aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-11-01 10:02:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-11-01 10:10:49 +0000
commit5d491cae987cf4d47d6bc1bdac5173ae67b1dadb (patch)
tree9903b2c49dd694591f901d08a3c6d941b14183b8
parent49bb87ab33a6bccd8205f8b2467ed1a346230d8c (diff)
downloadaports-5d491cae987cf4d47d6bc1bdac5173ae67b1dadb.tar.bz2
aports-5d491cae987cf4d47d6bc1bdac5173ae67b1dadb.tar.xz
main/linux-grsec: upgrade to grsecurity-2.2.0-2.6.35.8-201010311944
-rw-r--r--main/linux-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/grsecurity-2.2.0-2.6.35.8-201010311944.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.35.7-201010232009.patch)7326
2 files changed, 3630 insertions, 3706 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index a144f1f351..bd25e8bef0 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=2.6.35.7
+pkgver=2.6.35.8
_kernver=2.6.35
-pkgrel=3
+pkgrel=0
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- grsecurity-2.2.0-2.6.35.7-201010232009.patch
+ grsecurity-2.2.0-2.6.35.8-201010311944.patch
0004-arp-flush-arp-cache-on-device-change.patch
r8169-fix-rx-checksum-offload.patch
r8169-add-gro-support.patch
@@ -139,8 +139,8 @@ firmware() {
}
md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2
-4a1ceddc62ff83b136f32dbab50e15f8 grsecurity-2.2.0-2.6.35.7-201010232009.patch
+198e4e72ea9cc7f9f25bb5881167aa2e patch-2.6.35.8.bz2
+3ad2911a6009758d1df3fff0bce11405 grsecurity-2.2.0-2.6.35.8-201010311944.patch
776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
0ccecafd4123dcad0b0cd7787553d734 r8169-fix-rx-checksum-offload.patch
139b39da44ecb577275be53d7d365949 r8169-add-gro-support.patch
diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.35.7-201010232009.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.35.8-201010311944.patch
index c570cf880c..25d1ccbc21 100644
--- a/main/linux-grsec/grsecurity-2.2.0-2.6.35.7-201010232009.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.35.8-201010311944.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-2.6.35.7/arch/alpha/include/asm/dma-mapping.h linux-2.6.35.7/arch/alpha/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/alpha/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/include/asm/dma-mapping.h linux-2.6.35.8/arch/alpha/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/alpha/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -3,9 +3,9 @@
#include <linux/dma-attrs.h>
@@ -13,9 +13,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/include/asm/dma-mapping.h linux-2.6.35.7/ar
{
return dma_ops;
}
-diff -urNp linux-2.6.35.7/arch/alpha/include/asm/elf.h linux-2.6.35.7/arch/alpha/include/asm/elf.h
---- linux-2.6.35.7/arch/alpha/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/include/asm/elf.h linux-2.6.35.8/arch/alpha/include/asm/elf.h
+--- linux-2.6.35.8/arch/alpha/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -30,9 +30,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/include/asm/elf.h linux-2.6.35.7/arch/alpha
/* $0 is set by ld.so to a pointer to a function which might be
registered using atexit. This provides a mean for the dynamic
linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-2.6.35.7/arch/alpha/include/asm/pgtable.h linux-2.6.35.7/arch/alpha/include/asm/pgtable.h
---- linux-2.6.35.7/arch/alpha/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/include/asm/pgtable.h linux-2.6.35.8/arch/alpha/include/asm/pgtable.h
+--- linux-2.6.35.8/arch/alpha/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -51,9 +51,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/include/asm/pgtable.h linux-2.6.35.7/arch/a
#define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-2.6.35.7/arch/alpha/kernel/module.c linux-2.6.35.7/arch/alpha/kernel/module.c
---- linux-2.6.35.7/arch/alpha/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/kernel/module.c linux-2.6.35.8/arch/alpha/kernel/module.c
+--- linux-2.6.35.8/arch/alpha/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -63,9 +63,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/kernel/module.c linux-2.6.35.7/arch/alpha/k
got = sechdrs[me->arch.gotsecindex].sh_addr;
for (i = 0; i < n; i++) {
-diff -urNp linux-2.6.35.7/arch/alpha/kernel/osf_sys.c linux-2.6.35.7/arch/alpha/kernel/osf_sys.c
---- linux-2.6.35.7/arch/alpha/kernel/osf_sys.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/kernel/osf_sys.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/kernel/osf_sys.c linux-2.6.35.8/arch/alpha/kernel/osf_sys.c
+--- linux-2.6.35.8/arch/alpha/kernel/osf_sys.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/kernel/osf_sys.c 2010-09-17 20:12:09.000000000 -0400
@@ -1170,7 +1170,7 @@ arch_get_unmapped_area_1(unsigned long a
/* At this point: (!vma || addr < vma->vm_end). */
if (limit - len < addr)
@@ -97,9 +97,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/kernel/osf_sys.c linux-2.6.35.7/arch/alpha/
if (addr != (unsigned long) -ENOMEM)
return addr;
-diff -urNp linux-2.6.35.7/arch/alpha/kernel/pci_iommu.c linux-2.6.35.7/arch/alpha/kernel/pci_iommu.c
---- linux-2.6.35.7/arch/alpha/kernel/pci_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/kernel/pci_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/kernel/pci_iommu.c linux-2.6.35.8/arch/alpha/kernel/pci_iommu.c
+--- linux-2.6.35.8/arch/alpha/kernel/pci_iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/kernel/pci_iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct dev
return 0;
}
@@ -116,9 +116,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/kernel/pci_iommu.c linux-2.6.35.7/arch/alph
-struct dma_map_ops *dma_ops = &alpha_pci_ops;
+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
EXPORT_SYMBOL(dma_ops);
-diff -urNp linux-2.6.35.7/arch/alpha/kernel/pci-noop.c linux-2.6.35.7/arch/alpha/kernel/pci-noop.c
---- linux-2.6.35.7/arch/alpha/kernel/pci-noop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/kernel/pci-noop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/kernel/pci-noop.c linux-2.6.35.8/arch/alpha/kernel/pci-noop.c
+--- linux-2.6.35.8/arch/alpha/kernel/pci-noop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/kernel/pci-noop.c 2010-09-17 20:12:09.000000000 -0400
@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct de
return 0;
}
@@ -137,9 +137,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/kernel/pci-noop.c linux-2.6.35.7/arch/alpha
EXPORT_SYMBOL(dma_ops);
void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff -urNp linux-2.6.35.7/arch/alpha/mm/fault.c linux-2.6.35.7/arch/alpha/mm/fault.c
---- linux-2.6.35.7/arch/alpha/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/alpha/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/alpha/mm/fault.c linux-2.6.35.8/arch/alpha/mm/fault.c
+--- linux-2.6.35.8/arch/alpha/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/alpha/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -296,9 +296,9 @@ diff -urNp linux-2.6.35.7/arch/alpha/mm/fault.c linux-2.6.35.7/arch/alpha/mm/fau
} else if (!cause) {
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-2.6.35.7/arch/arm/include/asm/elf.h linux-2.6.35.7/arch/arm/include/asm/elf.h
---- linux-2.6.35.7/arch/arm/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/include/asm/elf.h linux-2.6.35.8/arch/arm/include/asm/elf.h
+--- linux-2.6.35.8/arch/arm/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -111,7 +111,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -315,9 +315,9 @@ diff -urNp linux-2.6.35.7/arch/arm/include/asm/elf.h linux-2.6.35.7/arch/arm/inc
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we
-diff -urNp linux-2.6.35.7/arch/arm/include/asm/kmap_types.h linux-2.6.35.7/arch/arm/include/asm/kmap_types.h
---- linux-2.6.35.7/arch/arm/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/include/asm/kmap_types.h linux-2.6.35.8/arch/arm/include/asm/kmap_types.h
+--- linux-2.6.35.8/arch/arm/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -21,6 +21,7 @@ enum km_type {
KM_L1_CACHE,
KM_L2_CACHE,
@@ -326,9 +326,9 @@ diff -urNp linux-2.6.35.7/arch/arm/include/asm/kmap_types.h linux-2.6.35.7/arch/
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.7/arch/arm/include/asm/uaccess.h linux-2.6.35.7/arch/arm/include/asm/uaccess.h
---- linux-2.6.35.7/arch/arm/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/include/asm/uaccess.h linux-2.6.35.8/arch/arm/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/arm/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -349,9 +349,9 @@ diff -urNp linux-2.6.35.7/arch/arm/include/asm/uaccess.h linux-2.6.35.7/arch/arm
if (access_ok(VERIFY_WRITE, to, n))
n = __copy_to_user(to, from, n);
return n;
-diff -urNp linux-2.6.35.7/arch/arm/kernel/kgdb.c linux-2.6.35.7/arch/arm/kernel/kgdb.c
---- linux-2.6.35.7/arch/arm/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/kernel/kgdb.c linux-2.6.35.8/arch/arm/kernel/kgdb.c
+--- linux-2.6.35.8/arch/arm/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -208,7 +208,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -361,9 +361,9 @@ diff -urNp linux-2.6.35.7/arch/arm/kernel/kgdb.c linux-2.6.35.7/arch/arm/kernel/
#ifndef __ARMEB__
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
-diff -urNp linux-2.6.35.7/arch/arm/mach-at91/pm.c linux-2.6.35.7/arch/arm/mach-at91/pm.c
---- linux-2.6.35.7/arch/arm/mach-at91/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-at91/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-at91/pm.c linux-2.6.35.8/arch/arm/mach-at91/pm.c
+--- linux-2.6.35.8/arch/arm/mach-at91/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-at91/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -294,7 +294,7 @@ static void at91_pm_end(void)
}
@@ -373,9 +373,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-at91/pm.c linux-2.6.35.7/arch/arm/mach-a
.valid = at91_pm_valid_state,
.begin = at91_pm_begin,
.enter = at91_pm_enter,
-diff -urNp linux-2.6.35.7/arch/arm/mach-davinci/pm.c linux-2.6.35.7/arch/arm/mach-davinci/pm.c
---- linux-2.6.35.7/arch/arm/mach-davinci/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-davinci/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-davinci/pm.c linux-2.6.35.8/arch/arm/mach-davinci/pm.c
+--- linux-2.6.35.8/arch/arm/mach-davinci/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-davinci/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -110,7 +110,7 @@ static int davinci_pm_enter(suspend_stat
return ret;
}
@@ -385,9 +385,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-davinci/pm.c linux-2.6.35.7/arch/arm/mac
.enter = davinci_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.7/arch/arm/mach-msm/last_radio_log.c linux-2.6.35.7/arch/arm/mach-msm/last_radio_log.c
---- linux-2.6.35.7/arch/arm/mach-msm/last_radio_log.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-msm/last_radio_log.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-msm/last_radio_log.c linux-2.6.35.8/arch/arm/mach-msm/last_radio_log.c
+--- linux-2.6.35.8/arch/arm/mach-msm/last_radio_log.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-msm/last_radio_log.c 2010-09-17 20:12:09.000000000 -0400
@@ -47,6 +47,7 @@ static ssize_t last_radio_log_read(struc
return count;
}
@@ -396,9 +396,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-msm/last_radio_log.c linux-2.6.35.7/arch
static struct file_operations last_radio_log_fops = {
.read = last_radio_log_read
};
-diff -urNp linux-2.6.35.7/arch/arm/mach-omap1/pm.c linux-2.6.35.7/arch/arm/mach-omap1/pm.c
---- linux-2.6.35.7/arch/arm/mach-omap1/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-omap1/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-omap1/pm.c linux-2.6.35.8/arch/arm/mach-omap1/pm.c
+--- linux-2.6.35.8/arch/arm/mach-omap1/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-omap1/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -408,9 +408,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-omap1/pm.c linux-2.6.35.7/arch/arm/mach-
.prepare = omap_pm_prepare,
.enter = omap_pm_enter,
.finish = omap_pm_finish,
-diff -urNp linux-2.6.35.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.35.7/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.35.7/arch/arm/mach-omap2/pm24xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-omap2/pm24xx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-omap2/pm24xx.c linux-2.6.35.8/arch/arm/mach-omap2/pm24xx.c
+--- linux-2.6.35.8/arch/arm/mach-omap2/pm24xx.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-omap2/pm24xx.c 2010-09-17 20:12:09.000000000 -0400
@@ -325,7 +325,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -420,9 +420,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-omap2/pm24xx.c linux-2.6.35.7/arch/arm/m
.prepare = omap2_pm_prepare,
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
-diff -urNp linux-2.6.35.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.35.7/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.35.7/arch/arm/mach-omap2/pm34xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-omap2/pm34xx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-omap2/pm34xx.c linux-2.6.35.8/arch/arm/mach-omap2/pm34xx.c
+--- linux-2.6.35.8/arch/arm/mach-omap2/pm34xx.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-omap2/pm34xx.c 2010-09-17 20:12:09.000000000 -0400
@@ -669,7 +669,7 @@ static void omap3_pm_end(void)
return;
}
@@ -432,9 +432,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-omap2/pm34xx.c linux-2.6.35.7/arch/arm/m
.begin = omap3_pm_begin,
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
-diff -urNp linux-2.6.35.7/arch/arm/mach-pnx4008/pm.c linux-2.6.35.7/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.35.7/arch/arm/mach-pnx4008/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-pnx4008/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-pnx4008/pm.c linux-2.6.35.8/arch/arm/mach-pnx4008/pm.c
+--- linux-2.6.35.8/arch/arm/mach-pnx4008/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-pnx4008/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -119,7 +119,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -444,9 +444,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-pnx4008/pm.c linux-2.6.35.7/arch/arm/mac
.enter = pnx4008_pm_enter,
.valid = pnx4008_pm_valid,
};
-diff -urNp linux-2.6.35.7/arch/arm/mach-pxa/pm.c linux-2.6.35.7/arch/arm/mach-pxa/pm.c
---- linux-2.6.35.7/arch/arm/mach-pxa/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-pxa/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-pxa/pm.c linux-2.6.35.8/arch/arm/mach-pxa/pm.c
+--- linux-2.6.35.8/arch/arm/mach-pxa/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-pxa/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -96,7 +96,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -456,9 +456,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-pxa/pm.c linux-2.6.35.7/arch/arm/mach-px
.valid = pxa_pm_valid,
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
-diff -urNp linux-2.6.35.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.35.7/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.35.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.35.8/arch/arm/mach-pxa/sharpsl_pm.c
+--- linux-2.6.35.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -468,9 +468,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.35.7/arch/arm
.prepare = pxa_pm_prepare,
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
-diff -urNp linux-2.6.35.7/arch/arm/mach-sa1100/pm.c linux-2.6.35.7/arch/arm/mach-sa1100/pm.c
---- linux-2.6.35.7/arch/arm/mach-sa1100/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mach-sa1100/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mach-sa1100/pm.c linux-2.6.35.8/arch/arm/mach-sa1100/pm.c
+--- linux-2.6.35.8/arch/arm/mach-sa1100/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mach-sa1100/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -480,9 +480,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mach-sa1100/pm.c linux-2.6.35.7/arch/arm/mach
.enter = sa11x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.7/arch/arm/mm/fault.c linux-2.6.35.7/arch/arm/mm/fault.c
---- linux-2.6.35.7/arch/arm/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mm/fault.c linux-2.6.35.8/arch/arm/mm/fault.c
+--- linux-2.6.35.8/arch/arm/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -531,9 +531,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mm/fault.c linux-2.6.35.7/arch/arm/mm/fault.c
/*
* First Level Translation Fault Handler
*
-diff -urNp linux-2.6.35.7/arch/arm/mm/mmap.c linux-2.6.35.7/arch/arm/mm/mmap.c
---- linux-2.6.35.7/arch/arm/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/mm/mmap.c linux-2.6.35.8/arch/arm/mm/mmap.c
+--- linux-2.6.35.8/arch/arm/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -583,9 +583,9 @@ diff -urNp linux-2.6.35.7/arch/arm/mm/mmap.c linux-2.6.35.7/arch/arm/mm/mmap.c
/*
* Remember the place where we stopped the search:
*/
-diff -urNp linux-2.6.35.7/arch/arm/plat-samsung/pm.c linux-2.6.35.7/arch/arm/plat-samsung/pm.c
---- linux-2.6.35.7/arch/arm/plat-samsung/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/arm/plat-samsung/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/arm/plat-samsung/pm.c linux-2.6.35.8/arch/arm/plat-samsung/pm.c
+--- linux-2.6.35.8/arch/arm/plat-samsung/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/arm/plat-samsung/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.35.7/arch/arm/plat-samsung/pm.c linux-2.6.35.7/arch/arm/pla
.enter = s3c_pm_enter,
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
-diff -urNp linux-2.6.35.7/arch/avr32/include/asm/elf.h linux-2.6.35.7/arch/avr32/include/asm/elf.h
---- linux-2.6.35.7/arch/avr32/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/avr32/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/avr32/include/asm/elf.h linux-2.6.35.8/arch/avr32/include/asm/elf.h
+--- linux-2.6.35.8/arch/avr32/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/avr32/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -614,9 +614,9 @@ diff -urNp linux-2.6.35.7/arch/avr32/include/asm/elf.h linux-2.6.35.7/arch/avr32
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
-diff -urNp linux-2.6.35.7/arch/avr32/include/asm/kmap_types.h linux-2.6.35.7/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.35.7/arch/avr32/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/avr32/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/avr32/include/asm/kmap_types.h linux-2.6.35.8/arch/avr32/include/asm/kmap_types.h
+--- linux-2.6.35.8/arch/avr32/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/avr32/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -627,9 +627,9 @@ diff -urNp linux-2.6.35.7/arch/avr32/include/asm/kmap_types.h linux-2.6.35.7/arc
};
#undef D
-diff -urNp linux-2.6.35.7/arch/avr32/mach-at32ap/pm.c linux-2.6.35.7/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.35.7/arch/avr32/mach-at32ap/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/avr32/mach-at32ap/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/avr32/mach-at32ap/pm.c linux-2.6.35.8/arch/avr32/mach-at32ap/pm.c
+--- linux-2.6.35.8/arch/avr32/mach-at32ap/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/avr32/mach-at32ap/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -639,9 +639,9 @@ diff -urNp linux-2.6.35.7/arch/avr32/mach-at32ap/pm.c linux-2.6.35.7/arch/avr32/
.valid = avr32_pm_valid_state,
.enter = avr32_pm_enter,
};
-diff -urNp linux-2.6.35.7/arch/avr32/mm/fault.c linux-2.6.35.7/arch/avr32/mm/fault.c
---- linux-2.6.35.7/arch/avr32/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/avr32/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/avr32/mm/fault.c linux-2.6.35.8/arch/avr32/mm/fault.c
+--- linux-2.6.35.8/arch/avr32/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/avr32/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -683,9 +683,9 @@ diff -urNp linux-2.6.35.7/arch/avr32/mm/fault.c linux-2.6.35.7/arch/avr32/mm/fau
if (exception_trace && printk_ratelimit())
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
-diff -urNp linux-2.6.35.7/arch/blackfin/kernel/kgdb.c linux-2.6.35.7/arch/blackfin/kernel/kgdb.c
---- linux-2.6.35.7/arch/blackfin/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/blackfin/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/blackfin/kernel/kgdb.c linux-2.6.35.8/arch/blackfin/kernel/kgdb.c
+--- linux-2.6.35.8/arch/blackfin/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/blackfin/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -397,7 +397,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -695,9 +695,9 @@ diff -urNp linux-2.6.35.7/arch/blackfin/kernel/kgdb.c linux-2.6.35.7/arch/blackf
.gdb_bpt_instr = {0xa1},
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff -urNp linux-2.6.35.7/arch/blackfin/mach-common/pm.c linux-2.6.35.7/arch/blackfin/mach-common/pm.c
---- linux-2.6.35.7/arch/blackfin/mach-common/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/blackfin/mach-common/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/blackfin/mach-common/pm.c linux-2.6.35.8/arch/blackfin/mach-common/pm.c
+--- linux-2.6.35.8/arch/blackfin/mach-common/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/blackfin/mach-common/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -232,7 +232,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -707,9 +707,9 @@ diff -urNp linux-2.6.35.7/arch/blackfin/mach-common/pm.c linux-2.6.35.7/arch/bla
.enter = bfin_pm_enter,
.valid = bfin_pm_valid,
};
-diff -urNp linux-2.6.35.7/arch/blackfin/mm/maccess.c linux-2.6.35.7/arch/blackfin/mm/maccess.c
---- linux-2.6.35.7/arch/blackfin/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/blackfin/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/blackfin/mm/maccess.c linux-2.6.35.8/arch/blackfin/mm/maccess.c
+--- linux-2.6.35.8/arch/blackfin/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/blackfin/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
@@ -16,7 +16,7 @@ static int validate_memory_access_addres
return bfin_mem_access_type(addr, size);
}
@@ -728,9 +728,9 @@ diff -urNp linux-2.6.35.7/arch/blackfin/mm/maccess.c linux-2.6.35.7/arch/blackfi
{
unsigned long ldst = (unsigned long)dst;
int mem_type;
-diff -urNp linux-2.6.35.7/arch/frv/include/asm/kmap_types.h linux-2.6.35.7/arch/frv/include/asm/kmap_types.h
---- linux-2.6.35.7/arch/frv/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/frv/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/frv/include/asm/kmap_types.h linux-2.6.35.8/arch/frv/include/asm/kmap_types.h
+--- linux-2.6.35.8/arch/frv/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/frv/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -739,9 +739,9 @@ diff -urNp linux-2.6.35.7/arch/frv/include/asm/kmap_types.h linux-2.6.35.7/arch/
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.7/arch/frv/mm/elf-fdpic.c linux-2.6.35.7/arch/frv/mm/elf-fdpic.c
---- linux-2.6.35.7/arch/frv/mm/elf-fdpic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/frv/mm/elf-fdpic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/frv/mm/elf-fdpic.c linux-2.6.35.8/arch/frv/mm/elf-fdpic.c
+--- linux-2.6.35.8/arch/frv/mm/elf-fdpic.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/frv/mm/elf-fdpic.c 2010-09-17 20:12:09.000000000 -0400
@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
if (addr) {
addr = PAGE_ALIGN(addr);
@@ -770,9 +770,9 @@ diff -urNp linux-2.6.35.7/arch/frv/mm/elf-fdpic.c linux-2.6.35.7/arch/frv/mm/elf
goto success;
addr = vma->vm_end;
}
-diff -urNp linux-2.6.35.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.35.7/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.35.7/arch/ia64/hp/common/hwsw_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/hp/common/hwsw_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.35.8/arch/ia64/hp/common/hwsw_iommu.c
+--- linux-2.6.35.8/arch/ia64/hp/common/hwsw_iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/hp/common/hwsw_iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -791,9 +791,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.35.7/arch/i
{
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
-diff -urNp linux-2.6.35.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.35.7/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.35.7/arch/ia64/hp/common/sba_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/hp/common/sba_iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/hp/common/sba_iommu.c linux-2.6.35.8/arch/ia64/hp/common/sba_iommu.c
+--- linux-2.6.35.8/arch/ia64/hp/common/sba_iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/hp/common/sba_iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -812,9 +812,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/hp/common/sba_iommu.c linux-2.6.35.7/arch/ia
.alloc_coherent = sba_alloc_coherent,
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
-diff -urNp linux-2.6.35.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.35.7/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/ia64/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/include/asm/dma-mapping.h linux-2.6.35.8/arch/ia64/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/ia64/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -858,9 +858,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/include/asm/dma-mapping.h linux-2.6.35.7/arc
return ops->dma_supported(dev, mask);
}
-diff -urNp linux-2.6.35.7/arch/ia64/include/asm/elf.h linux-2.6.35.7/arch/ia64/include/asm/elf.h
---- linux-2.6.35.7/arch/ia64/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/include/asm/elf.h linux-2.6.35.8/arch/ia64/include/asm/elf.h
+--- linux-2.6.35.8/arch/ia64/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -42,6 +42,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -875,9 +875,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/include/asm/elf.h linux-2.6.35.7/arch/ia64/i
#define PT_IA_64_UNWIND 0x70000001
/* IA-64 relocations: */
-diff -urNp linux-2.6.35.7/arch/ia64/include/asm/machvec.h linux-2.6.35.7/arch/ia64/include/asm/machvec.h
---- linux-2.6.35.7/arch/ia64/include/asm/machvec.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/include/asm/machvec.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/include/asm/machvec.h linux-2.6.35.8/arch/ia64/include/asm/machvec.h
+--- linux-2.6.35.8/arch/ia64/include/asm/machvec.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/include/asm/machvec.h 2010-09-17 20:12:09.000000000 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -896,9 +896,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/include/asm/machvec.h linux-2.6.35.7/arch/ia
/*
* Define default versions so we can extend machvec for new platforms without having
-diff -urNp linux-2.6.35.7/arch/ia64/include/asm/pgtable.h linux-2.6.35.7/arch/ia64/include/asm/pgtable.h
---- linux-2.6.35.7/arch/ia64/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/include/asm/pgtable.h linux-2.6.35.8/arch/ia64/include/asm/pgtable.h
+--- linux-2.6.35.8/arch/ia64/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -926,9 +926,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/include/asm/pgtable.h linux-2.6.35.7/arch/ia
#define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
#define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
#define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-2.6.35.7/arch/ia64/include/asm/uaccess.h linux-2.6.35.7/arch/ia64/include/asm/uaccess.h
---- linux-2.6.35.7/arch/ia64/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/include/asm/uaccess.h linux-2.6.35.8/arch/ia64/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/ia64/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -947,9 +947,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/include/asm/uaccess.h linux-2.6.35.7/arch/ia
__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
__cu_len; \
})
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/dma-mapping.c linux-2.6.35.7/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.35.7/arch/ia64/kernel/dma-mapping.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/dma-mapping.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/dma-mapping.c linux-2.6.35.8/arch/ia64/kernel/dma-mapping.c
+--- linux-2.6.35.8/arch/ia64/kernel/dma-mapping.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/dma-mapping.c 2010-09-17 20:12:09.000000000 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -968,9 +968,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/dma-mapping.c linux-2.6.35.7/arch/ia6
{
return dma_ops;
}
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/module.c linux-2.6.35.7/arch/ia64/kernel/module.c
---- linux-2.6.35.7/arch/ia64/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/module.c linux-2.6.35.8/arch/ia64/kernel/module.c
+--- linux-2.6.35.8/arch/ia64/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -1059,9 +1059,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/module.c linux-2.6.35.7/arch/ia64/ker
mod->arch.gp = gp;
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/pci-dma.c linux-2.6.35.7/arch/ia64/kernel/pci-dma.c
---- linux-2.6.35.7/arch/ia64/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/pci-dma.c linux-2.6.35.8/arch/ia64/kernel/pci-dma.c
+--- linux-2.6.35.8/arch/ia64/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -1071,9 +1071,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/pci-dma.c linux-2.6.35.7/arch/ia64/ke
static int __init pci_iommu_init(void)
{
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.35.7/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.35.7/arch/ia64/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/pci-swiotlb.c linux-2.6.35.8/arch/ia64/kernel/pci-swiotlb.c
+--- linux-2.6.35.8/arch/ia64/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1083,9 +1083,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/pci-swiotlb.c linux-2.6.35.7/arch/ia6
.alloc_coherent = ia64_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/sys_ia64.c linux-2.6.35.7/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.35.7/arch/ia64/kernel/sys_ia64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/sys_ia64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/sys_ia64.c linux-2.6.35.8/arch/ia64/kernel/sys_ia64.c
+--- linux-2.6.35.8/arch/ia64/kernel/sys_ia64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/sys_ia64.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1118,9 +1118,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/sys_ia64.c linux-2.6.35.7/arch/ia64/k
/* Remember the address where we stopped this search: */
mm->free_area_cache = addr + len;
return addr;
-diff -urNp linux-2.6.35.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.35.7/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.35.7/arch/ia64/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/kernel/vmlinux.lds.S linux-2.6.35.8/arch/ia64/kernel/vmlinux.lds.S
+--- linux-2.6.35.8/arch/ia64/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
@@ -196,7 +196,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1130,9 +1130,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.35.7/arch/ia6
. = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
* into percpu page size
*/
-diff -urNp linux-2.6.35.7/arch/ia64/mm/fault.c linux-2.6.35.7/arch/ia64/mm/fault.c
---- linux-2.6.35.7/arch/ia64/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/mm/fault.c linux-2.6.35.8/arch/ia64/mm/fault.c
+--- linux-2.6.35.8/arch/ia64/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1182,9 +1182,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/mm/fault.c linux-2.6.35.7/arch/ia64/mm/fault
/*
* If for any reason at all we couldn't handle the fault, make
* sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-2.6.35.7/arch/ia64/mm/hugetlbpage.c linux-2.6.35.7/arch/ia64/mm/hugetlbpage.c
---- linux-2.6.35.7/arch/ia64/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/mm/hugetlbpage.c linux-2.6.35.8/arch/ia64/mm/hugetlbpage.c
+--- linux-2.6.35.8/arch/ia64/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
/* At this point: (!vmm || addr < vmm->vm_end). */
if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1194,9 +1194,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/mm/hugetlbpage.c linux-2.6.35.7/arch/ia64/mm
return addr;
addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
}
-diff -urNp linux-2.6.35.7/arch/ia64/mm/init.c linux-2.6.35.7/arch/ia64/mm/init.c
---- linux-2.6.35.7/arch/ia64/mm/init.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/mm/init.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/mm/init.c linux-2.6.35.8/arch/ia64/mm/init.c
+--- linux-2.6.35.8/arch/ia64/mm/init.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/mm/init.c 2010-09-17 20:12:09.000000000 -0400
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1217,9 +1217,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/mm/init.c linux-2.6.35.7/arch/ia64/mm/init.c
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-2.6.35.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.35.7/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.35.7/arch/ia64/sn/pci/pci_dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/ia64/sn/pci/pci_dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/ia64/sn/pci/pci_dma.c linux-2.6.35.8/arch/ia64/sn/pci/pci_dma.c
+--- linux-2.6.35.8/arch/ia64/sn/pci/pci_dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/ia64/sn/pci/pci_dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1229,9 +1229,9 @@ diff -urNp linux-2.6.35.7/arch/ia64/sn/pci/pci_dma.c linux-2.6.35.7/arch/ia64/sn
.alloc_coherent = sn_dma_alloc_coherent,
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
-diff -urNp linux-2.6.35.7/arch/m32r/lib/usercopy.c linux-2.6.35.7/arch/m32r/lib/usercopy.c
---- linux-2.6.35.7/arch/m32r/lib/usercopy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/m32r/lib/usercopy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/m32r/lib/usercopy.c linux-2.6.35.8/arch/m32r/lib/usercopy.c
+--- linux-2.6.35.8/arch/m32r/lib/usercopy.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/m32r/lib/usercopy.c 2010-09-17 20:12:09.000000000 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1252,9 +1252,9 @@ diff -urNp linux-2.6.35.7/arch/m32r/lib/usercopy.c linux-2.6.35.7/arch/m32r/lib/
prefetchw(to);
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
-diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/device.h linux-2.6.35.7/arch/microblaze/include/asm/device.h
---- linux-2.6.35.7/arch/microblaze/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/microblaze/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/microblaze/include/asm/device.h linux-2.6.35.8/arch/microblaze/include/asm/device.h
+--- linux-2.6.35.8/arch/microblaze/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/microblaze/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
@@ -13,7 +13,7 @@ struct device_node;
struct dev_archdata {
@@ -1264,9 +1264,9 @@ diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/device.h linux-2.6.35.7/ar
void *dma_data;
};
-diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.35.7/arch/microblaze/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/microblaze/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/microblaze/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/microblaze/include/asm/dma-mapping.h linux-2.6.35.8/arch/microblaze/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/microblaze/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/microblaze/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -43,14 +43,14 @@ static inline unsigned long device_to_ma
return 0xfffffffful;
}
@@ -1338,9 +1338,9 @@ diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/dma-mapping.h linux-2.6.35
BUG_ON(!ops);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/pci.h linux-2.6.35.7/arch/microblaze/include/asm/pci.h
---- linux-2.6.35.7/arch/microblaze/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/microblaze/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/microblaze/include/asm/pci.h linux-2.6.35.8/arch/microblaze/include/asm/pci.h
+--- linux-2.6.35.8/arch/microblaze/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/microblaze/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_
}
@@ -1352,9 +1352,9 @@ diff -urNp linux-2.6.35.7/arch/microblaze/include/asm/pci.h linux-2.6.35.7/arch/
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.35.7/arch/microblaze/kernel/dma.c linux-2.6.35.7/arch/microblaze/kernel/dma.c
---- linux-2.6.35.7/arch/microblaze/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/microblaze/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/microblaze/kernel/dma.c linux-2.6.35.8/arch/microblaze/kernel/dma.c
+--- linux-2.6.35.8/arch/microblaze/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/microblaze/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page
__dma_sync_page(dma_address, 0 , size, direction);
}
@@ -1364,9 +1364,9 @@ diff -urNp linux-2.6.35.7/arch/microblaze/kernel/dma.c linux-2.6.35.7/arch/micro
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.35.7/arch/microblaze/pci/pci-common.c linux-2.6.35.7/arch/microblaze/pci/pci-common.c
---- linux-2.6.35.7/arch/microblaze/pci/pci-common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/microblaze/pci/pci-common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/microblaze/pci/pci-common.c linux-2.6.35.8/arch/microblaze/pci/pci-common.c
+--- linux-2.6.35.8/arch/microblaze/pci/pci-common.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/microblaze/pci/pci-common.c 2010-09-17 20:12:09.000000000 -0400
@@ -46,14 +46,14 @@ resource_size_t isa_mem_base;
/* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
unsigned int pci_flags;
@@ -1385,9 +1385,9 @@ diff -urNp linux-2.6.35.7/arch/microblaze/pci/pci-common.c linux-2.6.35.7/arch/m
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.35.7/arch/mips/alchemy/devboards/pm.c linux-2.6.35.7/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.35.7/arch/mips/alchemy/devboards/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/alchemy/devboards/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/alchemy/devboards/pm.c linux-2.6.35.8/arch/mips/alchemy/devboards/pm.c
+--- linux-2.6.35.8/arch/mips/alchemy/devboards/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/alchemy/devboards/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -110,7 +110,7 @@ static void db1x_pm_end(void)
}
@@ -1397,9 +1397,9 @@ diff -urNp linux-2.6.35.7/arch/mips/alchemy/devboards/pm.c linux-2.6.35.7/arch/m
.valid = suspend_valid_only_mem,
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
-diff -urNp linux-2.6.35.7/arch/mips/include/asm/elf.h linux-2.6.35.7/arch/mips/include/asm/elf.h
---- linux-2.6.35.7/arch/mips/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/include/asm/elf.h linux-2.6.35.8/arch/mips/include/asm/elf.h
+--- linux-2.6.35.8/arch/mips/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -368,6 +368,13 @@ extern const char *__elf_platform;
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1414,9 +1414,9 @@ diff -urNp linux-2.6.35.7/arch/mips/include/asm/elf.h linux-2.6.35.7/arch/mips/i
#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
struct linux_binprm;
extern int arch_setup_additional_pages(struct linux_binprm *bprm,
-diff -urNp linux-2.6.35.7/arch/mips/include/asm/page.h linux-2.6.35.7/arch/mips/include/asm/page.h
---- linux-2.6.35.7/arch/mips/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/include/asm/page.h linux-2.6.35.8/arch/mips/include/asm/page.h
+--- linux-2.6.35.8/arch/mips/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1426,9 +1426,9 @@ diff -urNp linux-2.6.35.7/arch/mips/include/asm/page.h linux-2.6.35.7/arch/mips/
#else
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
-diff -urNp linux-2.6.35.7/arch/mips/include/asm/system.h linux-2.6.35.7/arch/mips/include/asm/system.h
---- linux-2.6.35.7/arch/mips/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/include/asm/system.h linux-2.6.35.8/arch/mips/include/asm/system.h
+--- linux-2.6.35.8/arch/mips/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
@@ -234,6 +234,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1437,9 +1437,9 @@ diff -urNp linux-2.6.35.7/arch/mips/include/asm/system.h linux-2.6.35.7/arch/mip
+#define arch_align_stack(x) ((x) & ALMASK)
#endif /* _ASM_SYSTEM_H */
-diff -urNp linux-2.6.35.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.35.7/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.35.7/arch/mips/kernel/binfmt_elfn32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/kernel/binfmt_elfn32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/kernel/binfmt_elfn32.c linux-2.6.35.8/arch/mips/kernel/binfmt_elfn32.c
+--- linux-2.6.35.8/arch/mips/kernel/binfmt_elfn32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/kernel/binfmt_elfn32.c 2010-09-17 20:12:09.000000000 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1454,9 +1454,9 @@ diff -urNp linux-2.6.35.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.35.7/arch/m
#include <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-diff -urNp linux-2.6.35.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.35.7/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.35.7/arch/mips/kernel/binfmt_elfo32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/kernel/binfmt_elfo32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/kernel/binfmt_elfo32.c linux-2.6.35.8/arch/mips/kernel/binfmt_elfo32.c
+--- linux-2.6.35.8/arch/mips/kernel/binfmt_elfo32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/kernel/binfmt_elfo32.c 2010-09-17 20:12:09.000000000 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1471,9 +1471,9 @@ diff -urNp linux-2.6.35.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.35.7/arch/m
#include <asm/processor.h>
/*
-diff -urNp linux-2.6.35.7/arch/mips/kernel/kgdb.c linux-2.6.35.7/arch/mips/kernel/kgdb.c
---- linux-2.6.35.7/arch/mips/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/kernel/kgdb.c linux-2.6.35.8/arch/mips/kernel/kgdb.c
+--- linux-2.6.35.8/arch/mips/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -270,6 +270,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1482,9 +1482,9 @@ diff -urNp linux-2.6.35.7/arch/mips/kernel/kgdb.c linux-2.6.35.7/arch/mips/kerne
struct kgdb_arch arch_kgdb_ops;
/*
-diff -urNp linux-2.6.35.7/arch/mips/kernel/process.c linux-2.6.35.7/arch/mips/kernel/process.c
---- linux-2.6.35.7/arch/mips/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/kernel/process.c linux-2.6.35.8/arch/mips/kernel/process.c
+--- linux-2.6.35.8/arch/mips/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
@@ -474,15 +474,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1501,9 +1501,9 @@ diff -urNp linux-2.6.35.7/arch/mips/kernel/process.c linux-2.6.35.7/arch/mips/ke
-
- return sp & ALMASK;
-}
-diff -urNp linux-2.6.35.7/arch/mips/kernel/syscall.c linux-2.6.35.7/arch/mips/kernel/syscall.c
---- linux-2.6.35.7/arch/mips/kernel/syscall.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/kernel/syscall.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/kernel/syscall.c linux-2.6.35.8/arch/mips/kernel/syscall.c
+--- linux-2.6.35.8/arch/mips/kernel/syscall.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/kernel/syscall.c 2010-09-17 20:12:09.000000000 -0400
@@ -106,17 +106,21 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1538,9 +1538,9 @@ diff -urNp linux-2.6.35.7/arch/mips/kernel/syscall.c linux-2.6.35.7/arch/mips/ke
return addr;
addr = vmm->vm_end;
if (do_color_align)
-diff -urNp linux-2.6.35.7/arch/mips/loongson/common/pm.c linux-2.6.35.7/arch/mips/loongson/common/pm.c
---- linux-2.6.35.7/arch/mips/loongson/common/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/loongson/common/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/loongson/common/pm.c linux-2.6.35.8/arch/mips/loongson/common/pm.c
+--- linux-2.6.35.8/arch/mips/loongson/common/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/loongson/common/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -147,7 +147,7 @@ static int loongson_pm_valid_state(suspe
}
}
@@ -1550,9 +1550,9 @@ diff -urNp linux-2.6.35.7/arch/mips/loongson/common/pm.c linux-2.6.35.7/arch/mip
.valid = loongson_pm_valid_state,
.enter = loongson_pm_enter,
};
-diff -urNp linux-2.6.35.7/arch/mips/mm/fault.c linux-2.6.35.7/arch/mips/mm/fault.c
---- linux-2.6.35.7/arch/mips/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/mips/mm/fault.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/mips/mm/fault.c linux-2.6.35.8/arch/mips/mm/fault.c
+--- linux-2.6.35.8/arch/mips/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/mips/mm/fault.c 2010-10-11 22:41:44.000000000 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1577,9 +1577,9 @@ diff -urNp linux-2.6.35.7/arch/mips/mm/fault.c linux-2.6.35.7/arch/mips/mm/fault
/*
* This routine handles page faults. It determines the address,
* and the problem, and then passes it off to one of the appropriate
-diff -urNp linux-2.6.35.7/arch/parisc/include/asm/elf.h linux-2.6.35.7/arch/parisc/include/asm/elf.h
---- linux-2.6.35.7/arch/parisc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/include/asm/elf.h linux-2.6.35.8/arch/parisc/include/asm/elf.h
+--- linux-2.6.35.8/arch/parisc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1594,9 +1594,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/include/asm/elf.h linux-2.6.35.7/arch/pari
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. This could be done in user space,
but it's not easy, and we've already done it here. */
-diff -urNp linux-2.6.35.7/arch/parisc/include/asm/pgtable.h linux-2.6.35.7/arch/parisc/include/asm/pgtable.h
---- linux-2.6.35.7/arch/parisc/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/include/asm/pgtable.h linux-2.6.35.8/arch/parisc/include/asm/pgtable.h
+--- linux-2.6.35.8/arch/parisc/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1615,9 +1615,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/include/asm/pgtable.h linux-2.6.35.7/arch/
#define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
-diff -urNp linux-2.6.35.7/arch/parisc/kernel/module.c linux-2.6.35.7/arch/parisc/kernel/module.c
---- linux-2.6.35.7/arch/parisc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/kernel/module.c linux-2.6.35.8/arch/parisc/kernel/module.c
+--- linux-2.6.35.8/arch/parisc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -96,16 +96,38 @@
/* three functions to determine where in the module core
@@ -1718,9 +1718,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/kernel/module.c linux-2.6.35.7/arch/parisc
DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
me->arch.unwind_section, table, end, gp);
-diff -urNp linux-2.6.35.7/arch/parisc/kernel/sys_parisc.c linux-2.6.35.7/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.35.7/arch/parisc/kernel/sys_parisc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/kernel/sys_parisc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/kernel/sys_parisc.c linux-2.6.35.8/arch/parisc/kernel/sys_parisc.c
+--- linux-2.6.35.8/arch/parisc/kernel/sys_parisc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/kernel/sys_parisc.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
/* At this point: (!vma || addr < vma->vm_end). */
if (TASK_SIZE - len < addr)
@@ -1748,9 +1748,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/kernel/sys_parisc.c linux-2.6.35.7/arch/pa
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-2.6.35.7/arch/parisc/kernel/traps.c linux-2.6.35.7/arch/parisc/kernel/traps.c
---- linux-2.6.35.7/arch/parisc/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/kernel/traps.c linux-2.6.35.8/arch/parisc/kernel/traps.c
+--- linux-2.6.35.8/arch/parisc/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1762,9 +1762,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/kernel/traps.c linux-2.6.35.7/arch/parisc/
fault_address = regs->iaoq[0];
fault_space = regs->iasq[0];
-diff -urNp linux-2.6.35.7/arch/parisc/mm/fault.c linux-2.6.35.7/arch/parisc/mm/fault.c
---- linux-2.6.35.7/arch/parisc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/parisc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/parisc/mm/fault.c linux-2.6.35.8/arch/parisc/mm/fault.c
+--- linux-2.6.35.8/arch/parisc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/parisc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1934,9 +1934,9 @@ diff -urNp linux-2.6.35.7/arch/parisc/mm/fault.c linux-2.6.35.7/arch/parisc/mm/f
/*
* If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/device.h linux-2.6.35.7/arch/powerpc/include/asm/device.h
---- linux-2.6.35.7/arch/powerpc/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/device.h linux-2.6.35.8/arch/powerpc/include/asm/device.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
@@ -11,7 +11,7 @@ struct device_node;
struct dev_archdata {
@@ -1946,9 +1946,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/device.h linux-2.6.35.7/arch/
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.35.7/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/powerpc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/dma-mapping.h linux-2.6.35.8/arch/powerpc/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -66,12 +66,13 @@ static inline unsigned long device_to_ma
/*
* Available generic sets of operations
@@ -2019,9 +2019,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/dma-mapping.h linux-2.6.35.7/
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/elf.h linux-2.6.35.7/arch/powerpc/include/asm/elf.h
---- linux-2.6.35.7/arch/powerpc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/elf.h linux-2.6.35.8/arch/powerpc/include/asm/elf.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -2054,9 +2054,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/elf.h linux-2.6.35.7/arch/pow
#endif /* __KERNEL__ */
/*
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/iommu.h linux-2.6.35.7/arch/powerpc/include/asm/iommu.h
---- linux-2.6.35.7/arch/powerpc/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/iommu.h linux-2.6.35.8/arch/powerpc/include/asm/iommu.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -2067,9 +2067,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/iommu.h linux-2.6.35.7/arch/p
#ifdef CONFIG_PCI
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.35.7/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.35.7/arch/powerpc/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/kmap_types.h linux-2.6.35.8/arch/powerpc/include/asm/kmap_types.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -27,6 +27,7 @@ enum km_type {
KM_PPC_SYNC_PAGE,
KM_PPC_SYNC_ICACHE,
@@ -2078,9 +2078,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.35.7/a
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/page_64.h linux-2.6.35.7/arch/powerpc/include/asm/page_64.h
---- linux-2.6.35.7/arch/powerpc/include/asm/page_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/page_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/page_64.h linux-2.6.35.8/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/page_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/page_64.h 2010-09-17 20:12:09.000000000 -0400
@@ -172,15 +172,18 @@ do { \
* stack by default, so in the absense of a PT_GNU_STACK program header
* we turn execute permission off.
@@ -2102,9 +2102,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/page_64.h linux-2.6.35.7/arch
#include <asm-generic/getorder.h>
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/page.h linux-2.6.35.7/arch/powerpc/include/asm/page.h
---- linux-2.6.35.7/arch/powerpc/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/page.h linux-2.6.35.8/arch/powerpc/include/asm/page.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
@@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
* and needs to be executable. This means the whole heap ends
* up being executable.
@@ -2127,9 +2127,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/page.h linux-2.6.35.7/arch/po
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/pci.h linux-2.6.35.7/arch/powerpc/include/asm/pci.h
---- linux-2.6.35.7/arch/powerpc/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/pci.h linux-2.6.35.8/arch/powerpc/include/asm/pci.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/pci.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/pci.h 2010-09-17 20:12:09.000000000 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -2141,9 +2141,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/pci.h linux-2.6.35.7/arch/pow
#else /* CONFIG_PCI */
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.35.7/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.35.7/arch/powerpc/include/asm/pte-hash32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/pte-hash32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/pte-hash32.h linux-2.6.35.8/arch/powerpc/include/asm/pte-hash32.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/pte-hash32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/pte-hash32.h 2010-09-17 20:12:09.000000000 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -2152,9 +2152,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.35.7/a
#define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/reg.h linux-2.6.35.7/arch/powerpc/include/asm/reg.h
---- linux-2.6.35.7/arch/powerpc/include/asm/reg.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/reg.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/reg.h linux-2.6.35.8/arch/powerpc/include/asm/reg.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/reg.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/reg.h 2010-09-17 20:12:09.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -2163,9 +2163,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/reg.h linux-2.6.35.7/arch/pow
#define DSISR_PROTFAULT 0x08000000 /* protection fault */
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.35.7/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.35.7/arch/powerpc/include/asm/swiotlb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/swiotlb.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/swiotlb.h linux-2.6.35.8/arch/powerpc/include/asm/swiotlb.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/swiotlb.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/swiotlb.h 2010-09-17 20:12:09.000000000 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -2175,9 +2175,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/swiotlb.h linux-2.6.35.7/arch
static inline void dma_mark_clean(void *addr, size_t size) {}
-diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/uaccess.h linux-2.6.35.7/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.35.7/arch/powerpc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/include/asm/uaccess.h linux-2.6.35.8/arch/powerpc/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/powerpc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2355,9 +2355,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/include/asm/uaccess.h linux-2.6.35.7/arch
extern unsigned long __clear_user(void __user *addr, unsigned long size);
static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma.c linux-2.6.35.7/arch/powerpc/kernel/dma.c
---- linux-2.6.35.7/arch/powerpc/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/dma.c linux-2.6.35.8/arch/powerpc/kernel/dma.c
+--- linux-2.6.35.8/arch/powerpc/kernel/dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -135,7 +135,7 @@ static inline void dma_direct_sync_singl
}
#endif
@@ -2367,9 +2367,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma.c linux-2.6.35.7/arch/powerpc/
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = dma_direct_map_sg,
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.35.7/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.35.7/arch/powerpc/kernel/dma-iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/dma-iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/dma-iommu.c linux-2.6.35.8/arch/powerpc/kernel/dma-iommu.c
+--- linux-2.6.35.8/arch/powerpc/kernel/dma-iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/dma-iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2379,9 +2379,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma-iommu.c linux-2.6.35.7/arch/po
{
struct iommu_table *tbl = get_iommu_table_base(dev);
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.35.7/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.35.7/arch/powerpc/kernel/dma-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/dma-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.35.8/arch/powerpc/kernel/dma-swiotlb.c
+--- linux-2.6.35.8/arch/powerpc/kernel/dma-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/dma-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2391,9 +2391,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.35.7/arch/
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/exceptions-64e.S linux-2.6.35.7/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.35.7/arch/powerpc/kernel/exceptions-64e.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/exceptions-64e.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/exceptions-64e.S linux-2.6.35.8/arch/powerpc/kernel/exceptions-64e.S
+--- linux-2.6.35.8/arch/powerpc/kernel/exceptions-64e.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/exceptions-64e.S 2010-09-17 20:12:09.000000000 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2412,9 +2412,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/exceptions-64e.S linux-2.6.35.7/ar
addi r3,r1,STACK_FRAME_OVERHEAD
ld r4,_DAR(r1)
bl .bad_page_fault
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/exceptions-64s.S linux-2.6.35.7/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.35.7/arch/powerpc/kernel/exceptions-64s.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/exceptions-64s.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/exceptions-64s.S linux-2.6.35.8/arch/powerpc/kernel/exceptions-64s.S
+--- linux-2.6.35.8/arch/powerpc/kernel/exceptions-64s.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/exceptions-64s.S 2010-09-17 20:12:09.000000000 -0400
@@ -840,10 +840,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2427,9 +2427,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/exceptions-64s.S linux-2.6.35.7/ar
mr r5,r3
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/ibmebus.c linux-2.6.35.7/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.35.7/arch/powerpc/kernel/ibmebus.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/ibmebus.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/ibmebus.c linux-2.6.35.8/arch/powerpc/kernel/ibmebus.c
+--- linux-2.6.35.8/arch/powerpc/kernel/ibmebus.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/ibmebus.c 2010-09-17 20:12:09.000000000 -0400
@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2439,9 +2439,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/ibmebus.c linux-2.6.35.7/arch/powe
.alloc_coherent = ibmebus_alloc_coherent,
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/kgdb.c linux-2.6.35.7/arch/powerpc/kernel/kgdb.c
---- linux-2.6.35.7/arch/powerpc/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/kgdb.c linux-2.6.35.8/arch/powerpc/kernel/kgdb.c
+--- linux-2.6.35.8/arch/powerpc/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -128,7 +128,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(1, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2460,9 +2460,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/kgdb.c linux-2.6.35.7/arch/powerpc
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/module_32.c linux-2.6.35.7/arch/powerpc/kernel/module_32.c
---- linux-2.6.35.7/arch/powerpc/kernel/module_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/module_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/module_32.c linux-2.6.35.8/arch/powerpc/kernel/module_32.c
+--- linux-2.6.35.8/arch/powerpc/kernel/module_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/module_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
me->arch.core_plt_section = i;
}
@@ -2492,9 +2492,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/module_32.c linux-2.6.35.7/arch/po
/* Find this entry, or if that fails, the next avail. entry */
while (entry->jump[0]) {
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/module.c linux-2.6.35.7/arch/powerpc/kernel/module.c
---- linux-2.6.35.7/arch/powerpc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/module.c linux-2.6.35.8/arch/powerpc/kernel/module.c
+--- linux-2.6.35.8/arch/powerpc/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2534,9 +2534,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/module.c linux-2.6.35.7/arch/power
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/pci-common.c linux-2.6.35.7/arch/powerpc/kernel/pci-common.c
---- linux-2.6.35.7/arch/powerpc/kernel/pci-common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/pci-common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/pci-common.c linux-2.6.35.8/arch/powerpc/kernel/pci-common.c
+--- linux-2.6.35.8/arch/powerpc/kernel/pci-common.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/pci-common.c 2010-09-17 20:12:09.000000000 -0400
@@ -51,14 +51,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2555,9 +2555,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/pci-common.c linux-2.6.35.7/arch/p
{
return pci_dma_ops;
}
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/process.c linux-2.6.35.7/arch/powerpc/kernel/process.c
---- linux-2.6.35.7/arch/powerpc/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/process.c linux-2.6.35.8/arch/powerpc/kernel/process.c
+--- linux-2.6.35.8/arch/powerpc/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
@@ -1215,51 +1215,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
@@ -2610,9 +2610,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/process.c linux-2.6.35.7/arch/powe
-
- return ret;
-}
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/signal_32.c linux-2.6.35.7/arch/powerpc/kernel/signal_32.c
---- linux-2.6.35.7/arch/powerpc/kernel/signal_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/signal_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/signal_32.c linux-2.6.35.8/arch/powerpc/kernel/signal_32.c
+--- linux-2.6.35.8/arch/powerpc/kernel/signal_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/signal_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2622,9 +2622,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/signal_32.c linux-2.6.35.7/arch/po
if (save_user_regs(regs, frame, 0, 1))
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/signal_64.c linux-2.6.35.7/arch/powerpc/kernel/signal_64.c
---- linux-2.6.35.7/arch/powerpc/kernel/signal_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/signal_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/signal_64.c linux-2.6.35.8/arch/powerpc/kernel/signal_64.c
+--- linux-2.6.35.8/arch/powerpc/kernel/signal_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/signal_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2634,9 +2634,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/signal_64.c linux-2.6.35.7/arch/po
regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/vdso.c linux-2.6.35.7/arch/powerpc/kernel/vdso.c
---- linux-2.6.35.7/arch/powerpc/kernel/vdso.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/vdso.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/vdso.c linux-2.6.35.8/arch/powerpc/kernel/vdso.c
+--- linux-2.6.35.8/arch/powerpc/kernel/vdso.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/vdso.c 2010-09-17 20:12:09.000000000 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2663,9 +2663,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/vdso.c linux-2.6.35.7/arch/powerpc
if (IS_ERR_VALUE(vdso_base)) {
rc = vdso_base;
goto fail_mmapsem;
-diff -urNp linux-2.6.35.7/arch/powerpc/kernel/vio.c linux-2.6.35.7/arch/powerpc/kernel/vio.c
---- linux-2.6.35.7/arch/powerpc/kernel/vio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/kernel/vio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/kernel/vio.c linux-2.6.35.8/arch/powerpc/kernel/vio.c
+--- linux-2.6.35.8/arch/powerpc/kernel/vio.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/kernel/vio.c 2010-09-17 20:12:09.000000000 -0400
@@ -602,11 +602,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2688,9 +2688,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/kernel/vio.c linux-2.6.35.7/arch/powerpc/
viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
}
-diff -urNp linux-2.6.35.7/arch/powerpc/lib/usercopy_64.c linux-2.6.35.7/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.35.7/arch/powerpc/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/lib/usercopy_64.c linux-2.6.35.8/arch/powerpc/lib/usercopy_64.c
+--- linux-2.6.35.8/arch/powerpc/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2722,9 +2722,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/lib/usercopy_64.c linux-2.6.35.7/arch/pow
-EXPORT_SYMBOL(copy_to_user);
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.35.7/arch/powerpc/mm/fault.c linux-2.6.35.7/arch/powerpc/mm/fault.c
---- linux-2.6.35.7/arch/powerpc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/mm/fault.c linux-2.6.35.8/arch/powerpc/mm/fault.c
+--- linux-2.6.35.8/arch/powerpc/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/mm/fault.c 2010-09-17 20:12:09.000000000 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2829,9 +2829,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/mm/fault.c linux-2.6.35.7/arch/powerpc/mm
_exception(SIGSEGV, regs, code, address);
return 0;
}
-diff -urNp linux-2.6.35.7/arch/powerpc/mm/mmap_64.c linux-2.6.35.7/arch/powerpc/mm/mmap_64.c
---- linux-2.6.35.7/arch/powerpc/mm/mmap_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/mm/mmap_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/mm/mmap_64.c linux-2.6.35.8/arch/powerpc/mm/mmap_64.c
+--- linux-2.6.35.8/arch/powerpc/mm/mmap_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/mm/mmap_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2855,9 +2855,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/mm/mmap_64.c linux-2.6.35.7/arch/powerpc/
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.35.7/arch/powerpc/mm/slice.c linux-2.6.35.7/arch/powerpc/mm/slice.c
---- linux-2.6.35.7/arch/powerpc/mm/slice.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/mm/slice.c 2010-10-23 20:08:39.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/mm/slice.c linux-2.6.35.8/arch/powerpc/mm/slice.c
+--- linux-2.6.35.8/arch/powerpc/mm/slice.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/mm/slice.c 2010-10-23 20:08:39.000000000 -0400
@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
if ((mm->task_size - len) < addr)
return 0;
@@ -2897,9 +2897,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/mm/slice.c linux-2.6.35.7/arch/powerpc/mm
/* If hint, make sure it matches our alignment restrictions */
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-2.6.35.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.35.7/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.35.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.35.8/arch/powerpc/platforms/52xx/lite5200_pm.c
+--- linux-2.6.35.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2909,9 +2909,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.35
.valid = lite5200_pm_valid,
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
-diff -urNp linux-2.6.35.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.35.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.35.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.35.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c
+--- linux-2.6.35.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -189,7 +189,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2921,9 +2921,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.35.
.valid = mpc52xx_pm_valid,
.prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter,
-diff -urNp linux-2.6.35.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.35.7/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.35.7/arch/powerpc/platforms/83xx/suspend.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/platforms/83xx/suspend.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/platforms/83xx/suspend.c linux-2.6.35.8/arch/powerpc/platforms/83xx/suspend.c
+--- linux-2.6.35.8/arch/powerpc/platforms/83xx/suspend.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/platforms/83xx/suspend.c 2010-09-17 20:12:09.000000000 -0400
@@ -311,7 +311,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2933,9 +2933,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/platforms/83xx/suspend.c linux-2.6.35.7/a
.valid = mpc83xx_suspend_valid,
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
-diff -urNp linux-2.6.35.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.35.7/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.35.7/arch/powerpc/platforms/cell/iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/platforms/cell/iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/platforms/cell/iommu.c linux-2.6.35.8/arch/powerpc/platforms/cell/iommu.c
+--- linux-2.6.35.8/arch/powerpc/platforms/cell/iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/platforms/cell/iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2945,9 +2945,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/platforms/cell/iommu.c linux-2.6.35.7/arc
.alloc_coherent = dma_fixed_alloc_coherent,
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
-diff -urNp linux-2.6.35.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.35.7/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.35.7/arch/powerpc/platforms/ps3/system-bus.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/platforms/ps3/system-bus.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.35.8/arch/powerpc/platforms/ps3/system-bus.c
+--- linux-2.6.35.8/arch/powerpc/platforms/ps3/system-bus.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/platforms/ps3/system-bus.c 2010-09-17 20:12:09.000000000 -0400
@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2966,9 +2966,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.35.7
.alloc_coherent = ps3_alloc_coherent,
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
-diff -urNp linux-2.6.35.7/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.35.7/arch/powerpc/sysdev/fsl_pmc.c
---- linux-2.6.35.7/arch/powerpc/sysdev/fsl_pmc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/powerpc/sysdev/fsl_pmc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.35.8/arch/powerpc/sysdev/fsl_pmc.c
+--- linux-2.6.35.8/arch/powerpc/sysdev/fsl_pmc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/powerpc/sysdev/fsl_pmc.c 2010-09-17 20:12:09.000000000 -0400
@@ -53,7 +53,7 @@ static int pmc_suspend_valid(suspend_sta
return 1;
}
@@ -2978,9 +2978,9 @@ diff -urNp linux-2.6.35.7/arch/powerpc/sysdev/fsl_pmc.c linux-2.6.35.7/arch/powe
.valid = pmc_suspend_valid,
.enter = pmc_suspend_enter,
};
-diff -urNp linux-2.6.35.7/arch/s390/include/asm/elf.h linux-2.6.35.7/arch/s390/include/asm/elf.h
---- linux-2.6.35.7/arch/s390/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/include/asm/elf.h linux-2.6.35.8/arch/s390/include/asm/elf.h
+--- linux-2.6.35.8/arch/s390/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -163,6 +163,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.35.7/arch/s390/include/asm/elf.h linux-2.6.35.7/arch/s390/i
/* This yields a mask that user programs can use to figure out what
instruction set this CPU supports. */
-diff -urNp linux-2.6.35.7/arch/s390/include/asm/uaccess.h linux-2.6.35.7/arch/s390/include/asm/uaccess.h
---- linux-2.6.35.7/arch/s390/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/include/asm/uaccess.h linux-2.6.35.8/arch/s390/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/s390/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -234,6 +234,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -3030,9 +3030,9 @@ diff -urNp linux-2.6.35.7/arch/s390/include/asm/uaccess.h linux-2.6.35.7/arch/s3
if (unlikely(sz != -1 && sz < n)) {
copy_from_user_overflow();
return n;
-diff -urNp linux-2.6.35.7/arch/s390/Kconfig linux-2.6.35.7/arch/s390/Kconfig
---- linux-2.6.35.7/arch/s390/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/Kconfig 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/Kconfig linux-2.6.35.8/arch/s390/Kconfig
+--- linux-2.6.35.8/arch/s390/Kconfig 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/Kconfig 2010-09-17 20:12:09.000000000 -0400
@@ -230,13 +230,12 @@ config AUDIT_ARCH
config S390_EXEC_PROTECT
@@ -3051,9 +3051,9 @@ diff -urNp linux-2.6.35.7/arch/s390/Kconfig linux-2.6.35.7/arch/s390/Kconfig
comment "Code generation options"
-diff -urNp linux-2.6.35.7/arch/s390/kernel/module.c linux-2.6.35.7/arch/s390/kernel/module.c
---- linux-2.6.35.7/arch/s390/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/kernel/module.c linux-2.6.35.8/arch/s390/kernel/module.c
+--- linux-2.6.35.8/arch/s390/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -3125,9 +3125,9 @@ diff -urNp linux-2.6.35.7/arch/s390/kernel/module.c linux-2.6.35.7/arch/s390/ker
rela->r_addend - loc;
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
-diff -urNp linux-2.6.35.7/arch/s390/kernel/setup.c linux-2.6.35.7/arch/s390/kernel/setup.c
---- linux-2.6.35.7/arch/s390/kernel/setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/kernel/setup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/kernel/setup.c linux-2.6.35.8/arch/s390/kernel/setup.c
+--- linux-2.6.35.8/arch/s390/kernel/setup.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/kernel/setup.c 2010-09-17 20:12:09.000000000 -0400
@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *
}
early_param("mem", early_parse_mem);
@@ -3176,9 +3176,9 @@ diff -urNp linux-2.6.35.7/arch/s390/kernel/setup.c linux-2.6.35.7/arch/s390/kern
static void setup_addressing_mode(void)
{
if (user_mode == SECONDARY_SPACE_MODE) {
-diff -urNp linux-2.6.35.7/arch/s390/mm/maccess.c linux-2.6.35.7/arch/s390/mm/maccess.c
---- linux-2.6.35.7/arch/s390/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/mm/maccess.c linux-2.6.35.8/arch/s390/mm/maccess.c
+--- linux-2.6.35.8/arch/s390/mm/maccess.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/mm/maccess.c 2010-09-17 20:12:09.000000000 -0400
@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void
return rc ? rc : count;
}
@@ -3188,9 +3188,9 @@ diff -urNp linux-2.6.35.7/arch/s390/mm/maccess.c linux-2.6.35.7/arch/s390/mm/mac
{
long copied = 0;
-diff -urNp linux-2.6.35.7/arch/s390/mm/mmap.c linux-2.6.35.7/arch/s390/mm/mmap.c
---- linux-2.6.35.7/arch/s390/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/s390/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/s390/mm/mmap.c linux-2.6.35.8/arch/s390/mm/mmap.c
+--- linux-2.6.35.8/arch/s390/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/s390/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3237,9 +3237,9 @@ diff -urNp linux-2.6.35.7/arch/s390/mm/mmap.c linux-2.6.35.7/arch/s390/mm/mmap.c
mm->get_unmapped_area = s390_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.35.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.35.7/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.35.7/arch/sh/boards/mach-hp6xx/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/boards/mach-hp6xx/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.35.8/arch/sh/boards/mach-hp6xx/pm.c
+--- linux-2.6.35.8/arch/sh/boards/mach-hp6xx/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/boards/mach-hp6xx/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3249,9 +3249,9 @@ diff -urNp linux-2.6.35.7/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.35.7/arch/sh/
.enter = hp6x0_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.7/arch/sh/include/asm/dma-mapping.h linux-2.6.35.7/arch/sh/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/sh/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/include/asm/dma-mapping.h linux-2.6.35.8/arch/sh/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/sh/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -1,10 +1,10 @@
#ifndef __ASM_SH_DMA_MAPPING_H
#define __ASM_SH_DMA_MAPPING_H
@@ -3310,9 +3310,9 @@ diff -urNp linux-2.6.35.7/arch/sh/include/asm/dma-mapping.h linux-2.6.35.7/arch/
if (dma_release_from_coherent(dev, get_order(size), vaddr))
return;
-diff -urNp linux-2.6.35.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.35.7/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.35.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.35.8/arch/sh/kernel/cpu/shmobile/pm.c
+--- linux-2.6.35.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-17 20:12:09.000000000 -0400
@@ -141,7 +141,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3322,9 +3322,9 @@ diff -urNp linux-2.6.35.7/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.35.7/arch/s
.enter = sh_pm_enter,
.valid = suspend_valid_only_mem,
};
-diff -urNp linux-2.6.35.7/arch/sh/kernel/dma-nommu.c linux-2.6.35.7/arch/sh/kernel/dma-nommu.c
---- linux-2.6.35.7/arch/sh/kernel/dma-nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/kernel/dma-nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/kernel/dma-nommu.c linux-2.6.35.8/arch/sh/kernel/dma-nommu.c
+--- linux-2.6.35.8/arch/sh/kernel/dma-nommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/kernel/dma-nommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device
}
#endif
@@ -3334,9 +3334,9 @@ diff -urNp linux-2.6.35.7/arch/sh/kernel/dma-nommu.c linux-2.6.35.7/arch/sh/kern
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = dma_generic_free_coherent,
.map_page = nommu_map_page,
-diff -urNp linux-2.6.35.7/arch/sh/kernel/kgdb.c linux-2.6.35.7/arch/sh/kernel/kgdb.c
---- linux-2.6.35.7/arch/sh/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/kernel/kgdb.c linux-2.6.35.8/arch/sh/kernel/kgdb.c
+--- linux-2.6.35.8/arch/sh/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
unregister_die_notifier(&kgdb_notifier);
}
@@ -3346,9 +3346,9 @@ diff -urNp linux-2.6.35.7/arch/sh/kernel/kgdb.c linux-2.6.35.7/arch/sh/kernel/kg
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
-diff -urNp linux-2.6.35.7/arch/sh/mm/consistent.c linux-2.6.35.7/arch/sh/mm/consistent.c
---- linux-2.6.35.7/arch/sh/mm/consistent.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/mm/consistent.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/mm/consistent.c linux-2.6.35.8/arch/sh/mm/consistent.c
+--- linux-2.6.35.8/arch/sh/mm/consistent.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/mm/consistent.c 2010-09-17 20:12:09.000000000 -0400
@@ -22,7 +22,7 @@
#define PREALLOC_DMA_DEBUG_ENTRIES 4096
@@ -3358,9 +3358,9 @@ diff -urNp linux-2.6.35.7/arch/sh/mm/consistent.c linux-2.6.35.7/arch/sh/mm/cons
EXPORT_SYMBOL(dma_ops);
static int __init dma_init(void)
-diff -urNp linux-2.6.35.7/arch/sh/mm/mmap.c linux-2.6.35.7/arch/sh/mm/mmap.c
---- linux-2.6.35.7/arch/sh/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sh/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sh/mm/mmap.c linux-2.6.35.8/arch/sh/mm/mmap.c
+--- linux-2.6.35.8/arch/sh/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sh/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
addr = PAGE_ALIGN(addr);
@@ -3408,9 +3408,9 @@ diff -urNp linux-2.6.35.7/arch/sh/mm/mmap.c linux-2.6.35.7/arch/sh/mm/mmap.c
/* remember the address as a hint for next time */
return (mm->free_area_cache = addr);
}
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/atomic_64.h linux-2.6.35.7/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.35.7/arch/sparc/include/asm/atomic_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/atomic_64.h 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/atomic_64.h linux-2.6.35.8/arch/sparc/include/asm/atomic_64.h
+--- linux-2.6.35.8/arch/sparc/include/asm/atomic_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/atomic_64.h 2010-10-11 22:41:44.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3570,9 +3570,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/atomic_64.h linux-2.6.35.7/arch
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.35.7/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/sparc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/dma-mapping.h linux-2.6.35.8/arch/sparc/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/sparc/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -13,10 +13,10 @@ extern int dma_supported(struct device *
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3604,9 +3604,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/dma-mapping.h linux-2.6.35.7/ar
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/elf_32.h linux-2.6.35.7/arch/sparc/include/asm/elf_32.h
---- linux-2.6.35.7/arch/sparc/include/asm/elf_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/elf_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/elf_32.h linux-2.6.35.8/arch/sparc/include/asm/elf_32.h
+--- linux-2.6.35.8/arch/sparc/include/asm/elf_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/elf_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -114,6 +114,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3621,9 +3621,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/elf_32.h linux-2.6.35.7/arch/sp
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/elf_64.h linux-2.6.35.7/arch/sparc/include/asm/elf_64.h
---- linux-2.6.35.7/arch/sparc/include/asm/elf_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/elf_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/elf_64.h linux-2.6.35.8/arch/sparc/include/asm/elf_64.h
+--- linux-2.6.35.8/arch/sparc/include/asm/elf_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/elf_64.h 2010-09-17 20:12:09.000000000 -0400
@@ -162,6 +162,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3637,9 +3637,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/elf_64.h linux-2.6.35.7/arch/sp
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.35.7/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.35.7/arch/sparc/include/asm/pgtable_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/pgtable_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/pgtable_32.h linux-2.6.35.8/arch/sparc/include/asm/pgtable_32.h
+--- linux-2.6.35.8/arch/sparc/include/asm/pgtable_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/pgtable_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3671,9 +3671,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.35.7/arc
extern unsigned long page_kernel;
#ifdef MODULE
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.35.7/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.35.7/arch/sparc/include/asm/pgtsrmmu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/pgtsrmmu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.35.8/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-2.6.35.8/arch/sparc/include/asm/pgtsrmmu.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/pgtsrmmu.h 2010-09-17 20:12:09.000000000 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3688,9 +3688,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.35.7/arch/
#define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
SRMMU_DIRTY | SRMMU_REF)
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.35.7/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.35.7/arch/sparc/include/asm/spinlock_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/spinlock_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/spinlock_64.h linux-2.6.35.8/arch/sparc/include/asm/spinlock_64.h
+--- linux-2.6.35.8/arch/sparc/include/asm/spinlock_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/spinlock_64.h 2010-09-17 20:12:09.000000000 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(arch_r
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3742,9 +3742,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.35.7/ar
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.35.7/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.35.7/arch/sparc/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/uaccess_32.h linux-2.6.35.8/arch/sparc/include/asm/uaccess_32.h
+--- linux-2.6.35.8/arch/sparc/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -249,14 +249,25 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3803,9 +3803,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.35.7/arc
return __copy_user((__force void __user *) to, from, n);
}
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.35.7/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.35.7/arch/sparc/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/uaccess_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/uaccess_64.h linux-2.6.35.8/arch/sparc/include/asm/uaccess_64.h
+--- linux-2.6.35.8/arch/sparc/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/uaccess_64.h 2010-09-17 20:12:09.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3844,9 +3844,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.35.7/arc
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess.h linux-2.6.35.7/arch/sparc/include/asm/uaccess.h
---- linux-2.6.35.7/arch/sparc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/include/asm/uaccess.h linux-2.6.35.8/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/sparc/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -1,5 +1,13 @@
#ifndef ___ASM_SPARC_UACCESS_H
#define ___ASM_SPARC_UACCESS_H
@@ -3861,9 +3861,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/include/asm/uaccess.h linux-2.6.35.7/arch/s
#if defined(__sparc__) && defined(__arch64__)
#include <asm/uaccess_64.h>
#else
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/iommu.c linux-2.6.35.7/arch/sparc/kernel/iommu.c
---- linux-2.6.35.7/arch/sparc/kernel/iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/iommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/iommu.c linux-2.6.35.8/arch/sparc/kernel/iommu.c
+--- linux-2.6.35.8/arch/sparc/kernel/iommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/iommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -828,7 +828,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3882,9 +3882,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/iommu.c linux-2.6.35.7/arch/sparc/ke
EXPORT_SYMBOL(dma_ops);
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/ioport.c linux-2.6.35.7/arch/sparc/kernel/ioport.c
---- linux-2.6.35.7/arch/sparc/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/ioport.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/ioport.c linux-2.6.35.8/arch/sparc/kernel/ioport.c
+--- linux-2.6.35.8/arch/sparc/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/ioport.c 2010-09-17 20:12:09.000000000 -0400
@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3912,9 +3912,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/ioport.c linux-2.6.35.7/arch/sparc/k
.alloc_coherent = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/kgdb_32.c linux-2.6.35.7/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.35.7/arch/sparc/kernel/kgdb_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/kgdb_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/kgdb_32.c linux-2.6.35.8/arch/sparc/kernel/kgdb_32.c
+--- linux-2.6.35.8/arch/sparc/kernel/kgdb_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/kgdb_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
regs->npc = regs->pc + 4;
}
@@ -3924,9 +3924,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/kgdb_32.c linux-2.6.35.7/arch/sparc/
/* Breakpoint instruction: ta 0x7d */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/kgdb_64.c linux-2.6.35.7/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.35.7/arch/sparc/kernel/kgdb_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/kgdb_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/kgdb_64.c linux-2.6.35.8/arch/sparc/kernel/kgdb_64.c
+--- linux-2.6.35.8/arch/sparc/kernel/kgdb_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/kgdb_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *re
regs->tnpc = regs->tpc + 4;
}
@@ -3936,9 +3936,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/kgdb_64.c linux-2.6.35.7/arch/sparc/
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/Makefile linux-2.6.35.7/arch/sparc/kernel/Makefile
---- linux-2.6.35.7/arch/sparc/kernel/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/Makefile linux-2.6.35.8/arch/sparc/kernel/Makefile
+--- linux-2.6.35.8/arch/sparc/kernel/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/Makefile 2010-09-17 20:12:09.000000000 -0400
@@ -3,7 +3,7 @@
#
@@ -3948,9 +3948,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/Makefile linux-2.6.35.7/arch/sparc/k
extra-y := head_$(BITS).o
extra-y += init_task.o
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.35.7/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.35.7/arch/sparc/kernel/pci_sun4v.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/pci_sun4v.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/pci_sun4v.c linux-2.6.35.8/arch/sparc/kernel/pci_sun4v.c
+--- linux-2.6.35.8/arch/sparc/kernel/pci_sun4v.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/pci_sun4v.c 2010-09-17 20:12:09.000000000 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3960,9 +3960,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/pci_sun4v.c linux-2.6.35.7/arch/spar
.alloc_coherent = dma_4v_alloc_coherent,
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.35.7/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.35.7/arch/sparc/kernel/sys_sparc_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/sys_sparc_32.c linux-2.6.35.8/arch/sparc/kernel/sys_sparc_32.c
+--- linux-2.6.35.8/arch/sparc/kernel/sys_sparc_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/sys_sparc_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3981,9 +3981,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.35.7/arch/s
return addr;
addr = vmm->vm_end;
if (flags & MAP_SHARED)
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.35.7/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.35.7/arch/sparc/kernel/sys_sparc_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/sys_sparc_64.c linux-2.6.35.8/arch/sparc/kernel/sys_sparc_64.c
+--- linux-2.6.35.8/arch/sparc/kernel/sys_sparc_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/sys_sparc_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
/* We do not accept a shared mapping if it would violate
* cache aliasing constraints.
@@ -4104,9 +4104,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.35.7/arch/s
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.35.7/arch/sparc/kernel/traps_64.c linux-2.6.35.7/arch/sparc/kernel/traps_64.c
---- linux-2.6.35.7/arch/sparc/kernel/traps_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/kernel/traps_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/kernel/traps_64.c linux-2.6.35.8/arch/sparc/kernel/traps_64.c
+--- linux-2.6.35.8/arch/sparc/kernel/traps_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/kernel/traps_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
@@ -4138,9 +4138,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/kernel/traps_64.c linux-2.6.35.7/arch/sparc
dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-diff -urNp linux-2.6.35.7/arch/sparc/lib/atomic_64.S linux-2.6.35.7/arch/sparc/lib/atomic_64.S
---- linux-2.6.35.7/arch/sparc/lib/atomic_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/lib/atomic_64.S 2010-09-26 22:04:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/lib/atomic_64.S linux-2.6.35.8/arch/sparc/lib/atomic_64.S
+--- linux-2.6.35.8/arch/sparc/lib/atomic_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/lib/atomic_64.S 2010-09-26 22:04:10.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -4375,9 +4375,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/lib/atomic_64.S linux-2.6.35.7/arch/sparc/l
casx [%o1], %g1, %g7
cmp %g1, %g7
bne,pn %xcc, 2f
-diff -urNp linux-2.6.35.7/arch/sparc/lib/ksyms.c linux-2.6.35.7/arch/sparc/lib/ksyms.c
---- linux-2.6.35.7/arch/sparc/lib/ksyms.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/lib/ksyms.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/lib/ksyms.c linux-2.6.35.8/arch/sparc/lib/ksyms.c
+--- linux-2.6.35.8/arch/sparc/lib/ksyms.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/lib/ksyms.c 2010-09-17 20:12:09.000000000 -0400
@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -4396,9 +4396,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/lib/ksyms.c linux-2.6.35.7/arch/sparc/lib/k
EXPORT_SYMBOL(atomic64_sub_ret);
/* Atomic bit operations. */
-diff -urNp linux-2.6.35.7/arch/sparc/lib/rwsem_64.S linux-2.6.35.7/arch/sparc/lib/rwsem_64.S
---- linux-2.6.35.7/arch/sparc/lib/rwsem_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/lib/rwsem_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/lib/rwsem_64.S linux-2.6.35.8/arch/sparc/lib/rwsem_64.S
+--- linux-2.6.35.8/arch/sparc/lib/rwsem_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/lib/rwsem_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -4497,9 +4497,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/lib/rwsem_64.S linux-2.6.35.7/arch/sparc/li
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.35.7/arch/sparc/Makefile linux-2.6.35.7/arch/sparc/Makefile
---- linux-2.6.35.7/arch/sparc/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/Makefile 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/Makefile linux-2.6.35.8/arch/sparc/Makefile
+--- linux-2.6.35.8/arch/sparc/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/Makefile 2010-09-17 20:12:37.000000000 -0400
@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
# Export what is needed by arch/sparc/boot/Makefile
export VMLINUX_INIT VMLINUX_MAIN
@@ -4509,9 +4509,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/Makefile linux-2.6.35.7/arch/sparc/Makefile
VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
VMLINUX_MAIN += $(drivers-y) $(net-y)
-diff -urNp linux-2.6.35.7/arch/sparc/mm/fault_32.c linux-2.6.35.7/arch/sparc/mm/fault_32.c
---- linux-2.6.35.7/arch/sparc/mm/fault_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/fault_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/fault_32.c linux-2.6.35.8/arch/sparc/mm/fault_32.c
+--- linux-2.6.35.8/arch/sparc/mm/fault_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/fault_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -22,6 +22,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4816,9 +4816,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/fault_32.c linux-2.6.35.7/arch/sparc/mm/
/* Allow reads even for write-only mappings */
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
-diff -urNp linux-2.6.35.7/arch/sparc/mm/fault_64.c linux-2.6.35.7/arch/sparc/mm/fault_64.c
---- linux-2.6.35.7/arch/sparc/mm/fault_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/fault_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/fault_64.c linux-2.6.35.8/arch/sparc/mm/fault_64.c
+--- linux-2.6.35.8/arch/sparc/mm/fault_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/fault_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -21,6 +21,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -5317,9 +5317,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/fault_64.c linux-2.6.35.7/arch/sparc/mm/
/* Pure DTLB misses do not tell us whether the fault causing
* load/store/atomic was a write or not, it only says that there
* was no match. So in such a case we (carefully) read the
-diff -urNp linux-2.6.35.7/arch/sparc/mm/hugetlbpage.c linux-2.6.35.7/arch/sparc/mm/hugetlbpage.c
---- linux-2.6.35.7/arch/sparc/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/hugetlbpage.c linux-2.6.35.8/arch/sparc/mm/hugetlbpage.c
+--- linux-2.6.35.8/arch/sparc/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/hugetlbpage.c 2010-09-17 20:12:09.000000000 -0400
@@ -68,7 +68,7 @@ full_search:
}
return -ENOMEM;
@@ -5357,9 +5357,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/hugetlbpage.c linux-2.6.35.7/arch/sparc/
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.35.7/arch/sparc/mm/init_32.c linux-2.6.35.7/arch/sparc/mm/init_32.c
---- linux-2.6.35.7/arch/sparc/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/init_32.c linux-2.6.35.8/arch/sparc/mm/init_32.c
+--- linux-2.6.35.8/arch/sparc/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -318,6 +318,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -5394,9 +5394,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/init_32.c linux-2.6.35.7/arch/sparc/mm/i
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.35.7/arch/sparc/mm/Makefile linux-2.6.35.7/arch/sparc/mm/Makefile
---- linux-2.6.35.7/arch/sparc/mm/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/Makefile linux-2.6.35.8/arch/sparc/mm/Makefile
+--- linux-2.6.35.8/arch/sparc/mm/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/Makefile 2010-09-17 20:12:09.000000000 -0400
@@ -2,7 +2,7 @@
#
@@ -5406,9 +5406,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/Makefile linux-2.6.35.7/arch/sparc/mm/Ma
obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
obj-y += fault_$(BITS).o
-diff -urNp linux-2.6.35.7/arch/sparc/mm/srmmu.c linux-2.6.35.7/arch/sparc/mm/srmmu.c
---- linux-2.6.35.7/arch/sparc/mm/srmmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/sparc/mm/srmmu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/sparc/mm/srmmu.c linux-2.6.35.8/arch/sparc/mm/srmmu.c
+--- linux-2.6.35.8/arch/sparc/mm/srmmu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/sparc/mm/srmmu.c 2010-09-17 20:12:09.000000000 -0400
@@ -2198,6 +2198,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5423,9 +5423,9 @@ diff -urNp linux-2.6.35.7/arch/sparc/mm/srmmu.c linux-2.6.35.7/arch/sparc/mm/srm
BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
-diff -urNp linux-2.6.35.7/arch/um/include/asm/kmap_types.h linux-2.6.35.7/arch/um/include/asm/kmap_types.h
---- linux-2.6.35.7/arch/um/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/um/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/um/include/asm/kmap_types.h linux-2.6.35.8/arch/um/include/asm/kmap_types.h
+--- linux-2.6.35.8/arch/um/include/asm/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/um/include/asm/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -5434,9 +5434,9 @@ diff -urNp linux-2.6.35.7/arch/um/include/asm/kmap_types.h linux-2.6.35.7/arch/u
KM_TYPE_NR
};
-diff -urNp linux-2.6.35.7/arch/um/include/asm/page.h linux-2.6.35.7/arch/um/include/asm/page.h
---- linux-2.6.35.7/arch/um/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/um/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/um/include/asm/page.h linux-2.6.35.8/arch/um/include/asm/page.h
+--- linux-2.6.35.8/arch/um/include/asm/page.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/um/include/asm/page.h 2010-09-17 20:12:09.000000000 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -5447,9 +5447,9 @@ diff -urNp linux-2.6.35.7/arch/um/include/asm/page.h linux-2.6.35.7/arch/um/incl
#ifndef __ASSEMBLY__
struct page;
-diff -urNp linux-2.6.35.7/arch/um/sys-i386/syscalls.c linux-2.6.35.7/arch/um/sys-i386/syscalls.c
---- linux-2.6.35.7/arch/um/sys-i386/syscalls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/um/sys-i386/syscalls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/um/sys-i386/syscalls.c linux-2.6.35.8/arch/um/sys-i386/syscalls.c
+--- linux-2.6.35.8/arch/um/sys-i386/syscalls.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/um/sys-i386/syscalls.c 2010-09-17 20:12:09.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5472,9 +5472,9 @@ diff -urNp linux-2.6.35.7/arch/um/sys-i386/syscalls.c linux-2.6.35.7/arch/um/sys
/*
* The prototype on i386 is:
*
-diff -urNp linux-2.6.35.7/arch/x86/boot/bitops.h linux-2.6.35.7/arch/x86/boot/bitops.h
---- linux-2.6.35.7/arch/x86/boot/bitops.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/bitops.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/bitops.h linux-2.6.35.8/arch/x86/boot/bitops.h
+--- linux-2.6.35.8/arch/x86/boot/bitops.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/bitops.h 2010-09-17 20:12:09.000000000 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5493,9 +5493,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/bitops.h linux-2.6.35.7/arch/x86/boot/bi
}
#endif /* BOOT_BITOPS_H */
-diff -urNp linux-2.6.35.7/arch/x86/boot/boot.h linux-2.6.35.7/arch/x86/boot/boot.h
---- linux-2.6.35.7/arch/x86/boot/boot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/boot.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/boot.h linux-2.6.35.8/arch/x86/boot/boot.h
+--- linux-2.6.35.8/arch/x86/boot/boot.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/boot.h 2010-09-17 20:12:09.000000000 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5514,9 +5514,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/boot.h linux-2.6.35.7/arch/x86/boot/boot
: "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
return diff;
}
-diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/head_32.S linux-2.6.35.7/arch/x86/boot/compressed/head_32.S
---- linux-2.6.35.7/arch/x86/boot/compressed/head_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/compressed/head_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/compressed/head_32.S linux-2.6.35.8/arch/x86/boot/compressed/head_32.S
+--- linux-2.6.35.8/arch/x86/boot/compressed/head_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/compressed/head_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5545,9 +5545,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/head_32.S linux-2.6.35.7/arch
addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
jmp 1b
2:
-diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/head_64.S linux-2.6.35.7/arch/x86/boot/compressed/head_64.S
---- linux-2.6.35.7/arch/x86/boot/compressed/head_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/compressed/head_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/compressed/head_64.S linux-2.6.35.8/arch/x86/boot/compressed/head_64.S
+--- linux-2.6.35.8/arch/x86/boot/compressed/head_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/compressed/head_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5566,9 +5566,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/head_64.S linux-2.6.35.7/arch
#endif
/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/misc.c linux-2.6.35.7/arch/x86/boot/compressed/misc.c
---- linux-2.6.35.7/arch/x86/boot/compressed/misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/compressed/misc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/compressed/misc.c linux-2.6.35.8/arch/x86/boot/compressed/misc.c
+--- linux-2.6.35.8/arch/x86/boot/compressed/misc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/compressed/misc.c 2010-09-17 20:12:09.000000000 -0400
@@ -285,7 +285,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5587,9 +5587,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/misc.c linux-2.6.35.7/arch/x8
error("Wrong destination address");
#endif
-diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.35.7/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.35.7/arch/x86/boot/compressed/mkpiggy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/compressed/mkpiggy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/compressed/mkpiggy.c linux-2.6.35.8/arch/x86/boot/compressed/mkpiggy.c
+--- linux-2.6.35.8/arch/x86/boot/compressed/mkpiggy.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/compressed/mkpiggy.c 2010-09-17 20:12:09.000000000 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5599,9 +5599,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.35.7/arch
offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
printf(".section \".rodata..compressed\",\"a\",@progbits\n");
-diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/relocs.c linux-2.6.35.7/arch/x86/boot/compressed/relocs.c
---- linux-2.6.35.7/arch/x86/boot/compressed/relocs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/compressed/relocs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/compressed/relocs.c linux-2.6.35.8/arch/x86/boot/compressed/relocs.c
+--- linux-2.6.35.8/arch/x86/boot/compressed/relocs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/compressed/relocs.c 2010-09-17 20:12:09.000000000 -0400
@@ -13,8 +13,11 @@
static void die(char *fmt, ...);
@@ -5794,9 +5794,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/compressed/relocs.c linux-2.6.35.7/arch/
read_shdrs(fp);
read_strtabs(fp);
read_symtabs(fp);
-diff -urNp linux-2.6.35.7/arch/x86/boot/cpucheck.c linux-2.6.35.7/arch/x86/boot/cpucheck.c
---- linux-2.6.35.7/arch/x86/boot/cpucheck.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/cpucheck.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/cpucheck.c linux-2.6.35.8/arch/x86/boot/cpucheck.c
+--- linux-2.6.35.8/arch/x86/boot/cpucheck.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/cpucheck.c 2010-09-17 20:12:09.000000000 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5892,9 +5892,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/cpucheck.c linux-2.6.35.7/arch/x86/boot/
err = check_flags();
}
-diff -urNp linux-2.6.35.7/arch/x86/boot/header.S linux-2.6.35.7/arch/x86/boot/header.S
---- linux-2.6.35.7/arch/x86/boot/header.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/header.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/header.S linux-2.6.35.8/arch/x86/boot/header.S
+--- linux-2.6.35.8/arch/x86/boot/header.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/header.S 2010-09-17 20:12:09.000000000 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5904,9 +5904,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/header.S linux-2.6.35.7/arch/x86/boot/he
#define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
#define VO_INIT_SIZE (VO__end - VO__text)
-diff -urNp linux-2.6.35.7/arch/x86/boot/memory.c linux-2.6.35.7/arch/x86/boot/memory.c
---- linux-2.6.35.7/arch/x86/boot/memory.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/memory.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/memory.c linux-2.6.35.8/arch/x86/boot/memory.c
+--- linux-2.6.35.8/arch/x86/boot/memory.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/memory.c 2010-09-17 20:12:09.000000000 -0400
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -5916,9 +5916,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/memory.c linux-2.6.35.7/arch/x86/boot/me
struct biosregs ireg, oreg;
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-2.6.35.7/arch/x86/boot/video.c linux-2.6.35.7/arch/x86/boot/video.c
---- linux-2.6.35.7/arch/x86/boot/video.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/video.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/video.c linux-2.6.35.8/arch/x86/boot/video.c
+--- linux-2.6.35.8/arch/x86/boot/video.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/video.c 2010-09-17 20:12:09.000000000 -0400
@@ -96,7 +96,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -5928,9 +5928,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/video.c linux-2.6.35.7/arch/x86/boot/vid
int key;
unsigned int v;
-diff -urNp linux-2.6.35.7/arch/x86/boot/video-vesa.c linux-2.6.35.7/arch/x86/boot/video-vesa.c
---- linux-2.6.35.7/arch/x86/boot/video-vesa.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/boot/video-vesa.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/boot/video-vesa.c linux-2.6.35.8/arch/x86/boot/video-vesa.c
+--- linux-2.6.35.8/arch/x86/boot/video-vesa.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/boot/video-vesa.c 2010-09-17 20:12:09.000000000 -0400
@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5939,9 +5939,9 @@ diff -urNp linux-2.6.35.7/arch/x86/boot/video-vesa.c linux-2.6.35.7/arch/x86/boo
}
/*
-diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32_aout.c linux-2.6.35.7/arch/x86/ia32/ia32_aout.c
---- linux-2.6.35.7/arch/x86/ia32/ia32_aout.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/ia32/ia32_aout.c 2010-09-23 20:32:33.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/ia32/ia32_aout.c linux-2.6.35.8/arch/x86/ia32/ia32_aout.c
+--- linux-2.6.35.8/arch/x86/ia32/ia32_aout.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/ia32/ia32_aout.c 2010-09-23 20:32:33.000000000 -0400
@@ -168,6 +168,8 @@ static int aout_core_dump(long signr, st
unsigned long dump_start, dump_size;
struct user32 dump;
@@ -5964,9 +5964,9 @@ diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32_aout.c linux-2.6.35.7/arch/x86/ia32
end_coredump:
set_fs(fs);
return has_dumped;
-diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32entry.S linux-2.6.35.7/arch/x86/ia32/ia32entry.S
---- linux-2.6.35.7/arch/x86/ia32/ia32entry.S 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/ia32/ia32entry.S 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/ia32/ia32entry.S linux-2.6.35.8/arch/x86/ia32/ia32entry.S
+--- linux-2.6.35.8/arch/x86/ia32/ia32entry.S 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/arch/x86/ia32/ia32entry.S 2010-09-17 20:12:37.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -6061,9 +6061,9 @@ diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32entry.S linux-2.6.35.7/arch/x86/ia32
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32_signal.c linux-2.6.35.7/arch/x86/ia32/ia32_signal.c
---- linux-2.6.35.7/arch/x86/ia32/ia32_signal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/ia32/ia32_signal.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/ia32/ia32_signal.c linux-2.6.35.8/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.35.8/arch/x86/ia32/ia32_signal.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/ia32/ia32_signal.c 2010-10-31 17:26:09.000000000 -0400
@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
sp -= frame_size;
/* Align the stack pointer according to the i386 ABI,
@@ -6082,23 +6082,23 @@ diff -urNp linux-2.6.35.7/arch/x86/ia32/ia32_signal.c linux-2.6.35.7/arch/x86/ia
};
frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -534,8 +534,11 @@ int ia32_setup_rt_frame(int sig, struct
+@@ -533,9 +533,11 @@ int ia32_setup_rt_frame(int sig, struct
+
if (ka->sa.sa_flags & SA_RESTORER)
restorer = ka->sa.sa_restorer;
++ else if (current->mm->context.vdso)
++ /* Return stub is in 32bit vsyscall page */
++ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
else
- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
- rt_sigreturn);
-+ /* Return stub is in 32bit vsyscall page */
-+ if (current->mm->context.vdso)
-+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
-+ else
-+ restorer = &frame->retcode;
++ restorer = &frame->retcode;
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
/*
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/alternative.h linux-2.6.35.7/arch/x86/include/asm/alternative.h
---- linux-2.6.35.7/arch/x86/include/asm/alternative.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/alternative.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/alternative.h linux-2.6.35.8/arch/x86/include/asm/alternative.h
+--- linux-2.6.35.8/arch/x86/include/asm/alternative.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/alternative.h 2010-09-17 20:12:09.000000000 -0400
@@ -91,7 +91,7 @@ static inline int alternatives_text_rese
" .byte 664f-663f\n" /* replacementlen */ \
" .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
@@ -6108,9 +6108,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/alternative.h linux-2.6.35.7/arch
"663:\n\t" newinstr "\n664:\n" /* replacement */ \
".previous"
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/apm.h linux-2.6.35.7/arch/x86/include/asm/apm.h
---- linux-2.6.35.7/arch/x86/include/asm/apm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/apm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/apm.h linux-2.6.35.8/arch/x86/include/asm/apm.h
+--- linux-2.6.35.8/arch/x86/include/asm/apm.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/apm.h 2010-09-17 20:12:09.000000000 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -6129,9 +6129,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/apm.h linux-2.6.35.7/arch/x86/inc
"setc %%bl\n\t"
"popl %%ebp\n\t"
"popl %%edi\n\t"
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/asm.h linux-2.6.35.7/arch/x86/include/asm/asm.h
---- linux-2.6.35.7/arch/x86/include/asm/asm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/asm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/asm.h linux-2.6.35.8/arch/x86/include/asm/asm.h
+--- linux-2.6.35.8/arch/x86/include/asm/asm.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/asm.h 2010-09-17 20:12:09.000000000 -0400
@@ -37,6 +37,12 @@
#define _ASM_SI __ASM_REG(si)
#define _ASM_DI __ASM_REG(di)
@@ -6145,9 +6145,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/asm.h linux-2.6.35.7/arch/x86/inc
/* Exception table entry */
#ifdef __ASSEMBLY__
# define _ASM_EXTABLE(from,to) \
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic64_32.h linux-2.6.35.7/arch/x86/include/asm/atomic64_32.h
---- linux-2.6.35.7/arch/x86/include/asm/atomic64_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/atomic64_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/atomic64_32.h linux-2.6.35.8/arch/x86/include/asm/atomic64_32.h
+--- linux-2.6.35.8/arch/x86/include/asm/atomic64_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/atomic64_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,6 +12,14 @@ typedef struct {
u64 __aligned(8) counter;
} atomic64_t;
@@ -6163,9 +6163,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic64_32.h linux-2.6.35.7/arch
#define ATOMIC64_INIT(val) { (val) }
#ifdef CONFIG_X86_CMPXCHG64
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic64_64.h linux-2.6.35.7/arch/x86/include/asm/atomic64_64.h
---- linux-2.6.35.7/arch/x86/include/asm/atomic64_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/atomic64_64.h 2010-09-26 22:02:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/atomic64_64.h linux-2.6.35.8/arch/x86/include/asm/atomic64_64.h
+--- linux-2.6.35.8/arch/x86/include/asm/atomic64_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/atomic64_64.h 2010-09-26 22:02:10.000000000 -0400
@@ -22,6 +22,18 @@ static inline long atomic64_read(const a
}
@@ -6459,9 +6459,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic64_64.h linux-2.6.35.7/arch
}
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic.h linux-2.6.35.7/arch/x86/include/asm/atomic.h
---- linux-2.6.35.7/arch/x86/include/asm/atomic.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/atomic.h 2010-09-26 22:02:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/atomic.h linux-2.6.35.8/arch/x86/include/asm/atomic.h
+--- linux-2.6.35.8/arch/x86/include/asm/atomic.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/atomic.h 2010-09-26 22:02:10.000000000 -0400
@@ -26,6 +26,17 @@ static inline int atomic_read(const atom
}
@@ -6784,9 +6784,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/atomic.h linux-2.6.35.7/arch/x86/
}
#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/boot.h linux-2.6.35.7/arch/x86/include/asm/boot.h
---- linux-2.6.35.7/arch/x86/include/asm/boot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/boot.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/boot.h linux-2.6.35.8/arch/x86/include/asm/boot.h
+--- linux-2.6.35.8/arch/x86/include/asm/boot.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/boot.h 2010-09-17 20:12:09.000000000 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -6804,9 +6804,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/boot.h linux-2.6.35.7/arch/x86/in
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/cacheflush.h linux-2.6.35.7/arch/x86/include/asm/cacheflush.h
---- linux-2.6.35.7/arch/x86/include/asm/cacheflush.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/cacheflush.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/cacheflush.h linux-2.6.35.8/arch/x86/include/asm/cacheflush.h
+--- linux-2.6.35.8/arch/x86/include/asm/cacheflush.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/cacheflush.h 2010-09-17 20:12:09.000000000 -0400
@@ -66,7 +66,7 @@ static inline unsigned long get_page_mem
unsigned long pg_flags = pg->flags & _PGMT_MASK;
@@ -6816,9 +6816,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/cacheflush.h linux-2.6.35.7/arch/
else if (pg_flags == _PGMT_WC)
return _PAGE_CACHE_WC;
else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/cache.h linux-2.6.35.7/arch/x86/include/asm/cache.h
---- linux-2.6.35.7/arch/x86/include/asm/cache.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/cache.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/cache.h linux-2.6.35.8/arch/x86/include/asm/cache.h
+--- linux-2.6.35.8/arch/x86/include/asm/cache.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/cache.h 2010-09-17 20:12:09.000000000 -0400
@@ -8,6 +8,7 @@
#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
@@ -6827,9 +6827,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/cache.h linux-2.6.35.7/arch/x86/i
#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/checksum_32.h linux-2.6.35.7/arch/x86/include/asm/checksum_32.h
---- linux-2.6.35.7/arch/x86/include/asm/checksum_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/checksum_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/checksum_32.h linux-2.6.35.8/arch/x86/include/asm/checksum_32.h
+--- linux-2.6.35.8/arch/x86/include/asm/checksum_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/checksum_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -6863,9 +6863,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/checksum_32.h linux-2.6.35.7/arch
len, sum, NULL, err_ptr);
if (len)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/cpufeature.h linux-2.6.35.7/arch/x86/include/asm/cpufeature.h
---- linux-2.6.35.7/arch/x86/include/asm/cpufeature.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/cpufeature.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/cpufeature.h linux-2.6.35.8/arch/x86/include/asm/cpufeature.h
+--- linux-2.6.35.8/arch/x86/include/asm/cpufeature.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/cpufeature.h 2010-09-17 20:12:09.000000000 -0400
@@ -323,7 +323,7 @@ static __always_inline __pure bool __sta
" .byte 4f - 3f\n" /* replacement len */
" .byte 0xff + (4f-3f) - (2b-1b)\n" /* padding */
@@ -6875,9 +6875,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/cpufeature.h linux-2.6.35.7/arch/
"3: movb $1,%0\n"
"4:\n"
".previous\n"
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/desc.h linux-2.6.35.7/arch/x86/include/asm/desc.h
---- linux-2.6.35.7/arch/x86/include/asm/desc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/desc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/desc.h linux-2.6.35.8/arch/x86/include/asm/desc.h
+--- linux-2.6.35.8/arch/x86/include/asm/desc.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/desc.h 2010-09-17 20:12:09.000000000 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -7047,9 +7047,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/desc.h linux-2.6.35.7/arch/x86/in
+#endif
+
#endif /* _ASM_X86_DESC_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/device.h linux-2.6.35.7/arch/x86/include/asm/device.h
---- linux-2.6.35.7/arch/x86/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/device.h linux-2.6.35.8/arch/x86/include/asm/device.h
+--- linux-2.6.35.8/arch/x86/include/asm/device.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/device.h 2010-09-17 20:12:09.000000000 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -7059,9 +7059,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/device.h linux-2.6.35.7/arch/x86/
#endif
#if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
void *iommu; /* hook for IOMMU specific extension */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/dma-mapping.h linux-2.6.35.7/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.35.7/arch/x86/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/dma-mapping.h linux-2.6.35.8/arch/x86/include/asm/dma-mapping.h
+--- linux-2.6.35.8/arch/x86/include/asm/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -26,9 +26,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -7101,9 +7101,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/dma-mapping.h linux-2.6.35.7/arch
WARN_ON(irqs_disabled()); /* for portability */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/e820.h linux-2.6.35.7/arch/x86/include/asm/e820.h
---- linux-2.6.35.7/arch/x86/include/asm/e820.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/e820.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/e820.h linux-2.6.35.8/arch/x86/include/asm/e820.h
+--- linux-2.6.35.8/arch/x86/include/asm/e820.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/e820.h 2010-09-17 20:12:09.000000000 -0400
@@ -69,7 +69,7 @@ struct e820map {
#define ISA_START_ADDRESS 0xa0000
#define ISA_END_ADDRESS 0x100000
@@ -7113,9 +7113,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/e820.h linux-2.6.35.7/arch/x86/in
#define BIOS_END 0x00100000
#ifdef __KERNEL__
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/elf.h linux-2.6.35.7/arch/x86/include/asm/elf.h
---- linux-2.6.35.7/arch/x86/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/elf.h linux-2.6.35.8/arch/x86/include/asm/elf.h
+--- linux-2.6.35.8/arch/x86/include/asm/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -237,7 +237,25 @@ extern int force_personality32;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -7169,9 +7169,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/elf.h linux-2.6.35.7/arch/x86/inc
-#define arch_randomize_brk arch_randomize_brk
-
#endif /* _ASM_X86_ELF_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/futex.h linux-2.6.35.7/arch/x86/include/asm/futex.h
---- linux-2.6.35.7/arch/x86/include/asm/futex.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/futex.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/futex.h linux-2.6.35.8/arch/x86/include/asm/futex.h
+--- linux-2.6.35.8/arch/x86/include/asm/futex.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/futex.h 2010-09-17 20:12:09.000000000 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
@@ -7308,9 +7308,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/futex.h linux-2.6.35.7/arch/x86/i
: "memory"
);
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/i387.h linux-2.6.35.7/arch/x86/include/asm/i387.h
---- linux-2.6.35.7/arch/x86/include/asm/i387.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/i387.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/i387.h linux-2.6.35.8/arch/x86/include/asm/i387.h
+--- linux-2.6.35.8/arch/x86/include/asm/i387.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/i387.h 2010-09-17 20:12:09.000000000 -0400
@@ -77,6 +77,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7351,9 +7351,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/i387.h linux-2.6.35.7/arch/x86/in
/*
* These must be called with preempt disabled
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/io.h linux-2.6.35.7/arch/x86/include/asm/io.h
---- linux-2.6.35.7/arch/x86/include/asm/io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/io.h linux-2.6.35.8/arch/x86/include/asm/io.h
+--- linux-2.6.35.8/arch/x86/include/asm/io.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/io.h 2010-09-17 20:12:09.000000000 -0400
@@ -213,6 +213,17 @@ extern void iounmap(volatile void __iome
#include <linux/vmalloc.h>
@@ -7372,9 +7372,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/io.h linux-2.6.35.7/arch/x86/incl
/*
* Convert a virtual cached pointer to an uncached pointer
*/
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/iommu.h linux-2.6.35.7/arch/x86/include/asm/iommu.h
---- linux-2.6.35.7/arch/x86/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/iommu.h linux-2.6.35.8/arch/x86/include/asm/iommu.h
+--- linux-2.6.35.8/arch/x86/include/asm/iommu.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/iommu.h 2010-09-17 20:12:09.000000000 -0400
@@ -1,7 +1,7 @@
#ifndef _ASM_X86_IOMMU_H
#define _ASM_X86_IOMMU_H
@@ -7384,9 +7384,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/iommu.h linux-2.6.35.7/arch/x86/i
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int iommu_pass_through;
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/irqflags.h linux-2.6.35.7/arch/x86/include/asm/irqflags.h
---- linux-2.6.35.7/arch/x86/include/asm/irqflags.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/irqflags.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/irqflags.h linux-2.6.35.8/arch/x86/include/asm/irqflags.h
+--- linux-2.6.35.8/arch/x86/include/asm/irqflags.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/irqflags.h 2010-09-17 20:12:09.000000000 -0400
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -7399,9 +7399,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/irqflags.h linux-2.6.35.7/arch/x8
#else
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/kvm_host.h linux-2.6.35.7/arch/x86/include/asm/kvm_host.h
---- linux-2.6.35.7/arch/x86/include/asm/kvm_host.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/kvm_host.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/kvm_host.h linux-2.6.35.8/arch/x86/include/asm/kvm_host.h
+--- linux-2.6.35.8/arch/x86/include/asm/kvm_host.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/kvm_host.h 2010-09-17 20:12:09.000000000 -0400
@@ -536,7 +536,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -7411,9 +7411,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/kvm_host.h linux-2.6.35.7/arch/x8
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/local.h linux-2.6.35.7/arch/x86/include/asm/local.h
---- linux-2.6.35.7/arch/x86/include/asm/local.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/local.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/local.h linux-2.6.35.8/arch/x86/include/asm/local.h
+--- linux-2.6.35.8/arch/x86/include/asm/local.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/local.h 2010-09-17 20:12:09.000000000 -0400
@@ -18,26 +18,90 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7638,9 +7638,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/local.h linux-2.6.35.7/arch/x86/i
: "+r" (i), "+m" (l->a.counter)
: : "memory");
return i + __i;
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/mc146818rtc.h linux-2.6.35.7/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.35.7/arch/x86/include/asm/mc146818rtc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/mc146818rtc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/mc146818rtc.h linux-2.6.35.8/arch/x86/include/asm/mc146818rtc.h
+--- linux-2.6.35.8/arch/x86/include/asm/mc146818rtc.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/mc146818rtc.h 2010-09-17 20:12:09.000000000 -0400
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -7652,9 +7652,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/mc146818rtc.h linux-2.6.35.7/arch
#define do_i_have_lock_cmos() 0
#define current_lock_cmos_reg() 0
#endif
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/microcode.h linux-2.6.35.7/arch/x86/include/asm/microcode.h
---- linux-2.6.35.7/arch/x86/include/asm/microcode.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/microcode.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/microcode.h linux-2.6.35.8/arch/x86/include/asm/microcode.h
+--- linux-2.6.35.8/arch/x86/include/asm/microcode.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/microcode.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -7695,9 +7695,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/microcode.h linux-2.6.35.7/arch/x
{
return NULL;
}
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/mman.h linux-2.6.35.7/arch/x86/include/asm/mman.h
---- linux-2.6.35.7/arch/x86/include/asm/mman.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/mman.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/mman.h linux-2.6.35.8/arch/x86/include/asm/mman.h
+--- linux-2.6.35.8/arch/x86/include/asm/mman.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/mman.h 2010-09-17 20:12:09.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -7713,9 +7713,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/mman.h linux-2.6.35.7/arch/x86/in
+#endif
+
#endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/mmu_context.h linux-2.6.35.7/arch/x86/include/asm/mmu_context.h
---- linux-2.6.35.7/arch/x86/include/asm/mmu_context.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/mmu_context.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/mmu_context.h linux-2.6.35.8/arch/x86/include/asm/mmu_context.h
+--- linux-2.6.35.8/arch/x86/include/asm/mmu_context.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/mmu_context.h 2010-09-17 20:12:09.000000000 -0400
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7840,9 +7840,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/mmu_context.h linux-2.6.35.7/arch
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/mmu.h linux-2.6.35.7/arch/x86/include/asm/mmu.h
---- linux-2.6.35.7/arch/x86/include/asm/mmu.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/mmu.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/mmu.h linux-2.6.35.8/arch/x86/include/asm/mmu.h
+--- linux-2.6.35.8/arch/x86/include/asm/mmu.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/mmu.h 2010-09-17 20:12:09.000000000 -0400
@@ -9,10 +9,23 @@
* we put the segment information here.
*/
@@ -7869,9 +7869,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/mmu.h linux-2.6.35.7/arch/x86/inc
} mm_context_t;
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/module.h linux-2.6.35.7/arch/x86/include/asm/module.h
---- linux-2.6.35.7/arch/x86/include/asm/module.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/module.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/module.h linux-2.6.35.8/arch/x86/include/asm/module.h
+--- linux-2.6.35.8/arch/x86/include/asm/module.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/module.h 2010-09-17 20:12:37.000000000 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -7905,9 +7905,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/module.h linux-2.6.35.7/arch/x86/
#endif
#endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/page_32_types.h linux-2.6.35.7/arch/x86/include/asm/page_32_types.h
---- linux-2.6.35.7/arch/x86/include/asm/page_32_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/page_32_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/page_32_types.h linux-2.6.35.8/arch/x86/include/asm/page_32_types.h
+--- linux-2.6.35.8/arch/x86/include/asm/page_32_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/page_32_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7919,9 +7919,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/page_32_types.h linux-2.6.35.7/ar
#ifdef CONFIG_4KSTACKS
#define THREAD_ORDER 0
#else
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/paravirt.h linux-2.6.35.7/arch/x86/include/asm/paravirt.h
---- linux-2.6.35.7/arch/x86/include/asm/paravirt.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/paravirt.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/paravirt.h linux-2.6.35.8/arch/x86/include/asm/paravirt.h
+--- linux-2.6.35.8/arch/x86/include/asm/paravirt.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/paravirt.h 2010-09-17 20:12:09.000000000 -0400
@@ -720,6 +720,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -7975,9 +7975,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/paravirt.h linux-2.6.35.7/arch/x8
#endif /* CONFIG_X86_32 */
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/paravirt_types.h linux-2.6.35.7/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.35.7/arch/x86/include/asm/paravirt_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/paravirt_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/paravirt_types.h linux-2.6.35.8/arch/x86/include/asm/paravirt_types.h
+--- linux-2.6.35.8/arch/x86/include/asm/paravirt_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/paravirt_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -312,6 +312,12 @@ struct pv_mmu_ops {
an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7991,9 +7991,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/paravirt_types.h linux-2.6.35.7/a
};
struct arch_spinlock;
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pci_x86.h linux-2.6.35.7/arch/x86/include/asm/pci_x86.h
---- linux-2.6.35.7/arch/x86/include/asm/pci_x86.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pci_x86.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pci_x86.h linux-2.6.35.8/arch/x86/include/asm/pci_x86.h
+--- linux-2.6.35.8/arch/x86/include/asm/pci_x86.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pci_x86.h 2010-09-17 20:12:09.000000000 -0400
@@ -91,16 +91,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -8016,9 +8016,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pci_x86.h linux-2.6.35.7/arch/x86
extern bool port_cf9_safe;
/* arch_initcall level */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgalloc.h linux-2.6.35.7/arch/x86/include/asm/pgalloc.h
---- linux-2.6.35.7/arch/x86/include/asm/pgalloc.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgalloc.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgalloc.h linux-2.6.35.8/arch/x86/include/asm/pgalloc.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgalloc.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgalloc.h 2010-09-17 20:12:09.000000000 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -8033,9 +8033,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgalloc.h linux-2.6.35.7/arch/x86
set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
}
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.35.7/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable-2level.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable-2level.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable-2level.h linux-2.6.35.8/arch/x86/include/asm/pgtable-2level.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable-2level.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable-2level.h 2010-09-17 20:12:09.000000000 -0400
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8046,23 +8046,25 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.35.7/a
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h 2010-09-17 20:12:09.000000000 -0400
-@@ -25,8 +25,6 @@
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable_32.h linux-2.6.35.8/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable_32.h 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable_32.h 2010-10-31 17:18:15.000000000 -0400
+@@ -25,9 +25,6 @@
struct mm_struct;
struct vm_area_struct;
-extern pgd_t swapper_pg_dir[1024];
+-extern pgd_t trampoline_pg_dir[1024];
-
static inline void pgtable_cache_init(void) { }
static inline void check_pgt_cache(void) { }
void paging_init(void);
-@@ -47,6 +45,11 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u
# include <asm/pgtable-2level.h>
#endif
+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
+#ifdef CONFIG_X86_PAE
+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
+#endif
@@ -8070,7 +8072,7 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h linux-2.6.35.7/arch/
#if defined(CONFIG_HIGHPTE)
#define __KM_PTE \
(in_nmi() ? KM_NMI_PTE : \
-@@ -71,7 +74,9 @@ extern void set_pmd_pfn(unsigned long, u
+@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
/* Clear a kernel PTE and flush it from the TLB */
#define kpte_clear_flush(ptep, vaddr) \
do { \
@@ -8080,7 +8082,7 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h linux-2.6.35.7/arch/
__flush_tlb_one((vaddr)); \
} while (0)
-@@ -83,6 +88,9 @@ do { \
+@@ -84,6 +89,9 @@ do { \
#endif /* !__ASSEMBLY__ */
@@ -8090,9 +8092,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32.h linux-2.6.35.7/arch/
/*
* kern_addr_valid() is (1) for FLATMEM and (0) for
* SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.35.7/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable_32_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable_32_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable_32_types.h linux-2.6.35.8/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable_32_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable_32_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -8,7 +8,7 @@
*/
#ifdef CONFIG_X86_PAE
@@ -8122,9 +8124,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.35.7
#define MODULES_VADDR VMALLOC_START
#define MODULES_END VMALLOC_END
#define MODULES_LEN (MODULES_VADDR - MODULES_END)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.35.7/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable-3level.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable-3level.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable-3level.h linux-2.6.35.8/arch/x86/include/asm/pgtable-3level.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable-3level.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable-3level.h 2010-09-17 20:12:09.000000000 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8142,9 +8144,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.35.7/a
}
/*
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_64.h linux-2.6.35.7/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable_64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable_64.h linux-2.6.35.8/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable_64.h 2010-09-17 20:12:09.000000000 -0400
@@ -16,10 +16,13 @@
extern pud_t level3_kernel_pgt[512];
@@ -8181,9 +8183,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_64.h linux-2.6.35.7/arch/
}
static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_64_types.h linux-2.6.35.7/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable_64_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable_64_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable_64_types.h linux-2.6.35.8/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable_64_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable_64_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
#define MODULES_VADDR _AC(0xffffffffa0000000, UL)
#define MODULES_END _AC(0xffffffffff000000, UL)
@@ -8195,9 +8197,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_64_types.h linux-2.6.35.7
+#define ktva_ktla(addr) (addr)
#endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable.h linux-2.6.35.7/arch/x86/include/asm/pgtable.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable.h linux-2.6.35.8/arch/x86/include/asm/pgtable.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable.h 2010-09-17 20:12:09.000000000 -0400
@@ -76,12 +76,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -8367,9 +8369,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable.h linux-2.6.35.7/arch/x86
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_types.h linux-2.6.35.7/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.35.7/arch/x86/include/asm/pgtable_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/pgtable_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/pgtable_types.h linux-2.6.35.8/arch/x86/include/asm/pgtable_types.h
+--- linux-2.6.35.8/arch/x86/include/asm/pgtable_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/pgtable_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8481,9 +8483,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/pgtable_types.h linux-2.6.35.7/ar
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/processor.h linux-2.6.35.7/arch/x86/include/asm/processor.h
---- linux-2.6.35.7/arch/x86/include/asm/processor.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/processor.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/processor.h linux-2.6.35.8/arch/x86/include/asm/processor.h
+--- linux-2.6.35.8/arch/x86/include/asm/processor.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/processor.h 2010-09-17 20:12:09.000000000 -0400
@@ -269,7 +269,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8568,9 +8570,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/processor.h linux-2.6.35.7/arch/x
#define KSTK_EIP(task) (task_pt_regs(task)->ip)
/* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/ptrace.h linux-2.6.35.7/arch/x86/include/asm/ptrace.h
---- linux-2.6.35.7/arch/x86/include/asm/ptrace.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/ptrace.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/ptrace.h linux-2.6.35.8/arch/x86/include/asm/ptrace.h
+--- linux-2.6.35.8/arch/x86/include/asm/ptrace.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/ptrace.h 2010-09-17 20:12:09.000000000 -0400
@@ -152,28 +152,29 @@ static inline unsigned long regs_return_
}
@@ -8607,9 +8609,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/ptrace.h linux-2.6.35.7/arch/x86/
#endif
}
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/reboot.h linux-2.6.35.7/arch/x86/include/asm/reboot.h
---- linux-2.6.35.7/arch/x86/include/asm/reboot.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/reboot.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/reboot.h linux-2.6.35.8/arch/x86/include/asm/reboot.h
+--- linux-2.6.35.8/arch/x86/include/asm/reboot.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/reboot.h 2010-09-17 20:12:09.000000000 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8619,9 +8621,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/reboot.h linux-2.6.35.7/arch/x86/
typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/rwsem.h linux-2.6.35.7/arch/x86/include/asm/rwsem.h
---- linux-2.6.35.7/arch/x86/include/asm/rwsem.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/rwsem.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/rwsem.h linux-2.6.35.8/arch/x86/include/asm/rwsem.h
+--- linux-2.6.35.8/arch/x86/include/asm/rwsem.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/rwsem.h 2010-09-17 20:12:09.000000000 -0400
@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -8857,9 +8859,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/rwsem.h linux-2.6.35.7/arch/x86/i
: "+r" (tmp), "+m" (sem->count)
: : "memory");
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/segment.h linux-2.6.35.7/arch/x86/include/asm/segment.h
---- linux-2.6.35.7/arch/x86/include/asm/segment.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/segment.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/segment.h linux-2.6.35.8/arch/x86/include/asm/segment.h
+--- linux-2.6.35.8/arch/x86/include/asm/segment.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/segment.h 2010-09-17 20:12:09.000000000 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -8928,9 +8930,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/segment.h linux-2.6.35.7/arch/x86
#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/smp.h linux-2.6.35.7/arch/x86/include/asm/smp.h
---- linux-2.6.35.7/arch/x86/include/asm/smp.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/smp.h 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/smp.h linux-2.6.35.8/arch/x86/include/asm/smp.h
+--- linux-2.6.35.8/arch/x86/include/asm/smp.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/smp.h 2010-10-11 22:41:44.000000000 -0400
@@ -24,7 +24,7 @@ extern unsigned int num_processors;
DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
@@ -8940,9 +8942,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/smp.h linux-2.6.35.7/arch/x86/inc
static inline struct cpumask *cpu_sibling_mask(int cpu)
{
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/spinlock.h linux-2.6.35.7/arch/x86/include/asm/spinlock.h
---- linux-2.6.35.7/arch/x86/include/asm/spinlock.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/spinlock.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/spinlock.h linux-2.6.35.8/arch/x86/include/asm/spinlock.h
+--- linux-2.6.35.8/arch/x86/include/asm/spinlock.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/spinlock.h 2010-09-17 20:12:09.000000000 -0400
@@ -249,18 +249,50 @@ static inline int arch_write_can_lock(ar
static inline void arch_read_lock(arch_rwlock_t *rw)
{
@@ -9046,9 +9048,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/spinlock.h linux-2.6.35.7/arch/x8
: "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
}
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/system.h linux-2.6.35.7/arch/x86/include/asm/system.h
---- linux-2.6.35.7/arch/x86/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/system.h linux-2.6.35.8/arch/x86/include/asm/system.h
+--- linux-2.6.35.8/arch/x86/include/asm/system.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/system.h 2010-09-17 20:12:09.000000000 -0400
@@ -202,7 +202,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -9067,9 +9069,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/system.h linux-2.6.35.7/arch/x86/
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess_32.h linux-2.6.35.7/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.35.7/arch/x86/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/uaccess_32.h linux-2.6.35.8/arch/x86/include/asm/uaccess_32.h
+--- linux-2.6.35.8/arch/x86/include/asm/uaccess_32.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/uaccess_32.h 2010-09-17 20:12:09.000000000 -0400
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9226,9 +9228,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess_32.h linux-2.6.35.7/arch/
return n;
}
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess_64.h linux-2.6.35.7/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.35.7/arch/x86/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/uaccess_64.h 2010-10-02 11:47:12.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/uaccess_64.h linux-2.6.35.8/arch/x86/include/asm/uaccess_64.h
+--- linux-2.6.35.8/arch/x86/include/asm/uaccess_64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/uaccess_64.h 2010-10-02 11:47:12.000000000 -0400
@@ -11,6 +11,9 @@
#include <asm/alternative.h>
#include <asm/cpufeature.h>
@@ -9457,9 +9459,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess_64.h linux-2.6.35.7/arch/
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess.h linux-2.6.35.7/arch/x86/include/asm/uaccess.h
---- linux-2.6.35.7/arch/x86/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/uaccess.h linux-2.6.35.8/arch/x86/include/asm/uaccess.h
+--- linux-2.6.35.8/arch/x86/include/asm/uaccess.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/uaccess.h 2010-09-17 20:12:09.000000000 -0400
@@ -8,12 +8,15 @@
#include <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -9684,9 +9686,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/uaccess.h linux-2.6.35.7/arch/x86
#ifdef CONFIG_X86_32
# include "uaccess_32.h"
#else
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/vgtod.h linux-2.6.35.7/arch/x86/include/asm/vgtod.h
---- linux-2.6.35.7/arch/x86/include/asm/vgtod.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/vgtod.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/vgtod.h linux-2.6.35.8/arch/x86/include/asm/vgtod.h
+--- linux-2.6.35.8/arch/x86/include/asm/vgtod.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/vgtod.h 2010-09-17 20:12:09.000000000 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -9695,9 +9697,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/vgtod.h linux-2.6.35.7/arch/x86/i
cycle_t (*vread)(void);
cycle_t cycle_last;
cycle_t mask;
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/vmi.h linux-2.6.35.7/arch/x86/include/asm/vmi.h
---- linux-2.6.35.7/arch/x86/include/asm/vmi.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/vmi.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/vmi.h linux-2.6.35.8/arch/x86/include/asm/vmi.h
+--- linux-2.6.35.8/arch/x86/include/asm/vmi.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/vmi.h 2010-09-17 20:12:09.000000000 -0400
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -9706,9 +9708,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/vmi.h linux-2.6.35.7/arch/x86/inc
} __attribute__((packed));
struct pnp_header {
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/vsyscall.h linux-2.6.35.7/arch/x86/include/asm/vsyscall.h
---- linux-2.6.35.7/arch/x86/include/asm/vsyscall.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/vsyscall.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/vsyscall.h linux-2.6.35.8/arch/x86/include/asm/vsyscall.h
+--- linux-2.6.35.8/arch/x86/include/asm/vsyscall.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/vsyscall.h 2010-09-17 20:12:09.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -9739,9 +9741,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/vsyscall.h linux-2.6.35.7/arch/x8
#endif /* __KERNEL__ */
#endif /* _ASM_X86_VSYSCALL_H */
-diff -urNp linux-2.6.35.7/arch/x86/include/asm/xsave.h linux-2.6.35.7/arch/x86/include/asm/xsave.h
---- linux-2.6.35.7/arch/x86/include/asm/xsave.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/include/asm/xsave.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/include/asm/xsave.h linux-2.6.35.8/arch/x86/include/asm/xsave.h
+--- linux-2.6.35.8/arch/x86/include/asm/xsave.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/include/asm/xsave.h 2010-09-17 20:12:09.000000000 -0400
@@ -59,6 +59,12 @@ static inline int fpu_xrstor_checking(st
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -9767,9 +9769,9 @@ diff -urNp linux-2.6.35.7/arch/x86/include/asm/xsave.h linux-2.6.35.7/arch/x86/i
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.35.7/arch/x86/Kconfig linux-2.6.35.7/arch/x86/Kconfig
---- linux-2.6.35.7/arch/x86/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/Kconfig 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/Kconfig linux-2.6.35.8/arch/x86/Kconfig
+--- linux-2.6.35.8/arch/x86/Kconfig 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/Kconfig 2010-09-17 20:12:37.000000000 -0400
@@ -1038,7 +1038,7 @@ choice
config NOHIGHMEM
@@ -9834,9 +9836,9 @@ diff -urNp linux-2.6.35.7/arch/x86/Kconfig linux-2.6.35.7/arch/x86/Kconfig
---help---
Map the 32-bit VDSO to the predictable old-style address too.
-diff -urNp linux-2.6.35.7/arch/x86/Kconfig.cpu linux-2.6.35.7/arch/x86/Kconfig.cpu
---- linux-2.6.35.7/arch/x86/Kconfig.cpu 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/Kconfig.cpu 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/Kconfig.cpu linux-2.6.35.8/arch/x86/Kconfig.cpu
+--- linux-2.6.35.8/arch/x86/Kconfig.cpu 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/Kconfig.cpu 2010-09-17 20:12:09.000000000 -0400
@@ -336,7 +336,7 @@ config X86_PPRO_FENCE
config X86_F00F_BUG
@@ -9864,9 +9866,9 @@ diff -urNp linux-2.6.35.7/arch/x86/Kconfig.cpu linux-2.6.35.7/arch/x86/Kconfig.c
config X86_MINIMUM_CPU_FAMILY
int
-diff -urNp linux-2.6.35.7/arch/x86/Kconfig.debug linux-2.6.35.7/arch/x86/Kconfig.debug
---- linux-2.6.35.7/arch/x86/Kconfig.debug 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/Kconfig.debug 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/Kconfig.debug linux-2.6.35.8/arch/x86/Kconfig.debug
+--- linux-2.6.35.8/arch/x86/Kconfig.debug 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/Kconfig.debug 2010-09-17 20:12:09.000000000 -0400
@@ -97,7 +97,7 @@ config X86_PTDUMP
config DEBUG_RODATA
bool "Write protect kernel read-only data structures"
@@ -9876,9 +9878,9 @@ diff -urNp linux-2.6.35.7/arch/x86/Kconfig.debug linux-2.6.35.7/arch/x86/Kconfig
---help---
Mark the kernel read-only data as write-protected in the pagetables,
in order to catch accidental (and incorrect) writes to such const
-diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/boot.c linux-2.6.35.7/arch/x86/kernel/acpi/boot.c
---- linux-2.6.35.7/arch/x86/kernel/acpi/boot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/acpi/boot.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/acpi/boot.c linux-2.6.35.8/arch/x86/kernel/acpi/boot.c
+--- linux-2.6.35.8/arch/x86/kernel/acpi/boot.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/acpi/boot.c 2010-09-17 20:12:09.000000000 -0400
@@ -1472,7 +1472,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -9888,9 +9890,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/boot.c linux-2.6.35.7/arch/x86/ke
};
/*
-diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.35.7/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.35.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.35.8/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-2.6.35.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-17 20:12:09.000000000 -0400
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -9900,9 +9902,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.35.7/
wrmsr
1:
-diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/sleep.c linux-2.6.35.7/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.35.7/arch/x86/kernel/acpi/sleep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/acpi/sleep.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/acpi/sleep.c linux-2.6.35.8/arch/x86/kernel/acpi/sleep.c
+--- linux-2.6.35.8/arch/x86/kernel/acpi/sleep.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/acpi/sleep.c 2010-09-17 20:12:09.000000000 -0400
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -9930,9 +9932,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/sleep.c linux-2.6.35.7/arch/x86/k
initial_gs = per_cpu_offset(smp_processor_id());
#endif
initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.35.7/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.35.7/arch/x86/kernel/acpi/wakeup_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/acpi/wakeup_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.35.8/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-2.6.35.8/arch/x86/kernel/acpi/wakeup_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/acpi/wakeup_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -9949,9 +9951,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.35.7/arch/x
bogus_magic:
jmp bogus_magic
-diff -urNp linux-2.6.35.7/arch/x86/kernel/alternative.c linux-2.6.35.7/arch/x86/kernel/alternative.c
---- linux-2.6.35.7/arch/x86/kernel/alternative.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/alternative.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/alternative.c linux-2.6.35.8/arch/x86/kernel/alternative.c
+--- linux-2.6.35.8/arch/x86/kernel/alternative.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/alternative.c 2010-09-17 20:12:09.000000000 -0400
@@ -247,7 +247,7 @@ static void alternatives_smp_lock(const
if (!*poff || ptr < text || ptr >= text_end)
continue;
@@ -10053,10 +10055,10 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/alternative.c linux-2.6.35.7/arch/x86/
return addr;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/amd_iommu.c linux-2.6.35.7/arch/x86/kernel/amd_iommu.c
---- linux-2.6.35.7/arch/x86/kernel/amd_iommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/amd_iommu.c 2010-09-17 20:12:09.000000000 -0400
-@@ -2284,7 +2284,7 @@ static void prealloc_protection_domains(
+diff -urNp linux-2.6.35.8/arch/x86/kernel/amd_iommu.c linux-2.6.35.8/arch/x86/kernel/amd_iommu.c
+--- linux-2.6.35.8/arch/x86/kernel/amd_iommu.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/amd_iommu.c 2010-10-31 17:14:30.000000000 -0400
+@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(
}
}
@@ -10065,10 +10067,10 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/amd_iommu.c linux-2.6.35.7/arch/x86/ke
.alloc_coherent = alloc_coherent,
.free_coherent = free_coherent,
.map_page = map_page,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c 2010-09-20 17:33:32.000000000 -0400
-@@ -691,7 +691,7 @@ struct IO_APIC_route_entry **alloc_ioapi
+diff -urNp linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c
+--- linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/apic/io_apic.c 2010-10-31 17:14:30.000000000 -0400
+@@ -696,7 +696,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
if (!ioapic_entries)
@@ -10077,7 +10079,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c linux-2.6.35.7/arch/x86
for (apic = 0; apic < nr_ioapics; apic++) {
ioapic_entries[apic] =
-@@ -708,7 +708,7 @@ nomem:
+@@ -713,7 +713,7 @@ nomem:
kfree(ioapic_entries[apic]);
kfree(ioapic_entries);
@@ -10086,7 +10088,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c linux-2.6.35.7/arch/x86
}
/*
-@@ -1118,7 +1118,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
+@@ -1123,7 +1123,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,
}
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10095,7 +10097,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c linux-2.6.35.7/arch/x86
{
/* Used to the online set of cpus does not change
* during assign_irq_vector.
-@@ -1126,7 +1126,7 @@ void lock_vector_lock(void)
+@@ -1131,7 +1131,7 @@ void lock_vector_lock(void)
raw_spin_lock(&vector_lock);
}
@@ -10104,9 +10106,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/apic/io_apic.c linux-2.6.35.7/arch/x86
{
raw_spin_unlock(&vector_lock);
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/apm_32.c linux-2.6.35.7/arch/x86/kernel/apm_32.c
---- linux-2.6.35.7/arch/x86/kernel/apm_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/apm_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/apm_32.c linux-2.6.35.8/arch/x86/kernel/apm_32.c
+--- linux-2.6.35.8/arch/x86/kernel/apm_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/apm_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -10208,9 +10210,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/apm_32.c linux-2.6.35.7/arch/x86/kerne
proc_create("apm", 0, NULL, &apm_file_ops);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.35.7/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.35.7/arch/x86/kernel/asm-offsets_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/asm-offsets_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/asm-offsets_32.c linux-2.6.35.8/arch/x86/kernel/asm-offsets_32.c
+--- linux-2.6.35.8/arch/x86/kernel/asm-offsets_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/asm-offsets_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -115,6 +115,11 @@ void foo(void)
OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -10223,9 +10225,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.35.7/arch/x
#endif
#ifdef CONFIG_XEN
-diff -urNp linux-2.6.35.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.35.7/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.35.7/arch/x86/kernel/asm-offsets_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/asm-offsets_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/asm-offsets_64.c linux-2.6.35.8/arch/x86/kernel/asm-offsets_64.c
+--- linux-2.6.35.8/arch/x86/kernel/asm-offsets_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/asm-offsets_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10253,9 +10255,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.35.7/arch/x
DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
BLANK();
DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/common.c linux-2.6.35.7/arch/x86/kernel/cpu/common.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/common.c linux-2.6.35.8/arch/x86/kernel/cpu/common.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/common.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/common.c 2010-10-31 17:14:30.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10364,9 +10366,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/common.c linux-2.6.35.7/arch/x86/k
struct thread_struct *thread = &curr->thread;
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-17 20:12:09.000000000 -0400
@@ -484,7 +484,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10376,9 +10378,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3
};
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-17 20:12:09.000000000 -0400
@@ -226,7 +226,7 @@ static struct cpu_model models[] =
{ &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
{ &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL },
@@ -10388,10 +10390,10 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux
};
#undef _BANIAS
#undef BANIAS
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/intel.c linux-2.6.35.7/arch/x86/kernel/cpu/intel.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/intel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/intel.c 2010-09-17 20:12:09.000000000 -0400
-@@ -160,7 +160,7 @@ static void __cpuinit trap_init_f00f_bug
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/intel.c linux-2.6.35.8/arch/x86/kernel/cpu/intel.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/intel.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/intel.c 2010-10-31 17:14:30.000000000 -0400
+@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
*/
@@ -10400,9 +10402,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/intel.c linux-2.6.35.7/arch/x86/ke
load_idt(&idt_descr);
}
#endif
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/Makefile linux-2.6.35.7/arch/x86/kernel/cpu/Makefile
---- linux-2.6.35.7/arch/x86/kernel/cpu/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/Makefile linux-2.6.35.8/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.35.8/arch/x86/kernel/cpu/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/Makefile 2010-09-17 20:12:09.000000000 -0400
@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
CFLAGS_REMOVE_perf_event.o = -pg
endif
@@ -10414,9 +10416,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/Makefile linux-2.6.35.7/arch/x86/k
obj-y := intel_cacheinfo.o addon_cpuid_features.o
obj-y += proc.o capflags.o powerflags.o common.o
obj-y += vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.35.7/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.35.8/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-17 20:12:09.000000000 -0400
@@ -219,7 +219,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -10469,9 +10471,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.35.7/arch/x
};
/*
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/generic.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-17 20:12:09.000000000 -0400
@@ -28,7 +28,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10481,9 +10483,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.35.7/arch
};
static unsigned long smp_changes_mask;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/main.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/main.c 2010-09-17 20:12:09.000000000 -0400
@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -10493,9 +10495,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.35.7/arch/x8
const struct mtrr_ops *mtrr_if;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -10524,9 +10526,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.35.7/arch/x8
};
extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.35.7/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.35.8/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-17 20:12:09.000000000 -0400
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -10560,9 +10562,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.35.7/
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.35.7/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.35.7/arch/x86/kernel/cpu/perf_event.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/cpu/perf_event.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/cpu/perf_event.c linux-2.6.35.8/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.35.8/arch/x86/kernel/cpu/perf_event.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/cpu/perf_event.c 2010-09-17 20:12:09.000000000 -0400
@@ -1685,7 +1685,7 @@ perf_callchain_user(struct pt_regs *regs
break;
@@ -10572,9 +10574,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/cpu/perf_event.c linux-2.6.35.7/arch/x
}
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/crash.c linux-2.6.35.7/arch/x86/kernel/crash.c
---- linux-2.6.35.7/arch/x86/kernel/crash.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/crash.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/crash.c linux-2.6.35.8/arch/x86/kernel/crash.c
+--- linux-2.6.35.8/arch/x86/kernel/crash.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/crash.c 2010-09-17 20:12:09.000000000 -0400
@@ -40,7 +40,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -10584,9 +10586,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/crash.c linux-2.6.35.7/arch/x86/kernel
crash_fixup_ss_esp(&fixed_regs, regs);
regs = &fixed_regs;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/doublefault_32.c linux-2.6.35.7/arch/x86/kernel/doublefault_32.c
---- linux-2.6.35.7/arch/x86/kernel/doublefault_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/doublefault_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/doublefault_32.c linux-2.6.35.8/arch/x86/kernel/doublefault_32.c
+--- linux-2.6.35.8/arch/x86/kernel/doublefault_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/doublefault_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -10618,9 +10620,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/doublefault_32.c linux-2.6.35.7/arch/x
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.35.7/arch/x86/kernel/dumpstack_32.c linux-2.6.35.7/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.35.7/arch/x86/kernel/dumpstack_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/dumpstack_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/dumpstack_32.c linux-2.6.35.8/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.35.8/arch/x86/kernel/dumpstack_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/dumpstack_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs
* When in-kernel, we also print out the stack and code at the
* time of the fault..
@@ -10665,9 +10667,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/dumpstack_32.c linux-2.6.35.7/arch/x86
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.35.7/arch/x86/kernel/dumpstack.c linux-2.6.35.7/arch/x86/kernel/dumpstack.c
---- linux-2.6.35.7/arch/x86/kernel/dumpstack.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/dumpstack.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/dumpstack.c linux-2.6.35.8/arch/x86/kernel/dumpstack.c
+--- linux-2.6.35.8/arch/x86/kernel/dumpstack.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/dumpstack.c 2010-09-17 20:12:09.000000000 -0400
@@ -207,7 +207,7 @@ void dump_stack(void)
#endif
@@ -10704,9 +10706,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/dumpstack.c linux-2.6.35.7/arch/x86/ke
report_bug(regs->ip, regs);
if (__die(str, regs, err))
-diff -urNp linux-2.6.35.7/arch/x86/kernel/efi_32.c linux-2.6.35.7/arch/x86/kernel/efi_32.c
---- linux-2.6.35.7/arch/x86/kernel/efi_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/efi_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/efi_32.c linux-2.6.35.8/arch/x86/kernel/efi_32.c
+--- linux-2.6.35.8/arch/x86/kernel/efi_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/efi_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -38,70 +38,38 @@
*/
@@ -10787,9 +10789,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/efi_32.c linux-2.6.35.7/arch/x86/kerne
/*
* After the lock is released, the original page table is restored.
-diff -urNp linux-2.6.35.7/arch/x86/kernel/efi_stub_32.S linux-2.6.35.7/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.35.7/arch/x86/kernel/efi_stub_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/efi_stub_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/efi_stub_32.S linux-2.6.35.8/arch/x86/kernel/efi_stub_32.S
+--- linux-2.6.35.8/arch/x86/kernel/efi_stub_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/efi_stub_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -6,6 +6,7 @@
*/
@@ -10888,9 +10890,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/efi_stub_32.S linux-2.6.35.7/arch/x86/
saved_return_addr:
.long 0
efi_rt_function_ptr:
-diff -urNp linux-2.6.35.7/arch/x86/kernel/entry_32.S linux-2.6.35.7/arch/x86/kernel/entry_32.S
---- linux-2.6.35.7/arch/x86/kernel/entry_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/entry_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/entry_32.S linux-2.6.35.8/arch/x86/kernel/entry_32.S
+--- linux-2.6.35.8/arch/x86/kernel/entry_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/entry_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -192,7 +192,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
@@ -11201,9 +11203,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/entry_32.S linux-2.6.35.7/arch/x86/ker
RESTORE_REGS
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-2.6.35.7/arch/x86/kernel/entry_64.S linux-2.6.35.7/arch/x86/kernel/entry_64.S
---- linux-2.6.35.7/arch/x86/kernel/entry_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/entry_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/entry_64.S linux-2.6.35.8/arch/x86/kernel/entry_64.S
+--- linux-2.6.35.8/arch/x86/kernel/entry_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/entry_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -11661,9 +11663,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/entry_64.S linux-2.6.35.7/arch/x86/ker
RESTORE_ALL 8
jmp irq_return
nmi_userspace:
-diff -urNp linux-2.6.35.7/arch/x86/kernel/ftrace.c linux-2.6.35.7/arch/x86/kernel/ftrace.c
---- linux-2.6.35.7/arch/x86/kernel/ftrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/ftrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/ftrace.c linux-2.6.35.8/arch/x86/kernel/ftrace.c
+--- linux-2.6.35.8/arch/x86/kernel/ftrace.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/ftrace.c 2010-09-17 20:12:09.000000000 -0400
@@ -174,7 +174,9 @@ void ftrace_nmi_enter(void)
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11729,9 +11731,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/ftrace.c linux-2.6.35.7/arch/x86/kerne
if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/head32.c linux-2.6.35.7/arch/x86/kernel/head32.c
---- linux-2.6.35.7/arch/x86/kernel/head32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/head32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/head32.c linux-2.6.35.8/arch/x86/kernel/head32.c
+--- linux-2.6.35.8/arch/x86/kernel/head32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/head32.c 2010-09-17 20:12:09.000000000 -0400
@@ -17,6 +17,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -11749,9 +11751,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head32.c linux-2.6.35.7/arch/x86/kerne
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
-diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kernel/head_32.S
---- linux-2.6.35.7/arch/x86/kernel/head_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/head_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/head_32.S linux-2.6.35.8/arch/x86/kernel/head_32.S
+--- linux-2.6.35.8/arch/x86/kernel/head_32.S 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/head_32.S 2010-10-31 17:21:20.000000000 -0400
@@ -25,6 +25,12 @@
/* Physical address */
#define pa(X) ((X) - __PAGE_OFFSET)
@@ -12028,7 +12030,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
pushl 16(%esp)
pushl 24(%esp)
pushl 32(%esp)
-@@ -612,27 +681,38 @@ ENTRY(initial_code)
+@@ -614,31 +683,47 @@ ENTRY(initial_page_table)
/*
* BSS section
*/
@@ -12046,6 +12048,15 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
+
swapper_pg_fixmap:
.fill 1024,4,0
+ #ifdef CONFIG_X86_TRAMPOLINE
++.section .trampoline_pg_dir,"a",@progbits
+ ENTRY(trampoline_pg_dir)
++#ifdef CONFIG_X86_PAE
++ .fill 4,8,0
++#else
+ .fill 1024,4,0
+ #endif
++#endif
+
+.section .empty_zero_page,"a",@progbits
ENTRY(empty_zero_page)
@@ -12072,7 +12083,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
ENTRY(swapper_pg_dir)
.long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
# if KPMDS == 3
-@@ -651,15 +731,24 @@ ENTRY(swapper_pg_dir)
+@@ -657,15 +742,24 @@ ENTRY(swapper_pg_dir)
# error "Kernel PMDs should be 1, 2 or 3"
# endif
.align PAGE_SIZE_asm /* needs to be page-sized too */
@@ -12098,7 +12109,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
early_recursion_flag:
.long 0
-@@ -695,7 +784,7 @@ fault_msg:
+@@ -701,7 +795,7 @@ fault_msg:
.word 0 # 32 bit align gdt_desc.address
boot_gdt_descr:
.word __BOOT_DS+7
@@ -12107,7 +12118,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
.word 0 # 32-bit align idt_desc.address
idt_descr:
-@@ -706,7 +795,7 @@ idt_descr:
+@@ -712,7 +806,7 @@ idt_descr:
.word 0 # 32 bit align gdt_desc.address
ENTRY(early_gdt_descr)
.word GDT_ENTRIES*8-1
@@ -12116,7 +12127,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
/*
* The boot_gdt must mirror the equivalent in setup.S and is
-@@ -715,5 +804,65 @@ ENTRY(early_gdt_descr)
+@@ -721,5 +815,65 @@ ENTRY(early_gdt_descr)
.align L1_CACHE_BYTES
ENTRY(boot_gdt)
.fill GDT_ENTRY_BOOT_CS,8,0
@@ -12184,9 +12195,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_32.S linux-2.6.35.7/arch/x86/kern
+ /* Be sure this is zeroed to avoid false validations in Xen */
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
-diff -urNp linux-2.6.35.7/arch/x86/kernel/head_64.S linux-2.6.35.7/arch/x86/kernel/head_64.S
---- linux-2.6.35.7/arch/x86/kernel/head_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/head_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/head_64.S linux-2.6.35.8/arch/x86/kernel/head_64.S
+--- linux-2.6.35.8/arch/x86/kernel/head_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/head_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -12448,9 +12459,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/head_64.S linux-2.6.35.7/arch/x86/kern
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
-diff -urNp linux-2.6.35.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.35.7/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.35.7/arch/x86/kernel/i386_ksyms_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/i386_ksyms_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/i386_ksyms_32.c linux-2.6.35.8/arch/x86/kernel/i386_ksyms_32.c
+--- linux-2.6.35.8/arch/x86/kernel/i386_ksyms_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/i386_ksyms_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -12472,9 +12483,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.35.7/arch/x8
+#ifdef CONFIG_PAX_KERNEXEC
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
-diff -urNp linux-2.6.35.7/arch/x86/kernel/init_task.c linux-2.6.35.7/arch/x86/kernel/init_task.c
---- linux-2.6.35.7/arch/x86/kernel/init_task.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/init_task.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/init_task.c linux-2.6.35.8/arch/x86/kernel/init_task.c
+--- linux-2.6.35.8/arch/x86/kernel/init_task.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/init_task.c 2010-09-17 20:12:09.000000000 -0400
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12483,9 +12494,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/init_task.c linux-2.6.35.7/arch/x86/ke
-
+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
+EXPORT_SYMBOL(init_tss);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/ioport.c linux-2.6.35.7/arch/x86/kernel/ioport.c
---- linux-2.6.35.7/arch/x86/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/ioport.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/ioport.c linux-2.6.35.8/arch/x86/kernel/ioport.c
+--- linux-2.6.35.8/arch/x86/kernel/ioport.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/ioport.c 2010-09-17 20:12:37.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -12529,9 +12540,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/ioport.c linux-2.6.35.7/arch/x86/kerne
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/irq_32.c linux-2.6.35.7/arch/x86/kernel/irq_32.c
---- linux-2.6.35.7/arch/x86/kernel/irq_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/irq_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/irq_32.c linux-2.6.35.8/arch/x86/kernel/irq_32.c
+--- linux-2.6.35.8/arch/x86/kernel/irq_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/irq_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -12550,9 +12561,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/irq_32.c linux-2.6.35.7/arch/x86/kerne
call_on_stack(__do_softirq, isp);
/*
-diff -urNp linux-2.6.35.7/arch/x86/kernel/kgdb.c linux-2.6.35.7/arch/x86/kernel/kgdb.c
---- linux-2.6.35.7/arch/x86/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/kgdb.c linux-2.6.35.8/arch/x86/kernel/kgdb.c
+--- linux-2.6.35.8/arch/x86/kernel/kgdb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/kgdb.c 2010-09-17 20:12:09.000000000 -0400
@@ -77,7 +77,7 @@ void pt_regs_to_gdb_regs(unsigned long *
gdb_regs[GDB_CS] = regs->cs;
gdb_regs[GDB_FS] = 0xFFFF;
@@ -12571,9 +12582,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/kgdb.c linux-2.6.35.7/arch/x86/kernel/
/* Breakpoint instruction: */
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/kprobes.c linux-2.6.35.7/arch/x86/kernel/kprobes.c
---- linux-2.6.35.7/arch/x86/kernel/kprobes.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/kprobes.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/kprobes.c linux-2.6.35.8/arch/x86/kernel/kprobes.c
+--- linux-2.6.35.8/arch/x86/kernel/kprobes.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/kprobes.c 2010-09-17 20:12:09.000000000 -0400
@@ -114,9 +114,12 @@ static void __kprobes __synthesize_relat
s32 raddr;
} __attribute__((packed)) *insn;
@@ -12668,9 +12679,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/kprobes.c linux-2.6.35.7/arch/x86/kern
return ret;
switch (val) {
-diff -urNp linux-2.6.35.7/arch/x86/kernel/ldt.c linux-2.6.35.7/arch/x86/kernel/ldt.c
---- linux-2.6.35.7/arch/x86/kernel/ldt.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/ldt.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/ldt.c linux-2.6.35.8/arch/x86/kernel/ldt.c
+--- linux-2.6.35.8/arch/x86/kernel/ldt.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/ldt.c 2010-10-11 22:41:44.000000000 -0400
@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -12735,9 +12746,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/ldt.c linux-2.6.35.7/arch/x86/kernel/l
fill_ldt(&ldt, &ldt_info);
if (oldmode)
ldt.avl = 0;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.35.7/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.35.7/arch/x86/kernel/machine_kexec_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/machine_kexec_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/machine_kexec_32.c linux-2.6.35.8/arch/x86/kernel/machine_kexec_32.c
+--- linux-2.6.35.8/arch/x86/kernel/machine_kexec_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/machine_kexec_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -27,7 +27,7 @@
#include <asm/cacheflush.h>
#include <asm/debugreg.h>
@@ -12765,9 +12776,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.35.7/arch
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_amd.c linux-2.6.35.7/arch/x86/kernel/microcode_amd.c
---- linux-2.6.35.7/arch/x86/kernel/microcode_amd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/microcode_amd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/microcode_amd.c linux-2.6.35.8/arch/x86/kernel/microcode_amd.c
+--- linux-2.6.35.8/arch/x86/kernel/microcode_amd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/microcode_amd.c 2010-09-17 20:12:09.000000000 -0400
@@ -331,7 +331,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -12786,9 +12797,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_amd.c linux-2.6.35.7/arch/x8
{
return &microcode_amd_ops;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_core.c linux-2.6.35.7/arch/x86/kernel/microcode_core.c
---- linux-2.6.35.7/arch/x86/kernel/microcode_core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/microcode_core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/microcode_core.c linux-2.6.35.8/arch/x86/kernel/microcode_core.c
+--- linux-2.6.35.8/arch/x86/kernel/microcode_core.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/microcode_core.c 2010-09-17 20:12:09.000000000 -0400
@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -12798,9 +12809,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_core.c linux-2.6.35.7/arch/x
/*
* Synchronization.
-diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_intel.c linux-2.6.35.7/arch/x86/kernel/microcode_intel.c
---- linux-2.6.35.7/arch/x86/kernel/microcode_intel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/microcode_intel.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/microcode_intel.c linux-2.6.35.8/arch/x86/kernel/microcode_intel.c
+--- linux-2.6.35.8/arch/x86/kernel/microcode_intel.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/microcode_intel.c 2010-09-17 20:12:09.000000000 -0400
@@ -446,13 +446,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12835,9 +12846,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/microcode_intel.c linux-2.6.35.7/arch/
{
return &microcode_intel_ops;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/module.c linux-2.6.35.7/arch/x86/kernel/module.c
---- linux-2.6.35.7/arch/x86/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/module.c linux-2.6.35.8/arch/x86/kernel/module.c
+--- linux-2.6.35.8/arch/x86/kernel/module.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/module.c 2010-09-17 20:12:09.000000000 -0400
@@ -35,7 +35,7 @@
#define DEBUGP(fmt...)
#endif
@@ -12978,9 +12989,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/module.c linux-2.6.35.7/arch/x86/kerne
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/paravirt.c linux-2.6.35.7/arch/x86/kernel/paravirt.c
---- linux-2.6.35.7/arch/x86/kernel/paravirt.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/paravirt.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/paravirt.c linux-2.6.35.8/arch/x86/kernel/paravirt.c
+--- linux-2.6.35.8/arch/x86/kernel/paravirt.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/paravirt.c 2010-09-17 20:12:09.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -13084,9 +13095,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/paravirt.c linux-2.6.35.7/arch/x86/ker
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.35.7/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.35.7/arch/x86/kernel/paravirt-spinlocks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/paravirt-spinlocks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.35.8/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.35.8/arch/x86/kernel/paravirt-spinlocks.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/paravirt-spinlocks.c 2010-09-17 20:12:09.000000000 -0400
@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t
arch_spin_lock(lock);
}
@@ -13096,9 +13107,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.35.7/ar
#ifdef CONFIG_SMP
.spin_is_locked = __ticket_spin_is_locked,
.spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.35.7/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.35.7/arch/x86/kernel/pci-calgary_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/pci-calgary_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/pci-calgary_64.c linux-2.6.35.8/arch/x86/kernel/pci-calgary_64.c
+--- linux-2.6.35.8/arch/x86/kernel/pci-calgary_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/pci-calgary_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -475,7 +475,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -13108,9 +13119,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-calgary_64.c linux-2.6.35.7/arch/x
.alloc_coherent = calgary_alloc_coherent,
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-dma.c linux-2.6.35.7/arch/x86/kernel/pci-dma.c
---- linux-2.6.35.7/arch/x86/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/pci-dma.c linux-2.6.35.8/arch/x86/kernel/pci-dma.c
+--- linux-2.6.35.8/arch/x86/kernel/pci-dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/pci-dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -16,7 +16,7 @@
static int forbid_dac __read_mostly;
@@ -13129,9 +13140,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-dma.c linux-2.6.35.7/arch/x86/kern
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
-diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-gart_64.c linux-2.6.35.7/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.35.7/arch/x86/kernel/pci-gart_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/pci-gart_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/pci-gart_64.c linux-2.6.35.8/arch/x86/kernel/pci-gart_64.c
+--- linux-2.6.35.8/arch/x86/kernel/pci-gart_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/pci-gart_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -699,7 +699,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -13141,9 +13152,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-gart_64.c linux-2.6.35.7/arch/x86/
.map_sg = gart_map_sg,
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-nommu.c linux-2.6.35.7/arch/x86/kernel/pci-nommu.c
---- linux-2.6.35.7/arch/x86/kernel/pci-nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/pci-nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/pci-nommu.c linux-2.6.35.8/arch/x86/kernel/pci-nommu.c
+--- linux-2.6.35.8/arch/x86/kernel/pci-nommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/pci-nommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13153,9 +13164,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-nommu.c linux-2.6.35.7/arch/x86/ke
.alloc_coherent = dma_generic_alloc_coherent,
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.35.7/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.35.7/arch/x86/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/pci-swiotlb.c linux-2.6.35.8/arch/x86/kernel/pci-swiotlb.c
+--- linux-2.6.35.8/arch/x86/kernel/pci-swiotlb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/pci-swiotlb.c 2010-09-17 20:12:09.000000000 -0400
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13165,9 +13176,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/pci-swiotlb.c linux-2.6.35.7/arch/x86/
.mapping_error = swiotlb_dma_mapping_error,
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/process_32.c linux-2.6.35.7/arch/x86/kernel/process_32.c
---- linux-2.6.35.7/arch/x86/kernel/process_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/process_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/process_32.c linux-2.6.35.8/arch/x86/kernel/process_32.c
+--- linux-2.6.35.8/arch/x86/kernel/process_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/process_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -13251,9 +13262,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/process_32.c linux-2.6.35.7/arch/x86/k
+ load_sp0(init_tss + smp_processor_id(), thread);
+}
+#endif
-diff -urNp linux-2.6.35.7/arch/x86/kernel/process_64.c linux-2.6.35.7/arch/x86/kernel/process_64.c
---- linux-2.6.35.7/arch/x86/kernel/process_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/process_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/process_64.c linux-2.6.35.8/arch/x86/kernel/process_64.c
+--- linux-2.6.35.8/arch/x86/kernel/process_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/process_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -87,7 +87,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -13287,9 +13298,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/process_64.c linux-2.6.35.7/arch/x86/k
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.35.7/arch/x86/kernel/process.c linux-2.6.35.7/arch/x86/kernel/process.c
---- linux-2.6.35.7/arch/x86/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/process.c linux-2.6.35.8/arch/x86/kernel/process.c
+--- linux-2.6.35.8/arch/x86/kernel/process.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/process.c 2010-09-17 20:12:09.000000000 -0400
@@ -73,7 +73,7 @@ void exit_thread(void)
unsigned long *bp = t->io_bitmap_ptr;
@@ -13347,9 +13358,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/process.c linux-2.6.35.7/arch/x86/kern
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
-}
-
-diff -urNp linux-2.6.35.7/arch/x86/kernel/ptrace.c linux-2.6.35.7/arch/x86/kernel/ptrace.c
---- linux-2.6.35.7/arch/x86/kernel/ptrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/ptrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/ptrace.c linux-2.6.35.8/arch/x86/kernel/ptrace.c
+--- linux-2.6.35.8/arch/x86/kernel/ptrace.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/ptrace.c 2010-09-17 20:12:09.000000000 -0400
@@ -804,7 +804,7 @@ static const struct user_regset_view use
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
@@ -13385,9 +13396,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/ptrace.c linux-2.6.35.7/arch/x86/kerne
}
void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/reboot.c linux-2.6.35.7/arch/x86/kernel/reboot.c
---- linux-2.6.35.7/arch/x86/kernel/reboot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/reboot.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/reboot.c linux-2.6.35.8/arch/x86/kernel/reboot.c
+--- linux-2.6.35.8/arch/x86/kernel/reboot.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/reboot.c 2010-09-17 20:12:09.000000000 -0400
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -13464,9 +13475,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/reboot.c linux-2.6.35.7/arch/x86/kerne
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/setup.c linux-2.6.35.7/arch/x86/kernel/setup.c
---- linux-2.6.35.7/arch/x86/kernel/setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/setup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/setup.c linux-2.6.35.8/arch/x86/kernel/setup.c
+--- linux-2.6.35.8/arch/x86/kernel/setup.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/setup.c 2010-10-31 17:14:30.000000000 -0400
@@ -704,7 +704,7 @@ static void __init trim_bios_range(void)
* area (640->1Mb) as ram even though it is not.
* take them out.
@@ -13496,9 +13507,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/setup.c linux-2.6.35.7/arch/x86/kernel
data_resource.end = virt_to_phys(_edata)-1;
bss_resource.start = virt_to_phys(&__bss_start);
bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/setup_percpu.c linux-2.6.35.7/arch/x86/kernel/setup_percpu.c
---- linux-2.6.35.7/arch/x86/kernel/setup_percpu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/setup_percpu.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/setup_percpu.c linux-2.6.35.8/arch/x86/kernel/setup_percpu.c
+--- linux-2.6.35.8/arch/x86/kernel/setup_percpu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/setup_percpu.c 2010-10-11 22:41:44.000000000 -0400
@@ -21,19 +21,17 @@
#include <asm/cpu.h>
#include <asm/stackprotector.h>
@@ -13562,9 +13573,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/setup_percpu.c linux-2.6.35.7/arch/x86
/*
* Up to this point, the boot CPU has been using .init.data
* area. Reload any changed state for the boot CPU.
-diff -urNp linux-2.6.35.7/arch/x86/kernel/signal.c linux-2.6.35.7/arch/x86/kernel/signal.c
---- linux-2.6.35.7/arch/x86/kernel/signal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/signal.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/signal.c linux-2.6.35.8/arch/x86/kernel/signal.c
+--- linux-2.6.35.8/arch/x86/kernel/signal.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/signal.c 2010-10-11 22:41:44.000000000 -0400
@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
* Align the stack pointer according to the i386 ABI,
* i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -13639,10 +13650,10 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/signal.c linux-2.6.35.7/arch/x86/kerne
return;
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-2.6.35.7/arch/x86/kernel/smpboot.c linux-2.6.35.7/arch/x86/kernel/smpboot.c
---- linux-2.6.35.7/arch/x86/kernel/smpboot.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/smpboot.c 2010-09-17 20:12:09.000000000 -0400
-@@ -780,7 +780,11 @@ do_rest:
+diff -urNp linux-2.6.35.8/arch/x86/kernel/smpboot.c linux-2.6.35.8/arch/x86/kernel/smpboot.c
+--- linux-2.6.35.8/arch/x86/kernel/smpboot.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/smpboot.c 2010-10-31 17:25:38.000000000 -0400
+@@ -786,7 +786,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
#endif
@@ -13654,7 +13665,7 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/smpboot.c linux-2.6.35.7/arch/x86/kern
initial_code = (unsigned long)start_secondary;
stack_start.sp = (void *) c_idle.idle->thread.sp;
-@@ -920,6 +924,12 @@ int __cpuinit native_cpu_up(unsigned int
+@@ -926,6 +930,12 @@ int __cpuinit native_cpu_up(unsigned int
per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
@@ -13664,12 +13675,12 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/smpboot.c linux-2.6.35.7/arch/x86/kern
+ KERNEL_PGD_PTRS);
+#endif
+
- #ifdef CONFIG_X86_32
- /* init low mem mapping */
- clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
-diff -urNp linux-2.6.35.7/arch/x86/kernel/step.c linux-2.6.35.7/arch/x86/kernel/step.c
---- linux-2.6.35.7/arch/x86/kernel/step.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/step.c 2010-09-17 20:12:09.000000000 -0400
+ err = do_boot_cpu(apicid, cpu);
+
+ if (err) {
+diff -urNp linux-2.6.35.8/arch/x86/kernel/step.c linux-2.6.35.8/arch/x86/kernel/step.c
+--- linux-2.6.35.8/arch/x86/kernel/step.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/step.c 2010-09-17 20:12:09.000000000 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -13702,17 +13713,17 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/step.c linux-2.6.35.7/arch/x86/kernel/
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.35.7/arch/x86/kernel/syscall_table_32.S linux-2.6.35.7/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.35.7/arch/x86/kernel/syscall_table_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/syscall_table_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/syscall_table_32.S linux-2.6.35.8/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.35.8/arch/x86/kernel/syscall_table_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/syscall_table_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -1,3 +1,4 @@
+.section .rodata,"a",@progbits
ENTRY(sys_call_table)
.long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
.long sys_exit
-diff -urNp linux-2.6.35.7/arch/x86/kernel/sys_i386_32.c linux-2.6.35.7/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.35.7/arch/x86/kernel/sys_i386_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/sys_i386_32.c 2010-09-26 22:02:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/sys_i386_32.c linux-2.6.35.8/arch/x86/kernel/sys_i386_32.c
+--- linux-2.6.35.8/arch/x86/kernel/sys_i386_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/sys_i386_32.c 2010-09-26 22:02:10.000000000 -0400
@@ -24,6 +24,228 @@
#include <asm/syscalls.h>
@@ -13942,9 +13953,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/sys_i386_32.c linux-2.6.35.7/arch/x86/
/*
* Do a system call from kernel instead of calling sys_execve so we
* end up with proper pt_regs.
-diff -urNp linux-2.6.35.7/arch/x86/kernel/sys_x86_64.c linux-2.6.35.7/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.35.7/arch/x86/kernel/sys_x86_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/sys_x86_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/sys_x86_64.c linux-2.6.35.8/arch/x86/kernel/sys_x86_64.c
+--- linux-2.6.35.8/arch/x86/kernel/sys_x86_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/sys_x86_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -14066,9 +14077,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/sys_x86_64.c linux-2.6.35.7/arch/x86/k
mm->cached_hole_size = ~0UL;
return addr;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/time.c linux-2.6.35.7/arch/x86/kernel/time.c
---- linux-2.6.35.7/arch/x86/kernel/time.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/time.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/time.c linux-2.6.35.8/arch/x86/kernel/time.c
+--- linux-2.6.35.8/arch/x86/kernel/time.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/time.c 2010-09-17 20:12:09.000000000 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -14107,9 +14118,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/time.c linux-2.6.35.7/arch/x86/kernel/
}
return pc;
}
-diff -urNp linux-2.6.35.7/arch/x86/kernel/tls.c linux-2.6.35.7/arch/x86/kernel/tls.c
---- linux-2.6.35.7/arch/x86/kernel/tls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/tls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/tls.c linux-2.6.35.8/arch/x86/kernel/tls.c
+--- linux-2.6.35.8/arch/x86/kernel/tls.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/tls.c 2010-09-17 20:12:09.000000000 -0400
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
@@ -14122,9 +14133,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/tls.c linux-2.6.35.7/arch/x86/kernel/t
set_tls_desc(p, idx, &info, 1);
return 0;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/trampoline_32.S linux-2.6.35.7/arch/x86/kernel/trampoline_32.S
---- linux-2.6.35.7/arch/x86/kernel/trampoline_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/trampoline_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/trampoline_32.S linux-2.6.35.8/arch/x86/kernel/trampoline_32.S
+--- linux-2.6.35.8/arch/x86/kernel/trampoline_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/trampoline_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -14147,9 +14158,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/trampoline_32.S linux-2.6.35.7/arch/x8
# These need to be in the same 64K segment as the above;
# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-2.6.35.7/arch/x86/kernel/trampoline_64.S linux-2.6.35.7/arch/x86/kernel/trampoline_64.S
---- linux-2.6.35.7/arch/x86/kernel/trampoline_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/trampoline_64.S 2010-10-10 15:54:54.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/trampoline_64.S linux-2.6.35.8/arch/x86/kernel/trampoline_64.S
+--- linux-2.6.35.8/arch/x86/kernel/trampoline_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/trampoline_64.S 2010-10-10 15:54:54.000000000 -0400
@@ -91,7 +91,7 @@ startup_32:
movl $__KERNEL_DS, %eax # Initialize the %ds segment register
movl %eax, %ds
@@ -14168,9 +14179,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/trampoline_64.S linux-2.6.35.7/arch/x8
.long tgdt - r_base
.short 0
.quad 0x00cf9b000000ffff # __KERNEL32_CS
-diff -urNp linux-2.6.35.7/arch/x86/kernel/traps.c linux-2.6.35.7/arch/x86/kernel/traps.c
---- linux-2.6.35.7/arch/x86/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/traps.c linux-2.6.35.8/arch/x86/kernel/traps.c
+--- linux-2.6.35.8/arch/x86/kernel/traps.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/traps.c 2010-09-17 20:12:09.000000000 -0400
@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -14313,9 +14324,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/traps.c linux-2.6.35.7/arch/x86/kernel
{
if (!fixup_exception(regs)) {
task->thread.error_code = error_code;
-diff -urNp linux-2.6.35.7/arch/x86/kernel/tsc.c linux-2.6.35.7/arch/x86/kernel/tsc.c
---- linux-2.6.35.7/arch/x86/kernel/tsc.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/tsc.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/tsc.c linux-2.6.35.8/arch/x86/kernel/tsc.c
+--- linux-2.6.35.8/arch/x86/kernel/tsc.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/tsc.c 2010-09-20 17:33:32.000000000 -0400
@@ -833,7 +833,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -14325,9 +14336,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/tsc.c linux-2.6.35.7/arch/x86/kernel/t
};
static void __init check_system_tsc_reliable(void)
-diff -urNp linux-2.6.35.7/arch/x86/kernel/vm86_32.c linux-2.6.35.7/arch/x86/kernel/vm86_32.c
---- linux-2.6.35.7/arch/x86/kernel/vm86_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/vm86_32.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/vm86_32.c linux-2.6.35.8/arch/x86/kernel/vm86_32.c
+--- linux-2.6.35.8/arch/x86/kernel/vm86_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/vm86_32.c 2010-09-17 20:12:37.000000000 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -14392,9 +14403,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/vm86_32.c linux-2.6.35.7/arch/x86/kern
if (get_user(segoffs, intr_ptr))
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-2.6.35.7/arch/x86/kernel/vmi_32.c linux-2.6.35.7/arch/x86/kernel/vmi_32.c
---- linux-2.6.35.7/arch/x86/kernel/vmi_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/vmi_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/vmi_32.c linux-2.6.35.8/arch/x86/kernel/vmi_32.c
+--- linux-2.6.35.8/arch/x86/kernel/vmi_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/vmi_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -46,12 +46,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -14554,9 +14565,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/vmi_32.c linux-2.6.35.7/arch/x86/kerne
return;
local_irq_save(flags);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.35.7/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.35.7/arch/x86/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/vmlinux.lds.S linux-2.6.35.8/arch/x86/kernel/vmlinux.lds.S
+--- linux-2.6.35.8/arch/x86/kernel/vmlinux.lds.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/vmlinux.lds.S 2010-09-17 20:12:09.000000000 -0400
@@ -26,6 +26,13 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -14852,9 +14863,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.35.7/arch/x86/
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-diff -urNp linux-2.6.35.7/arch/x86/kernel/vsyscall_64.c linux-2.6.35.7/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.35.7/arch/x86/kernel/vsyscall_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/vsyscall_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/vsyscall_64.c linux-2.6.35.8/arch/x86/kernel/vsyscall_64.c
+--- linux-2.6.35.8/arch/x86/kernel/vsyscall_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/vsyscall_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14872,9 +14883,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/vsyscall_64.c linux-2.6.35.7/arch/x86/
p = tcache->blob[1];
} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
/* Load per CPU data from RDTSCP */
-diff -urNp linux-2.6.35.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.35.7/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.35.7/arch/x86/kernel/x8664_ksyms_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/x8664_ksyms_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.35.8/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-2.6.35.8/arch/x86/kernel/x8664_ksyms_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/x8664_ksyms_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic_string);
EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -14884,9 +14895,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.35.7/arch/x
EXPORT_SYMBOL(copy_page);
EXPORT_SYMBOL(clear_page);
-diff -urNp linux-2.6.35.7/arch/x86/kernel/xsave.c linux-2.6.35.7/arch/x86/kernel/xsave.c
---- linux-2.6.35.7/arch/x86/kernel/xsave.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kernel/xsave.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kernel/xsave.c linux-2.6.35.8/arch/x86/kernel/xsave.c
+--- linux-2.6.35.8/arch/x86/kernel/xsave.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kernel/xsave.c 2010-09-17 20:12:09.000000000 -0400
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
@@ -14914,9 +14925,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kernel/xsave.c linux-2.6.35.7/arch/x86/kernel
buf);
if (unlikely(err)) {
/*
-diff -urNp linux-2.6.35.7/arch/x86/kvm/emulate.c linux-2.6.35.7/arch/x86/kvm/emulate.c
---- linux-2.6.35.7/arch/x86/kvm/emulate.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kvm/emulate.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kvm/emulate.c linux-2.6.35.8/arch/x86/kvm/emulate.c
+--- linux-2.6.35.8/arch/x86/kvm/emulate.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kvm/emulate.c 2010-09-26 17:32:46.000000000 -0400
@@ -88,11 +88,11 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -14957,9 +14968,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kvm/emulate.c linux-2.6.35.7/arch/x86/kvm/emu
switch ((_dst).bytes) { \
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
-diff -urNp linux-2.6.35.7/arch/x86/kvm/lapic.c linux-2.6.35.7/arch/x86/kvm/lapic.c
---- linux-2.6.35.7/arch/x86/kvm/lapic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kvm/lapic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kvm/lapic.c linux-2.6.35.8/arch/x86/kvm/lapic.c
+--- linux-2.6.35.8/arch/x86/kvm/lapic.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kvm/lapic.c 2010-09-17 20:12:09.000000000 -0400
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -14969,9 +14980,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kvm/lapic.c linux-2.6.35.7/arch/x86/kvm/lapic
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-2.6.35.7/arch/x86/kvm/svm.c linux-2.6.35.7/arch/x86/kvm/svm.c
---- linux-2.6.35.7/arch/x86/kvm/svm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kvm/svm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kvm/svm.c linux-2.6.35.8/arch/x86/kvm/svm.c
+--- linux-2.6.35.8/arch/x86/kvm/svm.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kvm/svm.c 2010-10-31 17:14:30.000000000 -0400
@@ -2796,7 +2796,11 @@ static void reload_tss(struct kvm_vcpu *
int cpu = raw_smp_processor_id();
@@ -14993,9 +15004,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kvm/svm.c linux-2.6.35.7/arch/x86/kvm/svm.c
.cpu_has_kvm_support = has_svm,
.disabled_by_bios = is_disabled,
.hardware_setup = svm_hardware_setup,
-diff -urNp linux-2.6.35.7/arch/x86/kvm/vmx.c linux-2.6.35.7/arch/x86/kvm/vmx.c
---- linux-2.6.35.7/arch/x86/kvm/vmx.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kvm/vmx.c 2010-09-28 18:50:03.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kvm/vmx.c linux-2.6.35.8/arch/x86/kvm/vmx.c
+--- linux-2.6.35.8/arch/x86/kvm/vmx.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kvm/vmx.c 2010-09-28 18:50:03.000000000 -0400
@@ -654,7 +654,11 @@ static void reload_tss(void)
native_store_gdt(&gdt);
@@ -15077,9 +15088,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kvm/vmx.c linux-2.6.35.7/arch/x86/kvm/vmx.c
.cpu_has_kvm_support = cpu_has_kvm_support,
.disabled_by_bios = vmx_disabled_by_bios,
.hardware_setup = hardware_setup,
-diff -urNp linux-2.6.35.7/arch/x86/kvm/x86.c linux-2.6.35.7/arch/x86/kvm/x86.c
---- linux-2.6.35.7/arch/x86/kvm/x86.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/kvm/x86.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/kvm/x86.c linux-2.6.35.8/arch/x86/kvm/x86.c
+--- linux-2.6.35.8/arch/x86/kvm/x86.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/arch/x86/kvm/x86.c 2010-09-26 17:32:46.000000000 -0400
@@ -86,7 +86,7 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -15191,9 +15202,9 @@ diff -urNp linux-2.6.35.7/arch/x86/kvm/x86.c linux-2.6.35.7/arch/x86/kvm/x86.c
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
-diff -urNp linux-2.6.35.7/arch/x86/lib/atomic64_cx8_32.S linux-2.6.35.7/arch/x86/lib/atomic64_cx8_32.S
---- linux-2.6.35.7/arch/x86/lib/atomic64_cx8_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/atomic64_cx8_32.S 2010-09-26 22:02:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/atomic64_cx8_32.S linux-2.6.35.8/arch/x86/lib/atomic64_cx8_32.S
+--- linux-2.6.35.8/arch/x86/lib/atomic64_cx8_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/atomic64_cx8_32.S 2010-09-26 22:02:10.000000000 -0400
@@ -86,13 +86,23 @@ ENTRY(atomic64_\func\()_return_cx8)
movl %edx, %ecx
\ins\()l %esi, %ebx
@@ -15274,9 +15285,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/atomic64_cx8_32.S linux-2.6.35.7/arch/x86
LOCK_PREFIX
cmpxchg8b (%esi)
jne 1b
-diff -urNp linux-2.6.35.7/arch/x86/lib/checksum_32.S linux-2.6.35.7/arch/x86/lib/checksum_32.S
---- linux-2.6.35.7/arch/x86/lib/checksum_32.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/checksum_32.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/checksum_32.S linux-2.6.35.8/arch/x86/lib/checksum_32.S
+--- linux-2.6.35.8/arch/x86/lib/checksum_32.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/checksum_32.S 2010-09-17 20:12:09.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -15522,9 +15533,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/checksum_32.S linux-2.6.35.7/arch/x86/lib
#undef ROUND
#undef ROUND1
-diff -urNp linux-2.6.35.7/arch/x86/lib/clear_page_64.S linux-2.6.35.7/arch/x86/lib/clear_page_64.S
---- linux-2.6.35.7/arch/x86/lib/clear_page_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/clear_page_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/clear_page_64.S linux-2.6.35.8/arch/x86/lib/clear_page_64.S
+--- linux-2.6.35.8/arch/x86/lib/clear_page_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/clear_page_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -15534,9 +15545,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/clear_page_64.S linux-2.6.35.7/arch/x86/l
1: .byte 0xeb /* jmp <disp8> */
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.35.7/arch/x86/lib/copy_page_64.S linux-2.6.35.7/arch/x86/lib/copy_page_64.S
---- linux-2.6.35.7/arch/x86/lib/copy_page_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/copy_page_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/copy_page_64.S linux-2.6.35.8/arch/x86/lib/copy_page_64.S
+--- linux-2.6.35.8/arch/x86/lib/copy_page_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/copy_page_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -15546,9 +15557,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/copy_page_64.S linux-2.6.35.7/arch/x86/li
1: .byte 0xeb /* jmp <disp8> */
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
-diff -urNp linux-2.6.35.7/arch/x86/lib/copy_user_64.S linux-2.6.35.7/arch/x86/lib/copy_user_64.S
---- linux-2.6.35.7/arch/x86/lib/copy_user_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/copy_user_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/copy_user_64.S linux-2.6.35.8/arch/x86/lib/copy_user_64.S
+--- linux-2.6.35.8/arch/x86/lib/copy_user_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/copy_user_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15605,9 +15616,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/copy_user_64.S linux-2.6.35.7/arch/x86/li
movl %edx,%ecx
xorl %eax,%eax
rep
-diff -urNp linux-2.6.35.7/arch/x86/lib/copy_user_nocache_64.S linux-2.6.35.7/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.35.7/arch/x86/lib/copy_user_nocache_64.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/copy_user_nocache_64.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/copy_user_nocache_64.S linux-2.6.35.8/arch/x86/lib/copy_user_nocache_64.S
+--- linux-2.6.35.8/arch/x86/lib/copy_user_nocache_64.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/copy_user_nocache_64.S 2010-09-17 20:12:09.000000000 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -15632,9 +15643,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/copy_user_nocache_64.S linux-2.6.35.7/arc
cmpl $8,%edx
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
-diff -urNp linux-2.6.35.7/arch/x86/lib/csum-wrappers_64.c linux-2.6.35.7/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.35.7/arch/x86/lib/csum-wrappers_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/csum-wrappers_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/csum-wrappers_64.c linux-2.6.35.8/arch/x86/lib/csum-wrappers_64.c
+--- linux-2.6.35.8/arch/x86/lib/csum-wrappers_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/csum-wrappers_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -15653,9 +15664,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/csum-wrappers_64.c linux-2.6.35.7/arch/x8
return csum_partial_copy_generic(src, (void __force *)dst,
len, isum, NULL, errp);
}
-diff -urNp linux-2.6.35.7/arch/x86/lib/getuser.S linux-2.6.35.7/arch/x86/lib/getuser.S
---- linux-2.6.35.7/arch/x86/lib/getuser.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/getuser.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/getuser.S linux-2.6.35.8/arch/x86/lib/getuser.S
+--- linux-2.6.35.8/arch/x86/lib/getuser.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/getuser.S 2010-09-17 20:12:09.000000000 -0400
@@ -33,14 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15792,9 +15803,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/getuser.S linux-2.6.35.7/arch/x86/lib/get
xor %edx,%edx
mov $(-EFAULT),%_ASM_AX
ret
-diff -urNp linux-2.6.35.7/arch/x86/lib/insn.c linux-2.6.35.7/arch/x86/lib/insn.c
---- linux-2.6.35.7/arch/x86/lib/insn.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/insn.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/insn.c linux-2.6.35.8/arch/x86/lib/insn.c
+--- linux-2.6.35.8/arch/x86/lib/insn.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/insn.c 2010-09-17 20:12:09.000000000 -0400
@@ -21,6 +21,7 @@
#include <linux/string.h>
#include <asm/inat.h>
@@ -15814,9 +15825,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/insn.c linux-2.6.35.7/arch/x86/lib/insn.c
insn->x86_64 = x86_64 ? 1 : 0;
insn->opnd_bytes = 4;
if (x86_64)
-diff -urNp linux-2.6.35.7/arch/x86/lib/mmx_32.c linux-2.6.35.7/arch/x86/lib/mmx_32.c
---- linux-2.6.35.7/arch/x86/lib/mmx_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/mmx_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/mmx_32.c linux-2.6.35.8/arch/x86/lib/mmx_32.c
+--- linux-2.6.35.8/arch/x86/lib/mmx_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/mmx_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -16132,9 +16143,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/mmx_32.c linux-2.6.35.7/arch/x86/lib/mmx_
from += 64;
to += 64;
-diff -urNp linux-2.6.35.7/arch/x86/lib/putuser.S linux-2.6.35.7/arch/x86/lib/putuser.S
---- linux-2.6.35.7/arch/x86/lib/putuser.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/putuser.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/putuser.S linux-2.6.35.8/arch/x86/lib/putuser.S
+--- linux-2.6.35.8/arch/x86/lib/putuser.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/putuser.S 2010-09-17 20:12:09.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16315,9 +16326,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/putuser.S linux-2.6.35.7/arch/x86/lib/put
movl $-EFAULT,%eax
EXIT
END(bad_put_user)
-diff -urNp linux-2.6.35.7/arch/x86/lib/usercopy_32.c linux-2.6.35.7/arch/x86/lib/usercopy_32.c
---- linux-2.6.35.7/arch/x86/lib/usercopy_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/usercopy_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/usercopy_32.c linux-2.6.35.8/arch/x86/lib/usercopy_32.c
+--- linux-2.6.35.8/arch/x86/lib/usercopy_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/usercopy_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
* Copy a null terminated string from userspace.
*/
@@ -17302,9 +17313,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/usercopy_32.c linux-2.6.35.7/arch/x86/lib
+#endif
+
+EXPORT_SYMBOL(set_fs);
-diff -urNp linux-2.6.35.7/arch/x86/lib/usercopy_64.c linux-2.6.35.7/arch/x86/lib/usercopy_64.c
---- linux-2.6.35.7/arch/x86/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/lib/usercopy_64.c linux-2.6.35.8/arch/x86/lib/usercopy_64.c
+--- linux-2.6.35.8/arch/x86/lib/usercopy_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/lib/usercopy_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -17341,9 +17352,9 @@ diff -urNp linux-2.6.35.7/arch/x86/lib/usercopy_64.c linux-2.6.35.7/arch/x86/lib
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.35.7/arch/x86/Makefile linux-2.6.35.7/arch/x86/Makefile
---- linux-2.6.35.7/arch/x86/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/Makefile linux-2.6.35.8/arch/x86/Makefile
+--- linux-2.6.35.8/arch/x86/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/Makefile 2010-09-17 20:12:09.000000000 -0400
@@ -191,3 +191,12 @@ define archhelp
echo ' FDARGS="..." arguments for the booted kernel'
echo ' FDINITRD=file initrd for the booted kernel'
@@ -17357,9 +17368,9 @@ diff -urNp linux-2.6.35.7/arch/x86/Makefile linux-2.6.35.7/arch/x86/Makefile
+
+archprepare:
+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-2.6.35.7/arch/x86/mm/extable.c linux-2.6.35.7/arch/x86/mm/extable.c
---- linux-2.6.35.7/arch/x86/mm/extable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/extable.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/extable.c linux-2.6.35.8/arch/x86/mm/extable.c
+--- linux-2.6.35.8/arch/x86/mm/extable.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/extable.c 2010-09-17 20:12:09.000000000 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -17433,9 +17444,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/extable.c linux-2.6.35.7/arch/x86/mm/extab
extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
extern u32 pnp_bios_is_utter_crap;
pnp_bios_is_utter_crap = 1;
-diff -urNp linux-2.6.35.7/arch/x86/mm/fault.c linux-2.6.35.7/arch/x86/mm/fault.c
---- linux-2.6.35.7/arch/x86/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/fault.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/fault.c linux-2.6.35.8/arch/x86/mm/fault.c
+--- linux-2.6.35.8/arch/x86/mm/fault.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/fault.c 2010-10-11 22:41:44.000000000 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -18103,9 +18114,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/fault.c linux-2.6.35.7/arch/x86/mm/fault.c
+
+ return ret ? -EFAULT : 0;
+}
-diff -urNp linux-2.6.35.7/arch/x86/mm/gup.c linux-2.6.35.7/arch/x86/mm/gup.c
---- linux-2.6.35.7/arch/x86/mm/gup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/gup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/gup.c linux-2.6.35.8/arch/x86/mm/gup.c
+--- linux-2.6.35.8/arch/x86/mm/gup.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/gup.c 2010-09-17 20:12:09.000000000 -0400
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -18115,9 +18126,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/gup.c linux-2.6.35.7/arch/x86/mm/gup.c
(void __user *)start, len)))
return 0;
-diff -urNp linux-2.6.35.7/arch/x86/mm/highmem_32.c linux-2.6.35.7/arch/x86/mm/highmem_32.c
---- linux-2.6.35.7/arch/x86/mm/highmem_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/highmem_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/highmem_32.c linux-2.6.35.8/arch/x86/mm/highmem_32.c
+--- linux-2.6.35.8/arch/x86/mm/highmem_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/highmem_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -18129,9 +18140,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/highmem_32.c linux-2.6.35.7/arch/x86/mm/hi
return (void *)vaddr;
}
-diff -urNp linux-2.6.35.7/arch/x86/mm/hugetlbpage.c linux-2.6.35.7/arch/x86/mm/hugetlbpage.c
---- linux-2.6.35.7/arch/x86/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/hugetlbpage.c 2010-09-26 22:02:10.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/hugetlbpage.c linux-2.6.35.8/arch/x86/mm/hugetlbpage.c
+--- linux-2.6.35.8/arch/x86/mm/hugetlbpage.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/hugetlbpage.c 2010-09-26 22:02:10.000000000 -0400
@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -18335,9 +18346,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/hugetlbpage.c linux-2.6.35.7/arch/x86/mm/h
return addr;
}
if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-2.6.35.7/arch/x86/mm/init_32.c linux-2.6.35.7/arch/x86/mm/init_32.c
---- linux-2.6.35.7/arch/x86/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/init_32.c linux-2.6.35.8/arch/x86/mm/init_32.c
+--- linux-2.6.35.8/arch/x86/mm/init_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/init_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -18641,9 +18652,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/init_32.c linux-2.6.35.7/arch/x86/mm/init_
set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
-diff -urNp linux-2.6.35.7/arch/x86/mm/init_64.c linux-2.6.35.7/arch/x86/mm/init_64.c
---- linux-2.6.35.7/arch/x86/mm/init_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/init_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/init_64.c linux-2.6.35.8/arch/x86/mm/init_64.c
+--- linux-2.6.35.8/arch/x86/mm/init_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/init_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -50,7 +50,6 @@
#include <asm/numa.h>
#include <asm/cacheflush.h>
@@ -18721,9 +18732,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/init_64.c linux-2.6.35.7/arch/x86/mm/init_
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.35.7/arch/x86/mm/init.c linux-2.6.35.7/arch/x86/mm/init.c
---- linux-2.6.35.7/arch/x86/mm/init.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/init.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/init.c linux-2.6.35.8/arch/x86/mm/init.c
+--- linux-2.6.35.8/arch/x86/mm/init.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/init.c 2010-09-17 20:12:09.000000000 -0400
@@ -70,11 +70,7 @@ static void __init find_early_table_spac
* cause a hotspot and fill up ZONE_DMA. The page tables
* need roughly 0.5KB per GB.
@@ -18841,9 +18852,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/init.c linux-2.6.35.7/arch/x86/mm/init.c
free_init_pages("unused kernel memory",
(unsigned long)(&__init_begin),
(unsigned long)(&__init_end));
-diff -urNp linux-2.6.35.7/arch/x86/mm/iomap_32.c linux-2.6.35.7/arch/x86/mm/iomap_32.c
---- linux-2.6.35.7/arch/x86/mm/iomap_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/iomap_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/iomap_32.c linux-2.6.35.8/arch/x86/mm/iomap_32.c
+--- linux-2.6.35.8/arch/x86/mm/iomap_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/iomap_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18856,9 +18867,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/iomap_32.c linux-2.6.35.7/arch/x86/mm/ioma
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-diff -urNp linux-2.6.35.7/arch/x86/mm/ioremap.c linux-2.6.35.7/arch/x86/mm/ioremap.c
---- linux-2.6.35.7/arch/x86/mm/ioremap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/ioremap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/ioremap.c linux-2.6.35.8/arch/x86/mm/ioremap.c
+--- linux-2.6.35.8/arch/x86/mm/ioremap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/ioremap.c 2010-09-17 20:12:09.000000000 -0400
@@ -100,13 +100,10 @@ static void __iomem *__ioremap_caller(re
/*
* Don't allow anybody to remap normal RAM that we're using..
@@ -18894,9 +18905,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/ioremap.c linux-2.6.35.7/arch/x86/mm/iorem
/*
* The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-2.6.35.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.35.7/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.35.7/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.35.8/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-2.6.35.8/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-17 20:12:09.000000000 -0400
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
@@ -18909,9 +18920,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.35.7/arch/
return false;
pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-2.6.35.7/arch/x86/mm/mmap.c linux-2.6.35.7/arch/x86/mm/mmap.c
---- linux-2.6.35.7/arch/x86/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/mmap.c linux-2.6.35.8/arch/x86/mm/mmap.c
+--- linux-2.6.35.8/arch/x86/mm/mmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/mmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -18993,9 +19004,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/mmap.c linux-2.6.35.7/arch/x86/mm/mmap.c
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
mm->unmap_area = arch_unmap_area_topdown;
}
-diff -urNp linux-2.6.35.7/arch/x86/mm/numa_32.c linux-2.6.35.7/arch/x86/mm/numa_32.c
---- linux-2.6.35.7/arch/x86/mm/numa_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/numa_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/numa_32.c linux-2.6.35.8/arch/x86/mm/numa_32.c
+--- linux-2.6.35.8/arch/x86/mm/numa_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/numa_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -19004,9 +19015,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/numa_32.c linux-2.6.35.7/arch/x86/mm/numa_
extern unsigned long highend_pfn, highstart_pfn;
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff -urNp linux-2.6.35.7/arch/x86/mm/pageattr.c linux-2.6.35.7/arch/x86/mm/pageattr.c
---- linux-2.6.35.7/arch/x86/mm/pageattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/pageattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/pageattr.c linux-2.6.35.8/arch/x86/mm/pageattr.c
+--- linux-2.6.35.8/arch/x86/mm/pageattr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/pageattr.c 2010-09-17 20:12:09.000000000 -0400
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -19090,9 +19101,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/pageattr.c linux-2.6.35.7/arch/x86/mm/page
}
static int
-diff -urNp linux-2.6.35.7/arch/x86/mm/pageattr-test.c linux-2.6.35.7/arch/x86/mm/pageattr-test.c
---- linux-2.6.35.7/arch/x86/mm/pageattr-test.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/pageattr-test.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/pageattr-test.c linux-2.6.35.8/arch/x86/mm/pageattr-test.c
+--- linux-2.6.35.8/arch/x86/mm/pageattr-test.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/pageattr-test.c 2010-09-17 20:12:09.000000000 -0400
@@ -36,7 +36,7 @@ enum {
static int pte_testbit(pte_t pte)
@@ -19102,9 +19113,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/pageattr-test.c linux-2.6.35.7/arch/x86/mm
}
struct split_state {
-diff -urNp linux-2.6.35.7/arch/x86/mm/pat.c linux-2.6.35.7/arch/x86/mm/pat.c
---- linux-2.6.35.7/arch/x86/mm/pat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/pat.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/pat.c linux-2.6.35.8/arch/x86/mm/pat.c
+--- linux-2.6.35.8/arch/x86/mm/pat.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/pat.c 2010-09-17 20:12:09.000000000 -0400
@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
if (!entry) {
@@ -19152,9 +19163,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/pat.c linux-2.6.35.7/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.35.7/arch/x86/mm/pgtable_32.c linux-2.6.35.7/arch/x86/mm/pgtable_32.c
---- linux-2.6.35.7/arch/x86/mm/pgtable_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/pgtable_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/pgtable_32.c linux-2.6.35.8/arch/x86/mm/pgtable_32.c
+--- linux-2.6.35.8/arch/x86/mm/pgtable_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/pgtable_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr,
return;
}
@@ -19169,9 +19180,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/pgtable_32.c linux-2.6.35.7/arch/x86/mm/pg
/*
* It's enough to flush this one mapping.
-diff -urNp linux-2.6.35.7/arch/x86/mm/pgtable.c linux-2.6.35.7/arch/x86/mm/pgtable.c
---- linux-2.6.35.7/arch/x86/mm/pgtable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/pgtable.c 2010-10-10 15:54:54.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/pgtable.c linux-2.6.35.8/arch/x86/mm/pgtable.c
+--- linux-2.6.35.8/arch/x86/mm/pgtable.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/pgtable.c 2010-10-10 15:54:54.000000000 -0400
@@ -84,8 +84,58 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -19424,9 +19435,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/pgtable.c linux-2.6.35.7/arch/x86/mm/pgtab
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
-diff -urNp linux-2.6.35.7/arch/x86/mm/setup_nx.c linux-2.6.35.7/arch/x86/mm/setup_nx.c
---- linux-2.6.35.7/arch/x86/mm/setup_nx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/setup_nx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/setup_nx.c linux-2.6.35.8/arch/x86/mm/setup_nx.c
+--- linux-2.6.35.8/arch/x86/mm/setup_nx.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/setup_nx.c 2010-09-17 20:12:09.000000000 -0400
@@ -5,8 +5,10 @@
#include <asm/pgtable.h>
#include <asm/proto.h>
@@ -19456,9 +19467,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/setup_nx.c linux-2.6.35.7/arch/x86/mm/setu
__supported_pte_mask &= ~_PAGE_NX;
}
-diff -urNp linux-2.6.35.7/arch/x86/mm/tlb.c linux-2.6.35.7/arch/x86/mm/tlb.c
---- linux-2.6.35.7/arch/x86/mm/tlb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/mm/tlb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/mm/tlb.c linux-2.6.35.8/arch/x86/mm/tlb.c
+--- linux-2.6.35.8/arch/x86/mm/tlb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/mm/tlb.c 2010-09-17 20:12:09.000000000 -0400
@@ -13,7 +13,7 @@
#include <asm/uv/uv.h>
@@ -19480,9 +19491,9 @@ diff -urNp linux-2.6.35.7/arch/x86/mm/tlb.c linux-2.6.35.7/arch/x86/mm/tlb.c
}
EXPORT_SYMBOL_GPL(leave_mm);
-diff -urNp linux-2.6.35.7/arch/x86/oprofile/backtrace.c linux-2.6.35.7/arch/x86/oprofile/backtrace.c
---- linux-2.6.35.7/arch/x86/oprofile/backtrace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/oprofile/backtrace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/oprofile/backtrace.c linux-2.6.35.8/arch/x86/oprofile/backtrace.c
+--- linux-2.6.35.8/arch/x86/oprofile/backtrace.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/oprofile/backtrace.c 2010-09-17 20:12:09.000000000 -0400
@@ -58,7 +58,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -19501,9 +19512,9 @@ diff -urNp linux-2.6.35.7/arch/x86/oprofile/backtrace.c linux-2.6.35.7/arch/x86/
unsigned long stack = kernel_stack_pointer(regs);
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-2.6.35.7/arch/x86/oprofile/op_model_p4.c linux-2.6.35.7/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.35.7/arch/x86/oprofile/op_model_p4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/oprofile/op_model_p4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/oprofile/op_model_p4.c linux-2.6.35.8/arch/x86/oprofile/op_model_p4.c
+--- linux-2.6.35.8/arch/x86/oprofile/op_model_p4.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/oprofile/op_model_p4.c 2010-09-17 20:12:09.000000000 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -19513,9 +19524,9 @@ diff -urNp linux-2.6.35.7/arch/x86/oprofile/op_model_p4.c linux-2.6.35.7/arch/x8
{
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
-diff -urNp linux-2.6.35.7/arch/x86/pci/common.c linux-2.6.35.7/arch/x86/pci/common.c
---- linux-2.6.35.7/arch/x86/pci/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/common.c linux-2.6.35.8/arch/x86/pci/common.c
+--- linux-2.6.35.8/arch/x86/pci/common.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/common.c 2010-09-17 20:12:09.000000000 -0400
@@ -32,8 +32,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -19536,9 +19547,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/common.c linux-2.6.35.7/arch/x86/pci/comm
};
void __init dmi_check_pciprobe(void)
-diff -urNp linux-2.6.35.7/arch/x86/pci/direct.c linux-2.6.35.7/arch/x86/pci/direct.c
---- linux-2.6.35.7/arch/x86/pci/direct.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/direct.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/direct.c linux-2.6.35.8/arch/x86/pci/direct.c
+--- linux-2.6.35.8/arch/x86/pci/direct.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/direct.c 2010-09-17 20:12:09.000000000 -0400
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -19566,9 +19577,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/direct.c linux-2.6.35.7/arch/x86/pci/dire
{
u32 x = 0;
int year, devfn;
-diff -urNp linux-2.6.35.7/arch/x86/pci/fixup.c linux-2.6.35.7/arch/x86/pci/fixup.c
---- linux-2.6.35.7/arch/x86/pci/fixup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/fixup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/fixup.c linux-2.6.35.8/arch/x86/pci/fixup.c
+--- linux-2.6.35.8/arch/x86/pci/fixup.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/fixup.c 2010-09-17 20:12:09.000000000 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -19587,9 +19598,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/fixup.c linux-2.6.35.7/arch/x86/pci/fixup
};
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff -urNp linux-2.6.35.7/arch/x86/pci/irq.c linux-2.6.35.7/arch/x86/pci/irq.c
---- linux-2.6.35.7/arch/x86/pci/irq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/irq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/irq.c linux-2.6.35.8/arch/x86/pci/irq.c
+--- linux-2.6.35.8/arch/x86/pci/irq.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/irq.c 2010-09-17 20:12:09.000000000 -0400
@@ -542,7 +542,7 @@ static __init int intel_router_probe(str
static struct pci_device_id __initdata pirq_440gx[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) },
@@ -19608,9 +19619,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/irq.c linux-2.6.35.7/arch/x86/pci/irq.c
};
void __init pcibios_irq_init(void)
-diff -urNp linux-2.6.35.7/arch/x86/pci/mmconfig_32.c linux-2.6.35.7/arch/x86/pci/mmconfig_32.c
---- linux-2.6.35.7/arch/x86/pci/mmconfig_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/mmconfig_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/mmconfig_32.c linux-2.6.35.8/arch/x86/pci/mmconfig_32.c
+--- linux-2.6.35.8/arch/x86/pci/mmconfig_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/mmconfig_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19620,9 +19631,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/mmconfig_32.c linux-2.6.35.7/arch/x86/pci
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.35.7/arch/x86/pci/mmconfig_64.c linux-2.6.35.7/arch/x86/pci/mmconfig_64.c
---- linux-2.6.35.7/arch/x86/pci/mmconfig_64.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/mmconfig_64.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/mmconfig_64.c linux-2.6.35.8/arch/x86/pci/mmconfig_64.c
+--- linux-2.6.35.8/arch/x86/pci/mmconfig_64.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/mmconfig_64.c 2010-09-17 20:12:09.000000000 -0400
@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19632,9 +19643,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/mmconfig_64.c linux-2.6.35.7/arch/x86/pci
.read = pci_mmcfg_read,
.write = pci_mmcfg_write,
};
-diff -urNp linux-2.6.35.7/arch/x86/pci/numaq_32.c linux-2.6.35.7/arch/x86/pci/numaq_32.c
---- linux-2.6.35.7/arch/x86/pci/numaq_32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/numaq_32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/numaq_32.c linux-2.6.35.8/arch/x86/pci/numaq_32.c
+--- linux-2.6.35.8/arch/x86/pci/numaq_32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/numaq_32.c 2010-09-17 20:12:09.000000000 -0400
@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -19644,9 +19655,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/numaq_32.c linux-2.6.35.7/arch/x86/pci/nu
.read = pci_conf1_mq_read,
.write = pci_conf1_mq_write
};
-diff -urNp linux-2.6.35.7/arch/x86/pci/olpc.c linux-2.6.35.7/arch/x86/pci/olpc.c
---- linux-2.6.35.7/arch/x86/pci/olpc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/olpc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/olpc.c linux-2.6.35.8/arch/x86/pci/olpc.c
+--- linux-2.6.35.8/arch/x86/pci/olpc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/olpc.c 2010-09-17 20:12:09.000000000 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -19656,9 +19667,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/olpc.c linux-2.6.35.7/arch/x86/pci/olpc.c
.read = pci_olpc_read,
.write = pci_olpc_write,
};
-diff -urNp linux-2.6.35.7/arch/x86/pci/pcbios.c linux-2.6.35.7/arch/x86/pci/pcbios.c
---- linux-2.6.35.7/arch/x86/pci/pcbios.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/pci/pcbios.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/pci/pcbios.c linux-2.6.35.8/arch/x86/pci/pcbios.c
+--- linux-2.6.35.8/arch/x86/pci/pcbios.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/pci/pcbios.c 2010-09-17 20:12:09.000000000 -0400
@@ -57,50 +57,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -19981,9 +19992,9 @@ diff -urNp linux-2.6.35.7/arch/x86/pci/pcbios.c linux-2.6.35.7/arch/x86/pci/pcbi
return !(ret & 0xff00);
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-2.6.35.7/arch/x86/power/cpu.c linux-2.6.35.7/arch/x86/power/cpu.c
---- linux-2.6.35.7/arch/x86/power/cpu.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/power/cpu.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/power/cpu.c linux-2.6.35.8/arch/x86/power/cpu.c
+--- linux-2.6.35.8/arch/x86/power/cpu.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/arch/x86/power/cpu.c 2010-09-20 17:33:32.000000000 -0400
@@ -130,7 +130,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -20003,9 +20014,9 @@ diff -urNp linux-2.6.35.7/arch/x86/power/cpu.c linux-2.6.35.7/arch/x86/power/cpu
syscall_init(); /* This sets MSR_*STAR and related */
#endif
-diff -urNp linux-2.6.35.7/arch/x86/vdso/Makefile linux-2.6.35.7/arch/x86/vdso/Makefile
---- linux-2.6.35.7/arch/x86/vdso/Makefile 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/Makefile 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/Makefile linux-2.6.35.8/arch/x86/vdso/Makefile
+--- linux-2.6.35.8/arch/x86/vdso/Makefile 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/Makefile 2010-09-17 20:12:09.000000000 -0400
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -20015,9 +20026,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/Makefile linux-2.6.35.7/arch/x86/vdso/Ma
GCOV_PROFILE := n
#
-diff -urNp linux-2.6.35.7/arch/x86/vdso/vclock_gettime.c linux-2.6.35.7/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.35.7/arch/x86/vdso/vclock_gettime.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/vclock_gettime.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/vclock_gettime.c linux-2.6.35.8/arch/x86/vdso/vclock_gettime.c
+--- linux-2.6.35.8/arch/x86/vdso/vclock_gettime.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/vclock_gettime.c 2010-09-17 20:12:09.000000000 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -20116,9 +20127,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/vclock_gettime.c linux-2.6.35.7/arch/x86
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
-diff -urNp linux-2.6.35.7/arch/x86/vdso/vdso32-setup.c linux-2.6.35.7/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.35.7/arch/x86/vdso/vdso32-setup.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/vdso32-setup.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/vdso32-setup.c linux-2.6.35.8/arch/x86/vdso/vdso32-setup.c
+--- linux-2.6.35.8/arch/x86/vdso/vdso32-setup.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/vdso32-setup.c 2010-09-17 20:12:09.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -20201,9 +20212,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/vdso32-setup.c linux-2.6.35.7/arch/x86/v
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.35.7/arch/x86/vdso/vdso.lds.S linux-2.6.35.7/arch/x86/vdso/vdso.lds.S
---- linux-2.6.35.7/arch/x86/vdso/vdso.lds.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/vdso.lds.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/vdso.lds.S linux-2.6.35.8/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.35.8/arch/x86/vdso/vdso.lds.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/vdso.lds.S 2010-09-17 20:12:09.000000000 -0400
@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
#define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
#include "vextern.h"
@@ -20214,9 +20225,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/vdso.lds.S linux-2.6.35.7/arch/x86/vdso/
+VEXTERN(fallback_time)
+VEXTERN(getcpu)
+#undef VEXTERN
-diff -urNp linux-2.6.35.7/arch/x86/vdso/vextern.h linux-2.6.35.7/arch/x86/vdso/vextern.h
---- linux-2.6.35.7/arch/x86/vdso/vextern.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/vextern.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/vextern.h linux-2.6.35.8/arch/x86/vdso/vextern.h
+--- linux-2.6.35.8/arch/x86/vdso/vextern.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/vextern.h 2010-09-17 20:12:09.000000000 -0400
@@ -11,6 +11,5 @@
put into vextern.h and be referenced as a pointer with vdso prefix.
The main kernel later fills in the values. */
@@ -20224,9 +20235,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/vextern.h linux-2.6.35.7/arch/x86/vdso/v
-VEXTERN(jiffies)
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
-diff -urNp linux-2.6.35.7/arch/x86/vdso/vma.c linux-2.6.35.7/arch/x86/vdso/vma.c
---- linux-2.6.35.7/arch/x86/vdso/vma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/vdso/vma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/vdso/vma.c linux-2.6.35.8/arch/x86/vdso/vma.c
+--- linux-2.6.35.8/arch/x86/vdso/vma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/vdso/vma.c 2010-09-17 20:12:09.000000000 -0400
@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20273,9 +20284,9 @@ diff -urNp linux-2.6.35.7/arch/x86/vdso/vma.c linux-2.6.35.7/arch/x86/vdso/vma.c
- return 0;
-}
-__setup("vdso=", vdso_setup);
-diff -urNp linux-2.6.35.7/arch/x86/xen/enlighten.c linux-2.6.35.7/arch/x86/xen/enlighten.c
---- linux-2.6.35.7/arch/x86/xen/enlighten.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/xen/enlighten.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/xen/enlighten.c linux-2.6.35.8/arch/x86/xen/enlighten.c
+--- linux-2.6.35.8/arch/x86/xen/enlighten.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/xen/enlighten.c 2010-09-17 20:12:09.000000000 -0400
@@ -74,8 +74,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -20327,9 +20338,9 @@ diff -urNp linux-2.6.35.7/arch/x86/xen/enlighten.c linux-2.6.35.7/arch/x86/xen/e
xen_smp_init();
pgd = (pgd_t *)xen_start_info->pt_base;
-diff -urNp linux-2.6.35.7/arch/x86/xen/mmu.c linux-2.6.35.7/arch/x86/xen/mmu.c
---- linux-2.6.35.7/arch/x86/xen/mmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/xen/mmu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/xen/mmu.c linux-2.6.35.8/arch/x86/xen/mmu.c
+--- linux-2.6.35.8/arch/x86/xen/mmu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/xen/mmu.c 2010-09-17 20:12:09.000000000 -0400
@@ -1694,6 +1694,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -20350,9 +20361,9 @@ diff -urNp linux-2.6.35.7/arch/x86/xen/mmu.c linux-2.6.35.7/arch/x86/xen/mmu.c
set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
-diff -urNp linux-2.6.35.7/arch/x86/xen/smp.c linux-2.6.35.7/arch/x86/xen/smp.c
---- linux-2.6.35.7/arch/x86/xen/smp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/xen/smp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/xen/smp.c linux-2.6.35.8/arch/x86/xen/smp.c
+--- linux-2.6.35.8/arch/x86/xen/smp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/xen/smp.c 2010-09-17 20:12:09.000000000 -0400
@@ -169,11 +169,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -20376,9 +20387,9 @@ diff -urNp linux-2.6.35.7/arch/x86/xen/smp.c linux-2.6.35.7/arch/x86/xen/smp.c
ctxt->user_regs.ss = __KERNEL_DS;
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
-diff -urNp linux-2.6.35.7/arch/x86/xen/xen-head.S linux-2.6.35.7/arch/x86/xen/xen-head.S
---- linux-2.6.35.7/arch/x86/xen/xen-head.S 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/xen/xen-head.S 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/xen/xen-head.S linux-2.6.35.8/arch/x86/xen/xen-head.S
+--- linux-2.6.35.8/arch/x86/xen/xen-head.S 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/xen/xen-head.S 2010-09-17 20:12:09.000000000 -0400
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -20397,9 +20408,9 @@ diff -urNp linux-2.6.35.7/arch/x86/xen/xen-head.S linux-2.6.35.7/arch/x86/xen/xe
#else
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-2.6.35.7/arch/x86/xen/xen-ops.h linux-2.6.35.7/arch/x86/xen/xen-ops.h
---- linux-2.6.35.7/arch/x86/xen/xen-ops.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/arch/x86/xen/xen-ops.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/arch/x86/xen/xen-ops.h linux-2.6.35.8/arch/x86/xen/xen-ops.h
+--- linux-2.6.35.8/arch/x86/xen/xen-ops.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/arch/x86/xen/xen-ops.h 2010-09-17 20:12:09.000000000 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -20409,9 +20420,9 @@ diff -urNp linux-2.6.35.7/arch/x86/xen/xen-ops.h linux-2.6.35.7/arch/x86/xen/xen
struct trap_info;
void xen_copy_trap_info(struct trap_info *traps);
-diff -urNp linux-2.6.35.7/block/blk-iopoll.c linux-2.6.35.7/block/blk-iopoll.c
---- linux-2.6.35.7/block/blk-iopoll.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/block/blk-iopoll.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/block/blk-iopoll.c linux-2.6.35.8/block/blk-iopoll.c
+--- linux-2.6.35.8/block/blk-iopoll.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/block/blk-iopoll.c 2010-09-17 20:12:09.000000000 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20421,9 +20432,9 @@ diff -urNp linux-2.6.35.7/block/blk-iopoll.c linux-2.6.35.7/block/blk-iopoll.c
{
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-2.6.35.7/block/blk-map.c linux-2.6.35.7/block/blk-map.c
---- linux-2.6.35.7/block/blk-map.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/block/blk-map.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/block/blk-map.c linux-2.6.35.8/block/blk-map.c
+--- linux-2.6.35.8/block/blk-map.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/block/blk-map.c 2010-09-17 20:12:09.000000000 -0400
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -20442,9 +20453,9 @@ diff -urNp linux-2.6.35.7/block/blk-map.c linux-2.6.35.7/block/blk-map.c
if (do_copy)
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
-diff -urNp linux-2.6.35.7/block/blk-softirq.c linux-2.6.35.7/block/blk-softirq.c
---- linux-2.6.35.7/block/blk-softirq.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/block/blk-softirq.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/block/blk-softirq.c linux-2.6.35.8/block/blk-softirq.c
+--- linux-2.6.35.8/block/blk-softirq.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/block/blk-softirq.c 2010-09-17 20:12:09.000000000 -0400
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
@@ -20454,9 +20465,9 @@ diff -urNp linux-2.6.35.7/block/blk-softirq.c linux-2.6.35.7/block/blk-softirq.c
{
struct list_head *cpu_list, local_list;
-diff -urNp linux-2.6.35.7/crypto/lrw.c linux-2.6.35.7/crypto/lrw.c
---- linux-2.6.35.7/crypto/lrw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/crypto/lrw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/crypto/lrw.c linux-2.6.35.8/crypto/lrw.c
+--- linux-2.6.35.8/crypto/lrw.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/crypto/lrw.c 2010-09-17 20:12:09.000000000 -0400
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
@@ -20466,9 +20477,9 @@ diff -urNp linux-2.6.35.7/crypto/lrw.c linux-2.6.35.7/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.35.7/Documentation/dontdiff linux-2.6.35.7/Documentation/dontdiff
---- linux-2.6.35.7/Documentation/dontdiff 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/Documentation/dontdiff 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/Documentation/dontdiff linux-2.6.35.8/Documentation/dontdiff
+--- linux-2.6.35.8/Documentation/dontdiff 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/Documentation/dontdiff 2010-09-17 20:12:09.000000000 -0400
@@ -3,6 +3,7 @@
*.bin
*.cpio
@@ -20600,9 +20611,9 @@ diff -urNp linux-2.6.35.7/Documentation/dontdiff linux-2.6.35.7/Documentation/do
zImage*
zconf.hash.c
+zoffset.h
-diff -urNp linux-2.6.35.7/Documentation/filesystems/sysfs.txt linux-2.6.35.7/Documentation/filesystems/sysfs.txt
---- linux-2.6.35.7/Documentation/filesystems/sysfs.txt 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/Documentation/filesystems/sysfs.txt 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/Documentation/filesystems/sysfs.txt linux-2.6.35.8/Documentation/filesystems/sysfs.txt
+--- linux-2.6.35.8/Documentation/filesystems/sysfs.txt 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/Documentation/filesystems/sysfs.txt 2010-09-17 20:12:09.000000000 -0400
@@ -123,8 +123,8 @@ set of sysfs operations for forwarding r
show and store methods of the attribute owners.
@@ -20614,9 +20625,9 @@ diff -urNp linux-2.6.35.7/Documentation/filesystems/sysfs.txt linux-2.6.35.7/Doc
};
[ Subsystems should have already defined a struct kobj_type as a
-diff -urNp linux-2.6.35.7/Documentation/kernel-parameters.txt linux-2.6.35.7/Documentation/kernel-parameters.txt
---- linux-2.6.35.7/Documentation/kernel-parameters.txt 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/Documentation/kernel-parameters.txt 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/Documentation/kernel-parameters.txt linux-2.6.35.8/Documentation/kernel-parameters.txt
+--- linux-2.6.35.8/Documentation/kernel-parameters.txt 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/Documentation/kernel-parameters.txt 2010-09-17 20:12:09.000000000 -0400
@@ -1910,6 +1910,12 @@ and is between 256 and 4096 characters.
the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen.
@@ -20630,9 +20641,9 @@ diff -urNp linux-2.6.35.7/Documentation/kernel-parameters.txt linux-2.6.35.7/Doc
pcbit= [HW,ISDN]
pcd. [PARIDE]
-diff -urNp linux-2.6.35.7/drivers/acpi/battery.c linux-2.6.35.7/drivers/acpi/battery.c
---- linux-2.6.35.7/drivers/acpi/battery.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/battery.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/battery.c linux-2.6.35.8/drivers/acpi/battery.c
+--- linux-2.6.35.8/drivers/acpi/battery.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/battery.c 2010-09-17 20:12:09.000000000 -0400
@@ -810,7 +810,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -20642,9 +20653,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/battery.c linux-2.6.35.7/drivers/acpi/bat
mode_t mode;
const char *name;
} acpi_battery_file[] = {
-diff -urNp linux-2.6.35.7/drivers/acpi/blacklist.c linux-2.6.35.7/drivers/acpi/blacklist.c
---- linux-2.6.35.7/drivers/acpi/blacklist.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/blacklist.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/blacklist.c linux-2.6.35.8/drivers/acpi/blacklist.c
+--- linux-2.6.35.8/drivers/acpi/blacklist.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/blacklist.c 2010-10-31 17:14:30.000000000 -0400
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
@@ -20654,9 +20665,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/blacklist.c linux-2.6.35.7/drivers/acpi/b
};
#if CONFIG_ACPI_BLACKLIST_YEAR
-diff -urNp linux-2.6.35.7/drivers/acpi/dock.c linux-2.6.35.7/drivers/acpi/dock.c
---- linux-2.6.35.7/drivers/acpi/dock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/dock.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/dock.c linux-2.6.35.8/drivers/acpi/dock.c
+--- linux-2.6.35.8/drivers/acpi/dock.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/dock.c 2010-09-17 20:12:09.000000000 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -20675,9 +20686,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/dock.c linux-2.6.35.7/drivers/acpi/dock.c
void *context)
{
struct dock_dependent_device *dd;
-diff -urNp linux-2.6.35.7/drivers/acpi/osl.c linux-2.6.35.7/drivers/acpi/osl.c
---- linux-2.6.35.7/drivers/acpi/osl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/osl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/osl.c linux-2.6.35.8/drivers/acpi/osl.c
+--- linux-2.6.35.8/drivers/acpi/osl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/osl.c 2010-09-17 20:12:09.000000000 -0400
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -20696,9 +20707,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/osl.c linux-2.6.35.7/drivers/acpi/osl.c
switch (width) {
case 8:
-diff -urNp linux-2.6.35.7/drivers/acpi/power_meter.c linux-2.6.35.7/drivers/acpi/power_meter.c
---- linux-2.6.35.7/drivers/acpi/power_meter.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/power_meter.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/power_meter.c linux-2.6.35.8/drivers/acpi/power_meter.c
+--- linux-2.6.35.8/drivers/acpi/power_meter.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/power_meter.c 2010-09-17 20:12:09.000000000 -0400
@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -20708,9 +20719,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/power_meter.c linux-2.6.35.7/drivers/acpi
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
-diff -urNp linux-2.6.35.7/drivers/acpi/proc.c linux-2.6.35.7/drivers/acpi/proc.c
---- linux-2.6.35.7/drivers/acpi/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/proc.c linux-2.6.35.8/drivers/acpi/proc.c
+--- linux-2.6.35.8/drivers/acpi/proc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/proc.c 2010-09-17 20:12:09.000000000 -0400
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -20746,9 +20757,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/proc.c linux-2.6.35.7/drivers/acpi/proc.c
dev->wakeup.state.enabled =
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
-diff -urNp linux-2.6.35.7/drivers/acpi/processor_driver.c linux-2.6.35.7/drivers/acpi/processor_driver.c
---- linux-2.6.35.7/drivers/acpi/processor_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/processor_driver.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/processor_driver.c linux-2.6.35.8/drivers/acpi/processor_driver.c
+--- linux-2.6.35.8/drivers/acpi/processor_driver.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/processor_driver.c 2010-09-17 20:12:09.000000000 -0400
@@ -586,7 +586,7 @@ static int __cpuinit acpi_processor_add(
return 0;
#endif
@@ -20758,9 +20769,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/processor_driver.c linux-2.6.35.7/drivers
/*
* Buggy BIOS check
-diff -urNp linux-2.6.35.7/drivers/acpi/processor_idle.c linux-2.6.35.7/drivers/acpi/processor_idle.c
---- linux-2.6.35.7/drivers/acpi/processor_idle.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/processor_idle.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/processor_idle.c linux-2.6.35.8/drivers/acpi/processor_idle.c
+--- linux-2.6.35.8/drivers/acpi/processor_idle.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/processor_idle.c 2010-09-17 20:12:09.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20770,9 +20781,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/processor_idle.c linux-2.6.35.7/drivers/a
};
-diff -urNp linux-2.6.35.7/drivers/acpi/sleep.c linux-2.6.35.7/drivers/acpi/sleep.c
---- linux-2.6.35.7/drivers/acpi/sleep.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/sleep.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/sleep.c linux-2.6.35.8/drivers/acpi/sleep.c
+--- linux-2.6.35.8/drivers/acpi/sleep.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/sleep.c 2010-10-31 17:14:30.000000000 -0400
@@ -318,7 +318,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -20791,7 +20802,7 @@ diff -urNp linux-2.6.35.7/drivers/acpi/sleep.c linux-2.6.35.7/drivers/acpi/sleep
.valid = acpi_suspend_state_valid,
.begin = acpi_suspend_begin_old,
.prepare_late = acpi_pm_freeze,
-@@ -478,7 +478,7 @@ static void acpi_pm_thaw(void)
+@@ -500,7 +500,7 @@ static void acpi_pm_thaw(void)
acpi_enable_all_runtime_gpes();
}
@@ -20800,7 +20811,7 @@ diff -urNp linux-2.6.35.7/drivers/acpi/sleep.c linux-2.6.35.7/drivers/acpi/sleep
.begin = acpi_hibernation_begin,
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot,
-@@ -528,7 +528,7 @@ static int acpi_hibernation_pre_snapshot
+@@ -550,7 +550,7 @@ static int acpi_hibernation_pre_snapshot
* The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
* been requested.
*/
@@ -20809,9 +20820,9 @@ diff -urNp linux-2.6.35.7/drivers/acpi/sleep.c linux-2.6.35.7/drivers/acpi/sleep
.begin = acpi_hibernation_begin_old,
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
-diff -urNp linux-2.6.35.7/drivers/acpi/video.c linux-2.6.35.7/drivers/acpi/video.c
---- linux-2.6.35.7/drivers/acpi/video.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/acpi/video.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/acpi/video.c linux-2.6.35.8/drivers/acpi/video.c
+--- linux-2.6.35.8/drivers/acpi/video.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/acpi/video.c 2010-09-17 20:12:09.000000000 -0400
@@ -363,7 +363,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -20821,12 +20832,12 @@ diff -urNp linux-2.6.35.7/drivers/acpi/video.c linux-2.6.35.7/drivers/acpi/video
.get_brightness = acpi_video_get_brightness,
.update_status = acpi_video_set_brightness,
};
-diff -urNp linux-2.6.35.7/drivers/ata/ahci.c linux-2.6.35.7/drivers/ata/ahci.c
---- linux-2.6.35.7/drivers/ata/ahci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/ahci.c 2010-09-17 20:12:09.000000000 -0400
-@@ -89,17 +89,17 @@ static int ahci_pci_device_suspend(struc
- static int ahci_pci_device_resume(struct pci_dev *pdev);
- #endif
+diff -urNp linux-2.6.35.8/drivers/ata/ahci.c linux-2.6.35.8/drivers/ata/ahci.c
+--- linux-2.6.35.8/drivers/ata/ahci.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/ahci.c 2010-10-31 17:31:04.000000000 -0400
+@@ -93,17 +93,17 @@ static struct scsi_host_template ahci_sh
+ AHCI_SHT("ahci"),
+ };
-static struct ata_port_operations ahci_vt8251_ops = {
+static const struct ata_port_operations ahci_vt8251_ops = {
@@ -20845,7 +20856,7 @@ diff -urNp linux-2.6.35.7/drivers/ata/ahci.c linux-2.6.35.7/drivers/ata/ahci.c
.inherits = &ahci_ops,
.softreset = ahci_sb600_softreset,
.pmp_softreset = ahci_sb600_softreset,
-@@ -370,7 +370,7 @@ static const struct pci_device_id ahci_p
+@@ -374,7 +374,7 @@ static const struct pci_device_id ahci_p
{ PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
@@ -20854,21 +20865,21 @@ diff -urNp linux-2.6.35.7/drivers/ata/ahci.c linux-2.6.35.7/drivers/ata/ahci.c
};
-diff -urNp linux-2.6.35.7/drivers/ata/ahci.h linux-2.6.35.7/drivers/ata/ahci.h
---- linux-2.6.35.7/drivers/ata/ahci.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/ahci.h 2010-09-17 20:12:09.000000000 -0400
-@@ -298,7 +298,7 @@ struct ahci_host_priv {
- extern int ahci_ignore_sss;
+diff -urNp linux-2.6.35.8/drivers/ata/ahci.h linux-2.6.35.8/drivers/ata/ahci.h
+--- linux-2.6.35.8/drivers/ata/ahci.h 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/ahci.h 2010-10-31 17:30:27.000000000 -0400
+@@ -308,7 +308,7 @@ extern struct device_attribute *ahci_sde
+ .shost_attrs = ahci_shost_attrs, \
+ .sdev_attrs = ahci_sdev_attrs
- extern struct scsi_host_template ahci_sht;
-extern struct ata_port_operations ahci_ops;
+extern const struct ata_port_operations ahci_ops;
void ahci_save_initial_config(struct device *dev,
struct ahci_host_priv *hpriv,
-diff -urNp linux-2.6.35.7/drivers/ata/ata_generic.c linux-2.6.35.7/drivers/ata/ata_generic.c
---- linux-2.6.35.7/drivers/ata/ata_generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/ata_generic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/ata_generic.c linux-2.6.35.8/drivers/ata/ata_generic.c
+--- linux-2.6.35.8/drivers/ata/ata_generic.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/ata_generic.c 2010-09-17 20:12:09.000000000 -0400
@@ -104,7 +104,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20878,9 +20889,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/ata_generic.c linux-2.6.35.7/drivers/ata/a
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
-diff -urNp linux-2.6.35.7/drivers/ata/ata_piix.c linux-2.6.35.7/drivers/ata/ata_piix.c
---- linux-2.6.35.7/drivers/ata/ata_piix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/ata_piix.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/ata_piix.c linux-2.6.35.8/drivers/ata/ata_piix.c
+--- linux-2.6.35.8/drivers/ata/ata_piix.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/ata_piix.c 2010-09-17 20:12:09.000000000 -0400
@@ -302,7 +302,7 @@ static const struct pci_device_id piix_p
{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (CPT) */
@@ -20945,21 +20956,21 @@ diff -urNp linux-2.6.35.7/drivers/ata/ata_piix.c linux-2.6.35.7/drivers/ata/ata_
};
static const char *oemstrs[] = {
"Tecra M3,",
-diff -urNp linux-2.6.35.7/drivers/ata/libahci.c linux-2.6.35.7/drivers/ata/libahci.c
---- linux-2.6.35.7/drivers/ata/libahci.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/libahci.c 2010-09-20 17:33:32.000000000 -0400
-@@ -149,7 +149,7 @@ struct scsi_host_template ahci_sht = {
+diff -urNp linux-2.6.35.8/drivers/ata/libahci.c linux-2.6.35.8/drivers/ata/libahci.c
+--- linux-2.6.35.8/drivers/ata/libahci.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/libahci.c 2010-10-31 17:33:38.000000000 -0400
+@@ -141,7 +141,7 @@ struct device_attribute *ahci_sdev_attrs
};
- EXPORT_SYMBOL_GPL(ahci_sht);
+ EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
-struct ata_port_operations ahci_ops = {
+const struct ata_port_operations ahci_ops = {
.inherits = &sata_pmp_port_ops,
.qc_defer = ahci_pmp_qc_defer,
-diff -urNp linux-2.6.35.7/drivers/ata/libata-acpi.c linux-2.6.35.7/drivers/ata/libata-acpi.c
---- linux-2.6.35.7/drivers/ata/libata-acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/libata-acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/libata-acpi.c linux-2.6.35.8/drivers/ata/libata-acpi.c
+--- linux-2.6.35.8/drivers/ata/libata-acpi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/libata-acpi.c 2010-09-17 20:12:09.000000000 -0400
@@ -224,12 +224,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -20975,9 +20986,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/libata-acpi.c linux-2.6.35.7/drivers/ata/l
.handler = ata_acpi_ap_notify_dock,
.uevent = ata_acpi_ap_uevent,
};
-diff -urNp linux-2.6.35.7/drivers/ata/libata-core.c linux-2.6.35.7/drivers/ata/libata-core.c
---- linux-2.6.35.7/drivers/ata/libata-core.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/libata-core.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/libata-core.c linux-2.6.35.8/drivers/ata/libata-core.c
+--- linux-2.6.35.8/drivers/ata/libata-core.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/libata-core.c 2010-10-11 22:41:44.000000000 -0400
@@ -901,7 +901,7 @@ static const struct ata_xfer_ent {
{ ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
{ ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 },
@@ -21069,9 +21080,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/libata-core.c linux-2.6.35.7/drivers/ata/l
.qc_prep = ata_noop_qc_prep,
.qc_issue = ata_dummy_qc_issue,
.error_handler = ata_dummy_error_handler,
-diff -urNp linux-2.6.35.7/drivers/ata/libata-eh.c linux-2.6.35.7/drivers/ata/libata-eh.c
---- linux-2.6.35.7/drivers/ata/libata-eh.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/libata-eh.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/libata-eh.c linux-2.6.35.8/drivers/ata/libata-eh.c
+--- linux-2.6.35.8/drivers/ata/libata-eh.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/libata-eh.c 2010-09-20 17:33:32.000000000 -0400
@@ -3684,7 +3684,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -21081,9 +21092,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/libata-eh.c linux-2.6.35.7/drivers/ata/lib
ata_reset_fn_t hardreset = ops->hardreset;
/* ignore built-in hardreset if SCR access is not available */
-diff -urNp linux-2.6.35.7/drivers/ata/libata-pmp.c linux-2.6.35.7/drivers/ata/libata-pmp.c
---- linux-2.6.35.7/drivers/ata/libata-pmp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/libata-pmp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/libata-pmp.c linux-2.6.35.8/drivers/ata/libata-pmp.c
+--- linux-2.6.35.8/drivers/ata/libata-pmp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/libata-pmp.c 2010-09-17 20:12:09.000000000 -0400
@@ -868,7 +868,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -21093,9 +21104,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/libata-pmp.c linux-2.6.35.7/drivers/ata/li
int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
struct ata_link *pmp_link = &ap->link;
struct ata_device *pmp_dev = pmp_link->device;
-diff -urNp linux-2.6.35.7/drivers/ata/pata_acpi.c linux-2.6.35.7/drivers/ata/pata_acpi.c
---- linux-2.6.35.7/drivers/ata/pata_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_acpi.c linux-2.6.35.8/drivers/ata/pata_acpi.c
+--- linux-2.6.35.8/drivers/ata/pata_acpi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_acpi.c 2010-09-17 20:12:09.000000000 -0400
@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21105,9 +21116,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_acpi.c linux-2.6.35.7/drivers/ata/pat
.inherits = &ata_bmdma_port_ops,
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_ali.c linux-2.6.35.7/drivers/ata/pata_ali.c
---- linux-2.6.35.7/drivers/ata/pata_ali.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_ali.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_ali.c linux-2.6.35.8/drivers/ata/pata_ali.c
+--- linux-2.6.35.8/drivers/ata/pata_ali.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_ali.c 2010-09-17 20:12:09.000000000 -0400
@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -21153,9 +21164,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_ali.c linux-2.6.35.7/drivers/ata/pata
.inherits = &ali_dma_base_ops,
.check_atapi_dma = ali_check_atapi_dma,
.dev_config = ali_warn_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_amd.c linux-2.6.35.7/drivers/ata/pata_amd.c
---- linux-2.6.35.7/drivers/ata/pata_amd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_amd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_amd.c linux-2.6.35.8/drivers/ata/pata_amd.c
+--- linux-2.6.35.8/drivers/ata/pata_amd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_amd.c 2010-09-17 20:12:09.000000000 -0400
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -21205,9 +21216,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_amd.c linux-2.6.35.7/drivers/ata/pata
.inherits = &nv_base_port_ops,
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_artop.c linux-2.6.35.7/drivers/ata/pata_artop.c
---- linux-2.6.35.7/drivers/ata/pata_artop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_artop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_artop.c linux-2.6.35.8/drivers/ata/pata_artop.c
+--- linux-2.6.35.8/drivers/ata/pata_artop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_artop.c 2010-09-17 20:12:09.000000000 -0400
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21226,9 +21237,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_artop.c linux-2.6.35.7/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_at32.c linux-2.6.35.7/drivers/ata/pata_at32.c
---- linux-2.6.35.7/drivers/ata/pata_at32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_at32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_at32.c linux-2.6.35.8/drivers/ata/pata_at32.c
+--- linux-2.6.35.8/drivers/ata/pata_at32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_at32.c 2010-09-17 20:12:09.000000000 -0400
@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21238,9 +21249,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_at32.c linux-2.6.35.7/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_at91.c linux-2.6.35.7/drivers/ata/pata_at91.c
---- linux-2.6.35.7/drivers/ata/pata_at91.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_at91.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_at91.c linux-2.6.35.8/drivers/ata/pata_at91.c
+--- linux-2.6.35.8/drivers/ata/pata_at91.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_at91.c 2010-09-17 20:12:09.000000000 -0400
@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21250,9 +21261,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_at91.c linux-2.6.35.7/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.sff_data_xfer = pata_at91_data_xfer_noirq,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_atiixp.c linux-2.6.35.7/drivers/ata/pata_atiixp.c
---- linux-2.6.35.7/drivers/ata/pata_atiixp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_atiixp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_atiixp.c linux-2.6.35.8/drivers/ata/pata_atiixp.c
+--- linux-2.6.35.8/drivers/ata/pata_atiixp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_atiixp.c 2010-09-17 20:12:09.000000000 -0400
@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21262,9 +21273,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_atiixp.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_atp867x.c linux-2.6.35.7/drivers/ata/pata_atp867x.c
---- linux-2.6.35.7/drivers/ata/pata_atp867x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_atp867x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_atp867x.c linux-2.6.35.8/drivers/ata/pata_atp867x.c
+--- linux-2.6.35.8/drivers/ata/pata_atp867x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_atp867x.c 2010-09-17 20:12:09.000000000 -0400
@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21274,9 +21285,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_atp867x.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_bf54x.c linux-2.6.35.7/drivers/ata/pata_bf54x.c
---- linux-2.6.35.7/drivers/ata/pata_bf54x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_bf54x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_bf54x.c linux-2.6.35.8/drivers/ata/pata_bf54x.c
+--- linux-2.6.35.8/drivers/ata/pata_bf54x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_bf54x.c 2010-09-17 20:12:09.000000000 -0400
@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21286,9 +21297,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_bf54x.c linux-2.6.35.7/drivers/ata/pa
.inherits = &ata_bmdma_port_ops,
.set_piomode = bfin_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cmd640.c linux-2.6.35.7/drivers/ata/pata_cmd640.c
---- linux-2.6.35.7/drivers/ata/pata_cmd640.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cmd640.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cmd640.c linux-2.6.35.8/drivers/ata/pata_cmd640.c
+--- linux-2.6.35.8/drivers/ata/pata_cmd640.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cmd640.c 2010-09-17 20:12:09.000000000 -0400
@@ -165,7 +165,7 @@ static struct scsi_host_template cmd640_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21298,9 +21309,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cmd640.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_sff_port_ops,
/* In theory xfer_noirq is not needed once we kill the prefetcher */
.sff_data_xfer = ata_sff_data_xfer_noirq,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cmd64x.c linux-2.6.35.7/drivers/ata/pata_cmd64x.c
---- linux-2.6.35.7/drivers/ata/pata_cmd64x.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cmd64x.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cmd64x.c linux-2.6.35.8/drivers/ata/pata_cmd64x.c
+--- linux-2.6.35.8/drivers/ata/pata_cmd64x.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cmd64x.c 2010-09-20 17:33:32.000000000 -0400
@@ -268,18 +268,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -21323,9 +21334,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cmd64x.c linux-2.6.35.7/drivers/ata/p
.inherits = &cmd64x_base_ops,
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5520.c linux-2.6.35.7/drivers/ata/pata_cs5520.c
---- linux-2.6.35.7/drivers/ata/pata_cs5520.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cs5520.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cs5520.c linux-2.6.35.8/drivers/ata/pata_cs5520.c
+--- linux-2.6.35.8/drivers/ata/pata_cs5520.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cs5520.c 2010-09-17 20:12:09.000000000 -0400
@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21335,9 +21346,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5520.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5530.c linux-2.6.35.7/drivers/ata/pata_cs5530.c
---- linux-2.6.35.7/drivers/ata/pata_cs5530.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cs5530.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cs5530.c linux-2.6.35.8/drivers/ata/pata_cs5530.c
+--- linux-2.6.35.8/drivers/ata/pata_cs5530.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cs5530.c 2010-09-17 20:12:09.000000000 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21347,9 +21358,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5530.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5535.c linux-2.6.35.7/drivers/ata/pata_cs5535.c
---- linux-2.6.35.7/drivers/ata/pata_cs5535.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cs5535.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cs5535.c linux-2.6.35.8/drivers/ata/pata_cs5535.c
+--- linux-2.6.35.8/drivers/ata/pata_cs5535.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cs5535.c 2010-09-17 20:12:09.000000000 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21359,9 +21370,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5535.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5536.c linux-2.6.35.7/drivers/ata/pata_cs5536.c
---- linux-2.6.35.7/drivers/ata/pata_cs5536.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cs5536.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cs5536.c linux-2.6.35.8/drivers/ata/pata_cs5536.c
+--- linux-2.6.35.8/drivers/ata/pata_cs5536.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cs5536.c 2010-09-17 20:12:09.000000000 -0400
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21371,9 +21382,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cs5536.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma32_port_ops,
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_cypress.c linux-2.6.35.7/drivers/ata/pata_cypress.c
---- linux-2.6.35.7/drivers/ata/pata_cypress.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_cypress.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_cypress.c linux-2.6.35.8/drivers/ata/pata_cypress.c
+--- linux-2.6.35.8/drivers/ata/pata_cypress.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_cypress.c 2010-09-17 20:12:09.000000000 -0400
@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21383,9 +21394,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_cypress.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_efar.c linux-2.6.35.7/drivers/ata/pata_efar.c
---- linux-2.6.35.7/drivers/ata/pata_efar.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_efar.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_efar.c linux-2.6.35.8/drivers/ata/pata_efar.c
+--- linux-2.6.35.8/drivers/ata/pata_efar.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_efar.c 2010-09-17 20:12:09.000000000 -0400
@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21395,9 +21406,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_efar.c linux-2.6.35.7/drivers/ata/pat
.inherits = &ata_bmdma_port_ops,
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt366.c linux-2.6.35.7/drivers/ata/pata_hpt366.c
---- linux-2.6.35.7/drivers/ata/pata_hpt366.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_hpt366.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_hpt366.c linux-2.6.35.8/drivers/ata/pata_hpt366.c
+--- linux-2.6.35.8/drivers/ata/pata_hpt366.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_hpt366.c 2010-09-17 20:12:09.000000000 -0400
@@ -269,7 +269,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -21407,9 +21418,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt366.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt37x.c linux-2.6.35.7/drivers/ata/pata_hpt37x.c
---- linux-2.6.35.7/drivers/ata/pata_hpt37x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_hpt37x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_hpt37x.c linux-2.6.35.8/drivers/ata/pata_hpt37x.c
+--- linux-2.6.35.8/drivers/ata/pata_hpt37x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_hpt37x.c 2010-09-17 20:12:09.000000000 -0400
@@ -564,7 +564,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -21446,9 +21457,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt37x.c linux-2.6.35.7/drivers/ata/p
.inherits = &hpt372_port_ops,
.cable_detect = hpt374_fn1_cable_detect,
.prereset = hpt37x_pre_reset,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt3x2n.c linux-2.6.35.7/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.35.7/drivers/ata/pata_hpt3x2n.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_hpt3x2n.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_hpt3x2n.c linux-2.6.35.8/drivers/ata/pata_hpt3x2n.c
+--- linux-2.6.35.8/drivers/ata/pata_hpt3x2n.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_hpt3x2n.c 2010-09-17 20:12:09.000000000 -0400
@@ -331,7 +331,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -21458,9 +21469,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt3x2n.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.bmdma_stop = hpt3x2n_bmdma_stop,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt3x3.c linux-2.6.35.7/drivers/ata/pata_hpt3x3.c
---- linux-2.6.35.7/drivers/ata/pata_hpt3x3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_hpt3x3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_hpt3x3.c linux-2.6.35.8/drivers/ata/pata_hpt3x3.c
+--- linux-2.6.35.8/drivers/ata/pata_hpt3x3.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_hpt3x3.c 2010-09-17 20:12:09.000000000 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21470,9 +21481,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_hpt3x3.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_icside.c linux-2.6.35.7/drivers/ata/pata_icside.c
---- linux-2.6.35.7/drivers/ata/pata_icside.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_icside.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_icside.c linux-2.6.35.8/drivers/ata/pata_icside.c
+--- linux-2.6.35.8/drivers/ata/pata_icside.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_icside.c 2010-09-17 20:12:09.000000000 -0400
@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct
}
}
@@ -21482,9 +21493,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_icside.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_isapnp.c linux-2.6.35.7/drivers/ata/pata_isapnp.c
---- linux-2.6.35.7/drivers/ata/pata_isapnp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_isapnp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_isapnp.c linux-2.6.35.8/drivers/ata/pata_isapnp.c
+--- linux-2.6.35.8/drivers/ata/pata_isapnp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_isapnp.c 2010-09-17 20:12:09.000000000 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21500,9 +21511,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_isapnp.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
/* No altstatus so we don't want to use the lost interrupt poll */
-diff -urNp linux-2.6.35.7/drivers/ata/pata_it8213.c linux-2.6.35.7/drivers/ata/pata_it8213.c
---- linux-2.6.35.7/drivers/ata/pata_it8213.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_it8213.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_it8213.c linux-2.6.35.8/drivers/ata/pata_it8213.c
+--- linux-2.6.35.8/drivers/ata/pata_it8213.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_it8213.c 2010-09-17 20:12:09.000000000 -0400
@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_
};
@@ -21512,9 +21523,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_it8213.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_it821x.c linux-2.6.35.7/drivers/ata/pata_it821x.c
---- linux-2.6.35.7/drivers/ata/pata_it821x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_it821x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_it821x.c linux-2.6.35.8/drivers/ata/pata_it821x.c
+--- linux-2.6.35.8/drivers/ata/pata_it821x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_it821x.c 2010-09-17 20:12:09.000000000 -0400
@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21542,9 +21553,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_it821x.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.check_atapi_dma= it821x_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.35.7/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.35.7/drivers/ata/pata_ixp4xx_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_ixp4xx_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_ixp4xx_cf.c linux-2.6.35.8/drivers/ata/pata_ixp4xx_cf.c
+--- linux-2.6.35.8/drivers/ata/pata_ixp4xx_cf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_ixp4xx_cf.c 2010-09-17 20:12:09.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21554,9 +21565,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.35.7/drivers/at
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_jmicron.c linux-2.6.35.7/drivers/ata/pata_jmicron.c
---- linux-2.6.35.7/drivers/ata/pata_jmicron.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_jmicron.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_jmicron.c linux-2.6.35.8/drivers/ata/pata_jmicron.c
+--- linux-2.6.35.8/drivers/ata/pata_jmicron.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_jmicron.c 2010-09-17 20:12:09.000000000 -0400
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21566,9 +21577,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_jmicron.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.prereset = jmicron_pre_reset,
};
-diff -urNp linux-2.6.35.7/drivers/ata/pata_legacy.c linux-2.6.35.7/drivers/ata/pata_legacy.c
---- linux-2.6.35.7/drivers/ata/pata_legacy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_legacy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_legacy.c linux-2.6.35.8/drivers/ata/pata_legacy.c
+--- linux-2.6.35.8/drivers/ata/pata_legacy.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_legacy.c 2010-09-17 20:12:09.000000000 -0400
@@ -113,7 +113,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -21680,9 +21691,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_legacy.c linux-2.6.35.7/drivers/ata/p
struct legacy_data *ld = &legacy_data[probe->slot];
struct ata_host *host = NULL;
struct ata_port *ap;
-diff -urNp linux-2.6.35.7/drivers/ata/pata_macio.c linux-2.6.35.7/drivers/ata/pata_macio.c
---- linux-2.6.35.7/drivers/ata/pata_macio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_macio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_macio.c linux-2.6.35.8/drivers/ata/pata_macio.c
+--- linux-2.6.35.8/drivers/ata/pata_macio.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_macio.c 2010-09-17 20:12:09.000000000 -0400
@@ -918,9 +918,8 @@ static struct scsi_host_template pata_ma
.slave_configure = pata_macio_slave_config,
};
@@ -21694,9 +21705,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_macio.c linux-2.6.35.7/drivers/ata/pa
.freeze = pata_macio_freeze,
.set_piomode = pata_macio_set_timings,
.set_dmamode = pata_macio_set_timings,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_marvell.c linux-2.6.35.7/drivers/ata/pata_marvell.c
---- linux-2.6.35.7/drivers/ata/pata_marvell.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_marvell.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_marvell.c linux-2.6.35.8/drivers/ata/pata_marvell.c
+--- linux-2.6.35.8/drivers/ata/pata_marvell.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_marvell.c 2010-09-17 20:12:09.000000000 -0400
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21706,9 +21717,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_marvell.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_mpc52xx.c linux-2.6.35.7/drivers/ata/pata_mpc52xx.c
---- linux-2.6.35.7/drivers/ata/pata_mpc52xx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_mpc52xx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_mpc52xx.c linux-2.6.35.8/drivers/ata/pata_mpc52xx.c
+--- linux-2.6.35.8/drivers/ata/pata_mpc52xx.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_mpc52xx.c 2010-09-17 20:12:09.000000000 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -21718,9 +21729,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_mpc52xx.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_sff_port_ops,
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_mpiix.c linux-2.6.35.7/drivers/ata/pata_mpiix.c
---- linux-2.6.35.7/drivers/ata/pata_mpiix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_mpiix.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_mpiix.c linux-2.6.35.8/drivers/ata/pata_mpiix.c
+--- linux-2.6.35.8/drivers/ata/pata_mpiix.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_mpiix.c 2010-09-17 20:12:09.000000000 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -21730,9 +21741,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_mpiix.c linux-2.6.35.7/drivers/ata/pa
.inherits = &ata_sff_port_ops,
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_netcell.c linux-2.6.35.7/drivers/ata/pata_netcell.c
---- linux-2.6.35.7/drivers/ata/pata_netcell.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_netcell.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_netcell.c linux-2.6.35.8/drivers/ata/pata_netcell.c
+--- linux-2.6.35.8/drivers/ata/pata_netcell.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_netcell.c 2010-09-17 20:12:09.000000000 -0400
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21742,9 +21753,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_netcell.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_ninja32.c linux-2.6.35.7/drivers/ata/pata_ninja32.c
---- linux-2.6.35.7/drivers/ata/pata_ninja32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_ninja32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_ninja32.c linux-2.6.35.8/drivers/ata/pata_ninja32.c
+--- linux-2.6.35.8/drivers/ata/pata_ninja32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_ninja32.c 2010-09-17 20:12:09.000000000 -0400
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21754,9 +21765,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_ninja32.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_ns87410.c linux-2.6.35.7/drivers/ata/pata_ns87410.c
---- linux-2.6.35.7/drivers/ata/pata_ns87410.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_ns87410.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_ns87410.c linux-2.6.35.8/drivers/ata/pata_ns87410.c
+--- linux-2.6.35.8/drivers/ata/pata_ns87410.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_ns87410.c 2010-09-17 20:12:09.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -21766,9 +21777,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_ns87410.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_sff_port_ops,
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_ns87415.c linux-2.6.35.7/drivers/ata/pata_ns87415.c
---- linux-2.6.35.7/drivers/ata/pata_ns87415.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_ns87415.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_ns87415.c linux-2.6.35.8/drivers/ata/pata_ns87415.c
+--- linux-2.6.35.8/drivers/ata/pata_ns87415.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_ns87415.c 2010-09-17 20:12:09.000000000 -0400
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -21787,9 +21798,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_ns87415.c linux-2.6.35.7/drivers/ata/
.inherits = &ns87415_pata_ops,
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_octeon_cf.c linux-2.6.35.7/drivers/ata/pata_octeon_cf.c
---- linux-2.6.35.7/drivers/ata/pata_octeon_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_octeon_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_octeon_cf.c linux-2.6.35.8/drivers/ata/pata_octeon_cf.c
+--- linux-2.6.35.8/drivers/ata/pata_octeon_cf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_octeon_cf.c 2010-09-17 20:12:09.000000000 -0400
@@ -782,6 +782,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -21798,9 +21809,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_octeon_cf.c linux-2.6.35.7/drivers/at
static struct ata_port_operations octeon_cf_ops = {
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_oldpiix.c linux-2.6.35.7/drivers/ata/pata_oldpiix.c
---- linux-2.6.35.7/drivers/ata/pata_oldpiix.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_oldpiix.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_oldpiix.c linux-2.6.35.8/drivers/ata/pata_oldpiix.c
+--- linux-2.6.35.8/drivers/ata/pata_oldpiix.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_oldpiix.c 2010-09-17 20:12:09.000000000 -0400
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21810,9 +21821,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_oldpiix.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_opti.c linux-2.6.35.7/drivers/ata/pata_opti.c
---- linux-2.6.35.7/drivers/ata/pata_opti.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_opti.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_opti.c linux-2.6.35.8/drivers/ata/pata_opti.c
+--- linux-2.6.35.8/drivers/ata/pata_opti.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_opti.c 2010-09-17 20:12:09.000000000 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21822,9 +21833,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_opti.c linux-2.6.35.7/drivers/ata/pat
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_optidma.c linux-2.6.35.7/drivers/ata/pata_optidma.c
---- linux-2.6.35.7/drivers/ata/pata_optidma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_optidma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_optidma.c linux-2.6.35.8/drivers/ata/pata_optidma.c
+--- linux-2.6.35.8/drivers/ata/pata_optidma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_optidma.c 2010-09-17 20:12:09.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21843,9 +21854,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_optidma.c linux-2.6.35.7/drivers/ata/
.inherits = &optidma_port_ops,
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_palmld.c linux-2.6.35.7/drivers/ata/pata_palmld.c
---- linux-2.6.35.7/drivers/ata/pata_palmld.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_palmld.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_palmld.c linux-2.6.35.8/drivers/ata/pata_palmld.c
+--- linux-2.6.35.8/drivers/ata/pata_palmld.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_palmld.c 2010-09-17 20:12:09.000000000 -0400
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21855,9 +21866,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_palmld.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_pcmcia.c linux-2.6.35.7/drivers/ata/pata_pcmcia.c
---- linux-2.6.35.7/drivers/ata/pata_pcmcia.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_pcmcia.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_pcmcia.c linux-2.6.35.8/drivers/ata/pata_pcmcia.c
+--- linux-2.6.35.8/drivers/ata/pata_pcmcia.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_pcmcia.c 2010-09-17 20:12:09.000000000 -0400
@@ -153,14 +153,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21884,9 +21895,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_pcmcia.c linux-2.6.35.7/drivers/ata/p
/* Set up attributes in order to probe card and get resources */
pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-diff -urNp linux-2.6.35.7/drivers/ata/pata_pdc2027x.c linux-2.6.35.7/drivers/ata/pata_pdc2027x.c
---- linux-2.6.35.7/drivers/ata/pata_pdc2027x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_pdc2027x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_pdc2027x.c linux-2.6.35.8/drivers/ata/pata_pdc2027x.c
+--- linux-2.6.35.8/drivers/ata/pata_pdc2027x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_pdc2027x.c 2010-09-17 20:12:09.000000000 -0400
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21904,9 +21915,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_pdc2027x.c linux-2.6.35.7/drivers/ata
.inherits = &pdc2027x_pata100_ops,
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.35.7/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.35.7/drivers/ata/pata_pdc202xx_old.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_pdc202xx_old.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_pdc202xx_old.c linux-2.6.35.8/drivers/ata/pata_pdc202xx_old.c
+--- linux-2.6.35.8/drivers/ata/pata_pdc202xx_old.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_pdc202xx_old.c 2010-09-17 20:12:09.000000000 -0400
@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21925,9 +21936,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.35.7/drivers
.inherits = &pdc2024x_port_ops,
.check_atapi_dma = pdc2026x_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_piccolo.c linux-2.6.35.7/drivers/ata/pata_piccolo.c
---- linux-2.6.35.7/drivers/ata/pata_piccolo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_piccolo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_piccolo.c linux-2.6.35.8/drivers/ata/pata_piccolo.c
+--- linux-2.6.35.8/drivers/ata/pata_piccolo.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_piccolo.c 2010-09-17 20:12:09.000000000 -0400
@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21937,9 +21948,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_piccolo.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = tosh_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_platform.c linux-2.6.35.7/drivers/ata/pata_platform.c
---- linux-2.6.35.7/drivers/ata/pata_platform.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_platform.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_platform.c linux-2.6.35.8/drivers/ata/pata_platform.c
+--- linux-2.6.35.8/drivers/ata/pata_platform.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_platform.c 2010-09-17 20:12:09.000000000 -0400
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -21949,9 +21960,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_platform.c linux-2.6.35.7/drivers/ata
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_qdi.c linux-2.6.35.7/drivers/ata/pata_qdi.c
---- linux-2.6.35.7/drivers/ata/pata_qdi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_qdi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_qdi.c linux-2.6.35.8/drivers/ata/pata_qdi.c
+--- linux-2.6.35.8/drivers/ata/pata_qdi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_qdi.c 2010-09-17 20:12:09.000000000 -0400
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -21970,9 +21981,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_qdi.c linux-2.6.35.7/drivers/ata/pata
.inherits = &qdi6500_port_ops,
.set_piomode = qdi6580_set_piomode,
};
-diff -urNp linux-2.6.35.7/drivers/ata/pata_radisys.c linux-2.6.35.7/drivers/ata/pata_radisys.c
---- linux-2.6.35.7/drivers/ata/pata_radisys.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_radisys.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_radisys.c linux-2.6.35.8/drivers/ata/pata_radisys.c
+--- linux-2.6.35.8/drivers/ata/pata_radisys.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_radisys.c 2010-09-17 20:12:09.000000000 -0400
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21982,9 +21993,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_radisys.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_rb532_cf.c linux-2.6.35.7/drivers/ata/pata_rb532_cf.c
---- linux-2.6.35.7/drivers/ata/pata_rb532_cf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_rb532_cf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_rb532_cf.c linux-2.6.35.8/drivers/ata/pata_rb532_cf.c
+--- linux-2.6.35.8/drivers/ata/pata_rb532_cf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_rb532_cf.c 2010-09-17 20:12:09.000000000 -0400
@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -21994,9 +22005,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_rb532_cf.c linux-2.6.35.7/drivers/ata
.inherits = &ata_sff_port_ops,
.sff_data_xfer = ata_sff_data_xfer32,
};
-diff -urNp linux-2.6.35.7/drivers/ata/pata_rdc.c linux-2.6.35.7/drivers/ata/pata_rdc.c
---- linux-2.6.35.7/drivers/ata/pata_rdc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_rdc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_rdc.c linux-2.6.35.8/drivers/ata/pata_rdc.c
+--- linux-2.6.35.8/drivers/ata/pata_rdc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_rdc.c 2010-09-17 20:12:09.000000000 -0400
@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -22006,9 +22017,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_rdc.c linux-2.6.35.7/drivers/ata/pata
.inherits = &ata_bmdma32_port_ops,
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_rz1000.c linux-2.6.35.7/drivers/ata/pata_rz1000.c
---- linux-2.6.35.7/drivers/ata/pata_rz1000.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_rz1000.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_rz1000.c linux-2.6.35.8/drivers/ata/pata_rz1000.c
+--- linux-2.6.35.8/drivers/ata/pata_rz1000.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_rz1000.c 2010-09-17 20:12:09.000000000 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -22018,9 +22029,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_rz1000.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_sff_port_ops,
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_sc1200.c linux-2.6.35.7/drivers/ata/pata_sc1200.c
---- linux-2.6.35.7/drivers/ata/pata_sc1200.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_sc1200.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_sc1200.c linux-2.6.35.8/drivers/ata/pata_sc1200.c
+--- linux-2.6.35.8/drivers/ata/pata_sc1200.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_sc1200.c 2010-09-17 20:12:09.000000000 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -22030,9 +22041,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_sc1200.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma_port_ops,
.qc_prep = ata_bmdma_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_scc.c linux-2.6.35.7/drivers/ata/pata_scc.c
---- linux-2.6.35.7/drivers/ata/pata_scc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_scc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_scc.c linux-2.6.35.8/drivers/ata/pata_scc.c
+--- linux-2.6.35.8/drivers/ata/pata_scc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_scc.c 2010-09-17 20:12:09.000000000 -0400
@@ -927,7 +927,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22042,9 +22053,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_scc.c linux-2.6.35.7/drivers/ata/pata
.inherits = &ata_bmdma_port_ops,
.set_piomode = scc_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_sch.c linux-2.6.35.7/drivers/ata/pata_sch.c
---- linux-2.6.35.7/drivers/ata/pata_sch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_sch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_sch.c linux-2.6.35.8/drivers/ata/pata_sch.c
+--- linux-2.6.35.8/drivers/ata/pata_sch.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_sch.c 2010-09-17 20:12:09.000000000 -0400
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22054,9 +22065,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_sch.c linux-2.6.35.7/drivers/ata/pata
.inherits = &ata_bmdma_port_ops,
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_serverworks.c linux-2.6.35.7/drivers/ata/pata_serverworks.c
---- linux-2.6.35.7/drivers/ata/pata_serverworks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_serverworks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_serverworks.c linux-2.6.35.8/drivers/ata/pata_serverworks.c
+--- linux-2.6.35.8/drivers/ata/pata_serverworks.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_serverworks.c 2010-09-17 20:12:09.000000000 -0400
@@ -300,7 +300,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22075,9 +22086,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_serverworks.c linux-2.6.35.7/drivers/
.inherits = &serverworks_osb4_port_ops,
.mode_filter = serverworks_csb_filter,
};
-diff -urNp linux-2.6.35.7/drivers/ata/pata_sil680.c linux-2.6.35.7/drivers/ata/pata_sil680.c
---- linux-2.6.35.7/drivers/ata/pata_sil680.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_sil680.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_sil680.c linux-2.6.35.8/drivers/ata/pata_sil680.c
+--- linux-2.6.35.8/drivers/ata/pata_sil680.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_sil680.c 2010-09-17 20:12:09.000000000 -0400
@@ -214,8 +214,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22088,9 +22099,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_sil680.c linux-2.6.35.7/drivers/ata/p
.inherits = &ata_bmdma32_port_ops,
.sff_exec_command = sil680_sff_exec_command,
.cable_detect = sil680_cable_detect,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_sis.c linux-2.6.35.7/drivers/ata/pata_sis.c
---- linux-2.6.35.7/drivers/ata/pata_sis.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_sis.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_sis.c linux-2.6.35.8/drivers/ata/pata_sis.c
+--- linux-2.6.35.8/drivers/ata/pata_sis.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_sis.c 2010-09-17 20:12:09.000000000 -0400
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22146,9 +22157,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_sis.c linux-2.6.35.7/drivers/ata/pata
.inherits = &sis_base_ops,
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_sl82c105.c linux-2.6.35.7/drivers/ata/pata_sl82c105.c
---- linux-2.6.35.7/drivers/ata/pata_sl82c105.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_sl82c105.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_sl82c105.c linux-2.6.35.8/drivers/ata/pata_sl82c105.c
+--- linux-2.6.35.8/drivers/ata/pata_sl82c105.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_sl82c105.c 2010-09-17 20:12:09.000000000 -0400
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22158,9 +22169,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_sl82c105.c linux-2.6.35.7/drivers/ata
.inherits = &ata_bmdma_port_ops,
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_triflex.c linux-2.6.35.7/drivers/ata/pata_triflex.c
---- linux-2.6.35.7/drivers/ata/pata_triflex.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_triflex.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_triflex.c linux-2.6.35.8/drivers/ata/pata_triflex.c
+--- linux-2.6.35.8/drivers/ata/pata_triflex.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_triflex.c 2010-09-17 20:12:09.000000000 -0400
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22170,9 +22181,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_triflex.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_bmdma_port_ops,
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
-diff -urNp linux-2.6.35.7/drivers/ata/pata_via.c linux-2.6.35.7/drivers/ata/pata_via.c
---- linux-2.6.35.7/drivers/ata/pata_via.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_via.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_via.c linux-2.6.35.8/drivers/ata/pata_via.c
+--- linux-2.6.35.8/drivers/ata/pata_via.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_via.c 2010-09-20 17:33:32.000000000 -0400
@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22191,9 +22202,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_via.c linux-2.6.35.7/drivers/ata/pata
.inherits = &via_port_ops,
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
-diff -urNp linux-2.6.35.7/drivers/ata/pata_winbond.c linux-2.6.35.7/drivers/ata/pata_winbond.c
---- linux-2.6.35.7/drivers/ata/pata_winbond.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pata_winbond.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pata_winbond.c linux-2.6.35.8/drivers/ata/pata_winbond.c
+--- linux-2.6.35.8/drivers/ata/pata_winbond.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pata_winbond.c 2010-09-17 20:12:09.000000000 -0400
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -22203,9 +22214,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pata_winbond.c linux-2.6.35.7/drivers/ata/
.inherits = &ata_sff_port_ops,
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
-diff -urNp linux-2.6.35.7/drivers/ata/pdc_adma.c linux-2.6.35.7/drivers/ata/pdc_adma.c
---- linux-2.6.35.7/drivers/ata/pdc_adma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/pdc_adma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/pdc_adma.c linux-2.6.35.8/drivers/ata/pdc_adma.c
+--- linux-2.6.35.8/drivers/ata/pdc_adma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/pdc_adma.c 2010-09-17 20:12:09.000000000 -0400
@@ -146,7 +146,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -22215,9 +22226,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/pdc_adma.c linux-2.6.35.7/drivers/ata/pdc_
.inherits = &ata_sff_port_ops,
.lost_interrupt = ATA_OP_NULL,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_fsl.c linux-2.6.35.7/drivers/ata/sata_fsl.c
---- linux-2.6.35.7/drivers/ata/sata_fsl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_fsl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_fsl.c linux-2.6.35.8/drivers/ata/sata_fsl.c
+--- linux-2.6.35.8/drivers/ata/sata_fsl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_fsl.c 2010-09-17 20:12:09.000000000 -0400
@@ -1261,7 +1261,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22227,9 +22238,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_fsl.c linux-2.6.35.7/drivers/ata/sata
.inherits = &sata_pmp_port_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_inic162x.c linux-2.6.35.7/drivers/ata/sata_inic162x.c
---- linux-2.6.35.7/drivers/ata/sata_inic162x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_inic162x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_inic162x.c linux-2.6.35.8/drivers/ata/sata_inic162x.c
+--- linux-2.6.35.8/drivers/ata/sata_inic162x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_inic162x.c 2010-09-17 20:12:09.000000000 -0400
@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -22239,9 +22250,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_inic162x.c linux-2.6.35.7/drivers/ata
.inherits = &sata_port_ops,
.check_atapi_dma = inic_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_mv.c linux-2.6.35.7/drivers/ata/sata_mv.c
---- linux-2.6.35.7/drivers/ata/sata_mv.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_mv.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_mv.c linux-2.6.35.8/drivers/ata/sata_mv.c
+--- linux-2.6.35.8/drivers/ata/sata_mv.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_mv.c 2010-09-20 17:33:32.000000000 -0400
@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22269,9 +22280,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_mv.c linux-2.6.35.7/drivers/ata/sata_
.inherits = &mv6_ops,
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_nv.c linux-2.6.35.7/drivers/ata/sata_nv.c
---- linux-2.6.35.7/drivers/ata/sata_nv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_nv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_nv.c linux-2.6.35.8/drivers/ata/sata_nv.c
+--- linux-2.6.35.8/drivers/ata/sata_nv.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_nv.c 2010-09-17 20:12:09.000000000 -0400
@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swnc
* cases. Define nv_hardreset() which only kicks in for post-boot
* probing and use it for all variants.
@@ -22314,9 +22325,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_nv.c linux-2.6.35.7/drivers/ata/sata_
.inherits = &nv_generic_ops,
.qc_defer = ata_std_qc_defer,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_promise.c linux-2.6.35.7/drivers/ata/sata_promise.c
---- linux-2.6.35.7/drivers/ata/sata_promise.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_promise.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_promise.c linux-2.6.35.8/drivers/ata/sata_promise.c
+--- linux-2.6.35.8/drivers/ata/sata_promise.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_promise.c 2010-09-17 20:12:09.000000000 -0400
@@ -196,7 +196,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -22343,9 +22354,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_promise.c linux-2.6.35.7/drivers/ata/
.inherits = &pdc_common_ops,
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_qstor.c linux-2.6.35.7/drivers/ata/sata_qstor.c
---- linux-2.6.35.7/drivers/ata/sata_qstor.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_qstor.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_qstor.c linux-2.6.35.8/drivers/ata/sata_qstor.c
+--- linux-2.6.35.8/drivers/ata/sata_qstor.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_qstor.c 2010-09-17 20:12:09.000000000 -0400
@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -22355,9 +22366,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_qstor.c linux-2.6.35.7/drivers/ata/sa
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_sil24.c linux-2.6.35.7/drivers/ata/sata_sil24.c
---- linux-2.6.35.7/drivers/ata/sata_sil24.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_sil24.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_sil24.c linux-2.6.35.8/drivers/ata/sata_sil24.c
+--- linux-2.6.35.8/drivers/ata/sata_sil24.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_sil24.c 2010-09-17 20:12:09.000000000 -0400
@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_s
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -22367,9 +22378,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_sil24.c linux-2.6.35.7/drivers/ata/sa
.inherits = &sata_pmp_port_ops,
.qc_defer = sil24_qc_defer,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_sil.c linux-2.6.35.7/drivers/ata/sata_sil.c
---- linux-2.6.35.7/drivers/ata/sata_sil.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_sil.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_sil.c linux-2.6.35.8/drivers/ata/sata_sil.c
+--- linux-2.6.35.8/drivers/ata/sata_sil.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_sil.c 2010-09-17 20:12:09.000000000 -0400
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -22379,9 +22390,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_sil.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_sis.c linux-2.6.35.7/drivers/ata/sata_sis.c
---- linux-2.6.35.7/drivers/ata/sata_sis.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_sis.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_sis.c linux-2.6.35.8/drivers/ata/sata_sis.c
+--- linux-2.6.35.8/drivers/ata/sata_sis.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_sis.c 2010-09-17 20:12:09.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22391,9 +22402,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_sis.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_svw.c linux-2.6.35.7/drivers/ata/sata_svw.c
---- linux-2.6.35.7/drivers/ata/sata_svw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_svw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_svw.c linux-2.6.35.8/drivers/ata/sata_svw.c
+--- linux-2.6.35.8/drivers/ata/sata_svw.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_svw.c 2010-09-17 20:12:09.000000000 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -22403,9 +22414,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_svw.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_sx4.c linux-2.6.35.7/drivers/ata/sata_sx4.c
---- linux-2.6.35.7/drivers/ata/sata_sx4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_sx4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_sx4.c linux-2.6.35.8/drivers/ata/sata_sx4.c
+--- linux-2.6.35.8/drivers/ata/sata_sx4.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_sx4.c 2010-09-17 20:12:09.000000000 -0400
@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sat
};
@@ -22415,9 +22426,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_sx4.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_sff_port_ops,
.check_atapi_dma = pdc_check_atapi_dma,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_uli.c linux-2.6.35.7/drivers/ata/sata_uli.c
---- linux-2.6.35.7/drivers/ata/sata_uli.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_uli.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_uli.c linux-2.6.35.8/drivers/ata/sata_uli.c
+--- linux-2.6.35.8/drivers/ata/sata_uli.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_uli.c 2010-09-17 20:12:09.000000000 -0400
@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22427,9 +22438,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_uli.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_via.c linux-2.6.35.7/drivers/ata/sata_via.c
---- linux-2.6.35.7/drivers/ata/sata_via.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_via.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_via.c linux-2.6.35.8/drivers/ata/sata_via.c
+--- linux-2.6.35.8/drivers/ata/sata_via.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_via.c 2010-09-17 20:12:09.000000000 -0400
@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22468,9 +22479,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_via.c linux-2.6.35.7/drivers/ata/sata
.inherits = &svia_base_ops,
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
-diff -urNp linux-2.6.35.7/drivers/ata/sata_vsc.c linux-2.6.35.7/drivers/ata/sata_vsc.c
---- linux-2.6.35.7/drivers/ata/sata_vsc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ata/sata_vsc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ata/sata_vsc.c linux-2.6.35.8/drivers/ata/sata_vsc.c
+--- linux-2.6.35.8/drivers/ata/sata_vsc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ata/sata_vsc.c 2010-09-17 20:12:09.000000000 -0400
@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sat
};
@@ -22480,9 +22491,9 @@ diff -urNp linux-2.6.35.7/drivers/ata/sata_vsc.c linux-2.6.35.7/drivers/ata/sata
.inherits = &ata_bmdma_port_ops,
/* The IRQ handling is not quite standard SFF behaviour so we
cannot use the default lost interrupt handler */
-diff -urNp linux-2.6.35.7/drivers/atm/adummy.c linux-2.6.35.7/drivers/atm/adummy.c
---- linux-2.6.35.7/drivers/atm/adummy.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/adummy.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/adummy.c linux-2.6.35.8/drivers/atm/adummy.c
+--- linux-2.6.35.8/drivers/atm/adummy.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/adummy.c 2010-09-17 20:12:09.000000000 -0400
@@ -78,7 +78,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -22492,9 +22503,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/adummy.c linux-2.6.35.7/drivers/atm/adummy
return 0;
}
-diff -urNp linux-2.6.35.7/drivers/atm/ambassador.c linux-2.6.35.7/drivers/atm/ambassador.c
---- linux-2.6.35.7/drivers/atm/ambassador.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/ambassador.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/ambassador.c linux-2.6.35.8/drivers/atm/ambassador.c
+--- linux-2.6.35.8/drivers/atm/ambassador.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/ambassador.c 2010-09-17 20:12:09.000000000 -0400
@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -22531,9 +22542,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/ambassador.c linux-2.6.35.7/drivers/atm/am
return -ENOMEM; // ?
}
-diff -urNp linux-2.6.35.7/drivers/atm/atmtcp.c linux-2.6.35.7/drivers/atm/atmtcp.c
---- linux-2.6.35.7/drivers/atm/atmtcp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/atmtcp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/atmtcp.c linux-2.6.35.8/drivers/atm/atmtcp.c
+--- linux-2.6.35.8/drivers/atm/atmtcp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/atmtcp.c 2010-09-17 20:12:09.000000000 -0400
@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
@@ -22583,9 +22594,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/atmtcp.c linux-2.6.35.7/drivers/atm/atmtcp
done:
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
-diff -urNp linux-2.6.35.7/drivers/atm/eni.c linux-2.6.35.7/drivers/atm/eni.c
---- linux-2.6.35.7/drivers/atm/eni.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/eni.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/eni.c linux-2.6.35.8/drivers/atm/eni.c
+--- linux-2.6.35.8/drivers/atm/eni.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/eni.c 2010-09-17 20:12:09.000000000 -0400
@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
vcc->dev->number);
@@ -22631,9 +22642,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/eni.c linux-2.6.35.7/drivers/atm/eni.c
wake_up(&eni_dev->tx_wait);
dma_complete++;
}
-diff -urNp linux-2.6.35.7/drivers/atm/firestream.c linux-2.6.35.7/drivers/atm/firestream.c
---- linux-2.6.35.7/drivers/atm/firestream.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/firestream.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/firestream.c linux-2.6.35.8/drivers/atm/firestream.c
+--- linux-2.6.35.8/drivers/atm/firestream.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/firestream.c 2010-09-17 20:12:09.000000000 -0400
@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
}
}
@@ -22667,9 +22678,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/firestream.c linux-2.6.35.7/drivers/atm/fi
break;
default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
-diff -urNp linux-2.6.35.7/drivers/atm/fore200e.c linux-2.6.35.7/drivers/atm/fore200e.c
---- linux-2.6.35.7/drivers/atm/fore200e.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/fore200e.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/fore200e.c linux-2.6.35.8/drivers/atm/fore200e.c
+--- linux-2.6.35.8/drivers/atm/fore200e.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/fore200e.c 2010-09-17 20:12:09.000000000 -0400
@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -22726,9 +22737,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/fore200e.c linux-2.6.35.7/drivers/atm/fore
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-2.6.35.7/drivers/atm/he.c linux-2.6.35.7/drivers/atm/he.c
---- linux-2.6.35.7/drivers/atm/he.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/he.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/he.c linux-2.6.35.8/drivers/atm/he.c
+--- linux-2.6.35.8/drivers/atm/he.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/he.c 2010-09-17 20:12:09.000000000 -0400
@@ -1770,7 +1770,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22810,9 +22821,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/he.c linux-2.6.35.7/drivers/atm/he.c
return 0;
}
-diff -urNp linux-2.6.35.7/drivers/atm/horizon.c linux-2.6.35.7/drivers/atm/horizon.c
---- linux-2.6.35.7/drivers/atm/horizon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/horizon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/horizon.c linux-2.6.35.8/drivers/atm/horizon.c
+--- linux-2.6.35.8/drivers/atm/horizon.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/horizon.c 2010-09-17 20:12:09.000000000 -0400
@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22831,9 +22842,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/horizon.c linux-2.6.35.7/drivers/atm/horiz
// free the skb
hrz_kfree_skb (skb);
-diff -urNp linux-2.6.35.7/drivers/atm/idt77252.c linux-2.6.35.7/drivers/atm/idt77252.c
---- linux-2.6.35.7/drivers/atm/idt77252.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/idt77252.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/idt77252.c linux-2.6.35.8/drivers/atm/idt77252.c
+--- linux-2.6.35.8/drivers/atm/idt77252.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/idt77252.c 2010-09-17 20:12:09.000000000 -0400
@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -22988,9 +22999,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/idt77252.c linux-2.6.35.7/drivers/atm/idt7
return -ENOMEM;
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-2.6.35.7/drivers/atm/iphase.c linux-2.6.35.7/drivers/atm/iphase.c
---- linux-2.6.35.7/drivers/atm/iphase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/iphase.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/iphase.c linux-2.6.35.8/drivers/atm/iphase.c
+--- linux-2.6.35.8/drivers/atm/iphase.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/iphase.c 2010-09-17 20:12:09.000000000 -0400
@@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)
status = (u_short) (buf_desc_ptr->desc_mode);
if (status & (RX_CER | RX_PTE | RX_OFL))
@@ -23087,9 +23098,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/iphase.c linux-2.6.35.7/drivers/atm/iphase
if (iavcc->vc_desc_cnt > 10) {
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-2.6.35.7/drivers/atm/lanai.c linux-2.6.35.7/drivers/atm/lanai.c
---- linux-2.6.35.7/drivers/atm/lanai.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/lanai.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/lanai.c linux-2.6.35.8/drivers/atm/lanai.c
+--- linux-2.6.35.8/drivers/atm/lanai.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/lanai.c 2010-09-17 20:12:09.000000000 -0400
@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
lanai_endtx(lanai, lvcc);
@@ -23144,9 +23155,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/lanai.c linux-2.6.35.7/drivers/atm/lanai.c
lvcc->stats.x.aal5.service_rxcrc++;
lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-2.6.35.7/drivers/atm/nicstar.c linux-2.6.35.7/drivers/atm/nicstar.c
---- linux-2.6.35.7/drivers/atm/nicstar.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/nicstar.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/nicstar.c linux-2.6.35.8/drivers/atm/nicstar.c
+--- linux-2.6.35.8/drivers/atm/nicstar.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/nicstar.c 2010-09-17 20:12:09.000000000 -0400
@@ -1722,7 +1722,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -23349,9 +23360,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/nicstar.c linux-2.6.35.7/drivers/atm/nicst
}
}
-diff -urNp linux-2.6.35.7/drivers/atm/solos-pci.c linux-2.6.35.7/drivers/atm/solos-pci.c
---- linux-2.6.35.7/drivers/atm/solos-pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/solos-pci.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/solos-pci.c linux-2.6.35.8/drivers/atm/solos-pci.c
+--- linux-2.6.35.8/drivers/atm/solos-pci.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/solos-pci.c 2010-09-17 20:12:09.000000000 -0400
@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -23370,9 +23381,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/solos-pci.c linux-2.6.35.7/drivers/atm/sol
solos_pop(vcc, oldskb);
} else
dev_kfree_skb_irq(oldskb);
-diff -urNp linux-2.6.35.7/drivers/atm/suni.c linux-2.6.35.7/drivers/atm/suni.c
---- linux-2.6.35.7/drivers/atm/suni.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/suni.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/suni.c linux-2.6.35.8/drivers/atm/suni.c
+--- linux-2.6.35.8/drivers/atm/suni.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/suni.c 2010-09-17 20:12:09.000000000 -0400
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -23384,9 +23395,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/suni.c linux-2.6.35.7/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
-diff -urNp linux-2.6.35.7/drivers/atm/uPD98402.c linux-2.6.35.7/drivers/atm/uPD98402.c
---- linux-2.6.35.7/drivers/atm/uPD98402.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/uPD98402.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/uPD98402.c linux-2.6.35.8/drivers/atm/uPD98402.c
+--- linux-2.6.35.8/drivers/atm/uPD98402.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/uPD98402.c 2010-09-17 20:12:09.000000000 -0400
@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -23431,9 +23442,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/uPD98402.c linux-2.6.35.7/drivers/atm/uPD9
return 0;
}
-diff -urNp linux-2.6.35.7/drivers/atm/zatm.c linux-2.6.35.7/drivers/atm/zatm.c
---- linux-2.6.35.7/drivers/atm/zatm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/atm/zatm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/atm/zatm.c linux-2.6.35.8/drivers/atm/zatm.c
+--- linux-2.6.35.8/drivers/atm/zatm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/atm/zatm.c 2010-09-17 20:12:09.000000000 -0400
@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -23461,9 +23472,9 @@ diff -urNp linux-2.6.35.7/drivers/atm/zatm.c linux-2.6.35.7/drivers/atm/zatm.c
wake_up(&zatm_vcc->tx_wait);
}
-diff -urNp linux-2.6.35.7/drivers/block/pktcdvd.c linux-2.6.35.7/drivers/block/pktcdvd.c
---- linux-2.6.35.7/drivers/block/pktcdvd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/block/pktcdvd.c 2010-09-27 18:50:29.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/block/pktcdvd.c linux-2.6.35.8/drivers/block/pktcdvd.c
+--- linux-2.6.35.8/drivers/block/pktcdvd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/block/pktcdvd.c 2010-09-27 18:50:29.000000000 -0400
@@ -2368,7 +2368,7 @@ static void pkt_release_dev(struct pktcd
pkt_shrink_pktlist(pd);
}
@@ -23473,9 +23484,9 @@ diff -urNp linux-2.6.35.7/drivers/block/pktcdvd.c linux-2.6.35.7/drivers/block/p
{
if (dev_minor >= MAX_WRITERS)
return NULL;
-diff -urNp linux-2.6.35.7/drivers/char/agp/frontend.c linux-2.6.35.7/drivers/char/agp/frontend.c
---- linux-2.6.35.7/drivers/char/agp/frontend.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/agp/frontend.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/agp/frontend.c linux-2.6.35.8/drivers/char/agp/frontend.c
+--- linux-2.6.35.8/drivers/char/agp/frontend.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/agp/frontend.c 2010-09-17 20:12:09.000000000 -0400
@@ -818,7 +818,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -23485,10 +23496,10 @@ diff -urNp linux-2.6.35.7/drivers/char/agp/frontend.c linux-2.6.35.7/drivers/cha
return -EFAULT;
client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-2.6.35.7/drivers/char/agp/intel-agp.c linux-2.6.35.7/drivers/char/agp/intel-agp.c
---- linux-2.6.35.7/drivers/char/agp/intel-agp.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/agp/intel-agp.c 2010-09-26 17:35:29.000000000 -0400
-@@ -1054,7 +1054,7 @@ static struct pci_device_id agp_intel_pc
+diff -urNp linux-2.6.35.8/drivers/char/agp/intel-agp.c linux-2.6.35.8/drivers/char/agp/intel-agp.c
+--- linux-2.6.35.8/drivers/char/agp/intel-agp.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/char/agp/intel-agp.c 2010-10-31 17:14:30.000000000 -0400
+@@ -1055,7 +1055,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_HB),
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_M_HB),
ID(PCI_DEVICE_ID_INTEL_SANDYBRIDGE_S_HB),
@@ -23497,9 +23508,9 @@ diff -urNp linux-2.6.35.7/drivers/char/agp/intel-agp.c linux-2.6.35.7/drivers/ch
};
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
-diff -urNp linux-2.6.35.7/drivers/char/hpet.c linux-2.6.35.7/drivers/char/hpet.c
---- linux-2.6.35.7/drivers/char/hpet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/hpet.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/hpet.c linux-2.6.35.8/drivers/char/hpet.c
+--- linux-2.6.35.8/drivers/char/hpet.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/hpet.c 2010-10-31 19:44:22.000000000 -0400
@@ -429,7 +429,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -23518,6 +23529,20 @@ diff -urNp linux-2.6.35.7/drivers/char/hpet.c linux-2.6.35.7/drivers/char/hpet.c
{
struct hpet_timer __iomem *timer;
struct hpet __iomem *hpet;
+@@ -596,11 +596,11 @@ hpet_ioctl_common(struct hpet_dev *devp,
+ {
+ struct hpet_info info;
+
++ memset(&info, 0, sizeof(info));
++
+ if (devp->hd_ireqfreq)
+ info.hi_ireqfreq =
+ hpet_time_div(hpetp, devp->hd_ireqfreq);
+- else
+- info.hi_ireqfreq = 0;
+ info.hi_flags =
+ readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
+ info.hi_hpet = hpetp->hp_which;
@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
},
};
@@ -23527,9 +23552,9 @@ diff -urNp linux-2.6.35.7/drivers/char/hpet.c linux-2.6.35.7/drivers/char/hpet.c
static int __init hpet_init(void)
{
-diff -urNp linux-2.6.35.7/drivers/char/hvc_console.h linux-2.6.35.7/drivers/char/hvc_console.h
---- linux-2.6.35.7/drivers/char/hvc_console.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/hvc_console.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/hvc_console.h linux-2.6.35.8/drivers/char/hvc_console.h
+--- linux-2.6.35.8/drivers/char/hvc_console.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/hvc_console.h 2010-09-17 20:12:09.000000000 -0400
@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vter
/* register a vterm for hvc tty operation (module_init or hotplug add) */
extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
@@ -23538,9 +23563,9 @@ diff -urNp linux-2.6.35.7/drivers/char/hvc_console.h linux-2.6.35.7/drivers/char
/* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
extern int hvc_remove(struct hvc_struct *hp);
-diff -urNp linux-2.6.35.7/drivers/char/hvcs.c linux-2.6.35.7/drivers/char/hvcs.c
---- linux-2.6.35.7/drivers/char/hvcs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/hvcs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/hvcs.c linux-2.6.35.8/drivers/char/hvcs.c
+--- linux-2.6.35.8/drivers/char/hvcs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/hvcs.c 2010-09-17 20:12:09.000000000 -0400
@@ -270,7 +270,7 @@ struct hvcs_struct {
unsigned int index;
@@ -23635,9 +23660,9 @@ diff -urNp linux-2.6.35.7/drivers/char/hvcs.c linux-2.6.35.7/drivers/char/hvcs.c
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.35.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.35.7/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.35.7/drivers/char/ipmi/ipmi_msghandler.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/ipmi/ipmi_msghandler.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.35.8/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-2.6.35.8/drivers/char/ipmi/ipmi_msghandler.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/ipmi/ipmi_msghandler.c 2010-09-17 20:12:09.000000000 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -23668,9 +23693,9 @@ diff -urNp linux-2.6.35.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.35.7/dri
intf->proc_dir = NULL;
-diff -urNp linux-2.6.35.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.35.7/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.35.7/drivers/char/ipmi/ipmi_si_intf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/ipmi/ipmi_si_intf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.35.8/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-2.6.35.8/drivers/char/ipmi/ipmi_si_intf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/ipmi/ipmi_si_intf.c 2010-09-17 20:12:09.000000000 -0400
@@ -286,7 +286,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -23701,9 +23726,9 @@ diff -urNp linux-2.6.35.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.35.7/driver
new_smi->interrupt_disabled = 1;
atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-2.6.35.7/drivers/char/keyboard.c linux-2.6.35.7/drivers/char/keyboard.c
---- linux-2.6.35.7/drivers/char/keyboard.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/keyboard.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/keyboard.c linux-2.6.35.8/drivers/char/keyboard.c
+--- linux-2.6.35.8/drivers/char/keyboard.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/keyboard.c 2010-09-17 20:12:37.000000000 -0400
@@ -640,6 +640,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -23730,9 +23755,9 @@ diff -urNp linux-2.6.35.7/drivers/char/keyboard.c linux-2.6.35.7/drivers/char/ke
};
MODULE_DEVICE_TABLE(input, kbd_ids);
-diff -urNp linux-2.6.35.7/drivers/char/mem.c linux-2.6.35.7/drivers/char/mem.c
---- linux-2.6.35.7/drivers/char/mem.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/mem.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/mem.c linux-2.6.35.8/drivers/char/mem.c
+--- linux-2.6.35.8/drivers/char/mem.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/char/mem.c 2010-09-26 17:32:46.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -23900,9 +23925,9 @@ diff -urNp linux-2.6.35.7/drivers/char/mem.c linux-2.6.35.7/drivers/char/mem.c
};
static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-2.6.35.7/drivers/char/n_tty.c linux-2.6.35.7/drivers/char/n_tty.c
---- linux-2.6.35.7/drivers/char/n_tty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/n_tty.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/n_tty.c linux-2.6.35.8/drivers/char/n_tty.c
+--- linux-2.6.35.8/drivers/char/n_tty.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/n_tty.c 2010-09-17 20:12:09.000000000 -0400
@@ -2105,6 +2105,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
{
*ops = tty_ldisc_N_TTY;
@@ -23912,9 +23937,9 @@ diff -urNp linux-2.6.35.7/drivers/char/n_tty.c linux-2.6.35.7/drivers/char/n_tty
+ ops->flags = 0;
}
EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-2.6.35.7/drivers/char/nvram.c linux-2.6.35.7/drivers/char/nvram.c
---- linux-2.6.35.7/drivers/char/nvram.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/nvram.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/nvram.c linux-2.6.35.8/drivers/char/nvram.c
+--- linux-2.6.35.8/drivers/char/nvram.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/nvram.c 2010-09-17 20:12:09.000000000 -0400
@@ -245,7 +245,7 @@ static ssize_t nvram_read(struct file *f
spin_unlock_irq(&rtc_lock);
@@ -23936,9 +23961,9 @@ diff -urNp linux-2.6.35.7/drivers/char/nvram.c linux-2.6.35.7/drivers/char/nvram
};
static int __init nvram_init(void)
-diff -urNp linux-2.6.35.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.35.7/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.35.7/drivers/char/pcmcia/ipwireless/tty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/pcmcia/ipwireless/tty.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.35.8/drivers/char/pcmcia/ipwireless/tty.c
+--- linux-2.6.35.8/drivers/char/pcmcia/ipwireless/tty.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/pcmcia/ipwireless/tty.c 2010-09-17 20:12:09.000000000 -0400
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
@@ -24053,9 +24078,9 @@ diff -urNp linux-2.6.35.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.35.7/dr
do_ipw_close(ttyj);
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
-diff -urNp linux-2.6.35.7/drivers/char/pty.c linux-2.6.35.7/drivers/char/pty.c
---- linux-2.6.35.7/drivers/char/pty.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/pty.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/pty.c linux-2.6.35.8/drivers/char/pty.c
+--- linux-2.6.35.8/drivers/char/pty.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/pty.c 2010-09-17 20:12:09.000000000 -0400
@@ -677,7 +677,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -24086,9 +24111,9 @@ diff -urNp linux-2.6.35.7/drivers/char/pty.c linux-2.6.35.7/drivers/char/pty.c
cdev_init(&ptmx_cdev, &ptmx_fops);
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff -urNp linux-2.6.35.7/drivers/char/random.c linux-2.6.35.7/drivers/char/random.c
---- linux-2.6.35.7/drivers/char/random.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/random.c 2010-09-17 20:24:41.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/random.c linux-2.6.35.8/drivers/char/random.c
+--- linux-2.6.35.8/drivers/char/random.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/random.c 2010-09-17 20:24:41.000000000 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -24139,9 +24164,9 @@ diff -urNp linux-2.6.35.7/drivers/char/random.c linux-2.6.35.7/drivers/char/rand
static int max_write_thresh = INPUT_POOL_WORDS * 32;
static char sysctl_bootid[16];
-diff -urNp linux-2.6.35.7/drivers/char/sonypi.c linux-2.6.35.7/drivers/char/sonypi.c
---- linux-2.6.35.7/drivers/char/sonypi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/sonypi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/sonypi.c linux-2.6.35.8/drivers/char/sonypi.c
+--- linux-2.6.35.8/drivers/char/sonypi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/sonypi.c 2010-09-17 20:12:09.000000000 -0400
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
@@ -24172,9 +24197,9 @@ diff -urNp linux-2.6.35.7/drivers/char/sonypi.c linux-2.6.35.7/drivers/char/sony
mutex_unlock(&sonypi_device.lock);
return 0;
-diff -urNp linux-2.6.35.7/drivers/char/tpm/tpm_bios.c linux-2.6.35.7/drivers/char/tpm/tpm_bios.c
---- linux-2.6.35.7/drivers/char/tpm/tpm_bios.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/tpm/tpm_bios.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/tpm/tpm_bios.c linux-2.6.35.8/drivers/char/tpm/tpm_bios.c
+--- linux-2.6.35.8/drivers/char/tpm/tpm_bios.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/tpm/tpm_bios.c 2010-09-17 20:12:09.000000000 -0400
@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -24215,9 +24240,9 @@ diff -urNp linux-2.6.35.7/drivers/char/tpm/tpm_bios.c linux-2.6.35.7/drivers/cha
memcpy(log->bios_event_log, virt, len);
-diff -urNp linux-2.6.35.7/drivers/char/tty_io.c linux-2.6.35.7/drivers/char/tty_io.c
---- linux-2.6.35.7/drivers/char/tty_io.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/tty_io.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/tty_io.c linux-2.6.35.8/drivers/char/tty_io.c
+--- linux-2.6.35.8/drivers/char/tty_io.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/tty_io.c 2010-09-17 20:12:09.000000000 -0400
@@ -136,20 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -24347,9 +24372,9 @@ diff -urNp linux-2.6.35.7/drivers/char/tty_io.c linux-2.6.35.7/drivers/char/tty_
/*
* Initialize the console device. This is called *early*, so
* we can't necessarily depend on lots of kernel help here.
-diff -urNp linux-2.6.35.7/drivers/char/tty_ldisc.c linux-2.6.35.7/drivers/char/tty_ldisc.c
---- linux-2.6.35.7/drivers/char/tty_ldisc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/tty_ldisc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/tty_ldisc.c linux-2.6.35.8/drivers/char/tty_ldisc.c
+--- linux-2.6.35.8/drivers/char/tty_ldisc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/tty_ldisc.c 2010-09-17 20:12:09.000000000 -0400
@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *
if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
struct tty_ldisc_ops *ldo = ld->ops;
@@ -24395,9 +24420,9 @@ diff -urNp linux-2.6.35.7/drivers/char/tty_ldisc.c linux-2.6.35.7/drivers/char/t
module_put(ldops->owner);
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
-diff -urNp linux-2.6.35.7/drivers/char/vt_ioctl.c linux-2.6.35.7/drivers/char/vt_ioctl.c
---- linux-2.6.35.7/drivers/char/vt_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/char/vt_ioctl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/char/vt_ioctl.c linux-2.6.35.8/drivers/char/vt_ioctl.c
+--- linux-2.6.35.8/drivers/char/vt_ioctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/char/vt_ioctl.c 2010-09-17 20:12:37.000000000 -0400
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -24441,9 +24466,9 @@ diff -urNp linux-2.6.35.7/drivers/char/vt_ioctl.c linux-2.6.35.7/drivers/char/vt
if (!perm) {
ret = -EPERM;
goto reterr;
-diff -urNp linux-2.6.35.7/drivers/cpuidle/sysfs.c linux-2.6.35.7/drivers/cpuidle/sysfs.c
---- linux-2.6.35.7/drivers/cpuidle/sysfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/cpuidle/sysfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/cpuidle/sysfs.c linux-2.6.35.8/drivers/cpuidle/sysfs.c
+--- linux-2.6.35.8/drivers/cpuidle/sysfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/cpuidle/sysfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpui
.release = cpuidle_state_sysfs_release,
};
@@ -24453,9 +24478,9 @@ diff -urNp linux-2.6.35.7/drivers/cpuidle/sysfs.c linux-2.6.35.7/drivers/cpuidle
{
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff -urNp linux-2.6.35.7/drivers/edac/edac_core.h linux-2.6.35.7/drivers/edac/edac_core.h
---- linux-2.6.35.7/drivers/edac/edac_core.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/edac/edac_core.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/edac/edac_core.h linux-2.6.35.8/drivers/edac/edac_core.h
+--- linux-2.6.35.8/drivers/edac/edac_core.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/edac/edac_core.h 2010-09-17 20:12:09.000000000 -0400
@@ -100,11 +100,11 @@ extern const char *edac_mem_types[];
#else /* !CONFIG_EDAC_DEBUG */
@@ -24473,9 +24498,9 @@ diff -urNp linux-2.6.35.7/drivers/edac/edac_core.h linux-2.6.35.7/drivers/edac/e
#endif /* !CONFIG_EDAC_DEBUG */
-diff -urNp linux-2.6.35.7/drivers/edac/edac_mc_sysfs.c linux-2.6.35.7/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.35.7/drivers/edac/edac_mc_sysfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/edac/edac_mc_sysfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/edac/edac_mc_sysfs.c linux-2.6.35.8/drivers/edac/edac_mc_sysfs.c
+--- linux-2.6.35.8/drivers/edac/edac_mc_sysfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/edac/edac_mc_sysfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -776,7 +776,7 @@ static void edac_inst_grp_release(struct
}
@@ -24485,9 +24510,9 @@ diff -urNp linux-2.6.35.7/drivers/edac/edac_mc_sysfs.c linux-2.6.35.7/drivers/ed
.show = inst_grp_show,
.store = inst_grp_store
};
-diff -urNp linux-2.6.35.7/drivers/firewire/core-cdev.c linux-2.6.35.7/drivers/firewire/core-cdev.c
---- linux-2.6.35.7/drivers/firewire/core-cdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/firewire/core-cdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/firewire/core-cdev.c linux-2.6.35.8/drivers/firewire/core-cdev.c
+--- linux-2.6.35.8/drivers/firewire/core-cdev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/firewire/core-cdev.c 2010-09-17 20:12:09.000000000 -0400
@@ -1195,8 +1195,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -24498,9 +24523,9 @@ diff -urNp linux-2.6.35.7/drivers/firewire/core-cdev.c linux-2.6.35.7/drivers/fi
return -EINVAL;
r = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.35.7/drivers/firmware/dmi_scan.c linux-2.6.35.7/drivers/firmware/dmi_scan.c
---- linux-2.6.35.7/drivers/firmware/dmi_scan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/firmware/dmi_scan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/firmware/dmi_scan.c linux-2.6.35.8/drivers/firmware/dmi_scan.c
+--- linux-2.6.35.8/drivers/firmware/dmi_scan.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/firmware/dmi_scan.c 2010-09-17 20:12:09.000000000 -0400
@@ -387,11 +387,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -24513,9 +24538,9 @@ diff -urNp linux-2.6.35.7/drivers/firmware/dmi_scan.c linux-2.6.35.7/drivers/fir
p = dmi_ioremap(0xF0000, 0x10000);
if (p == NULL)
goto error;
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.35.7/drivers/gpu/drm/drm_crtc_helper.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_crtc_helper.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.35.8/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_crtc_helper.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_crtc_helper.c 2010-10-11 22:41:44.000000000 -0400
@@ -262,7 +262,7 @@ static bool drm_encoder_crtc_ok(struct d
struct drm_crtc *tmp;
int crtc_mask = 1;
@@ -24525,9 +24550,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.35.7/drive
dev = crtc->dev;
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_drv.c linux-2.6.35.7/drivers/gpu/drm/drm_drv.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_drv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_drv.c linux-2.6.35.8/drivers/gpu/drm/drm_drv.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_drv.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_drv.c 2010-09-17 20:12:09.000000000 -0400
@@ -449,7 +449,7 @@ long drm_ioctl(struct file *filp,
dev = file_priv->minor->dev;
@@ -24537,9 +24562,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_drv.c linux-2.6.35.7/drivers/gpu/d
++file_priv->ioctl_count;
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_fops.c linux-2.6.35.7/drivers/gpu/drm/drm_fops.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_fops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_fops.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_fops.c linux-2.6.35.8/drivers/gpu/drm/drm_fops.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_fops.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_fops.c 2010-09-17 20:12:09.000000000 -0400
@@ -67,7 +67,7 @@ static int drm_setup(struct drm_device *
}
@@ -24591,9 +24616,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_fops.c linux-2.6.35.7/drivers/gpu/
if (atomic_read(&dev->ioctl_count)) {
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_info.c linux-2.6.35.7/drivers/gpu/drm/drm_info.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_info.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_info.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_info.c linux-2.6.35.8/drivers/gpu/drm/drm_info.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_info.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_info.c 2010-10-11 22:41:44.000000000 -0400
@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
struct drm_local_map *map;
struct drm_map_list *r_list;
@@ -24622,9 +24647,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_info.c linux-2.6.35.7/drivers/gpu/
type = "??";
else
type = types[map->type];
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.35.7/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_ioctl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_ioctl.c linux-2.6.35.8/drivers/gpu/drm/drm_ioctl.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_ioctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_ioctl.c 2010-09-17 20:12:09.000000000 -0400
@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24634,9 +24659,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.35.7/drivers/gpu
stats->data[i].type = dev->types[i];
}
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_lock.c linux-2.6.35.7/drivers/gpu/drm/drm_lock.c
---- linux-2.6.35.7/drivers/gpu/drm/drm_lock.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/drm_lock.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/drm_lock.c linux-2.6.35.8/drivers/gpu/drm/drm_lock.c
+--- linux-2.6.35.8/drivers/gpu/drm/drm_lock.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/drm_lock.c 2010-09-17 20:12:09.000000000 -0400
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -24655,9 +24680,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/drm_lock.c linux-2.6.35.7/drivers/gpu/
/* kernel_context_switch isn't used by any of the x86 drm
* modules but is required by the Sparc driver.
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.35.7/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.35.7/drivers/gpu/drm/i810/i810_dma.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i810/i810_dma.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i810/i810_dma.c linux-2.6.35.8/drivers/gpu/drm/i810/i810_dma.c
+--- linux-2.6.35.8/drivers/gpu/drm/i810/i810_dma.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i810/i810_dma.c 2010-09-17 20:12:09.000000000 -0400
@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -24680,9 +24705,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.35.7/drivers
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-17 20:12:09.000000000 -0400
@@ -402,7 +402,7 @@ static void ch7017_destroy(struct intel_
}
}
@@ -24692,9 +24717,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.35.7/drive
.init = ch7017_init,
.detect = ch7017_detect,
.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-17 20:12:09.000000000 -0400
@@ -322,7 +322,7 @@ static void ch7xxx_destroy(struct intel_
}
}
@@ -24704,9 +24729,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.35.7/drive
.init = ch7xxx_init,
.detect = ch7xxx_detect,
.mode_valid = ch7xxx_mode_valid,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo.h linux-2.6.35.7/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo.h linux-2.6.35.8/drivers/gpu/drm/i915/dvo.h
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo.h 2010-09-17 20:12:09.000000000 -0400
@@ -125,23 +125,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -24739,9 +24764,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo.h linux-2.6.35.7/drivers/gpu/
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ivch.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-17 20:12:09.000000000 -0400
@@ -412,7 +412,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -24751,9 +24776,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.35.7/drivers
.init = ivch_init,
.dpms = ivch_dpms,
.mode_valid = ivch_mode_valid,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.35.7/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.35.8/drivers/gpu/drm/i915/dvo_sil164.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-17 20:12:09.000000000 -0400
@@ -254,7 +254,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -24763,9 +24788,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.35.7/drive
.init = sil164_init,
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.35.7/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.35.8/drivers/gpu/drm/i915/dvo_tfp410.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-17 20:12:09.000000000 -0400
@@ -295,7 +295,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -24775,9 +24800,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.35.7/drive
.init = tfp410_init,
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/i915_dma.c linux-2.6.35.7/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/i915_dma.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/i915_dma.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/i915_dma.c linux-2.6.35.8/drivers/gpu/drm/i915/i915_dma.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/i915_dma.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/i915_dma.c 2010-10-31 17:14:31.000000000 -0400
@@ -1348,7 +1348,7 @@ static bool i915_switcheroo_can_switch(s
bool can_switch;
@@ -24787,9 +24812,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/i915_dma.c linux-2.6.35.7/drivers
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.35.7/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/i915_drv.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/i915_drv.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/i915_drv.c linux-2.6.35.8/drivers/gpu/drm/i915/i915_drv.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/i915_drv.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/i915_drv.c 2010-09-26 17:32:46.000000000 -0400
@@ -497,7 +497,7 @@ const struct dev_pm_ops i915_pm_ops = {
.restore = i915_pm_resume,
};
@@ -24799,36 +24824,30 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.35.7/drivers
.fault = i915_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/i915/i915_gem.c linux-2.6.35.7/drivers/gpu/drm/i915/i915_gem.c
---- linux-2.6.35.7/drivers/gpu/drm/i915/i915_gem.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/i915/i915_gem.c 2010-09-28 18:50:18.000000000 -0400
-@@ -469,6 +469,11 @@ i915_gem_pread_ioctl(struct drm_device *
- return -EINVAL;
- }
-
-+ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
-+ drm_gem_object_unreference_unlocked(obj);
-+ return -EFAULT;
-+ }
-+
- if (i915_gem_object_needs_bit17_swizzle(obj)) {
- ret = i915_gem_shmem_pread_slow(dev, obj, args, file_priv);
- } else {
-@@ -932,6 +937,11 @@ i915_gem_pwrite_ioctl(struct drm_device
- return -EINVAL;
- }
-
-+ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr, args->size)) {
-+ drm_gem_object_unreference_unlocked(obj);
-+ return -EFAULT;
-+ }
-+
- /* We can only do the GTT pwrite on untiled buffers, as otherwise
- * it would end up going through the fenced access, and we'll get
- * different detiling behavior between reading and writing.
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_backlight.c
---- linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/i915/i915_gem.c linux-2.6.35.8/drivers/gpu/drm/i915/i915_gem.c
+--- linux-2.6.35.8/drivers/gpu/drm/i915/i915_gem.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/i915/i915_gem.c 2010-10-31 17:39:02.000000000 -0400
+@@ -471,7 +471,7 @@ i915_gem_pread_ioctl(struct drm_device *
+ }
+
+ if (!access_ok(VERIFY_WRITE,
+- (char __user *)(uintptr_t)args->data_ptr,
++ (char __user *) (uintptr_t)args->data_ptr,
+ args->size)) {
+ ret = -EFAULT;
+ goto err;
+@@ -939,7 +939,7 @@ i915_gem_pwrite_ioctl(struct drm_device
+ }
+
+ if (!access_ok(VERIFY_READ,
+- (char __user *)(uintptr_t)args->data_ptr,
++ (char __user *) (uintptr_t)args->data_ptr,
+ args->size)) {
+ ret = -EFAULT;
+ goto err;
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_backlight.c
+--- linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_backlight.c 2010-09-17 20:12:09.000000000 -0400
@@ -58,7 +58,7 @@ static int nv40_set_intensity(struct bac
return 0;
}
@@ -24847,9 +24866,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_backlight.c linux-2.6.
.options = BL_CORE_SUSPENDRESUME,
.get_brightness = nv50_get_intensity,
.update_status = nv50_set_intensity,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_state.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_state.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_state.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/nouveau/nouveau_state.c 2010-09-17 20:12:09.000000000 -0400
@@ -395,7 +395,7 @@ static bool nouveau_switcheroo_can_switc
bool can_switch;
@@ -24859,9 +24878,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.35.7
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.35.7/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.35.7/drivers/gpu/drm/radeon/mkregtable.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/radeon/mkregtable.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.35.8/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-2.6.35.8/drivers/gpu/drm/radeon/mkregtable.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/radeon/mkregtable.c 2010-09-17 20:12:09.000000000 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -24879,9 +24898,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.35.7/dri
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_device.c
---- linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_device.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_device.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_device.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_device.c 2010-09-17 20:12:09.000000000 -0400
@@ -562,7 +562,7 @@ static bool radeon_switcheroo_can_switch
bool can_switch;
@@ -24891,10 +24910,10 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_device.c linux-2.6.35.7/
spin_unlock(&dev->count_lock);
return can_switch;
}
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_display.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_display.c 2010-09-17 20:12:09.000000000 -0400
-@@ -559,7 +559,7 @@ static void radeon_compute_pll_legacy(st
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_display.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_display.c 2010-10-31 17:14:31.000000000 -0400
+@@ -561,7 +561,7 @@ static void radeon_compute_pll_legacy(st
if (pll->flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
error = freq - current_freq;
@@ -24903,9 +24922,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.35.7
} else
error = abs(current_freq - freq);
vco_diff = abs(vco - best_vco);
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_state.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_state.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_state.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_state.c 2010-09-17 20:12:09.000000000 -0400
@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -24924,9 +24943,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.35.7/d
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-17 20:12:09.000000000 -0400
@@ -601,8 +601,9 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -24987,9 +25006,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.35.7/dri
vma->vm_ops = &radeon_ttm_vm_ops;
return 0;
}
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo.c
+--- linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-17 20:12:09.000000000 -0400
@@ -47,7 +47,7 @@
#include <linux/module.h>
@@ -24999,9 +25018,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.35.7/drivers/gp
#define TTM_BO_HASH_ORDER 13
static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-20 17:14:49.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo_vm.c
+--- linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-20 17:14:49.000000000 -0400
@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_
return best_bo;
}
@@ -25055,9 +25074,9 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.35.7/drivers
static const struct vm_operations_struct ttm_bo_vm_ops = {
.fault = ttm_bo_vm_fault,
-diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_global.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_global.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_global.c
+--- linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_global.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/gpu/drm/ttm/ttm_global.c 2010-09-17 20:12:09.000000000 -0400
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -25115,31 +25134,21 @@ diff -urNp linux-2.6.35.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.35.7/driver
ref->release(ref);
item->object = NULL;
}
-diff -urNp linux-2.6.35.7/drivers/hid/hidraw.c linux-2.6.35.7/drivers/hid/hidraw.c
---- linux-2.6.35.7/drivers/hid/hidraw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hid/hidraw.c 2010-09-28 18:52:39.000000000 -0400
-@@ -246,6 +246,10 @@ static long hidraw_ioctl(struct file *fi
+diff -urNp linux-2.6.35.8/drivers/hid/hidraw.c linux-2.6.35.8/drivers/hid/hidraw.c
+--- linux-2.6.35.8/drivers/hid/hidraw.c 2010-10-31 17:13:58.000000000 -0400
++++ linux-2.6.35.8/drivers/hid/hidraw.c 2010-10-31 17:14:31.000000000 -0400
+@@ -252,7 +252,7 @@ static long hidraw_ioctl(struct file *fi
mutex_lock(&minors_lock);
dev = hidraw_table[minor];
+- if (!dev) {
+ if (dev == NULL) {
-+ ret = -ENODEV;
-+ goto out;
-+ }
-
- switch (cmd) {
- case HIDIOCGRDESCSIZE:
-@@ -319,6 +323,7 @@ static long hidraw_ioctl(struct file *fi
-
- ret = -ENOTTY;
+ ret = -ENODEV;
+ goto out;
}
-+out:
- mutex_unlock(&minors_lock);
- return ret;
- }
-diff -urNp linux-2.6.35.7/drivers/hid/usbhid/hiddev.c linux-2.6.35.7/drivers/hid/usbhid/hiddev.c
---- linux-2.6.35.7/drivers/hid/usbhid/hiddev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hid/usbhid/hiddev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hid/usbhid/hiddev.c linux-2.6.35.8/drivers/hid/usbhid/hiddev.c
+--- linux-2.6.35.8/drivers/hid/usbhid/hiddev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/hid/usbhid/hiddev.c 2010-09-17 20:12:09.000000000 -0400
@@ -616,7 +616,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -25149,9 +25158,9 @@ diff -urNp linux-2.6.35.7/drivers/hid/usbhid/hiddev.c linux-2.6.35.7/drivers/hid
return -EINVAL;
for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-2.6.35.7/drivers/hwmon/k8temp.c linux-2.6.35.7/drivers/hwmon/k8temp.c
---- linux-2.6.35.7/drivers/hwmon/k8temp.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/hwmon/k8temp.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hwmon/k8temp.c linux-2.6.35.8/drivers/hwmon/k8temp.c
+--- linux-2.6.35.8/drivers/hwmon/k8temp.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/hwmon/k8temp.c 2010-09-20 17:33:32.000000000 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static const struct pci_device_id k8temp_ids[] = {
@@ -25161,9 +25170,9 @@ diff -urNp linux-2.6.35.7/drivers/hwmon/k8temp.c linux-2.6.35.7/drivers/hwmon/k8
};
MODULE_DEVICE_TABLE(pci, k8temp_ids);
-diff -urNp linux-2.6.35.7/drivers/hwmon/sis5595.c linux-2.6.35.7/drivers/hwmon/sis5595.c
---- linux-2.6.35.7/drivers/hwmon/sis5595.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hwmon/sis5595.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hwmon/sis5595.c linux-2.6.35.8/drivers/hwmon/sis5595.c
+--- linux-2.6.35.8/drivers/hwmon/sis5595.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/hwmon/sis5595.c 2010-09-17 20:12:09.000000000 -0400
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static const struct pci_device_id sis5595_pci_ids[] = {
@@ -25173,9 +25182,9 @@ diff -urNp linux-2.6.35.7/drivers/hwmon/sis5595.c linux-2.6.35.7/drivers/hwmon/s
};
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
-diff -urNp linux-2.6.35.7/drivers/hwmon/via686a.c linux-2.6.35.7/drivers/hwmon/via686a.c
---- linux-2.6.35.7/drivers/hwmon/via686a.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hwmon/via686a.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hwmon/via686a.c linux-2.6.35.8/drivers/hwmon/via686a.c
+--- linux-2.6.35.8/drivers/hwmon/via686a.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/hwmon/via686a.c 2010-09-17 20:12:09.000000000 -0400
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static const struct pci_device_id via686a_pci_ids[] = {
@@ -25185,9 +25194,9 @@ diff -urNp linux-2.6.35.7/drivers/hwmon/via686a.c linux-2.6.35.7/drivers/hwmon/v
};
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
-diff -urNp linux-2.6.35.7/drivers/hwmon/vt8231.c linux-2.6.35.7/drivers/hwmon/vt8231.c
---- linux-2.6.35.7/drivers/hwmon/vt8231.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hwmon/vt8231.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hwmon/vt8231.c linux-2.6.35.8/drivers/hwmon/vt8231.c
+--- linux-2.6.35.8/drivers/hwmon/vt8231.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/hwmon/vt8231.c 2010-09-17 20:12:09.000000000 -0400
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static const struct pci_device_id vt8231_pci_ids[] = {
@@ -25197,9 +25206,9 @@ diff -urNp linux-2.6.35.7/drivers/hwmon/vt8231.c linux-2.6.35.7/drivers/hwmon/vt
};
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
-diff -urNp linux-2.6.35.7/drivers/hwmon/w83791d.c linux-2.6.35.7/drivers/hwmon/w83791d.c
---- linux-2.6.35.7/drivers/hwmon/w83791d.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/hwmon/w83791d.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/hwmon/w83791d.c linux-2.6.35.8/drivers/hwmon/w83791d.c
+--- linux-2.6.35.8/drivers/hwmon/w83791d.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/hwmon/w83791d.c 2010-09-17 20:12:09.000000000 -0400
@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
struct i2c_board_info *info);
static int w83791d_remove(struct i2c_client *client);
@@ -25211,9 +25220,9 @@ diff -urNp linux-2.6.35.7/drivers/hwmon/w83791d.c linux-2.6.35.7/drivers/hwmon/w
static struct w83791d_data *w83791d_update_device(struct device *dev);
#ifdef DEBUG
-diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-i801.c linux-2.6.35.7/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.35.7/drivers/i2c/busses/i2c-i801.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/i2c/busses/i2c-i801.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/i2c/busses/i2c-i801.c linux-2.6.35.8/drivers/i2c/busses/i2c-i801.c
+--- linux-2.6.35.8/drivers/i2c/busses/i2c-i801.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/i2c/busses/i2c-i801.c 2010-09-17 20:12:09.000000000 -0400
@@ -592,7 +592,7 @@ static const struct pci_device_id i801_i
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -25223,9 +25232,9 @@ diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-i801.c linux-2.6.35.7/drivers/i
};
MODULE_DEVICE_TABLE(pci, i801_ids);
-diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.35.7/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.35.7/drivers/i2c/busses/i2c-piix4.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/i2c/busses/i2c-piix4.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/i2c/busses/i2c-piix4.c linux-2.6.35.8/drivers/i2c/busses/i2c-piix4.c
+--- linux-2.6.35.8/drivers/i2c/busses/i2c-piix4.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/i2c/busses/i2c-piix4.c 2010-09-17 20:12:09.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25244,9 +25253,9 @@ diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.35.7/drivers/
};
MODULE_DEVICE_TABLE (pci, piix4_ids);
-diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.35.7/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.35.7/drivers/i2c/busses/i2c-sis630.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/i2c/busses/i2c-sis630.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/i2c/busses/i2c-sis630.c linux-2.6.35.8/drivers/i2c/busses/i2c-sis630.c
+--- linux-2.6.35.8/drivers/i2c/busses/i2c-sis630.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/i2c/busses/i2c-sis630.c 2010-09-17 20:12:09.000000000 -0400
@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
static const struct pci_device_id sis630_ids[] __devinitconst = {
{ PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) },
@@ -25256,9 +25265,9 @@ diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.35.7/drivers
};
MODULE_DEVICE_TABLE (pci, sis630_ids);
-diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.35.7/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.35.7/drivers/i2c/busses/i2c-sis96x.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/i2c/busses/i2c-sis96x.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/i2c/busses/i2c-sis96x.c linux-2.6.35.8/drivers/i2c/busses/i2c-sis96x.c
+--- linux-2.6.35.8/drivers/i2c/busses/i2c-sis96x.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/i2c/busses/i2c-sis96x.c 2010-09-17 20:12:09.000000000 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static const struct pci_device_id sis96x_ids[] = {
@@ -25268,9 +25277,9 @@ diff -urNp linux-2.6.35.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.35.7/drivers
};
MODULE_DEVICE_TABLE (pci, sis96x_ids);
-diff -urNp linux-2.6.35.7/drivers/ide/ide-cd.c linux-2.6.35.7/drivers/ide/ide-cd.c
---- linux-2.6.35.7/drivers/ide/ide-cd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ide/ide-cd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ide/ide-cd.c linux-2.6.35.8/drivers/ide/ide-cd.c
+--- linux-2.6.35.8/drivers/ide/ide-cd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ide/ide-cd.c 2010-09-17 20:12:09.000000000 -0400
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -25280,9 +25289,9 @@ diff -urNp linux-2.6.35.7/drivers/ide/ide-cd.c linux-2.6.35.7/drivers/ide/ide-cd
drive->dma = 0;
}
}
-diff -urNp linux-2.6.35.7/drivers/ieee1394/dv1394.c linux-2.6.35.7/drivers/ieee1394/dv1394.c
---- linux-2.6.35.7/drivers/ieee1394/dv1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/dv1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/dv1394.c linux-2.6.35.8/drivers/ieee1394/dv1394.c
+--- linux-2.6.35.8/drivers/ieee1394/dv1394.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/dv1394.c 2010-09-17 20:12:09.000000000 -0400
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -25301,9 +25310,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/dv1394.c linux-2.6.35.7/drivers/ieee1
};
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
-diff -urNp linux-2.6.35.7/drivers/ieee1394/eth1394.c linux-2.6.35.7/drivers/ieee1394/eth1394.c
---- linux-2.6.35.7/drivers/ieee1394/eth1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/eth1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/eth1394.c linux-2.6.35.8/drivers/ieee1394/eth1394.c
+--- linux-2.6.35.8/drivers/ieee1394/eth1394.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/eth1394.c 2010-09-17 20:12:09.000000000 -0400
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -25313,9 +25322,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/eth1394.c linux-2.6.35.7/drivers/ieee
};
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
-diff -urNp linux-2.6.35.7/drivers/ieee1394/hosts.c linux-2.6.35.7/drivers/ieee1394/hosts.c
---- linux-2.6.35.7/drivers/ieee1394/hosts.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/hosts.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/hosts.c linux-2.6.35.8/drivers/ieee1394/hosts.c
+--- linux-2.6.35.8/drivers/ieee1394/hosts.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/hosts.c 2010-09-17 20:12:09.000000000 -0400
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -25324,9 +25333,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/hosts.c linux-2.6.35.7/drivers/ieee13
.transmit_packet = dummy_transmit_packet,
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
-diff -urNp linux-2.6.35.7/drivers/ieee1394/ohci1394.c linux-2.6.35.7/drivers/ieee1394/ohci1394.c
---- linux-2.6.35.7/drivers/ieee1394/ohci1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/ohci1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/ohci1394.c linux-2.6.35.8/drivers/ieee1394/ohci1394.c
+--- linux-2.6.35.8/drivers/ieee1394/ohci1394.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/ohci1394.c 2010-09-17 20:12:09.000000000 -0400
@@ -148,9 +148,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
@@ -25348,9 +25357,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/ohci1394.c linux-2.6.35.7/drivers/iee
};
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
-diff -urNp linux-2.6.35.7/drivers/ieee1394/raw1394.c linux-2.6.35.7/drivers/ieee1394/raw1394.c
---- linux-2.6.35.7/drivers/ieee1394/raw1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/raw1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/raw1394.c linux-2.6.35.8/drivers/ieee1394/raw1394.c
+--- linux-2.6.35.8/drivers/ieee1394/raw1394.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/raw1394.c 2010-09-17 20:12:09.000000000 -0400
@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25360,9 +25369,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/raw1394.c linux-2.6.35.7/drivers/ieee
};
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
-diff -urNp linux-2.6.35.7/drivers/ieee1394/sbp2.c linux-2.6.35.7/drivers/ieee1394/sbp2.c
---- linux-2.6.35.7/drivers/ieee1394/sbp2.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/sbp2.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/sbp2.c linux-2.6.35.8/drivers/ieee1394/sbp2.c
+--- linux-2.6.35.8/drivers/ieee1394/sbp2.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/sbp2.c 2010-09-17 20:12:09.000000000 -0400
@@ -289,7 +289,7 @@ static const struct ieee1394_device_id s
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25381,9 +25390,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/sbp2.c linux-2.6.35.7/drivers/ieee139
{
int ret;
-diff -urNp linux-2.6.35.7/drivers/ieee1394/video1394.c linux-2.6.35.7/drivers/ieee1394/video1394.c
---- linux-2.6.35.7/drivers/ieee1394/video1394.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/ieee1394/video1394.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/ieee1394/video1394.c linux-2.6.35.8/drivers/ieee1394/video1394.c
+--- linux-2.6.35.8/drivers/ieee1394/video1394.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/ieee1394/video1394.c 2010-09-17 20:12:09.000000000 -0400
@@ -1312,7 +1312,7 @@ static const struct ieee1394_device_id v
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -25393,9 +25402,9 @@ diff -urNp linux-2.6.35.7/drivers/ieee1394/video1394.c linux-2.6.35.7/drivers/ie
};
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
-diff -urNp linux-2.6.35.7/drivers/infiniband/core/cm.c linux-2.6.35.7/drivers/infiniband/core/cm.c
---- linux-2.6.35.7/drivers/infiniband/core/cm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/infiniband/core/cm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/infiniband/core/cm.c linux-2.6.35.8/drivers/infiniband/core/cm.c
+--- linux-2.6.35.8/drivers/infiniband/core/cm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/infiniband/core/cm.c 2010-09-17 20:12:09.000000000 -0400
@@ -113,7 +113,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -25535,9 +25544,9 @@ diff -urNp linux-2.6.35.7/drivers/infiniband/core/cm.c linux-2.6.35.7/drivers/in
}
static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-2.6.35.7/drivers/infiniband/hw/qib/qib.h linux-2.6.35.7/drivers/infiniband/hw/qib/qib.h
---- linux-2.6.35.7/drivers/infiniband/hw/qib/qib.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/infiniband/hw/qib/qib.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/infiniband/hw/qib/qib.h linux-2.6.35.8/drivers/infiniband/hw/qib/qib.h
+--- linux-2.6.35.8/drivers/infiniband/hw/qib/qib.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/infiniband/hw/qib/qib.h 2010-09-17 20:12:09.000000000 -0400
@@ -50,6 +50,7 @@
#include <linux/completion.h>
#include <linux/kref.h>
@@ -25546,9 +25555,9 @@ diff -urNp linux-2.6.35.7/drivers/infiniband/hw/qib/qib.h linux-2.6.35.7/drivers
#include "qib_common.h"
#include "qib_verbs.h"
-diff -urNp linux-2.6.35.7/drivers/input/keyboard/atkbd.c linux-2.6.35.7/drivers/input/keyboard/atkbd.c
---- linux-2.6.35.7/drivers/input/keyboard/atkbd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/keyboard/atkbd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/keyboard/atkbd.c linux-2.6.35.8/drivers/input/keyboard/atkbd.c
+--- linux-2.6.35.8/drivers/input/keyboard/atkbd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/keyboard/atkbd.c 2010-09-17 20:12:09.000000000 -0400
@@ -1240,7 +1240,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25558,9 +25567,9 @@ diff -urNp linux-2.6.35.7/drivers/input/keyboard/atkbd.c linux-2.6.35.7/drivers/
};
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
-diff -urNp linux-2.6.35.7/drivers/input/mouse/lifebook.c linux-2.6.35.7/drivers/input/mouse/lifebook.c
---- linux-2.6.35.7/drivers/input/mouse/lifebook.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/mouse/lifebook.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/mouse/lifebook.c linux-2.6.35.8/drivers/input/mouse/lifebook.c
+--- linux-2.6.35.8/drivers/input/mouse/lifebook.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/mouse/lifebook.c 2010-09-17 20:12:09.000000000 -0400
@@ -123,7 +123,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -25570,9 +25579,9 @@ diff -urNp linux-2.6.35.7/drivers/input/mouse/lifebook.c linux-2.6.35.7/drivers/
};
void __init lifebook_module_init(void)
-diff -urNp linux-2.6.35.7/drivers/input/mouse/psmouse-base.c linux-2.6.35.7/drivers/input/mouse/psmouse-base.c
---- linux-2.6.35.7/drivers/input/mouse/psmouse-base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/mouse/psmouse-base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/mouse/psmouse-base.c linux-2.6.35.8/drivers/input/mouse/psmouse-base.c
+--- linux-2.6.35.8/drivers/input/mouse/psmouse-base.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/mouse/psmouse-base.c 2010-09-17 20:12:09.000000000 -0400
@@ -1460,7 +1460,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25582,9 +25591,9 @@ diff -urNp linux-2.6.35.7/drivers/input/mouse/psmouse-base.c linux-2.6.35.7/driv
};
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
-diff -urNp linux-2.6.35.7/drivers/input/mouse/synaptics.c linux-2.6.35.7/drivers/input/mouse/synaptics.c
---- linux-2.6.35.7/drivers/input/mouse/synaptics.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/mouse/synaptics.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/mouse/synaptics.c linux-2.6.35.8/drivers/input/mouse/synaptics.c
+--- linux-2.6.35.8/drivers/input/mouse/synaptics.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/mouse/synaptics.c 2010-09-17 20:12:09.000000000 -0400
@@ -476,7 +476,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -25613,9 +25622,9 @@ diff -urNp linux-2.6.35.7/drivers/input/mouse/synaptics.c linux-2.6.35.7/drivers
#endif
};
-diff -urNp linux-2.6.35.7/drivers/input/mousedev.c linux-2.6.35.7/drivers/input/mousedev.c
---- linux-2.6.35.7/drivers/input/mousedev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/mousedev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/mousedev.c linux-2.6.35.8/drivers/input/mousedev.c
+--- linux-2.6.35.8/drivers/input/mousedev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/mousedev.c 2010-09-17 20:12:09.000000000 -0400
@@ -754,7 +754,7 @@ static ssize_t mousedev_read(struct file
spin_unlock_irq(&client->packet_lock);
@@ -25634,9 +25643,9 @@ diff -urNp linux-2.6.35.7/drivers/input/mousedev.c linux-2.6.35.7/drivers/input/
};
static int psaux_registered;
#endif
-diff -urNp linux-2.6.35.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.35.7/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.35.7/drivers/input/serio/i8042-x86ia64io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/serio/i8042-x86ia64io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/serio/i8042-x86ia64io.h linux-2.6.35.8/drivers/input/serio/i8042-x86ia64io.h
+--- linux-2.6.35.8/drivers/input/serio/i8042-x86ia64io.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/serio/i8042-x86ia64io.h 2010-09-17 20:12:09.000000000 -0400
@@ -183,7 +183,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -25691,9 +25700,9 @@ diff -urNp linux-2.6.35.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.35.7/d
};
#endif /* CONFIG_X86 */
-diff -urNp linux-2.6.35.7/drivers/input/serio/serio_raw.c linux-2.6.35.7/drivers/input/serio/serio_raw.c
---- linux-2.6.35.7/drivers/input/serio/serio_raw.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/input/serio/serio_raw.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/input/serio/serio_raw.c linux-2.6.35.8/drivers/input/serio/serio_raw.c
+--- linux-2.6.35.8/drivers/input/serio/serio_raw.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/input/serio/serio_raw.c 2010-09-17 20:12:09.000000000 -0400
@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25703,9 +25712,9 @@ diff -urNp linux-2.6.35.7/drivers/input/serio/serio_raw.c linux-2.6.35.7/drivers
};
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
-diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/common.c linux-2.6.35.7/drivers/isdn/gigaset/common.c
---- linux-2.6.35.7/drivers/isdn/gigaset/common.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/gigaset/common.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/gigaset/common.c linux-2.6.35.8/drivers/isdn/gigaset/common.c
+--- linux-2.6.35.8/drivers/isdn/gigaset/common.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/gigaset/common.c 2010-09-17 20:12:09.000000000 -0400
@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -25715,9 +25724,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/common.c linux-2.6.35.7/drivers/i
cs->dev = NULL;
cs->tty = NULL;
cs->tty_dev = NULL;
-diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/gigaset.h linux-2.6.35.7/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.35.7/drivers/isdn/gigaset/gigaset.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/gigaset/gigaset.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/gigaset/gigaset.h linux-2.6.35.8/drivers/isdn/gigaset/gigaset.h
+--- linux-2.6.35.8/drivers/isdn/gigaset/gigaset.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/gigaset/gigaset.h 2010-09-17 20:12:09.000000000 -0400
@@ -442,7 +442,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
@@ -25727,9 +25736,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/gigaset.h linux-2.6.35.7/drivers/
struct tty_struct *tty;
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
-diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/interface.c linux-2.6.35.7/drivers/isdn/gigaset/interface.c
---- linux-2.6.35.7/drivers/isdn/gigaset/interface.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/gigaset/interface.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/gigaset/interface.c linux-2.6.35.8/drivers/isdn/gigaset/interface.c
+--- linux-2.6.35.8/drivers/isdn/gigaset/interface.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/gigaset/interface.c 2010-09-17 20:12:09.000000000 -0400
@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS;
tty->driver_data = cs;
@@ -25817,9 +25826,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/gigaset/interface.c linux-2.6.35.7/driver
dev_warn(cs->dev, "%s: device not opened\n", __func__);
goto out;
}
-diff -urNp linux-2.6.35.7/drivers/isdn/hardware/avm/b1.c linux-2.6.35.7/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.35.7/drivers/isdn/hardware/avm/b1.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/hardware/avm/b1.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/hardware/avm/b1.c linux-2.6.35.8/drivers/isdn/hardware/avm/b1.c
+--- linux-2.6.35.8/drivers/isdn/hardware/avm/b1.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/hardware/avm/b1.c 2010-09-17 20:12:37.000000000 -0400
@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -25838,9 +25847,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/hardware/avm/b1.c linux-2.6.35.7/drivers/
return -EFAULT;
} else {
memcpy(buf, dp, left);
-diff -urNp linux-2.6.35.7/drivers/isdn/icn/icn.c linux-2.6.35.7/drivers/isdn/icn/icn.c
---- linux-2.6.35.7/drivers/isdn/icn/icn.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/icn/icn.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/icn/icn.c linux-2.6.35.8/drivers/isdn/icn/icn.c
+--- linux-2.6.35.8/drivers/isdn/icn/icn.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/icn/icn.c 2010-09-17 20:12:37.000000000 -0400
@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -25850,9 +25859,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/icn/icn.c linux-2.6.35.7/drivers/isdn/icn
return -EFAULT;
} else
memcpy(msg, buf, count);
-diff -urNp linux-2.6.35.7/drivers/isdn/sc/interrupt.c linux-2.6.35.7/drivers/isdn/sc/interrupt.c
---- linux-2.6.35.7/drivers/isdn/sc/interrupt.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/isdn/sc/interrupt.c 2010-10-10 15:58:05.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/isdn/sc/interrupt.c linux-2.6.35.8/drivers/isdn/sc/interrupt.c
+--- linux-2.6.35.8/drivers/isdn/sc/interrupt.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/isdn/sc/interrupt.c 2010-10-10 15:58:05.000000000 -0400
@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy,
}
else if(callid>=0x0000 && callid<=0x7FFF)
@@ -25887,9 +25896,9 @@ diff -urNp linux-2.6.35.7/drivers/isdn/sc/interrupt.c linux-2.6.35.7/drivers/isd
continue;
}
-diff -urNp linux-2.6.35.7/drivers/lguest/core.c linux-2.6.35.7/drivers/lguest/core.c
---- linux-2.6.35.7/drivers/lguest/core.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/lguest/core.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/lguest/core.c linux-2.6.35.8/drivers/lguest/core.c
+--- linux-2.6.35.8/drivers/lguest/core.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/lguest/core.c 2010-09-17 20:12:09.000000000 -0400
@@ -92,9 +92,17 @@ static __init int map_switcher(void)
* it's worked so far. The end address needs +1 because __get_vm_area
* allocates an extra guard page, so we need space for that.
@@ -25908,9 +25917,9 @@ diff -urNp linux-2.6.35.7/drivers/lguest/core.c linux-2.6.35.7/drivers/lguest/co
if (!switcher_vma) {
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
-diff -urNp linux-2.6.35.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.35.7/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.35.7/drivers/macintosh/via-pmu-backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/macintosh/via-pmu-backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/macintosh/via-pmu-backlight.c linux-2.6.35.8/drivers/macintosh/via-pmu-backlight.c
+--- linux-2.6.35.8/drivers/macintosh/via-pmu-backlight.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/macintosh/via-pmu-backlight.c 2010-09-17 20:12:09.000000000 -0400
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -25929,9 +25938,9 @@ diff -urNp linux-2.6.35.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.35.7/d
.get_brightness = pmu_backlight_get_brightness,
.update_status = pmu_backlight_update_status,
-diff -urNp linux-2.6.35.7/drivers/macintosh/via-pmu.c linux-2.6.35.7/drivers/macintosh/via-pmu.c
---- linux-2.6.35.7/drivers/macintosh/via-pmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/macintosh/via-pmu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/macintosh/via-pmu.c linux-2.6.35.8/drivers/macintosh/via-pmu.c
+--- linux-2.6.35.8/drivers/macintosh/via-pmu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/macintosh/via-pmu.c 2010-09-17 20:12:09.000000000 -0400
@@ -2254,7 +2254,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -25941,9 +25950,9 @@ diff -urNp linux-2.6.35.7/drivers/macintosh/via-pmu.c linux-2.6.35.7/drivers/mac
.enter = powerbook_sleep,
.valid = pmu_sleep_valid,
};
-diff -urNp linux-2.6.35.7/drivers/md/bitmap.c linux-2.6.35.7/drivers/md/bitmap.c
---- linux-2.6.35.7/drivers/md/bitmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/md/bitmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/md/bitmap.c linux-2.6.35.8/drivers/md/bitmap.c
+--- linux-2.6.35.8/drivers/md/bitmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/md/bitmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25953,9 +25962,9 @@ diff -urNp linux-2.6.35.7/drivers/md/bitmap.c linux-2.6.35.7/drivers/md/bitmap.c
# endif
#endif
-diff -urNp linux-2.6.35.7/drivers/md/dm-table.c linux-2.6.35.7/drivers/md/dm-table.c
---- linux-2.6.35.7/drivers/md/dm-table.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/md/dm-table.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/md/dm-table.c linux-2.6.35.8/drivers/md/dm-table.c
+--- linux-2.6.35.8/drivers/md/dm-table.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/md/dm-table.c 2010-09-17 20:12:09.000000000 -0400
@@ -363,7 +363,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -25965,9 +25974,9 @@ diff -urNp linux-2.6.35.7/drivers/md/dm-table.c linux-2.6.35.7/drivers/md/dm-tab
DMWARN("%s: %s too small for target: "
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-2.6.35.7/drivers/md/md.c linux-2.6.35.7/drivers/md/md.c
---- linux-2.6.35.7/drivers/md/md.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/md/md.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/md/md.c linux-2.6.35.8/drivers/md/md.c
+--- linux-2.6.35.8/drivers/md/md.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/md/md.c 2010-09-17 20:12:09.000000000 -0400
@@ -6352,7 +6352,7 @@ static int md_seq_show(struct seq_file *
chunk_kb ? "KB" : "B");
if (bitmap->file) {
@@ -25986,9 +25995,9 @@ diff -urNp linux-2.6.35.7/drivers/md/md.c linux-2.6.35.7/drivers/md/md.c
/* sync IO will cause sync_io to increase before the disk_stats
* as sync_io is counted when a request starts, and
* disk_stats is counted when it completes.
-diff -urNp linux-2.6.35.7/drivers/md/md.h linux-2.6.35.7/drivers/md/md.h
---- linux-2.6.35.7/drivers/md/md.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/md/md.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/md/md.h linux-2.6.35.8/drivers/md/md.h
+--- linux-2.6.35.8/drivers/md/md.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/md/md.h 2010-09-17 20:12:09.000000000 -0400
@@ -334,7 +334,7 @@ static inline void rdev_dec_pending(mdk_
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25998,9 +26007,9 @@ diff -urNp linux-2.6.35.7/drivers/md/md.h linux-2.6.35.7/drivers/md/md.h
}
struct mdk_personality
-diff -urNp linux-2.6.35.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35.7/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.35.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35.8/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-2.6.35.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-17 20:12:09.000000000 -0400
@@ -196,6 +196,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -26009,9 +26018,9 @@ diff -urNp linux-2.6.35.7/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.35.7/dri
struct file_operations *dvbdevfops;
struct device *clsdev;
int minor;
-diff -urNp linux-2.6.35.7/drivers/media/radio/radio-cadet.c linux-2.6.35.7/drivers/media/radio/radio-cadet.c
---- linux-2.6.35.7/drivers/media/radio/radio-cadet.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/media/radio/radio-cadet.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/media/radio/radio-cadet.c linux-2.6.35.8/drivers/media/radio/radio-cadet.c
+--- linux-2.6.35.8/drivers/media/radio/radio-cadet.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/media/radio/radio-cadet.c 2010-09-17 20:12:37.000000000 -0400
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
while (i < count && dev->rdsin != dev->rdsout)
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -26021,68 +26030,9 @@ diff -urNp linux-2.6.35.7/drivers/media/radio/radio-cadet.c linux-2.6.35.7/drive
return -EFAULT;
return i;
}
-diff -urNp linux-2.6.35.7/drivers/media/video/v4l2-compat-ioctl32.c linux-2.6.35.7/drivers/media/video/v4l2-compat-ioctl32.c
---- linux-2.6.35.7/drivers/media/video/v4l2-compat-ioctl32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/media/video/v4l2-compat-ioctl32.c 2010-10-19 18:15:40.000000000 -0400
-@@ -193,17 +193,24 @@ static int put_video_window32(struct vid
- struct video_code32 {
- char loadwhat[16]; /* name or tag of file being passed */
- compat_int_t datasize;
-- unsigned char *data;
-+ compat_uptr_t data;
- };
-
--static int get_microcode32(struct video_code *kp, struct video_code32 __user *up)
-+static struct video_code __user *get_microcode32(struct video_code32 *kp)
- {
-- if (!access_ok(VERIFY_READ, up, sizeof(struct video_code32)) ||
-- copy_from_user(kp->loadwhat, up->loadwhat, sizeof(up->loadwhat)) ||
-- get_user(kp->datasize, &up->datasize) ||
-- copy_from_user(kp->data, up->data, up->datasize))
-- return -EFAULT;
-- return 0;
-+ struct video_code __user *up;
-+
-+ up = compat_alloc_user_space(sizeof(*up));
-+
-+ /*
-+ * NOTE! We don't actually care if these fail. If the
-+ * user address is invalid, the native ioctl will do
-+ * the error handling for us
-+ */
-+ (void) copy_to_user(up->loadwhat, kp->loadwhat, sizeof(up->loadwhat));
-+ (void) put_user(kp->datasize, &up->datasize);
-+ (void) put_user(compat_ptr(kp->data), &up->data);
-+ return up;
- }
-
- #define VIDIOCGTUNER32 _IOWR('v', 4, struct video_tuner32)
-@@ -744,7 +751,7 @@ static long do_video_ioctl(struct file *
- struct video_tuner vt;
- struct video_buffer vb;
- struct video_window vw;
-- struct video_code vc;
-+ struct video_code32 vc;
- struct video_audio va;
- #endif
- struct v4l2_format v2f;
-@@ -823,8 +830,11 @@ static long do_video_ioctl(struct file *
- break;
-
- case VIDIOCSMICROCODE:
-- err = get_microcode32(&karg.vc, up);
-- compatible_arg = 0;
-+ /* Copy the 32-bit "video_code32" to kernel space */
-+ if (copy_from_user(&karg.vc, up, sizeof(karg.vc)))
-+ return -EFAULT;
-+ /* Convert the 32-bit version to a 64-bit version in user space */
-+ up = get_microcode32(&karg.vc);
- break;
-
- case VIDIOCSFREQ:
-diff -urNp linux-2.6.35.7/drivers/message/fusion/mptbase.c linux-2.6.35.7/drivers/message/fusion/mptbase.c
---- linux-2.6.35.7/drivers/message/fusion/mptbase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/message/fusion/mptbase.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/message/fusion/mptbase.c linux-2.6.35.8/drivers/message/fusion/mptbase.c
+--- linux-2.6.35.8/drivers/message/fusion/mptbase.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/message/fusion/mptbase.c 2010-09-17 20:12:37.000000000 -0400
@@ -6715,8 +6715,14 @@ procmpt_iocinfo_read(char *buf, char **s
len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -26098,9 +26048,9 @@ diff -urNp linux-2.6.35.7/drivers/message/fusion/mptbase.c linux-2.6.35.7/driver
/*
* Rounding UP to nearest 4-kB boundary here...
*/
-diff -urNp linux-2.6.35.7/drivers/message/fusion/mptdebug.h linux-2.6.35.7/drivers/message/fusion/mptdebug.h
---- linux-2.6.35.7/drivers/message/fusion/mptdebug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/message/fusion/mptdebug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/message/fusion/mptdebug.h linux-2.6.35.8/drivers/message/fusion/mptdebug.h
+--- linux-2.6.35.8/drivers/message/fusion/mptdebug.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/message/fusion/mptdebug.h 2010-09-17 20:12:09.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
@@ -26110,9 +26060,9 @@ diff -urNp linux-2.6.35.7/drivers/message/fusion/mptdebug.h linux-2.6.35.7/drive
#endif
-diff -urNp linux-2.6.35.7/drivers/message/fusion/mptsas.c linux-2.6.35.7/drivers/message/fusion/mptsas.c
---- linux-2.6.35.7/drivers/message/fusion/mptsas.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/message/fusion/mptsas.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/message/fusion/mptsas.c linux-2.6.35.8/drivers/message/fusion/mptsas.c
+--- linux-2.6.35.8/drivers/message/fusion/mptsas.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/message/fusion/mptsas.c 2010-09-17 20:12:09.000000000 -0400
@@ -437,6 +437,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -26161,9 +26111,9 @@ diff -urNp linux-2.6.35.7/drivers/message/fusion/mptsas.c linux-2.6.35.7/drivers
static inline struct sas_port *
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
-diff -urNp linux-2.6.35.7/drivers/message/fusion/mptscsih.c linux-2.6.35.7/drivers/message/fusion/mptscsih.c
---- linux-2.6.35.7/drivers/message/fusion/mptscsih.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/message/fusion/mptscsih.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/message/fusion/mptscsih.c linux-2.6.35.8/drivers/message/fusion/mptscsih.c
+--- linux-2.6.35.8/drivers/message/fusion/mptscsih.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/message/fusion/mptscsih.c 2010-10-11 22:41:44.000000000 -0400
@@ -1244,15 +1244,16 @@ mptscsih_info(struct Scsi_Host *SChost)
h = shost_priv(SChost);
@@ -26189,9 +26139,9 @@ diff -urNp linux-2.6.35.7/drivers/message/fusion/mptscsih.c linux-2.6.35.7/drive
return h->info_kbuf;
}
-diff -urNp linux-2.6.35.7/drivers/message/i2o/i2o_proc.c linux-2.6.35.7/drivers/message/i2o/i2o_proc.c
---- linux-2.6.35.7/drivers/message/i2o/i2o_proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/message/i2o/i2o_proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/message/i2o/i2o_proc.c linux-2.6.35.8/drivers/message/i2o/i2o_proc.c
+--- linux-2.6.35.8/drivers/message/i2o/i2o_proc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/message/i2o/i2o_proc.c 2010-09-17 20:12:09.000000000 -0400
@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -26278,9 +26228,9 @@ diff -urNp linux-2.6.35.7/drivers/message/i2o/i2o_proc.c linux-2.6.35.7/drivers/
return 0;
}
-diff -urNp linux-2.6.35.7/drivers/mfd/janz-cmodio.c linux-2.6.35.7/drivers/mfd/janz-cmodio.c
---- linux-2.6.35.7/drivers/mfd/janz-cmodio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/mfd/janz-cmodio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/mfd/janz-cmodio.c linux-2.6.35.8/drivers/mfd/janz-cmodio.c
+--- linux-2.6.35.8/drivers/mfd/janz-cmodio.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/mfd/janz-cmodio.c 2010-09-17 20:12:09.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
@@ -26289,9 +26239,9 @@ diff -urNp linux-2.6.35.7/drivers/mfd/janz-cmodio.c linux-2.6.35.7/drivers/mfd/j
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-diff -urNp linux-2.6.35.7/drivers/misc/kgdbts.c linux-2.6.35.7/drivers/misc/kgdbts.c
---- linux-2.6.35.7/drivers/misc/kgdbts.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/misc/kgdbts.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/misc/kgdbts.c linux-2.6.35.8/drivers/misc/kgdbts.c
+--- linux-2.6.35.8/drivers/misc/kgdbts.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/misc/kgdbts.c 2010-09-17 20:12:09.000000000 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -26310,9 +26260,9 @@ diff -urNp linux-2.6.35.7/drivers/misc/kgdbts.c linux-2.6.35.7/drivers/misc/kgdb
.name = "kgdbts",
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
-diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.35.7/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.35.7/drivers/misc/sgi-gru/gruhandles.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/misc/sgi-gru/gruhandles.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/misc/sgi-gru/gruhandles.c linux-2.6.35.8/drivers/misc/sgi-gru/gruhandles.c
+--- linux-2.6.35.8/drivers/misc/sgi-gru/gruhandles.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/misc/sgi-gru/gruhandles.c 2010-09-17 20:12:09.000000000 -0400
@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
unsigned long nsec;
@@ -26324,9 +26274,9 @@ diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/gruhandles.c linux-2.6.35.7/drive
if (mcs_op_statistics[op].max < nsec)
mcs_op_statistics[op].max = nsec;
}
-diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.35.7/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.35.7/drivers/misc/sgi-gru/gruprocfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/misc/sgi-gru/gruprocfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.35.8/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-2.6.35.8/drivers/misc/sgi-gru/gruprocfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/misc/sgi-gru/gruprocfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -26350,9 +26300,9 @@ diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.35.7/driver
max = mcs_op_statistics[op].max;
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
count ? total / count : 0, max);
-diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/grutables.h linux-2.6.35.7/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.35.7/drivers/misc/sgi-gru/grutables.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/misc/sgi-gru/grutables.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/misc/sgi-gru/grutables.h linux-2.6.35.8/drivers/misc/sgi-gru/grutables.h
+--- linux-2.6.35.8/drivers/misc/sgi-gru/grutables.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/misc/sgi-gru/grutables.h 2010-09-17 20:12:09.000000000 -0400
@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -26532,9 +26482,9 @@ diff -urNp linux-2.6.35.7/drivers/misc/sgi-gru/grutables.h linux-2.6.35.7/driver
} while (0)
#ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-2.6.35.7/drivers/mtd/devices/doc2000.c linux-2.6.35.7/drivers/mtd/devices/doc2000.c
---- linux-2.6.35.7/drivers/mtd/devices/doc2000.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/mtd/devices/doc2000.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/mtd/devices/doc2000.c linux-2.6.35.8/drivers/mtd/devices/doc2000.c
+--- linux-2.6.35.8/drivers/mtd/devices/doc2000.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/mtd/devices/doc2000.c 2010-09-17 20:12:09.000000000 -0400
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
/* The ECC will not be calculated correctly if less than 512 is written */
@@ -26544,9 +26494,9 @@ diff -urNp linux-2.6.35.7/drivers/mtd/devices/doc2000.c linux-2.6.35.7/drivers/m
printk(KERN_WARNING
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
-diff -urNp linux-2.6.35.7/drivers/mtd/devices/doc2001.c linux-2.6.35.7/drivers/mtd/devices/doc2001.c
---- linux-2.6.35.7/drivers/mtd/devices/doc2001.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/mtd/devices/doc2001.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/mtd/devices/doc2001.c linux-2.6.35.8/drivers/mtd/devices/doc2001.c
+--- linux-2.6.35.8/drivers/mtd/devices/doc2001.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/mtd/devices/doc2001.c 2010-09-17 20:12:09.000000000 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -26556,9 +26506,9 @@ diff -urNp linux-2.6.35.7/drivers/mtd/devices/doc2001.c linux-2.6.35.7/drivers/m
return -EINVAL;
/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-2.6.35.7/drivers/mtd/nand/denali.c linux-2.6.35.7/drivers/mtd/nand/denali.c
---- linux-2.6.35.7/drivers/mtd/nand/denali.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/mtd/nand/denali.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/mtd/nand/denali.c linux-2.6.35.8/drivers/mtd/nand/denali.c
+--- linux-2.6.35.8/drivers/mtd/nand/denali.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/mtd/nand/denali.c 2010-09-17 20:12:09.000000000 -0400
@@ -24,6 +24,7 @@
#include <linux/pci.h>
#include <linux/mtd/mtd.h>
@@ -26567,9 +26517,9 @@ diff -urNp linux-2.6.35.7/drivers/mtd/nand/denali.c linux-2.6.35.7/drivers/mtd/n
#include "denali.h"
-diff -urNp linux-2.6.35.7/drivers/mtd/ubi/build.c linux-2.6.35.7/drivers/mtd/ubi/build.c
---- linux-2.6.35.7/drivers/mtd/ubi/build.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/mtd/ubi/build.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/mtd/ubi/build.c linux-2.6.35.8/drivers/mtd/ubi/build.c
+--- linux-2.6.35.8/drivers/mtd/ubi/build.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/mtd/ubi/build.c 2010-09-17 20:12:09.000000000 -0400
@@ -1282,7 +1282,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -26609,9 +26559,9 @@ diff -urNp linux-2.6.35.7/drivers/mtd/ubi/build.c linux-2.6.35.7/drivers/mtd/ubi
}
/**
-diff -urNp linux-2.6.35.7/drivers/net/cxgb3/cxgb3_main.c linux-2.6.35.7/drivers/net/cxgb3/cxgb3_main.c
---- linux-2.6.35.7/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/cxgb3/cxgb3_main.c linux-2.6.35.8/drivers/net/cxgb3/cxgb3_main.c
+--- linux-2.6.35.8/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/net/cxgb3/cxgb3_main.c 2010-09-26 17:32:46.000000000 -0400
@@ -2296,7 +2296,7 @@ static int cxgb_extension_ioctl(struct n
case CHELSIO_GET_QSET_NUM:{
struct ch_reg edata;
@@ -26621,9 +26571,9 @@ diff -urNp linux-2.6.35.7/drivers/net/cxgb3/cxgb3_main.c linux-2.6.35.7/drivers/
edata.cmd = CHELSIO_GET_QSET_NUM;
edata.val = pi->nqsets;
-diff -urNp linux-2.6.35.7/drivers/net/e1000e/82571.c linux-2.6.35.7/drivers/net/e1000e/82571.c
---- linux-2.6.35.7/drivers/net/e1000e/82571.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/e1000e/82571.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/e1000e/82571.c linux-2.6.35.8/drivers/net/e1000e/82571.c
+--- linux-2.6.35.8/drivers/net/e1000e/82571.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/e1000e/82571.c 2010-09-17 20:12:09.000000000 -0400
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -26677,9 +26627,9 @@ diff -urNp linux-2.6.35.7/drivers/net/e1000e/82571.c linux-2.6.35.7/drivers/net/
.acquire = e1000_acquire_nvm_82571,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_82571,
-diff -urNp linux-2.6.35.7/drivers/net/e1000e/e1000.h linux-2.6.35.7/drivers/net/e1000e/e1000.h
---- linux-2.6.35.7/drivers/net/e1000e/e1000.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/e1000e/e1000.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/e1000e/e1000.h linux-2.6.35.8/drivers/net/e1000e/e1000.h
+--- linux-2.6.35.8/drivers/net/e1000e/e1000.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/e1000e/e1000.h 2010-09-17 20:12:09.000000000 -0400
@@ -377,9 +377,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -26693,9 +26643,9 @@ diff -urNp linux-2.6.35.7/drivers/net/e1000e/e1000.h linux-2.6.35.7/drivers/net/
};
/* hardware capability, feature, and workaround flags */
-diff -urNp linux-2.6.35.7/drivers/net/e1000e/es2lan.c linux-2.6.35.7/drivers/net/e1000e/es2lan.c
---- linux-2.6.35.7/drivers/net/e1000e/es2lan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/e1000e/es2lan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/e1000e/es2lan.c linux-2.6.35.8/drivers/net/e1000e/es2lan.c
+--- linux-2.6.35.8/drivers/net/e1000e/es2lan.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/e1000e/es2lan.c 2010-09-17 20:12:09.000000000 -0400
@@ -205,6 +205,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -26731,9 +26681,9 @@ diff -urNp linux-2.6.35.7/drivers/net/e1000e/es2lan.c linux-2.6.35.7/drivers/net
.acquire = e1000_acquire_nvm_80003es2lan,
.read = e1000e_read_nvm_eerd,
.release = e1000_release_nvm_80003es2lan,
-diff -urNp linux-2.6.35.7/drivers/net/e1000e/hw.h linux-2.6.35.7/drivers/net/e1000e/hw.h
---- linux-2.6.35.7/drivers/net/e1000e/hw.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/e1000e/hw.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/e1000e/hw.h linux-2.6.35.8/drivers/net/e1000e/hw.h
+--- linux-2.6.35.8/drivers/net/e1000e/hw.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/e1000e/hw.h 2010-09-17 20:12:09.000000000 -0400
@@ -791,13 +791,13 @@ struct e1000_phy_operations {
/* Function pointers for the NVM. */
@@ -26763,9 +26713,9 @@ diff -urNp linux-2.6.35.7/drivers/net/e1000e/hw.h linux-2.6.35.7/drivers/net/e10
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.35.7/drivers/net/e1000e/ich8lan.c linux-2.6.35.7/drivers/net/e1000e/ich8lan.c
---- linux-2.6.35.7/drivers/net/e1000e/ich8lan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/e1000e/ich8lan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/e1000e/ich8lan.c linux-2.6.35.8/drivers/net/e1000e/ich8lan.c
+--- linux-2.6.35.8/drivers/net/e1000e/ich8lan.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/e1000e/ich8lan.c 2010-09-17 20:12:09.000000000 -0400
@@ -3388,7 +3388,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -26793,9 +26743,9 @@ diff -urNp linux-2.6.35.7/drivers/net/e1000e/ich8lan.c linux-2.6.35.7/drivers/ne
.acquire = e1000_acquire_nvm_ich8lan,
.read = e1000_read_nvm_ich8lan,
.release = e1000_release_nvm_ich8lan,
-diff -urNp linux-2.6.35.7/drivers/net/eql.c linux-2.6.35.7/drivers/net/eql.c
---- linux-2.6.35.7/drivers/net/eql.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/eql.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/eql.c linux-2.6.35.8/drivers/net/eql.c
+--- linux-2.6.35.8/drivers/net/eql.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/net/eql.c 2010-09-26 17:32:46.000000000 -0400
@@ -555,7 +555,7 @@ static int eql_g_master_cfg(struct net_d
equalizer_t *eql;
master_config_t mc;
@@ -26805,9 +26755,9 @@ diff -urNp linux-2.6.35.7/drivers/net/eql.c linux-2.6.35.7/drivers/net/eql.c
if (eql_is_master(dev)) {
eql = netdev_priv(dev);
-diff -urNp linux-2.6.35.7/drivers/net/igb/e1000_82575.c linux-2.6.35.7/drivers/net/igb/e1000_82575.c
---- linux-2.6.35.7/drivers/net/igb/e1000_82575.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/igb/e1000_82575.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/igb/e1000_82575.c linux-2.6.35.8/drivers/net/igb/e1000_82575.c
+--- linux-2.6.35.8/drivers/net/igb/e1000_82575.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/igb/e1000_82575.c 2010-09-17 20:12:09.000000000 -0400
@@ -1597,7 +1597,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
return ret_val;
}
@@ -26833,9 +26783,9 @@ diff -urNp linux-2.6.35.7/drivers/net/igb/e1000_82575.c linux-2.6.35.7/drivers/n
.acquire = igb_acquire_nvm_82575,
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
-diff -urNp linux-2.6.35.7/drivers/net/igb/e1000_hw.h linux-2.6.35.7/drivers/net/igb/e1000_hw.h
---- linux-2.6.35.7/drivers/net/igb/e1000_hw.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/igb/e1000_hw.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/igb/e1000_hw.h linux-2.6.35.8/drivers/net/igb/e1000_hw.h
+--- linux-2.6.35.8/drivers/net/igb/e1000_hw.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/igb/e1000_hw.h 2010-09-17 20:12:09.000000000 -0400
@@ -323,17 +323,17 @@ struct e1000_phy_operations {
};
@@ -26869,9 +26819,9 @@ diff -urNp linux-2.6.35.7/drivers/net/igb/e1000_hw.h linux-2.6.35.7/drivers/net/
struct e1000_nvm_operations ops;
enum e1000_nvm_type type;
-diff -urNp linux-2.6.35.7/drivers/net/irda/vlsi_ir.c linux-2.6.35.7/drivers/net/irda/vlsi_ir.c
---- linux-2.6.35.7/drivers/net/irda/vlsi_ir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/irda/vlsi_ir.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/irda/vlsi_ir.c linux-2.6.35.8/drivers/net/irda/vlsi_ir.c
+--- linux-2.6.35.8/drivers/net/irda/vlsi_ir.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/irda/vlsi_ir.c 2010-09-17 20:12:09.000000000 -0400
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -26888,9 +26838,9 @@ diff -urNp linux-2.6.35.7/drivers/net/irda/vlsi_ir.c linux-2.6.35.7/drivers/net/
spin_unlock_irqrestore(&idev->lock, flags);
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
-diff -urNp linux-2.6.35.7/drivers/net/pcnet32.c linux-2.6.35.7/drivers/net/pcnet32.c
---- linux-2.6.35.7/drivers/net/pcnet32.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/pcnet32.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/pcnet32.c linux-2.6.35.8/drivers/net/pcnet32.c
+--- linux-2.6.35.8/drivers/net/pcnet32.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/pcnet32.c 2010-09-17 20:12:09.000000000 -0400
@@ -82,7 +82,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -26900,9 +26850,9 @@ diff -urNp linux-2.6.35.7/drivers/net/pcnet32.c linux-2.6.35.7/drivers/net/pcnet
{ 0x300, 0x320, 0x340, 0x360, 0 };
static int pcnet32_debug;
-diff -urNp linux-2.6.35.7/drivers/net/ppp_generic.c linux-2.6.35.7/drivers/net/ppp_generic.c
---- linux-2.6.35.7/drivers/net/ppp_generic.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/ppp_generic.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/ppp_generic.c linux-2.6.35.8/drivers/net/ppp_generic.c
+--- linux-2.6.35.8/drivers/net/ppp_generic.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/ppp_generic.c 2010-09-17 20:12:09.000000000 -0400
@@ -992,7 +992,6 @@ ppp_net_ioctl(struct net_device *dev, st
void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
struct ppp_stats stats;
@@ -26921,9 +26871,9 @@ diff -urNp linux-2.6.35.7/drivers/net/ppp_generic.c linux-2.6.35.7/drivers/net/p
break;
err = 0;
break;
-diff -urNp linux-2.6.35.7/drivers/net/tg3.c linux-2.6.35.7/drivers/net/tg3.c
---- linux-2.6.35.7/drivers/net/tg3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/tg3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/tg3.c linux-2.6.35.8/drivers/net/tg3.c
+--- linux-2.6.35.8/drivers/net/tg3.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/tg3.c 2010-09-17 20:12:09.000000000 -0400
@@ -12410,7 +12410,7 @@ static void __devinit tg3_read_vpd(struc
cnt = pci_read_vpd(tp->pdev, pos,
TG3_NVM_VPD_LEN - pos,
@@ -26933,9 +26883,9 @@ diff -urNp linux-2.6.35.7/drivers/net/tg3.c linux-2.6.35.7/drivers/net/tg3.c
cnt = 0;
else if (cnt < 0)
goto out_not_found;
-diff -urNp linux-2.6.35.7/drivers/net/tg3.h linux-2.6.35.7/drivers/net/tg3.h
---- linux-2.6.35.7/drivers/net/tg3.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/tg3.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/tg3.h linux-2.6.35.8/drivers/net/tg3.h
+--- linux-2.6.35.8/drivers/net/tg3.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/tg3.h 2010-09-17 20:12:09.000000000 -0400
@@ -130,6 +130,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -26944,9 +26894,9 @@ diff -urNp linux-2.6.35.7/drivers/net/tg3.h linux-2.6.35.7/drivers/net/tg3.h
#define CHIPREV_ID_5750_C2 0x4202
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
-diff -urNp linux-2.6.35.7/drivers/net/tulip/de4x5.c linux-2.6.35.7/drivers/net/tulip/de4x5.c
---- linux-2.6.35.7/drivers/net/tulip/de4x5.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/tulip/de4x5.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/tulip/de4x5.c linux-2.6.35.8/drivers/net/tulip/de4x5.c
+--- linux-2.6.35.8/drivers/net/tulip/de4x5.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/tulip/de4x5.c 2010-09-17 20:12:37.000000000 -0400
@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -26974,9 +26924,9 @@ diff -urNp linux-2.6.35.7/drivers/net/tulip/de4x5.c linux-2.6.35.7/drivers/net/t
break;
#define DE4X5_DUMP 0x0f /* Dump the DE4X5 Status */
-diff -urNp linux-2.6.35.7/drivers/net/usb/hso.c linux-2.6.35.7/drivers/net/usb/hso.c
---- linux-2.6.35.7/drivers/net/usb/hso.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/usb/hso.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/usb/hso.c linux-2.6.35.8/drivers/net/usb/hso.c
+--- linux-2.6.35.8/drivers/net/usb/hso.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/net/usb/hso.c 2010-09-26 17:32:46.000000000 -0400
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
@@ -27078,9 +27028,9 @@ diff -urNp linux-2.6.35.7/drivers/net/usb/hso.c linux-2.6.35.7/drivers/net/usb/h
result =
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-2.6.35.7/drivers/net/wireless/b43/debugfs.c linux-2.6.35.7/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.35.7/drivers/net/wireless/b43/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/wireless/b43/debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/wireless/b43/debugfs.c linux-2.6.35.8/drivers/net/wireless/b43/debugfs.c
+--- linux-2.6.35.8/drivers/net/wireless/b43/debugfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/wireless/b43/debugfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -27090,9 +27040,9 @@ diff -urNp linux-2.6.35.7/drivers/net/wireless/b43/debugfs.c linux-2.6.35.7/driv
/* Offset of struct b43_dfs_file in struct b43_dfsentry */
size_t file_struct_offset;
};
-diff -urNp linux-2.6.35.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.35.7/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.35.7/drivers/net/wireless/b43legacy/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/wireless/b43legacy/debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.35.8/drivers/net/wireless/b43legacy/debugfs.c
+--- linux-2.6.35.8/drivers/net/wireless/b43legacy/debugfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/wireless/b43legacy/debugfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -27102,9 +27052,9 @@ diff -urNp linux-2.6.35.7/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.35.
/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
size_t file_struct_offset;
/* Take wl->irq_lock before calling read/write? */
-diff -urNp linux-2.6.35.7/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.35.7/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.35.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.35.8/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.35.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-17 20:12:09.000000000 -0400
@@ -68,8 +68,8 @@ do {
} while (0)
@@ -27116,9 +27066,9 @@ diff -urNp linux-2.6.35.7/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.35.
static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
void *p, u32 len)
{}
-diff -urNp linux-2.6.35.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.35.7/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.35.7/drivers/net/wireless/libertas/debugfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/wireless/libertas/debugfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/wireless/libertas/debugfs.c linux-2.6.35.8/drivers/net/wireless/libertas/debugfs.c
+--- linux-2.6.35.8/drivers/net/wireless/libertas/debugfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/wireless/libertas/debugfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -718,7 +718,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -27128,9 +27078,9 @@ diff -urNp linux-2.6.35.7/drivers/net/wireless/libertas/debugfs.c linux-2.6.35.7
};
static const struct lbs_debugfs_files debugfs_files[] = {
-diff -urNp linux-2.6.35.7/drivers/net/wireless/rndis_wlan.c linux-2.6.35.7/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.35.7/drivers/net/wireless/rndis_wlan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/net/wireless/rndis_wlan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/net/wireless/rndis_wlan.c linux-2.6.35.8/drivers/net/wireless/rndis_wlan.c
+--- linux-2.6.35.8/drivers/net/wireless/rndis_wlan.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/net/wireless/rndis_wlan.c 2010-09-17 20:12:09.000000000 -0400
@@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbn
netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -27140,9 +27090,9 @@ diff -urNp linux-2.6.35.7/drivers/net/wireless/rndis_wlan.c linux-2.6.35.7/drive
rts_threshold = 2347;
tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-2.6.35.7/drivers/oprofile/buffer_sync.c linux-2.6.35.7/drivers/oprofile/buffer_sync.c
---- linux-2.6.35.7/drivers/oprofile/buffer_sync.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/buffer_sync.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/buffer_sync.c linux-2.6.35.8/drivers/oprofile/buffer_sync.c
+--- linux-2.6.35.8/drivers/oprofile/buffer_sync.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/buffer_sync.c 2010-09-20 17:33:32.000000000 -0400
@@ -342,7 +342,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -27178,9 +27128,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/buffer_sync.c linux-2.6.35.7/drivers/
}
}
release_mm(mm);
-diff -urNp linux-2.6.35.7/drivers/oprofile/event_buffer.c linux-2.6.35.7/drivers/oprofile/event_buffer.c
---- linux-2.6.35.7/drivers/oprofile/event_buffer.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/event_buffer.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/event_buffer.c linux-2.6.35.8/drivers/oprofile/event_buffer.c
+--- linux-2.6.35.8/drivers/oprofile/event_buffer.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/event_buffer.c 2010-09-17 20:12:09.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -27190,9 +27140,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/event_buffer.c linux-2.6.35.7/drivers
return;
}
-diff -urNp linux-2.6.35.7/drivers/oprofile/oprof.c linux-2.6.35.7/drivers/oprofile/oprof.c
---- linux-2.6.35.7/drivers/oprofile/oprof.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/oprof.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/oprof.c linux-2.6.35.8/drivers/oprofile/oprof.c
+--- linux-2.6.35.8/drivers/oprofile/oprof.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/oprof.c 2010-09-17 20:12:09.000000000 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -27202,9 +27152,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/oprof.c linux-2.6.35.7/drivers/oprofi
start_switch_worker();
}
-diff -urNp linux-2.6.35.7/drivers/oprofile/oprofilefs.c linux-2.6.35.7/drivers/oprofile/oprofilefs.c
---- linux-2.6.35.7/drivers/oprofile/oprofilefs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/oprofilefs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/oprofilefs.c linux-2.6.35.8/drivers/oprofile/oprofilefs.c
+--- linux-2.6.35.8/drivers/oprofile/oprofilefs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/oprofilefs.c 2010-09-17 20:12:09.000000000 -0400
@@ -187,7 +187,7 @@ static const struct file_operations atom
@@ -27214,9 +27164,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/oprofilefs.c linux-2.6.35.7/drivers/o
{
struct dentry *d = __oprofilefs_create_file(sb, root, name,
&atomic_ro_fops, 0444);
-diff -urNp linux-2.6.35.7/drivers/oprofile/oprofile_stats.c linux-2.6.35.7/drivers/oprofile/oprofile_stats.c
---- linux-2.6.35.7/drivers/oprofile/oprofile_stats.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/oprofile_stats.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/oprofile_stats.c linux-2.6.35.8/drivers/oprofile/oprofile_stats.c
+--- linux-2.6.35.8/drivers/oprofile/oprofile_stats.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/oprofile_stats.c 2010-09-17 20:12:09.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -27234,9 +27184,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/oprofile_stats.c linux-2.6.35.7/drive
}
-diff -urNp linux-2.6.35.7/drivers/oprofile/oprofile_stats.h linux-2.6.35.7/drivers/oprofile/oprofile_stats.h
---- linux-2.6.35.7/drivers/oprofile/oprofile_stats.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/oprofile/oprofile_stats.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/oprofile/oprofile_stats.h linux-2.6.35.8/drivers/oprofile/oprofile_stats.h
+--- linux-2.6.35.8/drivers/oprofile/oprofile_stats.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/oprofile/oprofile_stats.h 2010-09-17 20:12:09.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -27254,9 +27204,9 @@ diff -urNp linux-2.6.35.7/drivers/oprofile/oprofile_stats.h linux-2.6.35.7/drive
};
extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-2.6.35.7/drivers/parport/procfs.c linux-2.6.35.7/drivers/parport/procfs.c
---- linux-2.6.35.7/drivers/parport/procfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/parport/procfs.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/parport/procfs.c linux-2.6.35.8/drivers/parport/procfs.c
+--- linux-2.6.35.8/drivers/parport/procfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/parport/procfs.c 2010-09-17 20:12:37.000000000 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -27275,9 +27225,9 @@ diff -urNp linux-2.6.35.7/drivers/parport/procfs.c linux-2.6.35.7/drivers/parpor
}
#endif /* IEEE1284.3 support. */
-diff -urNp linux-2.6.35.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.35.7/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.35.7/drivers/pci/hotplug/acpiphp_glue.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/hotplug/acpiphp_glue.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.35.8/drivers/pci/hotplug/acpiphp_glue.c
+--- linux-2.6.35.8/drivers/pci/hotplug/acpiphp_glue.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/hotplug/acpiphp_glue.c 2010-09-17 20:12:09.000000000 -0400
@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notif
}
@@ -27287,9 +27237,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.35.7/driv
.handler = handle_hotplug_event_func,
};
-diff -urNp linux-2.6.35.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.35.7/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.35.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.35.8/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-2.6.35.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-17 20:12:09.000000000 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -27304,9 +27254,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.35.7/driv
dbg("int15 entry = %p\n", compaq_int15_entry_point);
/* initialize our int15 lock */
-diff -urNp linux-2.6.35.7/drivers/pci/intel-iommu.c linux-2.6.35.7/drivers/pci/intel-iommu.c
---- linux-2.6.35.7/drivers/pci/intel-iommu.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/intel-iommu.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/intel-iommu.c linux-2.6.35.8/drivers/pci/intel-iommu.c
+--- linux-2.6.35.8/drivers/pci/intel-iommu.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/intel-iommu.c 2010-09-26 17:32:46.000000000 -0400
@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct de
return !dma_addr;
}
@@ -27316,9 +27266,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/intel-iommu.c linux-2.6.35.7/drivers/pci/i
.alloc_coherent = intel_alloc_coherent,
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
-diff -urNp linux-2.6.35.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.35.7/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.35.7/drivers/pci/pcie/portdrv_pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/pcie/portdrv_pci.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/pcie/portdrv_pci.c linux-2.6.35.8/drivers/pci/pcie/portdrv_pci.c
+--- linux-2.6.35.8/drivers/pci/pcie/portdrv_pci.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/pcie/portdrv_pci.c 2010-09-17 20:12:09.000000000 -0400
@@ -250,7 +250,7 @@ static void pcie_portdrv_err_resume(stru
static const struct pci_device_id port_pci_ids[] = { {
/* handle any PCI-Express port */
@@ -27328,9 +27278,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.35.7/drivers/
};
MODULE_DEVICE_TABLE(pci, port_pci_ids);
-diff -urNp linux-2.6.35.7/drivers/pci/probe.c linux-2.6.35.7/drivers/pci/probe.c
---- linux-2.6.35.7/drivers/pci/probe.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/probe.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/probe.c linux-2.6.35.8/drivers/pci/probe.c
+--- linux-2.6.35.8/drivers/pci/probe.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/probe.c 2010-09-17 20:12:09.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -27348,9 +27298,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/probe.c linux-2.6.35.7/drivers/pci/probe.c
struct device_attribute *attr,
char *buf)
{
-diff -urNp linux-2.6.35.7/drivers/pci/proc.c linux-2.6.35.7/drivers/pci/proc.c
---- linux-2.6.35.7/drivers/pci/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pci/proc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pci/proc.c linux-2.6.35.8/drivers/pci/proc.c
+--- linux-2.6.35.8/drivers/pci/proc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pci/proc.c 2010-09-17 20:12:37.000000000 -0400
@@ -481,7 +481,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -27368,9 +27318,9 @@ diff -urNp linux-2.6.35.7/drivers/pci/proc.c linux-2.6.35.7/drivers/pci/proc.c
proc_create("devices", 0, proc_bus_pci_dir,
&proc_bus_pci_dev_operations);
proc_initialized = 1;
-diff -urNp linux-2.6.35.7/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.35.7/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.35.7/drivers/pcmcia/pcmcia_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pcmcia/pcmcia_ioctl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.35.8/drivers/pcmcia/pcmcia_ioctl.c
+--- linux-2.6.35.8/drivers/pcmcia/pcmcia_ioctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pcmcia/pcmcia_ioctl.c 2010-09-17 20:12:09.000000000 -0400
@@ -850,7 +850,7 @@ static int ds_ioctl(struct file *file, u
return -EFAULT;
}
@@ -27380,9 +27330,9 @@ diff -urNp linux-2.6.35.7/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.35.7/drivers/p
if (!buf)
return -ENOMEM;
-diff -urNp linux-2.6.35.7/drivers/pcmcia/ti113x.h linux-2.6.35.7/drivers/pcmcia/ti113x.h
---- linux-2.6.35.7/drivers/pcmcia/ti113x.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pcmcia/ti113x.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pcmcia/ti113x.h linux-2.6.35.8/drivers/pcmcia/ti113x.h
+--- linux-2.6.35.8/drivers/pcmcia/ti113x.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pcmcia/ti113x.h 2010-09-17 20:12:09.000000000 -0400
@@ -936,7 +936,7 @@ static struct pci_device_id ene_tune_tbl
DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE),
@@ -27392,9 +27342,9 @@ diff -urNp linux-2.6.35.7/drivers/pcmcia/ti113x.h linux-2.6.35.7/drivers/pcmcia/
};
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
-diff -urNp linux-2.6.35.7/drivers/pcmcia/yenta_socket.c linux-2.6.35.7/drivers/pcmcia/yenta_socket.c
---- linux-2.6.35.7/drivers/pcmcia/yenta_socket.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pcmcia/yenta_socket.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pcmcia/yenta_socket.c linux-2.6.35.8/drivers/pcmcia/yenta_socket.c
+--- linux-2.6.35.8/drivers/pcmcia/yenta_socket.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pcmcia/yenta_socket.c 2010-09-17 20:12:09.000000000 -0400
@@ -1428,7 +1428,7 @@ static struct pci_device_id yenta_table[
/* match any cardbus bridge */
@@ -27404,9 +27354,9 @@ diff -urNp linux-2.6.35.7/drivers/pcmcia/yenta_socket.c linux-2.6.35.7/drivers/p
};
MODULE_DEVICE_TABLE(pci, yenta_table);
-diff -urNp linux-2.6.35.7/drivers/platform/x86/acer-wmi.c linux-2.6.35.7/drivers/platform/x86/acer-wmi.c
---- linux-2.6.35.7/drivers/platform/x86/acer-wmi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/acer-wmi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/acer-wmi.c linux-2.6.35.8/drivers/platform/x86/acer-wmi.c
+--- linux-2.6.35.8/drivers/platform/x86/acer-wmi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/acer-wmi.c 2010-09-17 20:12:09.000000000 -0400
@@ -916,7 +916,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -27416,9 +27366,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/acer-wmi.c linux-2.6.35.7/drivers
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/asus_acpi.c linux-2.6.35.7/drivers/platform/x86/asus_acpi.c
---- linux-2.6.35.7/drivers/platform/x86/asus_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/asus_acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/asus_acpi.c linux-2.6.35.8/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.35.8/drivers/platform/x86/asus_acpi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/asus_acpi.c 2010-09-17 20:12:09.000000000 -0400
@@ -1464,7 +1464,7 @@ static int asus_hotk_remove(struct acpi_
return 0;
}
@@ -27428,9 +27378,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/asus_acpi.c linux-2.6.35.7/driver
.get_brightness = read_brightness,
.update_status = set_brightness_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/asus-laptop.c linux-2.6.35.7/drivers/platform/x86/asus-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/asus-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/asus-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/asus-laptop.c linux-2.6.35.8/drivers/platform/x86/asus-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/asus-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/asus-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -224,7 +224,6 @@ struct asus_laptop {
struct asus_led gled;
struct asus_led kled;
@@ -27448,9 +27398,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/asus-laptop.c linux-2.6.35.7/driv
.get_brightness = asus_read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/compal-laptop.c linux-2.6.35.7/drivers/platform/x86/compal-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/compal-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/compal-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/compal-laptop.c linux-2.6.35.8/drivers/platform/x86/compal-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/compal-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/compal-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -168,7 +168,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -27460,9 +27410,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/compal-laptop.c linux-2.6.35.7/dr
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/dell-laptop.c linux-2.6.35.7/drivers/platform/x86/dell-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/dell-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/dell-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/dell-laptop.c linux-2.6.35.8/drivers/platform/x86/dell-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/dell-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/dell-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -469,7 +469,7 @@ out:
return buffer->output[1];
}
@@ -27472,9 +27422,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/dell-laptop.c linux-2.6.35.7/driv
.get_brightness = dell_get_intensity,
.update_status = dell_send_intensity,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.35.7/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/eeepc-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/eeepc-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/eeepc-laptop.c linux-2.6.35.8/drivers/platform/x86/eeepc-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/eeepc-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/eeepc-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -1114,7 +1114,7 @@ static int update_bl_status(struct backl
return set_brightness(bd, bd->props.brightness);
}
@@ -27484,9 +27434,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.35.7/dri
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.35.7/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/fujitsu-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/fujitsu-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/fujitsu-laptop.c linux-2.6.35.8/drivers/platform/x86/fujitsu-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/fujitsu-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/fujitsu-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -437,7 +437,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -27496,9 +27446,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.35.7/d
.get_brightness = bl_get_brightness,
.update_status = bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/sony-laptop.c linux-2.6.35.7/drivers/platform/x86/sony-laptop.c
---- linux-2.6.35.7/drivers/platform/x86/sony-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/sony-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/sony-laptop.c linux-2.6.35.8/drivers/platform/x86/sony-laptop.c
+--- linux-2.6.35.8/drivers/platform/x86/sony-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/sony-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -857,7 +857,7 @@ static int sony_backlight_get_brightness
}
@@ -27508,9 +27458,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/sony-laptop.c linux-2.6.35.7/driv
.update_status = sony_backlight_update_status,
.get_brightness = sony_backlight_get_brightness,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.35.7/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.35.7/drivers/platform/x86/thinkpad_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/thinkpad_acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/thinkpad_acpi.c linux-2.6.35.8/drivers/platform/x86/thinkpad_acpi.c
+--- linux-2.6.35.8/drivers/platform/x86/thinkpad_acpi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/thinkpad_acpi.c 2010-09-17 20:12:09.000000000 -0400
@@ -6142,7 +6142,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
@@ -27520,9 +27470,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.35.7/dr
.get_brightness = brightness_get,
.update_status = brightness_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.35.7/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.35.7/drivers/platform/x86/toshiba_acpi.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/platform/x86/toshiba_acpi.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/platform/x86/toshiba_acpi.c linux-2.6.35.8/drivers/platform/x86/toshiba_acpi.c
+--- linux-2.6.35.8/drivers/platform/x86/toshiba_acpi.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/platform/x86/toshiba_acpi.c 2010-09-17 20:12:09.000000000 -0400
@@ -741,7 +741,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -27532,9 +27482,9 @@ diff -urNp linux-2.6.35.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.35.7/dri
.get_brightness = get_lcd,
.update_status = set_lcd_status,
};
-diff -urNp linux-2.6.35.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.35.7/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.35.7/drivers/pnp/pnpbios/bioscalls.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pnp/pnpbios/bioscalls.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pnp/pnpbios/bioscalls.c linux-2.6.35.8/drivers/pnp/pnpbios/bioscalls.c
+--- linux-2.6.35.8/drivers/pnp/pnpbios/bioscalls.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pnp/pnpbios/bioscalls.c 2010-09-17 20:12:09.000000000 -0400
@@ -59,7 +59,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -27591,9 +27541,9 @@ diff -urNp linux-2.6.35.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.35.7/drivers
+
+ pax_close_kernel();
}
-diff -urNp linux-2.6.35.7/drivers/pnp/quirks.c linux-2.6.35.7/drivers/pnp/quirks.c
---- linux-2.6.35.7/drivers/pnp/quirks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pnp/quirks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pnp/quirks.c linux-2.6.35.8/drivers/pnp/quirks.c
+--- linux-2.6.35.8/drivers/pnp/quirks.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pnp/quirks.c 2010-09-17 20:12:09.000000000 -0400
@@ -322,7 +322,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -27603,9 +27553,9 @@ diff -urNp linux-2.6.35.7/drivers/pnp/quirks.c linux-2.6.35.7/drivers/pnp/quirks
};
void pnp_fixup_device(struct pnp_dev *dev)
-diff -urNp linux-2.6.35.7/drivers/pnp/resource.c linux-2.6.35.7/drivers/pnp/resource.c
---- linux-2.6.35.7/drivers/pnp/resource.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/pnp/resource.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/pnp/resource.c linux-2.6.35.8/drivers/pnp/resource.c
+--- linux-2.6.35.8/drivers/pnp/resource.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/pnp/resource.c 2010-09-17 20:12:09.000000000 -0400
@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -27624,9 +27574,9 @@ diff -urNp linux-2.6.35.7/drivers/pnp/resource.c linux-2.6.35.7/drivers/pnp/reso
return 0;
/* check if the resource is reserved */
-diff -urNp linux-2.6.35.7/drivers/s390/cio/qdio_debug.c linux-2.6.35.7/drivers/s390/cio/qdio_debug.c
---- linux-2.6.35.7/drivers/s390/cio/qdio_debug.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/s390/cio/qdio_debug.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/s390/cio/qdio_debug.c linux-2.6.35.8/drivers/s390/cio/qdio_debug.c
+--- linux-2.6.35.8/drivers/s390/cio/qdio_debug.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/s390/cio/qdio_debug.c 2010-09-17 20:12:09.000000000 -0400
@@ -233,7 +233,7 @@ static int qperf_seq_open(struct inode *
filp->f_path.dentry->d_inode->i_private);
}
@@ -27636,9 +27586,9 @@ diff -urNp linux-2.6.35.7/drivers/s390/cio/qdio_debug.c linux-2.6.35.7/drivers/s
.owner = THIS_MODULE,
.open = qperf_seq_open,
.read = seq_read,
-diff -urNp linux-2.6.35.7/drivers/scsi/ipr.c linux-2.6.35.7/drivers/scsi/ipr.c
---- linux-2.6.35.7/drivers/scsi/ipr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/ipr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/ipr.c linux-2.6.35.8/drivers/scsi/ipr.c
+--- linux-2.6.35.8/drivers/scsi/ipr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/ipr.c 2010-09-17 20:12:09.000000000 -0400
@@ -6091,7 +6091,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -27648,9 +27598,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/ipr.c linux-2.6.35.7/drivers/scsi/ipr.c
.phy_reset = ipr_ata_phy_reset,
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
-diff -urNp linux-2.6.35.7/drivers/scsi/libfc/fc_exch.c linux-2.6.35.7/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.35.7/drivers/scsi/libfc/fc_exch.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/libfc/fc_exch.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/libfc/fc_exch.c linux-2.6.35.8/drivers/scsi/libfc/fc_exch.c
+--- linux-2.6.35.8/drivers/scsi/libfc/fc_exch.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/libfc/fc_exch.c 2010-09-17 20:12:09.000000000 -0400
@@ -100,12 +100,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -27772,9 +27722,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/libfc/fc_exch.c linux-2.6.35.7/drivers/sc
fc_frame_free(fp);
}
-diff -urNp linux-2.6.35.7/drivers/scsi/libsas/sas_ata.c linux-2.6.35.7/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.35.7/drivers/scsi/libsas/sas_ata.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/libsas/sas_ata.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c
+--- linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/libsas/sas_ata.c 2010-09-17 20:12:09.000000000 -0400
@@ -344,7 +344,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -27784,9 +27734,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/libsas/sas_ata.c linux-2.6.35.7/drivers/s
.phy_reset = sas_ata_phy_reset,
.post_internal_cmd = sas_ata_post_internal,
.qc_prep = ata_noop_qc_prep,
-diff -urNp linux-2.6.35.7/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.35.7/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.35.7/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.35.8/drivers/scsi/mpt2sas/mpt2sas_debug.h
+--- linux-2.6.35.8/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-17 20:12:09.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
@@ -27796,9 +27746,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.35.7/dr
#endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
-diff -urNp linux-2.6.35.7/drivers/scsi/qla2xxx/qla_os.c linux-2.6.35.7/drivers/scsi/qla2xxx/qla_os.c
---- linux-2.6.35.7/drivers/scsi/qla2xxx/qla_os.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/qla2xxx/qla_os.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/qla2xxx/qla_os.c linux-2.6.35.8/drivers/scsi/qla2xxx/qla_os.c
+--- linux-2.6.35.8/drivers/scsi/qla2xxx/qla_os.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/qla2xxx/qla_os.c 2010-09-17 20:12:09.000000000 -0400
@@ -3899,7 +3899,7 @@ static struct pci_driver qla2xxx_pci_dri
.err_handler = &qla2xxx_err_handler,
};
@@ -27808,9 +27758,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/qla2xxx/qla_os.c linux-2.6.35.7/drivers/s
.owner = THIS_MODULE,
};
-diff -urNp linux-2.6.35.7/drivers/scsi/scsi_logging.h linux-2.6.35.7/drivers/scsi/scsi_logging.h
---- linux-2.6.35.7/drivers/scsi/scsi_logging.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/scsi_logging.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/scsi_logging.h linux-2.6.35.8/drivers/scsi/scsi_logging.h
+--- linux-2.6.35.8/drivers/scsi/scsi_logging.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/scsi_logging.h 2010-09-17 20:12:09.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -27820,9 +27770,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/scsi_logging.h linux-2.6.35.7/drivers/scs
#endif /* CONFIG_SCSI_LOGGING */
/*
-diff -urNp linux-2.6.35.7/drivers/scsi/sg.c linux-2.6.35.7/drivers/scsi/sg.c
---- linux-2.6.35.7/drivers/scsi/sg.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/scsi/sg.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/scsi/sg.c linux-2.6.35.8/drivers/scsi/sg.c
+--- linux-2.6.35.8/drivers/scsi/sg.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/scsi/sg.c 2010-09-17 20:12:09.000000000 -0400
@@ -2302,7 +2302,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -27841,9 +27791,9 @@ diff -urNp linux-2.6.35.7/drivers/scsi/sg.c linux-2.6.35.7/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
-diff -urNp linux-2.6.35.7/drivers/serial/8250_pci.c linux-2.6.35.7/drivers/serial/8250_pci.c
---- linux-2.6.35.7/drivers/serial/8250_pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/serial/8250_pci.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/serial/8250_pci.c linux-2.6.35.8/drivers/serial/8250_pci.c
+--- linux-2.6.35.8/drivers/serial/8250_pci.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/serial/8250_pci.c 2010-09-17 20:12:09.000000000 -0400
@@ -3777,7 +3777,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27853,9 +27803,9 @@ diff -urNp linux-2.6.35.7/drivers/serial/8250_pci.c linux-2.6.35.7/drivers/seria
};
static struct pci_driver serial_pci_driver = {
-diff -urNp linux-2.6.35.7/drivers/serial/kgdboc.c linux-2.6.35.7/drivers/serial/kgdboc.c
---- linux-2.6.35.7/drivers/serial/kgdboc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/serial/kgdboc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/serial/kgdboc.c linux-2.6.35.8/drivers/serial/kgdboc.c
+--- linux-2.6.35.8/drivers/serial/kgdboc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/serial/kgdboc.c 2010-09-17 20:12:09.000000000 -0400
@@ -20,7 +20,7 @@
#define MAX_CONFIG_LEN 40
@@ -27865,9 +27815,9 @@ diff -urNp linux-2.6.35.7/drivers/serial/kgdboc.c linux-2.6.35.7/drivers/serial/
/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
static int configured = -1;
-diff -urNp linux-2.6.35.7/drivers/staging/comedi/comedi_fops.c linux-2.6.35.7/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.35.7/drivers/staging/comedi/comedi_fops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/comedi/comedi_fops.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/comedi/comedi_fops.c linux-2.6.35.8/drivers/staging/comedi/comedi_fops.c
+--- linux-2.6.35.8/drivers/staging/comedi/comedi_fops.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/comedi/comedi_fops.c 2010-09-17 20:12:09.000000000 -0400
@@ -1425,7 +1425,7 @@ static void comedi_unmap(struct vm_area_
mutex_unlock(&dev->mutex);
}
@@ -27877,9 +27827,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/comedi/comedi_fops.c linux-2.6.35.7/dr
.close = comedi_unmap,
};
-diff -urNp linux-2.6.35.7/drivers/staging/dream/pmem.c linux-2.6.35.7/drivers/staging/dream/pmem.c
---- linux-2.6.35.7/drivers/staging/dream/pmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/pmem.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/pmem.c linux-2.6.35.8/drivers/staging/dream/pmem.c
+--- linux-2.6.35.8/drivers/staging/dream/pmem.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/pmem.c 2010-09-17 20:12:09.000000000 -0400
@@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, stru
static int pmem_open(struct inode *, struct file *);
static long pmem_ioctl(struct file *, unsigned int, unsigned long);
@@ -27898,9 +27848,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/pmem.c linux-2.6.35.7/drivers/st
.read = debug_read,
.open = debug_open,
};
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.35.7/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.35.8/drivers/staging/dream/qdsp5/adsp_driver.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-17 20:12:09.000000000 -0400
@@ -577,7 +577,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -27910,9 +27860,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.35
.owner = THIS_MODULE,
.open = adsp_open,
.unlocked_ioctl = adsp_ioctl,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_aac.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-17 20:12:09.000000000 -0400
@@ -1023,7 +1023,7 @@ done:
return rc;
}
@@ -27922,9 +27872,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.35.7
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_amrnb.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-17 20:12:09.000000000 -0400
@@ -834,7 +834,7 @@ done:
return rc;
}
@@ -27934,9 +27884,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.35
.owner = THIS_MODULE,
.open = audamrnb_open,
.release = audamrnb_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_evrc.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-17 20:12:09.000000000 -0400
@@ -806,7 +806,7 @@ dma_fail:
return rc;
}
@@ -27946,9 +27896,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.35.
.owner = THIS_MODULE,
.open = audevrc_open,
.release = audevrc_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_in.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_in.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_in.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_in.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_in.c 2010-09-17 20:12:09.000000000 -0400
@@ -914,7 +914,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -27967,9 +27917,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.35.7/
.owner = THIS_MODULE,
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_mp3.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-17 20:12:09.000000000 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -27979,9 +27929,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.35.7
.owner = THIS_MODULE,
.open = audio_open,
.release = audio_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_out.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_out.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_out.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_out.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_out.c 2010-09-17 20:12:09.000000000 -0400
@@ -800,7 +800,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -28000,9 +27950,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.35.7
.owner = THIS_MODULE,
.open = audpp_open,
.unlocked_ioctl = audpp_ioctl,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_qcelp.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-17 20:12:09.000000000 -0400
@@ -817,7 +817,7 @@ err:
return rc;
}
@@ -28012,9 +27962,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.35
.owner = THIS_MODULE,
.open = audqcelp_open,
.release = audqcelp_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.35.7/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.35.7/drivers/staging/dream/qdsp5/snd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dream/qdsp5/snd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dream/qdsp5/snd.c linux-2.6.35.8/drivers/staging/dream/qdsp5/snd.c
+--- linux-2.6.35.8/drivers/staging/dream/qdsp5/snd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dream/qdsp5/snd.c 2010-09-17 20:12:09.000000000 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -28024,9 +27974,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dream/qdsp5/snd.c linux-2.6.35.7/drive
.owner = THIS_MODULE,
.open = snd_open,
.release = snd_release,
-diff -urNp linux-2.6.35.7/drivers/staging/dt3155/dt3155_drv.c linux-2.6.35.7/drivers/staging/dt3155/dt3155_drv.c
---- linux-2.6.35.7/drivers/staging/dt3155/dt3155_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/dt3155/dt3155_drv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/dt3155/dt3155_drv.c linux-2.6.35.8/drivers/staging/dt3155/dt3155_drv.c
+--- linux-2.6.35.8/drivers/staging/dt3155/dt3155_drv.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/dt3155/dt3155_drv.c 2010-09-17 20:12:09.000000000 -0400
@@ -853,7 +853,7 @@ dt3155_unlocked_ioctl(struct file *file,
* needed by init_module
* register_chrdev
@@ -28036,9 +27986,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/dt3155/dt3155_drv.c linux-2.6.35.7/dri
.read = dt3155_read,
.unlocked_ioctl = dt3155_unlocked_ioctl,
.mmap = dt3155_mmap,
-diff -urNp linux-2.6.35.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.35.7/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.35.7/drivers/staging/go7007/go7007-v4l2.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/go7007/go7007-v4l2.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/go7007/go7007-v4l2.c linux-2.6.35.8/drivers/staging/go7007/go7007-v4l2.c
+--- linux-2.6.35.8/drivers/staging/go7007/go7007-v4l2.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/go7007/go7007-v4l2.c 2010-09-17 20:12:09.000000000 -0400
@@ -1673,7 +1673,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -28048,9 +27998,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.35.7/dr
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.35.7/drivers/staging/hv/hv.c linux-2.6.35.7/drivers/staging/hv/hv.c
---- linux-2.6.35.7/drivers/staging/hv/hv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/hv/hv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/hv/hv.c linux-2.6.35.8/drivers/staging/hv/hv.c
+--- linux-2.6.35.8/drivers/staging/hv/hv.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/hv/hv.c 2010-09-17 20:12:09.000000000 -0400
@@ -162,7 +162,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -28060,9 +28010,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/hv/hv.c linux-2.6.35.7/drivers/staging
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
-diff -urNp linux-2.6.35.7/drivers/staging/msm/msm_fb_bl.c linux-2.6.35.7/drivers/staging/msm/msm_fb_bl.c
---- linux-2.6.35.7/drivers/staging/msm/msm_fb_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/msm/msm_fb_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/msm/msm_fb_bl.c linux-2.6.35.8/drivers/staging/msm/msm_fb_bl.c
+--- linux-2.6.35.8/drivers/staging/msm/msm_fb_bl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/msm/msm_fb_bl.c 2010-09-17 20:12:09.000000000 -0400
@@ -42,7 +42,7 @@ static int msm_fb_bl_update_status(struc
return 0;
}
@@ -28072,9 +28022,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/msm/msm_fb_bl.c linux-2.6.35.7/drivers
.get_brightness = msm_fb_bl_get_brightness,
.update_status = msm_fb_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/staging/panel/panel.c linux-2.6.35.7/drivers/staging/panel/panel.c
---- linux-2.6.35.7/drivers/staging/panel/panel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/panel/panel.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/panel/panel.c linux-2.6.35.8/drivers/staging/panel/panel.c
+--- linux-2.6.35.8/drivers/staging/panel/panel.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/panel/panel.c 2010-09-17 20:12:09.000000000 -0400
@@ -1304,7 +1304,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -28093,9 +28043,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/panel/panel.c linux-2.6.35.7/drivers/s
.read = keypad_read, /* read */
.open = keypad_open, /* open */
.release = keypad_release, /* close */
-diff -urNp linux-2.6.35.7/drivers/staging/phison/phison.c linux-2.6.35.7/drivers/staging/phison/phison.c
---- linux-2.6.35.7/drivers/staging/phison/phison.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/phison/phison.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/phison/phison.c linux-2.6.35.8/drivers/staging/phison/phison.c
+--- linux-2.6.35.8/drivers/staging/phison/phison.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/phison/phison.c 2010-09-17 20:12:09.000000000 -0400
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -28105,9 +28055,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/phison/phison.c linux-2.6.35.7/drivers
.inherits = &ata_bmdma_port_ops,
.prereset = phison_pre_reset,
};
-diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/inode.c linux-2.6.35.7/drivers/staging/pohmelfs/inode.c
---- linux-2.6.35.7/drivers/staging/pohmelfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/pohmelfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/pohmelfs/inode.c linux-2.6.35.8/drivers/staging/pohmelfs/inode.c
+--- linux-2.6.35.8/drivers/staging/pohmelfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/pohmelfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -1846,7 +1846,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -28117,9 +28067,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/inode.c linux-2.6.35.7/driver
psb->trans_max_pages = 100;
-diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/mcache.c linux-2.6.35.7/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.35.7/drivers/staging/pohmelfs/mcache.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/pohmelfs/mcache.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/pohmelfs/mcache.c linux-2.6.35.8/drivers/staging/pohmelfs/mcache.c
+--- linux-2.6.35.8/drivers/staging/pohmelfs/mcache.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/pohmelfs/mcache.c 2010-09-17 20:12:09.000000000 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -28129,9 +28079,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/mcache.c linux-2.6.35.7/drive
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/netfs.h linux-2.6.35.7/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.35.7/drivers/staging/pohmelfs/netfs.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/pohmelfs/netfs.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/pohmelfs/netfs.h linux-2.6.35.8/drivers/staging/pohmelfs/netfs.h
+--- linux-2.6.35.8/drivers/staging/pohmelfs/netfs.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/pohmelfs/netfs.h 2010-09-17 20:12:09.000000000 -0400
@@ -571,7 +571,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -28141,9 +28091,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/pohmelfs/netfs.h linux-2.6.35.7/driver
unsigned long mcache_timeout;
unsigned int idx;
-diff -urNp linux-2.6.35.7/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.35.7/drivers/staging/ramzswap/ramzswap_drv.c
---- linux-2.6.35.7/drivers/staging/ramzswap/ramzswap_drv.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/ramzswap/ramzswap_drv.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.35.8/drivers/staging/ramzswap/ramzswap_drv.c
+--- linux-2.6.35.8/drivers/staging/ramzswap/ramzswap_drv.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/ramzswap/ramzswap_drv.c 2010-09-17 20:12:09.000000000 -0400
@@ -693,7 +693,7 @@ void ramzswap_slot_free_notify(struct bl
return;
}
@@ -28153,9 +28103,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/ramzswap/ramzswap_drv.c linux-2.6.35.7
.ioctl = ramzswap_ioctl,
.swap_slot_free_notify = ramzswap_slot_free_notify,
.owner = THIS_MODULE
-diff -urNp linux-2.6.35.7/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.35.7/drivers/staging/rtl8192u/ieee80211/proc.c
---- linux-2.6.35.7/drivers/staging/rtl8192u/ieee80211/proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/rtl8192u/ieee80211/proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.35.8/drivers/staging/rtl8192u/ieee80211/proc.c
+--- linux-2.6.35.8/drivers/staging/rtl8192u/ieee80211/proc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/rtl8192u/ieee80211/proc.c 2010-09-17 20:12:09.000000000 -0400
@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode
return seq_open(file, &crypto_seq_ops);
}
@@ -28165,9 +28115,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/rtl8192u/ieee80211/proc.c linux-2.6.35
.open = crypto_info_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.35.7/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.35.7/drivers/staging/samsung-laptop/samsung-laptop.c
---- linux-2.6.35.7/drivers/staging/samsung-laptop/samsung-laptop.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/samsung-laptop/samsung-laptop.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/samsung-laptop/samsung-laptop.c linux-2.6.35.8/drivers/staging/samsung-laptop/samsung-laptop.c
+--- linux-2.6.35.8/drivers/staging/samsung-laptop/samsung-laptop.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/samsung-laptop/samsung-laptop.c 2010-09-17 20:12:09.000000000 -0400
@@ -269,7 +269,7 @@ static int update_status(struct backligh
return 0;
}
@@ -28177,9 +28127,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/samsung-laptop/samsung-laptop.c linux-
.get_brightness = get_brightness,
.update_status = update_status,
};
-diff -urNp linux-2.6.35.7/drivers/staging/sep/sep_driver.c linux-2.6.35.7/drivers/staging/sep/sep_driver.c
---- linux-2.6.35.7/drivers/staging/sep/sep_driver.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/sep/sep_driver.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/sep/sep_driver.c linux-2.6.35.8/drivers/staging/sep/sep_driver.c
+--- linux-2.6.35.8/drivers/staging/sep/sep_driver.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/sep/sep_driver.c 2010-09-17 20:12:09.000000000 -0400
@@ -2637,7 +2637,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -28189,9 +28139,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/sep/sep_driver.c linux-2.6.35.7/driver
.owner = THIS_MODULE,
.unlocked_ioctl = sep_ioctl,
.poll = sep_poll,
-diff -urNp linux-2.6.35.7/drivers/staging/vme/devices/vme_user.c linux-2.6.35.7/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.35.7/drivers/staging/vme/devices/vme_user.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/staging/vme/devices/vme_user.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/staging/vme/devices/vme_user.c linux-2.6.35.8/drivers/staging/vme/devices/vme_user.c
+--- linux-2.6.35.8/drivers/staging/vme/devices/vme_user.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/staging/vme/devices/vme_user.c 2010-09-17 20:12:09.000000000 -0400
@@ -136,7 +136,7 @@ static long vme_user_unlocked_ioctl(stru
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
@@ -28201,9 +28151,9 @@ diff -urNp linux-2.6.35.7/drivers/staging/vme/devices/vme_user.c linux-2.6.35.7/
.open = vme_user_open,
.release = vme_user_release,
.read = vme_user_read,
-diff -urNp linux-2.6.35.7/drivers/usb/atm/cxacru.c linux-2.6.35.7/drivers/usb/atm/cxacru.c
---- linux-2.6.35.7/drivers/usb/atm/cxacru.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/atm/cxacru.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/atm/cxacru.c linux-2.6.35.8/drivers/usb/atm/cxacru.c
+--- linux-2.6.35.8/drivers/usb/atm/cxacru.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/atm/cxacru.c 2010-10-11 22:41:44.000000000 -0400
@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
if (ret < 2)
@@ -28213,9 +28163,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/atm/cxacru.c linux-2.6.35.7/drivers/usb/at
return -EINVAL;
pos += tmp;
-diff -urNp linux-2.6.35.7/drivers/usb/atm/usbatm.c linux-2.6.35.7/drivers/usb/atm/usbatm.c
---- linux-2.6.35.7/drivers/usb/atm/usbatm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/atm/usbatm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/atm/usbatm.c linux-2.6.35.8/drivers/usb/atm/usbatm.c
+--- linux-2.6.35.8/drivers/usb/atm/usbatm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/atm/usbatm.c 2010-09-17 20:12:09.000000000 -0400
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -28295,9 +28245,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/atm/usbatm.c linux-2.6.35.7/drivers/usb/at
if (!left--) {
if (instance->disconnected)
-diff -urNp linux-2.6.35.7/drivers/usb/class/cdc-acm.c linux-2.6.35.7/drivers/usb/class/cdc-acm.c
---- linux-2.6.35.7/drivers/usb/class/cdc-acm.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/class/cdc-acm.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/class/cdc-acm.c linux-2.6.35.8/drivers/usb/class/cdc-acm.c
+--- linux-2.6.35.8/drivers/usb/class/cdc-acm.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/class/cdc-acm.c 2010-09-20 17:33:32.000000000 -0400
@@ -1640,7 +1640,7 @@ static const struct usb_device_id acm_id
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -28307,9 +28257,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/class/cdc-acm.c linux-2.6.35.7/drivers/usb
};
MODULE_DEVICE_TABLE(usb, acm_ids);
-diff -urNp linux-2.6.35.7/drivers/usb/class/cdc-wdm.c linux-2.6.35.7/drivers/usb/class/cdc-wdm.c
---- linux-2.6.35.7/drivers/usb/class/cdc-wdm.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/class/cdc-wdm.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/class/cdc-wdm.c linux-2.6.35.8/drivers/usb/class/cdc-wdm.c
+--- linux-2.6.35.8/drivers/usb/class/cdc-wdm.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/class/cdc-wdm.c 2010-09-17 20:12:09.000000000 -0400
@@ -342,7 +342,7 @@ static ssize_t wdm_write
goto outnp;
}
@@ -28319,9 +28269,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/class/cdc-wdm.c linux-2.6.35.7/drivers/usb
r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
&desc->flags));
else
-diff -urNp linux-2.6.35.7/drivers/usb/class/usblp.c linux-2.6.35.7/drivers/usb/class/usblp.c
---- linux-2.6.35.7/drivers/usb/class/usblp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/class/usblp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/class/usblp.c linux-2.6.35.8/drivers/usb/class/usblp.c
+--- linux-2.6.35.8/drivers/usb/class/usblp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/class/usblp.c 2010-09-17 20:12:09.000000000 -0400
@@ -226,7 +226,7 @@ static const struct quirk_printer_struct
{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */
@@ -28340,9 +28290,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/class/usblp.c linux-2.6.35.7/drivers/usb/c
};
MODULE_DEVICE_TABLE (usb, usblp_ids);
-diff -urNp linux-2.6.35.7/drivers/usb/core/hcd.c linux-2.6.35.7/drivers/usb/core/hcd.c
---- linux-2.6.35.7/drivers/usb/core/hcd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/core/hcd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/core/hcd.c linux-2.6.35.8/drivers/usb/core/hcd.c
+--- linux-2.6.35.8/drivers/usb/core/hcd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/core/hcd.c 2010-09-17 20:12:09.000000000 -0400
@@ -2381,7 +2381,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28361,9 +28311,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/core/hcd.c linux-2.6.35.7/drivers/usb/core
{
if (mon_ops)
-diff -urNp linux-2.6.35.7/drivers/usb/core/hub.c linux-2.6.35.7/drivers/usb/core/hub.c
---- linux-2.6.35.7/drivers/usb/core/hub.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/core/hub.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/core/hub.c linux-2.6.35.8/drivers/usb/core/hub.c
+--- linux-2.6.35.8/drivers/usb/core/hub.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/core/hub.c 2010-09-17 20:12:09.000000000 -0400
@@ -3453,7 +3453,7 @@ static const struct usb_device_id hub_id
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28373,9 +28323,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/core/hub.c linux-2.6.35.7/drivers/usb/core
};
MODULE_DEVICE_TABLE (usb, hub_id_table);
-diff -urNp linux-2.6.35.7/drivers/usb/core/message.c linux-2.6.35.7/drivers/usb/core/message.c
---- linux-2.6.35.7/drivers/usb/core/message.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/core/message.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/core/message.c linux-2.6.35.8/drivers/usb/core/message.c
+--- linux-2.6.35.8/drivers/usb/core/message.c 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/core/message.c 2010-10-31 17:15:03.000000000 -0400
@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -28387,9 +28337,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/core/message.c linux-2.6.35.7/drivers/usb/
if (!smallbuf)
return buf;
memcpy(smallbuf, buf, len);
-diff -urNp linux-2.6.35.7/drivers/usb/early/ehci-dbgp.c linux-2.6.35.7/drivers/usb/early/ehci-dbgp.c
---- linux-2.6.35.7/drivers/usb/early/ehci-dbgp.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/early/ehci-dbgp.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/early/ehci-dbgp.c linux-2.6.35.8/drivers/usb/early/ehci-dbgp.c
+--- linux-2.6.35.8/drivers/usb/early/ehci-dbgp.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/early/ehci-dbgp.c 2010-09-17 20:12:09.000000000 -0400
@@ -1026,6 +1026,7 @@ static void kgdbdbgp_write_char(u8 chr)
early_dbgp_write(NULL, &chr, 1);
}
@@ -28398,9 +28348,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/early/ehci-dbgp.c linux-2.6.35.7/drivers/u
static struct kgdb_io kgdbdbgp_io_ops = {
.name = "kgdbdbgp",
.read_char = kgdbdbgp_read_char,
-diff -urNp linux-2.6.35.7/drivers/usb/host/ehci-pci.c linux-2.6.35.7/drivers/usb/host/ehci-pci.c
---- linux-2.6.35.7/drivers/usb/host/ehci-pci.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/host/ehci-pci.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/host/ehci-pci.c linux-2.6.35.8/drivers/usb/host/ehci-pci.c
+--- linux-2.6.35.8/drivers/usb/host/ehci-pci.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/host/ehci-pci.c 2010-09-17 20:12:09.000000000 -0400
@@ -419,7 +419,7 @@ static const struct pci_device_id pci_id
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
.driver_data = (unsigned long) &ehci_pci_hc_driver,
@@ -28410,9 +28360,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/host/ehci-pci.c linux-2.6.35.7/drivers/usb
};
MODULE_DEVICE_TABLE(pci, pci_ids);
-diff -urNp linux-2.6.35.7/drivers/usb/host/uhci-hcd.c linux-2.6.35.7/drivers/usb/host/uhci-hcd.c
---- linux-2.6.35.7/drivers/usb/host/uhci-hcd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/host/uhci-hcd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/host/uhci-hcd.c linux-2.6.35.8/drivers/usb/host/uhci-hcd.c
+--- linux-2.6.35.8/drivers/usb/host/uhci-hcd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/host/uhci-hcd.c 2010-09-17 20:12:09.000000000 -0400
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28422,9 +28372,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/host/uhci-hcd.c linux-2.6.35.7/drivers/usb
};
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
-diff -urNp linux-2.6.35.7/drivers/usb/mon/mon_main.c linux-2.6.35.7/drivers/usb/mon/mon_main.c
---- linux-2.6.35.7/drivers/usb/mon/mon_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/mon/mon_main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/mon/mon_main.c linux-2.6.35.8/drivers/usb/mon/mon_main.c
+--- linux-2.6.35.8/drivers/usb/mon/mon_main.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/mon/mon_main.c 2010-09-17 20:12:09.000000000 -0400
@@ -240,7 +240,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -28434,9 +28384,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/mon/mon_main.c linux-2.6.35.7/drivers/usb/
.urb_submit = mon_submit,
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
-diff -urNp linux-2.6.35.7/drivers/usb/storage/debug.h linux-2.6.35.7/drivers/usb/storage/debug.h
---- linux-2.6.35.7/drivers/usb/storage/debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/storage/debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/storage/debug.h linux-2.6.35.8/drivers/usb/storage/debug.h
+--- linux-2.6.35.8/drivers/usb/storage/debug.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/storage/debug.h 2010-09-17 20:12:09.000000000 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -28450,9 +28400,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/storage/debug.h linux-2.6.35.7/drivers/usb
#endif
#endif
-diff -urNp linux-2.6.35.7/drivers/usb/storage/usb.c linux-2.6.35.7/drivers/usb/storage/usb.c
---- linux-2.6.35.7/drivers/usb/storage/usb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/storage/usb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/storage/usb.c linux-2.6.35.8/drivers/usb/storage/usb.c
+--- linux-2.6.35.8/drivers/usb/storage/usb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/storage/usb.c 2010-09-17 20:12:09.000000000 -0400
@@ -122,7 +122,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28462,9 +28412,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/storage/usb.c linux-2.6.35.7/drivers/usb/s
};
#undef UNUSUAL_DEV
-diff -urNp linux-2.6.35.7/drivers/usb/storage/usual-tables.c linux-2.6.35.7/drivers/usb/storage/usual-tables.c
---- linux-2.6.35.7/drivers/usb/storage/usual-tables.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/usb/storage/usual-tables.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/usb/storage/usual-tables.c linux-2.6.35.8/drivers/usb/storage/usual-tables.c
+--- linux-2.6.35.8/drivers/usb/storage/usual-tables.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/usb/storage/usual-tables.c 2010-09-17 20:12:09.000000000 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -28474,9 +28424,9 @@ diff -urNp linux-2.6.35.7/drivers/usb/storage/usual-tables.c linux-2.6.35.7/driv
};
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
-diff -urNp linux-2.6.35.7/drivers/uwb/wlp/messages.c linux-2.6.35.7/drivers/uwb/wlp/messages.c
---- linux-2.6.35.7/drivers/uwb/wlp/messages.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/uwb/wlp/messages.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/uwb/wlp/messages.c linux-2.6.35.8/drivers/uwb/wlp/messages.c
+--- linux-2.6.35.8/drivers/uwb/wlp/messages.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/uwb/wlp/messages.c 2010-09-17 20:12:09.000000000 -0400
@@ -920,7 +920,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -28486,9 +28436,9 @@ diff -urNp linux-2.6.35.7/drivers/uwb/wlp/messages.c linux-2.6.35.7/drivers/uwb/
enum wlp_assc_error assc_err;
char enonce_buf[WLP_WSS_NONCE_STRSIZE];
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
-diff -urNp linux-2.6.35.7/drivers/vhost/vhost.c linux-2.6.35.7/drivers/vhost/vhost.c
---- linux-2.6.35.7/drivers/vhost/vhost.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/vhost/vhost.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/vhost/vhost.c linux-2.6.35.8/drivers/vhost/vhost.c
+--- linux-2.6.35.8/drivers/vhost/vhost.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/vhost/vhost.c 2010-09-17 20:12:09.000000000 -0400
@@ -357,7 +357,7 @@ static int init_used(struct vhost_virtqu
return get_user(vq->last_used_idx, &used->idx);
}
@@ -28498,9 +28448,9 @@ diff -urNp linux-2.6.35.7/drivers/vhost/vhost.c linux-2.6.35.7/drivers/vhost/vho
{
struct file *eventfp, *filep = NULL,
*pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-2.6.35.7/drivers/video/atmel_lcdfb.c linux-2.6.35.7/drivers/video/atmel_lcdfb.c
---- linux-2.6.35.7/drivers/video/atmel_lcdfb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/atmel_lcdfb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/atmel_lcdfb.c linux-2.6.35.8/drivers/video/atmel_lcdfb.c
+--- linux-2.6.35.8/drivers/video/atmel_lcdfb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/atmel_lcdfb.c 2010-09-17 20:12:09.000000000 -0400
@@ -111,7 +111,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -28510,9 +28460,9 @@ diff -urNp linux-2.6.35.7/drivers/video/atmel_lcdfb.c linux-2.6.35.7/drivers/vid
.update_status = atmel_bl_update_status,
.get_brightness = atmel_bl_get_brightness,
};
-diff -urNp linux-2.6.35.7/drivers/video/aty/aty128fb.c linux-2.6.35.7/drivers/video/aty/aty128fb.c
---- linux-2.6.35.7/drivers/video/aty/aty128fb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/aty/aty128fb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/aty/aty128fb.c linux-2.6.35.8/drivers/video/aty/aty128fb.c
+--- linux-2.6.35.8/drivers/video/aty/aty128fb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/aty/aty128fb.c 2010-09-17 20:12:09.000000000 -0400
@@ -1786,7 +1786,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28522,9 +28472,9 @@ diff -urNp linux-2.6.35.7/drivers/video/aty/aty128fb.c linux-2.6.35.7/drivers/vi
.get_brightness = aty128_bl_get_brightness,
.update_status = aty128_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/aty/atyfb_base.c linux-2.6.35.7/drivers/video/aty/atyfb_base.c
---- linux-2.6.35.7/drivers/video/aty/atyfb_base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/aty/atyfb_base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/aty/atyfb_base.c linux-2.6.35.8/drivers/video/aty/atyfb_base.c
+--- linux-2.6.35.8/drivers/video/aty/atyfb_base.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/aty/atyfb_base.c 2010-09-17 20:12:09.000000000 -0400
@@ -2221,7 +2221,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -28534,9 +28484,9 @@ diff -urNp linux-2.6.35.7/drivers/video/aty/atyfb_base.c linux-2.6.35.7/drivers/
.get_brightness = aty_bl_get_brightness,
.update_status = aty_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/aty/radeon_backlight.c linux-2.6.35.7/drivers/video/aty/radeon_backlight.c
---- linux-2.6.35.7/drivers/video/aty/radeon_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/aty/radeon_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/aty/radeon_backlight.c linux-2.6.35.8/drivers/video/aty/radeon_backlight.c
+--- linux-2.6.35.8/drivers/video/aty/radeon_backlight.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/aty/radeon_backlight.c 2010-09-17 20:12:09.000000000 -0400
@@ -128,7 +128,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28546,9 +28496,9 @@ diff -urNp linux-2.6.35.7/drivers/video/aty/radeon_backlight.c linux-2.6.35.7/dr
.get_brightness = radeon_bl_get_brightness,
.update_status = radeon_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/backlight/88pm860x_bl.c linux-2.6.35.7/drivers/video/backlight/88pm860x_bl.c
---- linux-2.6.35.7/drivers/video/backlight/88pm860x_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/backlight/88pm860x_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/backlight/88pm860x_bl.c linux-2.6.35.8/drivers/video/backlight/88pm860x_bl.c
+--- linux-2.6.35.8/drivers/video/backlight/88pm860x_bl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/backlight/88pm860x_bl.c 2010-09-17 20:12:09.000000000 -0400
@@ -155,7 +155,7 @@ out:
return -EINVAL;
}
@@ -28558,9 +28508,9 @@ diff -urNp linux-2.6.35.7/drivers/video/backlight/88pm860x_bl.c linux-2.6.35.7/d
.options = BL_CORE_SUSPENDRESUME,
.update_status = pm860x_backlight_update_status,
.get_brightness = pm860x_backlight_get_brightness,
-diff -urNp linux-2.6.35.7/drivers/video/backlight/max8925_bl.c linux-2.6.35.7/drivers/video/backlight/max8925_bl.c
---- linux-2.6.35.7/drivers/video/backlight/max8925_bl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/backlight/max8925_bl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/backlight/max8925_bl.c linux-2.6.35.8/drivers/video/backlight/max8925_bl.c
+--- linux-2.6.35.8/drivers/video/backlight/max8925_bl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/backlight/max8925_bl.c 2010-09-17 20:12:09.000000000 -0400
@@ -92,7 +92,7 @@ static int max8925_backlight_get_brightn
return ret;
}
@@ -28570,9 +28520,9 @@ diff -urNp linux-2.6.35.7/drivers/video/backlight/max8925_bl.c linux-2.6.35.7/dr
.options = BL_CORE_SUSPENDRESUME,
.update_status = max8925_backlight_update_status,
.get_brightness = max8925_backlight_get_brightness,
-diff -urNp linux-2.6.35.7/drivers/video/fbcmap.c linux-2.6.35.7/drivers/video/fbcmap.c
---- linux-2.6.35.7/drivers/video/fbcmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/fbcmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/fbcmap.c linux-2.6.35.8/drivers/video/fbcmap.c
+--- linux-2.6.35.8/drivers/video/fbcmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/fbcmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -28583,9 +28533,9 @@ diff -urNp linux-2.6.35.7/drivers/video/fbcmap.c linux-2.6.35.7/drivers/video/fb
rc = -EINVAL;
goto out1;
}
-diff -urNp linux-2.6.35.7/drivers/video/fbmem.c linux-2.6.35.7/drivers/video/fbmem.c
---- linux-2.6.35.7/drivers/video/fbmem.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/fbmem.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/fbmem.c linux-2.6.35.8/drivers/video/fbmem.c
+--- linux-2.6.35.8/drivers/video/fbmem.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/fbmem.c 2010-09-17 20:12:09.000000000 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -28613,9 +28563,9 @@ diff -urNp linux-2.6.35.7/drivers/video/fbmem.c linux-2.6.35.7/drivers/video/fbm
return -EINVAL;
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-2.6.35.7/drivers/video/fbmon.c linux-2.6.35.7/drivers/video/fbmon.c
---- linux-2.6.35.7/drivers/video/fbmon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/fbmon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/fbmon.c linux-2.6.35.8/drivers/video/fbmon.c
+--- linux-2.6.35.8/drivers/video/fbmon.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/fbmon.c 2010-09-17 20:12:09.000000000 -0400
@@ -46,7 +46,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -28625,9 +28575,9 @@ diff -urNp linux-2.6.35.7/drivers/video/fbmon.c linux-2.6.35.7/drivers/video/fbm
#endif
#define FBMON_FIX_HEADER 1
-diff -urNp linux-2.6.35.7/drivers/video/i810/i810_accel.c linux-2.6.35.7/drivers/video/i810/i810_accel.c
---- linux-2.6.35.7/drivers/video/i810/i810_accel.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/i810/i810_accel.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/i810/i810_accel.c linux-2.6.35.8/drivers/video/i810/i810_accel.c
+--- linux-2.6.35.8/drivers/video/i810/i810_accel.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/i810/i810_accel.c 2010-09-17 20:12:09.000000000 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -28636,9 +28586,9 @@ diff -urNp linux-2.6.35.7/drivers/video/i810/i810_accel.c linux-2.6.35.7/drivers
i810_report_error(mmio);
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
-diff -urNp linux-2.6.35.7/drivers/video/i810/i810_main.c linux-2.6.35.7/drivers/video/i810/i810_main.c
---- linux-2.6.35.7/drivers/video/i810/i810_main.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/i810/i810_main.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/i810/i810_main.c linux-2.6.35.8/drivers/video/i810/i810_main.c
+--- linux-2.6.35.8/drivers/video/i810/i810_main.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/i810/i810_main.c 2010-09-17 20:12:09.000000000 -0400
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -28648,9 +28598,9 @@ diff -urNp linux-2.6.35.7/drivers/video/i810/i810_main.c linux-2.6.35.7/drivers/
};
static struct pci_driver i810fb_driver = {
-diff -urNp linux-2.6.35.7/drivers/video/modedb.c linux-2.6.35.7/drivers/video/modedb.c
---- linux-2.6.35.7/drivers/video/modedb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/modedb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/modedb.c linux-2.6.35.8/drivers/video/modedb.c
+--- linux-2.6.35.8/drivers/video/modedb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/modedb.c 2010-09-17 20:12:09.000000000 -0400
@@ -40,240 +40,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -28951,9 +28901,9 @@ diff -urNp linux-2.6.35.7/drivers/video/modedb.c linux-2.6.35.7/drivers/video/mo
},
};
-diff -urNp linux-2.6.35.7/drivers/video/nvidia/nv_backlight.c linux-2.6.35.7/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.35.7/drivers/video/nvidia/nv_backlight.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/nvidia/nv_backlight.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/nvidia/nv_backlight.c linux-2.6.35.8/drivers/video/nvidia/nv_backlight.c
+--- linux-2.6.35.8/drivers/video/nvidia/nv_backlight.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/nvidia/nv_backlight.c 2010-09-17 20:12:09.000000000 -0400
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28963,9 +28913,9 @@ diff -urNp linux-2.6.35.7/drivers/video/nvidia/nv_backlight.c linux-2.6.35.7/dri
.get_brightness = nvidia_bl_get_brightness,
.update_status = nvidia_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/omap2/displays/panel-taal.c linux-2.6.35.7/drivers/video/omap2/displays/panel-taal.c
---- linux-2.6.35.7/drivers/video/omap2/displays/panel-taal.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/omap2/displays/panel-taal.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/omap2/displays/panel-taal.c linux-2.6.35.8/drivers/video/omap2/displays/panel-taal.c
+--- linux-2.6.35.8/drivers/video/omap2/displays/panel-taal.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/omap2/displays/panel-taal.c 2010-09-17 20:12:09.000000000 -0400
@@ -319,7 +319,7 @@ static int taal_bl_get_intensity(struct
return 0;
}
@@ -28975,9 +28925,9 @@ diff -urNp linux-2.6.35.7/drivers/video/omap2/displays/panel-taal.c linux-2.6.35
.get_brightness = taal_bl_get_intensity,
.update_status = taal_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/riva/fbdev.c linux-2.6.35.7/drivers/video/riva/fbdev.c
---- linux-2.6.35.7/drivers/video/riva/fbdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/riva/fbdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/riva/fbdev.c linux-2.6.35.8/drivers/video/riva/fbdev.c
+--- linux-2.6.35.8/drivers/video/riva/fbdev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/riva/fbdev.c 2010-09-17 20:12:09.000000000 -0400
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -28987,9 +28937,9 @@ diff -urNp linux-2.6.35.7/drivers/video/riva/fbdev.c linux-2.6.35.7/drivers/vide
.get_brightness = riva_bl_get_brightness,
.update_status = riva_bl_update_status,
};
-diff -urNp linux-2.6.35.7/drivers/video/uvesafb.c linux-2.6.35.7/drivers/video/uvesafb.c
---- linux-2.6.35.7/drivers/video/uvesafb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/uvesafb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/uvesafb.c linux-2.6.35.8/drivers/video/uvesafb.c
+--- linux-2.6.35.8/drivers/video/uvesafb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/uvesafb.c 2010-09-17 20:12:09.000000000 -0400
@@ -19,6 +19,7 @@
#include <linux/io.h>
#include <linux/mutex.h>
@@ -29065,9 +29015,9 @@ diff -urNp linux-2.6.35.7/drivers/video/uvesafb.c linux-2.6.35.7/drivers/video/u
}
framebuffer_release(info);
-diff -urNp linux-2.6.35.7/drivers/video/vesafb.c linux-2.6.35.7/drivers/video/vesafb.c
---- linux-2.6.35.7/drivers/video/vesafb.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/drivers/video/vesafb.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/drivers/video/vesafb.c linux-2.6.35.8/drivers/video/vesafb.c
+--- linux-2.6.35.8/drivers/video/vesafb.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/drivers/video/vesafb.c 2010-09-17 20:12:09.000000000 -0400
@@ -9,6 +9,7 @@
*/
@@ -29171,9 +29121,9 @@ diff -urNp linux-2.6.35.7/drivers/video/vesafb.c linux-2.6.35.7/drivers/video/ve
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.35.7/fs/9p/vfs_inode.c linux-2.6.35.7/fs/9p/vfs_inode.c
---- linux-2.6.35.7/fs/9p/vfs_inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/9p/vfs_inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/9p/vfs_inode.c linux-2.6.35.8/fs/9p/vfs_inode.c
+--- linux-2.6.35.8/fs/9p/vfs_inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/9p/vfs_inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -1087,7 +1087,7 @@ static void *v9fs_vfs_follow_link(struct
static void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -29183,9 +29133,9 @@ diff -urNp linux-2.6.35.7/fs/9p/vfs_inode.c linux-2.6.35.7/fs/9p/vfs_inode.c
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.35.7/fs/aio.c linux-2.6.35.7/fs/aio.c
---- linux-2.6.35.7/fs/aio.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/fs/aio.c 2010-09-26 17:32:46.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/aio.c linux-2.6.35.8/fs/aio.c
+--- linux-2.6.35.8/fs/aio.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/fs/aio.c 2010-09-26 17:32:46.000000000 -0400
@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29195,9 +29145,9 @@ diff -urNp linux-2.6.35.7/fs/aio.c linux-2.6.35.7/fs/aio.c
return -EINVAL;
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.35.7/fs/attr.c linux-2.6.35.7/fs/attr.c
---- linux-2.6.35.7/fs/attr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/attr.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/attr.c linux-2.6.35.8/fs/attr.c
+--- linux-2.6.35.8/fs/attr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/attr.c 2010-09-17 20:12:37.000000000 -0400
@@ -82,6 +82,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -29206,9 +29156,9 @@ diff -urNp linux-2.6.35.7/fs/attr.c linux-2.6.35.7/fs/attr.c
if (limit != RLIM_INFINITY && offset > limit)
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-2.6.35.7/fs/autofs/root.c linux-2.6.35.7/fs/autofs/root.c
---- linux-2.6.35.7/fs/autofs/root.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/autofs/root.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/autofs/root.c linux-2.6.35.8/fs/autofs/root.c
+--- linux-2.6.35.8/fs/autofs/root.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/autofs/root.c 2010-09-17 20:12:09.000000000 -0400
@@ -301,7 +301,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -29219,9 +29169,9 @@ diff -urNp linux-2.6.35.7/fs/autofs/root.c linux-2.6.35.7/fs/autofs/root.c
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.35.7/fs/autofs4/symlink.c linux-2.6.35.7/fs/autofs4/symlink.c
---- linux-2.6.35.7/fs/autofs4/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/autofs4/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/autofs4/symlink.c linux-2.6.35.8/fs/autofs4/symlink.c
+--- linux-2.6.35.8/fs/autofs4/symlink.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/autofs4/symlink.c 2010-09-17 20:12:09.000000000 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -29231,9 +29181,9 @@ diff -urNp linux-2.6.35.7/fs/autofs4/symlink.c linux-2.6.35.7/fs/autofs4/symlink
return NULL;
}
-diff -urNp linux-2.6.35.7/fs/befs/linuxvfs.c linux-2.6.35.7/fs/befs/linuxvfs.c
---- linux-2.6.35.7/fs/befs/linuxvfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/befs/linuxvfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/befs/linuxvfs.c linux-2.6.35.8/fs/befs/linuxvfs.c
+--- linux-2.6.35.8/fs/befs/linuxvfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/befs/linuxvfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29243,9 +29193,9 @@ diff -urNp linux-2.6.35.7/fs/befs/linuxvfs.c linux-2.6.35.7/fs/befs/linuxvfs.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.35.7/fs/binfmt_aout.c linux-2.6.35.7/fs/binfmt_aout.c
---- linux-2.6.35.7/fs/binfmt_aout.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/binfmt_aout.c 2010-09-23 20:16:12.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/binfmt_aout.c linux-2.6.35.8/fs/binfmt_aout.c
+--- linux-2.6.35.8/fs/binfmt_aout.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/binfmt_aout.c 2010-09-23 20:16:12.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -29334,9 +29284,9 @@ diff -urNp linux-2.6.35.7/fs/binfmt_aout.c linux-2.6.35.7/fs/binfmt_aout.c
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.35.7/fs/binfmt_elf.c linux-2.6.35.7/fs/binfmt_elf.c
---- linux-2.6.35.7/fs/binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/binfmt_elf.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/binfmt_elf.c linux-2.6.35.8/fs/binfmt_elf.c
+--- linux-2.6.35.8/fs/binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/binfmt_elf.c 2010-09-17 20:12:37.000000000 -0400
@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
#define elf_core_dump NULL
#endif
@@ -30002,9 +29952,9 @@ diff -urNp linux-2.6.35.7/fs/binfmt_elf.c linux-2.6.35.7/fs/binfmt_elf.c
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.35.7/fs/binfmt_flat.c linux-2.6.35.7/fs/binfmt_flat.c
---- linux-2.6.35.7/fs/binfmt_flat.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/binfmt_flat.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/binfmt_flat.c linux-2.6.35.8/fs/binfmt_flat.c
+--- linux-2.6.35.8/fs/binfmt_flat.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/binfmt_flat.c 2010-09-17 20:12:09.000000000 -0400
@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -30037,9 +29987,9 @@ diff -urNp linux-2.6.35.7/fs/binfmt_flat.c linux-2.6.35.7/fs/binfmt_flat.c
ret = result;
goto err;
}
-diff -urNp linux-2.6.35.7/fs/binfmt_misc.c linux-2.6.35.7/fs/binfmt_misc.c
---- linux-2.6.35.7/fs/binfmt_misc.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/fs/binfmt_misc.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/binfmt_misc.c linux-2.6.35.8/fs/binfmt_misc.c
+--- linux-2.6.35.8/fs/binfmt_misc.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/fs/binfmt_misc.c 2010-09-20 17:33:32.000000000 -0400
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -30049,9 +29999,9 @@ diff -urNp linux-2.6.35.7/fs/binfmt_misc.c linux-2.6.35.7/fs/binfmt_misc.c
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.35.7/fs/bio.c linux-2.6.35.7/fs/bio.c
---- linux-2.6.35.7/fs/bio.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/bio.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/bio.c linux-2.6.35.8/fs/bio.c
+--- linux-2.6.35.8/fs/bio.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/bio.c 2010-09-17 20:12:09.000000000 -0400
@@ -1213,7 +1213,7 @@ static void bio_copy_kern_endio(struct b
const int read = bio_data_dir(bio) == READ;
struct bio_map_data *bmd = bio->bi_private;
@@ -30061,9 +30011,9 @@ diff -urNp linux-2.6.35.7/fs/bio.c linux-2.6.35.7/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
-diff -urNp linux-2.6.35.7/fs/block_dev.c linux-2.6.35.7/fs/block_dev.c
---- linux-2.6.35.7/fs/block_dev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/block_dev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/block_dev.c linux-2.6.35.8/fs/block_dev.c
+--- linux-2.6.35.8/fs/block_dev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/block_dev.c 2010-09-17 20:12:09.000000000 -0400
@@ -647,7 +647,7 @@ static bool bd_may_claim(struct block_de
else if (bdev->bd_contains == bdev)
return true; /* is a whole device which isn't held */
@@ -30073,9 +30023,9 @@ diff -urNp linux-2.6.35.7/fs/block_dev.c linux-2.6.35.7/fs/block_dev.c
return true; /* is a partition of a device that is being partitioned */
else if (whole->bd_holder != NULL)
return false; /* is a partition of a held device */
-diff -urNp linux-2.6.35.7/fs/btrfs/ctree.c linux-2.6.35.7/fs/btrfs/ctree.c
---- linux-2.6.35.7/fs/btrfs/ctree.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/ctree.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/ctree.c linux-2.6.35.8/fs/btrfs/ctree.c
+--- linux-2.6.35.8/fs/btrfs/ctree.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/ctree.c 2010-10-11 22:41:44.000000000 -0400
@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(st
free_extent_buffer(buf);
add_root_to_dirty_list(root);
@@ -30100,9 +30050,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/ctree.c linux-2.6.35.7/fs/btrfs/ctree.c
btrfs_cpu_key_to_disk(&disk_key, cpu_key);
ret = fixup_low_keys(trans, root, path, &disk_key, 1);
}
-diff -urNp linux-2.6.35.7/fs/btrfs/disk-io.c linux-2.6.35.7/fs/btrfs/disk-io.c
---- linux-2.6.35.7/fs/btrfs/disk-io.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/disk-io.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/disk-io.c linux-2.6.35.8/fs/btrfs/disk-io.c
+--- linux-2.6.35.8/fs/btrfs/disk-io.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/disk-io.c 2010-09-17 20:12:09.000000000 -0400
@@ -40,7 +40,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -30121,9 +30071,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/disk-io.c linux-2.6.35.7/fs/btrfs/disk-io.c
.write_cache_pages_lock_hook = btree_lock_page_hook,
.readpage_end_io_hook = btree_readpage_end_io_hook,
.submit_bio_hook = btree_submit_bio_hook,
-diff -urNp linux-2.6.35.7/fs/btrfs/extent_io.h linux-2.6.35.7/fs/btrfs/extent_io.h
---- linux-2.6.35.7/fs/btrfs/extent_io.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/extent_io.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/extent_io.h linux-2.6.35.8/fs/btrfs/extent_io.h
+--- linux-2.6.35.8/fs/btrfs/extent_io.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/extent_io.h 2010-09-17 20:12:09.000000000 -0400
@@ -51,36 +51,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags, u64 bio_offset);
@@ -30184,9 +30134,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/extent_io.h linux-2.6.35.7/fs/btrfs/extent_io
};
struct extent_state {
-diff -urNp linux-2.6.35.7/fs/btrfs/free-space-cache.c linux-2.6.35.7/fs/btrfs/free-space-cache.c
---- linux-2.6.35.7/fs/btrfs/free-space-cache.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/free-space-cache.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/free-space-cache.c linux-2.6.35.8/fs/btrfs/free-space-cache.c
+--- linux-2.6.35.8/fs/btrfs/free-space-cache.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/free-space-cache.c 2010-09-17 20:12:09.000000000 -0400
@@ -1075,8 +1075,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -30205,9 +30155,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/free-space-cache.c linux-2.6.35.7/fs/btrfs/fr
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff -urNp linux-2.6.35.7/fs/btrfs/inode.c linux-2.6.35.7/fs/btrfs/inode.c
---- linux-2.6.35.7/fs/btrfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/inode.c linux-2.6.35.8/fs/btrfs/inode.c
+--- linux-2.6.35.8/fs/btrfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -64,7 +64,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -30226,9 +30176,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/inode.c linux-2.6.35.7/fs/btrfs/inode.c
.fill_delalloc = run_delalloc_range,
.submit_bio_hook = btrfs_submit_bio_hook,
.merge_bio_hook = btrfs_merge_bio_hook,
-diff -urNp linux-2.6.35.7/fs/btrfs/relocation.c linux-2.6.35.7/fs/btrfs/relocation.c
---- linux-2.6.35.7/fs/btrfs/relocation.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/btrfs/relocation.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/btrfs/relocation.c linux-2.6.35.8/fs/btrfs/relocation.c
+--- linux-2.6.35.8/fs/btrfs/relocation.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/btrfs/relocation.c 2010-10-11 22:41:44.000000000 -0400
@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct bt
}
spin_unlock(&rc->reloc_root_tree.lock);
@@ -30238,9 +30188,9 @@ diff -urNp linux-2.6.35.7/fs/btrfs/relocation.c linux-2.6.35.7/fs/btrfs/relocati
if (!del) {
spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-2.6.35.7/fs/cachefiles/bind.c linux-2.6.35.7/fs/cachefiles/bind.c
---- linux-2.6.35.7/fs/cachefiles/bind.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/cachefiles/bind.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/cachefiles/bind.c linux-2.6.35.8/fs/cachefiles/bind.c
+--- linux-2.6.35.8/fs/cachefiles/bind.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/cachefiles/bind.c 2010-09-17 20:12:09.000000000 -0400
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -30257,9 +30207,9 @@ diff -urNp linux-2.6.35.7/fs/cachefiles/bind.c linux-2.6.35.7/fs/cachefiles/bind
cache->bcull_percent < cache->brun_percent &&
cache->brun_percent < 100);
-diff -urNp linux-2.6.35.7/fs/cachefiles/daemon.c linux-2.6.35.7/fs/cachefiles/daemon.c
---- linux-2.6.35.7/fs/cachefiles/daemon.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/cachefiles/daemon.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/cachefiles/daemon.c linux-2.6.35.8/fs/cachefiles/daemon.c
+--- linux-2.6.35.8/fs/cachefiles/daemon.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/cachefiles/daemon.c 2010-09-17 20:12:09.000000000 -0400
@@ -195,7 +195,7 @@ static ssize_t cachefiles_daemon_read(st
if (n > buflen)
return -EMSGSIZE;
@@ -30296,9 +30246,9 @@ diff -urNp linux-2.6.35.7/fs/cachefiles/daemon.c linux-2.6.35.7/fs/cachefiles/da
return cachefiles_daemon_range_error(cache, args);
cache->bstop_percent = bstop;
-diff -urNp linux-2.6.35.7/fs/cachefiles/rdwr.c linux-2.6.35.7/fs/cachefiles/rdwr.c
---- linux-2.6.35.7/fs/cachefiles/rdwr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/cachefiles/rdwr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/cachefiles/rdwr.c linux-2.6.35.8/fs/cachefiles/rdwr.c
+--- linux-2.6.35.8/fs/cachefiles/rdwr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/cachefiles/rdwr.c 2010-09-17 20:12:09.000000000 -0400
@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -30308,9 +30258,9 @@ diff -urNp linux-2.6.35.7/fs/cachefiles/rdwr.c linux-2.6.35.7/fs/cachefiles/rdwr
set_fs(old_fs);
kunmap(page);
if (ret != len)
-diff -urNp linux-2.6.35.7/fs/ceph/dir.c linux-2.6.35.7/fs/ceph/dir.c
---- linux-2.6.35.7/fs/ceph/dir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ceph/dir.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ceph/dir.c linux-2.6.35.8/fs/ceph/dir.c
+--- linux-2.6.35.8/fs/ceph/dir.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ceph/dir.c 2010-10-11 22:41:44.000000000 -0400
@@ -228,7 +228,7 @@ static int ceph_readdir(struct file *fil
struct ceph_client *client = ceph_inode_to_client(inode);
struct ceph_mds_client *mdsc = &client->mdsc;
@@ -30329,9 +30279,9 @@ diff -urNp linux-2.6.35.7/fs/ceph/dir.c linux-2.6.35.7/fs/ceph/dir.c
u64 pos = ceph_make_fpos(frag, off);
struct ceph_mds_reply_inode *in =
rinfo->dir_in[off - fi->offset].in;
-diff -urNp linux-2.6.35.7/fs/cifs/cifs_uniupr.h linux-2.6.35.7/fs/cifs/cifs_uniupr.h
---- linux-2.6.35.7/fs/cifs/cifs_uniupr.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/cifs/cifs_uniupr.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/cifs/cifs_uniupr.h linux-2.6.35.8/fs/cifs/cifs_uniupr.h
+--- linux-2.6.35.8/fs/cifs/cifs_uniupr.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/cifs/cifs_uniupr.h 2010-09-17 20:12:09.000000000 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30341,9 +30291,9 @@ diff -urNp linux-2.6.35.7/fs/cifs/cifs_uniupr.h linux-2.6.35.7/fs/cifs/cifs_uniu
};
#endif
-diff -urNp linux-2.6.35.7/fs/cifs/link.c linux-2.6.35.7/fs/cifs/link.c
---- linux-2.6.35.7/fs/cifs/link.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/cifs/link.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/cifs/link.c linux-2.6.35.8/fs/cifs/link.c
+--- linux-2.6.35.8/fs/cifs/link.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/cifs/link.c 2010-09-17 20:12:09.000000000 -0400
@@ -216,7 +216,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30353,9 +30303,9 @@ diff -urNp linux-2.6.35.7/fs/cifs/link.c linux-2.6.35.7/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.35.7/fs/compat_binfmt_elf.c linux-2.6.35.7/fs/compat_binfmt_elf.c
---- linux-2.6.35.7/fs/compat_binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/compat_binfmt_elf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/compat_binfmt_elf.c linux-2.6.35.8/fs/compat_binfmt_elf.c
+--- linux-2.6.35.8/fs/compat_binfmt_elf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/compat_binfmt_elf.c 2010-09-17 20:12:09.000000000 -0400
@@ -30,11 +30,13 @@
#undef elf_phdr
#undef elf_shdr
@@ -30370,9 +30320,9 @@ diff -urNp linux-2.6.35.7/fs/compat_binfmt_elf.c linux-2.6.35.7/fs/compat_binfmt
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.35.7/fs/compat.c linux-2.6.35.7/fs/compat.c
---- linux-2.6.35.7/fs/compat.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/fs/compat.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/compat.c linux-2.6.35.8/fs/compat.c
+--- linux-2.6.35.8/fs/compat.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/fs/compat.c 2010-10-11 22:41:44.000000000 -0400
@@ -590,7 +590,7 @@ ssize_t compat_rw_copy_check_uvector(int
goto out;
@@ -30481,9 +30431,9 @@ diff -urNp linux-2.6.35.7/fs/compat.c linux-2.6.35.7/fs/compat.c
out:
if (bprm->mm)
mmput(bprm->mm);
-diff -urNp linux-2.6.35.7/fs/compat_ioctl.c linux-2.6.35.7/fs/compat_ioctl.c
---- linux-2.6.35.7/fs/compat_ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/compat_ioctl.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/compat_ioctl.c linux-2.6.35.8/fs/compat_ioctl.c
+--- linux-2.6.35.8/fs/compat_ioctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/compat_ioctl.c 2010-10-11 22:41:44.000000000 -0400
@@ -227,6 +227,8 @@ static int do_video_set_spu_palette(unsi
err = get_user(palp, &up->palette);
@@ -30493,9 +30443,9 @@ diff -urNp linux-2.6.35.7/fs/compat_ioctl.c linux-2.6.35.7/fs/compat_ioctl.c
up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
err = put_user(compat_ptr(palp), &up_native->palette);
-diff -urNp linux-2.6.35.7/fs/debugfs/inode.c linux-2.6.35.7/fs/debugfs/inode.c
---- linux-2.6.35.7/fs/debugfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/debugfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/debugfs/inode.c linux-2.6.35.8/fs/debugfs/inode.c
+--- linux-2.6.35.8/fs/debugfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/debugfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -129,7 +129,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30505,9 +30455,9 @@ diff -urNp linux-2.6.35.7/fs/debugfs/inode.c linux-2.6.35.7/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.35.7/fs/dlm/lockspace.c linux-2.6.35.7/fs/dlm/lockspace.c
---- linux-2.6.35.7/fs/dlm/lockspace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/dlm/lockspace.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/dlm/lockspace.c linux-2.6.35.8/fs/dlm/lockspace.c
+--- linux-2.6.35.8/fs/dlm/lockspace.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/dlm/lockspace.c 2010-09-17 20:12:09.000000000 -0400
@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset,
return 0;
}
@@ -30517,9 +30467,9 @@ diff -urNp linux-2.6.35.7/fs/dlm/lockspace.c linux-2.6.35.7/fs/dlm/lockspace.c
.uevent = dlm_uevent,
};
-diff -urNp linux-2.6.35.7/fs/ecryptfs/inode.c linux-2.6.35.7/fs/ecryptfs/inode.c
---- linux-2.6.35.7/fs/ecryptfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ecryptfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ecryptfs/inode.c linux-2.6.35.8/fs/ecryptfs/inode.c
+--- linux-2.6.35.8/fs/ecryptfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ecryptfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -30547,9 +30497,9 @@ diff -urNp linux-2.6.35.7/fs/ecryptfs/inode.c linux-2.6.35.7/fs/ecryptfs/inode.c
if (!IS_ERR(buf)) {
/* Free the char* */
kfree(buf);
-diff -urNp linux-2.6.35.7/fs/ecryptfs/miscdev.c linux-2.6.35.7/fs/ecryptfs/miscdev.c
---- linux-2.6.35.7/fs/ecryptfs/miscdev.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ecryptfs/miscdev.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ecryptfs/miscdev.c linux-2.6.35.8/fs/ecryptfs/miscdev.c
+--- linux-2.6.35.8/fs/ecryptfs/miscdev.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ecryptfs/miscdev.c 2010-09-17 20:12:09.000000000 -0400
@@ -328,7 +328,7 @@ check_list:
goto out_unlock_msg_ctx;
i = 5;
@@ -30559,9 +30509,9 @@ diff -urNp linux-2.6.35.7/fs/ecryptfs/miscdev.c linux-2.6.35.7/fs/ecryptfs/miscd
goto out_unlock_msg_ctx;
i += packet_length_size;
if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
---- linux-2.6.35.7/fs/exec.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/exec.c 2010-09-28 18:50:18.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/exec.c linux-2.6.35.8/fs/exec.c
+--- linux-2.6.35.8/fs/exec.c 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/fs/exec.c 2010-10-31 17:41:48.000000000 -0400
@@ -55,12 +55,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -30643,30 +30593,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
return 0;
err:
up_write(&mm->mmap_sem);
-@@ -377,6 +392,9 @@ static int count(char __user * __user *
- argv++;
- if (i++ >= max)
- return -E2BIG;
-+
-+ if (fatal_signal_pending(current))
-+ return -ERESTARTNOHAND;
- cond_resched();
- }
- }
-@@ -420,6 +438,12 @@ static int copy_strings(int argc, char _
- while (len > 0) {
- int offset, bytes_to_copy;
-
-+ if (fatal_signal_pending(current)) {
-+ ret = -ERESTARTNOHAND;
-+ goto out;
-+ }
-+ cond_resched();
-+
- offset = pos % PAGE_SIZE;
- if (offset == 0)
- offset = PAGE_SIZE;
-@@ -476,7 +500,7 @@ int copy_strings_kernel(int argc,char **
+@@ -485,7 +500,7 @@ int copy_strings_kernel(int argc,char **
int r;
mm_segment_t oldfs = get_fs();
set_fs(KERNEL_DS);
@@ -30675,7 +30602,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
set_fs(oldfs);
return r;
}
-@@ -506,7 +530,8 @@ static int shift_arg_pages(struct vm_are
+@@ -515,7 +530,8 @@ static int shift_arg_pages(struct vm_are
unsigned long new_end = old_end - shift;
struct mmu_gather *tlb;
@@ -30685,7 +30612,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/*
* ensure there are no vmas between where we want to go
-@@ -515,6 +540,10 @@ static int shift_arg_pages(struct vm_are
+@@ -524,6 +540,10 @@ static int shift_arg_pages(struct vm_are
if (vma != find_vma(mm, new_start))
return -EFAULT;
@@ -30696,7 +30623,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/*
* cover the whole range: [new_start, old_end)
*/
-@@ -605,8 +634,28 @@ int setup_arg_pages(struct linux_binprm
+@@ -619,8 +639,28 @@ int setup_arg_pages(struct linux_binprm
bprm->exec -= stack_shift;
down_write(&mm->mmap_sem);
@@ -30725,7 +30652,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/*
* Adjust stack execute permissions; explicitly enable for
* EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -625,13 +674,6 @@ int setup_arg_pages(struct linux_binprm
+@@ -639,13 +679,6 @@ int setup_arg_pages(struct linux_binprm
goto out_unlock;
BUG_ON(prev != vma);
@@ -30739,7 +30666,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/* mprotect_fixup is overkill to remove the temporary stack flags */
vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
-@@ -671,7 +713,7 @@ struct file *open_exec(const char *name)
+@@ -685,7 +718,7 @@ struct file *open_exec(const char *name)
int err;
file = do_filp_open(AT_FDCWD, name,
@@ -30748,7 +30675,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
MAY_EXEC | MAY_OPEN);
if (IS_ERR(file))
goto out;
-@@ -708,7 +750,7 @@ int kernel_read(struct file *file, loff_
+@@ -722,7 +755,7 @@ int kernel_read(struct file *file, loff_
old_fs = get_fs();
set_fs(get_ds());
/* The cast to a user pointer is valid due to the set_fs() */
@@ -30757,7 +30684,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
set_fs(old_fs);
return result;
}
-@@ -1125,7 +1167,7 @@ int check_unsafe_exec(struct linux_binpr
+@@ -1139,7 +1172,7 @@ int check_unsafe_exec(struct linux_binpr
}
rcu_read_unlock();
@@ -30766,7 +30693,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
res = -EAGAIN;
-@@ -1321,6 +1363,11 @@ int do_execve(char * filename,
+@@ -1335,6 +1368,11 @@ int do_execve(char * filename,
char __user *__user *envp,
struct pt_regs * regs)
{
@@ -30778,7 +30705,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
-@@ -1357,6 +1404,18 @@ int do_execve(char * filename,
+@@ -1371,6 +1409,18 @@ int do_execve(char * filename,
bprm->filename = filename;
bprm->interp = filename;
@@ -30797,7 +30724,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
retval = bprm_mm_init(bprm);
if (retval)
goto out_file;
-@@ -1386,10 +1445,41 @@ int do_execve(char * filename,
+@@ -1400,10 +1450,41 @@ int do_execve(char * filename,
if (retval < 0)
goto out;
@@ -30840,7 +30767,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/* execve succeeded */
current->fs->in_exec = 0;
-@@ -1400,6 +1490,14 @@ int do_execve(char * filename,
+@@ -1414,6 +1495,14 @@ int do_execve(char * filename,
put_files_struct(displaced);
return retval;
@@ -30855,7 +30782,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
out:
if (bprm->mm)
mmput (bprm->mm);
-@@ -1563,6 +1661,217 @@ out:
+@@ -1577,6 +1666,217 @@ out:
return ispipe;
}
@@ -31073,7 +31000,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
static int zap_process(struct task_struct *start, int exit_code)
{
struct task_struct *t;
-@@ -1773,17 +2082,17 @@ static void wait_for_dump_helpers(struct
+@@ -1787,17 +2087,17 @@ static void wait_for_dump_helpers(struct
pipe = file->f_path.dentry->d_inode->i_pipe;
pipe_lock(pipe);
@@ -31096,7 +31023,7 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
pipe_unlock(pipe);
}
-@@ -1891,6 +2200,10 @@ void do_coredump(long signr, int exit_co
+@@ -1905,6 +2205,10 @@ void do_coredump(long signr, int exit_co
*/
clear_thread_flag(TIF_SIGPENDING);
@@ -31107,9 +31034,9 @@ diff -urNp linux-2.6.35.7/fs/exec.c linux-2.6.35.7/fs/exec.c
/*
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
-diff -urNp linux-2.6.35.7/fs/ext2/balloc.c linux-2.6.35.7/fs/ext2/balloc.c
---- linux-2.6.35.7/fs/ext2/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext2/balloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext2/balloc.c linux-2.6.35.8/fs/ext2/balloc.c
+--- linux-2.6.35.8/fs/ext2/balloc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext2/balloc.c 2010-09-17 20:12:37.000000000 -0400
@@ -1193,7 +1193,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31119,9 +31046,9 @@ diff -urNp linux-2.6.35.7/fs/ext2/balloc.c linux-2.6.35.7/fs/ext2/balloc.c
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.35.7/fs/ext2/xattr.c linux-2.6.35.7/fs/ext2/xattr.c
---- linux-2.6.35.7/fs/ext2/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext2/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext2/xattr.c linux-2.6.35.8/fs/ext2/xattr.c
+--- linux-2.6.35.8/fs/ext2/xattr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext2/xattr.c 2010-09-17 20:12:09.000000000 -0400
@@ -86,8 +86,8 @@
printk("\n"); \
} while (0)
@@ -31133,9 +31060,9 @@ diff -urNp linux-2.6.35.7/fs/ext2/xattr.c linux-2.6.35.7/fs/ext2/xattr.c
#endif
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
-diff -urNp linux-2.6.35.7/fs/ext3/balloc.c linux-2.6.35.7/fs/ext3/balloc.c
---- linux-2.6.35.7/fs/ext3/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext3/balloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext3/balloc.c linux-2.6.35.8/fs/ext3/balloc.c
+--- linux-2.6.35.8/fs/ext3/balloc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext3/balloc.c 2010-09-17 20:12:37.000000000 -0400
@@ -1422,7 +1422,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31145,9 +31072,9 @@ diff -urNp linux-2.6.35.7/fs/ext3/balloc.c linux-2.6.35.7/fs/ext3/balloc.c
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.35.7/fs/ext3/namei.c linux-2.6.35.7/fs/ext3/namei.c
---- linux-2.6.35.7/fs/ext3/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext3/namei.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext3/namei.c linux-2.6.35.8/fs/ext3/namei.c
+--- linux-2.6.35.8/fs/ext3/namei.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext3/namei.c 2010-09-17 20:12:09.000000000 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31157,9 +31084,9 @@ diff -urNp linux-2.6.35.7/fs/ext3/namei.c linux-2.6.35.7/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.35.7/fs/ext3/xattr.c linux-2.6.35.7/fs/ext3/xattr.c
---- linux-2.6.35.7/fs/ext3/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext3/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext3/xattr.c linux-2.6.35.8/fs/ext3/xattr.c
+--- linux-2.6.35.8/fs/ext3/xattr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext3/xattr.c 2010-09-17 20:12:09.000000000 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -31171,9 +31098,9 @@ diff -urNp linux-2.6.35.7/fs/ext3/xattr.c linux-2.6.35.7/fs/ext3/xattr.c
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.35.7/fs/ext4/balloc.c linux-2.6.35.7/fs/ext4/balloc.c
---- linux-2.6.35.7/fs/ext4/balloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext4/balloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext4/balloc.c linux-2.6.35.8/fs/ext4/balloc.c
+--- linux-2.6.35.8/fs/ext4/balloc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext4/balloc.c 2010-09-17 20:12:37.000000000 -0400
@@ -522,7 +522,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -31183,9 +31110,9 @@ diff -urNp linux-2.6.35.7/fs/ext4/balloc.c linux-2.6.35.7/fs/ext4/balloc.c
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.35.7/fs/ext4/namei.c linux-2.6.35.7/fs/ext4/namei.c
---- linux-2.6.35.7/fs/ext4/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext4/namei.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext4/namei.c linux-2.6.35.8/fs/ext4/namei.c
+--- linux-2.6.35.8/fs/ext4/namei.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext4/namei.c 2010-09-17 20:12:09.000000000 -0400
@@ -1197,7 +1197,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31195,9 +31122,9 @@ diff -urNp linux-2.6.35.7/fs/ext4/namei.c linux-2.6.35.7/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.35.7/fs/ext4/xattr.c linux-2.6.35.7/fs/ext4/xattr.c
---- linux-2.6.35.7/fs/ext4/xattr.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ext4/xattr.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ext4/xattr.c linux-2.6.35.8/fs/ext4/xattr.c
+--- linux-2.6.35.8/fs/ext4/xattr.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ext4/xattr.c 2010-09-17 20:12:09.000000000 -0400
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
@@ -31209,9 +31136,9 @@ diff -urNp linux-2.6.35.7/fs/ext4/xattr.c linux-2.6.35.7/fs/ext4/xattr.c
#endif
static void ext4_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.35.7/fs/fcntl.c linux-2.6.35.7/fs/fcntl.c
---- linux-2.6.35.7/fs/fcntl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fcntl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fcntl.c linux-2.6.35.8/fs/fcntl.c
+--- linux-2.6.35.8/fs/fcntl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fcntl.c 2010-09-17 20:12:37.000000000 -0400
@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -31232,9 +31159,9 @@ diff -urNp linux-2.6.35.7/fs/fcntl.c linux-2.6.35.7/fs/fcntl.c
if (arg >= rlimit(RLIMIT_NOFILE))
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-diff -urNp linux-2.6.35.7/fs/fifo.c linux-2.6.35.7/fs/fifo.c
---- linux-2.6.35.7/fs/fifo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fifo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fifo.c linux-2.6.35.8/fs/fifo.c
+--- linux-2.6.35.8/fs/fifo.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fifo.c 2010-09-17 20:12:09.000000000 -0400
@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -31305,9 +31232,9 @@ diff -urNp linux-2.6.35.7/fs/fifo.c linux-2.6.35.7/fs/fifo.c
free_pipe_info(inode);
err_nocleanup:
-diff -urNp linux-2.6.35.7/fs/file.c linux-2.6.35.7/fs/file.c
---- linux-2.6.35.7/fs/file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/file.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/file.c linux-2.6.35.8/fs/file.c
+--- linux-2.6.35.8/fs/file.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/file.c 2010-09-17 20:12:37.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -31324,9 +31251,9 @@ diff -urNp linux-2.6.35.7/fs/file.c linux-2.6.35.7/fs/file.c
if (nr >= rlimit(RLIMIT_NOFILE))
return -EMFILE;
-diff -urNp linux-2.6.35.7/fs/fs_struct.c linux-2.6.35.7/fs/fs_struct.c
---- linux-2.6.35.7/fs/fs_struct.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fs_struct.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fs_struct.c linux-2.6.35.8/fs/fs_struct.c
+--- linux-2.6.35.8/fs/fs_struct.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fs_struct.c 2010-09-17 20:12:37.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -31406,9 +31333,9 @@ diff -urNp linux-2.6.35.7/fs/fs_struct.c linux-2.6.35.7/fs/fs_struct.c
write_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.35.7/fs/fuse/control.c linux-2.6.35.7/fs/fuse/control.c
---- linux-2.6.35.7/fs/fuse/control.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fuse/control.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fuse/control.c linux-2.6.35.8/fs/fuse/control.c
+--- linux-2.6.35.8/fs/fuse/control.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fuse/control.c 2010-09-17 20:12:09.000000000 -0400
@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31418,9 +31345,9 @@ diff -urNp linux-2.6.35.7/fs/fuse/control.c linux-2.6.35.7/fs/fuse/control.c
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.35.7/fs/fuse/cuse.c linux-2.6.35.7/fs/fuse/cuse.c
---- linux-2.6.35.7/fs/fuse/cuse.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fuse/cuse.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fuse/cuse.c linux-2.6.35.8/fs/fuse/cuse.c
+--- linux-2.6.35.8/fs/fuse/cuse.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fuse/cuse.c 2010-09-17 20:12:09.000000000 -0400
@@ -529,8 +529,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -31455,9 +31382,9 @@ diff -urNp linux-2.6.35.7/fs/fuse/cuse.c linux-2.6.35.7/fs/fuse/cuse.c
cuse_class = class_create(THIS_MODULE, "cuse");
if (IS_ERR(cuse_class))
return PTR_ERR(cuse_class);
-diff -urNp linux-2.6.35.7/fs/fuse/dev.c linux-2.6.35.7/fs/fuse/dev.c
---- linux-2.6.35.7/fs/fuse/dev.c 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/fs/fuse/dev.c 2010-09-20 17:33:32.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fuse/dev.c linux-2.6.35.8/fs/fuse/dev.c
+--- linux-2.6.35.8/fs/fuse/dev.c 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/fs/fuse/dev.c 2010-09-20 17:33:32.000000000 -0400
@@ -1031,7 +1031,7 @@ static ssize_t fuse_dev_do_read(struct f
return err;
}
@@ -31539,9 +31466,9 @@ diff -urNp linux-2.6.35.7/fs/fuse/dev.c linux-2.6.35.7/fs/fuse/dev.c
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,
-diff -urNp linux-2.6.35.7/fs/fuse/dir.c linux-2.6.35.7/fs/fuse/dir.c
---- linux-2.6.35.7/fs/fuse/dir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fuse/dir.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fuse/dir.c linux-2.6.35.8/fs/fuse/dir.c
+--- linux-2.6.35.8/fs/fuse/dir.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fuse/dir.c 2010-09-17 20:12:09.000000000 -0400
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -31551,9 +31478,9 @@ diff -urNp linux-2.6.35.7/fs/fuse/dir.c linux-2.6.35.7/fs/fuse/dir.c
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.35.7/fs/fuse/fuse_i.h linux-2.6.35.7/fs/fuse/fuse_i.h
---- linux-2.6.35.7/fs/fuse/fuse_i.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/fuse/fuse_i.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/fuse/fuse_i.h linux-2.6.35.8/fs/fuse/fuse_i.h
+--- linux-2.6.35.8/fs/fuse/fuse_i.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/fuse/fuse_i.h 2010-09-17 20:12:09.000000000 -0400
@@ -524,6 +524,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -31571,9 +31498,9 @@ diff -urNp linux-2.6.35.7/fs/fuse/fuse_i.h linux-2.6.35.7/fs/fuse/fuse_i.h
/**
* Inode to nodeid comparison.
*/
-diff -urNp linux-2.6.35.7/fs/hfs/inode.c linux-2.6.35.7/fs/hfs/inode.c
---- linux-2.6.35.7/fs/hfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/hfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/hfs/inode.c linux-2.6.35.8/fs/hfs/inode.c
+--- linux-2.6.35.8/fs/hfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/hfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -31592,9 +31519,9 @@ diff -urNp linux-2.6.35.7/fs/hfs/inode.c linux-2.6.35.7/fs/hfs/inode.c
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.35.7/fs/hfsplus/inode.c linux-2.6.35.7/fs/hfsplus/inode.c
---- linux-2.6.35.7/fs/hfsplus/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/hfsplus/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/hfsplus/inode.c linux-2.6.35.8/fs/hfsplus/inode.c
+--- linux-2.6.35.8/fs/hfsplus/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/hfsplus/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -31631,9 +31558,9 @@ diff -urNp linux-2.6.35.7/fs/hfsplus/inode.c linux-2.6.35.7/fs/hfsplus/inode.c
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
sizeof(struct hfsplus_cat_file));
hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.35.7/fs/hugetlbfs/inode.c linux-2.6.35.7/fs/hugetlbfs/inode.c
---- linux-2.6.35.7/fs/hugetlbfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/hugetlbfs/inode.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/hugetlbfs/inode.c linux-2.6.35.8/fs/hugetlbfs/inode.c
+--- linux-2.6.35.8/fs/hugetlbfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/hugetlbfs/inode.c 2010-09-17 20:12:37.000000000 -0400
@@ -908,7 +908,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -31643,9 +31570,9 @@ diff -urNp linux-2.6.35.7/fs/hugetlbfs/inode.c linux-2.6.35.7/fs/hugetlbfs/inode
static int can_do_hugetlb_shm(void)
{
-diff -urNp linux-2.6.35.7/fs/ioctl.c linux-2.6.35.7/fs/ioctl.c
---- linux-2.6.35.7/fs/ioctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ioctl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ioctl.c linux-2.6.35.8/fs/ioctl.c
+--- linux-2.6.35.8/fs/ioctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ioctl.c 2010-09-17 20:12:09.000000000 -0400
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -31673,9 +31600,9 @@ diff -urNp linux-2.6.35.7/fs/ioctl.c linux-2.6.35.7/fs/ioctl.c
error = -EFAULT;
return error;
-diff -urNp linux-2.6.35.7/fs/jffs2/debug.h linux-2.6.35.7/fs/jffs2/debug.h
---- linux-2.6.35.7/fs/jffs2/debug.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/jffs2/debug.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/jffs2/debug.h linux-2.6.35.8/fs/jffs2/debug.h
+--- linux-2.6.35.8/fs/jffs2/debug.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/jffs2/debug.h 2010-09-17 20:12:09.000000000 -0400
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -31777,9 +31704,9 @@ diff -urNp linux-2.6.35.7/fs/jffs2/debug.h linux-2.6.35.7/fs/jffs2/debug.h
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.35.7/fs/jffs2/erase.c linux-2.6.35.7/fs/jffs2/erase.c
---- linux-2.6.35.7/fs/jffs2/erase.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/jffs2/erase.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/jffs2/erase.c linux-2.6.35.8/fs/jffs2/erase.c
+--- linux-2.6.35.8/fs/jffs2/erase.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/jffs2/erase.c 2010-09-17 20:12:09.000000000 -0400
@@ -438,7 +438,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31790,9 +31717,9 @@ diff -urNp linux-2.6.35.7/fs/jffs2/erase.c linux-2.6.35.7/fs/jffs2/erase.c
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.35.7/fs/jffs2/summary.h linux-2.6.35.7/fs/jffs2/summary.h
---- linux-2.6.35.7/fs/jffs2/summary.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/jffs2/summary.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/jffs2/summary.h linux-2.6.35.8/fs/jffs2/summary.h
+--- linux-2.6.35.8/fs/jffs2/summary.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/jffs2/summary.h 2010-09-17 20:12:09.000000000 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -31821,9 +31748,9 @@ diff -urNp linux-2.6.35.7/fs/jffs2/summary.h linux-2.6.35.7/fs/jffs2/summary.h
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.35.7/fs/jffs2/wbuf.c linux-2.6.35.7/fs/jffs2/wbuf.c
---- linux-2.6.35.7/fs/jffs2/wbuf.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/jffs2/wbuf.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/jffs2/wbuf.c linux-2.6.35.8/fs/jffs2/wbuf.c
+--- linux-2.6.35.8/fs/jffs2/wbuf.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/jffs2/wbuf.c 2010-09-17 20:12:09.000000000 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -31834,9 +31761,9 @@ diff -urNp linux-2.6.35.7/fs/jffs2/wbuf.c linux-2.6.35.7/fs/jffs2/wbuf.c
};
/*
-diff -urNp linux-2.6.35.7/fs/Kconfig.binfmt linux-2.6.35.7/fs/Kconfig.binfmt
---- linux-2.6.35.7/fs/Kconfig.binfmt 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/Kconfig.binfmt 2010-09-23 20:17:27.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/Kconfig.binfmt linux-2.6.35.8/fs/Kconfig.binfmt
+--- linux-2.6.35.8/fs/Kconfig.binfmt 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/Kconfig.binfmt 2010-09-23 20:17:27.000000000 -0400
@@ -86,7 +86,7 @@ config HAVE_AOUT
config BINFMT_AOUT
@@ -31846,9 +31773,9 @@ diff -urNp linux-2.6.35.7/fs/Kconfig.binfmt linux-2.6.35.7/fs/Kconfig.binfmt
---help---
A.out (Assembler.OUTput) is a set of formats for libraries and
executables used in the earliest versions of UNIX. Linux used
-diff -urNp linux-2.6.35.7/fs/lockd/svc.c linux-2.6.35.7/fs/lockd/svc.c
---- linux-2.6.35.7/fs/lockd/svc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/lockd/svc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/lockd/svc.c linux-2.6.35.8/fs/lockd/svc.c
+--- linux-2.6.35.8/fs/lockd/svc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/lockd/svc.c 2010-09-17 20:12:09.000000000 -0400
@@ -42,7 +42,7 @@
static struct svc_program nlmsvc_program;
@@ -31858,9 +31785,9 @@ diff -urNp linux-2.6.35.7/fs/lockd/svc.c linux-2.6.35.7/fs/lockd/svc.c
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.35.7/fs/locks.c linux-2.6.35.7/fs/locks.c
---- linux-2.6.35.7/fs/locks.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/locks.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/locks.c linux-2.6.35.8/fs/locks.c
+--- linux-2.6.35.8/fs/locks.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/locks.c 2010-09-17 20:12:09.000000000 -0400
@@ -2008,16 +2008,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -31882,9 +31809,9 @@ diff -urNp linux-2.6.35.7/fs/locks.c linux-2.6.35.7/fs/locks.c
}
lock_kernel();
-diff -urNp linux-2.6.35.7/fs/namei.c linux-2.6.35.7/fs/namei.c
---- linux-2.6.35.7/fs/namei.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/namei.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/namei.c linux-2.6.35.8/fs/namei.c
+--- linux-2.6.35.8/fs/namei.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/namei.c 2010-09-17 20:12:37.000000000 -0400
@@ -548,7 +548,7 @@ __do_follow_link(struct path *path, stru
*p = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(*p);
@@ -32205,9 +32132,9 @@ diff -urNp linux-2.6.35.7/fs/namei.c linux-2.6.35.7/fs/namei.c
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.35.7/fs/namespace.c linux-2.6.35.7/fs/namespace.c
---- linux-2.6.35.7/fs/namespace.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/namespace.c 2010-09-17 20:21:58.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/namespace.c linux-2.6.35.8/fs/namespace.c
+--- linux-2.6.35.8/fs/namespace.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/namespace.c 2010-09-17 20:21:58.000000000 -0400
@@ -1099,6 +1099,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -32268,9 +32195,9 @@ diff -urNp linux-2.6.35.7/fs/namespace.c linux-2.6.35.7/fs/namespace.c
read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&current->fs->root);
-diff -urNp linux-2.6.35.7/fs/nfs/inode.c linux-2.6.35.7/fs/nfs/inode.c
---- linux-2.6.35.7/fs/nfs/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nfs/inode.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nfs/inode.c linux-2.6.35.8/fs/nfs/inode.c
+--- linux-2.6.35.8/fs/nfs/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nfs/inode.c 2010-09-17 20:12:09.000000000 -0400
@@ -915,16 +915,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -32291,9 +32218,9 @@ diff -urNp linux-2.6.35.7/fs/nfs/inode.c linux-2.6.35.7/fs/nfs/inode.c
}
void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-2.6.35.7/fs/nfs/nfs4proc.c linux-2.6.35.7/fs/nfs/nfs4proc.c
---- linux-2.6.35.7/fs/nfs/nfs4proc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nfs/nfs4proc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nfs/nfs4proc.c linux-2.6.35.8/fs/nfs/nfs4proc.c
+--- linux-2.6.35.8/fs/nfs/nfs4proc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nfs/nfs4proc.c 2010-09-17 20:12:09.000000000 -0400
@@ -1166,7 +1166,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -32564,9 +32491,9 @@ diff -urNp linux-2.6.35.7/fs/nfs/nfs4proc.c linux-2.6.35.7/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.35.7/fs/nfsd/lockd.c linux-2.6.35.7/fs/nfsd/lockd.c
---- linux-2.6.35.7/fs/nfsd/lockd.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nfsd/lockd.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nfsd/lockd.c linux-2.6.35.8/fs/nfsd/lockd.c
+--- linux-2.6.35.8/fs/nfsd/lockd.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nfsd/lockd.c 2010-09-17 20:12:09.000000000 -0400
@@ -61,7 +61,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -32576,9 +32503,9 @@ diff -urNp linux-2.6.35.7/fs/nfsd/lockd.c linux-2.6.35.7/fs/nfsd/lockd.c
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.35.7/fs/nfsd/nfsctl.c linux-2.6.35.7/fs/nfsd/nfsctl.c
---- linux-2.6.35.7/fs/nfsd/nfsctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nfsd/nfsctl.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nfsd/nfsctl.c linux-2.6.35.8/fs/nfsd/nfsctl.c
+--- linux-2.6.35.8/fs/nfsd/nfsctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nfsd/nfsctl.c 2010-09-17 20:12:09.000000000 -0400
@@ -163,7 +163,7 @@ static int export_features_open(struct i
return single_open(file, export_features_show, NULL);
}
@@ -32588,9 +32515,9 @@ diff -urNp linux-2.6.35.7/fs/nfsd/nfsctl.c linux-2.6.35.7/fs/nfsd/nfsctl.c
.open = export_features_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.35.7/fs/nfsd/vfs.c linux-2.6.35.7/fs/nfsd/vfs.c
---- linux-2.6.35.7/fs/nfsd/vfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nfsd/vfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nfsd/vfs.c linux-2.6.35.8/fs/nfsd/vfs.c
+--- linux-2.6.35.8/fs/nfsd/vfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nfsd/vfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -933,7 +933,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -32618,9 +32545,9 @@ diff -urNp linux-2.6.35.7/fs/nfsd/vfs.c linux-2.6.35.7/fs/nfsd/vfs.c
set_fs(oldfs);
if (host_err < 0)
-diff -urNp linux-2.6.35.7/fs/nls/nls_base.c linux-2.6.35.7/fs/nls/nls_base.c
---- linux-2.6.35.7/fs/nls/nls_base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/nls/nls_base.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/nls/nls_base.c linux-2.6.35.8/fs/nls/nls_base.c
+--- linux-2.6.35.8/fs/nls/nls_base.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/nls/nls_base.c 2010-09-17 20:12:09.000000000 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32630,9 +32557,9 @@ diff -urNp linux-2.6.35.7/fs/nls/nls_base.c linux-2.6.35.7/fs/nls/nls_base.c
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.35.7/fs/ntfs/dir.c linux-2.6.35.7/fs/ntfs/dir.c
---- linux-2.6.35.7/fs/ntfs/dir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ntfs/dir.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ntfs/dir.c linux-2.6.35.8/fs/ntfs/dir.c
+--- linux-2.6.35.8/fs/ntfs/dir.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ntfs/dir.c 2010-10-11 22:41:44.000000000 -0400
@@ -1329,7 +1329,7 @@ find_next_index_buffer:
ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
~(s64)(ndir->itype.index.block_size - 1)));
@@ -32642,9 +32569,9 @@ diff -urNp linux-2.6.35.7/fs/ntfs/dir.c linux-2.6.35.7/fs/ntfs/dir.c
ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
"inode 0x%lx or driver bug.", vdir->i_ino);
goto err_out;
-diff -urNp linux-2.6.35.7/fs/ntfs/file.c linux-2.6.35.7/fs/ntfs/file.c
---- linux-2.6.35.7/fs/ntfs/file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ntfs/file.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ntfs/file.c linux-2.6.35.8/fs/ntfs/file.c
+--- linux-2.6.35.8/fs/ntfs/file.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ntfs/file.c 2010-09-17 20:12:09.000000000 -0400
@@ -2223,6 +2223,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -32654,9 +32581,9 @@ diff -urNp linux-2.6.35.7/fs/ntfs/file.c linux-2.6.35.7/fs/ntfs/file.c
-const struct inode_operations ntfs_empty_inode_ops = {};
+const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.35.7/fs/ocfs2/localalloc.c linux-2.6.35.7/fs/ocfs2/localalloc.c
---- linux-2.6.35.7/fs/ocfs2/localalloc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ocfs2/localalloc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ocfs2/localalloc.c linux-2.6.35.8/fs/ocfs2/localalloc.c
+--- linux-2.6.35.8/fs/ocfs2/localalloc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ocfs2/localalloc.c 2010-09-17 20:12:09.000000000 -0400
@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -32666,9 +32593,9 @@ diff -urNp linux-2.6.35.7/fs/ocfs2/localalloc.c linux-2.6.35.7/fs/ocfs2/localall
bail:
if (handle)
-diff -urNp linux-2.6.35.7/fs/ocfs2/ocfs2.h linux-2.6.35.7/fs/ocfs2/ocfs2.h
---- linux-2.6.35.7/fs/ocfs2/ocfs2.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ocfs2/ocfs2.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ocfs2/ocfs2.h linux-2.6.35.8/fs/ocfs2/ocfs2.h
+--- linux-2.6.35.8/fs/ocfs2/ocfs2.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ocfs2/ocfs2.h 2010-09-17 20:12:09.000000000 -0400
@@ -223,11 +223,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -32686,9 +32613,9 @@ diff -urNp linux-2.6.35.7/fs/ocfs2/ocfs2.h linux-2.6.35.7/fs/ocfs2/ocfs2.h
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.35.7/fs/ocfs2/suballoc.c linux-2.6.35.7/fs/ocfs2/suballoc.c
---- linux-2.6.35.7/fs/ocfs2/suballoc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ocfs2/suballoc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ocfs2/suballoc.c linux-2.6.35.8/fs/ocfs2/suballoc.c
+--- linux-2.6.35.8/fs/ocfs2/suballoc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ocfs2/suballoc.c 2010-09-17 20:12:09.000000000 -0400
@@ -856,7 +856,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -32734,9 +32661,9 @@ diff -urNp linux-2.6.35.7/fs/ocfs2/suballoc.c linux-2.6.35.7/fs/ocfs2/suballoc.c
*num_clusters = res.sr_bits;
}
}
-diff -urNp linux-2.6.35.7/fs/ocfs2/super.c linux-2.6.35.7/fs/ocfs2/super.c
---- linux-2.6.35.7/fs/ocfs2/super.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ocfs2/super.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ocfs2/super.c linux-2.6.35.8/fs/ocfs2/super.c
+--- linux-2.6.35.8/fs/ocfs2/super.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/ocfs2/super.c 2010-09-17 20:12:09.000000000 -0400
@@ -293,11 +293,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -32771,9 +32698,9 @@ diff -urNp linux-2.6.35.7/fs/ocfs2/super.c linux-2.6.35.7/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.35.7/fs/ocfs2/symlink.c linux-2.6.35.7/fs/ocfs2/symlink.c
---- linux-2.6.35.7/fs/ocfs2/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/ocfs2/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/ocfs2/symlink.c linux-2.6.35.8/fs/ocfs2/symlink.c
+--- linux-2.6.35.8/fs/ocfs2/symlink.c 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/fs/ocfs2/symlink.c 2010-10-31 17:15:04.000000000 -0400
@@ -148,7 +148,7 @@ bail:
static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -32783,9 +32710,9 @@ diff -urNp linux-2.6.35.7/fs/ocfs2/symlink.c linux-2.6.35.7/fs/ocfs2/symlink.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.35.7/fs/open.c linux-2.6.35.7/fs/open.c
---- linux-2.6.35.7/fs/open.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/open.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/open.c linux-2.6.35.8/fs/open.c
+--- linux-2.6.35.8/fs/open.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/open.c 2010-09-17 20:12:37.000000000 -0400
@@ -42,6 +42,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
@@ -32910,9 +32837,9 @@ diff -urNp linux-2.6.35.7/fs/open.c linux-2.6.35.7/fs/open.c
newattrs.ia_valid = ATTR_CTIME;
if (user != (uid_t) -1) {
newattrs.ia_valid |= ATTR_UID;
-diff -urNp linux-2.6.35.7/fs/pipe.c linux-2.6.35.7/fs/pipe.c
---- linux-2.6.35.7/fs/pipe.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/pipe.c 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/pipe.c linux-2.6.35.8/fs/pipe.c
+--- linux-2.6.35.8/fs/pipe.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/pipe.c 2010-10-11 22:41:44.000000000 -0400
@@ -382,7 +382,7 @@ pipe_read(struct kiocb *iocb, const stru
error = ops->confirm(pipe, buf);
if (error) {
@@ -33045,10 +32972,18 @@ diff -urNp linux-2.6.35.7/fs/pipe.c linux-2.6.35.7/fs/pipe.c
inode->i_fop = &rdwr_pipefifo_fops;
/*
-diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
---- linux-2.6.35.7/fs/proc/array.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/array.c 2010-09-17 20:12:37.000000000 -0400
-@@ -337,6 +337,21 @@ static void task_cpus_allowed(struct seq
+diff -urNp linux-2.6.35.8/fs/proc/array.c linux-2.6.35.8/fs/proc/array.c
+--- linux-2.6.35.8/fs/proc/array.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/array.c 2010-10-27 19:40:03.000000000 -0400
+@@ -60,6 +60,7 @@
+ #include <linux/tty.h>
+ #include <linux/string.h>
+ #include <linux/mman.h>
++#include <linux/grsecurity.h>
+ #include <linux/proc_fs.h>
+ #include <linux/ioport.h>
+ #include <linux/uaccess.h>
+@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq
seq_printf(m, "\n");
}
@@ -33070,7 +33005,7 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task)
{
-@@ -357,9 +372,20 @@ int proc_pid_status(struct seq_file *m,
+@@ -357,9 +373,24 @@ int proc_pid_status(struct seq_file *m,
task_show_regs(m, task);
#endif
task_context_switch_counts(m, task);
@@ -33079,6 +33014,10 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
+ task_pax(m, task);
+#endif
+
++#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
++ task_grsec_rbac(m, task);
++#endif
++
return 0;
}
@@ -33091,7 +33030,7 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task, int whole)
{
-@@ -452,6 +478,19 @@ static int do_task_stat(struct seq_file
+@@ -452,6 +483,19 @@ static int do_task_stat(struct seq_file
gtime = task->gtime;
}
@@ -33111,7 +33050,7 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
/* scale priority and nice values from timeslices to -20..20 */
/* to make it look like a "normal" Unix priority/nice value */
priority = task_prio(task);
-@@ -492,9 +531,15 @@ static int do_task_stat(struct seq_file
+@@ -492,9 +536,15 @@ static int do_task_stat(struct seq_file
vsize,
mm ? get_mm_rss(mm) : 0,
rsslim,
@@ -33127,7 +33066,7 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
esp,
eip,
/* The signal information here is obsolete.
-@@ -547,3 +592,10 @@ int proc_pid_statm(struct seq_file *m, s
+@@ -547,3 +597,10 @@ int proc_pid_statm(struct seq_file *m, s
return 0;
}
@@ -33138,9 +33077,9 @@ diff -urNp linux-2.6.35.7/fs/proc/array.c linux-2.6.35.7/fs/proc/array.c
+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
+}
+#endif
-diff -urNp linux-2.6.35.7/fs/proc/base.c linux-2.6.35.7/fs/proc/base.c
---- linux-2.6.35.7/fs/proc/base.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/base.c 2010-10-20 17:37:57.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/base.c linux-2.6.35.8/fs/proc/base.c
+--- linux-2.6.35.8/fs/proc/base.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/base.c 2010-10-20 17:37:57.000000000 -0400
@@ -103,6 +103,22 @@ struct pid_entry {
union proc_op op;
};
@@ -33515,9 +33454,9 @@ diff -urNp linux-2.6.35.7/fs/proc/base.c linux-2.6.35.7/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.35.7/fs/proc/cmdline.c linux-2.6.35.7/fs/proc/cmdline.c
---- linux-2.6.35.7/fs/proc/cmdline.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/cmdline.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/cmdline.c linux-2.6.35.8/fs/proc/cmdline.c
+--- linux-2.6.35.8/fs/proc/cmdline.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/cmdline.c 2010-09-17 20:12:37.000000000 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -33530,9 +33469,9 @@ diff -urNp linux-2.6.35.7/fs/proc/cmdline.c linux-2.6.35.7/fs/proc/cmdline.c
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.35.7/fs/proc/devices.c linux-2.6.35.7/fs/proc/devices.c
---- linux-2.6.35.7/fs/proc/devices.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/devices.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/devices.c linux-2.6.35.8/fs/proc/devices.c
+--- linux-2.6.35.8/fs/proc/devices.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/devices.c 2010-09-17 20:12:37.000000000 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -33545,9 +33484,9 @@ diff -urNp linux-2.6.35.7/fs/proc/devices.c linux-2.6.35.7/fs/proc/devices.c
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.35.7/fs/proc/inode.c linux-2.6.35.7/fs/proc/inode.c
---- linux-2.6.35.7/fs/proc/inode.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/inode.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/inode.c linux-2.6.35.8/fs/proc/inode.c
+--- linux-2.6.35.8/fs/proc/inode.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/inode.c 2010-09-17 20:12:37.000000000 -0400
@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -33560,9 +33499,9 @@ diff -urNp linux-2.6.35.7/fs/proc/inode.c linux-2.6.35.7/fs/proc/inode.c
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.35.7/fs/proc/internal.h linux-2.6.35.7/fs/proc/internal.h
---- linux-2.6.35.7/fs/proc/internal.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/internal.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/internal.h linux-2.6.35.8/fs/proc/internal.h
+--- linux-2.6.35.8/fs/proc/internal.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/internal.h 2010-09-17 20:12:37.000000000 -0400
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33573,9 +33512,9 @@ diff -urNp linux-2.6.35.7/fs/proc/internal.h linux-2.6.35.7/fs/proc/internal.h
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.35.7/fs/proc/Kconfig linux-2.6.35.7/fs/proc/Kconfig
---- linux-2.6.35.7/fs/proc/Kconfig 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/Kconfig 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/Kconfig linux-2.6.35.8/fs/proc/Kconfig
+--- linux-2.6.35.8/fs/proc/Kconfig 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/Kconfig 2010-09-17 20:12:37.000000000 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -33603,9 +33542,9 @@ diff -urNp linux-2.6.35.7/fs/proc/Kconfig linux-2.6.35.7/fs/proc/Kconfig
bool "Enable /proc page monitoring" if EMBEDDED
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.35.7/fs/proc/kcore.c linux-2.6.35.7/fs/proc/kcore.c
---- linux-2.6.35.7/fs/proc/kcore.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/kcore.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/kcore.c linux-2.6.35.8/fs/proc/kcore.c
+--- linux-2.6.35.8/fs/proc/kcore.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/kcore.c 2010-09-17 20:12:37.000000000 -0400
@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
@@ -33659,9 +33598,9 @@ diff -urNp linux-2.6.35.7/fs/proc/kcore.c linux-2.6.35.7/fs/proc/kcore.c
if (!capable(CAP_SYS_RAWIO))
return -EPERM;
if (kcore_need_update)
-diff -urNp linux-2.6.35.7/fs/proc/meminfo.c linux-2.6.35.7/fs/proc/meminfo.c
---- linux-2.6.35.7/fs/proc/meminfo.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/meminfo.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/meminfo.c linux-2.6.35.8/fs/proc/meminfo.c
+--- linux-2.6.35.8/fs/proc/meminfo.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/meminfo.c 2010-09-17 20:12:09.000000000 -0400
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -33671,9 +33610,9 @@ diff -urNp linux-2.6.35.7/fs/proc/meminfo.c linux-2.6.35.7/fs/proc/meminfo.c
#endif
);
-diff -urNp linux-2.6.35.7/fs/proc/nommu.c linux-2.6.35.7/fs/proc/nommu.c
---- linux-2.6.35.7/fs/proc/nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/nommu.c linux-2.6.35.8/fs/proc/nommu.c
+--- linux-2.6.35.8/fs/proc/nommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/nommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -33683,9 +33622,9 @@ diff -urNp linux-2.6.35.7/fs/proc/nommu.c linux-2.6.35.7/fs/proc/nommu.c
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.35.7/fs/proc/proc_net.c linux-2.6.35.7/fs/proc/proc_net.c
---- linux-2.6.35.7/fs/proc/proc_net.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/proc_net.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/proc_net.c linux-2.6.35.8/fs/proc/proc_net.c
+--- linux-2.6.35.8/fs/proc/proc_net.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/proc_net.c 2010-09-17 20:12:37.000000000 -0400
@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -33704,9 +33643,9 @@ diff -urNp linux-2.6.35.7/fs/proc/proc_net.c linux-2.6.35.7/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.35.7/fs/proc/proc_sysctl.c linux-2.6.35.7/fs/proc/proc_sysctl.c
---- linux-2.6.35.7/fs/proc/proc_sysctl.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/proc_sysctl.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/proc_sysctl.c linux-2.6.35.8/fs/proc/proc_sysctl.c
+--- linux-2.6.35.8/fs/proc/proc_sysctl.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/proc_sysctl.c 2010-09-17 20:12:37.000000000 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -33746,9 +33685,9 @@ diff -urNp linux-2.6.35.7/fs/proc/proc_sysctl.c linux-2.6.35.7/fs/proc/proc_sysc
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.35.7/fs/proc/root.c linux-2.6.35.7/fs/proc/root.c
---- linux-2.6.35.7/fs/proc/root.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/root.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/root.c linux-2.6.35.8/fs/proc/root.c
+--- linux-2.6.35.8/fs/proc/root.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/root.c 2010-09-17 20:12:37.000000000 -0400
@@ -133,7 +133,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -33765,9 +33704,9 @@ diff -urNp linux-2.6.35.7/fs/proc/root.c linux-2.6.35.7/fs/proc/root.c
proc_sys_init();
}
-diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
---- linux-2.6.35.7/fs/proc/task_mmu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/task_mmu.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/task_mmu.c linux-2.6.35.8/fs/proc/task_mmu.c
+--- linux-2.6.35.8/fs/proc/task_mmu.c 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/fs/proc/task_mmu.c 2010-10-31 17:15:04.000000000 -0400
@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct
"VmExe:\t%8lu kB\n"
"VmLib:\t%8lu kB\n"
@@ -33820,14 +33759,15 @@ diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
dev_t dev = 0;
int len;
-@@ -221,19 +237,24 @@ static void show_map_vma(struct seq_file
+@@ -221,20 +237,24 @@ static void show_map_vma(struct seq_file
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
}
- /* We don't show the stack guard page in /proc/maps */
- start = vma->vm_start;
- if (vma->vm_flags & VM_GROWSDOWN)
-- start += PAGE_SIZE;
+- if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
+- start += PAGE_SIZE;
seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
- start,
@@ -33850,7 +33790,7 @@ diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
MAJOR(dev), MINOR(dev), ino, &len);
/*
-@@ -242,16 +263,16 @@ static void show_map_vma(struct seq_file
+@@ -243,16 +263,16 @@ static void show_map_vma(struct seq_file
*/
if (file) {
pad_len_spaces(m, len);
@@ -33872,7 +33812,7 @@ diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
name = "[stack]";
}
} else {
-@@ -393,11 +414,16 @@ static int show_smap(struct seq_file *m,
+@@ -394,11 +414,16 @@ static int show_smap(struct seq_file *m,
};
memset(&mss, 0, sizeof mss);
@@ -33894,7 +33834,7 @@ diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
show_map_vma(m, vma);
seq_printf(m,
-@@ -412,7 +438,11 @@ static int show_smap(struct seq_file *m,
+@@ -413,7 +438,11 @@ static int show_smap(struct seq_file *m,
"Swap: %8lu kB\n"
"KernelPageSize: %8lu kB\n"
"MMUPageSize: %8lu kB\n",
@@ -33906,9 +33846,9 @@ diff -urNp linux-2.6.35.7/fs/proc/task_mmu.c linux-2.6.35.7/fs/proc/task_mmu.c
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.35.7/fs/proc/task_nommu.c linux-2.6.35.7/fs/proc/task_nommu.c
---- linux-2.6.35.7/fs/proc/task_nommu.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/proc/task_nommu.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/proc/task_nommu.c linux-2.6.35.8/fs/proc/task_nommu.c
+--- linux-2.6.35.8/fs/proc/task_nommu.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/proc/task_nommu.c 2010-09-17 20:12:09.000000000 -0400
@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -33927,9 +33867,9 @@ diff -urNp linux-2.6.35.7/fs/proc/task_nommu.c linux-2.6.35.7/fs/proc/task_nommu
} else if (mm) {
if (vma->vm_start <= mm->start_stack &&
vma->vm_end >= mm->start_stack) {
-diff -urNp linux-2.6.35.7/fs/readdir.c linux-2.6.35.7/fs/readdir.c
---- linux-2.6.35.7/fs/readdir.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/readdir.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/readdir.c linux-2.6.35.8/fs/readdir.c
+--- linux-2.6.35.8/fs/readdir.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/readdir.c 2010-09-17 20:12:37.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -34019,9 +33959,9 @@ diff -urNp linux-2.6.35.7/fs/readdir.c linux-2.6.35.7/fs/readdir.c
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.35.7/fs/reiserfs/do_balan.c linux-2.6.35.7/fs/reiserfs/do_balan.c
---- linux-2.6.35.7/fs/reiserfs/do_balan.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/reiserfs/do_balan.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/reiserfs/do_balan.c linux-2.6.35.8/fs/reiserfs/do_balan.c
+--- linux-2.6.35.8/fs/reiserfs/do_balan.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/reiserfs/do_balan.c 2010-09-17 20:12:09.000000000 -0400
@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -34031,9 +33971,9 @@ diff -urNp linux-2.6.35.7/fs/reiserfs/do_balan.c linux-2.6.35.7/fs/reiserfs/do_b
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.35.7/fs/reiserfs/item_ops.c linux-2.6.35.7/fs/reiserfs/item_ops.c
---- linux-2.6.35.7/fs/reiserfs/item_ops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/reiserfs/item_ops.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/reiserfs/item_ops.c linux-2.6.35.8/fs/reiserfs/item_ops.c
+--- linux-2.6.35.8/fs/reiserfs/item_ops.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/reiserfs/item_ops.c 2010-09-17 20:12:09.000000000 -0400
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -34088,9 +34028,9 @@ diff -urNp linux-2.6.35.7/fs/reiserfs/item_ops.c linux-2.6.35.7/fs/reiserfs/item
&stat_data_ops,
&indirect_ops,
&direct_ops,
-diff -urNp linux-2.6.35.7/fs/reiserfs/procfs.c linux-2.6.35.7/fs/reiserfs/procfs.c
---- linux-2.6.35.7/fs/reiserfs/procfs.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/reiserfs/procfs.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/reiserfs/procfs.c linux-2.6.35.8/fs/reiserfs/procfs.c
+--- linux-2.6.35.8/fs/reiserfs/procfs.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/reiserfs/procfs.c 2010-09-17 20:12:09.000000000 -0400
@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -34100,9 +34040,9 @@ diff -urNp linux-2.6.35.7/fs/reiserfs/procfs.c linux-2.6.35.7/fs/reiserfs/procfs
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.35.7/fs/select.c linux-2.6.35.7/fs/select.c
---- linux-2.6.35.7/fs/select.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/select.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/select.c linux-2.6.35.8/fs/select.c
+--- linux-2.6.35.8/fs/select.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/select.c 2010-09-17 20:12:37.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -34119,9 +34059,9 @@ diff -urNp linux-2.6.35.7/fs/select.c linux-2.6.35.7/fs/select.c
if (nfds > rlimit(RLIMIT_NOFILE))
return -EINVAL;
-diff -urNp linux-2.6.35.7/fs/seq_file.c linux-2.6.35.7/fs/seq_file.c
---- linux-2.6.35.7/fs/seq_file.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/seq_file.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/seq_file.c linux-2.6.35.8/fs/seq_file.c
+--- linux-2.6.35.8/fs/seq_file.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/seq_file.c 2010-09-17 20:12:09.000000000 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -34162,9 +34102,9 @@ diff -urNp linux-2.6.35.7/fs/seq_file.c linux-2.6.35.7/fs/seq_file.c
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.35.7/fs/smbfs/symlink.c linux-2.6.35.7/fs/smbfs/symlink.c
---- linux-2.6.35.7/fs/smbfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/smbfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/smbfs/symlink.c linux-2.6.35.8/fs/smbfs/symlink.c
+--- linux-2.6.35.8/fs/smbfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/smbfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -34174,9 +34114,9 @@ diff -urNp linux-2.6.35.7/fs/smbfs/symlink.c linux-2.6.35.7/fs/smbfs/symlink.c
if (!IS_ERR(s))
__putname(s);
}
-diff -urNp linux-2.6.35.7/fs/splice.c linux-2.6.35.7/fs/splice.c
---- linux-2.6.35.7/fs/splice.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/splice.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/splice.c linux-2.6.35.8/fs/splice.c
+--- linux-2.6.35.8/fs/splice.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/splice.c 2010-09-17 20:12:09.000000000 -0400
@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -34315,9 +34255,9 @@ diff -urNp linux-2.6.35.7/fs/splice.c linux-2.6.35.7/fs/splice.c
ret = -EAGAIN;
pipe_unlock(ipipe);
-diff -urNp linux-2.6.35.7/fs/sysfs/symlink.c linux-2.6.35.7/fs/sysfs/symlink.c
---- linux-2.6.35.7/fs/sysfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/sysfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/sysfs/symlink.c linux-2.6.35.8/fs/sysfs/symlink.c
+--- linux-2.6.35.8/fs/sysfs/symlink.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/sysfs/symlink.c 2010-09-17 20:12:09.000000000 -0400
@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34327,9 +34267,9 @@ diff -urNp linux-2.6.35.7/fs/sysfs/symlink.c linux-2.6.35.7/fs/sysfs/symlink.c
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.35.7/fs/udf/misc.c linux-2.6.35.7/fs/udf/misc.c
---- linux-2.6.35.7/fs/udf/misc.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/udf/misc.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/udf/misc.c linux-2.6.35.8/fs/udf/misc.c
+--- linux-2.6.35.8/fs/udf/misc.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/udf/misc.c 2010-09-17 20:12:09.000000000 -0400
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
@@ -34341,9 +34281,9 @@ diff -urNp linux-2.6.35.7/fs/udf/misc.c linux-2.6.35.7/fs/udf/misc.c
return NULL;
}
-diff -urNp linux-2.6.35.7/fs/udf/udfdecl.h linux-2.6.35.7/fs/udf/udfdecl.h
---- linux-2.6.35.7/fs/udf/udfdecl.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/udf/udfdecl.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/udf/udfdecl.h linux-2.6.35.8/fs/udf/udfdecl.h
+--- linux-2.6.35.8/fs/udf/udfdecl.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/udf/udfdecl.h 2010-09-17 20:12:09.000000000 -0400
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
@@ -34353,9 +34293,9 @@ diff -urNp linux-2.6.35.7/fs/udf/udfdecl.h linux-2.6.35.7/fs/udf/udfdecl.h
#endif
#define udf_info(f, a...) \
-diff -urNp linux-2.6.35.7/fs/utimes.c linux-2.6.35.7/fs/utimes.c
---- linux-2.6.35.7/fs/utimes.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/utimes.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/utimes.c linux-2.6.35.8/fs/utimes.c
+--- linux-2.6.35.8/fs/utimes.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/utimes.c 2010-09-17 20:12:37.000000000 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -34377,9 +34317,9 @@ diff -urNp linux-2.6.35.7/fs/utimes.c linux-2.6.35.7/fs/utimes.c
mutex_lock(&inode->i_mutex);
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.35.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.7/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.35.7/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:32:50.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.8/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-2.6.35.8/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-26 17:32:50.000000000 -0400
@@ -136,7 +136,7 @@ xfs_find_handle(
}
@@ -34389,9 +34329,9 @@ diff -urNp linux-2.6.35.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.35.7/fs/xfs/lin
copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
goto out_put;
-diff -urNp linux-2.6.35.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.7/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.35.7/fs/xfs/linux-2.6/xfs_iops.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/xfs/linux-2.6/xfs_iops.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.8/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.35.8/fs/xfs/linux-2.6/xfs_iops.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/xfs/linux-2.6/xfs_iops.c 2010-09-17 20:12:09.000000000 -0400
@@ -480,7 +480,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -34401,9 +34341,9 @@ diff -urNp linux-2.6.35.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.35.7/fs/xfs/linu
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.35.7/fs/xfs/xfs_bmap.c linux-2.6.35.7/fs/xfs/xfs_bmap.c
---- linux-2.6.35.7/fs/xfs/xfs_bmap.c 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/fs/xfs/xfs_bmap.c 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/fs/xfs/xfs_bmap.c linux-2.6.35.8/fs/xfs/xfs_bmap.c
+--- linux-2.6.35.8/fs/xfs/xfs_bmap.c 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/fs/xfs/xfs_bmap.c 2010-09-17 20:12:09.000000000 -0400
@@ -296,7 +296,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -34413,9 +34353,9 @@ diff -urNp linux-2.6.35.7/fs/xfs/xfs_bmap.c linux-2.6.35.7/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
STATIC int
-diff -urNp linux-2.6.35.7/grsecurity/gracl_alloc.c linux-2.6.35.7/grsecurity/gracl_alloc.c
---- linux-2.6.35.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_alloc.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_alloc.c linux-2.6.35.8/grsecurity/gracl_alloc.c
+--- linux-2.6.35.8/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_alloc.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -34522,10 +34462,10 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_alloc.c linux-2.6.35.7/grsecurity/gra
+ else
+ return 1;
+}
-diff -urNp linux-2.6.35.7/grsecurity/gracl.c linux-2.6.35.7/grsecurity/gracl.c
---- linux-2.6.35.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl.c 2010-09-28 19:08:51.000000000 -0400
-@@ -0,0 +1,3925 @@
+diff -urNp linux-2.6.35.8/grsecurity/gracl.c linux-2.6.35.8/grsecurity/gracl.c
+--- linux-2.6.35.8/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl.c 2010-10-27 19:58:47.000000000 -0400
+@@ -0,0 +1,3943 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/sched.h>
@@ -34623,9 +34563,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl.c linux-2.6.35.7/grsecurity/gracl.c
+ return (gr_status & GR_READY);
+}
+
-+char gr_roletype_to_char(void)
++static char gr_task_roletype_to_char(struct task_struct *task)
+{
-+ switch (current->role->roletype &
++ switch (task->role->roletype &
+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
+ GR_ROLE_SPECIAL)) {
+ case GR_ROLE_DEFAULT:
@@ -34641,6 +34581,11 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl.c linux-2.6.35.7/grsecurity/gracl.c
+ return 'X';
+}
+
++char gr_roletype_to_char(void)
++{
++ return gr_task_roletype_to_char(current);
++}
++
+__inline__ int
+gr_acl_tpe_check(void)
+{
@@ -38121,6 +38066,19 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl.c linux-2.6.35.7/grsecurity/gracl.c
+ return 0;
+}
+
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
++{
++ if (unlikely(!(gr_status & GR_READY)))
++ return;
++
++ if (!(current->role->roletype & GR_ROLE_GOD))
++ return;
++
++ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
++ p->role->rolename, gr_task_roletype_to_char(p),
++ p->acl->filename);
++}
++
+int
+gr_handle_ptrace(struct task_struct *task, const long request)
+{
@@ -38451,9 +38409,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl.c linux-2.6.35.7/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.35.7/grsecurity/gracl_cap.c linux-2.6.35.7/grsecurity/gracl_cap.c
---- linux-2.6.35.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_cap.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_cap.c linux-2.6.35.8/grsecurity/gracl_cap.c
+--- linux-2.6.35.8/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_cap.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -38593,9 +38551,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_cap.c linux-2.6.35.7/grsecurity/gracl
+ return 0;
+}
+
-diff -urNp linux-2.6.35.7/grsecurity/gracl_fs.c linux-2.6.35.7/grsecurity/gracl_fs.c
---- linux-2.6.35.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_fs.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_fs.c linux-2.6.35.8/grsecurity/gracl_fs.c
+--- linux-2.6.35.8/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_fs.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -39021,9 +38979,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_fs.c linux-2.6.35.7/grsecurity/gracl_
+
+ return 0;
+}
-diff -urNp linux-2.6.35.7/grsecurity/gracl_ip.c linux-2.6.35.7/grsecurity/gracl_ip.c
---- linux-2.6.35.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_ip.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_ip.c linux-2.6.35.8/grsecurity/gracl_ip.c
+--- linux-2.6.35.8/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_ip.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,339 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -39364,9 +39322,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_ip.c linux-2.6.35.7/grsecurity/gracl_
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.35.7/grsecurity/gracl_learn.c linux-2.6.35.7/grsecurity/gracl_learn.c
---- linux-2.6.35.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_learn.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_learn.c linux-2.6.35.8/grsecurity/gracl_learn.c
+--- linux-2.6.35.8/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_learn.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -39579,9 +39537,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_learn.c linux-2.6.35.7/grsecurity/gra
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.35.7/grsecurity/gracl_res.c linux-2.6.35.7/grsecurity/gracl_res.c
---- linux-2.6.35.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_res.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_res.c linux-2.6.35.8/grsecurity/gracl_res.c
+--- linux-2.6.35.8/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_res.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,68 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -39651,9 +39609,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_res.c linux-2.6.35.7/grsecurity/gracl
+ rcu_read_unlock();
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/gracl_segv.c linux-2.6.35.7/grsecurity/gracl_segv.c
---- linux-2.6.35.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_segv.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_segv.c linux-2.6.35.8/grsecurity/gracl_segv.c
+--- linux-2.6.35.8/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_segv.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -39965,9 +39923,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_segv.c linux-2.6.35.7/grsecurity/grac
+
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/gracl_shm.c linux-2.6.35.7/grsecurity/gracl_shm.c
---- linux-2.6.35.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/gracl_shm.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/gracl_shm.c linux-2.6.35.8/grsecurity/gracl_shm.c
+--- linux-2.6.35.8/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/gracl_shm.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -40009,9 +39967,9 @@ diff -urNp linux-2.6.35.7/grsecurity/gracl_shm.c linux-2.6.35.7/grsecurity/gracl
+
+ return 1;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_chdir.c linux-2.6.35.7/grsecurity/grsec_chdir.c
---- linux-2.6.35.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_chdir.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_chdir.c linux-2.6.35.8/grsecurity/grsec_chdir.c
+--- linux-2.6.35.8/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_chdir.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40032,9 +39990,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_chdir.c linux-2.6.35.7/grsecurity/grs
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_chroot.c linux-2.6.35.7/grsecurity/grsec_chroot.c
---- linux-2.6.35.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_chroot.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_chroot.c linux-2.6.35.8/grsecurity/grsec_chroot.c
+--- linux-2.6.35.8/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_chroot.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,389 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -40425,9 +40383,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_chroot.c linux-2.6.35.7/grsecurity/gr
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.35.7/grsecurity/grsec_disabled.c linux-2.6.35.7/grsecurity/grsec_disabled.c
---- linux-2.6.35.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_disabled.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_disabled.c linux-2.6.35.8/grsecurity/grsec_disabled.c
+--- linux-2.6.35.8/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_disabled.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -40860,9 +40818,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_disabled.c linux-2.6.35.7/grsecurity/
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.35.7/grsecurity/grsec_exec.c linux-2.6.35.7/grsecurity/grsec_exec.c
---- linux-2.6.35.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_exec.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_exec.c linux-2.6.35.8/grsecurity/grsec_exec.c
+--- linux-2.6.35.8/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_exec.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,88 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40952,9 +40910,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_exec.c linux-2.6.35.7/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_fifo.c linux-2.6.35.7/grsecurity/grsec_fifo.c
---- linux-2.6.35.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_fifo.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_fifo.c linux-2.6.35.8/grsecurity/grsec_fifo.c
+--- linux-2.6.35.8/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_fifo.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40980,9 +40938,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_fifo.c linux-2.6.35.7/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_fork.c linux-2.6.35.7/grsecurity/grsec_fork.c
---- linux-2.6.35.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_fork.c 2010-09-23 20:39:19.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_fork.c linux-2.6.35.8/grsecurity/grsec_fork.c
+--- linux-2.6.35.8/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_fork.c 2010-09-23 20:39:19.000000000 -0400
@@ -0,0 +1,23 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41007,9 +40965,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_fork.c linux-2.6.35.7/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_init.c linux-2.6.35.7/grsecurity/grsec_init.c
---- linux-2.6.35.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_init.c 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_init.c linux-2.6.35.8/grsecurity/grsec_init.c
+--- linux-2.6.35.8/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_init.c 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,270 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41281,9 +41239,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_init.c linux-2.6.35.7/grsecurity/grse
+
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_link.c linux-2.6.35.7/grsecurity/grsec_link.c
---- linux-2.6.35.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_link.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_link.c linux-2.6.35.8/grsecurity/grsec_link.c
+--- linux-2.6.35.8/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_link.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41328,9 +41286,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_link.c linux-2.6.35.7/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_log.c linux-2.6.35.7/grsecurity/grsec_log.c
---- linux-2.6.35.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_log.c 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_log.c linux-2.6.35.8/grsecurity/grsec_log.c
+--- linux-2.6.35.8/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_log.c 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41642,9 +41600,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_log.c linux-2.6.35.7/grsecurity/grsec
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_mem.c linux-2.6.35.7/grsecurity/grsec_mem.c
---- linux-2.6.35.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_mem.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_mem.c linux-2.6.35.8/grsecurity/grsec_mem.c
+--- linux-2.6.35.8/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_mem.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41731,9 +41689,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_mem.c linux-2.6.35.7/grsecurity/grsec
+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_mount.c linux-2.6.35.7/grsecurity/grsec_mount.c
---- linux-2.6.35.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_mount.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_mount.c linux-2.6.35.8/grsecurity/grsec_mount.c
+--- linux-2.6.35.8/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_mount.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41797,9 +41755,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_mount.c linux-2.6.35.7/grsecurity/grs
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_pax.c linux-2.6.35.7/grsecurity/grsec_pax.c
---- linux-2.6.35.7/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_pax.c 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_pax.c linux-2.6.35.8/grsecurity/grsec_pax.c
+--- linux-2.6.35.8/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_pax.c 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,36 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41837,9 +41795,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_pax.c linux-2.6.35.7/grsecurity/grsec
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_ptrace.c linux-2.6.35.7/grsecurity/grsec_ptrace.c
---- linux-2.6.35.7/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_ptrace.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_ptrace.c linux-2.6.35.8/grsecurity/grsec_ptrace.c
+--- linux-2.6.35.8/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_ptrace.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41855,9 +41813,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_ptrace.c linux-2.6.35.7/grsecurity/gr
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_sig.c linux-2.6.35.7/grsecurity/grsec_sig.c
---- linux-2.6.35.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_sig.c 2010-09-28 19:09:19.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_sig.c linux-2.6.35.8/grsecurity/grsec_sig.c
+--- linux-2.6.35.8/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_sig.c 2010-09-28 19:09:19.000000000 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41924,9 +41882,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_sig.c linux-2.6.35.7/grsecurity/grsec
+ return;
+}
+
-diff -urNp linux-2.6.35.7/grsecurity/grsec_sock.c linux-2.6.35.7/grsecurity/grsec_sock.c
---- linux-2.6.35.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_sock.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_sock.c linux-2.6.35.8/grsecurity/grsec_sock.c
+--- linux-2.6.35.8/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_sock.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,271 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -42199,9 +42157,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_sock.c linux-2.6.35.7/grsecurity/grse
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_sysctl.c linux-2.6.35.7/grsecurity/grsec_sysctl.c
---- linux-2.6.35.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_sysctl.c 2010-10-18 21:02:33.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_sysctl.c linux-2.6.35.8/grsecurity/grsec_sysctl.c
+--- linux-2.6.35.8/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_sysctl.c 2010-10-18 21:02:33.000000000 -0400
@@ -0,0 +1,433 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42636,9 +42594,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_sysctl.c linux-2.6.35.7/grsecurity/gr
+ { }
+};
+#endif
-diff -urNp linux-2.6.35.7/grsecurity/grsec_time.c linux-2.6.35.7/grsecurity/grsec_time.c
---- linux-2.6.35.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_time.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_time.c linux-2.6.35.8/grsecurity/grsec_time.c
+--- linux-2.6.35.8/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_time.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42653,9 +42611,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_time.c linux-2.6.35.7/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsec_tpe.c linux-2.6.35.7/grsecurity/grsec_tpe.c
---- linux-2.6.35.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsec_tpe.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsec_tpe.c linux-2.6.35.8/grsecurity/grsec_tpe.c
+--- linux-2.6.35.8/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsec_tpe.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,39 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42696,9 +42654,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsec_tpe.c linux-2.6.35.7/grsecurity/grsec
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.35.7/grsecurity/grsum.c linux-2.6.35.7/grsecurity/grsum.c
---- linux-2.6.35.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/grsum.c 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/grsum.c linux-2.6.35.8/grsecurity/grsum.c
+--- linux-2.6.35.8/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/grsum.c 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -42761,9 +42719,9 @@ diff -urNp linux-2.6.35.7/grsecurity/grsum.c linux-2.6.35.7/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.35.7/grsecurity/Kconfig linux-2.6.35.7/grsecurity/Kconfig
---- linux-2.6.35.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/Kconfig 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/Kconfig linux-2.6.35.8/grsecurity/Kconfig
+--- linux-2.6.35.8/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/Kconfig 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,995 @@
+#
+# grecurity configuration
@@ -43760,9 +43718,9 @@ diff -urNp linux-2.6.35.7/grsecurity/Kconfig linux-2.6.35.7/grsecurity/Kconfig
+endmenu
+
+endmenu
-diff -urNp linux-2.6.35.7/grsecurity/Makefile linux-2.6.35.7/grsecurity/Makefile
---- linux-2.6.35.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/grsecurity/Makefile 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/grsecurity/Makefile linux-2.6.35.8/grsecurity/Makefile
+--- linux-2.6.35.8/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/grsecurity/Makefile 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,29 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -43793,9 +43751,9 @@ diff -urNp linux-2.6.35.7/grsecurity/Makefile linux-2.6.35.7/grsecurity/Makefile
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.35.7/include/acpi/acoutput.h linux-2.6.35.7/include/acpi/acoutput.h
---- linux-2.6.35.7/include/acpi/acoutput.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/acpi/acoutput.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/acpi/acoutput.h linux-2.6.35.8/include/acpi/acoutput.h
+--- linux-2.6.35.8/include/acpi/acoutput.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/acpi/acoutput.h 2010-09-17 20:12:09.000000000 -0400
@@ -268,8 +268,8 @@
* leaving no executable debug code!
*/
@@ -43807,9 +43765,9 @@ diff -urNp linux-2.6.35.7/include/acpi/acoutput.h linux-2.6.35.7/include/acpi/ac
#endif /* ACPI_DEBUG_OUTPUT */
-diff -urNp linux-2.6.35.7/include/acpi/acpi_drivers.h linux-2.6.35.7/include/acpi/acpi_drivers.h
---- linux-2.6.35.7/include/acpi/acpi_drivers.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/acpi/acpi_drivers.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/acpi/acpi_drivers.h linux-2.6.35.8/include/acpi/acpi_drivers.h
+--- linux-2.6.35.8/include/acpi/acpi_drivers.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/acpi/acpi_drivers.h 2010-09-17 20:12:09.000000000 -0400
@@ -121,8 +121,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -43839,9 +43797,9 @@ diff -urNp linux-2.6.35.7/include/acpi/acpi_drivers.h linux-2.6.35.7/include/acp
void *context)
{
return -ENODEV;
-diff -urNp linux-2.6.35.7/include/asm-generic/atomic-long.h linux-2.6.35.7/include/asm-generic/atomic-long.h
---- linux-2.6.35.7/include/asm-generic/atomic-long.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/atomic-long.h 2010-10-12 10:19:29.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/atomic-long.h linux-2.6.35.8/include/asm-generic/atomic-long.h
+--- linux-2.6.35.8/include/asm-generic/atomic-long.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/atomic-long.h 2010-10-12 10:19:29.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -44100,9 +44058,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/atomic-long.h linux-2.6.35.7/inclu
+#endif
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
-diff -urNp linux-2.6.35.7/include/asm-generic/dma-mapping-common.h linux-2.6.35.7/include/asm-generic/dma-mapping-common.h
---- linux-2.6.35.7/include/asm-generic/dma-mapping-common.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/dma-mapping-common.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/dma-mapping-common.h linux-2.6.35.8/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.35.8/include/asm-generic/dma-mapping-common.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/dma-mapping-common.h 2010-09-17 20:12:09.000000000 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -44193,9 +44151,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/dma-mapping-common.h linux-2.6.35.
BUG_ON(!valid_dma_direction(dir));
if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.35.7/include/asm-generic/futex.h linux-2.6.35.7/include/asm-generic/futex.h
---- linux-2.6.35.7/include/asm-generic/futex.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/futex.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/futex.h linux-2.6.35.8/include/asm-generic/futex.h
+--- linux-2.6.35.8/include/asm-generic/futex.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/futex.h 2010-09-17 20:12:09.000000000 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -44214,9 +44172,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/futex.h linux-2.6.35.7/include/asm
{
return -ENOSYS;
}
-diff -urNp linux-2.6.35.7/include/asm-generic/int-l64.h linux-2.6.35.7/include/asm-generic/int-l64.h
---- linux-2.6.35.7/include/asm-generic/int-l64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/int-l64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/int-l64.h linux-2.6.35.8/include/asm-generic/int-l64.h
+--- linux-2.6.35.8/include/asm-generic/int-l64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/int-l64.h 2010-09-17 20:12:09.000000000 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -44226,9 +44184,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/int-l64.h linux-2.6.35.7/include/a
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.35.7/include/asm-generic/int-ll64.h linux-2.6.35.7/include/asm-generic/int-ll64.h
---- linux-2.6.35.7/include/asm-generic/int-ll64.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/int-ll64.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/int-ll64.h linux-2.6.35.8/include/asm-generic/int-ll64.h
+--- linux-2.6.35.8/include/asm-generic/int-ll64.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/int-ll64.h 2010-09-17 20:12:09.000000000 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -44238,9 +44196,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/int-ll64.h linux-2.6.35.7/include/
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.35.7/include/asm-generic/kmap_types.h linux-2.6.35.7/include/asm-generic/kmap_types.h
---- linux-2.6.35.7/include/asm-generic/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/kmap_types.h linux-2.6.35.8/include/asm-generic/kmap_types.h
+--- linux-2.6.35.8/include/asm-generic/kmap_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/kmap_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
KMAP_D(18) KM_NMI_PTE,
@@ -44254,9 +44212,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/kmap_types.h linux-2.6.35.7/includ
};
#undef KMAP_D
-diff -urNp linux-2.6.35.7/include/asm-generic/pgtable.h linux-2.6.35.7/include/asm-generic/pgtable.h
---- linux-2.6.35.7/include/asm-generic/pgtable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/pgtable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/pgtable.h linux-2.6.35.8/include/asm-generic/pgtable.h
+--- linux-2.6.35.8/include/asm-generic/pgtable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/pgtable.h 2010-09-17 20:12:09.000000000 -0400
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -44272,9 +44230,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/pgtable.h linux-2.6.35.7/include/a
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.35.7/include/asm-generic/pgtable-nopmd.h linux-2.6.35.7/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.35.7/include/asm-generic/pgtable-nopmd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/pgtable-nopmd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/pgtable-nopmd.h linux-2.6.35.8/include/asm-generic/pgtable-nopmd.h
+--- linux-2.6.35.8/include/asm-generic/pgtable-nopmd.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/pgtable-nopmd.h 2010-09-17 20:12:09.000000000 -0400
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -44311,9 +44269,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/pgtable-nopmd.h linux-2.6.35.7/inc
/*
* The "pud_xxx()" functions here are trivial for a folded two-level
* setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-2.6.35.7/include/asm-generic/pgtable-nopud.h linux-2.6.35.7/include/asm-generic/pgtable-nopud.h
---- linux-2.6.35.7/include/asm-generic/pgtable-nopud.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/pgtable-nopud.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/pgtable-nopud.h linux-2.6.35.8/include/asm-generic/pgtable-nopud.h
+--- linux-2.6.35.8/include/asm-generic/pgtable-nopud.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/pgtable-nopud.h 2010-09-17 20:12:09.000000000 -0400
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -44344,9 +44302,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/pgtable-nopud.h linux-2.6.35.7/inc
/*
* The "pgd_xxx()" functions here are trivial for a folded two-level
* setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-2.6.35.7/include/asm-generic/vmlinux.lds.h linux-2.6.35.7/include/asm-generic/vmlinux.lds.h
---- linux-2.6.35.7/include/asm-generic/vmlinux.lds.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/asm-generic/vmlinux.lds.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/asm-generic/vmlinux.lds.h linux-2.6.35.8/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.35.8/include/asm-generic/vmlinux.lds.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/asm-generic/vmlinux.lds.h 2010-09-17 20:12:09.000000000 -0400
@@ -213,6 +213,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -44385,9 +44343,9 @@ diff -urNp linux-2.6.35.7/include/asm-generic/vmlinux.lds.h linux-2.6.35.7/inclu
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.35.7/include/drm/drm_pciids.h linux-2.6.35.7/include/drm/drm_pciids.h
---- linux-2.6.35.7/include/drm/drm_pciids.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/drm/drm_pciids.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/drm/drm_pciids.h linux-2.6.35.8/include/drm/drm_pciids.h
+--- linux-2.6.35.8/include/drm/drm_pciids.h 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/include/drm/drm_pciids.h 2010-10-31 17:15:04.000000000 -0400
@@ -419,7 +419,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44491,10 +44449,10 @@ diff -urNp linux-2.6.35.7/include/drm/drm_pciids.h linux-2.6.35.7/include/drm/dr
{0x8086, 0x0102, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
- {0, 0, 0}
+ {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.35.7/include/drm/drmP.h linux-2.6.35.7/include/drm/drmP.h
---- linux-2.6.35.7/include/drm/drmP.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/drm/drmP.h 2010-09-17 20:12:09.000000000 -0400
-@@ -808,7 +808,7 @@ struct drm_driver {
+diff -urNp linux-2.6.35.8/include/drm/drmP.h linux-2.6.35.8/include/drm/drmP.h
+--- linux-2.6.35.8/include/drm/drmP.h 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/include/drm/drmP.h 2010-10-31 17:15:04.000000000 -0400
+@@ -807,7 +807,7 @@ struct drm_driver {
void (*vgaarb_irq)(struct drm_device *dev, bool state);
/* Driver private ops for this object */
@@ -44503,7 +44461,7 @@ diff -urNp linux-2.6.35.7/include/drm/drmP.h linux-2.6.35.7/include/drm/drmP.h
int major;
int minor;
-@@ -917,7 +917,7 @@ struct drm_device {
+@@ -916,7 +916,7 @@ struct drm_device {
/** \name Usage Counters */
/*@{ */
@@ -44512,7 +44470,7 @@ diff -urNp linux-2.6.35.7/include/drm/drmP.h linux-2.6.35.7/include/drm/drmP.h
atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
atomic_t vma_count; /**< Outstanding vma areas open */
int buf_use; /**< Buffers in use -- cannot alloc */
-@@ -928,7 +928,7 @@ struct drm_device {
+@@ -927,7 +927,7 @@ struct drm_device {
/*@{ */
unsigned long counters;
enum drm_stat_type types[15];
@@ -44521,9 +44479,9 @@ diff -urNp linux-2.6.35.7/include/drm/drmP.h linux-2.6.35.7/include/drm/drmP.h
/*@} */
struct list_head filelist;
-diff -urNp linux-2.6.35.7/include/linux/a.out.h linux-2.6.35.7/include/linux/a.out.h
---- linux-2.6.35.7/include/linux/a.out.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/a.out.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/a.out.h linux-2.6.35.8/include/linux/a.out.h
+--- linux-2.6.35.8/include/linux/a.out.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/a.out.h 2010-09-17 20:12:09.000000000 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -44539,9 +44497,9 @@ diff -urNp linux-2.6.35.7/include/linux/a.out.h linux-2.6.35.7/include/linux/a.o
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.35.7/include/linux/atmdev.h linux-2.6.35.7/include/linux/atmdev.h
---- linux-2.6.35.7/include/linux/atmdev.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/atmdev.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/atmdev.h linux-2.6.35.8/include/linux/atmdev.h
+--- linux-2.6.35.8/include/linux/atmdev.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/atmdev.h 2010-09-17 20:12:09.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -44551,9 +44509,9 @@ diff -urNp linux-2.6.35.7/include/linux/atmdev.h linux-2.6.35.7/include/linux/at
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.35.7/include/linux/binfmts.h linux-2.6.35.7/include/linux/binfmts.h
---- linux-2.6.35.7/include/linux/binfmts.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/binfmts.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/binfmts.h linux-2.6.35.8/include/linux/binfmts.h
+--- linux-2.6.35.8/include/linux/binfmts.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/binfmts.h 2010-09-17 20:12:09.000000000 -0400
@@ -87,6 +87,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -44562,9 +44520,9 @@ diff -urNp linux-2.6.35.7/include/linux/binfmts.h linux-2.6.35.7/include/linux/b
unsigned long min_coredump; /* minimal dump size */
int hasvdso;
};
-diff -urNp linux-2.6.35.7/include/linux/blkdev.h linux-2.6.35.7/include/linux/blkdev.h
---- linux-2.6.35.7/include/linux/blkdev.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/blkdev.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/blkdev.h linux-2.6.35.8/include/linux/blkdev.h
+--- linux-2.6.35.8/include/linux/blkdev.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/blkdev.h 2010-09-17 20:12:09.000000000 -0400
@@ -1331,20 +1331,20 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -44598,9 +44556,9 @@ diff -urNp linux-2.6.35.7/include/linux/blkdev.h linux-2.6.35.7/include/linux/bl
};
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-2.6.35.7/include/linux/cache.h linux-2.6.35.7/include/linux/cache.h
---- linux-2.6.35.7/include/linux/cache.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/cache.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/cache.h linux-2.6.35.8/include/linux/cache.h
+--- linux-2.6.35.8/include/linux/cache.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/cache.h 2010-09-17 20:12:09.000000000 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -44612,9 +44570,9 @@ diff -urNp linux-2.6.35.7/include/linux/cache.h linux-2.6.35.7/include/linux/cac
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.35.7/include/linux/capability.h linux-2.6.35.7/include/linux/capability.h
---- linux-2.6.35.7/include/linux/capability.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/capability.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/capability.h linux-2.6.35.8/include/linux/capability.h
+--- linux-2.6.35.8/include/linux/capability.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/capability.h 2010-09-17 20:12:37.000000000 -0400
@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -44623,9 +44581,9 @@ diff -urNp linux-2.6.35.7/include/linux/capability.h linux-2.6.35.7/include/linu
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.35.7/include/linux/compiler-gcc4.h linux-2.6.35.7/include/linux/compiler-gcc4.h
---- linux-2.6.35.7/include/linux/compiler-gcc4.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/compiler-gcc4.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/compiler-gcc4.h linux-2.6.35.8/include/linux/compiler-gcc4.h
+--- linux-2.6.35.8/include/linux/compiler-gcc4.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/compiler-gcc4.h 2010-09-17 20:12:09.000000000 -0400
@@ -54,6 +54,10 @@
#endif
@@ -44637,9 +44595,9 @@ diff -urNp linux-2.6.35.7/include/linux/compiler-gcc4.h linux-2.6.35.7/include/l
#endif
#if __GNUC_MINOR__ > 0
-diff -urNp linux-2.6.35.7/include/linux/compiler.h linux-2.6.35.7/include/linux/compiler.h
---- linux-2.6.35.7/include/linux/compiler.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/compiler.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/compiler.h linux-2.6.35.8/include/linux/compiler.h
+--- linux-2.6.35.8/include/linux/compiler.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/compiler.h 2010-09-17 20:12:09.000000000 -0400
@@ -267,6 +267,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -44663,9 +44621,9 @@ diff -urNp linux-2.6.35.7/include/linux/compiler.h linux-2.6.35.7/include/linux/
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.35.7/include/linux/decompress/mm.h linux-2.6.35.7/include/linux/decompress/mm.h
---- linux-2.6.35.7/include/linux/decompress/mm.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/decompress/mm.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/decompress/mm.h linux-2.6.35.8/include/linux/decompress/mm.h
+--- linux-2.6.35.8/include/linux/decompress/mm.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/decompress/mm.h 2010-09-17 20:12:09.000000000 -0400
@@ -78,7 +78,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -44675,9 +44633,9 @@ diff -urNp linux-2.6.35.7/include/linux/decompress/mm.h linux-2.6.35.7/include/l
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.35.7/include/linux/dma-mapping.h linux-2.6.35.7/include/linux/dma-mapping.h
---- linux-2.6.35.7/include/linux/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/dma-mapping.h linux-2.6.35.8/include/linux/dma-mapping.h
+--- linux-2.6.35.8/include/linux/dma-mapping.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/dma-mapping.h 2010-09-17 20:12:09.000000000 -0400
@@ -16,40 +16,40 @@ enum dma_data_direction {
};
@@ -44733,9 +44691,9 @@ diff -urNp linux-2.6.35.7/include/linux/dma-mapping.h linux-2.6.35.7/include/lin
};
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-2.6.35.7/include/linux/elf.h linux-2.6.35.7/include/linux/elf.h
---- linux-2.6.35.7/include/linux/elf.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/elf.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/elf.h linux-2.6.35.8/include/linux/elf.h
+--- linux-2.6.35.8/include/linux/elf.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/elf.h 2010-09-17 20:12:09.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -44808,9 +44766,9 @@ diff -urNp linux-2.6.35.7/include/linux/elf.h linux-2.6.35.7/include/linux/elf.h
#endif
-diff -urNp linux-2.6.35.7/include/linux/fs.h linux-2.6.35.7/include/linux/fs.h
---- linux-2.6.35.7/include/linux/fs.h 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/include/linux/fs.h 2010-09-20 17:33:35.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/fs.h linux-2.6.35.8/include/linux/fs.h
+--- linux-2.6.35.8/include/linux/fs.h 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/include/linux/fs.h 2010-09-20 17:33:35.000000000 -0400
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)0x1000)
@@ -44972,9 +44930,9 @@ diff -urNp linux-2.6.35.7/include/linux/fs.h linux-2.6.35.7/include/linux/fs.h
};
/*
-diff -urNp linux-2.6.35.7/include/linux/fs_struct.h linux-2.6.35.7/include/linux/fs_struct.h
---- linux-2.6.35.7/include/linux/fs_struct.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/fs_struct.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/fs_struct.h linux-2.6.35.8/include/linux/fs_struct.h
+--- linux-2.6.35.8/include/linux/fs_struct.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/fs_struct.h 2010-09-17 20:12:09.000000000 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -44984,9 +44942,9 @@ diff -urNp linux-2.6.35.7/include/linux/fs_struct.h linux-2.6.35.7/include/linux
rwlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.35.7/include/linux/genhd.h linux-2.6.35.7/include/linux/genhd.h
---- linux-2.6.35.7/include/linux/genhd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/genhd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/genhd.h linux-2.6.35.8/include/linux/genhd.h
+--- linux-2.6.35.8/include/linux/genhd.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/genhd.h 2010-09-17 20:12:09.000000000 -0400
@@ -162,7 +162,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -44996,9 +44954,9 @@ diff -urNp linux-2.6.35.7/include/linux/genhd.h linux-2.6.35.7/include/linux/gen
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.35.7/include/linux/gracl.h linux-2.6.35.7/include/linux/gracl.h
---- linux-2.6.35.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/gracl.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/gracl.h linux-2.6.35.8/include/linux/gracl.h
+--- linux-2.6.35.8/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/gracl.h 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,310 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -45310,9 +45268,9 @@ diff -urNp linux-2.6.35.7/include/linux/gracl.h linux-2.6.35.7/include/linux/gra
+
+#endif
+
-diff -urNp linux-2.6.35.7/include/linux/gralloc.h linux-2.6.35.7/include/linux/gralloc.h
---- linux-2.6.35.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/gralloc.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/gralloc.h linux-2.6.35.8/include/linux/gralloc.h
+--- linux-2.6.35.8/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/gralloc.h 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -45323,9 +45281,9 @@ diff -urNp linux-2.6.35.7/include/linux/gralloc.h linux-2.6.35.7/include/linux/g
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/grdefs.h linux-2.6.35.7/include/linux/grdefs.h
---- linux-2.6.35.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/grdefs.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/grdefs.h linux-2.6.35.8/include/linux/grdefs.h
+--- linux-2.6.35.8/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/grdefs.h 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -45463,9 +45421,9 @@ diff -urNp linux-2.6.35.7/include/linux/grdefs.h linux-2.6.35.7/include/linux/gr
+};
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/grinternal.h linux-2.6.35.7/include/linux/grinternal.h
---- linux-2.6.35.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/grinternal.h 2010-10-18 21:05:08.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/grinternal.h linux-2.6.35.8/include/linux/grinternal.h
+--- linux-2.6.35.8/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/grinternal.h 2010-10-18 21:05:08.000000000 -0400
@@ -0,0 +1,214 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -45681,9 +45639,9 @@ diff -urNp linux-2.6.35.7/include/linux/grinternal.h linux-2.6.35.7/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/grmsg.h linux-2.6.35.7/include/linux/grmsg.h
---- linux-2.6.35.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/grmsg.h 2010-10-18 21:01:30.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/grmsg.h linux-2.6.35.8/include/linux/grmsg.h
+--- linux-2.6.35.8/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/grmsg.h 2010-10-18 21:01:30.000000000 -0400
@@ -0,0 +1,110 @@
+#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"
+#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"
@@ -45795,10 +45753,10 @@ diff -urNp linux-2.6.35.7/include/linux/grmsg.h linux-2.6.35.7/include/linux/grm
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
+#define GR_VM86_MSG "denied use of vm86 by "
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
-diff -urNp linux-2.6.35.7/include/linux/grsecurity.h linux-2.6.35.7/include/linux/grsecurity.h
---- linux-2.6.35.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/grsecurity.h 2010-10-18 21:01:30.000000000 -0400
-@@ -0,0 +1,205 @@
+diff -urNp linux-2.6.35.8/include/linux/grsecurity.h linux-2.6.35.8/include/linux/grsecurity.h
+--- linux-2.6.35.8/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/grsecurity.h 2010-10-27 19:41:24.000000000 -0400
+@@ -0,0 +1,206 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
+#include <linux/fs.h>
@@ -45991,6 +45949,7 @@ diff -urNp linux-2.6.35.7/include/linux/grsecurity.h linux-2.6.35.7/include/linu
+void gr_audit_ptrace(struct task_struct *task);
+
+#ifdef CONFIG_GRKERNSEC
++void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
+void gr_log_nonroot_mod_load(const char *modname);
+void gr_handle_vm86(void);
+void gr_handle_mem_write(void);
@@ -46004,9 +45963,9 @@ diff -urNp linux-2.6.35.7/include/linux/grsecurity.h linux-2.6.35.7/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/grsock.h linux-2.6.35.7/include/linux/grsock.h
---- linux-2.6.35.7/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/grsock.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/grsock.h linux-2.6.35.8/include/linux/grsock.h
+--- linux-2.6.35.8/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/grsock.h 2010-09-17 20:12:37.000000000 -0400
@@ -0,0 +1,19 @@
+#ifndef __GRSOCK_H
+#define __GRSOCK_H
@@ -46027,9 +45986,9 @@ diff -urNp linux-2.6.35.7/include/linux/grsock.h linux-2.6.35.7/include/linux/gr
+ const int protocol);
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/highmem.h linux-2.6.35.7/include/linux/highmem.h
---- linux-2.6.35.7/include/linux/highmem.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/highmem.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/highmem.h linux-2.6.35.8/include/linux/highmem.h
+--- linux-2.6.35.8/include/linux/highmem.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/highmem.h 2010-09-17 20:12:09.000000000 -0400
@@ -143,6 +143,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -46049,9 +46008,9 @@ diff -urNp linux-2.6.35.7/include/linux/highmem.h linux-2.6.35.7/include/linux/h
static inline void zero_user_segments(struct page *page,
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
-diff -urNp linux-2.6.35.7/include/linux/interrupt.h linux-2.6.35.7/include/linux/interrupt.h
---- linux-2.6.35.7/include/linux/interrupt.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/interrupt.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/interrupt.h linux-2.6.35.8/include/linux/interrupt.h
+--- linux-2.6.35.8/include/linux/interrupt.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/interrupt.h 2010-09-17 20:12:09.000000000 -0400
@@ -392,7 +392,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -46076,9 +46035,9 @@ diff -urNp linux-2.6.35.7/include/linux/interrupt.h linux-2.6.35.7/include/linux
extern void softirq_init(void);
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.35.7/include/linux/jbd2.h linux-2.6.35.7/include/linux/jbd2.h
---- linux-2.6.35.7/include/linux/jbd2.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/jbd2.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/jbd2.h linux-2.6.35.8/include/linux/jbd2.h
+--- linux-2.6.35.8/include/linux/jbd2.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/jbd2.h 2010-09-17 20:12:09.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -46088,9 +46047,9 @@ diff -urNp linux-2.6.35.7/include/linux/jbd2.h linux-2.6.35.7/include/linux/jbd2
#endif
extern void *jbd2_alloc(size_t size, gfp_t flags);
-diff -urNp linux-2.6.35.7/include/linux/jbd.h linux-2.6.35.7/include/linux/jbd.h
---- linux-2.6.35.7/include/linux/jbd.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/jbd.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/jbd.h linux-2.6.35.8/include/linux/jbd.h
+--- linux-2.6.35.8/include/linux/jbd.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/jbd.h 2010-09-17 20:12:09.000000000 -0400
@@ -67,7 +67,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -46100,9 +46059,9 @@ diff -urNp linux-2.6.35.7/include/linux/jbd.h linux-2.6.35.7/include/linux/jbd.h
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.35.7/include/linux/kallsyms.h linux-2.6.35.7/include/linux/kallsyms.h
---- linux-2.6.35.7/include/linux/kallsyms.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/kallsyms.h 2010-09-17 20:12:37.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/kallsyms.h linux-2.6.35.8/include/linux/kallsyms.h
+--- linux-2.6.35.8/include/linux/kallsyms.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/kallsyms.h 2010-09-17 20:12:37.000000000 -0400
@@ -15,7 +15,8 @@
struct module;
@@ -46123,9 +46082,9 @@ diff -urNp linux-2.6.35.7/include/linux/kallsyms.h linux-2.6.35.7/include/linux/
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.35.7/include/linux/kgdb.h linux-2.6.35.7/include/linux/kgdb.h
---- linux-2.6.35.7/include/linux/kgdb.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/kgdb.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/kgdb.h linux-2.6.35.8/include/linux/kgdb.h
+--- linux-2.6.35.8/include/linux/kgdb.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/kgdb.h 2010-09-17 20:12:09.000000000 -0400
@@ -263,22 +263,22 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -46159,9 +46118,9 @@ diff -urNp linux-2.6.35.7/include/linux/kgdb.h linux-2.6.35.7/include/linux/kgdb
extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.35.7/include/linux/kvm_host.h linux-2.6.35.7/include/linux/kvm_host.h
---- linux-2.6.35.7/include/linux/kvm_host.h 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/include/linux/kvm_host.h 2010-09-26 17:32:50.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/kvm_host.h linux-2.6.35.8/include/linux/kvm_host.h
+--- linux-2.6.35.8/include/linux/kvm_host.h 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/include/linux/kvm_host.h 2010-09-26 17:32:50.000000000 -0400
@@ -244,7 +244,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -46180,9 +46139,9 @@ diff -urNp linux-2.6.35.7/include/linux/kvm_host.h linux-2.6.35.7/include/linux/
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.35.7/include/linux/libata.h linux-2.6.35.7/include/linux/libata.h
---- linux-2.6.35.7/include/linux/libata.h 2010-09-20 17:33:09.000000000 -0400
-+++ linux-2.6.35.7/include/linux/libata.h 2010-09-20 17:33:35.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/libata.h linux-2.6.35.8/include/linux/libata.h
+--- linux-2.6.35.8/include/linux/libata.h 2010-09-20 17:33:09.000000000 -0400
++++ linux-2.6.35.8/include/linux/libata.h 2010-09-20 17:33:35.000000000 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -46248,9 +46207,9 @@ diff -urNp linux-2.6.35.7/include/linux/libata.h linux-2.6.35.7/include/linux/li
extern int ata_scsi_detect(struct scsi_host_template *sht);
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-diff -urNp linux-2.6.35.7/include/linux/lockd/bind.h linux-2.6.35.7/include/linux/lockd/bind.h
---- linux-2.6.35.7/include/linux/lockd/bind.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/lockd/bind.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/lockd/bind.h linux-2.6.35.8/include/linux/lockd/bind.h
+--- linux-2.6.35.8/include/linux/lockd/bind.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/lockd/bind.h 2010-09-17 20:12:09.000000000 -0400
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -46268,9 +46227,9 @@ diff -urNp linux-2.6.35.7/include/linux/lockd/bind.h linux-2.6.35.7/include/linu
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
---- linux-2.6.35.7/include/linux/mm.h 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/include/linux/mm.h 2010-09-26 17:32:50.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/mm.h linux-2.6.35.8/include/linux/mm.h
+--- linux-2.6.35.8/include/linux/mm.h 2010-10-31 17:13:59.000000000 -0400
++++ linux-2.6.35.8/include/linux/mm.h 2010-10-31 17:15:04.000000000 -0400
@@ -107,7 +107,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -46286,7 +46245,7 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
#define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
-@@ -1014,6 +1021,8 @@ struct shrinker {
+@@ -1020,6 +1027,8 @@ struct shrinker {
extern void register_shrinker(struct shrinker *);
extern void unregister_shrinker(struct shrinker *);
@@ -46295,7 +46254,7 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
int vma_wants_writenotify(struct vm_area_struct *vma);
extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
-@@ -1290,6 +1299,7 @@ out:
+@@ -1296,6 +1305,7 @@ out:
}
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -46303,7 +46262,7 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
extern unsigned long do_brk(unsigned long, unsigned long);
-@@ -1346,6 +1356,10 @@ extern struct vm_area_struct * find_vma(
+@@ -1352,6 +1362,10 @@ extern struct vm_area_struct * find_vma(
extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
struct vm_area_struct **pprev);
@@ -46314,7 +46273,7 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
/* Look up the first VMA which intersects the interval start_addr..end_addr-1,
NULL if none. Assume start_addr < end_addr. */
static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1362,7 +1376,6 @@ static inline unsigned long vma_pages(st
+@@ -1368,7 +1382,6 @@ static inline unsigned long vma_pages(st
return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
}
@@ -46322,7 +46281,7 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1469,10 +1482,16 @@ extern int unpoison_memory(unsigned long
+@@ -1475,10 +1488,16 @@ extern int unpoison_memory(unsigned long
extern int sysctl_memory_failure_early_kill;
extern int sysctl_memory_failure_recovery;
extern void shake_page(struct page *p, int access);
@@ -46340,9 +46299,9 @@ diff -urNp linux-2.6.35.7/include/linux/mm.h linux-2.6.35.7/include/linux/mm.h
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.35.7/include/linux/mm_types.h linux-2.6.35.7/include/linux/mm_types.h
---- linux-2.6.35.7/include/linux/mm_types.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/mm_types.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/mm_types.h linux-2.6.35.8/include/linux/mm_types.h
+--- linux-2.6.35.8/include/linux/mm_types.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/mm_types.h 2010-09-17 20:12:09.000000000 -0400
@@ -183,6 +183,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -46377,9 +46336,9 @@ diff -urNp linux-2.6.35.7/include/linux/mm_types.h linux-2.6.35.7/include/linux/
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.35.7/include/linux/mmu_notifier.h linux-2.6.35.7/include/linux/mmu_notifier.h
---- linux-2.6.35.7/include/linux/mmu_notifier.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/mmu_notifier.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/mmu_notifier.h linux-2.6.35.8/include/linux/mmu_notifier.h
+--- linux-2.6.35.8/include/linux/mmu_notifier.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/mmu_notifier.h 2010-09-17 20:12:09.000000000 -0400
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -46396,9 +46355,9 @@ diff -urNp linux-2.6.35.7/include/linux/mmu_notifier.h linux-2.6.35.7/include/li
})
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
-diff -urNp linux-2.6.35.7/include/linux/mmzone.h linux-2.6.35.7/include/linux/mmzone.h
---- linux-2.6.35.7/include/linux/mmzone.h 2010-09-26 17:32:11.000000000 -0400
-+++ linux-2.6.35.7/include/linux/mmzone.h 2010-09-26 17:32:50.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/mmzone.h linux-2.6.35.8/include/linux/mmzone.h
+--- linux-2.6.35.8/include/linux/mmzone.h 2010-09-26 17:32:11.000000000 -0400
++++ linux-2.6.35.8/include/linux/mmzone.h 2010-09-26 17:32:50.000000000 -0400
@@ -352,7 +352,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -46408,9 +46367,9 @@ diff -urNp linux-2.6.35.7/include/linux/mmzone.h linux-2.6.35.7/include/linux/mm
/*
* prev_priority holds the scanning priority for this zone. It is
-diff -urNp linux-2.6.35.7/include/linux/mod_devicetable.h linux-2.6.35.7/include/linux/mod_devicetable.h
---- linux-2.6.35.7/include/linux/mod_devicetable.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/mod_devicetable.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/mod_devicetable.h linux-2.6.35.8/include/linux/mod_devicetable.h
+--- linux-2.6.35.8/include/linux/mod_devicetable.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/mod_devicetable.h 2010-09-17 20:12:09.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -46429,9 +46388,9 @@ diff -urNp linux-2.6.35.7/include/linux/mod_devicetable.h linux-2.6.35.7/include
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.35.7/include/linux/module.h linux-2.6.35.7/include/linux/module.h
---- linux-2.6.35.7/include/linux/module.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/module.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/module.h linux-2.6.35.8/include/linux/module.h
+--- linux-2.6.35.8/include/linux/module.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/module.h 2010-09-17 20:12:09.000000000 -0400
@@ -297,16 +297,16 @@ struct module
int (*init)(void);
@@ -46504,9 +46463,9 @@ diff -urNp linux-2.6.35.7/include/linux/module.h linux-2.6.35.7/include/linux/mo
}
/* Search for module by name: must hold module_mutex. */
-diff -urNp linux-2.6.35.7/include/linux/moduleloader.h linux-2.6.35.7/include/linux/moduleloader.h
---- linux-2.6.35.7/include/linux/moduleloader.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/moduleloader.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/moduleloader.h linux-2.6.35.8/include/linux/moduleloader.h
+--- linux-2.6.35.8/include/linux/moduleloader.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/moduleloader.h 2010-09-17 20:12:09.000000000 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -46529,9 +46488,9 @@ diff -urNp linux-2.6.35.7/include/linux/moduleloader.h linux-2.6.35.7/include/li
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.35.7/include/linux/moduleparam.h linux-2.6.35.7/include/linux/moduleparam.h
---- linux-2.6.35.7/include/linux/moduleparam.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/moduleparam.h 2010-10-11 22:41:44.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/moduleparam.h linux-2.6.35.8/include/linux/moduleparam.h
+--- linux-2.6.35.8/include/linux/moduleparam.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/moduleparam.h 2010-10-11 22:41:44.000000000 -0400
@@ -132,7 +132,7 @@ struct kparam_array
/* Actually copy string: maxlen param is usually sizeof(string). */
@@ -46550,9 +46509,9 @@ diff -urNp linux-2.6.35.7/include/linux/moduleparam.h linux-2.6.35.7/include/lin
= { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
sizeof(array[0]), array }; \
__module_param_call(MODULE_PARAM_PREFIX, name, \
-diff -urNp linux-2.6.35.7/include/linux/namei.h linux-2.6.35.7/include/linux/namei.h
---- linux-2.6.35.7/include/linux/namei.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/namei.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/namei.h linux-2.6.35.8/include/linux/namei.h
+--- linux-2.6.35.8/include/linux/namei.h 2010-08-26 19:47:12.000000000 -0400
++++ linux-2.6.35.8/include/linux/namei.h 2010-09-17 20:12:09.000000000 -0400
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -46577,9 +46536,9 @@ diff -urNp linux-2.6.35.7/include/linux/namei.h linux-2.6.35.7/include/linux/nam
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.35.7/include/linux/netfilter/xt_gradm.h linux-2.6.35.7/include/linux/netfilter/xt_gradm.h
---- linux-2.6.35.7/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.35.7/include/linux/netfilter/xt_gradm.h 2010-09-28 18:05:52.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/netfilter/xt_gradm.h linux-2.6.35.8/include/linux/netfilter/xt_gradm.h
+--- linux-2.6.35.8/include/linux/netfilter/xt_gradm.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.35.8/include/linux/netfilter/xt_gradm.h 2010-09-28 18:05:52.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef _LINUX_NETFILTER_XT_GRADM_H
+#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -46590,9 +46549,9 @@ diff -urNp linux-2.6.35.7/include/linux/netfilter/xt_gradm.h linux-2.6.35.7/incl
+};
+
+#endif
-diff -urNp linux-2.6.35.7/include/linux/oprofile.h linux-2.6.35.7/include/linux/oprofile.h
---- linux-2.6.35.7/include/linux/oprofile.h 2010-08-26 19:47:12.000000000 -0400
-+++ linux-2.6.35.7/include/linux/oprofile.h 2010-09-17 20:12:09.000000000 -0400
+diff -urNp linux-2.6.35.8/include/linux/oprofile.h linux-2.6.35.8/include/linux/oprofile.