aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-10-29 17:30:53 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-10-29 17:32:07 +0000
commit49b4c1dfaf90f1435fe46e47ded7ca768d0be291 (patch)
tree22df09cf43f9865fe5e67e63c54021df917c6dfe
parent8c4ba598f3f964a8727f3f68ff3d3463d505d579 (diff)
downloadaports-49b4c1dfaf90f1435fe46e47ded7ca768d0be291.tar.bz2
aports-49b4c1dfaf90f1435fe46e47ded7ca768d0be291.tar.xz
*-grsec: upgrade kernel to 2.6.31.5
and use package() function
Diffstat
-rw-r--r--main/dahdi-linux-grsec/APKBUILD9
-rw-r--r--main/iscsitarget-grsec/APKBUILD10
-rw-r--r--main/linux-grsec/APKBUILD22
-rw-r--r--main/linux-grsec/grsecurity-2.1.14-2.6.31.5-200910232000.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.31.4-200910181015.patch)7770
-rw-r--r--main/linux-grsec/kernelconfig.x8610
-rw-r--r--main/xtables-addons-grsec/APKBUILD26
-rw-r--r--testing/kqemu-grsec/APKBUILD15
7 files changed, 4988 insertions, 2874 deletions
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
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(&current->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 <asm/processor.h>
#include <linux/module.h>
#include <linux/elfcore.h>
-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 <asm/processor.h>
/*
-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 <asm/ptrace.h>
#include <asm/highmem.h> /* 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(&current->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 <linux/sched.h>
#include <linux/interrupt.h>
@@ -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 <asm-generic/getorder.h>
-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 <asm/firmware.h>
#include <asm/vdso.h>
@@ -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 <linux/module.h>
#include <asm/uaccess.h>
@@ -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 <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -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 <linux/interrupt.h>
#include <linux/module.h>
@@ -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 <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -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 <endian.h>
@@ -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 <asm/pgtable_types.h>
@@ -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 <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -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 <asm/processor.h>
#include <asm/system.h>
@@ -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 <linux/vmalloc.h>
@@ -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 <asm-generic/iomap.h>
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 <linux/lockdep.h>
#include <asm/page.h>
@@ -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 <linux/thread_info.h>
#include <linux/prefetch.h>
@@ -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 <linux/cpumask.h>
#include <asm/segment.h>
@@ -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 <asm/e820.h>
#include <asm/bios_ebda.h>
@@ -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 <asm/setup.h>
#include <asm/processor-flags.h>
@@ -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 <linux/sched.h>
#include <linux/kernel.h>
@@ -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 <asm/system.h>
#include <asm/cacheflush.h>
@@ -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 &microcode_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 &microcode_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 <asm/syscalls.h>
@@ -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 <asm/time.h>
#include <asm/timer.h>
@@ -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 <asm/segment.h>
#include <asm/page_types.h>
@@ -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 <asm/page_types.h>
#include <asm/cache.h>
@@ -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 <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -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 <asm/cpufeature.h>
@@ -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 <disp8> */
.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 <asm/cpufeature.h>
@@ -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 <disp8> */
.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 <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -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 <disp8> */
.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 <asm/cpufeature.h>
@@ -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 <disp8> */
.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 <asm/thread_info.h>
#include <asm/errno.h>
@@ -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 <linux/module.h>
#include <linux/spinlock.h>
@@ -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 <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* 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 <asm/uv/uv.h>
@@ -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 <asm/hpet.h>
#include <asm/unistd.h>
@@ -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 <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -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 <linux/raw.h>
#include <linux/tty.h>
@@ -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 <asm/atomic.h>
@@ -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 <kernel@zut.de> */
{ 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 <linux/fb.h>
#include <linux/io.h>
@@ -22740,7 +23689,7 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u
#include <video/edid.h>
#include <video/uvesafb.h>
#ifdef CONFIG_X86
-@@ -118,7 +119,7 @@ static int uvesafb_helper_start(void)
+@@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
NULL,
};
@@ -22749,7 +23698,7 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u
}
/*
-@@ -566,10 +567,32 @@ static int __devinit uvesafb_vbe_getpmi(
+@@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(
if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
par->pmi_setpal = par->ypan = 0;
} else {
@@ -22782,7 +23731,7 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u
printk(KERN_INFO "uvesafb: protected mode interface info at "
"%04x:%04x\n",
(u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -1825,6 +1848,11 @@ out:
+@@ -1827,6 +1850,11 @@ out:
if (par->vbe_modes)
kfree(par->vbe_modes);
@@ -22794,7 +23743,7 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u
framebuffer_release(info);
return err;
}
-@@ -1851,6 +1879,12 @@ static int uvesafb_remove(struct platfor
+@@ -1853,6 +1881,12 @@ static int uvesafb_remove(struct platfor
kfree(par->vbe_state_orig);
if (par->vbe_state_saved)
kfree(par->vbe_state_saved);
@@ -22807,9 +23756,9 @@ diff -urNp linux-2.6.31.4/drivers/video/uvesafb.c linux-2.6.31.4/drivers/video/u
}
framebuffer_release(info);
-diff -urNp linux-2.6.31.4/drivers/video/vesafb.c linux-2.6.31.4/drivers/video/vesafb.c
---- linux-2.6.31.4/drivers/video/vesafb.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/drivers/video/vesafb.c 2009-10-12 23:12:55.482123466 -0400
+diff -urNp linux-2.6.31.5/drivers/video/vesafb.c linux-2.6.31.5/drivers/video/vesafb.c
+--- linux-2.6.31.5/drivers/video/vesafb.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/drivers/video/vesafb.c 2009-10-20 20:32:11.175385966 -0400
@@ -9,6 +9,7 @@
*/
@@ -22913,9 +23862,21 @@ diff -urNp linux-2.6.31.4/drivers/video/vesafb.c linux-2.6.31.4/drivers/video/ve
if (info->screen_base)
iounmap(info->screen_base);
framebuffer_release(info);
-diff -urNp linux-2.6.31.4/fs/9p/vfs_inode.c linux-2.6.31.4/fs/9p/vfs_inode.c
---- linux-2.6.31.4/fs/9p/vfs_inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/9p/vfs_inode.c 2009-10-11 15:29:45.532356583 -0400
+diff -urNp linux-2.6.31.5/drivers/xen/sys-hypervisor.c linux-2.6.31.5/drivers/xen/sys-hypervisor.c
+--- linux-2.6.31.5/drivers/xen/sys-hypervisor.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/drivers/xen/sys-hypervisor.c 2009-10-20 20:33:11.028168621 -0400
+@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
+ return 0;
+ }
+
+-static struct sysfs_ops hyp_sysfs_ops = {
++static const struct sysfs_ops hyp_sysfs_ops = {
+ .show = hyp_sysfs_show,
+ .store = hyp_sysfs_store,
+ };
+diff -urNp linux-2.6.31.5/fs/9p/vfs_inode.c linux-2.6.31.5/fs/9p/vfs_inode.c
+--- linux-2.6.31.5/fs/9p/vfs_inode.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/9p/vfs_inode.c 2009-10-20 20:32:11.175385966 -0400
@@ -1025,7 +1025,7 @@ static void *v9fs_vfs_follow_link(struct
static void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -22925,9 +23886,9 @@ diff -urNp linux-2.6.31.4/fs/9p/vfs_inode.c linux-2.6.31.4/fs/9p/vfs_inode.c
P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-2.6.31.4/fs/afs/proc.c linux-2.6.31.4/fs/afs/proc.c
---- linux-2.6.31.4/fs/afs/proc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/afs/proc.c 2009-10-11 15:29:45.543685527 -0400
+diff -urNp linux-2.6.31.5/fs/afs/proc.c linux-2.6.31.5/fs/afs/proc.c
+--- linux-2.6.31.5/fs/afs/proc.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/afs/proc.c 2009-10-20 20:32:11.178641617 -0400
@@ -28,7 +28,7 @@ static int afs_proc_cells_show(struct se
static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
size_t size, loff_t *_pos);
@@ -22964,9 +23925,9 @@ diff -urNp linux-2.6.31.4/fs/afs/proc.c linux-2.6.31.4/fs/afs/proc.c
.start = afs_proc_cell_servers_start,
.next = afs_proc_cell_servers_next,
.stop = afs_proc_cell_servers_stop,
-diff -urNp linux-2.6.31.4/fs/aio.c linux-2.6.31.4/fs/aio.c
---- linux-2.6.31.4/fs/aio.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/aio.c 2009-10-11 15:29:45.549515544 -0400
+diff -urNp linux-2.6.31.5/fs/aio.c linux-2.6.31.5/fs/aio.c
+--- linux-2.6.31.5/fs/aio.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/aio.c 2009-10-20 20:32:11.178641617 -0400
@@ -114,7 +114,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -22976,9 +23937,9 @@ diff -urNp linux-2.6.31.4/fs/aio.c linux-2.6.31.4/fs/aio.c
return -EINVAL;
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-diff -urNp linux-2.6.31.4/fs/autofs/root.c linux-2.6.31.4/fs/autofs/root.c
---- linux-2.6.31.4/fs/autofs/root.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/autofs/root.c 2009-10-11 15:29:45.558428420 -0400
+diff -urNp linux-2.6.31.5/fs/autofs/root.c linux-2.6.31.5/fs/autofs/root.c
+--- linux-2.6.31.5/fs/autofs/root.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/autofs/root.c 2009-10-20 20:32:11.178641617 -0400
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -22989,9 +23950,9 @@ diff -urNp linux-2.6.31.4/fs/autofs/root.c linux-2.6.31.4/fs/autofs/root.c
if (!sl->data) {
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
-diff -urNp linux-2.6.31.4/fs/autofs4/symlink.c linux-2.6.31.4/fs/autofs4/symlink.c
---- linux-2.6.31.4/fs/autofs4/symlink.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/autofs4/symlink.c 2009-10-11 15:29:45.563698041 -0400
+diff -urNp linux-2.6.31.5/fs/autofs4/symlink.c linux-2.6.31.5/fs/autofs4/symlink.c
+--- linux-2.6.31.5/fs/autofs4/symlink.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/autofs4/symlink.c 2009-10-20 20:32:11.178641617 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -23001,9 +23962,9 @@ diff -urNp linux-2.6.31.4/fs/autofs4/symlink.c linux-2.6.31.4/fs/autofs4/symlink
return NULL;
}
-diff -urNp linux-2.6.31.4/fs/befs/linuxvfs.c linux-2.6.31.4/fs/befs/linuxvfs.c
---- linux-2.6.31.4/fs/befs/linuxvfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/befs/linuxvfs.c 2009-10-11 15:29:45.569537314 -0400
+diff -urNp linux-2.6.31.5/fs/befs/linuxvfs.c linux-2.6.31.5/fs/befs/linuxvfs.c
+--- linux-2.6.31.5/fs/befs/linuxvfs.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/befs/linuxvfs.c 2009-10-20 20:32:11.178641617 -0400
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -23013,9 +23974,9 @@ diff -urNp linux-2.6.31.4/fs/befs/linuxvfs.c linux-2.6.31.4/fs/befs/linuxvfs.c
if (!IS_ERR(link))
kfree(link);
}
-diff -urNp linux-2.6.31.4/fs/binfmt_aout.c linux-2.6.31.4/fs/binfmt_aout.c
---- linux-2.6.31.4/fs/binfmt_aout.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/binfmt_aout.c 2009-10-11 15:29:45.580422857 -0400
+diff -urNp linux-2.6.31.5/fs/binfmt_aout.c linux-2.6.31.5/fs/binfmt_aout.c
+--- linux-2.6.31.5/fs/binfmt_aout.c 2009-10-20 20:42:59.127236789 -0400
++++ linux-2.6.31.5/fs/binfmt_aout.c 2009-10-20 20:32:11.178641617 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -23083,9 +24044,9 @@ diff -urNp linux-2.6.31.4/fs/binfmt_aout.c linux-2.6.31.4/fs/binfmt_aout.c
MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
-diff -urNp linux-2.6.31.4/fs/binfmt_elf.c linux-2.6.31.4/fs/binfmt_elf.c
---- linux-2.6.31.4/fs/binfmt_elf.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/binfmt_elf.c 2009-10-18 10:09:07.073630739 -0400
+diff -urNp linux-2.6.31.5/fs/binfmt_elf.c linux-2.6.31.5/fs/binfmt_elf.c
+--- linux-2.6.31.5/fs/binfmt_elf.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/binfmt_elf.c 2009-10-20 20:33:11.006222932 -0400
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -23581,6 +24542,18 @@ diff -urNp linux-2.6.31.4/fs/binfmt_elf.c linux-2.6.31.4/fs/binfmt_elf.c
#define DUMP_SEEK(off) \
if (!dump_seek(file, (off))) \
goto end_coredump;
+@@ -1411,9 +1702,9 @@ static void fill_auxv_note(struct memelf
+ {
+ elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
+ int i = 0;
+- do
++ do {
+ i += 2;
+- while (auxv[i - 2] != AT_NULL);
++ } while (auxv[i - 2] != AT_NULL);
+ fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
+ }
+
@@ -1991,7 +2282,7 @@ static int elf_core_dump(long signr, str
phdr.p_offset = offset;
phdr.p_vaddr = vma->vm_start;
@@ -23705,9 +24678,9 @@ diff -urNp linux-2.6.31.4/fs/binfmt_elf.c linux-2.6.31.4/fs/binfmt_elf.c
static int __init init_elf_binfmt(void)
{
return register_binfmt(&elf_format);
-diff -urNp linux-2.6.31.4/fs/binfmt_flat.c linux-2.6.31.4/fs/binfmt_flat.c
---- linux-2.6.31.4/fs/binfmt_flat.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/binfmt_flat.c 2009-10-11 15:29:45.598364649 -0400
+diff -urNp linux-2.6.31.5/fs/binfmt_flat.c linux-2.6.31.5/fs/binfmt_flat.c
+--- linux-2.6.31.5/fs/binfmt_flat.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/binfmt_flat.c 2009-10-20 20:32:11.178641617 -0400
@@ -565,7 +565,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -23740,9 +24713,9 @@ diff -urNp linux-2.6.31.4/fs/binfmt_flat.c linux-2.6.31.4/fs/binfmt_flat.c
ret = result;
goto err;
}
-diff -urNp linux-2.6.31.4/fs/binfmt_misc.c linux-2.6.31.4/fs/binfmt_misc.c
---- linux-2.6.31.4/fs/binfmt_misc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/binfmt_misc.c 2009-10-11 15:29:45.605695875 -0400
+diff -urNp linux-2.6.31.5/fs/binfmt_misc.c linux-2.6.31.5/fs/binfmt_misc.c
+--- linux-2.6.31.5/fs/binfmt_misc.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/binfmt_misc.c 2009-10-20 20:32:11.178641617 -0400
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -23752,9 +24725,41 @@ diff -urNp linux-2.6.31.4/fs/binfmt_misc.c linux-2.6.31.4/fs/binfmt_misc.c
};
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
-diff -urNp linux-2.6.31.4/fs/btrfs/ctree.h linux-2.6.31.4/fs/btrfs/ctree.h
---- linux-2.6.31.4/fs/btrfs/ctree.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/btrfs/ctree.h 2009-10-11 15:29:45.621803084 -0400
+diff -urNp linux-2.6.31.5/fs/bio.c linux-2.6.31.5/fs/bio.c
+--- linux-2.6.31.5/fs/bio.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/bio.c 2009-10-20 20:33:11.031321564 -0400
+@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
+
+ i = 0;
+ while (i < bio_slab_nr) {
+- struct bio_slab *bslab = &bio_slabs[i];
++ bslab = &bio_slabs[i];
+
+ if (!bslab->slab && entry == -1)
+ entry = i;
+@@ -1196,7 +1196,7 @@ static void bio_copy_kern_endio(struct b
+ const int read = bio_data_dir(bio) == READ;
+ struct bio_map_data *bmd = bio->bi_private;
+ int i;
+- char *p = bmd->sgvecs[0].iov_base;
++ char *p = (__force char *)bmd->sgvecs[0].iov_base;
+
+ __bio_for_each_segment(bvec, bio, i, 0) {
+ char *addr = page_address(bvec->bv_page);
+diff -urNp linux-2.6.31.5/fs/btrfs/ctree.c linux-2.6.31.5/fs/btrfs/ctree.c
+--- linux-2.6.31.5/fs/btrfs/ctree.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/btrfs/ctree.c 2009-10-20 20:33:11.031321564 -0400
+@@ -3562,7 +3562,6 @@ setup_items_for_insert(struct btrfs_tran
+
+ ret = 0;
+ if (slot == 0) {
+- struct btrfs_disk_key disk_key;
+ btrfs_cpu_key_to_disk(&disk_key, cpu_key);
+ ret = fixup_low_keys(trans, root, path, &disk_key, 1);
+ }
+diff -urNp linux-2.6.31.5/fs/btrfs/ctree.h linux-2.6.31.5/fs/btrfs/ctree.h
+--- linux-2.6.31.5/fs/btrfs/ctree.h 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/btrfs/ctree.h 2009-10-20 20:32:11.182204101 -0400
@@ -2286,7 +2286,7 @@ int btrfs_sync_file(struct file *file, s
int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end,
int skip_pinned);
@@ -23764,9 +24769,9 @@ diff -urNp linux-2.6.31.4/fs/btrfs/ctree.h linux-2.6.31.4/fs/btrfs/ctree.h
int btrfs_drop_extents(struct btrfs_trans_handle *trans,
struct btrfs_root *root, struct inode *inode,
u64 start, u64 end, u64 locked_end,
-diff -urNp linux-2.6.31.4/fs/btrfs/disk-io.c linux-2.6.31.4/fs/btrfs/disk-io.c
---- linux-2.6.31.4/fs/btrfs/disk-io.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/btrfs/disk-io.c 2009-10-11 15:29:45.648458307 -0400
+diff -urNp linux-2.6.31.5/fs/btrfs/disk-io.c linux-2.6.31.5/fs/btrfs/disk-io.c
+--- linux-2.6.31.5/fs/btrfs/disk-io.c 2009-10-20 20:42:59.130506973 -0400
++++ linux-2.6.31.5/fs/btrfs/disk-io.c 2009-10-20 20:32:11.182204101 -0400
@@ -772,7 +772,7 @@ static void btree_invalidatepage(struct
}
}
@@ -23776,9 +24781,9 @@ diff -urNp linux-2.6.31.4/fs/btrfs/disk-io.c linux-2.6.31.4/fs/btrfs/disk-io.c
.readpage = btree_readpage,
.writepage = btree_writepage,
.writepages = btree_writepages,
-diff -urNp linux-2.6.31.4/fs/btrfs/file.c linux-2.6.31.4/fs/btrfs/file.c
---- linux-2.6.31.4/fs/btrfs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/btrfs/file.c 2009-10-11 15:29:45.664391015 -0400
+diff -urNp linux-2.6.31.5/fs/btrfs/file.c linux-2.6.31.5/fs/btrfs/file.c
+--- linux-2.6.31.5/fs/btrfs/file.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/btrfs/file.c 2009-10-20 20:32:11.182204101 -0400
@@ -1203,7 +1203,7 @@ out:
return ret > 0 ? EIO : ret;
}
@@ -23797,9 +24802,30 @@ diff -urNp linux-2.6.31.4/fs/btrfs/file.c linux-2.6.31.4/fs/btrfs/file.c
.llseek = generic_file_llseek,
.read = do_sync_read,
.aio_read = generic_file_aio_read,
-diff -urNp linux-2.6.31.4/fs/btrfs/inode.c linux-2.6.31.4/fs/btrfs/inode.c
---- linux-2.6.31.4/fs/btrfs/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/btrfs/inode.c 2009-10-11 15:29:45.690664950 -0400
+diff -urNp linux-2.6.31.5/fs/btrfs/free-space-cache.c linux-2.6.31.5/fs/btrfs/free-space-cache.c
+--- linux-2.6.31.5/fs/btrfs/free-space-cache.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/btrfs/free-space-cache.c 2009-10-20 20:33:11.031321564 -0400
+@@ -1066,8 +1066,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
+
+ while(1) {
+ if (entry->bytes < bytes || entry->offset < min_start) {
+- struct rb_node *node;
+-
+ node = rb_next(&entry->offset_index);
+ if (!node)
+ break;
+@@ -1218,7 +1216,7 @@ again:
+ */
+ while (entry->bitmap || found_bitmap ||
+ (!entry->bitmap && entry->bytes < min_bytes)) {
+- struct rb_node *node = rb_next(&entry->offset_index);
++ node = rb_next(&entry->offset_index);
+
+ if (entry->bitmap && entry->bytes > bytes + empty_size) {
+ ret = btrfs_bitmap_cluster(block_group, entry, cluster,
+diff -urNp linux-2.6.31.5/fs/btrfs/inode.c linux-2.6.31.5/fs/btrfs/inode.c
+--- linux-2.6.31.5/fs/btrfs/inode.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/btrfs/inode.c 2009-10-20 20:32:11.182204101 -0400
@@ -55,14 +55,14 @@ struct btrfs_iget_args {
struct btrfs_root *root;
};
@@ -23890,9 +24916,9 @@ diff -urNp linux-2.6.31.4/fs/btrfs/inode.c linux-2.6.31.4/fs/btrfs/inode.c
.readlink = generic_readlink,
.follow_link = page_follow_link_light,
.put_link = page_put_link,
-diff -urNp linux-2.6.31.4/fs/btrfs/super.c linux-2.6.31.4/fs/btrfs/super.c
---- linux-2.6.31.4/fs/btrfs/super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/btrfs/super.c 2009-10-11 15:29:45.696364370 -0400
+diff -urNp linux-2.6.31.5/fs/btrfs/super.c linux-2.6.31.5/fs/btrfs/super.c
+--- linux-2.6.31.5/fs/btrfs/super.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/btrfs/super.c 2009-10-20 20:32:11.182204101 -0400
@@ -51,7 +51,7 @@
#include "export.h"
#include "compression.h"
@@ -23911,9 +24937,27 @@ diff -urNp linux-2.6.31.4/fs/btrfs/super.c linux-2.6.31.4/fs/btrfs/super.c
.delete_inode = btrfs_delete_inode,
.put_super = btrfs_put_super,
.sync_fs = btrfs_sync_fs,
-diff -urNp linux-2.6.31.4/fs/buffer.c linux-2.6.31.4/fs/buffer.c
---- linux-2.6.31.4/fs/buffer.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/buffer.c 2009-10-11 15:29:45.719430669 -0400
+diff -urNp linux-2.6.31.5/fs/btrfs/sysfs.c linux-2.6.31.5/fs/btrfs/sysfs.c
+--- linux-2.6.31.5/fs/btrfs/sysfs.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/btrfs/sysfs.c 2009-10-20 20:33:11.031321564 -0400
+@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
+ complete(&root->kobj_unregister);
+ }
+
+-static struct sysfs_ops btrfs_super_attr_ops = {
++static const struct sysfs_ops btrfs_super_attr_ops = {
+ .show = btrfs_super_attr_show,
+ .store = btrfs_super_attr_store,
+ };
+
+-static struct sysfs_ops btrfs_root_attr_ops = {
++static const struct sysfs_ops btrfs_root_attr_ops = {
+ .show = btrfs_root_attr_show,
+ .store = btrfs_root_attr_store,
+ };
+diff -urNp linux-2.6.31.5/fs/buffer.c linux-2.6.31.5/fs/buffer.c
+--- linux-2.6.31.5/fs/buffer.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/buffer.c 2009-10-20 20:32:11.182204101 -0400
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -23930,9 +24974,21 @@ diff -urNp linux-2.6.31.4/fs/buffer.c linux-2.6.31.4/fs/buffer.c
if (limit != RLIM_INFINITY && size > (loff_t)limit) {
send_sig(SIGXFSZ, current, 0);
goto out;
-diff -urNp linux-2.6.31.4/fs/cifs/cifs_dfs_ref.c linux-2.6.31.4/fs/cifs/cifs_dfs_ref.c
---- linux-2.6.31.4/fs/cifs/cifs_dfs_ref.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/cifs/cifs_dfs_ref.c 2009-10-11 15:29:45.730416734 -0400
+diff -urNp linux-2.6.31.5/fs/cachefiles/rdwr.c linux-2.6.31.5/fs/cachefiles/rdwr.c
+--- linux-2.6.31.5/fs/cachefiles/rdwr.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/cachefiles/rdwr.c 2009-10-20 20:33:11.031321564 -0400
+@@ -839,7 +839,7 @@ int cachefiles_write_page(struct fscache
+ old_fs = get_fs();
+ set_fs(KERNEL_DS);
+ ret = file->f_op->write(
+- file, (const void __user *) data, PAGE_SIZE,
++ file, (__force const void __user *) data, PAGE_SIZE,
+ &pos);
+ set_fs(old_fs);
+ kunmap(page);
+diff -urNp linux-2.6.31.5/fs/cifs/cifs_dfs_ref.c linux-2.6.31.5/fs/cifs/cifs_dfs_ref.c
+--- linux-2.6.31.5/fs/cifs/cifs_dfs_ref.c 2009-10-20 20:42:59.133953043 -0400
++++ linux-2.6.31.5/fs/cifs/cifs_dfs_ref.c 2009-10-20 20:32:11.182204101 -0400
@@ -385,7 +385,7 @@ out_err:
goto out;
}
@@ -23942,9 +24998,9 @@ diff -urNp linux-2.6.31.4/fs/cifs/cifs_dfs_ref.c linux-2.6.31.4/fs/cifs/cifs_dfs
.follow_link = cifs_dfs_follow_mountpoint,
};
-diff -urNp linux-2.6.31.4/fs/cifs/cifsfs.h linux-2.6.31.4/fs/cifs/cifsfs.h
---- linux-2.6.31.4/fs/cifs/cifsfs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/cifs/cifsfs.h 2009-10-11 15:29:45.732494587 -0400
+diff -urNp linux-2.6.31.5/fs/cifs/cifsfs.h linux-2.6.31.5/fs/cifs/cifsfs.h
+--- linux-2.6.31.5/fs/cifs/cifsfs.h 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/cifs/cifsfs.h 2009-10-20 20:32:11.182204101 -0400
@@ -67,7 +67,7 @@ extern int cifs_setattr(struct dentry *,
extern const struct inode_operations cifs_file_inode_ops;
@@ -23954,9 +25010,9 @@ diff -urNp linux-2.6.31.4/fs/cifs/cifsfs.h linux-2.6.31.4/fs/cifs/cifsfs.h
/* Functions related to files and directories */
-diff -urNp linux-2.6.31.4/fs/cifs/cifs_uniupr.h linux-2.6.31.4/fs/cifs/cifs_uniupr.h
---- linux-2.6.31.4/fs/cifs/cifs_uniupr.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/cifs/cifs_uniupr.h 2009-10-11 15:29:45.744362988 -0400
+diff -urNp linux-2.6.31.5/fs/cifs/cifs_uniupr.h linux-2.6.31.5/fs/cifs/cifs_uniupr.h
+--- linux-2.6.31.5/fs/cifs/cifs_uniupr.h 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/cifs/cifs_uniupr.h 2009-10-20 20:32:11.182204101 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -23966,9 +25022,9 @@ diff -urNp linux-2.6.31.4/fs/cifs/cifs_uniupr.h linux-2.6.31.4/fs/cifs/cifs_uniu
};
#endif
-diff -urNp linux-2.6.31.4/fs/cifs/link.c linux-2.6.31.4/fs/cifs/link.c
---- linux-2.6.31.4/fs/cifs/link.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/cifs/link.c 2009-10-11 15:29:45.964573068 -0400
+diff -urNp linux-2.6.31.5/fs/cifs/link.c linux-2.6.31.5/fs/cifs/link.c
+--- linux-2.6.31.5/fs/cifs/link.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/cifs/link.c 2009-10-20 20:32:11.185635862 -0400
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -23978,9 +25034,9 @@ diff -urNp linux-2.6.31.4/fs/cifs/link.c linux-2.6.31.4/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.31.4/fs/compat_binfmt_elf.c linux-2.6.31.4/fs/compat_binfmt_elf.c
---- linux-2.6.31.4/fs/compat_binfmt_elf.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/compat_binfmt_elf.c 2009-10-11 15:29:45.975961679 -0400
+diff -urNp linux-2.6.31.5/fs/compat_binfmt_elf.c linux-2.6.31.5/fs/compat_binfmt_elf.c
+--- linux-2.6.31.5/fs/compat_binfmt_elf.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/compat_binfmt_elf.c 2009-10-20 20:32:11.185635862 -0400
@@ -29,10 +29,12 @@
#undef elfhdr
#undef elf_phdr
@@ -23994,9 +25050,9 @@ diff -urNp linux-2.6.31.4/fs/compat_binfmt_elf.c linux-2.6.31.4/fs/compat_binfmt
#define elf_addr_t Elf32_Addr
/*
-diff -urNp linux-2.6.31.4/fs/compat.c linux-2.6.31.4/fs/compat.c
---- linux-2.6.31.4/fs/compat.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/compat.c 2009-10-11 15:29:45.981403405 -0400
+diff -urNp linux-2.6.31.5/fs/compat.c linux-2.6.31.5/fs/compat.c
+--- linux-2.6.31.5/fs/compat.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/compat.c 2009-10-20 20:32:11.185635862 -0400
@@ -1417,14 +1417,12 @@ static int compat_copy_strings(int argc,
if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
struct page *page;
@@ -24096,9 +25152,9 @@ diff -urNp linux-2.6.31.4/fs/compat.c linux-2.6.31.4/fs/compat.c
out:
if (bprm->mm)
mmput(bprm->mm);
-diff -urNp linux-2.6.31.4/fs/compat_ioctl.c linux-2.6.31.4/fs/compat_ioctl.c
---- linux-2.6.31.4/fs/compat_ioctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/compat_ioctl.c 2009-10-11 15:29:45.993396114 -0400
+diff -urNp linux-2.6.31.5/fs/compat_ioctl.c linux-2.6.31.5/fs/compat_ioctl.c
+--- linux-2.6.31.5/fs/compat_ioctl.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/compat_ioctl.c 2009-10-20 20:32:11.185635862 -0400
@@ -1827,15 +1827,15 @@ struct ioctl_trans {
};
@@ -24118,9 +25174,9 @@ diff -urNp linux-2.6.31.4/fs/compat_ioctl.c linux-2.6.31.4/fs/compat_ioctl.c
/* ioctl should not be warned about even if it's not implemented.
Valid reasons to use this:
-diff -urNp linux-2.6.31.4/fs/debugfs/inode.c linux-2.6.31.4/fs/debugfs/inode.c
---- linux-2.6.31.4/fs/debugfs/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/debugfs/inode.c 2009-10-11 15:29:45.999847453 -0400
+diff -urNp linux-2.6.31.5/fs/debugfs/inode.c linux-2.6.31.5/fs/debugfs/inode.c
+--- linux-2.6.31.5/fs/debugfs/inode.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/debugfs/inode.c 2009-10-20 20:32:11.185635862 -0400
@@ -118,7 +118,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -24130,9 +25186,9 @@ diff -urNp linux-2.6.31.4/fs/debugfs/inode.c linux-2.6.31.4/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
-diff -urNp linux-2.6.31.4/fs/dlm/debug_fs.c linux-2.6.31.4/fs/dlm/debug_fs.c
---- linux-2.6.31.4/fs/dlm/debug_fs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/dlm/debug_fs.c 2009-10-11 15:29:46.019447720 -0400
+diff -urNp linux-2.6.31.5/fs/dlm/debug_fs.c linux-2.6.31.5/fs/dlm/debug_fs.c
+--- linux-2.6.31.5/fs/dlm/debug_fs.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/dlm/debug_fs.c 2009-10-20 20:32:11.185635862 -0400
@@ -386,9 +386,9 @@ static int table_seq_show(struct seq_fil
return rv;
}
@@ -24171,9 +25227,21 @@ diff -urNp linux-2.6.31.4/fs/dlm/debug_fs.c linux-2.6.31.4/fs/dlm/debug_fs.c
.start = table_seq_start,
.next = table_seq_next,
.stop = table_seq_stop,
-diff -urNp linux-2.6.31.4/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.31.4/fs/ecryptfs/ecryptfs_kernel.h
---- linux-2.6.31.4/fs/ecryptfs/ecryptfs_kernel.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ecryptfs/ecryptfs_kernel.h 2009-10-11 15:29:46.026525717 -0400
+diff -urNp linux-2.6.31.5/fs/dlm/lockspace.c linux-2.6.31.5/fs/dlm/lockspace.c
+--- linux-2.6.31.5/fs/dlm/lockspace.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/dlm/lockspace.c 2009-10-20 20:33:11.031321564 -0400
+@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
+ kfree(ls);
+ }
+
+-static struct sysfs_ops dlm_attr_ops = {
++static const struct sysfs_ops dlm_attr_ops = {
+ .show = dlm_attr_show,
+ .store = dlm_attr_store,
+ };
+diff -urNp linux-2.6.31.5/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.31.5/fs/ecryptfs/ecryptfs_kernel.h
+--- linux-2.6.31.5/fs/ecryptfs/ecryptfs_kernel.h 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/ecryptfs/ecryptfs_kernel.h 2009-10-20 20:32:11.185635862 -0400
@@ -582,7 +582,7 @@ extern const struct inode_operations ecr
extern const struct inode_operations ecryptfs_symlink_iops;
extern const struct super_operations ecryptfs_sops;
@@ -24183,9 +25251,30 @@ diff -urNp linux-2.6.31.4/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.31.4/fs/ecrypt
extern int ecryptfs_verbosity;
extern unsigned int ecryptfs_message_buf_len;
extern signed long ecryptfs_message_wait_timeout;
-diff -urNp linux-2.6.31.4/fs/ecryptfs/mmap.c linux-2.6.31.4/fs/ecryptfs/mmap.c
---- linux-2.6.31.4/fs/ecryptfs/mmap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ecryptfs/mmap.c 2009-10-11 15:29:46.028545725 -0400
+diff -urNp linux-2.6.31.5/fs/ecryptfs/inode.c linux-2.6.31.5/fs/ecryptfs/inode.c
+--- linux-2.6.31.5/fs/ecryptfs/inode.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/ecryptfs/inode.c 2009-10-20 20:33:11.031321564 -0400
+@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry,
+ old_fs = get_fs();
+ set_fs(get_ds());
+ rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
+- (char __user *)lower_buf,
++ (__force char __user *)lower_buf,
+ lower_bufsiz);
+ set_fs(old_fs);
+ if (rc >= 0) {
+@@ -720,7 +720,7 @@ static void *ecryptfs_follow_link(struct
+ }
+ old_fs = get_fs();
+ set_fs(get_ds());
+- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
++ rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
+ set_fs(old_fs);
+ if (rc < 0)
+ goto out_free;
+diff -urNp linux-2.6.31.5/fs/ecryptfs/mmap.c linux-2.6.31.5/fs/ecryptfs/mmap.c
+--- linux-2.6.31.5/fs/ecryptfs/mmap.c 2009-10-20 20:42:59.137486813 -0400
++++ linux-2.6.31.5/fs/ecryptfs/mmap.c 2009-10-20 20:32:11.185635862 -0400
@@ -545,7 +545,7 @@ static sector_t ecryptfs_bmap(struct add
return rc;
}
@@ -24195,9 +25284,9 @@ diff -urNp linux-2.6.31.4/fs/ecryptfs/mmap.c linux-2.6.31.4/fs/ecryptfs/mmap.c
.writepage = ecryptfs_writepage,
.readpage = ecryptfs_readpage,
.write_begin = ecryptfs_write_begin,
-diff -urNp linux-2.6.31.4/fs/exec.c linux-2.6.31.4/fs/exec.c
---- linux-2.6.31.4/fs/exec.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/exec.c 2009-10-11 15:29:46.039456806 -0400
+diff -urNp linux-2.6.31.5/fs/exec.c linux-2.6.31.5/fs/exec.c
+--- linux-2.6.31.5/fs/exec.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/exec.c 2009-10-20 20:33:11.007196104 -0400
@@ -55,12 +55,24 @@
#include <linux/kmod.h>
#include <linux/fsnotify.h>
@@ -24279,6 +25368,15 @@ diff -urNp linux-2.6.31.4/fs/exec.c linux-2.6.31.4/fs/exec.c
return 0;
err:
up_write(&mm->mmap_sem);
+@@ -473,7 +488,7 @@ int copy_strings_kernel(int argc,char **
+ int r;
+ mm_segment_t oldfs = get_fs();
+ set_fs(KERNEL_DS);
+- r = copy_strings(argc, (char __user * __user *)argv, bprm);
++ r = copy_strings(argc, (__force char __user * __user *)argv, bprm);
+ set_fs(oldfs);
+ return r;
+ }
@@ -503,7 +518,8 @@ static int shift_arg_pages(struct vm_are
unsigned long new_end = old_end - shift;
struct mmu_gather *tlb;
@@ -24367,6 +25465,15 @@ diff -urNp linux-2.6.31.4/fs/exec.c linux-2.6.31.4/fs/exec.c
MAY_EXEC | MAY_OPEN);
if (IS_ERR(file))
goto out;
+@@ -688,7 +719,7 @@ int kernel_read(struct file *file, loff_
+ old_fs = get_fs();
+ set_fs(get_ds());
+ /* The cast to a user pointer is valid due to the set_fs() */
+- result = vfs_read(file, (void __user *)addr, count, &pos);
++ result = vfs_read(file, (__force void __user *)addr, count, &pos);
+ set_fs(old_fs);
+ return result;
+ }
@@ -1085,7 +1116,7 @@ int check_unsafe_exec(struct linux_binpr
}
rcu_read_unlock();
@@ -24641,9 +25748,9 @@ diff -urNp linux-2.6.31.4/fs/exec.c linux-2.6.31.4/fs/exec.c
/*
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
-diff -urNp linux-2.6.31.4/fs/ext2/balloc.c linux-2.6.31.4/fs/ext2/balloc.c
---- linux-2.6.31.4/fs/ext2/balloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext2/balloc.c 2009-10-11 15:29:46.053402474 -0400
+diff -urNp linux-2.6.31.5/fs/ext2/balloc.c linux-2.6.31.5/fs/ext2/balloc.c
+--- linux-2.6.31.5/fs/ext2/balloc.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext2/balloc.c 2009-10-20 20:32:11.188946746 -0400
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -24653,9 +25760,9 @@ diff -urNp linux-2.6.31.4/fs/ext2/balloc.c linux-2.6.31.4/fs/ext2/balloc.c
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.31.4/fs/ext3/balloc.c linux-2.6.31.4/fs/ext3/balloc.c
---- linux-2.6.31.4/fs/ext3/balloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext3/balloc.c 2009-10-11 15:29:46.067471738 -0400
+diff -urNp linux-2.6.31.5/fs/ext3/balloc.c linux-2.6.31.5/fs/ext3/balloc.c
+--- linux-2.6.31.5/fs/ext3/balloc.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext3/balloc.c 2009-10-20 20:32:11.188946746 -0400
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -24665,9 +25772,9 @@ diff -urNp linux-2.6.31.4/fs/ext3/balloc.c linux-2.6.31.4/fs/ext3/balloc.c
sbi->s_resuid != current_fsuid() &&
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
-diff -urNp linux-2.6.31.4/fs/ext3/namei.c linux-2.6.31.4/fs/ext3/namei.c
---- linux-2.6.31.4/fs/ext3/namei.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext3/namei.c 2009-10-11 15:29:46.077388519 -0400
+diff -urNp linux-2.6.31.5/fs/ext3/namei.c linux-2.6.31.5/fs/ext3/namei.c
+--- linux-2.6.31.5/fs/ext3/namei.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext3/namei.c 2009-10-20 20:32:11.188946746 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -24677,9 +25784,9 @@ diff -urNp linux-2.6.31.4/fs/ext3/namei.c linux-2.6.31.4/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.31.4/fs/ext3/xattr.c linux-2.6.31.4/fs/ext3/xattr.c
---- linux-2.6.31.4/fs/ext3/xattr.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext3/xattr.c 2009-10-11 15:29:46.078447283 -0400
+diff -urNp linux-2.6.31.5/fs/ext3/xattr.c linux-2.6.31.5/fs/ext3/xattr.c
+--- linux-2.6.31.5/fs/ext3/xattr.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext3/xattr.c 2009-10-20 20:32:11.188946746 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -24691,9 +25798,9 @@ diff -urNp linux-2.6.31.4/fs/ext3/xattr.c linux-2.6.31.4/fs/ext3/xattr.c
#endif
static void ext3_xattr_cache_insert(struct buffer_head *);
-diff -urNp linux-2.6.31.4/fs/ext4/balloc.c linux-2.6.31.4/fs/ext4/balloc.c
---- linux-2.6.31.4/fs/ext4/balloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext4/balloc.c 2009-10-11 15:29:46.088513626 -0400
+diff -urNp linux-2.6.31.5/fs/ext4/balloc.c linux-2.6.31.5/fs/ext4/balloc.c
+--- linux-2.6.31.5/fs/ext4/balloc.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext4/balloc.c 2009-10-20 20:32:11.188946746 -0400
@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -24703,9 +25810,9 @@ diff -urNp linux-2.6.31.4/fs/ext4/balloc.c linux-2.6.31.4/fs/ext4/balloc.c
if (free_blocks >= (nblocks + dirty_blocks))
return 1;
}
-diff -urNp linux-2.6.31.4/fs/ext4/file.c linux-2.6.31.4/fs/ext4/file.c
---- linux-2.6.31.4/fs/ext4/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext4/file.c 2009-10-11 15:29:46.089370324 -0400
+diff -urNp linux-2.6.31.5/fs/ext4/file.c linux-2.6.31.5/fs/ext4/file.c
+--- linux-2.6.31.5/fs/ext4/file.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext4/file.c 2009-10-20 20:32:11.188946746 -0400
@@ -130,7 +130,7 @@ force_commit:
return ret;
}
@@ -24715,9 +25822,9 @@ diff -urNp linux-2.6.31.4/fs/ext4/file.c linux-2.6.31.4/fs/ext4/file.c
.fault = filemap_fault,
.page_mkwrite = ext4_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/ext4/mballoc.c linux-2.6.31.4/fs/ext4/mballoc.c
---- linux-2.6.31.4/fs/ext4/mballoc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext4/mballoc.c 2009-10-11 15:29:46.116449374 -0400
+diff -urNp linux-2.6.31.5/fs/ext4/mballoc.c linux-2.6.31.5/fs/ext4/mballoc.c
+--- linux-2.6.31.5/fs/ext4/mballoc.c 2009-10-20 20:42:59.140912018 -0400
++++ linux-2.6.31.5/fs/ext4/mballoc.c 2009-10-20 20:32:11.188946746 -0400
@@ -2205,7 +2205,7 @@ static void ext4_mb_seq_history_stop(str
{
}
@@ -24754,9 +25861,9 @@ diff -urNp linux-2.6.31.4/fs/ext4/mballoc.c linux-2.6.31.4/fs/ext4/mballoc.c
.owner = THIS_MODULE,
.open = ext4_mb_seq_groups_open,
.read = seq_read,
-diff -urNp linux-2.6.31.4/fs/ext4/namei.c linux-2.6.31.4/fs/ext4/namei.c
---- linux-2.6.31.4/fs/ext4/namei.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ext4/namei.c 2009-10-11 15:29:46.127367595 -0400
+diff -urNp linux-2.6.31.5/fs/ext4/namei.c linux-2.6.31.5/fs/ext4/namei.c
+--- linux-2.6.31.5/fs/ext4/namei.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/ext4/namei.c 2009-10-20 20:32:11.192172375 -0400
@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -24766,9 +25873,21 @@ diff -urNp linux-2.6.31.4/fs/ext4/namei.c linux-2.6.31.4/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
-diff -urNp linux-2.6.31.4/fs/fcntl.c linux-2.6.31.4/fs/fcntl.c
---- linux-2.6.31.4/fs/fcntl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fcntl.c 2009-10-11 15:29:46.134368122 -0400
+diff -urNp linux-2.6.31.5/fs/ext4/super.c linux-2.6.31.5/fs/ext4/super.c
+--- linux-2.6.31.5/fs/ext4/super.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/ext4/super.c 2009-10-20 20:33:11.031321564 -0400
+@@ -2242,7 +2242,7 @@ static void ext4_sb_release(struct kobje
+ }
+
+
+-static struct sysfs_ops ext4_attr_ops = {
++static const struct sysfs_ops ext4_attr_ops = {
+ .show = ext4_attr_show,
+ .store = ext4_attr_store,
+ };
+diff -urNp linux-2.6.31.5/fs/fcntl.c linux-2.6.31.5/fs/fcntl.c
+--- linux-2.6.31.5/fs/fcntl.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fcntl.c 2009-10-20 20:32:11.192172375 -0400
@@ -271,6 +271,7 @@ static long do_fcntl(int fd, unsigned in
switch (cmd) {
case F_DUPFD:
@@ -24787,9 +25906,82 @@ diff -urNp linux-2.6.31.4/fs/fcntl.c linux-2.6.31.4/fs/fcntl.c
rcu_read_unlock();
return ret;
}
-diff -urNp linux-2.6.31.4/fs/file.c linux-2.6.31.4/fs/file.c
---- linux-2.6.31.4/fs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/file.c 2009-10-11 15:29:46.138384545 -0400
+diff -urNp linux-2.6.31.5/fs/fifo.c linux-2.6.31.5/fs/fifo.c
+--- linux-2.6.31.5/fs/fifo.c 2009-10-05 13:12:06.000000000 -0400
++++ linux-2.6.31.5/fs/fifo.c 2009-10-23 19:42:57.551669921 -0400
+@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
+ */
+ filp->f_op = &read_pipefifo_fops;
+ pipe->r_counter++;
+- if (pipe->readers++ == 0)
++ if (atomic_inc_return(&pipe->readers) == 1)
+ wake_up_partner(inode);
+
+- if (!pipe->writers) {
++ if (!atomic_read(&pipe->writers)) {
+ if ((filp->f_flags & O_NONBLOCK)) {
+ /* suppress POLLHUP until we have
+ * seen a writer */
+@@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode
+ * errno=ENXIO when there is no process reading the FIFO.
+ */
+ ret = -ENXIO;
+- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
++ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
+ goto err;
+
+ filp->f_op = &write_pipefifo_fops;
+ pipe->w_counter++;
+- if (!pipe->writers++)
++ if (atomic_inc_return(&pipe->writers) == 1)
+ wake_up_partner(inode);
+
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ wait_for_partner(inode, &pipe->r_counter);
+ if (signal_pending(current))
+ goto err_wr;
+@@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode
+ */
+ filp->f_op = &rdwr_pipefifo_fops;
+
+- pipe->readers++;
+- pipe->writers++;
++ atomic_inc(&pipe->readers);
++ atomic_inc(&pipe->writers);
+ pipe->r_counter++;
+ pipe->w_counter++;
+- if (pipe->readers == 1 || pipe->writers == 1)
++ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
+ wake_up_partner(inode);
+ break;
+
+@@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode
+ return 0;
+
+ err_rd:
+- if (!--pipe->readers)
++ if (!atomic_dec_return(&pipe->readers))
+ wake_up_interruptible(&pipe->wait);
+ ret = -ERESTARTSYS;
+ goto err;
+
+ err_wr:
+- if (!--pipe->writers)
++ if (!atomic_dec_return(&pipe->writers))
+ wake_up_interruptible(&pipe->wait);
+ ret = -ERESTARTSYS;
+ goto err;
+
+ err:
+- if (!pipe->readers && !pipe->writers)
++ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
+ free_pipe_info(inode);
+
+ err_nocleanup:
+diff -urNp linux-2.6.31.5/fs/file.c linux-2.6.31.5/fs/file.c
+--- linux-2.6.31.5/fs/file.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/file.c 2009-10-20 20:32:11.192172375 -0400
@@ -13,6 +13,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -24807,9 +25999,9 @@ diff -urNp linux-2.6.31.4/fs/file.c linux-2.6.31.4/fs/file.c
if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EMFILE;
-diff -urNp linux-2.6.31.4/fs/fs_struct.c linux-2.6.31.4/fs/fs_struct.c
---- linux-2.6.31.4/fs/fs_struct.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fs_struct.c 2009-10-11 15:29:46.139364465 -0400
+diff -urNp linux-2.6.31.5/fs/fs_struct.c linux-2.6.31.5/fs/fs_struct.c
+--- linux-2.6.31.5/fs/fs_struct.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fs_struct.c 2009-10-20 20:32:11.192172375 -0400
@@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk)
task_lock(tsk);
write_lock(&fs->lock);
@@ -24861,9 +26053,9 @@ diff -urNp linux-2.6.31.4/fs/fs_struct.c linux-2.6.31.4/fs/fs_struct.c
write_unlock(&fs->lock);
task_unlock(current);
-diff -urNp linux-2.6.31.4/fs/fuse/control.c linux-2.6.31.4/fs/fuse/control.c
---- linux-2.6.31.4/fs/fuse/control.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fuse/control.c 2009-10-11 15:29:46.148651030 -0400
+diff -urNp linux-2.6.31.5/fs/fuse/control.c linux-2.6.31.5/fs/fuse/control.c
+--- linux-2.6.31.5/fs/fuse/control.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fuse/control.c 2009-10-20 20:32:11.192172375 -0400
@@ -161,7 +161,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -24873,9 +26065,9 @@ diff -urNp linux-2.6.31.4/fs/fuse/control.c linux-2.6.31.4/fs/fuse/control.c
struct fuse_conn *fc;
int err;
-diff -urNp linux-2.6.31.4/fs/fuse/dev.c linux-2.6.31.4/fs/fuse/dev.c
---- linux-2.6.31.4/fs/fuse/dev.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fuse/dev.c 2009-10-11 15:29:46.246749083 -0400
+diff -urNp linux-2.6.31.5/fs/fuse/dev.c linux-2.6.31.5/fs/fuse/dev.c
+--- linux-2.6.31.5/fs/fuse/dev.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fuse/dev.c 2009-10-20 20:32:11.192172375 -0400
@@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc
{
struct fuse_notify_inval_entry_out outarg;
@@ -24919,9 +26111,9 @@ diff -urNp linux-2.6.31.4/fs/fuse/dev.c linux-2.6.31.4/fs/fuse/dev.c
return err;
}
-diff -urNp linux-2.6.31.4/fs/fuse/dir.c linux-2.6.31.4/fs/fuse/dir.c
---- linux-2.6.31.4/fs/fuse/dir.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fuse/dir.c 2009-10-11 15:29:46.247657356 -0400
+diff -urNp linux-2.6.31.5/fs/fuse/dir.c linux-2.6.31.5/fs/fuse/dir.c
+--- linux-2.6.31.5/fs/fuse/dir.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fuse/dir.c 2009-10-20 20:32:11.192172375 -0400
@@ -1122,7 +1122,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -24931,9 +26123,9 @@ diff -urNp linux-2.6.31.4/fs/fuse/dir.c linux-2.6.31.4/fs/fuse/dir.c
{
if (!IS_ERR(link))
free_page((unsigned long) link);
-diff -urNp linux-2.6.31.4/fs/fuse/file.c linux-2.6.31.4/fs/fuse/file.c
---- linux-2.6.31.4/fs/fuse/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/fuse/file.c 2009-10-11 15:29:46.248575745 -0400
+diff -urNp linux-2.6.31.5/fs/fuse/file.c linux-2.6.31.5/fs/fuse/file.c
+--- linux-2.6.31.5/fs/fuse/file.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/fuse/file.c 2009-10-20 20:32:11.192172375 -0400
@@ -1313,7 +1313,7 @@ static int fuse_page_mkwrite(struct vm_a
return 0;
}
@@ -24943,9 +26135,9 @@ diff -urNp linux-2.6.31.4/fs/fuse/file.c linux-2.6.31.4/fs/fuse/file.c
.close = fuse_vma_close,
.fault = filemap_fault,
.page_mkwrite = fuse_page_mkwrite,
-diff -urNp linux-2.6.31.4/fs/gfs2/file.c linux-2.6.31.4/fs/gfs2/file.c
---- linux-2.6.31.4/fs/gfs2/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/gfs2/file.c 2009-10-11 15:29:46.261361653 -0400
+diff -urNp linux-2.6.31.5/fs/gfs2/file.c linux-2.6.31.5/fs/gfs2/file.c
+--- linux-2.6.31.5/fs/gfs2/file.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/gfs2/file.c 2009-10-20 20:32:11.192172375 -0400
@@ -419,7 +419,7 @@ out:
return ret;
}
@@ -24955,9 +26147,21 @@ diff -urNp linux-2.6.31.4/fs/gfs2/file.c linux-2.6.31.4/fs/gfs2/file.c
.fault = filemap_fault,
.page_mkwrite = gfs2_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/hfs/inode.c linux-2.6.31.4/fs/hfs/inode.c
---- linux-2.6.31.4/fs/hfs/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/hfs/inode.c 2009-10-11 15:29:46.271712684 -0400
+diff -urNp linux-2.6.31.5/fs/gfs2/sys.c linux-2.6.31.5/fs/gfs2/sys.c
+--- linux-2.6.31.5/fs/gfs2/sys.c 2009-10-20 20:42:59.144124327 -0400
++++ linux-2.6.31.5/fs/gfs2/sys.c 2009-10-20 20:33:11.040874213 -0400
+@@ -48,7 +48,7 @@ static ssize_t gfs2_attr_store(struct ko
+ return a->store ? a->store(sdp, buf, len) : len;
+ }
+
+-static struct sysfs_ops gfs2_attr_ops = {
++static const struct sysfs_ops gfs2_attr_ops = {
+ .show = gfs2_attr_show,
+ .store = gfs2_attr_store,
+ };
+diff -urNp linux-2.6.31.5/fs/hfs/inode.c linux-2.6.31.5/fs/hfs/inode.c
+--- linux-2.6.31.5/fs/hfs/inode.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/hfs/inode.c 2009-10-20 20:32:11.192172375 -0400
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -24976,9 +26180,9 @@ diff -urNp linux-2.6.31.4/fs/hfs/inode.c linux-2.6.31.4/fs/hfs/inode.c
hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
-diff -urNp linux-2.6.31.4/fs/hfsplus/inode.c linux-2.6.31.4/fs/hfsplus/inode.c
---- linux-2.6.31.4/fs/hfsplus/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/hfsplus/inode.c 2009-10-11 15:29:46.283361764 -0400
+diff -urNp linux-2.6.31.5/fs/hfsplus/inode.c linux-2.6.31.5/fs/hfsplus/inode.c
+--- linux-2.6.31.5/fs/hfsplus/inode.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/hfsplus/inode.c 2009-10-20 20:32:11.192172375 -0400
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -25015,9 +26219,39 @@ diff -urNp linux-2.6.31.4/fs/hfsplus/inode.c linux-2.6.31.4/fs/hfsplus/inode.c
hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
sizeof(struct hfsplus_cat_file));
hfsplus_inode_write_fork(inode, &file->data_fork);
-diff -urNp linux-2.6.31.4/fs/jbd2/journal.c linux-2.6.31.4/fs/jbd2/journal.c
---- linux-2.6.31.4/fs/jbd2/journal.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/jbd2/journal.c 2009-10-11 15:29:46.294394496 -0400
+diff -urNp linux-2.6.31.5/fs/ioctl.c linux-2.6.31.5/fs/ioctl.c
+--- linux-2.6.31.5/fs/ioctl.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/ioctl.c 2009-10-20 20:33:11.040874213 -0400
+@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
+ u64 phys, u64 len, u32 flags)
+ {
+ struct fiemap_extent extent;
+- struct fiemap_extent *dest = fieinfo->fi_extents_start;
++ struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
+
+ /* only count the extents */
+ if (fieinfo->fi_extents_max == 0) {
+@@ -206,7 +206,7 @@ static int ioctl_fiemap(struct file *fil
+
+ fieinfo.fi_flags = fiemap.fm_flags;
+ fieinfo.fi_extents_max = fiemap.fm_extent_count;
+- fieinfo.fi_extents_start = (struct fiemap_extent *)(arg + sizeof(fiemap));
++ fieinfo.fi_extents_start = (struct fiemap_extent __user *)(arg + sizeof(fiemap));
+
+ if (fiemap.fm_extent_count != 0 &&
+ !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
+@@ -219,7 +219,7 @@ static int ioctl_fiemap(struct file *fil
+ error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
+ fiemap.fm_flags = fieinfo.fi_flags;
+ fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
+- if (copy_to_user((char *)arg, &fiemap, sizeof(fiemap)))
++ if (copy_to_user((__force char __user *)arg, &fiemap, sizeof(fiemap)))
+ error = -EFAULT;
+
+ return error;
+diff -urNp linux-2.6.31.5/fs/jbd2/journal.c linux-2.6.31.5/fs/jbd2/journal.c
+--- linux-2.6.31.5/fs/jbd2/journal.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/jbd2/journal.c 2009-10-20 20:32:11.195407996 -0400
@@ -768,7 +768,7 @@ static void jbd2_seq_history_stop(struct
{
}
@@ -25054,9 +26288,9 @@ diff -urNp linux-2.6.31.4/fs/jbd2/journal.c linux-2.6.31.4/fs/jbd2/journal.c
.owner = THIS_MODULE,
.open = jbd2_seq_info_open,
.read = seq_read,
-diff -urNp linux-2.6.31.4/fs/jffs2/debug.h linux-2.6.31.4/fs/jffs2/debug.h
---- linux-2.6.31.4/fs/jffs2/debug.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/jffs2/debug.h 2009-10-11 15:29:46.309686498 -0400
+diff -urNp linux-2.6.31.5/fs/jffs2/debug.h linux-2.6.31.5/fs/jffs2/debug.h
+--- linux-2.6.31.5/fs/jffs2/debug.h 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/jffs2/debug.h 2009-10-20 20:32:11.195407996 -0400
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -25158,9 +26392,9 @@ diff -urNp linux-2.6.31.4/fs/jffs2/debug.h linux-2.6.31.4/fs/jffs2/debug.h
#endif
/* "Sanity" checks */
-diff -urNp linux-2.6.31.4/fs/jffs2/erase.c linux-2.6.31.4/fs/jffs2/erase.c
---- linux-2.6.31.4/fs/jffs2/erase.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/jffs2/erase.c 2009-10-11 15:29:46.314378203 -0400
+diff -urNp linux-2.6.31.5/fs/jffs2/erase.c linux-2.6.31.5/fs/jffs2/erase.c
+--- linux-2.6.31.5/fs/jffs2/erase.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/jffs2/erase.c 2009-10-20 20:32:11.195407996 -0400
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -25171,9 +26405,9 @@ diff -urNp linux-2.6.31.4/fs/jffs2/erase.c linux-2.6.31.4/fs/jffs2/erase.c
};
jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-2.6.31.4/fs/jffs2/summary.h linux-2.6.31.4/fs/jffs2/summary.h
---- linux-2.6.31.4/fs/jffs2/summary.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/jffs2/summary.h 2009-10-11 15:29:46.317385502 -0400
+diff -urNp linux-2.6.31.5/fs/jffs2/summary.h linux-2.6.31.5/fs/jffs2/summary.h
+--- linux-2.6.31.5/fs/jffs2/summary.h 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/jffs2/summary.h 2009-10-20 20:32:11.195407996 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -25202,9 +26436,9 @@ diff -urNp linux-2.6.31.4/fs/jffs2/summary.h linux-2.6.31.4/fs/jffs2/summary.h
#define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
#endif /* CONFIG_JFFS2_SUMMARY */
-diff -urNp linux-2.6.31.4/fs/jffs2/wbuf.c linux-2.6.31.4/fs/jffs2/wbuf.c
---- linux-2.6.31.4/fs/jffs2/wbuf.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/jffs2/wbuf.c 2009-10-11 15:29:46.318374009 -0400
+diff -urNp linux-2.6.31.5/fs/jffs2/wbuf.c linux-2.6.31.5/fs/jffs2/wbuf.c
+--- linux-2.6.31.5/fs/jffs2/wbuf.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/jffs2/wbuf.c 2009-10-20 20:32:11.195407996 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -25215,9 +26449,9 @@ diff -urNp linux-2.6.31.4/fs/jffs2/wbuf.c linux-2.6.31.4/fs/jffs2/wbuf.c
};
/*
-diff -urNp linux-2.6.31.4/fs/lockd/svc.c linux-2.6.31.4/fs/lockd/svc.c
---- linux-2.6.31.4/fs/lockd/svc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/lockd/svc.c 2009-10-11 15:29:56.700390259 -0400
+diff -urNp linux-2.6.31.5/fs/lockd/svc.c linux-2.6.31.5/fs/lockd/svc.c
+--- linux-2.6.31.5/fs/lockd/svc.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/lockd/svc.c 2009-10-20 20:32:11.195407996 -0400
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -25227,9 +26461,9 @@ diff -urNp linux-2.6.31.4/fs/lockd/svc.c linux-2.6.31.4/fs/lockd/svc.c
EXPORT_SYMBOL_GPL(nlmsvc_ops);
static DEFINE_MUTEX(nlmsvc_mutex);
-diff -urNp linux-2.6.31.4/fs/locks.c linux-2.6.31.4/fs/locks.c
---- linux-2.6.31.4/fs/locks.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/locks.c 2009-10-11 15:29:46.340361540 -0400
+diff -urNp linux-2.6.31.5/fs/locks.c linux-2.6.31.5/fs/locks.c
+--- linux-2.6.31.5/fs/locks.c 2009-10-20 20:42:59.147740548 -0400
++++ linux-2.6.31.5/fs/locks.c 2009-10-20 20:32:11.195407996 -0400
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -25251,9 +26485,9 @@ diff -urNp linux-2.6.31.4/fs/locks.c linux-2.6.31.4/fs/locks.c
}
lock_kernel();
-diff -urNp linux-2.6.31.4/fs/namei.c linux-2.6.31.4/fs/namei.c
---- linux-2.6.31.4/fs/namei.c 2009-10-12 23:26:17.993604726 -0400
-+++ linux-2.6.31.4/fs/namei.c 2009-10-12 23:26:38.966399894 -0400
+diff -urNp linux-2.6.31.5/fs/namei.c linux-2.6.31.5/fs/namei.c
+--- linux-2.6.31.5/fs/namei.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/namei.c 2009-10-20 20:32:11.195407996 -0400
@@ -631,7 +631,7 @@ static __always_inline int __do_follow_l
cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(cookie);
@@ -25571,9 +26805,9 @@ diff -urNp linux-2.6.31.4/fs/namei.c linux-2.6.31.4/fs/namei.c
exit6:
mnt_drop_write(oldnd.path.mnt);
exit5:
-diff -urNp linux-2.6.31.4/fs/namespace.c linux-2.6.31.4/fs/namespace.c
---- linux-2.6.31.4/fs/namespace.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/namespace.c 2009-10-11 15:29:46.363482610 -0400
+diff -urNp linux-2.6.31.5/fs/namespace.c linux-2.6.31.5/fs/namespace.c
+--- linux-2.6.31.5/fs/namespace.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/namespace.c 2009-10-20 20:32:11.198708336 -0400
@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
if (!(sb->s_flags & MS_RDONLY))
retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -25629,9 +26863,9 @@ diff -urNp linux-2.6.31.4/fs/namespace.c linux-2.6.31.4/fs/namespace.c
read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&current->fs->root);
-diff -urNp linux-2.6.31.4/fs/nfs/client.c linux-2.6.31.4/fs/nfs/client.c
---- linux-2.6.31.4/fs/nfs/client.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfs/client.c 2009-10-11 15:29:46.370357763 -0400
+diff -urNp linux-2.6.31.5/fs/nfs/client.c linux-2.6.31.5/fs/nfs/client.c
+--- linux-2.6.31.5/fs/nfs/client.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/nfs/client.c 2009-10-20 20:32:11.198708336 -0400
@@ -1533,7 +1533,7 @@ static void *nfs_server_list_next(struct
static void nfs_server_list_stop(struct seq_file *p, void *v);
static int nfs_server_list_show(struct seq_file *m, void *v);
@@ -25650,9 +26884,9 @@ diff -urNp linux-2.6.31.4/fs/nfs/client.c linux-2.6.31.4/fs/nfs/client.c
.start = nfs_volume_list_start,
.next = nfs_volume_list_next,
.stop = nfs_volume_list_stop,
-diff -urNp linux-2.6.31.4/fs/nfs/file.c linux-2.6.31.4/fs/nfs/file.c
---- linux-2.6.31.4/fs/nfs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfs/file.c 2009-10-11 15:29:46.373639093 -0400
+diff -urNp linux-2.6.31.5/fs/nfs/file.c linux-2.6.31.5/fs/nfs/file.c
+--- linux-2.6.31.5/fs/nfs/file.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/nfs/file.c 2009-10-20 20:32:11.198708336 -0400
@@ -59,7 +59,7 @@ static int nfs_lock(struct file *filp, i
static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl);
static int nfs_setlease(struct file *file, long arg, struct file_lock **fl);
@@ -25671,9 +26905,9 @@ diff -urNp linux-2.6.31.4/fs/nfs/file.c linux-2.6.31.4/fs/nfs/file.c
.fault = filemap_fault,
.page_mkwrite = nfs_vm_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/nfs/nfs4proc.c linux-2.6.31.4/fs/nfs/nfs4proc.c
---- linux-2.6.31.4/fs/nfs/nfs4proc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfs/nfs4proc.c 2009-10-11 15:29:46.388402494 -0400
+diff -urNp linux-2.6.31.5/fs/nfs/nfs4proc.c linux-2.6.31.5/fs/nfs/nfs4proc.c
+--- linux-2.6.31.5/fs/nfs/nfs4proc.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/nfs/nfs4proc.c 2009-10-20 20:32:11.198708336 -0400
@@ -1123,7 +1123,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -25944,9 +27178,9 @@ diff -urNp linux-2.6.31.4/fs/nfs/nfs4proc.c linux-2.6.31.4/fs/nfs/nfs4proc.c
int err;
err = nfs4_set_lock_state(state, fl);
-diff -urNp linux-2.6.31.4/fs/nfsd/export.c linux-2.6.31.4/fs/nfsd/export.c
---- linux-2.6.31.4/fs/nfsd/export.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfsd/export.c 2009-10-11 15:29:46.400621399 -0400
+diff -urNp linux-2.6.31.5/fs/nfsd/export.c linux-2.6.31.5/fs/nfsd/export.c
+--- linux-2.6.31.5/fs/nfsd/export.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/nfsd/export.c 2009-10-20 20:32:11.198708336 -0400
@@ -1505,7 +1505,7 @@ static int e_show(struct seq_file *m, vo
return svc_export_show(m, &svc_export_cache, cp);
}
@@ -25956,9 +27190,9 @@ diff -urNp linux-2.6.31.4/fs/nfsd/export.c linux-2.6.31.4/fs/nfsd/export.c
.start = e_start,
.next = e_next,
.stop = e_stop,
-diff -urNp linux-2.6.31.4/fs/nfsd/lockd.c linux-2.6.31.4/fs/nfsd/lockd.c
---- linux-2.6.31.4/fs/nfsd/lockd.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfsd/lockd.c 2009-10-11 15:29:56.706369233 -0400
+diff -urNp linux-2.6.31.5/fs/nfsd/lockd.c linux-2.6.31.5/fs/nfsd/lockd.c
+--- linux-2.6.31.5/fs/nfsd/lockd.c 2009-10-20 20:42:59.151167536 -0400
++++ linux-2.6.31.5/fs/nfsd/lockd.c 2009-10-20 20:32:11.198708336 -0400
@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -25968,9 +27202,9 @@ diff -urNp linux-2.6.31.4/fs/nfsd/lockd.c linux-2.6.31.4/fs/nfsd/lockd.c
.fopen = nlm_fopen, /* open file for locking */
.fclose = nlm_fclose, /* close file */
};
-diff -urNp linux-2.6.31.4/fs/nfsd/nfsctl.c linux-2.6.31.4/fs/nfsd/nfsctl.c
---- linux-2.6.31.4/fs/nfsd/nfsctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nfsd/nfsctl.c 2009-10-11 15:29:46.410389784 -0400
+diff -urNp linux-2.6.31.5/fs/nfsd/nfsctl.c linux-2.6.31.5/fs/nfsd/nfsctl.c
+--- linux-2.6.31.5/fs/nfsd/nfsctl.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nfsd/nfsctl.c 2009-10-20 20:32:11.198708336 -0400
@@ -174,7 +174,7 @@ static const struct file_operations expo
extern int nfsd_pool_stats_open(struct inode *inode, struct file *file);
@@ -25980,9 +27214,39 @@ diff -urNp linux-2.6.31.4/fs/nfsd/nfsctl.c linux-2.6.31.4/fs/nfsd/nfsctl.c
.open = nfsd_pool_stats_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/fs/nilfs2/btnode.c linux-2.6.31.4/fs/nilfs2/btnode.c
---- linux-2.6.31.4/fs/nilfs2/btnode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/btnode.c 2009-10-11 15:29:46.423362967 -0400
+diff -urNp linux-2.6.31.5/fs/nfsd/vfs.c linux-2.6.31.5/fs/nfsd/vfs.c
+--- linux-2.6.31.5/fs/nfsd/vfs.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nfsd/vfs.c 2009-10-20 20:33:11.040874213 -0400
+@@ -930,7 +930,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
+ } else {
+ oldfs = get_fs();
+ set_fs(KERNEL_DS);
+- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
++ host_err = vfs_readv(file, (__force struct iovec __user *)vec, vlen, &offset);
+ set_fs(oldfs);
+ }
+
+@@ -1053,7 +1053,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
+
+ /* Write the data. */
+ oldfs = get_fs(); set_fs(KERNEL_DS);
+- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
++ host_err = vfs_writev(file, (__force struct iovec __user *)vec, vlen, &offset);
+ set_fs(oldfs);
+ if (host_err < 0)
+ goto out_nfserr;
+@@ -1528,7 +1528,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
+ */
+
+ oldfs = get_fs(); set_fs(KERNEL_DS);
+- host_err = inode->i_op->readlink(dentry, buf, *lenp);
++ host_err = inode->i_op->readlink(dentry, (__force char __user *)buf, *lenp);
+ set_fs(oldfs);
+
+ if (host_err < 0)
+diff -urNp linux-2.6.31.5/fs/nilfs2/btnode.c linux-2.6.31.5/fs/nilfs2/btnode.c
+--- linux-2.6.31.5/fs/nilfs2/btnode.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/btnode.c 2009-10-20 20:32:11.198708336 -0400
@@ -47,7 +47,7 @@ void nilfs_btnode_cache_init_once(struct
INIT_LIST_HEAD(&btnc->i_mmap_nonlinear);
}
@@ -25992,9 +27256,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/btnode.c linux-2.6.31.4/fs/nilfs2/btnode.c
.sync_page = block_sync_page,
};
-diff -urNp linux-2.6.31.4/fs/nilfs2/dir.c linux-2.6.31.4/fs/nilfs2/dir.c
---- linux-2.6.31.4/fs/nilfs2/dir.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/dir.c 2009-10-11 15:29:46.433846626 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/dir.c linux-2.6.31.5/fs/nilfs2/dir.c
+--- linux-2.6.31.5/fs/nilfs2/dir.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/dir.c 2009-10-20 20:32:11.198708336 -0400
@@ -697,7 +697,7 @@ not_empty:
return 0;
}
@@ -26004,9 +27268,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/dir.c linux-2.6.31.4/fs/nilfs2/dir.c
.llseek = generic_file_llseek,
.read = generic_read_dir,
.readdir = nilfs_readdir,
-diff -urNp linux-2.6.31.4/fs/nilfs2/file.c linux-2.6.31.4/fs/nilfs2/file.c
---- linux-2.6.31.4/fs/nilfs2/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/file.c 2009-10-11 15:29:46.434558499 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/file.c linux-2.6.31.5/fs/nilfs2/file.c
+--- linux-2.6.31.5/fs/nilfs2/file.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/file.c 2009-10-20 20:32:11.202198553 -0400
@@ -117,7 +117,7 @@ static int nilfs_page_mkwrite(struct vm_
return 0;
}
@@ -26034,9 +27298,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/file.c linux-2.6.31.4/fs/nilfs2/file.c
.truncate = nilfs_truncate,
.setattr = nilfs_setattr,
.permission = nilfs_permission,
-diff -urNp linux-2.6.31.4/fs/nilfs2/gcinode.c linux-2.6.31.4/fs/nilfs2/gcinode.c
---- linux-2.6.31.4/fs/nilfs2/gcinode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/gcinode.c 2009-10-11 15:29:46.450368609 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/gcinode.c linux-2.6.31.5/fs/nilfs2/gcinode.c
+--- linux-2.6.31.5/fs/nilfs2/gcinode.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/gcinode.c 2009-10-20 20:32:11.202198553 -0400
@@ -52,7 +52,7 @@
#include "dat.h"
#include "ifile.h"
@@ -26046,9 +27310,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/gcinode.c linux-2.6.31.4/fs/nilfs2/gcinode.c
.sync_page = block_sync_page,
};
-diff -urNp linux-2.6.31.4/fs/nilfs2/inode.c linux-2.6.31.4/fs/nilfs2/inode.c
---- linux-2.6.31.4/fs/nilfs2/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/inode.c 2009-10-11 15:29:46.457815912 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/inode.c linux-2.6.31.5/fs/nilfs2/inode.c
+--- linux-2.6.31.5/fs/nilfs2/inode.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/inode.c 2009-10-20 20:32:11.202198553 -0400
@@ -238,7 +238,7 @@ nilfs_direct_IO(int rw, struct kiocb *io
return size;
}
@@ -26058,9 +27322,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/inode.c linux-2.6.31.4/fs/nilfs2/inode.c
.writepage = nilfs_writepage,
.readpage = nilfs_readpage,
.sync_page = block_sync_page,
-diff -urNp linux-2.6.31.4/fs/nilfs2/mdt.c linux-2.6.31.4/fs/nilfs2/mdt.c
---- linux-2.6.31.4/fs/nilfs2/mdt.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/mdt.c 2009-10-11 15:29:46.469367503 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/mdt.c linux-2.6.31.5/fs/nilfs2/mdt.c
+--- linux-2.6.31.5/fs/nilfs2/mdt.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/mdt.c 2009-10-20 20:32:11.202198553 -0400
@@ -430,7 +430,7 @@ nilfs_mdt_write_page(struct page *page,
}
@@ -26070,9 +27334,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/mdt.c linux-2.6.31.4/fs/nilfs2/mdt.c
.writepage = nilfs_mdt_write_page,
.sync_page = block_sync_page,
};
-diff -urNp linux-2.6.31.4/fs/nilfs2/namei.c linux-2.6.31.4/fs/nilfs2/namei.c
---- linux-2.6.31.4/fs/nilfs2/namei.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/namei.c 2009-10-11 15:29:46.470397708 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/namei.c linux-2.6.31.5/fs/nilfs2/namei.c
+--- linux-2.6.31.5/fs/nilfs2/namei.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/namei.c 2009-10-20 20:32:11.202198553 -0400
@@ -448,7 +448,7 @@ out:
return err;
}
@@ -26097,9 +27361,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/namei.c linux-2.6.31.4/fs/nilfs2/namei.c
.readlink = generic_readlink,
.follow_link = page_follow_link_light,
.put_link = page_put_link,
-diff -urNp linux-2.6.31.4/fs/nilfs2/nilfs.h linux-2.6.31.4/fs/nilfs2/nilfs.h
---- linux-2.6.31.4/fs/nilfs2/nilfs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/nilfs.h 2009-10-11 15:29:46.471364793 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/nilfs.h linux-2.6.31.5/fs/nilfs2/nilfs.h
+--- linux-2.6.31.5/fs/nilfs2/nilfs.h 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/nilfs.h 2009-10-20 20:32:11.202198553 -0400
@@ -294,13 +294,13 @@ void nilfs_clear_gcdat_inode(struct the_
/*
* Inodes and files operations
@@ -26121,9 +27385,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/nilfs.h linux-2.6.31.4/fs/nilfs2/nilfs.h
/*
* filesystem type
-diff -urNp linux-2.6.31.4/fs/nilfs2/super.c linux-2.6.31.4/fs/nilfs2/super.c
---- linux-2.6.31.4/fs/nilfs2/super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nilfs2/super.c 2009-10-11 15:29:46.478795604 -0400
+diff -urNp linux-2.6.31.5/fs/nilfs2/super.c linux-2.6.31.5/fs/nilfs2/super.c
+--- linux-2.6.31.5/fs/nilfs2/super.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nilfs2/super.c 2009-10-20 20:32:11.202198553 -0400
@@ -529,7 +529,7 @@ static int nilfs_statfs(struct dentry *d
return 0;
}
@@ -26133,9 +27397,9 @@ diff -urNp linux-2.6.31.4/fs/nilfs2/super.c linux-2.6.31.4/fs/nilfs2/super.c
.alloc_inode = nilfs_alloc_inode,
.destroy_inode = nilfs_destroy_inode,
.dirty_inode = nilfs_dirty_inode,
-diff -urNp linux-2.6.31.4/fs/nls/nls_base.c linux-2.6.31.4/fs/nls/nls_base.c
---- linux-2.6.31.4/fs/nls/nls_base.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/nls/nls_base.c 2009-10-11 15:29:46.502448936 -0400
+diff -urNp linux-2.6.31.5/fs/nls/nls_base.c linux-2.6.31.5/fs/nls/nls_base.c
+--- linux-2.6.31.5/fs/nls/nls_base.c 2009-10-20 20:42:59.154564961 -0400
++++ linux-2.6.31.5/fs/nls/nls_base.c 2009-10-20 20:32:11.202198553 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -26145,9 +27409,9 @@ diff -urNp linux-2.6.31.4/fs/nls/nls_base.c linux-2.6.31.4/fs/nls/nls_base.c
};
#define UNICODE_MAX 0x0010ffff
-diff -urNp linux-2.6.31.4/fs/ntfs/file.c linux-2.6.31.4/fs/ntfs/file.c
---- linux-2.6.31.4/fs/ntfs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ntfs/file.c 2009-10-11 15:29:56.561366939 -0400
+diff -urNp linux-2.6.31.5/fs/ntfs/file.c linux-2.6.31.5/fs/ntfs/file.c
+--- linux-2.6.31.5/fs/ntfs/file.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ntfs/file.c 2009-10-20 20:32:11.202198553 -0400
@@ -2291,6 +2291,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -26157,9 +27421,9 @@ diff -urNp linux-2.6.31.4/fs/ntfs/file.c linux-2.6.31.4/fs/ntfs/file.c
-const struct inode_operations ntfs_empty_inode_ops = {};
+const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-2.6.31.4/fs/ocfs2/cluster/heartbeat.c linux-2.6.31.4/fs/ocfs2/cluster/heartbeat.c
---- linux-2.6.31.4/fs/ocfs2/cluster/heartbeat.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/cluster/heartbeat.c 2009-10-11 15:29:46.572499422 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/cluster/heartbeat.c linux-2.6.31.5/fs/ocfs2/cluster/heartbeat.c
+--- linux-2.6.31.5/fs/ocfs2/cluster/heartbeat.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/cluster/heartbeat.c 2009-10-20 20:32:11.202198553 -0400
@@ -966,7 +966,7 @@ static ssize_t o2hb_debug_read(struct fi
}
#endif /* CONFIG_DEBUG_FS */
@@ -26169,9 +27433,21 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/cluster/heartbeat.c linux-2.6.31.4/fs/ocfs2/c
.open = o2hb_debug_open,
.release = o2hb_debug_release,
.read = o2hb_debug_read,
-diff -urNp linux-2.6.31.4/fs/ocfs2/cluster/netdebug.c linux-2.6.31.4/fs/ocfs2/cluster/netdebug.c
---- linux-2.6.31.4/fs/ocfs2/cluster/netdebug.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/cluster/netdebug.c 2009-10-11 15:29:46.735364635 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/cluster/masklog.c linux-2.6.31.5/fs/ocfs2/cluster/masklog.c
+--- linux-2.6.31.5/fs/ocfs2/cluster/masklog.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/cluster/masklog.c 2009-10-20 20:33:11.040874213 -0400
+@@ -134,7 +134,7 @@ static ssize_t mlog_store(struct kobject
+ return mlog_mask_store(mlog_attr->mask, buf, count);
+ }
+
+-static struct sysfs_ops mlog_attr_ops = {
++static const struct sysfs_ops mlog_attr_ops = {
+ .show = mlog_show,
+ .store = mlog_store,
+ };
+diff -urNp linux-2.6.31.5/fs/ocfs2/cluster/netdebug.c linux-2.6.31.5/fs/ocfs2/cluster/netdebug.c
+--- linux-2.6.31.5/fs/ocfs2/cluster/netdebug.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/cluster/netdebug.c 2009-10-20 20:32:11.202198553 -0400
@@ -163,7 +163,7 @@ static void nst_seq_stop(struct seq_file
{
}
@@ -26208,9 +27484,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/cluster/netdebug.c linux-2.6.31.4/fs/ocfs2/cl
.open = sc_fop_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/fs/ocfs2/dlm/dlmdebug.c linux-2.6.31.4/fs/ocfs2/dlm/dlmdebug.c
---- linux-2.6.31.4/fs/ocfs2/dlm/dlmdebug.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/dlm/dlmdebug.c 2009-10-11 15:29:46.741462797 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/dlm/dlmdebug.c linux-2.6.31.5/fs/ocfs2/dlm/dlmdebug.c
+--- linux-2.6.31.5/fs/ocfs2/dlm/dlmdebug.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/dlm/dlmdebug.c 2009-10-20 20:32:11.202198553 -0400
@@ -479,7 +479,7 @@ bail:
return -ENOMEM;
}
@@ -26256,9 +27532,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/dlm/dlmdebug.c linux-2.6.31.4/fs/ocfs2/dlm/dl
.open = debug_state_open,
.release = debug_buffer_release,
.read = debug_buffer_read,
-diff -urNp linux-2.6.31.4/fs/ocfs2/localalloc.c linux-2.6.31.4/fs/ocfs2/localalloc.c
---- linux-2.6.31.4/fs/ocfs2/localalloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/localalloc.c 2009-10-11 15:29:46.742423150 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/localalloc.c linux-2.6.31.5/fs/ocfs2/localalloc.c
+--- linux-2.6.31.5/fs/ocfs2/localalloc.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/localalloc.c 2009-10-20 20:32:11.205658464 -0400
@@ -1186,7 +1186,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -26268,9 +27544,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/localalloc.c linux-2.6.31.4/fs/ocfs2/localall
status = 0;
bail:
-diff -urNp linux-2.6.31.4/fs/ocfs2/mmap.c linux-2.6.31.4/fs/ocfs2/mmap.c
---- linux-2.6.31.4/fs/ocfs2/mmap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/mmap.c 2009-10-11 15:29:46.743393548 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/mmap.c linux-2.6.31.5/fs/ocfs2/mmap.c
+--- linux-2.6.31.5/fs/ocfs2/mmap.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/mmap.c 2009-10-20 20:32:11.205658464 -0400
@@ -202,7 +202,7 @@ out:
return ret;
}
@@ -26280,9 +27556,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/mmap.c linux-2.6.31.4/fs/ocfs2/mmap.c
.fault = ocfs2_fault,
.page_mkwrite = ocfs2_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/ocfs2/ocfs2.h linux-2.6.31.4/fs/ocfs2/ocfs2.h
---- linux-2.6.31.4/fs/ocfs2/ocfs2.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/ocfs2.h 2009-10-11 15:29:46.746821045 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/ocfs2.h linux-2.6.31.5/fs/ocfs2/ocfs2.h
+--- linux-2.6.31.5/fs/ocfs2/ocfs2.h 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/ocfs2.h 2009-10-20 20:32:11.205658464 -0400
@@ -191,11 +191,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -26300,9 +27576,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/ocfs2.h linux-2.6.31.4/fs/ocfs2/ocfs2.h
};
enum ocfs2_local_alloc_state
-diff -urNp linux-2.6.31.4/fs/ocfs2/suballoc.c linux-2.6.31.4/fs/ocfs2/suballoc.c
---- linux-2.6.31.4/fs/ocfs2/suballoc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/suballoc.c 2009-10-11 15:29:46.761364329 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/suballoc.c linux-2.6.31.5/fs/ocfs2/suballoc.c
+--- linux-2.6.31.5/fs/ocfs2/suballoc.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/suballoc.c 2009-10-20 20:32:11.205658464 -0400
@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -26348,9 +27624,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/suballoc.c linux-2.6.31.4/fs/ocfs2/suballoc.c
}
}
if (status < 0) {
-diff -urNp linux-2.6.31.4/fs/ocfs2/super.c linux-2.6.31.4/fs/ocfs2/super.c
---- linux-2.6.31.4/fs/ocfs2/super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ocfs2/super.c 2009-10-11 15:29:46.780422864 -0400
+diff -urNp linux-2.6.31.5/fs/ocfs2/super.c linux-2.6.31.5/fs/ocfs2/super.c
+--- linux-2.6.31.5/fs/ocfs2/super.c 2009-10-20 20:42:59.157995048 -0400
++++ linux-2.6.31.5/fs/ocfs2/super.c 2009-10-20 20:32:11.205658464 -0400
@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
"%10s => GlobalAllocs: %d LocalAllocs: %d "
"SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
@@ -26394,9 +27670,9 @@ diff -urNp linux-2.6.31.4/fs/ocfs2/super.c linux-2.6.31.4/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
-diff -urNp linux-2.6.31.4/fs/omfs/dir.c linux-2.6.31.4/fs/omfs/dir.c
---- linux-2.6.31.4/fs/omfs/dir.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/omfs/dir.c 2009-10-11 15:29:46.789595505 -0400
+diff -urNp linux-2.6.31.5/fs/omfs/dir.c linux-2.6.31.5/fs/omfs/dir.c
+--- linux-2.6.31.5/fs/omfs/dir.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/omfs/dir.c 2009-10-20 20:32:11.205658464 -0400
@@ -489,7 +489,7 @@ out:
return ret;
}
@@ -26415,9 +27691,9 @@ diff -urNp linux-2.6.31.4/fs/omfs/dir.c linux-2.6.31.4/fs/omfs/dir.c
.read = generic_read_dir,
.readdir = omfs_readdir,
.llseek = generic_file_llseek,
-diff -urNp linux-2.6.31.4/fs/omfs/file.c linux-2.6.31.4/fs/omfs/file.c
---- linux-2.6.31.4/fs/omfs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/omfs/file.c 2009-10-11 15:29:46.790755470 -0400
+diff -urNp linux-2.6.31.5/fs/omfs/file.c linux-2.6.31.5/fs/omfs/file.c
+--- linux-2.6.31.5/fs/omfs/file.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/omfs/file.c 2009-10-20 20:32:11.205658464 -0400
@@ -322,7 +322,7 @@ static sector_t omfs_bmap(struct address
return generic_block_bmap(mapping, block, omfs_get_block);
}
@@ -26441,9 +27717,9 @@ diff -urNp linux-2.6.31.4/fs/omfs/file.c linux-2.6.31.4/fs/omfs/file.c
.readpage = omfs_readpage,
.readpages = omfs_readpages,
.writepage = omfs_writepage,
-diff -urNp linux-2.6.31.4/fs/omfs/inode.c linux-2.6.31.4/fs/omfs/inode.c
---- linux-2.6.31.4/fs/omfs/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/omfs/inode.c 2009-10-11 15:29:46.792134006 -0400
+diff -urNp linux-2.6.31.5/fs/omfs/inode.c linux-2.6.31.5/fs/omfs/inode.c
+--- linux-2.6.31.5/fs/omfs/inode.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/omfs/inode.c 2009-10-20 20:32:11.205658464 -0400
@@ -278,7 +278,7 @@ static int omfs_statfs(struct dentry *de
return 0;
}
@@ -26453,9 +27729,9 @@ diff -urNp linux-2.6.31.4/fs/omfs/inode.c linux-2.6.31.4/fs/omfs/inode.c
.write_inode = omfs_write_inode,
.delete_inode = omfs_delete_inode,
.put_super = omfs_put_super,
-diff -urNp linux-2.6.31.4/fs/omfs/omfs.h linux-2.6.31.4/fs/omfs/omfs.h
---- linux-2.6.31.4/fs/omfs/omfs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/omfs/omfs.h 2009-10-11 15:29:46.792134006 -0400
+diff -urNp linux-2.6.31.5/fs/omfs/omfs.h linux-2.6.31.5/fs/omfs/omfs.h
+--- linux-2.6.31.5/fs/omfs/omfs.h 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/omfs/omfs.h 2009-10-20 20:32:11.205658464 -0400
@@ -44,16 +44,16 @@ extern int omfs_allocate_range(struct su
extern int omfs_clear_range(struct super_block *sb, u64 block, int count);
@@ -26478,9 +27754,9 @@ diff -urNp linux-2.6.31.4/fs/omfs/omfs.h linux-2.6.31.4/fs/omfs/omfs.h
extern void omfs_make_empty_table(struct buffer_head *bh, int offset);
extern int omfs_shrink_inode(struct inode *inode);
-diff -urNp linux-2.6.31.4/fs/open.c linux-2.6.31.4/fs/open.c
---- linux-2.6.31.4/fs/open.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/open.c 2009-10-11 15:29:46.806390834 -0400
+diff -urNp linux-2.6.31.5/fs/open.c linux-2.6.31.5/fs/open.c
+--- linux-2.6.31.5/fs/open.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/open.c 2009-10-20 20:32:11.205658464 -0400
@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
@@ -26654,10 +27930,151 @@ diff -urNp linux-2.6.31.4/fs/open.c linux-2.6.31.4/fs/open.c
mnt_drop_write(file->f_path.mnt);
out_fput:
fput(file);
-diff -urNp linux-2.6.31.4/fs/pipe.c linux-2.6.31.4/fs/pipe.c
---- linux-2.6.31.4/fs/pipe.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/pipe.c 2009-10-11 15:29:46.817447071 -0400
-@@ -886,7 +886,7 @@ void free_pipe_info(struct inode *inode)
+diff -urNp linux-2.6.31.5/fs/pipe.c linux-2.6.31.5/fs/pipe.c
+--- linux-2.6.31.5/fs/pipe.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/pipe.c 2009-10-23 19:58:38.251949349 -0400
+@@ -401,9 +401,9 @@ redo:
+ }
+ if (bufs) /* More to do? */
+ continue;
+- if (!pipe->writers)
++ if (!atomic_read(&pipe->writers))
+ break;
+- if (!pipe->waiting_writers) {
++ if (!atomic_read(&pipe->waiting_writers)) {
+ /* syscall merging: Usually we must not sleep
+ * if O_NONBLOCK is set, or if we got some data.
+ * But if a writer sleeps in kernel space, then
+@@ -462,7 +462,7 @@ pipe_write(struct kiocb *iocb, const str
+ mutex_lock(&inode->i_mutex);
+ pipe = inode->i_pipe;
+
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ ret = -EPIPE;
+ goto out;
+@@ -511,7 +511,7 @@ redo1:
+ for (;;) {
+ int bufs;
+
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ if (!ret)
+ ret = -EPIPE;
+@@ -597,9 +597,9 @@ redo2:
+ kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
+ do_wakeup = 0;
+ }
+- pipe->waiting_writers++;
++ atomic_inc(&pipe->waiting_writers);
+ pipe_wait(pipe);
+- pipe->waiting_writers--;
++ atomic_dec(&pipe->waiting_writers);
+ }
+ out:
+ mutex_unlock(&inode->i_mutex);
+@@ -666,7 +666,7 @@ pipe_poll(struct file *filp, poll_table
+ mask = 0;
+ if (filp->f_mode & FMODE_READ) {
+ mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
+- if (!pipe->writers && filp->f_version != pipe->w_counter)
++ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
+ mask |= POLLHUP;
+ }
+
+@@ -676,7 +676,7 @@ pipe_poll(struct file *filp, poll_table
+ * Most Unices do not set POLLERR for FIFOs but on Linux they
+ * behave exactly like pipes for poll().
+ */
+- if (!pipe->readers)
++ if (!atomic_read(&pipe->readers))
+ mask |= POLLERR;
+ }
+
+@@ -690,10 +690,10 @@ pipe_release(struct inode *inode, int de
+
+ mutex_lock(&inode->i_mutex);
+ pipe = inode->i_pipe;
+- pipe->readers -= decr;
+- pipe->writers -= decw;
++ atomic_sub(decr, &pipe->readers);
++ atomic_sub(decw, &pipe->writers);
+
+- if (!pipe->readers && !pipe->writers) {
++ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
+ free_pipe_info(inode);
+ } else {
+ wake_up_interruptible_sync(&pipe->wait);
+@@ -777,36 +777,55 @@ pipe_rdwr_release(struct inode *inode, s
+ static int
+ pipe_read_open(struct inode *inode, struct file *filp)
+ {
+- /* We could have perhaps used atomic_t, but this and friends
+- below are the only places. So it doesn't seem worthwhile. */
++ int ret = -ENOENT;
++
+ mutex_lock(&inode->i_mutex);
+- inode->i_pipe->readers++;
++
++ if (inode->i_pipe) {
++ ret = 0;
++ atomic_inc(&inode->i_pipe->readers);
++ }
++
+ mutex_unlock(&inode->i_mutex);
+
+- return 0;
++ return ret;
+ }
+
+ static int
+ pipe_write_open(struct inode *inode, struct file *filp)
+ {
++ int ret = -ENOENT;
++
+ mutex_lock(&inode->i_mutex);
+- inode->i_pipe->writers++;
++
++ if (inode->i_pipe) {
++ ret = 0;
++ atomic_inc(&inode->i_pipe->writers);
++ }
++
+ mutex_unlock(&inode->i_mutex);
+
+- return 0;
++ return ret;
+ }
+
+ static int
+ pipe_rdwr_open(struct inode *inode, struct file *filp)
+ {
++ int ret = -ENOENT;
++
+ mutex_lock(&inode->i_mutex);
+- if (filp->f_mode & FMODE_READ)
+- inode->i_pipe->readers++;
+- if (filp->f_mode & FMODE_WRITE)
+- inode->i_pipe->writers++;
++
++ if (inode->i_pipe) {
++ ret = 0;
++ if (filp->f_mode & FMODE_READ)
++ atomic_inc(&inode->i_pipe->readers);
++ if (filp->f_mode & FMODE_WRITE)
++ atomic_inc(&inode->i_pipe->writers);
++ }
++
+ mutex_unlock(&inode->i_mutex);
+
+- return 0;
++ return ret;
+ }
+
+ /*
+@@ -886,7 +905,7 @@ void free_pipe_info(struct inode *inode)
inode->i_pipe = NULL;
}
@@ -26666,9 +28083,19 @@ diff -urNp linux-2.6.31.4/fs/pipe.c linux-2.6.31.4/fs/pipe.c
static int pipefs_delete_dentry(struct dentry *dentry)
{
/*
-diff -urNp linux-2.6.31.4/fs/proc/array.c linux-2.6.31.4/fs/proc/array.c
---- linux-2.6.31.4/fs/proc/array.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/array.c 2009-10-11 15:29:46.828369273 -0400
+@@ -926,7 +945,8 @@ static struct inode * get_pipe_inode(voi
+ goto fail_iput;
+ inode->i_pipe = pipe;
+
+- pipe->readers = pipe->writers = 1;
++ atomic_set(&pipe->readers, 1);
++ atomic_set(&pipe->writers, 1);
+ inode->i_fop = &rdwr_pipefifo_fops;
+
+ /*
+diff -urNp linux-2.6.31.5/fs/proc/array.c linux-2.6.31.5/fs/proc/array.c
+--- linux-2.6.31.5/fs/proc/array.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/array.c 2009-10-20 20:32:11.205658464 -0400
@@ -321,6 +321,21 @@ static inline void task_context_switch_c
p->nivcsw);
}
@@ -26759,9 +28186,9 @@ diff -urNp linux-2.6.31.4/fs/proc/array.c linux-2.6.31.4/fs/proc/array.c
+ return sprintf(buffer, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip));
+}
+#endif
-diff -urNp linux-2.6.31.4/fs/proc/base.c linux-2.6.31.4/fs/proc/base.c
---- linux-2.6.31.4/fs/proc/base.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/base.c 2009-10-11 15:29:46.841367255 -0400
+diff -urNp linux-2.6.31.5/fs/proc/base.c linux-2.6.31.5/fs/proc/base.c
+--- linux-2.6.31.5/fs/proc/base.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/base.c 2009-10-20 20:32:11.209060106 -0400
@@ -213,6 +213,9 @@ static int check_mem_permission(struct t
if (task == current)
return 0;
@@ -27086,9 +28513,9 @@ diff -urNp linux-2.6.31.4/fs/proc/base.c linux-2.6.31.4/fs/proc/base.c
ONE("stack", S_IRUSR, proc_pid_stack),
#endif
#ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-2.6.31.4/fs/proc/cmdline.c linux-2.6.31.4/fs/proc/cmdline.c
---- linux-2.6.31.4/fs/proc/cmdline.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/cmdline.c 2009-10-11 15:29:46.842364196 -0400
+diff -urNp linux-2.6.31.5/fs/proc/cmdline.c linux-2.6.31.5/fs/proc/cmdline.c
+--- linux-2.6.31.5/fs/proc/cmdline.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/cmdline.c 2009-10-20 20:32:11.209060106 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -27101,9 +28528,9 @@ diff -urNp linux-2.6.31.4/fs/proc/cmdline.c linux-2.6.31.4/fs/proc/cmdline.c
return 0;
}
module_init(proc_cmdline_init);
-diff -urNp linux-2.6.31.4/fs/proc/devices.c linux-2.6.31.4/fs/proc/devices.c
---- linux-2.6.31.4/fs/proc/devices.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/devices.c 2009-10-11 15:29:46.843365305 -0400
+diff -urNp linux-2.6.31.5/fs/proc/devices.c linux-2.6.31.5/fs/proc/devices.c
+--- linux-2.6.31.5/fs/proc/devices.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/devices.c 2009-10-20 20:32:11.209060106 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -27116,9 +28543,9 @@ diff -urNp linux-2.6.31.4/fs/proc/devices.c linux-2.6.31.4/fs/proc/devices.c
return 0;
}
module_init(proc_devices_init);
-diff -urNp linux-2.6.31.4/fs/proc/inode.c linux-2.6.31.4/fs/proc/inode.c
---- linux-2.6.31.4/fs/proc/inode.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/inode.c 2009-10-11 15:29:46.844357952 -0400
+diff -urNp linux-2.6.31.5/fs/proc/inode.c linux-2.6.31.5/fs/proc/inode.c
+--- linux-2.6.31.5/fs/proc/inode.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/inode.c 2009-10-20 20:32:11.209060106 -0400
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -27131,9 +28558,9 @@ diff -urNp linux-2.6.31.4/fs/proc/inode.c linux-2.6.31.4/fs/proc/inode.c
}
if (de->size)
inode->i_size = de->size;
-diff -urNp linux-2.6.31.4/fs/proc/internal.h linux-2.6.31.4/fs/proc/internal.h
---- linux-2.6.31.4/fs/proc/internal.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/internal.h 2009-10-11 15:29:46.844357952 -0400
+diff -urNp linux-2.6.31.5/fs/proc/internal.h linux-2.6.31.5/fs/proc/internal.h
+--- linux-2.6.31.5/fs/proc/internal.h 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/internal.h 2009-10-20 20:32:11.209060106 -0400
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -27144,9 +28571,9 @@ diff -urNp linux-2.6.31.4/fs/proc/internal.h linux-2.6.31.4/fs/proc/internal.h
extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.31.4/fs/proc/Kconfig linux-2.6.31.4/fs/proc/Kconfig
---- linux-2.6.31.4/fs/proc/Kconfig 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/Kconfig 2009-10-11 15:29:46.845374772 -0400
+diff -urNp linux-2.6.31.5/fs/proc/Kconfig linux-2.6.31.5/fs/proc/Kconfig
+--- linux-2.6.31.5/fs/proc/Kconfig 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/Kconfig 2009-10-20 20:32:11.209060106 -0400
@@ -30,12 +30,12 @@ config PROC_FS
config PROC_KCORE
@@ -27174,9 +28601,39 @@ diff -urNp linux-2.6.31.4/fs/proc/Kconfig linux-2.6.31.4/fs/proc/Kconfig
bool "Enable /proc page monitoring" if EMBEDDED
help
Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-2.6.31.4/fs/proc/kcore.c linux-2.6.31.4/fs/proc/kcore.c
---- linux-2.6.31.4/fs/proc/kcore.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/kcore.c 2009-10-11 15:29:46.845374772 -0400
+diff -urNp linux-2.6.31.5/fs/proc/kcore.c linux-2.6.31.5/fs/proc/kcore.c
+--- linux-2.6.31.5/fs/proc/kcore.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/kcore.c 2009-10-20 20:33:11.040874213 -0400
+@@ -314,16 +314,16 @@ read_kcore(struct file *file, char __use
+ tsz = buflen;
+
+ while (buflen) {
+- struct kcore_list *m;
++ struct kcore_list *kc;
+
+ read_lock(&kclist_lock);
+- for (m=kclist; m; m=m->next) {
+- if (start >= m->addr && start < (m->addr+m->size))
++ for (kc=kclist; kc; kc=kc->next) {
++ if (start >= kc->addr && start < (kc->addr+kc->size))
+ break;
+ }
+ read_unlock(&kclist_lock);
+
+- if (m == NULL) {
++ if (kc == NULL) {
+ if (clear_user(buffer, tsz))
+ return -EFAULT;
+ } else if (is_vmalloc_addr((void *)start)) {
+@@ -368,7 +368,7 @@ read_kcore(struct file *file, char __use
+ */
+ vmsize = __copy_from_user_inatomic(
+ elf_buf + (vmstart - start),
+- (char *)vmstart, vmsize);
++ (char __user *)vmstart, vmsize);
+ }
+ read_unlock(&vmlist_lock);
+ if (copy_to_user(buffer, elf_buf, tsz)) {
@@ -410,10 +410,12 @@ read_kcore(struct file *file, char __use
static int __init proc_kcore_init(void)
@@ -27190,9 +28647,9 @@ diff -urNp linux-2.6.31.4/fs/proc/kcore.c linux-2.6.31.4/fs/proc/kcore.c
return 0;
}
module_init(proc_kcore_init);
-diff -urNp linux-2.6.31.4/fs/proc/nommu.c linux-2.6.31.4/fs/proc/nommu.c
---- linux-2.6.31.4/fs/proc/nommu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/nommu.c 2009-10-11 15:29:46.846364828 -0400
+diff -urNp linux-2.6.31.5/fs/proc/nommu.c linux-2.6.31.5/fs/proc/nommu.c
+--- linux-2.6.31.5/fs/proc/nommu.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/nommu.c 2009-10-20 20:32:11.209060106 -0400
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -27211,9 +28668,9 @@ diff -urNp linux-2.6.31.4/fs/proc/nommu.c linux-2.6.31.4/fs/proc/nommu.c
.start = nommu_region_list_start,
.next = nommu_region_list_next,
.stop = nommu_region_list_stop,
-diff -urNp linux-2.6.31.4/fs/proc/proc_net.c linux-2.6.31.4/fs/proc/proc_net.c
---- linux-2.6.31.4/fs/proc/proc_net.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/proc_net.c 2009-10-11 15:29:46.860595458 -0400
+diff -urNp linux-2.6.31.5/fs/proc/proc_net.c linux-2.6.31.5/fs/proc/proc_net.c
+--- linux-2.6.31.5/fs/proc/proc_net.c 2009-10-20 20:42:59.161250773 -0400
++++ linux-2.6.31.5/fs/proc/proc_net.c 2009-10-20 20:32:11.209060106 -0400
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -27232,9 +28689,9 @@ diff -urNp linux-2.6.31.4/fs/proc/proc_net.c linux-2.6.31.4/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-2.6.31.4/fs/proc/proc_sysctl.c linux-2.6.31.4/fs/proc/proc_sysctl.c
---- linux-2.6.31.4/fs/proc/proc_sysctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/proc_sysctl.c 2009-10-11 15:29:46.861570763 -0400
+diff -urNp linux-2.6.31.5/fs/proc/proc_sysctl.c linux-2.6.31.5/fs/proc/proc_sysctl.c
+--- linux-2.6.31.5/fs/proc/proc_sysctl.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/proc/proc_sysctl.c 2009-10-20 20:32:11.209060106 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -27274,9 +28731,9 @@ diff -urNp linux-2.6.31.4/fs/proc/proc_sysctl.c linux-2.6.31.4/fs/proc/proc_sysc
generic_fillattr(inode, stat);
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-2.6.31.4/fs/proc/root.c linux-2.6.31.4/fs/proc/root.c
---- linux-2.6.31.4/fs/proc/root.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/root.c 2009-10-11 15:29:46.862452434 -0400
+diff -urNp linux-2.6.31.5/fs/proc/root.c linux-2.6.31.5/fs/proc/root.c
+--- linux-2.6.31.5/fs/proc/root.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/proc/root.c 2009-10-20 20:32:11.209060106 -0400
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -27293,9 +28750,9 @@ diff -urNp linux-2.6.31.4/fs/proc/root.c linux-2.6.31.4/fs/proc/root.c
proc_sys_init();
}
-diff -urNp linux-2.6.31.4/fs/proc/task_mmu.c linux-2.6.31.4/fs/proc/task_mmu.c
---- linux-2.6.31.4/fs/proc/task_mmu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/task_mmu.c 2009-10-11 15:29:46.862452434 -0400
+diff -urNp linux-2.6.31.5/fs/proc/task_mmu.c linux-2.6.31.5/fs/proc/task_mmu.c
+--- linux-2.6.31.5/fs/proc/task_mmu.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/proc/task_mmu.c 2009-10-20 20:32:11.209060106 -0400
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -27416,9 +28873,9 @@ diff -urNp linux-2.6.31.4/fs/proc/task_mmu.c linux-2.6.31.4/fs/proc/task_mmu.c
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
-diff -urNp linux-2.6.31.4/fs/proc/task_nommu.c linux-2.6.31.4/fs/proc/task_nommu.c
---- linux-2.6.31.4/fs/proc/task_nommu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/proc/task_nommu.c 2009-10-11 15:29:46.863521624 -0400
+diff -urNp linux-2.6.31.5/fs/proc/task_nommu.c linux-2.6.31.5/fs/proc/task_nommu.c
+--- linux-2.6.31.5/fs/proc/task_nommu.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/proc/task_nommu.c 2009-10-20 20:32:11.209060106 -0400
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -27437,9 +28894,9 @@ diff -urNp linux-2.6.31.4/fs/proc/task_nommu.c linux-2.6.31.4/fs/proc/task_nommu
}
seq_putc(m, '\n');
-diff -urNp linux-2.6.31.4/fs/readdir.c linux-2.6.31.4/fs/readdir.c
---- linux-2.6.31.4/fs/readdir.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/readdir.c 2009-10-11 15:29:46.877369354 -0400
+diff -urNp linux-2.6.31.5/fs/readdir.c linux-2.6.31.5/fs/readdir.c
+--- linux-2.6.31.5/fs/readdir.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/readdir.c 2009-10-20 20:32:11.209060106 -0400
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -27529,9 +28986,9 @@ diff -urNp linux-2.6.31.4/fs/readdir.c linux-2.6.31.4/fs/readdir.c
buf.count = count;
buf.error = 0;
-diff -urNp linux-2.6.31.4/fs/reiserfs/do_balan.c linux-2.6.31.4/fs/reiserfs/do_balan.c
---- linux-2.6.31.4/fs/reiserfs/do_balan.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/reiserfs/do_balan.c 2009-10-11 15:29:46.971431008 -0400
+diff -urNp linux-2.6.31.5/fs/reiserfs/do_balan.c linux-2.6.31.5/fs/reiserfs/do_balan.c
+--- linux-2.6.31.5/fs/reiserfs/do_balan.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/reiserfs/do_balan.c 2009-10-20 20:32:11.212593308 -0400
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -27541,9 +28998,9 @@ diff -urNp linux-2.6.31.4/fs/reiserfs/do_balan.c linux-2.6.31.4/fs/reiserfs/do_b
do_balance_starts(tb);
/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-2.6.31.4/fs/reiserfs/procfs.c linux-2.6.31.4/fs/reiserfs/procfs.c
---- linux-2.6.31.4/fs/reiserfs/procfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/reiserfs/procfs.c 2009-10-11 15:29:46.977743773 -0400
+diff -urNp linux-2.6.31.5/fs/reiserfs/procfs.c linux-2.6.31.5/fs/reiserfs/procfs.c
+--- linux-2.6.31.5/fs/reiserfs/procfs.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/reiserfs/procfs.c 2009-10-20 20:32:11.212593308 -0400
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -27553,9 +29010,9 @@ diff -urNp linux-2.6.31.4/fs/reiserfs/procfs.c linux-2.6.31.4/fs/reiserfs/procfs
SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
-diff -urNp linux-2.6.31.4/fs/romfs/super.c linux-2.6.31.4/fs/romfs/super.c
---- linux-2.6.31.4/fs/romfs/super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/romfs/super.c 2009-10-11 15:29:46.985687995 -0400
+diff -urNp linux-2.6.31.5/fs/romfs/super.c linux-2.6.31.5/fs/romfs/super.c
+--- linux-2.6.31.5/fs/romfs/super.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/romfs/super.c 2009-10-20 20:32:11.212593308 -0400
@@ -284,7 +284,7 @@ static const struct file_operations romf
.readdir = romfs_readdir,
};
@@ -27565,9 +29022,9 @@ diff -urNp linux-2.6.31.4/fs/romfs/super.c linux-2.6.31.4/fs/romfs/super.c
.lookup = romfs_lookup,
};
-diff -urNp linux-2.6.31.4/fs/select.c linux-2.6.31.4/fs/select.c
---- linux-2.6.31.4/fs/select.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/select.c 2009-10-11 15:29:46.996819755 -0400
+diff -urNp linux-2.6.31.5/fs/select.c linux-2.6.31.5/fs/select.c
+--- linux-2.6.31.5/fs/select.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/select.c 2009-10-20 20:32:11.212593308 -0400
@@ -19,6 +19,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -27584,9 +29041,9 @@ diff -urNp linux-2.6.31.4/fs/select.c linux-2.6.31.4/fs/select.c
if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
return -EINVAL;
-diff -urNp linux-2.6.31.4/fs/seq_file.c linux-2.6.31.4/fs/seq_file.c
---- linux-2.6.31.4/fs/seq_file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/seq_file.c 2009-10-11 15:29:47.009364999 -0400
+diff -urNp linux-2.6.31.5/fs/seq_file.c linux-2.6.31.5/fs/seq_file.c
+--- linux-2.6.31.5/fs/seq_file.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/seq_file.c 2009-10-20 20:32:11.212593308 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -27627,9 +29084,9 @@ diff -urNp linux-2.6.31.4/fs/seq_file.c linux-2.6.31.4/fs/seq_file.c
if (!m->buf)
goto Enomem;
m->count = 0;
-diff -urNp linux-2.6.31.4/fs/smbfs/symlink.c linux-2.6.31.4/fs/smbfs/symlink.c
---- linux-2.6.31.4/fs/smbfs/symlink.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/smbfs/symlink.c 2009-10-11 15:29:47.016374484 -0400
+diff -urNp linux-2.6.31.5/fs/smbfs/symlink.c linux-2.6.31.5/fs/smbfs/symlink.c
+--- linux-2.6.31.5/fs/smbfs/symlink.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/smbfs/symlink.c 2009-10-20 20:32:11.212593308 -0400
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -27639,9 +29096,150 @@ diff -urNp linux-2.6.31.4/fs/smbfs/symlink.c linux-2.6.31.4/fs/smbfs/symlink.c
if (!IS_ERR(s))
__putname(s);
}
-diff -urNp linux-2.6.31.4/fs/squashfs/super.c linux-2.6.31.4/fs/squashfs/super.c
---- linux-2.6.31.4/fs/squashfs/super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/squashfs/super.c 2009-10-11 15:29:47.021720727 -0400
+diff -urNp linux-2.6.31.5/fs/splice.c linux-2.6.31.5/fs/splice.c
+--- linux-2.6.31.5/fs/splice.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/splice.c 2009-10-23 19:42:57.532081568 -0400
+@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
+ pipe_lock(pipe);
+
+ for (;;) {
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ if (!ret)
+ ret = -EPIPE;
+@@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode
+ do_wakeup = 0;
+ }
+
+- pipe->waiting_writers++;
++ atomic_inc(&pipe->waiting_writers);
+ pipe_wait(pipe);
+- pipe->waiting_writers--;
++ atomic_dec(&pipe->waiting_writers);
+ }
+
+ pipe_unlock(pipe);
+@@ -529,7 +529,7 @@ static ssize_t kernel_readv(struct file
+ old_fs = get_fs();
+ set_fs(get_ds());
+ /* The cast to a user pointer is valid due to the set_fs() */
+- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
++ res = vfs_readv(file, (__force const struct iovec __user *)vec, vlen, &pos);
+ set_fs(old_fs);
+
+ return res;
+@@ -544,7 +544,7 @@ static ssize_t kernel_write(struct file
+ old_fs = get_fs();
+ set_fs(get_ds());
+ /* The cast to a user pointer is valid due to the set_fs() */
+- res = vfs_write(file, (const char __user *)buf, count, &pos);
++ res = vfs_write(file, (__force const char __user *)buf, count, &pos);
+ set_fs(old_fs);
+
+ return res;
+@@ -586,7 +586,7 @@ ssize_t default_file_splice_read(struct
+ goto err;
+
+ this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
+- vec[i].iov_base = (void __user *) page_address(page);
++ vec[i].iov_base = (__force void __user *) page_address(page);
+ vec[i].iov_len = this_len;
+ pages[i] = page;
+ spd.nr_pages++;
+@@ -806,10 +806,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+ int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
+ {
+ while (!pipe->nrbufs) {
+- if (!pipe->writers)
++ if (!atomic_read(&pipe->writers))
+ return 0;
+
+- if (!pipe->waiting_writers && sd->num_spliced)
++ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
+ return 0;
+
+ if (sd->flags & SPLICE_F_NONBLOCK)
+@@ -1152,7 +1152,7 @@ ssize_t splice_direct_to_actor(struct fi
+ * out of the pipe right after the splice_to_pipe(). So set
+ * PIPE_READERS appropriately.
+ */
+- pipe->readers = 1;
++ atomic_set(&pipe->readers, 1);
+
+ current->splice_pipe = pipe;
+ }
+@@ -1710,9 +1710,9 @@ static int ipipe_prep(struct pipe_inode_
+ ret = -ERESTARTSYS;
+ break;
+ }
+- if (!pipe->writers)
++ if (!atomic_read(&pipe->writers))
+ break;
+- if (!pipe->waiting_writers) {
++ if (!atomic_read(&pipe->waiting_writers)) {
+ if (flags & SPLICE_F_NONBLOCK) {
+ ret = -EAGAIN;
+ break;
+@@ -1744,7 +1744,7 @@ static int opipe_prep(struct pipe_inode_
+ pipe_lock(pipe);
+
+ while (pipe->nrbufs >= PIPE_BUFFERS) {
+- if (!pipe->readers) {
++ if (!atomic_read(&pipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ ret = -EPIPE;
+ break;
+@@ -1757,9 +1757,9 @@ static int opipe_prep(struct pipe_inode_
+ ret = -ERESTARTSYS;
+ break;
+ }
+- pipe->waiting_writers++;
++ atomic_inc(&pipe->waiting_writers);
+ pipe_wait(pipe);
+- pipe->waiting_writers--;
++ atomic_dec(&pipe->waiting_writers);
+ }
+
+ pipe_unlock(pipe);
+@@ -1795,14 +1795,14 @@ retry:
+ pipe_double_lock(ipipe, opipe);
+
+ do {
+- if (!opipe->readers) {
++ if (!atomic_read(&opipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ if (!ret)
+ ret = -EPIPE;
+ break;
+ }
+
+- if (!ipipe->nrbufs && !ipipe->writers)
++ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
+ break;
+
+ /*
+@@ -1902,7 +1902,7 @@ static int link_pipe(struct pipe_inode_i
+ pipe_double_lock(ipipe, opipe);
+
+ do {
+- if (!opipe->readers) {
++ if (!atomic_read(&opipe->readers)) {
+ send_sig(SIGPIPE, current, 0);
+ if (!ret)
+ ret = -EPIPE;
+@@ -1947,7 +1947,7 @@ static int link_pipe(struct pipe_inode_i
+ * return EAGAIN if we have the potential of some data in the
+ * future, otherwise just return 0
+ */
+- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
++ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
+ ret = -EAGAIN;
+
+ pipe_unlock(ipipe);
+diff -urNp linux-2.6.31.5/fs/squashfs/super.c linux-2.6.31.5/fs/squashfs/super.c
+--- linux-2.6.31.5/fs/squashfs/super.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/squashfs/super.c 2009-10-20 20:32:11.212593308 -0400
@@ -44,7 +44,7 @@
#include "squashfs.h"
@@ -27660,9 +29258,9 @@ diff -urNp linux-2.6.31.4/fs/squashfs/super.c linux-2.6.31.4/fs/squashfs/super.c
.alloc_inode = squashfs_alloc_inode,
.destroy_inode = squashfs_destroy_inode,
.statfs = squashfs_statfs,
-diff -urNp linux-2.6.31.4/fs/sysfs/bin.c linux-2.6.31.4/fs/sysfs/bin.c
---- linux-2.6.31.4/fs/sysfs/bin.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/sysfs/bin.c 2009-10-11 15:29:47.025732324 -0400
+diff -urNp linux-2.6.31.5/fs/sysfs/bin.c linux-2.6.31.5/fs/sysfs/bin.c
+--- linux-2.6.31.5/fs/sysfs/bin.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/sysfs/bin.c 2009-10-20 20:32:11.212593308 -0400
@@ -40,7 +40,7 @@ struct bin_buffer {
struct mutex mutex;
void *buffer;
@@ -27681,9 +29279,21 @@ diff -urNp linux-2.6.31.4/fs/sysfs/bin.c linux-2.6.31.4/fs/sysfs/bin.c
.open = bin_vma_open,
.close = bin_vma_close,
.fault = bin_fault,
-diff -urNp linux-2.6.31.4/fs/sysfs/symlink.c linux-2.6.31.4/fs/sysfs/symlink.c
---- linux-2.6.31.4/fs/sysfs/symlink.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/sysfs/symlink.c 2009-10-11 15:29:47.026482828 -0400
+diff -urNp linux-2.6.31.5/fs/sysfs/file.c linux-2.6.31.5/fs/sysfs/file.c
+--- linux-2.6.31.5/fs/sysfs/file.c 2009-10-23 19:50:17.593999889 -0400
++++ linux-2.6.31.5/fs/sysfs/file.c 2009-10-23 19:50:30.050681672 -0400
+@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode
+ struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
+ struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
+ struct sysfs_buffer *buffer;
+- struct sysfs_ops *ops;
++ const struct sysfs_ops *ops;
+ int error = -EACCES;
+ char *p;
+
+diff -urNp linux-2.6.31.5/fs/sysfs/symlink.c linux-2.6.31.5/fs/sysfs/symlink.c
+--- linux-2.6.31.5/fs/sysfs/symlink.c 2009-10-20 20:42:59.164835047 -0400
++++ linux-2.6.31.5/fs/sysfs/symlink.c 2009-10-20 20:32:11.212593308 -0400
@@ -203,7 +203,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -27693,9 +29303,9 @@ diff -urNp linux-2.6.31.4/fs/sysfs/symlink.c linux-2.6.31.4/fs/sysfs/symlink.c
if (!IS_ERR(page))
free_page((unsigned long)page);
}
-diff -urNp linux-2.6.31.4/fs/ubifs/file.c linux-2.6.31.4/fs/ubifs/file.c
---- linux-2.6.31.4/fs/ubifs/file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/ubifs/file.c 2009-10-11 15:29:47.031357207 -0400
+diff -urNp linux-2.6.31.5/fs/ubifs/file.c linux-2.6.31.5/fs/ubifs/file.c
+--- linux-2.6.31.5/fs/ubifs/file.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/ubifs/file.c 2009-10-20 20:32:11.212593308 -0400
@@ -1536,7 +1536,7 @@ out_unlock:
return err;
}
@@ -27705,9 +29315,9 @@ diff -urNp linux-2.6.31.4/fs/ubifs/file.c linux-2.6.31.4/fs/ubifs/file.c
.fault = filemap_fault,
.page_mkwrite = ubifs_vm_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/udf/balloc.c linux-2.6.31.4/fs/udf/balloc.c
---- linux-2.6.31.4/fs/udf/balloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/udf/balloc.c 2009-10-11 15:29:47.051362185 -0400
+diff -urNp linux-2.6.31.5/fs/udf/balloc.c linux-2.6.31.5/fs/udf/balloc.c
+--- linux-2.6.31.5/fs/udf/balloc.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/udf/balloc.c 2009-10-20 20:32:11.212593308 -0400
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -27730,9 +29340,9 @@ diff -urNp linux-2.6.31.4/fs/udf/balloc.c linux-2.6.31.4/fs/udf/balloc.c
udf_debug("%d < %d || %d + %d > %d\n",
bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
partmap->s_partition_len);
-diff -urNp linux-2.6.31.4/fs/utimes.c linux-2.6.31.4/fs/utimes.c
---- linux-2.6.31.4/fs/utimes.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/utimes.c 2009-10-11 15:29:47.064417796 -0400
+diff -urNp linux-2.6.31.5/fs/utimes.c linux-2.6.31.5/fs/utimes.c
+--- linux-2.6.31.5/fs/utimes.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/utimes.c 2009-10-20 20:32:11.212593308 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -27754,9 +29364,9 @@ diff -urNp linux-2.6.31.4/fs/utimes.c linux-2.6.31.4/fs/utimes.c
mutex_lock(&inode->i_mutex);
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_file.c linux-2.6.31.4/fs/xfs/linux-2.6/xfs_file.c
---- linux-2.6.31.4/fs/xfs/linux-2.6/xfs_file.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/xfs/linux-2.6/xfs_file.c 2009-10-11 15:29:47.067624386 -0400
+diff -urNp linux-2.6.31.5/fs/xfs/linux-2.6/xfs_file.c linux-2.6.31.5/fs/xfs/linux-2.6/xfs_file.c
+--- linux-2.6.31.5/fs/xfs/linux-2.6/xfs_file.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/xfs/linux-2.6/xfs_file.c 2009-10-20 20:32:11.212593308 -0400
@@ -42,7 +42,7 @@
#include <linux/dcache.h>
@@ -27775,9 +29385,9 @@ diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_file.c linux-2.6.31.4/fs/xfs/linu
.fault = filemap_fault,
.page_mkwrite = xfs_vm_page_mkwrite,
};
-diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.31.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.31.4/fs/xfs/linux-2.6/xfs_iops.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/xfs/linux-2.6/xfs_iops.c 2009-10-11 15:29:47.070535377 -0400
+diff -urNp linux-2.6.31.5/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.31.5/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-2.6.31.5/fs/xfs/linux-2.6/xfs_iops.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/xfs/linux-2.6/xfs_iops.c 2009-10-20 20:32:11.212593308 -0400
@@ -478,7 +478,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -27787,9 +29397,9 @@ diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.31.4/fs/xfs/linu
if (!IS_ERR(s))
kfree(s);
-diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_super.c linux-2.6.31.4/fs/xfs/linux-2.6/xfs_super.c
---- linux-2.6.31.4/fs/xfs/linux-2.6/xfs_super.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/xfs/linux-2.6/xfs_super.c 2009-10-11 15:29:47.081708416 -0400
+diff -urNp linux-2.6.31.5/fs/xfs/linux-2.6/xfs_super.c linux-2.6.31.5/fs/xfs/linux-2.6/xfs_super.c
+--- linux-2.6.31.5/fs/xfs/linux-2.6/xfs_super.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/xfs/linux-2.6/xfs_super.c 2009-10-20 20:32:11.215896675 -0400
@@ -67,7 +67,7 @@
#include <linux/freezer.h>
#include <linux/parser.h>
@@ -27808,9 +29418,9 @@ diff -urNp linux-2.6.31.4/fs/xfs/linux-2.6/xfs_super.c linux-2.6.31.4/fs/xfs/lin
.alloc_inode = xfs_fs_alloc_inode,
.destroy_inode = xfs_fs_destroy_inode,
.write_inode = xfs_fs_write_inode,
-diff -urNp linux-2.6.31.4/fs/xfs/xfs_bmap.c linux-2.6.31.4/fs/xfs/xfs_bmap.c
---- linux-2.6.31.4/fs/xfs/xfs_bmap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/fs/xfs/xfs_bmap.c 2009-10-11 15:29:47.090543861 -0400
+diff -urNp linux-2.6.31.5/fs/xfs/xfs_bmap.c linux-2.6.31.5/fs/xfs/xfs_bmap.c
+--- linux-2.6.31.5/fs/xfs/xfs_bmap.c 2009-10-20 20:42:59.168260599 -0400
++++ linux-2.6.31.5/fs/xfs/xfs_bmap.c 2009-10-20 20:32:11.215896675 -0400
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -27820,9 +29430,9 @@ diff -urNp linux-2.6.31.4/fs/xfs/xfs_bmap.c linux-2.6.31.4/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
#if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.31.4/grsecurity/gracl_alloc.c linux-2.6.31.4/grsecurity/gracl_alloc.c
---- linux-2.6.31.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_alloc.c 2009-10-11 15:29:47.091547864 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_alloc.c linux-2.6.31.5/grsecurity/gracl_alloc.c
+--- linux-2.6.31.5/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_alloc.c 2009-10-20 20:32:11.215896675 -0400
@@ -0,0 +1,105 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -27929,9 +29539,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_alloc.c linux-2.6.31.4/grsecurity/gra
+ else
+ return 1;
+}
-diff -urNp linux-2.6.31.4/grsecurity/gracl.c linux-2.6.31.4/grsecurity/gracl.c
---- linux-2.6.31.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl.c 2009-10-12 23:24:21.678213713 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl.c linux-2.6.31.5/grsecurity/gracl.c
+--- linux-2.6.31.5/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl.c 2009-10-20 20:32:11.215896675 -0400
@@ -0,0 +1,3910 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -31843,9 +33453,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl.c linux-2.6.31.4/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
-diff -urNp linux-2.6.31.4/grsecurity/gracl_cap.c linux-2.6.31.4/grsecurity/gracl_cap.c
---- linux-2.6.31.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_cap.c 2009-10-11 15:29:47.093493469 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_cap.c linux-2.6.31.5/grsecurity/gracl_cap.c
+--- linux-2.6.31.5/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_cap.c 2009-10-20 20:32:11.215896675 -0400
@@ -0,0 +1,131 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -31978,9 +33588,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_cap.c linux-2.6.31.4/grsecurity/gracl
+ return 0;
+}
+
-diff -urNp linux-2.6.31.4/grsecurity/gracl_fs.c linux-2.6.31.4/grsecurity/gracl_fs.c
---- linux-2.6.31.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_fs.c 2009-10-11 15:29:47.093493469 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_fs.c linux-2.6.31.5/grsecurity/gracl_fs.c
+--- linux-2.6.31.5/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_fs.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -32406,9 +34016,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_fs.c linux-2.6.31.4/grsecurity/gracl_
+
+ return 0;
+}
-diff -urNp linux-2.6.31.4/grsecurity/gracl_ip.c linux-2.6.31.4/grsecurity/gracl_ip.c
---- linux-2.6.31.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_ip.c 2009-10-11 15:29:47.094442375 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_ip.c linux-2.6.31.5/grsecurity/gracl_ip.c
+--- linux-2.6.31.5/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_ip.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,340 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -32750,9 +34360,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_ip.c linux-2.6.31.4/grsecurity/gracl_
+
+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
+}
-diff -urNp linux-2.6.31.4/grsecurity/gracl_learn.c linux-2.6.31.4/grsecurity/gracl_learn.c
---- linux-2.6.31.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_learn.c 2009-10-11 15:29:47.251814955 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_learn.c linux-2.6.31.5/grsecurity/gracl_learn.c
+--- linux-2.6.31.5/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_learn.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -32965,9 +34575,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_learn.c linux-2.6.31.4/grsecurity/gra
+ .release = close_learn,
+ .poll = poll_learn,
+};
-diff -urNp linux-2.6.31.4/grsecurity/gracl_res.c linux-2.6.31.4/grsecurity/gracl_res.c
---- linux-2.6.31.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_res.c 2009-10-11 15:29:47.252524620 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_res.c linux-2.6.31.5/grsecurity/gracl_res.c
+--- linux-2.6.31.5/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_res.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,58 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -33027,9 +34637,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_res.c linux-2.6.31.4/grsecurity/gracl
+
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/gracl_segv.c linux-2.6.31.4/grsecurity/gracl_segv.c
---- linux-2.6.31.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_segv.c 2009-10-11 15:29:47.252524620 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_segv.c linux-2.6.31.5/grsecurity/gracl_segv.c
+--- linux-2.6.31.5/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_segv.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,307 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -33338,9 +34948,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_segv.c linux-2.6.31.4/grsecurity/grac
+
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/gracl_shm.c linux-2.6.31.4/grsecurity/gracl_shm.c
---- linux-2.6.31.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/gracl_shm.c 2009-10-11 15:29:47.252524620 -0400
+diff -urNp linux-2.6.31.5/grsecurity/gracl_shm.c linux-2.6.31.5/grsecurity/gracl_shm.c
+--- linux-2.6.31.5/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/gracl_shm.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,37 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -33379,9 +34989,9 @@ diff -urNp linux-2.6.31.4/grsecurity/gracl_shm.c linux-2.6.31.4/grsecurity/gracl
+
+ return 1;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_chdir.c linux-2.6.31.4/grsecurity/grsec_chdir.c
---- linux-2.6.31.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_chdir.c 2009-10-11 15:29:47.252524620 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_chdir.c linux-2.6.31.5/grsecurity/grsec_chdir.c
+--- linux-2.6.31.5/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_chdir.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -33402,9 +35012,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_chdir.c linux-2.6.31.4/grsecurity/grs
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_chroot.c linux-2.6.31.4/grsecurity/grsec_chroot.c
---- linux-2.6.31.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_chroot.c 2009-10-11 15:29:47.252524620 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_chroot.c linux-2.6.31.5/grsecurity/grsec_chroot.c
+--- linux-2.6.31.5/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_chroot.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,348 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -33754,9 +35364,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_chroot.c linux-2.6.31.4/grsecurity/gr
+#ifdef CONFIG_SECURITY
+EXPORT_SYMBOL(gr_handle_chroot_caps);
+#endif
-diff -urNp linux-2.6.31.4/grsecurity/grsec_disabled.c linux-2.6.31.4/grsecurity/grsec_disabled.c
---- linux-2.6.31.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_disabled.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_disabled.c linux-2.6.31.5/grsecurity/grsec_disabled.c
+--- linux-2.6.31.5/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_disabled.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,426 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -34184,9 +35794,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_disabled.c linux-2.6.31.4/grsecurity/
+EXPORT_SYMBOL(gr_check_user_change);
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
-diff -urNp linux-2.6.31.4/grsecurity/grsec_exec.c linux-2.6.31.4/grsecurity/grsec_exec.c
---- linux-2.6.31.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_exec.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_exec.c linux-2.6.31.5/grsecurity/grsec_exec.c
+--- linux-2.6.31.5/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_exec.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,89 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34277,9 +35887,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_exec.c linux-2.6.31.4/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_fifo.c linux-2.6.31.4/grsecurity/grsec_fifo.c
---- linux-2.6.31.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_fifo.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_fifo.c linux-2.6.31.5/grsecurity/grsec_fifo.c
+--- linux-2.6.31.5/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_fifo.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34305,9 +35915,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_fifo.c linux-2.6.31.4/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_fork.c linux-2.6.31.4/grsecurity/grsec_fork.c
---- linux-2.6.31.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_fork.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_fork.c linux-2.6.31.5/grsecurity/grsec_fork.c
+--- linux-2.6.31.5/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_fork.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,15 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34324,9 +35934,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_fork.c linux-2.6.31.4/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_init.c linux-2.6.31.4/grsecurity/grsec_init.c
---- linux-2.6.31.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_init.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_init.c linux-2.6.31.5/grsecurity/grsec_init.c
+--- linux-2.6.31.5/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_init.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,230 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34558,9 +36168,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_init.c linux-2.6.31.4/grsecurity/grse
+
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_link.c linux-2.6.31.4/grsecurity/grsec_link.c
---- linux-2.6.31.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_link.c 2009-10-11 15:29:47.253388942 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_link.c linux-2.6.31.5/grsecurity/grsec_link.c
+--- linux-2.6.31.5/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_link.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34605,9 +36215,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_link.c linux-2.6.31.4/grsecurity/grse
+#endif
+ return 0;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_log.c linux-2.6.31.4/grsecurity/grsec_log.c
---- linux-2.6.31.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_log.c 2009-10-11 15:29:47.254390050 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_log.c linux-2.6.31.5/grsecurity/grsec_log.c
+--- linux-2.6.31.5/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_log.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,294 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34903,9 +36513,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_log.c linux-2.6.31.4/grsecurity/grsec
+ gr_log_end(audit);
+ END_LOCKS(audit);
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_mem.c linux-2.6.31.4/grsecurity/grsec_mem.c
---- linux-2.6.31.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_mem.c 2009-10-11 15:29:47.254390050 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_mem.c linux-2.6.31.5/grsecurity/grsec_mem.c
+--- linux-2.6.31.5/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_mem.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,79 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -34986,9 +36596,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_mem.c linux-2.6.31.4/grsecurity/grsec
+ return;
+}
+
-diff -urNp linux-2.6.31.4/grsecurity/grsec_mount.c linux-2.6.31.4/grsecurity/grsec_mount.c
---- linux-2.6.31.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_mount.c 2009-10-11 15:29:47.254390050 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_mount.c linux-2.6.31.5/grsecurity/grsec_mount.c
+--- linux-2.6.31.5/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_mount.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,34 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35024,9 +36634,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_mount.c linux-2.6.31.4/grsecurity/grs
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_sig.c linux-2.6.31.4/grsecurity/grsec_sig.c
---- linux-2.6.31.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_sig.c 2009-10-11 15:29:47.254390050 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_sig.c linux-2.6.31.5/grsecurity/grsec_sig.c
+--- linux-2.6.31.5/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_sig.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35093,9 +36703,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_sig.c linux-2.6.31.4/grsecurity/grsec
+ return;
+}
+
-diff -urNp linux-2.6.31.4/grsecurity/grsec_sock.c linux-2.6.31.4/grsecurity/grsec_sock.c
---- linux-2.6.31.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_sock.c 2009-10-11 15:29:47.254390050 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_sock.c linux-2.6.31.5/grsecurity/grsec_sock.c
+--- linux-2.6.31.5/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_sock.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,269 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -35366,9 +36976,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_sock.c linux-2.6.31.4/grsecurity/grse
+ return current_cap();
+#endif
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_sysctl.c linux-2.6.31.4/grsecurity/grsec_sysctl.c
---- linux-2.6.31.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_sysctl.c 2009-10-11 15:29:47.255360315 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_sysctl.c linux-2.6.31.5/grsecurity/grsec_sysctl.c
+--- linux-2.6.31.5/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_sysctl.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,403 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35773,9 +37383,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_sysctl.c linux-2.6.31.4/grsecurity/gr
+ { .ctl_name = 0 }
+};
+#endif
-diff -urNp linux-2.6.31.4/grsecurity/grsec_textrel.c linux-2.6.31.4/grsecurity/grsec_textrel.c
---- linux-2.6.31.4/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_textrel.c 2009-10-11 15:29:47.255360315 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_textrel.c linux-2.6.31.5/grsecurity/grsec_textrel.c
+--- linux-2.6.31.5/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_textrel.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35793,9 +37403,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_textrel.c linux-2.6.31.4/grsecurity/g
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_time.c linux-2.6.31.4/grsecurity/grsec_time.c
---- linux-2.6.31.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_time.c 2009-10-11 15:29:47.255360315 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_time.c linux-2.6.31.5/grsecurity/grsec_time.c
+--- linux-2.6.31.5/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_time.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35810,9 +37420,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_time.c linux-2.6.31.4/grsecurity/grse
+#endif
+ return;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsec_tpe.c linux-2.6.31.4/grsecurity/grsec_tpe.c
---- linux-2.6.31.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsec_tpe.c 2009-10-11 15:29:47.255360315 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsec_tpe.c linux-2.6.31.5/grsecurity/grsec_tpe.c
+--- linux-2.6.31.5/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsec_tpe.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,38 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -35852,9 +37462,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsec_tpe.c linux-2.6.31.4/grsecurity/grsec
+#endif
+ return 1;
+}
-diff -urNp linux-2.6.31.4/grsecurity/grsum.c linux-2.6.31.4/grsecurity/grsum.c
---- linux-2.6.31.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/grsum.c 2009-10-11 15:29:47.255360315 -0400
+diff -urNp linux-2.6.31.5/grsecurity/grsum.c linux-2.6.31.5/grsecurity/grsum.c
+--- linux-2.6.31.5/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/grsum.c 2009-10-20 20:32:11.219172768 -0400
@@ -0,0 +1,59 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -35915,9 +37525,9 @@ diff -urNp linux-2.6.31.4/grsecurity/grsum.c linux-2.6.31.4/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.31.4/grsecurity/Kconfig linux-2.6.31.4/grsecurity/Kconfig
---- linux-2.6.31.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/Kconfig 2009-10-11 15:29:47.256590155 -0400
+diff -urNp linux-2.6.31.5/grsecurity/Kconfig linux-2.6.31.5/grsecurity/Kconfig
+--- linux-2.6.31.5/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/Kconfig 2009-10-20 20:32:11.506703093 -0400
@@ -0,0 +1,908 @@
+#
+# grecurity configuration
@@ -36827,9 +38437,9 @@ diff -urNp linux-2.6.31.4/grsecurity/Kconfig linux-2.6.31.4/grsecurity/Kconfig
+endmenu
+
+endmenu
-diff -urNp linux-2.6.31.4/grsecurity/Makefile linux-2.6.31.4/grsecurity/Makefile
---- linux-2.6.31.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/grsecurity/Makefile 2009-10-11 15:29:47.256590155 -0400
+diff -urNp linux-2.6.31.5/grsecurity/Makefile linux-2.6.31.5/grsecurity/Makefile
+--- linux-2.6.31.5/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/grsecurity/Makefile 2009-10-20 20:32:11.506703093 -0400
@@ -0,0 +1,29 @@
+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
+# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -36860,9 +38470,30 @@ diff -urNp linux-2.6.31.4/grsecurity/Makefile linux-2.6.31.4/grsecurity/Makefile
+ @-chmod -f 700 .
+ @echo ' grsec: protected kernel image paths'
+endif
-diff -urNp linux-2.6.31.4/include/asm-generic/atomic.h linux-2.6.31.4/include/asm-generic/atomic.h
---- linux-2.6.31.4/include/asm-generic/atomic.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/atomic.h 2009-10-11 15:29:47.280427780 -0400
+diff -urNp linux-2.6.31.5/include/acpi/acpi_drivers.h linux-2.6.31.5/include/acpi/acpi_drivers.h
+--- linux-2.6.31.5/include/acpi/acpi_drivers.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/acpi/acpi_drivers.h 2009-10-20 20:33:11.040874213 -0400
+@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle ha
+ extern int register_dock_notifier(struct notifier_block *nb);
+ extern void unregister_dock_notifier(struct notifier_block *nb);
+ extern int register_hotplug_dock_device(acpi_handle handle,
+- struct acpi_dock_ops *ops,
++ const struct acpi_dock_ops *ops,
+ void *context);
+ extern void unregister_hotplug_dock_device(acpi_handle handle);
+ #else
+@@ -144,7 +144,7 @@ static inline void unregister_dock_notif
+ {
+ }
+ static inline int register_hotplug_dock_device(acpi_handle handle,
+- struct acpi_dock_ops *ops,
++ const struct acpi_dock_ops *ops,
+ void *context)
+ {
+ return -ENODEV;
+diff -urNp linux-2.6.31.5/include/asm-generic/atomic.h linux-2.6.31.5/include/asm-generic/atomic.h
+--- linux-2.6.31.5/include/asm-generic/atomic.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/atomic.h 2009-10-20 20:32:11.506703093 -0400
@@ -36,6 +36,15 @@
#define atomic_read(v) ((v)->counter)
@@ -36928,9 +38559,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/atomic.h linux-2.6.31.4/include/as
static inline void atomic_dec(atomic_t *v)
{
atomic_sub_return(1, v);
-diff -urNp linux-2.6.31.4/include/asm-generic/dma-mapping-common.h linux-2.6.31.4/include/asm-generic/dma-mapping-common.h
---- linux-2.6.31.4/include/asm-generic/dma-mapping-common.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/dma-mapping-common.h 2009-10-11 15:29:56.711807864 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/dma-mapping-common.h linux-2.6.31.5/include/asm-generic/dma-mapping-common.h
+--- linux-2.6.31.5/include/asm-generic/dma-mapping-common.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/dma-mapping-common.h 2009-10-20 20:32:11.506703093 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -37039,9 +38670,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/dma-mapping-common.h linux-2.6.31.
BUG_ON(!valid_dma_direction(dir));
if (ops->sync_sg_for_device)
-diff -urNp linux-2.6.31.4/include/asm-generic/futex.h linux-2.6.31.4/include/asm-generic/futex.h
---- linux-2.6.31.4/include/asm-generic/futex.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/futex.h 2009-10-11 15:29:47.300367529 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/futex.h linux-2.6.31.5/include/asm-generic/futex.h
+--- linux-2.6.31.5/include/asm-generic/futex.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/futex.h 2009-10-20 20:32:11.506703093 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -37060,9 +38691,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/futex.h linux-2.6.31.4/include/asm
{
return -ENOSYS;
}
-diff -urNp linux-2.6.31.4/include/asm-generic/int-l64.h linux-2.6.31.4/include/asm-generic/int-l64.h
---- linux-2.6.31.4/include/asm-generic/int-l64.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/int-l64.h 2009-10-11 15:29:47.309396912 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/int-l64.h linux-2.6.31.5/include/asm-generic/int-l64.h
+--- linux-2.6.31.5/include/asm-generic/int-l64.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/int-l64.h 2009-10-20 20:32:11.506703093 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -37072,9 +38703,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/int-l64.h linux-2.6.31.4/include/a
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.31.4/include/asm-generic/int-ll64.h linux-2.6.31.4/include/asm-generic/int-ll64.h
---- linux-2.6.31.4/include/asm-generic/int-ll64.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/int-ll64.h 2009-10-11 15:29:47.309396912 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/int-ll64.h linux-2.6.31.5/include/asm-generic/int-ll64.h
+--- linux-2.6.31.5/include/asm-generic/int-ll64.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/int-ll64.h 2009-10-20 20:32:11.506703093 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -37084,9 +38715,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/int-ll64.h linux-2.6.31.4/include/
#define S8_C(x) x
#define U8_C(x) x ## U
#define S16_C(x) x
-diff -urNp linux-2.6.31.4/include/asm-generic/kmap_types.h linux-2.6.31.4/include/asm-generic/kmap_types.h
---- linux-2.6.31.4/include/asm-generic/kmap_types.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/kmap_types.h 2009-10-11 15:29:47.321362391 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/kmap_types.h linux-2.6.31.5/include/asm-generic/kmap_types.h
+--- linux-2.6.31.5/include/asm-generic/kmap_types.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/kmap_types.h 2009-10-20 20:32:11.506703093 -0400
@@ -27,7 +27,8 @@ D(15) KM_UML_USERCOPY, /* UML specific,
D(16) KM_IRQ_PTE,
D(17) KM_NMI,
@@ -37097,9 +38728,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/kmap_types.h linux-2.6.31.4/includ
};
#undef D
-diff -urNp linux-2.6.31.4/include/asm-generic/pgtable.h linux-2.6.31.4/include/asm-generic/pgtable.h
---- linux-2.6.31.4/include/asm-generic/pgtable.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/pgtable.h 2009-10-14 17:18:22.973363290 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/pgtable.h linux-2.6.31.5/include/asm-generic/pgtable.h
+--- linux-2.6.31.5/include/asm-generic/pgtable.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/pgtable.h 2009-10-20 20:32:11.506703093 -0400
@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
unsigned long size);
#endif
@@ -37115,9 +38746,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/pgtable.h linux-2.6.31.4/include/a
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-2.6.31.4/include/asm-generic/vmlinux.lds.h linux-2.6.31.4/include/asm-generic/vmlinux.lds.h
---- linux-2.6.31.4/include/asm-generic/vmlinux.lds.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/asm-generic/vmlinux.lds.h 2009-10-11 15:29:47.322365212 -0400
+diff -urNp linux-2.6.31.5/include/asm-generic/vmlinux.lds.h linux-2.6.31.5/include/asm-generic/vmlinux.lds.h
+--- linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 2009-10-20 20:42:59.175085070 -0400
++++ linux-2.6.31.5/include/asm-generic/vmlinux.lds.h 2009-10-20 20:32:11.506703093 -0400
@@ -201,6 +201,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -37156,9 +38787,9 @@ diff -urNp linux-2.6.31.4/include/asm-generic/vmlinux.lds.h linux-2.6.31.4/inclu
/**
* PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.31.4/include/drm/drm_pciids.h linux-2.6.31.4/include/drm/drm_pciids.h
---- linux-2.6.31.4/include/drm/drm_pciids.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/drm/drm_pciids.h 2009-10-11 15:29:47.327392261 -0400
+diff -urNp linux-2.6.31.5/include/drm/drm_pciids.h linux-2.6.31.5/include/drm/drm_pciids.h
+--- linux-2.6.31.5/include/drm/drm_pciids.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/drm/drm_pciids.h 2009-10-20 20:32:11.506703093 -0400
@@ -375,7 +375,7 @@
{0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -37262,9 +38893,9 @@ diff -urNp linux-2.6.31.4/include/drm/drm_pciids.h linux-2.6.31.4/include/drm/dr
{0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
- {0, 0, 0}
+ {0, 0, 0, 0, 0, 0}
-diff -urNp linux-2.6.31.4/include/drm/drmP.h linux-2.6.31.4/include/drm/drmP.h
---- linux-2.6.31.4/include/drm/drmP.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/drm/drmP.h 2009-10-11 15:29:47.334563558 -0400
+diff -urNp linux-2.6.31.5/include/drm/drmP.h linux-2.6.31.5/include/drm/drmP.h
+--- linux-2.6.31.5/include/drm/drmP.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/drm/drmP.h 2009-10-20 20:32:11.506703093 -0400
@@ -787,7 +787,7 @@ struct drm_driver {
void (*gem_free_object) (struct drm_gem_object *obj);
@@ -37292,9 +38923,9 @@ diff -urNp linux-2.6.31.4/include/drm/drmP.h linux-2.6.31.4/include/drm/drmP.h
/*@} */
struct list_head filelist;
-diff -urNp linux-2.6.31.4/include/linux/agp_backend.h linux-2.6.31.4/include/linux/agp_backend.h
---- linux-2.6.31.4/include/linux/agp_backend.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/agp_backend.h 2009-10-11 15:29:47.337650931 -0400
+diff -urNp linux-2.6.31.5/include/linux/agp_backend.h linux-2.6.31.5/include/linux/agp_backend.h
+--- linux-2.6.31.5/include/linux/agp_backend.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/agp_backend.h 2009-10-20 20:32:11.506703093 -0400
@@ -53,7 +53,7 @@ struct agp_kern_info {
int current_memory;
bool cant_use_aperture;
@@ -37304,9 +38935,9 @@ diff -urNp linux-2.6.31.4/include/linux/agp_backend.h linux-2.6.31.4/include/lin
};
/*
-diff -urNp linux-2.6.31.4/include/linux/a.out.h linux-2.6.31.4/include/linux/a.out.h
---- linux-2.6.31.4/include/linux/a.out.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/a.out.h 2009-10-11 15:29:47.355716224 -0400
+diff -urNp linux-2.6.31.5/include/linux/a.out.h linux-2.6.31.5/include/linux/a.out.h
+--- linux-2.6.31.5/include/linux/a.out.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/a.out.h 2009-10-20 20:32:11.506703093 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -37322,9 +38953,9 @@ diff -urNp linux-2.6.31.4/include/linux/a.out.h linux-2.6.31.4/include/linux/a.o
#if !defined (N_MAGIC)
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
-diff -urNp linux-2.6.31.4/include/linux/atmdev.h linux-2.6.31.4/include/linux/atmdev.h
---- linux-2.6.31.4/include/linux/atmdev.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/atmdev.h 2009-10-11 15:29:47.367432821 -0400
+diff -urNp linux-2.6.31.5/include/linux/atmdev.h linux-2.6.31.5/include/linux/atmdev.h
+--- linux-2.6.31.5/include/linux/atmdev.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/atmdev.h 2009-10-20 20:32:11.506703093 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -37334,9 +38965,9 @@ diff -urNp linux-2.6.31.4/include/linux/atmdev.h linux-2.6.31.4/include/linux/at
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.31.4/include/linux/binfmts.h linux-2.6.31.4/include/linux/binfmts.h
---- linux-2.6.31.4/include/linux/binfmts.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/binfmts.h 2009-10-11 15:29:47.379373325 -0400
+diff -urNp linux-2.6.31.5/include/linux/binfmts.h linux-2.6.31.5/include/linux/binfmts.h
+--- linux-2.6.31.5/include/linux/binfmts.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/binfmts.h 2009-10-20 20:32:11.506703093 -0400
@@ -78,6 +78,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -37345,9 +38976,9 @@ diff -urNp linux-2.6.31.4/include/linux/binfmts.h linux-2.6.31.4/include/linux/b
unsigned long min_coredump; /* minimal dump size */
int hasvdso;
};
-diff -urNp linux-2.6.31.4/include/linux/cache.h linux-2.6.31.4/include/linux/cache.h
---- linux-2.6.31.4/include/linux/cache.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/cache.h 2009-10-11 15:29:47.392478261 -0400
+diff -urNp linux-2.6.31.5/include/linux/cache.h linux-2.6.31.5/include/linux/cache.h
+--- linux-2.6.31.5/include/linux/cache.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/cache.h 2009-10-20 20:32:11.506703093 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -37359,9 +38990,9 @@ diff -urNp linux-2.6.31.4/include/linux/cache.h linux-2.6.31.4/include/linux/cac
#ifndef ____cacheline_aligned
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
-diff -urNp linux-2.6.31.4/include/linux/capability.h linux-2.6.31.4/include/linux/capability.h
---- linux-2.6.31.4/include/linux/capability.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/capability.h 2009-10-11 15:29:47.401611590 -0400
+diff -urNp linux-2.6.31.5/include/linux/capability.h linux-2.6.31.5/include/linux/capability.h
+--- linux-2.6.31.5/include/linux/capability.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/capability.h 2009-10-20 20:32:11.506703093 -0400
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -37370,9 +39001,9 @@ diff -urNp linux-2.6.31.4/include/linux/capability.h linux-2.6.31.4/include/linu
/* audit system wants to get cap info from files as well */
struct dentry;
-diff -urNp linux-2.6.31.4/include/linux/cgroup.h linux-2.6.31.4/include/linux/cgroup.h
---- linux-2.6.31.4/include/linux/cgroup.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/cgroup.h 2009-10-11 15:29:47.405492510 -0400
+diff -urNp linux-2.6.31.5/include/linux/cgroup.h linux-2.6.31.5/include/linux/cgroup.h
+--- linux-2.6.31.5/include/linux/cgroup.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/cgroup.h 2009-10-20 20:32:11.506703093 -0400
@@ -37,7 +37,7 @@ extern void cgroup_exit(struct task_stru
extern int cgroupstats_build(struct cgroupstats *stats,
struct dentry *dentry);
@@ -37382,9 +39013,9 @@ diff -urNp linux-2.6.31.4/include/linux/cgroup.h linux-2.6.31.4/include/linux/cg
/* Define the enumeration of all cgroup subsystems */
#define SUBSYS(_x) _x ## _subsys_id,
-diff -urNp linux-2.6.31.4/include/linux/compiler-gcc4.h linux-2.6.31.4/include/linux/compiler-gcc4.h
---- linux-2.6.31.4/include/linux/compiler-gcc4.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/compiler-gcc4.h 2009-10-11 15:29:47.411368244 -0400
+diff -urNp linux-2.6.31.5/include/linux/compiler-gcc4.h linux-2.6.31.5/include/linux/compiler-gcc4.h
+--- linux-2.6.31.5/include/linux/compiler-gcc4.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/compiler-gcc4.h 2009-10-20 20:32:11.510838935 -0400
@@ -36,4 +36,8 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -37394,9 +39025,9 @@ diff -urNp linux-2.6.31.4/include/linux/compiler-gcc4.h linux-2.6.31.4/include/l
+#define __bos0(ptr) __bos((ptr), 0)
+#define __bos1(ptr) __bos((ptr), 1)
#endif
-diff -urNp linux-2.6.31.4/include/linux/compiler.h linux-2.6.31.4/include/linux/compiler.h
---- linux-2.6.31.4/include/linux/compiler.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/compiler.h 2009-10-11 15:29:47.415845902 -0400
+diff -urNp linux-2.6.31.5/include/linux/compiler.h linux-2.6.31.5/include/linux/compiler.h
+--- linux-2.6.31.5/include/linux/compiler.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/compiler.h 2009-10-20 20:32:11.510838935 -0400
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -37420,9 +39051,9 @@ diff -urNp linux-2.6.31.4/include/linux/compiler.h linux-2.6.31.4/include/linux/
/* Simple shorthand for a section definition */
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
-diff -urNp linux-2.6.31.4/include/linux/cpumask.h linux-2.6.31.4/include/linux/cpumask.h
---- linux-2.6.31.4/include/linux/cpumask.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/cpumask.h 2009-10-11 15:29:47.428461116 -0400
+diff -urNp linux-2.6.31.5/include/linux/cpumask.h linux-2.6.31.5/include/linux/cpumask.h
+--- linux-2.6.31.5/include/linux/cpumask.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/cpumask.h 2009-10-20 20:32:11.510838935 -0400
@@ -142,7 +142,6 @@
#include <linux/bitmap.h>
@@ -37431,9 +39062,9 @@ diff -urNp linux-2.6.31.4/include/linux/cpumask.h linux-2.6.31.4/include/linux/c
#ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS
#define cpu_set(cpu, dst) __cpu_set((cpu), &(dst))
-diff -urNp linux-2.6.31.4/include/linux/decompress/mm.h linux-2.6.31.4/include/linux/decompress/mm.h
---- linux-2.6.31.4/include/linux/decompress/mm.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/decompress/mm.h 2009-10-11 15:29:47.462648043 -0400
+diff -urNp linux-2.6.31.5/include/linux/decompress/mm.h linux-2.6.31.5/include/linux/decompress/mm.h
+--- linux-2.6.31.5/include/linux/decompress/mm.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/decompress/mm.h 2009-10-20 20:32:11.510838935 -0400
@@ -68,7 +68,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -37443,9 +39074,9 @@ diff -urNp linux-2.6.31.4/include/linux/decompress/mm.h linux-2.6.31.4/include/l
#define free(a) kfree(a)
#define large_malloc(a) vmalloc(a)
-diff -urNp linux-2.6.31.4/include/linux/elf.h linux-2.6.31.4/include/linux/elf.h
---- linux-2.6.31.4/include/linux/elf.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/elf.h 2009-10-11 15:29:47.475692461 -0400
+diff -urNp linux-2.6.31.5/include/linux/elf.h linux-2.6.31.5/include/linux/elf.h
+--- linux-2.6.31.5/include/linux/elf.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/elf.h 2009-10-20 20:32:11.510838935 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -37518,9 +39149,9 @@ diff -urNp linux-2.6.31.4/include/linux/elf.h linux-2.6.31.4/include/linux/elf.h
#endif
-diff -urNp linux-2.6.31.4/include/linux/fs.h linux-2.6.31.4/include/linux/fs.h
---- linux-2.6.31.4/include/linux/fs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/fs.h 2009-10-11 15:29:47.499468747 -0400
+diff -urNp linux-2.6.31.5/include/linux/fs.h linux-2.6.31.5/include/linux/fs.h
+--- linux-2.6.31.5/include/linux/fs.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/fs.h 2009-10-20 20:33:11.008170144 -0400
@@ -87,6 +87,10 @@ struct inodes_stat_t {
*/
#define FMODE_NOCMTIME ((__force fmode_t)2048)
@@ -37532,6 +39163,15 @@ diff -urNp linux-2.6.31.4/include/linux/fs.h linux-2.6.31.4/include/linux/fs.h
/*
* The below are the various read and write types that we support. Some of
* them include behavioral modifiers that send information down to the
+@@ -1435,7 +1439,7 @@ struct fiemap_extent_info {
+ unsigned int fi_flags; /* Flags as passed from user */
+ unsigned int fi_extents_mapped; /* Number of mapped extents */
+ unsigned int fi_extents_max; /* Size of fiemap_extent array */
+- struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
++ struct fiemap_extent __user *fi_extents_start; /* Start of fiemap_extent
+ * array */
+ };
+ int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
@@ -2430,7 +2434,7 @@ static int __fops ## _open(struct inode
__simple_attr_check_format(__fmt, 0ull); \
return simple_attr_open(inode, file, __get, __set, __fmt); \
@@ -37541,9 +39181,9 @@ diff -urNp linux-2.6.31.4/include/linux/fs.h linux-2.6.31.4/include/linux/fs.h
.owner = THIS_MODULE, \
.open = __fops ## _open, \
.release = simple_attr_release, \
-diff -urNp linux-2.6.31.4/include/linux/fs_struct.h linux-2.6.31.4/include/linux/fs_struct.h
---- linux-2.6.31.4/include/linux/fs_struct.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/fs_struct.h 2009-10-11 15:29:47.511362721 -0400
+diff -urNp linux-2.6.31.5/include/linux/fs_struct.h linux-2.6.31.5/include/linux/fs_struct.h
+--- linux-2.6.31.5/include/linux/fs_struct.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/fs_struct.h 2009-10-20 20:32:11.510838935 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -37553,9 +39193,9 @@ diff -urNp linux-2.6.31.4/include/linux/fs_struct.h linux-2.6.31.4/include/linux
rwlock_t lock;
int umask;
int in_exec;
-diff -urNp linux-2.6.31.4/include/linux/genhd.h linux-2.6.31.4/include/linux/genhd.h
---- linux-2.6.31.4/include/linux/genhd.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/genhd.h 2009-10-11 15:29:47.525436446 -0400
+diff -urNp linux-2.6.31.5/include/linux/genhd.h linux-2.6.31.5/include/linux/genhd.h
+--- linux-2.6.31.5/include/linux/genhd.h 2009-10-20 20:42:59.178507339 -0400
++++ linux-2.6.31.5/include/linux/genhd.h 2009-10-20 20:32:11.510838935 -0400
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -37565,9 +39205,9 @@ diff -urNp linux-2.6.31.4/include/linux/genhd.h linux-2.6.31.4/include/linux/gen
struct work_struct async_notify;
#ifdef CONFIG_BLK_DEV_INTEGRITY
struct blk_integrity *integrity;
-diff -urNp linux-2.6.31.4/include/linux/gracl.h linux-2.6.31.4/include/linux/gracl.h
---- linux-2.6.31.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/gracl.h 2009-10-11 15:29:47.525436446 -0400
+diff -urNp linux-2.6.31.5/include/linux/gracl.h linux-2.6.31.5/include/linux/gracl.h
+--- linux-2.6.31.5/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/gracl.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,309 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -37878,9 +39518,9 @@ diff -urNp linux-2.6.31.4/include/linux/gracl.h linux-2.6.31.4/include/linux/gra
+
+#endif
+
-diff -urNp linux-2.6.31.4/include/linux/gralloc.h linux-2.6.31.4/include/linux/gralloc.h
---- linux-2.6.31.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/gralloc.h 2009-10-11 15:29:47.525436446 -0400
+diff -urNp linux-2.6.31.5/include/linux/gralloc.h linux-2.6.31.5/include/linux/gralloc.h
+--- linux-2.6.31.5/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/gralloc.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -37891,9 +39531,9 @@ diff -urNp linux-2.6.31.4/include/linux/gralloc.h linux-2.6.31.4/include/linux/g
+void *acl_alloc_num(unsigned long num, unsigned long len);
+
+#endif
-diff -urNp linux-2.6.31.4/include/linux/grdefs.h linux-2.6.31.4/include/linux/grdefs.h
---- linux-2.6.31.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/grdefs.h 2009-10-11 15:29:47.526408201 -0400
+diff -urNp linux-2.6.31.5/include/linux/grdefs.h linux-2.6.31.5/include/linux/grdefs.h
+--- linux-2.6.31.5/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/grdefs.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -38031,9 +39671,9 @@ diff -urNp linux-2.6.31.4/include/linux/grdefs.h linux-2.6.31.4/include/linux/gr
+};
+
+#endif
-diff -urNp linux-2.6.31.4/include/linux/grinternal.h linux-2.6.31.4/include/linux/grinternal.h
---- linux-2.6.31.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/grinternal.h 2009-10-11 15:29:47.526408201 -0400
+diff -urNp linux-2.6.31.5/include/linux/grinternal.h linux-2.6.31.5/include/linux/grinternal.h
+--- linux-2.6.31.5/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/grinternal.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,211 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -38246,9 +39886,9 @@ diff -urNp linux-2.6.31.4/include/linux/grinternal.h linux-2.6.31.4/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.31.4/include/linux/grmsg.h linux-2.6.31.4/include/linux/grmsg.h
---- linux-2.6.31.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/grmsg.h 2009-10-11 15:29:47.526408201 -0400
+diff -urNp linux-2.6.31.5/include/linux/grmsg.h linux-2.6.31.5/include/linux/grmsg.h
+--- linux-2.6.31.5/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/grmsg.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,103 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -38353,9 +39993,9 @@ diff -urNp linux-2.6.31.4/include/linux/grmsg.h linux-2.6.31.4/include/linux/grm
+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
-diff -urNp linux-2.6.31.4/include/linux/grsecurity.h linux-2.6.31.4/include/linux/grsecurity.h
---- linux-2.6.31.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/include/linux/grsecurity.h 2009-10-11 15:29:47.526408201 -0400
+diff -urNp linux-2.6.31.5/include/linux/grsecurity.h linux-2.6.31.5/include/linux/grsecurity.h
+--- linux-2.6.31.5/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/include/linux/grsecurity.h 2009-10-20 20:32:11.510838935 -0400
@@ -0,0 +1,197 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -38554,9 +40194,9 @@ diff -urNp linux-2.6.31.4/include/linux/grsecurity.h linux-2.6.31.4/include/linu
+#endif
+
+#endif
-diff -urNp linux-2.6.31.4/include/linux/hdpu_features.h linux-2.6.31.4/include/linux/hdpu_features.h
---- linux-2.6.31.4/include/linux/hdpu_features.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/hdpu_features.h 2009-10-11 15:29:47.531377505 -0400
+diff -urNp linux-2.6.31.5/include/linux/hdpu_features.h linux-2.6.31.5/include/linux/hdpu_features.h
+--- linux-2.6.31.5/include/linux/hdpu_features.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/hdpu_features.h 2009-10-20 20:32:11.510838935 -0400
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -38566,9 +40206,9 @@ diff -urNp linux-2.6.31.4/include/linux/hdpu_features.h linux-2.6.31.4/include/l
unsigned char cached_val;
int inited;
unsigned long *set_addr;
-diff -urNp linux-2.6.31.4/include/linux/highmem.h linux-2.6.31.4/include/linux/highmem.h
---- linux-2.6.31.4/include/linux/highmem.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/highmem.h 2009-10-11 15:29:47.537359623 -0400
+diff -urNp linux-2.6.31.5/include/linux/highmem.h linux-2.6.31.5/include/linux/highmem.h
+--- linux-2.6.31.5/include/linux/highmem.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/highmem.h 2009-10-20 20:32:11.510838935 -0400
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -38588,9 +40228,9 @@ diff -urNp linux-2.6.31.4/include/linux/highmem.h linux-2.6.31.4/include/linux/h
static inline void zero_user_segments(struct page *page,
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
-diff -urNp linux-2.6.31.4/include/linux/hugetlb.h linux-2.6.31.4/include/linux/hugetlb.h
---- linux-2.6.31.4/include/linux/hugetlb.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/hugetlb.h 2009-10-11 15:29:47.550499155 -0400
+diff -urNp linux-2.6.31.5/include/linux/hugetlb.h linux-2.6.31.5/include/linux/hugetlb.h
+--- linux-2.6.31.5/include/linux/hugetlb.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/hugetlb.h 2009-10-20 20:32:11.510838935 -0400
@@ -146,7 +146,7 @@ static inline struct hugetlbfs_sb_info *
}
@@ -38600,9 +40240,9 @@ diff -urNp linux-2.6.31.4/include/linux/hugetlb.h linux-2.6.31.4/include/linux/h
struct file *hugetlb_file_setup(const char *name, size_t size, int acct,
struct user_struct **user);
int hugetlb_get_quota(struct address_space *mapping, long delta);
-diff -urNp linux-2.6.31.4/include/linux/jbd2.h linux-2.6.31.4/include/linux/jbd2.h
---- linux-2.6.31.4/include/linux/jbd2.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/jbd2.h 2009-10-11 15:29:47.558359124 -0400
+diff -urNp linux-2.6.31.5/include/linux/jbd2.h linux-2.6.31.5/include/linux/jbd2.h
+--- linux-2.6.31.5/include/linux/jbd2.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/jbd2.h 2009-10-20 20:32:11.514245928 -0400
@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
@@ -38612,9 +40252,9 @@ diff -urNp linux-2.6.31.4/include/linux/jbd2.h linux-2.6.31.4/include/linux/jbd2
#endif
static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.31.4/include/linux/jbd.h linux-2.6.31.4/include/linux/jbd.h
---- linux-2.6.31.4/include/linux/jbd.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/jbd.h 2009-10-11 15:29:47.583598622 -0400
+diff -urNp linux-2.6.31.5/include/linux/jbd.h linux-2.6.31.5/include/linux/jbd.h
+--- linux-2.6.31.5/include/linux/jbd.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/jbd.h 2009-10-20 20:32:11.514245928 -0400
@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
@@ -38624,9 +40264,9 @@ diff -urNp linux-2.6.31.4/include/linux/jbd.h linux-2.6.31.4/include/linux/jbd.h
#endif
static inline void *jbd_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.31.4/include/linux/kallsyms.h linux-2.6.31.4/include/linux/kallsyms.h
---- linux-2.6.31.4/include/linux/kallsyms.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/kallsyms.h 2009-10-11 15:29:47.594450124 -0400
+diff -urNp linux-2.6.31.5/include/linux/kallsyms.h linux-2.6.31.5/include/linux/kallsyms.h
+--- linux-2.6.31.5/include/linux/kallsyms.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/kallsyms.h 2009-10-20 20:32:11.514245928 -0400
@@ -15,7 +15,8 @@
struct module;
@@ -38647,9 +40287,9 @@ diff -urNp linux-2.6.31.4/include/linux/kallsyms.h linux-2.6.31.4/include/linux/
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-2.6.31.4/include/linux/kgdb.h linux-2.6.31.4/include/linux/kgdb.h
---- linux-2.6.31.4/include/linux/kgdb.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/kgdb.h 2009-10-11 15:29:56.722513976 -0400
+diff -urNp linux-2.6.31.5/include/linux/kgdb.h linux-2.6.31.5/include/linux/kgdb.h
+--- linux-2.6.31.5/include/linux/kgdb.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/kgdb.h 2009-10-20 20:32:11.514245928 -0400
@@ -259,12 +259,12 @@ struct kgdb_io {
void (*post_exception) (void);
};
@@ -38666,9 +40306,49 @@ diff -urNp linux-2.6.31.4/include/linux/kgdb.h linux-2.6.31.4/include/linux/kgdb
extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
extern int kgdb_mem2hex(char *mem, char *buf, int count);
-diff -urNp linux-2.6.31.4/include/linux/kvm_host.h linux-2.6.31.4/include/linux/kvm_host.h
---- linux-2.6.31.4/include/linux/kvm_host.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/kvm_host.h 2009-10-11 15:29:47.601369207 -0400
+diff -urNp linux-2.6.31.5/include/linux/kmemcheck.h linux-2.6.31.5/include/linux/kmemcheck.h
+--- linux-2.6.31.5/include/linux/kmemcheck.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/kmemcheck.h 2009-10-20 20:33:11.040874213 -0400
+@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia
+ int name##_end[0];
+
+ #define kmemcheck_annotate_bitfield(ptr, name) \
+- do if (ptr) { \
++ if (ptr) { \
+ int _n = (long) &((ptr)->name##_end) \
+ - (long) &((ptr)->name##_begin); \
+ BUILD_BUG_ON(_n < 0); \
+ \
+ kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \
+- } while (0)
++ }
+
+ #define kmemcheck_annotate_variable(var) \
+ do { \
+diff -urNp linux-2.6.31.5/include/linux/kobject.h linux-2.6.31.5/include/linux/kobject.h
+--- linux-2.6.31.5/include/linux/kobject.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/kobject.h 2009-10-20 20:33:11.040874213 -0400
+@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
+
+ struct kobj_type {
+ void (*release)(struct kobject *kobj);
+- struct sysfs_ops *sysfs_ops;
++ const struct sysfs_ops *sysfs_ops;
+ struct attribute **default_attrs;
+ };
+
+@@ -132,7 +132,7 @@ struct kobj_attribute {
+ const char *buf, size_t count);
+ };
+
+-extern struct sysfs_ops kobj_sysfs_ops;
++extern const struct sysfs_ops kobj_sysfs_ops;
+
+ /**
+ * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
+diff -urNp linux-2.6.31.5/include/linux/kvm_host.h linux-2.6.31.5/include/linux/kvm_host.h
+--- linux-2.6.31.5/include/linux/kvm_host.h 2009-10-20 20:42:59.181924713 -0400
++++ linux-2.6.31.5/include/linux/kvm_host.h 2009-10-20 20:32:11.514245928 -0400
@@ -173,7 +173,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -38687,9 +40367,9 @@ diff -urNp linux-2.6.31.4/include/linux/kvm_host.h linux-2.6.31.4/include/linux/
void kvm_arch_exit(void);
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-2.6.31.4/include/linux/libata.h linux-2.6.31.4/include/linux/libata.h
---- linux-2.6.31.4/include/linux/libata.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/libata.h 2009-10-11 15:29:47.624759429 -0400
+diff -urNp linux-2.6.31.5/include/linux/libata.h linux-2.6.31.5/include/linux/libata.h
+--- linux-2.6.31.5/include/linux/libata.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/libata.h 2009-10-20 20:32:11.514245928 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -38705,9 +40385,9 @@ diff -urNp linux-2.6.31.4/include/linux/libata.h linux-2.6.31.4/include/linux/li
#endif /* ATA_DEBUG */
#define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args)
-diff -urNp linux-2.6.31.4/include/linux/lockd/bind.h linux-2.6.31.4/include/linux/lockd/bind.h
---- linux-2.6.31.4/include/linux/lockd/bind.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/lockd/bind.h 2009-10-11 15:29:56.732568510 -0400
+diff -urNp linux-2.6.31.5/include/linux/lockd/bind.h linux-2.6.31.5/include/linux/lockd/bind.h
+--- linux-2.6.31.5/include/linux/lockd/bind.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/lockd/bind.h 2009-10-20 20:32:11.514245928 -0400
@@ -29,7 +29,7 @@ struct nlmsvc_binding {
void (*fclose)(struct file *);
};
@@ -38717,9 +40397,9 @@ diff -urNp linux-2.6.31.4/include/linux/lockd/bind.h linux-2.6.31.4/include/linu
/*
* Similar to nfs_client_initdata, but without the NFS-specific
-diff -urNp linux-2.6.31.4/include/linux/mm.h linux-2.6.31.4/include/linux/mm.h
---- linux-2.6.31.4/include/linux/mm.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/mm.h 2009-10-11 15:29:47.999456313 -0400
+diff -urNp linux-2.6.31.5/include/linux/mm.h linux-2.6.31.5/include/linux/mm.h
+--- linux-2.6.31.5/include/linux/mm.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/mm.h 2009-10-20 20:32:11.514245928 -0400
@@ -104,6 +104,10 @@ extern unsigned int kobjsize(const void
#define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
#define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
@@ -38780,9 +40460,9 @@ diff -urNp linux-2.6.31.4/include/linux/mm.h linux-2.6.31.4/include/linux/mm.h
+
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
-diff -urNp linux-2.6.31.4/include/linux/mm_types.h linux-2.6.31.4/include/linux/mm_types.h
---- linux-2.6.31.4/include/linux/mm_types.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/mm_types.h 2009-10-11 15:29:48.018417226 -0400
+diff -urNp linux-2.6.31.5/include/linux/mm_types.h linux-2.6.31.5/include/linux/mm_types.h
+--- linux-2.6.31.5/include/linux/mm_types.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/mm_types.h 2009-10-20 20:32:11.514245928 -0400
@@ -171,7 +171,7 @@ struct vm_area_struct {
struct anon_vma *anon_vma; /* Serialized by page_table_lock */
@@ -38826,9 +40506,28 @@ diff -urNp linux-2.6.31.4/include/linux/mm_types.h linux-2.6.31.4/include/linux/
};
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff -urNp linux-2.6.31.4/include/linux/mod_devicetable.h linux-2.6.31.4/include/linux/mod_devicetable.h
---- linux-2.6.31.4/include/linux/mod_devicetable.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/mod_devicetable.h 2009-10-11 15:29:48.025616758 -0400
+diff -urNp linux-2.6.31.5/include/linux/mmu_notifier.h linux-2.6.31.5/include/linux/mmu_notifier.h
+--- linux-2.6.31.5/include/linux/mmu_notifier.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/mmu_notifier.h 2009-10-20 20:33:11.040874213 -0400
+@@ -217,12 +217,12 @@ static inline void mmu_notifier_mm_destr
+ */
+ #define ptep_clear_flush_notify(__vma, __address, __ptep) \
+ ({ \
+- pte_t __pte; \
++ pte_t ___pte; \
+ struct vm_area_struct *___vma = __vma; \
+ unsigned long ___address = __address; \
+- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
++ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
+ mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
+- __pte; \
++ ___pte; \
+ })
+
+ #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
+diff -urNp linux-2.6.31.5/include/linux/mod_devicetable.h linux-2.6.31.5/include/linux/mod_devicetable.h
+--- linux-2.6.31.5/include/linux/mod_devicetable.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/mod_devicetable.h 2009-10-20 20:32:11.514245928 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -38847,9 +40546,9 @@ diff -urNp linux-2.6.31.4/include/linux/mod_devicetable.h linux-2.6.31.4/include
struct hid_device_id {
__u16 bus;
-diff -urNp linux-2.6.31.4/include/linux/module.h linux-2.6.31.4/include/linux/module.h
---- linux-2.6.31.4/include/linux/module.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/module.h 2009-10-11 15:29:48.033419169 -0400
+diff -urNp linux-2.6.31.5/include/linux/module.h linux-2.6.31.5/include/linux/module.h
+--- linux-2.6.31.5/include/linux/module.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/module.h 2009-10-20 20:32:11.514245928 -0400
@@ -283,16 +283,16 @@ struct module
int (*init)(void);
@@ -38934,9 +40633,9 @@ diff -urNp linux-2.6.31.4/include/linux/module.h linux-2.6.31.4/include/linux/mo
#else
return &mod->ref;
#endif
-diff -urNp linux-2.6.31.4/include/linux/moduleloader.h linux-2.6.31.4/include/linux/moduleloader.h
---- linux-2.6.31.4/include/linux/moduleloader.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/moduleloader.h 2009-10-11 15:29:48.057377464 -0400
+diff -urNp linux-2.6.31.5/include/linux/moduleloader.h linux-2.6.31.5/include/linux/moduleloader.h
+--- linux-2.6.31.5/include/linux/moduleloader.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/moduleloader.h 2009-10-20 20:32:11.514245928 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -38959,9 +40658,9 @@ diff -urNp linux-2.6.31.4/include/linux/moduleloader.h linux-2.6.31.4/include/li
/* Apply the given relocation to the (simplified) ELF. Return -error
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-2.6.31.4/include/linux/moduleparam.h linux-2.6.31.4/include/linux/moduleparam.h
---- linux-2.6.31.4/include/linux/moduleparam.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/moduleparam.h 2009-10-11 15:29:48.105818655 -0400
+diff -urNp linux-2.6.31.5/include/linux/moduleparam.h linux-2.6.31.5/include/linux/moduleparam.h
+--- linux-2.6.31.5/include/linux/moduleparam.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/moduleparam.h 2009-10-20 20:32:11.514245928 -0400
@@ -37,7 +37,6 @@ typedef int (*param_set_fn)(const char *
typedef int (*param_get_fn)(char *buffer, struct kernel_param *kp);
@@ -38970,9 +40669,9 @@ diff -urNp linux-2.6.31.4/include/linux/moduleparam.h linux-2.6.31.4/include/lin
#define KPARAM_ISBOOL 2
struct kernel_param {
-diff -urNp linux-2.6.31.4/include/linux/namei.h linux-2.6.31.4/include/linux/namei.h
---- linux-2.6.31.4/include/linux/namei.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/namei.h 2009-10-11 15:29:48.108549462 -0400
+diff -urNp linux-2.6.31.5/include/linux/namei.h linux-2.6.31.5/include/linux/namei.h
+--- linux-2.6.31.5/include/linux/namei.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/namei.h 2009-10-20 20:32:11.514245928 -0400
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -38997,9 +40696,9 @@ diff -urNp linux-2.6.31.4/include/linux/namei.h linux-2.6.31.4/include/linux/nam
{
return nd->saved_names[nd->depth];
}
-diff -urNp linux-2.6.31.4/include/linux/nfsd/nfsd.h linux-2.6.31.4/include/linux/nfsd/nfsd.h
---- linux-2.6.31.4/include/linux/nfsd/nfsd.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/nfsd/nfsd.h 2009-10-11 15:29:48.398689865 -0400
+diff -urNp linux-2.6.31.5/include/linux/nfsd/nfsd.h linux-2.6.31.5/include/linux/nfsd/nfsd.h
+--- linux-2.6.31.5/include/linux/nfsd/nfsd.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/nfsd/nfsd.h 2009-10-20 20:32:11.514245928 -0400
@@ -57,7 +57,7 @@ extern u32 nfsd_supported_minorversion
extern struct mutex nfsd_mutex;
extern struct svc_serv *nfsd_serv;
@@ -39009,9 +40708,9 @@ diff -urNp linux-2.6.31.4/include/linux/nfsd/nfsd.h linux-2.6.31.4/include/linux
/*
* Function prototypes.
-diff -urNp linux-2.6.31.4/include/linux/nodemask.h linux-2.6.31.4/include/linux/nodemask.h
---- linux-2.6.31.4/include/linux/nodemask.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/nodemask.h 2009-10-11 15:29:48.399434098 -0400
+diff -urNp linux-2.6.31.5/include/linux/nodemask.h linux-2.6.31.5/include/linux/nodemask.h
+--- linux-2.6.31.5/include/linux/nodemask.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/nodemask.h 2009-10-20 20:32:11.514245928 -0400
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -39028,9 +40727,9 @@ diff -urNp linux-2.6.31.4/include/linux/nodemask.h linux-2.6.31.4/include/linux/
})
#define num_online_nodes() num_node_state(N_ONLINE)
-diff -urNp linux-2.6.31.4/include/linux/oprofile.h linux-2.6.31.4/include/linux/oprofile.h
---- linux-2.6.31.4/include/linux/oprofile.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/oprofile.h 2009-10-11 15:29:48.408367704 -0400
+diff -urNp linux-2.6.31.5/include/linux/oprofile.h linux-2.6.31.5/include/linux/oprofile.h
+--- linux-2.6.31.5/include/linux/oprofile.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/oprofile.h 2009-10-20 20:32:11.517628208 -0400
@@ -128,7 +128,7 @@ int oprofilefs_create_ro_ulong(struct su
/** Create a file for read-only access to an atomic_t. */
@@ -39040,23 +40739,39 @@ diff -urNp linux-2.6.31.4/include/linux/oprofile.h linux-2.6.31.4/include/linux/
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-2.6.31.4/include/linux/poison.h linux-2.6.31.4/include/linux/poison.h
---- linux-2.6.31.4/include/linux/poison.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/poison.h 2009-10-11 15:29:48.420678259 -0400
+diff -urNp linux-2.6.31.5/include/linux/pipe_fs_i.h linux-2.6.31.5/include/linux/pipe_fs_i.h
+--- linux-2.6.31.5/include/linux/pipe_fs_i.h 2009-10-05 13:12:06.000000000 -0400
++++ linux-2.6.31.5/include/linux/pipe_fs_i.h 2009-10-23 19:42:57.592681415 -0400
+@@ -46,9 +46,9 @@ struct pipe_inode_info {
+ wait_queue_head_t wait;
+ unsigned int nrbufs, curbuf;
+ struct page *tmp_page;
+- unsigned int readers;
+- unsigned int writers;
+- unsigned int waiting_writers;
++ atomic_t readers;
++ atomic_t writers;
++ atomic_t waiting_writers;
+ unsigned int r_counter;
+ unsigned int w_counter;
+ struct fasync_struct *fasync_readers;
+diff -urNp linux-2.6.31.5/include/linux/poison.h linux-2.6.31.5/include/linux/poison.h
+--- linux-2.6.31.5/include/linux/poison.h 2009-10-20 20:42:59.185145000 -0400
++++ linux-2.6.31.5/include/linux/poison.h 2009-10-20 20:33:11.008170144 -0400
@@ -7,8 +7,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
*/
-#define LIST_POISON1 ((void *) 0x00100100)
-#define LIST_POISON2 ((void *) 0x00200200)
-+#define LIST_POISON1 ((void *) 0xFF1001FFFF1001FFULL)
-+#define LIST_POISON2 ((void *) 0xFF2002FFFF2002FFULL)
++#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
++#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
/********** include/linux/timer.h **********/
/*
-diff -urNp linux-2.6.31.4/include/linux/proc_fs.h linux-2.6.31.4/include/linux/proc_fs.h
---- linux-2.6.31.4/include/linux/proc_fs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/proc_fs.h 2009-10-11 15:29:48.430367364 -0400
+diff -urNp linux-2.6.31.5/include/linux/proc_fs.h linux-2.6.31.5/include/linux/proc_fs.h
+--- linux-2.6.31.5/include/linux/proc_fs.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/proc_fs.h 2009-10-20 20:32:11.517628208 -0400
@@ -146,6 +146,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -39077,9 +40792,9 @@ diff -urNp linux-2.6.31.4/include/linux/proc_fs.h linux-2.6.31.4/include/linux/p
static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
mode_t mode, struct proc_dir_entry *base,
read_proc_t *read_proc, void * data)
-diff -urNp linux-2.6.31.4/include/linux/random.h linux-2.6.31.4/include/linux/random.h
---- linux-2.6.31.4/include/linux/random.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/random.h 2009-10-11 15:29:48.499866658 -0400
+diff -urNp linux-2.6.31.5/include/linux/random.h linux-2.6.31.5/include/linux/random.h
+--- linux-2.6.31.5/include/linux/random.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/random.h 2009-10-20 20:32:11.517628208 -0400
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -39092,9 +40807,9 @@ diff -urNp linux-2.6.31.4/include/linux/random.h linux-2.6.31.4/include/linux/ra
#endif /* __KERNEL___ */
#endif /* _LINUX_RANDOM_H */
-diff -urNp linux-2.6.31.4/include/linux/reiserfs_fs.h linux-2.6.31.4/include/linux/reiserfs_fs.h
---- linux-2.6.31.4/include/linux/reiserfs_fs.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/reiserfs_fs.h 2009-10-11 15:29:48.524394940 -0400
+diff -urNp linux-2.6.31.5/include/linux/reiserfs_fs.h linux-2.6.31.5/include/linux/reiserfs_fs.h
+--- linux-2.6.31.5/include/linux/reiserfs_fs.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/reiserfs_fs.h 2009-10-20 20:32:11.517628208 -0400
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -39104,9 +40819,9 @@ diff -urNp linux-2.6.31.4/include/linux/reiserfs_fs.h linux-2.6.31.4/include/lin
#define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
#define __fs_changed(gen,s) (gen != get_generation (s))
#define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
-diff -urNp linux-2.6.31.4/include/linux/reiserfs_fs_sb.h linux-2.6.31.4/include/linux/reiserfs_fs_sb.h
---- linux-2.6.31.4/include/linux/reiserfs_fs_sb.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/reiserfs_fs_sb.h 2009-10-11 15:29:48.533445057 -0400
+diff -urNp linux-2.6.31.5/include/linux/reiserfs_fs_sb.h linux-2.6.31.5/include/linux/reiserfs_fs_sb.h
+--- linux-2.6.31.5/include/linux/reiserfs_fs_sb.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/reiserfs_fs_sb.h 2009-10-20 20:32:11.517628208 -0400
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -39116,9 +40831,9 @@ diff -urNp linux-2.6.31.4/include/linux/reiserfs_fs_sb.h linux-2.6.31.4/include/
// tree gets re-balanced
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
-diff -urNp linux-2.6.31.4/include/linux/sched.h linux-2.6.31.4/include/linux/sched.h
---- linux-2.6.31.4/include/linux/sched.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/sched.h 2009-10-11 15:29:48.598405889 -0400
+diff -urNp linux-2.6.31.5/include/linux/sched.h linux-2.6.31.5/include/linux/sched.h
+--- linux-2.6.31.5/include/linux/sched.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/sched.h 2009-10-20 20:32:11.517628208 -0400
@@ -99,6 +99,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -39292,9 +41007,9 @@ diff -urNp linux-2.6.31.4/include/linux/sched.h linux-2.6.31.4/include/linux/sch
{
void *stack = task_stack_page(current);
-diff -urNp linux-2.6.31.4/include/linux/screen_info.h linux-2.6.31.4/include/linux/screen_info.h
---- linux-2.6.31.4/include/linux/screen_info.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/screen_info.h 2009-10-11 15:29:48.608652872 -0400
+diff -urNp linux-2.6.31.5/include/linux/screen_info.h linux-2.6.31.5/include/linux/screen_info.h
+--- linux-2.6.31.5/include/linux/screen_info.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/screen_info.h 2009-10-20 20:32:11.517628208 -0400
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -39305,9 +41020,9 @@ diff -urNp linux-2.6.31.4/include/linux/screen_info.h linux-2.6.31.4/include/lin
} __attribute__((packed));
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
-diff -urNp linux-2.6.31.4/include/linux/security.h linux-2.6.31.4/include/linux/security.h
---- linux-2.6.31.4/include/linux/security.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/security.h 2009-10-11 15:29:48.611584165 -0400
+diff -urNp linux-2.6.31.5/include/linux/security.h linux-2.6.31.5/include/linux/security.h
+--- linux-2.6.31.5/include/linux/security.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/security.h 2009-10-20 20:32:11.517628208 -0400
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -39316,9 +41031,9 @@ diff -urNp linux-2.6.31.4/include/linux/security.h linux-2.6.31.4/include/linux/
#include <net/flow.h>
/* Maximum number of letters for an LSM name string */
-diff -urNp linux-2.6.31.4/include/linux/shm.h linux-2.6.31.4/include/linux/shm.h
---- linux-2.6.31.4/include/linux/shm.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/shm.h 2009-10-11 15:29:48.675417353 -0400
+diff -urNp linux-2.6.31.5/include/linux/shm.h linux-2.6.31.5/include/linux/shm.h
+--- linux-2.6.31.5/include/linux/shm.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/shm.h 2009-10-20 20:32:11.517628208 -0400
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -39330,9 +41045,9 @@ diff -urNp linux-2.6.31.4/include/linux/shm.h linux-2.6.31.4/include/linux/shm.h
};
/* shm_mode upper byte flags */
-diff -urNp linux-2.6.31.4/include/linux/slab.h linux-2.6.31.4/include/linux/slab.h
---- linux-2.6.31.4/include/linux/slab.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/slab.h 2009-10-11 15:37:26.493201327 -0400
+diff -urNp linux-2.6.31.5/include/linux/slab.h linux-2.6.31.5/include/linux/slab.h
+--- linux-2.6.31.5/include/linux/slab.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/slab.h 2009-10-20 20:32:11.517628208 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -39404,9 +41119,9 @@ diff -urNp linux-2.6.31.4/include/linux/slab.h linux-2.6.31.4/include/linux/slab
+})
+
#endif /* _LINUX_SLAB_H */
-diff -urNp linux-2.6.31.4/include/linux/slub_def.h linux-2.6.31.4/include/linux/slub_def.h
---- linux-2.6.31.4/include/linux/slub_def.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/slub_def.h 2009-10-11 15:29:48.736579940 -0400
+diff -urNp linux-2.6.31.5/include/linux/slub_def.h linux-2.6.31.5/include/linux/slub_def.h
+--- linux-2.6.31.5/include/linux/slub_def.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/slub_def.h 2009-10-20 20:32:11.517628208 -0400
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -39416,9 +41131,9 @@ diff -urNp linux-2.6.31.4/include/linux/slub_def.h linux-2.6.31.4/include/linux/
void (*ctor)(void *);
int inuse; /* Offset to metadata */
int align; /* Alignment */
-diff -urNp linux-2.6.31.4/include/linux/sonet.h linux-2.6.31.4/include/linux/sonet.h
---- linux-2.6.31.4/include/linux/sonet.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/sonet.h 2009-10-11 15:29:48.745375886 -0400
+diff -urNp linux-2.6.31.5/include/linux/sonet.h linux-2.6.31.5/include/linux/sonet.h
+--- linux-2.6.31.5/include/linux/sonet.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/sonet.h 2009-10-20 20:32:11.517628208 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -39428,9 +41143,9 @@ diff -urNp linux-2.6.31.4/include/linux/sonet.h linux-2.6.31.4/include/linux/son
__SONET_ITEMS
#undef __HANDLE_ITEM
};
-diff -urNp linux-2.6.31.4/include/linux/suspend.h linux-2.6.31.4/include/linux/suspend.h
---- linux-2.6.31.4/include/linux/suspend.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/suspend.h 2009-10-11 15:29:56.741456884 -0400
+diff -urNp linux-2.6.31.5/include/linux/suspend.h linux-2.6.31.5/include/linux/suspend.h
+--- linux-2.6.31.5/include/linux/suspend.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/suspend.h 2009-10-20 20:32:11.521046728 -0400
@@ -120,7 +120,7 @@ struct platform_suspend_ops {
* suspend_set_ops - set platform dependent suspend operations
* @ops: The new suspend operations to set.
@@ -39458,9 +41173,9 @@ diff -urNp linux-2.6.31.4/include/linux/suspend.h linux-2.6.31.4/include/linux/s
static inline int hibernate(void) { return -ENOSYS; }
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
-diff -urNp linux-2.6.31.4/include/linux/sysctl.h linux-2.6.31.4/include/linux/sysctl.h
---- linux-2.6.31.4/include/linux/sysctl.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/sysctl.h 2009-10-11 15:29:48.771740224 -0400
+diff -urNp linux-2.6.31.5/include/linux/sysctl.h linux-2.6.31.5/include/linux/sysctl.h
+--- linux-2.6.31.5/include/linux/sysctl.h 2009-10-20 20:42:59.188388445 -0400
++++ linux-2.6.31.5/include/linux/sysctl.h 2009-10-20 20:32:11.521046728 -0400
@@ -165,7 +165,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -39474,9 +41189,9 @@ diff -urNp linux-2.6.31.4/include/linux/sysctl.h linux-2.6.31.4/include/linux/sy
/* CTL_VM names: */
enum
-diff -urNp linux-2.6.31.4/include/linux/thread_info.h linux-2.6.31.4/include/linux/thread_info.h
---- linux-2.6.31.4/include/linux/thread_info.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/thread_info.h 2009-10-11 15:29:48.775651508 -0400
+diff -urNp linux-2.6.31.5/include/linux/thread_info.h linux-2.6.31.5/include/linux/thread_info.h
+--- linux-2.6.31.5/include/linux/thread_info.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/linux/thread_info.h 2009-10-20 20:32:11.521046728 -0400
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -39486,9 +41201,9 @@ diff -urNp linux-2.6.31.4/include/linux/thread_info.h linux-2.6.31.4/include/lin
u32 val;
u32 flags;
u32 bitset;
-diff -urNp linux-2.6.31.4/include/linux/tty_ldisc.h linux-2.6.31.4/include/linux/tty_ldisc.h
---- linux-2.6.31.4/include/linux/tty_ldisc.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/tty_ldisc.h 2009-10-11 15:29:48.789829466 -0400
+diff -urNp linux-2.6.31.5/include/linux/tty_ldisc.h linux-2.6.31.5/include/linux/tty_ldisc.h
+--- linux-2.6.31.5/include/linux/tty_ldisc.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/linux/tty_ldisc.h 2009-10-20 20:32:11.521046728 -0400
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -39498,9 +41213,9 @@ diff -urNp linux-2.6.31.4/include/linux/tty_ldisc.h linux-2.6.31.4/include/linux
};
struct tty_ldisc {
-diff -urNp linux-2.6.31.4/include/linux/types.h linux-2.6.31.4/include/linux/types.h
---- linux-2.6.31.4/include/linux/types.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/types.h 2009-10-11 15:29:48.857683639 -0400
+diff -urNp linux-2.6.31.5/include/linux/types.h linux-2.6.31.5/include/linux/types.h
+--- linux-2.6.31.5/include/linux/types.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/linux/types.h 2009-10-20 20:32:11.521046728 -0400
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -39528,9 +41243,9 @@ diff -urNp linux-2.6.31.4/include/linux/types.h linux-2.6.31.4/include/linux/typ
#endif
struct ustat {
-diff -urNp linux-2.6.31.4/include/linux/uaccess.h linux-2.6.31.4/include/linux/uaccess.h
---- linux-2.6.31.4/include/linux/uaccess.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/uaccess.h 2009-10-11 15:29:56.562357747 -0400
+diff -urNp linux-2.6.31.5/include/linux/uaccess.h linux-2.6.31.5/include/linux/uaccess.h
+--- linux-2.6.31.5/include/linux/uaccess.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/linux/uaccess.h 2009-10-20 20:32:11.521046728 -0400
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -39562,9 +41277,9 @@ diff -urNp linux-2.6.31.4/include/linux/uaccess.h linux-2.6.31.4/include/linux/u
+extern long probe_kernel_write(void *dst, const void *src, size_t size);
#endif /* __LINUX_UACCESS_H__ */
-diff -urNp linux-2.6.31.4/include/linux/vmalloc.h linux-2.6.31.4/include/linux/vmalloc.h
---- linux-2.6.31.4/include/linux/vmalloc.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/linux/vmalloc.h 2009-10-11 15:29:48.907361583 -0400
+diff -urNp linux-2.6.31.5/include/linux/vmalloc.h linux-2.6.31.5/include/linux/vmalloc.h
+--- linux-2.6.31.5/include/linux/vmalloc.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/linux/vmalloc.h 2009-10-20 20:32:11.521046728 -0400
@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
#define VM_MAP 0x00000004 /* vmap()ed pages */
#define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
@@ -39659,9 +41374,9 @@ diff -urNp linux-2.6.31.4/include/linux/vmalloc.h linux-2.6.31.4/include/linux/v
+})
+
#endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-2.6.31.4/include/net/irda/ircomm_tty.h linux-2.6.31.4/include/net/irda/ircomm_tty.h
---- linux-2.6.31.4/include/net/irda/ircomm_tty.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/net/irda/ircomm_tty.h 2009-10-11 15:29:48.929362537 -0400
+diff -urNp linux-2.6.31.5/include/net/irda/ircomm_tty.h linux-2.6.31.5/include/net/irda/ircomm_tty.h
+--- linux-2.6.31.5/include/net/irda/ircomm_tty.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/net/irda/ircomm_tty.h 2009-10-20 20:32:11.521046728 -0400
@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
@@ -39673,9 +41388,9 @@ diff -urNp linux-2.6.31.4/include/net/irda/ircomm_tty.h linux-2.6.31.4/include/n
/* Protect concurent access to :
* o self->open_count
-diff -urNp linux-2.6.31.4/include/net/sctp/sctp.h linux-2.6.31.4/include/net/sctp/sctp.h
---- linux-2.6.31.4/include/net/sctp/sctp.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/net/sctp/sctp.h 2009-10-11 15:29:48.934361963 -0400
+diff -urNp linux-2.6.31.5/include/net/sctp/sctp.h linux-2.6.31.5/include/net/sctp/sctp.h
+--- linux-2.6.31.5/include/net/sctp/sctp.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/net/sctp/sctp.h 2009-10-20 20:32:11.521046728 -0400
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -39687,9 +41402,9 @@ diff -urNp linux-2.6.31.4/include/net/sctp/sctp.h linux-2.6.31.4/include/net/sct
#define SCTP_ENABLE_DEBUG
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-2.6.31.4/include/sound/ac97_codec.h linux-2.6.31.4/include/sound/ac97_codec.h
---- linux-2.6.31.4/include/sound/ac97_codec.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/sound/ac97_codec.h 2009-10-11 15:29:56.764361720 -0400
+diff -urNp linux-2.6.31.5/include/sound/ac97_codec.h linux-2.6.31.5/include/sound/ac97_codec.h
+--- linux-2.6.31.5/include/sound/ac97_codec.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/sound/ac97_codec.h 2009-10-20 20:32:11.521046728 -0400
@@ -474,7 +474,7 @@ struct snd_ac97_template {
struct snd_ac97 {
@@ -39699,9 +41414,9 @@ diff -urNp linux-2.6.31.4/include/sound/ac97_codec.h linux-2.6.31.4/include/soun
void *private_data;
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
-diff -urNp linux-2.6.31.4/include/sound/core.h linux-2.6.31.4/include/sound/core.h
---- linux-2.6.31.4/include/sound/core.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/sound/core.h 2009-10-11 15:29:48.942356386 -0400
+diff -urNp linux-2.6.31.5/include/sound/core.h linux-2.6.31.5/include/sound/core.h
+--- linux-2.6.31.5/include/sound/core.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/sound/core.h 2009-10-20 20:32:11.521046728 -0400
@@ -430,7 +430,7 @@ static inline int __snd_bug_on(int cond)
*/
#define snd_printdd(format, args...) snd_printk(format, ##args)
@@ -39711,9 +41426,9 @@ diff -urNp linux-2.6.31.4/include/sound/core.h linux-2.6.31.4/include/sound/core
#endif
-diff -urNp linux-2.6.31.4/include/video/uvesafb.h linux-2.6.31.4/include/video/uvesafb.h
---- linux-2.6.31.4/include/video/uvesafb.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/include/video/uvesafb.h 2009-10-11 15:29:48.950363536 -0400
+diff -urNp linux-2.6.31.5/include/video/uvesafb.h linux-2.6.31.5/include/video/uvesafb.h
+--- linux-2.6.31.5/include/video/uvesafb.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/include/video/uvesafb.h 2009-10-20 20:32:11.521046728 -0400
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -39722,20 +41437,20 @@ diff -urNp linux-2.6.31.4/include/video/uvesafb.h linux-2.6.31.4/include/video/u
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
-diff -urNp linux-2.6.31.4/init/do_mounts.c linux-2.6.31.4/init/do_mounts.c
---- linux-2.6.31.4/init/do_mounts.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/do_mounts.c 2009-10-11 15:29:48.958755031 -0400
+diff -urNp linux-2.6.31.5/init/do_mounts.c linux-2.6.31.5/init/do_mounts.c
+--- linux-2.6.31.5/init/do_mounts.c 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/do_mounts.c 2009-10-20 20:33:11.009148195 -0400
@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
static int __init do_mount_root(char *name, char *fs, int flags, void *data)
{
- int err = sys_mount(name, "/root", fs, flags, data);
-+ int err = sys_mount((char __user *)name, (char __user *)"/root", (char __user *)fs, flags, (void __user *)data);
++ int err = sys_mount((__force char __user *)name, (__force char __user *)"/root", (__force char __user *)fs, flags, (__force void __user *)data);
if (err)
return err;
- sys_chdir("/root");
-+ sys_chdir((char __user *)"/root");
++ sys_chdir((__force char __user *)"/root");
ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
current->fs->pwd.mnt->mnt_sb->s_type->name,
@@ -39767,21 +41482,21 @@ diff -urNp linux-2.6.31.4/init/do_mounts.c linux-2.6.31.4/init/do_mounts.c
out:
- sys_mount(".", "/", NULL, MS_MOVE, NULL);
- sys_chroot(".");
-+ sys_mount((char __user *)".", (char __user *)"/", NULL, MS_MOVE, NULL);
-+ sys_chroot((char __user *)".");
++ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
++ sys_chroot((__force char __user *)".");
}
-diff -urNp linux-2.6.31.4/init/do_mounts.h linux-2.6.31.4/init/do_mounts.h
---- linux-2.6.31.4/init/do_mounts.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/do_mounts.h 2009-10-11 15:29:48.959591163 -0400
+diff -urNp linux-2.6.31.5/init/do_mounts.h linux-2.6.31.5/init/do_mounts.h
+--- linux-2.6.31.5/init/do_mounts.h 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/do_mounts.h 2009-10-20 20:33:11.009148195 -0400
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
{
- sys_unlink(name);
- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
-+ sys_unlink((char __user *)name);
-+ return sys_mknod((char __user *)name, S_IFBLK|0600, new_encode_dev(dev));
++ sys_unlink((__force char __user *)name);
++ return sys_mknod((__force char __user *)name, S_IFBLK|0600, new_encode_dev(dev));
}
#if BITS_PER_LONG == 32
@@ -39789,19 +41504,19 @@ diff -urNp linux-2.6.31.4/init/do_mounts.h linux-2.6.31.4/init/do_mounts.h
{
struct stat64 stat;
- if (sys_stat64(name, &stat) != 0)
-+ if (sys_stat64((char __user *)name, (struct stat64 __user *)&stat) != 0)
++ if (sys_stat64((__force char __user *)name, (__force struct stat64 __user *)&stat) != 0)
return 0;
if (!S_ISBLK(stat.st_mode))
return 0;
-diff -urNp linux-2.6.31.4/init/do_mounts_initrd.c linux-2.6.31.4/init/do_mounts_initrd.c
---- linux-2.6.31.4/init/do_mounts_initrd.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/do_mounts_initrd.c 2009-10-11 15:29:48.959591163 -0400
+diff -urNp linux-2.6.31.5/init/do_mounts_initrd.c linux-2.6.31.5/init/do_mounts_initrd.c
+--- linux-2.6.31.5/init/do_mounts_initrd.c 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/do_mounts_initrd.c 2009-10-20 20:33:11.009148195 -0400
@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
sys_close(old_fd);sys_close(root_fd);
sys_close(0);sys_close(1);sys_close(2);
sys_setsid();
- (void) sys_open("/dev/console",O_RDWR,0);
-+ (void) sys_open((const char __user *)"/dev/console",O_RDWR,0);
++ (void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
(void) sys_dup(0);
(void) sys_dup(0);
return kernel_execve(shell, argv, envp_init);
@@ -39812,16 +41527,16 @@ diff -urNp linux-2.6.31.4/init/do_mounts_initrd.c linux-2.6.31.4/init/do_mounts_
- sys_mkdir("/old", 0700);
- root_fd = sys_open("/", 0, 0);
- old_fd = sys_open("/old", 0, 0);
-+ sys_mkdir((const char __user *)"/old", 0700);
-+ root_fd = sys_open((const char __user *)"/", 0, 0);
-+ old_fd = sys_open((const char __user *)"/old", 0, 0);
++ sys_mkdir((__force const char __user *)"/old", 0700);
++ root_fd = sys_open((__force const char __user *)"/", 0, 0);
++ old_fd = sys_open((__force const char __user *)"/old", 0, 0);
/* move initrd over / and chdir/chroot in initrd root */
- sys_chdir("/root");
- sys_mount(".", "/", NULL, MS_MOVE, NULL);
- sys_chroot(".");
-+ sys_chdir((const char __user *)"/root");
-+ sys_mount((char __user *)".", (char __user *)"/", NULL, MS_MOVE, NULL);
-+ sys_chroot((const char __user *)".");
++ sys_chdir((__force const char __user *)"/root");
++ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
++ sys_chroot((__force const char __user *)".");
/*
* In case that a resume from disk is carried out by linuxrc or one of
@@ -39830,17 +41545,17 @@ diff -urNp linux-2.6.31.4/init/do_mounts_initrd.c linux-2.6.31.4/init/do_mounts_
/* move initrd to rootfs' /old */
sys_fchdir(old_fd);
- sys_mount("/", ".", NULL, MS_MOVE, NULL);
-+ sys_mount((char __user *)"/", (char __user *)".", NULL, MS_MOVE, NULL);
++ sys_mount((__force char __user *)"/", (__force char __user *)".", NULL, MS_MOVE, NULL);
/* switch root and cwd back to / of rootfs */
sys_fchdir(root_fd);
- sys_chroot(".");
-+ sys_chroot((const char __user *)".");
++ sys_chroot((__force const char __user *)".");
sys_close(old_fd);
sys_close(root_fd);
if (new_decode_dev(real_root_dev) == Root_RAM0) {
- sys_chdir("/old");
-+ sys_chdir((const char __user *)"/old");
++ sys_chdir((__force const char __user *)"/old");
return;
}
@@ -39849,19 +41564,19 @@ diff -urNp linux-2.6.31.4/init/do_mounts_initrd.c linux-2.6.31.4/init/do_mounts_
printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
-+ error = sys_mount((char __user *)"/old", (char __user *)"/root/initrd", NULL, MS_MOVE, NULL);
++ error = sys_mount((__force char __user *)"/old", (__force char __user *)"/root/initrd", NULL, MS_MOVE, NULL);
if (!error)
printk("okay\n");
else {
- int fd = sys_open("/dev/root.old", O_RDWR, 0);
-+ int fd = sys_open((const char __user *)"/dev/root.old", O_RDWR, 0);
++ int fd = sys_open((__force const char __user *)"/dev/root.old", O_RDWR, 0);
if (error == -ENOENT)
printk("/initrd does not exist. Ignored.\n");
else
printk("failed\n");
printk(KERN_NOTICE "Unmounting old root\n");
- sys_umount("/old", MNT_DETACH);
-+ sys_umount((char __user *)"/old", MNT_DETACH);
++ sys_umount((__force char __user *)"/old", MNT_DETACH);
printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
if (fd < 0) {
error = fd;
@@ -39870,24 +41585,24 @@ diff -urNp linux-2.6.31.4/init/do_mounts_initrd.c linux-2.6.31.4/init/do_mounts_
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
- sys_unlink("/initrd.image");
-+ sys_unlink((const char __user *)"/initrd.image");
++ sys_unlink((__force const char __user *)"/initrd.image");
handle_initrd();
return 1;
}
}
- sys_unlink("/initrd.image");
-+ sys_unlink((const char __user *)"/initrd.image");
++ sys_unlink((__force const char __user *)"/initrd.image");
return 0;
}
-diff -urNp linux-2.6.31.4/init/do_mounts_md.c linux-2.6.31.4/init/do_mounts_md.c
---- linux-2.6.31.4/init/do_mounts_md.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/do_mounts_md.c 2009-10-11 15:29:48.960385585 -0400
+diff -urNp linux-2.6.31.5/init/do_mounts_md.c linux-2.6.31.5/init/do_mounts_md.c
+--- linux-2.6.31.5/init/do_mounts_md.c 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/do_mounts_md.c 2009-10-20 20:33:11.009148195 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
- fd = sys_open(name, 0, 0);
-+ fd = sys_open((char __user *)name, 0, 0);
++ fd = sys_open((__force char __user *)name, 0, 0);
if (fd < 0) {
printk(KERN_ERR "md: open failed - cannot start "
"array %s\n", name);
@@ -39896,7 +41611,7 @@ diff -urNp linux-2.6.31.4/init/do_mounts_md.c linux-2.6.31.4/init/do_mounts_md.c
*/
sys_close(fd);
- fd = sys_open(name, 0, 0);
-+ fd = sys_open((char __user *)name, 0, 0);
++ fd = sys_open((__force char __user *)name, 0, 0);
sys_ioctl(fd, BLKRRPART, 0);
}
sys_close(fd);
@@ -39905,19 +41620,37 @@ diff -urNp linux-2.6.31.4/init/do_mounts_md.c linux-2.6.31.4/init/do_mounts_md.c
wait_for_device_probe();
- fd = sys_open("/dev/md0", 0, 0);
-+ fd = sys_open((char __user *)"/dev/md0", 0, 0);
++ fd = sys_open((__force char __user *)"/dev/md0", 0, 0);
if (fd >= 0) {
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
-diff -urNp linux-2.6.31.4/init/initramfs.c linux-2.6.31.4/init/initramfs.c
---- linux-2.6.31.4/init/initramfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/initramfs.c 2009-10-11 15:29:48.961462731 -0400
+diff -urNp linux-2.6.31.5/init/initramfs.c linux-2.6.31.5/init/initramfs.c
+--- linux-2.6.31.5/init/initramfs.c 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/initramfs.c 2009-10-20 20:33:11.010128580 -0400
+@@ -74,7 +74,7 @@ static void __init free_hash(void)
+ }
+ }
+
+-static long __init do_utime(char __user *filename, time_t mtime)
++static long __init do_utime(__force char __user *filename, time_t mtime)
+ {
+ struct timespec t[2];
+
+@@ -109,7 +109,7 @@ static void __init dir_utime(void)
+ struct dir_entry *de, *tmp;
+ list_for_each_entry_safe(de, tmp, &dir_list, list) {
+ list_del(&de->list);
+- do_utime(de->name, de->mtime);
++ do_utime((__force char __user *)de->name, de->mtime);
+ kfree(de->name);
+ kfree(de);
+ }
@@ -271,7 +271,7 @@ static int __init maybe_link(void)
if (nlink >= 2) {
char *old = find_link(major, minor, ino, mode, collected);
if (old)
- return (sys_link(old, collected) < 0) ? -1 : 1;
-+ return (sys_link((char __user *)old, (char __user *)collected) < 0) ? -1 : 1;
++ return (sys_link((__force char __user *)old, (__force char __user *)collected) < 0) ? -1 : 1;
}
return 0;
}
@@ -39926,13 +41659,13 @@ diff -urNp linux-2.6.31.4/init/initramfs.c linux-2.6.31.4/init/initramfs.c
struct stat st;
- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
-+ if (!sys_newlstat((char __user *)path, (struct stat __user *)&st) && (st.st_mode^mode) & S_IFMT) {
++ if (!sys_newlstat((__force char __user *)path, (__force struct stat __user *)&st) && (st.st_mode^mode) & S_IFMT) {
if (S_ISDIR(st.st_mode))
- sys_rmdir(path);
-+ sys_rmdir((char __user *)path);
++ sys_rmdir((__force char __user *)path);
else
- sys_unlink(path);
-+ sys_unlink((char __user *)path);
++ sys_unlink((__force char __user *)path);
}
}
@@ -39941,20 +41674,20 @@ diff -urNp linux-2.6.31.4/init/initramfs.c linux-2.6.31.4/init/initramfs.c
if (ml != 1)
openflags |= O_TRUNC;
- wfd = sys_open(collected, openflags, mode);
-+ wfd = sys_open((char __user *)collected, openflags, mode);
++ wfd = sys_open((__force char __user *)collected, openflags, mode);
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
-@@ -317,16 +317,16 @@ static int __init do_name(void)
+@@ -317,17 +317,17 @@ static int __init do_name(void)
}
}
} else if (S_ISDIR(mode)) {
- sys_mkdir(collected, mode);
- sys_chown(collected, uid, gid);
- sys_chmod(collected, mode);
-+ sys_mkdir((char __user *)collected, mode);
-+ sys_chown((char __user *)collected, uid, gid);
-+ sys_chmod((char __user *)collected, mode);
++ sys_mkdir((__force char __user *)collected, mode);
++ sys_chown((__force char __user *)collected, uid, gid);
++ sys_chmod((__force char __user *)collected, mode);
dir_add(collected, mtime);
} else if (S_ISBLK(mode) || S_ISCHR(mode) ||
S_ISFIFO(mode) || S_ISSOCK(mode)) {
@@ -39962,44 +41695,49 @@ diff -urNp linux-2.6.31.4/init/initramfs.c linux-2.6.31.4/init/initramfs.c
- sys_mknod(collected, mode, rdev);
- sys_chown(collected, uid, gid);
- sys_chmod(collected, mode);
-+ sys_mknod((char __user *)collected, mode, rdev);
-+ sys_chown((char __user *)collected, uid, gid);
-+ sys_chmod((char __user *)collected, mode);
- do_utime(collected, mtime);
+- do_utime(collected, mtime);
++ sys_mknod((__force char __user *)collected, mode, rdev);
++ sys_chown((__force char __user *)collected, uid, gid);
++ sys_chmod((__force char __user *)collected, mode);
++ do_utime((__force char __user *)collected, mtime);
}
}
-@@ -336,7 +336,7 @@ static int __init do_name(void)
+ return 0;
+@@ -336,15 +336,15 @@ static int __init do_name(void)
static int __init do_copy(void)
{
if (count >= body_len) {
- sys_write(wfd, victim, body_len);
-+ sys_write(wfd, (char __user *)victim, body_len);
++ sys_write(wfd, (__force char __user *)victim, body_len);
sys_close(wfd);
- do_utime(vcollected, mtime);
+- do_utime(vcollected, mtime);
++ do_utime((__force char __user *)vcollected, mtime);
kfree(vcollected);
-@@ -344,7 +344,7 @@ static int __init do_copy(void)
+ eat(body_len);
state = SkipIt;
return 0;
} else {
- sys_write(wfd, victim, count);
-+ sys_write(wfd, (char __user *)victim, count);
++ sys_write(wfd, (__force char __user *)victim, count);
body_len -= count;
eat(count);
return 1;
-@@ -355,8 +355,8 @@ static int __init do_symlink(void)
+@@ -355,9 +355,9 @@ static int __init do_symlink(void)
{
collected[N_ALIGN(name_len) + body_len] = '\0';
clean_path(collected, 0);
- sys_symlink(collected + N_ALIGN(name_len), collected);
- sys_lchown(collected, uid, gid);
-+ sys_symlink((char __user *)collected + N_ALIGN(name_len), (char __user *)collected);
-+ sys_lchown((char __user *)collected, uid, gid);
- do_utime(collected, mtime);
+- do_utime(collected, mtime);
++ sys_symlink((__force char __user *)collected + N_ALIGN(name_len), (__force char __user *)collected);
++ sys_lchown((__force char __user *)collected, uid, gid);
++ do_utime((__force char __user *)collected, mtime);
state = SkipIt;
next_state = Reset;
-diff -urNp linux-2.6.31.4/init/Kconfig linux-2.6.31.4/init/Kconfig
---- linux-2.6.31.4/init/Kconfig 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/Kconfig 2009-10-11 15:29:48.961462731 -0400
+ return 0;
+diff -urNp linux-2.6.31.5/init/Kconfig linux-2.6.31.5/init/Kconfig
+--- linux-2.6.31.5/init/Kconfig 2009-10-20 20:42:59.191690937 -0400
++++ linux-2.6.31.5/init/Kconfig 2009-10-20 20:32:11.884048721 -0400
@@ -1014,7 +1014,7 @@ config STRIP_ASM_SYMS
config COMPAT_BRK
@@ -40021,9 +41759,9 @@ diff -urNp linux-2.6.31.4/init/Kconfig linux-2.6.31.4/init/Kconfig
config RT_MUTEXES
boolean
-diff -urNp linux-2.6.31.4/init/main.c linux-2.6.31.4/init/main.c
---- linux-2.6.31.4/init/main.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/main.c 2009-10-11 15:29:48.962478131 -0400
+diff -urNp linux-2.6.31.5/init/main.c linux-2.6.31.5/init/main.c
+--- linux-2.6.31.5/init/main.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/init/main.c 2009-10-20 20:33:11.010128580 -0400
@@ -96,6 +96,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -40077,16 +41815,54 @@ diff -urNp linux-2.6.31.4/init/main.c linux-2.6.31.4/init/main.c
EXPORT_SYMBOL(__per_cpu_offset);
-@@ -741,6 +771,7 @@ int do_one_initcall(initcall_t fn)
+@@ -734,52 +764,53 @@ int initcall_debug;
+ core_param(initcall_debug, initcall_debug, bool, 0644);
+
+ static char msgbuf[64];
+-static struct boot_trace_call call;
+-static struct boot_trace_ret ret;
++static struct boot_trace_call trace_call;
++static struct boot_trace_ret trace_ret;
+
+ int do_one_initcall(initcall_t fn)
{
int count = preempt_count();
ktime_t calltime, delta, rettime;
+ const char *msg1 = "", *msg2 = "";
if (initcall_debug) {
- call.caller = task_pid_nr(current);
-@@ -768,15 +799,15 @@ int do_one_initcall(initcall_t fn)
- sprintf(msgbuf, "error code %d ", ret.result);
+- call.caller = task_pid_nr(current);
+- printk("calling %pF @ %i\n", fn, call.caller);
++ trace_call.caller = task_pid_nr(current);
++ printk("calling %pF @ %i\n", fn, trace_call.caller);
+ calltime = ktime_get();
+- trace_boot_call(&call, fn);
++ trace_boot_call(&trace_call, fn);
+ enable_boot_trace();
+ }
+
+- ret.result = fn();
++ trace_ret.result = fn();
+
+ if (initcall_debug) {
+ disable_boot_trace();
+ rettime = ktime_get();
+ delta = ktime_sub(rettime, calltime);
+- ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
+- trace_boot_ret(&ret, fn);
++ trace_ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
++ trace_boot_ret(&trace_ret, fn);
+ printk("initcall %pF returned %d after %Ld usecs\n", fn,
+- ret.result, ret.duration);
++ trace_ret.result, trace_ret.duration);
+ }
+
+ msgbuf[0] = 0;
+
+- if (ret.result && ret.result != -ENODEV && initcall_debug)
+- sprintf(msgbuf, "error code %d ", ret.result);
++ if (trace_ret.result && trace_ret.result != -ENODEV && initcall_debug)
++ sprintf(msgbuf, "error code %d ", trace_ret.result);
if (preempt_count() != count) {
- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
@@ -40104,8 +41880,18 @@ diff -urNp linux-2.6.31.4/init/main.c linux-2.6.31.4/init/main.c
+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
}
- return ret.result;
-@@ -923,6 +954,8 @@ static int __init kernel_init(void * unu
+- return ret.result;
++ return trace_ret.result;
+ }
+
+
+@@ -918,11 +949,13 @@ static int __init kernel_init(void * unu
+ if (!ramdisk_execute_command)
+ ramdisk_execute_command = "/init";
+
+- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
++ if (sys_access((__force const char __user *) ramdisk_execute_command, 0) != 0) {
+ ramdisk_execute_command = NULL;
prepare_namespace();
}
@@ -40114,9 +41900,9 @@ diff -urNp linux-2.6.31.4/init/main.c linux-2.6.31.4/init/main.c
/*
* Ok, we have completed the initial bootup, and
* we're essentially up and running. Get rid of the
-diff -urNp linux-2.6.31.4/init/noinitramfs.c linux-2.6.31.4/init/noinitramfs.c
---- linux-2.6.31.4/init/noinitramfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/init/noinitramfs.c 2009-10-11 15:29:48.963371490 -0400
+diff -urNp linux-2.6.31.5/init/noinitramfs.c linux-2.6.31.5/init/noinitramfs.c
+--- linux-2.6.31.5/init/noinitramfs.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/init/noinitramfs.c 2009-10-20 20:32:11.884048721 -0400
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -40135,9 +41921,9 @@ diff -urNp linux-2.6.31.4/init/noinitramfs.c linux-2.6.31.4/init/noinitramfs.c
if (err < 0)
goto out;
-diff -urNp linux-2.6.31.4/ipc/ipc_sysctl.c linux-2.6.31.4/ipc/ipc_sysctl.c
---- linux-2.6.31.4/ipc/ipc_sysctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/ipc/ipc_sysctl.c 2009-10-11 15:29:48.963371490 -0400
+diff -urNp linux-2.6.31.5/ipc/ipc_sysctl.c linux-2.6.31.5/ipc/ipc_sysctl.c
+--- linux-2.6.31.5/ipc/ipc_sysctl.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/ipc/ipc_sysctl.c 2009-10-20 20:32:11.884048721 -0400
@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
.extra1 = &zero,
.extra2 = &one,
@@ -40156,9 +41942,9 @@ diff -urNp linux-2.6.31.4/ipc/ipc_sysctl.c linux-2.6.31.4/ipc/ipc_sysctl.c
};
static int __init ipc_sysctl_init(void)
-diff -urNp linux-2.6.31.4/ipc/mqueue.c linux-2.6.31.4/ipc/mqueue.c
---- linux-2.6.31.4/ipc/mqueue.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/ipc/mqueue.c 2009-10-11 15:29:48.963371490 -0400
+diff -urNp linux-2.6.31.5/ipc/mqueue.c linux-2.6.31.5/ipc/mqueue.c
+--- linux-2.6.31.5/ipc/mqueue.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/ipc/mqueue.c 2009-10-20 20:32:11.884048721 -0400
@@ -77,7 +77,7 @@ struct mqueue_inode_info {
static const struct inode_operations mqueue_dir_inode_operations;
@@ -40185,9 +41971,9 @@ diff -urNp linux-2.6.31.4/ipc/mqueue.c linux-2.6.31.4/ipc/mqueue.c
.alloc_inode = mqueue_alloc_inode,
.destroy_inode = mqueue_destroy_inode,
.statfs = simple_statfs,
-diff -urNp linux-2.6.31.4/ipc/shm.c linux-2.6.31.4/ipc/shm.c
---- linux-2.6.31.4/ipc/shm.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/ipc/shm.c 2009-10-11 15:29:48.964420843 -0400
+diff -urNp linux-2.6.31.5/ipc/shm.c linux-2.6.31.5/ipc/shm.c
+--- linux-2.6.31.5/ipc/shm.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/ipc/shm.c 2009-10-20 20:32:11.885357453 -0400
@@ -55,7 +55,7 @@ struct shm_file_data {
#define shm_file_data(file) (*((struct shm_file_data **)&(file)->private_data))
@@ -40258,9 +42044,9 @@ diff -urNp linux-2.6.31.4/ipc/shm.c linux-2.6.31.4/ipc/shm.c
size = i_size_read(path.dentry->d_inode);
shm_unlock(shp);
-diff -urNp linux-2.6.31.4/ipc/util.c linux-2.6.31.4/ipc/util.c
---- linux-2.6.31.4/ipc/util.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/ipc/util.c 2009-10-11 15:29:48.964420843 -0400
+diff -urNp linux-2.6.31.5/ipc/util.c linux-2.6.31.5/ipc/util.c
+--- linux-2.6.31.5/ipc/util.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/ipc/util.c 2009-10-20 20:32:11.885357453 -0400
@@ -942,7 +942,7 @@ static int sysvipc_proc_show(struct seq_
return iface->show(s, it);
}
@@ -40270,21 +42056,21 @@ diff -urNp linux-2.6.31.4/ipc/util.c linux-2.6.31.4/ipc/util.c
.start = sysvipc_proc_start,
.stop = sysvipc_proc_stop,
.next = sysvipc_proc_next,
-diff -urNp linux-2.6.31.4/kernel/acct.c linux-2.6.31.4/kernel/acct.c
---- linux-2.6.31.4/kernel/acct.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/acct.c 2009-10-11 15:29:48.964420843 -0400
-@@ -574,7 +574,7 @@ static void do_acct_process(struct bsd_a
+diff -urNp linux-2.6.31.5/kernel/acct.c linux-2.6.31.5/kernel/acct.c
+--- linux-2.6.31.5/kernel/acct.c 2009-10-23 19:50:17.804466363 -0400
++++ linux-2.6.31.5/kernel/acct.c 2009-10-23 19:50:30.117213973 -0400
+@@ -578,7 +578,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
- file->f_op->write(file, (char *)&ac,
-+ file->f_op->write(file, (char __user *)&ac,
++ file->f_op->write(file, (__force char __user *)&ac,
sizeof(acct_t), &file->f_pos);
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
-diff -urNp linux-2.6.31.4/kernel/capability.c linux-2.6.31.4/kernel/capability.c
---- linux-2.6.31.4/kernel/capability.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/capability.c 2009-10-11 15:29:48.964420843 -0400
+diff -urNp linux-2.6.31.5/kernel/capability.c linux-2.6.31.5/kernel/capability.c
+--- linux-2.6.31.5/kernel/capability.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/kernel/capability.c 2009-10-20 20:32:11.885357453 -0400
@@ -306,10 +306,21 @@ int capable(int cap)
BUG();
}
@@ -40308,9 +42094,9 @@ diff -urNp linux-2.6.31.4/kernel/capability.c linux-2.6.31.4/kernel/capability.c
+
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
-diff -urNp linux-2.6.31.4/kernel/cgroup.c linux-2.6.31.4/kernel/cgroup.c
---- linux-2.6.31.4/kernel/cgroup.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/cgroup.c 2009-10-11 15:29:48.965596731 -0400
+diff -urNp linux-2.6.31.5/kernel/cgroup.c linux-2.6.31.5/kernel/cgroup.c
+--- linux-2.6.31.5/kernel/cgroup.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/kernel/cgroup.c 2009-10-20 20:32:11.886334013 -0400
@@ -596,8 +596,8 @@ void cgroup_unlock(void)
static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode);
static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry);
@@ -40394,9 +42180,9 @@ diff -urNp linux-2.6.31.4/kernel/cgroup.c linux-2.6.31.4/kernel/cgroup.c
.open = cgroupstats_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/kernel/configs.c linux-2.6.31.4/kernel/configs.c
---- linux-2.6.31.4/kernel/configs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/configs.c 2009-10-11 15:29:48.966364272 -0400
+diff -urNp linux-2.6.31.5/kernel/configs.c linux-2.6.31.5/kernel/configs.c
+--- linux-2.6.31.5/kernel/configs.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/kernel/configs.c 2009-10-20 20:32:11.886334013 -0400
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -40417,9 +42203,9 @@ diff -urNp linux-2.6.31.4/kernel/configs.c linux-2.6.31.4/kernel/configs.c
if (!entry)
return -ENOMEM;
-diff -urNp linux-2.6.31.4/kernel/cpu.c linux-2.6.31.4/kernel/cpu.c
---- linux-2.6.31.4/kernel/cpu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/cpu.c 2009-10-11 15:29:48.966364272 -0400
+diff -urNp linux-2.6.31.5/kernel/cpu.c linux-2.6.31.5/kernel/cpu.c
+--- linux-2.6.31.5/kernel/cpu.c 2009-10-20 20:42:59.194863969 -0400
++++ linux-2.6.31.5/kernel/cpu.c 2009-10-20 20:32:11.887309566 -0400
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -40429,9 +42215,9 @@ diff -urNp linux-2.6.31.4/kernel/cpu.c linux-2.6.31.4/kernel/cpu.c
/* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
* Should always be manipulated under cpu_add_remove_lock
-diff -urNp linux-2.6.31.4/kernel/cred.c linux-2.6.31.4/kernel/cred.c
---- linux-2.6.31.4/kernel/cred.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/cred.c 2009-10-11 15:29:48.966364272 -0400
+diff -urNp linux-2.6.31.5/kernel/cred.c linux-2.6.31.5/kernel/cred.c
+--- linux-2.6.31.5/kernel/cred.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/cred.c 2009-10-20 20:32:11.887309566 -0400
@@ -366,6 +366,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -40441,9 +42227,9 @@ diff -urNp linux-2.6.31.4/kernel/cred.c linux-2.6.31.4/kernel/cred.c
/* dumpability changes */
if (old->euid != new->euid ||
old->egid != new->egid ||
-diff -urNp linux-2.6.31.4/kernel/exit.c linux-2.6.31.4/kernel/exit.c
---- linux-2.6.31.4/kernel/exit.c 2009-10-12 23:26:18.119754005 -0400
-+++ linux-2.6.31.4/kernel/exit.c 2009-10-12 23:26:38.978149596 -0400
+diff -urNp linux-2.6.31.5/kernel/exit.c linux-2.6.31.5/kernel/exit.c
+--- linux-2.6.31.5/kernel/exit.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/exit.c 2009-10-20 20:33:11.010880245 -0400
@@ -56,6 +56,10 @@
#include <asm/mmu_context.h>
#include "cred-internals.h"
@@ -40487,6 +42273,15 @@ diff -urNp linux-2.6.31.4/kernel/exit.c linux-2.6.31.4/kernel/exit.c
/* Set the exit signal to SIGCHLD so we signal init on exit */
current->exit_signal = SIGCHLD;
+@@ -390,7 +407,7 @@ int allow_signal(int sig)
+ * know it'll be handled, so that they don't get converted to
+ * SIGKILL or just silently dropped.
+ */
+- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
++ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
+ recalc_sigpending();
+ spin_unlock_irq(&current->sighand->siglock);
+ return 0;
@@ -426,6 +443,17 @@ void daemonize(const char *name, ...)
vsnprintf(current->comm, sizeof(current->comm), name, args);
va_end(args);
@@ -40524,9 +42319,9 @@ diff -urNp linux-2.6.31.4/kernel/exit.c linux-2.6.31.4/kernel/exit.c
get_task_struct(p);
read_unlock(&tasklist_lock);
-diff -urNp linux-2.6.31.4/kernel/fork.c linux-2.6.31.4/kernel/fork.c
---- linux-2.6.31.4/kernel/fork.c 2009-10-12 23:26:18.120395868 -0400
-+++ linux-2.6.31.4/kernel/fork.c 2009-10-12 23:28:40.273368388 -0400
+diff -urNp linux-2.6.31.5/kernel/fork.c linux-2.6.31.5/kernel/fork.c
+--- linux-2.6.31.5/kernel/fork.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/fork.c 2009-10-20 20:32:11.888286337 -0400
@@ -244,7 +244,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -40668,10 +42463,10 @@ diff -urNp linux-2.6.31.4/kernel/fork.c linux-2.6.31.4/kernel/fork.c
new_fs = NULL;
else
new_fs = fs;
-diff -urNp linux-2.6.31.4/kernel/futex.c linux-2.6.31.4/kernel/futex.c
---- linux-2.6.31.4/kernel/futex.c 2009-10-12 23:26:18.130015056 -0400
-+++ linux-2.6.31.4/kernel/futex.c 2009-10-12 23:26:38.979417555 -0400
-@@ -218,6 +218,11 @@ get_futex_key(u32 __user *uaddr, int fsh
+diff -urNp linux-2.6.31.5/kernel/futex.c linux-2.6.31.5/kernel/futex.c
+--- linux-2.6.31.5/kernel/futex.c 2009-10-23 19:50:17.815180276 -0400
++++ linux-2.6.31.5/kernel/futex.c 2009-10-23 19:50:30.118244956 -0400
+@@ -221,6 +221,11 @@ get_futex_key(u32 __user *uaddr, int fsh
struct page *page;
int err;
@@ -40683,7 +42478,7 @@ diff -urNp linux-2.6.31.4/kernel/futex.c linux-2.6.31.4/kernel/futex.c
/*
* The futex address must be "naturally" aligned.
*/
-@@ -1788,7 +1793,7 @@ static int futex_wait(u32 __user *uaddr,
+@@ -1793,7 +1798,7 @@ static int futex_wait(u32 __user *uaddr,
restart = &current_thread_info()->restart_block;
restart->fn = futex_wait_restart;
@@ -40692,7 +42487,7 @@ diff -urNp linux-2.6.31.4/kernel/futex.c linux-2.6.31.4/kernel/futex.c
restart->futex.val = val;
restart->futex.time = abs_time->tv64;
restart->futex.bitset = bitset;
-@@ -2402,7 +2407,7 @@ retry:
+@@ -2409,7 +2414,7 @@ retry:
*/
static inline int fetch_robust_entry(struct robust_list __user **entry,
struct robust_list __user * __user *head,
@@ -40701,9 +42496,9 @@ diff -urNp linux-2.6.31.4/kernel/futex.c linux-2.6.31.4/kernel/futex.c
{
unsigned long uentry;
-diff -urNp linux-2.6.31.4/kernel/gcov/base.c linux-2.6.31.4/kernel/gcov/base.c
---- linux-2.6.31.4/kernel/gcov/base.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/gcov/base.c 2009-10-11 15:29:48.968525491 -0400
+diff -urNp linux-2.6.31.5/kernel/gcov/base.c linux-2.6.31.5/kernel/gcov/base.c
+--- linux-2.6.31.5/kernel/gcov/base.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/gcov/base.c 2009-10-20 20:32:11.888286337 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -40725,9 +42520,9 @@ diff -urNp linux-2.6.31.4/kernel/gcov/base.c linux-2.6.31.4/kernel/gcov/base.c
if (prev)
prev->next = info->next;
else
-diff -urNp linux-2.6.31.4/kernel/kallsyms.c linux-2.6.31.4/kernel/kallsyms.c
---- linux-2.6.31.4/kernel/kallsyms.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/kallsyms.c 2009-10-11 15:29:56.562357747 -0400
+diff -urNp linux-2.6.31.5/kernel/kallsyms.c linux-2.6.31.5/kernel/kallsyms.c
+--- linux-2.6.31.5/kernel/kallsyms.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/kallsyms.c 2009-10-23 19:49:23.849065232 -0400
@@ -11,6 +11,9 @@
* Changed the compression method from stem compression to "table lookup"
* compression (see scripts/kallsyms.c for a more complete description)
@@ -40766,7 +42561,19 @@ diff -urNp linux-2.6.31.4/kernel/kallsyms.c linux-2.6.31.4/kernel/kallsyms.c
iter->nameoff = get_symbol_offset(new_pos);
iter->pos = new_pos;
}
-@@ -500,7 +508,7 @@ static int kallsyms_open(struct inode *i
+@@ -460,6 +468,11 @@ static int s_show(struct seq_file *m, vo
+ {
+ struct kallsym_iter *iter = m->private;
+
++#ifdef CONFIG_GRKERNSEC_HIDESYM
++ if (current_uid())
++ return 0;
++#endif
++
+ /* Some debugging symbols have no name. Ignore them. */
+ if (!iter->name[0])
+ return 0;
+@@ -500,7 +513,7 @@ static int kallsyms_open(struct inode *i
struct kallsym_iter *iter;
int ret;
@@ -40775,25 +42582,17 @@ diff -urNp linux-2.6.31.4/kernel/kallsyms.c linux-2.6.31.4/kernel/kallsyms.c
if (!iter)
return -ENOMEM;
reset_iter(iter, 0);
-@@ -522,7 +530,15 @@ static const struct file_operations kall
-
+@@ -523,6 +536,7 @@ static const struct file_operations kall
static int __init kallsyms_init(void)
{
-+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
-+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
-+ proc_create("kallsyms", S_IFREG | S_IRUSR, NULL, &kallsyms_operations);
-+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
-+ proc_create("kallsyms", S_IFREG | S_IRUSR | S_IRGRP, NULL, &kallsyms_operations);
-+#endif
-+#else
proc_create("kallsyms", 0444, NULL, &kallsyms_operations);
-+#endif
++
return 0;
}
device_initcall(kallsyms_init);
-diff -urNp linux-2.6.31.4/kernel/kgdb.c linux-2.6.31.4/kernel/kgdb.c
---- linux-2.6.31.4/kernel/kgdb.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/kgdb.c 2009-10-11 15:29:56.764361720 -0400
+diff -urNp linux-2.6.31.5/kernel/kgdb.c linux-2.6.31.5/kernel/kgdb.c
+--- linux-2.6.31.5/kernel/kgdb.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/kgdb.c 2009-10-20 20:32:11.889263169 -0400
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -40821,9 +42620,9 @@ diff -urNp linux-2.6.31.4/kernel/kgdb.c linux-2.6.31.4/kernel/kgdb.c
{
BUG_ON(kgdb_connected);
-diff -urNp linux-2.6.31.4/kernel/kmod.c linux-2.6.31.4/kernel/kmod.c
---- linux-2.6.31.4/kernel/kmod.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/kmod.c 2009-10-11 15:29:48.969387954 -0400
+diff -urNp linux-2.6.31.5/kernel/kmod.c linux-2.6.31.5/kernel/kmod.c
+--- linux-2.6.31.5/kernel/kmod.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/kmod.c 2009-10-20 20:32:11.889263169 -0400
@@ -84,6 +84,18 @@ int __request_module(bool wait, const ch
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
@@ -40843,9 +42642,9 @@ diff -urNp linux-2.6.31.4/kernel/kmod.c linux-2.6.31.4/kernel/kmod.c
/* If modprobe needs a service that is in a module, we get a recursive
* loop. Limit the number of running kmod threads to max_threads/2 or
* MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
-diff -urNp linux-2.6.31.4/kernel/kprobes.c linux-2.6.31.4/kernel/kprobes.c
---- linux-2.6.31.4/kernel/kprobes.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/kprobes.c 2009-10-11 15:29:48.969387954 -0400
+diff -urNp linux-2.6.31.5/kernel/kprobes.c linux-2.6.31.5/kernel/kprobes.c
+--- linux-2.6.31.5/kernel/kprobes.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/kprobes.c 2009-10-20 20:32:11.889263169 -0400
@@ -184,7 +184,7 @@ static kprobe_opcode_t __kprobes *__get_
* kernel image and loaded module images reside. This is required
* so x86_64 can correctly handle the %rip-relative fixups.
@@ -40891,9 +42690,9 @@ diff -urNp linux-2.6.31.4/kernel/kprobes.c linux-2.6.31.4/kernel/kprobes.c
.read = read_enabled_file_bool,
.write = write_enabled_file_bool,
};
-diff -urNp linux-2.6.31.4/kernel/lockdep.c linux-2.6.31.4/kernel/lockdep.c
---- linux-2.6.31.4/kernel/lockdep.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/lockdep.c 2009-10-18 10:09:07.074626502 -0400
+diff -urNp linux-2.6.31.5/kernel/lockdep.c linux-2.6.31.5/kernel/lockdep.c
+--- linux-2.6.31.5/kernel/lockdep.c 2009-10-20 20:42:59.198042714 -0400
++++ linux-2.6.31.5/kernel/lockdep.c 2009-10-20 20:32:11.890239664 -0400
@@ -630,6 +630,10 @@ static int static_obj(void *obj)
int i;
#endif
@@ -40915,9 +42714,9 @@ diff -urNp linux-2.6.31.4/kernel/lockdep.c linux-2.6.31.4/kernel/lockdep.c
if ((addr >= start) && (addr < end))
return 1;
-diff -urNp linux-2.6.31.4/kernel/lockdep_proc.c linux-2.6.31.4/kernel/lockdep_proc.c
---- linux-2.6.31.4/kernel/lockdep_proc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/lockdep_proc.c 2009-10-11 15:29:48.970376150 -0400
+diff -urNp linux-2.6.31.5/kernel/lockdep_proc.c linux-2.6.31.5/kernel/lockdep_proc.c
+--- linux-2.6.31.5/kernel/lockdep_proc.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/lockdep_proc.c 2009-10-20 20:32:11.890239664 -0400
@@ -670,7 +670,7 @@ static int ls_show(struct seq_file *m, v
return 0;
}
@@ -40927,9 +42726,9 @@ diff -urNp linux-2.6.31.4/kernel/lockdep_proc.c linux-2.6.31.4/kernel/lockdep_pr
.start = ls_start,
.next = ls_next,
.stop = ls_stop,
-diff -urNp linux-2.6.31.4/kernel/module.c linux-2.6.31.4/kernel/module.c
---- linux-2.6.31.4/kernel/module.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/module.c 2009-10-18 10:09:07.075622427 -0400
+diff -urNp linux-2.6.31.5/kernel/module.c linux-2.6.31.5/kernel/module.c
+--- linux-2.6.31.5/kernel/module.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/module.c 2009-10-20 20:32:11.891217146 -0400
@@ -83,7 +83,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
@@ -41422,9 +43221,9 @@ diff -urNp linux-2.6.31.4/kernel/module.c linux-2.6.31.4/kernel/module.c
mod = NULL;
}
return mod;
-diff -urNp linux-2.6.31.4/kernel/panic.c linux-2.6.31.4/kernel/panic.c
---- linux-2.6.31.4/kernel/panic.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/panic.c 2009-10-11 15:29:48.972417406 -0400
+diff -urNp linux-2.6.31.5/kernel/panic.c linux-2.6.31.5/kernel/panic.c
+--- linux-2.6.31.5/kernel/panic.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/panic.c 2009-10-20 20:32:11.891217146 -0400
@@ -391,7 +391,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
void __stack_chk_fail(void)
@@ -41435,9 +43234,9 @@ diff -urNp linux-2.6.31.4/kernel/panic.c linux-2.6.31.4/kernel/panic.c
__builtin_return_address(0));
}
EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-2.6.31.4/kernel/params.c linux-2.6.31.4/kernel/params.c
---- linux-2.6.31.4/kernel/params.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/params.c 2009-10-11 15:29:48.972417406 -0400
+diff -urNp linux-2.6.31.5/kernel/params.c linux-2.6.31.5/kernel/params.c
+--- linux-2.6.31.5/kernel/params.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/params.c 2009-10-20 20:33:11.010880245 -0400
@@ -217,13 +217,9 @@ int param_set_charp(const char *val, str
return -ENOSPC;
}
@@ -41461,9 +43260,18 @@ diff -urNp linux-2.6.31.4/kernel/params.c linux-2.6.31.4/kernel/params.c
kfree(*(char **)params[i].arg);
}
-diff -urNp linux-2.6.31.4/kernel/perf_counter.c linux-2.6.31.4/kernel/perf_counter.c
---- linux-2.6.31.4/kernel/perf_counter.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/perf_counter.c 2009-10-11 15:29:48.973405232 -0400
+@@ -729,7 +725,7 @@ static ssize_t module_attr_store(struct
+ return ret;
+ }
+
+-static struct sysfs_ops module_sysfs_ops = {
++static const struct sysfs_ops module_sysfs_ops = {
+ .show = module_attr_show,
+ .store = module_attr_store,
+ };
+diff -urNp linux-2.6.31.5/kernel/perf_counter.c linux-2.6.31.5/kernel/perf_counter.c
+--- linux-2.6.31.5/kernel/perf_counter.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/perf_counter.c 2009-10-20 20:32:11.893000180 -0400
@@ -2231,7 +2231,7 @@ static void perf_mmap_close(struct vm_ar
}
}
@@ -41473,9 +43281,9 @@ diff -urNp linux-2.6.31.4/kernel/perf_counter.c linux-2.6.31.4/kernel/perf_count
.open = perf_mmap_open,
.close = perf_mmap_close,
.fault = perf_mmap_fault,
-diff -urNp linux-2.6.31.4/kernel/pid.c linux-2.6.31.4/kernel/pid.c
---- linux-2.6.31.4/kernel/pid.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/pid.c 2009-10-11 15:29:48.973405232 -0400
+diff -urNp linux-2.6.31.5/kernel/pid.c linux-2.6.31.5/kernel/pid.c
+--- linux-2.6.31.5/kernel/pid.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/pid.c 2009-10-20 20:32:11.893000180 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -41509,9 +43317,9 @@ diff -urNp linux-2.6.31.4/kernel/pid.c linux-2.6.31.4/kernel/pid.c
}
struct task_struct *find_task_by_vpid(pid_t vnr)
-diff -urNp linux-2.6.31.4/kernel/posix-cpu-timers.c linux-2.6.31.4/kernel/posix-cpu-timers.c
---- linux-2.6.31.4/kernel/posix-cpu-timers.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/posix-cpu-timers.c 2009-10-11 15:29:48.974396171 -0400
+diff -urNp linux-2.6.31.5/kernel/posix-cpu-timers.c linux-2.6.31.5/kernel/posix-cpu-timers.c
+--- linux-2.6.31.5/kernel/posix-cpu-timers.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/posix-cpu-timers.c 2009-10-20 20:32:11.893000180 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -41536,9 +43344,9 @@ diff -urNp linux-2.6.31.4/kernel/posix-cpu-timers.c linux-2.6.31.4/kernel/posix-
if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
/*
* At the soft limit, send a SIGXCPU every second.
-diff -urNp linux-2.6.31.4/kernel/power/hibernate.c linux-2.6.31.4/kernel/power/hibernate.c
---- linux-2.6.31.4/kernel/power/hibernate.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/power/hibernate.c 2009-10-11 15:29:56.764361720 -0400
+diff -urNp linux-2.6.31.5/kernel/power/hibernate.c linux-2.6.31.5/kernel/power/hibernate.c
+--- linux-2.6.31.5/kernel/power/hibernate.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/power/hibernate.c 2009-10-20 20:32:11.893906974 -0400
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -41556,9 +43364,9 @@ diff -urNp linux-2.6.31.4/kernel/power/hibernate.c linux-2.6.31.4/kernel/power/h
{
if (ops && !(ops->begin && ops->end && ops->pre_snapshot
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore
-diff -urNp linux-2.6.31.4/kernel/power/poweroff.c linux-2.6.31.4/kernel/power/poweroff.c
---- linux-2.6.31.4/kernel/power/poweroff.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/power/poweroff.c 2009-10-11 15:29:48.974396171 -0400
+diff -urNp linux-2.6.31.5/kernel/power/poweroff.c linux-2.6.31.5/kernel/power/poweroff.c
+--- linux-2.6.31.5/kernel/power/poweroff.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/power/poweroff.c 2009-10-20 20:32:11.893906974 -0400
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -41568,9 +43376,9 @@ diff -urNp linux-2.6.31.4/kernel/power/poweroff.c linux-2.6.31.4/kernel/power/po
{
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
-diff -urNp linux-2.6.31.4/kernel/power/process.c linux-2.6.31.4/kernel/power/process.c
---- linux-2.6.31.4/kernel/power/process.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/power/process.c 2009-10-11 15:29:48.974396171 -0400
+diff -urNp linux-2.6.31.5/kernel/power/process.c linux-2.6.31.5/kernel/power/process.c
+--- linux-2.6.31.5/kernel/power/process.c 2009-10-20 20:42:59.201456332 -0400
++++ linux-2.6.31.5/kernel/power/process.c 2009-10-20 20:32:11.893906974 -0400
@@ -36,12 +36,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -41610,9 +43418,9 @@ diff -urNp linux-2.6.31.4/kernel/power/process.c linux-2.6.31.4/kernel/power/pro
do_gettimeofday(&end);
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
-diff -urNp linux-2.6.31.4/kernel/power/suspend.c linux-2.6.31.4/kernel/power/suspend.c
---- linux-2.6.31.4/kernel/power/suspend.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/power/suspend.c 2009-10-11 15:29:56.765433917 -0400
+diff -urNp linux-2.6.31.5/kernel/power/suspend.c linux-2.6.31.5/kernel/power/suspend.c
+--- linux-2.6.31.5/kernel/power/suspend.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/power/suspend.c 2009-10-20 20:32:11.893906974 -0400
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -41629,9 +43437,9 @@ diff -urNp linux-2.6.31.4/kernel/power/suspend.c linux-2.6.31.4/kernel/power/sus
{
mutex_lock(&pm_mutex);
suspend_ops = ops;
-diff -urNp linux-2.6.31.4/kernel/printk.c linux-2.6.31.4/kernel/printk.c
---- linux-2.6.31.4/kernel/printk.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/printk.c 2009-10-11 15:29:48.974396171 -0400
+diff -urNp linux-2.6.31.5/kernel/printk.c linux-2.6.31.5/kernel/printk.c
+--- linux-2.6.31.5/kernel/printk.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/printk.c 2009-10-20 20:32:11.893906974 -0400
@@ -272,6 +272,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -41644,9 +43452,9 @@ diff -urNp linux-2.6.31.4/kernel/printk.c linux-2.6.31.4/kernel/printk.c
error = security_syslog(type);
if (error)
return error;
-diff -urNp linux-2.6.31.4/kernel/ptrace.c linux-2.6.31.4/kernel/ptrace.c
---- linux-2.6.31.4/kernel/ptrace.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/ptrace.c 2009-10-11 15:29:48.975367037 -0400
+diff -urNp linux-2.6.31.5/kernel/ptrace.c linux-2.6.31.5/kernel/ptrace.c
+--- linux-2.6.31.5/kernel/ptrace.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/ptrace.c 2009-10-20 20:33:11.040874213 -0400
@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
@@ -41674,6 +43482,28 @@ diff -urNp linux-2.6.31.4/kernel/ptrace.c linux-2.6.31.4/kernel/ptrace.c
task->ptrace |= PT_PTRACE_CAP;
__ptrace_link(task, current);
+@@ -529,18 +529,18 @@ int ptrace_request(struct task_struct *c
+ ret = ptrace_setoptions(child, data);
+ break;
+ case PTRACE_GETEVENTMSG:
+- ret = put_user(child->ptrace_message, (unsigned long __user *) data);
++ ret = put_user(child->ptrace_message, (__force unsigned long __user *) data);
+ break;
+
+ case PTRACE_GETSIGINFO:
+ ret = ptrace_getsiginfo(child, &siginfo);
+ if (!ret)
+- ret = copy_siginfo_to_user((siginfo_t __user *) data,
++ ret = copy_siginfo_to_user((__force siginfo_t __user *) data,
+ &siginfo);
+ break;
+
+ case PTRACE_SETSIGINFO:
+- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
++ if (copy_from_user(&siginfo, (__force siginfo_t __user *) data,
+ sizeof siginfo))
+ ret = -EFAULT;
+ else
@@ -618,6 +618,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l
goto out;
}
@@ -41686,9 +43516,18 @@ diff -urNp linux-2.6.31.4/kernel/ptrace.c linux-2.6.31.4/kernel/ptrace.c
if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child);
/*
-diff -urNp linux-2.6.31.4/kernel/rcupreempt_trace.c linux-2.6.31.4/kernel/rcupreempt_trace.c
---- linux-2.6.31.4/kernel/rcupreempt_trace.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/rcupreempt_trace.c 2009-10-11 15:29:48.975367037 -0400
+@@ -650,7 +655,7 @@ int generic_ptrace_peekdata(struct task_
+ copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
+ if (copied != sizeof(tmp))
+ return -EIO;
+- return put_user(tmp, (unsigned long __user *)data);
++ return put_user(tmp, (__force unsigned long __user *)data);
+ }
+
+ int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
+diff -urNp linux-2.6.31.5/kernel/rcupreempt_trace.c linux-2.6.31.5/kernel/rcupreempt_trace.c
+--- linux-2.6.31.5/kernel/rcupreempt_trace.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/rcupreempt_trace.c 2009-10-20 20:32:11.893906974 -0400
@@ -261,17 +261,17 @@ static ssize_t rcuctrs_read(struct file
return bcount;
}
@@ -41710,9 +43549,9 @@ diff -urNp linux-2.6.31.4/kernel/rcupreempt_trace.c linux-2.6.31.4/kernel/rcupre
.owner = THIS_MODULE,
.read = rcuctrs_read,
};
-diff -urNp linux-2.6.31.4/kernel/rcutree_trace.c linux-2.6.31.4/kernel/rcutree_trace.c
---- linux-2.6.31.4/kernel/rcutree_trace.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/rcutree_trace.c 2009-10-11 15:29:48.975367037 -0400
+diff -urNp linux-2.6.31.5/kernel/rcutree_trace.c linux-2.6.31.5/kernel/rcutree_trace.c
+--- linux-2.6.31.5/kernel/rcutree_trace.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/rcutree_trace.c 2009-10-20 20:32:11.896099244 -0400
@@ -88,7 +88,7 @@ static int rcudata_open(struct inode *in
return single_open(file, show_rcudata, NULL);
}
@@ -41758,9 +43597,9 @@ diff -urNp linux-2.6.31.4/kernel/rcutree_trace.c linux-2.6.31.4/kernel/rcutree_t
.owner = THIS_MODULE,
.open = rcu_pending_open,
.read = seq_read,
-diff -urNp linux-2.6.31.4/kernel/relay.c linux-2.6.31.4/kernel/relay.c
---- linux-2.6.31.4/kernel/relay.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/relay.c 2009-10-11 15:29:48.975367037 -0400
+diff -urNp linux-2.6.31.5/kernel/relay.c linux-2.6.31.5/kernel/relay.c
+--- linux-2.6.31.5/kernel/relay.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/relay.c 2009-10-20 20:32:11.897079665 -0400
@@ -60,7 +60,7 @@ static int relay_buf_fault(struct vm_are
/*
* vm_ops for relay file mappings.
@@ -41779,9 +43618,9 @@ diff -urNp linux-2.6.31.4/kernel/relay.c linux-2.6.31.4/kernel/relay.c
return ret;
if (read_start + ret == nonpad_end)
-diff -urNp linux-2.6.31.4/kernel/resource.c linux-2.6.31.4/kernel/resource.c
---- linux-2.6.31.4/kernel/resource.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/resource.c 2009-10-11 15:29:48.976638585 -0400
+diff -urNp linux-2.6.31.5/kernel/resource.c linux-2.6.31.5/kernel/resource.c
+--- linux-2.6.31.5/kernel/resource.c 2009-10-20 20:42:59.204873594 -0400
++++ linux-2.6.31.5/kernel/resource.c 2009-10-20 20:32:11.897079665 -0400
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -41801,9 +43640,9 @@ diff -urNp linux-2.6.31.4/kernel/resource.c linux-2.6.31.4/kernel/resource.c
return 0;
}
__initcall(ioresources_init);
-diff -urNp linux-2.6.31.4/kernel/sched.c linux-2.6.31.4/kernel/sched.c
---- linux-2.6.31.4/kernel/sched.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/sched.c 2009-10-11 15:29:48.977812736 -0400
+diff -urNp linux-2.6.31.5/kernel/sched.c linux-2.6.31.5/kernel/sched.c
+--- linux-2.6.31.5/kernel/sched.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/sched.c 2009-10-20 20:32:11.899019752 -0400
@@ -820,7 +820,7 @@ static int sched_feat_open(struct inode
return single_open(filp, sched_feat_show, NULL);
}
@@ -41859,9 +43698,9 @@ diff -urNp linux-2.6.31.4/kernel/sched.c linux-2.6.31.4/kernel/sched.c
};
static struct ctl_table *sd_alloc_ctl_entry(int n)
-diff -urNp linux-2.6.31.4/kernel/signal.c linux-2.6.31.4/kernel/signal.c
---- linux-2.6.31.4/kernel/signal.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/signal.c 2009-10-11 15:29:48.979375591 -0400
+diff -urNp linux-2.6.31.5/kernel/signal.c linux-2.6.31.5/kernel/signal.c
+--- linux-2.6.31.5/kernel/signal.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/signal.c 2009-10-20 20:32:11.900005755 -0400
@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
*/
user = get_uid(__task_cred(t)->user);
@@ -41921,9 +43760,39 @@ diff -urNp linux-2.6.31.4/kernel/signal.c linux-2.6.31.4/kernel/signal.c
}
return ret;
-diff -urNp linux-2.6.31.4/kernel/sys.c linux-2.6.31.4/kernel/sys.c
---- linux-2.6.31.4/kernel/sys.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/sys.c 2009-10-11 15:29:48.979375591 -0400
+diff -urNp linux-2.6.31.5/kernel/smp.c linux-2.6.31.5/kernel/smp.c
+--- linux-2.6.31.5/kernel/smp.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/smp.c 2009-10-20 20:33:11.040874213 -0400
+@@ -451,22 +451,22 @@ int smp_call_function(void (*func)(void
+ }
+ EXPORT_SYMBOL(smp_call_function);
+
+-void ipi_call_lock(void)
++void ipi_call_lock(void) __acquires(call_function.lock)
+ {
+ spin_lock(&call_function.lock);
+ }
+
+-void ipi_call_unlock(void)
++void ipi_call_unlock(void) __releases(call_function.lock)
+ {
+ spin_unlock(&call_function.lock);
+ }
+
+-void ipi_call_lock_irq(void)
++void ipi_call_lock_irq(void) __acquires(call_function.lock)
+ {
+ spin_lock_irq(&call_function.lock);
+ }
+
+-void ipi_call_unlock_irq(void)
++void ipi_call_unlock_irq(void) __releases(call_function.lock)
+ {
+ spin_unlock_irq(&call_function.lock);
+ }
+diff -urNp linux-2.6.31.5/kernel/sys.c linux-2.6.31.5/kernel/sys.c
+--- linux-2.6.31.5/kernel/sys.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/sys.c 2009-10-20 20:33:11.012085229 -0400
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -41937,6 +43806,35 @@ diff -urNp linux-2.6.31.4/kernel/sys.c linux-2.6.31.4/kernel/sys.c
no_nice = security_task_setnice(p, niceval);
if (no_nice) {
error = no_nice;
+@@ -190,10 +196,10 @@ SYSCALL_DEFINE3(setpriority, int, which,
+ !(user = find_user(who)))
+ goto out_unlock; /* No processes for this user */
+
+- do_each_thread(g, p)
++ do_each_thread(g, p) {
+ if (__task_cred(p)->uid == who)
+ error = set_one_prio(p, niceval, error);
+- while_each_thread(g, p);
++ } while_each_thread(g, p);
+ if (who != cred->uid)
+ free_uid(user); /* For find_user() */
+ break;
+@@ -253,13 +259,13 @@ SYSCALL_DEFINE2(getpriority, int, which,
+ !(user = find_user(who)))
+ goto out_unlock; /* No processes for this user */
+
+- do_each_thread(g, p)
++ do_each_thread(g, p) {
+ if (__task_cred(p)->uid == who) {
+ niceval = 20 - task_nice(p);
+ if (niceval > retval)
+ retval = niceval;
+ }
+- while_each_thread(g, p);
++ } while_each_thread(g, p);
+ if (who != cred->uid)
+ free_uid(user); /* for find_user() */
+ break;
@@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
goto error;
}
@@ -42030,9 +43928,9 @@ diff -urNp linux-2.6.31.4/kernel/sys.c linux-2.6.31.4/kernel/sys.c
error = -EINVAL;
break;
}
-diff -urNp linux-2.6.31.4/kernel/sysctl.c linux-2.6.31.4/kernel/sysctl.c
---- linux-2.6.31.4/kernel/sysctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/sysctl.c 2009-10-11 15:29:48.980397226 -0400
+diff -urNp linux-2.6.31.5/kernel/sysctl.c linux-2.6.31.5/kernel/sysctl.c
+--- linux-2.6.31.5/kernel/sysctl.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/sysctl.c 2009-10-20 20:32:11.900983652 -0400
@@ -65,6 +65,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -42154,9 +44052,9 @@ diff -urNp linux-2.6.31.4/kernel/sysctl.c linux-2.6.31.4/kernel/sysctl.c
error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
if (error)
return error;
-diff -urNp linux-2.6.31.4/kernel/taskstats.c linux-2.6.31.4/kernel/taskstats.c
---- linux-2.6.31.4/kernel/taskstats.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/taskstats.c 2009-10-11 15:29:48.980397226 -0400
+diff -urNp linux-2.6.31.5/kernel/taskstats.c linux-2.6.31.5/kernel/taskstats.c
+--- linux-2.6.31.5/kernel/taskstats.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/taskstats.c 2009-10-20 20:32:11.900983652 -0400
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -42180,9 +44078,9 @@ diff -urNp linux-2.6.31.4/kernel/taskstats.c linux-2.6.31.4/kernel/taskstats.c
if (!alloc_cpumask_var(&mask, GFP_KERNEL))
return -ENOMEM;
-diff -urNp linux-2.6.31.4/kernel/time/tick-broadcast.c linux-2.6.31.4/kernel/time/tick-broadcast.c
---- linux-2.6.31.4/kernel/time/tick-broadcast.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/time/tick-broadcast.c 2009-10-11 15:29:48.981572864 -0400
+diff -urNp linux-2.6.31.5/kernel/time/tick-broadcast.c linux-2.6.31.5/kernel/time/tick-broadcast.c
+--- linux-2.6.31.5/kernel/time/tick-broadcast.c 2009-10-20 20:42:59.208036387 -0400
++++ linux-2.6.31.5/kernel/time/tick-broadcast.c 2009-10-20 20:32:11.900983652 -0400
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -42192,9 +44090,9 @@ diff -urNp linux-2.6.31.4/kernel/time/tick-broadcast.c linux-2.6.31.4/kernel/tim
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-2.6.31.4/kernel/time/timer_list.c linux-2.6.31.4/kernel/time/timer_list.c
---- linux-2.6.31.4/kernel/time/timer_list.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/time/timer_list.c 2009-10-11 15:29:48.981572864 -0400
+diff -urNp linux-2.6.31.5/kernel/time/timer_list.c linux-2.6.31.5/kernel/time/timer_list.c
+--- linux-2.6.31.5/kernel/time/timer_list.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/time/timer_list.c 2009-10-20 20:32:11.900983652 -0400
@@ -275,7 +275,7 @@ static int timer_list_open(struct inode
return single_open(filp, timer_list_show, NULL);
}
@@ -42204,9 +44102,9 @@ diff -urNp linux-2.6.31.4/kernel/time/timer_list.c linux-2.6.31.4/kernel/time/ti
.open = timer_list_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/kernel/time/timer_stats.c linux-2.6.31.4/kernel/time/timer_stats.c
---- linux-2.6.31.4/kernel/time/timer_stats.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/time/timer_stats.c 2009-10-11 15:29:48.981572864 -0400
+diff -urNp linux-2.6.31.5/kernel/time/timer_stats.c linux-2.6.31.5/kernel/time/timer_stats.c
+--- linux-2.6.31.5/kernel/time/timer_stats.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/time/timer_stats.c 2009-10-20 20:32:11.901968409 -0400
@@ -395,7 +395,7 @@ static int tstats_open(struct inode *ino
return single_open(filp, tstats_show, NULL);
}
@@ -42216,9 +44114,9 @@ diff -urNp linux-2.6.31.4/kernel/time/timer_stats.c linux-2.6.31.4/kernel/time/t
.open = tstats_open,
.read = seq_read,
.write = tstats_write,
-diff -urNp linux-2.6.31.4/kernel/time.c linux-2.6.31.4/kernel/time.c
---- linux-2.6.31.4/kernel/time.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/time.c 2009-10-11 15:29:48.982400503 -0400
+diff -urNp linux-2.6.31.5/kernel/time.c linux-2.6.31.5/kernel/time.c
+--- linux-2.6.31.5/kernel/time.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/time.c 2009-10-20 20:32:11.901968409 -0400
@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
return err;
@@ -42256,9 +44154,9 @@ diff -urNp linux-2.6.31.4/kernel/time.c linux-2.6.31.4/kernel/time.c
{
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
-diff -urNp linux-2.6.31.4/kernel/trace/ftrace.c linux-2.6.31.4/kernel/trace/ftrace.c
---- linux-2.6.31.4/kernel/trace/ftrace.c 2009-10-12 23:26:18.155165783 -0400
-+++ linux-2.6.31.4/kernel/trace/ftrace.c 2009-10-12 23:26:38.979417555 -0400
+diff -urNp linux-2.6.31.5/kernel/trace/ftrace.c linux-2.6.31.5/kernel/trace/ftrace.c
+--- linux-2.6.31.5/kernel/trace/ftrace.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/trace/ftrace.c 2009-10-20 20:32:11.901968409 -0400
@@ -1562,7 +1562,7 @@ static int t_show(struct seq_file *m, vo
return 0;
}
@@ -42277,9 +44175,9 @@ diff -urNp linux-2.6.31.4/kernel/trace/ftrace.c linux-2.6.31.4/kernel/trace/ftra
.start = g_start,
.next = g_next,
.stop = g_stop,
-diff -urNp linux-2.6.31.4/kernel/trace/Kconfig linux-2.6.31.4/kernel/trace/Kconfig
---- linux-2.6.31.4/kernel/trace/Kconfig 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/trace/Kconfig 2009-10-11 15:29:48.983493274 -0400
+diff -urNp linux-2.6.31.5/kernel/trace/Kconfig linux-2.6.31.5/kernel/trace/Kconfig
+--- linux-2.6.31.5/kernel/trace/Kconfig 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/trace/Kconfig 2009-10-20 20:32:11.902935564 -0400
@@ -111,6 +111,7 @@ if FTRACE
config FUNCTION_TRACER
bool "Kernel Function Tracer"
@@ -42296,9 +44194,9 @@ diff -urNp linux-2.6.31.4/kernel/trace/Kconfig linux-2.6.31.4/kernel/trace/Kconf
select FUNCTION_TRACER
select STACKTRACE
select KALLSYMS
-diff -urNp linux-2.6.31.4/kernel/trace/trace.c linux-2.6.31.4/kernel/trace/trace.c
---- linux-2.6.31.4/kernel/trace/trace.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/trace/trace.c 2009-10-11 15:29:48.983493274 -0400
+diff -urNp linux-2.6.31.5/kernel/trace/trace.c linux-2.6.31.5/kernel/trace/trace.c
+--- linux-2.6.31.5/kernel/trace/trace.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/trace/trace.c 2009-10-20 20:33:11.012085229 -0400
@@ -1885,7 +1885,7 @@ static int s_show(struct seq_file *m, vo
return 0;
}
@@ -42317,9 +44215,74 @@ diff -urNp linux-2.6.31.4/kernel/trace/trace.c linux-2.6.31.4/kernel/trace/trace
.start = t_start,
.next = t_next,
.stop = t_stop,
-diff -urNp linux-2.6.31.4/kernel/trace/trace_output.c linux-2.6.31.4/kernel/trace/trace_output.c
---- linux-2.6.31.4/kernel/trace/trace_output.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/trace/trace_output.c 2009-10-11 15:29:48.984551170 -0400
+@@ -2292,23 +2292,23 @@ tracing_trace_options_read(struct file *
+ /* Try to assign a tracer specific option */
+ static int set_tracer_option(struct tracer *trace, char *cmp, int neg)
+ {
+- struct tracer_flags *trace_flags = trace->flags;
++ struct tracer_flags *tracer_flags = trace->flags;
+ struct tracer_opt *opts = NULL;
+ int ret = 0, i = 0;
+ int len;
+
+- for (i = 0; trace_flags->opts[i].name; i++) {
+- opts = &trace_flags->opts[i];
++ for (i = 0; tracer_flags->opts[i].name; i++) {
++ opts = &tracer_flags->opts[i];
+ len = strlen(opts->name);
+
+ if (strncmp(cmp, opts->name, len) == 0) {
+- ret = trace->set_flag(trace_flags->val,
++ ret = trace->set_flag(tracer_flags->val,
+ opts->bit, !neg);
+ break;
+ }
+ }
+ /* Not found */
+- if (!trace_flags->opts[i].name)
++ if (!tracer_flags->opts[i].name)
+ return -EINVAL;
+
+ /* Refused to handle */
+@@ -2316,9 +2316,9 @@ static int set_tracer_option(struct trac
+ return ret;
+
+ if (neg)
+- trace_flags->val &= ~opts->bit;
++ tracer_flags->val &= ~opts->bit;
+ else
+- trace_flags->val |= opts->bit;
++ tracer_flags->val |= opts->bit;
+
+ return 0;
+ }
+@@ -3685,10 +3685,9 @@ static const struct file_operations trac
+ };
+ #endif
+
+-static struct dentry *d_tracer;
+-
+ struct dentry *tracing_init_dentry(void)
+ {
++ static struct dentry *d_tracer;
+ static int once;
+
+ if (d_tracer)
+@@ -3708,10 +3707,9 @@ struct dentry *tracing_init_dentry(void)
+ return d_tracer;
+ }
+
+-static struct dentry *d_percpu;
+-
+ struct dentry *tracing_dentry_percpu(void)
+ {
++ static struct dentry *d_percpu;
+ static int once;
+ struct dentry *d_tracer;
+
+diff -urNp linux-2.6.31.5/kernel/trace/trace_output.c linux-2.6.31.5/kernel/trace/trace_output.c
+--- linux-2.6.31.5/kernel/trace/trace_output.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/trace/trace_output.c 2009-10-20 20:32:11.903912228 -0400
@@ -234,7 +234,7 @@ int trace_seq_path(struct trace_seq *s,
return 0;
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -42329,9 +44292,9 @@ diff -urNp linux-2.6.31.4/kernel/trace/trace_output.c linux-2.6.31.4/kernel/trac
if (p) {
s->len = p - s->buffer;
return 1;
-diff -urNp linux-2.6.31.4/kernel/utsname_sysctl.c linux-2.6.31.4/kernel/utsname_sysctl.c
---- linux-2.6.31.4/kernel/utsname_sysctl.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/kernel/utsname_sysctl.c 2009-10-11 15:29:48.984551170 -0400
+diff -urNp linux-2.6.31.5/kernel/utsname_sysctl.c linux-2.6.31.5/kernel/utsname_sysctl.c
+--- linux-2.6.31.5/kernel/utsname_sysctl.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/kernel/utsname_sysctl.c 2009-10-20 20:32:11.903912228 -0400
@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
.proc_handler = proc_do_uts_string,
.strategy = sysctl_uts_string,
@@ -42350,9 +44313,9 @@ diff -urNp linux-2.6.31.4/kernel/utsname_sysctl.c linux-2.6.31.4/kernel/utsname_
};
static int __init utsname_sysctl_init(void)
-diff -urNp linux-2.6.31.4/lib/inflate.c linux-2.6.31.4/lib/inflate.c
---- linux-2.6.31.4/lib/inflate.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/lib/inflate.c 2009-10-11 15:29:48.985524572 -0400
+diff -urNp linux-2.6.31.5/lib/inflate.c linux-2.6.31.5/lib/inflate.c
+--- linux-2.6.31.5/lib/inflate.c 2009-10-20 20:42:59.211223240 -0400
++++ linux-2.6.31.5/lib/inflate.c 2009-10-20 20:32:11.903912228 -0400
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -42362,9 +44325,9 @@ diff -urNp linux-2.6.31.4/lib/inflate.c linux-2.6.31.4/lib/inflate.c
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.31.4/lib/Kconfig.debug linux-2.6.31.4/lib/Kconfig.debug
---- linux-2.6.31.4/lib/Kconfig.debug 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/lib/Kconfig.debug 2009-10-11 15:29:48.985524572 -0400
+diff -urNp linux-2.6.31.5/lib/Kconfig.debug linux-2.6.31.5/lib/Kconfig.debug
+--- linux-2.6.31.5/lib/Kconfig.debug 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/lib/Kconfig.debug 2009-10-20 20:32:11.904888361 -0400
@@ -866,7 +866,7 @@ config LATENCYTOP
select STACKTRACE
select SCHEDSTATS
@@ -42374,9 +44337,21 @@ diff -urNp linux-2.6.31.4/lib/Kconfig.debug linux-2.6.31.4/lib/Kconfig.debug
help
Enable this option if you want to use the LatencyTOP tool
to find out which userspace is blocking on what kernel operations.
-diff -urNp linux-2.6.31.4/lib/parser.c linux-2.6.31.4/lib/parser.c
---- linux-2.6.31.4/lib/parser.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/lib/parser.c 2009-10-11 15:29:48.985524572 -0400
+diff -urNp linux-2.6.31.5/lib/kobject.c linux-2.6.31.5/lib/kobject.c
+--- linux-2.6.31.5/lib/kobject.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/lib/kobject.c 2009-10-20 20:33:11.044053425 -0400
+@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
+ return ret;
+ }
+
+-struct sysfs_ops kobj_sysfs_ops = {
++const struct sysfs_ops kobj_sysfs_ops = {
+ .show = kobj_attr_show,
+ .store = kobj_attr_store,
+ };
+diff -urNp linux-2.6.31.5/lib/parser.c linux-2.6.31.5/lib/parser.c
+--- linux-2.6.31.5/lib/parser.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/lib/parser.c 2009-10-20 20:32:11.904888361 -0400
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -42386,9 +44361,9 @@ diff -urNp linux-2.6.31.4/lib/parser.c linux-2.6.31.4/lib/parser.c
if (!buf)
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
-diff -urNp linux-2.6.31.4/lib/radix-tree.c linux-2.6.31.4/lib/radix-tree.c
---- linux-2.6.31.4/lib/radix-tree.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/lib/radix-tree.c 2009-10-11 15:29:48.986515047 -0400
+diff -urNp linux-2.6.31.5/lib/radix-tree.c linux-2.6.31.5/lib/radix-tree.c
+--- linux-2.6.31.5/lib/radix-tree.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/lib/radix-tree.c 2009-10-20 20:32:11.904888361 -0400
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -42398,9 +44373,9 @@ diff -urNp linux-2.6.31.4/lib/radix-tree.c linux-2.6.31.4/lib/radix-tree.c
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
-diff -urNp linux-2.6.31.4/lib/random32.c linux-2.6.31.4/lib/random32.c
---- linux-2.6.31.4/lib/random32.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/lib/random32.c 2009-10-11 15:29:48.986515047 -0400
+diff -urNp linux-2.6.31.5/lib/random32.c linux-2.6.31.5/lib/random32.c
+--- linux-2.6.31.5/lib/random32.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/lib/random32.c 2009-10-20 20:32:11.904888361 -0400
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -42410,14 +44385,14 @@ diff -urNp linux-2.6.31.4/lib/random32.c linux-2.6.31.4/lib/random32.c
}
/**
-diff -urNp linux-2.6.31.4/localversion-grsec linux-2.6.31.4/localversion-grsec
---- linux-2.6.31.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.31.4/localversion-grsec 2009-10-11 15:29:48.986515047 -0400
+diff -urNp linux-2.6.31.5/localversion-grsec linux-2.6.31.5/localversion-grsec
+--- linux-2.6.31.5/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.31.5/localversion-grsec 2009-10-20 20:32:11.904888361 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.31.4/Makefile linux-2.6.31.4/Makefile
---- linux-2.6.31.4/Makefile 2009-10-12 23:26:17.420700952 -0400
-+++ linux-2.6.31.4/Makefile 2009-10-12 23:26:25.101420025 -0400
+diff -urNp linux-2.6.31.5/Makefile linux-2.6.31.5/Makefile
+--- linux-2.6.31.5/Makefile 2009-10-23 19:50:16.181196953 -0400
++++ linux-2.6.31.5/Makefile 2009-10-23 19:50:24.270955574 -0400
@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
HOSTCC = gcc
@@ -42438,9 +44413,9 @@ diff -urNp linux-2.6.31.4/Makefile linux-2.6.31.4/Makefile
vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
$(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff -urNp linux-2.6.31.4/mm/filemap.c linux-2.6.31.4/mm/filemap.c
---- linux-2.6.31.4/mm/filemap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/filemap.c 2009-10-11 15:29:49.446423019 -0400
+diff -urNp linux-2.6.31.5/mm/filemap.c linux-2.6.31.5/mm/filemap.c
+--- linux-2.6.31.5/mm/filemap.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/filemap.c 2009-10-20 20:32:11.906354728 -0400
@@ -1648,7 +1648,7 @@ page_not_uptodate:
}
EXPORT_SYMBOL(filemap_fault);
@@ -42467,9 +44442,9 @@ diff -urNp linux-2.6.31.4/mm/filemap.c linux-2.6.31.4/mm/filemap.c
if (*pos >= limit) {
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
-diff -urNp linux-2.6.31.4/mm/filemap_xip.c linux-2.6.31.4/mm/filemap_xip.c
---- linux-2.6.31.4/mm/filemap_xip.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/filemap_xip.c 2009-10-11 15:29:49.459837195 -0400
+diff -urNp linux-2.6.31.5/mm/filemap_xip.c linux-2.6.31.5/mm/filemap_xip.c
+--- linux-2.6.31.5/mm/filemap_xip.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/filemap_xip.c 2009-10-20 20:32:11.906354728 -0400
@@ -296,7 +296,7 @@ out:
}
}
@@ -42479,9 +44454,9 @@ diff -urNp linux-2.6.31.4/mm/filemap_xip.c linux-2.6.31.4/mm/filemap_xip.c
.fault = xip_file_fault,
};
-diff -urNp linux-2.6.31.4/mm/fremap.c linux-2.6.31.4/mm/fremap.c
---- linux-2.6.31.4/mm/fremap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/fremap.c 2009-10-11 15:29:49.468438199 -0400
+diff -urNp linux-2.6.31.5/mm/fremap.c linux-2.6.31.5/mm/fremap.c
+--- linux-2.6.31.5/mm/fremap.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/fremap.c 2009-10-20 20:32:11.906921809 -0400
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -42494,9 +44469,9 @@ diff -urNp linux-2.6.31.4/mm/fremap.c linux-2.6.31.4/mm/fremap.c
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
-diff -urNp linux-2.6.31.4/mm/highmem.c linux-2.6.31.4/mm/highmem.c
---- linux-2.6.31.4/mm/highmem.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/highmem.c 2009-10-12 23:18:44.754293330 -0400
+diff -urNp linux-2.6.31.5/mm/highmem.c linux-2.6.31.5/mm/highmem.c
+--- linux-2.6.31.5/mm/highmem.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/highmem.c 2009-10-20 20:32:11.906921809 -0400
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -42522,9 +44497,9 @@ diff -urNp linux-2.6.31.4/mm/highmem.c linux-2.6.31.4/mm/highmem.c
pkmap_count[last_pkmap_nr] = 1;
set_page_address(page, (void *)vaddr);
-diff -urNp linux-2.6.31.4/mm/hugetlb.c linux-2.6.31.4/mm/hugetlb.c
---- linux-2.6.31.4/mm/hugetlb.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/hugetlb.c 2009-10-11 15:29:49.498808742 -0400
+diff -urNp linux-2.6.31.5/mm/hugetlb.c linux-2.6.31.5/mm/hugetlb.c
+--- linux-2.6.31.5/mm/hugetlb.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/hugetlb.c 2009-10-20 20:32:11.906921809 -0400
@@ -1689,7 +1689,7 @@ static int hugetlb_vm_op_fault(struct vm
return 0;
}
@@ -42613,9 +44588,9 @@ diff -urNp linux-2.6.31.4/mm/hugetlb.c linux-2.6.31.4/mm/hugetlb.c
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.31.4/mm/Kconfig linux-2.6.31.4/mm/Kconfig
---- linux-2.6.31.4/mm/Kconfig 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/Kconfig 2009-10-11 15:29:49.499680557 -0400
+diff -urNp linux-2.6.31.5/mm/Kconfig linux-2.6.31.5/mm/Kconfig
+--- linux-2.6.31.5/mm/Kconfig 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/Kconfig 2009-10-20 20:32:11.906921809 -0400
@@ -216,7 +216,7 @@ config MMU_NOTIFIER
config DEFAULT_MMAP_MIN_ADDR
@@ -42625,9 +44600,9 @@ diff -urNp linux-2.6.31.4/mm/Kconfig linux-2.6.31.4/mm/Kconfig
help
This is the portion of low virtual memory which should be protected
from userspace allocation. Keeping a user from writing to low pages
-diff -urNp linux-2.6.31.4/mm/maccess.c linux-2.6.31.4/mm/maccess.c
---- linux-2.6.31.4/mm/maccess.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/maccess.c 2009-10-11 15:29:56.775737985 -0400
+diff -urNp linux-2.6.31.5/mm/maccess.c linux-2.6.31.5/mm/maccess.c
+--- linux-2.6.31.5/mm/maccess.c 2009-10-20 20:42:59.214636322 -0400
++++ linux-2.6.31.5/mm/maccess.c 2009-10-20 20:32:11.908188680 -0400
@@ -14,7 +14,7 @@
* Safely read from address @src to the buffer at @dst. If a kernel fault
* happens, handle that and return -EFAULT.
@@ -42646,9 +44621,9 @@ diff -urNp linux-2.6.31.4/mm/maccess.c linux-2.6.31.4/mm/maccess.c
{
long ret;
mm_segment_t old_fs = get_fs();
-diff -urNp linux-2.6.31.4/mm/madvise.c linux-2.6.31.4/mm/madvise.c
---- linux-2.6.31.4/mm/madvise.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/madvise.c 2009-10-11 15:29:49.500524968 -0400
+diff -urNp linux-2.6.31.5/mm/madvise.c linux-2.6.31.5/mm/madvise.c
+--- linux-2.6.31.5/mm/madvise.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/madvise.c 2009-10-20 20:32:11.908188680 -0400
@@ -43,6 +43,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
int new_flags = vma->vm_flags;
@@ -42709,9 +44684,9 @@ diff -urNp linux-2.6.31.4/mm/madvise.c linux-2.6.31.4/mm/madvise.c
error = 0;
if (end == start)
goto out;
-diff -urNp linux-2.6.31.4/mm/memory.c linux-2.6.31.4/mm/memory.c
---- linux-2.6.31.4/mm/memory.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/memory.c 2009-10-11 15:29:49.509549777 -0400
+diff -urNp linux-2.6.31.5/mm/memory.c linux-2.6.31.5/mm/memory.c
+--- linux-2.6.31.5/mm/memory.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/memory.c 2009-10-20 20:32:11.913144033 -0400
@@ -47,6 +47,7 @@
#include <linux/pagemap.h>
#include <linux/rmap.h>
@@ -43115,9 +45090,9 @@ diff -urNp linux-2.6.31.4/mm/memory.c linux-2.6.31.4/mm/memory.c
/*
* Make sure the vDSO gets into every core dump.
* Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.31.4/mm/mempolicy.c linux-2.6.31.4/mm/mempolicy.c
---- linux-2.6.31.4/mm/mempolicy.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/mempolicy.c 2009-10-11 15:29:49.521380502 -0400
+diff -urNp linux-2.6.31.5/mm/mempolicy.c linux-2.6.31.5/mm/mempolicy.c
+--- linux-2.6.31.5/mm/mempolicy.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/mempolicy.c 2009-10-20 20:32:11.914078480 -0400
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -43198,9 +45173,9 @@ diff -urNp linux-2.6.31.4/mm/mempolicy.c linux-2.6.31.4/mm/mempolicy.c
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
seq_printf(m, " heap");
} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-2.6.31.4/mm/migrate.c linux-2.6.31.4/mm/migrate.c
---- linux-2.6.31.4/mm/migrate.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/migrate.c 2009-10-11 15:29:49.532363246 -0400
+diff -urNp linux-2.6.31.5/mm/migrate.c linux-2.6.31.5/mm/migrate.c
+--- linux-2.6.31.5/mm/migrate.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/migrate.c 2009-10-20 20:32:11.914078480 -0400
@@ -1087,6 +1087,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -43226,9 +45201,9 @@ diff -urNp linux-2.6.31.4/mm/migrate.c linux-2.6.31.4/mm/migrate.c
rcu_read_unlock();
err = -EPERM;
goto out;
-diff -urNp linux-2.6.31.4/mm/mlock.c linux-2.6.31.4/mm/mlock.c
---- linux-2.6.31.4/mm/mlock.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/mlock.c 2009-10-11 15:29:49.541486136 -0400
+diff -urNp linux-2.6.31.5/mm/mlock.c linux-2.6.31.5/mm/mlock.c
+--- linux-2.6.31.5/mm/mlock.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/mlock.c 2009-10-20 20:32:11.914078480 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -43297,9 +45272,9 @@ diff -urNp linux-2.6.31.4/mm/mlock.c linux-2.6.31.4/mm/mlock.c
if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
-diff -urNp linux-2.6.31.4/mm/mmap.c linux-2.6.31.4/mm/mmap.c
---- linux-2.6.31.4/mm/mmap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/mmap.c 2009-10-11 15:29:49.553490783 -0400
+diff -urNp linux-2.6.31.5/mm/mmap.c linux-2.6.31.5/mm/mmap.c
+--- linux-2.6.31.5/mm/mmap.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/mmap.c 2009-10-20 20:32:11.915144501 -0400
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -44435,9 +46410,9 @@ diff -urNp linux-2.6.31.4/mm/mmap.c linux-2.6.31.4/mm/mmap.c
vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
-diff -urNp linux-2.6.31.4/mm/mprotect.c linux-2.6.31.4/mm/mprotect.c
---- linux-2.6.31.4/mm/mprotect.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/mprotect.c 2009-10-11 15:29:49.559452903 -0400
+diff -urNp linux-2.6.31.5/mm/mprotect.c linux-2.6.31.5/mm/mprotect.c
+--- linux-2.6.31.5/mm/mprotect.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/mprotect.c 2009-10-20 20:32:11.916110239 -0400
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -44628,9 +46603,9 @@ diff -urNp linux-2.6.31.4/mm/mprotect.c linux-2.6.31.4/mm/mprotect.c
nstart = tmp;
if (nstart < prev->vm_end)
-diff -urNp linux-2.6.31.4/mm/mremap.c linux-2.6.31.4/mm/mremap.c
---- linux-2.6.31.4/mm/mremap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/mremap.c 2009-10-11 15:29:49.559452903 -0400
+diff -urNp linux-2.6.31.5/mm/mremap.c linux-2.6.31.5/mm/mremap.c
+--- linux-2.6.31.5/mm/mremap.c 2009-10-20 20:42:59.217845877 -0400
++++ linux-2.6.31.5/mm/mremap.c 2009-10-20 20:32:11.916110239 -0400
@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -44742,9 +46717,9 @@ diff -urNp linux-2.6.31.4/mm/mremap.c linux-2.6.31.4/mm/mremap.c
}
out:
if (ret & ~PAGE_MASK)
-diff -urNp linux-2.6.31.4/mm/nommu.c linux-2.6.31.4/mm/nommu.c
---- linux-2.6.31.4/mm/nommu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/nommu.c 2009-10-11 15:29:49.560387946 -0400
+diff -urNp linux-2.6.31.5/mm/nommu.c linux-2.6.31.5/mm/nommu.c
+--- linux-2.6.31.5/mm/nommu.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/nommu.c 2009-10-20 20:32:11.917461597 -0400
@@ -79,7 +79,7 @@ static struct kmem_cache *vm_region_jar;
struct rb_root nommu_region_tree = RB_ROOT;
DECLARE_RWSEM(nommu_region_sem);
@@ -44770,9 +46745,9 @@ diff -urNp linux-2.6.31.4/mm/nommu.c linux-2.6.31.4/mm/nommu.c
* expand a stack to a given address
* - not supported under NOMMU conditions
*/
-diff -urNp linux-2.6.31.4/mm/page_alloc.c linux-2.6.31.4/mm/page_alloc.c
---- linux-2.6.31.4/mm/page_alloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/page_alloc.c 2009-10-11 15:29:49.573358875 -0400
+diff -urNp linux-2.6.31.5/mm/page_alloc.c linux-2.6.31.5/mm/page_alloc.c
+--- linux-2.6.31.5/mm/page_alloc.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/page_alloc.c 2009-10-20 20:32:11.918073697 -0400
@@ -559,6 +559,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = TestClearPageMlocked(page);
@@ -44820,9 +46795,9 @@ diff -urNp linux-2.6.31.4/mm/page_alloc.c linux-2.6.31.4/mm/page_alloc.c
arch_free_page(page, 0);
kernel_map_pages(page, 1, 0);
-diff -urNp linux-2.6.31.4/mm/percpu.c linux-2.6.31.4/mm/percpu.c
---- linux-2.6.31.4/mm/percpu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/percpu.c 2009-10-11 15:29:49.574364071 -0400
+diff -urNp linux-2.6.31.5/mm/percpu.c linux-2.6.31.5/mm/percpu.c
+--- linux-2.6.31.5/mm/percpu.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/percpu.c 2009-10-20 20:32:11.918073697 -0400
@@ -105,7 +105,7 @@ static int pcpu_nr_slots __read_mostly;
static size_t pcpu_chunk_struct_size __read_mostly;
@@ -44832,9 +46807,9 @@ diff -urNp linux-2.6.31.4/mm/percpu.c linux-2.6.31.4/mm/percpu.c
EXPORT_SYMBOL_GPL(pcpu_base_addr);
/*
-diff -urNp linux-2.6.31.4/mm/rmap.c linux-2.6.31.4/mm/rmap.c
---- linux-2.6.31.4/mm/rmap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/rmap.c 2009-10-11 15:29:49.582516976 -0400
+diff -urNp linux-2.6.31.5/mm/rmap.c linux-2.6.31.5/mm/rmap.c
+--- linux-2.6.31.5/mm/rmap.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/rmap.c 2009-10-20 20:32:11.919050668 -0400
@@ -103,6 +103,10 @@ int anon_vma_prepare(struct vm_area_stru
struct mm_struct *mm = vma->vm_mm;
struct anon_vma *allocated;
@@ -44862,9 +46837,9 @@ diff -urNp linux-2.6.31.4/mm/rmap.c linux-2.6.31.4/mm/rmap.c
vma->anon_vma = anon_vma;
list_add_tail(&vma->anon_vma_node, &anon_vma->head);
allocated = NULL;
-diff -urNp linux-2.6.31.4/mm/shmem.c linux-2.6.31.4/mm/shmem.c
---- linux-2.6.31.4/mm/shmem.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/shmem.c 2009-10-11 15:29:49.618358944 -0400
+diff -urNp linux-2.6.31.5/mm/shmem.c linux-2.6.31.5/mm/shmem.c
+--- linux-2.6.31.5/mm/shmem.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/shmem.c 2009-10-20 20:32:11.919050668 -0400
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -44892,9 +46867,9 @@ diff -urNp linux-2.6.31.4/mm/shmem.c linux-2.6.31.4/mm/shmem.c
.fault = shmem_fault,
#ifdef CONFIG_NUMA
.set_policy = shmem_set_policy,
-diff -urNp linux-2.6.31.4/mm/slab.c linux-2.6.31.4/mm/slab.c
---- linux-2.6.31.4/mm/slab.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/slab.c 2009-10-11 15:29:49.628084636 -0400
+diff -urNp linux-2.6.31.5/mm/slab.c linux-2.6.31.5/mm/slab.c
+--- linux-2.6.31.5/mm/slab.c 2009-10-20 20:42:59.221476230 -0400
++++ linux-2.6.31.5/mm/slab.c 2009-10-20 20:32:11.920034413 -0400
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -44996,9 +46971,9 @@ diff -urNp linux-2.6.31.4/mm/slab.c linux-2.6.31.4/mm/slab.c
/**
* ksize - get the actual amount of memory allocated for a given object
* @objp: Pointer to the object
-diff -urNp linux-2.6.31.4/mm/slob.c linux-2.6.31.4/mm/slob.c
---- linux-2.6.31.4/mm/slob.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/slob.c 2009-10-11 15:29:49.637362751 -0400
+diff -urNp linux-2.6.31.5/mm/slob.c linux-2.6.31.5/mm/slob.c
+--- linux-2.6.31.5/mm/slob.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/mm/slob.c 2009-10-20 20:32:11.920034413 -0400
@@ -29,7 +29,7 @@
* If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
* alloc_pages() directly, allocating compound pages so the page order
@@ -45321,9 +47296,9 @@ diff -urNp linux-2.6.31.4/mm/slob.c linux-2.6.31.4/mm/slob.c
}
trace_kmem_cache_free(_RET_IP_, b);
-diff -urNp linux-2.6.31.4/mm/slub.c linux-2.6.31.4/mm/slub.c
---- linux-2.6.31.4/mm/slub.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/slub.c 2009-10-11 15:29:49.647370469 -0400
+diff -urNp linux-2.6.31.5/mm/slub.c linux-2.6.31.5/mm/slub.c
+--- linux-2.6.31.5/mm/slub.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/mm/slub.c 2009-10-20 20:33:11.013917396 -0400
@@ -1915,7 +1915,7 @@ static int slub_min_objects;
* Merge control. If this is set then no merging of slab caches will occur.
* (Could be removed. This was introduced to pacify the merge skeptics.)
@@ -45446,6 +47421,15 @@ diff -urNp linux-2.6.31.4/mm/slub.c linux-2.6.31.4/mm/slub.c
}
SLAB_ATTR_RO(aliases);
+@@ -4447,7 +4488,7 @@ static void kmem_cache_release(struct ko
+ kfree(s);
+ }
+
+-static struct sysfs_ops slab_sysfs_ops = {
++static const struct sysfs_ops slab_sysfs_ops = {
+ .show = slab_attr_show,
+ .store = slab_attr_store,
+ };
@@ -4726,7 +4767,9 @@ static const struct file_operations proc
static int __init slab_proc_init(void)
@@ -45456,9 +47440,9 @@ diff -urNp linux-2.6.31.4/mm/slub.c linux-2.6.31.4/mm/slub.c
return 0;
}
module_init(slab_proc_init);
-diff -urNp linux-2.6.31.4/mm/util.c linux-2.6.31.4/mm/util.c
---- linux-2.6.31.4/mm/util.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/util.c 2009-10-11 15:29:49.653579667 -0400
+diff -urNp linux-2.6.31.5/mm/util.c linux-2.6.31.5/mm/util.c
+--- linux-2.6.31.5/mm/util.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/mm/util.c 2009-10-20 20:32:11.921980675 -0400
@@ -224,6 +224,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -45472,10 +47456,32 @@ diff -urNp linux-2.6.31.4/mm/util.c linux-2.6.31.4/mm/util.c
mm->get_unmapped_area = arch_get_unmapped_area;
mm->unmap_area = arch_unmap_area;
}
-diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
---- linux-2.6.31.4/mm/vmalloc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/mm/vmalloc.c 2009-10-12 23:13:00.624202177 -0400
-@@ -91,6 +91,7 @@ static int vmap_pte_range(pmd_t *pmd, un
+diff -urNp linux-2.6.31.5/mm/vmalloc.c linux-2.6.31.5/mm/vmalloc.c
+--- linux-2.6.31.5/mm/vmalloc.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/mm/vmalloc.c 2009-10-20 20:33:11.013917396 -0400
+@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
+
+ pte = pte_offset_kernel(pmd, addr);
+ do {
+- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
+- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
++
++#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
++ BUG_ON(!pte_exec(*pte));
++ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
++ continue;
++ }
++#endif
++
++ {
++ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
++ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
++ }
+ } while (pte++, addr += PAGE_SIZE, addr != end);
+ }
+
+@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, un
unsigned long end, pgprot_t prot, struct page **pages, int *nr)
{
pte_t *pte;
@@ -45483,7 +47489,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
/*
* nr is a running index into the array which helps higher level
-@@ -100,17 +101,26 @@ static int vmap_pte_range(pmd_t *pmd, un
+@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, un
pte = pte_alloc_kernel(pmd, addr);
if (!pte)
return -ENOMEM;
@@ -45496,6 +47502,10 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
- return -EBUSY;
- if (WARN_ON(!page))
- return -ENOMEM;
++#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if (pgprot_val(prot) & _PAGE_NX)
++#endif
++
+ if (WARN_ON(!pte_none(*pte))) {
+ ret = -EBUSY;
+ goto out;
@@ -45515,7 +47525,47 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
}
static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -1132,6 +1142,16 @@ static struct vm_struct *__get_vm_area_n
+@@ -193,11 +218,20 @@ static inline int is_vmalloc_or_module_a
+ * and fall back on vmalloc() if that fails. Others
+ * just put it in the vmalloc space.
+ */
+-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
++#ifdef CONFIG_MODULES
++#ifdef MODULES_VADDR
+ unsigned long addr = (unsigned long)x;
+ if (addr >= MODULES_VADDR && addr < MODULES_END)
+ return 1;
+ #endif
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
++ return 1;
++#endif
++
++#endif
++
+ return is_vmalloc_addr(x);
+ }
+
+@@ -292,13 +326,13 @@ static void __insert_vmap_area(struct vm
+ struct rb_node *tmp;
+
+ while (*p) {
+- struct vmap_area *tmp;
++ struct vmap_area *varea;
+
+ parent = *p;
+- tmp = rb_entry(parent, struct vmap_area, rb_node);
+- if (va->va_start < tmp->va_end)
++ varea = rb_entry(parent, struct vmap_area, rb_node);
++ if (va->va_start < varea->va_end)
+ p = &(*p)->rb_left;
+- else if (va->va_end > tmp->va_start)
++ else if (va->va_end > varea->va_start)
+ p = &(*p)->rb_right;
+ else
+ BUG();
+@@ -1132,6 +1166,16 @@ static struct vm_struct *__get_vm_area_n
unsigned long align = 1;
BUG_ON(in_interrupt());
@@ -45532,7 +47582,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
if (flags & VM_IOREMAP) {
int bit = fls(size);
-@@ -1371,6 +1391,11 @@ void *vmap(struct page **pages, unsigned
+@@ -1371,6 +1415,11 @@ void *vmap(struct page **pages, unsigned
if (count > num_physpages)
return NULL;
@@ -45544,7 +47594,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
area = get_vm_area_caller((count << PAGE_SHIFT), flags,
__builtin_return_address(0));
if (!area)
-@@ -1478,6 +1503,13 @@ static void *__vmalloc_node(unsigned lon
+@@ -1478,6 +1527,13 @@ static void *__vmalloc_node(unsigned lon
if (!size || (size >> PAGE_SHIFT) > num_physpages)
return NULL;
@@ -45558,7 +47608,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END,
node, gfp_mask, caller);
-@@ -1496,6 +1528,7 @@ static void *__vmalloc_node(unsigned lon
+@@ -1496,6 +1552,7 @@ static void *__vmalloc_node(unsigned lon
return addr;
}
@@ -45566,7 +47616,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
{
return __vmalloc_node(size, gfp_mask, prot, -1,
-@@ -1512,6 +1545,7 @@ EXPORT_SYMBOL(__vmalloc);
+@@ -1512,6 +1569,7 @@ EXPORT_SYMBOL(__vmalloc);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
@@ -45574,7 +47624,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *vmalloc(unsigned long size)
{
return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1526,6 +1560,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1526,6 +1584,7 @@ EXPORT_SYMBOL(vmalloc);
* The resulting memory area is zeroed so it can be mapped to userspace
* without leaking data.
*/
@@ -45582,7 +47632,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *vmalloc_user(unsigned long size)
{
struct vm_struct *area;
-@@ -1552,6 +1587,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1552,6 +1611,7 @@ EXPORT_SYMBOL(vmalloc_user);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
@@ -45590,7 +47640,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *vmalloc_node(unsigned long size, int node)
{
return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1574,10 +1610,10 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1574,10 +1634,10 @@ EXPORT_SYMBOL(vmalloc_node);
* For tight control over page level allocator and protection flags
* use __vmalloc() instead.
*/
@@ -45603,7 +47653,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
-1, __builtin_return_address(0));
}
-@@ -1596,6 +1632,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1596,6 +1656,7 @@ void *vmalloc_exec(unsigned long size)
* Allocate enough 32bit PA addressable pages to cover @size from the
* page level allocator and map them into contiguous kernel virtual space.
*/
@@ -45611,7 +47661,7 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *vmalloc_32(unsigned long size)
{
return __vmalloc_node(size, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1610,6 +1647,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1610,6 +1671,7 @@ EXPORT_SYMBOL(vmalloc_32);
* The resulting memory area is 32bit addressable and zeroed so it can be
* mapped to userspace without leaking data.
*/
@@ -45619,9 +47669,9 @@ diff -urNp linux-2.6.31.4/mm/vmalloc.c linux-2.6.31.4/mm/vmalloc.c
void *vmalloc_32_user(unsigned long size)
{
struct vm_struct *area;
-diff -urNp linux-2.6.31.4/net/atm/atm_misc.c linux-2.6.31.4/net/atm/atm_misc.c
---- linux-2.6.31.4/net/atm/atm_misc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/atm/atm_misc.c 2009-10-11 15:29:49.681362371 -0400
+diff -urNp linux-2.6.31.5/net/atm/atm_misc.c linux-2.6.31.5/net/atm/atm_misc.c
+--- linux-2.6.31.5/net/atm/atm_misc.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/atm/atm_misc.c 2009-10-20 20:32:11.921980675 -0400
@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
return 1;
@@ -45658,9 +47708,9 @@ diff -urNp linux-2.6.31.4/net/atm/atm_misc.c linux-2.6.31.4/net/atm/atm_misc.c
__SONET_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.31.4/net/atm/proc.c linux-2.6.31.4/net/atm/proc.c
---- linux-2.6.31.4/net/atm/proc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/atm/proc.c 2009-10-11 15:29:49.693625675 -0400
+diff -urNp linux-2.6.31.5/net/atm/proc.c linux-2.6.31.5/net/atm/proc.c
+--- linux-2.6.31.5/net/atm/proc.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/atm/proc.c 2009-10-20 20:32:11.921980675 -0400
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -45674,9 +47724,9 @@ diff -urNp linux-2.6.31.4/net/atm/proc.c linux-2.6.31.4/net/atm/proc.c
}
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-2.6.31.4/net/atm/resources.c linux-2.6.31.4/net/atm/resources.c
---- linux-2.6.31.4/net/atm/resources.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/atm/resources.c 2009-10-11 15:29:49.694611006 -0400
+diff -urNp linux-2.6.31.5/net/atm/resources.c linux-2.6.31.5/net/atm/resources.c
+--- linux-2.6.31.5/net/atm/resources.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/atm/resources.c 2009-10-20 20:32:11.922946268 -0400
@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
static void copy_aal_stats(struct k_atm_aal_stats *from,
struct atm_aal_stats *to)
@@ -45695,9 +47745,21 @@ diff -urNp linux-2.6.31.4/net/atm/resources.c linux-2.6.31.4/net/atm/resources.c
__AAL_STAT_ITEMS
#undef __HANDLE_ITEM
}
-diff -urNp linux-2.6.31.4/net/bridge/br_stp_if.c linux-2.6.31.4/net/bridge/br_stp_if.c
---- linux-2.6.31.4/net/bridge/br_stp_if.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/bridge/br_stp_if.c 2009-10-11 15:29:49.706364227 -0400
+diff -urNp linux-2.6.31.5/net/bridge/br_private.h linux-2.6.31.5/net/bridge/br_private.h
+--- linux-2.6.31.5/net/bridge/br_private.h 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/bridge/br_private.h 2009-10-20 20:33:11.044053425 -0400
+@@ -250,7 +250,7 @@ extern void br_ifinfo_notify(int event,
+
+ #ifdef CONFIG_SYSFS
+ /* br_sysfs_if.c */
+-extern struct sysfs_ops brport_sysfs_ops;
++extern const struct sysfs_ops brport_sysfs_ops;
+ extern int br_sysfs_addif(struct net_bridge_port *p);
+
+ /* br_sysfs_br.c */
+diff -urNp linux-2.6.31.5/net/bridge/br_stp_if.c linux-2.6.31.5/net/bridge/br_stp_if.c
+--- linux-2.6.31.5/net/bridge/br_stp_if.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/bridge/br_stp_if.c 2009-10-20 20:32:11.922946268 -0400
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -45707,9 +47769,21 @@ diff -urNp linux-2.6.31.4/net/bridge/br_stp_if.c linux-2.6.31.4/net/bridge/br_st
printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
br->dev->name, r);
-diff -urNp linux-2.6.31.4/net/core/flow.c linux-2.6.31.4/net/core/flow.c
---- linux-2.6.31.4/net/core/flow.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/core/flow.c 2009-10-11 15:29:49.715599171 -0400
+diff -urNp linux-2.6.31.5/net/bridge/br_sysfs_if.c linux-2.6.31.5/net/bridge/br_sysfs_if.c
+--- linux-2.6.31.5/net/bridge/br_sysfs_if.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/bridge/br_sysfs_if.c 2009-10-20 20:33:11.044053425 -0400
+@@ -203,7 +203,7 @@ static ssize_t brport_store(struct kobje
+ return ret;
+ }
+
+-struct sysfs_ops brport_sysfs_ops = {
++const struct sysfs_ops brport_sysfs_ops = {
+ .show = brport_show,
+ .store = brport_store,
+ };
+diff -urNp linux-2.6.31.5/net/core/flow.c linux-2.6.31.5/net/core/flow.c
+--- linux-2.6.31.5/net/core/flow.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/core/flow.c 2009-10-20 20:32:11.922946268 -0400
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
@@ -45737,9 +47811,9 @@ diff -urNp linux-2.6.31.4/net/core/flow.c linux-2.6.31.4/net/core/flow.c
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
-diff -urNp linux-2.6.31.4/net/dccp/ccids/ccid3.c linux-2.6.31.4/net/dccp/ccids/ccid3.c
---- linux-2.6.31.4/net/dccp/ccids/ccid3.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/dccp/ccids/ccid3.c 2009-10-11 15:29:49.721369398 -0400
+diff -urNp linux-2.6.31.5/net/dccp/ccids/ccid3.c linux-2.6.31.5/net/dccp/ccids/ccid3.c
+--- linux-2.6.31.5/net/dccp/ccids/ccid3.c 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/dccp/ccids/ccid3.c 2009-10-20 20:32:11.922946268 -0400
@@ -43,7 +43,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -45749,9 +47823,9 @@ diff -urNp linux-2.6.31.4/net/dccp/ccids/ccid3.c linux-2.6.31.4/net/dccp/ccids/c
#endif
/*
-diff -urNp linux-2.6.31.4/net/dccp/dccp.h linux-2.6.31.4/net/dccp/dccp.h
---- linux-2.6.31.4/net/dccp/dccp.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/dccp/dccp.h 2009-10-11 15:29:49.728786661 -0400
+diff -urNp linux-2.6.31.5/net/dccp/dccp.h linux-2.6.31.5/net/dccp/dccp.h
+--- linux-2.6.31.5/net/dccp/dccp.h 2009-10-20 20:42:59.224894785 -0400
++++ linux-2.6.31.5/net/dccp/dccp.h 2009-10-20 20:32:11.922946268 -0400
@@ -44,9 +44,9 @@ extern int dccp_debug;
#define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
#define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a)
@@ -45765,9 +47839,9 @@ diff -urNp linux-2.6.31.4/net/dccp/dccp.h linux-2.6.31.4/net/dccp/dccp.h
#endif
extern struct inet_hashinfo dccp_hashinfo;
-diff -urNp linux-2.6.31.4/net/ipv4/inet_hashtables.c linux-2.6.31.4/net/ipv4/inet_hashtables.c
---- linux-2.6.31.4/net/ipv4/inet_hashtables.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv4/inet_hashtables.c 2009-10-11 15:29:49.742362588 -0400
+diff -urNp linux-2.6.31.5/net/ipv4/inet_hashtables.c linux-2.6.31.5/net/ipv4/inet_hashtables.c
+--- linux-2.6.31.5/net/ipv4/inet_hashtables.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv4/inet_hashtables.c 2009-10-20 20:32:11.923932966 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -45792,9 +47866,9 @@ diff -urNp linux-2.6.31.4/net/ipv4/inet_hashtables.c linux-2.6.31.4/net/ipv4/ine
if (tw) {
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
-diff -urNp linux-2.6.31.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.31.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.31.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-10-11 15:29:49.754672404 -0400
+diff -urNp linux-2.6.31.5/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.31.5/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-2.6.31.5/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-10-20 20:32:11.923932966 -0400
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -45804,9 +47878,9 @@ diff -urNp linux-2.6.31.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.31.4/
if (*octets == NULL) {
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-2.6.31.4/net/ipv4/tcp_ipv4.c linux-2.6.31.4/net/ipv4/tcp_ipv4.c
---- linux-2.6.31.4/net/ipv4/tcp_ipv4.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv4/tcp_ipv4.c 2009-10-11 15:29:49.781362821 -0400
+diff -urNp linux-2.6.31.5/net/ipv4/tcp_ipv4.c linux-2.6.31.5/net/ipv4/tcp_ipv4.c
+--- linux-2.6.31.5/net/ipv4/tcp_ipv4.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv4/tcp_ipv4.c 2009-10-20 20:32:11.923932966 -0400
@@ -1504,6 +1504,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
return 0;
@@ -45827,9 +47901,9 @@ diff -urNp linux-2.6.31.4/net/ipv4/tcp_ipv4.c linux-2.6.31.4/net/ipv4/tcp_ipv4.c
tcp_v4_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.31.4/net/ipv4/tcp_minisocks.c linux-2.6.31.4/net/ipv4/tcp_minisocks.c
---- linux-2.6.31.4/net/ipv4/tcp_minisocks.c 2009-10-12 23:26:18.276226548 -0400
-+++ linux-2.6.31.4/net/ipv4/tcp_minisocks.c 2009-10-12 23:26:38.983529432 -0400
+diff -urNp linux-2.6.31.5/net/ipv4/tcp_minisocks.c linux-2.6.31.5/net/ipv4/tcp_minisocks.c
+--- linux-2.6.31.5/net/ipv4/tcp_minisocks.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv4/tcp_minisocks.c 2009-10-20 20:32:11.924909851 -0400
@@ -695,8 +695,11 @@ listen_overflow:
embryonic_reset:
@@ -45842,9 +47916,9 @@ diff -urNp linux-2.6.31.4/net/ipv4/tcp_minisocks.c linux-2.6.31.4/net/ipv4/tcp_m
inet_csk_reqsk_queue_drop(sk, req, prev);
return NULL;
-diff -urNp linux-2.6.31.4/net/ipv4/udp.c linux-2.6.31.4/net/ipv4/udp.c
---- linux-2.6.31.4/net/ipv4/udp.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv4/udp.c 2009-10-11 15:29:49.797526454 -0400
+diff -urNp linux-2.6.31.5/net/ipv4/udp.c linux-2.6.31.5/net/ipv4/udp.c
+--- linux-2.6.31.5/net/ipv4/udp.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv4/udp.c 2009-10-20 20:32:11.924909851 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -45903,9 +47977,9 @@ diff -urNp linux-2.6.31.4/net/ipv4/udp.c linux-2.6.31.4/net/ipv4/udp.c
icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
/*
-diff -urNp linux-2.6.31.4/net/ipv6/exthdrs.c linux-2.6.31.4/net/ipv6/exthdrs.c
---- linux-2.6.31.4/net/ipv6/exthdrs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv6/exthdrs.c 2009-10-11 15:29:49.804368392 -0400
+diff -urNp linux-2.6.31.5/net/ipv6/exthdrs.c linux-2.6.31.5/net/ipv6/exthdrs.c
+--- linux-2.6.31.5/net/ipv6/exthdrs.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv6/exthdrs.c 2009-10-20 20:32:11.924909851 -0400
@@ -630,7 +630,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -45915,9 +47989,9 @@ diff -urNp linux-2.6.31.4/net/ipv6/exthdrs.c linux-2.6.31.4/net/ipv6/exthdrs.c
};
int ipv6_parse_hopopts(struct sk_buff *skb)
-diff -urNp linux-2.6.31.4/net/ipv6/ip6mr.c linux-2.6.31.4/net/ipv6/ip6mr.c
---- linux-2.6.31.4/net/ipv6/ip6mr.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv6/ip6mr.c 2009-10-11 15:29:49.807404369 -0400
+diff -urNp linux-2.6.31.5/net/ipv6/ip6mr.c linux-2.6.31.5/net/ipv6/ip6mr.c
+--- linux-2.6.31.5/net/ipv6/ip6mr.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv6/ip6mr.c 2009-10-20 20:32:11.925886482 -0400
@@ -204,7 +204,7 @@ static int ip6mr_vif_seq_show(struct seq
return 0;
}
@@ -45954,9 +48028,9 @@ diff -urNp linux-2.6.31.4/net/ipv6/ip6mr.c linux-2.6.31.4/net/ipv6/ip6mr.c
.owner = THIS_MODULE,
.open = ipmr_mfc_open,
.read = seq_read,
-diff -urNp linux-2.6.31.4/net/ipv6/raw.c linux-2.6.31.4/net/ipv6/raw.c
---- linux-2.6.31.4/net/ipv6/raw.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv6/raw.c 2009-10-11 15:29:49.808386900 -0400
+diff -urNp linux-2.6.31.5/net/ipv6/raw.c linux-2.6.31.5/net/ipv6/raw.c
+--- linux-2.6.31.5/net/ipv6/raw.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv6/raw.c 2009-10-20 20:32:11.925886482 -0400
@@ -600,7 +600,7 @@ out:
return err;
}
@@ -45966,9 +48040,9 @@ diff -urNp linux-2.6.31.4/net/ipv6/raw.c linux-2.6.31.4/net/ipv6/raw.c
struct flowi *fl, struct rt6_info *rt,
unsigned int flags)
{
-diff -urNp linux-2.6.31.4/net/ipv6/tcp_ipv6.c linux-2.6.31.4/net/ipv6/tcp_ipv6.c
---- linux-2.6.31.4/net/ipv6/tcp_ipv6.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv6/tcp_ipv6.c 2009-10-11 15:29:49.811375867 -0400
+diff -urNp linux-2.6.31.5/net/ipv6/tcp_ipv6.c linux-2.6.31.5/net/ipv6/tcp_ipv6.c
+--- linux-2.6.31.5/net/ipv6/tcp_ipv6.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv6/tcp_ipv6.c 2009-10-20 20:32:11.925886482 -0400
@@ -1577,6 +1577,9 @@ static int tcp_v6_do_rcv(struct sock *sk
return 0;
@@ -45989,9 +48063,9 @@ diff -urNp linux-2.6.31.4/net/ipv6/tcp_ipv6.c linux-2.6.31.4/net/ipv6/tcp_ipv6.c
tcp_v6_send_reset(NULL, skb);
}
-diff -urNp linux-2.6.31.4/net/ipv6/udp.c linux-2.6.31.4/net/ipv6/udp.c
---- linux-2.6.31.4/net/ipv6/udp.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/ipv6/udp.c 2009-10-11 15:29:49.811375867 -0400
+diff -urNp linux-2.6.31.5/net/ipv6/udp.c linux-2.6.31.5/net/ipv6/udp.c
+--- linux-2.6.31.5/net/ipv6/udp.c 2009-10-20 20:42:59.228319584 -0400
++++ linux-2.6.31.5/net/ipv6/udp.c 2009-10-20 20:32:11.925886482 -0400
@@ -589,6 +589,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
proto == IPPROTO_UDPLITE);
@@ -46002,9 +48076,9 @@ diff -urNp linux-2.6.31.4/net/ipv6/udp.c linux-2.6.31.4/net/ipv6/udp.c
icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
kfree_skb(skb);
-diff -urNp linux-2.6.31.4/net/irda/ircomm/ircomm_tty.c linux-2.6.31.4/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.31.4/net/irda/ircomm/ircomm_tty.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/irda/ircomm/ircomm_tty.c 2009-10-11 15:29:49.816450122 -0400
+diff -urNp linux-2.6.31.5/net/irda/ircomm/ircomm_tty.c linux-2.6.31.5/net/irda/ircomm/ircomm_tty.c
+--- linux-2.6.31.5/net/irda/ircomm/ircomm_tty.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/irda/ircomm/ircomm_tty.c 2009-10-20 20:32:11.927351251 -0400
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -46127,9 +48201,9 @@ diff -urNp linux-2.6.31.4/net/irda/ircomm/ircomm_tty.c linux-2.6.31.4/net/irda/i
seq_printf(m, "Max data size: %d\n", self->max_data_size);
seq_printf(m, "Max header size: %d\n", self->max_header_size);
-diff -urNp linux-2.6.31.4/net/key/af_key.c linux-2.6.31.4/net/key/af_key.c
---- linux-2.6.31.4/net/key/af_key.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/key/af_key.c 2009-10-11 15:29:49.832755760 -0400
+diff -urNp linux-2.6.31.5/net/key/af_key.c linux-2.6.31.5/net/key/af_key.c
+--- linux-2.6.31.5/net/key/af_key.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/key/af_key.c 2009-10-20 20:32:11.928044543 -0400
@@ -3705,7 +3705,7 @@ static void pfkey_seq_stop(struct seq_fi
read_unlock(&pfkey_table_lock);
}
@@ -46148,9 +48222,9 @@ diff -urNp linux-2.6.31.4/net/key/af_key.c linux-2.6.31.4/net/key/af_key.c
.open = pfkey_seq_open,
.read = seq_read,
.llseek = seq_lseek,
-diff -urNp linux-2.6.31.4/net/mac80211/ieee80211_i.h linux-2.6.31.4/net/mac80211/ieee80211_i.h
---- linux-2.6.31.4/net/mac80211/ieee80211_i.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/ieee80211_i.h 2009-10-11 15:29:49.995365046 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/ieee80211_i.h linux-2.6.31.5/net/mac80211/ieee80211_i.h
+--- linux-2.6.31.5/net/mac80211/ieee80211_i.h 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/ieee80211_i.h 2009-10-20 20:32:11.928044543 -0400
@@ -609,7 +609,7 @@ struct ieee80211_local {
spinlock_t queue_stop_reason_lock;
@@ -46160,9 +48234,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/ieee80211_i.h linux-2.6.31.4/net/mac80211
int monitors, cooked_mntrs;
/* number of interfaces with corresponding FIF_ flags */
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss;
-diff -urNp linux-2.6.31.4/net/mac80211/iface.c linux-2.6.31.4/net/mac80211/iface.c
---- linux-2.6.31.4/net/mac80211/iface.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/iface.c 2009-10-11 15:29:49.998543934 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/iface.c linux-2.6.31.5/net/mac80211/iface.c
+--- linux-2.6.31.5/net/mac80211/iface.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/iface.c 2009-10-20 20:32:11.928885294 -0400
@@ -164,7 +164,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -46226,9 +48300,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/iface.c linux-2.6.31.4/net/mac80211/iface
if (netif_running(local->mdev))
dev_close(local->mdev);
-diff -urNp linux-2.6.31.4/net/mac80211/main.c linux-2.6.31.4/net/mac80211/main.c
---- linux-2.6.31.4/net/mac80211/main.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/main.c 2009-10-11 15:29:49.999554879 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/main.c linux-2.6.31.5/net/mac80211/main.c
+--- linux-2.6.31.5/net/mac80211/main.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/main.c 2009-10-20 20:32:11.928885294 -0400
@@ -193,7 +193,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -46238,9 +48312,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/main.c linux-2.6.31.4/net/mac80211/main.c
ret = drv_config(local, changed);
/*
* Goal:
-diff -urNp linux-2.6.31.4/net/mac80211/pm.c linux-2.6.31.4/net/mac80211/pm.c
---- linux-2.6.31.4/net/mac80211/pm.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/pm.c 2009-10-11 15:29:50.010421891 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/pm.c linux-2.6.31.5/net/mac80211/pm.c
+--- linux-2.6.31.5/net/mac80211/pm.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/pm.c 2009-10-20 20:32:11.928885294 -0400
@@ -103,7 +103,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -46250,9 +48324,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/pm.c linux-2.6.31.4/net/mac80211/pm.c
ieee80211_led_radio(local, false);
drv_stop(local);
}
-diff -urNp linux-2.6.31.4/net/mac80211/rate.c linux-2.6.31.4/net/mac80211/rate.c
---- linux-2.6.31.4/net/mac80211/rate.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/rate.c 2009-10-11 15:29:50.010421891 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/rate.c linux-2.6.31.5/net/mac80211/rate.c
+--- linux-2.6.31.5/net/mac80211/rate.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/rate.c 2009-10-20 20:32:11.928885294 -0400
@@ -258,7 +258,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -46262,9 +48336,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/rate.c linux-2.6.31.4/net/mac80211/rate.c
return -EBUSY;
ref = rate_control_alloc(name, local);
-diff -urNp linux-2.6.31.4/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.31.4/net/mac80211/rc80211_minstrel_debugfs.c
---- linux-2.6.31.4/net/mac80211/rc80211_minstrel_debugfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/rc80211_minstrel_debugfs.c 2009-10-11 15:29:50.202379108 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.31.5/net/mac80211/rc80211_minstrel_debugfs.c
+--- linux-2.6.31.5/net/mac80211/rc80211_minstrel_debugfs.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/rc80211_minstrel_debugfs.c 2009-10-20 20:32:11.928885294 -0400
@@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *ino
return 0;
}
@@ -46274,9 +48348,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.31.4
.owner = THIS_MODULE,
.open = minstrel_stats_open,
.read = minstrel_stats_read,
-diff -urNp linux-2.6.31.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.31.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-2.6.31.4/net/mac80211/rc80211_pid_debugfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/rc80211_pid_debugfs.c 2009-10-11 15:29:50.203405749 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/rc80211_pid_debugfs.c linux-2.6.31.5/net/mac80211/rc80211_pid_debugfs.c
+--- linux-2.6.31.5/net/mac80211/rc80211_pid_debugfs.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/rc80211_pid_debugfs.c 2009-10-20 20:32:11.928885294 -0400
@@ -198,7 +198,7 @@ static ssize_t rate_control_pid_events_r
#undef RC_PID_PRINT_BUF_SIZE
@@ -46286,9 +48360,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.31.4/net/
.owner = THIS_MODULE,
.read = rate_control_pid_events_read,
.poll = rate_control_pid_events_poll,
-diff -urNp linux-2.6.31.4/net/mac80211/util.c linux-2.6.31.4/net/mac80211/util.c
---- linux-2.6.31.4/net/mac80211/util.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/mac80211/util.c 2009-10-11 15:29:50.204376135 -0400
+diff -urNp linux-2.6.31.5/net/mac80211/util.c linux-2.6.31.5/net/mac80211/util.c
+--- linux-2.6.31.5/net/mac80211/util.c 2009-10-20 20:42:59.231726955 -0400
++++ linux-2.6.31.5/net/mac80211/util.c 2009-10-20 20:32:11.928885294 -0400
@@ -991,7 +991,7 @@ int ieee80211_reconfig(struct ieee80211_
local->suspended = false;
@@ -46298,9 +48372,9 @@ diff -urNp linux-2.6.31.4/net/mac80211/util.c linux-2.6.31.4/net/mac80211/util.c
res = drv_start(local);
ieee80211_led_radio(local, true);
-diff -urNp linux-2.6.31.4/net/packet/af_packet.c linux-2.6.31.4/net/packet/af_packet.c
---- linux-2.6.31.4/net/packet/af_packet.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/packet/af_packet.c 2009-10-11 15:29:50.208404960 -0400
+diff -urNp linux-2.6.31.5/net/packet/af_packet.c linux-2.6.31.5/net/packet/af_packet.c
+--- linux-2.6.31.5/net/packet/af_packet.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/packet/af_packet.c 2009-10-20 20:32:11.930280581 -0400
@@ -2086,7 +2086,7 @@ static void packet_mm_close(struct vm_ar
atomic_dec(&pkt_sk(sk)->mapped);
}
@@ -46310,9 +48384,9 @@ diff -urNp linux-2.6.31.4/net/packet/af_packet.c linux-2.6.31.4/net/packet/af_pa
.open = packet_mm_open,
.close =packet_mm_close,
};
-diff -urNp linux-2.6.31.4/net/sctp/socket.c linux-2.6.31.4/net/sctp/socket.c
---- linux-2.6.31.4/net/sctp/socket.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/sctp/socket.c 2009-10-11 15:29:50.242359580 -0400
+diff -urNp linux-2.6.31.5/net/sctp/socket.c linux-2.6.31.5/net/sctp/socket.c
+--- linux-2.6.31.5/net/sctp/socket.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/sctp/socket.c 2009-10-20 20:32:11.931176712 -0400
@@ -1471,7 +1471,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -46330,9 +48404,9 @@ diff -urNp linux-2.6.31.4/net/sctp/socket.c linux-2.6.31.4/net/sctp/socket.c
SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
if (pp->fastreuse && sk->sk_reuse &&
-diff -urNp linux-2.6.31.4/net/socket.c linux-2.6.31.4/net/socket.c
---- linux-2.6.31.4/net/socket.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/socket.c 2009-10-11 15:29:50.266400000 -0400
+diff -urNp linux-2.6.31.5/net/socket.c linux-2.6.31.5/net/socket.c
+--- linux-2.6.31.5/net/socket.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/socket.c 2009-10-20 20:32:11.932247231 -0400
@@ -86,6 +86,7 @@
#include <linux/audit.h>
#include <linux/wireless.h>
@@ -46496,9 +48570,9 @@ diff -urNp linux-2.6.31.4/net/socket.c linux-2.6.31.4/net/socket.c
err =
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
-diff -urNp linux-2.6.31.4/net/sunrpc/rpc_pipe.c linux-2.6.31.4/net/sunrpc/rpc_pipe.c
---- linux-2.6.31.4/net/sunrpc/rpc_pipe.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/sunrpc/rpc_pipe.c 2009-10-11 15:29:50.275728603 -0400
+diff -urNp linux-2.6.31.5/net/sunrpc/rpc_pipe.c linux-2.6.31.5/net/sunrpc/rpc_pipe.c
+--- linux-2.6.31.5/net/sunrpc/rpc_pipe.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/sunrpc/rpc_pipe.c 2009-10-20 20:32:11.932247231 -0400
@@ -858,7 +858,7 @@ EXPORT_SYMBOL_GPL(rpc_unlink);
/*
* populate the filesystem
@@ -46508,9 +48582,9 @@ diff -urNp linux-2.6.31.4/net/sunrpc/rpc_pipe.c linux-2.6.31.4/net/sunrpc/rpc_pi
.alloc_inode = rpc_alloc_inode,
.destroy_inode = rpc_destroy_inode,
.statfs = simple_statfs,
-diff -urNp linux-2.6.31.4/net/unix/af_unix.c linux-2.6.31.4/net/unix/af_unix.c
---- linux-2.6.31.4/net/unix/af_unix.c 2009-10-12 23:26:18.321029026 -0400
-+++ linux-2.6.31.4/net/unix/af_unix.c 2009-10-12 23:26:38.984513863 -0400
+diff -urNp linux-2.6.31.5/net/unix/af_unix.c linux-2.6.31.5/net/unix/af_unix.c
+--- linux-2.6.31.5/net/unix/af_unix.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/unix/af_unix.c 2009-10-20 20:32:11.932247231 -0400
@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -46568,9 +48642,9 @@ diff -urNp linux-2.6.31.4/net/unix/af_unix.c linux-2.6.31.4/net/unix/af_unix.c
list = &unix_socket_table[addr->hash];
} else {
list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-diff -urNp linux-2.6.31.4/net/xfrm/xfrm_proc.c linux-2.6.31.4/net/xfrm/xfrm_proc.c
---- linux-2.6.31.4/net/xfrm/xfrm_proc.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/net/xfrm/xfrm_proc.c 2009-10-11 15:29:50.290424347 -0400
+diff -urNp linux-2.6.31.5/net/xfrm/xfrm_proc.c linux-2.6.31.5/net/xfrm/xfrm_proc.c
+--- linux-2.6.31.5/net/xfrm/xfrm_proc.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/net/xfrm/xfrm_proc.c 2009-10-20 20:32:11.933210183 -0400
@@ -60,7 +60,7 @@ static int xfrm_statistics_seq_open(stru
return single_open_net(inode, file, xfrm_statistics_seq_show);
}
@@ -46580,9 +48654,21 @@ diff -urNp linux-2.6.31.4/net/xfrm/xfrm_proc.c linux-2.6.31.4/net/xfrm/xfrm_proc
.owner = THIS_MODULE,
.open = xfrm_statistics_seq_open,
.read = seq_read,
-diff -urNp linux-2.6.31.4/samples/markers/marker-example.c linux-2.6.31.4/samples/markers/marker-example.c
---- linux-2.6.31.4/samples/markers/marker-example.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/samples/markers/marker-example.c 2009-10-11 15:29:50.317572591 -0400
+diff -urNp linux-2.6.31.5/samples/kobject/kset-example.c linux-2.6.31.5/samples/kobject/kset-example.c
+--- linux-2.6.31.5/samples/kobject/kset-example.c 2009-10-20 20:42:59.235155155 -0400
++++ linux-2.6.31.5/samples/kobject/kset-example.c 2009-10-20 20:33:11.044053425 -0400
+@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
+ }
+
+ /* Our custom sysfs_ops that we will associate with our ktype later on */
+-static struct sysfs_ops foo_sysfs_ops = {
++static const struct sysfs_ops foo_sysfs_ops = {
+ .show = foo_attr_show,
+ .store = foo_attr_store,
+ };
+diff -urNp linux-2.6.31.5/samples/markers/marker-example.c linux-2.6.31.5/samples/markers/marker-example.c
+--- linux-2.6.31.5/samples/markers/marker-example.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/samples/markers/marker-example.c 2009-10-20 20:32:11.933210183 -0400
@@ -26,7 +26,7 @@ static int my_open(struct inode *inode,
return -EPERM;
}
@@ -46592,9 +48678,9 @@ diff -urNp linux-2.6.31.4/samples/markers/marker-example.c linux-2.6.31.4/sample
.open = my_open,
};
-diff -urNp linux-2.6.31.4/samples/tracepoints/tracepoint-sample.c linux-2.6.31.4/samples/tracepoints/tracepoint-sample.c
---- linux-2.6.31.4/samples/tracepoints/tracepoint-sample.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/samples/tracepoints/tracepoint-sample.c 2009-10-11 15:29:50.318633778 -0400
+diff -urNp linux-2.6.31.5/samples/tracepoints/tracepoint-sample.c linux-2.6.31.5/samples/tracepoints/tracepoint-sample.c
+--- linux-2.6.31.5/samples/tracepoints/tracepoint-sample.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/samples/tracepoints/tracepoint-sample.c 2009-10-20 20:32:11.933210183 -0400
@@ -28,7 +28,7 @@ static int my_open(struct inode *inode,
return -EPERM;
}
@@ -46604,9 +48690,9 @@ diff -urNp linux-2.6.31.4/samples/tracepoints/tracepoint-sample.c linux-2.6.31.4
.open = my_open,
};
-diff -urNp linux-2.6.31.4/scripts/basic/fixdep.c linux-2.6.31.4/scripts/basic/fixdep.c
---- linux-2.6.31.4/scripts/basic/fixdep.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/basic/fixdep.c 2009-10-11 15:29:50.322528140 -0400
+diff -urNp linux-2.6.31.5/scripts/basic/fixdep.c linux-2.6.31.5/scripts/basic/fixdep.c
+--- linux-2.6.31.5/scripts/basic/fixdep.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/basic/fixdep.c 2009-10-20 20:32:11.933210183 -0400
@@ -224,9 +224,9 @@ void use_config(char *m, int slen)
void parse_config_file(char *map, size_t len)
@@ -46628,9 +48714,9 @@ diff -urNp linux-2.6.31.4/scripts/basic/fixdep.c linux-2.6.31.4/scripts/basic/fi
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-2.6.31.4/scripts/kallsyms.c linux-2.6.31.4/scripts/kallsyms.c
---- linux-2.6.31.4/scripts/kallsyms.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/kallsyms.c 2009-10-11 15:29:50.351373957 -0400
+diff -urNp linux-2.6.31.5/scripts/kallsyms.c linux-2.6.31.5/scripts/kallsyms.c
+--- linux-2.6.31.5/scripts/kallsyms.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/kallsyms.c 2009-10-20 20:32:11.934092756 -0400
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -46646,9 +48732,9 @@ diff -urNp linux-2.6.31.4/scripts/kallsyms.c linux-2.6.31.4/scripts/kallsyms.c
};
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
-diff -urNp linux-2.6.31.4/scripts/kconfig/lkc.h linux-2.6.31.4/scripts/kconfig/lkc.h
---- linux-2.6.31.4/scripts/kconfig/lkc.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/kconfig/lkc.h 2009-10-11 15:29:50.352381683 -0400
+diff -urNp linux-2.6.31.5/scripts/kconfig/lkc.h linux-2.6.31.5/scripts/kconfig/lkc.h
+--- linux-2.6.31.5/scripts/kconfig/lkc.h 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/kconfig/lkc.h 2009-10-20 20:32:11.934092756 -0400
@@ -97,7 +97,7 @@ void menu_add_expr(enum prop_type type,
void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep);
void menu_add_option(int token, char *arg);
@@ -46658,9 +48744,9 @@ diff -urNp linux-2.6.31.4/scripts/kconfig/lkc.h linux-2.6.31.4/scripts/kconfig/l
/* util.c */
struct file *file_lookup(const char *name);
-diff -urNp linux-2.6.31.4/scripts/kconfig/mconf.c linux-2.6.31.4/scripts/kconfig/mconf.c
---- linux-2.6.31.4/scripts/kconfig/mconf.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/kconfig/mconf.c 2009-10-11 15:29:50.369364284 -0400
+diff -urNp linux-2.6.31.5/scripts/kconfig/mconf.c linux-2.6.31.5/scripts/kconfig/mconf.c
+--- linux-2.6.31.5/scripts/kconfig/mconf.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/kconfig/mconf.c 2009-10-20 20:32:11.934092756 -0400
@@ -361,7 +361,7 @@ static char filename[PATH_MAX+1];
static void set_config_filename(const char *config_filename)
{
@@ -46670,9 +48756,9 @@ diff -urNp linux-2.6.31.4/scripts/kconfig/mconf.c linux-2.6.31.4/scripts/kconfig
struct symbol *sym;
sym = sym_lookup("KERNELVERSION", 0);
-diff -urNp linux-2.6.31.4/scripts/kconfig/menu.c linux-2.6.31.4/scripts/kconfig/menu.c
---- linux-2.6.31.4/scripts/kconfig/menu.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/kconfig/menu.c 2009-10-11 15:29:50.370363562 -0400
+diff -urNp linux-2.6.31.5/scripts/kconfig/menu.c linux-2.6.31.5/scripts/kconfig/menu.c
+--- linux-2.6.31.5/scripts/kconfig/menu.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/kconfig/menu.c 2009-10-20 20:32:11.934884845 -0400
@@ -104,7 +104,7 @@ void menu_add_dep(struct expr *dep)
current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
}
@@ -46682,9 +48768,9 @@ diff -urNp linux-2.6.31.4/scripts/kconfig/menu.c linux-2.6.31.4/scripts/kconfig/
{
struct symbol *sym = current_entry->sym;
-diff -urNp linux-2.6.31.4/scripts/mod/file2alias.c linux-2.6.31.4/scripts/mod/file2alias.c
---- linux-2.6.31.4/scripts/mod/file2alias.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/mod/file2alias.c 2009-10-11 15:29:50.382598456 -0400
+diff -urNp linux-2.6.31.5/scripts/mod/file2alias.c linux-2.6.31.5/scripts/mod/file2alias.c
+--- linux-2.6.31.5/scripts/mod/file2alias.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/mod/file2alias.c 2009-10-20 20:32:11.934884845 -0400
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -46739,9 +48825,9 @@ diff -urNp linux-2.6.31.4/scripts/mod/file2alias.c linux-2.6.31.4/scripts/mod/fi
sprintf(alias, "dmi*");
-diff -urNp linux-2.6.31.4/scripts/mod/modpost.c linux-2.6.31.4/scripts/mod/modpost.c
---- linux-2.6.31.4/scripts/mod/modpost.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/mod/modpost.c 2009-10-11 15:29:50.400495594 -0400
+diff -urNp linux-2.6.31.5/scripts/mod/modpost.c linux-2.6.31.5/scripts/mod/modpost.c
+--- linux-2.6.31.5/scripts/mod/modpost.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/mod/modpost.c 2009-10-20 20:32:11.934884845 -0400
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -46809,9 +48895,9 @@ diff -urNp linux-2.6.31.4/scripts/mod/modpost.c linux-2.6.31.4/scripts/mod/modpo
goto close_write;
tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-2.6.31.4/scripts/mod/modpost.h linux-2.6.31.4/scripts/mod/modpost.h
---- linux-2.6.31.4/scripts/mod/modpost.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/mod/modpost.h 2009-10-11 15:29:50.410430555 -0400
+diff -urNp linux-2.6.31.5/scripts/mod/modpost.h linux-2.6.31.5/scripts/mod/modpost.h
+--- linux-2.6.31.5/scripts/mod/modpost.h 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/mod/modpost.h 2009-10-20 20:32:11.934884845 -0400
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -46831,9 +48917,9 @@ diff -urNp linux-2.6.31.4/scripts/mod/modpost.h linux-2.6.31.4/scripts/mod/modpo
struct module {
struct module *next;
-diff -urNp linux-2.6.31.4/scripts/mod/sumversion.c linux-2.6.31.4/scripts/mod/sumversion.c
---- linux-2.6.31.4/scripts/mod/sumversion.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/mod/sumversion.c 2009-10-11 15:29:50.411393009 -0400
+diff -urNp linux-2.6.31.5/scripts/mod/sumversion.c linux-2.6.31.5/scripts/mod/sumversion.c
+--- linux-2.6.31.5/scripts/mod/sumversion.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/mod/sumversion.c 2009-10-20 20:32:11.934884845 -0400
@@ -457,7 +457,7 @@ static void write_version(const char *fi
goto out;
}
@@ -46843,9 +48929,9 @@ diff -urNp linux-2.6.31.4/scripts/mod/sumversion.c linux-2.6.31.4/scripts/mod/su
warn("writing sum in %s failed: %s\n",
filename, strerror(errno));
goto out;
-diff -urNp linux-2.6.31.4/scripts/pnmtologo.c linux-2.6.31.4/scripts/pnmtologo.c
---- linux-2.6.31.4/scripts/pnmtologo.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/scripts/pnmtologo.c 2009-10-11 15:29:50.421425530 -0400
+diff -urNp linux-2.6.31.5/scripts/pnmtologo.c linux-2.6.31.5/scripts/pnmtologo.c
+--- linux-2.6.31.5/scripts/pnmtologo.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/scripts/pnmtologo.c 2009-10-20 20:32:11.936125655 -0400
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -46872,9 +48958,9 @@ diff -urNp linux-2.6.31.4/scripts/pnmtologo.c linux-2.6.31.4/scripts/pnmtologo.c
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.31.4/security/commoncap.c linux-2.6.31.4/security/commoncap.c
---- linux-2.6.31.4/security/commoncap.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/security/commoncap.c 2009-10-11 15:29:50.450436585 -0400
+diff -urNp linux-2.6.31.5/security/commoncap.c linux-2.6.31.5/security/commoncap.c
+--- linux-2.6.31.5/security/commoncap.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/security/commoncap.c 2009-10-20 20:32:11.936125655 -0400
@@ -27,7 +27,7 @@
#include <linux/sched.h>
#include <linux/prctl.h>
@@ -46897,9 +48983,9 @@ diff -urNp linux-2.6.31.4/security/commoncap.c linux-2.6.31.4/security/commoncap
return 0;
}
-diff -urNp linux-2.6.31.4/security/integrity/ima/ima_fs.c linux-2.6.31.4/security/integrity/ima/ima_fs.c
---- linux-2.6.31.4/security/integrity/ima/ima_fs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/security/integrity/ima/ima_fs.c 2009-10-11 15:29:50.462411243 -0400
+diff -urNp linux-2.6.31.5/security/integrity/ima/ima_fs.c linux-2.6.31.5/security/integrity/ima/ima_fs.c
+--- linux-2.6.31.5/security/integrity/ima/ima_fs.c 2009-10-20 20:42:59.238403833 -0400
++++ linux-2.6.31.5/security/integrity/ima/ima_fs.c 2009-10-20 20:32:11.936125655 -0400
@@ -43,7 +43,7 @@ static ssize_t ima_show_htable_violation
return ima_show_htable_value(buf, count, ppos, &ima_htable.violations);
}
@@ -46963,9 +49049,9 @@ diff -urNp linux-2.6.31.4/security/integrity/ima/ima_fs.c linux-2.6.31.4/securit
.open = ima_open_policy,
.write = ima_write_policy,
.release = ima_release_policy
-diff -urNp linux-2.6.31.4/security/Kconfig linux-2.6.31.4/security/Kconfig
---- linux-2.6.31.4/security/Kconfig 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/security/Kconfig 2009-10-11 15:29:50.470476900 -0400
+diff -urNp linux-2.6.31.5/security/Kconfig linux-2.6.31.5/security/Kconfig
+--- linux-2.6.31.5/security/Kconfig 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/security/Kconfig 2009-10-20 20:32:11.937116931 -0400
@@ -4,6 +4,465 @@
menu "Security options"
@@ -47432,9 +49518,9 @@ diff -urNp linux-2.6.31.4/security/Kconfig linux-2.6.31.4/security/Kconfig
config KEYS
bool "Enable access key retention support"
help
-diff -urNp linux-2.6.31.4/security/min_addr.c linux-2.6.31.4/security/min_addr.c
---- linux-2.6.31.4/security/min_addr.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/security/min_addr.c 2009-10-11 15:29:50.480533250 -0400
+diff -urNp linux-2.6.31.5/security/min_addr.c linux-2.6.31.5/security/min_addr.c
+--- linux-2.6.31.5/security/min_addr.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/security/min_addr.c 2009-10-20 20:32:11.937116931 -0400
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -47451,9 +49537,9 @@ diff -urNp linux-2.6.31.4/security/min_addr.c linux-2.6.31.4/security/min_addr.c
}
/*
-diff -urNp linux-2.6.31.4/security/smack/smackfs.c linux-2.6.31.4/security/smack/smackfs.c
---- linux-2.6.31.4/security/smack/smackfs.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/security/smack/smackfs.c 2009-10-11 15:29:50.489384946 -0400
+diff -urNp linux-2.6.31.5/security/smack/smackfs.c linux-2.6.31.5/security/smack/smackfs.c
+--- linux-2.6.31.5/security/smack/smackfs.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/security/smack/smackfs.c 2009-10-20 20:32:11.937116931 -0400
@@ -187,7 +187,7 @@ static void load_seq_stop(struct seq_fil
/* No-op */
}
@@ -47481,9 +49567,9 @@ diff -urNp linux-2.6.31.4/security/smack/smackfs.c linux-2.6.31.4/security/smack
.start = netlbladdr_seq_start,
.stop = netlbladdr_seq_stop,
.next = netlbladdr_seq_next,
-diff -urNp linux-2.6.31.4/sound/aoa/codecs/onyx.c linux-2.6.31.4/sound/aoa/codecs/onyx.c
---- linux-2.6.31.4/sound/aoa/codecs/onyx.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/aoa/codecs/onyx.c 2009-10-11 15:29:50.500776222 -0400
+diff -urNp linux-2.6.31.5/sound/aoa/codecs/onyx.c linux-2.6.31.5/sound/aoa/codecs/onyx.c
+--- linux-2.6.31.5/sound/aoa/codecs/onyx.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/aoa/codecs/onyx.c 2009-10-20 20:32:12.532197656 -0400
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -47512,9 +49598,9 @@ diff -urNp linux-2.6.31.4/sound/aoa/codecs/onyx.c linux-2.6.31.4/sound/aoa/codec
onyx->spdif_locked = onyx->analog_locked = 0;
mutex_unlock(&onyx->mutex);
-diff -urNp linux-2.6.31.4/sound/core/oss/pcm_oss.c linux-2.6.31.4/sound/core/oss/pcm_oss.c
---- linux-2.6.31.4/sound/core/oss/pcm_oss.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/core/oss/pcm_oss.c 2009-10-11 15:29:50.512486357 -0400
+diff -urNp linux-2.6.31.5/sound/core/oss/pcm_oss.c linux-2.6.31.5/sound/core/oss/pcm_oss.c
+--- linux-2.6.31.5/sound/core/oss/pcm_oss.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/core/oss/pcm_oss.c 2009-10-20 20:32:12.532197656 -0400
@@ -2943,8 +2943,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -47526,9 +49612,9 @@ diff -urNp linux-2.6.31.4/sound/core/oss/pcm_oss.c linux-2.6.31.4/sound/core/oss
#endif /* CONFIG_SND_VERBOSE_PROCFS */
/*
-diff -urNp linux-2.6.31.4/sound/core/seq/seq_lock.h linux-2.6.31.4/sound/core/seq/seq_lock.h
---- linux-2.6.31.4/sound/core/seq/seq_lock.h 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/core/seq/seq_lock.h 2009-10-11 15:29:50.532447704 -0400
+diff -urNp linux-2.6.31.5/sound/core/seq/seq_lock.h linux-2.6.31.5/sound/core/seq/seq_lock.h
+--- linux-2.6.31.5/sound/core/seq/seq_lock.h 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/core/seq/seq_lock.h 2009-10-20 20:32:12.533320224 -0400
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -47544,9 +49630,9 @@ diff -urNp linux-2.6.31.4/sound/core/seq/seq_lock.h linux-2.6.31.4/sound/core/se
#endif /* SMP || CONFIG_SND_DEBUG */
-diff -urNp linux-2.6.31.4/sound/drivers/mts64.c linux-2.6.31.4/sound/drivers/mts64.c
---- linux-2.6.31.4/sound/drivers/mts64.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/drivers/mts64.c 2009-10-11 15:29:50.541689084 -0400
+diff -urNp linux-2.6.31.5/sound/drivers/mts64.c linux-2.6.31.5/sound/drivers/mts64.c
+--- linux-2.6.31.5/sound/drivers/mts64.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/drivers/mts64.c 2009-10-20 20:32:12.972174429 -0400
@@ -65,7 +65,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
@@ -47595,9 +49681,9 @@ diff -urNp linux-2.6.31.4/sound/drivers/mts64.c linux-2.6.31.4/sound/drivers/mts
return 0;
}
-diff -urNp linux-2.6.31.4/sound/drivers/portman2x4.c linux-2.6.31.4/sound/drivers/portman2x4.c
---- linux-2.6.31.4/sound/drivers/portman2x4.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/drivers/portman2x4.c 2009-10-11 15:29:50.544711989 -0400
+diff -urNp linux-2.6.31.5/sound/drivers/portman2x4.c linux-2.6.31.5/sound/drivers/portman2x4.c
+--- linux-2.6.31.5/sound/drivers/portman2x4.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/drivers/portman2x4.c 2009-10-20 20:32:13.677818364 -0400
@@ -83,7 +83,7 @@ struct portman {
struct pardevice *pardev;
int pardev_claimed;
@@ -47607,9 +49693,9 @@ diff -urNp linux-2.6.31.4/sound/drivers/portman2x4.c linux-2.6.31.4/sound/driver
int mode[PORTMAN_NUM_INPUT_PORTS];
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
-diff -urNp linux-2.6.31.4/sound/pci/ac97/ac97_codec.c linux-2.6.31.4/sound/pci/ac97/ac97_codec.c
---- linux-2.6.31.4/sound/pci/ac97/ac97_codec.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/pci/ac97/ac97_codec.c 2009-10-11 15:29:56.788410938 -0400
+diff -urNp linux-2.6.31.5/sound/pci/ac97/ac97_codec.c linux-2.6.31.5/sound/pci/ac97/ac97_codec.c
+--- linux-2.6.31.5/sound/pci/ac97/ac97_codec.c 2009-10-20 20:42:59.241849300 -0400
++++ linux-2.6.31.5/sound/pci/ac97/ac97_codec.c 2009-10-20 20:32:14.471870477 -0400
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -47619,9 +49705,9 @@ diff -urNp linux-2.6.31.4/sound/pci/ac97/ac97_codec.c linux-2.6.31.4/sound/pci/a
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
-diff -urNp linux-2.6.31.4/sound/pci/ac97/ac97_patch.c linux-2.6.31.4/sound/pci/ac97/ac97_patch.c
---- linux-2.6.31.4/sound/pci/ac97/ac97_patch.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/pci/ac97/ac97_patch.c 2009-10-11 15:29:50.580365938 -0400
+diff -urNp linux-2.6.31.5/sound/pci/ac97/ac97_patch.c linux-2.6.31.5/sound/pci/ac97/ac97_patch.c
+--- linux-2.6.31.5/sound/pci/ac97/ac97_patch.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/pci/ac97/ac97_patch.c 2009-10-20 20:32:14.523775341 -0400
@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a
{ AC97_VIDEO, 0x9f1f },
{ AC97_AUX, 0x9f1f },
@@ -47640,9 +49726,9 @@ diff -urNp linux-2.6.31.4/sound/pci/ac97/ac97_patch.c linux-2.6.31.4/sound/pci/a
};
static int patch_lm4550(struct snd_ac97 *ac97)
-diff -urNp linux-2.6.31.4/sound/pci/ens1370.c linux-2.6.31.4/sound/pci/ens1370.c
---- linux-2.6.31.4/sound/pci/ens1370.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/pci/ens1370.c 2009-10-11 15:29:50.594395653 -0400
+diff -urNp linux-2.6.31.5/sound/pci/ens1370.c linux-2.6.31.5/sound/pci/ens1370.c
+--- linux-2.6.31.5/sound/pci/ens1370.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/pci/ens1370.c 2009-10-20 20:32:14.529881696 -0400
@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
{ PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
{ PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */
@@ -47652,9 +49738,9 @@ diff -urNp linux-2.6.31.4/sound/pci/ens1370.c linux-2.6.31.4/sound/pci/ens1370.c
};
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
-diff -urNp linux-2.6.31.4/sound/pci/intel8x0.c linux-2.6.31.4/sound/pci/intel8x0.c
---- linux-2.6.31.4/sound/pci/intel8x0.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/pci/intel8x0.c 2009-10-11 15:29:50.763369936 -0400
+diff -urNp linux-2.6.31.5/sound/pci/intel8x0.c linux-2.6.31.5/sound/pci/intel8x0.c
+--- linux-2.6.31.5/sound/pci/intel8x0.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/pci/intel8x0.c 2009-10-20 20:32:14.530922299 -0400
@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */
@@ -47673,9 +49759,9 @@ diff -urNp linux-2.6.31.4/sound/pci/intel8x0.c linux-2.6.31.4/sound/pci/intel8x0
};
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
-diff -urNp linux-2.6.31.4/sound/pci/intel8x0m.c linux-2.6.31.4/sound/pci/intel8x0m.c
---- linux-2.6.31.4/sound/pci/intel8x0m.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/pci/intel8x0m.c 2009-10-11 15:29:50.783366924 -0400
+diff -urNp linux-2.6.31.5/sound/pci/intel8x0m.c linux-2.6.31.5/sound/pci/intel8x0m.c
+--- linux-2.6.31.5/sound/pci/intel8x0m.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/pci/intel8x0m.c 2009-10-20 20:32:14.531900079 -0400
@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
{ PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
{ PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */
@@ -47694,9 +49780,9 @@ diff -urNp linux-2.6.31.4/sound/pci/intel8x0m.c linux-2.6.31.4/sound/pci/intel8x
};
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff -urNp linux-2.6.31.4/sound/usb/usx2y/us122l.c linux-2.6.31.4/sound/usb/usx2y/us122l.c
---- linux-2.6.31.4/sound/usb/usx2y/us122l.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/usb/usx2y/us122l.c 2009-10-11 15:29:50.795481787 -0400
+diff -urNp linux-2.6.31.5/sound/usb/usx2y/us122l.c linux-2.6.31.5/sound/usb/usx2y/us122l.c
+--- linux-2.6.31.5/sound/usb/usx2y/us122l.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/usb/usx2y/us122l.c 2009-10-20 20:32:14.533864170 -0400
@@ -154,7 +154,7 @@ static void usb_stream_hwdep_vm_close(st
snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count));
}
@@ -47706,9 +49792,9 @@ diff -urNp linux-2.6.31.4/sound/usb/usx2y/us122l.c linux-2.6.31.4/sound/usb/usx2
.open = usb_stream_hwdep_vm_open,
.fault = usb_stream_hwdep_vm_fault,
.close = usb_stream_hwdep_vm_close,
-diff -urNp linux-2.6.31.4/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.31.4/sound/usb/usx2y/usX2Yhwdep.c
---- linux-2.6.31.4/sound/usb/usx2y/usX2Yhwdep.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/usb/usx2y/usX2Yhwdep.c 2009-10-11 15:29:50.796372753 -0400
+diff -urNp linux-2.6.31.5/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.31.5/sound/usb/usx2y/usX2Yhwdep.c
+--- linux-2.6.31.5/sound/usb/usx2y/usX2Yhwdep.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/usb/usx2y/usX2Yhwdep.c 2009-10-20 20:32:14.545987927 -0400
@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct
return 0;
}
@@ -47718,9 +49804,9 @@ diff -urNp linux-2.6.31.4/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.31.4/sound/usb/
.fault = snd_us428ctls_vm_fault,
};
-diff -urNp linux-2.6.31.4/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.31.4/sound/usb/usx2y/usx2yhwdeppcm.c
---- linux-2.6.31.4/sound/usb/usx2y/usx2yhwdeppcm.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/sound/usb/usx2y/usx2yhwdeppcm.c 2009-10-11 15:29:50.796372753 -0400
+diff -urNp linux-2.6.31.5/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.31.5/sound/usb/usx2y/usx2yhwdeppcm.c
+--- linux-2.6.31.5/sound/usb/usx2y/usx2yhwdeppcm.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/sound/usb/usx2y/usx2yhwdeppcm.c 2009-10-20 20:32:14.545987927 -0400
@@ -697,7 +697,7 @@ static int snd_usX2Y_hwdep_pcm_vm_fault(
}
@@ -47730,9 +49816,9 @@ diff -urNp linux-2.6.31.4/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.31.4/sound/u
.open = snd_usX2Y_hwdep_pcm_vm_open,
.close = snd_usX2Y_hwdep_pcm_vm_close,
.fault = snd_usX2Y_hwdep_pcm_vm_fault,
-diff -urNp linux-2.6.31.4/usr/gen_init_cpio.c linux-2.6.31.4/usr/gen_init_cpio.c
---- linux-2.6.31.4/usr/gen_init_cpio.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/usr/gen_init_cpio.c 2009-10-11 15:29:50.802401343 -0400
+diff -urNp linux-2.6.31.5/usr/gen_init_cpio.c linux-2.6.31.5/usr/gen_init_cpio.c
+--- linux-2.6.31.5/usr/gen_init_cpio.c 2009-10-20 20:42:59.245399180 -0400
++++ linux-2.6.31.5/usr/gen_init_cpio.c 2009-10-20 20:32:14.547037822 -0400
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -47755,9 +49841,9 @@ diff -urNp linux-2.6.31.4/usr/gen_init_cpio.c linux-2.6.31.4/usr/gen_init_cpio.c
} else
break;
}
-diff -urNp linux-2.6.31.4/virt/kvm/kvm_main.c linux-2.6.31.4/virt/kvm/kvm_main.c
---- linux-2.6.31.4/virt/kvm/kvm_main.c 2009-10-05 13:12:06.000000000 -0400
-+++ linux-2.6.31.4/virt/kvm/kvm_main.c 2009-10-11 15:29:50.826401354 -0400
+diff -urNp linux-2.6.31.5/virt/kvm/kvm_main.c linux-2.6.31.5/virt/kvm/kvm_main.c
+--- linux-2.6.31.5/virt/kvm/kvm_main.c 2009-10-20 20:42:59.248622750 -0400
++++ linux-2.6.31.5/virt/kvm/kvm_main.c 2009-10-20 20:32:14.547037822 -0400
@@ -2353,6 +2353,9 @@ static struct miscdevice kvm_dev = {
KVM_MINOR,
"kvm",
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index f8ea0320cf..0578066e86 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.4
-# Thu Oct 15 14:17:51 2009
+# Linux kernel version: 2.6.31.5
+# Mon Oct 26 17:37:25 2009
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -4289,9 +4289,9 @@ CONFIG_PAX_HAVE_ACL_FLAGS=y
# Non-executable pages
#
CONFIG_PAX_NOEXEC=y
-# CONFIG_PAX_PAGEEXEC is not set
-CONFIG_PAX_SEGMEXEC=y
-# CONFIG_PAX_EMUTRAMP is not set
+CONFIG_PAX_PAGEEXEC=y
+# CONFIG_PAX_SEGMEXEC is not set
+CONFIG_PAX_EMUTRAMP=y
CONFIG_PAX_MPROTECT=y
CONFIG_PAX_NOELFRELOCS=y
CONFIG_PAX_KERNEXEC=y
diff --git a/main/xtables-addons-grsec/APKBUILD b/main/xtables-addons-grsec/APKBUILD
index f068a9b6b3..278d2b21b3 100644
--- a/main/xtables-addons-grsec/APKBUILD
+++ b/main/xtables-addons-grsec/APKBUILD
@@ -9,14 +9,10 @@ fi
_kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
-# get pkgver from xtables-addons package
-if [ -f ../$_realname/APKBUILD ]; then
- . ../$_realname/APKBUILD
-fi
-
pkgname=${_realname}-${_flavor}
-pkgver=${pkgver:-1.17}
-pkgrel=15
+pkgver=${pkgver}
+_realver=1.19
+pkgrel=0
pkgdesc="Iptables extensions kernel modules"
url="http://xtables-addons.sourceforge.net/"
license="GPL"
@@ -24,17 +20,25 @@ depends="linux-${_flavor}=${_kernelver}"
makedepends="linux-${_flavor}-dev=${_kernelver} iptables-dev pkgconfig"
install=
subpackages=
-source="http://downloads.sourceforge.net/$_realname/$_realname-$pkgver.tar.bz2"
+source="http://downloads.sourceforge.net/$_realname/$_realname-$_realver.tar.bz2"
-build() {
- cd "$srcdir/$_realname-$pkgver"
+# override kernel's prepare()
+prepare() {
+ :
+}
+build() {
+ cd "$srcdir/$_realname-$_realver"
./configure --prefix=/usr \
--with-kbuild=/usr/src/linux-headers-${_abi_release}
cd extensions
make CC="${CC:-gcc}" modules || return 1
+}
+
+package() {
+ cd "$srcdir/$_realname-$_realver"/extensions
make DESTDIR="$pkgdir" modules_install
}
-md5sums="eca2e3f4f4904814e3a301539876fae6 xtables-addons-1.17.tar.bz2"
+md5sums="6b51556a853aef8a3d1ab8925db809fc xtables-addons-1.19.tar.bz2"
diff --git a/testing/kqemu-grsec/APKBUILD b/testing/kqemu-grsec/APKBUILD
index b9527fa87b..b02b8c27e9 100644
--- a/testing/kqemu-grsec/APKBUILD
+++ b/testing/kqemu-grsec/APKBUILD
@@ -10,10 +10,10 @@ _kernelver=$pkgver-r$pkgrel
_abi_release=$pkgver-${_flavor}
pkgname=${_realname}-${_flavor}
-pkgver=1.4.0_pre1
+pkgver=$pkgver
_realver=1.4.0pre1
-pkgrel=10
-pkgdesc="$_flavor kernel modules for kemu"
+pkgrel=0
+pkgdesc="$_flavor kernel modules for kemu $_realver"
url="http://www.nongnu.org/qemu/"
license="GPL"
depends="linux-${_flavor}=${_kernelver}"
@@ -22,10 +22,19 @@ makedepends="linux-${_flavor}-dev=${_kernelver}"
subpackages=
source="http://www.nongnu.org/qemu/kqemu-$_realver.tar.gz"
+# override kernel APKBUILD's prepare
+prepare() {
+ :
+}
+
build() {
cd "$srcdir"/$_realname-$_realver
./configure --kernel-path=/lib/modules/${_abi_release}/build
make || return 1
+}
+
+package() {
+ cd "$srcdir"/$_realname-$_realver
install -D -m644 kqemu.ko \
"$pkgdir"/lib/modules/${_abi_release}/misc/kqemu.ko \
|| return 1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 05:24:59 +0000