From 49b4c1dfaf90f1435fe46e47ded7ca768d0be291 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 29 Oct 2009 17:30:53 +0000 Subject: [PATCH] *-grsec: upgrade kernel to 2.6.31.5 and use package() function --- main/dahdi-linux-grsec/APKBUILD | 9 +- main/iscsitarget-grsec/APKBUILD | 10 +- main/linux-grsec/APKBUILD | 22 +- ...curity-2.1.14-2.6.31.5-200910232000.patch} | 7770 +++++++++++------ main/linux-grsec/kernelconfig.x86 | 10 +- main/xtables-addons-grsec/APKBUILD | 26 +- testing/kqemu-grsec/APKBUILD | 15 +- 7 files changed, 4988 insertions(+), 2874 deletions(-) rename main/linux-grsec/{grsecurity-2.1.14-2.6.31.4-200910181015.patch => grsecurity-2.1.14-2.6.31.5-200910232000.patch} (82%) diff --git a/main/dahdi-linux-grsec/APKBUILD b/main/dahdi-linux-grsec/APKBUILD index e2a40a391d..d6320d13ed 100644 --- a/main/dahdi-linux-grsec/APKBUILD +++ b/main/dahdi-linux-grsec/APKBUILD @@ -34,15 +34,22 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_realna dahdi-2.6.31.patch " -build() { +prepare() { cd "$srcdir/$_realname-$_dahdiver" for i in ../*.patch ../*.diff; do msg "Applying $i" patch -p1 < $i || return 1; done +} +build() { + cd "$srcdir/$_realname-$_dahdiver" make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ || return 1 +} + +package() { + cd "$srcdir/$_realname-$_dahdiver" make KVERS="${_abi_release}" DYNFS="yes" MODULES_EXTRA="zaphfc" \ DESTDIR="$pkgdir" install rm -rf "$pkgdir"/lib/firmware "$pkgdir"/usr/lib/hotplug/firmware \ diff --git a/main/iscsitarget-grsec/APKBUILD b/main/iscsitarget-grsec/APKBUILD index ad63f44a9a..009165e9e7 100644 --- a/main/iscsitarget-grsec/APKBUILD +++ b/main/iscsitarget-grsec/APKBUILD @@ -25,16 +25,24 @@ subpackages= source="http://downloads.sourceforge.net/$_realname/$_realname-$_iscsiver.tar.gz " -build() { +prepare() { cd "$srcdir"/$_realname-$_iscsiver # for i in ../*.patch; do # msg "Applying $i" # patch -p1 < $i || return 1 # done +} +build() { + cd "$srcdir"/$_realname-$_iscsiver unset ARCH local ksrc=/usr/src/linux-headers-${_abi_release} make KSRC="$ksrc" kernel || return 1 +} + +package() { + cd "$srcdir"/$_realname-$_iscsiver make KSRC="$ksrc" DISTDIR="$pkgdir" install-kernel || return 1 } + md5sums="9e756e89cc47aaa71824ed34a6560543 iscsitarget-1.4.18.tar.gz" diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index cde46c6e23..f2230adbdb 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,18 +2,19 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.31.4 +pkgver=2.6.31.5 _kernver=2.6.31 pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" makedepends="perl installkernel" +options="!strip" _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.1.14-2.6.31.4-200910181015.patch + grsecurity-2.1.14-2.6.31.5-200910232000.patch kernelconfig.x86 " subpackages="$pkgname-dev linux-firmware:firmware" @@ -21,7 +22,7 @@ license="GPL-2" _abi_release=${pkgver}-${_flavor} -_prepare() { +prepare() { cd "$srcdir"/linux-$_kernver if [ "$_kernver" != "$pkgver" ]; then bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1 @@ -41,24 +42,23 @@ _prepare() { # this is so we can do: 'abuild menuconfig' to reconfigure kernel menuconfig() { - _prepare - cd "$srcdir"/build + cd "$srcdir"/build || return 1 make menuconfig cp .config "$startdir"/$_config } build() { - _prepare || return 1 cd "$srcdir"/build make CC="$CC" || return 1 +} +package() { + cd "$srcdir"/build mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules make modules_install install \ INSTALL_MOD_PATH="$pkgdir" \ INSTALL_PATH="$pkgdir"/boot -# ln -s vmlinuz-${_abi_release} "${pkgdir}"/boot/$_flavor - rm -f "$pkgdir"/lib/modules/${_abi_release}/build \ "$pkgdir"/lib/modules/${_abi_release}/source install -D include/config/kernel.release \ @@ -119,6 +119,6 @@ firmware() { } md5sums="84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2 -02078f4231baee4f0004212f2875df2b patch-2.6.31.4.bz2 -d4a3559a00702e4c6d6f3b7d64f72dcc grsecurity-2.1.14-2.6.31.4-200910181015.patch -25d08b2d9f22a06994b1e45ab8276a7b kernelconfig.x86" +6cac5e59d5562b591cdda485941204d5 patch-2.6.31.5.bz2 +6b3813a484429f160dce06d69e2e8d7f grsecurity-2.1.14-2.6.31.5-200910232000.patch +5fadc584b08c9bc420d61e148139becd kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.31.4-200910181015.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.31.5-200910232000.patch similarity index 82% rename from main/linux-grsec/grsecurity-2.1.14-2.6.31.4-200910181015.patch rename to main/linux-grsec/grsecurity-2.1.14-2.6.31.5-200910232000.patch index 3c0533ca21..0079a01ef7 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.31.4-200910181015.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.31.5-200910232000.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.31.4/arch/alpha/include/asm/atomic.h linux-2.6.31.4/arch/alpha/include/asm/atomic.h ---- linux-2.6.31.4/arch/alpha/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/include/asm/atomic.h 2009-10-11 15:29:40.123741591 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/include/asm/atomic.h linux-2.6.31.5/arch/alpha/include/asm/atomic.h +--- linux-2.6.31.5/arch/alpha/include/asm/atomic.h 2009-10-20 20:42:58.966109165 -0400 ++++ linux-2.6.31.5/arch/alpha/include/asm/atomic.h 2009-10-20 20:32:11.013671975 -0400 @@ -18,9 +18,11 @@ #define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } ) @@ -45,9 +45,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/include/asm/atomic.h linux-2.6.31.4/arch/al #define atomic64_inc(v) atomic64_add(1,(v)) #define atomic_dec(v) atomic_sub(1,(v)) -diff -urNp linux-2.6.31.4/arch/alpha/include/asm/elf.h linux-2.6.31.4/arch/alpha/include/asm/elf.h ---- linux-2.6.31.4/arch/alpha/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/include/asm/elf.h 2009-10-11 15:29:40.124678650 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/include/asm/elf.h linux-2.6.31.5/arch/alpha/include/asm/elf.h +--- linux-2.6.31.5/arch/alpha/include/asm/elf.h 2009-10-20 20:42:58.966109165 -0400 ++++ linux-2.6.31.5/arch/alpha/include/asm/elf.h 2009-10-20 20:32:11.013671975 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -62,9 +62,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/include/asm/elf.h linux-2.6.31.4/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.31.4/arch/alpha/include/asm/pgtable.h linux-2.6.31.4/arch/alpha/include/asm/pgtable.h ---- linux-2.6.31.4/arch/alpha/include/asm/pgtable.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/include/asm/pgtable.h 2009-10-11 15:29:40.124678650 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/include/asm/pgtable.h linux-2.6.31.5/arch/alpha/include/asm/pgtable.h +--- linux-2.6.31.5/arch/alpha/include/asm/pgtable.h 2009-10-20 20:42:58.966109165 -0400 ++++ linux-2.6.31.5/arch/alpha/include/asm/pgtable.h 2009-10-20 20:32:11.013671975 -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) @@ -83,9 +83,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/include/asm/pgtable.h linux-2.6.31.4/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.31.4/arch/alpha/kernel/module.c linux-2.6.31.4/arch/alpha/kernel/module.c ---- linux-2.6.31.4/arch/alpha/kernel/module.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/kernel/module.c 2009-10-11 15:29:40.124678650 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/kernel/module.c linux-2.6.31.5/arch/alpha/kernel/module.c +--- linux-2.6.31.5/arch/alpha/kernel/module.c 2009-10-20 20:42:58.966109165 -0400 ++++ linux-2.6.31.5/arch/alpha/kernel/module.c 2009-10-20 20:32:11.013671975 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -95,9 +95,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/kernel/module.c linux-2.6.31.4/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.31.4/arch/alpha/kernel/osf_sys.c linux-2.6.31.4/arch/alpha/kernel/osf_sys.c ---- linux-2.6.31.4/arch/alpha/kernel/osf_sys.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/kernel/osf_sys.c 2009-10-11 15:29:40.124678650 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/kernel/osf_sys.c linux-2.6.31.5/arch/alpha/kernel/osf_sys.c +--- linux-2.6.31.5/arch/alpha/kernel/osf_sys.c 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/alpha/kernel/osf_sys.c 2009-10-20 20:32:11.015085037 -0400 @@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -120,9 +120,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/kernel/osf_sys.c linux-2.6.31.4/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.31.4/arch/alpha/mm/fault.c linux-2.6.31.4/arch/alpha/mm/fault.c ---- linux-2.6.31.4/arch/alpha/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/alpha/mm/fault.c 2009-10-11 15:29:40.124678650 -0400 +diff -urNp linux-2.6.31.5/arch/alpha/mm/fault.c linux-2.6.31.5/arch/alpha/mm/fault.c +--- linux-2.6.31.5/arch/alpha/mm/fault.c 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/alpha/mm/fault.c 2009-10-20 20:32:11.015085037 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -279,9 +279,9 @@ diff -urNp linux-2.6.31.4/arch/alpha/mm/fault.c linux-2.6.31.4/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.31.4/arch/arm/include/asm/atomic.h linux-2.6.31.4/arch/arm/include/asm/atomic.h ---- linux-2.6.31.4/arch/arm/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/include/asm/atomic.h 2009-10-11 15:29:40.230158580 -0400 +diff -urNp linux-2.6.31.5/arch/arm/include/asm/atomic.h linux-2.6.31.5/arch/arm/include/asm/atomic.h +--- linux-2.6.31.5/arch/arm/include/asm/atomic.h 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/arm/include/asm/atomic.h 2009-10-20 20:32:11.015085037 -0400 @@ -20,6 +20,7 @@ #ifdef __KERNEL__ @@ -342,9 +342,9 @@ diff -urNp linux-2.6.31.4/arch/arm/include/asm/atomic.h linux-2.6.31.4/arch/arm/ #define atomic_dec(v) atomic_sub(1, v) #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) -diff -urNp linux-2.6.31.4/arch/arm/include/asm/elf.h linux-2.6.31.4/arch/arm/include/asm/elf.h ---- linux-2.6.31.4/arch/arm/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/include/asm/elf.h 2009-10-11 15:29:40.230158580 -0400 +diff -urNp linux-2.6.31.5/arch/arm/include/asm/elf.h linux-2.6.31.5/arch/arm/include/asm/elf.h +--- linux-2.6.31.5/arch/arm/include/asm/elf.h 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/arm/include/asm/elf.h 2009-10-20 20:32:11.015085037 -0400 @@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con 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. */ @@ -361,9 +361,9 @@ diff -urNp linux-2.6.31.4/arch/arm/include/asm/elf.h linux-2.6.31.4/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.31.4/arch/arm/include/asm/kmap_types.h linux-2.6.31.4/arch/arm/include/asm/kmap_types.h ---- linux-2.6.31.4/arch/arm/include/asm/kmap_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/include/asm/kmap_types.h 2009-10-11 15:29:40.230158580 -0400 +diff -urNp linux-2.6.31.5/arch/arm/include/asm/kmap_types.h linux-2.6.31.5/arch/arm/include/asm/kmap_types.h +--- linux-2.6.31.5/arch/arm/include/asm/kmap_types.h 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/arm/include/asm/kmap_types.h 2009-10-20 20:32:11.015085037 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -372,9 +372,9 @@ diff -urNp linux-2.6.31.4/arch/arm/include/asm/kmap_types.h linux-2.6.31.4/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.31.4/arch/arm/include/asm/uaccess.h linux-2.6.31.4/arch/arm/include/asm/uaccess.h ---- linux-2.6.31.4/arch/arm/include/asm/uaccess.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/include/asm/uaccess.h 2009-10-11 15:29:40.230158580 -0400 +diff -urNp linux-2.6.31.5/arch/arm/include/asm/uaccess.h linux-2.6.31.5/arch/arm/include/asm/uaccess.h +--- linux-2.6.31.5/arch/arm/include/asm/uaccess.h 2009-10-20 20:42:58.967083785 -0400 ++++ linux-2.6.31.5/arch/arm/include/asm/uaccess.h 2009-10-20 20:32:11.016200356 -0400 @@ -400,6 +400,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) @@ -395,9 +395,9 @@ diff -urNp linux-2.6.31.4/arch/arm/include/asm/uaccess.h linux-2.6.31.4/arch/arm if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c ---- linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c 2009-10-11 15:29:40.230158580 -0400 +diff -urNp linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c +--- linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/arm/mach-ns9xxx/clock.c 2009-10-20 20:32:11.016200356 -0400 @@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode return single_open(file, clk_debugfs_show, NULL); } @@ -407,9 +407,9 @@ diff -urNp linux-2.6.31.4/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.4/arch/arm/m .open = clk_debugfs_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.31.4/arch/arm/mm/mmap.c linux-2.6.31.4/arch/arm/mm/mmap.c ---- linux-2.6.31.4/arch/arm/mm/mmap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/arm/mm/mmap.c 2009-10-11 15:29:40.231419184 -0400 +diff -urNp linux-2.6.31.5/arch/arm/mm/mmap.c linux-2.6.31.5/arch/arm/mm/mmap.c +--- linux-2.6.31.5/arch/arm/mm/mmap.c 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/arm/mm/mmap.c 2009-10-20 20:32:11.016200356 -0400 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -446,9 +446,9 @@ diff -urNp linux-2.6.31.4/arch/arm/mm/mmap.c linux-2.6.31.4/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.31.4/arch/avr32/include/asm/atomic.h linux-2.6.31.4/arch/avr32/include/asm/atomic.h ---- linux-2.6.31.4/arch/avr32/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/avr32/include/asm/atomic.h 2009-10-11 15:29:40.239493712 -0400 +diff -urNp linux-2.6.31.5/arch/avr32/include/asm/atomic.h linux-2.6.31.5/arch/avr32/include/asm/atomic.h +--- linux-2.6.31.5/arch/avr32/include/asm/atomic.h 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/avr32/include/asm/atomic.h 2009-10-20 20:32:11.026942899 -0400 @@ -20,7 +20,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -510,9 +510,9 @@ diff -urNp linux-2.6.31.4/arch/avr32/include/asm/atomic.h linux-2.6.31.4/arch/av #define atomic_dec_return(v) atomic_sub_return(1, v) #define atomic_inc_return(v) atomic_add_return(1, v) -diff -urNp linux-2.6.31.4/arch/avr32/include/asm/elf.h linux-2.6.31.4/arch/avr32/include/asm/elf.h ---- linux-2.6.31.4/arch/avr32/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/avr32/include/asm/elf.h 2009-10-11 15:29:40.239493712 -0400 +diff -urNp linux-2.6.31.5/arch/avr32/include/asm/elf.h linux-2.6.31.5/arch/avr32/include/asm/elf.h +--- linux-2.6.31.5/arch/avr32/include/asm/elf.h 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/avr32/include/asm/elf.h 2009-10-20 20:32:11.026942899 -0400 @@ -85,8 +85,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. */ @@ -529,9 +529,9 @@ diff -urNp linux-2.6.31.4/arch/avr32/include/asm/elf.h linux-2.6.31.4/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.31.4/arch/avr32/include/asm/kmap_types.h linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h 2009-10-11 15:29:40.240390629 -0400 +diff -urNp linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/avr32/include/asm/kmap_types.h 2009-10-20 20:32:11.026942899 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -542,9 +542,9 @@ diff -urNp linux-2.6.31.4/arch/avr32/include/asm/kmap_types.h linux-2.6.31.4/arc }; #undef D -diff -urNp linux-2.6.31.4/arch/avr32/mm/fault.c linux-2.6.31.4/arch/avr32/mm/fault.c ---- linux-2.6.31.4/arch/avr32/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/avr32/mm/fault.c 2009-10-11 15:29:40.240390629 -0400 +diff -urNp linux-2.6.31.5/arch/avr32/mm/fault.c linux-2.6.31.5/arch/avr32/mm/fault.c +--- linux-2.6.31.5/arch/avr32/mm/fault.c 2009-10-20 20:42:58.968069565 -0400 ++++ linux-2.6.31.5/arch/avr32/mm/fault.c 2009-10-20 20:32:11.026942899 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -586,9 +586,9 @@ diff -urNp linux-2.6.31.4/arch/avr32/mm/fault.c linux-2.6.31.4/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.31.4/arch/blackfin/include/asm/atomic.h linux-2.6.31.4/arch/blackfin/include/asm/atomic.h ---- linux-2.6.31.4/arch/blackfin/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/blackfin/include/asm/atomic.h 2009-10-11 15:29:40.241333193 -0400 +diff -urNp linux-2.6.31.5/arch/blackfin/include/asm/atomic.h linux-2.6.31.5/arch/blackfin/include/asm/atomic.h +--- linux-2.6.31.5/arch/blackfin/include/asm/atomic.h 2009-10-20 20:42:58.969037301 -0400 ++++ linux-2.6.31.5/arch/blackfin/include/asm/atomic.h 2009-10-20 20:32:11.026942899 -0400 @@ -15,8 +15,10 @@ #define ATOMIC_INIT(i) { (i) } @@ -634,9 +634,9 @@ diff -urNp linux-2.6.31.4/arch/blackfin/include/asm/atomic.h linux-2.6.31.4/arch static inline void atomic_dec(volatile atomic_t *v) { __raw_atomic_update_asm(&v->counter, -1); -diff -urNp linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c ---- linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c 2009-10-11 15:29:40.241333193 -0400 +diff -urNp linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c +--- linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c 2009-10-20 20:42:58.969037301 -0400 ++++ linux-2.6.31.5/arch/blackfin/mach-bf561/coreb.c 2009-10-20 20:32:11.026942899 -0400 @@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct return ret; } @@ -646,9 +646,9 @@ diff -urNp linux-2.6.31.4/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.4/arch/b .owner = THIS_MODULE, .ioctl = coreb_ioctl, }; -diff -urNp linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c ---- linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-11 15:29:40.241333193 -0400 +diff -urNp linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c +--- linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-20 20:42:58.969037301 -0400 ++++ linux-2.6.31.5/arch/cris/arch-v10/drivers/sync_serial.c 2009-10-20 20:32:11.027918282 -0400 @@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha #define NUMBER_OF_PORTS 2 @@ -658,9 +658,9 @@ diff -urNp linux-2.6.31.4/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31. .owner = THIS_MODULE, .write = sync_serial_write, .read = sync_serial_read, -diff -urNp linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c ---- linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-11 15:29:40.267744989 -0400 +diff -urNp linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c +--- linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-20 20:42:58.969037301 -0400 ++++ linux-2.6.31.5/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-10-20 20:32:11.027918282 -0400 @@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign return 0; } @@ -670,9 +670,9 @@ diff -urNp linux-2.6.31.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31 .owner = THIS_MODULE, .poll = gpio_poll, .ioctl = gpio_ioctl, -diff -urNp linux-2.6.31.4/arch/cris/include/asm/atomic.h linux-2.6.31.4/arch/cris/include/asm/atomic.h ---- linux-2.6.31.4/arch/cris/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/cris/include/asm/atomic.h 2009-10-11 15:29:40.268620061 -0400 +diff -urNp linux-2.6.31.5/arch/cris/include/asm/atomic.h linux-2.6.31.5/arch/cris/include/asm/atomic.h +--- linux-2.6.31.5/arch/cris/include/asm/atomic.h 2009-10-20 20:42:58.969037301 -0400 ++++ linux-2.6.31.5/arch/cris/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400 @@ -16,7 +16,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -719,9 +719,9 @@ diff -urNp linux-2.6.31.4/arch/cris/include/asm/atomic.h linux-2.6.31.4/arch/cri static inline void atomic_dec(volatile atomic_t *v) { unsigned long flags; -diff -urNp linux-2.6.31.4/arch/frv/include/asm/atomic.h linux-2.6.31.4/arch/frv/include/asm/atomic.h ---- linux-2.6.31.4/arch/frv/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/frv/include/asm/atomic.h 2009-10-11 15:29:40.268620061 -0400 +diff -urNp linux-2.6.31.5/arch/frv/include/asm/atomic.h linux-2.6.31.5/arch/frv/include/asm/atomic.h +--- linux-2.6.31.5/arch/frv/include/asm/atomic.h 2009-10-20 20:42:58.970005584 -0400 ++++ linux-2.6.31.5/arch/frv/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400 @@ -37,7 +37,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -764,9 +764,9 @@ diff -urNp linux-2.6.31.4/arch/frv/include/asm/atomic.h linux-2.6.31.4/arch/frv/ static inline void atomic_dec(atomic_t *v) { atomic_sub_return(1, v); -diff -urNp linux-2.6.31.4/arch/frv/include/asm/kmap_types.h linux-2.6.31.4/arch/frv/include/asm/kmap_types.h ---- linux-2.6.31.4/arch/frv/include/asm/kmap_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/frv/include/asm/kmap_types.h 2009-10-11 15:29:40.268620061 -0400 +diff -urNp linux-2.6.31.5/arch/frv/include/asm/kmap_types.h linux-2.6.31.5/arch/frv/include/asm/kmap_types.h +--- linux-2.6.31.5/arch/frv/include/asm/kmap_types.h 2009-10-20 20:42:58.970005584 -0400 ++++ linux-2.6.31.5/arch/frv/include/asm/kmap_types.h 2009-10-20 20:32:11.028889957 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -775,9 +775,9 @@ diff -urNp linux-2.6.31.4/arch/frv/include/asm/kmap_types.h linux-2.6.31.4/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.31.4/arch/h8300/include/asm/atomic.h linux-2.6.31.4/arch/h8300/include/asm/atomic.h ---- linux-2.6.31.4/arch/h8300/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/h8300/include/asm/atomic.h 2009-10-11 15:29:40.269365271 -0400 +diff -urNp linux-2.6.31.5/arch/h8300/include/asm/atomic.h linux-2.6.31.5/arch/h8300/include/asm/atomic.h +--- linux-2.6.31.5/arch/h8300/include/asm/atomic.h 2009-10-20 20:42:58.970005584 -0400 ++++ linux-2.6.31.5/arch/h8300/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400 @@ -11,7 +11,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -830,9 +830,9 @@ diff -urNp linux-2.6.31.4/arch/h8300/include/asm/atomic.h linux-2.6.31.4/arch/h8 /* * atomic_inc_and_test - increment and test -diff -urNp linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c 2009-10-11 15:29:40.299486229 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c 2009-10-20 20:42:58.970005584 -0400 ++++ linux-2.6.31.5/arch/ia64/ia32/binfmt_elf32.c 2009-10-20 20:32:11.028889957 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -861,9 +861,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.4/arch/ia64 .fault = ia32_install_gate_page }; -diff -urNp linux-2.6.31.4/arch/ia64/ia32/ia32priv.h linux-2.6.31.4/arch/ia64/ia32/ia32priv.h ---- linux-2.6.31.4/arch/ia64/ia32/ia32priv.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/ia32/ia32priv.h 2009-10-11 15:29:40.300380760 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/ia32/ia32priv.h linux-2.6.31.5/arch/ia64/ia32/ia32priv.h +--- linux-2.6.31.5/arch/ia64/ia32/ia32priv.h 2009-10-20 20:42:58.970005584 -0400 ++++ linux-2.6.31.5/arch/ia64/ia32/ia32priv.h 2009-10-20 20:32:11.028889957 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -880,9 +880,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/ia32/ia32priv.h linux-2.6.31.4/arch/ia64/ia3 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.31.4/arch/ia64/include/asm/atomic.h linux-2.6.31.4/arch/ia64/include/asm/atomic.h ---- linux-2.6.31.4/arch/ia64/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/include/asm/atomic.h 2009-10-11 15:29:40.300380760 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/include/asm/atomic.h linux-2.6.31.5/arch/ia64/include/asm/atomic.h +--- linux-2.6.31.5/arch/ia64/include/asm/atomic.h 2009-10-20 20:42:58.970997131 -0400 ++++ linux-2.6.31.5/arch/ia64/include/asm/atomic.h 2009-10-20 20:32:11.028889957 -0400 @@ -22,9 +22,11 @@ #define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) @@ -907,9 +907,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/include/asm/atomic.h linux-2.6.31.4/arch/ia6 #define atomic_dec(v) atomic_sub(1, (v)) #define atomic64_add(i,v) atomic64_add_return((i), (v)) -diff -urNp linux-2.6.31.4/arch/ia64/include/asm/elf.h linux-2.6.31.4/arch/ia64/include/asm/elf.h ---- linux-2.6.31.4/arch/ia64/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/include/asm/elf.h 2009-10-11 15:29:40.300380760 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/include/asm/elf.h linux-2.6.31.5/arch/ia64/include/asm/elf.h +--- linux-2.6.31.5/arch/ia64/include/asm/elf.h 2009-10-20 20:42:58.970997131 -0400 ++++ linux-2.6.31.5/arch/ia64/include/asm/elf.h 2009-10-20 20:32:11.028889957 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -924,9 +924,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/include/asm/elf.h linux-2.6.31.4/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.31.4/arch/ia64/include/asm/pgtable.h linux-2.6.31.4/arch/ia64/include/asm/pgtable.h ---- linux-2.6.31.4/arch/ia64/include/asm/pgtable.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/include/asm/pgtable.h 2009-10-11 15:29:40.300380760 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/include/asm/pgtable.h linux-2.6.31.5/arch/ia64/include/asm/pgtable.h +--- linux-2.6.31.5/arch/ia64/include/asm/pgtable.h 2009-10-20 20:42:58.970997131 -0400 ++++ linux-2.6.31.5/arch/ia64/include/asm/pgtable.h 2009-10-20 20:32:11.030364852 -0400 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -945,9 +945,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/include/asm/pgtable.h linux-2.6.31.4/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.31.4/arch/ia64/include/asm/uaccess.h linux-2.6.31.4/arch/ia64/include/asm/uaccess.h ---- linux-2.6.31.4/arch/ia64/include/asm/uaccess.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/include/asm/uaccess.h 2009-10-11 15:29:40.301438897 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/include/asm/uaccess.h linux-2.6.31.5/arch/ia64/include/asm/uaccess.h +--- linux-2.6.31.5/arch/ia64/include/asm/uaccess.h 2009-10-20 20:42:58.970997131 -0400 ++++ linux-2.6.31.5/arch/ia64/include/asm/uaccess.h 2009-10-20 20:32:11.030364852 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -966,9 +966,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/include/asm/uaccess.h linux-2.6.31.4/arch/ia __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.31.4/arch/ia64/kernel/module.c linux-2.6.31.4/arch/ia64/kernel/module.c ---- linux-2.6.31.4/arch/ia64/kernel/module.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/kernel/module.c 2009-10-11 15:29:40.433757387 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/kernel/module.c linux-2.6.31.5/arch/ia64/kernel/module.c +--- linux-2.6.31.5/arch/ia64/kernel/module.c 2009-10-20 20:42:58.970997131 -0400 ++++ linux-2.6.31.5/arch/ia64/kernel/module.c 2009-10-20 20:32:11.030364852 -0400 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1057,9 +1057,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/kernel/module.c linux-2.6.31.4/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c 2009-10-11 15:29:40.435419266 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c 2009-10-20 20:42:58.971967718 -0400 ++++ linux-2.6.31.5/arch/ia64/kernel/sys_ia64.c 2009-10-20 20:32:11.031345603 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1086,9 +1086,21 @@ diff -urNp linux-2.6.31.4/arch/ia64/kernel/sys_ia64.c linux-2.6.31.4/arch/ia64/k goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S 2009-10-11 15:29:56.562357747 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/kernel/topology.c linux-2.6.31.5/arch/ia64/kernel/topology.c +--- linux-2.6.31.5/arch/ia64/kernel/topology.c 2009-10-20 20:42:58.971967718 -0400 ++++ linux-2.6.31.5/arch/ia64/kernel/topology.c 2009-10-20 20:33:11.013917396 -0400 +@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject + return ret; + } + +-static struct sysfs_ops cache_sysfs_ops = { ++static const struct sysfs_ops cache_sysfs_ops = { + .show = cache_show + }; + +diff -urNp linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S 2009-10-20 20:42:58.971967718 -0400 ++++ linux-2.6.31.5/arch/ia64/kernel/vmlinux.lds.S 2009-10-20 20:32:11.031345603 -0400 @@ -245,7 +245,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); @@ -1098,9 +1110,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.4/arch/ia6 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.31.4/arch/ia64/mm/fault.c linux-2.6.31.4/arch/ia64/mm/fault.c ---- linux-2.6.31.4/arch/ia64/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/mm/fault.c 2009-10-11 15:29:40.435419266 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/mm/fault.c linux-2.6.31.5/arch/ia64/mm/fault.c +--- linux-2.6.31.5/arch/ia64/mm/fault.c 2009-10-20 20:42:58.971967718 -0400 ++++ linux-2.6.31.5/arch/ia64/mm/fault.c 2009-10-20 20:32:11.031345603 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1150,9 +1162,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/mm/fault.c linux-2.6.31.4/arch/ia64/mm/fault survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.31.4/arch/ia64/mm/init.c linux-2.6.31.4/arch/ia64/mm/init.c ---- linux-2.6.31.4/arch/ia64/mm/init.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/mm/init.c 2009-10-11 15:29:40.465501498 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/mm/init.c linux-2.6.31.5/arch/ia64/mm/init.c +--- linux-2.6.31.5/arch/ia64/mm/init.c 2009-10-20 20:42:58.971967718 -0400 ++++ linux-2.6.31.5/arch/ia64/mm/init.c 2009-10-20 20:32:11.032216822 -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; @@ -1173,9 +1185,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/mm/init.c linux-2.6.31.4/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.31.4/arch/ia64/pci/pci.c linux-2.6.31.4/arch/ia64/pci/pci.c ---- linux-2.6.31.4/arch/ia64/pci/pci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/ia64/pci/pci.c 2009-10-12 23:35:28.183270176 -0400 +diff -urNp linux-2.6.31.5/arch/ia64/pci/pci.c linux-2.6.31.5/arch/ia64/pci/pci.c +--- linux-2.6.31.5/arch/ia64/pci/pci.c 2009-10-20 20:42:58.972952757 -0400 ++++ linux-2.6.31.5/arch/ia64/pci/pci.c 2009-10-20 20:32:11.032216822 -0400 @@ -56,10 +56,13 @@ int raw_pci_read(unsigned int seg, unsig if ((seg | reg) <= 255) { addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg); @@ -1206,9 +1218,9 @@ diff -urNp linux-2.6.31.4/arch/ia64/pci/pci.c linux-2.6.31.4/arch/ia64/pci/pci.c result = ia64_sal_pci_config_write(addr, mode, len, value); if (result != 0) return -EINVAL; -diff -urNp linux-2.6.31.4/arch/m32r/include/asm/atomic.h linux-2.6.31.4/arch/m32r/include/asm/atomic.h ---- linux-2.6.31.4/arch/m32r/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/m32r/include/asm/atomic.h 2009-10-11 15:29:40.466363930 -0400 +diff -urNp linux-2.6.31.5/arch/m32r/include/asm/atomic.h linux-2.6.31.5/arch/m32r/include/asm/atomic.h +--- linux-2.6.31.5/arch/m32r/include/asm/atomic.h 2009-10-20 20:42:58.972952757 -0400 ++++ linux-2.6.31.5/arch/m32r/include/asm/atomic.h 2009-10-20 20:32:11.032906662 -0400 @@ -29,6 +29,14 @@ #define atomic_read(v) ((v)->counter) @@ -1251,9 +1263,9 @@ diff -urNp linux-2.6.31.4/arch/m32r/include/asm/atomic.h linux-2.6.31.4/arch/m32 /* Atomic operations are already serializing on m32r */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.31.4/arch/m32r/lib/usercopy.c linux-2.6.31.4/arch/m32r/lib/usercopy.c ---- linux-2.6.31.4/arch/m32r/lib/usercopy.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/m32r/lib/usercopy.c 2009-10-11 15:29:40.488105689 -0400 +diff -urNp linux-2.6.31.5/arch/m32r/lib/usercopy.c linux-2.6.31.5/arch/m32r/lib/usercopy.c +--- linux-2.6.31.5/arch/m32r/lib/usercopy.c 2009-10-20 20:42:58.973931661 -0400 ++++ linux-2.6.31.5/arch/m32r/lib/usercopy.c 2009-10-20 20:32:11.032906662 -0400 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1274,9 +1286,9 @@ diff -urNp linux-2.6.31.4/arch/m32r/lib/usercopy.c linux-2.6.31.4/arch/m32r/lib/ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h ---- linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h 2009-10-11 15:29:40.503696410 -0400 +diff -urNp linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h +--- linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h 2009-10-20 20:42:58.974905064 -0400 ++++ linux-2.6.31.5/arch/m68k/include/asm/atomic_mm.h 2009-10-20 20:32:11.032906662 -0400 @@ -16,23 +16,40 @@ #define ATOMIC_INIT(i) { (i) } @@ -1318,9 +1330,9 @@ diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.4/arch/ static inline void atomic_dec(atomic_t *v) { __asm__ __volatile__("subql #1,%0" : "+m" (*v)); -diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h ---- linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h 2009-10-11 15:29:40.503696410 -0400 +diff -urNp linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h +--- linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h 2009-10-20 20:42:58.974905064 -0400 ++++ linux-2.6.31.5/arch/m68k/include/asm/atomic_no.h 2009-10-20 20:32:11.032906662 -0400 @@ -16,7 +16,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -1367,9 +1379,9 @@ diff -urNp linux-2.6.31.4/arch/m68k/include/asm/atomic_no.h linux-2.6.31.4/arch/ /* * atomic_inc_and_test - increment and test * @v: pointer of type atomic_t -diff -urNp linux-2.6.31.4/arch/mips/include/asm/atomic.h linux-2.6.31.4/arch/mips/include/asm/atomic.h ---- linux-2.6.31.4/arch/mips/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/include/asm/atomic.h 2009-10-11 15:29:40.503696410 -0400 +diff -urNp linux-2.6.31.5/arch/mips/include/asm/atomic.h linux-2.6.31.5/arch/mips/include/asm/atomic.h +--- linux-2.6.31.5/arch/mips/include/asm/atomic.h 2009-10-20 20:42:58.974905064 -0400 ++++ linux-2.6.31.5/arch/mips/include/asm/atomic.h 2009-10-20 20:32:11.033977911 -0400 @@ -32,6 +32,14 @@ #define atomic_read(v) ((v)->counter) @@ -1411,9 +1423,9 @@ diff -urNp linux-2.6.31.4/arch/mips/include/asm/atomic.h linux-2.6.31.4/arch/mip /* * atomic_dec - decrement and test -diff -urNp linux-2.6.31.4/arch/mips/include/asm/elf.h linux-2.6.31.4/arch/mips/include/asm/elf.h ---- linux-2.6.31.4/arch/mips/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/include/asm/elf.h 2009-10-11 15:29:40.504567695 -0400 +diff -urNp linux-2.6.31.5/arch/mips/include/asm/elf.h linux-2.6.31.5/arch/mips/include/asm/elf.h +--- linux-2.6.31.5/arch/mips/include/asm/elf.h 2009-10-20 20:42:58.974905064 -0400 ++++ linux-2.6.31.5/arch/mips/include/asm/elf.h 2009-10-20 20:32:11.033977911 -0400 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1426,9 +1438,9 @@ diff -urNp linux-2.6.31.4/arch/mips/include/asm/elf.h linux-2.6.31.4/arch/mips/i +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.31.4/arch/mips/include/asm/page.h linux-2.6.31.4/arch/mips/include/asm/page.h ---- linux-2.6.31.4/arch/mips/include/asm/page.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/include/asm/page.h 2009-10-11 15:29:40.519375120 -0400 +diff -urNp linux-2.6.31.5/arch/mips/include/asm/page.h linux-2.6.31.5/arch/mips/include/asm/page.h +--- linux-2.6.31.5/arch/mips/include/asm/page.h 2009-10-20 20:42:58.974905064 -0400 ++++ linux-2.6.31.5/arch/mips/include/asm/page.h 2009-10-20 20:32:11.033977911 -0400 @@ -92,7 +92,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; @@ -1438,9 +1450,9 @@ diff -urNp linux-2.6.31.4/arch/mips/include/asm/page.h linux-2.6.31.4/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.31.4/arch/mips/include/asm/system.h linux-2.6.31.4/arch/mips/include/asm/system.h ---- linux-2.6.31.4/arch/mips/include/asm/system.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/include/asm/system.h 2009-10-11 15:29:40.519375120 -0400 +diff -urNp linux-2.6.31.5/arch/mips/include/asm/system.h linux-2.6.31.5/arch/mips/include/asm/system.h +--- linux-2.6.31.5/arch/mips/include/asm/system.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/include/asm/system.h 2009-10-20 20:32:11.033977911 -0400 @@ -217,6 +217,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1449,9 +1461,9 @@ diff -urNp linux-2.6.31.4/arch/mips/include/asm/system.h linux-2.6.31.4/arch/mip +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c 2009-10-11 15:29:40.519375120 -0400 +diff -urNp linux-2.6.31.5/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.5/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.31.5/arch/mips/kernel/binfmt_elfn32.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/kernel/binfmt_elfn32.c 2009-10-20 20:32:11.033977911 -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) @@ -1466,9 +1478,9 @@ diff -urNp linux-2.6.31.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.4/arch/m #include #include #include -diff -urNp linux-2.6.31.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.31.4/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.31.4/arch/mips/kernel/binfmt_elfo32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/kernel/binfmt_elfo32.c 2009-10-11 15:29:40.519375120 -0400 +diff -urNp linux-2.6.31.5/arch/mips/kernel/binfmt_elfo32.c linux-2.6.31.5/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.31.5/arch/mips/kernel/binfmt_elfo32.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/kernel/binfmt_elfo32.c 2009-10-20 20:32:11.033977911 -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) @@ -1483,9 +1495,9 @@ diff -urNp linux-2.6.31.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.31.4/arch/m #include /* -diff -urNp linux-2.6.31.4/arch/mips/kernel/process.c linux-2.6.31.4/arch/mips/kernel/process.c ---- linux-2.6.31.4/arch/mips/kernel/process.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/kernel/process.c 2009-10-11 15:29:40.519375120 -0400 +diff -urNp linux-2.6.31.5/arch/mips/kernel/process.c linux-2.6.31.5/arch/mips/kernel/process.c +--- linux-2.6.31.5/arch/mips/kernel/process.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/kernel/process.c 2009-10-20 20:32:11.035243170 -0400 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1502,9 +1514,9 @@ diff -urNp linux-2.6.31.4/arch/mips/kernel/process.c linux-2.6.31.4/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.31.4/arch/mips/kernel/syscall.c linux-2.6.31.4/arch/mips/kernel/syscall.c ---- linux-2.6.31.4/arch/mips/kernel/syscall.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/kernel/syscall.c 2009-10-11 15:29:40.520684872 -0400 +diff -urNp linux-2.6.31.5/arch/mips/kernel/syscall.c linux-2.6.31.5/arch/mips/kernel/syscall.c +--- linux-2.6.31.5/arch/mips/kernel/syscall.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/kernel/syscall.c 2009-10-20 20:32:11.035243170 -0400 @@ -99,6 +99,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1526,9 +1538,9 @@ diff -urNp linux-2.6.31.4/arch/mips/kernel/syscall.c linux-2.6.31.4/arch/mips/ke if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.31.4/arch/mips/mm/fault.c linux-2.6.31.4/arch/mips/mm/fault.c ---- linux-2.6.31.4/arch/mips/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mips/mm/fault.c 2009-10-11 15:29:40.520684872 -0400 +diff -urNp linux-2.6.31.5/arch/mips/mm/fault.c linux-2.6.31.5/arch/mips/mm/fault.c +--- linux-2.6.31.5/arch/mips/mm/fault.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mips/mm/fault.c 2009-10-20 20:32:11.035243170 -0400 @@ -26,6 +26,23 @@ #include #include /* For VMALLOC_END */ @@ -1553,9 +1565,9 @@ diff -urNp linux-2.6.31.4/arch/mips/mm/fault.c linux-2.6.31.4/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.31.4/arch/mn10300/include/asm/atomic.h linux-2.6.31.4/arch/mn10300/include/asm/atomic.h ---- linux-2.6.31.4/arch/mn10300/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mn10300/include/asm/atomic.h 2009-10-11 15:29:40.520684872 -0400 +diff -urNp linux-2.6.31.5/arch/mn10300/include/asm/atomic.h linux-2.6.31.5/arch/mn10300/include/asm/atomic.h +--- linux-2.6.31.5/arch/mn10300/include/asm/atomic.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mn10300/include/asm/atomic.h 2009-10-20 20:32:11.035966669 -0400 @@ -34,6 +34,15 @@ #define atomic_read(v) ((v)->counter) @@ -1621,9 +1633,9 @@ diff -urNp linux-2.6.31.4/arch/mn10300/include/asm/atomic.h linux-2.6.31.4/arch/ static inline void atomic_dec(atomic_t *v) { atomic_sub_return(1, v); -diff -urNp linux-2.6.31.4/arch/mn10300/kernel/setup.c linux-2.6.31.4/arch/mn10300/kernel/setup.c ---- linux-2.6.31.4/arch/mn10300/kernel/setup.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/mn10300/kernel/setup.c 2009-10-11 15:29:40.521507126 -0400 +diff -urNp linux-2.6.31.5/arch/mn10300/kernel/setup.c linux-2.6.31.5/arch/mn10300/kernel/setup.c +--- linux-2.6.31.5/arch/mn10300/kernel/setup.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/mn10300/kernel/setup.c 2009-10-20 20:32:11.035966669 -0400 @@ -285,7 +285,7 @@ static void c_stop(struct seq_file *m, v { } @@ -1633,9 +1645,9 @@ diff -urNp linux-2.6.31.4/arch/mn10300/kernel/setup.c linux-2.6.31.4/arch/mn1030 .start = c_start, .next = c_next, .stop = c_stop, -diff -urNp linux-2.6.31.4/arch/parisc/include/asm/atomic.h linux-2.6.31.4/arch/parisc/include/asm/atomic.h ---- linux-2.6.31.4/arch/parisc/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/include/asm/atomic.h 2009-10-11 15:29:40.521507126 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/include/asm/atomic.h linux-2.6.31.5/arch/parisc/include/asm/atomic.h +--- linux-2.6.31.5/arch/parisc/include/asm/atomic.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/include/asm/atomic.h 2009-10-20 20:32:11.035966669 -0400 @@ -177,6 +177,18 @@ static __inline__ int __atomic_add_retur return ret; } @@ -1694,9 +1706,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/include/asm/atomic.h linux-2.6.31.4/arch/p #define atomic_dec(v) ((void)(__atomic_add_return( -1,(v)))) #define atomic_add_return(i,v) (__atomic_add_return( (i),(v))) -diff -urNp linux-2.6.31.4/arch/parisc/include/asm/elf.h linux-2.6.31.4/arch/parisc/include/asm/elf.h ---- linux-2.6.31.4/arch/parisc/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/include/asm/elf.h 2009-10-11 15:29:40.521507126 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/include/asm/elf.h linux-2.6.31.5/arch/parisc/include/asm/elf.h +--- linux-2.6.31.5/arch/parisc/include/asm/elf.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/include/asm/elf.h 2009-10-20 20:32:11.035966669 -0400 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1711,9 +1723,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/include/asm/elf.h linux-2.6.31.4/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.31.4/arch/parisc/include/asm/pgtable.h linux-2.6.31.4/arch/parisc/include/asm/pgtable.h ---- linux-2.6.31.4/arch/parisc/include/asm/pgtable.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/include/asm/pgtable.h 2009-10-11 15:29:40.521507126 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/include/asm/pgtable.h linux-2.6.31.5/arch/parisc/include/asm/pgtable.h +--- linux-2.6.31.5/arch/parisc/include/asm/pgtable.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/include/asm/pgtable.h 2009-10-20 20:32:11.036963136 -0400 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1732,9 +1744,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/include/asm/pgtable.h linux-2.6.31.4/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.31.4/arch/parisc/kernel/module.c linux-2.6.31.4/arch/parisc/kernel/module.c ---- linux-2.6.31.4/arch/parisc/kernel/module.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/kernel/module.c 2009-10-11 15:29:40.522555387 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/kernel/module.c linux-2.6.31.5/arch/parisc/kernel/module.c +--- linux-2.6.31.5/arch/parisc/kernel/module.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/kernel/module.c 2009-10-20 20:32:11.036963136 -0400 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1835,9 +1847,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/kernel/module.c linux-2.6.31.4/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.31.4/arch/parisc/kernel/sys_parisc.c linux-2.6.31.4/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.31.4/arch/parisc/kernel/sys_parisc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/kernel/sys_parisc.c 2009-10-11 15:29:40.522555387 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/kernel/sys_parisc.c linux-2.6.31.5/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.31.5/arch/parisc/kernel/sys_parisc.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/kernel/sys_parisc.c 2009-10-20 20:32:11.036963136 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1847,9 +1859,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/kernel/sys_parisc.c linux-2.6.31.4/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.31.4/arch/parisc/kernel/traps.c linux-2.6.31.4/arch/parisc/kernel/traps.c ---- linux-2.6.31.4/arch/parisc/kernel/traps.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/kernel/traps.c 2009-10-11 15:29:40.613367290 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/kernel/traps.c linux-2.6.31.5/arch/parisc/kernel/traps.c +--- linux-2.6.31.5/arch/parisc/kernel/traps.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/kernel/traps.c 2009-10-20 20:32:11.036963136 -0400 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -1861,9 +1873,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/kernel/traps.c linux-2.6.31.4/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.31.4/arch/parisc/mm/fault.c linux-2.6.31.4/arch/parisc/mm/fault.c ---- linux-2.6.31.4/arch/parisc/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/parisc/mm/fault.c 2009-10-11 15:29:40.613367290 -0400 +diff -urNp linux-2.6.31.5/arch/parisc/mm/fault.c linux-2.6.31.5/arch/parisc/mm/fault.c +--- linux-2.6.31.5/arch/parisc/mm/fault.c 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/parisc/mm/fault.c 2009-10-20 20:32:11.037911671 -0400 @@ -15,6 +15,7 @@ #include #include @@ -2033,9 +2045,9 @@ diff -urNp linux-2.6.31.4/arch/parisc/mm/fault.c linux-2.6.31.4/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/atomic.h linux-2.6.31.4/arch/powerpc/include/asm/atomic.h ---- linux-2.6.31.4/arch/powerpc/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/atomic.h 2009-10-11 15:29:40.614427595 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/atomic.h linux-2.6.31.5/arch/powerpc/include/asm/atomic.h +--- linux-2.6.31.5/arch/powerpc/include/asm/atomic.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/atomic.h 2009-10-20 20:32:11.037911671 -0400 @@ -24,11 +24,21 @@ static __inline__ int atomic_read(const return t; } @@ -2094,9 +2106,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/atomic.h linux-2.6.31.4/arch/ static __inline__ int atomic_inc_return(atomic_t *v) { int t; -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/elf.h linux-2.6.31.4/arch/powerpc/include/asm/elf.h ---- linux-2.6.31.4/arch/powerpc/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/elf.h 2009-10-11 15:29:40.614427595 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/elf.h linux-2.6.31.5/arch/powerpc/include/asm/elf.h +--- linux-2.6.31.5/arch/powerpc/include/asm/elf.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/elf.h 2009-10-20 20:32:11.037911671 -0400 @@ -179,8 +179,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. */ @@ -2129,9 +2141,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/elf.h linux-2.6.31.4/arch/pow #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.31.4/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.31.4/arch/powerpc/include/asm/kmap_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/kmap_types.h 2009-10-11 15:29:40.624678541 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/kmap_types.h linux-2.6.31.5/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.31.5/arch/powerpc/include/asm/kmap_types.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/kmap_types.h 2009-10-20 20:32:11.037911671 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -2140,9 +2152,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.31.4/a KM_TYPE_NR }; -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/page_64.h linux-2.6.31.4/arch/powerpc/include/asm/page_64.h ---- linux-2.6.31.4/arch/powerpc/include/asm/page_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/page_64.h 2009-10-11 15:29:40.625611745 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/page_64.h linux-2.6.31.5/arch/powerpc/include/asm/page_64.h +--- linux-2.6.31.5/arch/powerpc/include/asm/page_64.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/page_64.h 2009-10-20 20:32:11.037911671 -0400 @@ -170,15 +170,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -2164,9 +2176,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/page_64.h linux-2.6.31.4/arch #include -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/page.h linux-2.6.31.4/arch/powerpc/include/asm/page.h ---- linux-2.6.31.4/arch/powerpc/include/asm/page.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/page.h 2009-10-11 15:29:40.626417088 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/page.h linux-2.6.31.5/arch/powerpc/include/asm/page.h +--- linux-2.6.31.5/arch/powerpc/include/asm/page.h 2009-10-20 20:42:58.975887238 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/page.h 2009-10-20 20:32:11.037911671 -0400 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. @@ -2179,9 +2191,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/page.h linux-2.6.31.4/arch/po #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/pte-common.h linux-2.6.31.4/arch/powerpc/include/asm/pte-common.h ---- linux-2.6.31.4/arch/powerpc/include/asm/pte-common.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/pte-common.h 2009-10-11 15:29:40.627363132 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/pte-common.h linux-2.6.31.5/arch/powerpc/include/asm/pte-common.h +--- linux-2.6.31.5/arch/powerpc/include/asm/pte-common.h 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/pte-common.h 2009-10-20 20:32:11.037911671 -0400 @@ -121,11 +121,11 @@ extern unsigned long bad_call_to_PMD_PAG */ #define PAGE_NONE __pgprot(_PAGE_BASE) @@ -2197,9 +2209,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/pte-common.h linux-2.6.31.4/a #define __P000 PAGE_NONE #define __P001 PAGE_READONLY -diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.31.4/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.31.4/arch/powerpc/include/asm/pte-hash32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/pte-hash32.h 2009-10-11 15:29:40.627363132 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/pte-hash32.h linux-2.6.31.5/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.31.5/arch/powerpc/include/asm/pte-hash32.h 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/pte-hash32.h 2009-10-20 20:32:11.040127589 -0400 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2208,9 +2220,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/pte-hash32.h linux-2.6.31.4/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.31.4/arch/powerpc/include/asm/reg.h linux-2.6.31.4/arch/powerpc/include/asm/reg.h ---- linux-2.6.31.4/arch/powerpc/include/asm/reg.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/reg.h 2009-10-11 15:29:40.627363132 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/reg.h linux-2.6.31.5/arch/powerpc/include/asm/reg.h +--- linux-2.6.31.5/arch/powerpc/include/asm/reg.h 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/reg.h 2009-10-20 20:32:11.040934695 -0400 @@ -195,6 +195,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ @@ -2219,9 +2231,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/reg.h linux-2.6.31.4/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.31.4/arch/powerpc/include/asm/uaccess.h linux-2.6.31.4/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.31.4/arch/powerpc/include/asm/uaccess.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/include/asm/uaccess.h 2009-10-11 15:29:40.627363132 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/include/asm/uaccess.h linux-2.6.31.5/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.31.5/arch/powerpc/include/asm/uaccess.h 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/include/asm/uaccess.h 2009-10-20 20:32:11.040934695 -0400 @@ -327,52 +327,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -2393,9 +2405,21 @@ diff -urNp linux-2.6.31.4/arch/powerpc/include/asm/uaccess.h linux-2.6.31.4/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.31.4/arch/powerpc/kernel/module_32.c linux-2.6.31.4/arch/powerpc/kernel/module_32.c ---- linux-2.6.31.4/arch/powerpc/kernel/module_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/module_32.c 2009-10-11 15:29:40.628592547 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/cacheinfo.c linux-2.6.31.5/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.31.5/arch/powerpc/kernel/cacheinfo.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/cacheinfo.c 2009-10-20 20:33:11.013917396 -0400 +@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde + &cache_assoc_attr, + }; + +-static struct sysfs_ops cache_index_ops = { ++static const struct sysfs_ops cache_index_ops = { + .show = cache_index_show, + }; + +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/module_32.c linux-2.6.31.5/arch/powerpc/kernel/module_32.c +--- linux-2.6.31.5/arch/powerpc/kernel/module_32.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/module_32.c 2009-10-20 20:32:11.040934695 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2425,9 +2449,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/module_32.c linux-2.6.31.4/arch/po /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.31.4/arch/powerpc/kernel/process.c linux-2.6.31.4/arch/powerpc/kernel/process.c ---- linux-2.6.31.4/arch/powerpc/kernel/process.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/process.c 2009-10-11 15:29:40.628592547 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/process.c linux-2.6.31.5/arch/powerpc/kernel/process.c +--- linux-2.6.31.5/arch/powerpc/kernel/process.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/process.c 2009-10-20 20:32:11.040934695 -0400 @@ -1147,36 +1147,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; @@ -2465,9 +2489,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/process.c linux-2.6.31.4/arch/powe - - return ret; -} -diff -urNp linux-2.6.31.4/arch/powerpc/kernel/setup-common.c linux-2.6.31.4/arch/powerpc/kernel/setup-common.c ---- linux-2.6.31.4/arch/powerpc/kernel/setup-common.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/setup-common.c 2009-10-11 15:29:40.628592547 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/setup-common.c linux-2.6.31.5/arch/powerpc/kernel/setup-common.c +--- linux-2.6.31.5/arch/powerpc/kernel/setup-common.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/setup-common.c 2009-10-20 20:32:11.041884808 -0400 @@ -328,7 +328,7 @@ static void c_stop(struct seq_file *m, v { } @@ -2477,9 +2501,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/setup-common.c linux-2.6.31.4/arch .start =c_start, .next = c_next, .stop = c_stop, -diff -urNp linux-2.6.31.4/arch/powerpc/kernel/signal_32.c linux-2.6.31.4/arch/powerpc/kernel/signal_32.c ---- linux-2.6.31.4/arch/powerpc/kernel/signal_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/signal_32.c 2009-10-11 15:29:40.629482564 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/signal_32.c linux-2.6.31.5/arch/powerpc/kernel/signal_32.c +--- linux-2.6.31.5/arch/powerpc/kernel/signal_32.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/signal_32.c 2009-10-20 20:32:11.041884808 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2489,9 +2513,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/signal_32.c linux-2.6.31.4/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.31.4/arch/powerpc/kernel/signal_64.c linux-2.6.31.4/arch/powerpc/kernel/signal_64.c ---- linux-2.6.31.4/arch/powerpc/kernel/signal_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/signal_64.c 2009-10-11 15:29:40.629482564 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/signal_64.c linux-2.6.31.5/arch/powerpc/kernel/signal_64.c +--- linux-2.6.31.5/arch/powerpc/kernel/signal_64.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/signal_64.c 2009-10-20 20:32:11.041884808 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2501,9 +2525,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/signal_64.c linux-2.6.31.4/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.31.4/arch/powerpc/kernel/sys_ppc32.c linux-2.6.31.4/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.31.4/arch/powerpc/kernel/sys_ppc32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/sys_ppc32.c 2009-10-11 15:29:40.629482564 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/sys_ppc32.c linux-2.6.31.5/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.31.5/arch/powerpc/kernel/sys_ppc32.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/sys_ppc32.c 2009-10-20 20:32:11.041884808 -0400 @@ -552,10 +552,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { @@ -2517,9 +2541,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/sys_ppc32.c linux-2.6.31.4/arch/po } return error; } -diff -urNp linux-2.6.31.4/arch/powerpc/kernel/vdso.c linux-2.6.31.4/arch/powerpc/kernel/vdso.c ---- linux-2.6.31.4/arch/powerpc/kernel/vdso.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kernel/vdso.c 2009-10-11 15:29:40.630363096 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kernel/vdso.c linux-2.6.31.5/arch/powerpc/kernel/vdso.c +--- linux-2.6.31.5/arch/powerpc/kernel/vdso.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kernel/vdso.c 2009-10-20 20:32:11.043056532 -0400 @@ -35,6 +35,7 @@ #include #include @@ -2546,9 +2570,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kernel/vdso.c linux-2.6.31.4/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.31.4/arch/powerpc/kvm/timing.c linux-2.6.31.4/arch/powerpc/kvm/timing.c ---- linux-2.6.31.4/arch/powerpc/kvm/timing.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/kvm/timing.c 2009-10-11 15:29:40.651325654 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/kvm/timing.c linux-2.6.31.5/arch/powerpc/kvm/timing.c +--- linux-2.6.31.5/arch/powerpc/kvm/timing.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/kvm/timing.c 2009-10-20 20:32:11.043056532 -0400 @@ -201,7 +201,7 @@ static int kvmppc_exit_timing_open(struc return single_open(file, kvmppc_exit_timing_show, inode->i_private); } @@ -2558,9 +2582,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/kvm/timing.c linux-2.6.31.4/arch/powerpc/ .owner = THIS_MODULE, .open = kvmppc_exit_timing_open, .read = seq_read, -diff -urNp linux-2.6.31.4/arch/powerpc/lib/usercopy_64.c linux-2.6.31.4/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.31.4/arch/powerpc/lib/usercopy_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/lib/usercopy_64.c 2009-10-11 15:29:40.651325654 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/lib/usercopy_64.c linux-2.6.31.5/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.31.5/arch/powerpc/lib/usercopy_64.c 2009-10-20 20:42:58.979873583 -0400 ++++ linux-2.6.31.5/arch/powerpc/lib/usercopy_64.c 2009-10-20 20:32:11.043056532 -0400 @@ -9,22 +9,6 @@ #include #include @@ -2592,9 +2616,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/lib/usercopy_64.c linux-2.6.31.4/arch/pow -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.31.4/arch/powerpc/mm/fault.c linux-2.6.31.4/arch/powerpc/mm/fault.c ---- linux-2.6.31.4/arch/powerpc/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/mm/fault.c 2009-10-11 15:29:40.663258967 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/mm/fault.c linux-2.6.31.5/arch/powerpc/mm/fault.c +--- linux-2.6.31.5/arch/powerpc/mm/fault.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/mm/fault.c 2009-10-20 20:32:11.043056532 -0400 @@ -30,6 +30,10 @@ #include #include @@ -2699,9 +2723,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/mm/fault.c linux-2.6.31.4/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.31.4/arch/powerpc/mm/mmap_64.c linux-2.6.31.4/arch/powerpc/mm/mmap_64.c ---- linux-2.6.31.4/arch/powerpc/mm/mmap_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/mm/mmap_64.c 2009-10-11 15:29:40.707202687 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/mm/mmap_64.c linux-2.6.31.5/arch/powerpc/mm/mmap_64.c +--- linux-2.6.31.5/arch/powerpc/mm/mmap_64.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/mm/mmap_64.c 2009-10-20 20:32:11.044032135 -0400 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2725,9 +2749,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/mm/mmap_64.c linux-2.6.31.4/arch/powerpc/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.31.4/arch/powerpc/mm/slice.c linux-2.6.31.4/arch/powerpc/mm/slice.c ---- linux-2.6.31.4/arch/powerpc/mm/slice.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/mm/slice.c 2009-10-11 15:29:40.708190399 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/mm/slice.c linux-2.6.31.5/arch/powerpc/mm/slice.c +--- linux-2.6.31.5/arch/powerpc/mm/slice.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/mm/slice.c 2009-10-20 20:32:11.044032135 -0400 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2740,9 +2764,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/mm/slice.c linux-2.6.31.4/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.31.4/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.31.4/arch/powerpc/platforms/cell/spufs/file.c ---- linux-2.6.31.4/arch/powerpc/platforms/cell/spufs/file.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/platforms/cell/spufs/file.c 2009-10-11 15:29:40.708190399 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.31.5/arch/powerpc/platforms/cell/spufs/file.c +--- linux-2.6.31.5/arch/powerpc/platforms/cell/spufs/file.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/platforms/cell/spufs/file.c 2009-10-20 20:32:11.044032135 -0400 @@ -147,7 +147,7 @@ static int __fops ## _open(struct inode __simple_attr_check_format(__fmt, 0ull); \ return spufs_attr_open(inode, file, __get, __set, __fmt); \ @@ -2815,9 +2839,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.31. .fault = spufs_mfc_mmap_fault, }; -diff -urNp linux-2.6.31.4/arch/powerpc/platforms/pseries/dtl.c linux-2.6.31.4/arch/powerpc/platforms/pseries/dtl.c ---- linux-2.6.31.4/arch/powerpc/platforms/pseries/dtl.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/platforms/pseries/dtl.c 2009-10-11 15:29:40.748219183 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/platforms/pseries/dtl.c linux-2.6.31.5/arch/powerpc/platforms/pseries/dtl.c +--- linux-2.6.31.5/arch/powerpc/platforms/pseries/dtl.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/platforms/pseries/dtl.c 2009-10-20 20:32:11.045004501 -0400 @@ -209,7 +209,7 @@ static ssize_t dtl_file_read(struct file return n_read * sizeof(struct dtl_entry); } @@ -2827,9 +2851,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/platforms/pseries/dtl.c linux-2.6.31.4/ar .open = dtl_file_open, .release = dtl_file_release, .read = dtl_file_read, -diff -urNp linux-2.6.31.4/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.31.4/arch/powerpc/platforms/pseries/hvCall_inst.c ---- linux-2.6.31.4/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-10-11 15:29:40.748219183 -0400 +diff -urNp linux-2.6.31.5/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.31.5/arch/powerpc/platforms/pseries/hvCall_inst.c +--- linux-2.6.31.5/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-10-20 20:32:11.045004501 -0400 @@ -71,7 +71,7 @@ static int hc_show(struct seq_file *m, v return 0; } @@ -2839,9 +2863,9 @@ diff -urNp linux-2.6.31.4/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6 .start = hc_start, .next = hc_next, .stop = hc_stop, -diff -urNp linux-2.6.31.4/arch/s390/hypfs/inode.c linux-2.6.31.4/arch/s390/hypfs/inode.c ---- linux-2.6.31.4/arch/s390/hypfs/inode.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/s390/hypfs/inode.c 2009-10-11 15:29:40.748219183 -0400 +diff -urNp linux-2.6.31.5/arch/s390/hypfs/inode.c linux-2.6.31.5/arch/s390/hypfs/inode.c +--- linux-2.6.31.5/arch/s390/hypfs/inode.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/s390/hypfs/inode.c 2009-10-20 20:32:11.045004501 -0400 @@ -41,7 +41,7 @@ struct hypfs_sb_info { static const struct file_operations hypfs_file_ops; @@ -2860,9 +2884,9 @@ diff -urNp linux-2.6.31.4/arch/s390/hypfs/inode.c linux-2.6.31.4/arch/s390/hypfs .statfs = simple_statfs, .drop_inode = hypfs_drop_inode, .show_options = hypfs_show_options, -diff -urNp linux-2.6.31.4/arch/s390/include/asm/atomic.h linux-2.6.31.4/arch/s390/include/asm/atomic.h ---- linux-2.6.31.4/arch/s390/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/s390/include/asm/atomic.h 2009-10-11 15:29:40.749192014 -0400 +diff -urNp linux-2.6.31.5/arch/s390/include/asm/atomic.h linux-2.6.31.5/arch/s390/include/asm/atomic.h +--- linux-2.6.31.5/arch/s390/include/asm/atomic.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/s390/include/asm/atomic.h 2009-10-20 20:32:11.045004501 -0400 @@ -71,19 +71,31 @@ static inline int atomic_read(const atom return v->counter; } @@ -2903,9 +2927,9 @@ diff -urNp linux-2.6.31.4/arch/s390/include/asm/atomic.h linux-2.6.31.4/arch/s39 #define atomic_sub_and_test(_i, _v) (atomic_sub_return(_i, _v) == 0) #define atomic_dec(_v) atomic_sub_return(1, _v) #define atomic_dec_return(_v) atomic_sub_return(1, _v) -diff -urNp linux-2.6.31.4/arch/s390/include/asm/uaccess.h linux-2.6.31.4/arch/s390/include/asm/uaccess.h ---- linux-2.6.31.4/arch/s390/include/asm/uaccess.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/s390/include/asm/uaccess.h 2009-10-11 15:29:40.749192014 -0400 +diff -urNp linux-2.6.31.5/arch/s390/include/asm/uaccess.h linux-2.6.31.5/arch/s390/include/asm/uaccess.h +--- linux-2.6.31.5/arch/s390/include/asm/uaccess.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/s390/include/asm/uaccess.h 2009-10-20 20:32:11.045004501 -0400 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -2938,9 +2962,9 @@ diff -urNp linux-2.6.31.4/arch/s390/include/asm/uaccess.h linux-2.6.31.4/arch/s3 if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.31.4/arch/s390/kernel/module.c linux-2.6.31.4/arch/s390/kernel/module.c ---- linux-2.6.31.4/arch/s390/kernel/module.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/s390/kernel/module.c 2009-10-11 15:29:40.750174954 -0400 +diff -urNp linux-2.6.31.5/arch/s390/kernel/module.c linux-2.6.31.5/arch/s390/kernel/module.c +--- linux-2.6.31.5/arch/s390/kernel/module.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/s390/kernel/module.c 2009-10-20 20:32:11.045983864 -0400 @@ -164,11 +164,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -3012,9 +3036,9 @@ diff -urNp linux-2.6.31.4/arch/s390/kernel/module.c linux-2.6.31.4/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.31.4/arch/sh/include/asm/atomic.h linux-2.6.31.4/arch/sh/include/asm/atomic.h ---- linux-2.6.31.4/arch/sh/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sh/include/asm/atomic.h 2009-10-11 15:29:40.750174954 -0400 +diff -urNp linux-2.6.31.5/arch/sh/include/asm/atomic.h linux-2.6.31.5/arch/sh/include/asm/atomic.h +--- linux-2.6.31.5/arch/sh/include/asm/atomic.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sh/include/asm/atomic.h 2009-10-20 20:32:11.045983864 -0400 @@ -14,7 +14,9 @@ #define ATOMIC_INIT(i) ( (atomic_t) { (i) } ) @@ -3035,9 +3059,21 @@ diff -urNp linux-2.6.31.4/arch/sh/include/asm/atomic.h linux-2.6.31.4/arch/sh/in #define atomic_dec(v) atomic_sub(1,(v)) #if !defined(CONFIG_GUSA_RB) && !defined(CONFIG_CPU_SH4A) -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/atomic_32.h linux-2.6.31.4/arch/sparc/include/asm/atomic_32.h ---- linux-2.6.31.4/arch/sparc/include/asm/atomic_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/atomic_32.h 2009-10-11 15:29:40.750174954 -0400 +diff -urNp linux-2.6.31.5/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.31.5/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.31.5/arch/sh/kernel/cpu/sh4/sq.c 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sh/kernel/cpu/sh4/sq.c 2009-10-20 20:33:11.013917396 -0400 +@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ + NULL, + }; + +-static struct sysfs_ops sq_sysfs_ops = { ++static const struct sysfs_ops sq_sysfs_ops = { + .show = sq_sysfs_show, + .store = sq_sysfs_store, + }; +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/atomic_32.h linux-2.6.31.5/arch/sparc/include/asm/atomic_32.h +--- linux-2.6.31.5/arch/sparc/include/asm/atomic_32.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/atomic_32.h 2009-10-20 20:32:11.045983864 -0400 @@ -24,12 +24,17 @@ extern int atomic_cmpxchg(atomic_t *, in #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) extern int atomic_add_unless(atomic_t *, int, int); @@ -3056,9 +3092,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/atomic_32.h linux-2.6.31.4/arch #define atomic_dec(v) ((void)__atomic_add_return( -1, (v))) #define atomic_add_return(i, v) (__atomic_add_return( (int)(i), (v))) -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/atomic_64.h linux-2.6.31.4/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.31.4/arch/sparc/include/asm/atomic_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/atomic_64.h 2009-10-11 15:29:40.750174954 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/atomic_64.h linux-2.6.31.5/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.31.5/arch/sparc/include/asm/atomic_64.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/atomic_64.h 2009-10-20 20:32:11.045983864 -0400 @@ -14,14 +14,18 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3152,9 +3188,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/atomic_64.h linux-2.6.31.4/arch } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/elf_32.h linux-2.6.31.4/arch/sparc/include/asm/elf_32.h ---- linux-2.6.31.4/arch/sparc/include/asm/elf_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/elf_32.h 2009-10-11 15:29:40.751151087 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/elf_32.h linux-2.6.31.5/arch/sparc/include/asm/elf_32.h +--- linux-2.6.31.5/arch/sparc/include/asm/elf_32.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/elf_32.h 2009-10-20 20:32:11.045983864 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3169,9 +3205,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/elf_32.h linux-2.6.31.4/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.31.4/arch/sparc/include/asm/elf_64.h linux-2.6.31.4/arch/sparc/include/asm/elf_64.h ---- linux-2.6.31.4/arch/sparc/include/asm/elf_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/elf_64.h 2009-10-11 15:29:40.751151087 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/elf_64.h linux-2.6.31.5/arch/sparc/include/asm/elf_64.h +--- linux-2.6.31.5/arch/sparc/include/asm/elf_64.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/elf_64.h 2009-10-20 20:32:11.045983864 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3185,9 +3221,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/elf_64.h linux-2.6.31.4/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.31.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.31.4/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.31.4/arch/sparc/include/asm/pgtable_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/pgtable_32.h 2009-10-11 15:29:40.752121950 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/pgtable_32.h linux-2.6.31.5/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.31.5/arch/sparc/include/asm/pgtable_32.h 2009-10-20 20:42:58.983192134 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/pgtable_32.h 2009-10-20 20:32:11.046954331 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3219,9 +3255,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.31.4/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.31.4/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.31.4/arch/sparc/include/asm/pgtsrmmu.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/pgtsrmmu.h 2009-10-11 15:29:40.752121950 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.31.5/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.31.5/arch/sparc/include/asm/pgtsrmmu.h 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/pgtsrmmu.h 2009-10-20 20:32:11.046954331 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3236,9 +3272,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.31.4/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.4/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.31.4/arch/sparc/include/asm/spinlock_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/spinlock_64.h 2009-10-11 15:29:40.752121950 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.5/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.31.5/arch/sparc/include/asm/spinlock_64.h 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/spinlock_64.h 2009-10-20 20:32:11.046954331 -0400 @@ -99,7 +99,12 @@ static void inline __read_lock(raw_rwloc __asm__ __volatile__ ( "1: ldsw [%2], %0\n" @@ -3290,9 +3326,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.4/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.31.4/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.31.4/arch/sparc/include/asm/uaccess_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/uaccess_32.h 2009-10-11 15:29:40.752121950 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/uaccess_32.h linux-2.6.31.5/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.31.5/arch/sparc/include/asm/uaccess_32.h 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/uaccess_32.h 2009-10-20 20:32:11.047886657 -0400 @@ -249,27 +249,49 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) @@ -3347,9 +3383,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.31.4/arc return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.31.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.31.4/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.31.4/arch/sparc/include/asm/uaccess_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/include/asm/uaccess_64.h 2009-10-11 15:29:40.753260906 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/include/asm/uaccess_64.h linux-2.6.31.5/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.31.5/arch/sparc/include/asm/uaccess_64.h 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/include/asm/uaccess_64.h 2009-10-20 20:32:11.047886657 -0400 @@ -212,7 +212,15 @@ extern unsigned long copy_from_user_fixu static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) @@ -3384,9 +3420,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.31.4/arc if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); -diff -urNp linux-2.6.31.4/arch/sparc/kernel/Makefile linux-2.6.31.4/arch/sparc/kernel/Makefile ---- linux-2.6.31.4/arch/sparc/kernel/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/kernel/Makefile 2009-10-11 15:29:40.753260906 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/kernel/Makefile linux-2.6.31.5/arch/sparc/kernel/Makefile +--- linux-2.6.31.5/arch/sparc/kernel/Makefile 2009-10-23 19:50:16.633068862 -0400 ++++ linux-2.6.31.5/arch/sparc/kernel/Makefile 2009-10-23 19:50:24.532187590 -0400 @@ -3,7 +3,7 @@ # @@ -3396,9 +3432,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/kernel/Makefile linux-2.6.31.4/arch/sparc/k extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.31.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.31.4/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.31.4/arch/sparc/kernel/sys_sparc_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/kernel/sys_sparc_32.c 2009-10-11 15:29:40.753260906 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/kernel/sys_sparc_32.c linux-2.6.31.5/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.31.5/arch/sparc/kernel/sys_sparc_32.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/kernel/sys_sparc_32.c 2009-10-20 20:32:11.047886657 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3408,9 +3444,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.31.4/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.31.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.31.4/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.31.4/arch/sparc/kernel/sys_sparc_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/kernel/sys_sparc_64.c 2009-10-11 15:29:40.753260906 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/kernel/sys_sparc_64.c linux-2.6.31.5/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.31.5/arch/sparc/kernel/sys_sparc_64.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/kernel/sys_sparc_64.c 2009-10-20 20:32:11.047886657 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -3489,9 +3525,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.31.4/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.31.4/arch/sparc/kernel/traps_64.c linux-2.6.31.4/arch/sparc/kernel/traps_64.c ---- linux-2.6.31.4/arch/sparc/kernel/traps_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/kernel/traps_64.c 2009-10-11 15:29:40.754377338 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/kernel/traps_64.c linux-2.6.31.5/arch/sparc/kernel/traps_64.c +--- linux-2.6.31.5/arch/sparc/kernel/traps_64.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/kernel/traps_64.c 2009-10-20 20:32:11.048913412 -0400 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3523,9 +3559,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/kernel/traps_64.c linux-2.6.31.4/arch/sparc dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.31.4/arch/sparc/lib/atomic32.c linux-2.6.31.4/arch/sparc/lib/atomic32.c ---- linux-2.6.31.4/arch/sparc/lib/atomic32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/lib/atomic32.c 2009-10-11 15:29:40.754377338 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/lib/atomic32.c linux-2.6.31.5/arch/sparc/lib/atomic32.c +--- linux-2.6.31.5/arch/sparc/lib/atomic32.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/lib/atomic32.c 2009-10-20 20:32:11.048913412 -0400 @@ -80,6 +80,12 @@ void atomic_set(atomic_t *v, int i) } EXPORT_SYMBOL(atomic_set); @@ -3539,9 +3575,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/lib/atomic32.c linux-2.6.31.4/arch/sparc/li unsigned long ___set_bit(unsigned long *addr, unsigned long mask) { unsigned long old, flags; -diff -urNp linux-2.6.31.4/arch/sparc/lib/atomic_64.S linux-2.6.31.4/arch/sparc/lib/atomic_64.S ---- linux-2.6.31.4/arch/sparc/lib/atomic_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/lib/atomic_64.S 2009-10-11 15:29:40.754377338 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/lib/atomic_64.S linux-2.6.31.5/arch/sparc/lib/atomic_64.S +--- linux-2.6.31.5/arch/sparc/lib/atomic_64.S 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/lib/atomic_64.S 2009-10-20 20:32:11.049885138 -0400 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3694,9 +3730,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/lib/atomic_64.S linux-2.6.31.4/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.31.4/arch/sparc/lib/ksyms.c linux-2.6.31.4/arch/sparc/lib/ksyms.c ---- linux-2.6.31.4/arch/sparc/lib/ksyms.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/lib/ksyms.c 2009-10-11 15:29:40.755534860 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/lib/ksyms.c linux-2.6.31.5/arch/sparc/lib/ksyms.c +--- linux-2.6.31.5/arch/sparc/lib/ksyms.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/lib/ksyms.c 2009-10-20 20:32:11.049885138 -0400 @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3708,9 +3744,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/lib/ksyms.c linux-2.6.31.4/arch/sparc/lib/k EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.31.4/arch/sparc/lib/rwsem_64.S linux-2.6.31.4/arch/sparc/lib/rwsem_64.S ---- linux-2.6.31.4/arch/sparc/lib/rwsem_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/lib/rwsem_64.S 2009-10-11 15:29:40.756220631 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/lib/rwsem_64.S linux-2.6.31.5/arch/sparc/lib/rwsem_64.S +--- linux-2.6.31.5/arch/sparc/lib/rwsem_64.S 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/lib/rwsem_64.S 2009-10-20 20:32:11.049885138 -0400 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -3809,10 +3845,10 @@ diff -urNp linux-2.6.31.4/arch/sparc/lib/rwsem_64.S linux-2.6.31.4/arch/sparc/li cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.31.4/arch/sparc/Makefile linux-2.6.31.4/arch/sparc/Makefile ---- linux-2.6.31.4/arch/sparc/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/Makefile 2009-10-11 15:29:40.756220631 -0400 -@@ -81,7 +81,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc +diff -urNp linux-2.6.31.5/arch/sparc/Makefile linux-2.6.31.5/arch/sparc/Makefile +--- linux-2.6.31.5/arch/sparc/Makefile 2009-10-23 19:50:16.600032950 -0400 ++++ linux-2.6.31.5/arch/sparc/Makefile 2009-10-23 19:50:24.505219533 -0400 +@@ -77,7 +77,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN VMLINUX_INIT := $(head-y) $(init-y) @@ -3821,9 +3857,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/Makefile linux-2.6.31.4/arch/sparc/Makefile VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.31.4/arch/sparc/mm/fault_32.c linux-2.6.31.4/arch/sparc/mm/fault_32.c ---- linux-2.6.31.4/arch/sparc/mm/fault_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/mm/fault_32.c 2009-10-11 15:29:40.756220631 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/mm/fault_32.c linux-2.6.31.5/arch/sparc/mm/fault_32.c +--- linux-2.6.31.5/arch/sparc/mm/fault_32.c 2009-10-20 20:42:58.986604731 -0400 ++++ linux-2.6.31.5/arch/sparc/mm/fault_32.c 2009-10-20 20:32:11.049885138 -0400 @@ -21,6 +21,9 @@ #include #include @@ -4127,9 +4163,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/mm/fault_32.c linux-2.6.31.4/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.31.4/arch/sparc/mm/fault_64.c linux-2.6.31.4/arch/sparc/mm/fault_64.c ---- linux-2.6.31.4/arch/sparc/mm/fault_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/mm/fault_64.c 2009-10-11 15:29:40.756220631 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/mm/fault_64.c linux-2.6.31.5/arch/sparc/mm/fault_64.c +--- linux-2.6.31.5/arch/sparc/mm/fault_64.c 2009-10-20 20:42:58.990026889 -0400 ++++ linux-2.6.31.5/arch/sparc/mm/fault_64.c 2009-10-20 20:32:11.050876092 -0400 @@ -20,6 +20,9 @@ #include #include @@ -4587,9 +4623,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/mm/fault_64.c linux-2.6.31.4/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.31.4/arch/sparc/mm/init_32.c linux-2.6.31.4/arch/sparc/mm/init_32.c ---- linux-2.6.31.4/arch/sparc/mm/init_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/mm/init_32.c 2009-10-11 15:29:40.757490633 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/mm/init_32.c linux-2.6.31.5/arch/sparc/mm/init_32.c +--- linux-2.6.31.5/arch/sparc/mm/init_32.c 2009-10-20 20:42:58.990026889 -0400 ++++ linux-2.6.31.5/arch/sparc/mm/init_32.c 2009-10-20 20:32:11.050876092 -0400 @@ -316,6 +316,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4624,9 +4660,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/mm/init_32.c linux-2.6.31.4/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.31.4/arch/sparc/mm/Makefile linux-2.6.31.4/arch/sparc/mm/Makefile ---- linux-2.6.31.4/arch/sparc/mm/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/mm/Makefile 2009-10-11 15:29:40.757490633 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/mm/Makefile linux-2.6.31.5/arch/sparc/mm/Makefile +--- linux-2.6.31.5/arch/sparc/mm/Makefile 2009-10-20 20:42:58.990026889 -0400 ++++ linux-2.6.31.5/arch/sparc/mm/Makefile 2009-10-20 20:32:11.050876092 -0400 @@ -2,7 +2,7 @@ # @@ -4636,9 +4672,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/mm/Makefile linux-2.6.31.4/arch/sparc/mm/Ma obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.31.4/arch/sparc/mm/srmmu.c linux-2.6.31.4/arch/sparc/mm/srmmu.c ---- linux-2.6.31.4/arch/sparc/mm/srmmu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/sparc/mm/srmmu.c 2009-10-11 15:29:40.758208353 -0400 +diff -urNp linux-2.6.31.5/arch/sparc/mm/srmmu.c linux-2.6.31.5/arch/sparc/mm/srmmu.c +--- linux-2.6.31.5/arch/sparc/mm/srmmu.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/sparc/mm/srmmu.c 2009-10-20 20:32:11.050876092 -0400 @@ -2149,6 +2149,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -4653,9 +4689,9 @@ diff -urNp linux-2.6.31.4/arch/sparc/mm/srmmu.c linux-2.6.31.4/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.31.4/arch/um/include/asm/kmap_types.h linux-2.6.31.4/arch/um/include/asm/kmap_types.h ---- linux-2.6.31.4/arch/um/include/asm/kmap_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/um/include/asm/kmap_types.h 2009-10-11 15:29:40.758208353 -0400 +diff -urNp linux-2.6.31.5/arch/um/include/asm/kmap_types.h linux-2.6.31.5/arch/um/include/asm/kmap_types.h +--- linux-2.6.31.5/arch/um/include/asm/kmap_types.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/um/include/asm/kmap_types.h 2009-10-20 20:32:11.050876092 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4664,9 +4700,9 @@ diff -urNp linux-2.6.31.4/arch/um/include/asm/kmap_types.h linux-2.6.31.4/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.31.4/arch/um/include/asm/page.h linux-2.6.31.4/arch/um/include/asm/page.h ---- linux-2.6.31.4/arch/um/include/asm/page.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/um/include/asm/page.h 2009-10-11 15:29:40.758208353 -0400 +diff -urNp linux-2.6.31.5/arch/um/include/asm/page.h linux-2.6.31.5/arch/um/include/asm/page.h +--- linux-2.6.31.5/arch/um/include/asm/page.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/um/include/asm/page.h 2009-10-20 20:32:11.050876092 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4677,9 +4713,9 @@ diff -urNp linux-2.6.31.4/arch/um/include/asm/page.h linux-2.6.31.4/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.31.4/arch/um/sys-i386/syscalls.c linux-2.6.31.4/arch/um/sys-i386/syscalls.c ---- linux-2.6.31.4/arch/um/sys-i386/syscalls.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/um/sys-i386/syscalls.c 2009-10-11 15:29:40.758208353 -0400 +diff -urNp linux-2.6.31.5/arch/um/sys-i386/syscalls.c linux-2.6.31.5/arch/um/sys-i386/syscalls.c +--- linux-2.6.31.5/arch/um/sys-i386/syscalls.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/um/sys-i386/syscalls.c 2009-10-20 20:32:11.050876092 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4702,9 +4738,9 @@ diff -urNp linux-2.6.31.4/arch/um/sys-i386/syscalls.c linux-2.6.31.4/arch/um/sys /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.31.4/arch/x86/boot/bitops.h linux-2.6.31.4/arch/x86/boot/bitops.h ---- linux-2.6.31.4/arch/x86/boot/bitops.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/bitops.h 2009-10-11 15:29:40.759197597 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/bitops.h linux-2.6.31.5/arch/x86/boot/bitops.h +--- linux-2.6.31.5/arch/x86/boot/bitops.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/bitops.h 2009-10-20 20:32:11.050876092 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -4723,9 +4759,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/bitops.h linux-2.6.31.4/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.31.4/arch/x86/boot/boot.h linux-2.6.31.4/arch/x86/boot/boot.h ---- linux-2.6.31.4/arch/x86/boot/boot.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/boot.h 2009-10-11 15:29:40.759197597 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/boot.h linux-2.6.31.5/arch/x86/boot/boot.h +--- linux-2.6.31.5/arch/x86/boot/boot.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/boot.h 2009-10-20 20:32:11.050876092 -0400 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -4744,9 +4780,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/boot.h linux-2.6.31.4/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/head_32.S linux-2.6.31.4/arch/x86/boot/compressed/head_32.S ---- linux-2.6.31.4/arch/x86/boot/compressed/head_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/compressed/head_32.S 2009-10-11 15:29:40.759197597 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/compressed/head_32.S linux-2.6.31.5/arch/x86/boot/compressed/head_32.S +--- linux-2.6.31.5/arch/x86/boot/compressed/head_32.S 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/compressed/head_32.S 2009-10-20 20:32:11.050876092 -0400 @@ -75,7 +75,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4775,9 +4811,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/head_32.S linux-2.6.31.4/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/head_64.S linux-2.6.31.4/arch/x86/boot/compressed/head_64.S ---- linux-2.6.31.4/arch/x86/boot/compressed/head_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/compressed/head_64.S 2009-10-11 15:29:40.759197597 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/compressed/head_64.S linux-2.6.31.5/arch/x86/boot/compressed/head_64.S +--- linux-2.6.31.5/arch/x86/boot/compressed/head_64.S 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/compressed/head_64.S 2009-10-20 20:32:11.050876092 -0400 @@ -90,7 +90,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx @@ -4796,9 +4832,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/head_64.S linux-2.6.31.4/arch #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/misc.c linux-2.6.31.4/arch/x86/boot/compressed/misc.c ---- linux-2.6.31.4/arch/x86/boot/compressed/misc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/compressed/misc.c 2009-10-11 15:29:40.760169296 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/compressed/misc.c linux-2.6.31.5/arch/x86/boot/compressed/misc.c +--- linux-2.6.31.5/arch/x86/boot/compressed/misc.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/compressed/misc.c 2009-10-20 20:32:11.050876092 -0400 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -4817,9 +4853,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/misc.c linux-2.6.31.4/arch/x8 error("Wrong destination address"); #endif -diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/mkpiggy.c linux-2.6.31.4/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.31.4/arch/x86/boot/compressed/mkpiggy.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/compressed/mkpiggy.c 2009-10-11 15:29:40.760169296 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/compressed/mkpiggy.c linux-2.6.31.5/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.31.5/arch/x86/boot/compressed/mkpiggy.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/compressed/mkpiggy.c 2009-10-20 20:32:11.050876092 -0400 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -4829,9 +4865,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/mkpiggy.c linux-2.6.31.4/arch offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/relocs.c linux-2.6.31.4/arch/x86/boot/compressed/relocs.c ---- linux-2.6.31.4/arch/x86/boot/compressed/relocs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/compressed/relocs.c 2009-10-11 15:29:56.555367199 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/compressed/relocs.c linux-2.6.31.5/arch/x86/boot/compressed/relocs.c +--- linux-2.6.31.5/arch/x86/boot/compressed/relocs.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/compressed/relocs.c 2009-10-20 20:32:11.050876092 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include @@ -5032,9 +5068,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/compressed/relocs.c linux-2.6.31.4/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.31.4/arch/x86/boot/cpucheck.c linux-2.6.31.4/arch/x86/boot/cpucheck.c ---- linux-2.6.31.4/arch/x86/boot/cpucheck.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/cpucheck.c 2009-10-11 15:29:40.760169296 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/cpucheck.c linux-2.6.31.5/arch/x86/boot/cpucheck.c +--- linux-2.6.31.5/arch/x86/boot/cpucheck.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/cpucheck.c 2009-10-20 20:32:11.050876092 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5130,9 +5166,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/cpucheck.c linux-2.6.31.4/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.31.4/arch/x86/boot/header.S linux-2.6.31.4/arch/x86/boot/header.S ---- linux-2.6.31.4/arch/x86/boot/header.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/header.S 2009-10-11 15:29:40.761273749 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/header.S linux-2.6.31.5/arch/x86/boot/header.S +--- linux-2.6.31.5/arch/x86/boot/header.S 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/header.S 2009-10-20 20:32:11.050876092 -0400 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5142,9 +5178,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/header.S linux-2.6.31.4/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.31.4/arch/x86/boot/video-vesa.c linux-2.6.31.4/arch/x86/boot/video-vesa.c ---- linux-2.6.31.4/arch/x86/boot/video-vesa.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/boot/video-vesa.c 2009-10-11 15:29:40.761273749 -0400 +diff -urNp linux-2.6.31.5/arch/x86/boot/video-vesa.c linux-2.6.31.5/arch/x86/boot/video-vesa.c +--- linux-2.6.31.5/arch/x86/boot/video-vesa.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/boot/video-vesa.c 2009-10-20 20:32:11.054286952 -0400 @@ -205,6 +205,7 @@ static void vesa_store_pm_info(void) boot_params.screen_info.vesapm_seg = oreg.es; @@ -5153,9 +5189,9 @@ diff -urNp linux-2.6.31.4/arch/x86/boot/video-vesa.c linux-2.6.31.4/arch/x86/boo } /* -diff -urNp linux-2.6.31.4/arch/x86/ia32/ia32_signal.c linux-2.6.31.4/arch/x86/ia32/ia32_signal.c ---- linux-2.6.31.4/arch/x86/ia32/ia32_signal.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/ia32/ia32_signal.c 2009-10-11 15:29:40.762194225 -0400 +diff -urNp linux-2.6.31.5/arch/x86/ia32/ia32_signal.c linux-2.6.31.5/arch/x86/ia32/ia32_signal.c +--- linux-2.6.31.5/arch/x86/ia32/ia32_signal.c 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/ia32/ia32_signal.c 2009-10-20 20:32:11.054286952 -0400 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5174,9 +5210,9 @@ diff -urNp linux-2.6.31.4/arch/x86/ia32/ia32_signal.c linux-2.6.31.4/arch/x86/ia }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/alternative.h linux-2.6.31.4/arch/x86/include/asm/alternative.h ---- linux-2.6.31.4/arch/x86/include/asm/alternative.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/alternative.h 2009-10-11 15:29:40.762194225 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/alternative.h linux-2.6.31.5/arch/x86/include/asm/alternative.h +--- linux-2.6.31.5/arch/x86/include/asm/alternative.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/alternative.h 2009-10-20 20:32:11.054286952 -0400 @@ -87,7 +87,7 @@ const unsigned char *const *find_nop_tab " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -5186,9 +5222,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/alternative.h linux-2.6.31.4/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.31.4/arch/x86/include/asm/apm.h linux-2.6.31.4/arch/x86/include/asm/apm.h ---- linux-2.6.31.4/arch/x86/include/asm/apm.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/apm.h 2009-10-11 15:29:40.762194225 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/apm.h linux-2.6.31.5/arch/x86/include/asm/apm.h +--- linux-2.6.31.5/arch/x86/include/asm/apm.h 2009-10-20 20:42:58.993444625 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/apm.h 2009-10-20 20:32:11.054286952 -0400 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5207,9 +5243,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/apm.h linux-2.6.31.4/arch/x86/inc "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.31.4/arch/x86/include/asm/atomic_32.h linux-2.6.31.4/arch/x86/include/asm/atomic_32.h ---- linux-2.6.31.4/arch/x86/include/asm/atomic_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/atomic_32.h 2009-10-11 15:29:40.762194225 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/atomic_32.h linux-2.6.31.5/arch/x86/include/asm/atomic_32.h +--- linux-2.6.31.5/arch/x86/include/asm/atomic_32.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/atomic_32.h 2009-10-20 20:32:11.054286952 -0400 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5489,9 +5525,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/atomic_32.h linux-2.6.31.4/arch/x } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -diff -urNp linux-2.6.31.4/arch/x86/include/asm/atomic_64.h linux-2.6.31.4/arch/x86/include/asm/atomic_64.h ---- linux-2.6.31.4/arch/x86/include/asm/atomic_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/atomic_64.h 2009-10-11 15:29:40.763353730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/atomic_64.h linux-2.6.31.5/arch/x86/include/asm/atomic_64.h +--- linux-2.6.31.5/arch/x86/include/asm/atomic_64.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/atomic_64.h 2009-10-20 20:32:11.054286952 -0400 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -5984,9 +6020,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/atomic_64.h linux-2.6.31.4/arch/x } /** -diff -urNp linux-2.6.31.4/arch/x86/include/asm/boot.h linux-2.6.31.4/arch/x86/include/asm/boot.h ---- linux-2.6.31.4/arch/x86/include/asm/boot.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/boot.h 2009-10-11 15:29:40.763353730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/boot.h linux-2.6.31.5/arch/x86/include/asm/boot.h +--- linux-2.6.31.5/arch/x86/include/asm/boot.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/boot.h 2009-10-20 20:32:11.054286952 -0400 @@ -11,10 +11,15 @@ #include @@ -6004,9 +6040,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/boot.h linux-2.6.31.4/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.31.4/arch/x86/include/asm/cache.h linux-2.6.31.4/arch/x86/include/asm/cache.h ---- linux-2.6.31.4/arch/x86/include/asm/cache.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/cache.h 2009-10-11 15:29:40.763353730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/cache.h linux-2.6.31.5/arch/x86/include/asm/cache.h +--- linux-2.6.31.5/arch/x86/include/asm/cache.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/cache.h 2009-10-20 20:32:11.054286952 -0400 @@ -6,6 +6,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -6015,9 +6051,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/cache.h linux-2.6.31.4/arch/x86/i #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/checksum_32.h linux-2.6.31.4/arch/x86/include/asm/checksum_32.h ---- linux-2.6.31.4/arch/x86/include/asm/checksum_32.h 2009-10-12 23:26:17.489391684 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/checksum_32.h 2009-10-12 23:26:38.910153076 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/checksum_32.h linux-2.6.31.5/arch/x86/include/asm/checksum_32.h +--- linux-2.6.31.5/arch/x86/include/asm/checksum_32.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/checksum_32.h 2009-10-20 20:32:11.054286952 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6051,9 +6087,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/checksum_32.h linux-2.6.31.4/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.31.4/arch/x86/include/asm/desc.h linux-2.6.31.4/arch/x86/include/asm/desc.h ---- linux-2.6.31.4/arch/x86/include/asm/desc.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/desc.h 2009-10-12 23:12:54.950348398 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/desc.h linux-2.6.31.5/arch/x86/include/asm/desc.h +--- linux-2.6.31.5/arch/x86/include/asm/desc.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/desc.h 2009-10-20 20:32:11.054286952 -0400 @@ -4,6 +4,7 @@ #include #include @@ -6164,9 +6200,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/desc.h linux-2.6.31.4/arch/x86/in +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/device.h linux-2.6.31.4/arch/x86/include/asm/device.h ---- linux-2.6.31.4/arch/x86/include/asm/device.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/device.h 2009-10-11 15:29:56.562357747 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/device.h linux-2.6.31.5/arch/x86/include/asm/device.h +--- linux-2.6.31.5/arch/x86/include/asm/device.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/device.h 2009-10-20 20:32:11.054286952 -0400 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6176,9 +6212,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/device.h linux-2.6.31.4/arch/x86/ #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/dma-mapping.h linux-2.6.31.4/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.31.4/arch/x86/include/asm/dma-mapping.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/dma-mapping.h 2009-10-11 15:29:56.563916619 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/dma-mapping.h linux-2.6.31.5/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.31.5/arch/x86/include/asm/dma-mapping.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/dma-mapping.h 2009-10-20 20:32:11.054286952 -0400 @@ -19,9 +19,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6218,9 +6254,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/dma-mapping.h linux-2.6.31.4/arch WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/e820.h linux-2.6.31.4/arch/x86/include/asm/e820.h ---- linux-2.6.31.4/arch/x86/include/asm/e820.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/e820.h 2009-10-11 15:29:40.764338399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/e820.h linux-2.6.31.5/arch/x86/include/asm/e820.h +--- linux-2.6.31.5/arch/x86/include/asm/e820.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/e820.h 2009-10-20 20:32:11.054286952 -0400 @@ -135,7 +135,7 @@ extern char *memory_setup(void); #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -6230,9 +6266,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/e820.h linux-2.6.31.4/arch/x86/in #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/elf.h linux-2.6.31.4/arch/x86/include/asm/elf.h ---- linux-2.6.31.4/arch/x86/include/asm/elf.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/elf.h 2009-10-11 15:29:40.764338399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/elf.h linux-2.6.31.5/arch/x86/include/asm/elf.h +--- linux-2.6.31.5/arch/x86/include/asm/elf.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/elf.h 2009-10-20 20:32:11.054286952 -0400 @@ -263,7 +263,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. */ @@ -6286,9 +6322,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/elf.h linux-2.6.31.4/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/futex.h linux-2.6.31.4/arch/x86/include/asm/futex.h ---- linux-2.6.31.4/arch/x86/include/asm/futex.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/futex.h 2009-10-11 15:29:40.764338399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/futex.h linux-2.6.31.5/arch/x86/include/asm/futex.h +--- linux-2.6.31.5/arch/x86/include/asm/futex.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/futex.h 2009-10-20 20:32:11.057513625 -0400 @@ -11,6 +11,40 @@ #include #include @@ -6400,9 +6436,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/futex.h linux-2.6.31.4/arch/x86/i : "memory" ); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/i387.h linux-2.6.31.4/arch/x86/include/asm/i387.h ---- linux-2.6.31.4/arch/x86/include/asm/i387.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/i387.h 2009-10-11 15:29:40.764338399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/i387.h linux-2.6.31.5/arch/x86/include/asm/i387.h +--- linux-2.6.31.5/arch/x86/include/asm/i387.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/i387.h 2009-10-20 20:32:11.057513625 -0400 @@ -194,13 +194,8 @@ static inline int fxrstor_checking(struc } @@ -6419,9 +6455,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/i387.h linux-2.6.31.4/arch/x86/in /* * These must be called with preempt disabled -diff -urNp linux-2.6.31.4/arch/x86/include/asm/io_64.h linux-2.6.31.4/arch/x86/include/asm/io_64.h ---- linux-2.6.31.4/arch/x86/include/asm/io_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/io_64.h 2009-10-11 15:29:40.765316562 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/io_64.h linux-2.6.31.5/arch/x86/include/asm/io_64.h +--- linux-2.6.31.5/arch/x86/include/asm/io_64.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/io_64.h 2009-10-20 20:32:11.057513625 -0400 @@ -140,6 +140,17 @@ __OUTS(l) #include @@ -6440,9 +6476,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/io_64.h linux-2.6.31.4/arch/x86/i #include void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/iommu.h linux-2.6.31.4/arch/x86/include/asm/iommu.h ---- linux-2.6.31.4/arch/x86/include/asm/iommu.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/iommu.h 2009-10-11 15:29:56.563916619 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/iommu.h linux-2.6.31.5/arch/x86/include/asm/iommu.h +--- linux-2.6.31.5/arch/x86/include/asm/iommu.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/iommu.h 2009-10-20 20:32:11.057513625 -0400 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -6452,9 +6488,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/iommu.h linux-2.6.31.4/arch/x86/i extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.31.4/arch/x86/include/asm/irqflags.h linux-2.6.31.4/arch/x86/include/asm/irqflags.h ---- linux-2.6.31.4/arch/x86/include/asm/irqflags.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/irqflags.h 2009-10-18 10:12:57.682033309 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/irqflags.h linux-2.6.31.5/arch/x86/include/asm/irqflags.h +--- linux-2.6.31.5/arch/x86/include/asm/irqflags.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/irqflags.h 2009-10-20 20:32:11.057513625 -0400 @@ -147,6 +147,27 @@ static inline unsigned long __raw_local_ #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit @@ -6483,9 +6519,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/irqflags.h linux-2.6.31.4/arch/x8 #endif -diff -urNp linux-2.6.31.4/arch/x86/include/asm/kvm_host.h linux-2.6.31.4/arch/x86/include/asm/kvm_host.h ---- linux-2.6.31.4/arch/x86/include/asm/kvm_host.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/kvm_host.h 2009-10-11 15:29:40.765316562 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/kvm_host.h linux-2.6.31.5/arch/x86/include/asm/kvm_host.h +--- linux-2.6.31.5/arch/x86/include/asm/kvm_host.h 2009-10-20 20:42:58.996862730 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/kvm_host.h 2009-10-20 20:32:11.057513625 -0400 @@ -528,7 +528,7 @@ struct kvm_x86_ops { u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio); }; @@ -6495,9 +6531,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/kvm_host.h linux-2.6.31.4/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/local.h linux-2.6.31.4/arch/x86/include/asm/local.h ---- linux-2.6.31.4/arch/x86/include/asm/local.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/local.h 2009-10-11 15:29:40.766258235 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/local.h linux-2.6.31.5/arch/x86/include/asm/local.h +--- linux-2.6.31.5/arch/x86/include/asm/local.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/local.h 2009-10-20 20:32:11.057513625 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -6722,9 +6758,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/local.h linux-2.6.31.4/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.31.4/arch/x86/include/asm/microcode.h linux-2.6.31.4/arch/x86/include/asm/microcode.h ---- linux-2.6.31.4/arch/x86/include/asm/microcode.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/microcode.h 2009-10-11 15:29:56.563916619 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/microcode.h linux-2.6.31.5/arch/x86/include/asm/microcode.h +--- linux-2.6.31.5/arch/x86/include/asm/microcode.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/microcode.h 2009-10-20 20:32:11.057513625 -0400 @@ -38,18 +38,18 @@ struct ucode_cpu_info { extern struct ucode_cpu_info ucode_cpu_info[]; @@ -6748,9 +6784,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/microcode.h linux-2.6.31.4/arch/x { return NULL; } -diff -urNp linux-2.6.31.4/arch/x86/include/asm/mman.h linux-2.6.31.4/arch/x86/include/asm/mman.h ---- linux-2.6.31.4/arch/x86/include/asm/mman.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/mman.h 2009-10-11 15:29:40.766258235 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/mman.h linux-2.6.31.5/arch/x86/include/asm/mman.h +--- linux-2.6.31.5/arch/x86/include/asm/mman.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/mman.h 2009-10-20 20:32:11.057513625 -0400 @@ -17,4 +17,14 @@ #define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_FUTURE 2 /* lock all future mappings */ @@ -6766,9 +6802,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/mman.h linux-2.6.31.4/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/mmu_context.h linux-2.6.31.4/arch/x86/include/asm/mmu_context.h ---- linux-2.6.31.4/arch/x86/include/asm/mmu_context.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/mmu_context.h 2009-10-11 15:29:40.767275438 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/mmu_context.h linux-2.6.31.5/arch/x86/include/asm/mmu_context.h +--- linux-2.6.31.5/arch/x86/include/asm/mmu_context.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/mmu_context.h 2009-10-20 20:33:06.205827668 -0400 @@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { @@ -6803,13 +6839,13 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/mmu_context.h linux-2.6.31.4/arch + +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base || -+ prev->context.user_cs_limit != next->context.user_cs_limit ++ prev->context.user_cs_limit != next->context.user_cs_limit)) ++ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); +#ifdef CONFIG_SMP -+ || tlbstate != TLBSTATE_OK -+#endif -+ )) ++ else if (unlikely(tlbstate != TLBSTATE_OK)) + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); +#endif ++#endif + } #ifdef CONFIG_SMP @@ -6834,9 +6870,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/mmu_context.h linux-2.6.31.4/arch } } #endif -diff -urNp linux-2.6.31.4/arch/x86/include/asm/mmu.h linux-2.6.31.4/arch/x86/include/asm/mmu.h ---- linux-2.6.31.4/arch/x86/include/asm/mmu.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/mmu.h 2009-10-11 15:29:40.767275438 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/mmu.h linux-2.6.31.5/arch/x86/include/asm/mmu.h +--- linux-2.6.31.5/arch/x86/include/asm/mmu.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/mmu.h 2009-10-20 20:32:11.057513625 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -6863,9 +6899,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/mmu.h linux-2.6.31.4/arch/x86/inc } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.31.4/arch/x86/include/asm/module.h linux-2.6.31.4/arch/x86/include/asm/module.h ---- linux-2.6.31.4/arch/x86/include/asm/module.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/module.h 2009-10-11 15:29:40.767275438 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/module.h linux-2.6.31.5/arch/x86/include/asm/module.h +--- linux-2.6.31.5/arch/x86/include/asm/module.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/module.h 2009-10-20 20:32:11.057513625 -0400 @@ -74,7 +74,12 @@ struct mod_arch_specific {}; # else # define MODULE_STACKSIZE "" @@ -6880,9 +6916,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/module.h linux-2.6.31.4/arch/x86/ #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/page_32_types.h linux-2.6.31.4/arch/x86/include/asm/page_32_types.h ---- linux-2.6.31.4/arch/x86/include/asm/page_32_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/page_32_types.h 2009-10-11 15:29:40.768245747 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/page_32_types.h linux-2.6.31.5/arch/x86/include/asm/page_32_types.h +--- linux-2.6.31.5/arch/x86/include/asm/page_32_types.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/page_32_types.h 2009-10-20 20:32:11.057513625 -0400 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -6894,9 +6930,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/page_32_types.h linux-2.6.31.4/ar #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.31.4/arch/x86/include/asm/page_64_types.h linux-2.6.31.4/arch/x86/include/asm/page_64_types.h ---- linux-2.6.31.4/arch/x86/include/asm/page_64_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/page_64_types.h 2009-10-11 15:29:40.786205701 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/page_64_types.h linux-2.6.31.5/arch/x86/include/asm/page_64_types.h +--- linux-2.6.31.5/arch/x86/include/asm/page_64_types.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/page_64_types.h 2009-10-20 20:32:11.057513625 -0400 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -6907,9 +6943,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/page_64_types.h linux-2.6.31.4/ar /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.31.4/arch/x86/include/asm/paravirt.h linux-2.6.31.4/arch/x86/include/asm/paravirt.h ---- linux-2.6.31.4/arch/x86/include/asm/paravirt.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/paravirt.h 2009-10-18 10:08:40.907788965 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/paravirt.h linux-2.6.31.5/arch/x86/include/asm/paravirt.h +--- linux-2.6.31.5/arch/x86/include/asm/paravirt.h 2009-10-23 19:50:16.727631000 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/paravirt.h 2009-10-20 20:32:11.057513625 -0400 @@ -350,6 +350,12 @@ struct pv_mmu_ops { an mfn. We can tell which is which from the index. */ void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, @@ -6923,40 +6959,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/paravirt.h linux-2.6.31.4/arch/x8 }; struct raw_spinlock; -@@ -528,10 +534,11 @@ int paravirt_disable_iospace(void); - #define EXTRA_CLOBBERS - #define VEXTRA_CLOBBERS - #else /* CONFIG_X86_64 */ -+/* [re]ax isn't an arg, but the return val */ - #define PVOP_VCALL_ARGS \ - unsigned long __edi = __edi, __esi = __esi, \ -- __edx = __edx, __ecx = __ecx --#define PVOP_CALL_ARGS PVOP_VCALL_ARGS, __eax -+ __edx = __edx, __ecx = __ecx, __eax = __eax -+#define PVOP_CALL_ARGS PVOP_VCALL_ARGS - - #define PVOP_CALL_ARG1(x) "D" ((unsigned long)(x)) - #define PVOP_CALL_ARG2(x) "S" ((unsigned long)(x)) -@@ -543,6 +550,7 @@ int paravirt_disable_iospace(void); - "=c" (__ecx) - #define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS, "=a" (__eax) - -+/* void functions are still allowed [re]ax for scratch */ - #define PVOP_VCALLEE_CLOBBERS "=a" (__eax) - #define PVOP_CALLEE_CLOBBERS PVOP_VCALLEE_CLOBBERS - -@@ -617,8 +625,8 @@ int paravirt_disable_iospace(void); - VEXTRA_CLOBBERS, \ - pre, post, ##__VA_ARGS__) - --#define __PVOP_VCALLEESAVE(rettype, op, pre, post, ...) \ -- ____PVOP_CALL(rettype, op.func, CLBR_RET_REG, \ -+#define __PVOP_VCALLEESAVE(op, pre, post, ...) \ -+ ____PVOP_VCALL(op.func, CLBR_RET_REG, \ - PVOP_VCALLEE_CLOBBERS, , \ - pre, post, ##__VA_ARGS__) - -@@ -1437,6 +1445,21 @@ static inline void __set_fixmap(unsigned +@@ -1439,6 +1445,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -6978,54 +6981,16 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/paravirt.h linux-2.6.31.4/arch/x8 void _paravirt_nop(void); u32 _paravirt_ident_32(u32); u64 _paravirt_ident_64(u64); -@@ -1565,42 +1588,22 @@ extern struct paravirt_patch_site __para - - static inline unsigned long __raw_local_save_flags(void) - { -- unsigned long f; -- -- asm volatile(paravirt_alt(PARAVIRT_CALL) -- : "=a"(f) -- : paravirt_type(pv_irq_ops.save_fl), -- paravirt_clobber(CLBR_EAX) -- : "memory", "cc"); -- return f; -+ return PVOP_CALLEE0(unsigned long, pv_irq_ops.save_fl); - } +@@ -1572,7 +1593,7 @@ static inline unsigned long __raw_local_ static inline void raw_local_irq_restore(unsigned long f) { -- asm volatile(paravirt_alt(PARAVIRT_CALL) -- : "=a"(f) -- : PV_FLAGS_ARG(f), -- paravirt_type(pv_irq_ops.restore_fl), -- paravirt_clobber(CLBR_EAX) -- : "memory", "cc"); +- PVOP_VCALLEE1(pv_irq_ops.restore_fl, f); + return PVOP_VCALLEE1(pv_irq_ops.restore_fl, f); } static inline void raw_local_irq_disable(void) - { -- asm volatile(paravirt_alt(PARAVIRT_CALL) -- : -- : paravirt_type(pv_irq_ops.irq_disable), -- paravirt_clobber(CLBR_EAX) -- : "memory", "eax", "cc"); -+ PVOP_VCALLEE0(pv_irq_ops.irq_disable); - } - - static inline void raw_local_irq_enable(void) - { -- asm volatile(paravirt_alt(PARAVIRT_CALL) -- : -- : paravirt_type(pv_irq_ops.irq_enable), -- paravirt_clobber(CLBR_EAX) -- : "memory", "eax", "cc"); -+ PVOP_VCALLEE0(pv_irq_ops.irq_enable); - } - - static inline unsigned long __raw_local_irq_save(void) -@@ -1688,7 +1691,7 @@ static inline unsigned long __raw_local_ +@@ -1670,7 +1691,7 @@ static inline unsigned long __raw_local_ #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) @@ -7034,7 +6999,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/paravirt.h linux-2.6.31.4/arch/x8 #endif #define INTERRUPT_RETURN \ -@@ -1713,6 +1716,27 @@ static inline unsigned long __raw_local_ +@@ -1695,6 +1716,27 @@ static inline unsigned long __raw_local_ jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret32)) #ifdef CONFIG_X86_32 @@ -7062,9 +7027,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/paravirt.h linux-2.6.31.4/arch/x8 #define GET_CR0_INTO_EAX \ push %ecx; push %edx; \ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pci_x86.h linux-2.6.31.4/arch/x86/include/asm/pci_x86.h ---- linux-2.6.31.4/arch/x86/include/asm/pci_x86.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pci_x86.h 2009-10-11 15:29:56.563916619 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pci_x86.h linux-2.6.31.5/arch/x86/include/asm/pci_x86.h +--- linux-2.6.31.5/arch/x86/include/asm/pci_x86.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pci_x86.h 2009-10-20 20:32:11.060850890 -0400 @@ -95,10 +95,10 @@ struct pci_raw_ops { int reg, int len, u32 val); }; @@ -7079,9 +7044,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pci_x86.h linux-2.6.31.4/arch/x86 extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgalloc.h linux-2.6.31.4/arch/x86/include/asm/pgalloc.h ---- linux-2.6.31.4/arch/x86/include/asm/pgalloc.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgalloc.h 2009-10-11 15:29:40.786205701 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgalloc.h linux-2.6.31.5/arch/x86/include/asm/pgalloc.h +--- linux-2.6.31.5/arch/x86/include/asm/pgalloc.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgalloc.h 2009-10-20 20:32:11.060850890 -0400 @@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7096,9 +7061,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgalloc.h linux-2.6.31.4/arch/x86 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.31.4/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable-2level.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable-2level.h 2009-10-12 23:12:55.019577525 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable-2level.h linux-2.6.31.5/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable-2level.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable-2level.h 2009-10-20 20:32:11.060850890 -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) @@ -7109,9 +7074,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.31.4/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_32.h linux-2.6.31.4/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable_32.h 2009-10-11 15:29:40.787291048 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable_32.h linux-2.6.31.5/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable_32.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable_32.h 2009-10-20 20:32:11.060850890 -0400 @@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -7143,9 +7108,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_32.h linux-2.6.31.4/arch/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.31.4/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable_32_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable_32_types.h 2009-10-11 15:29:40.787291048 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable_32_types.h linux-2.6.31.5/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable_32_types.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable_32_types.h 2009-10-20 20:32:11.060850890 -0400 @@ -8,7 +8,7 @@ */ #ifdef CONFIG_X86_PAE @@ -7175,9 +7140,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_32_types.h linux-2.6.31.4 #define MODULES_VADDR VMALLOC_START #define MODULES_END VMALLOC_END #define MODULES_LEN (MODULES_VADDR - MODULES_END) -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.31.4/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable-3level.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable-3level.h 2009-10-12 23:12:55.020133311 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable-3level.h linux-2.6.31.5/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable-3level.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable-3level.h 2009-10-20 20:32:11.060850890 -0400 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7195,9 +7160,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.31.4/a } /* -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_64.h linux-2.6.31.4/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable_64.h 2009-10-12 23:12:55.021186264 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable_64.h linux-2.6.31.5/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable_64.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable_64.h 2009-10-20 20:32:11.060850890 -0400 @@ -16,9 +16,12 @@ extern pud_t level3_kernel_pgt[512]; @@ -7222,9 +7187,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_64.h linux-2.6.31.4/arch/ } static inline void native_pmd_clear(pmd_t *pmd) -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable.h linux-2.6.31.4/arch/x86/include/asm/pgtable.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable.h 2009-10-14 17:20:19.872322390 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable.h linux-2.6.31.5/arch/x86/include/asm/pgtable.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable.h 2009-10-20 20:32:11.060850890 -0400 @@ -84,12 +84,51 @@ static inline void __init paravirt_paget #define arch_end_context_switch(prev) do {} while(0) @@ -7328,9 +7293,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable.h linux-2.6.31.4/arch/x86 } -diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_types.h linux-2.6.31.4/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.31.4/arch/x86/include/asm/pgtable_types.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/pgtable_types.h 2009-10-11 15:29:40.788262670 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/pgtable_types.h linux-2.6.31.5/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.31.5/arch/x86/include/asm/pgtable_types.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/pgtable_types.h 2009-10-20 20:32:11.060850890 -0400 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -7414,9 +7379,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/pgtable_types.h linux-2.6.31.4/ar #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/processor.h linux-2.6.31.4/arch/x86/include/asm/processor.h ---- linux-2.6.31.4/arch/x86/include/asm/processor.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/processor.h 2009-10-11 15:29:40.789238393 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/processor.h linux-2.6.31.5/arch/x86/include/asm/processor.h +--- linux-2.6.31.5/arch/x86/include/asm/processor.h 2009-10-20 20:42:59.000286162 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/processor.h 2009-10-20 20:32:11.060850890 -0400 @@ -271,7 +271,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -7496,9 +7461,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/processor.h linux-2.6.31.4/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.31.4/arch/x86/include/asm/ptrace.h linux-2.6.31.4/arch/x86/include/asm/ptrace.h ---- linux-2.6.31.4/arch/x86/include/asm/ptrace.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/ptrace.h 2009-10-11 15:29:40.789238393 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/ptrace.h linux-2.6.31.5/arch/x86/include/asm/ptrace.h +--- linux-2.6.31.5/arch/x86/include/asm/ptrace.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/ptrace.h 2009-10-20 20:32:11.060850890 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -7535,9 +7500,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/ptrace.h linux-2.6.31.4/arch/x86/ #endif } -diff -urNp linux-2.6.31.4/arch/x86/include/asm/reboot.h linux-2.6.31.4/arch/x86/include/asm/reboot.h ---- linux-2.6.31.4/arch/x86/include/asm/reboot.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/reboot.h 2009-10-11 15:29:40.789238393 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/reboot.h linux-2.6.31.5/arch/x86/include/asm/reboot.h +--- linux-2.6.31.5/arch/x86/include/asm/reboot.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/reboot.h 2009-10-20 20:32:11.060850890 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -7547,9 +7512,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/reboot.h linux-2.6.31.4/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/rwsem.h linux-2.6.31.4/arch/x86/include/asm/rwsem.h ---- linux-2.6.31.4/arch/x86/include/asm/rwsem.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/rwsem.h 2009-10-11 15:29:40.790147132 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/rwsem.h linux-2.6.31.5/arch/x86/include/asm/rwsem.h +--- linux-2.6.31.5/arch/x86/include/asm/rwsem.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/rwsem.h 2009-10-20 20:32:11.060850890 -0400 @@ -106,10 +106,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -7782,9 +7747,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/rwsem.h linux-2.6.31.4/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/segment.h linux-2.6.31.4/arch/x86/include/asm/segment.h ---- linux-2.6.31.4/arch/x86/include/asm/segment.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/segment.h 2009-10-11 15:29:40.790147132 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/segment.h linux-2.6.31.5/arch/x86/include/asm/segment.h +--- linux-2.6.31.5/arch/x86/include/asm/segment.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/segment.h 2009-10-20 20:32:11.060850890 -0400 @@ -88,7 +88,7 @@ #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) @@ -7816,9 +7781,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/segment.h linux-2.6.31.4/arch/x86 #else -diff -urNp linux-2.6.31.4/arch/x86/include/asm/spinlock.h linux-2.6.31.4/arch/x86/include/asm/spinlock.h ---- linux-2.6.31.4/arch/x86/include/asm/spinlock.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/spinlock.h 2009-10-11 15:29:40.790147132 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/spinlock.h linux-2.6.31.5/arch/x86/include/asm/spinlock.h +--- linux-2.6.31.5/arch/x86/include/asm/spinlock.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/spinlock.h 2009-10-20 20:32:11.060850890 -0400 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -7922,9 +7887,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/spinlock.h linux-2.6.31.4/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.31.4/arch/x86/include/asm/system.h linux-2.6.31.4/arch/x86/include/asm/system.h ---- linux-2.6.31.4/arch/x86/include/asm/system.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/system.h 2009-10-12 23:12:55.051359241 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/system.h linux-2.6.31.5/arch/x86/include/asm/system.h +--- linux-2.6.31.5/arch/x86/include/asm/system.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/system.h 2009-10-20 20:32:11.064041758 -0400 @@ -227,7 +227,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; @@ -7943,9 +7908,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/system.h linux-2.6.31.4/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess_32.h linux-2.6.31.4/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.31.4/arch/x86/include/asm/uaccess_32.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/uaccess_32.h 2009-10-11 15:29:40.792163155 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/uaccess_32.h linux-2.6.31.5/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.31.5/arch/x86/include/asm/uaccess_32.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/uaccess_32.h 2009-10-20 20:32:11.064041758 -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) @@ -8075,9 +8040,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess_32.h linux-2.6.31.4/arch/ long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess_64.h linux-2.6.31.4/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.31.4/arch/x86/include/asm/uaccess_64.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/uaccess_64.h 2009-10-11 15:29:40.792163155 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/uaccess_64.h linux-2.6.31.5/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.31.5/arch/x86/include/asm/uaccess_64.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/uaccess_64.h 2009-10-20 20:32:11.064041758 -0400 @@ -10,6 +10,8 @@ #include #include @@ -8228,9 +8193,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess_64.h linux-2.6.31.4/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86/include/asm/uaccess.h ---- linux-2.6.31.4/arch/x86/include/asm/uaccess.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/uaccess.h 2009-10-11 15:29:40.793142234 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/uaccess.h linux-2.6.31.5/arch/x86/include/asm/uaccess.h +--- linux-2.6.31.5/arch/x86/include/asm/uaccess.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/uaccess.h 2009-10-20 20:33:06.205827668 -0400 @@ -8,8 +8,11 @@ #include #include @@ -8256,11 +8221,12 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 #define segment_eq(a, b) ((a).seg == (b).seg) -@@ -77,7 +85,26 @@ +@@ -77,7 +85,27 @@ * checks that the pointer is in the user space range - after calling * this function, memory access functions may still return -EFAULT. */ -#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) ++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0)) +#define access_ok(type, addr, size) \ +({ \ + bool __ret_ao = __range_not_ok(addr, size) == 0; \ @@ -8284,7 +8250,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 /* * The exception table consists of pairs of addresses: the first is the -@@ -183,13 +210,21 @@ extern int __get_user_bad(void); +@@ -183,13 +211,21 @@ extern int __get_user_bad(void); asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") @@ -8309,7 +8275,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 ".section .fixup,\"ax\"\n" \ "4: movl %3,%0\n" \ " jmp 3b\n" \ -@@ -197,15 +232,18 @@ extern int __get_user_bad(void); +@@ -197,15 +233,18 @@ extern int __get_user_bad(void); _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=r" (err) \ @@ -8332,7 +8298,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 #define __put_user_x8(x, ptr, __ret_pu) \ asm volatile("call __put_user_8" : "=a" (__ret_pu) \ -@@ -374,16 +412,18 @@ do { \ +@@ -374,16 +413,18 @@ do { \ } while (0) #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -8354,7 +8320,7 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 #define __get_user_size_ex(x, ptr, size) \ do { \ -@@ -407,10 +447,12 @@ do { \ +@@ -407,10 +448,12 @@ do { \ } while (0) #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ @@ -8369,7 +8335,16 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 #define __put_user_nocheck(x, ptr, size) \ ({ \ -@@ -438,21 +480,26 @@ struct __large_struct { unsigned long bu +@@ -424,7 +467,7 @@ do { \ + int __gu_err; \ + unsigned long __gu_val; \ + __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ +- (x) = (__force __typeof__(*(ptr)))__gu_val; \ ++ (x) = (__typeof__(*(ptr)))__gu_val; \ + __gu_err; \ + }) + +@@ -438,21 +481,26 @@ struct __large_struct { unsigned long bu * aliasing issues. */ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ @@ -8400,7 +8375,16 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 /* * uaccess_try and catch -@@ -567,6 +614,7 @@ extern struct movsl_mask { +@@ -530,7 +578,7 @@ struct __large_struct { unsigned long bu + #define get_user_ex(x, ptr) do { \ + unsigned long __gue_val; \ + __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ +- (x) = (__force __typeof__(*(ptr)))__gue_val; \ ++ (x) = (__typeof__(*(ptr)))__gue_val; \ + } while (0) + + #ifdef CONFIG_X86_WP_WORKS_OK +@@ -567,6 +615,7 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 @@ -8408,9 +8392,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/uaccess.h linux-2.6.31.4/arch/x86 #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.31.4/arch/x86/include/asm/vgtod.h linux-2.6.31.4/arch/x86/include/asm/vgtod.h ---- linux-2.6.31.4/arch/x86/include/asm/vgtod.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/vgtod.h 2009-10-11 15:29:40.793142234 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/vgtod.h linux-2.6.31.5/arch/x86/include/asm/vgtod.h +--- linux-2.6.31.5/arch/x86/include/asm/vgtod.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/vgtod.h 2009-10-20 20:32:11.064041758 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -8419,9 +8403,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/vgtod.h linux-2.6.31.4/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.31.4/arch/x86/include/asm/vmi.h linux-2.6.31.4/arch/x86/include/asm/vmi.h ---- linux-2.6.31.4/arch/x86/include/asm/vmi.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/vmi.h 2009-10-11 15:29:56.563916619 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/vmi.h linux-2.6.31.5/arch/x86/include/asm/vmi.h +--- linux-2.6.31.5/arch/x86/include/asm/vmi.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/vmi.h 2009-10-20 20:32:11.064041758 -0400 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -8430,9 +8414,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/vmi.h linux-2.6.31.4/arch/x86/inc } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.31.4/arch/x86/include/asm/vsyscall.h linux-2.6.31.4/arch/x86/include/asm/vsyscall.h ---- linux-2.6.31.4/arch/x86/include/asm/vsyscall.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/include/asm/vsyscall.h 2009-10-11 15:29:40.793142234 -0400 +diff -urNp linux-2.6.31.5/arch/x86/include/asm/vsyscall.h linux-2.6.31.5/arch/x86/include/asm/vsyscall.h +--- linux-2.6.31.5/arch/x86/include/asm/vsyscall.h 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/include/asm/vsyscall.h 2009-10-20 20:32:11.064041758 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -8463,9 +8447,9 @@ diff -urNp linux-2.6.31.4/arch/x86/include/asm/vsyscall.h linux-2.6.31.4/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.31.4/arch/x86/Kconfig linux-2.6.31.4/arch/x86/Kconfig ---- linux-2.6.31.4/arch/x86/Kconfig 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/Kconfig 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/Kconfig linux-2.6.31.5/arch/x86/Kconfig +--- linux-2.6.31.5/arch/x86/Kconfig 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/Kconfig 2009-10-20 20:32:11.064041758 -0400 @@ -1098,7 +1098,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT @@ -8496,9 +8480,9 @@ diff -urNp linux-2.6.31.4/arch/x86/Kconfig linux-2.6.31.4/arch/x86/Kconfig ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.31.4/arch/x86/Kconfig.cpu linux-2.6.31.4/arch/x86/Kconfig.cpu ---- linux-2.6.31.4/arch/x86/Kconfig.cpu 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/Kconfig.cpu 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/Kconfig.cpu linux-2.6.31.5/arch/x86/Kconfig.cpu +--- linux-2.6.31.5/arch/x86/Kconfig.cpu 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/Kconfig.cpu 2009-10-20 20:32:11.064041758 -0400 @@ -331,7 +331,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG @@ -8526,9 +8510,9 @@ diff -urNp linux-2.6.31.4/arch/x86/Kconfig.cpu linux-2.6.31.4/arch/x86/Kconfig.c config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.31.4/arch/x86/Kconfig.debug linux-2.6.31.4/arch/x86/Kconfig.debug ---- linux-2.6.31.4/arch/x86/Kconfig.debug 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/Kconfig.debug 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/Kconfig.debug linux-2.6.31.5/arch/x86/Kconfig.debug +--- linux-2.6.31.5/arch/x86/Kconfig.debug 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/Kconfig.debug 2009-10-20 20:32:11.064041758 -0400 @@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" @@ -8538,9 +8522,9 @@ diff -urNp linux-2.6.31.4/arch/x86/Kconfig.debug linux-2.6.31.4/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.31.4/arch/x86/kernel/acpi/boot.c linux-2.6.31.4/arch/x86/kernel/acpi/boot.c ---- linux-2.6.31.4/arch/x86/kernel/acpi/boot.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/acpi/boot.c 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/acpi/boot.c linux-2.6.31.5/arch/x86/kernel/acpi/boot.c +--- linux-2.6.31.5/arch/x86/kernel/acpi/boot.c 2009-10-20 20:42:59.003700785 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/acpi/boot.c 2009-10-20 20:32:11.064041758 -0400 @@ -1609,7 +1609,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, @@ -8550,9 +8534,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/boot.c linux-2.6.31.4/arch/x86/ke }; /* -diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.31.4/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.31.4/arch/x86/kernel/acpi/realmode/wakeup.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/acpi/realmode/wakeup.S 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.31.5/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.31.5/arch/x86/kernel/acpi/realmode/wakeup.S 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/acpi/realmode/wakeup.S 2009-10-20 20:32:11.064041758 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -8562,9 +8546,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.31.4/ wrmsr 1: -diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/sleep.c linux-2.6.31.4/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.31.4/arch/x86/kernel/acpi/sleep.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/acpi/sleep.c 2009-10-12 23:12:55.099157679 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/acpi/sleep.c linux-2.6.31.5/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.31.5/arch/x86/kernel/acpi/sleep.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/acpi/sleep.c 2009-10-20 20:32:11.064041758 -0400 @@ -11,11 +11,12 @@ #include #include @@ -8609,9 +8593,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/sleep.c linux-2.6.31.4/arch/x86/k } -diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.31.4/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.31.4/arch/x86/kernel/acpi/wakeup_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/acpi/wakeup_32.S 2009-10-11 15:29:40.794132399 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.31.5/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.31.5/arch/x86/kernel/acpi/wakeup_32.S 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/acpi/wakeup_32.S 2009-10-20 20:32:11.064041758 -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 @@ -8628,9 +8612,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.31.4/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.31.4/arch/x86/kernel/alternative.c linux-2.6.31.4/arch/x86/kernel/alternative.c ---- linux-2.6.31.4/arch/x86/kernel/alternative.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/alternative.c 2009-10-12 23:12:55.126056683 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/alternative.c linux-2.6.31.5/arch/x86/kernel/alternative.c +--- linux-2.6.31.5/arch/x86/kernel/alternative.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/alternative.c 2009-10-20 20:32:11.064041758 -0400 @@ -400,7 +400,7 @@ void apply_paravirt(struct paravirt_patc BUG_ON(p->len > MAX_PATCH_LEN); @@ -8703,9 +8687,48 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/alternative.c linux-2.6.31.4/arch/x86/ + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/apm_32.c linux-2.6.31.4/arch/x86/kernel/apm_32.c ---- linux-2.6.31.4/arch/x86/kernel/apm_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/apm_32.c 2009-10-12 23:12:55.140901679 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/apic/io_apic.c linux-2.6.31.5/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.31.5/arch/x86/kernel/apic/io_apic.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/apic/io_apic.c 2009-10-20 20:33:11.013917396 -0400 +@@ -719,7 +719,7 @@ struct IO_APIC_route_entry **alloc_ioapi + ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, + GFP_ATOMIC); + if (!ioapic_entries) +- return 0; ++ return NULL; + + for (apic = 0; apic < nr_ioapics; apic++) { + ioapic_entries[apic] = +@@ -736,7 +736,7 @@ nomem: + kfree(ioapic_entries[apic]); + kfree(ioapic_entries); + +- return 0; ++ return NULL; + } + + /* +@@ -1153,7 +1153,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, + } + EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); + +-void lock_vector_lock(void) ++void lock_vector_lock(void) __acquires(vector_lock) + { + /* Used to the online set of cpus does not change + * during assign_irq_vector. +@@ -1161,7 +1161,7 @@ void lock_vector_lock(void) + spin_lock(&vector_lock); + } + +-void unlock_vector_lock(void) ++void unlock_vector_lock(void) __releases(vector_lock) + { + spin_unlock(&vector_lock); + } +diff -urNp linux-2.6.31.5/arch/x86/kernel/apm_32.c linux-2.6.31.5/arch/x86/kernel/apm_32.c +--- linux-2.6.31.5/arch/x86/kernel/apm_32.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/apm_32.c 2009-10-20 20:32:11.067470808 -0400 @@ -403,7 +403,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitq static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue); static struct apm_user *user_list; @@ -8819,9 +8842,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/apm_32.c linux-2.6.31.4/arch/x86/kerne proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.31.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.31.4/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.31.4/arch/x86/kernel/asm-offsets_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/asm-offsets_32.c 2009-10-18 10:09:07.003389630 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/asm-offsets_32.c linux-2.6.31.5/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.31.5/arch/x86/kernel/asm-offsets_32.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/asm-offsets_32.c 2009-10-20 20:32:11.067470808 -0400 @@ -115,6 +115,12 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); @@ -8835,9 +8858,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.31.4/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.31.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.31.4/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.31.4/arch/x86/kernel/asm-offsets_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/asm-offsets_64.c 2009-10-11 15:29:40.796384874 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/asm-offsets_64.c linux-2.6.31.5/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.31.5/arch/x86/kernel/asm-offsets_64.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/asm-offsets_64.c 2009-10-20 20:32:11.067470808 -0400 @@ -114,6 +114,7 @@ int main(void) ENTRY(cr8); BLANK(); @@ -8846,9 +8869,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.31.4/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.31.4/arch/x86/kernel/cpu/common.c linux-2.6.31.4/arch/x86/kernel/cpu/common.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/common.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/common.c 2009-10-11 15:29:40.796384874 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/common.c linux-2.6.31.5/arch/x86/kernel/cpu/common.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/common.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/common.c 2009-10-20 20:32:11.067470808 -0400 @@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -8957,9 +8980,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/common.c linux-2.6.31.4/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-10-11 15:29:40.797357986 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-10-20 20:42:59.007118358 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-10-20 20:32:11.067470808 -0400 @@ -586,7 +586,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, @@ -8969,9 +8992,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.3 }; #endif -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-10-11 15:29:40.797357986 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-10-20 20:32:11.067470808 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -8981,9 +9004,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/intel.c linux-2.6.31.4/arch/x86/kernel/cpu/intel.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/intel.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/intel.c 2009-10-11 15:29:40.797357986 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/intel.c linux-2.6.31.5/arch/x86/kernel/cpu/intel.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/intel.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/intel.c 2009-10-20 20:32:11.067470808 -0400 @@ -140,7 +140,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. @@ -8993,9 +9016,21 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/intel.c linux-2.6.31.4/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/Makefile linux-2.6.31.4/arch/x86/kernel/cpu/Makefile ---- linux-2.6.31.4/arch/x86/kernel/cpu/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/Makefile 2009-10-11 15:29:40.797357986 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.31.5/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-10-20 20:33:11.013917396 -0400 +@@ -842,7 +842,7 @@ static ssize_t store(struct kobject * ko + return ret; + } + +-static struct sysfs_ops sysfs_ops = { ++static const struct sysfs_ops sysfs_ops = { + .show = show, + .store = store, + }; +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/Makefile linux-2.6.31.5/arch/x86/kernel/cpu/Makefile +--- linux-2.6.31.5/arch/x86/kernel/cpu/Makefile 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/Makefile 2009-10-20 20:32:11.067470808 -0400 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_common.o = -pg endif @@ -9007,9 +9042,21 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/Makefile linux-2.6.31.4/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 -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.4/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mcheck/mce.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mcheck/mce.c 2009-10-11 15:29:40.798326845 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-10-20 20:33:11.013917396 -0400 +@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob + return ret; + } + +-static struct sysfs_ops threshold_ops = { ++static const struct sysfs_ops threshold_ops = { + .show = show, + .store = store, + }; +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mcheck/mce.c 2009-10-20 20:32:11.067470808 -0400 @@ -1370,14 +1370,14 @@ void __cpuinit mcheck_init(struct cpuinf */ @@ -9053,9 +9100,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.4/arch/x }; /* -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/amd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/amd.c 2009-10-11 15:29:56.564796063 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/amd.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/amd.c 2009-10-20 20:32:11.067470808 -0400 @@ -101,7 +101,7 @@ static int amd_validate_add_page(unsigne return 0; } @@ -9065,9 +9112,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.31.4/arch/x86 .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/centaur.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/centaur.c 2009-10-11 15:29:56.564796063 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/centaur.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/centaur.c 2009-10-20 20:32:11.067470808 -0400 @@ -205,7 +205,7 @@ static int centaur_validate_add_page(uns return 0; } @@ -9077,9 +9124,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.31.4/arch .vendor = X86_VENDOR_CENTAUR, // .init = centaur_mcr_init, .set = centaur_set_mcr, -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-10-11 15:29:56.564796063 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-10-20 20:32:11.067470808 -0400 @@ -254,7 +254,7 @@ static void cyrix_set_all(void) post_set(); } @@ -9089,9 +9136,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.31.4/arch/x .vendor = X86_VENDOR_CYRIX, // .init = cyrix_arr_init, .set_all = cyrix_set_all, -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/generic.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/generic.c 2009-10-11 15:29:56.556364216 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/generic.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/generic.c 2009-10-20 20:32:11.067470808 -0400 @@ -23,14 +23,14 @@ static struct fixed_range_block fixed_ra { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ @@ -9118,9 +9165,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.31.4/arch .use_intel_if = 1, .set_all = generic_set_all, .get = generic_get_mtrr, -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/main.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/main.c 2009-10-11 15:29:56.564796063 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/main.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/main.c 2009-10-20 20:32:11.070759873 -0400 @@ -54,14 +54,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; @@ -9139,9 +9186,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.31.4/arch/x8 { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-10-11 15:29:56.564796063 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-10-20 20:32:11.070759873 -0400 @@ -33,7 +33,7 @@ extern int generic_get_free_region(unsig extern int generic_validate_add_page(unsigned long base, unsigned long size, unsigned int type); @@ -9164,9 +9211,21 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.31.4/arch/x8 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -diff -urNp linux-2.6.31.4/arch/x86/kernel/crash.c linux-2.6.31.4/arch/x86/kernel/crash.c ---- linux-2.6.31.4/arch/x86/kernel/crash.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/crash.c 2009-10-11 15:29:40.799154910 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/cpu/perf_counter.c linux-2.6.31.5/arch/x86/kernel/cpu/perf_counter.c +--- linux-2.6.31.5/arch/x86/kernel/cpu/perf_counter.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/cpu/perf_counter.c 2009-10-20 20:33:11.013917396 -0400 +@@ -1920,7 +1920,7 @@ perf_callchain_user(struct pt_regs *regs + break; + + callchain_store(entry, frame.return_address); +- fp = frame.next_frame; ++ fp = (__force const void __user *)frame.next_frame; + } + } + +diff -urNp linux-2.6.31.5/arch/x86/kernel/crash.c linux-2.6.31.5/arch/x86/kernel/crash.c +--- linux-2.6.31.5/arch/x86/kernel/crash.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/crash.c 2009-10-20 20:32:11.070759873 -0400 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -9176,9 +9235,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/crash.c linux-2.6.31.4/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/doublefault_32.c linux-2.6.31.4/arch/x86/kernel/doublefault_32.c ---- linux-2.6.31.4/arch/x86/kernel/doublefault_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/doublefault_32.c 2009-10-11 15:29:40.799154910 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/doublefault_32.c linux-2.6.31.5/arch/x86/kernel/doublefault_32.c +--- linux-2.6.31.5/arch/x86/kernel/doublefault_32.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/doublefault_32.c 2009-10-20 20:32:11.070759873 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -9210,9 +9269,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/doublefault_32.c linux-2.6.31.4/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.31.4/arch/x86/kernel/dumpstack_32.c linux-2.6.31.4/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.31.4/arch/x86/kernel/dumpstack_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/dumpstack_32.c 2009-10-11 15:29:40.799154910 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/dumpstack_32.c linux-2.6.31.5/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.31.5/arch/x86/kernel/dumpstack_32.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/dumpstack_32.c 2009-10-20 20:32:11.070759873 -0400 @@ -113,11 +113,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.. @@ -9257,9 +9316,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/dumpstack_32.c linux-2.6.31.4/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.31.4/arch/x86/kernel/dumpstack.c linux-2.6.31.4/arch/x86/kernel/dumpstack.c ---- linux-2.6.31.4/arch/x86/kernel/dumpstack.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/dumpstack.c 2009-10-11 15:29:40.799154910 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/dumpstack.c linux-2.6.31.5/arch/x86/kernel/dumpstack.c +--- linux-2.6.31.5/arch/x86/kernel/dumpstack.c 2009-10-20 20:42:59.010537382 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/dumpstack.c 2009-10-20 20:32:11.070759873 -0400 @@ -181,7 +181,7 @@ void dump_stack(void) #endif @@ -9287,9 +9346,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/dumpstack.c linux-2.6.31.4/arch/x86/ke report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.31.4/arch/x86/kernel/e820.c linux-2.6.31.4/arch/x86/kernel/e820.c ---- linux-2.6.31.4/arch/x86/kernel/e820.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/e820.c 2009-10-11 15:29:40.800410493 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/e820.c linux-2.6.31.5/arch/x86/kernel/e820.c +--- linux-2.6.31.5/arch/x86/kernel/e820.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/e820.c 2009-10-20 20:32:11.070759873 -0400 @@ -733,7 +733,10 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -9302,9 +9361,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/e820.c linux-2.6.31.4/arch/x86/kernel/ }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.31.4/arch/x86/kernel/efi_32.c linux-2.6.31.4/arch/x86/kernel/efi_32.c ---- linux-2.6.31.4/arch/x86/kernel/efi_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/efi_32.c 2009-10-11 15:29:40.800410493 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/efi_32.c linux-2.6.31.5/arch/x86/kernel/efi_32.c +--- linux-2.6.31.5/arch/x86/kernel/efi_32.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/efi_32.c 2009-10-20 20:32:11.074147875 -0400 @@ -38,70 +38,38 @@ */ @@ -9385,9 +9444,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/efi_32.c linux-2.6.31.4/arch/x86/kerne /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.31.4/arch/x86/kernel/efi_stub_32.S linux-2.6.31.4/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.31.4/arch/x86/kernel/efi_stub_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/efi_stub_32.S 2009-10-11 15:29:40.801422965 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/efi_stub_32.S linux-2.6.31.5/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.31.5/arch/x86/kernel/efi_stub_32.S 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/efi_stub_32.S 2009-10-20 20:32:11.074147875 -0400 @@ -6,6 +6,7 @@ */ @@ -9486,9 +9545,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/efi_stub_32.S linux-2.6.31.4/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.31.4/arch/x86/kernel/entry_32.S linux-2.6.31.4/arch/x86/kernel/entry_32.S ---- linux-2.6.31.4/arch/x86/kernel/entry_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/entry_32.S 2009-10-18 10:09:07.029411525 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/entry_32.S linux-2.6.31.5/arch/x86/kernel/entry_32.S +--- linux-2.6.31.5/arch/x86/kernel/entry_32.S 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/entry_32.S 2009-10-20 20:32:11.074147875 -0400 @@ -191,7 +191,7 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -9742,9 +9801,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/entry_32.S linux-2.6.31.4/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.31.4/arch/x86/kernel/entry_64.S linux-2.6.31.4/arch/x86/kernel/entry_64.S ---- linux-2.6.31.4/arch/x86/kernel/entry_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/entry_64.S 2009-10-11 15:29:40.802326520 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/entry_64.S linux-2.6.31.5/arch/x86/kernel/entry_64.S +--- linux-2.6.31.5/arch/x86/kernel/entry_64.S 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/entry_64.S 2009-10-20 20:32:11.074147875 -0400 @@ -1074,7 +1074,12 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ @@ -9759,9 +9818,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/entry_64.S linux-2.6.31.4/arch/x86/ker subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) -diff -urNp linux-2.6.31.4/arch/x86/kernel/ftrace.c linux-2.6.31.4/arch/x86/kernel/ftrace.c ---- linux-2.6.31.4/arch/x86/kernel/ftrace.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/ftrace.c 2009-10-11 15:29:40.802326520 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/ftrace.c linux-2.6.31.5/arch/x86/kernel/ftrace.c +--- linux-2.6.31.5/arch/x86/kernel/ftrace.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/ftrace.c 2009-10-20 20:32:11.074147875 -0400 @@ -284,9 +284,9 @@ int ftrace_update_ftrace_func(ftrace_fun unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; @@ -9774,9 +9833,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/ftrace.c linux-2.6.31.4/arch/x86/kerne return ret; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/head32.c linux-2.6.31.4/arch/x86/kernel/head32.c ---- linux-2.6.31.4/arch/x86/kernel/head32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/head32.c 2009-10-11 15:29:40.803198518 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/head32.c linux-2.6.31.5/arch/x86/kernel/head32.c +--- linux-2.6.31.5/arch/x86/kernel/head32.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/head32.c 2009-10-20 20:32:11.074147875 -0400 @@ -13,12 +13,13 @@ #include #include @@ -9792,9 +9851,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/head32.c linux-2.6.31.4/arch/x86/kerne #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.31.4/arch/x86/kernel/head_32.S linux-2.6.31.4/arch/x86/kernel/head_32.S ---- linux-2.6.31.4/arch/x86/kernel/head_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/head_32.S 2009-10-18 10:15:00.924043933 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/head_32.S linux-2.6.31.5/arch/x86/kernel/head_32.S +--- linux-2.6.31.5/arch/x86/kernel/head_32.S 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/head_32.S 2009-10-20 20:32:11.074147875 -0400 @@ -19,10 +19,17 @@ #include #include @@ -10216,9 +10275,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/head_32.S linux-2.6.31.4/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.31.4/arch/x86/kernel/head_64.S linux-2.6.31.4/arch/x86/kernel/head_64.S ---- linux-2.6.31.4/arch/x86/kernel/head_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/head_64.S 2009-10-11 15:29:40.803198518 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/head_64.S linux-2.6.31.5/arch/x86/kernel/head_64.S +--- linux-2.6.31.5/arch/x86/kernel/head_64.S 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/head_64.S 2009-10-20 20:32:11.074147875 -0400 @@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) @@ -10455,9 +10514,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/head_64.S linux-2.6.31.4/arch/x86/kern .section .bss.page_aligned, "aw", @nobits .align PAGE_SIZE -diff -urNp linux-2.6.31.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.4/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.31.4/arch/x86/kernel/i386_ksyms_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/i386_ksyms_32.c 2009-10-11 15:29:40.804350684 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.5/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.31.5/arch/x86/kernel/i386_ksyms_32.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/i386_ksyms_32.c 2009-10-20 20:32:11.074147875 -0400 @@ -10,8 +10,12 @@ EXPORT_SYMBOL(mcount); #endif @@ -10479,9 +10538,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.4/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.31.4/arch/x86/kernel/init_task.c linux-2.6.31.4/arch/x86/kernel/init_task.c ---- linux-2.6.31.4/arch/x86/kernel/init_task.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/init_task.c 2009-10-11 15:29:40.804350684 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/init_task.c linux-2.6.31.5/arch/x86/kernel/init_task.c +--- linux-2.6.31.5/arch/x86/kernel/init_task.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/init_task.c 2009-10-20 20:32:11.074147875 -0400 @@ -39,5 +39,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. @@ -10490,9 +10549,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/init_task.c linux-2.6.31.4/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.31.4/arch/x86/kernel/ioport.c linux-2.6.31.4/arch/x86/kernel/ioport.c ---- linux-2.6.31.4/arch/x86/kernel/ioport.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/ioport.c 2009-10-11 15:29:40.804350684 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/ioport.c linux-2.6.31.5/arch/x86/kernel/ioport.c +--- linux-2.6.31.5/arch/x86/kernel/ioport.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/ioport.c 2009-10-20 20:32:11.074147875 -0400 @@ -6,6 +6,7 @@ #include #include @@ -10537,9 +10596,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/ioport.c linux-2.6.31.4/arch/x86/kerne } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.31.4/arch/x86/kernel/irq_32.c linux-2.6.31.4/arch/x86/kernel/irq_32.c ---- linux-2.6.31.4/arch/x86/kernel/irq_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/irq_32.c 2009-10-11 15:29:40.805176137 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/irq_32.c linux-2.6.31.5/arch/x86/kernel/irq_32.c +--- linux-2.6.31.5/arch/x86/kernel/irq_32.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/irq_32.c 2009-10-20 20:32:11.074147875 -0400 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -10558,9 +10617,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/irq_32.c linux-2.6.31.4/arch/x86/kerne call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.31.4/arch/x86/kernel/kgdb.c linux-2.6.31.4/arch/x86/kernel/kgdb.c ---- linux-2.6.31.4/arch/x86/kernel/kgdb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/kgdb.c 2009-10-11 15:29:56.565890778 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/kgdb.c linux-2.6.31.5/arch/x86/kernel/kgdb.c +--- linux-2.6.31.5/arch/x86/kernel/kgdb.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/kgdb.c 2009-10-20 20:32:11.074147875 -0400 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -10570,9 +10629,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/kgdb.c linux-2.6.31.4/arch/x86/kernel/ /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.31.4/arch/x86/kernel/kprobes.c linux-2.6.31.4/arch/x86/kernel/kprobes.c ---- linux-2.6.31.4/arch/x86/kernel/kprobes.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/kprobes.c 2009-10-12 23:12:55.189930027 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/kprobes.c linux-2.6.31.5/arch/x86/kernel/kprobes.c +--- linux-2.6.31.5/arch/x86/kernel/kprobes.c 2009-10-20 20:42:59.013952554 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/kprobes.c 2009-10-20 20:32:11.074147875 -0400 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -10655,9 +10714,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/kprobes.c linux-2.6.31.4/arch/x86/kern return ret; switch (val) { -diff -urNp linux-2.6.31.4/arch/x86/kernel/ldt.c linux-2.6.31.4/arch/x86/kernel/ldt.c ---- linux-2.6.31.4/arch/x86/kernel/ldt.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/ldt.c 2009-10-11 15:29:40.805176137 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/ldt.c linux-2.6.31.5/arch/x86/kernel/ldt.c +--- linux-2.6.31.5/arch/x86/kernel/ldt.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/ldt.c 2009-10-20 20:32:11.077724114 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -10722,9 +10781,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/ldt.c linux-2.6.31.4/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.31.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.31.4/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.31.4/arch/x86/kernel/machine_kexec_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/machine_kexec_32.c 2009-10-11 15:29:40.805176137 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/machine_kexec_32.c linux-2.6.31.5/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.31.5/arch/x86/kernel/machine_kexec_32.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/machine_kexec_32.c 2009-10-20 20:32:11.077724114 -0400 @@ -26,7 +26,7 @@ #include #include @@ -10752,9 +10811,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.31.4/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_amd.c linux-2.6.31.4/arch/x86/kernel/microcode_amd.c ---- linux-2.6.31.4/arch/x86/kernel/microcode_amd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/microcode_amd.c 2009-10-11 15:29:56.565890778 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/microcode_amd.c linux-2.6.31.5/arch/x86/kernel/microcode_amd.c +--- linux-2.6.31.5/arch/x86/kernel/microcode_amd.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/microcode_amd.c 2009-10-20 20:32:11.077724114 -0400 @@ -340,7 +340,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -10773,9 +10832,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_amd.c linux-2.6.31.4/arch/x8 { return µcode_amd_ops; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_core.c linux-2.6.31.4/arch/x86/kernel/microcode_core.c ---- linux-2.6.31.4/arch/x86/kernel/microcode_core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/microcode_core.c 2009-10-11 15:29:56.565890778 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/microcode_core.c linux-2.6.31.5/arch/x86/kernel/microcode_core.c +--- linux-2.6.31.5/arch/x86/kernel/microcode_core.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/microcode_core.c 2009-10-20 20:32:11.077724114 -0400 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -10785,9 +10844,25 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_core.c linux-2.6.31.4/arch/x /* * Synchronization. -diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_intel.c linux-2.6.31.4/arch/x86/kernel/microcode_intel.c ---- linux-2.6.31.4/arch/x86/kernel/microcode_intel.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/microcode_intel.c 2009-10-11 15:29:56.566751102 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/microcode_intel.c linux-2.6.31.5/arch/x86/kernel/microcode_intel.c +--- linux-2.6.31.5/arch/x86/kernel/microcode_intel.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/microcode_intel.c 2009-10-20 20:33:06.205827668 -0400 +@@ -443,13 +443,13 @@ static enum ucode_state request_microcod + + static int get_ucode_user(void *to, const void *from, size_t n) + { +- return copy_from_user(to, from, n); ++ return copy_from_user(to, (__force const void __user *)from, n); + } + + static enum ucode_state + request_microcode_user(int cpu, const void __user *buf, size_t size) + { +- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user); ++ return generic_load_microcode(cpu, (__force void *)buf, size, &get_ucode_user); + } + + static void microcode_fini_cpu(int cpu) @@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu) uci->mc = NULL; } @@ -10806,9 +10881,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/microcode_intel.c linux-2.6.31.4/arch/ { return µcode_intel_ops; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/module.c linux-2.6.31.4/arch/x86/kernel/module.c ---- linux-2.6.31.4/arch/x86/kernel/module.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/module.c 2009-10-18 10:09:07.037806226 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/module.c linux-2.6.31.5/arch/x86/kernel/module.c +--- linux-2.6.31.5/arch/x86/kernel/module.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/module.c 2009-10-20 20:32:11.077724114 -0400 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -10980,9 +11055,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/module.c linux-2.6.31.4/arch/x86/kerne #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.31.4/arch/x86/kernel/paravirt.c linux-2.6.31.4/arch/x86/kernel/paravirt.c ---- linux-2.6.31.4/arch/x86/kernel/paravirt.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/paravirt.c 2009-10-12 23:12:55.191160939 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/paravirt.c linux-2.6.31.5/arch/x86/kernel/paravirt.c +--- linux-2.6.31.5/arch/x86/kernel/paravirt.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/paravirt.c 2009-10-20 20:32:11.077724114 -0400 @@ -54,7 +54,7 @@ u64 _paravirt_ident_64(u64 x) return x; } @@ -11103,9 +11178,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/paravirt.c linux-2.6.31.4/arch/x86/ker }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.31.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.31.4/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.31.4/arch/x86/kernel/paravirt-spinlocks.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/paravirt-spinlocks.c 2009-10-11 15:29:40.806332268 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.31.5/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.31.5/arch/x86/kernel/paravirt-spinlocks.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/paravirt-spinlocks.c 2009-10-20 20:32:11.077724114 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -11115,9 +11190,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.31.4/ar #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.31.4/arch/x86/kernel/pci-dma.c linux-2.6.31.4/arch/x86/kernel/pci-dma.c ---- linux-2.6.31.4/arch/x86/kernel/pci-dma.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/pci-dma.c 2009-10-11 15:29:56.566751102 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/pci-dma.c linux-2.6.31.5/arch/x86/kernel/pci-dma.c +--- linux-2.6.31.5/arch/x86/kernel/pci-dma.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/pci-dma.c 2009-10-20 20:32:11.077724114 -0400 @@ -13,7 +13,7 @@ static int forbid_dac __read_mostly; @@ -11136,9 +11211,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/pci-dma.c linux-2.6.31.4/arch/x86/kern #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.31.4/arch/x86/kernel/pci-nommu.c linux-2.6.31.4/arch/x86/kernel/pci-nommu.c ---- linux-2.6.31.4/arch/x86/kernel/pci-nommu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/pci-nommu.c 2009-10-11 15:29:56.566751102 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/pci-nommu.c linux-2.6.31.5/arch/x86/kernel/pci-nommu.c +--- linux-2.6.31.5/arch/x86/kernel/pci-nommu.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/pci-nommu.c 2009-10-20 20:32:11.077724114 -0400 @@ -79,7 +79,7 @@ static void nommu_free_coherent(struct d free_pages((unsigned long)vaddr, get_order(size)); } @@ -11148,9 +11223,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/pci-nommu.c linux-2.6.31.4/arch/x86/ke .alloc_coherent = dma_generic_alloc_coherent, .free_coherent = nommu_free_coherent, .map_sg = nommu_map_sg, -diff -urNp linux-2.6.31.4/arch/x86/kernel/process_32.c linux-2.6.31.4/arch/x86/kernel/process_32.c ---- linux-2.6.31.4/arch/x86/kernel/process_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/process_32.c 2009-10-11 15:29:40.807144183 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/process_32.c linux-2.6.31.5/arch/x86/kernel/process_32.c +--- linux-2.6.31.5/arch/x86/kernel/process_32.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/process_32.c 2009-10-20 20:32:11.077724114 -0400 @@ -70,6 +70,7 @@ EXPORT_PER_CPU_SYMBOL(current_task); unsigned long thread_saved_pc(struct task_struct *tsk) { @@ -11245,9 +11320,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/process_32.c linux-2.6.31.4/arch/x86/k + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.31.4/arch/x86/kernel/process_64.c linux-2.6.31.4/arch/x86/kernel/process_64.c ---- linux-2.6.31.4/arch/x86/kernel/process_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/process_64.c 2009-10-11 15:29:40.807144183 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/process_64.c linux-2.6.31.5/arch/x86/kernel/process_64.c +--- linux-2.6.31.5/arch/x86/kernel/process_64.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/process_64.c 2009-10-20 20:32:11.077724114 -0400 @@ -94,7 +94,7 @@ static void __exit_idle(void) void exit_idle(void) { @@ -11290,9 +11365,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/process_64.c linux-2.6.31.4/arch/x86/k return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.31.4/arch/x86/kernel/process.c linux-2.6.31.4/arch/x86/kernel/process.c ---- linux-2.6.31.4/arch/x86/kernel/process.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/process.c 2009-10-11 15:29:40.847340009 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/process.c linux-2.6.31.5/arch/x86/kernel/process.c +--- linux-2.6.31.5/arch/x86/kernel/process.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/process.c 2009-10-20 20:32:11.077724114 -0400 @@ -76,7 +76,7 @@ void exit_thread(void) unsigned long *bp = t->io_bitmap_ptr; @@ -11330,21 +11405,80 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/process.c linux-2.6.31.4/arch/x86/kern - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} - -diff -urNp linux-2.6.31.4/arch/x86/kernel/ptrace.c linux-2.6.31.4/arch/x86/kernel/ptrace.c ---- linux-2.6.31.4/arch/x86/kernel/ptrace.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/ptrace.c 2009-10-11 15:29:40.847340009 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/ptrace.c linux-2.6.31.5/arch/x86/kernel/ptrace.c +--- linux-2.6.31.5/arch/x86/kernel/ptrace.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/ptrace.c 2009-10-20 20:33:06.209232976 -0400 +@@ -934,7 +934,7 @@ static const struct user_regset_view use + long arch_ptrace(struct task_struct *child, long request, long addr, long data) + { + int ret; +- unsigned long __user *datap = (unsigned long __user *)data; ++ unsigned long __user *datap = (__force unsigned long __user *)data; + + switch (request) { + /* read the word at location addr in the USER area. */ +@@ -1021,14 +1021,14 @@ long arch_ptrace(struct task_struct *chi + if (addr < 0) + return -EIO; + ret = do_get_thread_area(child, addr, +- (struct user_desc __user *) data); ++ (__force struct user_desc __user *) data); + break; + + case PTRACE_SET_THREAD_AREA: + if (addr < 0) + return -EIO; + ret = do_set_thread_area(child, addr, +- (struct user_desc __user *) data, 0); ++ (__force struct user_desc __user *) data, 0); + break; + #endif + +@@ -1047,12 +1047,12 @@ long arch_ptrace(struct task_struct *chi + #ifdef CONFIG_X86_PTRACE_BTS + case PTRACE_BTS_CONFIG: + ret = ptrace_bts_config +- (child, data, (struct ptrace_bts_config __user *)addr); ++ (child, data, (__force struct ptrace_bts_config __user *)addr); + break; + + case PTRACE_BTS_STATUS: + ret = ptrace_bts_status +- (child, data, (struct ptrace_bts_config __user *)addr); ++ (child, data, (__force struct ptrace_bts_config __user *)addr); + break; + + case PTRACE_BTS_SIZE: +@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi + + case PTRACE_BTS_GET: + ret = ptrace_bts_read_record +- (child, data, (struct bts_struct __user *) addr); ++ (child, data, (__force struct bts_struct __user *) addr); + break; + + case PTRACE_BTS_CLEAR: +@@ -1070,7 +1070,7 @@ long arch_ptrace(struct task_struct *chi + + case PTRACE_BTS_DRAIN: + ret = ptrace_bts_drain +- (child, data, (struct bts_struct __user *) addr); ++ (child, data, (__force struct bts_struct __user *) addr); + break; + #endif /* CONFIG_X86_PTRACE_BTS */ + @@ -1454,7 +1454,7 @@ void send_sigtrap(struct task_struct *ts info.si_code = si_code; /* User-mode ip? */ - info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL; -+ info.si_addr = user_mode(regs) ? (void __user *) regs->ip : NULL; ++ info.si_addr = user_mode(regs) ? (__force void __user *) regs->ip : NULL; /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.31.4/arch/x86/kernel/reboot.c linux-2.6.31.4/arch/x86/kernel/reboot.c ---- linux-2.6.31.4/arch/x86/kernel/reboot.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/reboot.c 2009-10-11 15:29:40.848286998 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/reboot.c linux-2.6.31.5/arch/x86/kernel/reboot.c +--- linux-2.6.31.5/arch/x86/kernel/reboot.c 2009-10-20 20:42:59.017371205 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/reboot.c 2009-10-20 20:32:11.080941887 -0400 @@ -31,7 +31,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); @@ -11421,9 +11555,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/reboot.c linux-2.6.31.4/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.31.4/arch/x86/kernel/setup.c linux-2.6.31.4/arch/x86/kernel/setup.c ---- linux-2.6.31.4/arch/x86/kernel/setup.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/setup.c 2009-10-11 15:29:40.848286998 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/setup.c linux-2.6.31.5/arch/x86/kernel/setup.c +--- linux-2.6.31.5/arch/x86/kernel/setup.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/setup.c 2009-10-20 20:32:11.080941887 -0400 @@ -768,14 +768,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) @@ -11444,9 +11578,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/setup.c linux-2.6.31.4/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.31.4/arch/x86/kernel/setup_percpu.c linux-2.6.31.4/arch/x86/kernel/setup_percpu.c ---- linux-2.6.31.4/arch/x86/kernel/setup_percpu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/setup_percpu.c 2009-10-11 15:29:40.848286998 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/setup_percpu.c linux-2.6.31.5/arch/x86/kernel/setup_percpu.c +--- linux-2.6.31.5/arch/x86/kernel/setup_percpu.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/setup_percpu.c 2009-10-20 20:32:11.080941887 -0400 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -11518,9 +11652,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/setup_percpu.c linux-2.6.31.4/arch/x86 /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.31.4/arch/x86/kernel/signal.c linux-2.6.31.4/arch/x86/kernel/signal.c ---- linux-2.6.31.4/arch/x86/kernel/signal.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/signal.c 2009-10-11 15:29:40.849219730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/signal.c linux-2.6.31.5/arch/x86/kernel/signal.c +--- linux-2.6.31.5/arch/x86/kernel/signal.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/signal.c 2009-10-20 20:33:06.209232976 -0400 @@ -197,7 +197,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. @@ -11530,27 +11664,59 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/signal.c linux-2.6.31.4/arch/x86/kerne #else /* !CONFIG_X86_32 */ sp = round_down(sp, 16) - 8; #endif +@@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, str + * Return an always-bogus address instead so we will die with SIGSEGV. + */ + if (onsigstack && !likely(on_sig_stack(sp))) +- return (void __user *)-1L; ++ return (__force void __user *)-1L; + + /* save i387 state */ + if (used_math() && save_i387_xstate(*fpstate) < 0) +- return (void __user *)-1L; ++ return (__force void __user *)-1L; + + return (void __user *)sp; + } @@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigactio } if (current->mm->context.vdso) - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); -+ restorer = (void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); ++ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); else - restorer = &frame->retcode; + restorer = (void __user *)&frame->retcode; if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; +@@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigactio + * reasons and because gdb uses it as a signature to notice + * signal handler stack frames. + */ +- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode); ++ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode); + + if (err) + return -EFAULT; @@ -377,7 +377,7 @@ static int __setup_rt_frame(int sig, str err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); /* Set up to return from userspace. */ - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); -+ restorer = (void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; put_user_ex(restorer, &frame->pretcode); +@@ -389,7 +389,7 @@ static int __setup_rt_frame(int sig, str + * reasons and because gdb uses it as a signature to notice + * signal handler stack frames. + */ +- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode); ++ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode); + } put_user_catch(err); + + if (err) @@ -789,7 +789,7 @@ static void do_signal(struct pt_regs *re * X86_32: vm86 regs switched out by assembly code before reaching * here, so testing against kernel CS suffices. @@ -11560,9 +11726,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/signal.c linux-2.6.31.4/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.31.4/arch/x86/kernel/smpboot.c linux-2.6.31.4/arch/x86/kernel/smpboot.c ---- linux-2.6.31.4/arch/x86/kernel/smpboot.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/smpboot.c 2009-10-12 23:12:55.236461764 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/smpboot.c linux-2.6.31.5/arch/x86/kernel/smpboot.c +--- linux-2.6.31.5/arch/x86/kernel/smpboot.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/smpboot.c 2009-10-20 20:32:11.080941887 -0400 @@ -727,7 +727,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; @@ -11575,9 +11741,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/smpboot.c linux-2.6.31.4/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start.sp = (void *) c_idle.idle->thread.sp; -diff -urNp linux-2.6.31.4/arch/x86/kernel/step.c linux-2.6.31.4/arch/x86/kernel/step.c ---- linux-2.6.31.4/arch/x86/kernel/step.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/step.c 2009-10-11 15:29:40.849219730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/step.c linux-2.6.31.5/arch/x86/kernel/step.c +--- linux-2.6.31.5/arch/x86/kernel/step.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/step.c 2009-10-20 20:32:11.080941887 -0400 @@ -23,22 +23,20 @@ unsigned long convert_ip_to_linear(struc * and APM bios ones we just ignore here. */ @@ -11627,17 +11793,17 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/step.c linux-2.6.31.4/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.31.4/arch/x86/kernel/syscall_table_32.S linux-2.6.31.4/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.31.4/arch/x86/kernel/syscall_table_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/syscall_table_32.S 2009-10-11 15:29:40.849219730 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/syscall_table_32.S linux-2.6.31.5/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.31.5/arch/x86/kernel/syscall_table_32.S 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/syscall_table_32.S 2009-10-20 20:32:11.080941887 -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.31.4/arch/x86/kernel/sys_i386_32.c linux-2.6.31.4/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.31.4/arch/x86/kernel/sys_i386_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/sys_i386_32.c 2009-10-11 15:29:40.850288534 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/sys_i386_32.c linux-2.6.31.5/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.31.5/arch/x86/kernel/sys_i386_32.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/sys_i386_32.c 2009-10-20 20:33:06.209232976 -0400 @@ -24,6 +24,21 @@ #include @@ -11866,9 +12032,27 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/sys_i386_32.c linux-2.6.31.4/arch/x86/ struct sel_arg_struct { unsigned long n; -diff -urNp linux-2.6.31.4/arch/x86/kernel/sys_x86_64.c linux-2.6.31.4/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.31.4/arch/x86/kernel/sys_x86_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/sys_x86_64.c 2009-10-11 15:29:40.850288534 -0400 +@@ -118,7 +332,7 @@ asmlinkage int sys_ipc(uint call, int fi + return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL); + case SEMTIMEDOP: + return sys_semtimedop(first, (struct sembuf __user *)ptr, second, +- (const struct timespec __user *)fifth); ++ (__force const struct timespec __user *)fifth); + + case SEMGET: + return sys_semget(first, second, third); +@@ -165,7 +379,7 @@ asmlinkage int sys_ipc(uint call, int fi + ret = do_shmat(first, (char __user *) ptr, second, &raddr); + if (ret) + return ret; +- return put_user(raddr, (ulong __user *) third); ++ return put_user(raddr, (__force ulong __user *) third); + } + case 1: /* iBCS2 emulator entry point */ + if (!segment_eq(get_fs(), get_ds())) +diff -urNp linux-2.6.31.5/arch/x86/kernel/sys_x86_64.c linux-2.6.31.5/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.31.5/arch/x86/kernel/sys_x86_64.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/sys_x86_64.c 2009-10-20 20:32:11.080941887 -0400 @@ -47,8 +47,8 @@ out: return error; } @@ -11950,9 +12134,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/sys_x86_64.c linux-2.6.31.4/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.31.4/arch/x86/kernel/time_32.c linux-2.6.31.4/arch/x86/kernel/time_32.c ---- linux-2.6.31.4/arch/x86/kernel/time_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/time_32.c 2009-10-11 15:29:40.850288534 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/time_32.c linux-2.6.31.5/arch/x86/kernel/time_32.c +--- linux-2.6.31.5/arch/x86/kernel/time_32.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/time_32.c 2009-10-20 20:32:11.080941887 -0400 @@ -47,22 +47,32 @@ unsigned long profile_pc(struct pt_regs unsigned long pc = instruction_pointer(regs); @@ -11988,9 +12172,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/time_32.c linux-2.6.31.4/arch/x86/kern return pc; } EXPORT_SYMBOL(profile_pc); -diff -urNp linux-2.6.31.4/arch/x86/kernel/time_64.c linux-2.6.31.4/arch/x86/kernel/time_64.c ---- linux-2.6.31.4/arch/x86/kernel/time_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/time_64.c 2009-10-11 15:29:40.850288534 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/time_64.c linux-2.6.31.5/arch/x86/kernel/time_64.c +--- linux-2.6.31.5/arch/x86/kernel/time_64.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/time_64.c 2009-10-20 20:32:11.080941887 -0400 @@ -25,8 +25,6 @@ #include #include @@ -12009,9 +12193,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/time_64.c linux-2.6.31.4/arch/x86/kern #ifdef CONFIG_FRAME_POINTER return *(unsigned long *)(regs->bp + sizeof(long)); #else -diff -urNp linux-2.6.31.4/arch/x86/kernel/tls.c linux-2.6.31.4/arch/x86/kernel/tls.c ---- linux-2.6.31.4/arch/x86/kernel/tls.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/tls.c 2009-10-11 15:29:40.851265721 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/tls.c linux-2.6.31.5/arch/x86/kernel/tls.c +--- linux-2.6.31.5/arch/x86/kernel/tls.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/tls.c 2009-10-20 20:32:11.080941887 -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; @@ -12024,9 +12208,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/tls.c linux-2.6.31.4/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.31.4/arch/x86/kernel/trampoline_32.S linux-2.6.31.4/arch/x86/kernel/trampoline_32.S ---- linux-2.6.31.4/arch/x86/kernel/trampoline_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/trampoline_32.S 2009-10-11 15:29:56.566751102 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/trampoline_32.S linux-2.6.31.5/arch/x86/kernel/trampoline_32.S +--- linux-2.6.31.5/arch/x86/kernel/trampoline_32.S 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/trampoline_32.S 2009-10-20 20:32:11.080941887 -0400 @@ -31,6 +31,12 @@ #include #include @@ -12049,9 +12233,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/trampoline_32.S linux-2.6.31.4/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.31.4/arch/x86/kernel/traps.c linux-2.6.31.4/arch/x86/kernel/traps.c ---- linux-2.6.31.4/arch/x86/kernel/traps.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/traps.c 2009-10-11 15:29:40.851265721 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/traps.c linux-2.6.31.5/arch/x86/kernel/traps.c +--- linux-2.6.31.5/arch/x86/kernel/traps.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/traps.c 2009-10-20 20:32:11.080941887 -0400 @@ -70,14 +70,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ @@ -12213,9 +12397,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/traps.c linux-2.6.31.4/arch/x86/kernel return new_kesp; } -diff -urNp linux-2.6.31.4/arch/x86/kernel/tsc.c linux-2.6.31.4/arch/x86/kernel/tsc.c ---- linux-2.6.31.4/arch/x86/kernel/tsc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/tsc.c 2009-10-11 15:29:40.852236167 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/tsc.c linux-2.6.31.5/arch/x86/kernel/tsc.c +--- linux-2.6.31.5/arch/x86/kernel/tsc.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/tsc.c 2009-10-20 20:32:11.084569313 -0400 @@ -790,7 +790,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, @@ -12225,9 +12409,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/tsc.c linux-2.6.31.4/arch/x86/kernel/t }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.31.4/arch/x86/kernel/vm86_32.c linux-2.6.31.4/arch/x86/kernel/vm86_32.c ---- linux-2.6.31.4/arch/x86/kernel/vm86_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/vm86_32.c 2009-10-11 15:29:40.852236167 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/vm86_32.c linux-2.6.31.5/arch/x86/kernel/vm86_32.c +--- linux-2.6.31.5/arch/x86/kernel/vm86_32.c 2009-10-20 20:42:59.020760222 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/vm86_32.c 2009-10-20 20:33:06.209232976 -0400 @@ -148,7 +148,7 @@ struct pt_regs *save_v86_state(struct ke do_exit(SIGSEGV); } @@ -12246,9 +12430,18 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/vm86_32.c linux-2.6.31.4/arch/x86/kern tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; if (cpu_has_sep) tsk->thread.sysenter_cs = 0; -diff -urNp linux-2.6.31.4/arch/x86/kernel/vmi_32.c linux-2.6.31.4/arch/x86/kernel/vmi_32.c ---- linux-2.6.31.4/arch/x86/kernel/vmi_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/vmi_32.c 2009-10-18 10:15:00.936767037 -0400 +@@ -529,7 +529,7 @@ static void do_int(struct kernel_vm86_re + goto cannot_handle; + if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored)) + goto cannot_handle; +- intr_ptr = (unsigned long __user *) (i << 2); ++ intr_ptr = (__force unsigned long __user *) (i << 2); + if (get_user(segoffs, intr_ptr)) + goto cannot_handle; + if ((segoffs >> 16) == BIOSSEG) +diff -urNp linux-2.6.31.5/arch/x86/kernel/vmi_32.c linux-2.6.31.5/arch/x86/kernel/vmi_32.c +--- linux-2.6.31.5/arch/x86/kernel/vmi_32.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/vmi_32.c 2009-10-20 20:32:11.084569313 -0400 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -12408,9 +12601,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/vmi_32.c linux-2.6.31.4/arch/x86/kerne return; local_irq_save(flags); -diff -urNp linux-2.6.31.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.4/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.31.4/arch/x86/kernel/vmlinux.lds.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/vmlinux.lds.S 2009-10-13 19:00:18.392269554 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/vmlinux.lds.S 2009-10-20 20:32:11.084569313 -0400 @@ -26,6 +26,22 @@ #include #include @@ -12710,9 +12903,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.4/arch/x86/ "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.31.4/arch/x86/kernel/vsyscall_64.c linux-2.6.31.4/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.31.4/arch/x86/kernel/vsyscall_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/vsyscall_64.c 2009-10-11 15:29:40.853208575 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/vsyscall_64.c linux-2.6.31.5/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.31.5/arch/x86/kernel/vsyscall_64.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/vsyscall_64.c 2009-10-20 20:32:11.084569313 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -12746,9 +12939,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/vsyscall_64.c linux-2.6.31.4/arch/x86/ }; #endif -diff -urNp linux-2.6.31.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.31.4/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.31.4/arch/x86/kernel/x8664_ksyms_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/kernel/x8664_ksyms_64.c 2009-10-11 15:29:40.853208575 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.31.5/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.31.5/arch/x86/kernel/x8664_ksyms_64.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/x8664_ksyms_64.c 2009-10-20 20:32:11.084569313 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -12758,9 +12951,39 @@ diff -urNp linux-2.6.31.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.31.4/arch/x EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.31.4/arch/x86/kvm/svm.c linux-2.6.31.4/arch/x86/kvm/svm.c ---- linux-2.6.31.4/arch/x86/kvm/svm.c 2009-10-12 23:26:17.568876652 -0400 -+++ linux-2.6.31.4/arch/x86/kvm/svm.c 2009-10-12 23:26:38.911688164 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kernel/xsave.c linux-2.6.31.5/arch/x86/kernel/xsave.c +--- linux-2.6.31.5/arch/x86/kernel/xsave.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kernel/xsave.c 2009-10-20 20:33:11.013917396 -0400 +@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ + fx_sw_user->xstate_size > fx_sw_user->extended_size) + return -1; + +- err = __get_user(magic2, (__u32 *) (((void *)fpstate) + ++ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) + + fx_sw_user->extended_size - + FP_XSTATE_MAGIC2_SIZE)); + /* +@@ -196,7 +196,7 @@ fx_only: + * the other extended state. + */ + xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE); +- return fxrstor_checking((__force struct i387_fxsave_struct *)buf); ++ return fxrstor_checking((struct i387_fxsave_struct __user *)buf); + } + + /* +@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf + if (task_thread_info(tsk)->status & TS_XSAVE) + err = restore_user_xstate(buf); + else +- err = fxrstor_checking((__force struct i387_fxsave_struct *) ++ err = fxrstor_checking((struct i387_fxsave_struct __user *) + buf); + if (unlikely(err)) { + /* +diff -urNp linux-2.6.31.5/arch/x86/kvm/svm.c linux-2.6.31.5/arch/x86/kvm/svm.c +--- linux-2.6.31.5/arch/x86/kvm/svm.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kvm/svm.c 2009-10-20 20:32:11.084569313 -0400 @@ -2300,9 +2300,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { @@ -12784,9 +13007,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kvm/svm.c linux-2.6.31.4/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.31.4/arch/x86/kvm/vmx.c linux-2.6.31.4/arch/x86/kvm/vmx.c ---- linux-2.6.31.4/arch/x86/kvm/vmx.c 2009-10-12 23:26:17.612585756 -0400 -+++ linux-2.6.31.4/arch/x86/kvm/vmx.c 2009-10-12 23:26:38.912396218 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kvm/vmx.c linux-2.6.31.5/arch/x86/kvm/vmx.c +--- linux-2.6.31.5/arch/x86/kvm/vmx.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kvm/vmx.c 2009-10-20 20:32:11.084569313 -0400 @@ -521,7 +521,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); @@ -12865,9 +13088,9 @@ diff -urNp linux-2.6.31.4/arch/x86/kvm/vmx.c linux-2.6.31.4/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.31.4/arch/x86/kvm/x86.c linux-2.6.31.4/arch/x86/kvm/x86.c ---- linux-2.6.31.4/arch/x86/kvm/x86.c 2009-10-12 23:26:17.620234568 -0400 -+++ linux-2.6.31.4/arch/x86/kvm/x86.c 2009-10-12 23:26:38.912396218 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kvm/x86.c linux-2.6.31.5/arch/x86/kvm/x86.c +--- linux-2.6.31.5/arch/x86/kvm/x86.c 2009-10-20 20:42:59.024079472 -0400 ++++ linux-2.6.31.5/arch/x86/kvm/x86.c 2009-10-20 20:32:11.084569313 -0400 @@ -73,42 +73,42 @@ static int kvm_dev_ioctl_get_supported_c struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, u32 function, u32 index); @@ -12966,9 +13189,37 @@ diff -urNp linux-2.6.31.4/arch/x86/kvm/x86.c linux-2.6.31.4/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.31.4/arch/x86/lib/checksum_32.S linux-2.6.31.4/arch/x86/lib/checksum_32.S ---- linux-2.6.31.4/arch/x86/lib/checksum_32.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/checksum_32.S 2009-10-11 15:29:40.961121537 -0400 +diff -urNp linux-2.6.31.5/arch/x86/kvm/x86_emulate.c linux-2.6.31.5/arch/x86/kvm/x86_emulate.c +--- linux-2.6.31.5/arch/x86/kvm/x86_emulate.c 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/kvm/x86_emulate.c 2009-10-20 20:33:11.013917396 -0400 +@@ -382,6 +382,7 @@ static u32 group2_table[] = { + + #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ + do { \ ++ unsigned long _tmp; \ + __asm__ __volatile__ ( \ + _PRE_EFLAGS("0", "4", "2") \ + _op _suffix " %"_x"3,%1; " \ +@@ -395,8 +396,6 @@ static u32 group2_table[] = { + /* Raw emulation: instruction has two explicit operands. */ + #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ + do { \ +- unsigned long _tmp; \ +- \ + switch ((_dst).bytes) { \ + case 2: \ + ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ +@@ -412,7 +411,6 @@ static u32 group2_table[] = { + + #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ + do { \ +- unsigned long _tmp; \ + switch ((_dst).bytes) { \ + case 1: \ + ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ +diff -urNp linux-2.6.31.5/arch/x86/lib/checksum_32.S linux-2.6.31.5/arch/x86/lib/checksum_32.S +--- linux-2.6.31.5/arch/x86/lib/checksum_32.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/checksum_32.S 2009-10-20 20:32:11.087963939 -0400 @@ -28,7 +28,8 @@ #include #include @@ -13214,9 +13465,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/checksum_32.S linux-2.6.31.4/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.31.4/arch/x86/lib/clear_page_64.S linux-2.6.31.4/arch/x86/lib/clear_page_64.S ---- linux-2.6.31.4/arch/x86/lib/clear_page_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/clear_page_64.S 2009-10-11 15:29:40.961121537 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/clear_page_64.S linux-2.6.31.5/arch/x86/lib/clear_page_64.S +--- linux-2.6.31.5/arch/x86/lib/clear_page_64.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/clear_page_64.S 2009-10-20 20:32:11.087963939 -0400 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include @@ -13226,9 +13477,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/clear_page_64.S linux-2.6.31.4/arch/x86/l 1: .byte 0xeb /* jmp */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.4/arch/x86/lib/copy_page_64.S linux-2.6.31.4/arch/x86/lib/copy_page_64.S ---- linux-2.6.31.4/arch/x86/lib/copy_page_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/copy_page_64.S 2009-10-11 15:29:40.962275196 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/copy_page_64.S linux-2.6.31.5/arch/x86/lib/copy_page_64.S +--- linux-2.6.31.5/arch/x86/lib/copy_page_64.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/copy_page_64.S 2009-10-20 20:32:11.087963939 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include @@ -13238,9 +13489,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/copy_page_64.S linux-2.6.31.4/arch/x86/li 1: .byte 0xeb /* jmp */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.4/arch/x86/lib/copy_user_64.S linux-2.6.31.4/arch/x86/lib/copy_user_64.S ---- linux-2.6.31.4/arch/x86/lib/copy_user_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/copy_user_64.S 2009-10-11 15:29:40.962275196 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/copy_user_64.S linux-2.6.31.5/arch/x86/lib/copy_user_64.S +--- linux-2.6.31.5/arch/x86/lib/copy_user_64.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/copy_user_64.S 2009-10-20 20:32:11.087963939 -0400 @@ -21,7 +21,7 @@ .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ @@ -13292,9 +13543,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/copy_user_64.S linux-2.6.31.4/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.31.4/arch/x86/lib/getuser.S linux-2.6.31.4/arch/x86/lib/getuser.S ---- linux-2.6.31.4/arch/x86/lib/getuser.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/getuser.S 2009-10-11 15:29:40.962275196 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/getuser.S linux-2.6.31.5/arch/x86/lib/getuser.S +--- linux-2.6.31.5/arch/x86/lib/getuser.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/getuser.S 2009-10-20 20:32:11.087963939 -0400 @@ -33,6 +33,7 @@ #include #include @@ -13376,9 +13627,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/getuser.S linux-2.6.31.4/arch/x86/lib/get xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.31.4/arch/x86/lib/memcpy_64.S linux-2.6.31.4/arch/x86/lib/memcpy_64.S ---- linux-2.6.31.4/arch/x86/lib/memcpy_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/memcpy_64.S 2009-10-11 15:29:40.962275196 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/memcpy_64.S linux-2.6.31.5/arch/x86/lib/memcpy_64.S +--- linux-2.6.31.5/arch/x86/lib/memcpy_64.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/memcpy_64.S 2009-10-20 20:32:11.087963939 -0400 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -13388,9 +13639,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/memcpy_64.S linux-2.6.31.4/arch/x86/lib/m 1: .byte 0xeb /* jmp */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.4/arch/x86/lib/memset_64.S linux-2.6.31.4/arch/x86/lib/memset_64.S ---- linux-2.6.31.4/arch/x86/lib/memset_64.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/memset_64.S 2009-10-11 15:29:40.963145709 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/memset_64.S linux-2.6.31.5/arch/x86/lib/memset_64.S +--- linux-2.6.31.5/arch/x86/lib/memset_64.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/memset_64.S 2009-10-20 20:32:11.087963939 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include @@ -13400,9 +13651,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/memset_64.S linux-2.6.31.4/arch/x86/lib/m 1: .byte 0xeb /* jmp */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.4/arch/x86/lib/mmx_32.c linux-2.6.31.4/arch/x86/lib/mmx_32.c ---- linux-2.6.31.4/arch/x86/lib/mmx_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/mmx_32.c 2009-10-11 15:29:40.963145709 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/mmx_32.c linux-2.6.31.5/arch/x86/lib/mmx_32.c +--- linux-2.6.31.5/arch/x86/lib/mmx_32.c 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/mmx_32.c 2009-10-20 20:32:11.087963939 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -13718,9 +13969,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/mmx_32.c linux-2.6.31.4/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.31.4/arch/x86/lib/putuser.S linux-2.6.31.4/arch/x86/lib/putuser.S ---- linux-2.6.31.4/arch/x86/lib/putuser.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/putuser.S 2009-10-11 15:29:40.963145709 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/putuser.S linux-2.6.31.5/arch/x86/lib/putuser.S +--- linux-2.6.31.5/arch/x86/lib/putuser.S 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/putuser.S 2009-10-20 20:32:11.087963939 -0400 @@ -15,6 +15,7 @@ #include #include @@ -13824,9 +14075,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/putuser.S linux-2.6.31.4/arch/x86/lib/put movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.31.4/arch/x86/lib/usercopy_32.c linux-2.6.31.4/arch/x86/lib/usercopy_32.c ---- linux-2.6.31.4/arch/x86/lib/usercopy_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/lib/usercopy_32.c 2009-10-11 15:29:56.559427908 -0400 +diff -urNp linux-2.6.31.5/arch/x86/lib/usercopy_32.c linux-2.6.31.5/arch/x86/lib/usercopy_32.c +--- linux-2.6.31.5/arch/x86/lib/usercopy_32.c 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/lib/usercopy_32.c 2009-10-20 20:32:11.087963939 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -14795,9 +15046,9 @@ diff -urNp linux-2.6.31.4/arch/x86/lib/usercopy_32.c linux-2.6.31.4/arch/x86/lib +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.31.4/arch/x86/Makefile linux-2.6.31.4/arch/x86/Makefile ---- linux-2.6.31.4/arch/x86/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/Makefile 2009-10-11 15:29:40.964527359 -0400 +diff -urNp linux-2.6.31.5/arch/x86/Makefile linux-2.6.31.5/arch/x86/Makefile +--- linux-2.6.31.5/arch/x86/Makefile 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/Makefile 2009-10-20 20:32:11.087963939 -0400 @@ -188,3 +188,12 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' @@ -14811,9 +15062,9 @@ diff -urNp linux-2.6.31.4/arch/x86/Makefile linux-2.6.31.4/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.31.4/arch/x86/mm/extable.c linux-2.6.31.4/arch/x86/mm/extable.c ---- linux-2.6.31.4/arch/x86/mm/extable.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/extable.c 2009-10-13 19:00:18.392269554 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/extable.c linux-2.6.31.5/arch/x86/mm/extable.c +--- linux-2.6.31.5/arch/x86/mm/extable.c 2009-10-20 20:42:59.027621375 -0400 ++++ linux-2.6.31.5/arch/x86/mm/extable.c 2009-10-20 20:32:11.087963939 -0400 @@ -1,14 +1,71 @@ #include #include @@ -14887,9 +15138,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/extable.c linux-2.6.31.4/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.31.4/arch/x86/mm/fault.c linux-2.6.31.4/arch/x86/mm/fault.c ---- linux-2.6.31.4/arch/x86/mm/fault.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/fault.c 2009-10-11 15:41:02.289144032 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/fault.c linux-2.6.31.5/arch/x86/mm/fault.c +--- linux-2.6.31.5/arch/x86/mm/fault.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/fault.c 2009-10-20 20:33:06.209232976 -0400 @@ -11,10 +11,14 @@ #include /* __kprobes, ... */ #include /* kmmio_handler, ... */ @@ -15410,7 +15661,7 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/fault.c linux-2.6.31.4/arch/x86/mm/fault.c + printk(KERN_ERR "PAX: bytes at PC: "); + for (i = 0; i < 20; i++) { + unsigned char c; -+ if (get_user(c, (unsigned char __user *)pc+i)) ++ if (get_user(c, (__force unsigned char __user *)pc+i)) + printk(KERN_CONT "?? "); + else + printk(KERN_CONT "%02x ", c); @@ -15420,7 +15671,7 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/fault.c linux-2.6.31.4/arch/x86/mm/fault.c + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long)); + for (i = -1; i < 80 / sizeof(long); i++) { + unsigned long c; -+ if (get_user(c, (unsigned long __user *)sp+i)) ++ if (get_user(c, (__force unsigned long __user *)sp+i)) +#ifdef CONFIG_X86_32 + printk(KERN_CONT "???????? "); +#else @@ -15432,9 +15683,21 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/fault.c linux-2.6.31.4/arch/x86/mm/fault.c + printk("\n"); +} +#endif -diff -urNp linux-2.6.31.4/arch/x86/mm/highmem_32.c linux-2.6.31.4/arch/x86/mm/highmem_32.c ---- linux-2.6.31.4/arch/x86/mm/highmem_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/highmem_32.c 2009-10-12 23:12:55.284949502 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/gup.c linux-2.6.31.5/arch/x86/mm/gup.c +--- linux-2.6.31.5/arch/x86/mm/gup.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/gup.c 2009-10-20 20:33:11.017710972 -0400 +@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long + addr = start; + len = (unsigned long) nr_pages << PAGE_SHIFT; + end = start + len; +- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ, ++ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ, + (void __user *)start, len))) + return 0; + +diff -urNp linux-2.6.31.5/arch/x86/mm/highmem_32.c linux-2.6.31.5/arch/x86/mm/highmem_32.c +--- linux-2.6.31.5/arch/x86/mm/highmem_32.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/highmem_32.c 2009-10-20 20:32:11.087963939 -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); @@ -15460,9 +15723,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/highmem_32.c linux-2.6.31.4/arch/x86/mm/hi #ifdef CONFIG_DEBUG_HIGHMEM BUG_ON(vaddr < PAGE_OFFSET); BUG_ON(vaddr >= (unsigned long)high_memory); -diff -urNp linux-2.6.31.4/arch/x86/mm/hugetlbpage.c linux-2.6.31.4/arch/x86/mm/hugetlbpage.c ---- linux-2.6.31.4/arch/x86/mm/hugetlbpage.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/hugetlbpage.c 2009-10-11 15:29:40.965222374 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/hugetlbpage.c linux-2.6.31.5/arch/x86/mm/hugetlbpage.c +--- linux-2.6.31.5/arch/x86/mm/hugetlbpage.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/hugetlbpage.c 2009-10-20 20:32:11.091397062 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -15597,9 +15860,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/hugetlbpage.c linux-2.6.31.4/arch/x86/mm/h (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.31.4/arch/x86/mm/init_32.c linux-2.6.31.4/arch/x86/mm/init_32.c ---- linux-2.6.31.4/arch/x86/mm/init_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/init_32.c 2009-10-18 10:09:07.063636365 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/init_32.c linux-2.6.31.5/arch/x86/mm/init_32.c +--- linux-2.6.31.5/arch/x86/mm/init_32.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/init_32.c 2009-10-20 20:32:11.091397062 -0400 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -15857,9 +16120,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init_32.c linux-2.6.31.4/arch/x86/mm/init_ ((unsigned long)&_etext - (unsigned long)&_text) >> 10); /* -diff -urNp linux-2.6.31.4/arch/x86/mm/init_64.c linux-2.6.31.4/arch/x86/mm/init_64.c ---- linux-2.6.31.4/arch/x86/mm/init_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/init_64.c 2009-10-12 23:12:55.286158560 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/init_64.c linux-2.6.31.5/arch/x86/mm/init_64.c +--- linux-2.6.31.5/arch/x86/mm/init_64.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/init_64.c 2009-10-20 20:32:11.091397062 -0400 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -15907,9 +16170,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init_64.c linux-2.6.31.4/arch/x86/mm/init_ return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c ---- linux-2.6.31.4/arch/x86/mm/init.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/init.c 2009-10-12 23:12:55.284949502 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/init.c linux-2.6.31.5/arch/x86/mm/init.c +--- linux-2.6.31.5/arch/x86/mm/init.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/init.c 2009-10-20 20:33:06.209232976 -0400 @@ -28,11 +28,10 @@ int direct_gbpages #endif ; @@ -15946,12 +16209,12 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c static void __init set_nx(void) { - unsigned int v[4], l, h; +- +- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) { +- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]); + if (!nx_enabled && cpu_has_nx) { + unsigned l, h; -- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) { -- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]); -- - if ((v[3] & (1 << 20)) && !disable_nx) { - rdmsr(MSR_EFER, l, h); - l |= EFER_NX; @@ -15990,7 +16253,7 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c return 1; if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) return 0; -@@ -442,6 +441,73 @@ void free_init_pages(char *what, unsigne +@@ -442,6 +441,83 @@ void free_init_pages(char *what, unsigne void free_initmem(void) { @@ -16016,14 +16279,19 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c + } + + /* PaX: make KERNEL_CS read-only */ ++ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text)); + if (!paravirt_enabled()) ++ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT); ++/* + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); + pmd = pmd_offset(pud, addr); + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); + } ++*/ +#ifdef CONFIG_X86_PAE ++ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT); + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); + pud = pud_offset(pgd, addr); @@ -16031,6 +16299,11 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); + } +#endif ++ ++#ifdef CONFIG_MODULES ++ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT); ++#endif ++ +#else + unsigned long addr, end; + @@ -16064,9 +16337,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/init.c linux-2.6.31.4/arch/x86/mm/init.c free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -diff -urNp linux-2.6.31.4/arch/x86/mm/iomap_32.c linux-2.6.31.4/arch/x86/mm/iomap_32.c ---- linux-2.6.31.4/arch/x86/mm/iomap_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/iomap_32.c 2009-10-12 23:12:55.287156226 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/iomap_32.c linux-2.6.31.5/arch/x86/mm/iomap_32.c +--- linux-2.6.31.5/arch/x86/mm/iomap_32.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/iomap_32.c 2009-10-20 20:32:11.091397062 -0400 @@ -42,7 +42,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); @@ -16079,9 +16352,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/iomap_32.c linux-2.6.31.4/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.31.4/arch/x86/mm/ioremap.c linux-2.6.31.4/arch/x86/mm/ioremap.c ---- linux-2.6.31.4/arch/x86/mm/ioremap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/ioremap.c 2009-10-11 15:29:41.151107138 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/ioremap.c linux-2.6.31.5/arch/x86/mm/ioremap.c +--- linux-2.6.31.5/arch/x86/mm/ioremap.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/ioremap.c 2009-10-20 20:32:11.091397062 -0400 @@ -111,8 +111,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. @@ -16133,9 +16406,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/ioremap.c linux-2.6.31.4/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.31.4/arch/x86/mm/mmap.c linux-2.6.31.4/arch/x86/mm/mmap.c ---- linux-2.6.31.4/arch/x86/mm/mmap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/mmap.c 2009-10-11 15:29:41.151107138 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/mmap.c linux-2.6.31.5/arch/x86/mm/mmap.c +--- linux-2.6.31.5/arch/x86/mm/mmap.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/mmap.c 2009-10-20 20:32:11.091397062 -0400 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -16217,9 +16490,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/mmap.c linux-2.6.31.4/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.31.4/arch/x86/mm/numa_32.c linux-2.6.31.4/arch/x86/mm/numa_32.c ---- linux-2.6.31.4/arch/x86/mm/numa_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/numa_32.c 2009-10-11 15:29:41.151107138 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/numa_32.c linux-2.6.31.5/arch/x86/mm/numa_32.c +--- linux-2.6.31.5/arch/x86/mm/numa_32.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/numa_32.c 2009-10-20 20:32:11.091397062 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -16228,9 +16501,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/numa_32.c linux-2.6.31.4/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.31.4/arch/x86/mm/pageattr.c linux-2.6.31.4/arch/x86/mm/pageattr.c ---- linux-2.6.31.4/arch/x86/mm/pageattr.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/pageattr.c 2009-10-18 10:09:07.072973187 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/pageattr.c linux-2.6.31.5/arch/x86/mm/pageattr.c +--- linux-2.6.31.5/arch/x86/mm/pageattr.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/pageattr.c 2009-10-20 20:32:11.091397062 -0400 @@ -267,9 +267,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping @@ -16262,9 +16535,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/pageattr.c linux-2.6.31.4/arch/x86/mm/page #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.31.4/arch/x86/mm/pageattr-test.c linux-2.6.31.4/arch/x86/mm/pageattr-test.c ---- linux-2.6.31.4/arch/x86/mm/pageattr-test.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/pageattr-test.c 2009-10-11 15:29:41.152322234 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/pageattr-test.c linux-2.6.31.5/arch/x86/mm/pageattr-test.c +--- linux-2.6.31.5/arch/x86/mm/pageattr-test.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/pageattr-test.c 2009-10-20 20:32:11.091397062 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -16274,9 +16547,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/pageattr-test.c linux-2.6.31.4/arch/x86/mm } struct split_state { -diff -urNp linux-2.6.31.4/arch/x86/mm/pat.c linux-2.6.31.4/arch/x86/mm/pat.c ---- linux-2.6.31.4/arch/x86/mm/pat.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/pat.c 2009-10-11 15:29:41.152322234 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/pat.c linux-2.6.31.5/arch/x86/mm/pat.c +--- linux-2.6.31.5/arch/x86/mm/pat.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/pat.c 2009-10-20 20:32:11.091397062 -0400 @@ -213,7 +213,7 @@ chk_conflict(struct memtype *new, struct conflict: @@ -16322,9 +16595,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/pat.c linux-2.6.31.4/arch/x86/mm/pat.c .start = memtype_seq_start, .next = memtype_seq_next, .stop = memtype_seq_stop, -diff -urNp linux-2.6.31.4/arch/x86/mm/pgtable_32.c linux-2.6.31.4/arch/x86/mm/pgtable_32.c ---- linux-2.6.31.4/arch/x86/mm/pgtable_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/pgtable_32.c 2009-10-12 23:12:55.288178434 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/pgtable_32.c linux-2.6.31.5/arch/x86/mm/pgtable_32.c +--- linux-2.6.31.5/arch/x86/mm/pgtable_32.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/pgtable_32.c 2009-10-20 20:32:11.091397062 -0400 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -16339,9 +16612,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/pgtable_32.c linux-2.6.31.4/arch/x86/mm/pg /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.31.4/arch/x86/mm/tlb.c linux-2.6.31.4/arch/x86/mm/tlb.c ---- linux-2.6.31.4/arch/x86/mm/tlb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/mm/tlb.c 2009-10-11 15:29:41.153221557 -0400 +diff -urNp linux-2.6.31.5/arch/x86/mm/tlb.c linux-2.6.31.5/arch/x86/mm/tlb.c +--- linux-2.6.31.5/arch/x86/mm/tlb.c 2009-10-20 20:42:59.030925644 -0400 ++++ linux-2.6.31.5/arch/x86/mm/tlb.c 2009-10-20 20:32:11.094747939 -0400 @@ -12,7 +12,7 @@ #include @@ -16351,9 +16624,9 @@ diff -urNp linux-2.6.31.4/arch/x86/mm/tlb.c linux-2.6.31.4/arch/x86/mm/tlb.c /* * Smarter SMP flushing macros. -diff -urNp linux-2.6.31.4/arch/x86/oprofile/backtrace.c linux-2.6.31.4/arch/x86/oprofile/backtrace.c ---- linux-2.6.31.4/arch/x86/oprofile/backtrace.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/oprofile/backtrace.c 2009-10-11 15:29:41.153221557 -0400 +diff -urNp linux-2.6.31.5/arch/x86/oprofile/backtrace.c linux-2.6.31.5/arch/x86/oprofile/backtrace.c +--- linux-2.6.31.5/arch/x86/oprofile/backtrace.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/oprofile/backtrace.c 2009-10-20 20:33:06.209232976 -0400 @@ -37,7 +37,7 @@ static void backtrace_address(void *data unsigned int *depth = data; @@ -16363,6 +16636,15 @@ diff -urNp linux-2.6.31.4/arch/x86/oprofile/backtrace.c linux-2.6.31.4/arch/x86/ } static struct stacktrace_ops backtrace_ops = { +@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back + struct frame_head bufhead[2]; + + /* Also check accessibility of one struct frame_head beyond */ +- if (!access_ok(VERIFY_READ, head, sizeof(bufhead))) ++ if (!__access_ok(VERIFY_READ, head, sizeof(bufhead))) + return NULL; + if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead))) + return NULL; @@ -77,7 +77,7 @@ x86_backtrace(struct pt_regs * const reg { struct frame_head *head = (struct frame_head *)frame_pointer(regs); @@ -16372,9 +16654,9 @@ diff -urNp linux-2.6.31.4/arch/x86/oprofile/backtrace.c linux-2.6.31.4/arch/x86/ unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.31.4/arch/x86/oprofile/op_model_p4.c linux-2.6.31.4/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.31.4/arch/x86/oprofile/op_model_p4.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/oprofile/op_model_p4.c 2009-10-11 15:29:41.153221557 -0400 +diff -urNp linux-2.6.31.5/arch/x86/oprofile/op_model_p4.c linux-2.6.31.5/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.31.5/arch/x86/oprofile/op_model_p4.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/oprofile/op_model_p4.c 2009-10-20 20:32:11.094747939 -0400 @@ -48,7 +48,7 @@ static inline void setup_num_counters(vo #endif } @@ -16384,9 +16666,9 @@ diff -urNp linux-2.6.31.4/arch/x86/oprofile/op_model_p4.c linux-2.6.31.4/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.31.4/arch/x86/pci/common.c linux-2.6.31.4/arch/x86/pci/common.c ---- linux-2.6.31.4/arch/x86/pci/common.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/common.c 2009-10-11 15:29:56.560399027 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/common.c linux-2.6.31.5/arch/x86/pci/common.c +--- linux-2.6.31.5/arch/x86/pci/common.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/common.c 2009-10-20 20:32:11.094747939 -0400 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -16407,9 +16689,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/common.c linux-2.6.31.4/arch/x86/pci/comm }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.31.4/arch/x86/pci/direct.c linux-2.6.31.4/arch/x86/pci/direct.c ---- linux-2.6.31.4/arch/x86/pci/direct.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/direct.c 2009-10-11 15:29:56.566751102 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/direct.c linux-2.6.31.5/arch/x86/pci/direct.c +--- linux-2.6.31.5/arch/x86/pci/direct.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/direct.c 2009-10-20 20:32:11.094747939 -0400 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -16437,9 +16719,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/direct.c linux-2.6.31.4/arch/x86/pci/dire { u32 x = 0; int devfn; -diff -urNp linux-2.6.31.4/arch/x86/pci/fixup.c linux-2.6.31.4/arch/x86/pci/fixup.c ---- linux-2.6.31.4/arch/x86/pci/fixup.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/fixup.c 2009-10-11 15:29:41.154278402 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/fixup.c linux-2.6.31.5/arch/x86/pci/fixup.c +--- linux-2.6.31.5/arch/x86/pci/fixup.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/fixup.c 2009-10-20 20:32:11.094747939 -0400 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -16458,9 +16740,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/fixup.c linux-2.6.31.4/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.31.4/arch/x86/pci/i386.c linux-2.6.31.4/arch/x86/pci/i386.c ---- linux-2.6.31.4/arch/x86/pci/i386.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/i386.c 2009-10-11 15:29:41.154278402 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/i386.c linux-2.6.31.5/arch/x86/pci/i386.c +--- linux-2.6.31.5/arch/x86/pci/i386.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/i386.c 2009-10-20 20:32:11.094747939 -0400 @@ -266,7 +266,7 @@ void pcibios_set_master(struct pci_dev * pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); } @@ -16470,9 +16752,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/i386.c linux-2.6.31.4/arch/x86/pci/i386.c .access = generic_access_phys, }; -diff -urNp linux-2.6.31.4/arch/x86/pci/irq.c linux-2.6.31.4/arch/x86/pci/irq.c ---- linux-2.6.31.4/arch/x86/pci/irq.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/irq.c 2009-10-11 15:29:41.154278402 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/irq.c linux-2.6.31.5/arch/x86/pci/irq.c +--- linux-2.6.31.5/arch/x86/pci/irq.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/irq.c 2009-10-20 20:32:11.094747939 -0400 @@ -543,7 +543,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) }, @@ -16491,9 +16773,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/irq.c linux-2.6.31.4/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.31.4/arch/x86/pci/mmconfig_32.c linux-2.6.31.4/arch/x86/pci/mmconfig_32.c ---- linux-2.6.31.4/arch/x86/pci/mmconfig_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/mmconfig_32.c 2009-10-11 15:29:56.567716338 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/mmconfig_32.c linux-2.6.31.5/arch/x86/pci/mmconfig_32.c +--- linux-2.6.31.5/arch/x86/pci/mmconfig_32.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/mmconfig_32.c 2009-10-20 20:32:11.094747939 -0400 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -16503,9 +16785,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/mmconfig_32.c linux-2.6.31.4/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.31.4/arch/x86/pci/mmconfig_64.c linux-2.6.31.4/arch/x86/pci/mmconfig_64.c ---- linux-2.6.31.4/arch/x86/pci/mmconfig_64.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/mmconfig_64.c 2009-10-11 15:29:56.567716338 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/mmconfig_64.c linux-2.6.31.5/arch/x86/pci/mmconfig_64.c +--- linux-2.6.31.5/arch/x86/pci/mmconfig_64.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/mmconfig_64.c 2009-10-20 20:32:11.094747939 -0400 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -16515,9 +16797,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/mmconfig_64.c linux-2.6.31.4/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.31.4/arch/x86/pci/numaq_32.c linux-2.6.31.4/arch/x86/pci/numaq_32.c ---- linux-2.6.31.4/arch/x86/pci/numaq_32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/numaq_32.c 2009-10-11 15:29:56.567716338 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/numaq_32.c linux-2.6.31.5/arch/x86/pci/numaq_32.c +--- linux-2.6.31.5/arch/x86/pci/numaq_32.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/numaq_32.c 2009-10-20 20:32:11.094747939 -0400 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -16527,9 +16809,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/numaq_32.c linux-2.6.31.4/arch/x86/pci/nu .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.31.4/arch/x86/pci/olpc.c linux-2.6.31.4/arch/x86/pci/olpc.c ---- linux-2.6.31.4/arch/x86/pci/olpc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/olpc.c 2009-10-11 15:29:56.567716338 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/olpc.c linux-2.6.31.5/arch/x86/pci/olpc.c +--- linux-2.6.31.5/arch/x86/pci/olpc.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/olpc.c 2009-10-20 20:32:11.094747939 -0400 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -16539,9 +16821,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/olpc.c linux-2.6.31.4/arch/x86/pci/olpc.c .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.31.4/arch/x86/pci/pcbios.c linux-2.6.31.4/arch/x86/pci/pcbios.c ---- linux-2.6.31.4/arch/x86/pci/pcbios.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/pci/pcbios.c 2009-10-12 23:12:55.295312661 -0400 +diff -urNp linux-2.6.31.5/arch/x86/pci/pcbios.c linux-2.6.31.5/arch/x86/pci/pcbios.c +--- linux-2.6.31.5/arch/x86/pci/pcbios.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/pci/pcbios.c 2009-10-20 20:32:11.094747939 -0400 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -16864,9 +17146,9 @@ diff -urNp linux-2.6.31.4/arch/x86/pci/pcbios.c linux-2.6.31.4/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.31.4/arch/x86/power/cpu.c linux-2.6.31.4/arch/x86/power/cpu.c ---- linux-2.6.31.4/arch/x86/power/cpu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/power/cpu.c 2009-10-12 23:12:55.296056556 -0400 +diff -urNp linux-2.6.31.5/arch/x86/power/cpu.c linux-2.6.31.5/arch/x86/power/cpu.c +--- linux-2.6.31.5/arch/x86/power/cpu.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/power/cpu.c 2009-10-20 20:32:11.094747939 -0400 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -16886,9 +17168,9 @@ diff -urNp linux-2.6.31.4/arch/x86/power/cpu.c linux-2.6.31.4/arch/x86/power/cpu syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.31.4/arch/x86/vdso/Makefile linux-2.6.31.4/arch/x86/vdso/Makefile ---- linux-2.6.31.4/arch/x86/vdso/Makefile 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/Makefile 2009-10-11 15:29:41.155221953 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/Makefile linux-2.6.31.5/arch/x86/vdso/Makefile +--- linux-2.6.31.5/arch/x86/vdso/Makefile 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/Makefile 2009-10-20 20:32:11.094747939 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -16898,9 +17180,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/Makefile linux-2.6.31.4/arch/x86/vdso/Ma GCOV_PROFILE := n # -diff -urNp linux-2.6.31.4/arch/x86/vdso/vclock_gettime.c linux-2.6.31.4/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.31.4/arch/x86/vdso/vclock_gettime.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/vclock_gettime.c 2009-10-11 15:29:41.156287758 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/vclock_gettime.c linux-2.6.31.5/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.31.5/arch/x86/vdso/vclock_gettime.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/vclock_gettime.c 2009-10-20 20:32:11.094747939 -0400 @@ -22,24 +22,48 @@ #include #include @@ -16999,9 +17281,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vclock_gettime.c linux-2.6.31.4/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c 2009-10-11 15:29:41.156287758 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/vdso32-setup.c linux-2.6.31.5/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.31.5/arch/x86/vdso/vdso32-setup.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/vdso32-setup.c 2009-10-20 20:33:06.209232976 -0400 @@ -25,6 +25,7 @@ #include #include @@ -17045,7 +17327,12 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c linux-2.6.31.4/arch/x86/v if (compat_uses_vma || !compat) { /* -@@ -365,7 +366,7 @@ int arch_setup_additional_pages(struct l +@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l + } + + current_thread_info()->sysenter_return = +- VDSO32_SYMBOL(addr, SYSENTER_RETURN); ++ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN); up_fail: if (ret) @@ -17097,9 +17384,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vdso32-setup.c linux-2.6.31.4/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.31.4/arch/x86/vdso/vdso.lds.S linux-2.6.31.4/arch/x86/vdso/vdso.lds.S ---- linux-2.6.31.4/arch/x86/vdso/vdso.lds.S 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/vdso.lds.S 2009-10-11 15:29:41.156287758 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/vdso.lds.S linux-2.6.31.5/arch/x86/vdso/vdso.lds.S +--- linux-2.6.31.5/arch/x86/vdso/vdso.lds.S 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/vdso.lds.S 2009-10-20 20:32:11.098007503 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -17110,9 +17397,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vdso.lds.S linux-2.6.31.4/arch/x86/vdso/ +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.31.4/arch/x86/vdso/vextern.h linux-2.6.31.4/arch/x86/vdso/vextern.h ---- linux-2.6.31.4/arch/x86/vdso/vextern.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/vextern.h 2009-10-11 15:29:41.156287758 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/vextern.h linux-2.6.31.5/arch/x86/vdso/vextern.h +--- linux-2.6.31.5/arch/x86/vdso/vextern.h 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/vextern.h 2009-10-20 20:32:11.098007503 -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. */ @@ -17120,9 +17407,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vextern.h linux-2.6.31.4/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.31.4/arch/x86/vdso/vma.c linux-2.6.31.4/arch/x86/vdso/vma.c ---- linux-2.6.31.4/arch/x86/vdso/vma.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/vdso/vma.c 2009-10-11 15:29:41.157225306 -0400 +diff -urNp linux-2.6.31.5/arch/x86/vdso/vma.c linux-2.6.31.5/arch/x86/vdso/vma.c +--- linux-2.6.31.5/arch/x86/vdso/vma.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/vdso/vma.c 2009-10-20 20:32:11.098007503 -0400 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -17169,9 +17456,9 @@ diff -urNp linux-2.6.31.4/arch/x86/vdso/vma.c linux-2.6.31.4/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.31.4/arch/x86/xen/debugfs.c linux-2.6.31.4/arch/x86/xen/debugfs.c ---- linux-2.6.31.4/arch/x86/xen/debugfs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/xen/debugfs.c 2009-10-11 15:29:41.157225306 -0400 +diff -urNp linux-2.6.31.5/arch/x86/xen/debugfs.c linux-2.6.31.5/arch/x86/xen/debugfs.c +--- linux-2.6.31.5/arch/x86/xen/debugfs.c 2009-10-20 20:42:59.034316011 -0400 ++++ linux-2.6.31.5/arch/x86/xen/debugfs.c 2009-10-20 20:32:11.098007503 -0400 @@ -100,7 +100,7 @@ static int xen_array_release(struct inod return 0; } @@ -17181,9 +17468,9 @@ diff -urNp linux-2.6.31.4/arch/x86/xen/debugfs.c linux-2.6.31.4/arch/x86/xen/deb .owner = THIS_MODULE, .open = u32_array_open, .release= xen_array_release, -diff -urNp linux-2.6.31.4/arch/x86/xen/enlighten.c linux-2.6.31.4/arch/x86/xen/enlighten.c ---- linux-2.6.31.4/arch/x86/xen/enlighten.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/xen/enlighten.c 2009-10-11 15:29:41.157225306 -0400 +diff -urNp linux-2.6.31.5/arch/x86/xen/enlighten.c linux-2.6.31.5/arch/x86/xen/enlighten.c +--- linux-2.6.31.5/arch/x86/xen/enlighten.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/arch/x86/xen/enlighten.c 2009-10-20 20:32:11.098007503 -0400 @@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -17216,9 +17503,9 @@ diff -urNp linux-2.6.31.4/arch/x86/xen/enlighten.c linux-2.6.31.4/arch/x86/xen/e xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.31.4/arch/x86/xen/mmu.c linux-2.6.31.4/arch/x86/xen/mmu.c ---- linux-2.6.31.4/arch/x86/xen/mmu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/xen/mmu.c 2009-10-11 15:29:41.158173548 -0400 +diff -urNp linux-2.6.31.5/arch/x86/xen/mmu.c linux-2.6.31.5/arch/x86/xen/mmu.c +--- linux-2.6.31.5/arch/x86/xen/mmu.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/arch/x86/xen/mmu.c 2009-10-20 20:32:11.098007503 -0400 @@ -1707,6 +1707,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); @@ -17239,9 +17526,9 @@ diff -urNp linux-2.6.31.4/arch/x86/xen/mmu.c linux-2.6.31.4/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.31.4/arch/x86/xen/smp.c linux-2.6.31.4/arch/x86/xen/smp.c ---- linux-2.6.31.4/arch/x86/xen/smp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/xen/smp.c 2009-10-11 15:29:41.158173548 -0400 +diff -urNp linux-2.6.31.5/arch/x86/xen/smp.c linux-2.6.31.5/arch/x86/xen/smp.c +--- linux-2.6.31.5/arch/x86/xen/smp.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/arch/x86/xen/smp.c 2009-10-20 20:32:11.098007503 -0400 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -17265,9 +17552,9 @@ diff -urNp linux-2.6.31.4/arch/x86/xen/smp.c linux-2.6.31.4/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.31.4/arch/x86/xen/xen-ops.h linux-2.6.31.4/arch/x86/xen/xen-ops.h ---- linux-2.6.31.4/arch/x86/xen/xen-ops.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/x86/xen/xen-ops.h 2009-10-11 15:29:41.158173548 -0400 +diff -urNp linux-2.6.31.5/arch/x86/xen/xen-ops.h linux-2.6.31.5/arch/x86/xen/xen-ops.h +--- linux-2.6.31.5/arch/x86/xen/xen-ops.h 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/arch/x86/xen/xen-ops.h 2009-10-20 20:32:11.098007503 -0400 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -17277,9 +17564,9 @@ diff -urNp linux-2.6.31.4/arch/x86/xen/xen-ops.h linux-2.6.31.4/arch/x86/xen/xen struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.31.4/arch/xtensa/include/asm/atomic.h linux-2.6.31.4/arch/xtensa/include/asm/atomic.h ---- linux-2.6.31.4/arch/xtensa/include/asm/atomic.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/arch/xtensa/include/asm/atomic.h 2009-10-11 15:29:41.158173548 -0400 +diff -urNp linux-2.6.31.5/arch/xtensa/include/asm/atomic.h linux-2.6.31.5/arch/xtensa/include/asm/atomic.h +--- linux-2.6.31.5/arch/xtensa/include/asm/atomic.h 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/arch/xtensa/include/asm/atomic.h 2009-10-20 20:32:11.098007503 -0400 @@ -49,6 +49,14 @@ #define atomic_read(v) ((v)->counter) @@ -17343,9 +17630,57 @@ diff -urNp linux-2.6.31.4/arch/xtensa/include/asm/atomic.h linux-2.6.31.4/arch/x /** * atomic_inc - increment atomic variable -diff -urNp linux-2.6.31.4/crypto/lrw.c linux-2.6.31.4/crypto/lrw.c ---- linux-2.6.31.4/crypto/lrw.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/crypto/lrw.c 2009-10-11 15:29:41.340125789 -0400 +diff -urNp linux-2.6.31.5/block/blk-integrity.c linux-2.6.31.5/block/blk-integrity.c +--- linux-2.6.31.5/block/blk-integrity.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/block/blk-integrity.c 2009-10-20 20:33:11.017710972 -0400 +@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs + NULL, + }; + +-static struct sysfs_ops integrity_ops = { ++static const struct sysfs_ops integrity_ops = { + .show = &integrity_attr_show, + .store = &integrity_attr_store, + }; +diff -urNp linux-2.6.31.5/block/blk-map.c linux-2.6.31.5/block/blk-map.c +--- linux-2.6.31.5/block/blk-map.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/block/blk-map.c 2009-10-20 20:33:11.017710972 -0400 +@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ + * direct dma. else, set up kernel bounce buffers + */ + uaddr = (unsigned long) ubuf; +- if (blk_rq_aligned(q, ubuf, len) && !map_data) ++ if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data) + bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask); + else + bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask); +diff -urNp linux-2.6.31.5/block/blk-sysfs.c linux-2.6.31.5/block/blk-sysfs.c +--- linux-2.6.31.5/block/blk-sysfs.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/block/blk-sysfs.c 2009-10-20 20:33:11.017710972 -0400 +@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob + kmem_cache_free(blk_requestq_cachep, q); + } + +-static struct sysfs_ops queue_sysfs_ops = { ++static const struct sysfs_ops queue_sysfs_ops = { + .show = queue_attr_show, + .store = queue_attr_store, + }; +diff -urNp linux-2.6.31.5/block/elevator.c linux-2.6.31.5/block/elevator.c +--- linux-2.6.31.5/block/elevator.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/block/elevator.c 2009-10-20 20:33:11.017710972 -0400 +@@ -901,7 +901,7 @@ elv_attr_store(struct kobject *kobj, str + return error; + } + +-static struct sysfs_ops elv_sysfs_ops = { ++static const struct sysfs_ops elv_sysfs_ops = { + .show = elv_attr_show, + .store = elv_attr_store, + }; +diff -urNp linux-2.6.31.5/crypto/lrw.c linux-2.6.31.5/crypto/lrw.c +--- linux-2.6.31.5/crypto/lrw.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/crypto/lrw.c 2009-10-20 20:32:11.098007503 -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; @@ -17355,9 +17690,9 @@ diff -urNp linux-2.6.31.4/crypto/lrw.c linux-2.6.31.4/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.31.4/Documentation/dontdiff linux-2.6.31.4/Documentation/dontdiff ---- linux-2.6.31.4/Documentation/dontdiff 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/Documentation/dontdiff 2009-10-11 15:29:41.340125789 -0400 +diff -urNp linux-2.6.31.5/Documentation/dontdiff linux-2.6.31.5/Documentation/dontdiff +--- linux-2.6.31.5/Documentation/dontdiff 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/Documentation/dontdiff 2009-10-20 20:32:11.098007503 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -17454,9 +17789,9 @@ diff -urNp linux-2.6.31.4/Documentation/dontdiff linux-2.6.31.4/Documentation/do zImage* zconf.hash.c +zoffset.h -diff -urNp linux-2.6.31.4/Documentation/kernel-parameters.txt linux-2.6.31.4/Documentation/kernel-parameters.txt ---- linux-2.6.31.4/Documentation/kernel-parameters.txt 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/Documentation/kernel-parameters.txt 2009-10-11 15:29:41.387334245 -0400 +diff -urNp linux-2.6.31.5/Documentation/kernel-parameters.txt linux-2.6.31.5/Documentation/kernel-parameters.txt +--- linux-2.6.31.5/Documentation/kernel-parameters.txt 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/Documentation/kernel-parameters.txt 2009-10-20 20:32:11.098007503 -0400 @@ -1776,6 +1776,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. @@ -17470,21 +17805,42 @@ diff -urNp linux-2.6.31.4/Documentation/kernel-parameters.txt linux-2.6.31.4/Doc pcbit= [HW,ISDN] pcd. [PARIDE] -diff -urNp linux-2.6.31.4/drivers/acpi/blacklist.c linux-2.6.31.4/drivers/acpi/blacklist.c ---- linux-2.6.31.4/drivers/acpi/blacklist.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/acpi/blacklist.c 2009-10-11 15:29:41.411312253 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/blacklist.c linux-2.6.31.5/drivers/acpi/blacklist.c +--- linux-2.6.31.5/drivers/acpi/blacklist.c 2009-10-20 20:42:59.037878556 -0400 ++++ linux-2.6.31.5/drivers/acpi/blacklist.c 2009-10-20 20:33:06.209232976 -0400 @@ -71,7 +71,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, - {""} -+ {"", "", 0, 0, 0, all_versions, 0} ++ {"", "", 0, NULL, all_versions, NULL, 0} }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.31.4/drivers/acpi/osl.c linux-2.6.31.4/drivers/acpi/osl.c ---- linux-2.6.31.4/drivers/acpi/osl.c 2009-10-12 23:26:17.640437961 -0400 -+++ linux-2.6.31.4/drivers/acpi/osl.c 2009-10-12 23:26:38.913624626 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/dock.c linux-2.6.31.5/drivers/acpi/dock.c +--- linux-2.6.31.5/drivers/acpi/dock.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/dock.c 2009-10-20 20:33:11.017710972 -0400 +@@ -75,7 +75,7 @@ struct dock_dependent_device { + struct list_head list; + struct list_head hotplug_list; + acpi_handle handle; +- struct acpi_dock_ops *ops; ++ const struct acpi_dock_ops *ops; + void *context; + }; + +@@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi + * the dock driver after _DCK is executed. + */ + int +-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, ++register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops, + void *context) + { + struct dock_dependent_device *dd; +diff -urNp linux-2.6.31.5/drivers/acpi/osl.c linux-2.6.31.5/drivers/acpi/osl.c +--- linux-2.6.31.5/drivers/acpi/osl.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/osl.c 2009-10-20 20:32:11.101227437 -0400 @@ -521,6 +521,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; @@ -17503,9 +17859,9 @@ diff -urNp linux-2.6.31.4/drivers/acpi/osl.c linux-2.6.31.4/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.31.4/drivers/acpi/processor_core.c linux-2.6.31.4/drivers/acpi/processor_core.c ---- linux-2.6.31.4/drivers/acpi/processor_core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/acpi/processor_core.c 2009-10-11 15:29:41.419134023 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/processor_core.c linux-2.6.31.5/drivers/acpi/processor_core.c +--- linux-2.6.31.5/drivers/acpi/processor_core.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/processor_core.c 2009-10-20 20:32:11.101227437 -0400 @@ -712,7 +712,7 @@ static int __cpuinit acpi_processor_star return 0; } @@ -17515,9 +17871,9 @@ diff -urNp linux-2.6.31.4/drivers/acpi/processor_core.c linux-2.6.31.4/drivers/a /* * Buggy BIOS check -diff -urNp linux-2.6.31.4/drivers/acpi/processor_idle.c linux-2.6.31.4/drivers/acpi/processor_idle.c ---- linux-2.6.31.4/drivers/acpi/processor_idle.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/acpi/processor_idle.c 2009-10-11 15:29:41.433629076 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/processor_idle.c linux-2.6.31.5/drivers/acpi/processor_idle.c +--- linux-2.6.31.5/drivers/acpi/processor_idle.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/processor_idle.c 2009-10-20 20:32:11.101227437 -0400 @@ -108,7 +108,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, @@ -17527,9 +17883,9 @@ diff -urNp linux-2.6.31.4/drivers/acpi/processor_idle.c linux-2.6.31.4/drivers/a }; -diff -urNp linux-2.6.31.4/drivers/acpi/sleep.c linux-2.6.31.4/drivers/acpi/sleep.c ---- linux-2.6.31.4/drivers/acpi/sleep.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/acpi/sleep.c 2009-10-11 15:29:56.583380078 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/sleep.c linux-2.6.31.5/drivers/acpi/sleep.c +--- linux-2.6.31.5/drivers/acpi/sleep.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/sleep.c 2009-10-20 20:32:11.101227437 -0400 @@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp } } @@ -17566,9 +17922,9 @@ diff -urNp linux-2.6.31.4/drivers/acpi/sleep.c linux-2.6.31.4/drivers/acpi/sleep .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.31.4/drivers/acpi/video.c linux-2.6.31.4/drivers/acpi/video.c ---- linux-2.6.31.4/drivers/acpi/video.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/acpi/video.c 2009-10-11 15:29:41.441500388 -0400 +diff -urNp linux-2.6.31.5/drivers/acpi/video.c linux-2.6.31.5/drivers/acpi/video.c +--- linux-2.6.31.5/drivers/acpi/video.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/acpi/video.c 2009-10-20 20:32:11.101227437 -0400 @@ -283,7 +283,7 @@ static int acpi_video_device_brightness_ struct file *file); static ssize_t acpi_video_device_write_brightness(struct file *file, @@ -17578,9 +17934,9 @@ diff -urNp linux-2.6.31.4/drivers/acpi/video.c linux-2.6.31.4/drivers/acpi/video .owner = THIS_MODULE, .open = acpi_video_device_brightness_open_fs, .read = seq_read, -diff -urNp linux-2.6.31.4/drivers/ata/ahci.c linux-2.6.31.4/drivers/ata/ahci.c ---- linux-2.6.31.4/drivers/ata/ahci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ata/ahci.c 2009-10-11 15:29:41.446364925 -0400 +diff -urNp linux-2.6.31.5/drivers/ata/ahci.c linux-2.6.31.5/drivers/ata/ahci.c +--- linux-2.6.31.5/drivers/ata/ahci.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/ata/ahci.c 2009-10-20 20:32:11.104612407 -0400 @@ -629,7 +629,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 }, @@ -17590,9 +17946,9 @@ diff -urNp linux-2.6.31.4/drivers/ata/ahci.c linux-2.6.31.4/drivers/ata/ahci.c }; -diff -urNp linux-2.6.31.4/drivers/ata/ata_piix.c linux-2.6.31.4/drivers/ata/ata_piix.c ---- linux-2.6.31.4/drivers/ata/ata_piix.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ata/ata_piix.c 2009-10-11 15:29:41.452812112 -0400 +diff -urNp linux-2.6.31.5/drivers/ata/ata_piix.c linux-2.6.31.5/drivers/ata/ata_piix.c +--- linux-2.6.31.5/drivers/ata/ata_piix.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/ata/ata_piix.c 2009-10-20 20:32:11.104612407 -0400 @@ -291,7 +291,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (PCH) */ @@ -17620,9 +17976,27 @@ diff -urNp linux-2.6.31.4/drivers/ata/ata_piix.c linux-2.6.31.4/drivers/ata/ata_ }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.31.4/drivers/ata/libata-core.c linux-2.6.31.4/drivers/ata/libata-core.c ---- linux-2.6.31.4/drivers/ata/libata-core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ata/libata-core.c 2009-10-11 15:29:41.477768140 -0400 +diff -urNp linux-2.6.31.5/drivers/ata/libata-acpi.c linux-2.6.31.5/drivers/ata/libata-acpi.c +--- linux-2.6.31.5/drivers/ata/libata-acpi.c 2009-10-20 20:42:59.041293464 -0400 ++++ linux-2.6.31.5/drivers/ata/libata-acpi.c 2009-10-20 20:33:11.017710972 -0400 +@@ -233,12 +233,12 @@ static void ata_acpi_dev_uevent(acpi_han + ata_acpi_uevent(dev->link->ap, dev, event); + } + +-static struct acpi_dock_ops ata_acpi_dev_dock_ops = { ++static const struct acpi_dock_ops ata_acpi_dev_dock_ops = { + .handler = ata_acpi_dev_notify_dock, + .uevent = ata_acpi_dev_uevent, + }; + +-static struct acpi_dock_ops ata_acpi_ap_dock_ops = { ++static const struct acpi_dock_ops ata_acpi_ap_dock_ops = { + .handler = ata_acpi_ap_notify_dock, + .uevent = ata_acpi_ap_uevent, + }; +diff -urNp linux-2.6.31.5/drivers/ata/libata-core.c linux-2.6.31.5/drivers/ata/libata-core.c +--- linux-2.6.31.5/drivers/ata/libata-core.c 2009-10-20 20:42:59.044501245 -0400 ++++ linux-2.6.31.5/drivers/ata/libata-core.c 2009-10-20 20:32:11.104612407 -0400 @@ -896,7 +896,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 }, @@ -17650,9 +18024,9 @@ diff -urNp linux-2.6.31.4/drivers/ata/libata-core.c linux-2.6.31.4/drivers/ata/l }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -diff -urNp linux-2.6.31.4/drivers/atm/adummy.c linux-2.6.31.4/drivers/atm/adummy.c ---- linux-2.6.31.4/drivers/atm/adummy.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/adummy.c 2009-10-11 15:29:41.481622008 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/adummy.c linux-2.6.31.5/drivers/atm/adummy.c +--- linux-2.6.31.5/drivers/atm/adummy.c 2009-10-20 20:42:59.047665566 -0400 ++++ linux-2.6.31.5/drivers/atm/adummy.c 2009-10-20 20:32:11.104612407 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -17662,9 +18036,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/adummy.c linux-2.6.31.4/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.31.4/drivers/atm/ambassador.c linux-2.6.31.4/drivers/atm/ambassador.c ---- linux-2.6.31.4/drivers/atm/ambassador.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/ambassador.c 2009-10-11 15:29:41.491363630 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/ambassador.c linux-2.6.31.5/drivers/atm/ambassador.c +--- linux-2.6.31.5/drivers/atm/ambassador.c 2009-10-20 20:42:59.050830377 -0400 ++++ linux-2.6.31.5/drivers/atm/ambassador.c 2009-10-20 20:32:11.104612407 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -17701,9 +18075,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/ambassador.c linux-2.6.31.4/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.31.4/drivers/atm/atmtcp.c linux-2.6.31.4/drivers/atm/atmtcp.c ---- linux-2.6.31.4/drivers/atm/atmtcp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/atmtcp.c 2009-10-11 15:29:41.492368987 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/atmtcp.c linux-2.6.31.5/drivers/atm/atmtcp.c +--- linux-2.6.31.5/drivers/atm/atmtcp.c 2009-10-20 20:42:59.050830377 -0400 ++++ linux-2.6.31.5/drivers/atm/atmtcp.c 2009-10-20 20:32:11.107983477 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -17753,9 +18127,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/atmtcp.c linux-2.6.31.4/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.31.4/drivers/atm/eni.c linux-2.6.31.4/drivers/atm/eni.c ---- linux-2.6.31.4/drivers/atm/eni.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/eni.c 2009-10-11 15:29:41.500507070 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/eni.c linux-2.6.31.5/drivers/atm/eni.c +--- linux-2.6.31.5/drivers/atm/eni.c 2009-10-20 20:42:59.050830377 -0400 ++++ linux-2.6.31.5/drivers/atm/eni.c 2009-10-20 20:32:11.107983477 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -17801,9 +18175,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/eni.c linux-2.6.31.4/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.31.4/drivers/atm/firestream.c linux-2.6.31.4/drivers/atm/firestream.c ---- linux-2.6.31.4/drivers/atm/firestream.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/firestream.c 2009-10-11 15:29:41.514469585 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/firestream.c linux-2.6.31.5/drivers/atm/firestream.c +--- linux-2.6.31.5/drivers/atm/firestream.c 2009-10-20 20:42:59.050830377 -0400 ++++ linux-2.6.31.5/drivers/atm/firestream.c 2009-10-20 20:32:11.107983477 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -17837,9 +18211,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/firestream.c linux-2.6.31.4/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.31.4/drivers/atm/fore200e.c linux-2.6.31.4/drivers/atm/fore200e.c ---- linux-2.6.31.4/drivers/atm/fore200e.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/fore200e.c 2009-10-11 15:29:41.867364251 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/fore200e.c linux-2.6.31.5/drivers/atm/fore200e.c +--- linux-2.6.31.5/drivers/atm/fore200e.c 2009-10-20 20:42:59.050830377 -0400 ++++ linux-2.6.31.5/drivers/atm/fore200e.c 2009-10-20 20:32:11.107983477 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -17896,9 +18270,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/fore200e.c linux-2.6.31.4/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.31.4/drivers/atm/he.c linux-2.6.31.4/drivers/atm/he.c ---- linux-2.6.31.4/drivers/atm/he.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/he.c 2009-10-11 15:29:41.926362979 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/he.c linux-2.6.31.5/drivers/atm/he.c +--- linux-2.6.31.5/drivers/atm/he.c 2009-10-20 20:42:59.054102494 -0400 ++++ linux-2.6.31.5/drivers/atm/he.c 2009-10-20 20:32:11.107983477 -0400 @@ -1728,7 +1728,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -17980,9 +18354,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/he.c linux-2.6.31.4/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.31.4/drivers/atm/horizon.c linux-2.6.31.4/drivers/atm/horizon.c ---- linux-2.6.31.4/drivers/atm/horizon.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/horizon.c 2009-10-11 15:29:41.963561255 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/horizon.c linux-2.6.31.5/drivers/atm/horizon.c +--- linux-2.6.31.5/drivers/atm/horizon.c 2009-10-20 20:42:59.054102494 -0400 ++++ linux-2.6.31.5/drivers/atm/horizon.c 2009-10-20 20:32:11.107983477 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -18001,9 +18375,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/horizon.c linux-2.6.31.4/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.31.4/drivers/atm/idt77252.c linux-2.6.31.4/drivers/atm/idt77252.c ---- linux-2.6.31.4/drivers/atm/idt77252.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/idt77252.c 2009-10-11 15:29:41.967398057 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/idt77252.c linux-2.6.31.5/drivers/atm/idt77252.c +--- linux-2.6.31.5/drivers/atm/idt77252.c 2009-10-20 20:42:59.054102494 -0400 ++++ linux-2.6.31.5/drivers/atm/idt77252.c 2009-10-20 20:32:11.111431554 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -18158,9 +18532,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/idt77252.c linux-2.6.31.4/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.31.4/drivers/atm/iphase.c linux-2.6.31.4/drivers/atm/iphase.c ---- linux-2.6.31.4/drivers/atm/iphase.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/iphase.c 2009-10-11 15:29:41.977650727 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/iphase.c linux-2.6.31.5/drivers/atm/iphase.c +--- linux-2.6.31.5/drivers/atm/iphase.c 2009-10-20 20:42:59.054102494 -0400 ++++ linux-2.6.31.5/drivers/atm/iphase.c 2009-10-20 20:32:11.111431554 -0400 @@ -1123,7 +1123,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)) @@ -18257,9 +18631,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/iphase.c linux-2.6.31.4/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.31.4/drivers/atm/lanai.c linux-2.6.31.4/drivers/atm/lanai.c ---- linux-2.6.31.4/drivers/atm/lanai.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/lanai.c 2009-10-11 15:29:41.990418719 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/lanai.c linux-2.6.31.5/drivers/atm/lanai.c +--- linux-2.6.31.5/drivers/atm/lanai.c 2009-10-20 20:42:59.054102494 -0400 ++++ linux-2.6.31.5/drivers/atm/lanai.c 2009-10-20 20:32:11.111431554 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -18314,9 +18688,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/lanai.c linux-2.6.31.4/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.31.4/drivers/atm/nicstar.c linux-2.6.31.4/drivers/atm/nicstar.c ---- linux-2.6.31.4/drivers/atm/nicstar.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/nicstar.c 2009-10-11 15:29:42.023423181 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/nicstar.c linux-2.6.31.5/drivers/atm/nicstar.c +--- linux-2.6.31.5/drivers/atm/nicstar.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/atm/nicstar.c 2009-10-20 20:32:11.114709382 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -18519,9 +18893,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/nicstar.c linux-2.6.31.4/drivers/atm/nicst } } -diff -urNp linux-2.6.31.4/drivers/atm/solos-pci.c linux-2.6.31.4/drivers/atm/solos-pci.c ---- linux-2.6.31.4/drivers/atm/solos-pci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/solos-pci.c 2009-10-11 15:29:42.035623502 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/solos-pci.c linux-2.6.31.5/drivers/atm/solos-pci.c +--- linux-2.6.31.5/drivers/atm/solos-pci.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/atm/solos-pci.c 2009-10-20 20:32:11.114709382 -0400 @@ -663,7 +663,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); @@ -18540,9 +18914,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/solos-pci.c linux-2.6.31.4/drivers/atm/sol solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.31.4/drivers/atm/suni.c linux-2.6.31.4/drivers/atm/suni.c ---- linux-2.6.31.4/drivers/atm/suni.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/suni.c 2009-10-11 15:29:42.050476713 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/suni.c linux-2.6.31.5/drivers/atm/suni.c +--- linux-2.6.31.5/drivers/atm/suni.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/atm/suni.c 2009-10-20 20:32:11.114709382 -0400 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -18554,9 +18928,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/suni.c linux-2.6.31.4/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.31.4/drivers/atm/uPD98402.c linux-2.6.31.4/drivers/atm/uPD98402.c ---- linux-2.6.31.4/drivers/atm/uPD98402.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/uPD98402.c 2009-10-11 15:29:42.051465371 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/uPD98402.c linux-2.6.31.5/drivers/atm/uPD98402.c +--- linux-2.6.31.5/drivers/atm/uPD98402.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/atm/uPD98402.c 2009-10-20 20:32:11.114709382 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -18601,9 +18975,9 @@ diff -urNp linux-2.6.31.4/drivers/atm/uPD98402.c linux-2.6.31.4/drivers/atm/uPD9 return 0; } -diff -urNp linux-2.6.31.4/drivers/atm/zatm.c linux-2.6.31.4/drivers/atm/zatm.c ---- linux-2.6.31.4/drivers/atm/zatm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/atm/zatm.c 2009-10-11 15:29:42.067535381 -0400 +diff -urNp linux-2.6.31.5/drivers/atm/zatm.c linux-2.6.31.5/drivers/atm/zatm.c +--- linux-2.6.31.5/drivers/atm/zatm.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/atm/zatm.c 2009-10-20 20:32:11.114709382 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -18631,9 +19005,75 @@ diff -urNp linux-2.6.31.4/drivers/atm/zatm.c linux-2.6.31.4/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.31.4/drivers/block/cciss.c linux-2.6.31.4/drivers/block/cciss.c ---- linux-2.6.31.4/drivers/block/cciss.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/block/cciss.c 2009-10-11 15:29:42.079531064 -0400 +diff -urNp linux-2.6.31.5/drivers/base/bus.c linux-2.6.31.5/drivers/base/bus.c +--- linux-2.6.31.5/drivers/base/bus.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/base/bus.c 2009-10-20 20:33:11.017710972 -0400 +@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob + return ret; + } + +-static struct sysfs_ops driver_sysfs_ops = { ++static const struct sysfs_ops driver_sysfs_ops = { + .show = drv_attr_show, + .store = drv_attr_store, + }; +@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kob + return ret; + } + +-static struct sysfs_ops bus_sysfs_ops = { ++static const struct sysfs_ops bus_sysfs_ops = { + .show = bus_attr_show, + .store = bus_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/base/class.c linux-2.6.31.5/drivers/base/class.c +--- linux-2.6.31.5/drivers/base/class.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/base/class.c 2009-10-20 20:33:11.021338493 -0400 +@@ -61,7 +61,7 @@ static void class_release(struct kobject + "be careful\n", class->name); + } + +-static struct sysfs_ops class_sysfs_ops = { ++static const struct sysfs_ops class_sysfs_ops = { + .show = class_attr_show, + .store = class_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/base/core.c linux-2.6.31.5/drivers/base/core.c +--- linux-2.6.31.5/drivers/base/core.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/base/core.c 2009-10-20 20:33:11.021338493 -0400 +@@ -93,7 +93,7 @@ static ssize_t dev_attr_store(struct kob + return ret; + } + +-static struct sysfs_ops dev_sysfs_ops = { ++static const struct sysfs_ops dev_sysfs_ops = { + .show = dev_attr_show, + .store = dev_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/base/sys.c linux-2.6.31.5/drivers/base/sys.c +--- linux-2.6.31.5/drivers/base/sys.c 2009-10-20 20:42:59.057266348 -0400 ++++ linux-2.6.31.5/drivers/base/sys.c 2009-10-20 20:33:11.021338493 -0400 +@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc + return -EIO; + } + +-static struct sysfs_ops sysfs_ops = { ++static const struct sysfs_ops sysfs_ops = { + .show = sysdev_show, + .store = sysdev_store, + }; +@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct + return -EIO; + } + +-static struct sysfs_ops sysfs_class_ops = { ++static const struct sysfs_ops sysfs_class_ops = { + .show = sysdev_class_show, + .store = sysdev_class_store, + }; +diff -urNp linux-2.6.31.5/drivers/block/cciss.c linux-2.6.31.5/drivers/block/cciss.c +--- linux-2.6.31.5/drivers/block/cciss.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/block/cciss.c 2009-10-20 20:32:11.114709382 -0400 @@ -363,7 +363,7 @@ static void cciss_seq_stop(struct seq_fi h->busy_configuring = 0; } @@ -18652,9 +19092,21 @@ diff -urNp linux-2.6.31.4/drivers/block/cciss.c linux-2.6.31.4/drivers/block/cci .owner = THIS_MODULE, .open = cciss_seq_open, .read = seq_read, -diff -urNp linux-2.6.31.4/drivers/char/agp/agp.h linux-2.6.31.4/drivers/char/agp/agp.h ---- linux-2.6.31.4/drivers/char/agp/agp.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/agp/agp.h 2009-10-11 15:29:42.086608730 -0400 +diff -urNp linux-2.6.31.5/drivers/block/pktcdvd.c linux-2.6.31.5/drivers/block/pktcdvd.c +--- linux-2.6.31.5/drivers/block/pktcdvd.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/block/pktcdvd.c 2009-10-20 20:33:11.021338493 -0400 +@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob + return len; + } + +-static struct sysfs_ops kobj_pkt_ops = { ++static const struct sysfs_ops kobj_pkt_ops = { + .show = kobj_pkt_show, + .store = kobj_pkt_store + }; +diff -urNp linux-2.6.31.5/drivers/char/agp/agp.h linux-2.6.31.5/drivers/char/agp/agp.h +--- linux-2.6.31.5/drivers/char/agp/agp.h 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/agp/agp.h 2009-10-20 20:32:11.114709382 -0400 @@ -126,7 +126,7 @@ struct agp_bridge_driver { struct agp_bridge_data { const struct agp_version *version; @@ -18664,9 +19116,9 @@ diff -urNp linux-2.6.31.4/drivers/char/agp/agp.h linux-2.6.31.4/drivers/char/agp void *previous_size; void *current_size; void *dev_private_data; -diff -urNp linux-2.6.31.4/drivers/char/agp/alpha-agp.c linux-2.6.31.4/drivers/char/agp/alpha-agp.c ---- linux-2.6.31.4/drivers/char/agp/alpha-agp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/agp/alpha-agp.c 2009-10-11 15:29:42.093367493 -0400 +diff -urNp linux-2.6.31.5/drivers/char/agp/alpha-agp.c linux-2.6.31.5/drivers/char/agp/alpha-agp.c +--- linux-2.6.31.5/drivers/char/agp/alpha-agp.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/agp/alpha-agp.c 2009-10-20 20:32:11.114709382 -0400 @@ -40,7 +40,7 @@ static struct aper_size_info_fixed alpha { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ }; @@ -18676,9 +19128,9 @@ diff -urNp linux-2.6.31.4/drivers/char/agp/alpha-agp.c linux-2.6.31.4/drivers/ch .fault = alpha_core_agp_vm_fault, }; -diff -urNp linux-2.6.31.4/drivers/char/agp/frontend.c linux-2.6.31.4/drivers/char/agp/frontend.c ---- linux-2.6.31.4/drivers/char/agp/frontend.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/agp/frontend.c 2009-10-11 15:29:42.095364198 -0400 +diff -urNp linux-2.6.31.5/drivers/char/agp/frontend.c linux-2.6.31.5/drivers/char/agp/frontend.c +--- linux-2.6.31.5/drivers/char/agp/frontend.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/agp/frontend.c 2009-10-20 20:32:11.114709382 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -18688,9 +19140,9 @@ diff -urNp linux-2.6.31.4/drivers/char/agp/frontend.c linux-2.6.31.4/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.31.4/drivers/char/agp/intel-agp.c linux-2.6.31.4/drivers/char/agp/intel-agp.c ---- linux-2.6.31.4/drivers/char/agp/intel-agp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/agp/intel-agp.c 2009-10-11 15:29:42.119540059 -0400 +diff -urNp linux-2.6.31.5/drivers/char/agp/intel-agp.c linux-2.6.31.5/drivers/char/agp/intel-agp.c +--- linux-2.6.31.5/drivers/char/agp/intel-agp.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/agp/intel-agp.c 2009-10-20 20:32:11.117980006 -0400 @@ -2411,7 +2411,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_IGDNG_D_HB), ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), @@ -18700,9 +19152,9 @@ diff -urNp linux-2.6.31.4/drivers/char/agp/intel-agp.c linux-2.6.31.4/drivers/ch }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.31.4/drivers/char/apm-emulation.c linux-2.6.31.4/drivers/char/apm-emulation.c ---- linux-2.6.31.4/drivers/char/apm-emulation.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/apm-emulation.c 2009-10-11 15:29:42.142760585 -0400 +diff -urNp linux-2.6.31.5/drivers/char/apm-emulation.c linux-2.6.31.5/drivers/char/apm-emulation.c +--- linux-2.6.31.5/drivers/char/apm-emulation.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/apm-emulation.c 2009-10-20 20:32:11.117980006 -0400 @@ -393,7 +393,7 @@ static int apm_open(struct inode * inode return as ? 0 : -ENOMEM; } @@ -18712,9 +19164,9 @@ diff -urNp linux-2.6.31.4/drivers/char/apm-emulation.c linux-2.6.31.4/drivers/ch .owner = THIS_MODULE, .read = apm_read, .poll = apm_poll, -diff -urNp linux-2.6.31.4/drivers/char/bfin-otp.c linux-2.6.31.4/drivers/char/bfin-otp.c ---- linux-2.6.31.4/drivers/char/bfin-otp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/bfin-otp.c 2009-10-11 15:29:42.149403708 -0400 +diff -urNp linux-2.6.31.5/drivers/char/bfin-otp.c linux-2.6.31.5/drivers/char/bfin-otp.c +--- linux-2.6.31.5/drivers/char/bfin-otp.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/bfin-otp.c 2009-10-20 20:32:11.117980006 -0400 @@ -133,7 +133,7 @@ static ssize_t bfin_otp_write(struct fil # define bfin_otp_write NULL #endif @@ -18724,9 +19176,9 @@ diff -urNp linux-2.6.31.4/drivers/char/bfin-otp.c linux-2.6.31.4/drivers/char/bf .owner = THIS_MODULE, .read = bfin_otp_read, .write = bfin_otp_write, -diff -urNp linux-2.6.31.4/drivers/char/hpet.c linux-2.6.31.4/drivers/char/hpet.c ---- linux-2.6.31.4/drivers/char/hpet.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hpet.c 2009-10-11 15:29:42.154363785 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hpet.c linux-2.6.31.5/drivers/char/hpet.c +--- linux-2.6.31.5/drivers/char/hpet.c 2009-10-20 20:42:59.060477316 -0400 ++++ linux-2.6.31.5/drivers/char/hpet.c 2009-10-20 20:32:11.117980006 -0400 @@ -995,7 +995,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -18736,9 +19188,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hpet.c linux-2.6.31.4/drivers/char/hpet.c static int __init hpet_init(void) { -diff -urNp linux-2.6.31.4/drivers/char/hvc_beat.c linux-2.6.31.4/drivers/char/hvc_beat.c ---- linux-2.6.31.4/drivers/char/hvc_beat.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_beat.c 2009-10-11 15:29:56.593454350 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_beat.c linux-2.6.31.5/drivers/char/hvc_beat.c +--- linux-2.6.31.5/drivers/char/hvc_beat.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_beat.c 2009-10-20 20:32:11.117980006 -0400 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -18748,9 +19200,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_beat.c linux-2.6.31.4/drivers/char/hv .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.31.4/drivers/char/hvc_console.c linux-2.6.31.4/drivers/char/hvc_console.c ---- linux-2.6.31.4/drivers/char/hvc_console.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_console.c 2009-10-11 15:29:56.597362442 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_console.c linux-2.6.31.5/drivers/char/hvc_console.c +--- linux-2.6.31.5/drivers/char/hvc_console.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_console.c 2009-10-20 20:32:11.117980006 -0400 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind * console interfaces but can still be used as a tty device. This has to be * static because kmalloc will not work during early console init. @@ -18778,9 +19230,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_console.c linux-2.6.31.4/drivers/char { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.31.4/drivers/char/hvc_console.h linux-2.6.31.4/drivers/char/hvc_console.h ---- linux-2.6.31.4/drivers/char/hvc_console.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_console.h 2009-10-11 15:29:56.622361882 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_console.h linux-2.6.31.5/drivers/char/hvc_console.h +--- linux-2.6.31.5/drivers/char/hvc_console.h 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_console.h 2009-10-20 20:32:11.117980006 -0400 @@ -54,7 +54,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; @@ -18804,9 +19256,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_console.h linux-2.6.31.4/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.31.4/drivers/char/hvc_iseries.c linux-2.6.31.4/drivers/char/hvc_iseries.c ---- linux-2.6.31.4/drivers/char/hvc_iseries.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_iseries.c 2009-10-11 15:29:56.623360664 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_iseries.c linux-2.6.31.5/drivers/char/hvc_iseries.c +--- linux-2.6.31.5/drivers/char/hvc_iseries.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_iseries.c 2009-10-20 20:32:11.117980006 -0400 @@ -197,7 +197,7 @@ done: return sent; } @@ -18816,9 +19268,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_iseries.c linux-2.6.31.4/drivers/char .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.31.4/drivers/char/hvc_iucv.c linux-2.6.31.4/drivers/char/hvc_iucv.c ---- linux-2.6.31.4/drivers/char/hvc_iucv.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_iucv.c 2009-10-11 15:29:56.623360664 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_iucv.c linux-2.6.31.5/drivers/char/hvc_iucv.c +--- linux-2.6.31.5/drivers/char/hvc_iucv.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_iucv.c 2009-10-20 20:32:11.117980006 -0400 @@ -920,7 +920,7 @@ static int hvc_iucv_pm_restore_thaw(stru @@ -18828,9 +19280,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_iucv.c linux-2.6.31.4/drivers/char/hv .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.31.4/drivers/char/hvc_rtas.c linux-2.6.31.4/drivers/char/hvc_rtas.c ---- linux-2.6.31.4/drivers/char/hvc_rtas.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_rtas.c 2009-10-11 15:29:56.634628091 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_rtas.c linux-2.6.31.5/drivers/char/hvc_rtas.c +--- linux-2.6.31.5/drivers/char/hvc_rtas.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_rtas.c 2009-10-20 20:32:11.117980006 -0400 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -18840,9 +19292,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_rtas.c linux-2.6.31.4/drivers/char/hv .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.31.4/drivers/char/hvcs.c linux-2.6.31.4/drivers/char/hvcs.c ---- linux-2.6.31.4/drivers/char/hvcs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvcs.c 2009-10-11 15:29:42.186621563 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvcs.c linux-2.6.31.5/drivers/char/hvcs.c +--- linux-2.6.31.5/drivers/char/hvcs.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvcs.c 2009-10-20 20:32:11.117980006 -0400 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -18937,9 +19389,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvcs.c linux-2.6.31.4/drivers/char/hvcs.c return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.31.4/drivers/char/hvc_udbg.c linux-2.6.31.4/drivers/char/hvc_udbg.c ---- linux-2.6.31.4/drivers/char/hvc_udbg.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_udbg.c 2009-10-11 15:29:56.634628091 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_udbg.c linux-2.6.31.5/drivers/char/hvc_udbg.c +--- linux-2.6.31.5/drivers/char/hvc_udbg.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_udbg.c 2009-10-20 20:32:11.117980006 -0400 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno return i; } @@ -18949,9 +19401,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_udbg.c linux-2.6.31.4/drivers/char/hv .get_chars = hvc_udbg_get, .put_chars = hvc_udbg_put, }; -diff -urNp linux-2.6.31.4/drivers/char/hvc_vio.c linux-2.6.31.4/drivers/char/hvc_vio.c ---- linux-2.6.31.4/drivers/char/hvc_vio.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_vio.c 2009-10-11 15:29:56.635522130 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_vio.c linux-2.6.31.5/drivers/char/hvc_vio.c +--- linux-2.6.31.5/drivers/char/hvc_vio.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_vio.c 2009-10-20 20:32:11.121183550 -0400 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v return got; } @@ -18961,9 +19413,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_vio.c linux-2.6.31.4/drivers/char/hvc .get_chars = filtered_get_chars, .put_chars = hvc_put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.31.4/drivers/char/hvc_xen.c linux-2.6.31.4/drivers/char/hvc_xen.c ---- linux-2.6.31.4/drivers/char/hvc_xen.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/hvc_xen.c 2009-10-11 15:29:56.636398446 -0400 +diff -urNp linux-2.6.31.5/drivers/char/hvc_xen.c linux-2.6.31.5/drivers/char/hvc_xen.c +--- linux-2.6.31.5/drivers/char/hvc_xen.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/hvc_xen.c 2009-10-20 20:32:11.121183550 -0400 @@ -97,7 +97,7 @@ static int read_console(uint32_t vtermno return recv; } @@ -18973,9 +19425,9 @@ diff -urNp linux-2.6.31.4/drivers/char/hvc_xen.c linux-2.6.31.4/drivers/char/hvc .get_chars = read_console, .put_chars = write_console, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.31.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.4/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.31.4/drivers/char/ipmi/ipmi_msghandler.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/ipmi/ipmi_msghandler.c 2009-10-11 15:29:42.205391419 -0400 +diff -urNp linux-2.6.31.5/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.5/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.31.5/drivers/char/ipmi/ipmi_msghandler.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/ipmi/ipmi_msghandler.c 2009-10-20 20:32:11.121183550 -0400 @@ -413,7 +413,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -19006,9 +19458,9 @@ diff -urNp linux-2.6.31.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.4/dri intf->proc_dir = NULL; -diff -urNp linux-2.6.31.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.31.4/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.31.4/drivers/char/ipmi/ipmi_si_intf.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/ipmi/ipmi_si_intf.c 2009-10-11 15:29:42.219429460 -0400 +diff -urNp linux-2.6.31.5/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.31.5/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.31.5/drivers/char/ipmi/ipmi_si_intf.c 2009-10-20 20:42:59.063755001 -0400 ++++ linux-2.6.31.5/drivers/char/ipmi/ipmi_si_intf.c 2009-10-20 20:32:11.121183550 -0400 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -19039,9 +19491,9 @@ diff -urNp linux-2.6.31.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.31.4/driver new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.31.4/drivers/char/keyboard.c linux-2.6.31.4/drivers/char/keyboard.c ---- linux-2.6.31.4/drivers/char/keyboard.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/keyboard.c 2009-10-11 15:29:42.233580689 -0400 +diff -urNp linux-2.6.31.5/drivers/char/keyboard.c linux-2.6.31.5/drivers/char/keyboard.c +--- linux-2.6.31.5/drivers/char/keyboard.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/keyboard.c 2009-10-20 20:32:11.121183550 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -19068,9 +19520,9 @@ diff -urNp linux-2.6.31.4/drivers/char/keyboard.c linux-2.6.31.4/drivers/char/ke }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.31.4/drivers/char/mem.c linux-2.6.31.4/drivers/char/mem.c ---- linux-2.6.31.4/drivers/char/mem.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/mem.c 2009-10-11 15:29:42.244455659 -0400 +diff -urNp linux-2.6.31.5/drivers/char/mem.c linux-2.6.31.5/drivers/char/mem.c +--- linux-2.6.31.5/drivers/char/mem.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/mem.c 2009-10-20 20:32:11.121183550 -0400 @@ -18,6 +18,7 @@ #include #include @@ -19170,9 +19622,9 @@ diff -urNp linux-2.6.31.4/drivers/char/mem.c linux-2.6.31.4/drivers/char/mem.c }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.31.4/drivers/char/misc.c linux-2.6.31.4/drivers/char/misc.c ---- linux-2.6.31.4/drivers/char/misc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/misc.c 2009-10-11 15:29:42.245366641 -0400 +diff -urNp linux-2.6.31.5/drivers/char/misc.c linux-2.6.31.5/drivers/char/misc.c +--- linux-2.6.31.5/drivers/char/misc.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/misc.c 2009-10-20 20:32:11.121183550 -0400 @@ -91,7 +91,7 @@ static int misc_seq_show(struct seq_file } @@ -19182,9 +19634,9 @@ diff -urNp linux-2.6.31.4/drivers/char/misc.c linux-2.6.31.4/drivers/char/misc.c .start = misc_seq_start, .next = misc_seq_next, .stop = misc_seq_stop, -diff -urNp linux-2.6.31.4/drivers/char/mspec.c linux-2.6.31.4/drivers/char/mspec.c ---- linux-2.6.31.4/drivers/char/mspec.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/mspec.c 2009-10-11 15:29:42.256536393 -0400 +diff -urNp linux-2.6.31.5/drivers/char/mspec.c linux-2.6.31.5/drivers/char/mspec.c +--- linux-2.6.31.5/drivers/char/mspec.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/mspec.c 2009-10-20 20:32:11.121183550 -0400 @@ -239,7 +239,7 @@ mspec_fault(struct vm_area_struct *vma, return VM_FAULT_NOPAGE; } @@ -19194,9 +19646,9 @@ diff -urNp linux-2.6.31.4/drivers/char/mspec.c linux-2.6.31.4/drivers/char/mspec .open = mspec_open, .close = mspec_close, .fault = mspec_fault, -diff -urNp linux-2.6.31.4/drivers/char/nvram.c linux-2.6.31.4/drivers/char/nvram.c ---- linux-2.6.31.4/drivers/char/nvram.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/nvram.c 2009-10-11 15:29:42.263368352 -0400 +diff -urNp linux-2.6.31.5/drivers/char/nvram.c linux-2.6.31.5/drivers/char/nvram.c +--- linux-2.6.31.5/drivers/char/nvram.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/nvram.c 2009-10-20 20:32:11.124600412 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -19209,9 +19661,9 @@ diff -urNp linux-2.6.31.4/drivers/char/nvram.c linux-2.6.31.4/drivers/char/nvram }; static int __init nvram_init(void) -diff -urNp linux-2.6.31.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.31.4/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.31.4/drivers/char/pcmcia/ipwireless/tty.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/pcmcia/ipwireless/tty.c 2009-10-11 15:29:42.263368352 -0400 +diff -urNp linux-2.6.31.5/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.31.5/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.31.5/drivers/char/pcmcia/ipwireless/tty.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/pcmcia/ipwireless/tty.c 2009-10-20 20:32:11.124600412 -0400 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -19326,9 +19778,9 @@ diff -urNp linux-2.6.31.4/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.31.4/dr do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.31.4/drivers/char/random.c linux-2.6.31.4/drivers/char/random.c ---- linux-2.6.31.4/drivers/char/random.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/random.c 2009-10-11 15:29:42.274496328 -0400 +diff -urNp linux-2.6.31.5/drivers/char/random.c linux-2.6.31.5/drivers/char/random.c +--- linux-2.6.31.5/drivers/char/random.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/random.c 2009-10-20 20:32:11.124600412 -0400 @@ -253,8 +253,13 @@ /* * Configuration information @@ -19370,9 +19822,9 @@ diff -urNp linux-2.6.31.4/drivers/char/random.c linux-2.6.31.4/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.31.4/drivers/char/sonypi.c linux-2.6.31.4/drivers/char/sonypi.c ---- linux-2.6.31.4/drivers/char/sonypi.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/sonypi.c 2009-10-11 15:29:42.283364069 -0400 +diff -urNp linux-2.6.31.5/drivers/char/sonypi.c linux-2.6.31.5/drivers/char/sonypi.c +--- linux-2.6.31.5/drivers/char/sonypi.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/sonypi.c 2009-10-20 20:32:11.124600412 -0400 @@ -490,7 +490,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; @@ -19403,9 +19855,9 @@ diff -urNp linux-2.6.31.4/drivers/char/sonypi.c linux-2.6.31.4/drivers/char/sony mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.31.4/drivers/char/tpm/tpm_bios.c linux-2.6.31.4/drivers/char/tpm/tpm_bios.c ---- linux-2.6.31.4/drivers/char/tpm/tpm_bios.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/tpm/tpm_bios.c 2009-10-18 10:15:00.940967436 -0400 +diff -urNp linux-2.6.31.5/drivers/char/tpm/tpm_bios.c linux-2.6.31.5/drivers/char/tpm/tpm_bios.c +--- linux-2.6.31.5/drivers/char/tpm/tpm_bios.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/tpm/tpm_bios.c 2009-10-20 20:32:11.124600412 -0400 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -19463,9 +19915,9 @@ diff -urNp linux-2.6.31.4/drivers/char/tpm/tpm_bios.c linux-2.6.31.4/drivers/cha memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.31.4/drivers/char/tty_ldisc.c linux-2.6.31.4/drivers/char/tty_ldisc.c ---- linux-2.6.31.4/drivers/char/tty_ldisc.c 2009-10-12 23:26:17.710631970 -0400 -+++ linux-2.6.31.4/drivers/char/tty_ldisc.c 2009-10-12 23:26:38.914481208 -0400 +diff -urNp linux-2.6.31.5/drivers/char/tty_ldisc.c linux-2.6.31.5/drivers/char/tty_ldisc.c +--- linux-2.6.31.5/drivers/char/tty_ldisc.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/tty_ldisc.c 2009-10-20 20:32:11.124600412 -0400 @@ -73,7 +73,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; @@ -19502,9 +19954,9 @@ diff -urNp linux-2.6.31.4/drivers/char/tty_ldisc.c linux-2.6.31.4/drivers/char/t ld->ops = ldops; atomic_set(&ld->users, 1); err = 0; -diff -urNp linux-2.6.31.4/drivers/char/vt_ioctl.c linux-2.6.31.4/drivers/char/vt_ioctl.c ---- linux-2.6.31.4/drivers/char/vt_ioctl.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/vt_ioctl.c 2009-10-11 15:29:42.320396774 -0400 +diff -urNp linux-2.6.31.5/drivers/char/vt_ioctl.c linux-2.6.31.5/drivers/char/vt_ioctl.c +--- linux-2.6.31.5/drivers/char/vt_ioctl.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/vt_ioctl.c 2009-10-20 20:32:11.124600412 -0400 @@ -97,6 +97,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -19532,9 +19984,9 @@ diff -urNp linux-2.6.31.4/drivers/char/vt_ioctl.c linux-2.6.31.4/drivers/char/vt q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.31.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.31.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c ---- linux-2.6.31.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-10-11 15:29:42.328499471 -0400 +diff -urNp linux-2.6.31.5/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.31.5/drivers/char/xilinx_hwicap/xilinx_hwicap.c +--- linux-2.6.31.5/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-10-20 20:32:11.124600412 -0400 @@ -559,7 +559,7 @@ static int hwicap_release(struct inode * return status; } @@ -19544,9 +19996,42 @@ diff -urNp linux-2.6.31.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.3 .owner = THIS_MODULE, .write = hwicap_write, .read = hwicap_read, -diff -urNp linux-2.6.31.4/drivers/edac/edac_core.h linux-2.6.31.4/drivers/edac/edac_core.h ---- linux-2.6.31.4/drivers/edac/edac_core.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/edac/edac_core.h 2009-10-11 15:29:42.625694104 -0400 +diff -urNp linux-2.6.31.5/drivers/cpufreq/cpufreq.c linux-2.6.31.5/drivers/cpufreq/cpufreq.c +--- linux-2.6.31.5/drivers/cpufreq/cpufreq.c 2009-10-20 20:42:59.067176778 -0400 ++++ linux-2.6.31.5/drivers/cpufreq/cpufreq.c 2009-10-20 20:33:11.021338493 -0400 +@@ -745,7 +745,7 @@ static void cpufreq_sysfs_release(struct + complete(&policy->kobj_unregister); + } + +-static struct sysfs_ops sysfs_ops = { ++static const struct sysfs_ops sysfs_ops = { + .show = show, + .store = store, + }; +diff -urNp linux-2.6.31.5/drivers/cpuidle/sysfs.c linux-2.6.31.5/drivers/cpuidle/sysfs.c +--- linux-2.6.31.5/drivers/cpuidle/sysfs.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/cpuidle/sysfs.c 2009-10-20 20:33:11.021338493 -0400 +@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj + return ret; + } + +-static struct sysfs_ops cpuidle_sysfs_ops = { ++static const struct sysfs_ops cpuidle_sysfs_ops = { + .show = cpuidle_show, + .store = cpuidle_store, + }; +@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct + return ret; + } + +-static struct sysfs_ops cpuidle_state_sysfs_ops = { ++static const struct sysfs_ops cpuidle_state_sysfs_ops = { + .show = cpuidle_state_show, + }; + +diff -urNp linux-2.6.31.5/drivers/edac/edac_core.h linux-2.6.31.5/drivers/edac/edac_core.h +--- linux-2.6.31.5/drivers/edac/edac_core.h 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/edac/edac_core.h 2009-10-20 20:32:11.124600412 -0400 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -19564,9 +20049,81 @@ diff -urNp linux-2.6.31.4/drivers/edac/edac_core.h linux-2.6.31.4/drivers/edac/e #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.31.4/drivers/firmware/dmi_scan.c linux-2.6.31.4/drivers/firmware/dmi_scan.c ---- linux-2.6.31.4/drivers/firmware/dmi_scan.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/firmware/dmi_scan.c 2009-10-11 15:29:42.633362379 -0400 +diff -urNp linux-2.6.31.5/drivers/edac/edac_device_sysfs.c linux-2.6.31.5/drivers/edac/edac_device_sysfs.c +--- linux-2.6.31.5/drivers/edac/edac_device_sysfs.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/edac/edac_device_sysfs.c 2009-10-20 20:33:11.021338493 -0400 +@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s + } + + /* edac_dev file operations for an 'ctl_info' */ +-static struct sysfs_ops device_ctl_info_ops = { ++static const struct sysfs_ops device_ctl_info_ops = { + .show = edac_dev_ctl_info_show, + .store = edac_dev_ctl_info_store + }; +@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(s + } + + /* edac_dev file operations for an 'instance' */ +-static struct sysfs_ops device_instance_ops = { ++static const struct sysfs_ops device_instance_ops = { + .show = edac_dev_instance_show, + .store = edac_dev_instance_store + }; +@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(stru + } + + /* edac_dev file operations for a 'block' */ +-static struct sysfs_ops device_block_ops = { ++static const struct sysfs_ops device_block_ops = { + .show = edac_dev_block_show, + .store = edac_dev_block_store + }; +diff -urNp linux-2.6.31.5/drivers/edac/edac_mc_sysfs.c linux-2.6.31.5/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.31.5/drivers/edac/edac_mc_sysfs.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/edac/edac_mc_sysfs.c 2009-10-20 20:33:11.021338493 -0400 +@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob + return -EIO; + } + +-static struct sysfs_ops csrowfs_ops = { ++static const struct sysfs_ops csrowfs_ops = { + .show = csrowdev_show, + .store = csrowdev_store + }; +@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobje + } + + /* Intermediate show/store table */ +-static struct sysfs_ops mci_ops = { ++static const struct sysfs_ops mci_ops = { + .show = mcidev_show, + .store = mcidev_store + }; +diff -urNp linux-2.6.31.5/drivers/edac/edac_pci_sysfs.c linux-2.6.31.5/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.31.5/drivers/edac/edac_pci_sysfs.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/edac/edac_pci_sysfs.c 2009-10-20 20:33:11.021338493 -0400 +@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s + } + + /* fs_ops table */ +-static struct sysfs_ops pci_instance_ops = { ++static const struct sysfs_ops pci_instance_ops = { + .show = edac_pci_instance_show, + .store = edac_pci_instance_store + }; +@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct + return -EIO; + } + +-static struct sysfs_ops edac_pci_sysfs_ops = { ++static const struct sysfs_ops edac_pci_sysfs_ops = { + .show = edac_pci_dev_show, + .store = edac_pci_dev_store + }; +diff -urNp linux-2.6.31.5/drivers/firmware/dmi_scan.c linux-2.6.31.5/drivers/firmware/dmi_scan.c +--- linux-2.6.31.5/drivers/firmware/dmi_scan.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/firmware/dmi_scan.c 2009-10-20 20:32:11.124600412 -0400 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -19579,9 +20136,57 @@ diff -urNp linux-2.6.31.4/drivers/firmware/dmi_scan.c linux-2.6.31.4/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.31.4/drivers/gpio/gpiolib.c linux-2.6.31.4/drivers/gpio/gpiolib.c ---- linux-2.6.31.4/drivers/gpio/gpiolib.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpio/gpiolib.c 2009-10-11 15:29:42.645381456 -0400 +diff -urNp linux-2.6.31.5/drivers/firmware/edd.c linux-2.6.31.5/drivers/firmware/edd.c +--- linux-2.6.31.5/drivers/firmware/edd.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/firmware/edd.c 2009-10-20 20:33:11.021338493 -0400 +@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str + return ret; + } + +-static struct sysfs_ops edd_attr_ops = { ++static const struct sysfs_ops edd_attr_ops = { + .show = edd_attr_show, + }; + +diff -urNp linux-2.6.31.5/drivers/firmware/efivars.c linux-2.6.31.5/drivers/firmware/efivars.c +--- linux-2.6.31.5/drivers/firmware/efivars.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/firmware/efivars.c 2009-10-20 20:33:11.024597101 -0400 +@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct + return ret; + } + +-static struct sysfs_ops efivar_attr_ops = { ++static const struct sysfs_ops efivar_attr_ops = { + .show = efivar_attr_show, + .store = efivar_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/firmware/iscsi_ibft.c linux-2.6.31.5/drivers/firmware/iscsi_ibft.c +--- linux-2.6.31.5/drivers/firmware/iscsi_ibft.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/firmware/iscsi_ibft.c 2009-10-20 20:33:11.024597101 -0400 +@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc + return ret; + } + +-static struct sysfs_ops ibft_attr_ops = { ++static const struct sysfs_ops ibft_attr_ops = { + .show = ibft_show_attribute, + }; + +diff -urNp linux-2.6.31.5/drivers/firmware/memmap.c linux-2.6.31.5/drivers/firmware/memmap.c +--- linux-2.6.31.5/drivers/firmware/memmap.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/firmware/memmap.c 2009-10-20 20:33:11.024597101 -0400 +@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { + NULL + }; + +-static struct sysfs_ops memmap_attr_ops = { ++static const struct sysfs_ops memmap_attr_ops = { + .show = memmap_attr_show, + }; + +diff -urNp linux-2.6.31.5/drivers/gpio/gpiolib.c linux-2.6.31.5/drivers/gpio/gpiolib.c +--- linux-2.6.31.5/drivers/gpio/gpiolib.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/gpio/gpiolib.c 2009-10-20 20:32:11.124600412 -0400 @@ -1244,7 +1244,7 @@ static int gpiolib_open(struct inode *in return single_open(file, gpiolib_show, NULL); } @@ -19591,9 +20196,9 @@ diff -urNp linux-2.6.31.4/drivers/gpio/gpiolib.c linux-2.6.31.4/drivers/gpio/gpi .open = gpiolib_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_drv.c linux-2.6.31.4/drivers/gpu/drm/drm_drv.c ---- linux-2.6.31.4/drivers/gpu/drm/drm_drv.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/drm_drv.c 2009-10-11 15:29:42.654462132 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/drm_drv.c linux-2.6.31.5/drivers/gpu/drm/drm_drv.c +--- linux-2.6.31.5/drivers/gpu/drm/drm_drv.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/drm_drv.c 2009-10-20 20:32:11.127980726 -0400 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -19603,9 +20208,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_drv.c linux-2.6.31.4/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.31.4/drivers/gpu/drm/drm_fops.c linux-2.6.31.4/drivers/gpu/drm/drm_fops.c ---- linux-2.6.31.4/drivers/gpu/drm/drm_fops.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/drm_fops.c 2009-10-11 15:29:42.659366095 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/drm_fops.c linux-2.6.31.5/drivers/gpu/drm/drm_fops.c +--- linux-2.6.31.5/drivers/gpu/drm/drm_fops.c 2009-10-20 20:42:59.070608791 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/drm_fops.c 2009-10-20 20:32:11.127980726 -0400 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -19657,9 +20262,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_fops.c linux-2.6.31.4/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.31.4/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.31.4/drivers/gpu/drm/drm_ioctl.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/drm_ioctl.c 2009-10-11 15:29:42.670600481 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/drm_ioctl.c linux-2.6.31.5/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.31.5/drivers/gpu/drm/drm_ioctl.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/drm_ioctl.c 2009-10-20 20:32:11.127980726 -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); @@ -19669,9 +20274,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_ioctl.c linux-2.6.31.4/drivers/gpu stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_lock.c linux-2.6.31.4/drivers/gpu/drm/drm_lock.c ---- linux-2.6.31.4/drivers/gpu/drm/drm_lock.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/drm_lock.c 2009-10-11 15:29:42.671364495 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/drm_lock.c linux-2.6.31.5/drivers/gpu/drm/drm_lock.c +--- linux-2.6.31.5/drivers/gpu/drm/drm_lock.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/drm_lock.c 2009-10-20 20:32:11.127980726 -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; @@ -19690,9 +20295,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_lock.c linux-2.6.31.4/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.31.4/drivers/gpu/drm/drm_vm.c linux-2.6.31.4/drivers/gpu/drm/drm_vm.c ---- linux-2.6.31.4/drivers/gpu/drm/drm_vm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/drm_vm.c 2009-10-11 15:29:42.681494190 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/drm_vm.c linux-2.6.31.5/drivers/gpu/drm/drm_vm.c +--- linux-2.6.31.5/drivers/gpu/drm/drm_vm.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/drm_vm.c 2009-10-20 20:32:11.127980726 -0400 @@ -369,28 +369,28 @@ static int drm_vm_sg_fault(struct vm_are } @@ -19726,9 +20331,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/drm_vm.c linux-2.6.31.4/drivers/gpu/dr .fault = drm_vm_sg_fault, .open = drm_vm_open, .close = drm_vm_close, -diff -urNp linux-2.6.31.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.31.4/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.31.4/drivers/gpu/drm/i810/i810_dma.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/i810/i810_dma.c 2009-10-11 15:29:42.692564293 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/i810/i810_dma.c linux-2.6.31.5/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.31.5/drivers/gpu/drm/i810/i810_dma.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/i810/i810_dma.c 2009-10-20 20:32:11.127980726 -0400 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -19751,9 +20356,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.31.4/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.31.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.31.4/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.31.4/drivers/gpu/drm/i915/i915_drv.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/i915/i915_drv.c 2009-10-11 15:29:42.693483643 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/i915/i915_drv.c linux-2.6.31.5/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.31.5/drivers/gpu/drm/i915/i915_drv.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/i915/i915_drv.c 2009-10-20 20:32:11.127980726 -0400 @@ -152,7 +152,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -19763,9 +20368,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.31.4/drivers .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_atombios.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_atombios.c 2009-10-11 15:29:42.704778896 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_atombios.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_atombios.c 2009-10-20 20:32:11.127980726 -0400 @@ -425,13 +425,13 @@ bool radeon_get_atom_connector_info_from return true; } @@ -19790,9 +20395,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.31. atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_state.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_state.c 2009-10-11 15:29:42.719362199 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_state.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_state.c 2009-10-20 20:32:11.127980726 -0400 @@ -3007,7 +3007,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; @@ -19802,9 +20407,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.31.4/d DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_ttm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_ttm.c 2009-10-11 15:29:42.732437297 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_ttm.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/radeon/radeon_ttm.c 2009-10-20 20:32:11.131147373 -0400 @@ -500,27 +500,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } @@ -19856,9 +20461,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.4/dri } -diff -urNp linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-10-11 15:29:42.735410455 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-10-20 20:32:11.131147373 -0400 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -19888,9 +20493,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.31.4/drivers .fault = ttm_bo_vm_fault, .open = ttm_bo_vm_open, .close = ttm_bo_vm_close -diff -urNp linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_global.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_global.c 2009-10-18 10:09:07.093644495 -0400 +diff -urNp linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_global.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/gpu/drm/ttm/ttm_global.c 2009-10-20 20:32:11.131147373 -0400 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -19948,9 +20553,9 @@ diff -urNp linux-2.6.31.4/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.4/driver ref->release(ref); kfree(item->object); item->object = NULL; -diff -urNp linux-2.6.31.4/drivers/hwmon/fschmd.c linux-2.6.31.4/drivers/hwmon/fschmd.c ---- linux-2.6.31.4/drivers/hwmon/fschmd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/fschmd.c 2009-10-11 15:29:42.745523075 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/fschmd.c linux-2.6.31.5/drivers/hwmon/fschmd.c +--- linux-2.6.31.5/drivers/hwmon/fschmd.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/hwmon/fschmd.c 2009-10-20 20:32:11.131147373 -0400 @@ -915,7 +915,7 @@ static int watchdog_ioctl(struct inode * return ret; } @@ -19960,9 +20565,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/fschmd.c linux-2.6.31.4/drivers/hwmon/fs .owner = THIS_MODULE, .llseek = no_llseek, .open = watchdog_open, -diff -urNp linux-2.6.31.4/drivers/hwmon/fscpos.c linux-2.6.31.4/drivers/hwmon/fscpos.c ---- linux-2.6.31.4/drivers/hwmon/fscpos.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/fscpos.c 2009-10-11 15:29:42.748578517 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/fscpos.c linux-2.6.31.5/drivers/hwmon/fscpos.c +--- linux-2.6.31.5/drivers/hwmon/fscpos.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/hwmon/fscpos.c 2009-10-20 20:32:11.131147373 -0400 @@ -240,7 +240,6 @@ static ssize_t set_pwm(struct i2c_client unsigned long v = simple_strtoul(buf, NULL, 10); @@ -19971,9 +20576,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/fscpos.c linux-2.6.31.4/drivers/hwmon/fs if (v > 255) v = 255; mutex_lock(&data->update_lock); -diff -urNp linux-2.6.31.4/drivers/hwmon/k8temp.c linux-2.6.31.4/drivers/hwmon/k8temp.c ---- linux-2.6.31.4/drivers/hwmon/k8temp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/k8temp.c 2009-10-11 15:29:42.757370825 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/k8temp.c linux-2.6.31.5/drivers/hwmon/k8temp.c +--- linux-2.6.31.5/drivers/hwmon/k8temp.c 2009-10-20 20:42:59.073816025 -0400 ++++ linux-2.6.31.5/drivers/hwmon/k8temp.c 2009-10-20 20:32:11.131147373 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -19983,9 +20588,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/k8temp.c linux-2.6.31.4/drivers/hwmon/k8 }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.31.4/drivers/hwmon/sis5595.c linux-2.6.31.4/drivers/hwmon/sis5595.c ---- linux-2.6.31.4/drivers/hwmon/sis5595.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/sis5595.c 2009-10-11 15:29:42.762403207 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/sis5595.c linux-2.6.31.5/drivers/hwmon/sis5595.c +--- linux-2.6.31.5/drivers/hwmon/sis5595.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/hwmon/sis5595.c 2009-10-20 20:32:11.131147373 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -19995,9 +20600,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/sis5595.c linux-2.6.31.4/drivers/hwmon/s }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.31.4/drivers/hwmon/via686a.c linux-2.6.31.4/drivers/hwmon/via686a.c ---- linux-2.6.31.4/drivers/hwmon/via686a.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/via686a.c 2009-10-11 15:29:42.762403207 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/via686a.c linux-2.6.31.5/drivers/hwmon/via686a.c +--- linux-2.6.31.5/drivers/hwmon/via686a.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/hwmon/via686a.c 2009-10-20 20:32:11.131147373 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -20007,9 +20612,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/via686a.c linux-2.6.31.4/drivers/hwmon/v }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.31.4/drivers/hwmon/vt8231.c linux-2.6.31.4/drivers/hwmon/vt8231.c ---- linux-2.6.31.4/drivers/hwmon/vt8231.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/vt8231.c 2009-10-11 15:29:42.768746394 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/vt8231.c linux-2.6.31.5/drivers/hwmon/vt8231.c +--- linux-2.6.31.5/drivers/hwmon/vt8231.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/hwmon/vt8231.c 2009-10-20 20:32:11.131147373 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -20019,9 +20624,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/vt8231.c linux-2.6.31.4/drivers/hwmon/vt }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.31.4/drivers/hwmon/w83791d.c linux-2.6.31.4/drivers/hwmon/w83791d.c ---- linux-2.6.31.4/drivers/hwmon/w83791d.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/hwmon/w83791d.c 2009-10-11 15:29:42.777507659 -0400 +diff -urNp linux-2.6.31.5/drivers/hwmon/w83791d.c linux-2.6.31.5/drivers/hwmon/w83791d.c +--- linux-2.6.31.5/drivers/hwmon/w83791d.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/hwmon/w83791d.c 2009-10-20 20:32:11.131147373 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -20033,9 +20638,9 @@ diff -urNp linux-2.6.31.4/drivers/hwmon/w83791d.c linux-2.6.31.4/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-i801.c linux-2.6.31.4/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.31.4/drivers/i2c/busses/i2c-i801.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/i2c/busses/i2c-i801.c 2009-10-11 15:29:42.780369338 -0400 +diff -urNp linux-2.6.31.5/drivers/i2c/busses/i2c-i801.c linux-2.6.31.5/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.31.5/drivers/i2c/busses/i2c-i801.c 2009-10-23 19:50:16.977027653 -0400 ++++ linux-2.6.31.5/drivers/i2c/busses/i2c-i801.c 2009-10-23 19:50:29.541807847 -0400 @@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, @@ -20045,9 +20650,9 @@ diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-i801.c linux-2.6.31.4/drivers/i }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.4/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.31.4/drivers/i2c/busses/i2c-piix4.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/i2c/busses/i2c-piix4.c 2009-10-11 15:29:42.781378383 -0400 +diff -urNp linux-2.6.31.5/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.5/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.31.5/drivers/i2c/busses/i2c-piix4.c 2009-10-23 19:50:16.994221175 -0400 ++++ linux-2.6.31.5/drivers/i2c/busses/i2c-piix4.c 2009-10-23 19:50:29.543109185 -0400 @@ -123,7 +123,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -20066,9 +20671,9 @@ diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.4/drivers/ }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-sis630.c linux-2.6.31.4/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.31.4/drivers/i2c/busses/i2c-sis630.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/i2c/busses/i2c-sis630.c 2009-10-11 15:29:42.785835708 -0400 +diff -urNp linux-2.6.31.5/drivers/i2c/busses/i2c-sis630.c linux-2.6.31.5/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.31.5/drivers/i2c/busses/i2c-sis630.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/i2c/busses/i2c-sis630.c 2009-10-20 20:32:11.134717539 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -20078,9 +20683,9 @@ diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-sis630.c linux-2.6.31.4/drivers }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-sis96x.c linux-2.6.31.4/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.31.4/drivers/i2c/busses/i2c-sis96x.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/i2c/busses/i2c-sis96x.c 2009-10-11 15:29:42.794625318 -0400 +diff -urNp linux-2.6.31.5/drivers/i2c/busses/i2c-sis96x.c linux-2.6.31.5/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.31.5/drivers/i2c/busses/i2c-sis96x.c 2009-10-23 19:50:16.994221175 -0400 ++++ linux-2.6.31.5/drivers/i2c/busses/i2c-sis96x.c 2009-10-23 19:50:29.543109185 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -20090,9 +20695,9 @@ diff -urNp linux-2.6.31.4/drivers/i2c/busses/i2c-sis96x.c linux-2.6.31.4/drivers }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.31.4/drivers/ieee1394/dma.c linux-2.6.31.4/drivers/ieee1394/dma.c ---- linux-2.6.31.4/drivers/ieee1394/dma.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/dma.c 2009-10-11 15:29:42.799401768 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/dma.c linux-2.6.31.5/drivers/ieee1394/dma.c +--- linux-2.6.31.5/drivers/ieee1394/dma.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/dma.c 2009-10-20 20:32:11.134717539 -0400 @@ -247,7 +247,7 @@ static int dma_region_pagefault(struct v return 0; } @@ -20102,9 +20707,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/dma.c linux-2.6.31.4/drivers/ieee1394 .fault = dma_region_pagefault, }; -diff -urNp linux-2.6.31.4/drivers/ieee1394/dv1394.c linux-2.6.31.4/drivers/ieee1394/dv1394.c ---- linux-2.6.31.4/drivers/ieee1394/dv1394.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/dv1394.c 2009-10-11 15:29:42.819369280 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/dv1394.c linux-2.6.31.5/drivers/ieee1394/dv1394.c +--- linux-2.6.31.5/drivers/ieee1394/dv1394.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/dv1394.c 2009-10-20 20:32:11.134717539 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -20123,9 +20728,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/dv1394.c linux-2.6.31.4/drivers/ieee1 }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.31.4/drivers/ieee1394/eth1394.c linux-2.6.31.4/drivers/ieee1394/eth1394.c ---- linux-2.6.31.4/drivers/ieee1394/eth1394.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/eth1394.c 2009-10-11 15:29:42.830758573 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/eth1394.c linux-2.6.31.5/drivers/ieee1394/eth1394.c +--- linux-2.6.31.5/drivers/ieee1394/eth1394.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/eth1394.c 2009-10-20 20:32:11.134717539 -0400 @@ -445,7 +445,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, @@ -20135,9 +20740,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/eth1394.c linux-2.6.31.4/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.31.4/drivers/ieee1394/hosts.c linux-2.6.31.4/drivers/ieee1394/hosts.c ---- linux-2.6.31.4/drivers/ieee1394/hosts.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/hosts.c 2009-10-11 15:29:42.841361962 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/hosts.c linux-2.6.31.5/drivers/ieee1394/hosts.c +--- linux-2.6.31.5/drivers/ieee1394/hosts.c 2009-10-20 20:42:59.077101764 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/hosts.c 2009-10-20 20:32:11.134717539 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -20146,9 +20751,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/hosts.c linux-2.6.31.4/drivers/ieee13 .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.31.4/drivers/ieee1394/ohci1394.c linux-2.6.31.4/drivers/ieee1394/ohci1394.c ---- linux-2.6.31.4/drivers/ieee1394/ohci1394.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/ohci1394.c 2009-10-11 15:29:42.853706440 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/ohci1394.c linux-2.6.31.5/drivers/ieee1394/ohci1394.c +--- linux-2.6.31.5/drivers/ieee1394/ohci1394.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/ohci1394.c 2009-10-20 20:32:11.134717539 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -20170,9 +20775,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/ohci1394.c linux-2.6.31.4/drivers/iee }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.31.4/drivers/ieee1394/raw1394.c linux-2.6.31.4/drivers/ieee1394/raw1394.c ---- linux-2.6.31.4/drivers/ieee1394/raw1394.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/raw1394.c 2009-10-11 15:29:42.863360246 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/raw1394.c linux-2.6.31.5/drivers/ieee1394/raw1394.c +--- linux-2.6.31.5/drivers/ieee1394/raw1394.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/raw1394.c 2009-10-20 20:32:11.134717539 -0400 @@ -2999,7 +2999,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, @@ -20182,9 +20787,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/raw1394.c linux-2.6.31.4/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.31.4/drivers/ieee1394/sbp2.c linux-2.6.31.4/drivers/ieee1394/sbp2.c ---- linux-2.6.31.4/drivers/ieee1394/sbp2.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/sbp2.c 2009-10-11 15:29:42.871883380 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/sbp2.c linux-2.6.31.5/drivers/ieee1394/sbp2.c +--- linux-2.6.31.5/drivers/ieee1394/sbp2.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/sbp2.c 2009-10-20 20:32:11.138131446 -0400 @@ -290,7 +290,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, @@ -20203,9 +20808,9 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/sbp2.c linux-2.6.31.4/drivers/ieee139 { int ret; -diff -urNp linux-2.6.31.4/drivers/ieee1394/video1394.c linux-2.6.31.4/drivers/ieee1394/video1394.c ---- linux-2.6.31.4/drivers/ieee1394/video1394.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/ieee1394/video1394.c 2009-10-11 15:29:42.888363714 -0400 +diff -urNp linux-2.6.31.5/drivers/ieee1394/video1394.c linux-2.6.31.5/drivers/ieee1394/video1394.c +--- linux-2.6.31.5/drivers/ieee1394/video1394.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/ieee1394/video1394.c 2009-10-20 20:32:11.138131446 -0400 @@ -1310,7 +1310,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff @@ -20215,9 +20820,33 @@ diff -urNp linux-2.6.31.4/drivers/ieee1394/video1394.c linux-2.6.31.4/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.31.4/drivers/infiniband/hw/ehca/ehca_uverbs.c ---- linux-2.6.31.4/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-10-11 15:29:43.239368467 -0400 +diff -urNp linux-2.6.31.5/drivers/infiniband/core/cm.c linux-2.6.31.5/drivers/infiniband/core/cm.c +--- linux-2.6.31.5/drivers/infiniband/core/cm.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/infiniband/core/cm.c 2009-10-20 20:33:11.024597101 -0400 +@@ -3597,7 +3597,7 @@ static ssize_t cm_show_counter(struct ko + atomic_long_read(&group->counter[cm_attr->index])); + } + +-static struct sysfs_ops cm_counter_ops = { ++static const struct sysfs_ops cm_counter_ops = { + .show = cm_show_counter + }; + +diff -urNp linux-2.6.31.5/drivers/infiniband/core/sysfs.c linux-2.6.31.5/drivers/infiniband/core/sysfs.c +--- linux-2.6.31.5/drivers/infiniband/core/sysfs.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/infiniband/core/sysfs.c 2009-10-20 20:33:11.024597101 -0400 +@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob + return port_attr->show(p, port_attr, buf); + } + +-static struct sysfs_ops port_sysfs_ops = { ++static const struct sysfs_ops port_sysfs_ops = { + .show = port_attr_show + }; + +diff -urNp linux-2.6.31.5/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.31.5/drivers/infiniband/hw/ehca/ehca_uverbs.c +--- linux-2.6.31.5/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-10-20 20:32:11.138131446 -0400 @@ -95,7 +95,7 @@ static void ehca_mm_close(struct vm_area vma->vm_start, vma->vm_end, *count); } @@ -20227,9 +20856,9 @@ diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.31. .open = ehca_mm_open, .close = ehca_mm_close, }; -diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_file_ops.c ---- linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-10-11 15:29:43.736367245 -0400 +diff -urNp linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_file_ops.c +--- linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-10-20 20:42:59.080365651 -0400 ++++ linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-10-20 20:32:11.138131446 -0400 @@ -1151,7 +1151,7 @@ static int ipath_file_vma_fault(struct v return 0; } @@ -20239,9 +20868,9 @@ diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6 .fault = ipath_file_vma_fault, }; -diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_mmap.c ---- linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-10-11 15:29:43.746784518 -0400 +diff -urNp linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_mmap.c +--- linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-10-20 20:32:11.138131446 -0400 @@ -74,7 +74,7 @@ static void ipath_vma_close(struct vm_ar kref_put(&ip->ref, ipath_release_mmap_info); } @@ -20251,9 +20880,9 @@ diff -urNp linux-2.6.31.4/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.31. .open = ipath_vma_open, .close = ipath_vma_close, }; -diff -urNp linux-2.6.31.4/drivers/input/keyboard/atkbd.c linux-2.6.31.4/drivers/input/keyboard/atkbd.c ---- linux-2.6.31.4/drivers/input/keyboard/atkbd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/keyboard/atkbd.c 2009-10-11 15:29:43.759359284 -0400 +diff -urNp linux-2.6.31.5/drivers/input/keyboard/atkbd.c linux-2.6.31.5/drivers/input/keyboard/atkbd.c +--- linux-2.6.31.5/drivers/input/keyboard/atkbd.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/keyboard/atkbd.c 2009-10-20 20:32:11.138131446 -0400 @@ -1188,7 +1188,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -20263,9 +20892,9 @@ diff -urNp linux-2.6.31.4/drivers/input/keyboard/atkbd.c linux-2.6.31.4/drivers/ }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.31.4/drivers/input/mouse/lifebook.c linux-2.6.31.4/drivers/input/mouse/lifebook.c ---- linux-2.6.31.4/drivers/input/mouse/lifebook.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/mouse/lifebook.c 2009-10-11 15:29:43.762393832 -0400 +diff -urNp linux-2.6.31.5/drivers/input/mouse/lifebook.c linux-2.6.31.5/drivers/input/mouse/lifebook.c +--- linux-2.6.31.5/drivers/input/mouse/lifebook.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/mouse/lifebook.c 2009-10-20 20:32:11.138131446 -0400 @@ -116,7 +116,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, @@ -20275,9 +20904,9 @@ diff -urNp linux-2.6.31.4/drivers/input/mouse/lifebook.c linux-2.6.31.4/drivers/ }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.31.4/drivers/input/mouse/psmouse-base.c linux-2.6.31.4/drivers/input/mouse/psmouse-base.c ---- linux-2.6.31.4/drivers/input/mouse/psmouse-base.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/mouse/psmouse-base.c 2009-10-11 15:29:43.764379597 -0400 +diff -urNp linux-2.6.31.5/drivers/input/mouse/psmouse-base.c linux-2.6.31.5/drivers/input/mouse/psmouse-base.c +--- linux-2.6.31.5/drivers/input/mouse/psmouse-base.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/mouse/psmouse-base.c 2009-10-20 20:32:11.138131446 -0400 @@ -1380,7 +1380,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -20287,9 +20916,9 @@ diff -urNp linux-2.6.31.4/drivers/input/mouse/psmouse-base.c linux-2.6.31.4/driv }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.31.4/drivers/input/mouse/synaptics.c linux-2.6.31.4/drivers/input/mouse/synaptics.c ---- linux-2.6.31.4/drivers/input/mouse/synaptics.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/mouse/synaptics.c 2009-10-11 15:29:43.766811888 -0400 +diff -urNp linux-2.6.31.5/drivers/input/mouse/synaptics.c linux-2.6.31.5/drivers/input/mouse/synaptics.c +--- linux-2.6.31.5/drivers/input/mouse/synaptics.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/mouse/synaptics.c 2009-10-20 20:32:11.138131446 -0400 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -20308,9 +20937,9 @@ diff -urNp linux-2.6.31.4/drivers/input/mouse/synaptics.c linux-2.6.31.4/drivers }; #endif -diff -urNp linux-2.6.31.4/drivers/input/mousedev.c linux-2.6.31.4/drivers/input/mousedev.c ---- linux-2.6.31.4/drivers/input/mousedev.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/mousedev.c 2009-10-11 15:29:43.773490984 -0400 +diff -urNp linux-2.6.31.5/drivers/input/mousedev.c linux-2.6.31.5/drivers/input/mousedev.c +--- linux-2.6.31.5/drivers/input/mousedev.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/mousedev.c 2009-10-20 20:32:11.141690122 -0400 @@ -1056,7 +1056,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX @@ -20320,9 +20949,9 @@ diff -urNp linux-2.6.31.4/drivers/input/mousedev.c linux-2.6.31.4/drivers/input/ }; static int psaux_registered; #endif -diff -urNp linux-2.6.31.4/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.4/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.31.4/drivers/input/serio/i8042-x86ia64io.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/serio/i8042-x86ia64io.h 2009-10-11 15:29:43.781361754 -0400 +diff -urNp linux-2.6.31.5/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.5/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.31.5/drivers/input/serio/i8042-x86ia64io.h 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/serio/i8042-x86ia64io.h 2009-10-20 20:32:11.141690122 -0400 @@ -167,7 +167,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -20368,9 +20997,9 @@ diff -urNp linux-2.6.31.4/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.4/d }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.31.4/drivers/input/serio/serio_raw.c linux-2.6.31.4/drivers/input/serio/serio_raw.c ---- linux-2.6.31.4/drivers/input/serio/serio_raw.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/input/serio/serio_raw.c 2009-10-11 15:29:43.794417509 -0400 +diff -urNp linux-2.6.31.5/drivers/input/serio/serio_raw.c linux-2.6.31.5/drivers/input/serio/serio_raw.c +--- linux-2.6.31.5/drivers/input/serio/serio_raw.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/input/serio/serio_raw.c 2009-10-20 20:32:11.141690122 -0400 @@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, @@ -20380,9 +21009,9 @@ diff -urNp linux-2.6.31.4/drivers/input/serio/serio_raw.c linux-2.6.31.4/drivers }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.31.4/drivers/isdn/capi/kcapi_proc.c linux-2.6.31.4/drivers/isdn/capi/kcapi_proc.c ---- linux-2.6.31.4/drivers/isdn/capi/kcapi_proc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/isdn/capi/kcapi_proc.c 2009-10-11 15:29:43.801430505 -0400 +diff -urNp linux-2.6.31.5/drivers/isdn/capi/kcapi_proc.c linux-2.6.31.5/drivers/isdn/capi/kcapi_proc.c +--- linux-2.6.31.5/drivers/isdn/capi/kcapi_proc.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/isdn/capi/kcapi_proc.c 2009-10-20 20:32:11.141690122 -0400 @@ -89,14 +89,14 @@ static int contrstats_show(struct seq_fi return 0; } @@ -20426,9 +21055,9 @@ diff -urNp linux-2.6.31.4/drivers/isdn/capi/kcapi_proc.c linux-2.6.31.4/drivers/ .start = capi_driver_start, .next = capi_driver_next, .stop = capi_driver_stop, -diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/common.c linux-2.6.31.4/drivers/isdn/gigaset/common.c ---- linux-2.6.31.4/drivers/isdn/gigaset/common.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/isdn/gigaset/common.c 2009-10-11 15:29:43.802363565 -0400 +diff -urNp linux-2.6.31.5/drivers/isdn/gigaset/common.c linux-2.6.31.5/drivers/isdn/gigaset/common.c +--- linux-2.6.31.5/drivers/isdn/gigaset/common.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/isdn/gigaset/common.c 2009-10-20 20:32:11.141690122 -0400 @@ -665,7 +665,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; @@ -20438,9 +21067,9 @@ diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/common.c linux-2.6.31.4/drivers/i cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/gigaset.h linux-2.6.31.4/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.31.4/drivers/isdn/gigaset/gigaset.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/isdn/gigaset/gigaset.h 2009-10-11 15:29:43.808430205 -0400 +diff -urNp linux-2.6.31.5/drivers/isdn/gigaset/gigaset.h linux-2.6.31.5/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.31.5/drivers/isdn/gigaset/gigaset.h 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/isdn/gigaset/gigaset.h 2009-10-20 20:32:11.141690122 -0400 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -20450,9 +21079,9 @@ diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/gigaset.h linux-2.6.31.4/drivers/ struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/interface.c linux-2.6.31.4/drivers/isdn/gigaset/interface.c ---- linux-2.6.31.4/drivers/isdn/gigaset/interface.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/isdn/gigaset/interface.c 2009-10-11 15:29:43.809413897 -0400 +diff -urNp linux-2.6.31.5/drivers/isdn/gigaset/interface.c linux-2.6.31.5/drivers/isdn/gigaset/interface.c +--- linux-2.6.31.5/drivers/isdn/gigaset/interface.c 2009-10-20 20:42:59.083794107 -0400 ++++ linux-2.6.31.5/drivers/isdn/gigaset/interface.c 2009-10-20 20:32:11.141690122 -0400 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -20540,9 +21169,9 @@ diff -urNp linux-2.6.31.4/drivers/isdn/gigaset/interface.c linux-2.6.31.4/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.31.4/drivers/lguest/core.c linux-2.6.31.4/drivers/lguest/core.c ---- linux-2.6.31.4/drivers/lguest/core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/lguest/core.c 2009-10-11 15:29:43.853764885 -0400 +diff -urNp linux-2.6.31.5/drivers/lguest/core.c linux-2.6.31.5/drivers/lguest/core.c +--- linux-2.6.31.5/drivers/lguest/core.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/lguest/core.c 2009-10-20 20:32:11.141690122 -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. @@ -20561,9 +21190,9 @@ diff -urNp linux-2.6.31.4/drivers/lguest/core.c linux-2.6.31.4/drivers/lguest/co if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.31.4/drivers/lguest/lguest_user.c linux-2.6.31.4/drivers/lguest/lguest_user.c ---- linux-2.6.31.4/drivers/lguest/lguest_user.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/lguest/lguest_user.c 2009-10-11 15:29:43.854371333 -0400 +diff -urNp linux-2.6.31.5/drivers/lguest/lguest_user.c linux-2.6.31.5/drivers/lguest/lguest_user.c +--- linux-2.6.31.5/drivers/lguest/lguest_user.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/lguest/lguest_user.c 2009-10-20 20:32:11.141690122 -0400 @@ -508,7 +508,7 @@ static int close(struct inode *inode, st * uses: reading and writing a character device called /dev/lguest. All the * work happens in the read(), write() and close() routines: @@ -20573,9 +21202,9 @@ diff -urNp linux-2.6.31.4/drivers/lguest/lguest_user.c linux-2.6.31.4/drivers/lg .owner = THIS_MODULE, .release = close, .write = write, -diff -urNp linux-2.6.31.4/drivers/macintosh/via-pmu.c linux-2.6.31.4/drivers/macintosh/via-pmu.c ---- linux-2.6.31.4/drivers/macintosh/via-pmu.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/macintosh/via-pmu.c 2009-10-11 15:29:56.646498264 -0400 +diff -urNp linux-2.6.31.5/drivers/macintosh/via-pmu.c linux-2.6.31.5/drivers/macintosh/via-pmu.c +--- linux-2.6.31.5/drivers/macintosh/via-pmu.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/macintosh/via-pmu.c 2009-10-20 20:32:11.141690122 -0400 @@ -2226,7 +2226,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -20585,9 +21214,9 @@ diff -urNp linux-2.6.31.4/drivers/macintosh/via-pmu.c linux-2.6.31.4/drivers/mac .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.31.4/drivers/md/bitmap.c linux-2.6.31.4/drivers/md/bitmap.c ---- linux-2.6.31.4/drivers/md/bitmap.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/md/bitmap.c 2009-10-11 15:29:43.863370113 -0400 +diff -urNp linux-2.6.31.5/drivers/md/bitmap.c linux-2.6.31.5/drivers/md/bitmap.c +--- linux-2.6.31.5/drivers/md/bitmap.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/md/bitmap.c 2009-10-20 20:32:11.144867261 -0400 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -20597,9 +21226,21 @@ diff -urNp linux-2.6.31.4/drivers/md/bitmap.c linux-2.6.31.4/drivers/md/bitmap.c # endif #endif -diff -urNp linux-2.6.31.4/drivers/md/dm-table.c linux-2.6.31.4/drivers/md/dm-table.c ---- linux-2.6.31.4/drivers/md/dm-table.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/md/dm-table.c 2009-10-11 15:29:43.865390866 -0400 +diff -urNp linux-2.6.31.5/drivers/md/dm-sysfs.c linux-2.6.31.5/drivers/md/dm-sysfs.c +--- linux-2.6.31.5/drivers/md/dm-sysfs.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/md/dm-sysfs.c 2009-10-20 20:33:11.024597101 -0400 +@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { + NULL, + }; + +-static struct sysfs_ops dm_sysfs_ops = { ++static const struct sysfs_ops dm_sysfs_ops = { + .show = dm_attr_show, + }; + +diff -urNp linux-2.6.31.5/drivers/md/dm-table.c linux-2.6.31.5/drivers/md/dm-table.c +--- linux-2.6.31.5/drivers/md/dm-table.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/md/dm-table.c 2009-10-20 20:32:11.144867261 -0400 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -20609,9 +21250,27 @@ diff -urNp linux-2.6.31.4/drivers/md/dm-table.c linux-2.6.31.4/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.31.4/drivers/md/md.c linux-2.6.31.4/drivers/md/md.c ---- linux-2.6.31.4/drivers/md/md.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/md/md.c 2009-10-11 15:29:43.885458981 -0400 +diff -urNp linux-2.6.31.5/drivers/md/md.c linux-2.6.31.5/drivers/md/md.c +--- linux-2.6.31.5/drivers/md/md.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/md/md.c 2009-10-20 20:33:11.005233243 -0400 +@@ -2474,7 +2474,7 @@ static void rdev_free(struct kobject *ko + mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); + kfree(rdev); + } +-static struct sysfs_ops rdev_sysfs_ops = { ++static const struct sysfs_ops rdev_sysfs_ops = { + .show = rdev_attr_show, + .store = rdev_attr_store, + }; +@@ -3844,7 +3844,7 @@ static void md_free(struct kobject *ko) + kfree(mddev); + } + +-static struct sysfs_ops md_sysfs_ops = { ++static const struct sysfs_ops md_sysfs_ops = { + .show = md_attr_show, + .store = md_attr_store, + }; @@ -5963,7 +5963,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { @@ -20630,9 +21289,9 @@ diff -urNp linux-2.6.31.4/drivers/md/md.c linux-2.6.31.4/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.31.4/drivers/md/md.h linux-2.6.31.4/drivers/md/md.h ---- linux-2.6.31.4/drivers/md/md.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/md/md.h 2009-10-11 15:29:43.898365423 -0400 +diff -urNp linux-2.6.31.5/drivers/md/md.h linux-2.6.31.5/drivers/md/md.h +--- linux-2.6.31.5/drivers/md/md.h 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/md/md.h 2009-10-20 20:32:11.144867261 -0400 @@ -303,7 +303,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -20642,9 +21301,9 @@ diff -urNp linux-2.6.31.4/drivers/md/md.h linux-2.6.31.4/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.31.4/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.31.4/drivers/media/dvb/dvb-core/dmxdev.c ---- linux-2.6.31.4/drivers/media/dvb/dvb-core/dmxdev.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/dvb/dvb-core/dmxdev.c 2009-10-11 15:29:43.905368587 -0400 +diff -urNp linux-2.6.31.5/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.31.5/drivers/media/dvb/dvb-core/dmxdev.c +--- linux-2.6.31.5/drivers/media/dvb/dvb-core/dmxdev.c 2009-10-20 20:42:59.087041546 -0400 ++++ linux-2.6.31.5/drivers/media/dvb/dvb-core/dmxdev.c 2009-10-20 20:32:11.144867261 -0400 @@ -1086,7 +1086,7 @@ static unsigned int dvb_dvr_poll(struct return mask; } @@ -20654,9 +21313,9 @@ diff -urNp linux-2.6.31.4/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.31.4/dri .owner = THIS_MODULE, .read = dvb_dvr_read, .write = dvb_dvr_write, -diff -urNp linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-ci.c linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-ci.c ---- linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-ci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-ci.c 2009-10-11 15:29:43.922548672 -0400 +diff -urNp linux-2.6.31.5/drivers/media/dvb/firewire/firedtv-ci.c linux-2.6.31.5/drivers/media/dvb/firewire/firedtv-ci.c +--- linux-2.6.31.5/drivers/media/dvb/firewire/firedtv-ci.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/dvb/firewire/firedtv-ci.c 2009-10-20 20:32:11.144867261 -0400 @@ -215,7 +215,7 @@ static unsigned int fdtv_ca_io_poll(stru return POLLIN; } @@ -20666,9 +21325,9 @@ diff -urNp linux-2.6.31.4/drivers/media/dvb/firewire/firedtv-ci.c linux-2.6.31.4 .owner = THIS_MODULE, .ioctl = dvb_generic_ioctl, .open = dvb_generic_open, -diff -urNp linux-2.6.31.4/drivers/media/video/cafe_ccic.c linux-2.6.31.4/drivers/media/video/cafe_ccic.c ---- linux-2.6.31.4/drivers/media/video/cafe_ccic.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/cafe_ccic.c 2009-10-11 15:29:43.937411870 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/cafe_ccic.c linux-2.6.31.5/drivers/media/video/cafe_ccic.c +--- linux-2.6.31.5/drivers/media/video/cafe_ccic.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/cafe_ccic.c 2009-10-20 20:32:11.144867261 -0400 @@ -1326,7 +1326,7 @@ static void cafe_v4l_vm_close(struct vm_ mutex_unlock(&sbuf->cam->s_mutex); } @@ -20678,9 +21337,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/cafe_ccic.c linux-2.6.31.4/drivers .open = cafe_v4l_vm_open, .close = cafe_v4l_vm_close }; -diff -urNp linux-2.6.31.4/drivers/media/video/et61x251/et61x251_core.c linux-2.6.31.4/drivers/media/video/et61x251/et61x251_core.c ---- linux-2.6.31.4/drivers/media/video/et61x251/et61x251_core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/et61x251/et61x251_core.c 2009-10-11 15:29:43.961415511 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/et61x251/et61x251_core.c linux-2.6.31.5/drivers/media/video/et61x251/et61x251_core.c +--- linux-2.6.31.5/drivers/media/video/et61x251/et61x251_core.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/et61x251/et61x251_core.c 2009-10-20 20:32:11.144867261 -0400 @@ -1494,7 +1494,7 @@ static void et61x251_vm_close(struct vm_ } @@ -20690,9 +21349,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/et61x251/et61x251_core.c linux-2.6 .open = et61x251_vm_open, .close = et61x251_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/gspca/gspca.c linux-2.6.31.4/drivers/media/video/gspca/gspca.c ---- linux-2.6.31.4/drivers/media/video/gspca/gspca.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/gspca/gspca.c 2009-10-11 15:29:43.966364172 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/gspca/gspca.c linux-2.6.31.5/drivers/media/video/gspca/gspca.c +--- linux-2.6.31.5/drivers/media/video/gspca/gspca.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/gspca/gspca.c 2009-10-20 20:32:11.148635761 -0400 @@ -99,7 +99,7 @@ static void gspca_vm_close(struct vm_are frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED; } @@ -20702,9 +21361,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/gspca/gspca.c linux-2.6.31.4/drive .open = gspca_vm_open, .close = gspca_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/meye.c linux-2.6.31.4/drivers/media/video/meye.c ---- linux-2.6.31.4/drivers/media/video/meye.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/meye.c 2009-10-11 15:29:43.975790828 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/meye.c linux-2.6.31.5/drivers/media/video/meye.c +--- linux-2.6.31.5/drivers/media/video/meye.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/meye.c 2009-10-20 20:32:11.148635761 -0400 @@ -1589,7 +1589,7 @@ static void meye_vm_close(struct vm_area meye.vma_use_count[idx]--; } @@ -20714,9 +21373,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/meye.c linux-2.6.31.4/drivers/medi .open = meye_vm_open, .close = meye_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.31.4/drivers/media/video/sn9c102/sn9c102_core.c ---- linux-2.6.31.4/drivers/media/video/sn9c102/sn9c102_core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/sn9c102/sn9c102_core.c 2009-10-11 15:29:43.998358880 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.31.5/drivers/media/video/sn9c102/sn9c102_core.c +--- linux-2.6.31.5/drivers/media/video/sn9c102/sn9c102_core.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/sn9c102/sn9c102_core.c 2009-10-20 20:32:11.148635761 -0400 @@ -2075,7 +2075,7 @@ static void sn9c102_vm_close(struct vm_a } @@ -20726,9 +21385,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.3 .open = sn9c102_vm_open, .close = sn9c102_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/stk-webcam.c linux-2.6.31.4/drivers/media/video/stk-webcam.c ---- linux-2.6.31.4/drivers/media/video/stk-webcam.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/stk-webcam.c 2009-10-11 15:29:44.000678395 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/stk-webcam.c linux-2.6.31.5/drivers/media/video/stk-webcam.c +--- linux-2.6.31.5/drivers/media/video/stk-webcam.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/stk-webcam.c 2009-10-20 20:32:11.148635761 -0400 @@ -790,7 +790,7 @@ static void stk_v4l_vm_close(struct vm_a if (sbuf->mapcount == 0) sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED; @@ -20738,9 +21397,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/stk-webcam.c linux-2.6.31.4/driver .open = stk_v4l_vm_open, .close = stk_v4l_vm_close }; -diff -urNp linux-2.6.31.4/drivers/media/video/usbvideo/konicawc.c linux-2.6.31.4/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.31.4/drivers/media/video/usbvideo/konicawc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/usbvideo/konicawc.c 2009-10-11 15:29:44.011445121 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/usbvideo/konicawc.c linux-2.6.31.5/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.31.5/drivers/media/video/usbvideo/konicawc.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/usbvideo/konicawc.c 2009-10-20 20:32:11.148635761 -0400 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -20750,9 +21409,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/usbvideo/konicawc.c linux-2.6.31.4 cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.31.4/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.31.4/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.31.4/drivers/media/video/usbvideo/quickcam_messenger.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/usbvideo/quickcam_messenger.c 2009-10-11 15:29:44.021731416 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.31.5/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.31.5/drivers/media/video/usbvideo/quickcam_messenger.c 2009-10-20 20:42:59.090658477 -0400 ++++ linux-2.6.31.5/drivers/media/video/usbvideo/quickcam_messenger.c 2009-10-20 20:32:11.148635761 -0400 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -20762,9 +21421,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/usbvideo/quickcam_messenger.c linu cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.31.4/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.31.4/drivers/media/video/uvc/uvc_v4l2.c ---- linux-2.6.31.4/drivers/media/video/uvc/uvc_v4l2.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/uvc/uvc_v4l2.c 2009-10-11 15:29:44.025363899 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.31.5/drivers/media/video/uvc/uvc_v4l2.c +--- linux-2.6.31.5/drivers/media/video/uvc/uvc_v4l2.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/media/video/uvc/uvc_v4l2.c 2009-10-20 20:32:11.148635761 -0400 @@ -1063,7 +1063,7 @@ static void uvc_vm_close(struct vm_area_ buffer->vma_use_count--; } @@ -20774,9 +21433,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.31.4/driv .open = uvc_vm_open, .close = uvc_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/videobuf-dma-contig.c linux-2.6.31.4/drivers/media/video/videobuf-dma-contig.c ---- linux-2.6.31.4/drivers/media/video/videobuf-dma-contig.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/videobuf-dma-contig.c 2009-10-11 15:29:44.029502192 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/videobuf-dma-contig.c linux-2.6.31.5/drivers/media/video/videobuf-dma-contig.c +--- linux-2.6.31.5/drivers/media/video/videobuf-dma-contig.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/media/video/videobuf-dma-contig.c 2009-10-20 20:32:11.151799275 -0400 @@ -105,7 +105,7 @@ static void videobuf_vm_close(struct vm_ } } @@ -20786,9 +21445,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/videobuf-dma-contig.c linux-2.6.31 .open = videobuf_vm_open, .close = videobuf_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/vino.c linux-2.6.31.4/drivers/media/video/vino.c ---- linux-2.6.31.4/drivers/media/video/vino.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/vino.c 2009-10-11 15:29:44.052363861 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/vino.c linux-2.6.31.5/drivers/media/video/vino.c +--- linux-2.6.31.5/drivers/media/video/vino.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/media/video/vino.c 2009-10-20 20:32:11.151799275 -0400 @@ -3858,7 +3858,7 @@ static void vino_vm_close(struct vm_area dprintk("vino_vm_close(): count = %d\n", fb->map_count); } @@ -20798,9 +21457,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/vino.c linux-2.6.31.4/drivers/medi .open = vino_vm_open, .close = vino_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/zc0301/zc0301_core.c linux-2.6.31.4/drivers/media/video/zc0301/zc0301_core.c ---- linux-2.6.31.4/drivers/media/video/zc0301/zc0301_core.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/zc0301/zc0301_core.c 2009-10-11 15:29:44.068437873 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/zc0301/zc0301_core.c linux-2.6.31.5/drivers/media/video/zc0301/zc0301_core.c +--- linux-2.6.31.5/drivers/media/video/zc0301/zc0301_core.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/media/video/zc0301/zc0301_core.c 2009-10-20 20:32:11.151799275 -0400 @@ -933,7 +933,7 @@ static void zc0301_vm_close(struct vm_ar } @@ -20810,9 +21469,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/zc0301/zc0301_core.c linux-2.6.31. .open = zc0301_vm_open, .close = zc0301_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/media/video/zoran/zoran_driver.c linux-2.6.31.4/drivers/media/video/zoran/zoran_driver.c ---- linux-2.6.31.4/drivers/media/video/zoran/zoran_driver.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/media/video/zoran/zoran_driver.c 2009-10-11 15:29:44.077359107 -0400 +diff -urNp linux-2.6.31.5/drivers/media/video/zoran/zoran_driver.c linux-2.6.31.5/drivers/media/video/zoran/zoran_driver.c +--- linux-2.6.31.5/drivers/media/video/zoran/zoran_driver.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/media/video/zoran/zoran_driver.c 2009-10-20 20:32:11.151799275 -0400 @@ -3172,7 +3172,7 @@ zoran_vm_close (struct vm_area_struct *v mutex_unlock(&zr->resource_lock); } @@ -20822,9 +21481,9 @@ diff -urNp linux-2.6.31.4/drivers/media/video/zoran/zoran_driver.c linux-2.6.31. .open = zoran_vm_open, .close = zoran_vm_close, }; -diff -urNp linux-2.6.31.4/drivers/message/i2o/i2o_proc.c linux-2.6.31.4/drivers/message/i2o/i2o_proc.c ---- linux-2.6.31.4/drivers/message/i2o/i2o_proc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/message/i2o/i2o_proc.c 2009-10-11 15:29:44.103477731 -0400 +diff -urNp linux-2.6.31.5/drivers/message/i2o/i2o_proc.c linux-2.6.31.5/drivers/message/i2o/i2o_proc.c +--- linux-2.6.31.5/drivers/message/i2o/i2o_proc.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/message/i2o/i2o_proc.c 2009-10-20 20:32:11.151799275 -0400 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -20911,9 +21570,9 @@ diff -urNp linux-2.6.31.4/drivers/message/i2o/i2o_proc.c linux-2.6.31.4/drivers/ return 0; } -diff -urNp linux-2.6.31.4/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.31.4/drivers/misc/ibmasm/ibmasmfs.c ---- linux-2.6.31.4/drivers/misc/ibmasm/ibmasmfs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/misc/ibmasm/ibmasmfs.c 2009-10-11 15:29:44.144639162 -0400 +diff -urNp linux-2.6.31.5/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.31.5/drivers/misc/ibmasm/ibmasmfs.c +--- linux-2.6.31.5/drivers/misc/ibmasm/ibmasmfs.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/misc/ibmasm/ibmasmfs.c 2009-10-20 20:32:11.151799275 -0400 @@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct fil return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt); } @@ -20923,9 +21582,9 @@ diff -urNp linux-2.6.31.4/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.31.4/drivers/ .statfs = simple_statfs, .drop_inode = generic_delete_inode, }; -diff -urNp linux-2.6.31.4/drivers/misc/kgdbts.c linux-2.6.31.4/drivers/misc/kgdbts.c ---- linux-2.6.31.4/drivers/misc/kgdbts.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/misc/kgdbts.c 2009-10-11 15:29:56.651812655 -0400 +diff -urNp linux-2.6.31.5/drivers/misc/kgdbts.c linux-2.6.31.5/drivers/misc/kgdbts.c +--- linux-2.6.31.5/drivers/misc/kgdbts.c 2009-10-20 20:42:59.093942158 -0400 ++++ linux-2.6.31.5/drivers/misc/kgdbts.c 2009-10-20 20:32:11.151799275 -0400 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -20944,9 +21603,9 @@ diff -urNp linux-2.6.31.4/drivers/misc/kgdbts.c linux-2.6.31.4/drivers/misc/kgdb .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.31.4/drivers/misc/phantom.c linux-2.6.31.4/drivers/misc/phantom.c ---- linux-2.6.31.4/drivers/misc/phantom.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/misc/phantom.c 2009-10-11 15:29:44.151696755 -0400 +diff -urNp linux-2.6.31.5/drivers/misc/phantom.c linux-2.6.31.5/drivers/misc/phantom.c +--- linux-2.6.31.5/drivers/misc/phantom.c 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/misc/phantom.c 2009-10-20 20:32:11.151799275 -0400 @@ -271,7 +271,7 @@ static unsigned int phantom_poll(struct return mask; } @@ -20956,9 +21615,9 @@ diff -urNp linux-2.6.31.4/drivers/misc/phantom.c linux-2.6.31.4/drivers/misc/pha .open = phantom_open, .release = phantom_release, .unlocked_ioctl = phantom_ioctl, -diff -urNp linux-2.6.31.4/drivers/misc/sgi-gru/grufile.c linux-2.6.31.4/drivers/misc/sgi-gru/grufile.c ---- linux-2.6.31.4/drivers/misc/sgi-gru/grufile.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/misc/sgi-gru/grufile.c 2009-10-11 15:29:44.181375113 -0400 +diff -urNp linux-2.6.31.5/drivers/misc/sgi-gru/grufile.c linux-2.6.31.5/drivers/misc/sgi-gru/grufile.c +--- linux-2.6.31.5/drivers/misc/sgi-gru/grufile.c 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/misc/sgi-gru/grufile.c 2009-10-20 20:32:11.151799275 -0400 @@ -53,7 +53,7 @@ struct gru_stats_s gru_stats; /* Guaranteed user available resources on each node */ static int max_user_cbrs, max_user_dsr_bytes; @@ -20986,9 +21645,9 @@ diff -urNp linux-2.6.31.4/drivers/misc/sgi-gru/grufile.c linux-2.6.31.4/drivers/ .close = gru_vma_close, .fault = gru_fault, }; -diff -urNp linux-2.6.31.4/drivers/misc/sgi-gru/grutables.h linux-2.6.31.4/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.31.4/drivers/misc/sgi-gru/grutables.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/misc/sgi-gru/grutables.h 2009-10-11 15:29:44.191716193 -0400 +diff -urNp linux-2.6.31.5/drivers/misc/sgi-gru/grutables.h linux-2.6.31.5/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.31.5/drivers/misc/sgi-gru/grutables.h 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/misc/sgi-gru/grutables.h 2009-10-20 20:32:11.155263529 -0400 @@ -624,7 +624,7 @@ static inline int is_kernel_context(stru */ struct gru_unload_context_req; @@ -20998,9 +21657,9 @@ diff -urNp linux-2.6.31.4/drivers/misc/sgi-gru/grutables.h linux-2.6.31.4/driver extern struct device *grudev; extern struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, -diff -urNp linux-2.6.31.4/drivers/mmc/core/debugfs.c linux-2.6.31.4/drivers/mmc/core/debugfs.c ---- linux-2.6.31.4/drivers/mmc/core/debugfs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/mmc/core/debugfs.c 2009-10-11 15:29:44.204796497 -0400 +diff -urNp linux-2.6.31.5/drivers/mmc/core/debugfs.c linux-2.6.31.5/drivers/mmc/core/debugfs.c +--- linux-2.6.31.5/drivers/mmc/core/debugfs.c 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/mmc/core/debugfs.c 2009-10-20 20:32:11.155263529 -0400 @@ -240,7 +240,7 @@ static int mmc_ext_csd_release(struct in return 0; } @@ -21010,9 +21669,9 @@ diff -urNp linux-2.6.31.4/drivers/mmc/core/debugfs.c linux-2.6.31.4/drivers/mmc/ .open = mmc_ext_csd_open, .read = mmc_ext_csd_read, .release = mmc_ext_csd_release, -diff -urNp linux-2.6.31.4/drivers/mtd/devices/doc2000.c linux-2.6.31.4/drivers/mtd/devices/doc2000.c ---- linux-2.6.31.4/drivers/mtd/devices/doc2000.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/mtd/devices/doc2000.c 2009-10-11 15:29:44.224823634 -0400 +diff -urNp linux-2.6.31.5/drivers/mtd/devices/doc2000.c linux-2.6.31.5/drivers/mtd/devices/doc2000.c +--- linux-2.6.31.5/drivers/mtd/devices/doc2000.c 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/mtd/devices/doc2000.c 2009-10-20 20:32:11.155263529 -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 */ @@ -21022,9 +21681,9 @@ diff -urNp linux-2.6.31.4/drivers/mtd/devices/doc2000.c linux-2.6.31.4/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.31.4/drivers/mtd/devices/doc2001.c linux-2.6.31.4/drivers/mtd/devices/doc2001.c ---- linux-2.6.31.4/drivers/mtd/devices/doc2001.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/mtd/devices/doc2001.c 2009-10-11 15:29:44.231733020 -0400 +diff -urNp linux-2.6.31.5/drivers/mtd/devices/doc2001.c linux-2.6.31.5/drivers/mtd/devices/doc2001.c +--- linux-2.6.31.5/drivers/mtd/devices/doc2001.c 2009-10-20 20:42:59.097446840 -0400 ++++ linux-2.6.31.5/drivers/mtd/devices/doc2001.c 2009-10-20 20:32:11.155263529 -0400 @@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt /* Don't allow read past end of device */ if (from >= this->totlen) @@ -21034,9 +21693,9 @@ diff -urNp linux-2.6.31.4/drivers/mtd/devices/doc2001.c linux-2.6.31.4/drivers/m /* Don't allow a single read to cross a 512-byte block boundary */ if (from + len > ((from | 0x1ff) + 1)) -diff -urNp linux-2.6.31.4/drivers/mtd/ubi/build.c linux-2.6.31.4/drivers/mtd/ubi/build.c ---- linux-2.6.31.4/drivers/mtd/ubi/build.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/mtd/ubi/build.c 2009-10-11 15:29:44.251713063 -0400 +diff -urNp linux-2.6.31.5/drivers/mtd/ubi/build.c linux-2.6.31.5/drivers/mtd/ubi/build.c +--- linux-2.6.31.5/drivers/mtd/ubi/build.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/mtd/ubi/build.c 2009-10-20 20:32:11.155263529 -0400 @@ -1257,7 +1257,7 @@ static int __init bytes_str_to_int(const unsigned long result; @@ -21046,9 +21705,189 @@ diff -urNp linux-2.6.31.4/drivers/mtd/ubi/build.c linux-2.6.31.4/drivers/mtd/ubi printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", str); return -EINVAL; -diff -urNp linux-2.6.31.4/drivers/net/irda/vlsi_ir.c linux-2.6.31.4/drivers/net/irda/vlsi_ir.c ---- linux-2.6.31.4/drivers/net/irda/vlsi_ir.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/net/irda/vlsi_ir.c 2009-10-11 15:29:44.258384983 -0400 +diff -urNp linux-2.6.31.5/drivers/net/e1000e/82571.c linux-2.6.31.5/drivers/net/e1000e/82571.c +--- linux-2.6.31.5/drivers/net/e1000e/82571.c 2009-10-23 19:50:17.183885454 -0400 ++++ linux-2.6.31.5/drivers/net/e1000e/82571.c 2009-10-23 19:50:29.642212930 -0400 +@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(s + temp = er32(ICRXDMTC); + } + +-static struct e1000_mac_operations e82571_mac_ops = { ++static const struct e1000_mac_operations e82571_mac_ops = { + /* .check_mng_mode: mac type dependent */ + /* .check_for_link: media type dependent */ + .id_led_init = e1000e_id_led_init, +@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e8257 + .setup_led = e1000e_setup_led_generic, + }; + +-static struct e1000_phy_operations e82_phy_ops_igp = { ++static const struct e1000_phy_operations e82_phy_ops_igp = { + .acquire_phy = e1000_get_hw_semaphore_82571, + .check_reset_block = e1000e_check_reset_block_generic, + .commit_phy = NULL, +@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up = NULL, + }; + +-static struct e1000_phy_operations e82_phy_ops_m88 = { ++static const struct e1000_phy_operations e82_phy_ops_m88 = { + .acquire_phy = e1000_get_hw_semaphore_82571, + .check_reset_block = e1000e_check_reset_block_generic, + .commit_phy = e1000e_phy_sw_reset, +@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up = NULL, + }; + +-static struct e1000_phy_operations e82_phy_ops_bm = { ++static const struct e1000_phy_operations e82_phy_ops_bm = { + .acquire_phy = e1000_get_hw_semaphore_82571, + .check_reset_block = e1000e_check_reset_block_generic, + .commit_phy = e1000e_phy_sw_reset, +@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up = NULL, + }; + +-static struct e1000_nvm_operations e82571_nvm_ops = { ++static const struct e1000_nvm_operations e82571_nvm_ops = { + .acquire_nvm = e1000_acquire_nvm_82571, + .read_nvm = e1000e_read_nvm_eerd, + .release_nvm = e1000_release_nvm_82571, +diff -urNp linux-2.6.31.5/drivers/net/e1000e/e1000.h linux-2.6.31.5/drivers/net/e1000e/e1000.h +--- linux-2.6.31.5/drivers/net/e1000e/e1000.h 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/e1000e/e1000.h 2009-10-20 20:33:11.024597101 -0400 +@@ -359,9 +359,9 @@ struct e1000_info { + u32 pba; + u32 max_hw_frame_size; + s32 (*get_variants)(struct e1000_adapter *); +- struct e1000_mac_operations *mac_ops; +- struct e1000_phy_operations *phy_ops; +- struct e1000_nvm_operations *nvm_ops; ++ const struct e1000_mac_operations *mac_ops; ++ const struct e1000_phy_operations *phy_ops; ++ const struct e1000_nvm_operations *nvm_ops; + }; + + /* hardware capability, feature, and workaround flags */ +diff -urNp linux-2.6.31.5/drivers/net/e1000e/es2lan.c linux-2.6.31.5/drivers/net/e1000e/es2lan.c +--- linux-2.6.31.5/drivers/net/e1000e/es2lan.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/e1000e/es2lan.c 2009-10-20 20:33:11.024597101 -0400 +@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es + temp = er32(ICRXDMTC); + } + +-static struct e1000_mac_operations es2_mac_ops = { ++static const struct e1000_mac_operations es2_mac_ops = { + .id_led_init = e1000e_id_led_init, + .check_mng_mode = e1000e_check_mng_mode_generic, + /* check_for_link dependent on media type */ +@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_m + .setup_led = e1000e_setup_led_generic, + }; + +-static struct e1000_phy_operations es2_phy_ops = { ++static const struct e1000_phy_operations es2_phy_ops = { + .acquire_phy = e1000_acquire_phy_80003es2lan, + .check_reset_block = e1000e_check_reset_block_generic, + .commit_phy = e1000e_phy_sw_reset, +@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_p + .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan, + }; + +-static struct e1000_nvm_operations es2_nvm_ops = { ++static const struct e1000_nvm_operations es2_nvm_ops = { + .acquire_nvm = e1000_acquire_nvm_80003es2lan, + .read_nvm = e1000e_read_nvm_eerd, + .release_nvm = e1000_release_nvm_80003es2lan, +diff -urNp linux-2.6.31.5/drivers/net/e1000e/ich8lan.c linux-2.6.31.5/drivers/net/e1000e/ich8lan.c +--- linux-2.6.31.5/drivers/net/e1000e/ich8lan.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/e1000e/ich8lan.c 2009-10-20 20:33:11.024597101 -0400 +@@ -3078,7 +3078,7 @@ static void e1000_clear_hw_cntrs_ich8lan + } + } + +-static struct e1000_mac_operations ich8_mac_ops = { ++static const struct e1000_mac_operations ich8_mac_ops = { + .id_led_init = e1000e_id_led_init, + .check_mng_mode = e1000_check_mng_mode_ich8lan, + .check_for_link = e1000_check_for_copper_link_ich8lan, +@@ -3096,7 +3096,7 @@ static struct e1000_mac_operations ich8_ + /* id_led_init dependent on mac type */ + }; + +-static struct e1000_phy_operations ich8_phy_ops = { ++static const struct e1000_phy_operations ich8_phy_ops = { + .acquire_phy = e1000_acquire_swflag_ich8lan, + .check_reset_block = e1000_check_reset_block_ich8lan, + .commit_phy = NULL, +@@ -3112,7 +3112,7 @@ static struct e1000_phy_operations ich8_ + .write_phy_reg = e1000e_write_phy_reg_igp, + }; + +-static struct e1000_nvm_operations ich8_nvm_ops = { ++static const struct e1000_nvm_operations ich8_nvm_ops = { + .acquire_nvm = e1000_acquire_swflag_ich8lan, + .read_nvm = e1000_read_nvm_ich8lan, + .release_nvm = e1000_release_swflag_ich8lan, +diff -urNp linux-2.6.31.5/drivers/net/ibmveth.c linux-2.6.31.5/drivers/net/ibmveth.c +--- linux-2.6.31.5/drivers/net/ibmveth.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/ibmveth.c 2009-10-20 20:33:11.028168621 -0400 +@@ -1576,7 +1576,7 @@ static struct attribute * veth_pool_attr + NULL, + }; + +-static struct sysfs_ops veth_pool_ops = { ++static const struct sysfs_ops veth_pool_ops = { + .show = veth_pool_show, + .store = veth_pool_store, + }; +diff -urNp linux-2.6.31.5/drivers/net/igb/e1000_82575.c linux-2.6.31.5/drivers/net/igb/e1000_82575.c +--- linux-2.6.31.5/drivers/net/igb/e1000_82575.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/igb/e1000_82575.c 2009-10-20 20:33:11.028168621 -0400 +@@ -1461,7 +1461,7 @@ void igb_vmdq_set_replication_pf(struct + wr32(E1000_VT_CTL, vt_ctl); + } + +-static struct e1000_mac_operations e1000_mac_ops_82575 = { ++static const struct e1000_mac_operations e1000_mac_ops_82575 = { + .reset_hw = igb_reset_hw_82575, + .init_hw = igb_init_hw_82575, + .check_for_link = igb_check_for_link_82575, +@@ -1470,13 +1470,13 @@ static struct e1000_mac_operations e1000 + .get_speed_and_duplex = igb_get_speed_and_duplex_copper, + }; + +-static struct e1000_phy_operations e1000_phy_ops_82575 = { ++static const struct e1000_phy_operations e1000_phy_ops_82575 = { + .acquire = igb_acquire_phy_82575, + .get_cfg_done = igb_get_cfg_done_82575, + .release = igb_release_phy_82575, + }; + +-static struct e1000_nvm_operations e1000_nvm_ops_82575 = { ++static const struct e1000_nvm_operations e1000_nvm_ops_82575 = { + .acquire = igb_acquire_nvm_82575, + .read = igb_read_nvm_eerd, + .release = igb_release_nvm_82575, +diff -urNp linux-2.6.31.5/drivers/net/igb/e1000_hw.h linux-2.6.31.5/drivers/net/igb/e1000_hw.h +--- linux-2.6.31.5/drivers/net/igb/e1000_hw.h 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/igb/e1000_hw.h 2009-10-20 20:33:11.028168621 -0400 +@@ -310,9 +310,9 @@ struct e1000_nvm_operations { + + struct e1000_info { + s32 (*get_invariants)(struct e1000_hw *); +- struct e1000_mac_operations *mac_ops; +- struct e1000_phy_operations *phy_ops; +- struct e1000_nvm_operations *nvm_ops; ++ const struct e1000_mac_operations *mac_ops; ++ const struct e1000_phy_operations *phy_ops; ++ const struct e1000_nvm_operations *nvm_ops; + }; + + extern const struct e1000_info e1000_82575_info; +diff -urNp linux-2.6.31.5/drivers/net/irda/vlsi_ir.c linux-2.6.31.5/drivers/net/irda/vlsi_ir.c +--- linux-2.6.31.5/drivers/net/irda/vlsi_ir.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/irda/vlsi_ir.c 2009-10-20 20:32:11.155263529 -0400 @@ -906,13 +906,12 @@ static int vlsi_hard_start_xmit(struct s /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -21065,9 +21904,30 @@ diff -urNp linux-2.6.31.4/drivers/net/irda/vlsi_ir.c linux-2.6.31.4/drivers/net/ spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return 0; -diff -urNp linux-2.6.31.4/drivers/net/pcnet32.c linux-2.6.31.4/drivers/net/pcnet32.c ---- linux-2.6.31.4/drivers/net/pcnet32.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/net/pcnet32.c 2009-10-11 15:29:44.290520192 -0400 +diff -urNp linux-2.6.31.5/drivers/net/iseries_veth.c linux-2.6.31.5/drivers/net/iseries_veth.c +--- linux-2.6.31.5/drivers/net/iseries_veth.c 2009-10-20 20:42:59.100605007 -0400 ++++ linux-2.6.31.5/drivers/net/iseries_veth.c 2009-10-20 20:33:11.028168621 -0400 +@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul + NULL + }; + +-static struct sysfs_ops veth_cnx_sysfs_ops = { ++static const struct sysfs_ops veth_cnx_sysfs_ops = { + .show = veth_cnx_attribute_show + }; + +@@ -441,7 +441,7 @@ static struct attribute *veth_port_defau + NULL + }; + +-static struct sysfs_ops veth_port_sysfs_ops = { ++static const struct sysfs_ops veth_port_sysfs_ops = { + .show = veth_port_attribute_show + }; + +diff -urNp linux-2.6.31.5/drivers/net/pcnet32.c linux-2.6.31.5/drivers/net/pcnet32.c +--- linux-2.6.31.5/drivers/net/pcnet32.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/net/pcnet32.c 2009-10-20 20:32:11.155263529 -0400 @@ -78,7 +78,7 @@ static int cards_found; /* * VLB I/O addresses @@ -21077,9 +21937,9 @@ diff -urNp linux-2.6.31.4/drivers/net/pcnet32.c linux-2.6.31.4/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.31.4/drivers/net/tg3.h linux-2.6.31.4/drivers/net/tg3.h ---- linux-2.6.31.4/drivers/net/tg3.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/net/tg3.h 2009-10-11 15:29:44.293671047 -0400 +diff -urNp linux-2.6.31.5/drivers/net/tg3.h linux-2.6.31.5/drivers/net/tg3.h +--- linux-2.6.31.5/drivers/net/tg3.h 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/net/tg3.h 2009-10-20 20:32:11.155263529 -0400 @@ -89,6 +89,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -21088,9 +21948,9 @@ diff -urNp linux-2.6.31.4/drivers/net/tg3.h linux-2.6.31.4/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.31.4/drivers/net/usb/hso.c linux-2.6.31.4/drivers/net/usb/hso.c ---- linux-2.6.31.4/drivers/net/usb/hso.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/net/usb/hso.c 2009-10-11 15:29:44.585641846 -0400 +diff -urNp linux-2.6.31.5/drivers/net/usb/hso.c linux-2.6.31.5/drivers/net/usb/hso.c +--- linux-2.6.31.5/drivers/net/usb/hso.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/net/usb/hso.c 2009-10-20 20:32:11.158529077 -0400 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -21169,9 +22029,9 @@ diff -urNp linux-2.6.31.4/drivers/net/usb/hso.c linux-2.6.31.4/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.31.4/drivers/oprofile/buffer_sync.c linux-2.6.31.4/drivers/oprofile/buffer_sync.c ---- linux-2.6.31.4/drivers/oprofile/buffer_sync.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/oprofile/buffer_sync.c 2009-10-11 15:29:44.618380075 -0400 +diff -urNp linux-2.6.31.5/drivers/oprofile/buffer_sync.c linux-2.6.31.5/drivers/oprofile/buffer_sync.c +--- linux-2.6.31.5/drivers/oprofile/buffer_sync.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/oprofile/buffer_sync.c 2009-10-20 20:32:11.158529077 -0400 @@ -341,7 +341,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; @@ -21207,9 +22067,9 @@ diff -urNp linux-2.6.31.4/drivers/oprofile/buffer_sync.c linux-2.6.31.4/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.31.4/drivers/oprofile/event_buffer.c linux-2.6.31.4/drivers/oprofile/event_buffer.c ---- linux-2.6.31.4/drivers/oprofile/event_buffer.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/oprofile/event_buffer.c 2009-10-11 15:29:44.618380075 -0400 +diff -urNp linux-2.6.31.5/drivers/oprofile/event_buffer.c linux-2.6.31.5/drivers/oprofile/event_buffer.c +--- linux-2.6.31.5/drivers/oprofile/event_buffer.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/oprofile/event_buffer.c 2009-10-20 20:32:11.158529077 -0400 @@ -42,7 +42,7 @@ static atomic_t buffer_ready = ATOMIC_IN void add_event_entry(unsigned long value) { @@ -21219,9 +22079,9 @@ diff -urNp linux-2.6.31.4/drivers/oprofile/event_buffer.c linux-2.6.31.4/drivers return; } -diff -urNp linux-2.6.31.4/drivers/oprofile/oprofilefs.c linux-2.6.31.4/drivers/oprofile/oprofilefs.c ---- linux-2.6.31.4/drivers/oprofile/oprofilefs.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/oprofile/oprofilefs.c 2009-10-11 15:29:44.628632352 -0400 +diff -urNp linux-2.6.31.5/drivers/oprofile/oprofilefs.c linux-2.6.31.5/drivers/oprofile/oprofilefs.c +--- linux-2.6.31.5/drivers/oprofile/oprofilefs.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/oprofile/oprofilefs.c 2009-10-20 20:32:11.158529077 -0400 @@ -35,7 +35,7 @@ static struct inode *oprofilefs_get_inod } @@ -21240,9 +22100,9 @@ diff -urNp linux-2.6.31.4/drivers/oprofile/oprofilefs.c linux-2.6.31.4/drivers/o { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.31.4/drivers/oprofile/oprofile_stats.c linux-2.6.31.4/drivers/oprofile/oprofile_stats.c ---- linux-2.6.31.4/drivers/oprofile/oprofile_stats.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/oprofile/oprofile_stats.c 2009-10-11 15:29:44.630372065 -0400 +diff -urNp linux-2.6.31.5/drivers/oprofile/oprofile_stats.c linux-2.6.31.5/drivers/oprofile/oprofile_stats.c +--- linux-2.6.31.5/drivers/oprofile/oprofile_stats.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/oprofile/oprofile_stats.c 2009-10-20 20:32:11.158529077 -0400 @@ -30,10 +30,10 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -21258,9 +22118,9 @@ diff -urNp linux-2.6.31.4/drivers/oprofile/oprofile_stats.c linux-2.6.31.4/drive } -diff -urNp linux-2.6.31.4/drivers/oprofile/oprofile_stats.h linux-2.6.31.4/drivers/oprofile/oprofile_stats.h ---- linux-2.6.31.4/drivers/oprofile/oprofile_stats.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/oprofile/oprofile_stats.h 2009-10-11 15:29:44.630372065 -0400 +diff -urNp linux-2.6.31.5/drivers/oprofile/oprofile_stats.h linux-2.6.31.5/drivers/oprofile/oprofile_stats.h +--- linux-2.6.31.5/drivers/oprofile/oprofile_stats.h 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/oprofile/oprofile_stats.h 2009-10-20 20:32:11.158529077 -0400 @@ -13,10 +13,10 @@ #include @@ -21276,9 +22136,33 @@ diff -urNp linux-2.6.31.4/drivers/oprofile/oprofile_stats.h linux-2.6.31.4/drive }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.31.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.31.4/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.31.4/drivers/pci/hotplug/cpqphp_nvram.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pci/hotplug/cpqphp_nvram.c 2009-10-11 15:29:44.665386313 -0400 +diff -urNp linux-2.6.31.5/drivers/parisc/pdc_stable.c linux-2.6.31.5/drivers/parisc/pdc_stable.c +--- linux-2.6.31.5/drivers/parisc/pdc_stable.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/parisc/pdc_stable.c 2009-10-20 20:33:11.028168621 -0400 +@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj + return ret; + } + +-static struct sysfs_ops pdcspath_attr_ops = { ++static const struct sysfs_ops pdcspath_attr_ops = { + .show = pdcspath_attr_show, + .store = pdcspath_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.31.5/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.31.5/drivers/pci/hotplug/acpiphp_glue.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/pci/hotplug/acpiphp_glue.c 2009-10-20 20:33:11.028168621 -0400 +@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif + } + + +-static struct acpi_dock_ops acpiphp_dock_ops = { ++static const struct acpi_dock_ops acpiphp_dock_ops = { + .handler = handle_hotplug_event_func, + }; + +diff -urNp linux-2.6.31.5/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.31.5/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.31.5/drivers/pci/hotplug/cpqphp_nvram.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/pci/hotplug/cpqphp_nvram.c 2009-10-20 20:32:11.158529077 -0400 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -21293,9 +22177,21 @@ diff -urNp linux-2.6.31.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.31.4/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.31.4/drivers/pci/pcie/portdrv_pci.c linux-2.6.31.4/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.31.4/drivers/pci/pcie/portdrv_pci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pci/pcie/portdrv_pci.c 2009-10-11 15:29:44.668667899 -0400 +diff -urNp linux-2.6.31.5/drivers/pci/hotplug/fakephp.c linux-2.6.31.5/drivers/pci/hotplug/fakephp.c +--- linux-2.6.31.5/drivers/pci/hotplug/fakephp.c 2009-10-20 20:42:59.103762398 -0400 ++++ linux-2.6.31.5/drivers/pci/hotplug/fakephp.c 2009-10-20 20:33:11.028168621 -0400 +@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec + } + + static struct kobj_type legacy_ktype = { +- .sysfs_ops = &(struct sysfs_ops){ ++ .sysfs_ops = &(const struct sysfs_ops){ + .store = legacy_store, .show = legacy_show + }, + .release = &legacy_release, +diff -urNp linux-2.6.31.5/drivers/pci/pcie/portdrv_pci.c linux-2.6.31.5/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.31.5/drivers/pci/pcie/portdrv_pci.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pci/pcie/portdrv_pci.c 2009-10-20 20:32:11.158529077 -0400 @@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ @@ -21305,9 +22201,9 @@ diff -urNp linux-2.6.31.4/drivers/pci/pcie/portdrv_pci.c linux-2.6.31.4/drivers/ }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.31.4/drivers/pci/proc.c linux-2.6.31.4/drivers/pci/proc.c ---- linux-2.6.31.4/drivers/pci/proc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pci/proc.c 2009-10-11 15:29:44.679387313 -0400 +diff -urNp linux-2.6.31.5/drivers/pci/proc.c linux-2.6.31.5/drivers/pci/proc.c +--- linux-2.6.31.5/drivers/pci/proc.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pci/proc.c 2009-10-20 20:32:11.158529077 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -21325,9 +22221,21 @@ diff -urNp linux-2.6.31.4/drivers/pci/proc.c linux-2.6.31.4/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.31.4/drivers/pcmcia/ti113x.h linux-2.6.31.4/drivers/pcmcia/ti113x.h ---- linux-2.6.31.4/drivers/pcmcia/ti113x.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pcmcia/ti113x.h 2009-10-11 15:29:44.692586872 -0400 +diff -urNp linux-2.6.31.5/drivers/pci/slot.c linux-2.6.31.5/drivers/pci/slot.c +--- linux-2.6.31.5/drivers/pci/slot.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pci/slot.c 2009-10-20 20:33:11.028168621 -0400 +@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc + return attribute->store ? attribute->store(slot, buf, len) : -EIO; + } + +-static struct sysfs_ops pci_slot_sysfs_ops = { ++static const struct sysfs_ops pci_slot_sysfs_ops = { + .show = pci_slot_attr_show, + .store = pci_slot_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/pcmcia/ti113x.h linux-2.6.31.5/drivers/pcmcia/ti113x.h +--- linux-2.6.31.5/drivers/pcmcia/ti113x.h 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pcmcia/ti113x.h 2009-10-20 20:32:11.158529077 -0400 @@ -903,7 +903,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), @@ -21337,9 +22245,9 @@ diff -urNp linux-2.6.31.4/drivers/pcmcia/ti113x.h linux-2.6.31.4/drivers/pcmcia/ }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.31.4/drivers/pcmcia/yenta_socket.c linux-2.6.31.4/drivers/pcmcia/yenta_socket.c ---- linux-2.6.31.4/drivers/pcmcia/yenta_socket.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pcmcia/yenta_socket.c 2009-10-11 15:29:44.706664278 -0400 +diff -urNp linux-2.6.31.5/drivers/pcmcia/yenta_socket.c linux-2.6.31.5/drivers/pcmcia/yenta_socket.c +--- linux-2.6.31.5/drivers/pcmcia/yenta_socket.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pcmcia/yenta_socket.c 2009-10-20 20:32:11.158529077 -0400 @@ -1377,7 +1377,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -21349,9 +22257,9 @@ diff -urNp linux-2.6.31.4/drivers/pcmcia/yenta_socket.c linux-2.6.31.4/drivers/p }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.31.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.4/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.31.4/drivers/pnp/pnpbios/bioscalls.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pnp/pnpbios/bioscalls.c 2009-10-12 23:12:55.434226670 -0400 +diff -urNp linux-2.6.31.5/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.5/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.31.5/drivers/pnp/pnpbios/bioscalls.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pnp/pnpbios/bioscalls.c 2009-10-20 20:32:11.158529077 -0400 @@ -60,7 +60,7 @@ set_base(gdt[(selname) >> 3], (u32)(addr set_limit(gdt[(selname) >> 3], size); \ } while(0) @@ -21411,9 +22319,9 @@ diff -urNp linux-2.6.31.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.4/drivers + + pax_close_kernel(); } -diff -urNp linux-2.6.31.4/drivers/pnp/quirks.c linux-2.6.31.4/drivers/pnp/quirks.c ---- linux-2.6.31.4/drivers/pnp/quirks.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pnp/quirks.c 2009-10-11 15:29:44.731654476 -0400 +diff -urNp linux-2.6.31.5/drivers/pnp/quirks.c linux-2.6.31.5/drivers/pnp/quirks.c +--- linux-2.6.31.5/drivers/pnp/quirks.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pnp/quirks.c 2009-10-20 20:32:11.158529077 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -21423,9 +22331,9 @@ diff -urNp linux-2.6.31.4/drivers/pnp/quirks.c linux-2.6.31.4/drivers/pnp/quirks }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.31.4/drivers/pnp/resource.c linux-2.6.31.4/drivers/pnp/resource.c ---- linux-2.6.31.4/drivers/pnp/resource.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/pnp/resource.c 2009-10-11 15:29:44.732423827 -0400 +diff -urNp linux-2.6.31.5/drivers/pnp/resource.c linux-2.6.31.5/drivers/pnp/resource.c +--- linux-2.6.31.5/drivers/pnp/resource.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/pnp/resource.c 2009-10-20 20:32:11.158529077 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -21444,9 +22352,9 @@ diff -urNp linux-2.6.31.4/drivers/pnp/resource.c linux-2.6.31.4/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.31.4/drivers/s390/cio/qdio_debug.c linux-2.6.31.4/drivers/s390/cio/qdio_debug.c ---- linux-2.6.31.4/drivers/s390/cio/qdio_debug.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/s390/cio/qdio_debug.c 2009-10-11 15:29:44.779362855 -0400 +diff -urNp linux-2.6.31.5/drivers/s390/cio/qdio_debug.c linux-2.6.31.5/drivers/s390/cio/qdio_debug.c +--- linux-2.6.31.5/drivers/s390/cio/qdio_debug.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/s390/cio/qdio_debug.c 2009-10-20 20:32:11.158529077 -0400 @@ -144,7 +144,7 @@ static void remove_debugfs_entry(struct } } @@ -21456,9 +22364,9 @@ diff -urNp linux-2.6.31.4/drivers/s390/cio/qdio_debug.c linux-2.6.31.4/drivers/s .owner = THIS_MODULE, .open = qstat_seq_open, .read = seq_read, -diff -urNp linux-2.6.31.4/drivers/s390/cio/qdio_perf.c linux-2.6.31.4/drivers/s390/cio/qdio_perf.c ---- linux-2.6.31.4/drivers/s390/cio/qdio_perf.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/s390/cio/qdio_perf.c 2009-10-11 15:29:44.793374565 -0400 +diff -urNp linux-2.6.31.5/drivers/s390/cio/qdio_perf.c linux-2.6.31.5/drivers/s390/cio/qdio_perf.c +--- linux-2.6.31.5/drivers/s390/cio/qdio_perf.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/s390/cio/qdio_perf.c 2009-10-20 20:32:11.161709964 -0400 @@ -84,7 +84,7 @@ static int qdio_perf_seq_open(struct ino return single_open(filp, qdio_perf_proc_show, NULL); } @@ -21468,9 +22376,9 @@ diff -urNp linux-2.6.31.4/drivers/s390/cio/qdio_perf.c linux-2.6.31.4/drivers/s3 .owner = THIS_MODULE, .open = qdio_perf_seq_open, .read = seq_read, -diff -urNp linux-2.6.31.4/drivers/scsi/libfc/fc_exch.c linux-2.6.31.4/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.31.4/drivers/scsi/libfc/fc_exch.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/scsi/libfc/fc_exch.c 2009-10-11 15:29:44.802463958 -0400 +diff -urNp linux-2.6.31.5/drivers/scsi/libfc/fc_exch.c linux-2.6.31.5/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.31.5/drivers/scsi/libfc/fc_exch.c 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/scsi/libfc/fc_exch.c 2009-10-20 20:32:11.161709964 -0400 @@ -73,12 +73,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -21593,9 +22501,9 @@ diff -urNp linux-2.6.31.4/drivers/scsi/libfc/fc_exch.c linux-2.6.31.4/drivers/sc FC_EM_DBG(mp, "non-BLS response to sequence"); } fc_frame_free(fp); -diff -urNp linux-2.6.31.4/drivers/scsi/scsi_logging.h linux-2.6.31.4/drivers/scsi/scsi_logging.h ---- linux-2.6.31.4/drivers/scsi/scsi_logging.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/scsi/scsi_logging.h 2009-10-11 15:29:44.834685764 -0400 +diff -urNp linux-2.6.31.5/drivers/scsi/scsi_logging.h linux-2.6.31.5/drivers/scsi/scsi_logging.h +--- linux-2.6.31.5/drivers/scsi/scsi_logging.h 2009-10-20 20:42:59.107082683 -0400 ++++ linux-2.6.31.5/drivers/scsi/scsi_logging.h 2009-10-20 20:32:11.161709964 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -21605,9 +22513,9 @@ diff -urNp linux-2.6.31.4/drivers/scsi/scsi_logging.h linux-2.6.31.4/drivers/scs #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.31.4/drivers/scsi/sg.c linux-2.6.31.4/drivers/scsi/sg.c ---- linux-2.6.31.4/drivers/scsi/sg.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/scsi/sg.c 2009-10-11 15:29:44.847362696 -0400 +diff -urNp linux-2.6.31.5/drivers/scsi/sg.c linux-2.6.31.5/drivers/scsi/sg.c +--- linux-2.6.31.5/drivers/scsi/sg.c 2009-10-23 19:50:17.347400575 -0400 ++++ linux-2.6.31.5/drivers/scsi/sg.c 2009-10-23 19:50:29.809407597 -0400 @@ -1185,7 +1185,7 @@ sg_vma_fault(struct vm_area_struct *vma, return VM_FAULT_SIGBUS; } @@ -21745,9 +22653,9 @@ diff -urNp linux-2.6.31.4/drivers/scsi/sg.c linux-2.6.31.4/drivers/scsi/sg.c proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops); } return 0; -diff -urNp linux-2.6.31.4/drivers/serial/8250_pci.c linux-2.6.31.4/drivers/serial/8250_pci.c ---- linux-2.6.31.4/drivers/serial/8250_pci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/serial/8250_pci.c 2009-10-11 15:29:44.853791605 -0400 +diff -urNp linux-2.6.31.5/drivers/serial/8250_pci.c linux-2.6.31.5/drivers/serial/8250_pci.c +--- linux-2.6.31.5/drivers/serial/8250_pci.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/serial/8250_pci.c 2009-10-20 20:32:11.161709964 -0400 @@ -3580,7 +3580,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, @@ -21757,9 +22665,9 @@ diff -urNp linux-2.6.31.4/drivers/serial/8250_pci.c linux-2.6.31.4/drivers/seria }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.31.4/drivers/serial/kgdboc.c linux-2.6.31.4/drivers/serial/kgdboc.c ---- linux-2.6.31.4/drivers/serial/kgdboc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/serial/kgdboc.c 2009-10-11 15:29:56.663363593 -0400 +diff -urNp linux-2.6.31.5/drivers/serial/kgdboc.c linux-2.6.31.5/drivers/serial/kgdboc.c +--- linux-2.6.31.5/drivers/serial/kgdboc.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/serial/kgdboc.c 2009-10-20 20:32:11.161709964 -0400 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -21778,9 +22686,9 @@ diff -urNp linux-2.6.31.4/drivers/serial/kgdboc.c linux-2.6.31.4/drivers/serial/ .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.31.4/drivers/spi/spidev.c linux-2.6.31.4/drivers/spi/spidev.c ---- linux-2.6.31.4/drivers/spi/spidev.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/spi/spidev.c 2009-10-11 15:29:44.868369274 -0400 +diff -urNp linux-2.6.31.5/drivers/spi/spidev.c linux-2.6.31.5/drivers/spi/spidev.c +--- linux-2.6.31.5/drivers/spi/spidev.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/spi/spidev.c 2009-10-20 20:32:11.161709964 -0400 @@ -537,7 +537,7 @@ static int spidev_release(struct inode * return status; } @@ -21790,9 +22698,9 @@ diff -urNp linux-2.6.31.4/drivers/spi/spidev.c linux-2.6.31.4/drivers/spi/spidev .owner = THIS_MODULE, /* REVISIT switch to aio primitives, so that userspace * gets more complete API coverage. It'll simplify things -diff -urNp linux-2.6.31.4/drivers/staging/android/binder.c linux-2.6.31.4/drivers/staging/android/binder.c ---- linux-2.6.31.4/drivers/staging/android/binder.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/android/binder.c 2009-10-11 15:29:44.887447321 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/android/binder.c linux-2.6.31.5/drivers/staging/android/binder.c +--- linux-2.6.31.5/drivers/staging/android/binder.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/staging/android/binder.c 2009-10-20 20:32:11.164959475 -0400 @@ -2717,7 +2717,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -21802,9 +22710,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/android/binder.c linux-2.6.31.4/driver .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.31.4/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.4/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.31.4/drivers/staging/b3dfg/b3dfg.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/b3dfg/b3dfg.c 2009-10-11 15:29:44.902687498 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.5/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.31.5/drivers/staging/b3dfg/b3dfg.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/staging/b3dfg/b3dfg.c 2009-10-20 20:32:11.164959475 -0400 @@ -454,7 +454,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -21823,9 +22731,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.4/drivers/s .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.31.4/drivers/staging/comedi/comedi_fops.c linux-2.6.31.4/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.31.4/drivers/staging/comedi/comedi_fops.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/comedi/comedi_fops.c 2009-10-11 15:29:44.918372391 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/comedi/comedi_fops.c linux-2.6.31.5/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.31.5/drivers/staging/comedi/comedi_fops.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/staging/comedi/comedi_fops.c 2009-10-20 20:32:11.164959475 -0400 @@ -1370,7 +1370,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -21835,9 +22743,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/comedi/comedi_fops.c linux-2.6.31.4/dr .close = comedi_unmap, }; -diff -urNp linux-2.6.31.4/drivers/staging/cpc-usb/cpc-usb_drv.c linux-2.6.31.4/drivers/staging/cpc-usb/cpc-usb_drv.c ---- linux-2.6.31.4/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-10-11 15:29:44.926382787 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/cpc-usb/cpc-usb_drv.c linux-2.6.31.5/drivers/staging/cpc-usb/cpc-usb_drv.c +--- linux-2.6.31.5/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-10-20 20:32:11.164959475 -0400 @@ -104,7 +104,7 @@ static void cpcusb_read_interrupt_callba static int cpcusb_setup_intrep(CPC_USB_T *card); @@ -21847,9 +22755,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/cpc-usb/cpc-usb_drv.c linux-2.6.31.4/d /* * The owner field is part of the module-locking * mechanism. The idea is that the kernel knows -diff -urNp linux-2.6.31.4/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.31.4/drivers/staging/epl/EplApiLinuxKernel.c ---- linux-2.6.31.4/drivers/staging/epl/EplApiLinuxKernel.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/epl/EplApiLinuxKernel.c 2009-10-11 15:29:44.932396952 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.31.5/drivers/staging/epl/EplApiLinuxKernel.c +--- linux-2.6.31.5/drivers/staging/epl/EplApiLinuxKernel.c 2009-10-20 20:42:59.110257638 -0400 ++++ linux-2.6.31.5/drivers/staging/epl/EplApiLinuxKernel.c 2009-10-20 20:32:11.164959475 -0400 @@ -203,7 +203,7 @@ static int EplLinIoctl(struct inode *pDe module_init(EplLinInit); module_exit(EplLinExit); @@ -21859,9 +22767,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.31.4 .owner = THIS_MODULE, .open = EplLinOpen, .release = EplLinRelease, -diff -urNp linux-2.6.31.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.31.4/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.31.4/drivers/staging/go7007/go7007-v4l2.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/go7007/go7007-v4l2.c 2009-10-11 15:29:44.936423433 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/go7007/go7007-v4l2.c linux-2.6.31.5/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.31.5/drivers/staging/go7007/go7007-v4l2.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/staging/go7007/go7007-v4l2.c 2009-10-20 20:32:11.164959475 -0400 @@ -1717,7 +1717,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -21871,9 +22779,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.31.4/dr .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.31.4/drivers/staging/panel/panel.c linux-2.6.31.4/drivers/staging/panel/panel.c ---- linux-2.6.31.4/drivers/staging/panel/panel.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/panel/panel.c 2009-10-11 15:29:44.938697042 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/panel/panel.c linux-2.6.31.5/drivers/staging/panel/panel.c +--- linux-2.6.31.5/drivers/staging/panel/panel.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/staging/panel/panel.c 2009-10-20 20:32:11.164959475 -0400 @@ -1263,7 +1263,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -21892,9 +22800,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/panel/panel.c linux-2.6.31.4/drivers/s .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.31.4/drivers/staging/poch/poch.c linux-2.6.31.4/drivers/staging/poch/poch.c ---- linux-2.6.31.4/drivers/staging/poch/poch.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/poch/poch.c 2009-10-11 15:29:44.945395463 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/poch/poch.c linux-2.6.31.5/drivers/staging/poch/poch.c +--- linux-2.6.31.5/drivers/staging/poch/poch.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/staging/poch/poch.c 2009-10-20 20:32:11.164959475 -0400 @@ -1056,7 +1056,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -21904,9 +22812,9 @@ diff -urNp linux-2.6.31.4/drivers/staging/poch/poch.c linux-2.6.31.4/drivers/sta .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.31.4/drivers/staging/rtl8192su/ieee80211/proc.c linux-2.6.31.4/drivers/staging/rtl8192su/ieee80211/proc.c ---- linux-2.6.31.4/drivers/staging/rtl8192su/ieee80211/proc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/staging/rtl8192su/ieee80211/proc.c 2009-10-11 15:29:44.949388458 -0400 +diff -urNp linux-2.6.31.5/drivers/staging/rtl8192su/ieee80211/proc.c linux-2.6.31.5/drivers/staging/rtl8192su/ieee80211/proc.c +--- linux-2.6.31.5/drivers/staging/rtl8192su/ieee80211/proc.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/staging/rtl8192su/ieee80211/proc.c 2009-10-20 20:32:11.164959475 -0400 @@ -87,7 +87,7 @@ static int c_show(struct seq_file *m, vo return 0; } @@ -21925,9 +22833,27 @@ diff -urNp linux-2.6.31.4/drivers/staging/rtl8192su/ieee80211/proc.c linux-2.6.3 .open = crypto_info_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.31.4/drivers/uio/uio.c linux-2.6.31.4/drivers/uio/uio.c ---- linux-2.6.31.4/drivers/uio/uio.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/uio/uio.c 2009-10-11 15:29:44.963503921 -0400 +diff -urNp linux-2.6.31.5/drivers/uio/uio.c linux-2.6.31.5/drivers/uio/uio.c +--- linux-2.6.31.5/drivers/uio/uio.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/uio/uio.c 2009-10-20 20:33:11.006222932 -0400 +@@ -128,7 +128,7 @@ static ssize_t map_type_show(struct kobj + return entry->show(mem, buf); + } + +-static struct sysfs_ops map_sysfs_ops = { ++static const struct sysfs_ops map_sysfs_ops = { + .show = map_type_show, + }; + +@@ -216,7 +216,7 @@ static ssize_t portio_type_show(struct k + return entry->show(port, buf); + } + +-static struct sysfs_ops portio_sysfs_ops = { ++static const struct sysfs_ops portio_sysfs_ops = { + .show = portio_type_show, + }; + @@ -658,7 +658,7 @@ static int uio_vma_fault(struct vm_area_ return 0; } @@ -21937,9 +22863,9 @@ diff -urNp linux-2.6.31.4/drivers/uio/uio.c linux-2.6.31.4/drivers/uio/uio.c .open = uio_vma_open, .close = uio_vma_close, .fault = uio_vma_fault, -diff -urNp linux-2.6.31.4/drivers/usb/atm/usbatm.c linux-2.6.31.4/drivers/usb/atm/usbatm.c ---- linux-2.6.31.4/drivers/usb/atm/usbatm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/atm/usbatm.c 2009-10-11 15:29:44.970413386 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/atm/usbatm.c linux-2.6.31.5/drivers/usb/atm/usbatm.c +--- linux-2.6.31.5/drivers/usb/atm/usbatm.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/usb/atm/usbatm.c 2009-10-20 20:32:11.168331951 -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", @@ -22019,9 +22945,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/atm/usbatm.c linux-2.6.31.4/drivers/usb/at if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.31.4/drivers/usb/class/cdc-acm.c linux-2.6.31.4/drivers/usb/class/cdc-acm.c ---- linux-2.6.31.4/drivers/usb/class/cdc-acm.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/class/cdc-acm.c 2009-10-11 15:29:44.979712371 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/class/cdc-acm.c linux-2.6.31.5/drivers/usb/class/cdc-acm.c +--- linux-2.6.31.5/drivers/usb/class/cdc-acm.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/usb/class/cdc-acm.c 2009-10-20 20:32:11.168331951 -0400 @@ -1528,7 +1528,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, @@ -22031,9 +22957,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/class/cdc-acm.c linux-2.6.31.4/drivers/usb }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.31.4/drivers/usb/class/usblp.c linux-2.6.31.4/drivers/usb/class/usblp.c ---- linux-2.6.31.4/drivers/usb/class/usblp.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/class/usblp.c 2009-10-11 15:29:44.980654948 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/class/usblp.c linux-2.6.31.5/drivers/usb/class/usblp.c +--- linux-2.6.31.5/drivers/usb/class/usblp.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/usb/class/usblp.c 2009-10-20 20:32:11.168331951 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -22052,9 +22978,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/class/usblp.c linux-2.6.31.4/drivers/usb/c }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.31.4/drivers/usb/class/usbtmc.c linux-2.6.31.4/drivers/usb/class/usbtmc.c ---- linux-2.6.31.4/drivers/usb/class/usbtmc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/class/usbtmc.c 2009-10-11 15:29:44.981454623 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/class/usbtmc.c linux-2.6.31.5/drivers/usb/class/usbtmc.c +--- linux-2.6.31.5/drivers/usb/class/usbtmc.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/usb/class/usbtmc.c 2009-10-20 20:32:11.168331951 -0400 @@ -970,7 +970,7 @@ static long usbtmc_ioctl(struct file *fi return retval; } @@ -22064,9 +22990,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/class/usbtmc.c linux-2.6.31.4/drivers/usb/ .owner = THIS_MODULE, .read = usbtmc_read, .write = usbtmc_write, -diff -urNp linux-2.6.31.4/drivers/usb/core/hcd.c linux-2.6.31.4/drivers/usb/core/hcd.c ---- linux-2.6.31.4/drivers/usb/core/hcd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/core/hcd.c 2009-10-11 15:29:56.673684935 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/core/hcd.c linux-2.6.31.5/drivers/usb/core/hcd.c +--- linux-2.6.31.5/drivers/usb/core/hcd.c 2009-10-20 20:42:59.116979261 -0400 ++++ linux-2.6.31.5/drivers/usb/core/hcd.c 2009-10-20 20:32:11.168331951 -0400 @@ -2199,7 +2199,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -22085,9 +23011,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/core/hcd.c linux-2.6.31.4/drivers/usb/core { if (mon_ops) -diff -urNp linux-2.6.31.4/drivers/usb/core/hcd.h linux-2.6.31.4/drivers/usb/core/hcd.h ---- linux-2.6.31.4/drivers/usb/core/hcd.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/core/hcd.h 2009-10-11 15:29:56.689386276 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/core/hcd.h linux-2.6.31.5/drivers/usb/core/hcd.h +--- linux-2.6.31.5/drivers/usb/core/hcd.h 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/core/hcd.h 2009-10-20 20:32:11.168331951 -0400 @@ -487,7 +487,7 @@ struct usb_mon_operations { /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ }; @@ -22106,9 +23032,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/core/hcd.h linux-2.6.31.4/drivers/usb/core void usb_mon_deregister(void); #else -diff -urNp linux-2.6.31.4/drivers/usb/core/hub.c linux-2.6.31.4/drivers/usb/core/hub.c ---- linux-2.6.31.4/drivers/usb/core/hub.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/core/hub.c 2009-10-11 15:29:44.995739688 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/core/hub.c linux-2.6.31.5/drivers/usb/core/hub.c +--- linux-2.6.31.5/drivers/usb/core/hub.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/core/hub.c 2009-10-20 20:32:11.168331951 -0400 @@ -3284,7 +3284,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, @@ -22118,9 +23044,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/core/hub.c linux-2.6.31.4/drivers/usb/core }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.31.4/drivers/usb/core/inode.c linux-2.6.31.4/drivers/usb/core/inode.c ---- linux-2.6.31.4/drivers/usb/core/inode.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/core/inode.c 2009-10-11 15:29:45.002655566 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/core/inode.c linux-2.6.31.5/drivers/usb/core/inode.c +--- linux-2.6.31.5/drivers/usb/core/inode.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/core/inode.c 2009-10-20 20:32:11.168331951 -0400 @@ -48,7 +48,7 @@ #define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO) #define USBFS_DEFAULT_LISTMODE S_IRUGO @@ -22139,9 +23065,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/core/inode.c linux-2.6.31.4/drivers/usb/co .statfs = simple_statfs, .drop_inode = generic_delete_inode, .remount_fs = remount, -diff -urNp linux-2.6.31.4/drivers/usb/core/message.c linux-2.6.31.4/drivers/usb/core/message.c ---- linux-2.6.31.4/drivers/usb/core/message.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/core/message.c 2009-10-11 15:29:45.010363758 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/core/message.c linux-2.6.31.5/drivers/usb/core/message.c +--- linux-2.6.31.5/drivers/usb/core/message.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/core/message.c 2009-10-20 20:32:11.168331951 -0400 @@ -926,8 +926,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_KERNEL); if (buf) { @@ -22153,9 +23079,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/core/message.c linux-2.6.31.4/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.31.4/drivers/usb/gadget/inode.c linux-2.6.31.4/drivers/usb/gadget/inode.c ---- linux-2.6.31.4/drivers/usb/gadget/inode.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/gadget/inode.c 2009-10-11 15:29:45.016380486 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/gadget/inode.c linux-2.6.31.5/drivers/usb/gadget/inode.c +--- linux-2.6.31.5/drivers/usb/gadget/inode.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/gadget/inode.c 2009-10-20 20:32:11.168331951 -0400 @@ -2033,7 +2033,7 @@ gadgetfs_create_file (struct super_block return inode; } @@ -22165,9 +23091,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/gadget/inode.c linux-2.6.31.4/drivers/usb/ .statfs = simple_statfs, .drop_inode = generic_delete_inode, }; -diff -urNp linux-2.6.31.4/drivers/usb/gadget/printer.c linux-2.6.31.4/drivers/usb/gadget/printer.c ---- linux-2.6.31.4/drivers/usb/gadget/printer.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/gadget/printer.c 2009-10-11 15:29:45.025526302 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/gadget/printer.c linux-2.6.31.5/drivers/usb/gadget/printer.c +--- linux-2.6.31.5/drivers/usb/gadget/printer.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/gadget/printer.c 2009-10-20 20:32:11.171686508 -0400 @@ -875,7 +875,7 @@ printer_ioctl(struct file *fd, unsigned } @@ -22177,9 +23103,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/gadget/printer.c linux-2.6.31.4/drivers/us .owner = THIS_MODULE, .open = printer_open, .read = printer_read, -diff -urNp linux-2.6.31.4/drivers/usb/host/ehci-pci.c linux-2.6.31.4/drivers/usb/host/ehci-pci.c ---- linux-2.6.31.4/drivers/usb/host/ehci-pci.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/host/ehci-pci.c 2009-10-11 15:29:45.029362905 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/host/ehci-pci.c linux-2.6.31.5/drivers/usb/host/ehci-pci.c +--- linux-2.6.31.5/drivers/usb/host/ehci-pci.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/host/ehci-pci.c 2009-10-20 20:32:11.171686508 -0400 @@ -416,7 +416,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, @@ -22189,9 +23115,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/host/ehci-pci.c linux-2.6.31.4/drivers/usb }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.31.4/drivers/usb/host/uhci-hcd.c linux-2.6.31.4/drivers/usb/host/uhci-hcd.c ---- linux-2.6.31.4/drivers/usb/host/uhci-hcd.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/host/uhci-hcd.c 2009-10-11 15:29:45.037812496 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/host/uhci-hcd.c linux-2.6.31.5/drivers/usb/host/uhci-hcd.c +--- linux-2.6.31.5/drivers/usb/host/uhci-hcd.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/host/uhci-hcd.c 2009-10-20 20:32:11.171686508 -0400 @@ -927,7 +927,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -22201,9 +23127,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/host/uhci-hcd.c linux-2.6.31.4/drivers/usb }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.31.4/drivers/usb/host/whci/debug.c linux-2.6.31.4/drivers/usb/host/whci/debug.c ---- linux-2.6.31.4/drivers/usb/host/whci/debug.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/host/whci/debug.c 2009-10-11 15:29:45.040742060 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/host/whci/debug.c linux-2.6.31.5/drivers/usb/host/whci/debug.c +--- linux-2.6.31.5/drivers/usb/host/whci/debug.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/host/whci/debug.c 2009-10-20 20:32:11.171686508 -0400 @@ -134,7 +134,7 @@ static int pzl_open(struct inode *inode, return single_open(file, pzl_print, inode->i_private); } @@ -22231,9 +23157,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/host/whci/debug.c linux-2.6.31.4/drivers/u .open = pzl_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.31.4/drivers/usb/mon/mon_bin.c linux-2.6.31.4/drivers/usb/mon/mon_bin.c ---- linux-2.6.31.4/drivers/usb/mon/mon_bin.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/mon/mon_bin.c 2009-10-11 15:29:45.304368643 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/mon/mon_bin.c linux-2.6.31.5/drivers/usb/mon/mon_bin.c +--- linux-2.6.31.5/drivers/usb/mon/mon_bin.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/mon/mon_bin.c 2009-10-20 20:32:11.171686508 -0400 @@ -1184,7 +1184,7 @@ static int mon_bin_vma_fault(struct vm_a return 0; } @@ -22243,9 +23169,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/mon/mon_bin.c linux-2.6.31.4/drivers/usb/m .open = mon_bin_vma_open, .close = mon_bin_vma_close, .fault = mon_bin_vma_fault, -diff -urNp linux-2.6.31.4/drivers/usb/mon/mon_main.c linux-2.6.31.4/drivers/usb/mon/mon_main.c ---- linux-2.6.31.4/drivers/usb/mon/mon_main.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/mon/mon_main.c 2009-10-11 15:29:56.693810138 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/mon/mon_main.c linux-2.6.31.5/drivers/usb/mon/mon_main.c +--- linux-2.6.31.5/drivers/usb/mon/mon_main.c 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/mon/mon_main.c 2009-10-20 20:32:11.171686508 -0400 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -22255,9 +23181,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/mon/mon_main.c linux-2.6.31.4/drivers/usb/ .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.31.4/drivers/usb/storage/debug.h linux-2.6.31.4/drivers/usb/storage/debug.h ---- linux-2.6.31.4/drivers/usb/storage/debug.h 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/storage/debug.h 2009-10-11 15:29:45.306363940 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/storage/debug.h linux-2.6.31.5/drivers/usb/storage/debug.h +--- linux-2.6.31.5/drivers/usb/storage/debug.h 2009-10-20 20:42:59.120404852 -0400 ++++ linux-2.6.31.5/drivers/usb/storage/debug.h 2009-10-20 20:32:11.171686508 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -22271,9 +23197,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/storage/debug.h linux-2.6.31.4/drivers/usb #endif #endif -diff -urNp linux-2.6.31.4/drivers/usb/storage/usb.c linux-2.6.31.4/drivers/usb/storage/usb.c ---- linux-2.6.31.4/drivers/usb/storage/usb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/storage/usb.c 2009-10-11 15:29:45.317510534 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/storage/usb.c linux-2.6.31.5/drivers/usb/storage/usb.c +--- linux-2.6.31.5/drivers/usb/storage/usb.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/usb/storage/usb.c 2009-10-20 20:32:11.171686508 -0400 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -22283,9 +23209,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/storage/usb.c linux-2.6.31.4/drivers/usb/s }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.31.4/drivers/usb/storage/usual-tables.c linux-2.6.31.4/drivers/usb/storage/usual-tables.c ---- linux-2.6.31.4/drivers/usb/storage/usual-tables.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/usb/storage/usual-tables.c 2009-10-11 15:29:45.318365840 -0400 +diff -urNp linux-2.6.31.5/drivers/usb/storage/usual-tables.c linux-2.6.31.5/drivers/usb/storage/usual-tables.c +--- linux-2.6.31.5/drivers/usb/storage/usual-tables.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/usb/storage/usual-tables.c 2009-10-20 20:32:11.171686508 -0400 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -22295,9 +23221,9 @@ diff -urNp linux-2.6.31.4/drivers/usb/storage/usual-tables.c linux-2.6.31.4/driv }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.31.4/drivers/uwb/uwb-debug.c linux-2.6.31.4/drivers/uwb/uwb-debug.c ---- linux-2.6.31.4/drivers/uwb/uwb-debug.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/uwb/uwb-debug.c 2009-10-11 15:29:45.387368066 -0400 +diff -urNp linux-2.6.31.5/drivers/uwb/uwb-debug.c linux-2.6.31.5/drivers/uwb/uwb-debug.c +--- linux-2.6.31.5/drivers/uwb/uwb-debug.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/uwb/uwb-debug.c 2009-10-20 20:32:11.171686508 -0400 @@ -205,7 +205,7 @@ static ssize_t command_write(struct file return ret < 0 ? ret : len; } @@ -22325,9 +23251,9 @@ diff -urNp linux-2.6.31.4/drivers/uwb/uwb-debug.c linux-2.6.31.4/drivers/uwb/uwb .open = drp_avail_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.31.4/drivers/uwb/wlp/messages.c linux-2.6.31.4/drivers/uwb/wlp/messages.c ---- linux-2.6.31.4/drivers/uwb/wlp/messages.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/uwb/wlp/messages.c 2009-10-11 15:29:45.414457006 -0400 +diff -urNp linux-2.6.31.5/drivers/uwb/wlp/messages.c linux-2.6.31.5/drivers/uwb/wlp/messages.c +--- linux-2.6.31.5/drivers/uwb/wlp/messages.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/uwb/wlp/messages.c 2009-10-20 20:32:11.171686508 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -22337,9 +23263,32 @@ diff -urNp linux-2.6.31.4/drivers/uwb/wlp/messages.c linux-2.6.31.4/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.31.4/drivers/video/fb_defio.c linux-2.6.31.4/drivers/video/fb_defio.c ---- linux-2.6.31.4/drivers/video/fb_defio.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/fb_defio.c 2009-10-11 15:29:45.427377745 -0400 +diff -urNp linux-2.6.31.5/drivers/uwb/wlp/sysfs.c linux-2.6.31.5/drivers/uwb/wlp/sysfs.c +--- linux-2.6.31.5/drivers/uwb/wlp/sysfs.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/uwb/wlp/sysfs.c 2009-10-20 20:33:11.028168621 -0400 +@@ -602,8 +602,7 @@ ssize_t wlp_wss_attr_show(struct kobject + * Sysfs operation for forwarding write call to the store method of the + * attribute owner + */ +-static +-ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr, ++static ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr, + const char *buf, size_t count) + { + struct wlp_wss_attribute *wss_attr = attr_to_wlp_wss_attr(attr); +@@ -615,8 +614,7 @@ ssize_t wlp_wss_attr_store(struct kobjec + return ret; + } + +-static +-struct sysfs_ops wss_sysfs_ops = { ++static const struct sysfs_ops wss_sysfs_ops = { + .show = wlp_wss_attr_show, + .store = wlp_wss_attr_store, + }; +diff -urNp linux-2.6.31.5/drivers/video/fb_defio.c linux-2.6.31.5/drivers/video/fb_defio.c +--- linux-2.6.31.5/drivers/video/fb_defio.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/fb_defio.c 2009-10-20 20:32:11.171686508 -0400 @@ -125,7 +125,7 @@ page_already_added: return 0; } @@ -22349,9 +23298,9 @@ diff -urNp linux-2.6.31.4/drivers/video/fb_defio.c linux-2.6.31.4/drivers/video/ .fault = fb_deferred_io_fault, .page_mkwrite = fb_deferred_io_mkwrite, }; -diff -urNp linux-2.6.31.4/drivers/video/fbmem.c linux-2.6.31.4/drivers/video/fbmem.c ---- linux-2.6.31.4/drivers/video/fbmem.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/fbmem.c 2009-10-11 15:29:45.441375226 -0400 +diff -urNp linux-2.6.31.5/drivers/video/fbmem.c linux-2.6.31.5/drivers/video/fbmem.c +--- linux-2.6.31.5/drivers/video/fbmem.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/fbmem.c 2009-10-20 20:32:11.175385966 -0400 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -22379,9 +23328,9 @@ diff -urNp linux-2.6.31.4/drivers/video/fbmem.c linux-2.6.31.4/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.31.4/drivers/video/fbmon.c linux-2.6.31.4/drivers/video/fbmon.c ---- linux-2.6.31.4/drivers/video/fbmon.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/fbmon.c 2009-10-11 15:29:45.445414957 -0400 +diff -urNp linux-2.6.31.5/drivers/video/fbmon.c linux-2.6.31.5/drivers/video/fbmon.c +--- linux-2.6.31.5/drivers/video/fbmon.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/fbmon.c 2009-10-20 20:32:11.175385966 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -22391,9 +23340,9 @@ diff -urNp linux-2.6.31.4/drivers/video/fbmon.c linux-2.6.31.4/drivers/video/fbm #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.31.4/drivers/video/i810/i810_accel.c linux-2.6.31.4/drivers/video/i810/i810_accel.c ---- linux-2.6.31.4/drivers/video/i810/i810_accel.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/i810/i810_accel.c 2009-10-11 15:29:45.451361963 -0400 +diff -urNp linux-2.6.31.5/drivers/video/i810/i810_accel.c linux-2.6.31.5/drivers/video/i810/i810_accel.c +--- linux-2.6.31.5/drivers/video/i810/i810_accel.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/i810/i810_accel.c 2009-10-20 20:32:11.175385966 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -22402,9 +23351,9 @@ diff -urNp linux-2.6.31.4/drivers/video/i810/i810_accel.c linux-2.6.31.4/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.31.4/drivers/video/i810/i810_main.c linux-2.6.31.4/drivers/video/i810/i810_main.c ---- linux-2.6.31.4/drivers/video/i810/i810_main.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/i810/i810_main.c 2009-10-11 15:29:45.453358345 -0400 +diff -urNp linux-2.6.31.5/drivers/video/i810/i810_main.c linux-2.6.31.5/drivers/video/i810/i810_main.c +--- linux-2.6.31.5/drivers/video/i810/i810_main.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/i810/i810_main.c 2009-10-20 20:32:11.175385966 -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, @@ -22414,9 +23363,9 @@ diff -urNp linux-2.6.31.4/drivers/video/i810/i810_main.c linux-2.6.31.4/drivers/ }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.31.4/drivers/video/modedb.c linux-2.6.31.4/drivers/video/modedb.c ---- linux-2.6.31.4/drivers/video/modedb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/modedb.c 2009-10-11 15:29:45.464567681 -0400 +diff -urNp linux-2.6.31.5/drivers/video/modedb.c linux-2.6.31.5/drivers/video/modedb.c +--- linux-2.6.31.5/drivers/video/modedb.c 2009-10-20 20:42:59.123836343 -0400 ++++ linux-2.6.31.5/drivers/video/modedb.c 2009-10-20 20:32:11.175385966 -0400 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -22717,9 +23666,9 @@ diff -urNp linux-2.6.31.4/drivers/video/modedb.c linux-2.6.31.4/drivers/video/mo }, }; -diff -urNp linux-2.6.31.4/drivers/video/omap/dispc.c linux-2.6.31.4/drivers/video/omap/dispc.c ---- linux-2.6.31.4/drivers/video/omap/dispc.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/omap/dispc.c 2009-10-11 15:29:45.486541086 -0400 +diff -urNp linux-2.6.31.5/drivers/video/omap/dispc.c linux-2.6.31.5/drivers/video/omap/dispc.c +--- linux-2.6.31.5/drivers/video/omap/dispc.c 2009-10-20 20:42:59.127236789 -0400 ++++ linux-2.6.31.5/drivers/video/omap/dispc.c 2009-10-20 20:32:11.175385966 -0400 @@ -1013,7 +1013,7 @@ static void mmap_user_close(struct vm_ar atomic_dec(&dispc.map_count[plane]); } @@ -22729,9 +23678,9 @@ diff -urNp linux-2.6.31.4/drivers/video/omap/dispc.c linux-2.6.31.4/drivers/vide .open = mmap_user_open, .close = mmap_user_close, }; -diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/uvesafb.c ---- linux-2.6.31.4/drivers/video/uvesafb.c 2009-10-05 13:12:06.000000000 -0400 -+++ linux-2.6.31.4/drivers/video/uvesafb.c 2009-10-12 23:12:55.481147603 -0400 +diff -urNp linux-2.6.31.5/drivers/video/uvesafb.c linux-2.6.31.5/drivers/video/uvesafb.c +--- linux-2.6.31.5/drivers/video/uvesafb.c 2009-10-23 19:50:17.558400629 -0400 ++++ linux-2.6.31.5/drivers/video/uvesafb.c 2009-10-23 19:50:30.025485679 -0400 @@ -18,6 +18,7 @@ #include #include @@ -22740,7 +23689,7 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u #include