summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/acf-freeswitch-vmail/APKBUILD4
-rw-r--r--main/bind/APKBUILD4
-rw-r--r--main/imagemagick/APKBUILD4
-rw-r--r--main/libetpan/APKBUILD5
-rw-r--r--main/linux-grsec/APKBUILD6
-rw-r--r--main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009130811.patch (renamed from main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009032133.patch)9602
-rw-r--r--main/samba/APKBUILD6
-rw-r--r--main/sudo/APKBUILD4
-rw-r--r--main/util-vserver/APKBUILD4
-rw-r--r--main/util-vserver/setup-vs-guest6
-rw-r--r--main/vala/APKBUILD4
-rw-r--r--main/xfce4-vala/APKBUILD5
-rw-r--r--main/xfsprogs/APKBUILD6
-rw-r--r--testing/apache-mod-auth-ntlm-winbind/APKBUILD34
-rw-r--r--testing/apache-mod-auth-ntlm-winbind/mod-auth-ntlm-winbind.conf1
-rw-r--r--testing/tinc/APKBUILD50
-rw-r--r--testing/tinc/tinc.networks13
-rw-r--r--testing/tinc/tincd.initd64
-rw-r--r--testing/tinc/tincd.lo.initd46
19 files changed, 5054 insertions, 4814 deletions
diff --git a/main/acf-freeswitch-vmail/APKBUILD b/main/acf-freeswitch-vmail/APKBUILD
index aa7a10d79..a2b50c0ee 100644
--- a/main/acf-freeswitch-vmail/APKBUILD
+++ b/main/acf-freeswitch-vmail/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Ted Trask <ttrask01@yahoo.com>
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname=acf-freeswitch-vmail
-pkgver=0.0.3
+pkgver=0.0.4
pkgrel=0
pkgdesc="ACF for a web interface for freeswitch voicemail"
url="http://git.alpinelinux.org/cgit/$pkgname"
@@ -17,4 +17,4 @@ build() {
make DESTDIR="$pkgdir" install
}
-md5sums="78c4c4e6f6a333bebc395e8b01bcde60 acf-freeswitch-vmail-0.0.3.tar.bz2"
+md5sums="2873793c3177ad35ecd1c14c62a773ec acf-freeswitch-vmail-0.0.4.tar.bz2"
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index 2a6bd0de9..e54292c98 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bind
-pkgver=9.7.1_p2
+pkgver=9.7.2
_ver=${pkgver%_p*}
_p=${pkgver#*_p}
[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
@@ -93,7 +93,7 @@ tools() {
done
}
-md5sums="bd6be63cc910d04da39103d441871596 bind-9.7.1-P2.tar.gz
+md5sums="166832fc0f94d6e4eb2dac8bed3b275f bind-9.7.2.tar.gz
f270a5b0a28ab6e818840c5c368ddbcc bind.so_bsdcompat.patch
92914193cc603d8d81ef00534ce9c1c9 bind.initd
8b05a287976d66d51c18b73ee7523671 bind.confd
diff --git a/main/imagemagick/APKBUILD b/main/imagemagick/APKBUILD
index 27aeab2a5..39ba1c778 100644
--- a/main/imagemagick/APKBUILD
+++ b/main/imagemagick/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=imagemagick
-pkgver=6.6.4.0
+pkgver=6.6.4.1
_pkgver=${pkgver%.*}-${pkgver##*.}
pkgrel=0
pkgdesc="A collection of tools and libraries for many image formats"
@@ -47,4 +47,4 @@ dev() {
"$pkgdir"/usr/lib/ImageMagick-$_v/modules-Q16/filters/
}
-md5sums="8aeaf91220e2cd658f150bb9a2e4b7b5 ImageMagick-6.6.4-0.tar.gz"
+md5sums="1c02b877181766a98017144e436c8d7b ImageMagick-6.6.4-1.tar.gz"
diff --git a/main/libetpan/APKBUILD b/main/libetpan/APKBUILD
index 8724c7ea9..16419ca9c 100644
--- a/main/libetpan/APKBUILD
+++ b/main/libetpan/APKBUILD
@@ -1,13 +1,13 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libetpan
pkgver=1.0
-pkgrel=2
+pkgrel=3
_dbver=4.8
pkgdesc="a portable middleware for email access"
url="http://www.etpan.org/"
license="custom:etpan"
subpackages="$pkgname-dev $pkgname-doc"
-makedepends="db-dev cyrus-sasl-dev curl-dev expat-dev"
+makedepends="db-dev cyrus-sasl-dev curl-dev expat-dev openssl-dev"
depends=
depends_dev="cyrus-sasl-dev db-dev"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -17,6 +17,7 @@ build ()
cd "$srcdir"/$pkgname-$pkgver
# sed -e "s/db-4.4/db-${_dbver}/g" -i configure || return 1
./configure --prefix=/usr \
+ --with-openssl \
--disable-static
make || return 1
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index cfac0e8a0..6cec7efa1 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor}
pkgver=2.6.32.21
_kernver=2.6.32
-pkgrel=3
+pkgrel=4
pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net
depends="mkinitfs linux-firmware"
@@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
- grsecurity-2.2.0-2.6.32.21-201009032133.patch
+ grsecurity-2.2.0-2.6.32.21-201009130811.patch
0001-grsec-revert-conflicting-flow-cache-changes.patch
0002-gre-fix-hard-header-destination-address-checking.patch
0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
@@ -151,7 +151,7 @@ firmware() {
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
29aa10a231882a6e52908642b572326f patch-2.6.32.21.bz2
-788609bb641e557f9875f251144bb904 grsecurity-2.2.0-2.6.32.21-201009032133.patch
+4fc4d5e5b33bc1bbd10290ebcd54d930 grsecurity-2.2.0-2.6.32.21-201009130811.patch
1d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
diff --git a/main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009032133.patch b/main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009130811.patch
index a84a4eab7..3054b2625 100644
--- a/main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009032133.patch
+++ b/main/linux-grsec/grsecurity-2.2.0-2.6.32.21-201009130811.patch
@@ -1,6 +1,165 @@
+diff -urNp linux-2.6.32.21/Documentation/dontdiff linux-2.6.32.21/Documentation/dontdiff
+--- linux-2.6.32.21/Documentation/dontdiff 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/Documentation/dontdiff 2010-09-13 08:10:07.000000000 -0400
+@@ -3,6 +3,7 @@
+ *.bin
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+@@ -38,8 +39,10 @@
+ *.tab.h
+ *.tex
+ *.ver
++*.vim
+ *.xml
+ *_MODULES
++*_reg_safe.h
+ *_vga16.c
+ *~
+ *.9
+@@ -49,11 +52,16 @@
+ 53c700_d.h
+ CVS
+ ChangeSet
++GPATH
++GRTAGS
++GSYMS
++GTAGS
+ Image
+ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -76,7 +84,10 @@ btfixupprep
+ build
+ bvmlinux
+ bzImage*
++capflags.c
+ classlist.h*
++clut_vga16.c
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -103,13 +114,14 @@ gen_crc32table
+ gen_init_cpio
+ genksyms
+ *_gray256.c
++hash
+ ihex2fw
+ ikconfig.h*
+ initramfs_data.cpio
++initramfs_data.cpio.bz2
+ initramfs_data.cpio.gz
+ initramfs_list
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -133,7 +145,9 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
++mkregtable
+ mktables
+ mktree
+ modpost
+@@ -149,6 +163,7 @@ patches*
+ pca200e.bin
+ pca200e_ecd.bin2
+ piggy.gz
++piggy.S
+ piggyback
+ pnmtologo
+ ppc_defs.h*
+@@ -157,12 +172,14 @@ qconf
+ raid6altivec*.c
+ raid6int*.c
+ raid6tables.c
++regdb.c
+ relocs
+ series
+ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -186,14 +203,20 @@ version.h*
+ vmlinux
+ vmlinux-*
+ vmlinux.aout
++vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
++voffset.h
+ vsyscall.lds
+ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+ zImage*
+ zconf.hash.c
++zoffset.h
+diff -urNp linux-2.6.32.21/Documentation/kernel-parameters.txt linux-2.6.32.21/Documentation/kernel-parameters.txt
+--- linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-09-13 08:10:07.000000000 -0400
+@@ -1836,6 +1836,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.
+
++ pax_nouderef [X86-32] disables UDEREF. Most likely needed under certain
++ virtualization environments that don't cope well with the
++ expand down segment used by UDEREF on X86-32.
++
++ pax_softmode= [X86-32] 0/1 to disable/enable PaX softmode on boot already.
++
+ pcbit= [HW,ISDN]
+
+ pcd. [PARIDE]
+diff -urNp linux-2.6.32.21/Makefile linux-2.6.32.21/Makefile
+--- linux-2.6.32.21/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/Makefile 2010-09-13 08:10:11.000000000 -0400
+@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+
+ HOSTCC = gcc
+ HOSTCXX = g++
+-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
+
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -644,7 +644,7 @@ export mod_strip_cmd
+
+
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+
+ vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
diff -urNp linux-2.6.32.21/arch/alpha/include/asm/elf.h linux-2.6.32.21/arch/alpha/include/asm/elf.h
---- linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/alpha/include/asm/elf.h 2010-09-13 08:10:04.000000000 -0400
@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
@@ -16,8 +175,8 @@ diff -urNp linux-2.6.32.21/arch/alpha/include/asm/elf.h linux-2.6.32.21/arch/alp
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.32.21/arch/alpha/include/asm/pgtable.h linux-2.6.32.21/arch/alpha/include/asm/pgtable.h
---- linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/alpha/include/asm/pgtable.h 2010-09-13 08:10:04.000000000 -0400
@@ -101,6 +101,17 @@ struct vm_area_struct;
#define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
#define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -37,8 +196,8 @@ diff -urNp linux-2.6.32.21/arch/alpha/include/asm/pgtable.h linux-2.6.32.21/arch
#define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
diff -urNp linux-2.6.32.21/arch/alpha/kernel/module.c linux-2.6.32.21/arch/alpha/kernel/module.c
---- linux-2.6.32.21/arch/alpha/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/alpha/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/alpha/kernel/module.c 2010-09-13 08:10:04.000000000 -0400
@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
/* The small sections were sorted to the end of the segment.
@@ -49,8 +208,8 @@ diff -urNp linux-2.6.32.21/arch/alpha/kernel/module.c linux-2.6.32.21/arch/alpha
for (i = 0; i < n; i++) {
diff -urNp linux-2.6.32.21/arch/alpha/kernel/osf_sys.c linux-2.6.32.21/arch/alpha/kernel/osf_sys.c
---- linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/alpha/kernel/osf_sys.c 2010-09-13 08:10:04.000000000 -0400
@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
merely specific addresses, but regions of memory -- perhaps
this feature should be incorporated into all ports? */
@@ -74,8 +233,8 @@ diff -urNp linux-2.6.32.21/arch/alpha/kernel/osf_sys.c linux-2.6.32.21/arch/alph
return addr;
diff -urNp linux-2.6.32.21/arch/alpha/mm/fault.c linux-2.6.32.21/arch/alpha/mm/fault.c
---- linux-2.6.32.21/arch/alpha/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/alpha/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/alpha/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/alpha/mm/fault.c 2010-09-13 08:10:04.000000000 -0400
@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
__reload_thread(pcb);
}
@@ -233,8 +392,8 @@ diff -urNp linux-2.6.32.21/arch/alpha/mm/fault.c linux-2.6.32.21/arch/alpha/mm/f
/* Allow reads even for write-only mappings */
if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
diff -urNp linux-2.6.32.21/arch/arm/include/asm/elf.h linux-2.6.32.21/arch/arm/include/asm/elf.h
---- linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/include/asm/elf.h 2010-09-13 08:10:04.000000000 -0400
@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
@@ -252,8 +411,8 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/elf.h linux-2.6.32.21/arch/arm/i
/* 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.32.21/arch/arm/include/asm/kmap_types.h linux-2.6.32.21/arch/arm/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/include/asm/kmap_types.h 2010-09-13 08:10:04.000000000 -0400
@@ -19,6 +19,7 @@ enum km_type {
KM_SOFTIRQ0,
KM_SOFTIRQ1,
@@ -263,8 +422,8 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/kmap_types.h linux-2.6.32.21/arc
};
diff -urNp linux-2.6.32.21/arch/arm/include/asm/uaccess.h linux-2.6.32.21/arch/arm/include/asm/uaccess.h
---- linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/include/asm/uaccess.h 2010-09-13 08:10:04.000000000 -0400
@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -286,8 +445,8 @@ diff -urNp linux-2.6.32.21/arch/arm/include/asm/uaccess.h linux-2.6.32.21/arch/a
n = __copy_to_user(to, from, n);
return n;
diff -urNp linux-2.6.32.21/arch/arm/kernel/kgdb.c linux-2.6.32.21/arch/arm/kernel/kgdb.c
---- linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/kernel/kgdb.c 2010-09-13 08:10:04.000000000 -0400
@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
* and we handle the normal undef case within the do_undefinstr
* handler.
@@ -298,8 +457,8 @@ diff -urNp linux-2.6.32.21/arch/arm/kernel/kgdb.c linux-2.6.32.21/arch/arm/kerne
.gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
#else /* ! __ARMEB__ */
diff -urNp linux-2.6.32.21/arch/arm/mach-at91/pm.c linux-2.6.32.21/arch/arm/mach-at91/pm.c
---- linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-at91/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -348,7 +348,7 @@ static void at91_pm_end(void)
}
@@ -310,8 +469,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-at91/pm.c linux-2.6.32.21/arch/arm/mach
.begin = at91_pm_begin,
.enter = at91_pm_enter,
diff -urNp linux-2.6.32.21/arch/arm/mach-omap1/pm.c linux-2.6.32.21/arch/arm/mach-omap1/pm.c
---- linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-omap1/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
@@ -322,8 +481,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap1/pm.c linux-2.6.32.21/arch/arm/mac
.enter = omap_pm_enter,
.finish = omap_pm_finish,
diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c
---- linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c 2010-09-13 08:10:04.000000000 -0400
@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
enable_hlt();
}
@@ -334,8 +493,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.21/arch/arm
.enter = omap2_pm_enter,
.finish = omap2_pm_finish,
diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c
---- linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c 2010-09-13 08:10:04.000000000 -0400
@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
return;
}
@@ -346,8 +505,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.21/arch/arm
.end = omap3_pm_end,
.prepare = omap3_pm_prepare,
diff -urNp linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c
---- linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
(state == PM_SUSPEND_MEM);
}
@@ -358,8 +517,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pnx4008/pm.c linux-2.6.32.21/arch/arm/m
.valid = pnx4008_pm_valid,
};
diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/pm.c linux-2.6.32.21/arch/arm/mach-pxa/pm.c
---- linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-pxa/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
pxa_cpu_pm_fns->finish();
}
@@ -370,8 +529,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/pm.c linux-2.6.32.21/arch/arm/mach-
.enter = pxa_pm_enter,
.prepare = pxa_pm_prepare,
diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c
---- linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
}
@@ -382,8 +541,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.21/arch/a
.finish = pxa_pm_finish,
.enter = corgi_pxa_pm_enter,
diff -urNp linux-2.6.32.21/arch/arm/mach-sa1100/pm.c linux-2.6.32.21/arch/arm/mach-sa1100/pm.c
---- linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mach-sa1100/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
return virt_to_phys(sp);
}
@@ -394,8 +553,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mach-sa1100/pm.c linux-2.6.32.21/arch/arm/ma
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.21/arch/arm/mm/fault.c linux-2.6.32.21/arch/arm/mm/fault.c
---- linux-2.6.32.21/arch/arm/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mm/fault.c 2010-09-13 08:10:04.000000000 -0400
@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
}
#endif
@@ -445,8 +604,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/fault.c linux-2.6.32.21/arch/arm/mm/fault
* First Level Translation Fault Handler
*
diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
---- linux-2.6.32.21/arch/arm/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/mm/mmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/mm/mmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/mm/mmap.c 2010-09-13 08:10:04.000000000 -0400
@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
if (len > TASK_SIZE)
return -ENOMEM;
@@ -484,8 +643,8 @@ diff -urNp linux-2.6.32.21/arch/arm/mm/mmap.c linux-2.6.32.21/arch/arm/mm/mmap.c
goto full_search;
}
diff -urNp linux-2.6.32.21/arch/arm/plat-s3c/pm.c linux-2.6.32.21/arch/arm/plat-s3c/pm.c
---- linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/arm/plat-s3c/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
s3c_pm_check_cleanup();
}
@@ -496,8 +655,8 @@ diff -urNp linux-2.6.32.21/arch/arm/plat-s3c/pm.c linux-2.6.32.21/arch/arm/plat-
.prepare = s3c_pm_prepare,
.finish = s3c_pm_finish,
diff -urNp linux-2.6.32.21/arch/avr32/include/asm/elf.h linux-2.6.32.21/arch/avr32/include/asm/elf.h
---- linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/avr32/include/asm/elf.h 2010-09-13 08:10:04.000000000 -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. */
@@ -515,8 +674,8 @@ diff -urNp linux-2.6.32.21/arch/avr32/include/asm/elf.h linux-2.6.32.21/arch/avr
/* 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.32.21/arch/avr32/include/asm/kmap_types.h linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h 2010-09-13 08:10:04.000000000 -0400
@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
D(11) KM_IRQ1,
D(12) KM_SOFTIRQ0,
@@ -528,8 +687,8 @@ diff -urNp linux-2.6.32.21/arch/avr32/include/asm/kmap_types.h linux-2.6.32.21/a
#undef D
diff -urNp linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c
---- linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -176,7 +176,7 @@ out:
return 0;
}
@@ -540,8 +699,8 @@ diff -urNp linux-2.6.32.21/arch/avr32/mach-at32ap/pm.c linux-2.6.32.21/arch/avr3
.enter = avr32_pm_enter,
};
diff -urNp linux-2.6.32.21/arch/avr32/mm/fault.c linux-2.6.32.21/arch/avr32/mm/fault.c
---- linux-2.6.32.21/arch/avr32/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/avr32/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/avr32/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/avr32/mm/fault.c 2010-09-13 08:10:04.000000000 -0400
@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
int exception_trace = 1;
@@ -584,8 +743,8 @@ diff -urNp linux-2.6.32.21/arch/avr32/mm/fault.c linux-2.6.32.21/arch/avr32/mm/f
printk("%s%s[%d]: segfault at %08lx pc %08lx "
"sp %08lx ecr %lu\n",
diff -urNp linux-2.6.32.21/arch/blackfin/kernel/kgdb.c linux-2.6.32.21/arch/blackfin/kernel/kgdb.c
---- linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/blackfin/kernel/kgdb.c 2010-09-13 08:10:04.000000000 -0400
@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
return -1; /* this means that we do not want to exit from the handler */
}
@@ -596,8 +755,8 @@ diff -urNp linux-2.6.32.21/arch/blackfin/kernel/kgdb.c linux-2.6.32.21/arch/blac
#ifdef CONFIG_SMP
.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
diff -urNp linux-2.6.32.21/arch/blackfin/mach-common/pm.c linux-2.6.32.21/arch/blackfin/mach-common/pm.c
---- linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/blackfin/mach-common/pm.c 2010-09-13 08:10:04.000000000 -0400
@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
return 0;
}
@@ -608,8 +767,8 @@ diff -urNp linux-2.6.32.21/arch/blackfin/mach-common/pm.c linux-2.6.32.21/arch/b
.valid = bfin_pm_valid,
};
diff -urNp linux-2.6.32.21/arch/frv/include/asm/kmap_types.h linux-2.6.32.21/arch/frv/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/frv/include/asm/kmap_types.h 2010-09-13 08:10:04.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -619,8 +778,8 @@ diff -urNp linux-2.6.32.21/arch/frv/include/asm/kmap_types.h linux-2.6.32.21/arc
};
diff -urNp linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c
---- linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c 2010-09-13 08:10:04.000000000 -0400
@@ -17,7 +17,7 @@
#include <linux/swiotlb.h>
#include <asm/machvec.h>
@@ -640,8 +799,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32.21/arch
if (use_swiotlb(dev))
return &swiotlb_dma_ops;
diff -urNp linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c
---- linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c 2010-09-13 08:10:04.000000000 -0400
@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d
},
};
@@ -661,8 +820,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.21/arch/
.free_coherent = sba_free_coherent,
.map_page = sba_map_page,
diff -urNp linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c 2010-09-13 08:10:04.000000000 -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))
@@ -678,8 +837,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.21/arch/ia
#include "../../../fs/binfmt_elf.c"
diff -urNp linux-2.6.32.21/arch/ia64/ia32/ia32priv.h linux-2.6.32.21/arch/ia64/ia32/ia32priv.h
---- linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/ia32/ia32priv.h 2010-09-13 08:10:04.000000000 -0400
@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
#define ELF_DATA ELFDATA2LSB
#define ELF_ARCH EM_386
@@ -697,8 +856,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/ia32/ia32priv.h linux-2.6.32.21/arch/ia64/i
#define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
diff -urNp linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h 2010-09-13 08:10:04.000000000 -0400
@@ -12,7 +12,7 @@
#define ARCH_HAS_DMA_GET_REQUIRED_MASK
@@ -743,8 +902,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/dma-mapping.h linux-2.6.32.21/a
}
diff -urNp linux-2.6.32.21/arch/ia64/include/asm/elf.h linux-2.6.32.21/arch/ia64/include/asm/elf.h
---- linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/include/asm/elf.h 2010-09-13 08:10:04.000000000 -0400
@@ -43,6 +43,13 @@
*/
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -760,8 +919,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/elf.h linux-2.6.32.21/arch/ia64
/* IA-64 relocations: */
diff -urNp linux-2.6.32.21/arch/ia64/include/asm/machvec.h linux-2.6.32.21/arch/ia64/include/asm/machvec.h
---- linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/include/asm/machvec.h 2010-09-13 08:10:04.000000000 -0400
@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
/* DMA-mapping interface: */
typedef void ia64_mv_dma_init (void);
@@ -781,8 +940,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/machvec.h linux-2.6.32.21/arch/
/*
* Define default versions so we can extend machvec for new platforms without having
diff -urNp linux-2.6.32.21/arch/ia64/include/asm/pgtable.h linux-2.6.32.21/arch/ia64/include/asm/pgtable.h
---- linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/include/asm/pgtable.h 2010-09-13 08:10:05.000000000 -0400
@@ -12,7 +12,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
@@ -811,8 +970,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/pgtable.h linux-2.6.32.21/arch/
#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.32.21/arch/ia64/include/asm/uaccess.h linux-2.6.32.21/arch/ia64/include/asm/uaccess.h
---- linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/include/asm/uaccess.h 2010-09-13 08:10:05.000000000 -0400
@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
const void *__cu_from = (from); \
long __cu_len = (n); \
@@ -832,8 +991,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/include/asm/uaccess.h linux-2.6.32.21/arch/
__cu_len; \
})
diff -urNp linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c
---- linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c 2010-09-13 08:10:05.000000000 -0400
@@ -3,7 +3,7 @@
/* Set this to 1 if there is a HW IOMMU in the system */
int iommu_detected __read_mostly;
@@ -853,8 +1012,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/dma-mapping.c linux-2.6.32.21/arch/i
return dma_ops;
}
diff -urNp linux-2.6.32.21/arch/ia64/kernel/module.c linux-2.6.32.21/arch/ia64/kernel/module.c
---- linux-2.6.32.21/arch/ia64/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/module.c 2010-09-13 08:10:05.000000000 -0400
@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
void
module_free (struct module *mod, void *module_region)
@@ -944,8 +1103,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/module.c linux-2.6.32.21/arch/ia64/k
DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
}
diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-dma.c linux-2.6.32.21/arch/ia64/kernel/pci-dma.c
---- linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/pci-dma.c 2010-09-13 08:10:05.000000000 -0400
@@ -43,7 +43,7 @@ struct device fallback_dev = {
.dma_mask = &fallback_dev.coherent_dma_mask,
};
@@ -998,8 +1157,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-dma.c linux-2.6.32.21/arch/ia64/
/*
* The order of these functions is important for
diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c
---- linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c 2010-09-13 08:10:05.000000000 -0400
@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
}
@@ -1010,8 +1169,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.21/arch/i
.free_coherent = swiotlb_free_coherent,
.map_page = swiotlb_map_page,
diff -urNp linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c
---- linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c 2010-09-13 08:10:05.000000000 -0400
@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
if (REGION_NUMBER(addr) == RGN_HPAGE)
addr = 0;
@@ -1039,8 +1198,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/sys_ia64.c linux-2.6.32.21/arch/ia64
}
return -ENOMEM;
diff -urNp linux-2.6.32.21/arch/ia64/kernel/topology.c linux-2.6.32.21/arch/ia64/kernel/topology.c
---- linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/topology.c 2010-09-13 08:10:05.000000000 -0400
@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
return ret;
}
@@ -1051,8 +1210,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/topology.c linux-2.6.32.21/arch/ia64
};
diff -urNp linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S
---- linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S 2010-09-13 08:10:05.000000000 -0400
@@ -190,7 +190,7 @@ SECTIONS
/* Per-cpu data: */
. = ALIGN(PERCPU_PAGE_SIZE);
@@ -1063,8 +1222,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.21/arch/i
* into percpu page size
*/
diff -urNp linux-2.6.32.21/arch/ia64/mm/fault.c linux-2.6.32.21/arch/ia64/mm/fault.c
---- linux-2.6.32.21/arch/ia64/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/mm/fault.c 2010-09-13 08:10:05.000000000 -0400
@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
return pte_present(pte);
}
@@ -1115,8 +1274,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/mm/fault.c linux-2.6.32.21/arch/ia64/mm/fau
/*
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.21/arch/ia64/mm/init.c linux-2.6.32.21/arch/ia64/mm/init.c
---- linux-2.6.32.21/arch/ia64/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/mm/init.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/mm/init.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/mm/init.c 2010-09-13 08:10:05.000000000 -0400
@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1138,8 +1297,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/mm/init.c linux-2.6.32.21/arch/ia64/mm/init
down_write(&current->mm->mmap_sem);
if (insert_vm_struct(current->mm, vma)) {
diff -urNp linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c
---- linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c 2010-09-13 08:10:05.000000000 -0400
@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
return ret;
}
@@ -1150,8 +1309,8 @@ diff -urNp linux-2.6.32.21/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.21/arch/ia64/
.free_coherent = sn_dma_free_coherent,
.map_page = sn_dma_map_page,
diff -urNp linux-2.6.32.21/arch/m32r/lib/usercopy.c linux-2.6.32.21/arch/m32r/lib/usercopy.c
---- linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/m32r/lib/usercopy.c 2010-09-13 08:10:05.000000000 -0400
@@ -14,6 +14,9 @@
unsigned long
__generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1173,8 +1332,8 @@ diff -urNp linux-2.6.32.21/arch/m32r/lib/usercopy.c linux-2.6.32.21/arch/m32r/li
if (access_ok(VERIFY_READ, from, n))
__copy_user_zeroing(to,from,n);
diff -urNp linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c
---- linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c 2010-09-13 08:10:05.000000000 -0400
@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
}
@@ -1185,8 +1344,8 @@ diff -urNp linux-2.6.32.21/arch/mips/alchemy/devboards/pm.c linux-2.6.32.21/arch
.begin = db1x_pm_begin,
.enter = db1x_pm_enter,
diff -urNp linux-2.6.32.21/arch/mips/include/asm/elf.h linux-2.6.32.21/arch/mips/include/asm/elf.h
---- linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/include/asm/elf.h 2010-09-13 08:10:05.000000000 -0400
@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
#endif
@@ -1200,8 +1359,8 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/elf.h linux-2.6.32.21/arch/mips
+
#endif /* _ASM_ELF_H */
diff -urNp linux-2.6.32.21/arch/mips/include/asm/page.h linux-2.6.32.21/arch/mips/include/asm/page.h
---- linux-2.6.32.21/arch/mips/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/page.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/include/asm/page.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/include/asm/page.h 2010-09-13 08:10:05.000000000 -0400
@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
#ifdef CONFIG_CPU_MIPS32
typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1212,8 +1371,8 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/page.h linux-2.6.32.21/arch/mip
typedef struct { unsigned long long pte; } pte_t;
#define pte_val(x) ((x).pte)
diff -urNp linux-2.6.32.21/arch/mips/include/asm/system.h linux-2.6.32.21/arch/mips/include/asm/system.h
---- linux-2.6.32.21/arch/mips/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/include/asm/system.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/include/asm/system.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/include/asm/system.h 2010-09-13 08:10:05.000000000 -0400
@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
*/
#define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1223,8 +1382,8 @@ diff -urNp linux-2.6.32.21/arch/mips/include/asm/system.h linux-2.6.32.21/arch/m
#endif /* _ASM_SYSTEM_H */
diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c
---- linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c 2010-09-13 08:10:05.000000000 -0400
@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1240,8 +1399,8 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.21/arch
#include <linux/module.h>
#include <linux/elfcore.h>
diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c
---- linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c 2010-09-13 08:10:05.000000000 -0400
@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
#undef ELF_ET_DYN_BASE
#define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
@@ -1257,8 +1416,8 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.21/arch
/*
diff -urNp linux-2.6.32.21/arch/mips/kernel/kgdb.c linux-2.6.32.21/arch/mips/kernel/kgdb.c
---- linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/kernel/kgdb.c 2010-09-13 08:10:05.000000000 -0400
@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
return -1;
}
@@ -1268,8 +1427,8 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/kgdb.c linux-2.6.32.21/arch/mips/ker
/*
diff -urNp linux-2.6.32.21/arch/mips/kernel/process.c linux-2.6.32.21/arch/mips/kernel/process.c
---- linux-2.6.32.21/arch/mips/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/process.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/kernel/process.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/kernel/process.c 2010-09-13 08:10:05.000000000 -0400
@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
out:
return pc;
@@ -1287,8 +1446,8 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/process.c linux-2.6.32.21/arch/mips/
- return sp & ALMASK;
-}
diff -urNp linux-2.6.32.21/arch/mips/kernel/syscall.c linux-2.6.32.21/arch/mips/kernel/syscall.c
---- linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/kernel/syscall.c 2010-09-13 08:10:05.000000000 -0400
@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
do_color_align = 0;
if (filp || (flags & MAP_SHARED))
@@ -1311,8 +1470,8 @@ diff -urNp linux-2.6.32.21/arch/mips/kernel/syscall.c linux-2.6.32.21/arch/mips/
addr = COLOUR_ALIGN(addr, pgoff);
else
diff -urNp linux-2.6.32.21/arch/mips/mm/fault.c linux-2.6.32.21/arch/mips/mm/fault.c
---- linux-2.6.32.21/arch/mips/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/mips/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/mips/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/mips/mm/fault.c 2010-09-13 08:10:05.000000000 -0400
@@ -26,6 +26,23 @@
#include <asm/ptrace.h>
#include <asm/highmem.h> /* For VMALLOC_END */
@@ -1338,8 +1497,8 @@ diff -urNp linux-2.6.32.21/arch/mips/mm/fault.c linux-2.6.32.21/arch/mips/mm/fau
* 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.32.21/arch/parisc/include/asm/elf.h linux-2.6.32.21/arch/parisc/include/asm/elf.h
---- linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/include/asm/elf.h 2010-09-13 08:10:05.000000000 -0400
@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1355,8 +1514,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/include/asm/elf.h linux-2.6.32.21/arch/pa
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.32.21/arch/parisc/include/asm/pgtable.h linux-2.6.32.21/arch/parisc/include/asm/pgtable.h
---- linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/include/asm/pgtable.h 2010-09-13 08:10:05.000000000 -0400
@@ -207,6 +207,17 @@
#define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
#define PAGE_COPY PAGE_EXECREAD
@@ -1376,8 +1535,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/include/asm/pgtable.h linux-2.6.32.21/arc
#define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
#define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
diff -urNp linux-2.6.32.21/arch/parisc/kernel/module.c linux-2.6.32.21/arch/parisc/kernel/module.c
---- linux-2.6.32.21/arch/parisc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/kernel/module.c 2010-09-13 08:10:05.000000000 -0400
@@ -95,16 +95,38 @@
/* three functions to determine where in the module core
@@ -1479,8 +1638,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/module.c linux-2.6.32.21/arch/pari
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.32.21/arch/parisc/kernel/sys_parisc.c linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c
---- linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c 2010-09-13 08:10:05.000000000 -0400
@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
if (flags & MAP_FIXED)
return addr;
@@ -1491,8 +1650,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/sys_parisc.c linux-2.6.32.21/arch/
if (filp) {
addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
diff -urNp linux-2.6.32.21/arch/parisc/kernel/traps.c linux-2.6.32.21/arch/parisc/kernel/traps.c
---- linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/kernel/traps.c 2010-09-13 08:10:05.000000000 -0400
@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
down_read(&current->mm->mmap_sem);
@@ -1505,8 +1664,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/kernel/traps.c linux-2.6.32.21/arch/paris
fault_space = regs->iasq[0];
diff -urNp linux-2.6.32.21/arch/parisc/mm/fault.c linux-2.6.32.21/arch/parisc/mm/fault.c
---- linux-2.6.32.21/arch/parisc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/parisc/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/parisc/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/parisc/mm/fault.c 2010-09-13 08:10:05.000000000 -0400
@@ -15,6 +15,7 @@
#include <linux/sched.h>
#include <linux/interrupt.h>
@@ -1677,8 +1836,8 @@ diff -urNp linux-2.6.32.21/arch/parisc/mm/fault.c linux-2.6.32.21/arch/parisc/mm
/*
* If for any reason at all we couldn't handle the fault, make
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/device.h linux-2.6.32.21/arch/powerpc/include/asm/device.h
---- linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/device.h 2010-09-13 08:10:05.000000000 -0400
@@ -14,7 +14,7 @@ struct dev_archdata {
struct device_node *of_node;
@@ -1689,8 +1848,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/device.h linux-2.6.32.21/arc
/*
* When an iommu is in use, dma_data is used as a ptr to the base of the
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h 2010-09-13 08:10:05.000000000 -0400
@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
#ifdef CONFIG_PPC64
extern struct dma_map_ops dma_iommu_ops;
@@ -1758,8 +1917,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32.2
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dev, dma_addr);
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/elf.h linux-2.6.32.21/arch/powerpc/include/asm/elf.h
---- linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/elf.h 2010-09-13 08:10:05.000000000 -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. */
@@ -1793,8 +1952,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/elf.h linux-2.6.32.21/arch/p
/*
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/iommu.h linux-2.6.32.21/arch/powerpc/include/asm/iommu.h
---- linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/iommu.h 2010-09-13 08:10:05.000000000 -0400
@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
extern void iommu_init_early_dart(void);
extern void iommu_init_early_pasemi(void);
@@ -1806,8 +1965,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/iommu.h linux-2.6.32.21/arch
extern void pci_iommu_init(void);
extern void pci_direct_iommu_init(void);
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h 2010-09-13 08:10:05.000000000 -0400
@@ -26,6 +26,7 @@ enum km_type {
KM_SOFTIRQ1,
KM_PPC_SYNC_PAGE,
@@ -1816,33 +1975,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.21
KM_TYPE_NR
};
-diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page_64.h linux-2.6.32.21/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-08-13 18:34:40.000000000 -0400
-@@ -180,15 +180,18 @@ do { \
- * stack by default, so in the absense of a PT_GNU_STACK program header
- * we turn execute permission off.
- */
--#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
-- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+#define VM_STACK_DEFAULT_FLAGS32 \
-+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
- #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
-+#ifndef CONFIG_PAX_PAGEEXEC
- #define VM_STACK_DEFAULT_FLAGS \
- (test_thread_flag(TIF_32BIT) ? \
- VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
-+#endif
-
- #include <asm-generic/getorder.h>
-
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page.h linux-2.6.32.21/arch/powerpc/include/asm/page.h
---- linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/page.h 2010-09-13 08:10:05.000000000 -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.
@@ -1865,9 +2000,33 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page.h linux-2.6.32.21/arch/
#ifndef __ASSEMBLY__
#undef STRICT_MM_TYPECHECKS
+diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/page_64.h linux-2.6.32.21/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/page_64.h 2010-09-13 08:10:05.000000000 -0400
+@@ -180,15 +180,18 @@ do { \
+ * stack by default, so in the absense of a PT_GNU_STACK program header
+ * we turn execute permission off.
+ */
+-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
+- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++#define VM_STACK_DEFAULT_FLAGS32 \
++ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
++ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+ #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
++#ifndef CONFIG_PAX_PAGEEXEC
+ #define VM_STACK_DEFAULT_FLAGS \
+ (test_thread_flag(TIF_32BIT) ? \
+ VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
++#endif
+
+ #include <asm-generic/getorder.h>
+
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pci.h linux-2.6.32.21/arch/powerpc/include/asm/pci.h
---- linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/pci.h 2010-09-13 08:10:05.000000000 -0400
@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
}
@@ -1880,8 +2039,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pci.h linux-2.6.32.21/arch/p
#define set_pci_dma_ops(d)
#define get_pci_dma_ops() NULL
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h
---- linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h 2010-09-13 08:10:05.000000000 -0400
@@ -21,6 +21,7 @@
#define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
#define _PAGE_USER 0x004 /* usermode access allowed */
@@ -1891,8 +2050,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32.21
#define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
#define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/reg.h linux-2.6.32.21/arch/powerpc/include/asm/reg.h
---- linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/reg.h 2010-09-13 08:10:05.000000000 -0400
@@ -191,6 +191,7 @@
#define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
#define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
@@ -1902,8 +2061,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/reg.h linux-2.6.32.21/arch/p
#define DSISR_ISSTORE 0x02000000 /* access was a store */
#define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h
---- linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h 2010-09-13 08:10:05.000000000 -0400
@@ -13,7 +13,7 @@
#include <linux/swiotlb.h>
@@ -1914,8 +2073,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.21/ar
static inline void dma_mark_clean(void *addr, size_t size) {}
diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h
---- linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h 2010-09-13 08:10:05.000000000 -0400
@@ -13,6 +13,8 @@
#define VERIFY_READ 0
#define VERIFY_WRITE 1
@@ -2094,8 +2253,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/include/asm/uaccess.h linux-2.6.32.21/ar
static inline unsigned long clear_user(void __user *addr, unsigned long size)
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c
---- linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c 2010-09-13 08:10:05.000000000 -0400
@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
&cache_assoc_attr,
};
@@ -2105,21 +2264,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.21/arch/
.show = cache_index_show,
};
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma.c linux-2.6.32.21/arch/powerpc/kernel/dma.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-08-13 18:34:40.000000000 -0400
-@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
- }
- #endif
-
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- .alloc_coherent = dma_direct_alloc_coherent,
- .free_coherent = dma_direct_free_coherent,
- .map_sg = dma_direct_map_sg,
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c 2010-09-13 08:10:05.000000000 -0400
@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
}
@@ -2130,8 +2277,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.21/arch/
struct iommu_table *tbl = get_iommu_table_base(dev);
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c
---- linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c 2010-09-13 08:10:05.000000000 -0400
@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
* map_page, and unmap_page on highmem, use normal dma_ops
* for everything else.
@@ -2141,9 +2288,21 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.21/arc
.alloc_coherent = dma_direct_alloc_coherent,
.free_coherent = dma_direct_free_coherent,
.map_sg = swiotlb_map_sg_attrs,
+diff -urNp linux-2.6.32.21/arch/powerpc/kernel/dma.c linux-2.6.32.21/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/dma.c 2010-09-13 08:10:05.000000000 -0400
+@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
+ }
+ #endif
+
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+ .alloc_coherent = dma_direct_alloc_coherent,
+ .free_coherent = dma_direct_free_coherent,
+ .map_sg = dma_direct_map_sg,
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S
---- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S 2010-09-13 08:10:05.000000000 -0400
@@ -455,6 +455,7 @@ storage_fault_common:
std r14,_DAR(r1)
std r15,_DSISR(r1)
@@ -2163,8 +2322,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.21/
ld r4,_DAR(r1)
bl .bad_page_fault
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S
---- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S 2010-09-13 08:10:05.000000000 -0400
@@ -818,10 +818,10 @@ handle_page_fault:
11: ld r4,_DAR(r1)
ld r5,_DSISR(r1)
@@ -2178,8 +2337,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.21/
addi r3,r1,STACK_FRAME_OVERHEAD
lwz r4,_DAR(r1)
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c 2010-09-13 08:10:05.000000000 -0400
@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
return 1;
}
@@ -2190,8 +2349,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/ibmebus.c linux-2.6.32.21/arch/po
.free_coherent = ibmebus_free_coherent,
.map_sg = ibmebus_map_sg,
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/kgdb.c linux-2.6.32.21/arch/powerpc/kernel/kgdb.c
---- linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/kgdb.c 2010-09-13 08:10:05.000000000 -0400
@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
return 0;
@@ -2210,41 +2369,9 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/kgdb.c linux-2.6.32.21/arch/power
.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
};
-diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module_32.c linux-2.6.32.21/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-08-13 18:34:40.000000000 -0400
-@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
- me->arch.core_plt_section = i;
- }
- if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
-- printk("Module doesn't contain .plt or .init.plt sections.\n");
-+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
- return -ENOEXEC;
- }
-
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
-
- DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- /* Init, or core PLT? */
-- if (location >= mod->module_core
-- && location < mod->module_core + mod->core_size)
-+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
-- else
-+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+ else {
-+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+ return ~0UL;
-+ }
-
- /* Find this entry, or if that fails, the next avail. entry */
- while (entry->jump[0]) {
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module.c linux-2.6.32.21/arch/powerpc/kernel/module.c
---- linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/module.c 2010-09-13 08:10:05.000000000 -0400
@@ -31,11 +31,24 @@
LIST_HEAD(module_bug_list);
@@ -2284,9 +2411,41 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module.c linux-2.6.32.21/arch/pow
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
+diff -urNp linux-2.6.32.21/arch/powerpc/kernel/module_32.c linux-2.6.32.21/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/module_32.c 2010-09-13 08:10:05.000000000 -0400
+@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
+ me->arch.core_plt_section = i;
+ }
+ if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
+- printk("Module doesn't contain .plt or .init.plt sections.\n");
++ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+ return -ENOEXEC;
+ }
+
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+
+ DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ /* Init, or core PLT? */
+- if (location >= mod->module_core
+- && location < mod->module_core + mod->core_size)
++ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+- else
++ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++ else {
++ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++ return ~0UL;
++ }
+
+ /* Find this entry, or if that fails, the next avail. entry */
+ while (entry->jump[0]) {
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/pci-common.c linux-2.6.32.21/arch/powerpc/kernel/pci-common.c
---- linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/pci-common.c 2010-09-13 08:10:05.000000000 -0400
@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
unsigned int ppc_pci_flags = 0;
@@ -2306,8 +2465,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/pci-common.c linux-2.6.32.21/arch
return pci_dma_ops;
}
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/process.c linux-2.6.32.21/arch/powerpc/kernel/process.c
---- linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/process.c 2010-09-13 08:10:05.000000000 -0400
@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
sp -= get_random_int() & ~PAGE_MASK;
return sp & ~0xf;
@@ -2361,8 +2520,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/process.c linux-2.6.32.21/arch/po
- return ret;
-}
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_32.c linux-2.6.32.21/arch/powerpc/kernel/signal_32.c
---- linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/signal_32.c 2010-09-13 08:10:05.000000000 -0400
@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
/* Save user registers on the stack */
frame = &rt_sf->uc.uc_mcontext;
@@ -2373,8 +2532,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_32.c linux-2.6.32.21/arch/
goto badframe;
regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_64.c linux-2.6.32.21/arch/powerpc/kernel/signal_64.c
---- linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/signal_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
current->thread.fpscr.val = 0;
@@ -2385,8 +2544,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/signal_64.c linux-2.6.32.21/arch/
} else {
err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c
---- linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c 2010-09-13 08:10:05.000000000 -0400
@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
if (oldlenp) {
if (!error) {
@@ -2401,8 +2560,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.21/arch/
return error;
}
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vdso.c linux-2.6.32.21/arch/powerpc/kernel/vdso.c
---- linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/vdso.c 2010-09-13 08:10:05.000000000 -0400
@@ -36,6 +36,7 @@
#include <asm/firmware.h>
#include <asm/vdso.h>
@@ -2430,8 +2589,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vdso.c linux-2.6.32.21/arch/power
rc = vdso_base;
goto fail_mmapsem;
diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vio.c linux-2.6.32.21/arch/powerpc/kernel/vio.c
---- linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/kernel/vio.c 2010-09-13 08:10:05.000000000 -0400
@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
vio_cmo_dealloc(viodev, alloc_size);
}
@@ -2455,8 +2614,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/kernel/vio.c linux-2.6.32.21/arch/powerp
}
diff -urNp linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c
---- linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -9,22 +9,6 @@
#include <linux/module.h>
#include <asm/uaccess.h>
@@ -2489,8 +2648,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/lib/usercopy_64.c linux-2.6.32.21/arch/p
EXPORT_SYMBOL(copy_in_user);
diff -urNp linux-2.6.32.21/arch/powerpc/mm/fault.c linux-2.6.32.21/arch/powerpc/mm/fault.c
---- linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/mm/fault.c 2010-09-13 08:10:05.000000000 -0400
@@ -30,6 +30,10 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -2596,8 +2755,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/fault.c linux-2.6.32.21/arch/powerpc/
return 0;
}
diff -urNp linux-2.6.32.21/arch/powerpc/mm/mmap_64.c linux-2.6.32.21/arch/powerpc/mm/mmap_64.c
---- linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/mm/mmap_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -2622,8 +2781,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/mmap_64.c linux-2.6.32.21/arch/powerp
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.21/arch/powerpc/mm/slice.c linux-2.6.32.21/arch/powerpc/mm/slice.c
---- linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/mm/slice.c 2010-09-13 08:10:05.000000000 -0400
@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
if (fixed && addr > (mm->task_size - len))
return -EINVAL;
@@ -2637,8 +2796,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/mm/slice.c linux-2.6.32.21/arch/powerpc/
if (!fixed && addr) {
addr = _ALIGN_UP(addr, 1ul << pshift);
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-09-13 08:10:05.000000000 -0400
@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
lite5200_pm_target_state = PM_SUSPEND_ON;
}
@@ -2649,8 +2808,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
.begin = lite5200_pm_begin,
.prepare = lite5200_pm_prepare,
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-09-13 08:10:05.000000000 -0400
@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
iounmap(mbar);
}
@@ -2661,8 +2820,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
.prepare = mpc52xx_pm_prepare,
.enter = mpc52xx_pm_enter,
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c
---- linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c 2010-09-13 08:10:05.000000000 -0400
@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
return ret;
}
@@ -2673,8 +2832,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.21
.begin = mpc83xx_suspend_begin,
.enter = mpc83xx_suspend_enter,
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c 2010-09-13 08:10:05.000000000 -0400
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
@@ -2685,8 +2844,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.21/a
.free_coherent = dma_fixed_free_coherent,
.map_sg = dma_fixed_map_sg,
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c 2010-09-13 08:10:05.000000000 -0400
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
return mask >= DMA_BIT_MASK(32);
}
@@ -2706,8 +2865,8 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
.free_coherent = ps3_free_coherent,
.map_sg = ps3_ioc0_map_sg,
diff -urNp linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig
---- linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig 2010-09-13 08:10:05.000000000 -0400
@@ -2,6 +2,8 @@ config PPC_PSERIES
depends on PPC64 && PPC_BOOK3S
bool "IBM pSeries & new (POWER5-based) iSeries"
@@ -2717,9 +2876,49 @@ diff -urNp linux-2.6.32.21/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.2
select PPC_I8259
select PPC_RTAS
select RTAS_ERROR_LOGGING
+diff -urNp linux-2.6.32.21/arch/s390/Kconfig linux-2.6.32.21/arch/s390/Kconfig
+--- linux-2.6.32.21/arch/s390/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/Kconfig 2010-09-13 08:10:05.000000000 -0400
+@@ -194,28 +194,26 @@ config AUDIT_ARCH
+
+ config S390_SWITCH_AMODE
+ bool "Switch kernel/user addressing modes"
++ default y
+ help
+ This option allows to switch the addressing modes of kernel and user
+- space. The kernel parameter switch_amode=on will enable this feature,
+- default is disabled. Enabling this (via kernel parameter) on machines
+- earlier than IBM System z9-109 EC/BC will reduce system performance.
++ space. Enabling this on machines earlier than IBM System z9-109 EC/BC
++ will reduce system performance.
+
+ Note that this option will also be selected by selecting the execute
+- protection option below. Enabling the execute protection via the
+- noexec kernel parameter will also switch the addressing modes,
+- independent of the switch_amode kernel parameter.
++ protection option below. Enabling the execute protection will also
++ switch the addressing modes, independent of this option.
+
+
+ config S390_EXEC_PROTECT
+ bool "Data execute protection"
++ default y
+ select S390_SWITCH_AMODE
+ help
+ This option allows to enable a buffer overflow protection for user
+ space programs and it also selects the addressing mode option above.
+- The kernel parameter noexec=on will enable this feature and also
+- switch the addressing modes, default is disabled. Enabling this (via
+- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
+- will reduce system performance.
++ Enabling this on machines earlier than IBM System z9-109 EC/BC will
++ reduce system performance.
+
+ comment "Code generation options"
+
diff -urNp linux-2.6.32.21/arch/s390/include/asm/elf.h linux-2.6.32.21/arch/s390/include/asm/elf.h
---- linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/include/asm/elf.h 2010-09-13 08:10:05.000000000 -0400
@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
@@ -2735,8 +2934,8 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/elf.h linux-2.6.32.21/arch/s390
instruction set this CPU supports. */
diff -urNp linux-2.6.32.21/arch/s390/include/asm/setup.h linux-2.6.32.21/arch/s390/include/asm/setup.h
---- linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/include/asm/setup.h 2010-09-13 08:10:05.000000000 -0400
@@ -50,13 +50,13 @@ extern unsigned long memory_end;
void detect_memory_layout(struct mem_chunk chunk[]);
@@ -2754,8 +2953,8 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/setup.h linux-2.6.32.21/arch/s3
#define s390_noexec (0)
#endif
diff -urNp linux-2.6.32.21/arch/s390/include/asm/uaccess.h linux-2.6.32.21/arch/s390/include/asm/uaccess.h
---- linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/include/asm/uaccess.h 2010-09-13 08:10:05.000000000 -0400
@@ -232,6 +232,10 @@ static inline unsigned long __must_check
copy_to_user(void __user *to, const void *from, unsigned long n)
{
@@ -2788,49 +2987,9 @@ diff -urNp linux-2.6.32.21/arch/s390/include/asm/uaccess.h linux-2.6.32.21/arch/
if (access_ok(VERIFY_READ, from, n))
n = __copy_from_user(to, from, n);
else
-diff -urNp linux-2.6.32.21/arch/s390/Kconfig linux-2.6.32.21/arch/s390/Kconfig
---- linux-2.6.32.21/arch/s390/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/Kconfig 2010-08-13 18:34:40.000000000 -0400
-@@ -194,28 +194,26 @@ config AUDIT_ARCH
-
- config S390_SWITCH_AMODE
- bool "Switch kernel/user addressing modes"
-+ default y
- help
- This option allows to switch the addressing modes of kernel and user
-- space. The kernel parameter switch_amode=on will enable this feature,
-- default is disabled. Enabling this (via kernel parameter) on machines
-- earlier than IBM System z9-109 EC/BC will reduce system performance.
-+ space. Enabling this on machines earlier than IBM System z9-109 EC/BC
-+ will reduce system performance.
-
- Note that this option will also be selected by selecting the execute
-- protection option below. Enabling the execute protection via the
-- noexec kernel parameter will also switch the addressing modes,
-- independent of the switch_amode kernel parameter.
-+ protection option below. Enabling the execute protection will also
-+ switch the addressing modes, independent of this option.
-
-
- config S390_EXEC_PROTECT
- bool "Data execute protection"
-+ default y
- select S390_SWITCH_AMODE
- help
- This option allows to enable a buffer overflow protection for user
- space programs and it also selects the addressing mode option above.
-- The kernel parameter noexec=on will enable this feature and also
-- switch the addressing modes, default is disabled. Enabling this (via
-- kernel parameter) on machines earlier than IBM System z9-109 EC/BC
-- will reduce system performance.
-+ Enabling this on machines earlier than IBM System z9-109 EC/BC will
-+ reduce system performance.
-
- comment "Code generation options"
-
diff -urNp linux-2.6.32.21/arch/s390/kernel/module.c linux-2.6.32.21/arch/s390/kernel/module.c
---- linux-2.6.32.21/arch/s390/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/kernel/module.c 2010-09-13 08:10:05.000000000 -0400
@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
/* Increase core size by size of got & plt and set start
@@ -2903,8 +3062,8 @@ diff -urNp linux-2.6.32.21/arch/s390/kernel/module.c linux-2.6.32.21/arch/s390/k
if (r_type == R_390_GOTPC)
*(unsigned int *) loc = val;
diff -urNp linux-2.6.32.21/arch/s390/kernel/setup.c linux-2.6.32.21/arch/s390/kernel/setup.c
---- linux-2.6.32.21/arch/s390/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/kernel/setup.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/kernel/setup.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/kernel/setup.c 2010-09-13 08:10:05.000000000 -0400
@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
early_param("mem", early_parse_mem);
@@ -2959,8 +3118,8 @@ diff -urNp linux-2.6.32.21/arch/s390/kernel/setup.c linux-2.6.32.21/arch/s390/ke
{
if (s390_noexec) {
diff -urNp linux-2.6.32.21/arch/s390/mm/mmap.c linux-2.6.32.21/arch/s390/mm/mmap.c
---- linux-2.6.32.21/arch/s390/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/s390/mm/mmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/s390/mm/mmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/s390/mm/mmap.c 2010-09-13 08:10:05.000000000 -0400
@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
*/
if (mmap_is_legacy()) {
@@ -3008,8 +3167,8 @@ diff -urNp linux-2.6.32.21/arch/s390/mm/mmap.c linux-2.6.32.21/arch/s390/mm/mmap
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c
---- linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c 2010-09-13 08:10:05.000000000 -0400
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
return 0;
}
@@ -3020,8 +3179,8 @@ diff -urNp linux-2.6.32.21/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.21/arch/s
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c
---- linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c 2010-09-13 08:10:05.000000000 -0400
@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
NULL,
};
@@ -3032,8 +3191,8 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.21/arch/sh/k
.store = sq_sysfs_store,
};
diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c
---- linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c 2010-09-13 08:10:05.000000000 -0400
@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
return 0;
}
@@ -3044,8 +3203,8 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.21/arch
.valid = suspend_valid_only_mem,
};
diff -urNp linux-2.6.32.21/arch/sh/kernel/kgdb.c linux-2.6.32.21/arch/sh/kernel/kgdb.c
---- linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sh/kernel/kgdb.c 2010-09-13 08:10:05.000000000 -0400
@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3055,9 +3214,21 @@ diff -urNp linux-2.6.32.21/arch/sh/kernel/kgdb.c linux-2.6.32.21/arch/sh/kernel/
/* Breakpoint instruction: trapa #0x3c */
#ifdef CONFIG_CPU_LITTLE_ENDIAN
.gdb_bpt_instr = { 0x3c, 0xc3 },
+diff -urNp linux-2.6.32.21/arch/sparc/Makefile linux-2.6.32.21/arch/sparc/Makefile
+--- linux-2.6.32.21/arch/sparc/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/Makefile 2010-09-13 08:10:05.000000000 -0400
+@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
+ # Export what is needed by arch/sparc/boot/Makefile
+ export VMLINUX_INIT VMLINUX_MAIN
+ VMLINUX_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-08-29 21:46:28.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -14,18 +14,40 @@
#define ATOMIC64_INIT(i) { (i) }
@@ -3203,8 +3374,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/atomic_64.h linux-2.6.32.21/ar
#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h 2010-09-13 08:10:05.000000000 -0400
@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
#define dma_is_consistent(d, h) (1)
@@ -3237,8 +3408,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/dma-mapping.h linux-2.6.32.21/
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle);
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_32.h linux-2.6.32.21/arch/sparc/include/asm/elf_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/elf_32.h 2010-09-13 08:10:05.000000000 -0400
@@ -116,6 +116,13 @@ typedef struct {
#define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
@@ -3254,8 +3425,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_32.h linux-2.6.32.21/arch/
instruction set this cpu supports. This can NOT be done in userspace
on Sparc. */
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_64.h linux-2.6.32.21/arch/sparc/include/asm/elf_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/elf_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -163,6 +163,12 @@ typedef struct {
#define ELF_ET_DYN_BASE 0x0000010000000000UL
#define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
@@ -3270,8 +3441,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/elf_64.h linux-2.6.32.21/arch/
/* This yields a mask that user programs can use to figure out what
instruction set this cpu supports. */
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h 2010-09-13 08:10:05.000000000 -0400
@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
BTFIXUPDEF_INT(page_none)
BTFIXUPDEF_INT(page_copy)
@@ -3304,8 +3475,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtable_32.h linux-2.6.32.21/a
#ifdef MODULE
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h
---- linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h 2010-09-13 08:10:05.000000000 -0400
@@ -115,6 +115,13 @@
SRMMU_EXEC | SRMMU_REF)
#define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3321,8 +3492,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.21/arc
SRMMU_DIRTY | SRMMU_REF)
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
__asm__ __volatile__ (
"1: ldsw [%2], %0\n"
@@ -3374,9 +3545,26 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/spinlock_64.h linux-2.6.32.21/
" cas [%2], %0, %1\n"
" cmp %0, %1\n"
" bne,pn %%xcc, 1b\n"
+diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess.h linux-2.6.32.21/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-09-13 08:10:05.000000000 -0400
+@@ -1,5 +1,13 @@
+ #ifndef ___ASM_SPARC_UACCESS_H
+ #define ___ASM_SPARC_UACCESS_H
++
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
++#include <linux/types.h>
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++#endif
++#endif
++
+ #if defined(__sparc__) && defined(__arch64__)
+ #include <asm/uaccess_64.h>
+ #else
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h 2010-09-13 08:10:05.000000000 -0400
@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3429,8 +3617,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.21/a
}
diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -9,6 +9,7 @@
#include <linux/compiler.h>
#include <linux/string.h>
@@ -3473,26 +3661,21 @@ diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.21/a
if (unlikely(ret))
ret = copy_to_user_fixup(to, from, size);
return ret;
-diff -urNp linux-2.6.32.21/arch/sparc/include/asm/uaccess.h linux-2.6.32.21/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
-@@ -1,5 +1,13 @@
- #ifndef ___ASM_SPARC_UACCESS_H
- #define ___ASM_SPARC_UACCESS_H
-+
-+#ifdef __KERNEL__
-+#ifndef __ASSEMBLY__
-+#include <linux/types.h>
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+#endif
-+#endif
-+
- #if defined(__sparc__) && defined(__arch64__)
- #include <asm/uaccess_64.h>
- #else
+diff -urNp linux-2.6.32.21/arch/sparc/kernel/Makefile linux-2.6.32.21/arch/sparc/kernel/Makefile
+--- linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-09-13 08:10:05.000000000 -0400
+@@ -3,7 +3,7 @@
+ #
+
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+
+ extra-y := head_$(BITS).o
+ extra-y += init_task.o
diff -urNp linux-2.6.32.21/arch/sparc/kernel/iommu.c linux-2.6.32.21/arch/sparc/kernel/iommu.c
---- linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/iommu.c 2010-09-13 08:10:05.000000000 -0400
@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3512,8 +3695,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/iommu.c linux-2.6.32.21/arch/sparc/
extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
diff -urNp linux-2.6.32.21/arch/sparc/kernel/ioport.c linux-2.6.32.21/arch/sparc/kernel/ioport.c
---- linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/ioport.c 2010-09-13 08:10:05.000000000 -0400
@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
BUG();
}
@@ -3542,8 +3725,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/ioport.c linux-2.6.32.21/arch/sparc
.free_coherent = pci32_free_coherent,
.map_page = pci32_map_page,
diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c
---- linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c 2010-09-13 08:10:05.000000000 -0400
@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3554,8 +3737,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_32.c linux-2.6.32.21/arch/spar
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
};
diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c
---- linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
{
}
@@ -3565,21 +3748,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/kgdb_64.c linux-2.6.32.21/arch/spar
/* Breakpoint instruction: ta 0x72 */
.gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
};
-diff -urNp linux-2.6.32.21/arch/sparc/kernel/Makefile linux-2.6.32.21/arch/sparc/kernel/Makefile
---- linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/Makefile 2010-08-13 18:34:40.000000000 -0400
-@@ -3,7 +3,7 @@
- #
-
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
-
- extra-y := head_$(BITS).o
- extra-y += init_task.o
diff -urNp linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c
---- linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c 2010-09-13 08:10:05.000000000 -0400
@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -3590,8 +3761,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.21/arch/sp
.free_coherent = dma_4v_free_coherent,
.map_page = dma_4v_map_page,
diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c
---- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c 2010-09-13 08:10:05.000000000 -0400
@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
if (ARCH_SUN4C && len > 0x20000000)
return -ENOMEM;
@@ -3602,8 +3773,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32.21/arch
if (flags & MAP_SHARED)
addr = COLOUR_ALIGN(addr);
diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c
---- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c 2010-09-13 08:10:05.000000000 -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.
@@ -3683,8 +3854,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32.21/arch
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.21/arch/sparc/kernel/traps_64.c linux-2.6.32.21/arch/sparc/kernel/traps_64.c
---- linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/kernel/traps_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
lvl -= 0x100;
@@ -3717,8 +3888,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/kernel/traps_64.c linux-2.6.32.21/arch/spa
sprintf (buffer, "Bad trap %lx at tl>0", lvl);
diff -urNp linux-2.6.32.21/arch/sparc/lib/atomic_64.S linux-2.6.32.21/arch/sparc/lib/atomic_64.S
---- linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-08-29 21:48:28.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/lib/atomic_64.S 2010-09-13 08:10:05.000000000 -0400
@@ -18,7 +18,12 @@
atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
BACKOFF_SETUP(%o2)
@@ -3954,8 +4125,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/atomic_64.S linux-2.6.32.21/arch/sparc
cmp %g1, %g7
bne,pn %xcc, 2f
diff -urNp linux-2.6.32.21/arch/sparc/lib/ksyms.c linux-2.6.32.21/arch/sparc/lib/ksyms.c
---- linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/lib/ksyms.c 2010-09-13 08:10:05.000000000 -0400
@@ -144,12 +144,15 @@ EXPORT_SYMBOL(__downgrade_write);
/* Atomic counter implementation. */
@@ -3973,8 +4144,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/ksyms.c linux-2.6.32.21/arch/sparc/lib
/* Atomic bit operations. */
diff -urNp linux-2.6.32.21/arch/sparc/lib/rwsem_64.S linux-2.6.32.21/arch/sparc/lib/rwsem_64.S
---- linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/lib/rwsem_64.S 2010-09-13 08:10:05.000000000 -0400
@@ -11,7 +11,12 @@
.globl __down_read
__down_read:
@@ -4073,21 +4244,21 @@ diff -urNp linux-2.6.32.21/arch/sparc/lib/rwsem_64.S linux-2.6.32.21/arch/sparc/
cas [%o0], %g3, %g7
cmp %g3, %g7
bne,pn %icc, 1b
-diff -urNp linux-2.6.32.21/arch/sparc/Makefile linux-2.6.32.21/arch/sparc/Makefile
---- linux-2.6.32.21/arch/sparc/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/Makefile 2010-08-13 18:34:40.000000000 -0400
-@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
- # Export what is needed by arch/sparc/boot/Makefile
- export VMLINUX_INIT VMLINUX_MAIN
- VMLINUX_INIT := $(head-y) $(init-y)
--VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
- VMLINUX_MAIN += $(drivers-y) $(net-y)
+diff -urNp linux-2.6.32.21/arch/sparc/mm/Makefile linux-2.6.32.21/arch/sparc/mm/Makefile
+--- linux-2.6.32.21/arch/sparc/mm/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/mm/Makefile 2010-09-13 08:10:05.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+ obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
+ obj-y += fault_$(BITS).o
diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_32.c linux-2.6.32.21/arch/sparc/mm/fault_32.c
---- linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/mm/fault_32.c 2010-09-13 08:10:05.000000000 -0400
@@ -21,6 +21,9 @@
#include <linux/interrupt.h>
#include <linux/module.h>
@@ -4392,8 +4563,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_32.c linux-2.6.32.21/arch/sparc/m
if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
goto bad_area;
diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_64.c linux-2.6.32.21/arch/sparc/mm/fault_64.c
---- linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/mm/fault_64.c 2010-09-13 08:10:05.000000000 -0400
@@ -20,6 +20,9 @@
#include <linux/kprobes.h>
#include <linux/kdebug.h>
@@ -4892,8 +5063,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/fault_64.c linux-2.6.32.21/arch/sparc/m
* 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.32.21/arch/sparc/mm/init_32.c linux-2.6.32.21/arch/sparc/mm/init_32.c
---- linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/mm/init_32.c 2010-09-13 08:10:05.000000000 -0400
@@ -317,6 +317,9 @@ extern void device_scan(void);
pgprot_t PAGE_SHARED __read_mostly;
EXPORT_SYMBOL(PAGE_SHARED);
@@ -4928,21 +5099,9 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/init_32.c linux-2.6.32.21/arch/sparc/mm
protection_map[12] = PAGE_READONLY;
protection_map[13] = PAGE_READONLY;
protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.21/arch/sparc/mm/Makefile linux-2.6.32.21/arch/sparc/mm/Makefile
---- linux-2.6.32.21/arch/sparc/mm/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/Makefile 2010-08-13 18:34:40.000000000 -0400
-@@ -2,7 +2,7 @@
- #
-
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
-
- obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
- obj-y += fault_$(BITS).o
diff -urNp linux-2.6.32.21/arch/sparc/mm/srmmu.c linux-2.6.32.21/arch/sparc/mm/srmmu.c
---- linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/sparc/mm/srmmu.c 2010-09-13 08:10:05.000000000 -0400
@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -4958,8 +5117,8 @@ diff -urNp linux-2.6.32.21/arch/sparc/mm/srmmu.c linux-2.6.32.21/arch/sparc/mm/s
page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
diff -urNp linux-2.6.32.21/arch/um/include/asm/kmap_types.h linux-2.6.32.21/arch/um/include/asm/kmap_types.h
---- linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/um/include/asm/kmap_types.h 2010-09-13 08:10:05.000000000 -0400
@@ -23,6 +23,7 @@ enum km_type {
KM_IRQ1,
KM_SOFTIRQ0,
@@ -4969,8 +5128,8 @@ diff -urNp linux-2.6.32.21/arch/um/include/asm/kmap_types.h linux-2.6.32.21/arch
};
diff -urNp linux-2.6.32.21/arch/um/include/asm/page.h linux-2.6.32.21/arch/um/include/asm/page.h
---- linux-2.6.32.21/arch/um/include/asm/page.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/include/asm/page.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/um/include/asm/page.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/um/include/asm/page.h 2010-09-13 08:10:05.000000000 -0400
@@ -14,6 +14,9 @@
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
@@ -4982,8 +5141,8 @@ diff -urNp linux-2.6.32.21/arch/um/include/asm/page.h linux-2.6.32.21/arch/um/in
struct page;
diff -urNp linux-2.6.32.21/arch/um/sys-i386/syscalls.c linux-2.6.32.21/arch/um/sys-i386/syscalls.c
---- linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/um/sys-i386/syscalls.c 2010-09-13 08:10:05.000000000 -0400
@@ -11,6 +11,21 @@
#include "asm/uaccess.h"
#include "asm/unistd.h"
@@ -5006,9 +5165,134 @@ diff -urNp linux-2.6.32.21/arch/um/sys-i386/syscalls.c linux-2.6.32.21/arch/um/s
/*
* 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.32.21/arch/x86/Kconfig linux-2.6.32.21/arch/x86/Kconfig
+--- linux-2.6.32.21/arch/x86/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/Kconfig 2010-09-13 08:10:06.000000000 -0400
+@@ -997,7 +997,7 @@ choice
+
+ config NOHIGHMEM
+ bool "off"
+- depends on !X86_NUMAQ
++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
+ ---help---
+ Linux can use up to 64 Gigabytes of physical memory on x86 systems.
+ However, the address space of 32-bit x86 processors is only 4
+@@ -1034,7 +1034,7 @@ config NOHIGHMEM
+
+ config HIGHMEM4G
+ bool "4GB"
+- depends on !X86_NUMAQ
++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
+ ---help---
+ Select this if you have a 32-bit processor and between 1 and 4
+ gigabytes of physical RAM.
+@@ -1088,7 +1088,7 @@ config PAGE_OFFSET
+ hex
+ default 0xB0000000 if VMSPLIT_3G_OPT
+ default 0x80000000 if VMSPLIT_2G
+- default 0x78000000 if VMSPLIT_2G_OPT
++ default 0x70000000 if VMSPLIT_2G_OPT
+ default 0x40000000 if VMSPLIT_1G
+ default 0xC0000000
+ depends on X86_32
+@@ -1419,7 +1419,7 @@ config ARCH_USES_PG_UNCACHED
+
+ config EFI
+ bool "EFI runtime service support"
+- depends on ACPI
++ depends on ACPI && !PAX_KERNEXEC
+ ---help---
+ This enables the kernel to use EFI runtime services that are
+ available (such as the EFI variable services).
+@@ -1506,6 +1506,7 @@ config KEXEC_JUMP
+ config PHYSICAL_START
+ hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+ default "0x1000000"
++ range 0x400000 0x40000000
+ ---help---
+ This gives the physical address where the kernel is loaded.
+
+@@ -1570,6 +1571,7 @@ config PHYSICAL_ALIGN
+ hex
+ prompt "Alignment value to which kernel should be aligned" if X86_32
+ default "0x1000000"
++ range 0x400000 0x1000000 if PAX_KERNEXEC
+ range 0x2000 0x1000000
+ ---help---
+ This value puts the alignment restrictions on physical address
+@@ -1601,9 +1603,10 @@ config HOTPLUG_CPU
+ Say N if you want to disable CPU hotplug.
+
+ config COMPAT_VDSO
+- def_bool y
++ def_bool n
+ prompt "Compat VDSO support"
+ depends on X86_32 || IA32_EMULATION
++ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+ ---help---
+ Map the 32-bit VDSO to the predictable old-style address too.
+ ---help---
+diff -urNp linux-2.6.32.21/arch/x86/Kconfig.cpu linux-2.6.32.21/arch/x86/Kconfig.cpu
+--- linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-09-13 08:10:06.000000000 -0400
+@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
+
+ config X86_F00F_BUG
+ def_bool y
+- depends on M586MMX || M586TSC || M586 || M486 || M386
++ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
+
+ config X86_WP_WORKS_OK
+ def_bool y
+@@ -360,7 +360,7 @@ config X86_POPAD_OK
+
+ config X86_ALIGNMENT_16
+ def_bool y
+- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+
+ config X86_INTEL_USERCOPY
+ def_bool y
+@@ -406,7 +406,7 @@ config X86_CMPXCHG64
+ # generates cmov.
+ config X86_CMOV
+ def_bool y
+- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
++ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
+
+ config X86_MINIMUM_CPU_FAMILY
+ int
+diff -urNp linux-2.6.32.21/arch/x86/Kconfig.debug linux-2.6.32.21/arch/x86/Kconfig.debug
+--- linux-2.6.32.21/arch/x86/Kconfig.debug 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/Kconfig.debug 2010-09-13 08:10:06.000000000 -0400
+@@ -99,7 +99,7 @@ config X86_PTDUMP
+ config DEBUG_RODATA
+ bool "Write protect kernel read-only data structures"
+ default y
+- depends on DEBUG_KERNEL
++ depends on DEBUG_KERNEL && BROKEN
+ ---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.32.21/arch/x86/Makefile linux-2.6.32.21/arch/x86/Makefile
+--- linux-2.6.32.21/arch/x86/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/Makefile 2010-09-13 08:10:06.000000000 -0400
+@@ -189,3 +189,12 @@ define archhelp
+ echo ' FDARGS="..." arguments for the booted kernel'
+ echo ' FDINITRD=file initrd for the booted kernel'
+ endef
++
++define OLD_LD
++
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
++
++archprepare:
++ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff -urNp linux-2.6.32.21/arch/x86/boot/bitops.h linux-2.6.32.21/arch/x86/boot/bitops.h
---- linux-2.6.32.21/arch/x86/boot/bitops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/bitops.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/bitops.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/bitops.h 2010-09-13 08:10:05.000000000 -0400
@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
u8 v;
const u32 *p = (const u32 *)addr;
@@ -5028,8 +5312,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/bitops.h linux-2.6.32.21/arch/x86/boot/
#endif /* BOOT_BITOPS_H */
diff -urNp linux-2.6.32.21/arch/x86/boot/boot.h linux-2.6.32.21/arch/x86/boot/boot.h
---- linux-2.6.32.21/arch/x86/boot/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/boot.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/boot.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/boot.h 2010-09-13 08:10:05.000000000 -0400
@@ -82,7 +82,7 @@ static inline void io_delay(void)
static inline u16 ds(void)
{
@@ -5049,8 +5333,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/boot.h linux-2.6.32.21/arch/x86/boot/bo
return diff;
}
diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_32.S linux-2.6.32.21/arch/x86/boot/compressed/head_32.S
---- linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/compressed/head_32.S 2010-09-13 08:10:05.000000000 -0400
@@ -76,7 +76,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5080,8 +5364,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_32.S linux-2.6.32.21/ar
jmp 1b
2:
diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_64.S linux-2.6.32.21/arch/x86/boot/compressed/head_64.S
---- linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/compressed/head_64.S 2010-09-13 08:10:05.000000000 -0400
@@ -91,7 +91,7 @@ ENTRY(startup_32)
notl %eax
andl %eax, %ebx
@@ -5101,8 +5385,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/head_64.S linux-2.6.32.21/ar
/* Target address to relocate to for decompression */
diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/misc.c linux-2.6.32.21/arch/x86/boot/compressed/misc.c
---- linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/compressed/misc.c 2010-09-13 08:10:05.000000000 -0400
@@ -288,7 +288,7 @@ static void parse_elf(void *output)
case PT_LOAD:
#ifdef CONFIG_RELOCATABLE
@@ -5122,8 +5406,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/misc.c linux-2.6.32.21/arch/
#endif
diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c
---- linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c 2010-09-13 08:10:05.000000000 -0400
@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
offs = (olen > ilen) ? olen - ilen : 0;
@@ -5134,8 +5418,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.21/ar
printf(".section \".rodata.compressed\",\"a\",@progbits\n");
diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/relocs.c linux-2.6.32.21/arch/x86/boot/compressed/relocs.c
---- linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/compressed/relocs.c 2010-09-13 08:10:05.000000000 -0400
@@ -10,8 +10,11 @@
#define USE_BSD
#include <endian.h>
@@ -5337,8 +5621,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/compressed/relocs.c linux-2.6.32.21/arc
read_strtabs(fp);
read_symtabs(fp);
diff -urNp linux-2.6.32.21/arch/x86/boot/cpucheck.c linux-2.6.32.21/arch/x86/boot/cpucheck.c
---- linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/cpucheck.c 2010-09-13 08:10:05.000000000 -0400
@@ -74,7 +74,7 @@ static int has_fpu(void)
u16 fcw = -1, fsw = -1;
u32 cr0;
@@ -5435,8 +5719,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/cpucheck.c linux-2.6.32.21/arch/x86/boo
err = check_flags();
}
diff -urNp linux-2.6.32.21/arch/x86/boot/header.S linux-2.6.32.21/arch/x86/boot/header.S
---- linux-2.6.32.21/arch/x86/boot/header.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/header.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/header.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/header.S 2010-09-13 08:10:05.000000000 -0400
@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
# single linked list of
# struct setup_data
@@ -5447,8 +5731,8 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/header.S linux-2.6.32.21/arch/x86/boot/
#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.32.21/arch/x86/boot/memory.c linux-2.6.32.21/arch/x86/boot/memory.c
---- linux-2.6.32.21/arch/x86/boot/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/memory.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/memory.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/memory.c 2010-09-13 08:10:05.000000000 -0400
@@ -19,7 +19,7 @@
static int detect_memory_e820(void)
@@ -5458,9 +5742,20 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/memory.c linux-2.6.32.21/arch/x86/boot/
struct biosregs ireg, oreg;
struct e820entry *desc = boot_params.e820_map;
static struct e820entry buf; /* static so it is zeroed */
+diff -urNp linux-2.6.32.21/arch/x86/boot/video-vesa.c linux-2.6.32.21/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-09-13 08:10:05.000000000 -0400
+@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+
+ boot_params.screen_info.vesapm_seg = oreg.es;
+ boot_params.screen_info.vesapm_off = oreg.di;
++ boot_params.screen_info.vesapm_size = oreg.cx;
+ }
+
+ /*
diff -urNp linux-2.6.32.21/arch/x86/boot/video.c linux-2.6.32.21/arch/x86/boot/video.c
---- linux-2.6.32.21/arch/x86/boot/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/video.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/boot/video.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/boot/video.c 2010-09-13 08:10:05.000000000 -0400
@@ -90,7 +90,7 @@ static void store_mode_params(void)
static unsigned int get_entry(void)
{
@@ -5470,20 +5765,30 @@ diff -urNp linux-2.6.32.21/arch/x86/boot/video.c linux-2.6.32.21/arch/x86/boot/v
int key;
unsigned int v;
-diff -urNp linux-2.6.32.21/arch/x86/boot/video-vesa.c linux-2.6.32.21/arch/x86/boot/video-vesa.c
---- linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/boot/video-vesa.c 2010-08-13 18:34:40.000000000 -0400
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
-
- boot_params.screen_info.vesapm_seg = oreg.es;
- boot_params.screen_info.vesapm_off = oreg.di;
-+ boot_params.screen_info.vesapm_size = oreg.cx;
+diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32_signal.c linux-2.6.32.21/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-09-13 08:10:05.000000000 -0400
+@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
+ sp -= frame_size;
+ /* Align the stack pointer according to the i386 ABI,
+ * i.e. so that on function entry ((sp + 4) & 15) == 0. */
+- sp = ((sp + 4) & -16ul) - 4;
++ sp = ((sp - 12) & -16ul) - 4;
+ return (void __user *) sp;
}
- /*
+@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct
+ 0xb8,
+ __NR_ia32_rt_sigreturn,
+ 0x80cd,
+- 0,
++ 0
+ };
+
+ frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia32/ia32entry.S
---- linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/ia32/ia32entry.S 2010-09-13 08:10:05.000000000 -0400
@@ -13,6 +13,7 @@
#include <asm/thread_info.h>
#include <asm/segment.h>
@@ -5578,30 +5883,9 @@ diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32entry.S linux-2.6.32.21/arch/x86/ia
/*
* No need to follow this irqs on/off section: the syscall
* disabled irqs and here we enable it straight after entry:
-diff -urNp linux-2.6.32.21/arch/x86/ia32/ia32_signal.c linux-2.6.32.21/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/ia32/ia32_signal.c 2010-08-13 18:34:40.000000000 -0400
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
- sp -= frame_size;
- /* Align the stack pointer according to the i386 ABI,
- * i.e. so that on function entry ((sp + 4) & 15) == 0. */
-- sp = ((sp + 4) & -16ul) - 4;
-+ sp = ((sp - 12) & -16ul) - 4;
- return (void __user *) sp;
- }
-
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct
- 0xb8,
- __NR_ia32_rt_sigreturn,
- 0x80cd,
-- 0,
-+ 0
- };
-
- frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/alternative.h linux-2.6.32.21/arch/x86/include/asm/alternative.h
---- linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/alternative.h 2010-09-13 08:10:05.000000000 -0400
@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
" .byte 662b-661b\n" /* sourcelen */ \
" .byte 664f-663f\n" /* replacementlen */ \
@@ -5612,8 +5896,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/alternative.h linux-2.6.32.21/ar
".previous"
diff -urNp linux-2.6.32.21/arch/x86/include/asm/apm.h linux-2.6.32.21/arch/x86/include/asm/apm.h
---- linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/apm.h 2010-09-13 08:10:05.000000000 -0400
@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
__asm__ __volatile__(APM_DO_ZERO_SEGS
"pushl %%edi\n\t"
@@ -5633,8 +5917,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/apm.h linux-2.6.32.21/arch/x86/i
"popl %%ebp\n\t"
"popl %%edi\n\t"
diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_32.h linux-2.6.32.21/arch/x86/include/asm/atomic_32.h
---- linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/atomic_32.h 2010-09-13 08:10:05.000000000 -0400
@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
}
@@ -5978,8 +6262,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_32.h linux-2.6.32.21/arch
extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch/x86/include/asm/atomic_64.h
---- linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/atomic_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
}
@@ -6608,8 +6892,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/atomic_64.h linux-2.6.32.21/arch
/**
diff -urNp linux-2.6.32.21/arch/x86/include/asm/boot.h linux-2.6.32.21/arch/x86/include/asm/boot.h
---- linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/boot.h 2010-09-13 08:10:05.000000000 -0400
@@ -11,10 +11,15 @@
#include <asm/pgtable_types.h>
@@ -6627,9 +6911,20 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/boot.h linux-2.6.32.21/arch/x86/
/* Minimum kernel alignment, as a power of two */
#ifdef CONFIG_X86_64
#define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/cache.h linux-2.6.32.21/arch/x86/include/asm/cache.h
+--- linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-09-13 08:10:05.000000000 -0400
+@@ -8,6 +8,7 @@
+ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
+
+ #define __read_mostly __attribute__((__section__(".data.read_mostly")))
++#define __read_only __attribute__((__section__(".data.read_only")))
+
+ #ifdef CONFIG_X86_VSMP
+ /* vSMP Internode cacheline shift */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/cacheflush.h linux-2.6.32.21/arch/x86/include/asm/cacheflush.h
---- linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/cacheflush.h 2010-09-13 08:10:05.000000000 -0400
@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
static inline unsigned long get_page_memtype(struct page *pg)
{
@@ -6648,20 +6943,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/cacheflush.h linux-2.6.32.21/arc
ClearPageUncached(pg);
ClearPageWC(pg);
break;
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/cache.h linux-2.6.32.21/arch/x86/include/asm/cache.h
---- linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/cache.h 2010-08-13 18:34:40.000000000 -0400
-@@ -8,6 +8,7 @@
- #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
-
- #define __read_mostly __attribute__((__section__(".data.read_mostly")))
-+#define __read_only __attribute__((__section__(".data.read_only")))
-
- #ifdef CONFIG_X86_VSMP
- /* vSMP Internode cacheline shift */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/checksum_32.h linux-2.6.32.21/arch/x86/include/asm/checksum_32.h
---- linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/checksum_32.h 2010-09-13 08:10:05.000000000 -0400
@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
int len, __wsum sum,
int *src_err_ptr, int *dst_err_ptr);
@@ -6696,8 +6980,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/checksum_32.h linux-2.6.32.21/ar
if (len)
diff -urNp linux-2.6.32.21/arch/x86/include/asm/desc.h linux-2.6.32.21/arch/x86/include/asm/desc.h
---- linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/desc.h 2010-09-13 08:10:05.000000000 -0400
@@ -4,6 +4,7 @@
#include <asm/desc_defs.h>
#include <asm/ldt.h>
@@ -6868,8 +7152,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/desc.h linux-2.6.32.21/arch/x86/
+
#endif /* _ASM_X86_DESC_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/device.h linux-2.6.32.21/arch/x86/include/asm/device.h
---- linux-2.6.32.21/arch/x86/include/asm/device.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/device.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/device.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/device.h 2010-09-13 08:10:05.000000000 -0400
@@ -6,7 +6,7 @@ struct dev_archdata {
void *acpi_handle;
#endif
@@ -6880,8 +7164,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/device.h linux-2.6.32.21/arch/x8
#ifdef CONFIG_DMAR
void *iommu; /* hook for IOMMU specific extension */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h
---- linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h 2010-09-13 08:10:05.000000000 -0400
@@ -25,9 +25,9 @@ extern int iommu_merge;
extern struct device x86_dma_fallback_dev;
extern int panic_on_overflow;
@@ -6922,8 +7206,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/dma-mapping.h linux-2.6.32.21/ar
WARN_ON(irqs_disabled()); /* for portability */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/e820.h linux-2.6.32.21/arch/x86/include/asm/e820.h
---- linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/e820.h 2010-09-13 08:10:05.000000000 -0400
@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
#define ISA_END_ADDRESS 0x100000
#define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
@@ -6934,8 +7218,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/e820.h linux-2.6.32.21/arch/x86/
#ifdef __KERNEL__
diff -urNp linux-2.6.32.21/arch/x86/include/asm/elf.h linux-2.6.32.21/arch/x86/include/asm/elf.h
---- linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/elf.h 2010-09-13 08:10:05.000000000 -0400
@@ -257,7 +257,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. */
@@ -6990,8 +7274,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/elf.h linux-2.6.32.21/arch/x86/i
-
#endif /* _ASM_X86_ELF_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/futex.h linux-2.6.32.21/arch/x86/include/asm/futex.h
---- linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/futex.h 2010-09-13 08:10:05.000000000 -0400
@@ -11,17 +11,54 @@
#include <asm/processor.h>
#include <asm/system.h>
@@ -7129,8 +7413,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/futex.h linux-2.6.32.21/arch/x86
);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/i387.h linux-2.6.32.21/arch/x86/include/asm/i387.h
---- linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/i387.h 2010-09-13 08:10:05.000000000 -0400
@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
{
int err;
@@ -7172,8 +7456,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/i387.h linux-2.6.32.21/arch/x86/
/*
* These must be called with preempt disabled
diff -urNp linux-2.6.32.21/arch/x86/include/asm/io_64.h linux-2.6.32.21/arch/x86/include/asm/io_64.h
---- linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/io_64.h 2010-09-13 08:10:05.000000000 -0400
@@ -140,6 +140,17 @@ __OUTS(l)
#include <linux/vmalloc.h>
@@ -7193,8 +7477,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/io_64.h linux-2.6.32.21/arch/x86
void __memcpy_fromio(void *, unsigned long, unsigned);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/iommu.h linux-2.6.32.21/arch/x86/include/asm/iommu.h
---- linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/iommu.h 2010-09-13 08:10:05.000000000 -0400
@@ -3,7 +3,7 @@
extern void pci_iommu_shutdown(void);
@@ -7205,8 +7489,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/iommu.h linux-2.6.32.21/arch/x86
extern int iommu_detected;
extern int iommu_pass_through;
diff -urNp linux-2.6.32.21/arch/x86/include/asm/irqflags.h linux-2.6.32.21/arch/x86/include/asm/irqflags.h
---- linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/irqflags.h 2010-09-13 08:10:05.000000000 -0400
@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
sti; \
sysexit
@@ -7220,8 +7504,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/irqflags.h linux-2.6.32.21/arch/
#define INTERRUPT_RETURN iret
#define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
diff -urNp linux-2.6.32.21/arch/x86/include/asm/kvm_host.h linux-2.6.32.21/arch/x86/include/asm/kvm_host.h
---- linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/kvm_host.h 2010-09-13 08:10:06.000000000 -0400
@@ -533,7 +533,7 @@ struct kvm_x86_ops {
const struct trace_print_flags *exit_reasons_str;
};
@@ -7232,8 +7516,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/kvm_host.h linux-2.6.32.21/arch/
int kvm_mmu_module_init(void);
void kvm_mmu_module_exit(void);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/local.h linux-2.6.32.21/arch/x86/include/asm/local.h
---- linux-2.6.32.21/arch/x86/include/asm/local.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/local.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/local.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/local.h 2010-09-13 08:10:06.000000000 -0400
@@ -18,26 +18,90 @@ typedef struct {
static inline void local_inc(local_t *l)
@@ -7459,8 +7743,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/local.h linux-2.6.32.21/arch/x86
: : "memory");
return i + __i;
diff -urNp linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h
---- linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h 2010-09-13 08:10:06.000000000 -0400
@@ -81,8 +81,8 @@ static inline unsigned char current_lock
#else
#define lock_cmos_prefix(reg) do {} while (0)
@@ -7473,8 +7757,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.21/ar
#define current_lock_cmos_reg() 0
#endif
diff -urNp linux-2.6.32.21/arch/x86/include/asm/microcode.h linux-2.6.32.21/arch/x86/include/asm/microcode.h
---- linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/microcode.h 2010-09-13 08:10:06.000000000 -0400
@@ -12,13 +12,13 @@ struct device;
enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
@@ -7516,8 +7800,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/microcode.h linux-2.6.32.21/arch
return NULL;
}
diff -urNp linux-2.6.32.21/arch/x86/include/asm/mman.h linux-2.6.32.21/arch/x86/include/asm/mman.h
---- linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/mman.h 2010-09-13 08:10:06.000000000 -0400
@@ -5,4 +5,14 @@
#include <asm-generic/mman.h>
@@ -7533,9 +7817,38 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mman.h linux-2.6.32.21/arch/x86/
+#endif
+
#endif /* _ASM_X86_MMAN_H */
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu.h linux-2.6.32.21/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-09-13 08:10:06.000000000 -0400
+@@ -9,10 +9,23 @@
+ * we put the segment information here.
+ */
+ typedef struct {
+- void *ldt;
++ struct desc_struct *ldt;
+ int size;
+ struct mutex lock;
+- void *vdso;
++ unsigned long vdso;
++
++#ifdef CONFIG_X86_32
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++ unsigned long user_cs_base;
++ unsigned long user_cs_limit;
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
++ cpumask_t cpu_user_cs_mask;
++#endif
++
++#endif
++#endif
++
+ } mm_context_t;
+
+ #ifdef CONFIG_SMP
diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu_context.h linux-2.6.32.21/arch/x86/include/asm/mmu_context.h
---- linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/mmu_context.h 2010-09-13 08:10:06.000000000 -0400
@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7660,38 +7973,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu_context.h linux-2.6.32.21/ar
}
#define activate_mm(prev, next) \
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/mmu.h linux-2.6.32.21/arch/x86/include/asm/mmu.h
---- linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/mmu.h 2010-08-13 18:34:40.000000000 -0400
-@@ -9,10 +9,23 @@
- * we put the segment information here.
- */
- typedef struct {
-- void *ldt;
-+ struct desc_struct *ldt;
- int size;
- struct mutex lock;
-- void *vdso;
-+ unsigned long vdso;
-+
-+#ifdef CONFIG_X86_32
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+ unsigned long user_cs_base;
-+ unsigned long user_cs_limit;
-+
-+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+ cpumask_t cpu_user_cs_mask;
-+#endif
-+
-+#endif
-+#endif
-+
- } mm_context_t;
-
- #ifdef CONFIG_SMP
diff -urNp linux-2.6.32.21/arch/x86/include/asm/module.h linux-2.6.32.21/arch/x86/include/asm/module.h
---- linux-2.6.32.21/arch/x86/include/asm/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/module.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/module.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/module.h 2010-09-13 08:10:06.000000000 -0400
@@ -59,13 +59,31 @@
#error unknown processor family
#endif
@@ -7726,8 +8010,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/module.h linux-2.6.32.21/arch/x8
#endif /* _ASM_X86_MODULE_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/page_32_types.h linux-2.6.32.21/arch/x86/include/asm/page_32_types.h
---- linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/page_32_types.h 2010-09-13 08:10:06.000000000 -0400
@@ -15,6 +15,10 @@
*/
#define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
@@ -7740,8 +8024,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/page_32_types.h linux-2.6.32.21/
#define THREAD_ORDER 0
#else
diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt.h linux-2.6.32.21/arch/x86/include/asm/paravirt.h
---- linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/paravirt.h 2010-09-13 08:10:06.000000000 -0400
@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
pv_mmu_ops.set_fixmap(idx, phys, flags);
}
@@ -7796,8 +8080,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt.h linux-2.6.32.21/arch/
#endif /* __ASSEMBLY__ */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h
---- linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h 2010-09-13 08:10:06.000000000 -0400
@@ -316,6 +316,12 @@ struct pv_mmu_ops {
an mfn. We can tell which is which from the index. */
void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
@@ -7812,8 +8096,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/paravirt_types.h linux-2.6.32.21
struct raw_spinlock;
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pci_x86.h linux-2.6.32.21/arch/x86/include/asm/pci_x86.h
---- linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pci_x86.h 2010-09-13 08:10:06.000000000 -0400
@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
extern void (*pcibios_disable_irq)(struct pci_dev *dev);
@@ -7837,8 +8121,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pci_x86.h linux-2.6.32.21/arch/x
/* arch_initcall level */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgalloc.h linux-2.6.32.21/arch/x86/include/asm/pgalloc.h
---- linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgalloc.h 2010-09-13 08:10:06.000000000 -0400
@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
pmd_t *pmd, pte_t *pte)
{
@@ -7854,8 +8138,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgalloc.h linux-2.6.32.21/arch/x
}
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h 2010-09-13 08:10:06.000000000 -0400
@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7866,85 +8150,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.21
}
static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-08-13 18:34:40.000000000 -0400
-@@ -26,8 +26,6 @@
- struct mm_struct;
- struct vm_area_struct;
-
--extern pgd_t swapper_pg_dir[1024];
--
- static inline void pgtable_cache_init(void) { }
- static inline void check_pgt_cache(void) { }
- void paging_init(void);
-@@ -48,6 +46,11 @@ extern void set_pmd_pfn(unsigned long, u
- # include <asm/pgtable-2level.h>
- #endif
-
-+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-+#ifdef CONFIG_X86_PAE
-+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
-+#endif
-+
- #if defined(CONFIG_HIGHPTE)
- #define __KM_PTE \
- (in_nmi() ? KM_NMI_PTE : \
-@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
- /* Clear a kernel PTE and flush it from the TLB */
- #define kpte_clear_flush(ptep, vaddr) \
- do { \
-+ pax_open_kernel(); \
- pte_clear(&init_mm, (vaddr), (ptep)); \
-+ pax_close_kernel(); \
- __flush_tlb_one((vaddr)); \
- } while (0)
-
-@@ -84,6 +89,9 @@ do { \
-
- #endif /* !__ASSEMBLY__ */
-
-+#define HAVE_ARCH_UNMAPPED_AREA
-+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-+
- /*
- * kern_addr_valid() is (1) for FLATMEM and (0) for
- * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-08-13 18:34:40.000000000 -0400
-@@ -8,7 +8,7 @@
- */
- #ifdef CONFIG_X86_PAE
- # include <asm/pgtable-3level_types.h>
--# define PMD_SIZE (1UL << PMD_SHIFT)
-+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
- # define PMD_MASK (~(PMD_SIZE - 1))
- #else
- # include <asm/pgtable-2level_types.h>
-@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set
- # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
- #endif
-
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifndef __ASSEMBLY__
-+extern unsigned char MODULES_EXEC_VADDR[];
-+extern unsigned char MODULES_EXEC_END[];
-+#endif
-+#include <asm/boot.h>
-+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
-+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
-+#else
-+#define ktla_ktva(addr) (addr)
-+#define ktva_ktla(addr) (addr)
-+#endif
-+
- #define MODULES_VADDR VMALLOC_START
- #define MODULES_END VMALLOC_END
- #define MODULES_LEN (MODULES_VADDR - MODULES_END)
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h 2010-09-13 08:10:06.000000000 -0400
@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7962,62 +8170,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.21
}
/*
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-08-13 18:34:40.000000000 -0400
-@@ -16,10 +16,13 @@
-
- extern pud_t level3_kernel_pgt[512];
- extern pud_t level3_ident_pgt[512];
-+extern pud_t level3_vmalloc_pgt[512];
-+extern pud_t level3_vmemmap_pgt[512];
-+extern pud_t level2_vmemmap_pgt[512];
- extern pmd_t level2_kernel_pgt[512];
- extern pmd_t level2_fixmap_pgt[512];
--extern pmd_t level2_ident_pgt[512];
--extern pgd_t init_level4_pgt[];
-+extern pmd_t level2_ident_pgt[512*2];
-+extern pgd_t init_level4_pgt[512];
-
- #define swapper_pg_dir init_level4_pgt
-
-@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
-
- static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
- {
-+ pax_open_kernel();
- *pmdp = pmd;
-+ pax_close_kernel();
- }
-
- static inline void native_pmd_clear(pmd_t *pmd)
-@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_
-
- static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
- {
-+ pax_open_kernel();
- *pgdp = pgd;
-+ pax_close_kernel();
- }
-
- static inline void native_pgd_clear(pgd_t *pgd)
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-08-29 21:40:54.000000000 -0400
-@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
- #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
- #define MODULES_END _AC(0xffffffffff000000, UL)
- #define MODULES_LEN (MODULES_END - MODULES_VADDR)
-+#define MODULES_EXEC_VADDR MODULES_VADDR
-+#define MODULES_EXEC_END MODULES_END
-+
-+#define ktla_ktva(addr) (addr)
-+#define ktva_ktla(addr) (addr)
-
- #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable.h linux-2.6.32.21/arch/x86/include/asm/pgtable.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable.h 2010-09-13 08:10:06.000000000 -0400
@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
#define arch_end_context_switch(prev) do {} while(0)
@@ -8187,9 +8342,138 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable.h linux-2.6.32.21/arch/x
#include <asm-generic/pgtable.h>
#endif /* __ASSEMBLY__ */
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32.h 2010-09-13 08:10:06.000000000 -0400
+@@ -26,8 +26,6 @@
+ struct mm_struct;
+ struct vm_area_struct;
+
+-extern pgd_t swapper_pg_dir[1024];
+-
+ static inline void pgtable_cache_init(void) { }
+ static inline void check_pgt_cache(void) { }
+ void paging_init(void);
+@@ -48,6 +46,11 @@ extern void set_pmd_pfn(unsigned long, u
+ # include <asm/pgtable-2level.h>
+ #endif
+
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++#ifdef CONFIG_X86_PAE
++extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
++#endif
++
+ #if defined(CONFIG_HIGHPTE)
+ #define __KM_PTE \
+ (in_nmi() ? KM_NMI_PTE : \
+@@ -72,7 +75,9 @@ extern void set_pmd_pfn(unsigned long, u
+ /* Clear a kernel PTE and flush it from the TLB */
+ #define kpte_clear_flush(ptep, vaddr) \
+ do { \
++ pax_open_kernel(); \
+ pte_clear(&init_mm, (vaddr), (ptep)); \
++ pax_close_kernel(); \
+ __flush_tlb_one((vaddr)); \
+ } while (0)
+
+@@ -84,6 +89,9 @@ do { \
+
+ #endif /* !__ASSEMBLY__ */
+
++#define HAVE_ARCH_UNMAPPED_AREA
++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
++
+ /*
+ * kern_addr_valid() is (1) for FLATMEM and (0) for
+ * SPARSEMEM and DISCONTIGMEM
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable_32_types.h 2010-09-13 08:10:06.000000000 -0400
+@@ -8,7 +8,7 @@
+ */
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level_types.h>
+-# define PMD_SIZE (1UL << PMD_SHIFT)
++# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
+ # define PMD_MASK (~(PMD_SIZE - 1))
+ #else
+ # include <asm/pgtable-2level_types.h>
+@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set
+ # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
+ #endif
+
++#ifdef CONFIG_PAX_KERNEXEC
++#ifndef __ASSEMBLY__
++extern unsigned char MODULES_EXEC_VADDR[];
++extern unsigned char MODULES_EXEC_END[];
++#endif
++#include <asm/boot.h>
++#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
++#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
++#else
++#define ktla_ktva(addr) (addr)
++#define ktva_ktla(addr) (addr)
++#endif
++
+ #define MODULES_VADDR VMALLOC_START
+ #define MODULES_END VMALLOC_END
+ #define MODULES_LEN (MODULES_VADDR - MODULES_END)
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64.h 2010-09-13 08:10:06.000000000 -0400
+@@ -16,10 +16,13 @@
+
+ extern pud_t level3_kernel_pgt[512];
+ extern pud_t level3_ident_pgt[512];
++extern pud_t level3_vmalloc_pgt[512];
++extern pud_t level3_vmemmap_pgt[512];
++extern pud_t level2_vmemmap_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pmd_t level2_fixmap_pgt[512];
+-extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
++extern pmd_t level2_ident_pgt[512*2];
++extern pgd_t init_level4_pgt[512];
+
+ #define swapper_pg_dir init_level4_pgt
+
+@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
+
+ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
+ {
++ pax_open_kernel();
+ *pmdp = pmd;
++ pax_close_kernel();
+ }
+
+ static inline void native_pmd_clear(pmd_t *pmd)
+@@ -94,7 +99,9 @@ static inline void native_pud_clear(pud_
+
+ static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
+ {
++ pax_open_kernel();
+ *pgdp = pgd;
++ pax_close_kernel();
+ }
+
+ static inline void native_pgd_clear(pgd_t *pgd)
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable_64_types.h 2010-09-13 08:10:06.000000000 -0400
+@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
+ #define MODULES_END _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
++
++#define ktla_ktva(addr) (addr)
++#define ktva_ktla(addr) (addr)
+
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h
---- linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h 2010-09-13 08:10:06.000000000 -0400
@@ -16,12 +16,11 @@
#define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
#define _PAGE_BIT_PAT 7 /* on 4KB pages */
@@ -8311,8 +8595,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/pgtable_types.h linux-2.6.32.21/
#define pgprot_writecombine pgprot_writecombine
extern pgprot_t pgprot_writecombine(pgprot_t prot);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/processor.h linux-2.6.32.21/arch/x86/include/asm/processor.h
---- linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/processor.h 2010-09-13 08:10:06.000000000 -0400
@@ -272,7 +272,7 @@ struct tss_struct {
} ____cacheline_aligned;
@@ -8398,8 +8682,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/processor.h linux-2.6.32.21/arch
/* Get/set a process' ability to use the timestamp counter instruction */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/ptrace.h linux-2.6.32.21/arch/x86/include/asm/ptrace.h
---- linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/ptrace.h 2010-09-13 08:10:06.000000000 -0400
@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
}
@@ -8437,8 +8721,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/ptrace.h linux-2.6.32.21/arch/x8
}
diff -urNp linux-2.6.32.21/arch/x86/include/asm/reboot.h linux-2.6.32.21/arch/x86/include/asm/reboot.h
---- linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/reboot.h 2010-09-13 08:10:06.000000000 -0400
@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
void native_machine_crash_shutdown(struct pt_regs *regs);
@@ -8449,8 +8733,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/reboot.h linux-2.6.32.21/arch/x8
typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);
diff -urNp linux-2.6.32.21/arch/x86/include/asm/rwsem.h linux-2.6.32.21/arch/x86/include/asm/rwsem.h
---- linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/rwsem.h 2010-09-13 08:10:06.000000000 -0400
@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
{
asm volatile("# beginning down_read\n\t"
@@ -8687,8 +8971,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/rwsem.h linux-2.6.32.21/arch/x86
: : "memory");
diff -urNp linux-2.6.32.21/arch/x86/include/asm/segment.h linux-2.6.32.21/arch/x86/include/asm/segment.h
---- linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/segment.h 2010-09-13 08:10:06.000000000 -0400
@@ -62,8 +62,8 @@
* 26 - ESPFIX small SS
* 27 - per-cpu [ offset to per-cpu data area ]
@@ -8758,8 +9042,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/segment.h linux-2.6.32.21/arch/x
#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
diff -urNp linux-2.6.32.21/arch/x86/include/asm/spinlock.h linux-2.6.32.21/arch/x86/include/asm/spinlock.h
---- linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/spinlock.h 2010-09-13 08:10:06.000000000 -0400
@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
static inline void __raw_read_lock(raw_rwlock_t *rw)
{
@@ -8864,8 +9148,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/spinlock.h linux-2.6.32.21/arch/
}
diff -urNp linux-2.6.32.21/arch/x86/include/asm/system.h linux-2.6.32.21/arch/x86/include/asm/system.h
---- linux-2.6.32.21/arch/x86/include/asm/system.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/system.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/system.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/system.h 2010-09-13 08:10:06.000000000 -0400
@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
{
unsigned long __limit;
@@ -8884,9 +9168,249 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/system.h linux-2.6.32.21/arch/x8
extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
void default_idle(void);
+diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-09-13 08:10:06.000000000 -0400
+@@ -8,12 +8,15 @@
+ #include <linux/thread_info.h>
+ #include <linux/prefetch.h>
+ #include <linux/string.h>
++#include <linux/sched.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+ * The fs value determines whether argument validity checking should be
+ * performed or not. If get_fs() == USER_DS, checking is performed, with
+@@ -29,7 +32,12 @@
+
+ #define get_ds() (KERNEL_DS)
+ #define get_fs() (current_thread_info()->addr_limit)
++#ifdef CONFIG_X86_32
++void __set_fs(mm_segment_t x, int cpu);
++void set_fs(mm_segment_t x);
++#else
+ #define set_fs(x) (current_thread_info()->addr_limit = (x))
++#endif
+
+ #define segment_eq(a, b) ((a).seg == (b).seg)
+
+@@ -77,7 +85,33 @@
+ * 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) \
++({ \
++ long __size = size; \
++ unsigned long __addr = (unsigned long)addr; \
++ unsigned long __addr_ao = __addr & PAGE_MASK; \
++ unsigned long __end_ao = __addr + __size - 1; \
++ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
++ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
++ while(__addr_ao <= __end_ao) { \
++ char __c_ao; \
++ __addr_ao += PAGE_SIZE; \
++ if (__size > PAGE_SIZE) \
++ cond_resched(); \
++ if (__get_user(__c_ao, (char __user *)__addr)) \
++ break; \
++ if (type != VERIFY_WRITE) { \
++ __addr = __addr_ao; \
++ continue; \
++ } \
++ if (__put_user(__c_ao, (char __user *)__addr)) \
++ break; \
++ __addr = __addr_ao; \
++ } \
++ } \
++ __ret_ao; \
++})
+
+ /*
+ * The exception table consists of pairs of addresses: the first is the
+@@ -179,17 +213,34 @@ extern int __get_user_bad(void);
+ __ret_gu; \
+ })
+
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define __put_user_x(size, x, ptr, __ret_pu) \
++ ({ \
++ int __dummy; \
++ asm volatile("call __put_user_" #size : "=a" (__ret_pu), "=c" (__dummy) \
++ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx"); \
++ })
++#else
+ #define __put_user_x(size, x, ptr, __ret_pu) \
+ asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
+ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
++#endif
+
+-
++#ifdef CONFIG_X86_32
++#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
++#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
++#else
++#define _ASM_LOAD_USER_DS(ds)
++#define _ASM_LOAD_KERNEL_DS
++#endif
+
+ #ifdef CONFIG_X86_32
+ #define __put_user_asm_u64(x, addr, err, errret) \
+- asm volatile("1: movl %%eax,0(%2)\n" \
+- "2: movl %%edx,4(%2)\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: movl %%eax,%%ds:0(%2)\n" \
++ "2: movl %%edx,%%ds:4(%2)\n" \
+ "3:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "4: movl %3,%0\n" \
+ " jmp 3b\n" \
+@@ -197,15 +248,18 @@ extern int __get_user_bad(void);
+ _ASM_EXTABLE(1b, 4b) \
+ _ASM_EXTABLE(2b, 4b) \
+ : "=r" (err) \
+- : "A" (x), "r" (addr), "i" (errret), "0" (err))
++ : "A" (x), "r" (addr), "i" (errret), "0" (err), \
++ "r"(__USER_DS))
+
+ #define __put_user_asm_ex_u64(x, addr) \
+- asm volatile("1: movl %%eax,0(%1)\n" \
+- "2: movl %%edx,4(%1)\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: movl %%eax,%%ds:0(%1)\n" \
++ "2: movl %%edx,%%ds:4(%1)\n" \
+ "3:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+ _ASM_EXTABLE(2b, 3b - 2b) \
+- : : "A" (x), "r" (addr))
++ : : "A" (x), "r" (addr), "r"(__USER_DS))
+
+ #define __put_user_x8(x, ptr, __ret_pu) \
+ asm volatile("call __put_user_8" : "=a" (__ret_pu) \
+@@ -374,16 +428,18 @@ do { \
+ } while (0)
+
+ #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
+- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: mov"itype" %%ds:%2,%"rtype"1\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "3: mov %3,%0\n" \
+ " xor"itype" %"rtype"1,%"rtype"1\n" \
+ " jmp 2b\n" \
+ ".previous\n" \
+ _ASM_EXTABLE(1b, 3b) \
+- : "=r" (err), ltype(x) \
+- : "m" (__m(addr)), "i" (errret), "0" (err))
++ : "=r" (err), ltype (x) \
++ : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
+
+ #define __get_user_size_ex(x, ptr, size) \
+ do { \
+@@ -407,10 +463,12 @@ do { \
+ } while (0)
+
+ #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
+- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: mov"itype" %%ds:%1,%"rtype"0\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+- : ltype(x) : "m" (__m(addr)))
++ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
+
+ #define __put_user_nocheck(x, ptr, size) \
+ ({ \
+@@ -424,13 +482,24 @@ 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; \
+ })
+
+ /* FIXME: this hack is definitely wrong -AK */
+ struct __large_struct { unsigned long buf[100]; };
+-#define __m(x) (*(struct __large_struct __user *)(x))
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define ____m(x) \
++({ \
++ unsigned long ____x = (unsigned long)(x); \
++ if (____x < PAX_USER_SHADOW_BASE) \
++ ____x += PAX_USER_SHADOW_BASE; \
++ (void __user *)____x; \
++})
++#else
++#define ____m(x) (x)
++#endif
++#define __m(x) (*(struct __large_struct __user *)____m(x))
+
+ /*
+ * Tell gcc we read from memory instead of writing: this is because
+@@ -438,21 +507,26 @@ struct __large_struct { unsigned long bu
+ * aliasing issues.
+ */
+ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
+- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
++ asm volatile(_ASM_LOAD_USER_DS(5) \
++ "1: mov"itype" %"rtype"1,%%ds:%2\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ ".section .fixup,\"ax\"\n" \
+ "3: mov %3,%0\n" \
+ " jmp 2b\n" \
+ ".previous\n" \
+ _ASM_EXTABLE(1b, 3b) \
+ : "=r"(err) \
+- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
++ "r"(__USER_DS))
+
+ #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
+- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
++ asm volatile(_ASM_LOAD_USER_DS(2) \
++ "1: mov"itype" %"rtype"0,%%ds:%1\n" \
+ "2:\n" \
++ _ASM_LOAD_KERNEL_DS \
+ _ASM_EXTABLE(1b, 2b - 1b) \
+- : : ltype(x), "m" (__m(addr)))
++ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
+
+ /*
+ * uaccess_try and catch
+@@ -530,7 +604,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 +641,7 @@ extern struct movsl_mask {
+
+ #define ARCH_HAS_NOCACHE_UACCESS 1
+
++#define ARCH_HAS_SORT_EXTABLE
+ #ifdef CONFIG_X86_32
+ # include "uaccess_32.h"
+ #else
diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h 2010-09-13 08:10:06.000000000 -0400
@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
static __always_inline unsigned long __must_check
__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
@@ -9017,8 +9541,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_32.h linux-2.6.32.21/arc
long count);
long __must_check __strncpy_from_user(char *dst,
diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h 2010-09-13 08:10:06.000000000 -0400
@@ -9,6 +9,9 @@
#include <linux/prefetch.h>
#include <linux/lockdep.h>
@@ -9210,249 +9734,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess_64.h linux-2.6.32.21/arc
copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
#endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.21/arch/x86/include/asm/uaccess.h linux-2.6.32.21/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/uaccess.h 2010-08-13 18:34:40.000000000 -0400
-@@ -8,12 +8,15 @@
- #include <linux/thread_info.h>
- #include <linux/prefetch.h>
- #include <linux/string.h>
-+#include <linux/sched.h>
- #include <asm/asm.h>
- #include <asm/page.h>
-
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
-
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+
- /*
- * The fs value determines whether argument validity checking should be
- * performed or not. If get_fs() == USER_DS, checking is performed, with
-@@ -29,7 +32,12 @@
-
- #define get_ds() (KERNEL_DS)
- #define get_fs() (current_thread_info()->addr_limit)
-+#ifdef CONFIG_X86_32
-+void __set_fs(mm_segment_t x, int cpu);
-+void set_fs(mm_segment_t x);
-+#else
- #define set_fs(x) (current_thread_info()->addr_limit = (x))
-+#endif
-
- #define segment_eq(a, b) ((a).seg == (b).seg)
-
-@@ -77,7 +85,33 @@
- * 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) \
-+({ \
-+ long __size = size; \
-+ unsigned long __addr = (unsigned long)addr; \
-+ unsigned long __addr_ao = __addr & PAGE_MASK; \
-+ unsigned long __end_ao = __addr + __size - 1; \
-+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
-+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
-+ while(__addr_ao <= __end_ao) { \
-+ char __c_ao; \
-+ __addr_ao += PAGE_SIZE; \
-+ if (__size > PAGE_SIZE) \
-+ cond_resched(); \
-+ if (__get_user(__c_ao, (char __user *)__addr)) \
-+ break; \
-+ if (type != VERIFY_WRITE) { \
-+ __addr = __addr_ao; \
-+ continue; \
-+ } \
-+ if (__put_user(__c_ao, (char __user *)__addr)) \
-+ break; \
-+ __addr = __addr_ao; \
-+ } \
-+ } \
-+ __ret_ao; \
-+})
-
- /*
- * The exception table consists of pairs of addresses: the first is the
-@@ -179,17 +213,34 @@ extern int __get_user_bad(void);
- __ret_gu; \
- })
-
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define __put_user_x(size, x, ptr, __ret_pu) \
-+ ({ \
-+ int __dummy; \
-+ asm volatile("call __put_user_" #size : "=a" (__ret_pu), "=c" (__dummy) \
-+ : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx"); \
-+ })
-+#else
- #define __put_user_x(size, x, ptr, __ret_pu) \
- asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
- : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
-+#endif
-
--
-+#ifdef CONFIG_X86_32
-+#define _ASM_LOAD_USER_DS(ds) "movw %w" #ds ",%%ds\n"
-+#define _ASM_LOAD_KERNEL_DS "pushl %%ss; popl %%ds\n"
-+#else
-+#define _ASM_LOAD_USER_DS(ds)
-+#define _ASM_LOAD_KERNEL_DS
-+#endif
-
- #ifdef CONFIG_X86_32
- #define __put_user_asm_u64(x, addr, err, errret) \
-- asm volatile("1: movl %%eax,0(%2)\n" \
-- "2: movl %%edx,4(%2)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: movl %%eax,%%ds:0(%2)\n" \
-+ "2: movl %%edx,%%ds:4(%2)\n" \
- "3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "4: movl %3,%0\n" \
- " jmp 3b\n" \
-@@ -197,15 +248,18 @@ extern int __get_user_bad(void);
- _ASM_EXTABLE(1b, 4b) \
- _ASM_EXTABLE(2b, 4b) \
- : "=r" (err) \
-- : "A" (x), "r" (addr), "i" (errret), "0" (err))
-+ : "A" (x), "r" (addr), "i" (errret), "0" (err), \
-+ "r"(__USER_DS))
-
- #define __put_user_asm_ex_u64(x, addr) \
-- asm volatile("1: movl %%eax,0(%1)\n" \
-- "2: movl %%edx,4(%1)\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: movl %%eax,%%ds:0(%1)\n" \
-+ "2: movl %%edx,%%ds:4(%1)\n" \
- "3:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
- _ASM_EXTABLE(2b, 3b - 2b) \
-- : : "A" (x), "r" (addr))
-+ : : "A" (x), "r" (addr), "r"(__USER_DS))
-
- #define __put_user_x8(x, ptr, __ret_pu) \
- asm volatile("call __put_user_8" : "=a" (__ret_pu) \
-@@ -374,16 +428,18 @@ do { \
- } while (0)
-
- #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %%ds:%2,%"rtype"1\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "3: mov %3,%0\n" \
- " xor"itype" %"rtype"1,%"rtype"1\n" \
- " jmp 2b\n" \
- ".previous\n" \
- _ASM_EXTABLE(1b, 3b) \
-- : "=r" (err), ltype(x) \
-- : "m" (__m(addr)), "i" (errret), "0" (err))
-+ : "=r" (err), ltype (x) \
-+ : "m" (__m(addr)), "i" (errret), "0" (err), "r"(__USER_DS))
-
- #define __get_user_size_ex(x, ptr, size) \
- do { \
-@@ -407,10 +463,12 @@ do { \
- } while (0)
-
- #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
-- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %%ds:%1,%"rtype"0\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
-- : ltype(x) : "m" (__m(addr)))
-+ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS))
-
- #define __put_user_nocheck(x, ptr, size) \
- ({ \
-@@ -424,13 +482,24 @@ 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; \
- })
-
- /* FIXME: this hack is definitely wrong -AK */
- struct __large_struct { unsigned long buf[100]; };
--#define __m(x) (*(struct __large_struct __user *)(x))
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define ____m(x) \
-+({ \
-+ unsigned long ____x = (unsigned long)(x); \
-+ if (____x < PAX_USER_SHADOW_BASE) \
-+ ____x += PAX_USER_SHADOW_BASE; \
-+ (void __user *)____x; \
-+})
-+#else
-+#define ____m(x) (x)
-+#endif
-+#define __m(x) (*(struct __large_struct __user *)____m(x))
-
- /*
- * Tell gcc we read from memory instead of writing: this is because
-@@ -438,21 +507,26 @@ struct __large_struct { unsigned long bu
- * aliasing issues.
- */
- #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
-- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(5) \
-+ "1: mov"itype" %"rtype"1,%%ds:%2\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- ".section .fixup,\"ax\"\n" \
- "3: mov %3,%0\n" \
- " jmp 2b\n" \
- ".previous\n" \
- _ASM_EXTABLE(1b, 3b) \
- : "=r"(err) \
-- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err),\
-+ "r"(__USER_DS))
-
- #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
-- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
-+ asm volatile(_ASM_LOAD_USER_DS(2) \
-+ "1: mov"itype" %"rtype"0,%%ds:%1\n" \
- "2:\n" \
-+ _ASM_LOAD_KERNEL_DS \
- _ASM_EXTABLE(1b, 2b - 1b) \
-- : : ltype(x), "m" (__m(addr)))
-+ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS))
-
- /*
- * uaccess_try and catch
-@@ -530,7 +604,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 +641,7 @@ extern struct movsl_mask {
-
- #define ARCH_HAS_NOCACHE_UACCESS 1
-
-+#define ARCH_HAS_SORT_EXTABLE
- #ifdef CONFIG_X86_32
- # include "uaccess_32.h"
- #else
diff -urNp linux-2.6.32.21/arch/x86/include/asm/vgtod.h linux-2.6.32.21/arch/x86/include/asm/vgtod.h
---- linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/vgtod.h 2010-09-13 08:10:06.000000000 -0400
@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
int sysctl_enabled;
struct timezone sys_tz;
@@ -9462,8 +9746,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vgtod.h linux-2.6.32.21/arch/x86
cycle_t cycle_last;
cycle_t mask;
diff -urNp linux-2.6.32.21/arch/x86/include/asm/vmi.h linux-2.6.32.21/arch/x86/include/asm/vmi.h
---- linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/vmi.h 2010-09-13 08:10:06.000000000 -0400
@@ -191,6 +191,7 @@ struct vrom_header {
u8 reserved[96]; /* Reserved for headers */
char vmi_init[8]; /* VMI_Init jump point */
@@ -9473,8 +9757,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vmi.h linux-2.6.32.21/arch/x86/i
struct pnp_header {
diff -urNp linux-2.6.32.21/arch/x86/include/asm/vsyscall.h linux-2.6.32.21/arch/x86/include/asm/vsyscall.h
---- linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/vsyscall.h 2010-09-13 08:10:06.000000000 -0400
@@ -15,9 +15,10 @@ enum vsyscall_num {
#ifdef __KERNEL__
@@ -9506,8 +9790,8 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/vsyscall.h linux-2.6.32.21/arch/
#endif /* _ASM_X86_VSYSCALL_H */
diff -urNp linux-2.6.32.21/arch/x86/include/asm/xsave.h linux-2.6.32.21/arch/x86/include/asm/xsave.h
---- linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/include/asm/xsave.h 2010-09-13 08:10:06.000000000 -0400
@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
static inline int xsave_user(struct xsave_struct __user *buf)
{
@@ -9533,118 +9817,9 @@ diff -urNp linux-2.6.32.21/arch/x86/include/asm/xsave.h linux-2.6.32.21/arch/x86
__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
"2:\n"
".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig linux-2.6.32.21/arch/x86/Kconfig
---- linux-2.6.32.21/arch/x86/Kconfig 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig 2010-08-29 21:09:26.000000000 -0400
-@@ -997,7 +997,7 @@ choice
-
- config NOHIGHMEM
- bool "off"
-- depends on !X86_NUMAQ
-+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
- ---help---
- Linux can use up to 64 Gigabytes of physical memory on x86 systems.
- However, the address space of 32-bit x86 processors is only 4
-@@ -1034,7 +1034,7 @@ config NOHIGHMEM
-
- config HIGHMEM4G
- bool "4GB"
-- depends on !X86_NUMAQ
-+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
- ---help---
- Select this if you have a 32-bit processor and between 1 and 4
- gigabytes of physical RAM.
-@@ -1088,7 +1088,7 @@ config PAGE_OFFSET
- hex
- default 0xB0000000 if VMSPLIT_3G_OPT
- default 0x80000000 if VMSPLIT_2G
-- default 0x78000000 if VMSPLIT_2G_OPT
-+ default 0x70000000 if VMSPLIT_2G_OPT
- default 0x40000000 if VMSPLIT_1G
- default 0xC0000000
- depends on X86_32
-@@ -1419,7 +1419,7 @@ config ARCH_USES_PG_UNCACHED
-
- config EFI
- bool "EFI runtime service support"
-- depends on ACPI
-+ depends on ACPI && !PAX_KERNEXEC
- ---help---
- This enables the kernel to use EFI runtime services that are
- available (such as the EFI variable services).
-@@ -1506,6 +1506,7 @@ config KEXEC_JUMP
- config PHYSICAL_START
- hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
- default "0x1000000"
-+ range 0x400000 0x40000000
- ---help---
- This gives the physical address where the kernel is loaded.
-
-@@ -1570,6 +1571,7 @@ config PHYSICAL_ALIGN
- hex
- prompt "Alignment value to which kernel should be aligned" if X86_32
- default "0x1000000"
-+ range 0x400000 0x1000000 if PAX_KERNEXEC
- range 0x2000 0x1000000
- ---help---
- This value puts the alignment restrictions on physical address
-@@ -1601,9 +1603,10 @@ config HOTPLUG_CPU
- Say N if you want to disable CPU hotplug.
-
- config COMPAT_VDSO
-- def_bool y
-+ def_bool n
- prompt "Compat VDSO support"
- depends on X86_32 || IA32_EMULATION
-+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- ---help---
- Map the 32-bit VDSO to the predictable old-style address too.
- ---help---
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig.cpu linux-2.6.32.21/arch/x86/Kconfig.cpu
---- linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig.cpu 2010-08-13 18:34:40.000000000 -0400
-@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
-
- config X86_F00F_BUG
- def_bool y
-- depends on M586MMX || M586TSC || M586 || M486 || M386
-+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
-
- config X86_WP_WORKS_OK
- def_bool y
-@@ -360,7 +360,7 @@ config X86_POPAD_OK
-
- config X86_ALIGNMENT_16
- def_bool y
-- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-
- config X86_INTEL_USERCOPY
- def_bool y
-@@ -406,7 +406,7 @@ config X86_CMPXCHG64
- # generates cmov.
- config X86_CMOV
- def_bool y
-- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
-+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
-
- config X86_MINIMUM_CPU_FAMILY
- int
-diff -urNp linux-2.6.32.21/arch/x86/Kconfig.debug linux-2.6.32.21/arch/x86/Kconfig.debug
---- linux-2.6.32.21/arch/x86/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Kconfig.debug 2010-08-13 18:34:40.000000000 -0400
-@@ -99,7 +99,7 @@ config X86_PTDUMP
- config DEBUG_RODATA
- bool "Write protect kernel read-only data structures"
- default y
-- depends on DEBUG_KERNEL
-+ depends on DEBUG_KERNEL && BROKEN
- ---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.32.21/arch/x86/kernel/acpi/boot.c linux-2.6.32.21/arch/x86/kernel/acpi/boot.c
---- linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/acpi/boot.c 2010-09-13 08:10:06.000000000 -0400
@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
},
@@ -9655,8 +9830,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/boot.c linux-2.6.32.21/arch/x86/
/*
diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S 2010-09-13 08:10:06.000000000 -0400
@@ -104,7 +104,7 @@ _start:
movl %eax, %ecx
orl %edx, %ecx
@@ -9667,8 +9842,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32.2
1:
diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c
---- linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c 2010-09-13 08:10:06.000000000 -0400
@@ -11,11 +11,12 @@
#include <linux/cpumask.h>
#include <asm/segment.h>
@@ -9714,8 +9889,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/sleep.c linux-2.6.32.21/arch/x86
diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S
---- linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -30,13 +30,11 @@ wakeup_pmode_return:
# and restore the stack ... but you need gdt for this to work
movl saved_context_esp, %esp
@@ -9733,8 +9908,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32.21/arch
bogus_magic:
jmp bogus_magic
diff -urNp linux-2.6.32.21/arch/x86/kernel/alternative.c linux-2.6.32.21/arch/x86/kernel/alternative.c
---- linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/alternative.c 2010-09-13 08:10:06.000000000 -0400
@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
BUG_ON(p->len > MAX_PATCH_LEN);
@@ -9818,8 +9993,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/alternative.c linux-2.6.32.21/arch/x8
return addr;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/amd_iommu.c linux-2.6.32.21/arch/x86/kernel/amd_iommu.c
---- linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/amd_iommu.c 2010-09-13 08:10:06.000000000 -0400
@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
}
}
@@ -9830,8 +10005,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/amd_iommu.c linux-2.6.32.21/arch/x86/
.free_coherent = free_coherent,
.map_page = map_page,
diff -urNp linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c
---- linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c 2010-09-13 08:10:06.000000000 -0400
@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
GFP_ATOMIC);
@@ -9869,8 +10044,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/apic/io_apic.c linux-2.6.32.21/arch/x
spin_unlock(&vector_lock);
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/apm_32.c linux-2.6.32.21/arch/x86/kernel/apm_32.c
---- linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/apm_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
* This is for buggy BIOS's that refer to (real mode) segment 0x40
* even though they are called in protected mode.
@@ -9973,8 +10148,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/apm_32.c linux-2.6.32.21/arch/x86/ker
proc_create("apm", 0, NULL, &apm_file_ops);
diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c
---- linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -115,6 +115,11 @@ void foo(void)
OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
@@ -9988,8 +10163,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_32.c linux-2.6.32.21/arch
#ifdef CONFIG_XEN
diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c
---- linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -63,6 +63,18 @@ int main(void)
OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
@@ -10017,9 +10192,23 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.21/arch
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.32.21/arch/x86/kernel/cpu/Makefile linux-2.6.32.21/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-09-13 08:10:06.000000000 -0400
+@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
+ CFLAGS_REMOVE_common.o = -pg
+ endif
+
+-# Make sure load_percpu_segment has no stackprotector
+-nostackp := $(call cc-option, -fno-stack-protector)
+-CFLAGS_common.o := $(nostackp)
+-
+ obj-y := intel_cacheinfo.o addon_cpuid_features.o
+ obj-y += proc.o capflags.o powerflags.o common.o
+ obj-y += vmware.o hypervisor.o sched.o
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/common.c linux-2.6.32.21/arch/x86/kernel/cpu/common.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/common.c 2010-09-13 08:10:06.000000000 -0400
@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10129,8 +10318,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/common.c linux-2.6.32.21/arch/x86
if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-09-13 08:10:06.000000000 -0400
@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
},
@@ -10141,8 +10330,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-09-13 08:10:06.000000000 -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 },
@@ -10153,8 +10342,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linu
#undef _BANIAS
#undef BANIAS
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel.c linux-2.6.32.21/arch/x86/kernel/cpu/intel.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/intel.c 2010-09-13 08:10:06.000000000 -0400
@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug
* Update the IDT descriptor and reload the IDT so that
* it uses the read-only mapped virtual address.
@@ -10165,8 +10354,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel.c linux-2.6.32.21/arch/x86/
}
#endif
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-09-13 08:10:06.000000000 -0400
@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob
return ret;
}
@@ -10176,35 +10365,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.21
.show = show,
.store = store,
};
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/Makefile linux-2.6.32.21/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/Makefile 2010-08-13 18:34:40.000000000 -0400
-@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_common.o = -pg
- endif
-
--# Make sure load_percpu_segment has no stackprotector
--nostackp := $(call cc-option, -fno-stack-protector)
--CFLAGS_common.o := $(nostackp)
--
- obj-y := intel_cacheinfo.o addon_cpuid_features.o
- obj-y += proc.o capflags.o powerflags.o common.o
- obj-y += vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-13 18:34:40.000000000 -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.32.21/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c 2010-09-13 08:10:06.000000000 -0400
@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
m->cs, m->ip);
@@ -10257,9 +10420,21 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.21/arch
};
/*
+diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-09-13 08:10:06.000000000 -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.32.21/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c 2010-09-13 08:10:06.000000000 -0400
@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
return 0;
}
@@ -10270,8 +10445,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.21/arch/x
.set = amd_set_mtrr,
.get = amd_get_mtrr,
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c 2010-09-13 08:10:06.000000000 -0400
@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
return 0;
}
@@ -10282,8 +10457,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.21/ar
.set = centaur_set_mcr,
.get = centaur_get_mcr,
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-09-13 08:10:06.000000000 -0400
@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
post_set();
}
@@ -10294,8 +10469,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.21/arch
.set_all = cyrix_set_all,
.set = cyrix_set_arr,
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c 2010-09-13 08:10:06.000000000 -0400
@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
{ MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
{ MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */
@@ -10315,8 +10490,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32.21/ar
.set_all = generic_set_all,
.get = generic_get_mtrr,
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c 2010-09-13 08:10:06.000000000 -0400
@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
u64 size_or_mask, size_and_mask;
static bool mtrr_aps_delayed_init;
@@ -10336,8 +10511,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.21/arch/
if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
mtrr_ops[ops->vendor] = ops;
diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-09-13 08:10:06.000000000 -0400
@@ -12,19 +12,19 @@
extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
@@ -10388,9 +10563,21 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.21/arch/
#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.32.21/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c
+--- linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-09-13 08:10:06.000000000 -0400
+@@ -2357,7 +2357,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.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-09-13 08:10:06.000000000 -0400
@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
/* Interface defining a CPU specific perfctr watchdog */
@@ -10424,21 +10611,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.2
static struct wd_ops intel_arch_wd_ops __read_mostly = {
.reserve = single_msr_reserve,
.unreserve = single_msr_unreserve,
-diff -urNp linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c
---- linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/cpu/perf_event.c 2010-08-13 18:34:40.000000000 -0400
-@@ -2357,7 +2357,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.32.21/arch/x86/kernel/crash.c linux-2.6.32.21/arch/x86/kernel/crash.c
---- linux-2.6.32.21/arch/x86/kernel/crash.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/crash.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/crash.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/crash.c 2010-09-13 08:10:06.000000000 -0400
@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
regs = args->regs;
@@ -10449,8 +10624,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/crash.c linux-2.6.32.21/arch/x86/kern
regs = &fixed_regs;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/doublefault_32.c linux-2.6.32.21/arch/x86/kernel/doublefault_32.c
---- linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/doublefault_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -11,7 +11,7 @@
#define DOUBLEFAULT_STACKSIZE (1024)
@@ -10482,9 +10657,39 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/doublefault_32.c linux-2.6.32.21/arch
.fs = __KERNEL_PERCPU,
.__cr3 = __pa_nodebug(swapper_pg_dir),
+diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack.c linux-2.6.32.21/arch/x86/kernel/dumpstack.c
+--- linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-09-13 08:10:06.000000000 -0400
+@@ -180,7 +180,7 @@ void dump_stack(void)
+ #endif
+
+ printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+- current->pid, current->comm, print_tainted(),
++ task_pid_nr(current), current->comm, print_tainted(),
+ init_utsname()->release,
+ (int)strcspn(init_utsname()->version, " "),
+ init_utsname()->version);
+@@ -241,7 +241,7 @@ void __kprobes oops_end(unsigned long fl
+ panic("Fatal exception in interrupt");
+ if (panic_on_oops)
+ panic("Fatal exception");
+- do_exit(signr);
++ do_group_exit(signr);
+ }
+
+ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+@@ -295,7 +295,7 @@ void die(const char *str, struct pt_regs
+ unsigned long flags = oops_begin();
+ int sig = SIGSEGV;
+
+- if (!user_mode_vm(regs))
++ if (!user_mode(regs))
+ report_bug(regs->ip, regs);
+
+ if (__die(str, regs, err))
diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -112,11 +112,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..
@@ -10529,39 +10734,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack_32.c linux-2.6.32.21/arch/x
if (ip < PAGE_OFFSET)
return 0;
if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/dumpstack.c linux-2.6.32.21/arch/x86/kernel/dumpstack.c
---- linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/dumpstack.c 2010-08-13 18:34:40.000000000 -0400
-@@ -180,7 +180,7 @@ void dump_stack(void)
- #endif
-
- printk("Pid: %d, comm: %.20s %s %s %.*s\n",
-- current->pid, current->comm, print_tainted(),
-+ task_pid_nr(current), current->comm, print_tainted(),
- init_utsname()->release,
- (int)strcspn(init_utsname()->version, " "),
- init_utsname()->version);
-@@ -241,7 +241,7 @@ void __kprobes oops_end(unsigned long fl
- panic("Fatal exception in interrupt");
- if (panic_on_oops)
- panic("Fatal exception");
-- do_exit(signr);
-+ do_group_exit(signr);
- }
-
- int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -295,7 +295,7 @@ void die(const char *str, struct pt_regs
- unsigned long flags = oops_begin();
- int sig = SIGSEGV;
-
-- if (!user_mode_vm(regs))
-+ if (!user_mode(regs))
- report_bug(regs->ip, regs);
-
- if (__die(str, regs, err))
diff -urNp linux-2.6.32.21/arch/x86/kernel/e820.c linux-2.6.32.21/arch/x86/kernel/e820.c
---- linux-2.6.32.21/arch/x86/kernel/e820.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/e820.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/e820.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/e820.c 2010-09-13 08:10:06.000000000 -0400
@@ -733,7 +733,7 @@ struct early_res {
};
static struct early_res early_res[MAX_EARLY_RES] __initdata = {
@@ -10572,8 +10747,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/e820.c linux-2.6.32.21/arch/x86/kerne
static int __init find_overlapped_early(u64 start, u64 end)
diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_32.c linux-2.6.32.21/arch/x86/kernel/efi_32.c
---- linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/efi_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -38,70 +38,38 @@
*/
@@ -10655,8 +10830,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_32.c linux-2.6.32.21/arch/x86/ker
/*
* After the lock is released, the original page table is restored.
diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S
---- linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -6,6 +6,7 @@
*/
@@ -10756,8 +10931,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/efi_stub_32.S linux-2.6.32.21/arch/x8
.long 0
efi_rt_function_ptr:
diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_32.S linux-2.6.32.21/arch/x86/kernel/entry_32.S
---- linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/entry_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -191,7 +191,67 @@
#endif /* CONFIG_X86_32_LAZY_GS */
@@ -11069,8 +11244,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_32.S linux-2.6.32.21/arch/x86/k
lss 12+4(%esp), %esp # back to espfix stack
CFI_ADJUST_CFA_OFFSET -24
diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_64.S linux-2.6.32.21/arch/x86/kernel/entry_64.S
---- linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/entry_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -53,6 +53,7 @@
#include <asm/paravirt.h>
#include <asm/ftrace.h>
@@ -11529,8 +11704,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/entry_64.S linux-2.6.32.21/arch/x86/k
jmp irq_return
nmi_userspace:
diff -urNp linux-2.6.32.21/arch/x86/kernel/ftrace.c linux-2.6.32.21/arch/x86/kernel/ftrace.c
---- linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/ftrace.c 2010-09-13 08:10:06.000000000 -0400
@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -11597,8 +11772,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ftrace.c linux-2.6.32.21/arch/x86/ker
return -EFAULT;
diff -urNp linux-2.6.32.21/arch/x86/kernel/head32.c linux-2.6.32.21/arch/x86/kernel/head32.c
---- linux-2.6.32.21/arch/x86/kernel/head32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/head32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/head32.c 2010-09-13 08:10:06.000000000 -0400
@@ -16,6 +16,7 @@
#include <asm/apic.h>
#include <asm/io_apic.h>
@@ -11617,8 +11792,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head32.c linux-2.6.32.21/arch/x86/ker
#ifdef CONFIG_BLK_DEV_INITRD
/* Reserve INITRD */
diff -urNp linux-2.6.32.21/arch/x86/kernel/head_32.S linux-2.6.32.21/arch/x86/kernel/head_32.S
---- linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/head_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -19,10 +19,17 @@
#include <asm/setup.h>
#include <asm/processor-flags.h>
@@ -12066,8 +12241,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head_32.S linux-2.6.32.21/arch/x86/ke
+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
+ .endr
diff -urNp linux-2.6.32.21/arch/x86/kernel/head_64.S linux-2.6.32.21/arch/x86/kernel/head_64.S
---- linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/head_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -19,6 +19,7 @@
#include <asm/cache.h>
#include <asm/processor-flags.h>
@@ -12339,8 +12514,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/head_64.S linux-2.6.32.21/arch/x86/ke
__PAGE_ALIGNED_BSS
.align PAGE_SIZE
diff -urNp linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c
---- linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
EXPORT_SYMBOL(cmpxchg8b_emu);
#endif
@@ -12363,8 +12538,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.21/arch/
+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
+#endif
diff -urNp linux-2.6.32.21/arch/x86/kernel/init_task.c linux-2.6.32.21/arch/x86/kernel/init_task.c
---- linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/init_task.c 2010-09-13 08:10:06.000000000 -0400
@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
* section. Since TSS's are completely CPU-local, we want them
* on exact cacheline boundaries, to eliminate cacheline ping-pong.
@@ -12374,8 +12549,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/init_task.c linux-2.6.32.21/arch/x86/
+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.32.21/arch/x86/kernel/ioport.c linux-2.6.32.21/arch/x86/kernel/ioport.c
---- linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/ioport.c 2010-09-13 08:10:06.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/sched.h>
#include <linux/kernel.h>
@@ -12420,8 +12595,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ioport.c linux-2.6.32.21/arch/x86/ker
return -EPERM;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/irq_32.c linux-2.6.32.21/arch/x86/kernel/irq_32.c
---- linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/irq_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
return 0;
@@ -12441,8 +12616,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/irq_32.c linux-2.6.32.21/arch/x86/ker
call_on_stack(__do_softirq, isp);
/*
diff -urNp linux-2.6.32.21/arch/x86/kernel/kgdb.c linux-2.6.32.21/arch/x86/kernel/kgdb.c
---- linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/kgdb.c 2010-09-13 08:10:06.000000000 -0400
@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
return instruction_pointer(regs);
}
@@ -12453,8 +12628,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/kgdb.c linux-2.6.32.21/arch/x86/kerne
.gdb_bpt_instr = { 0xcc },
.flags = KGDB_HW_BREAKPOINT,
diff -urNp linux-2.6.32.21/arch/x86/kernel/kprobes.c linux-2.6.32.21/arch/x86/kernel/kprobes.c
---- linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/kprobes.c 2010-09-13 08:10:06.000000000 -0400
@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
char op;
s32 raddr;
@@ -12548,8 +12723,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/kprobes.c linux-2.6.32.21/arch/x86/ke
switch (val) {
diff -urNp linux-2.6.32.21/arch/x86/kernel/ldt.c linux-2.6.32.21/arch/x86/kernel/ldt.c
---- linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/ldt.c 2010-09-13 08:10:06.000000000 -0400
@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
if (reload) {
#ifdef CONFIG_SMP
@@ -12615,8 +12790,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ldt.c linux-2.6.32.21/arch/x86/kernel
if (oldmode)
ldt.avl = 0;
diff -urNp linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c
---- linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -26,7 +26,7 @@
#include <asm/system.h>
#include <asm/cacheflush.h>
@@ -12645,8 +12820,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/machine_kexec_32.c linux-2.6.32.21/ar
relocate_kernel_ptr = control_page;
page_list[PA_CONTROL_PAGE] = __pa(control_page);
diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_amd.c linux-2.6.32.21/arch/x86/kernel/microcode_amd.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/microcode_amd.c 2010-09-13 08:10:06.000000000 -0400
@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
uci->mc = NULL;
}
@@ -12666,8 +12841,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_amd.c linux-2.6.32.21/arch/
return &microcode_amd_ops;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_core.c linux-2.6.32.21/arch/x86/kernel/microcode_core.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/microcode_core.c 2010-09-13 08:10:06.000000000 -0400
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
#define MICROCODE_VERSION "2.00"
@@ -12678,8 +12853,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_core.c linux-2.6.32.21/arch
/*
* Synchronization.
diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_intel.c linux-2.6.32.21/arch/x86/kernel/microcode_intel.c
---- linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/microcode_intel.c 2010-09-13 08:10:06.000000000 -0400
@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
static int get_ucode_user(void *to, const void *from, size_t n)
@@ -12715,8 +12890,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/microcode_intel.c linux-2.6.32.21/arc
return &microcode_intel_ops;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/module.c linux-2.6.32.21/arch/x86/kernel/module.c
---- linux-2.6.32.21/arch/x86/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/module.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/module.c 2010-09-13 08:10:06.000000000 -0400
@@ -34,7 +34,7 @@
#define DEBUGP(fmt...)
#endif
@@ -12857,9 +13032,21 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/module.c linux-2.6.32.21/arch/x86/ker
#if 0
if ((s64)val != *(s32 *)loc)
goto overflow;
+diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-09-13 08:10:06.000000000 -0400
+@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
+ __raw_spin_lock(lock);
+ }
+
+-struct pv_lock_ops pv_lock_ops = {
++struct pv_lock_ops pv_lock_ops __read_only = {
+ #ifdef CONFIG_SMP
+ .spin_is_locked = __ticket_spin_is_locked,
+ .spin_is_contended = __ticket_spin_is_contended,
diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt.c linux-2.6.32.21/arch/x86/kernel/paravirt.c
---- linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/paravirt.c 2010-09-13 08:10:06.000000000 -0400
@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
* corresponding structure. */
static void *get_call_destination(u8 type)
@@ -12963,21 +13150,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt.c linux-2.6.32.21/arch/x86/k
};
EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/paravirt-spinlocks.c 2010-08-13 18:34:40.000000000 -0400
-@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
- __raw_spin_lock(lock);
- }
-
--struct pv_lock_ops pv_lock_ops = {
-+struct pv_lock_ops pv_lock_ops __read_only = {
- #ifdef CONFIG_SMP
- .spin_is_locked = __ticket_spin_is_locked,
- .spin_is_contended = __ticket_spin_is_contended,
diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c
---- linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct
free_pages((unsigned long)vaddr, get_order(size));
}
@@ -12988,8 +13163,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.21/arch
.free_coherent = calgary_free_coherent,
.map_sg = calgary_map_sg,
diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-dma.c linux-2.6.32.21/arch/x86/kernel/pci-dma.c
---- linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/pci-dma.c 2010-09-13 08:10:06.000000000 -0400
@@ -14,7 +14,7 @@
static int forbid_dac __read_mostly;
@@ -13009,8 +13184,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-dma.c linux-2.6.32.21/arch/x86/ke
#ifdef CONFIG_PCI
if (mask > 0xffffffff && forbid_dac > 0) {
diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c
---- linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
return -1;
}
@@ -13021,8 +13196,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-gart_64.c linux-2.6.32.21/arch/x8
.unmap_sg = gart_unmap_sg,
.map_page = gart_map_page,
diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-nommu.c linux-2.6.32.21/arch/x86/kernel/pci-nommu.c
---- linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/pci-nommu.c 2010-09-13 08:10:06.000000000 -0400
@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
flush_write_buffers();
}
@@ -13033,8 +13208,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-nommu.c linux-2.6.32.21/arch/x86/
.free_coherent = nommu_free_coherent,
.map_sg = nommu_map_sg,
diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c
---- linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c 2010-09-13 08:10:06.000000000 -0400
@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
}
@@ -13044,9 +13219,49 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.21/arch/x8
.mapping_error = swiotlb_dma_mapping_error,
.alloc_coherent = x86_swiotlb_alloc_coherent,
.free_coherent = swiotlb_free_coherent,
+diff -urNp linux-2.6.32.21/arch/x86/kernel/process.c linux-2.6.32.21/arch/x86/kernel/process.c
+--- linux-2.6.32.21/arch/x86/kernel/process.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/process.c 2010-09-13 08:10:06.000000000 -0400
+@@ -73,7 +73,7 @@ void exit_thread(void)
+ unsigned long *bp = t->io_bitmap_ptr;
+
+ if (bp) {
+- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
++ struct tss_struct *tss = init_tss + get_cpu();
+
+ t->io_bitmap_ptr = NULL;
+ clear_thread_flag(TIF_IO_BITMAP);
+@@ -93,6 +93,9 @@ void flush_thread(void)
+
+ clear_tsk_thread_flag(tsk, TIF_DEBUG);
+
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
++ loadsegment(gs, 0);
++#endif
+ tsk->thread.debugreg0 = 0;
+ tsk->thread.debugreg1 = 0;
+ tsk->thread.debugreg2 = 0;
+@@ -602,17 +605,3 @@ static int __init idle_setup(char *str)
+ return 0;
+ }
+ early_param("idle", idle_setup);
+-
+-unsigned long arch_align_stack(unsigned long sp)
+-{
+- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
+- sp -= get_random_int() % 8192;
+- return sp & ~0xf;
+-}
+-
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+- unsigned long range_end = mm->brk + 0x02000000;
+- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+-}
+-
diff -urNp linux-2.6.32.21/arch/x86/kernel/process_32.c linux-2.6.32.21/arch/x86/kernel/process_32.c
---- linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/process_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
unsigned long thread_saved_pc(struct task_struct *tsk)
{
@@ -13142,8 +13357,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/process_32.c linux-2.6.32.21/arch/x86
+}
+#endif
diff -urNp linux-2.6.32.21/arch/x86/kernel/process_64.c linux-2.6.32.21/arch/x86/kernel/process_64.c
---- linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/process_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -91,7 +91,7 @@ static void __exit_idle(void)
void exit_idle(void)
{
@@ -13186,49 +13401,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/process_64.c linux-2.6.32.21/arch/x86
return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.21/arch/x86/kernel/process.c linux-2.6.32.21/arch/x86/kernel/process.c
---- linux-2.6.32.21/arch/x86/kernel/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/process.c 2010-08-13 18:34:40.000000000 -0400
-@@ -73,7 +73,7 @@ void exit_thread(void)
- unsigned long *bp = t->io_bitmap_ptr;
-
- if (bp) {
-- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
-+ struct tss_struct *tss = init_tss + get_cpu();
-
- t->io_bitmap_ptr = NULL;
- clear_thread_flag(TIF_IO_BITMAP);
-@@ -93,6 +93,9 @@ void flush_thread(void)
-
- clear_tsk_thread_flag(tsk, TIF_DEBUG);
-
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR)
-+ loadsegment(gs, 0);
-+#endif
- tsk->thread.debugreg0 = 0;
- tsk->thread.debugreg1 = 0;
- tsk->thread.debugreg2 = 0;
-@@ -602,17 +605,3 @@ static int __init idle_setup(char *str)
- return 0;
- }
- early_param("idle", idle_setup);
--
--unsigned long arch_align_stack(unsigned long sp)
--{
-- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
-- sp -= get_random_int() % 8192;
-- return sp & ~0xf;
--}
--
--unsigned long arch_randomize_brk(struct mm_struct *mm)
--{
-- unsigned long range_end = mm->brk + 0x02000000;
-- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
--}
--
diff -urNp linux-2.6.32.21/arch/x86/kernel/ptrace.c linux-2.6.32.21/arch/x86/kernel/ptrace.c
---- linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/ptrace.c 2010-09-13 08:10:06.000000000 -0400
@@ -925,7 +925,7 @@ static const struct user_regset_view use
long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
@@ -13298,8 +13473,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/ptrace.c linux-2.6.32.21/arch/x86/ker
/* Send us the fake SIGTRAP */
force_sig_info(SIGTRAP, &info, tsk);
diff -urNp linux-2.6.32.21/arch/x86/kernel/reboot.c linux-2.6.32.21/arch/x86/kernel/reboot.c
---- linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/reboot.c 2010-09-13 08:10:06.000000000 -0400
@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
EXPORT_SYMBOL(pm_power_off);
@@ -13377,8 +13552,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/reboot.c linux-2.6.32.21/arch/x86/ker
/* Set up the IDT for real mode. */
load_idt(&real_mode_idt);
diff -urNp linux-2.6.32.21/arch/x86/kernel/setup.c linux-2.6.32.21/arch/x86/kernel/setup.c
---- linux-2.6.32.21/arch/x86/kernel/setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/setup.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/setup.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/setup.c 2010-09-13 08:10:06.000000000 -0400
@@ -782,14 +782,14 @@ void __init setup_arch(char **cmdline_p)
if (!boot_params.hdr.root_flags)
@@ -13400,8 +13575,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/setup.c linux-2.6.32.21/arch/x86/kern
bss_resource.start = virt_to_phys(&__bss_start);
bss_resource.end = virt_to_phys(&__bss_stop)-1;
diff -urNp linux-2.6.32.21/arch/x86/kernel/setup_percpu.c linux-2.6.32.21/arch/x86/kernel/setup_percpu.c
---- linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/setup_percpu.c 2010-09-13 08:10:06.000000000 -0400
@@ -25,19 +25,17 @@
# define DBG(x...)
#endif
@@ -13465,8 +13640,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/setup_percpu.c linux-2.6.32.21/arch/x
* 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.32.21/arch/x86/kernel/signal.c linux-2.6.32.21/arch/x86/kernel/signal.c
---- linux-2.6.32.21/arch/x86/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/signal.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/signal.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/signal.c 2010-09-13 08:10:06.000000000 -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.
@@ -13539,8 +13714,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/signal.c linux-2.6.32.21/arch/x86/ker
if (current_thread_info()->status & TS_RESTORE_SIGMASK)
diff -urNp linux-2.6.32.21/arch/x86/kernel/smpboot.c linux-2.6.32.21/arch/x86/kernel/smpboot.c
---- linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/smpboot.c 2010-09-13 08:10:06.000000000 -0400
@@ -748,7 +748,11 @@ do_rest:
(unsigned long)task_stack_page(c_idle.idle) -
KERNEL_STACK_OFFSET + THREAD_SIZE;
@@ -13567,8 +13742,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/smpboot.c linux-2.6.32.21/arch/x86/ke
/* init low mem mapping */
clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
diff -urNp linux-2.6.32.21/arch/x86/kernel/step.c linux-2.6.32.21/arch/x86/kernel/step.c
---- linux-2.6.32.21/arch/x86/kernel/step.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/step.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/step.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/step.c 2010-09-13 08:10:06.000000000 -0400
@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
struct desc_struct *desc;
unsigned long base;
@@ -13601,17 +13776,9 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/step.c linux-2.6.32.21/arch/x86/kerne
/* 32-bit mode: register increment */
return 0;
/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-08-13 18:34:40.000000000 -0400
-@@ -1,3 +1,4 @@
-+.section .rodata,"a",@progbits
- ENTRY(sys_call_table)
- .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
- .long sys_exit
diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c
---- linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -24,6 +24,21 @@
#include <asm/syscalls.h>
@@ -13859,8 +14026,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_i386_32.c linux-2.6.32.21/arch/x8
case 1: /* iBCS2 emulator entry point */
if (!segment_eq(get_fs(), get_ds()))
diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c
---- linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -32,8 +32,8 @@ out:
return error;
}
@@ -13942,9 +14109,17 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/sys_x86_64.c linux-2.6.32.21/arch/x86
mm->cached_hole_size = ~0UL;
return addr;
+diff -urNp linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/syscall_table_32.S 2010-09-13 08:10:06.000000000 -0400
+@@ -1,3 +1,4 @@
++.section .rodata,"a",@progbits
+ ENTRY(sys_call_table)
+ .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
+ .long sys_exit
diff -urNp linux-2.6.32.21/arch/x86/kernel/time.c linux-2.6.32.21/arch/x86/kernel/time.c
---- linux-2.6.32.21/arch/x86/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/time.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/time.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/time.c 2010-09-13 08:10:06.000000000 -0400
@@ -26,17 +26,13 @@
int timer_ack;
#endif
@@ -13984,8 +14159,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/time.c linux-2.6.32.21/arch/x86/kerne
return pc;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/tls.c linux-2.6.32.21/arch/x86/kernel/tls.c
---- linux-2.6.32.21/arch/x86/kernel/tls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/tls.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/tls.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/tls.c 2010-09-13 08:10:06.000000000 -0400
@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL;
@@ -13999,8 +14174,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/tls.c linux-2.6.32.21/arch/x86/kernel
return 0;
diff -urNp linux-2.6.32.21/arch/x86/kernel/trampoline_32.S linux-2.6.32.21/arch/x86/kernel/trampoline_32.S
---- linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/trampoline_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -32,6 +32,12 @@
#include <asm/segment.h>
#include <asm/page_types.h>
@@ -14024,8 +14199,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/trampoline_32.S linux-2.6.32.21/arch/
# 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.32.21/arch/x86/kernel/traps.c linux-2.6.32.21/arch/x86/kernel/traps.c
---- linux-2.6.32.21/arch/x86/kernel/traps.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/traps.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/traps.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/traps.c 2010-09-13 08:10:06.000000000 -0400
@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
/* Do we ignore FPU interrupts ? */
@@ -14176,8 +14351,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/traps.c linux-2.6.32.21/arch/x86/kern
return;
}
diff -urNp linux-2.6.32.21/arch/x86/kernel/tsc.c linux-2.6.32.21/arch/x86/kernel/tsc.c
---- linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/tsc.c 2010-09-13 08:10:06.000000000 -0400
@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
},
@@ -14188,8 +14363,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/tsc.c linux-2.6.32.21/arch/x86/kernel
static void __init check_system_tsc_reliable(void)
diff -urNp linux-2.6.32.21/arch/x86/kernel/vm86_32.c linux-2.6.32.21/arch/x86/kernel/vm86_32.c
---- linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/vm86_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -41,6 +41,7 @@
#include <linux/ptrace.h>
#include <linux/audit.h>
@@ -14255,8 +14430,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vm86_32.c linux-2.6.32.21/arch/x86/ke
goto cannot_handle;
if ((segoffs >> 16) == BIOSSEG)
diff -urNp linux-2.6.32.21/arch/x86/kernel/vmi_32.c linux-2.6.32.21/arch/x86/kernel/vmi_32.c
---- linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/vmi_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
@@ -14417,8 +14592,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmi_32.c linux-2.6.32.21/arch/x86/ker
local_irq_save(flags);
diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S
---- linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S 2010-09-13 08:10:06.000000000 -0400
@@ -26,6 +26,22 @@
#include <asm/page_types.h>
#include <asm/cache.h>
@@ -14712,8 +14887,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.21/arch/x8
#ifdef CONFIG_SMP
diff -urNp linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c
---- linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa
write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
@@ -14748,8 +14923,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/vsyscall_64.c linux-2.6.32.21/arch/x8
#endif
diff -urNp linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c
---- linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
EXPORT_SYMBOL(copy_user_generic);
@@ -14760,8 +14935,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32.21/arch
EXPORT_SYMBOL(copy_page);
diff -urNp linux-2.6.32.21/arch/x86/kernel/xsave.c linux-2.6.32.21/arch/x86/kernel/xsave.c
---- linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kernel/xsave.c 2010-09-13 08:10:06.000000000 -0400
@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
fx_sw_user->xstate_size > fx_sw_user->extended_size)
return -1;
@@ -14790,8 +14965,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kernel/xsave.c linux-2.6.32.21/arch/x86/kern
if (unlikely(err)) {
/*
diff -urNp linux-2.6.32.21/arch/x86/kvm/emulate.c linux-2.6.32.21/arch/x86/kvm/emulate.c
---- linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kvm/emulate.c 2010-09-13 08:10:06.000000000 -0400
@@ -81,8 +81,8 @@
#define Src2CL (1<<29)
#define Src2ImmByte (2<<29)
@@ -14829,8 +15004,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/emulate.c linux-2.6.32.21/arch/x86/kvm/e
case 1: \
____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
diff -urNp linux-2.6.32.21/arch/x86/kvm/lapic.c linux-2.6.32.21/arch/x86/kvm/lapic.c
---- linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kvm/lapic.c 2010-09-13 08:10:06.000000000 -0400
@@ -52,7 +52,7 @@
#define APIC_BUS_CYCLE_NS 1
@@ -14841,8 +15016,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/lapic.c linux-2.6.32.21/arch/x86/kvm/lap
#define APIC_LVT_NUM 6
/* 14 is the version for Xeon and Pentium 8.4.8*/
diff -urNp linux-2.6.32.21/arch/x86/kvm/svm.c linux-2.6.32.21/arch/x86/kvm/svm.c
---- linux-2.6.32.21/arch/x86/kvm/svm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/svm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kvm/svm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kvm/svm.c 2010-09-13 08:10:06.000000000 -0400
@@ -2482,9 +2482,12 @@ static int handle_exit(struct kvm_run *k
static void reload_tss(struct kvm_vcpu *vcpu)
{
@@ -14867,8 +15042,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/svm.c linux-2.6.32.21/arch/x86/kvm/svm.c
.disabled_by_bios = is_disabled,
.hardware_setup = svm_hardware_setup,
diff -urNp linux-2.6.32.21/arch/x86/kvm/vmx.c linux-2.6.32.21/arch/x86/kvm/vmx.c
---- linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kvm/vmx.c 2010-09-13 08:10:06.000000000 -0400
@@ -569,7 +569,11 @@ static void reload_tss(void)
kvm_get_gdt(&gdt);
@@ -14951,8 +15126,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/vmx.c linux-2.6.32.21/arch/x86/kvm/vmx.c
.disabled_by_bios = vmx_disabled_by_bios,
.hardware_setup = hardware_setup,
diff -urNp linux-2.6.32.21/arch/x86/kvm/x86.c linux-2.6.32.21/arch/x86/kvm/x86.c
---- linux-2.6.32.21/arch/x86/kvm/x86.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/kvm/x86.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/kvm/x86.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/kvm/x86.c 2010-09-13 08:10:06.000000000 -0400
@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries);
@@ -15055,8 +15230,8 @@ diff -urNp linux-2.6.32.21/arch/x86/kvm/x86.c linux-2.6.32.21/arch/x86/kvm/x86.c
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
diff -urNp linux-2.6.32.21/arch/x86/lib/checksum_32.S linux-2.6.32.21/arch/x86/lib/checksum_32.S
---- linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/checksum_32.S 2010-09-13 08:10:06.000000000 -0400
@@ -28,7 +28,8 @@
#include <linux/linkage.h>
#include <asm/dwarf2.h>
@@ -15303,8 +15478,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/checksum_32.S linux-2.6.32.21/arch/x86/l
#undef ROUND
#undef ROUND1
diff -urNp linux-2.6.32.21/arch/x86/lib/clear_page_64.S linux-2.6.32.21/arch/x86/lib/clear_page_64.S
---- linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/clear_page_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -43,7 +43,7 @@ ENDPROC(clear_page)
#include <asm/cpufeature.h>
@@ -15315,8 +15490,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/clear_page_64.S linux-2.6.32.21/arch/x86
.byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.21/arch/x86/lib/copy_page_64.S linux-2.6.32.21/arch/x86/lib/copy_page_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/copy_page_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -104,7 +104,7 @@ ENDPROC(copy_page)
#include <asm/cpufeature.h>
@@ -15327,8 +15502,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_page_64.S linux-2.6.32.21/arch/x86/
.byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_64.S linux-2.6.32.21/arch/x86/lib/copy_user_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/copy_user_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -15,13 +15,14 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15404,8 +15579,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_64.S linux-2.6.32.21/arch/x86/
xorl %eax,%eax
rep
diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S
---- linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -14,6 +14,7 @@
#include <asm/current.h>
#include <asm/asm-offsets.h>
@@ -15431,8 +15606,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/copy_user_nocache_64.S linux-2.6.32.21/a
jb 20f /* less then 8 bytes, go to byte copy loop */
ALIGN_DESTINATION
diff -urNp linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c
---- linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
len -= 2;
}
@@ -15452,8 +15627,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.21/arch/
len, isum, NULL, errp);
}
diff -urNp linux-2.6.32.21/arch/x86/lib/getuser.S linux-2.6.32.21/arch/x86/lib/getuser.S
---- linux-2.6.32.21/arch/x86/lib/getuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/getuser.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/getuser.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/getuser.S 2010-09-13 08:10:06.000000000 -0400
@@ -33,14 +33,38 @@
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>
@@ -15591,8 +15766,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/getuser.S linux-2.6.32.21/arch/x86/lib/g
mov $(-EFAULT),%_ASM_AX
ret
diff -urNp linux-2.6.32.21/arch/x86/lib/memcpy_64.S linux-2.6.32.21/arch/x86/lib/memcpy_64.S
---- linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/memcpy_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
* It is also a lot simpler. Use this when possible:
*/
@@ -15603,8 +15778,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/memcpy_64.S linux-2.6.32.21/arch/x86/lib
.byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.21/arch/x86/lib/memset_64.S linux-2.6.32.21/arch/x86/lib/memset_64.S
---- linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/memset_64.S 2010-09-13 08:10:06.000000000 -0400
@@ -118,7 +118,7 @@ ENDPROC(__memset)
#include <asm/cpufeature.h>
@@ -15615,8 +15790,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/memset_64.S linux-2.6.32.21/arch/x86/lib
.byte (memset_c - memset) - (2f - 1b) /* offset */
2:
diff -urNp linux-2.6.32.21/arch/x86/lib/mmx_32.c linux-2.6.32.21/arch/x86/lib/mmx_32.c
---- linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/mmx_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
{
void *p;
@@ -15933,8 +16108,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/mmx_32.c linux-2.6.32.21/arch/x86/lib/mm
from += 64;
to += 64;
diff -urNp linux-2.6.32.21/arch/x86/lib/putuser.S linux-2.6.32.21/arch/x86/lib/putuser.S
---- linux-2.6.32.21/arch/x86/lib/putuser.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/putuser.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/putuser.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/putuser.S 2010-09-13 08:10:06.000000000 -0400
@@ -15,7 +15,8 @@
#include <asm/thread_info.h>
#include <asm/errno.h>
@@ -16116,8 +16291,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/putuser.S linux-2.6.32.21/arch/x86/lib/p
EXIT
END(bad_put_user)
diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_32.c linux-2.6.32.21/arch/x86/lib/usercopy_32.c
---- linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/usercopy_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
* Copy a null terminated string from userspace.
*/
@@ -17087,8 +17262,8 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_32.c linux-2.6.32.21/arch/x86/l
+
+EXPORT_SYMBOL(set_fs);
diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_64.c linux-2.6.32.21/arch/x86/lib/usercopy_64.c
---- linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/lib/usercopy_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -42,6 +42,8 @@ long
__strncpy_from_user(char *dst, const char __user *src, long count)
{
@@ -17125,25 +17300,9 @@ diff -urNp linux-2.6.32.21/arch/x86/lib/usercopy_64.c linux-2.6.32.21/arch/x86/l
}
EXPORT_SYMBOL(copy_in_user);
-diff -urNp linux-2.6.32.21/arch/x86/Makefile linux-2.6.32.21/arch/x86/Makefile
---- linux-2.6.32.21/arch/x86/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/Makefile 2010-08-13 18:34:40.000000000 -0400
-@@ -189,3 +189,12 @@ define archhelp
- echo ' FDARGS="..." arguments for the booted kernel'
- echo ' FDINITRD=file initrd for the booted kernel'
- endef
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
diff -urNp linux-2.6.32.21/arch/x86/mm/extable.c linux-2.6.32.21/arch/x86/mm/extable.c
---- linux-2.6.32.21/arch/x86/mm/extable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/extable.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/extable.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/extable.c 2010-09-13 08:10:06.000000000 -0400
@@ -1,14 +1,71 @@
#include <linux/module.h>
#include <linux/spinlock.h>
@@ -17218,8 +17377,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/extable.c linux-2.6.32.21/arch/x86/mm/ext
extern u32 pnp_bios_is_utter_crap;
pnp_bios_is_utter_crap = 1;
diff -urNp linux-2.6.32.21/arch/x86/mm/fault.c linux-2.6.32.21/arch/x86/mm/fault.c
---- linux-2.6.32.21/arch/x86/mm/fault.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/fault.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/fault.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/fault.c 2010-09-13 08:10:06.000000000 -0400
@@ -11,10 +11,19 @@
#include <linux/kprobes.h> /* __kprobes, ... */
#include <linux/mmiotrace.h> /* kmmio_handler, ... */
@@ -17888,8 +18047,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/fault.c linux-2.6.32.21/arch/x86/mm/fault
+ return ret ? -EFAULT : 0;
+}
diff -urNp linux-2.6.32.21/arch/x86/mm/gup.c linux-2.6.32.21/arch/x86/mm/gup.c
---- linux-2.6.32.21/arch/x86/mm/gup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/gup.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/gup.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/gup.c 2010-09-13 08:10:06.000000000 -0400
@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
addr = start;
len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -17900,8 +18059,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/gup.c linux-2.6.32.21/arch/x86/mm/gup.c
return 0;
diff -urNp linux-2.6.32.21/arch/x86/mm/highmem_32.c linux-2.6.32.21/arch/x86/mm/highmem_32.c
---- linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/highmem_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -17914,8 +18073,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/highmem_32.c linux-2.6.32.21/arch/x86/mm/
return (void *)vaddr;
}
diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm/hugetlbpage.c
---- linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/hugetlbpage.c 2010-09-13 08:10:06.000000000 -0400
@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
struct hstate *h = hstate_file(file);
struct mm_struct *mm = current->mm;
@@ -18050,9 +18209,138 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/hugetlbpage.c linux-2.6.32.21/arch/x86/mm
(!vma || addr + len <= vma->vm_start))
return addr;
}
+diff -urNp linux-2.6.32.21/arch/x86/mm/init.c linux-2.6.32.21/arch/x86/mm/init.c
+--- linux-2.6.32.21/arch/x86/mm/init.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/init.c 2010-09-13 08:10:22.000000000 -0400
+@@ -69,11 +69,7 @@ static void __init find_early_table_spac
+ * cause a hotspot and fill up ZONE_DMA. The page tables
+ * need roughly 0.5KB per GB.
+ */
+-#ifdef CONFIG_X86_32
+- start = 0x7000;
+-#else
+- start = 0x8000;
+-#endif
++ start = 0x100000;
+ e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
+ tables, PAGE_SIZE);
+ if (e820_table_start == -1UL)
+@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_m
+ #endif
+
+ set_nx();
+- if (nx_enabled)
++ if (nx_enabled && cpu_has_nx)
+ printk(KERN_INFO "NX (Execute Disable) protection: active\n");
+
+ /* Enable PSE if available */
+@@ -331,7 +327,13 @@ unsigned long __init_refok init_memory_m
+ */
+ int devmem_is_allowed(unsigned long pagenr)
+ {
+- if (pagenr <= 256)
++ if (!pagenr)
++ return 1;
++#ifdef CONFIG_VM86
++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
++ return 1;
++#endif
++ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
+ return 1;
+ if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+ return 0;
+@@ -379,6 +381,88 @@ void free_init_pages(char *what, unsigne
+
+ void free_initmem(void)
+ {
++
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_X86_32
++ /* PaX: limit KERNEL_CS to actual size */
++ unsigned long addr, limit;
++ struct desc_struct d;
++ int cpu;
++
++ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
++ limit = (limit - 1UL) >> PAGE_SHIFT;
++
++ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
++ for (cpu = 0; cpu < NR_CPUS; cpu++) {
++ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
++ }
++
++ /* 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);
++ pmd = pmd_offset(pud, addr);
++ 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
++ pgd_t *pgd;
++ pud_t *pud;
++ pmd_t *pmd;
++ unsigned long addr, end;
++
++ /* PaX: make kernel code/rodata read-only, rest non-executable */
++ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ if (!pmd_present(*pmd))
++ continue;
++ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++ else
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ }
++
++ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
++ end = addr + KERNEL_IMAGE_SIZE;
++ for (; addr < end; addr += PMD_SIZE) {
++ pgd = pgd_offset_k(addr);
++ pud = pud_offset(pgd, addr);
++ pmd = pmd_offset(pud, addr);
++ if (!pmd_present(*pmd))
++ continue;
++ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++ else
++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++ }
++#endif
++
++ flush_tlb_all();
++#endif
++
+ free_init_pages("unused kernel memory",
+ (unsigned long)(&__init_begin),
+ (unsigned long)(&__init_end));
diff -urNp linux-2.6.32.21/arch/x86/mm/init_32.c linux-2.6.32.21/arch/x86/mm/init_32.c
---- linux-2.6.32.21/arch/x86/mm/init_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/init_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/init_32.c 2010-09-13 08:10:06.000000000 -0400
@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
}
@@ -18357,8 +18645,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init_32.c linux-2.6.32.21/arch/x86/mm/ini
printk(KERN_INFO "Write protecting the kernel text: %luk\n",
size >> 10);
diff -urNp linux-2.6.32.21/arch/x86/mm/init_64.c linux-2.6.32.21/arch/x86/mm/init_64.c
---- linux-2.6.32.21/arch/x86/mm/init_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/init_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/init_64.c 2010-09-13 08:10:06.000000000 -0400
@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
pmd = fill_pmd(pud, vaddr);
pte = fill_pte(pmd, vaddr);
@@ -18419,129 +18707,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/init_64.c linux-2.6.32.21/arch/x86/mm/ini
return "[vdso]";
if (vma == &gate_vma)
return "[vsyscall]";
-diff -urNp linux-2.6.32.21/arch/x86/mm/init.c linux-2.6.32.21/arch/x86/mm/init.c
---- linux-2.6.32.21/arch/x86/mm/init.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/init.c 2010-08-13 18:34:40.000000000 -0400
-@@ -69,11 +69,7 @@ static void __init find_early_table_spac
- * cause a hotspot and fill up ZONE_DMA. The page tables
- * need roughly 0.5KB per GB.
- */
--#ifdef CONFIG_X86_32
-- start = 0x7000;
--#else
-- start = 0x8000;
--#endif
-+ start = 0x100000;
- e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
- tables, PAGE_SIZE);
- if (e820_table_start == -1UL)
-@@ -331,7 +327,13 @@ unsigned long __init_refok init_memory_m
- */
- int devmem_is_allowed(unsigned long pagenr)
- {
-- if (pagenr <= 256)
-+ if (!pagenr)
-+ return 1;
-+#ifdef CONFIG_VM86
-+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
-+ return 1;
-+#endif
-+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
- return 1;
- if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
- return 0;
-@@ -379,6 +381,88 @@ void free_init_pages(char *what, unsigne
-
- void free_initmem(void)
- {
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifdef CONFIG_X86_32
-+ /* PaX: limit KERNEL_CS to actual size */
-+ unsigned long addr, limit;
-+ struct desc_struct d;
-+ int cpu;
-+
-+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
-+ limit = (limit - 1UL) >> PAGE_SHIFT;
-+
-+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
-+ for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
-+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
-+ }
-+
-+ /* 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);
-+ pmd = pmd_offset(pud, addr);
-+ 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
-+ pgd_t *pgd;
-+ pud_t *pud;
-+ pmd_t *pmd;
-+ unsigned long addr, end;
-+
-+ /* PaX: make kernel code/rodata read-only, rest non-executable */
-+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ if (!pmd_present(*pmd))
-+ continue;
-+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+ else
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+ }
-+
-+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
-+ end = addr + KERNEL_IMAGE_SIZE;
-+ for (; addr < end; addr += PMD_SIZE) {
-+ pgd = pgd_offset_k(addr);
-+ pud = pud_offset(pgd, addr);
-+ pmd = pmd_offset(pud, addr);
-+ if (!pmd_present(*pmd))
-+ continue;
-+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+ else
-+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+ }
-+#endif
-+
-+ flush_tlb_all();
-+#endif
-+
- free_init_pages("unused kernel memory",
- (unsigned long)(&__init_begin),
- (unsigned long)(&__init_end));
diff -urNp linux-2.6.32.21/arch/x86/mm/iomap_32.c linux-2.6.32.21/arch/x86/mm/iomap_32.c
---- linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/iomap_32.c 2010-09-13 08:10:07.000000000 -0400
@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
debug_kmap_atomic(type);
idx = type + KM_TYPE_NR * smp_processor_id();
@@ -18555,8 +18723,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/iomap_32.c linux-2.6.32.21/arch/x86/mm/io
return (void *)vaddr;
diff -urNp linux-2.6.32.21/arch/x86/mm/ioremap.c linux-2.6.32.21/arch/x86/mm/ioremap.c
---- linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/ioremap.c 2010-09-13 08:10:07.000000000 -0400
@@ -41,8 +41,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.
@@ -18604,8 +18772,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/ioremap.c linux-2.6.32.21/arch/x86/mm/ior
/*
* The boot-ioremap range spans multiple pmds, for which
diff -urNp linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c 2010-09-13 08:10:07.000000000 -0400
@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
* memory (e.g. tracked pages)? For now, we need this to avoid
* invoking kmemcheck for PnP BIOS calls.
@@ -18619,8 +18787,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.21/arc
pte = kmemcheck_pte_lookup(address);
diff -urNp linux-2.6.32.21/arch/x86/mm/mmap.c linux-2.6.32.21/arch/x86/mm/mmap.c
---- linux-2.6.32.21/arch/x86/mm/mmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/mmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/mmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/mmap.c 2010-09-13 08:10:07.000000000 -0400
@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
* Leave an at least ~128 MB hole with possible stack randomization.
*/
@@ -18703,8 +18871,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/mmap.c linux-2.6.32.21/arch/x86/mm/mmap.c
mm->unmap_area = arch_unmap_area_topdown;
}
diff -urNp linux-2.6.32.21/arch/x86/mm/numa_32.c linux-2.6.32.21/arch/x86/mm/numa_32.c
---- linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/numa_32.c 2010-09-13 08:10:07.000000000 -0400
@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
}
#endif
@@ -18713,9 +18881,21 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/numa_32.c linux-2.6.32.21/arch/x86/mm/num
extern unsigned long highend_pfn, highstart_pfn;
#define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
+diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr-test.c linux-2.6.32.21/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-09-13 08:10:07.000000000 -0400
+@@ -36,7 +36,7 @@ enum {
+
+ static int pte_testbit(pte_t pte)
+ {
+- return pte_flags(pte) & _PAGE_UNUSED1;
++ return pte_flags(pte) & _PAGE_CPA_TEST;
+ }
+
+ struct split_state {
diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr.c linux-2.6.32.21/arch/x86/mm/pageattr.c
---- linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/pageattr.c 2010-09-13 08:10:07.000000000 -0400
@@ -261,16 +261,17 @@ static inline pgprot_t static_protection
* PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
*/
@@ -18792,21 +18972,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr.c linux-2.6.32.21/arch/x86/mm/pa
}
static int
-diff -urNp linux-2.6.32.21/arch/x86/mm/pageattr-test.c linux-2.6.32.21/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pageattr-test.c 2010-08-13 18:34:40.000000000 -0400
-@@ -36,7 +36,7 @@ enum {
-
- static int pte_testbit(pte_t pte)
- {
-- return pte_flags(pte) & _PAGE_UNUSED1;
-+ return pte_flags(pte) & _PAGE_CPA_TEST;
- }
-
- struct split_state {
diff -urNp linux-2.6.32.21/arch/x86/mm/pat.c linux-2.6.32.21/arch/x86/mm/pat.c
---- linux-2.6.32.21/arch/x86/mm/pat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pat.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/pat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/pat.c 2010-09-13 08:10:07.000000000 -0400
@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
conflict:
@@ -18854,26 +19022,9 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pat.c linux-2.6.32.21/arch/x86/mm/pat.c
cattr_name(want_flags),
(unsigned long long)paddr,
(unsigned long long)(paddr + size),
-diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable_32.c linux-2.6.32.21/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-08-13 18:34:40.000000000 -0400
-@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
- return;
- }
- pte = pte_offset_kernel(pmd, vaddr);
-+
-+ pax_open_kernel();
- if (pte_val(pteval))
- set_pte_at(&init_mm, vaddr, pte, pteval);
- else
- pte_clear(&init_mm, vaddr, pte);
-+ pax_close_kernel();
-
- /*
- * It's enough to flush this one mapping.
diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable.c linux-2.6.32.21/arch/x86/mm/pgtable.c
---- linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/pgtable.c 2010-09-13 08:10:07.000000000 -0400
@@ -83,8 +83,59 @@ static inline void pgd_list_del(pgd_t *p
list_del(&page->lru);
}
@@ -19127,9 +19278,26 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable.c linux-2.6.32.21/arch/x86/mm/pgt
pgd_dtor(pgd);
paravirt_pgd_free(mm, pgd);
free_page((unsigned long)pgd);
+diff -urNp linux-2.6.32.21/arch/x86/mm/pgtable_32.c linux-2.6.32.21/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/pgtable_32.c 2010-09-13 08:10:07.000000000 -0400
+@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
+ return;
+ }
+ pte = pte_offset_kernel(pmd, vaddr);
++
++ pax_open_kernel();
+ if (pte_val(pteval))
+ set_pte_at(&init_mm, vaddr, pte, pteval);
+ else
+ pte_clear(&init_mm, vaddr, pte);
++ pax_close_kernel();
+
+ /*
+ * It's enough to flush this one mapping.
diff -urNp linux-2.6.32.21/arch/x86/mm/setup_nx.c linux-2.6.32.21/arch/x86/mm/setup_nx.c
---- linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/setup_nx.c 2010-09-13 08:10:07.000000000 -0400
@@ -4,11 +4,10 @@
#include <asm/pgtable.h>
@@ -19196,8 +19364,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/setup_nx.c linux-2.6.32.21/arch/x86/mm/se
}
#endif
diff -urNp linux-2.6.32.21/arch/x86/mm/tlb.c linux-2.6.32.21/arch/x86/mm/tlb.c
---- linux-2.6.32.21/arch/x86/mm/tlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/mm/tlb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/mm/tlb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/mm/tlb.c 2010-09-13 08:10:07.000000000 -0400
@@ -12,7 +12,7 @@
#include <asm/uv/uv.h>
@@ -19220,8 +19388,8 @@ diff -urNp linux-2.6.32.21/arch/x86/mm/tlb.c linux-2.6.32.21/arch/x86/mm/tlb.c
EXPORT_SYMBOL_GPL(leave_mm);
diff -urNp linux-2.6.32.21/arch/x86/oprofile/backtrace.c linux-2.6.32.21/arch/x86/oprofile/backtrace.c
---- linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/oprofile/backtrace.c 2010-09-13 08:10:07.000000000 -0400
@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
struct frame_head bufhead[2];
@@ -19241,8 +19409,8 @@ diff -urNp linux-2.6.32.21/arch/x86/oprofile/backtrace.c linux-2.6.32.21/arch/x8
if (depth)
dump_trace(NULL, regs, (unsigned long *)stack, 0,
diff -urNp linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c
---- linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c 2010-09-13 08:10:07.000000000 -0400
@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
#endif
}
@@ -19253,8 +19421,8 @@ diff -urNp linux-2.6.32.21/arch/x86/oprofile/op_model_p4.c linux-2.6.32.21/arch/
#ifdef CONFIG_SMP
return smp_num_siblings == 2 ? 2 : 1;
diff -urNp linux-2.6.32.21/arch/x86/pci/common.c linux-2.6.32.21/arch/x86/pci/common.c
---- linux-2.6.32.21/arch/x86/pci/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/common.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/common.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/common.c 2010-09-13 08:10:07.000000000 -0400
@@ -31,8 +31,8 @@ int noioapicreroute = 1;
int pcibios_last_bus = -1;
unsigned long pirq_table_addr;
@@ -19276,8 +19444,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/common.c linux-2.6.32.21/arch/x86/pci/co
void __init dmi_check_pciprobe(void)
diff -urNp linux-2.6.32.21/arch/x86/pci/direct.c linux-2.6.32.21/arch/x86/pci/direct.c
---- linux-2.6.32.21/arch/x86/pci/direct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/direct.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/direct.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/direct.c 2010-09-13 08:10:07.000000000 -0400
@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
#undef PCI_CONF1_ADDRESS
@@ -19306,8 +19474,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/direct.c linux-2.6.32.21/arch/x86/pci/di
u32 x = 0;
int year, devfn;
diff -urNp linux-2.6.32.21/arch/x86/pci/fixup.c linux-2.6.32.21/arch/x86/pci/fixup.c
---- linux-2.6.32.21/arch/x86/pci/fixup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/fixup.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/fixup.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/fixup.c 2010-09-13 08:10:07.000000000 -0400
@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
},
@@ -19327,8 +19495,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/fixup.c linux-2.6.32.21/arch/x86/pci/fix
static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
diff -urNp linux-2.6.32.21/arch/x86/pci/irq.c linux-2.6.32.21/arch/x86/pci/irq.c
---- linux-2.6.32.21/arch/x86/pci/irq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/irq.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/irq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/irq.c 2010-09-13 08:10:07.000000000 -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) },
@@ -19348,8 +19516,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/irq.c linux-2.6.32.21/arch/x86/pci/irq.c
int __init pcibios_irq_init(void)
diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_32.c linux-2.6.32.21/arch/x86/pci/mmconfig_32.c
---- linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/mmconfig_32.c 2010-09-13 08:10:07.000000000 -0400
@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19360,8 +19528,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_32.c linux-2.6.32.21/arch/x86/p
.write = pci_mmcfg_write,
};
diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_64.c linux-2.6.32.21/arch/x86/pci/mmconfig_64.c
---- linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/mmconfig_64.c 2010-09-13 08:10:07.000000000 -0400
@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
return 0;
}
@@ -19372,8 +19540,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/mmconfig_64.c linux-2.6.32.21/arch/x86/p
.write = pci_mmcfg_write,
};
diff -urNp linux-2.6.32.21/arch/x86/pci/numaq_32.c linux-2.6.32.21/arch/x86/pci/numaq_32.c
---- linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/numaq_32.c 2010-09-13 08:10:07.000000000 -0400
@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
#undef PCI_CONF1_MQ_ADDRESS
@@ -19384,8 +19552,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/numaq_32.c linux-2.6.32.21/arch/x86/pci/
.write = pci_conf1_mq_write
};
diff -urNp linux-2.6.32.21/arch/x86/pci/olpc.c linux-2.6.32.21/arch/x86/pci/olpc.c
---- linux-2.6.32.21/arch/x86/pci/olpc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/olpc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/olpc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/olpc.c 2010-09-13 08:10:07.000000000 -0400
@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
return 0;
}
@@ -19396,8 +19564,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/olpc.c linux-2.6.32.21/arch/x86/pci/olpc
.write = pci_olpc_write,
};
diff -urNp linux-2.6.32.21/arch/x86/pci/pcbios.c linux-2.6.32.21/arch/x86/pci/pcbios.c
---- linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/pci/pcbios.c 2010-09-13 08:10:07.000000000 -0400
@@ -56,50 +56,93 @@ union bios32 {
static struct {
unsigned long address;
@@ -19721,8 +19889,8 @@ diff -urNp linux-2.6.32.21/arch/x86/pci/pcbios.c linux-2.6.32.21/arch/x86/pci/pc
}
EXPORT_SYMBOL(pcibios_set_irq_routing);
diff -urNp linux-2.6.32.21/arch/x86/power/cpu.c linux-2.6.32.21/arch/x86/power/cpu.c
---- linux-2.6.32.21/arch/x86/power/cpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/power/cpu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/power/cpu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/power/cpu.c 2010-09-13 08:10:07.000000000 -0400
@@ -128,7 +128,7 @@ static void do_fpu_end(void)
static void fix_processor_context(void)
{
@@ -19743,8 +19911,8 @@ diff -urNp linux-2.6.32.21/arch/x86/power/cpu.c linux-2.6.32.21/arch/x86/power/c
syscall_init(); /* This sets MSR_*STAR and related */
#endif
diff -urNp linux-2.6.32.21/arch/x86/vdso/Makefile linux-2.6.32.21/arch/x86/vdso/Makefile
---- linux-2.6.32.21/arch/x86/vdso/Makefile 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/Makefile 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/vdso/Makefile 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/Makefile 2010-09-13 08:10:07.000000000 -0400
@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
$(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
-Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
@@ -19755,8 +19923,8 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/Makefile linux-2.6.32.21/arch/x86/vdso/
#
diff -urNp linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c
---- linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c 2010-09-13 08:10:07.000000000 -0400
@@ -22,24 +22,48 @@
#include <asm/hpet.h>
#include <asm/unistd.h>
@@ -19855,9 +20023,22 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vclock_gettime.c linux-2.6.32.21/arch/x
}
int gettimeofday(struct timeval *, struct timezone *)
__attribute__((weak, alias("__vdso_gettimeofday")));
+diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso.lds.S linux-2.6.32.21/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-09-13 08:10:07.000000000 -0400
+@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
+ #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
+ #include "vextern.h"
+ #undef VEXTERN
++
++#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
++VEXTERN(fallback_gettimeofday)
++VEXTERN(fallback_time)
++VEXTERN(getcpu)
++#undef VEXTERN
diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c
---- linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c 2010-09-13 08:10:07.000000000 -0400
@@ -25,6 +25,7 @@
#include <asm/tlbflush.h>
#include <asm/vdso.h>
@@ -19958,22 +20139,9 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso32-setup.c linux-2.6.32.21/arch/x86
return &gate_vma;
return NULL;
}
-diff -urNp linux-2.6.32.21/arch/x86/vdso/vdso.lds.S linux-2.6.32.21/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vdso.lds.S 2010-08-13 18:34:40.000000000 -0400
-@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
- #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
- #include "vextern.h"
- #undef VEXTERN
-+
-+#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
-+VEXTERN(fallback_gettimeofday)
-+VEXTERN(fallback_time)
-+VEXTERN(getcpu)
-+#undef VEXTERN
diff -urNp linux-2.6.32.21/arch/x86/vdso/vextern.h linux-2.6.32.21/arch/x86/vdso/vextern.h
---- linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/vextern.h 2010-09-13 08:10:07.000000000 -0400
@@ -11,6 +11,5 @@
put into vextern.h and be referenced as a pointer with vdso prefix.
The main kernel later fills in the values. */
@@ -19982,8 +20150,8 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vextern.h linux-2.6.32.21/arch/x86/vdso
VEXTERN(vgetcpu_mode)
VEXTERN(vsyscall_gtod_data)
diff -urNp linux-2.6.32.21/arch/x86/vdso/vma.c linux-2.6.32.21/arch/x86/vdso/vma.c
---- linux-2.6.32.21/arch/x86/vdso/vma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/vdso/vma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/vdso/vma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/vdso/vma.c 2010-09-13 08:10:07.000000000 -0400
@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
if (!vbase)
goto oom;
@@ -20031,8 +20199,8 @@ diff -urNp linux-2.6.32.21/arch/x86/vdso/vma.c linux-2.6.32.21/arch/x86/vdso/vma
-}
-__setup("vdso=", vdso_setup);
diff -urNp linux-2.6.32.21/arch/x86/xen/enlighten.c linux-2.6.32.21/arch/x86/xen/enlighten.c
---- linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/xen/enlighten.c 2010-09-13 08:10:07.000000000 -0400
@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
struct shared_info xen_dummy_shared_info;
@@ -20089,8 +20257,8 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/enlighten.c linux-2.6.32.21/arch/x86/xen
pgd = (pgd_t *)xen_start_info->pt_base;
diff -urNp linux-2.6.32.21/arch/x86/xen/mmu.c linux-2.6.32.21/arch/x86/xen/mmu.c
---- linux-2.6.32.21/arch/x86/xen/mmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/mmu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/xen/mmu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/xen/mmu.c 2010-09-13 08:10:07.000000000 -0400
@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
convert_pfn_mfn(init_level4_pgt);
convert_pfn_mfn(level3_ident_pgt);
@@ -20112,8 +20280,8 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/mmu.c linux-2.6.32.21/arch/x86/xen/mmu.c
set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
diff -urNp linux-2.6.32.21/arch/x86/xen/smp.c linux-2.6.32.21/arch/x86/xen/smp.c
---- linux-2.6.32.21/arch/x86/xen/smp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/smp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/xen/smp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/xen/smp.c 2010-09-13 08:10:07.000000000 -0400
@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
{
BUG_ON(smp_processor_id() != 0);
@@ -20138,8 +20306,8 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/smp.c linux-2.6.32.21/arch/x86/xen/smp.c
#ifdef CONFIG_X86_32
ctxt->user_regs.fs = __KERNEL_PERCPU;
diff -urNp linux-2.6.32.21/arch/x86/xen/xen-head.S linux-2.6.32.21/arch/x86/xen/xen-head.S
---- linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/xen/xen-head.S 2010-09-13 08:10:07.000000000 -0400
@@ -19,6 +19,17 @@ ENTRY(startup_xen)
#ifdef CONFIG_X86_32
mov %esi,xen_start_info
@@ -20159,8 +20327,8 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/xen-head.S linux-2.6.32.21/arch/x86/xen/
mov %rsi,xen_start_info
mov $init_thread_union+THREAD_SIZE,%rsp
diff -urNp linux-2.6.32.21/arch/x86/xen/xen-ops.h linux-2.6.32.21/arch/x86/xen/xen-ops.h
---- linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/arch/x86/xen/xen-ops.h 2010-09-13 08:10:07.000000000 -0400
@@ -10,8 +10,6 @@
extern const char xen_hypervisor_callback[];
extern const char xen_failsafe_callback[];
@@ -20171,8 +20339,8 @@ diff -urNp linux-2.6.32.21/arch/x86/xen/xen-ops.h linux-2.6.32.21/arch/x86/xen/x
void xen_copy_trap_info(struct trap_info *traps);
diff -urNp linux-2.6.32.21/block/blk-integrity.c linux-2.6.32.21/block/blk-integrity.c
---- linux-2.6.32.21/block/blk-integrity.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-integrity.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/blk-integrity.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/blk-integrity.c 2010-09-13 08:10:07.000000000 -0400
@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
NULL,
};
@@ -20183,8 +20351,8 @@ diff -urNp linux-2.6.32.21/block/blk-integrity.c linux-2.6.32.21/block/blk-integ
.store = &integrity_attr_store,
};
diff -urNp linux-2.6.32.21/block/blk-iopoll.c linux-2.6.32.21/block/blk-iopoll.c
---- linux-2.6.32.21/block/blk-iopoll.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-iopoll.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/blk-iopoll.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/blk-iopoll.c 2010-09-13 08:10:07.000000000 -0400
@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
}
EXPORT_SYMBOL(blk_iopoll_complete);
@@ -20195,8 +20363,8 @@ diff -urNp linux-2.6.32.21/block/blk-iopoll.c linux-2.6.32.21/block/blk-iopoll.c
struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
int rearm = 0, budget = blk_iopoll_budget;
diff -urNp linux-2.6.32.21/block/blk-map.c linux-2.6.32.21/block/blk-map.c
---- linux-2.6.32.21/block/blk-map.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-map.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/blk-map.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/blk-map.c 2010-09-13 08:10:07.000000000 -0400
@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
* direct dma. else, set up kernel bounce buffers
*/
@@ -20216,8 +20384,8 @@ diff -urNp linux-2.6.32.21/block/blk-map.c linux-2.6.32.21/block/blk-map.c
bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
else
diff -urNp linux-2.6.32.21/block/blk-softirq.c linux-2.6.32.21/block/blk-softirq.c
---- linux-2.6.32.21/block/blk-softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-softirq.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/blk-softirq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/blk-softirq.c 2010-09-13 08:10:07.000000000 -0400
@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
* Softirq action handler - move entries to local list and loop over them
* while passing them to the queue registered handler.
@@ -20228,8 +20396,8 @@ diff -urNp linux-2.6.32.21/block/blk-softirq.c linux-2.6.32.21/block/blk-softirq
struct list_head *cpu_list, local_list;
diff -urNp linux-2.6.32.21/block/blk-sysfs.c linux-2.6.32.21/block/blk-sysfs.c
---- linux-2.6.32.21/block/blk-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/blk-sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/blk-sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/blk-sysfs.c 2010-09-13 08:10:07.000000000 -0400
@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
kmem_cache_free(blk_requestq_cachep, q);
}
@@ -20240,8 +20408,8 @@ diff -urNp linux-2.6.32.21/block/blk-sysfs.c linux-2.6.32.21/block/blk-sysfs.c
.store = queue_attr_store,
};
diff -urNp linux-2.6.32.21/block/elevator.c linux-2.6.32.21/block/elevator.c
---- linux-2.6.32.21/block/elevator.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/block/elevator.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/block/elevator.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/block/elevator.c 2010-09-13 08:10:07.000000000 -0400
@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
return error;
}
@@ -20252,8 +20420,8 @@ diff -urNp linux-2.6.32.21/block/elevator.c linux-2.6.32.21/block/elevator.c
.store = elv_attr_store,
};
diff -urNp linux-2.6.32.21/crypto/lrw.c linux-2.6.32.21/crypto/lrw.c
---- linux-2.6.32.21/crypto/lrw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/crypto/lrw.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/crypto/lrw.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/crypto/lrw.c 2010-09-13 08:10:07.000000000 -0400
@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
struct priv *ctx = crypto_tfm_ctx(parent);
struct crypto_cipher *child = ctx->child;
@@ -20263,145 +20431,9 @@ diff -urNp linux-2.6.32.21/crypto/lrw.c linux-2.6.32.21/crypto/lrw.c
int bsize = crypto_cipher_blocksize(child);
crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
-diff -urNp linux-2.6.32.21/Documentation/dontdiff linux-2.6.32.21/Documentation/dontdiff
---- linux-2.6.32.21/Documentation/dontdiff 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/Documentation/dontdiff 2010-08-13 18:34:40.000000000 -0400
-@@ -3,6 +3,7 @@
- *.bin
- *.cpio
- *.csp
-+*.dbg
- *.dsp
- *.dvi
- *.elf
-@@ -38,8 +39,10 @@
- *.tab.h
- *.tex
- *.ver
-+*.vim
- *.xml
- *_MODULES
-+*_reg_safe.h
- *_vga16.c
- *~
- *.9
-@@ -49,11 +52,16 @@
- 53c700_d.h
- CVS
- ChangeSet
-+GPATH
-+GRTAGS
-+GSYMS
-+GTAGS
- Image
- Kerntypes
- Module.markers
- Module.symvers
- PENDING
-+PERF*
- SCCS
- System.map*
- TAGS
-@@ -76,7 +84,10 @@ btfixupprep
- build
- bvmlinux
- bzImage*
-+capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -103,13 +114,14 @@ gen_crc32table
- gen_init_cpio
- genksyms
- *_gray256.c
-+hash
- ihex2fw
- ikconfig.h*
- initramfs_data.cpio
-+initramfs_data.cpio.bz2
- initramfs_data.cpio.gz
- initramfs_list
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -133,7 +145,9 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
-+mkregtable
- mktables
- mktree
- modpost
-@@ -149,6 +163,7 @@ patches*
- pca200e.bin
- pca200e_ecd.bin2
- piggy.gz
-+piggy.S
- piggyback
- pnmtologo
- ppc_defs.h*
-@@ -157,12 +172,14 @@ qconf
- raid6altivec*.c
- raid6int*.c
- raid6tables.c
-+regdb.c
- relocs
- series
- setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -186,14 +203,20 @@ version.h*
- vmlinux
- vmlinux-*
- vmlinux.aout
-+vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
-+voffset.h
- vsyscall.lds
- vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
- zImage*
- zconf.hash.c
-+zoffset.h
-diff -urNp linux-2.6.32.21/Documentation/kernel-parameters.txt linux-2.6.32.21/Documentation/kernel-parameters.txt
---- linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/Documentation/kernel-parameters.txt 2010-08-13 18:34:40.000000000 -0400
-@@ -1836,6 +1836,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.
-
-+ pax_nouderef [X86-32] disables UDEREF. Most likely needed under certain
-+ virtualization environments that don't cope well with the
-+ expand down segment used by UDEREF on X86-32.
-+
-+ pax_softmode= [X86-32] 0/1 to disable/enable PaX softmode on boot already.
-+
- pcbit= [HW,ISDN]
-
- pcd. [PARIDE]
diff -urNp linux-2.6.32.21/drivers/acpi/acpi_pad.c linux-2.6.32.21/drivers/acpi/acpi_pad.c
---- linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/acpi_pad.c 2010-09-13 08:10:07.000000000 -0400
@@ -30,7 +30,7 @@
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
@@ -20412,8 +20444,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/acpi_pad.c linux-2.6.32.21/drivers/acpi/
#define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
static DEFINE_MUTEX(isolated_cpus_lock);
diff -urNp linux-2.6.32.21/drivers/acpi/battery.c linux-2.6.32.21/drivers/acpi/battery.c
---- linux-2.6.32.21/drivers/acpi/battery.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/battery.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/battery.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/battery.c 2010-09-13 08:10:07.000000000 -0400
@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
}
@@ -20424,8 +20456,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/battery.c linux-2.6.32.21/drivers/acpi/b
const char *name;
} acpi_battery_file[] = {
diff -urNp linux-2.6.32.21/drivers/acpi/blacklist.c linux-2.6.32.21/drivers/acpi/blacklist.c
---- linux-2.6.32.21/drivers/acpi/blacklist.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/blacklist.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/blacklist.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/blacklist.c 2010-09-13 08:10:07.000000000 -0400
@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
{"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
"Incorrect _ADR", 1},
@@ -20436,8 +20468,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/blacklist.c linux-2.6.32.21/drivers/acpi
#if CONFIG_ACPI_BLACKLIST_YEAR
diff -urNp linux-2.6.32.21/drivers/acpi/dock.c linux-2.6.32.21/drivers/acpi/dock.c
---- linux-2.6.32.21/drivers/acpi/dock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/dock.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/dock.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/dock.c 2010-09-13 08:10:07.000000000 -0400
@@ -77,7 +77,7 @@ struct dock_dependent_device {
struct list_head list;
struct list_head hotplug_list;
@@ -20457,8 +20489,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/dock.c linux-2.6.32.21/drivers/acpi/dock
{
struct dock_dependent_device *dd;
diff -urNp linux-2.6.32.21/drivers/acpi/osl.c linux-2.6.32.21/drivers/acpi/osl.c
---- linux-2.6.32.21/drivers/acpi/osl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/osl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/osl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/osl.c 2010-09-13 08:10:07.000000000 -0400
@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
void __iomem *virt_addr;
@@ -20478,8 +20510,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/osl.c linux-2.6.32.21/drivers/acpi/osl.c
switch (width) {
case 8:
diff -urNp linux-2.6.32.21/drivers/acpi/power_meter.c linux-2.6.32.21/drivers/acpi/power_meter.c
---- linux-2.6.32.21/drivers/acpi/power_meter.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/power_meter.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/power_meter.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/power_meter.c 2010-09-13 08:10:07.000000000 -0400
@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
return res;
@@ -20490,8 +20522,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/power_meter.c linux-2.6.32.21/drivers/ac
mutex_lock(&resource->lock);
resource->trip[attr->index - 7] = temp;
diff -urNp linux-2.6.32.21/drivers/acpi/proc.c linux-2.6.32.21/drivers/acpi/proc.c
---- linux-2.6.32.21/drivers/acpi/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/proc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/proc.c 2010-09-13 08:10:07.000000000 -0400
@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
size_t count, loff_t * ppos)
{
@@ -20528,8 +20560,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/proc.c linux-2.6.32.21/drivers/acpi/proc
dev->wakeup.state.enabled ? 0 : 1;
found_dev = dev;
diff -urNp linux-2.6.32.21/drivers/acpi/processor_core.c linux-2.6.32.21/drivers/acpi/processor_core.c
---- linux-2.6.32.21/drivers/acpi/processor_core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/processor_core.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/processor_core.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/processor_core.c 2010-09-13 08:10:07.000000000 -0400
@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
return 0;
}
@@ -20540,8 +20572,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/processor_core.c linux-2.6.32.21/drivers
/*
* Buggy BIOS check
diff -urNp linux-2.6.32.21/drivers/acpi/processor_idle.c linux-2.6.32.21/drivers/acpi/processor_idle.c
---- linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/processor_idle.c 2010-09-13 08:10:07.000000000 -0400
@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
@@ -20552,8 +20584,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/processor_idle.c linux-2.6.32.21/drivers
diff -urNp linux-2.6.32.21/drivers/acpi/sbshc.c linux-2.6.32.21/drivers/acpi/sbshc.c
---- linux-2.6.32.21/drivers/acpi/sbshc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/sbshc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/sbshc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/sbshc.c 2010-09-13 08:10:07.000000000 -0400
@@ -17,7 +17,7 @@
#define PREFIX "ACPI: "
@@ -20564,8 +20596,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/sbshc.c linux-2.6.32.21/drivers/acpi/sbs
struct acpi_smb_hc {
diff -urNp linux-2.6.32.21/drivers/acpi/sleep.c linux-2.6.32.21/drivers/acpi/sleep.c
---- linux-2.6.32.21/drivers/acpi/sleep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/sleep.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/sleep.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/sleep.c 2010-09-13 08:10:07.000000000 -0400
@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp
}
}
@@ -20603,8 +20635,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/sleep.c linux-2.6.32.21/drivers/acpi/sle
.end = acpi_pm_end,
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
diff -urNp linux-2.6.32.21/drivers/acpi/video.c linux-2.6.32.21/drivers/acpi/video.c
---- linux-2.6.32.21/drivers/acpi/video.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/acpi/video.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/acpi/video.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/acpi/video.c 2010-09-13 08:10:07.000000000 -0400
@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
vd->brightness->levels[request_level]);
}
@@ -20615,8 +20647,8 @@ diff -urNp linux-2.6.32.21/drivers/acpi/video.c linux-2.6.32.21/drivers/acpi/vid
.update_status = acpi_video_set_brightness,
};
diff -urNp linux-2.6.32.21/drivers/ata/ahci.c linux-2.6.32.21/drivers/ata/ahci.c
---- linux-2.6.32.21/drivers/ata/ahci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ahci.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/ahci.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/ahci.c 2010-09-13 08:10:07.000000000 -0400
@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
.sdev_attrs = ahci_sdev_attrs,
};
@@ -20657,8 +20689,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/ahci.c linux-2.6.32.21/drivers/ata/ahci.c
diff -urNp linux-2.6.32.21/drivers/ata/ata_generic.c linux-2.6.32.21/drivers/ata/ata_generic.c
---- linux-2.6.32.21/drivers/ata/ata_generic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ata_generic.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/ata_generic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/ata_generic.c 2010-09-13 08:10:07.000000000 -0400
@@ -95,7 +95,7 @@ static struct scsi_host_template generic
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20669,8 +20701,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/ata_generic.c linux-2.6.32.21/drivers/ata
.cable_detect = ata_cable_unknown,
.set_mode = generic_set_mode,
diff -urNp linux-2.6.32.21/drivers/ata/ata_piix.c linux-2.6.32.21/drivers/ata/ata_piix.c
---- linux-2.6.32.21/drivers/ata/ata_piix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/ata_piix.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/ata_piix.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/ata_piix.c 2010-09-13 08:10:07.000000000 -0400
@@ -300,7 +300,7 @@ static const struct pci_device_id piix_p
{ 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
/* SATA Controller IDE (CPT) */
@@ -20735,8 +20767,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/ata_piix.c linux-2.6.32.21/drivers/ata/at
static const char *oemstrs[] = {
"Tecra M3,",
diff -urNp linux-2.6.32.21/drivers/ata/libata-acpi.c linux-2.6.32.21/drivers/ata/libata-acpi.c
---- linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/libata-acpi.c 2010-09-13 08:10:07.000000000 -0400
@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
ata_acpi_uevent(dev->link->ap, dev, event);
}
@@ -20753,8 +20785,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-acpi.c linux-2.6.32.21/drivers/ata
.uevent = ata_acpi_ap_uevent,
};
diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata/libata-core.c
---- linux-2.6.32.21/drivers/ata/libata-core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-core.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/libata-core.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/libata-core.c 2010-09-13 08:10:07.000000000 -0400
@@ -900,7 +900,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 },
@@ -20829,8 +20861,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-core.c linux-2.6.32.21/drivers/ata
.qc_issue = ata_dummy_qc_issue,
.error_handler = ata_dummy_error_handler,
diff -urNp linux-2.6.32.21/drivers/ata/libata-eh.c linux-2.6.32.21/drivers/ata/libata-eh.c
---- linux-2.6.32.21/drivers/ata/libata-eh.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-eh.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/libata-eh.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/libata-eh.c 2010-09-13 08:10:07.000000000 -0400
@@ -3586,7 +3586,7 @@ void ata_do_eh(struct ata_port *ap, ata_
*/
void ata_std_error_handler(struct ata_port *ap)
@@ -20841,8 +20873,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-eh.c linux-2.6.32.21/drivers/ata/l
/* ignore built-in hardreset if SCR access is not available */
diff -urNp linux-2.6.32.21/drivers/ata/libata-pmp.c linux-2.6.32.21/drivers/ata/libata-pmp.c
---- linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/libata-pmp.c 2010-09-13 08:10:07.000000000 -0400
@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
*/
static int sata_pmp_eh_recover(struct ata_port *ap)
@@ -20853,8 +20885,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/libata-pmp.c linux-2.6.32.21/drivers/ata/
struct ata_link *pmp_link = &ap->link;
struct ata_device *pmp_dev = pmp_link->device;
diff -urNp linux-2.6.32.21/drivers/ata/pata_acpi.c linux-2.6.32.21/drivers/ata/pata_acpi.c
---- linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_acpi.c 2010-09-13 08:10:07.000000000 -0400
@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20865,8 +20897,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_acpi.c linux-2.6.32.21/drivers/ata/p
.qc_issue = pacpi_qc_issue,
.cable_detect = pacpi_cable_detect,
diff -urNp linux-2.6.32.21/drivers/ata/pata_ali.c linux-2.6.32.21/drivers/ata/pata_ali.c
---- linux-2.6.32.21/drivers/ata/pata_ali.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ali.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_ali.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_ali.c 2010-09-13 08:10:07.000000000 -0400
@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
* Port operations for PIO only ALi
*/
@@ -20913,8 +20945,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ali.c linux-2.6.32.21/drivers/ata/pa
.check_atapi_dma = ali_check_atapi_dma,
.dev_config = ali_warn_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/pata_amd.c linux-2.6.32.21/drivers/ata/pata_amd.c
---- linux-2.6.32.21/drivers/ata/pata_amd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_amd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_amd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_amd.c 2010-09-13 08:10:07.000000000 -0400
@@ -397,28 +397,28 @@ static const struct ata_port_operations
.prereset = amd_pre_reset,
};
@@ -20965,8 +20997,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_amd.c linux-2.6.32.21/drivers/ata/pa
.set_piomode = nv133_set_piomode,
.set_dmamode = nv133_set_dmamode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_artop.c linux-2.6.32.21/drivers/ata/pata_artop.c
---- linux-2.6.32.21/drivers/ata/pata_artop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_artop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_artop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_artop.c 2010-09-13 08:10:07.000000000 -0400
@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -20986,8 +21018,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_artop.c linux-2.6.32.21/drivers/ata/
.cable_detect = artop6260_cable_detect,
.set_piomode = artop6260_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_at32.c linux-2.6.32.21/drivers/ata/pata_at32.c
---- linux-2.6.32.21/drivers/ata/pata_at32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_at32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_at32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_at32.c 2010-09-13 08:10:07.000000000 -0400
@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -20998,8 +21030,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_at32.c linux-2.6.32.21/drivers/ata/p
.cable_detect = ata_cable_40wire,
.set_piomode = pata_at32_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_at91.c linux-2.6.32.21/drivers/ata/pata_at91.c
---- linux-2.6.32.21/drivers/ata/pata_at91.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_at91.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_at91.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_at91.c 2010-09-13 08:10:07.000000000 -0400
@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
ATA_PIO_SHT(DRV_NAME),
};
@@ -21010,8 +21042,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_at91.c linux-2.6.32.21/drivers/ata/p
.sff_data_xfer = pata_at91_data_xfer_noirq,
diff -urNp linux-2.6.32.21/drivers/ata/pata_atiixp.c linux-2.6.32.21/drivers/ata/pata_atiixp.c
---- linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_atiixp.c 2010-09-13 08:10:07.000000000 -0400
@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21022,8 +21054,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_atiixp.c linux-2.6.32.21/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.21/drivers/ata/pata_atp867x.c linux-2.6.32.21/drivers/ata/pata_atp867x.c
---- linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_atp867x.c 2010-09-13 08:10:07.000000000 -0400
@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21034,8 +21066,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_atp867x.c linux-2.6.32.21/drivers/at
.cable_detect = atp867x_cable_detect,
.set_piomode = atp867x_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_bf54x.c linux-2.6.32.21/drivers/ata/pata_bf54x.c
---- linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_bf54x.c 2010-09-13 08:10:07.000000000 -0400
@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21046,8 +21078,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_bf54x.c linux-2.6.32.21/drivers/ata/
.set_piomode = bfin_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd640.c linux-2.6.32.21/drivers/ata/pata_cmd640.c
---- linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cmd640.c 2010-09-13 08:10:07.000000000 -0400
@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21058,8 +21090,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd640.c linux-2.6.32.21/drivers/ata
/* In theory xfer_noirq is not needed once we kill the prefetcher */
.sff_data_xfer = ata_sff_data_xfer_noirq,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd64x.c linux-2.6.32.21/drivers/ata/pata_cmd64x.c
---- linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cmd64x.c 2010-09-13 08:10:07.000000000 -0400
@@ -275,18 +275,18 @@ static const struct ata_port_operations
.set_dmamode = cmd64x_set_dmamode,
};
@@ -21083,8 +21115,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cmd64x.c linux-2.6.32.21/drivers/ata
.bmdma_stop = cmd648_bmdma_stop,
.cable_detect = cmd648_cable_detect,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5520.c linux-2.6.32.21/drivers/ata/pata_cs5520.c
---- linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cs5520.c 2010-09-13 08:10:07.000000000 -0400
@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21095,8 +21127,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5520.c linux-2.6.32.21/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5530.c linux-2.6.32.21/drivers/ata/pata_cs5530.c
---- linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cs5530.c 2010-09-13 08:10:07.000000000 -0400
@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21107,8 +21139,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5530.c linux-2.6.32.21/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5535.c linux-2.6.32.21/drivers/ata/pata_cs5535.c
---- linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cs5535.c 2010-09-13 08:10:07.000000000 -0400
@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21119,8 +21151,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5535.c linux-2.6.32.21/drivers/ata
.cable_detect = cs5535_cable_detect,
.set_piomode = cs5535_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5536.c linux-2.6.32.21/drivers/ata/pata_cs5536.c
---- linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cs5536.c 2010-09-13 08:10:07.000000000 -0400
@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21131,8 +21163,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cs5536.c linux-2.6.32.21/drivers/ata
.cable_detect = cs5536_cable_detect,
.set_piomode = cs5536_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_cypress.c linux-2.6.32.21/drivers/ata/pata_cypress.c
---- linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_cypress.c 2010-09-13 08:10:07.000000000 -0400
@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21143,8 +21175,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_cypress.c linux-2.6.32.21/drivers/at
.cable_detect = ata_cable_40wire,
.set_piomode = cy82c693_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_efar.c linux-2.6.32.21/drivers/ata/pata_efar.c
---- linux-2.6.32.21/drivers/ata/pata_efar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_efar.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_efar.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_efar.c 2010-09-13 08:10:07.000000000 -0400
@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21155,8 +21187,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_efar.c linux-2.6.32.21/drivers/ata/p
.cable_detect = efar_cable_detect,
.set_piomode = efar_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt366.c linux-2.6.32.21/drivers/ata/pata_hpt366.c
---- linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_hpt366.c 2010-09-13 08:10:07.000000000 -0400
@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
* Configuration for HPT366/68
*/
@@ -21167,8 +21199,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt366.c linux-2.6.32.21/drivers/ata
.cable_detect = hpt36x_cable_detect,
.mode_filter = hpt366_filter,
diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt37x.c linux-2.6.32.21/drivers/ata/pata_hpt37x.c
---- linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_hpt37x.c 2010-09-13 08:10:07.000000000 -0400
@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
* Configuration for HPT370
*/
@@ -21206,8 +21238,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt37x.c linux-2.6.32.21/drivers/ata
.prereset = hpt374_fn1_pre_reset,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c
---- linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c 2010-09-13 08:10:07.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
* Configuration for HPT3x2n.
*/
@@ -21218,8 +21250,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x2n.c linux-2.6.32.21/drivers/at
.bmdma_stop = hpt3x2n_bmdma_stop,
diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x3.c linux-2.6.32.21/drivers/ata/pata_hpt3x3.c
---- linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_hpt3x3.c 2010-09-13 08:10:07.000000000 -0400
@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21230,8 +21262,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_hpt3x3.c linux-2.6.32.21/drivers/ata
.cable_detect = ata_cable_40wire,
.set_piomode = hpt3x3_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_icside.c linux-2.6.32.21/drivers/ata/pata_icside.c
---- linux-2.6.32.21/drivers/ata/pata_icside.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_icside.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_icside.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_icside.c 2010-09-13 08:10:07.000000000 -0400
@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
}
}
@@ -21242,8 +21274,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_icside.c linux-2.6.32.21/drivers/ata
/* no need to build any PRD tables for DMA */
.qc_prep = ata_noop_qc_prep,
diff -urNp linux-2.6.32.21/drivers/ata/pata_isapnp.c linux-2.6.32.21/drivers/ata/pata_isapnp.c
---- linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_isapnp.c 2010-09-13 08:10:07.000000000 -0400
@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21260,8 +21292,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_isapnp.c linux-2.6.32.21/drivers/ata
.cable_detect = ata_cable_40wire,
/* No altstatus so we don't want to use the lost interrupt poll */
diff -urNp linux-2.6.32.21/drivers/ata/pata_it8213.c linux-2.6.32.21/drivers/ata/pata_it8213.c
---- linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_it8213.c 2010-09-13 08:10:07.000000000 -0400
@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
};
@@ -21272,8 +21304,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_it8213.c linux-2.6.32.21/drivers/ata
.cable_detect = it8213_cable_detect,
.set_piomode = it8213_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_it821x.c linux-2.6.32.21/drivers/ata/pata_it821x.c
---- linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_it821x.c 2010-09-13 08:10:07.000000000 -0400
@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21302,8 +21334,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_it821x.c linux-2.6.32.21/drivers/ata
.check_atapi_dma= it821x_check_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c
---- linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c 2010-09-13 08:10:07.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21314,8 +21346,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.21/drivers/
.sff_data_xfer = ixp4xx_mmio_data_xfer,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_jmicron.c linux-2.6.32.21/drivers/ata/pata_jmicron.c
---- linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_jmicron.c 2010-09-13 08:10:07.000000000 -0400
@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21326,8 +21358,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_jmicron.c linux-2.6.32.21/drivers/at
.prereset = jmicron_pre_reset,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_legacy.c linux-2.6.32.21/drivers/ata/pata_legacy.c
---- linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_legacy.c 2010-09-13 08:10:07.000000000 -0400
@@ -106,7 +106,7 @@ struct legacy_probe {
struct legacy_controller {
@@ -21440,8 +21472,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_legacy.c linux-2.6.32.21/drivers/ata
struct ata_host *host = NULL;
struct ata_port *ap;
diff -urNp linux-2.6.32.21/drivers/ata/pata_marvell.c linux-2.6.32.21/drivers/ata/pata_marvell.c
---- linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_marvell.c 2010-09-13 08:10:07.000000000 -0400
@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21452,8 +21484,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_marvell.c linux-2.6.32.21/drivers/at
.cable_detect = marvell_cable_detect,
.prereset = marvell_pre_reset,
diff -urNp linux-2.6.32.21/drivers/ata/pata_mpc52xx.c linux-2.6.32.21/drivers/ata/pata_mpc52xx.c
---- linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_mpc52xx.c 2010-09-13 08:10:07.000000000 -0400
@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
ATA_PIO_SHT(DRV_NAME),
};
@@ -21464,8 +21496,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_mpc52xx.c linux-2.6.32.21/drivers/at
.sff_dev_select = mpc52xx_ata_dev_select,
.set_piomode = mpc52xx_ata_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_mpiix.c linux-2.6.32.21/drivers/ata/pata_mpiix.c
---- linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_mpiix.c 2010-09-13 08:10:07.000000000 -0400
@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
ATA_PIO_SHT(DRV_NAME),
};
@@ -21476,8 +21508,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_mpiix.c linux-2.6.32.21/drivers/ata/
.qc_issue = mpiix_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_netcell.c linux-2.6.32.21/drivers/ata/pata_netcell.c
---- linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_netcell.c 2010-09-13 08:10:07.000000000 -0400
@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21488,8 +21520,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_netcell.c linux-2.6.32.21/drivers/at
.cable_detect = ata_cable_80wire,
.read_id = netcell_read_id,
diff -urNp linux-2.6.32.21/drivers/ata/pata_ninja32.c linux-2.6.32.21/drivers/ata/pata_ninja32.c
---- linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_ninja32.c 2010-09-13 08:10:07.000000000 -0400
@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21500,8 +21532,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ninja32.c linux-2.6.32.21/drivers/at
.sff_dev_select = ninja32_dev_select,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87410.c linux-2.6.32.21/drivers/ata/pata_ns87410.c
---- linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_ns87410.c 2010-09-13 08:10:07.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
ATA_PIO_SHT(DRV_NAME),
};
@@ -21512,8 +21544,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87410.c linux-2.6.32.21/drivers/at
.qc_issue = ns87410_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87415.c linux-2.6.32.21/drivers/ata/pata_ns87415.c
---- linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_ns87415.c 2010-09-13 08:10:07.000000000 -0400
@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
}
#endif /* 87560 SuperIO Support */
@@ -21533,8 +21565,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_ns87415.c linux-2.6.32.21/drivers/at
.sff_tf_read = ns87560_tf_read,
.sff_check_status = ns87560_check_status,
diff -urNp linux-2.6.32.21/drivers/ata/pata_octeon_cf.c linux-2.6.32.21/drivers/ata/pata_octeon_cf.c
---- linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_octeon_cf.c 2010-09-13 08:10:07.000000000 -0400
@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
return 0;
}
@@ -21544,8 +21576,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_octeon_cf.c linux-2.6.32.21/drivers/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = octeon_cf_check_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/pata_oldpiix.c linux-2.6.32.21/drivers/ata/pata_oldpiix.c
---- linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_oldpiix.c 2010-09-13 08:10:07.000000000 -0400
@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21556,8 +21588,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_oldpiix.c linux-2.6.32.21/drivers/at
.qc_issue = oldpiix_qc_issue,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_opti.c linux-2.6.32.21/drivers/ata/pata_opti.c
---- linux-2.6.32.21/drivers/ata/pata_opti.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_opti.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_opti.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_opti.c 2010-09-13 08:10:07.000000000 -0400
@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
ATA_PIO_SHT(DRV_NAME),
};
@@ -21568,8 +21600,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_opti.c linux-2.6.32.21/drivers/ata/p
.cable_detect = ata_cable_40wire,
.set_piomode = opti_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_optidma.c linux-2.6.32.21/drivers/ata/pata_optidma.c
---- linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_optidma.c 2010-09-13 08:10:07.000000000 -0400
@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21589,8 +21621,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_optidma.c linux-2.6.32.21/drivers/at
.set_piomode = optiplus_set_pio_mode,
.set_dmamode = optiplus_set_dma_mode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_palmld.c linux-2.6.32.21/drivers/ata/pata_palmld.c
---- linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_palmld.c 2010-09-13 08:10:07.000000000 -0400
@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21601,8 +21633,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_palmld.c linux-2.6.32.21/drivers/ata
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pata_pcmcia.c linux-2.6.32.21/drivers/ata/pata_pcmcia.c
---- linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_pcmcia.c 2010-09-13 08:10:07.000000000 -0400
@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21630,8 +21662,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pcmcia.c linux-2.6.32.21/drivers/ata
info = kzalloc(sizeof(*info), GFP_KERNEL);
if (info == NULL)
diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc2027x.c linux-2.6.32.21/drivers/ata/pata_pdc2027x.c
---- linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_pdc2027x.c 2010-09-13 08:10:07.000000000 -0400
@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21650,8 +21682,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc2027x.c linux-2.6.32.21/drivers/a
.mode_filter = pdc2027x_mode_filter,
.set_piomode = pdc2027x_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c
---- linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c 2010-09-13 08:10:07.000000000 -0400
@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21671,8 +21703,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.21/drive
.check_atapi_dma = pdc2026x_check_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/pata_platform.c linux-2.6.32.21/drivers/ata/pata_platform.c
---- linux-2.6.32.21/drivers/ata/pata_platform.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_platform.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_platform.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_platform.c 2010-09-13 08:10:07.000000000 -0400
@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
ATA_PIO_SHT(DRV_NAME),
};
@@ -21683,8 +21715,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_platform.c linux-2.6.32.21/drivers/a
.sff_data_xfer = ata_sff_data_xfer_noirq,
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.21/drivers/ata/pata_qdi.c linux-2.6.32.21/drivers/ata/pata_qdi.c
---- linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_qdi.c 2010-09-13 08:10:07.000000000 -0400
@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
ATA_PIO_SHT(DRV_NAME),
};
@@ -21704,8 +21736,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_qdi.c linux-2.6.32.21/drivers/ata/pa
.set_piomode = qdi6580_set_piomode,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_radisys.c linux-2.6.32.21/drivers/ata/pata_radisys.c
---- linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_radisys.c 2010-09-13 08:10:07.000000000 -0400
@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21716,8 +21748,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_radisys.c linux-2.6.32.21/drivers/at
.qc_issue = radisys_qc_issue,
.cable_detect = ata_cable_unknown,
diff -urNp linux-2.6.32.21/drivers/ata/pata_rb532_cf.c linux-2.6.32.21/drivers/ata/pata_rb532_cf.c
---- linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_rb532_cf.c 2010-09-13 08:10:07.000000000 -0400
@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
return IRQ_HANDLED;
}
@@ -21728,8 +21760,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rb532_cf.c linux-2.6.32.21/drivers/a
.sff_data_xfer = ata_sff_data_xfer32,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_rdc.c linux-2.6.32.21/drivers/ata/pata_rdc.c
---- linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_rdc.c 2010-09-13 08:10:07.000000000 -0400
@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
pci_write_config_byte(dev, 0x48, udma_enable);
}
@@ -21740,8 +21772,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rdc.c linux-2.6.32.21/drivers/ata/pa
.cable_detect = rdc_pata_cable_detect,
.set_piomode = rdc_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_rz1000.c linux-2.6.32.21/drivers/ata/pata_rz1000.c
---- linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_rz1000.c 2010-09-13 08:10:07.000000000 -0400
@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
ATA_PIO_SHT(DRV_NAME),
};
@@ -21752,8 +21784,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_rz1000.c linux-2.6.32.21/drivers/ata
.cable_detect = ata_cable_40wire,
.set_mode = rz1000_set_mode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_sc1200.c linux-2.6.32.21/drivers/ata/pata_sc1200.c
---- linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_sc1200.c 2010-09-13 08:10:07.000000000 -0400
@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
.sg_tablesize = LIBATA_DUMB_MAX_PRD,
};
@@ -21764,8 +21796,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sc1200.c linux-2.6.32.21/drivers/ata
.qc_prep = ata_sff_dumb_qc_prep,
.qc_issue = sc1200_qc_issue,
diff -urNp linux-2.6.32.21/drivers/ata/pata_scc.c linux-2.6.32.21/drivers/ata/pata_scc.c
---- linux-2.6.32.21/drivers/ata/pata_scc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_scc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_scc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_scc.c 2010-09-13 08:10:07.000000000 -0400
@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21776,8 +21808,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_scc.c linux-2.6.32.21/drivers/ata/pa
.set_piomode = scc_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_sch.c linux-2.6.32.21/drivers/ata/pata_sch.c
---- linux-2.6.32.21/drivers/ata/pata_sch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sch.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_sch.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_sch.c 2010-09-13 08:10:07.000000000 -0400
@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21788,8 +21820,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sch.c linux-2.6.32.21/drivers/ata/pa
.cable_detect = ata_cable_unknown,
.set_piomode = sch_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_serverworks.c linux-2.6.32.21/drivers/ata/pata_serverworks.c
---- linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_serverworks.c 2010-09-13 08:10:07.000000000 -0400
@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21809,8 +21841,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_serverworks.c linux-2.6.32.21/driver
.mode_filter = serverworks_csb_filter,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_sil680.c linux-2.6.32.21/drivers/ata/pata_sil680.c
---- linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_sil680.c 2010-09-13 08:10:07.000000000 -0400
@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21821,8 +21853,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sil680.c linux-2.6.32.21/drivers/ata
.cable_detect = sil680_cable_detect,
.set_piomode = sil680_set_piomode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_sis.c linux-2.6.32.21/drivers/ata/pata_sis.c
---- linux-2.6.32.21/drivers/ata/pata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sis.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_sis.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_sis.c 2010-09-13 08:10:07.000000000 -0400
@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21879,8 +21911,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sis.c linux-2.6.32.21/drivers/ata/pa
.set_piomode = sis_old_set_piomode,
.set_dmamode = sis_old_set_dmamode,
diff -urNp linux-2.6.32.21/drivers/ata/pata_sl82c105.c linux-2.6.32.21/drivers/ata/pata_sl82c105.c
---- linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_sl82c105.c 2010-09-13 08:10:07.000000000 -0400
@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21891,8 +21923,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_sl82c105.c linux-2.6.32.21/drivers/a
.qc_defer = sl82c105_qc_defer,
.bmdma_start = sl82c105_bmdma_start,
diff -urNp linux-2.6.32.21/drivers/ata/pata_triflex.c linux-2.6.32.21/drivers/ata/pata_triflex.c
---- linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_triflex.c 2010-09-13 08:10:07.000000000 -0400
@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21903,8 +21935,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_triflex.c linux-2.6.32.21/drivers/at
.bmdma_start = triflex_bmdma_start,
.bmdma_stop = triflex_bmdma_stop,
diff -urNp linux-2.6.32.21/drivers/ata/pata_via.c linux-2.6.32.21/drivers/ata/pata_via.c
---- linux-2.6.32.21/drivers/ata/pata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_via.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_via.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_via.c 2010-09-13 08:10:07.000000000 -0400
@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -21924,8 +21956,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_via.c linux-2.6.32.21/drivers/ata/pa
.sff_data_xfer = ata_sff_data_xfer_noirq,
};
diff -urNp linux-2.6.32.21/drivers/ata/pata_winbond.c linux-2.6.32.21/drivers/ata/pata_winbond.c
---- linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pata_winbond.c 2010-09-13 08:10:07.000000000 -0400
@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
ATA_PIO_SHT(DRV_NAME),
};
@@ -21936,8 +21968,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pata_winbond.c linux-2.6.32.21/drivers/at
.sff_data_xfer = winbond_data_xfer,
.cable_detect = ata_cable_40wire,
diff -urNp linux-2.6.32.21/drivers/ata/pdc_adma.c linux-2.6.32.21/drivers/ata/pdc_adma.c
---- linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/pdc_adma.c 2010-09-13 08:10:07.000000000 -0400
@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
.dma_boundary = ADMA_DMA_BOUNDARY,
};
@@ -21948,8 +21980,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/pdc_adma.c linux-2.6.32.21/drivers/ata/pd
.lost_interrupt = ATA_OP_NULL,
diff -urNp linux-2.6.32.21/drivers/ata/sata_fsl.c linux-2.6.32.21/drivers/ata/sata_fsl.c
---- linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_fsl.c 2010-09-13 08:10:07.000000000 -0400
@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
.dma_boundary = ATA_DMA_BOUNDARY,
};
@@ -21960,8 +21992,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_fsl.c linux-2.6.32.21/drivers/ata/sa
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.21/drivers/ata/sata_inic162x.c linux-2.6.32.21/drivers/ata/sata_inic162x.c
---- linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_inic162x.c 2010-09-13 08:10:07.000000000 -0400
@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
return 0;
}
@@ -21972,8 +22004,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_inic162x.c linux-2.6.32.21/drivers/a
.check_atapi_dma = inic_check_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/sata_mv.c linux-2.6.32.21/drivers/ata/sata_mv.c
---- linux-2.6.32.21/drivers/ata/sata_mv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_mv.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_mv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_mv.c 2010-09-13 08:10:07.000000000 -0400
@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
.dma_boundary = MV_DMA_BOUNDARY,
};
@@ -22002,8 +22034,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_mv.c linux-2.6.32.21/drivers/ata/sat
.dev_config = ATA_OP_NULL,
.qc_prep = mv_qc_prep_iie,
diff -urNp linux-2.6.32.21/drivers/ata/sata_nv.c linux-2.6.32.21/drivers/ata/sata_nv.c
---- linux-2.6.32.21/drivers/ata/sata_nv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_nv.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_nv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_nv.c 2010-09-13 08:10:07.000000000 -0400
@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
* cases. Define nv_hardreset() which only kicks in for post-boot
* probing and use it for all variants.
@@ -22047,8 +22079,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_nv.c linux-2.6.32.21/drivers/ata/sat
.qc_defer = ata_std_qc_defer,
diff -urNp linux-2.6.32.21/drivers/ata/sata_promise.c linux-2.6.32.21/drivers/ata/sata_promise.c
---- linux-2.6.32.21/drivers/ata/sata_promise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_promise.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_promise.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_promise.c 2010-09-13 08:10:07.000000000 -0400
@@ -195,7 +195,7 @@ static const struct ata_port_operations
.error_handler = pdc_error_handler,
};
@@ -22076,8 +22108,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_promise.c linux-2.6.32.21/drivers/at
.cable_detect = pdc_pata_cable_detect,
.freeze = pdc_freeze,
diff -urNp linux-2.6.32.21/drivers/ata/sata_qstor.c linux-2.6.32.21/drivers/ata/sata_qstor.c
---- linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_qstor.c 2010-09-13 08:10:07.000000000 -0400
@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
.dma_boundary = QS_DMA_BOUNDARY,
};
@@ -22087,21 +22119,9 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_qstor.c linux-2.6.32.21/drivers/ata/
.inherits = &ata_sff_port_ops,
.check_atapi_dma = qs_check_atapi_dma,
-diff -urNp linux-2.6.32.21/drivers/ata/sata_sil24.c linux-2.6.32.21/drivers/ata/sata_sil24.c
---- linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-08-13 18:34:40.000000000 -0400
-@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
- .dma_boundary = ATA_DMA_BOUNDARY,
- };
-
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- .inherits = &sata_pmp_port_ops,
-
- .qc_defer = sil24_qc_defer,
diff -urNp linux-2.6.32.21/drivers/ata/sata_sil.c linux-2.6.32.21/drivers/ata/sata_sil.c
---- linux-2.6.32.21/drivers/ata/sata_sil.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sil.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_sil.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_sil.c 2010-09-13 08:10:07.000000000 -0400
@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
.sg_tablesize = ATA_MAX_PRD
};
@@ -22111,9 +22131,21 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sil.c linux-2.6.32.21/drivers/ata/sa
.inherits = &ata_bmdma32_port_ops,
.dev_config = sil_dev_config,
.set_mode = sil_set_mode,
+diff -urNp linux-2.6.32.21/drivers/ata/sata_sil24.c linux-2.6.32.21/drivers/ata/sata_sil24.c
+--- linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_sil24.c 2010-09-13 08:10:07.000000000 -0400
+@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
+ .dma_boundary = ATA_DMA_BOUNDARY,
+ };
+
+-static struct ata_port_operations sil24_ops = {
++static const struct ata_port_operations sil24_ops = {
+ .inherits = &sata_pmp_port_ops,
+
+ .qc_defer = sil24_qc_defer,
diff -urNp linux-2.6.32.21/drivers/ata/sata_sis.c linux-2.6.32.21/drivers/ata/sata_sis.c
---- linux-2.6.32.21/drivers/ata/sata_sis.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sis.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_sis.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_sis.c 2010-09-13 08:10:07.000000000 -0400
@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22124,8 +22156,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sis.c linux-2.6.32.21/drivers/ata/sa
.scr_read = sis_scr_read,
.scr_write = sis_scr_write,
diff -urNp linux-2.6.32.21/drivers/ata/sata_svw.c linux-2.6.32.21/drivers/ata/sata_svw.c
---- linux-2.6.32.21/drivers/ata/sata_svw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_svw.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_svw.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_svw.c 2010-09-13 08:10:07.000000000 -0400
@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
};
@@ -22136,8 +22168,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_svw.c linux-2.6.32.21/drivers/ata/sa
.sff_tf_load = k2_sata_tf_load,
.sff_tf_read = k2_sata_tf_read,
diff -urNp linux-2.6.32.21/drivers/ata/sata_sx4.c linux-2.6.32.21/drivers/ata/sata_sx4.c
---- linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_sx4.c 2010-09-13 08:10:07.000000000 -0400
@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
};
@@ -22148,8 +22180,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_sx4.c linux-2.6.32.21/drivers/ata/sa
.check_atapi_dma = pdc_check_atapi_dma,
diff -urNp linux-2.6.32.21/drivers/ata/sata_uli.c linux-2.6.32.21/drivers/ata/sata_uli.c
---- linux-2.6.32.21/drivers/ata/sata_uli.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_uli.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_uli.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_uli.c 2010-09-13 08:10:07.000000000 -0400
@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22160,8 +22192,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_uli.c linux-2.6.32.21/drivers/ata/sa
.scr_read = uli_scr_read,
.scr_write = uli_scr_write,
diff -urNp linux-2.6.32.21/drivers/ata/sata_via.c linux-2.6.32.21/drivers/ata/sata_via.c
---- linux-2.6.32.21/drivers/ata/sata_via.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_via.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_via.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_via.c 2010-09-13 08:10:07.000000000 -0400
@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -22200,8 +22232,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_via.c linux-2.6.32.21/drivers/ata/sa
.hardreset = sata_std_hardreset,
.scr_read = vt8251_scr_read,
diff -urNp linux-2.6.32.21/drivers/ata/sata_vsc.c linux-2.6.32.21/drivers/ata/sata_vsc.c
---- linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ata/sata_vsc.c 2010-09-13 08:10:07.000000000 -0400
@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
};
@@ -22212,8 +22244,8 @@ diff -urNp linux-2.6.32.21/drivers/ata/sata_vsc.c linux-2.6.32.21/drivers/ata/sa
/* The IRQ handling is not quite standard SFF behaviour so we
cannot use the default lost interrupt handler */
diff -urNp linux-2.6.32.21/drivers/atm/adummy.c linux-2.6.32.21/drivers/atm/adummy.c
---- linux-2.6.32.21/drivers/atm/adummy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/adummy.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/adummy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/adummy.c 2010-09-13 08:10:07.000000000 -0400
@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
vcc->pop(vcc, skb);
else
@@ -22224,8 +22256,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/adummy.c linux-2.6.32.21/drivers/atm/adum
return 0;
}
diff -urNp linux-2.6.32.21/drivers/atm/ambassador.c linux-2.6.32.21/drivers/atm/ambassador.c
---- linux-2.6.32.21/drivers/atm/ambassador.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/ambassador.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/ambassador.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/ambassador.c 2010-09-13 08:10:07.000000000 -0400
@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
@@ -22263,8 +22295,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/ambassador.c linux-2.6.32.21/drivers/atm/
}
diff -urNp linux-2.6.32.21/drivers/atm/atmtcp.c linux-2.6.32.21/drivers/atm/atmtcp.c
---- linux-2.6.32.21/drivers/atm/atmtcp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/atmtcp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/atmtcp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/atmtcp.c 2010-09-13 08:10:07.000000000 -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);
@@ -22315,8 +22347,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/atmtcp.c linux-2.6.32.21/drivers/atm/atmt
if (vcc->pop) vcc->pop(vcc,skb);
else dev_kfree_skb(skb);
diff -urNp linux-2.6.32.21/drivers/atm/eni.c linux-2.6.32.21/drivers/atm/eni.c
---- linux-2.6.32.21/drivers/atm/eni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/eni.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/eni.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/eni.c 2010-09-13 08:10:08.000000000 -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);
@@ -22363,8 +22395,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/eni.c linux-2.6.32.21/drivers/atm/eni.c
dma_complete++;
}
diff -urNp linux-2.6.32.21/drivers/atm/firestream.c linux-2.6.32.21/drivers/atm/firestream.c
---- linux-2.6.32.21/drivers/atm/firestream.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/firestream.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/firestream.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/firestream.c 2010-09-13 08:10:08.000000000 -0400
@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
}
}
@@ -22399,8 +22431,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/firestream.c linux-2.6.32.21/drivers/atm/
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.32.21/drivers/atm/fore200e.c linux-2.6.32.21/drivers/atm/fore200e.c
---- linux-2.6.32.21/drivers/atm/fore200e.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/fore200e.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/fore200e.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/fore200e.c 2010-09-13 08:10:08.000000000 -0400
@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
#endif
/* check error condition */
@@ -22458,8 +22490,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/fore200e.c linux-2.6.32.21/drivers/atm/fo
fore200e->tx_sat++;
DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
diff -urNp linux-2.6.32.21/drivers/atm/he.c linux-2.6.32.21/drivers/atm/he.c
---- linux-2.6.32.21/drivers/atm/he.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/he.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/he.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/he.c 2010-09-13 08:10:08.000000000 -0400
@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22542,8 +22574,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/he.c linux-2.6.32.21/drivers/atm/he.c
return 0;
}
diff -urNp linux-2.6.32.21/drivers/atm/horizon.c linux-2.6.32.21/drivers/atm/horizon.c
---- linux-2.6.32.21/drivers/atm/horizon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/horizon.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/horizon.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/horizon.c 2010-09-13 08:10:08.000000000 -0400
@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
{
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22563,8 +22595,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/horizon.c linux-2.6.32.21/drivers/atm/hor
// free the skb
hrz_kfree_skb (skb);
diff -urNp linux-2.6.32.21/drivers/atm/idt77252.c linux-2.6.32.21/drivers/atm/idt77252.c
---- linux-2.6.32.21/drivers/atm/idt77252.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/idt77252.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/idt77252.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/idt77252.c 2010-09-13 08:10:08.000000000 -0400
@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
else
dev_kfree_skb(skb);
@@ -22720,8 +22752,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/idt77252.c linux-2.6.32.21/drivers/atm/id
}
atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
diff -urNp linux-2.6.32.21/drivers/atm/iphase.c linux-2.6.32.21/drivers/atm/iphase.c
---- linux-2.6.32.21/drivers/atm/iphase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/iphase.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/iphase.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/iphase.c 2010-09-13 08:10:08.000000000 -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))
@@ -22819,8 +22851,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/iphase.c linux-2.6.32.21/drivers/atm/ipha
vcc->tx_quota = vcc->tx_quota * 3 / 4;
printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
diff -urNp linux-2.6.32.21/drivers/atm/lanai.c linux-2.6.32.21/drivers/atm/lanai.c
---- linux-2.6.32.21/drivers/atm/lanai.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/lanai.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/lanai.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/lanai.c 2010-09-13 08:10:08.000000000 -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);
@@ -22876,8 +22908,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/lanai.c linux-2.6.32.21/drivers/atm/lanai
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.32.21/drivers/atm/nicstar.c linux-2.6.32.21/drivers/atm/nicstar.c
---- linux-2.6.32.21/drivers/atm/nicstar.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/nicstar.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/nicstar.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/nicstar.c 2010-09-13 08:10:08.000000000 -0400
@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
if ((vc = (vc_map *) vcc->dev_data) == NULL)
{
@@ -23081,8 +23113,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/nicstar.c linux-2.6.32.21/drivers/atm/nic
}
diff -urNp linux-2.6.32.21/drivers/atm/solos-pci.c linux-2.6.32.21/drivers/atm/solos-pci.c
---- linux-2.6.32.21/drivers/atm/solos-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/solos-pci.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/solos-pci.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/solos-pci.c 2010-09-13 08:10:08.000000000 -0400
@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
}
atm_charge(vcc, skb->truesize);
@@ -23102,8 +23134,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/solos-pci.c linux-2.6.32.21/drivers/atm/s
} else
dev_kfree_skb_irq(oldskb);
diff -urNp linux-2.6.32.21/drivers/atm/suni.c linux-2.6.32.21/drivers/atm/suni.c
---- linux-2.6.32.21/drivers/atm/suni.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/suni.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/suni.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/suni.c 2010-09-13 08:10:08.000000000 -0400
@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
@@ -23116,8 +23148,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/suni.c linux-2.6.32.21/drivers/atm/suni.c
static void suni_hz(unsigned long from_timer)
diff -urNp linux-2.6.32.21/drivers/atm/uPD98402.c linux-2.6.32.21/drivers/atm/uPD98402.c
---- linux-2.6.32.21/drivers/atm/uPD98402.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/uPD98402.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/uPD98402.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/uPD98402.c 2010-09-13 08:10:08.000000000 -0400
@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
struct sonet_stats tmp;
int error = 0;
@@ -23163,8 +23195,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/uPD98402.c linux-2.6.32.21/drivers/atm/uP
}
diff -urNp linux-2.6.32.21/drivers/atm/zatm.c linux-2.6.32.21/drivers/atm/zatm.c
---- linux-2.6.32.21/drivers/atm/zatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/atm/zatm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/atm/zatm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/atm/zatm.c 2010-09-13 08:10:08.000000000 -0400
@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
}
if (!size) {
@@ -23193,8 +23225,8 @@ diff -urNp linux-2.6.32.21/drivers/atm/zatm.c linux-2.6.32.21/drivers/atm/zatm.c
}
diff -urNp linux-2.6.32.21/drivers/base/bus.c linux-2.6.32.21/drivers/base/bus.c
---- linux-2.6.32.21/drivers/base/bus.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/bus.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/base/bus.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/base/bus.c 2010-09-13 08:10:08.000000000 -0400
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
return ret;
}
@@ -23223,8 +23255,8 @@ diff -urNp linux-2.6.32.21/drivers/base/bus.c linux-2.6.32.21/drivers/base/bus.c
};
diff -urNp linux-2.6.32.21/drivers/base/class.c linux-2.6.32.21/drivers/base/class.c
---- linux-2.6.32.21/drivers/base/class.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/class.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/base/class.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/base/class.c 2010-09-13 08:10:08.000000000 -0400
@@ -63,7 +63,7 @@ static void class_release(struct kobject
kfree(cp);
}
@@ -23235,8 +23267,8 @@ diff -urNp linux-2.6.32.21/drivers/base/class.c linux-2.6.32.21/drivers/base/cla
.store = class_attr_store,
};
diff -urNp linux-2.6.32.21/drivers/base/core.c linux-2.6.32.21/drivers/base/core.c
---- linux-2.6.32.21/drivers/base/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/core.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/base/core.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/base/core.c 2010-09-13 08:10:08.000000000 -0400
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
return ret;
}
@@ -23256,8 +23288,8 @@ diff -urNp linux-2.6.32.21/drivers/base/core.c linux-2.6.32.21/drivers/base/core
.name = dev_uevent_name,
.uevent = dev_uevent,
diff -urNp linux-2.6.32.21/drivers/base/memory.c linux-2.6.32.21/drivers/base/memory.c
---- linux-2.6.32.21/drivers/base/memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/memory.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/base/memory.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/base/memory.c 2010-09-13 08:10:08.000000000 -0400
@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
return retval;
}
@@ -23268,8 +23300,8 @@ diff -urNp linux-2.6.32.21/drivers/base/memory.c linux-2.6.32.21/drivers/base/me
.uevent = memory_uevent,
};
diff -urNp linux-2.6.32.21/drivers/base/sys.c linux-2.6.32.21/drivers/base/sys.c
---- linux-2.6.32.21/drivers/base/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/base/sys.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/base/sys.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/base/sys.c 2010-09-13 08:10:08.000000000 -0400
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
return -EIO;
}
@@ -23289,8 +23321,8 @@ diff -urNp linux-2.6.32.21/drivers/base/sys.c linux-2.6.32.21/drivers/base/sys.c
.store = sysdev_class_store,
};
diff -urNp linux-2.6.32.21/drivers/block/pktcdvd.c linux-2.6.32.21/drivers/block/pktcdvd.c
---- linux-2.6.32.21/drivers/block/pktcdvd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/block/pktcdvd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/block/pktcdvd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/block/pktcdvd.c 2010-09-13 08:10:08.000000000 -0400
@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
return len;
}
@@ -23301,8 +23333,8 @@ diff -urNp linux-2.6.32.21/drivers/block/pktcdvd.c linux-2.6.32.21/drivers/block
.store = kobj_pkt_store
};
diff -urNp linux-2.6.32.21/drivers/char/agp/frontend.c linux-2.6.32.21/drivers/char/agp/frontend.c
---- linux-2.6.32.21/drivers/char/agp/frontend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/agp/frontend.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/agp/frontend.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/agp/frontend.c 2010-09-13 08:10:08.000000000 -0400
@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
return -EFAULT;
@@ -23313,8 +23345,8 @@ diff -urNp linux-2.6.32.21/drivers/char/agp/frontend.c linux-2.6.32.21/drivers/c
client = agp_find_client_by_pid(reserve.pid);
diff -urNp linux-2.6.32.21/drivers/char/agp/intel-agp.c linux-2.6.32.21/drivers/char/agp/intel-agp.c
---- linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/agp/intel-agp.c 2010-09-13 08:10:08.000000000 -0400
@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
@@ -23325,8 +23357,8 @@ diff -urNp linux-2.6.32.21/drivers/char/agp/intel-agp.c linux-2.6.32.21/drivers/
MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
diff -urNp linux-2.6.32.21/drivers/char/hpet.c linux-2.6.32.21/drivers/char/hpet.c
---- linux-2.6.32.21/drivers/char/hpet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hpet.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hpet.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hpet.c 2010-09-13 08:10:08.000000000 -0400
@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
return 0;
}
@@ -23355,8 +23387,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hpet.c linux-2.6.32.21/drivers/char/hpet
static int __init hpet_init(void)
{
diff -urNp linux-2.6.32.21/drivers/char/hvc_beat.c linux-2.6.32.21/drivers/char/hvc_beat.c
---- linux-2.6.32.21/drivers/char/hvc_beat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_beat.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_beat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_beat.c 2010-09-13 08:10:08.000000000 -0400
@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
return cnt;
}
@@ -23367,8 +23399,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_beat.c linux-2.6.32.21/drivers/char/
.put_chars = hvc_beat_put_chars,
};
diff -urNp linux-2.6.32.21/drivers/char/hvc_console.c linux-2.6.32.21/drivers/char/hvc_console.c
---- linux-2.6.32.21/drivers/char/hvc_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_console.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_console.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_console.c 2010-09-13 08:10:08.000000000 -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.
@@ -23397,8 +23429,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_console.c linux-2.6.32.21/drivers/ch
struct hvc_struct *hp;
int i;
diff -urNp linux-2.6.32.21/drivers/char/hvc_console.h linux-2.6.32.21/drivers/char/hvc_console.h
---- linux-2.6.32.21/drivers/char/hvc_console.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_console.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_console.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_console.h 2010-09-13 08:10:08.000000000 -0400
@@ -55,7 +55,7 @@ struct hvc_struct {
int outbuf_size;
int n_outbuf;
@@ -23423,8 +23455,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_console.h linux-2.6.32.21/drivers/ch
extern int hvc_remove(struct hvc_struct *hp);
diff -urNp linux-2.6.32.21/drivers/char/hvc_iseries.c linux-2.6.32.21/drivers/char/hvc_iseries.c
---- linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_iseries.c 2010-09-13 08:10:08.000000000 -0400
@@ -197,7 +197,7 @@ done:
return sent;
}
@@ -23435,8 +23467,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_iseries.c linux-2.6.32.21/drivers/ch
.put_chars = put_chars,
.notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.21/drivers/char/hvc_iucv.c linux-2.6.32.21/drivers/char/hvc_iucv.c
---- linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_iucv.c 2010-09-13 08:10:08.000000000 -0400
@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
@@ -23447,8 +23479,8 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_iucv.c linux-2.6.32.21/drivers/char/
.put_chars = hvc_iucv_put_chars,
.notifier_add = hvc_iucv_notifier_add,
diff -urNp linux-2.6.32.21/drivers/char/hvc_rtas.c linux-2.6.32.21/drivers/char/hvc_rtas.c
---- linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_rtas.c 2010-09-13 08:10:08.000000000 -0400
@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
return i;
}
@@ -23458,9 +23490,45 @@ diff -urNp linux-2.6.32.21/drivers/char/hvc_rtas.c linux-2.6.32.21/drivers/char/
.get_chars = hvc_rtas_read_console,
.put_chars = hvc_rtas_write_console,
};
+diff -urNp linux-2.6.32.21/drivers/char/hvc_udbg.c linux-2.6.32.21/drivers/char/hvc_udbg.c
+--- linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-09-13 08:10:08.000000000 -0400
+@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
+ return i;
+ }
+
+-static struct hv_ops hvc_udbg_ops = {
++static const struct hv_ops hvc_udbg_ops = {
+ .get_chars = hvc_udbg_get,
+ .put_chars = hvc_udbg_put,
+ };
+diff -urNp linux-2.6.32.21/drivers/char/hvc_vio.c linux-2.6.32.21/drivers/char/hvc_vio.c
+--- linux-2.6.32.21/drivers/char/hvc_vio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_vio.c 2010-09-13 08:10:08.000000000 -0400
+@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
+ return got;
+ }
+
+-static struct hv_ops hvc_get_put_ops = {
++static const struct hv_ops hvc_get_put_ops = {
+ .get_chars = filtered_get_chars,
+ .put_chars = hvc_put_chars,
+ .notifier_add = notifier_add_irq,
+diff -urNp linux-2.6.32.21/drivers/char/hvc_xen.c linux-2.6.32.21/drivers/char/hvc_xen.c
+--- linux-2.6.32.21/drivers/char/hvc_xen.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvc_xen.c 2010-09-13 08:10:08.000000000 -0400
+@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
+ return recv;
+ }
+
+-static struct hv_ops hvc_ops = {
++static const struct hv_ops hvc_ops = {
+ .get_chars = read_console,
+ .put_chars = write_console,
+ .notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.21/drivers/char/hvcs.c linux-2.6.32.21/drivers/char/hvcs.c
---- linux-2.6.32.21/drivers/char/hvcs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvcs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/hvcs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/hvcs.c 2010-09-13 08:10:08.000000000 -0400
@@ -269,7 +269,7 @@ struct hvcs_struct {
unsigned int index;
@@ -23555,45 +23623,9 @@ diff -urNp linux-2.6.32.21/drivers/char/hvcs.c linux-2.6.32.21/drivers/char/hvcs
return 0;
return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.21/drivers/char/hvc_udbg.c linux-2.6.32.21/drivers/char/hvc_udbg.c
---- linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_udbg.c 2010-08-13 18:34:40.000000000 -0400
-@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
- return i;
- }
-
--static struct hv_ops hvc_udbg_ops = {
-+static const struct hv_ops hvc_udbg_ops = {
- .get_chars = hvc_udbg_get,
- .put_chars = hvc_udbg_put,
- };
-diff -urNp linux-2.6.32.21/drivers/char/hvc_vio.c linux-2.6.32.21/drivers/char/hvc_vio.c
---- linux-2.6.32.21/drivers/char/hvc_vio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_vio.c 2010-08-13 18:34:40.000000000 -0400
-@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
- return got;
- }
-
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
- .get_chars = filtered_get_chars,
- .put_chars = hvc_put_chars,
- .notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.21/drivers/char/hvc_xen.c linux-2.6.32.21/drivers/char/hvc_xen.c
---- linux-2.6.32.21/drivers/char/hvc_xen.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/hvc_xen.c 2010-08-13 18:34:40.000000000 -0400
-@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
- return recv;
- }
-
--static struct hv_ops hvc_ops = {
-+static const struct hv_ops hvc_ops = {
- .get_chars = read_console,
- .put_chars = write_console,
- .notifier_add = notifier_add_irq,
diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c
---- linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c 2010-09-13 08:10:08.000000000 -0400
@@ -414,7 +414,7 @@ struct ipmi_smi {
struct proc_dir_entry *proc_dir;
char proc_dir_name[10];
@@ -23625,8 +23657,8 @@ diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.21/d
intf->proc_dir = NULL;
diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c
---- linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c 2010-09-13 08:10:08.000000000 -0400
@@ -277,7 +277,7 @@ struct smi_info {
unsigned char slave_addr;
@@ -23658,8 +23690,8 @@ diff -urNp linux-2.6.32.21/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.21/driv
new_smi->interrupt_disabled = 0;
atomic_set(&new_smi->stop_operation, 0);
diff -urNp linux-2.6.32.21/drivers/char/keyboard.c linux-2.6.32.21/drivers/char/keyboard.c
---- linux-2.6.32.21/drivers/char/keyboard.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/keyboard.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/keyboard.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/keyboard.c 2010-09-13 08:10:08.000000000 -0400
@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
kbd->kbdmode == VC_MEDIUMRAW) &&
value != KVAL(K_SAK))
@@ -23687,8 +23719,8 @@ diff -urNp linux-2.6.32.21/drivers/char/keyboard.c linux-2.6.32.21/drivers/char/
MODULE_DEVICE_TABLE(input, kbd_ids);
diff -urNp linux-2.6.32.21/drivers/char/mem.c linux-2.6.32.21/drivers/char/mem.c
---- linux-2.6.32.21/drivers/char/mem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/mem.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/drivers/char/mem.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/mem.c 2010-09-13 08:10:08.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/raw.h>
#include <linux/tty.h>
@@ -23866,8 +23898,8 @@ diff -urNp linux-2.6.32.21/drivers/char/mem.c linux-2.6.32.21/drivers/char/mem.c
static int memory_open(struct inode *inode, struct file *filp)
diff -urNp linux-2.6.32.21/drivers/char/nvram.c linux-2.6.32.21/drivers/char/nvram.c
---- linux-2.6.32.21/drivers/char/nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/nvram.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/nvram.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/nvram.c 2010-09-13 08:10:08.000000000 -0400
@@ -435,7 +435,10 @@ static const struct file_operations nvra
static struct miscdevice nvram_dev = {
NVRAM_MINOR,
@@ -23881,8 +23913,8 @@ diff -urNp linux-2.6.32.21/drivers/char/nvram.c linux-2.6.32.21/drivers/char/nvr
static int __init nvram_init(void)
diff -urNp linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c
---- linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c 2010-09-13 08:10:08.000000000 -0400
@@ -51,7 +51,7 @@ struct ipw_tty {
int tty_type;
struct ipw_network *network;
@@ -23998,8 +24030,8 @@ diff -urNp linux-2.6.32.21/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.21/
ipwireless_disassociate_network_ttys(network,
ttyj->channel_idx);
diff -urNp linux-2.6.32.21/drivers/char/pty.c linux-2.6.32.21/drivers/char/pty.c
---- linux-2.6.32.21/drivers/char/pty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/pty.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/pty.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/pty.c 2010-09-13 08:10:08.000000000 -0400
@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
return ret;
}
@@ -24031,8 +24063,8 @@ diff -urNp linux-2.6.32.21/drivers/char/pty.c linux-2.6.32.21/drivers/char/pty.c
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
diff -urNp linux-2.6.32.21/drivers/char/random.c linux-2.6.32.21/drivers/char/random.c
---- linux-2.6.32.21/drivers/char/random.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/random.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/random.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/random.c 2010-09-13 08:10:08.000000000 -0400
@@ -254,8 +254,13 @@
/*
* Configuration information
@@ -24075,8 +24107,8 @@ diff -urNp linux-2.6.32.21/drivers/char/random.c linux-2.6.32.21/drivers/char/ra
static char sysctl_bootid[16];
diff -urNp linux-2.6.32.21/drivers/char/sonypi.c linux-2.6.32.21/drivers/char/sonypi.c
---- linux-2.6.32.21/drivers/char/sonypi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/sonypi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/sonypi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/sonypi.c 2010-09-13 08:10:08.000000000 -0400
@@ -491,7 +491,7 @@ static struct sonypi_device {
spinlock_t fifo_lock;
wait_queue_head_t fifo_proc_list;
@@ -24108,8 +24140,8 @@ diff -urNp linux-2.6.32.21/drivers/char/sonypi.c linux-2.6.32.21/drivers/char/so
unlock_kernel();
return 0;
diff -urNp linux-2.6.32.21/drivers/char/tpm/tpm_bios.c linux-2.6.32.21/drivers/char/tpm/tpm_bios.c
---- linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/tpm/tpm_bios.c 2010-09-13 08:10:08.000000000 -0400
@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
event = addr;
@@ -24151,8 +24183,8 @@ diff -urNp linux-2.6.32.21/drivers/char/tpm/tpm_bios.c linux-2.6.32.21/drivers/c
memcpy(log->bios_event_log, virt, len);
diff -urNp linux-2.6.32.21/drivers/char/tty_io.c linux-2.6.32.21/drivers/char/tty_io.c
---- linux-2.6.32.21/drivers/char/tty_io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tty_io.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/tty_io.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/tty_io.c 2010-09-13 08:10:08.000000000 -0400
@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
DEFINE_MUTEX(tty_mutex);
EXPORT_SYMBOL(tty_mutex);
@@ -24292,8 +24324,8 @@ diff -urNp linux-2.6.32.21/drivers/char/tty_io.c linux-2.6.32.21/drivers/char/tt
* Initialize the console device. This is called *early*, so
* we can't necessarily depend on lots of kernel help here.
diff -urNp linux-2.6.32.21/drivers/char/tty_ldisc.c linux-2.6.32.21/drivers/char/tty_ldisc.c
---- linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/tty_ldisc.c 2010-09-13 08:10:08.000000000 -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;
@@ -24340,8 +24372,8 @@ diff -urNp linux-2.6.32.21/drivers/char/tty_ldisc.c linux-2.6.32.21/drivers/char
spin_unlock_irqrestore(&tty_ldisc_lock, flags);
}
diff -urNp linux-2.6.32.21/drivers/char/virtio_console.c linux-2.6.32.21/drivers/char/virtio_console.c
---- linux-2.6.32.21/drivers/char/virtio_console.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/virtio_console.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/virtio_console.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/virtio_console.c 2010-09-13 08:10:08.000000000 -0400
@@ -44,6 +44,7 @@ static unsigned int in_len;
static char *in, *inbuf;
@@ -24351,8 +24383,8 @@ diff -urNp linux-2.6.32.21/drivers/char/virtio_console.c linux-2.6.32.21/drivers
/* The hvc device */
diff -urNp linux-2.6.32.21/drivers/char/vt_ioctl.c linux-2.6.32.21/drivers/char/vt_ioctl.c
---- linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/char/vt_ioctl.c 2010-09-13 08:10:08.000000000 -0400
@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
return -EFAULT;
@@ -24397,8 +24429,8 @@ diff -urNp linux-2.6.32.21/drivers/char/vt_ioctl.c linux-2.6.32.21/drivers/char/
ret = -EPERM;
goto reterr;
diff -urNp linux-2.6.32.21/drivers/cpufreq/cpufreq.c linux-2.6.32.21/drivers/cpufreq/cpufreq.c
---- linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/cpufreq/cpufreq.c 2010-09-13 08:10:08.000000000 -0400
@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
complete(&policy->kobj_unregister);
}
@@ -24409,8 +24441,8 @@ diff -urNp linux-2.6.32.21/drivers/cpufreq/cpufreq.c linux-2.6.32.21/drivers/cpu
.store = store,
};
diff -urNp linux-2.6.32.21/drivers/cpuidle/sysfs.c linux-2.6.32.21/drivers/cpuidle/sysfs.c
---- linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/cpuidle/sysfs.c 2010-09-13 08:10:08.000000000 -0400
@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
return ret;
}
@@ -24439,8 +24471,8 @@ diff -urNp linux-2.6.32.21/drivers/cpuidle/sysfs.c linux-2.6.32.21/drivers/cpuid
kobject_put(&device->kobjs[i]->kobj);
wait_for_completion(&device->kobjs[i]->kobj_unregister);
diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.c linux-2.6.32.21/drivers/dma/ioat/dma.c
---- linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/dma/ioat/dma.c 2010-09-13 08:10:08.000000000 -0400
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
return entry->show(&chan->common, page);
}
@@ -24451,8 +24483,8 @@ diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.c linux-2.6.32.21/drivers/dma/io
};
diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.h linux-2.6.32.21/drivers/dma/ioat/dma.h
---- linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/dma/ioat/dma.h 2010-09-13 08:10:08.000000000 -0400
@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
unsigned long *phys_complete);
void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
@@ -24463,8 +24495,8 @@ diff -urNp linux-2.6.32.21/drivers/dma/ioat/dma.h linux-2.6.32.21/drivers/dma/io
extern struct ioat_sysfs_entry ioat_cap_attr;
#endif /* IOATDMA_H */
diff -urNp linux-2.6.32.21/drivers/edac/edac_core.h linux-2.6.32.21/drivers/edac/edac_core.h
---- linux-2.6.32.21/drivers/edac/edac_core.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_core.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/edac/edac_core.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/edac/edac_core.h 2010-09-13 08:10:08.000000000 -0400
@@ -99,11 +99,11 @@ extern int edac_debug_level;
#else /* !CONFIG_EDAC_DEBUG */
@@ -24483,8 +24515,8 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_core.h linux-2.6.32.21/drivers/edac
#endif /* !CONFIG_EDAC_DEBUG */
diff -urNp linux-2.6.32.21/drivers/edac/edac_device_sysfs.c linux-2.6.32.21/drivers/edac/edac_device_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/edac/edac_device_sysfs.c 2010-09-13 08:10:08.000000000 -0400
@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
}
@@ -24513,8 +24545,8 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_device_sysfs.c linux-2.6.32.21/driv
.store = edac_dev_block_store
};
diff -urNp linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c 2010-09-13 08:10:08.000000000 -0400
@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
return -EIO;
}
@@ -24534,8 +24566,8 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_mc_sysfs.c linux-2.6.32.21/drivers/
.store = mcidev_store
};
diff -urNp linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c
---- linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c 2010-09-13 08:10:08.000000000 -0400
@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
}
@@ -24555,8 +24587,8 @@ diff -urNp linux-2.6.32.21/drivers/edac/edac_pci_sysfs.c linux-2.6.32.21/drivers
.store = edac_pci_dev_store
};
diff -urNp linux-2.6.32.21/drivers/firewire/core-cdev.c linux-2.6.32.21/drivers/firewire/core-cdev.c
---- linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firewire/core-cdev.c 2010-09-13 08:10:08.000000000 -0400
@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
int ret;
@@ -24568,8 +24600,8 @@ diff -urNp linux-2.6.32.21/drivers/firewire/core-cdev.c linux-2.6.32.21/drivers/
r = kmalloc(sizeof(*r), GFP_KERNEL);
diff -urNp linux-2.6.32.21/drivers/firmware/dmi_scan.c linux-2.6.32.21/drivers/firmware/dmi_scan.c
---- linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firmware/dmi_scan.c 2010-09-13 08:10:08.000000000 -0400
@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
}
}
@@ -24583,8 +24615,8 @@ diff -urNp linux-2.6.32.21/drivers/firmware/dmi_scan.c linux-2.6.32.21/drivers/f
if (p == NULL)
goto error;
diff -urNp linux-2.6.32.21/drivers/firmware/edd.c linux-2.6.32.21/drivers/firmware/edd.c
---- linux-2.6.32.21/drivers/firmware/edd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/edd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firmware/edd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firmware/edd.c 2010-09-13 08:10:08.000000000 -0400
@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
return ret;
}
@@ -24595,8 +24627,8 @@ diff -urNp linux-2.6.32.21/drivers/firmware/edd.c linux-2.6.32.21/drivers/firmwa
};
diff -urNp linux-2.6.32.21/drivers/firmware/efivars.c linux-2.6.32.21/drivers/firmware/efivars.c
---- linux-2.6.32.21/drivers/firmware/efivars.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/efivars.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firmware/efivars.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firmware/efivars.c 2010-09-13 08:10:08.000000000 -0400
@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
return ret;
}
@@ -24607,8 +24639,8 @@ diff -urNp linux-2.6.32.21/drivers/firmware/efivars.c linux-2.6.32.21/drivers/fi
.store = efivar_attr_store,
};
diff -urNp linux-2.6.32.21/drivers/firmware/iscsi_ibft.c linux-2.6.32.21/drivers/firmware/iscsi_ibft.c
---- linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firmware/iscsi_ibft.c 2010-09-13 08:10:08.000000000 -0400
@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
return ret;
}
@@ -24619,8 +24651,8 @@ diff -urNp linux-2.6.32.21/drivers/firmware/iscsi_ibft.c linux-2.6.32.21/drivers
};
diff -urNp linux-2.6.32.21/drivers/firmware/memmap.c linux-2.6.32.21/drivers/firmware/memmap.c
---- linux-2.6.32.21/drivers/firmware/memmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/firmware/memmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/firmware/memmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/firmware/memmap.c 2010-09-13 08:10:08.000000000 -0400
@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
NULL
};
@@ -24631,8 +24663,8 @@ diff -urNp linux-2.6.32.21/drivers/firmware/memmap.c linux-2.6.32.21/drivers/fir
};
diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_drv.c linux-2.6.32.21/drivers/gpu/drm/drm_drv.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/drm_drv.c 2010-09-13 08:10:09.000000000 -0400
@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
char *kdata = NULL;
@@ -24643,8 +24675,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_drv.c linux-2.6.32.21/drivers/gpu
DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_fops.c linux-2.6.32.21/drivers/gpu/drm/drm_fops.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/drm_fops.c 2010-09-13 08:10:09.000000000 -0400
@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
}
@@ -24697,8 +24729,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_fops.c linux-2.6.32.21/drivers/gp
DRM_ERROR("Device busy: %d\n",
atomic_read(&dev->ioctl_count));
diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c 2010-09-13 08:10:09.000000000 -0400
@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
stats->data[i].value =
(file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24709,8 +24741,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.21/drivers/g
}
diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_lock.c linux-2.6.32.21/drivers/gpu/drm/drm_lock.c
---- linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/drm_lock.c 2010-09-13 08:10:09.000000000 -0400
@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
if (drm_lock_take(&master->lock, lock->context)) {
master->lock.file_priv = file_priv;
@@ -24730,8 +24762,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/drm_lock.c linux-2.6.32.21/drivers/gp
/* 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.32.21/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c
---- linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c 2010-09-13 08:10:09.000000000 -0400
@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
dma->buflist[vertex->idx],
vertex->discard, vertex->used);
@@ -24754,33 +24786,9 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.21/drive
sarea_priv->last_enqueue = dev_priv->counter - 1;
sarea_priv->last_dispatch = (int)hw_status[5];
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-13 18:34:40.000000000 -0400
-@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
- }
- }
-
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- .init = ch7017_init,
- .detect = ch7017_detect,
- .mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-13 18:34:40.000000000 -0400
-@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
- }
- }
-
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- .init = ch7xxx_init,
- .detect = ch7xxx_detect,
- .mode_valid = ch7xxx_mode_valid,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h 2010-09-13 08:10:09.000000000 -0400
@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
*
* \return singly-linked list of modes or NULL if no modes found.
@@ -24813,9 +24821,33 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo.h linux-2.6.32.21/drivers/gp
+extern const struct intel_dvo_dev_ops ch7017_ops;
#endif /* _INTEL_DVO_H */
+diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7017.c 2010-09-13 08:10:09.000000000 -0400
+@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
+ }
+ }
+
+-struct intel_dvo_dev_ops ch7017_ops = {
++const struct intel_dvo_dev_ops ch7017_ops = {
+ .init = ch7017_init,
+ .detect = ch7017_detect,
+ .mode_valid = ch7017_mode_valid,
+diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-09-13 08:10:09.000000000 -0400
+@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
+ }
+ }
+
+-struct intel_dvo_dev_ops ch7xxx_ops = {
++const struct intel_dvo_dev_ops ch7xxx_ops = {
+ .init = ch7xxx_init,
+ .detect = ch7xxx_detect,
+ .mode_valid = ch7xxx_mode_valid,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c 2010-09-13 08:10:09.000000000 -0400
@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
}
}
@@ -24826,8 +24858,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.21/drive
.dpms = ivch_dpms,
.save = ivch_save,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c 2010-09-13 08:10:09.000000000 -0400
@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
}
}
@@ -24838,8 +24870,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.21/dri
.detect = sil164_detect,
.mode_valid = sil164_mode_valid,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c 2010-09-13 08:10:09.000000000 -0400
@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
}
}
@@ -24850,8 +24882,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.21/dri
.detect = tfp410_detect,
.mode_valid = tfp410_mode_valid,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c
---- linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c 2010-09-13 08:10:09.000000000 -0400
@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
return i915_resume(dev);
}
@@ -24862,8 +24894,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.21/drive
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c 2010-09-13 08:10:09.000000000 -0400
@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
regex_t mask_rex;
regmatch_t match[4];
@@ -24882,8 +24914,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.21/d
if (regcomp
(&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c 2010-09-13 08:10:09.000000000 -0400
@@ -513,13 +513,13 @@ static uint16_t atombios_get_connector_o
}
}
@@ -24909,8 +24941,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c 2010-09-13 08:10:09.000000000 -0400
@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
@@ -24921,8 +24953,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_display.c linux-2.6.32.
error = abs(current_freq - freq);
vco_diff = abs(vco - best_vco);
diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c 2010-09-13 08:10:09.000000000 -0400
@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm
{
drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -24933,8 +24965,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32.21
DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c 2010-09-13 08:10:09.000000000 -0400
@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
DRM_INFO("radeon: ttm finalized\n");
}
@@ -24987,8 +25019,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.21/d
diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c 2010-09-13 08:10:09.000000000 -0400
@@ -39,7 +39,7 @@
#include <linux/module.h>
@@ -25008,8 +25040,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.21/drivers/
};
diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-09-13 08:10:09.000000000 -0400
@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
{
struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
@@ -25031,8 +25063,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.21/drive
* Work around locking order reversal in fault / nopfn
* between mmap_sem and bo_reserve: Perform a trylock operation
diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c 2010-09-13 08:10:09.000000000 -0400
@@ -36,7 +36,7 @@
struct ttm_global_item {
struct mutex mutex;
@@ -25091,8 +25123,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32.21/driv
item->object = NULL;
}
diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c
---- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c 2010-09-13 08:10:09.000000000 -0400
@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
NULL
};
@@ -25103,8 +25135,8 @@ diff -urNp linux-2.6.32.21/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.21/driv
.store = &ttm_mem_zone_store
};
diff -urNp linux-2.6.32.21/drivers/hid/usbhid/hiddev.c linux-2.6.32.21/drivers/hid/usbhid/hiddev.c
---- linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hid/usbhid/hiddev.c 2010-09-13 08:10:09.000000000 -0400
@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
return put_user(HID_VERSION, (int __user *)arg);
@@ -25115,8 +25147,8 @@ diff -urNp linux-2.6.32.21/drivers/hid/usbhid/hiddev.c linux-2.6.32.21/drivers/h
for (i = 0; i < hid->maxcollection; i++)
diff -urNp linux-2.6.32.21/drivers/hwmon/k8temp.c linux-2.6.32.21/drivers/hwmon/k8temp.c
---- linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hwmon/k8temp.c 2010-09-13 08:10:09.000000000 -0400
@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
static struct pci_device_id k8temp_ids[] = {
@@ -25127,8 +25159,8 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/k8temp.c linux-2.6.32.21/drivers/hwmon/
MODULE_DEVICE_TABLE(pci, k8temp_ids);
diff -urNp linux-2.6.32.21/drivers/hwmon/sis5595.c linux-2.6.32.21/drivers/hwmon/sis5595.c
---- linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hwmon/sis5595.c 2010-09-13 08:10:09.000000000 -0400
@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
static struct pci_device_id sis5595_pci_ids[] = {
@@ -25139,8 +25171,8 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/sis5595.c linux-2.6.32.21/drivers/hwmon
MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
diff -urNp linux-2.6.32.21/drivers/hwmon/via686a.c linux-2.6.32.21/drivers/hwmon/via686a.c
---- linux-2.6.32.21/drivers/hwmon/via686a.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/via686a.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hwmon/via686a.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hwmon/via686a.c 2010-09-13 08:10:09.000000000 -0400
@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
static struct pci_device_id via686a_pci_ids[] = {
@@ -25151,8 +25183,8 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/via686a.c linux-2.6.32.21/drivers/hwmon
MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
diff -urNp linux-2.6.32.21/drivers/hwmon/vt8231.c linux-2.6.32.21/drivers/hwmon/vt8231.c
---- linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hwmon/vt8231.c 2010-09-13 08:10:09.000000000 -0400
@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
static struct pci_device_id vt8231_pci_ids[] = {
@@ -25163,8 +25195,8 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/vt8231.c linux-2.6.32.21/drivers/hwmon/
MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
diff -urNp linux-2.6.32.21/drivers/hwmon/w83791d.c linux-2.6.32.21/drivers/hwmon/w83791d.c
---- linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/hwmon/w83791d.c 2010-09-13 08:10:09.000000000 -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);
@@ -25177,8 +25209,8 @@ diff -urNp linux-2.6.32.21/drivers/hwmon/w83791d.c linux-2.6.32.21/drivers/hwmon
#ifdef DEBUG
diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c 2010-09-13 08:10:09.000000000 -0400
@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
@@ -25189,8 +25221,8 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-i801.c linux-2.6.32.21/drivers
MODULE_DEVICE_TABLE (pci, i801_ids);
diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c 2010-09-13 08:10:09.000000000 -0400
@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
.ident = "IBM",
.matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), },
@@ -25210,8 +25242,8 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.21/driver
MODULE_DEVICE_TABLE (pci, piix4_ids);
diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c 2010-09-13 08:10:09.000000000 -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) },
@@ -25222,8 +25254,8 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.21/drive
MODULE_DEVICE_TABLE (pci, sis630_ids);
diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c
---- linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c 2010-09-13 08:10:09.000000000 -0400
@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
static struct pci_device_id sis96x_ids[] = {
@@ -25234,8 +25266,8 @@ diff -urNp linux-2.6.32.21/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.21/drive
MODULE_DEVICE_TABLE (pci, sis96x_ids);
diff -urNp linux-2.6.32.21/drivers/ide/ide-cd.c linux-2.6.32.21/drivers/ide/ide-cd.c
---- linux-2.6.32.21/drivers/ide/ide-cd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ide/ide-cd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ide/ide-cd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ide/ide-cd.c 2010-09-13 08:10:09.000000000 -0400
@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_
alignment = queue_dma_alignment(q) | q->dma_pad_mask;
if ((unsigned long)buf & alignment
@@ -25246,8 +25278,8 @@ diff -urNp linux-2.6.32.21/drivers/ide/ide-cd.c linux-2.6.32.21/drivers/ide/ide-
}
}
diff -urNp linux-2.6.32.21/drivers/ieee1394/dv1394.c linux-2.6.32.21/drivers/ieee1394/dv1394.c
---- linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/dv1394.c 2010-09-13 08:10:09.000000000 -0400
@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
based upon DIF section and sequence
*/
@@ -25267,8 +25299,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/dv1394.c linux-2.6.32.21/drivers/iee
MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
diff -urNp linux-2.6.32.21/drivers/ieee1394/eth1394.c linux-2.6.32.21/drivers/ieee1394/eth1394.c
---- linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/eth1394.c 2010-09-13 08:10:09.000000000 -0400
@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
.specifier_id = ETHER1394_GASP_SPECIFIER_ID,
.version = ETHER1394_GASP_VERSION,
@@ -25279,8 +25311,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/eth1394.c linux-2.6.32.21/drivers/ie
MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
diff -urNp linux-2.6.32.21/drivers/ieee1394/hosts.c linux-2.6.32.21/drivers/ieee1394/hosts.c
---- linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/hosts.c 2010-09-13 08:10:09.000000000 -0400
@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
}
@@ -25290,8 +25322,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/hosts.c linux-2.6.32.21/drivers/ieee
.devctl = dummy_devctl,
.isoctl = dummy_isoctl
diff -urNp linux-2.6.32.21/drivers/ieee1394/ohci1394.c linux-2.6.32.21/drivers/ieee1394/ohci1394.c
---- linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/ohci1394.c 2010-09-13 08:10:09.000000000 -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)
@@ -25314,8 +25346,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/ohci1394.c linux-2.6.32.21/drivers/i
MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
diff -urNp linux-2.6.32.21/drivers/ieee1394/raw1394.c linux-2.6.32.21/drivers/ieee1394/raw1394.c
---- linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/raw1394.c 2010-09-13 08:10:09.000000000 -0400
@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
.match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
@@ -25326,8 +25358,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/raw1394.c linux-2.6.32.21/drivers/ie
MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
diff -urNp linux-2.6.32.21/drivers/ieee1394/sbp2.c linux-2.6.32.21/drivers/ieee1394/sbp2.c
---- linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/sbp2.c 2010-09-13 08:10:09.000000000 -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,
@@ -25347,8 +25379,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/sbp2.c linux-2.6.32.21/drivers/ieee1
int ret;
diff -urNp linux-2.6.32.21/drivers/ieee1394/video1394.c linux-2.6.32.21/drivers/ieee1394/video1394.c
---- linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/ieee1394/video1394.c 2010-09-13 08:10:09.000000000 -0400
@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
.specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
.version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff
@@ -25359,8 +25391,8 @@ diff -urNp linux-2.6.32.21/drivers/ieee1394/video1394.c linux-2.6.32.21/drivers/
MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
diff -urNp linux-2.6.32.21/drivers/infiniband/core/cm.c linux-2.6.32.21/drivers/infiniband/core/cm.c
---- linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/infiniband/core/cm.c 2010-09-13 08:10:09.000000000 -0400
@@ -112,7 +112,7 @@ static char const counter_group_names[CM
struct cm_counter_group {
@@ -25505,8 +25537,8 @@ diff -urNp linux-2.6.32.21/drivers/infiniband/core/cm.c linux-2.6.32.21/drivers/
};
diff -urNp linux-2.6.32.21/drivers/infiniband/core/sysfs.c linux-2.6.32.21/drivers/infiniband/core/sysfs.c
---- linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/infiniband/core/sysfs.c 2010-09-13 08:10:09.000000000 -0400
@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
return port_attr->show(p, port_attr, buf);
}
@@ -25517,8 +25549,8 @@ diff -urNp linux-2.6.32.21/drivers/infiniband/core/sysfs.c linux-2.6.32.21/drive
};
diff -urNp linux-2.6.32.21/drivers/input/keyboard/atkbd.c linux-2.6.32.21/drivers/input/keyboard/atkbd.c
---- linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/keyboard/atkbd.c 2010-09-13 08:10:09.000000000 -0400
@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25529,8 +25561,8 @@ diff -urNp linux-2.6.32.21/drivers/input/keyboard/atkbd.c linux-2.6.32.21/driver
MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
diff -urNp linux-2.6.32.21/drivers/input/mouse/lifebook.c linux-2.6.32.21/drivers/input/mouse/lifebook.c
---- linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/mouse/lifebook.c 2010-09-13 08:10:09.000000000 -0400
@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
},
@@ -25541,8 +25573,8 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/lifebook.c linux-2.6.32.21/driver
static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
diff -urNp linux-2.6.32.21/drivers/input/mouse/psmouse-base.c linux-2.6.32.21/drivers/input/mouse/psmouse-base.c
---- linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/mouse/psmouse-base.c 2010-09-13 08:10:09.000000000 -0400
@@ -1415,7 +1415,7 @@ static struct serio_device_id psmouse_se
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25553,8 +25585,8 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/psmouse-base.c linux-2.6.32.21/dr
MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
diff -urNp linux-2.6.32.21/drivers/input/mouse/synaptics.c linux-2.6.32.21/drivers/input/mouse/synaptics.c
---- linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/mouse/synaptics.c 2010-09-13 08:10:09.000000000 -0400
@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
break;
case 2:
@@ -25584,8 +25616,8 @@ diff -urNp linux-2.6.32.21/drivers/input/mouse/synaptics.c linux-2.6.32.21/drive
#endif
diff -urNp linux-2.6.32.21/drivers/input/mousedev.c linux-2.6.32.21/drivers/input/mousedev.c
---- linux-2.6.32.21/drivers/input/mousedev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/mousedev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/mousedev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/mousedev.c 2010-09-13 08:10:09.000000000 -0400
@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
#ifdef CONFIG_INPUT_MOUSEDEV_PSAUX
@@ -25596,8 +25628,8 @@ diff -urNp linux-2.6.32.21/drivers/input/mousedev.c linux-2.6.32.21/drivers/inpu
static int psaux_registered;
#endif
diff -urNp linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h
---- linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h 2010-09-13 08:10:09.000000000 -0400
@@ -179,7 +179,7 @@ static const struct dmi_system_id __init
DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
},
@@ -25653,8 +25685,8 @@ diff -urNp linux-2.6.32.21/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.21
#endif /* CONFIG_X86 */
diff -urNp linux-2.6.32.21/drivers/input/serio/serio_raw.c linux-2.6.32.21/drivers/input/serio/serio_raw.c
---- linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/input/serio/serio_raw.c 2010-09-13 08:10:09.000000000 -0400
@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
.id = SERIO_ANY,
.extra = SERIO_ANY,
@@ -25665,8 +25697,8 @@ diff -urNp linux-2.6.32.21/drivers/input/serio/serio_raw.c linux-2.6.32.21/drive
MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/common.c linux-2.6.32.21/drivers/isdn/gigaset/common.c
---- linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/isdn/gigaset/common.c 2010-09-13 08:10:09.000000000 -0400
@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
cs->commands_pending = 0;
cs->cur_at_seq = 0;
@@ -25677,8 +25709,8 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/common.c linux-2.6.32.21/drivers
cs->tty = NULL;
cs->tty_dev = NULL;
diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h
---- linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h 2010-09-13 08:10:09.000000000 -0400
@@ -446,7 +446,7 @@ struct cardstate {
spinlock_t cmdlock;
unsigned curlen, cmdbytes;
@@ -25689,8 +25721,8 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/gigaset.h linux-2.6.32.21/driver
struct tasklet_struct if_wake_tasklet;
unsigned control_state;
diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/interface.c linux-2.6.32.21/drivers/isdn/gigaset/interface.c
---- linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/isdn/gigaset/interface.c 2010-09-13 08:10:09.000000000 -0400
@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
return -ERESTARTSYS; // FIXME -EINTR?
tty->driver_data = cs;
@@ -25779,8 +25811,8 @@ diff -urNp linux-2.6.32.21/drivers/isdn/gigaset/interface.c linux-2.6.32.21/driv
goto out;
}
diff -urNp linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c
---- linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c 2010-09-13 08:10:09.000000000 -0400
@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
}
if (left) {
@@ -25800,8 +25832,8 @@ diff -urNp linux-2.6.32.21/drivers/isdn/hardware/avm/b1.c linux-2.6.32.21/driver
} else {
memcpy(buf, dp, left);
diff -urNp linux-2.6.32.21/drivers/isdn/icn/icn.c linux-2.6.32.21/drivers/isdn/icn/icn.c
---- linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/isdn/icn/icn.c 2010-09-13 08:10:09.000000000 -0400
@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
if (count > len)
count = len;
@@ -25812,8 +25844,8 @@ diff -urNp linux-2.6.32.21/drivers/isdn/icn/icn.c linux-2.6.32.21/drivers/isdn/i
} else
memcpy(msg, buf, count);
diff -urNp linux-2.6.32.21/drivers/lguest/core.c linux-2.6.32.21/drivers/lguest/core.c
---- linux-2.6.32.21/drivers/lguest/core.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/lguest/core.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/lguest/core.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/lguest/core.c 2010-09-13 08:10:09.000000000 -0400
@@ -91,9 +91,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.
@@ -25833,8 +25865,8 @@ diff -urNp linux-2.6.32.21/drivers/lguest/core.c linux-2.6.32.21/drivers/lguest/
err = -ENOMEM;
printk("lguest: could not map switcher pages high\n");
diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c 2010-09-13 08:10:09.000000000 -0400
@@ -15,7 +15,7 @@
#define MAX_PMU_LEVEL 0xFF
@@ -25854,8 +25886,8 @@ diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.21
.update_status = pmu_backlight_update_status,
diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu.c linux-2.6.32.21/drivers/macintosh/via-pmu.c
---- linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/macintosh/via-pmu.c 2010-09-13 08:10:09.000000000 -0400
@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
}
@@ -25866,8 +25898,8 @@ diff -urNp linux-2.6.32.21/drivers/macintosh/via-pmu.c linux-2.6.32.21/drivers/m
.valid = pmu_sleep_valid,
};
diff -urNp linux-2.6.32.21/drivers/md/bitmap.c linux-2.6.32.21/drivers/md/bitmap.c
---- linux-2.6.32.21/drivers/md/bitmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/bitmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/md/bitmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/md/bitmap.c 2010-09-13 08:10:09.000000000 -0400
@@ -58,7 +58,7 @@
# if DEBUG > 0
# define PRINTK(x...) printk(KERN_DEBUG x)
@@ -25878,8 +25910,8 @@ diff -urNp linux-2.6.32.21/drivers/md/bitmap.c linux-2.6.32.21/drivers/md/bitmap
#endif
diff -urNp linux-2.6.32.21/drivers/md/dm-sysfs.c linux-2.6.32.21/drivers/md/dm-sysfs.c
---- linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/md/dm-sysfs.c 2010-09-13 08:10:09.000000000 -0400
@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
NULL,
};
@@ -25890,8 +25922,8 @@ diff -urNp linux-2.6.32.21/drivers/md/dm-sysfs.c linux-2.6.32.21/drivers/md/dm-s
};
diff -urNp linux-2.6.32.21/drivers/md/dm-table.c linux-2.6.32.21/drivers/md/dm-table.c
---- linux-2.6.32.21/drivers/md/dm-table.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/dm-table.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/md/dm-table.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/md/dm-table.c 2010-09-13 08:10:09.000000000 -0400
@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
if (!dev_size)
return 0;
@@ -25902,8 +25934,8 @@ diff -urNp linux-2.6.32.21/drivers/md/dm-table.c linux-2.6.32.21/drivers/md/dm-t
"start=%llu, len=%llu, dev_size=%llu",
dm_device_name(ti->table->md), bdevname(bdev, b),
diff -urNp linux-2.6.32.21/drivers/md/md.c linux-2.6.32.21/drivers/md/md.c
---- linux-2.6.32.21/drivers/md/md.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/md.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/md/md.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/md/md.c 2010-09-13 08:10:09.000000000 -0400
@@ -2514,7 +2514,7 @@ static void rdev_free(struct kobject *ko
mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
kfree(rdev);
@@ -25941,8 +25973,8 @@ diff -urNp linux-2.6.32.21/drivers/md/md.c linux-2.6.32.21/drivers/md/md.c
* as sync_io is counted when a request starts, and
* disk_stats is counted when it completes.
diff -urNp linux-2.6.32.21/drivers/md/md.h linux-2.6.32.21/drivers/md/md.h
---- linux-2.6.32.21/drivers/md/md.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/md/md.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/md/md.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/md/md.h 2010-09-13 08:10:09.000000000 -0400
@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
@@ -25953,8 +25985,8 @@ diff -urNp linux-2.6.32.21/drivers/md/md.h linux-2.6.32.21/drivers/md/md.h
struct mdk_personality
diff -urNp linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c 2010-09-13 08:10:09.000000000 -0400
@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
const struct dvb_device *template, void *priv, int type)
{
@@ -25964,8 +25996,8 @@ diff -urNp linux-2.6.32.21/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.21/d
struct device *clsdev;
int minor;
diff -urNp linux-2.6.32.21/drivers/media/radio/radio-cadet.c linux-2.6.32.21/drivers/media/radio/radio-cadet.c
---- linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/media/radio/radio-cadet.c 2010-09-13 08:10:09.000000000 -0400
@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
while (i < count && dev->rdsin != dev->rdsout)
readbuf[i++] = dev->rdsbuf[dev->rdsout++];
@@ -25976,8 +26008,8 @@ diff -urNp linux-2.6.32.21/drivers/media/radio/radio-cadet.c linux-2.6.32.21/dri
return i;
}
diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c
---- linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c 2010-09-13 08:10:09.000000000 -0400
@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
int error;
@@ -25988,8 +26020,8 @@ diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c
---- linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c 2010-09-13 08:10:10.000000000 -0400
@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
int error;
@@ -26000,8 +26032,8 @@ diff -urNp linux-2.6.32.21/drivers/media/video/usbvideo/quickcam_messenger.c lin
cam->input = input_dev = input_allocate_device();
if (!input_dev) {
diff -urNp linux-2.6.32.21/drivers/message/fusion/mptdebug.h linux-2.6.32.21/drivers/message/fusion/mptdebug.h
---- linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/message/fusion/mptdebug.h 2010-09-13 08:10:10.000000000 -0400
@@ -71,7 +71,7 @@
CMD; \
}
@@ -26012,8 +26044,8 @@ diff -urNp linux-2.6.32.21/drivers/message/fusion/mptdebug.h linux-2.6.32.21/dri
diff -urNp linux-2.6.32.21/drivers/message/fusion/mptsas.c linux-2.6.32.21/drivers/message/fusion/mptsas.c
---- linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/message/fusion/mptsas.c 2010-09-13 08:10:10.000000000 -0400
@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
return 0;
}
@@ -26063,8 +26095,8 @@ diff -urNp linux-2.6.32.21/drivers/message/fusion/mptsas.c linux-2.6.32.21/drive
mptsas_get_port(struct mptsas_phyinfo *phy_info)
{
diff -urNp linux-2.6.32.21/drivers/message/i2o/i2o_proc.c linux-2.6.32.21/drivers/message/i2o/i2o_proc.c
---- linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/message/i2o/i2o_proc.c 2010-09-13 08:10:10.000000000 -0400
@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
"Array Controller Device"
};
@@ -26152,8 +26184,8 @@ diff -urNp linux-2.6.32.21/drivers/message/i2o/i2o_proc.c linux-2.6.32.21/driver
return 0;
}
diff -urNp linux-2.6.32.21/drivers/misc/kgdbts.c linux-2.6.32.21/drivers/misc/kgdbts.c
---- linux-2.6.32.21/drivers/misc/kgdbts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/kgdbts.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/misc/kgdbts.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/misc/kgdbts.c 2010-09-13 08:10:10.000000000 -0400
@@ -118,7 +118,7 @@
} while (0)
#define MAX_CONFIG_LEN 40
@@ -26173,8 +26205,8 @@ diff -urNp linux-2.6.32.21/drivers/misc/kgdbts.c linux-2.6.32.21/drivers/misc/kg
.read_char = kgdbts_get_char,
.write_char = kgdbts_put_char,
diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c
---- linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c 2010-09-13 08:10:10.000000000 -0400
@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
static void update_mcs_stats(enum mcs_op op, unsigned long clks)
@@ -26187,8 +26219,8 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.21/dri
mcs_op_statistics[op].max = clks;
}
diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c
---- linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -32,9 +32,9 @@
#define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
@@ -26213,8 +26245,8 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.21/driv
seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
count ? total / count : 0, max);
diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h
---- linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h 2010-09-13 08:10:10.000000000 -0400
@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
* GRU statistics.
*/
@@ -26399,8 +26431,8 @@ diff -urNp linux-2.6.32.21/drivers/misc/sgi-gru/grutables.h linux-2.6.32.21/driv
#ifdef CONFIG_SGI_GRU_DEBUG
diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2000.c linux-2.6.32.21/drivers/mtd/devices/doc2000.c
---- linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/mtd/devices/doc2000.c 2010-09-13 08:10:10.000000000 -0400
@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
/* The ECC will not be calculated correctly if less than 512 is written */
@@ -26411,8 +26443,8 @@ diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2000.c linux-2.6.32.21/drivers
"ECC needs a full sector write (adr: %lx size %lx)\n",
(long) to, (long) len);
diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2001.c linux-2.6.32.21/drivers/mtd/devices/doc2001.c
---- linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/mtd/devices/doc2001.c 2010-09-13 08:10:10.000000000 -0400
@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
struct Nand *mychip = &this->chips[from >> (this->chipshift)];
@@ -26423,8 +26455,8 @@ diff -urNp linux-2.6.32.21/drivers/mtd/devices/doc2001.c linux-2.6.32.21/drivers
/* Don't allow a single read to cross a 512-byte block boundary */
diff -urNp linux-2.6.32.21/drivers/mtd/ubi/build.c linux-2.6.32.21/drivers/mtd/ubi/build.c
---- linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/mtd/ubi/build.c 2010-09-13 08:10:10.000000000 -0400
@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
static int __init bytes_str_to_int(const char *str)
{
@@ -26465,8 +26497,8 @@ diff -urNp linux-2.6.32.21/drivers/mtd/ubi/build.c linux-2.6.32.21/drivers/mtd/u
/**
diff -urNp linux-2.6.32.21/drivers/net/e1000e/82571.c linux-2.6.32.21/drivers/net/e1000e/82571.c
---- linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/e1000e/82571.c 2010-09-13 08:10:10.000000000 -0400
@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
{
struct e1000_hw *hw = &adapter->hw;
@@ -26521,8 +26553,8 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/82571.c linux-2.6.32.21/drivers/ne
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_82571,
diff -urNp linux-2.6.32.21/drivers/net/e1000e/e1000.h linux-2.6.32.21/drivers/net/e1000e/e1000.h
---- linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/e1000e/e1000.h 2010-09-13 08:10:10.000000000 -0400
@@ -375,9 +375,9 @@ struct e1000_info {
u32 pba;
u32 max_hw_frame_size;
@@ -26537,8 +26569,8 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/e1000.h linux-2.6.32.21/drivers/ne
/* hardware capability, feature, and workaround flags */
diff -urNp linux-2.6.32.21/drivers/net/e1000e/es2lan.c linux-2.6.32.21/drivers/net/e1000e/es2lan.c
---- linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/e1000e/es2lan.c 2010-09-13 08:10:10.000000000 -0400
@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
{
struct e1000_hw *hw = &adapter->hw;
@@ -26575,8 +26607,8 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/es2lan.c linux-2.6.32.21/drivers/n
.read_nvm = e1000e_read_nvm_eerd,
.release_nvm = e1000_release_nvm_80003es2lan,
diff -urNp linux-2.6.32.21/drivers/net/e1000e/hw.h linux-2.6.32.21/drivers/net/e1000e/hw.h
---- linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/e1000e/hw.h 2010-09-13 08:10:10.000000000 -0400
@@ -756,34 +756,34 @@ struct e1000_mac_operations {
/* Function pointers for the PHY. */
@@ -26637,8 +26669,8 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/hw.h linux-2.6.32.21/drivers/net/e
struct e1000_mac_info {
diff -urNp linux-2.6.32.21/drivers/net/e1000e/ich8lan.c linux-2.6.32.21/drivers/net/e1000e/ich8lan.c
---- linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/e1000e/ich8lan.c 2010-09-13 08:10:10.000000000 -0400
@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
}
}
@@ -26667,8 +26699,8 @@ diff -urNp linux-2.6.32.21/drivers/net/e1000e/ich8lan.c linux-2.6.32.21/drivers/
.read_nvm = e1000_read_nvm_ich8lan,
.release_nvm = e1000_release_nvm_ich8lan,
diff -urNp linux-2.6.32.21/drivers/net/ibmveth.c linux-2.6.32.21/drivers/net/ibmveth.c
---- linux-2.6.32.21/drivers/net/ibmveth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/ibmveth.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/ibmveth.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/ibmveth.c 2010-09-13 08:10:10.000000000 -0400
@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
NULL,
};
@@ -26679,8 +26711,8 @@ diff -urNp linux-2.6.32.21/drivers/net/ibmveth.c linux-2.6.32.21/drivers/net/ibm
.store = veth_pool_store,
};
diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_82575.c linux-2.6.32.21/drivers/net/igb/e1000_82575.c
---- linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/igb/e1000_82575.c 2010-09-13 08:10:10.000000000 -0400
@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct
wr32(E1000_VT_CTL, vt_ctl);
}
@@ -26707,8 +26739,8 @@ diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_82575.c linux-2.6.32.21/drivers
.read = igb_read_nvm_eerd,
.release = igb_release_nvm_82575,
diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_hw.h linux-2.6.32.21/drivers/net/igb/e1000_hw.h
---- linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/igb/e1000_hw.h 2010-09-13 08:10:10.000000000 -0400
@@ -305,17 +305,17 @@ struct e1000_phy_operations {
};
@@ -26735,8 +26767,8 @@ diff -urNp linux-2.6.32.21/drivers/net/igb/e1000_hw.h linux-2.6.32.21/drivers/ne
extern const struct e1000_info e1000_82575_info;
diff -urNp linux-2.6.32.21/drivers/net/irda/vlsi_ir.c linux-2.6.32.21/drivers/net/irda/vlsi_ir.c
---- linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/irda/vlsi_ir.c 2010-09-13 08:10:10.000000000 -0400
@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
/* no race - tx-ring already empty */
vlsi_set_baud(idev, iobase);
@@ -26754,8 +26786,8 @@ diff -urNp linux-2.6.32.21/drivers/net/irda/vlsi_ir.c linux-2.6.32.21/drivers/ne
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
diff -urNp linux-2.6.32.21/drivers/net/iseries_veth.c linux-2.6.32.21/drivers/net/iseries_veth.c
---- linux-2.6.32.21/drivers/net/iseries_veth.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/iseries_veth.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/iseries_veth.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/iseries_veth.c 2010-09-13 08:10:10.000000000 -0400
@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
NULL
};
@@ -26775,8 +26807,8 @@ diff -urNp linux-2.6.32.21/drivers/net/iseries_veth.c linux-2.6.32.21/drivers/ne
};
diff -urNp linux-2.6.32.21/drivers/net/pcnet32.c linux-2.6.32.21/drivers/net/pcnet32.c
---- linux-2.6.32.21/drivers/net/pcnet32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/pcnet32.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/pcnet32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/pcnet32.c 2010-09-13 08:10:10.000000000 -0400
@@ -79,7 +79,7 @@ static int cards_found;
/*
* VLB I/O addresses
@@ -26787,8 +26819,8 @@ diff -urNp linux-2.6.32.21/drivers/net/pcnet32.c linux-2.6.32.21/drivers/net/pcn
static int pcnet32_debug = 0;
diff -urNp linux-2.6.32.21/drivers/net/tg3.h linux-2.6.32.21/drivers/net/tg3.h
---- linux-2.6.32.21/drivers/net/tg3.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/tg3.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/tg3.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/tg3.h 2010-09-13 08:10:10.000000000 -0400
@@ -95,6 +95,7 @@
#define CHIPREV_ID_5750_A0 0x4000
#define CHIPREV_ID_5750_A1 0x4001
@@ -26798,8 +26830,8 @@ diff -urNp linux-2.6.32.21/drivers/net/tg3.h linux-2.6.32.21/drivers/net/tg3.h
#define CHIPREV_ID_5752_A0_HW 0x5000
#define CHIPREV_ID_5752_A0 0x6000
diff -urNp linux-2.6.32.21/drivers/net/tulip/de4x5.c linux-2.6.32.21/drivers/net/tulip/de4x5.c
---- linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/tulip/de4x5.c 2010-09-13 08:10:10.000000000 -0400
@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
for (i=0; i<ETH_ALEN; i++) {
tmp.addr[i] = dev->dev_addr[i];
@@ -26819,8 +26851,8 @@ diff -urNp linux-2.6.32.21/drivers/net/tulip/de4x5.c linux-2.6.32.21/drivers/net
break;
}
diff -urNp linux-2.6.32.21/drivers/net/usb/hso.c linux-2.6.32.21/drivers/net/usb/hso.c
---- linux-2.6.32.21/drivers/net/usb/hso.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/usb/hso.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/usb/hso.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/usb/hso.c 2010-09-13 08:10:10.000000000 -0400
@@ -258,7 +258,7 @@ struct hso_serial {
/* from usb_serial_port */
@@ -26900,8 +26932,8 @@ diff -urNp linux-2.6.32.21/drivers/net/usb/hso.c linux-2.6.32.21/drivers/net/usb
hso_start_serial_device(serial_table[i], GFP_NOIO);
hso_kick_transmit(dev2ser(serial_table[i]));
diff -urNp linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -43,7 +43,7 @@ static struct dentry *rootdir;
struct b43_debugfs_fops {
ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
@@ -26912,8 +26944,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/b43/debugfs.c linux-2.6.32.21/dr
size_t file_struct_offset;
};
diff -urNp linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -44,7 +44,7 @@ static struct dentry *rootdir;
struct b43legacy_debugfs_fops {
ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
@@ -26924,8 +26956,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32
size_t file_struct_offset;
/* Take wl->irq_lock before calling read/write? */
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-09-13 08:10:10.000000000 -0400
@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
},
};
@@ -26936,8 +26968,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
.lib = &iwl1000_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-09-13 08:10:10.000000000 -0400
@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
.build_addsta_hcmd = iwl3945_build_addsta_hcmd,
};
@@ -26948,8 +26980,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
.lib = &iwl3945_lib,
.hcmd = &iwl3945_hcmd,
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-09-13 08:10:10.000000000 -0400
@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =
},
};
@@ -26960,8 +26992,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
.lib = &iwl4965_lib,
.hcmd = &iwl4965_hcmd,
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-09-13 08:10:10.000000000 -0400
@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =
},
};
@@ -26980,8 +27012,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
.lib = &iwl5150_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-09-13 08:10:10.000000000 -0400
@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
.calc_rssi = iwl5000_calc_rssi,
};
@@ -26992,8 +27024,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
.lib = &iwl6000_lib,
.hcmd = &iwl5000_hcmd,
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-09-13 08:10:10.000000000 -0400
@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
#endif
@@ -27006,8 +27038,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32
void *p, u32 len)
{}
diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h
---- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-09-13 08:10:10.000000000 -0400
@@ -68,7 +68,7 @@ struct iwl_tx_queue;
/* shared structures from iwl-5000.c */
@@ -27018,8 +27050,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.2
extern struct iwl_lib_ops iwl5000_lib;
extern struct iwl_hcmd_ops iwl5000_hcmd;
diff -urNp linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c
---- linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -708,7 +708,7 @@ out_unlock:
struct lbs_debugfs_files {
const char *name;
@@ -27030,8 +27062,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
static const struct lbs_debugfs_files debugfs_files[] = {
diff -urNp linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c
---- linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c 2010-09-13 08:10:10.000000000 -0400
@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
@@ -27042,8 +27074,8 @@ diff -urNp linux-2.6.32.21/drivers/net/wireless/rndis_wlan.c linux-2.6.32.21/dri
tmp = cpu_to_le32(rts_threshold);
diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/drivers/oprofile/buffer_sync.c
---- linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/buffer_sync.c 2010-09-13 08:10:10.000000000 -0400
@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
if (cookie == NO_COOKIE)
offset = pc;
@@ -27080,8 +27112,8 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/buffer_sync.c linux-2.6.32.21/driver
}
release_mm(mm);
diff -urNp linux-2.6.32.21/drivers/oprofile/event_buffer.c linux-2.6.32.21/drivers/oprofile/event_buffer.c
---- linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/event_buffer.c 2010-09-13 08:10:10.000000000 -0400
@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
}
@@ -27092,8 +27124,8 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/event_buffer.c linux-2.6.32.21/drive
}
diff -urNp linux-2.6.32.21/drivers/oprofile/oprof.c linux-2.6.32.21/drivers/oprofile/oprof.c
---- linux-2.6.32.21/drivers/oprofile/oprof.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprof.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/oprofile/oprof.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/oprof.c 2010-09-13 08:10:10.000000000 -0400
@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
if (oprofile_ops.switch_events())
return;
@@ -27103,21 +27135,9 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprof.c linux-2.6.32.21/drivers/opro
start_switch_worker();
}
-diff -urNp linux-2.6.32.21/drivers/oprofile/oprofilefs.c linux-2.6.32.21/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-08-13 18:34:40.000000000 -0400
-@@ -187,7 +187,7 @@ static const struct file_operations atom
-
-
- int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
-- char const *name, atomic_t *val)
-+ char const *name, atomic_unchecked_t *val)
- {
- struct dentry *d = __oprofilefs_create_file(sb, root, name,
- &atomic_ro_fops, 0444);
diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.c linux-2.6.32.21/drivers/oprofile/oprofile_stats.c
---- linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.c 2010-09-13 08:10:10.000000000 -0400
@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
cpu_buf->sample_invalid_eip = 0;
}
@@ -27136,8 +27156,8 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.c linux-2.6.32.21/dri
diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.h linux-2.6.32.21/drivers/oprofile/oprofile_stats.h
---- linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/oprofile_stats.h 2010-09-13 08:10:10.000000000 -0400
@@ -13,11 +13,11 @@
#include <asm/atomic.h>
@@ -27155,9 +27175,21 @@ diff -urNp linux-2.6.32.21/drivers/oprofile/oprofile_stats.h linux-2.6.32.21/dri
};
extern struct oprofile_stat_struct oprofile_stats;
+diff -urNp linux-2.6.32.21/drivers/oprofile/oprofilefs.c linux-2.6.32.21/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/oprofile/oprofilefs.c 2010-09-13 08:10:10.000000000 -0400
+@@ -187,7 +187,7 @@ static const struct file_operations atom
+
+
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+- char const *name, atomic_t *val)
++ char const *name, atomic_unchecked_t *val)
+ {
+ struct dentry *d = __oprofilefs_create_file(sb, root, name,
+ &atomic_ro_fops, 0444);
diff -urNp linux-2.6.32.21/drivers/parisc/pdc_stable.c linux-2.6.32.21/drivers/parisc/pdc_stable.c
---- linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/parisc/pdc_stable.c 2010-09-13 08:10:10.000000000 -0400
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
return ret;
}
@@ -27168,8 +27200,8 @@ diff -urNp linux-2.6.32.21/drivers/parisc/pdc_stable.c linux-2.6.32.21/drivers/p
.store = pdcspath_attr_store,
};
diff -urNp linux-2.6.32.21/drivers/parport/procfs.c linux-2.6.32.21/drivers/parport/procfs.c
---- linux-2.6.32.21/drivers/parport/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/parport/procfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/parport/procfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/parport/procfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
*ppos += len;
@@ -27189,8 +27221,8 @@ diff -urNp linux-2.6.32.21/drivers/parport/procfs.c linux-2.6.32.21/drivers/parp
#endif /* IEEE1284.3 support. */
diff -urNp linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c
---- linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c 2010-09-13 08:10:10.000000000 -0400
@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
}
@@ -27201,8 +27233,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.21/dr
};
diff -urNp linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c 2010-09-13 08:10:10.000000000 -0400
@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
void compaq_nvram_init (void __iomem *rom_start)
@@ -27218,8 +27250,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.21/dr
/* initialize our int15 lock */
diff -urNp linux-2.6.32.21/drivers/pci/hotplug/fakephp.c linux-2.6.32.21/drivers/pci/hotplug/fakephp.c
---- linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/hotplug/fakephp.c 2010-09-13 08:10:10.000000000 -0400
@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
}
@@ -27230,8 +27262,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/hotplug/fakephp.c linux-2.6.32.21/drivers
},
.release = &legacy_release,
diff -urNp linux-2.6.32.21/drivers/pci/intel-iommu.c linux-2.6.32.21/drivers/pci/intel-iommu.c
---- linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/intel-iommu.c 2010-09-13 08:10:10.000000000 -0400
@@ -2647,7 +2647,7 @@ error:
return 0;
}
@@ -27302,8 +27334,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/intel-iommu.c linux-2.6.32.21/drivers/pci
.free_coherent = intel_free_coherent,
.map_sg = intel_map_sg,
diff -urNp linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c
---- linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c 2010-09-13 08:10:10.000000000 -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 */
@@ -27314,8 +27346,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.21/driver
MODULE_DEVICE_TABLE(pci, port_pci_ids);
diff -urNp linux-2.6.32.21/drivers/pci/probe.c linux-2.6.32.21/drivers/pci/probe.c
---- linux-2.6.32.21/drivers/pci/probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/probe.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/probe.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/probe.c 2010-09-13 08:10:10.000000000 -0400
@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
return ret;
}
@@ -27334,8 +27366,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/probe.c linux-2.6.32.21/drivers/pci/probe
char *buf)
{
diff -urNp linux-2.6.32.21/drivers/pci/proc.c linux-2.6.32.21/drivers/pci/proc.c
---- linux-2.6.32.21/drivers/pci/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/proc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/proc.c 2010-09-13 08:10:10.000000000 -0400
@@ -480,7 +480,16 @@ static const struct file_operations proc
static int __init pci_proc_init(void)
{
@@ -27354,8 +27386,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/proc.c linux-2.6.32.21/drivers/pci/proc.c
&proc_bus_pci_dev_operations);
proc_initialized = 1;
diff -urNp linux-2.6.32.21/drivers/pci/slot.c linux-2.6.32.21/drivers/pci/slot.c
---- linux-2.6.32.21/drivers/pci/slot.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pci/slot.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pci/slot.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pci/slot.c 2010-09-13 08:10:10.000000000 -0400
@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
return attribute->store ? attribute->store(slot, buf, len) : -EIO;
}
@@ -27366,8 +27398,8 @@ diff -urNp linux-2.6.32.21/drivers/pci/slot.c linux-2.6.32.21/drivers/pci/slot.c
.store = pci_slot_attr_store,
};
diff -urNp linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c
---- linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode
return -EFAULT;
}
@@ -27378,8 +27410,8 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.21/drivers
return -ENOMEM;
diff -urNp linux-2.6.32.21/drivers/pcmcia/ti113x.h linux-2.6.32.21/drivers/pcmcia/ti113x.h
---- linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pcmcia/ti113x.h 2010-09-13 08:10:10.000000000 -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),
@@ -27390,8 +27422,8 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/ti113x.h linux-2.6.32.21/drivers/pcmci
static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
diff -urNp linux-2.6.32.21/drivers/pcmcia/yenta_socket.c linux-2.6.32.21/drivers/pcmcia/yenta_socket.c
---- linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pcmcia/yenta_socket.c 2010-09-13 08:10:10.000000000 -0400
@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
/* match any cardbus bridge */
@@ -27402,8 +27434,8 @@ diff -urNp linux-2.6.32.21/drivers/pcmcia/yenta_socket.c linux-2.6.32.21/drivers
MODULE_DEVICE_TABLE(pci, yenta_table);
diff -urNp linux-2.6.32.21/drivers/platform/x86/acer-wmi.c linux-2.6.32.21/drivers/platform/x86/acer-wmi.c
---- linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/acer-wmi.c 2010-09-13 08:10:10.000000000 -0400
@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
return 0;
}
@@ -27413,21 +27445,9 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/acer-wmi.c linux-2.6.32.21/drive
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
-diff -urNp linux-2.6.32.21/drivers/platform/x86/asus_acpi.c linux-2.6.32.21/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-08-13 18:34:40.000000000 -0400
-@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
- return 0;
- }
-
--static struct backlight_ops asus_backlight_data = {
-+static const struct backlight_ops asus_backlight_data = {
- .get_brightness = read_brightness,
- .update_status = set_brightness_status,
- };
diff -urNp linux-2.6.32.21/drivers/platform/x86/asus-laptop.c linux-2.6.32.21/drivers/platform/x86/asus-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/asus-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
*/
static int read_brightness(struct backlight_device *bd);
@@ -27437,9 +27457,21 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/asus-laptop.c linux-2.6.32.21/dr
.get_brightness = read_brightness,
.update_status = update_bl_status,
};
+diff -urNp linux-2.6.32.21/drivers/platform/x86/asus_acpi.c linux-2.6.32.21/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/asus_acpi.c 2010-09-13 08:10:10.000000000 -0400
+@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
+ return 0;
+ }
+
+-static struct backlight_ops asus_backlight_data = {
++static const struct backlight_ops asus_backlight_data = {
+ .get_brightness = read_brightness,
+ .update_status = set_brightness_status,
+ };
diff -urNp linux-2.6.32.21/drivers/platform/x86/compal-laptop.c linux-2.6.32.21/drivers/platform/x86/compal-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/compal-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -27450,8 +27482,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/compal-laptop.c linux-2.6.32.21/
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/dell-laptop.c linux-2.6.32.21/drivers/platform/x86/dell-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/dell-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
return buffer.output[1];
}
@@ -27462,8 +27494,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/dell-laptop.c linux-2.6.32.21/dr
.update_status = dell_send_intensity,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
*/
static int read_brightness(struct backlight_device *bd);
@@ -27474,8 +27506,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.21/d
.update_status = update_bl_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
return ret;
}
@@ -27486,8 +27518,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.21
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/msi-laptop.c linux-2.6.32.21/drivers/platform/x86/msi-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/msi-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
return set_lcd_level(b->props.brightness);
}
@@ -27498,8 +27530,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/msi-laptop.c linux-2.6.32.21/dri
.update_status = bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
}
@@ -27510,8 +27542,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
.update_status = bl_set_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/sony-laptop.c linux-2.6.32.21/drivers/platform/x86/sony-laptop.c
---- linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/sony-laptop.c 2010-09-13 08:10:10.000000000 -0400
@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
}
@@ -27522,8 +27554,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/sony-laptop.c linux-2.6.32.21/dr
.get_brightness = sony_backlight_get_brightness,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c 2010-09-13 08:10:10.000000000 -0400
@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
BACKLIGHT_UPDATE_HOTKEY);
}
@@ -27534,8 +27566,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.21/
.update_status = brightness_update_status,
};
diff -urNp linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c
---- linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c 2010-09-13 08:10:10.000000000 -0400
@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
return AE_OK;
}
@@ -27546,8 +27578,8 @@ diff -urNp linux-2.6.32.21/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.21/d
.update_status = set_lcd_status,
};
diff -urNp linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c
---- linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c 2010-09-13 08:10:10.000000000 -0400
@@ -60,7 +60,7 @@ do { \
set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
} while(0)
@@ -27605,8 +27637,8 @@ diff -urNp linux-2.6.32.21/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.21/drive
+ pax_close_kernel();
}
diff -urNp linux-2.6.32.21/drivers/pnp/quirks.c linux-2.6.32.21/drivers/pnp/quirks.c
---- linux-2.6.32.21/drivers/pnp/quirks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/quirks.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pnp/quirks.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pnp/quirks.c 2010-09-13 08:10:10.000000000 -0400
@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
/* PnP resources that might overlap PCI BARs */
{"PNP0c01", quirk_system_pci_resources},
@@ -27617,8 +27649,8 @@ diff -urNp linux-2.6.32.21/drivers/pnp/quirks.c linux-2.6.32.21/drivers/pnp/quir
void pnp_fixup_device(struct pnp_dev *dev)
diff -urNp linux-2.6.32.21/drivers/pnp/resource.c linux-2.6.32.21/drivers/pnp/resource.c
---- linux-2.6.32.21/drivers/pnp/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/pnp/resource.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/pnp/resource.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/pnp/resource.c 2010-09-13 08:10:10.000000000 -0400
@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
return 1;
@@ -27638,8 +27670,8 @@ diff -urNp linux-2.6.32.21/drivers/pnp/resource.c linux-2.6.32.21/drivers/pnp/re
/* check if the resource is reserved */
diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.c linux-2.6.32.21/drivers/s390/cio/qdio_perf.c
---- linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.c 2010-09-13 08:10:10.000000000 -0400
@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
static int qdio_perf_proc_show(struct seq_file *m, void *v)
{
@@ -27716,8 +27748,8 @@ diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.c linux-2.6.32.21/drivers/
return 0;
}
diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.h linux-2.6.32.21/drivers/s390/cio/qdio_perf.h
---- linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/s390/cio/qdio_perf.h 2010-09-13 08:10:10.000000000 -0400
@@ -13,46 +13,46 @@
struct qdio_perf_stats {
@@ -27791,8 +27823,8 @@ diff -urNp linux-2.6.32.21/drivers/s390/cio/qdio_perf.h linux-2.6.32.21/drivers/
int qdio_setup_perf_stats(void);
diff -urNp linux-2.6.32.21/drivers/scsi/ipr.c linux-2.6.32.21/drivers/scsi/ipr.c
---- linux-2.6.32.21/drivers/scsi/ipr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/ipr.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/ipr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/ipr.c 2010-09-13 08:10:10.000000000 -0400
@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
return true;
}
@@ -27803,8 +27835,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/ipr.c linux-2.6.32.21/drivers/scsi/ipr.c
.hardreset = ipr_sata_reset,
.post_internal_cmd = ipr_ata_post_internal,
diff -urNp linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c
---- linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c 2010-09-13 08:10:10.000000000 -0400
@@ -86,12 +86,12 @@ struct fc_exch_mgr {
* all together if not used XXX
*/
@@ -27927,8 +27959,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/libfc/fc_exch.c linux-2.6.32.21/drivers/
fc_frame_free(fp);
}
diff -urNp linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c
---- linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c 2010-09-13 08:10:10.000000000 -0400
@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
}
}
@@ -27939,8 +27971,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/libsas/sas_ata.c linux-2.6.32.21/drivers
.post_internal_cmd = sas_ata_post_internal,
.qc_prep = ata_noop_qc_prep,
diff -urNp linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h
---- linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-09-13 08:10:10.000000000 -0400
@@ -79,7 +79,7 @@
CMD; \
}
@@ -27951,8 +27983,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.21/
diff -urNp linux-2.6.32.21/drivers/scsi/scsi_logging.h linux-2.6.32.21/drivers/scsi/scsi_logging.h
---- linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/scsi_logging.h 2010-09-13 08:10:10.000000000 -0400
@@ -51,7 +51,7 @@ do { \
} while (0); \
} while (0)
@@ -27963,8 +27995,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/scsi_logging.h linux-2.6.32.21/drivers/s
/*
diff -urNp linux-2.6.32.21/drivers/scsi/sg.c linux-2.6.32.21/drivers/scsi/sg.c
---- linux-2.6.32.21/drivers/scsi/sg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/scsi/sg.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/scsi/sg.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/scsi/sg.c 2010-09-13 08:10:10.000000000 -0400
@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
const struct file_operations * fops;
};
@@ -27984,8 +28016,8 @@ diff -urNp linux-2.6.32.21/drivers/scsi/sg.c linux-2.6.32.21/drivers/scsi/sg.c
sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
if (!sg_proc_sgp)
diff -urNp linux-2.6.32.21/drivers/serial/8250_pci.c linux-2.6.32.21/drivers/serial/8250_pci.c
---- linux-2.6.32.21/drivers/serial/8250_pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/serial/8250_pci.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/serial/8250_pci.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/serial/8250_pci.c 2010-09-13 08:10:10.000000000 -0400
@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_COMMUNICATION_MULTISERIAL << 8,
@@ -27996,8 +28028,8 @@ diff -urNp linux-2.6.32.21/drivers/serial/8250_pci.c linux-2.6.32.21/drivers/ser
static struct pci_driver serial_pci_driver = {
diff -urNp linux-2.6.32.21/drivers/serial/kgdboc.c linux-2.6.32.21/drivers/serial/kgdboc.c
---- linux-2.6.32.21/drivers/serial/kgdboc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/serial/kgdboc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/serial/kgdboc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/serial/kgdboc.c 2010-09-13 08:10:10.000000000 -0400
@@ -18,7 +18,7 @@
#define MAX_CONFIG_LEN 40
@@ -28017,8 +28049,8 @@ diff -urNp linux-2.6.32.21/drivers/serial/kgdboc.c linux-2.6.32.21/drivers/seria
.read_char = kgdboc_get_char,
.write_char = kgdboc_put_char,
diff -urNp linux-2.6.32.21/drivers/staging/android/binder.c linux-2.6.32.21/drivers/staging/android/binder.c
---- linux-2.6.32.21/drivers/staging/android/binder.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/android/binder.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/android/binder.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/android/binder.c 2010-09-13 08:10:10.000000000 -0400
@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
}
@@ -28029,8 +28061,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/android/binder.c linux-2.6.32.21/driv
.close = binder_vma_close,
};
diff -urNp linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c
---- linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c 2010-09-13 08:10:10.000000000 -0400
@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
return VM_FAULT_NOPAGE;
}
@@ -28050,8 +28082,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.21/drivers
.open = b3dfg_open,
.release = b3dfg_release,
diff -urNp linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c
---- linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c 2010-09-13 08:10:10.000000000 -0400
@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
mutex_unlock(&dev->mutex);
}
@@ -28062,8 +28094,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/comedi/comedi_fops.c linux-2.6.32.21/
};
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c 2010-09-13 08:10:10.000000000 -0400
@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
static dev_t adsp_devno;
static struct class *adsp_class;
@@ -28074,8 +28106,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.3
.open = adsp_open,
.unlocked_ioctl = adsp_ioctl,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c 2010-09-13 08:10:10.000000000 -0400
@@ -1022,7 +1022,7 @@ done:
return rc;
}
@@ -28086,8 +28118,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
.open = audio_open,
.release = audio_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-09-13 08:10:10.000000000 -0400
@@ -833,7 +833,7 @@ done:
return rc;
}
@@ -28098,8 +28130,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
.open = audamrnb_open,
.release = audamrnb_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c 2010-09-13 08:10:10.000000000 -0400
@@ -805,7 +805,7 @@ dma_fail:
return rc;
}
@@ -28110,8 +28142,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
.open = audevrc_open,
.release = audevrc_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c 2010-09-13 08:10:10.000000000 -0400
@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
return 0;
}
@@ -28131,8 +28163,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.2
.open = audpre_open,
.unlocked_ioctl = audpre_ioctl,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c 2010-09-13 08:10:10.000000000 -0400
@@ -941,7 +941,7 @@ done:
return rc;
}
@@ -28143,8 +28175,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
.open = audio_open,
.release = audio_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c 2010-09-13 08:10:10.000000000 -0400
@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
return 0;
}
@@ -28164,8 +28196,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
.open = audpp_open,
.unlocked_ioctl = audpp_ioctl,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-09-13 08:10:10.000000000 -0400
@@ -816,7 +816,7 @@ err:
return rc;
}
@@ -28176,8 +28208,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
.open = audqcelp_open,
.release = audqcelp_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c
---- linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c 2010-09-13 08:10:10.000000000 -0400
@@ -242,7 +242,7 @@ err:
return rc;
}
@@ -28188,8 +28220,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.21/dri
.open = snd_open,
.release = snd_release,
diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c
---- linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c 2010-09-13 08:10:10.000000000 -0400
@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
return 0;
}
@@ -28200,8 +28232,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.21/d
.read = qmi_read,
.write = qmi_write,
diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c
---- linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-09-13 08:10:10.000000000 -0400
@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
return rc;
}
@@ -28221,8 +28253,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
.open = rpcrouter_open,
.release = rpcrouter_release,
diff -urNp linux-2.6.32.21/drivers/staging/dst/dcore.c linux-2.6.32.21/drivers/staging/dst/dcore.c
---- linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dst/dcore.c 2010-09-13 08:10:10.000000000 -0400
@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
return 0;
}
@@ -28242,8 +28274,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dst/dcore.c linux-2.6.32.21/drivers/s
err = dst_node_sysfs_init(n);
diff -urNp linux-2.6.32.21/drivers/staging/dst/trans.c linux-2.6.32.21/drivers/staging/dst/trans.c
---- linux-2.6.32.21/drivers/staging/dst/trans.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/dst/trans.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/dst/trans.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/dst/trans.c 2010-09-13 08:10:10.000000000 -0400
@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
t->error = 0;
t->retries = 0;
@@ -28254,8 +28286,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/dst/trans.c linux-2.6.32.21/drivers/s
t->enc = bio_data_dir(bio);
dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
diff -urNp linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c
---- linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c 2010-09-13 08:10:10.000000000 -0400
@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
return 0;
}
@@ -28265,21 +28297,9 @@ diff -urNp linux-2.6.32.21/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.21/
.open = go7007_vm_open,
.close = go7007_vm_close,
.fault = go7007_vm_fault,
-diff -urNp linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-08-13 18:34:40.000000000 -0400
-@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
- /* The one and only one */
- static struct blkvsc_driver_context g_blkvsc_drv;
-
--static struct block_device_operations block_ops = {
-+static const struct block_device_operations block_ops = {
- .owner = THIS_MODULE,
- .open = blkvsc_open,
- .release = blkvsc_release,
diff -urNp linux-2.6.32.21/drivers/staging/hv/Hv.c linux-2.6.32.21/drivers/staging/hv/Hv.c
---- linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/hv/Hv.c 2010-09-13 08:10:10.000000000 -0400
@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo
u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
u32 outputAddressHi = outputAddress >> 32;
@@ -28289,9 +28309,21 @@ diff -urNp linux-2.6.32.21/drivers/staging/hv/Hv.c linux-2.6.32.21/drivers/stagi
DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
Control, Input, Output);
+diff -urNp linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/hv/blkvsc_drv.c 2010-09-13 08:10:10.000000000 -0400
+@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
+ /* The one and only one */
+ static struct blkvsc_driver_context g_blkvsc_drv;
+
+-static struct block_device_operations block_ops = {
++static const struct block_device_operations block_ops = {
+ .owner = THIS_MODULE,
+ .open = blkvsc_open,
+ .release = blkvsc_release,
diff -urNp linux-2.6.32.21/drivers/staging/panel/panel.c linux-2.6.32.21/drivers/staging/panel/panel.c
---- linux-2.6.32.21/drivers/staging/panel/panel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/panel/panel.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/panel/panel.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/panel/panel.c 2010-09-13 08:10:10.000000000 -0400
@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
return 0;
}
@@ -28311,8 +28343,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/panel/panel.c linux-2.6.32.21/drivers
.open = keypad_open, /* open */
.release = keypad_release, /* close */
diff -urNp linux-2.6.32.21/drivers/staging/phison/phison.c linux-2.6.32.21/drivers/staging/phison/phison.c
---- linux-2.6.32.21/drivers/staging/phison/phison.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/phison/phison.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/phison/phison.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/phison/phison.c 2010-09-13 08:10:10.000000000 -0400
@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
ATA_BMDMA_SHT(DRV_NAME),
};
@@ -28323,8 +28355,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/phison/phison.c linux-2.6.32.21/drive
.prereset = phison_pre_reset,
};
diff -urNp linux-2.6.32.21/drivers/staging/poch/poch.c linux-2.6.32.21/drivers/staging/poch/poch.c
---- linux-2.6.32.21/drivers/staging/poch/poch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/poch/poch.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/poch/poch.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/poch/poch.c 2010-09-13 08:10:10.000000000 -0400
@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
return 0;
}
@@ -28335,8 +28367,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/poch/poch.c linux-2.6.32.21/drivers/s
.open = poch_open,
.release = poch_release,
diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/inode.c linux-2.6.32.21/drivers/staging/pohmelfs/inode.c
---- linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/pohmelfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
mutex_init(&psb->mcache_lock);
psb->mcache_root = RB_ROOT;
@@ -28347,8 +28379,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/inode.c linux-2.6.32.21/driv
psb->trans_max_pages = 100;
diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c
---- linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c 2010-09-13 08:10:10.000000000 -0400
@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
m->data = data;
m->start = start;
@@ -28359,8 +28391,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/mcache.c linux-2.6.32.21/dri
mutex_lock(&psb->mcache_lock);
err = pohmelfs_mcache_insert(psb, m);
diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h
---- linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h 2010-09-13 08:10:10.000000000 -0400
@@ -570,7 +570,7 @@ struct pohmelfs_config;
struct pohmelfs_sb {
struct rb_root mcache_root;
@@ -28371,8 +28403,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/pohmelfs/netfs.h linux-2.6.32.21/driv
unsigned int idx;
diff -urNp linux-2.6.32.21/drivers/staging/sep/sep_driver.c linux-2.6.32.21/drivers/staging/sep/sep_driver.c
---- linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/sep/sep_driver.c 2010-09-13 08:10:10.000000000 -0400
@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
static dev_t sep_devno;
@@ -28383,8 +28415,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/sep/sep_driver.c linux-2.6.32.21/driv
.ioctl = sep_ioctl,
.poll = sep_poll,
diff -urNp linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c
---- linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c 2010-09-13 08:10:10.000000000 -0400
@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
static int __init vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int);
@@ -28395,8 +28427,8 @@ diff -urNp linux-2.6.32.21/drivers/staging/vme/devices/vme_user.c linux-2.6.32.2
.release = vme_user_release,
.read = vme_user_read,
diff -urNp linux-2.6.32.21/drivers/uio/uio.c linux-2.6.32.21/drivers/uio/uio.c
---- linux-2.6.32.21/drivers/uio/uio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uio/uio.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/uio/uio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/uio/uio.c 2010-09-13 08:10:10.000000000 -0400
@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
return entry->show(mem, buf);
}
@@ -28416,8 +28448,8 @@ diff -urNp linux-2.6.32.21/drivers/uio/uio.c linux-2.6.32.21/drivers/uio/uio.c
};
diff -urNp linux-2.6.32.21/drivers/usb/atm/usbatm.c linux-2.6.32.21/drivers/usb/atm/usbatm.c
---- linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/atm/usbatm.c 2010-09-13 08:10:10.000000000 -0400
@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
if (printk_ratelimit())
atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -28498,8 +28530,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/atm/usbatm.c linux-2.6.32.21/drivers/usb/
if (!left--) {
if (instance->disconnected)
diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-acm.c linux-2.6.32.21/drivers/usb/class/cdc-acm.c
---- linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/class/cdc-acm.c 2010-09-13 08:10:10.000000000 -0400
@@ -1537,7 +1537,7 @@ static struct usb_device_id acm_ids[] =
USB_CDC_ACM_PROTO_AT_CDMA) },
@@ -28510,8 +28542,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-acm.c linux-2.6.32.21/drivers/u
MODULE_DEVICE_TABLE(usb, acm_ids);
diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-wdm.c linux-2.6.32.21/drivers/usb/class/cdc-wdm.c
---- linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/class/cdc-wdm.c 2010-09-13 08:10:10.000000000 -0400
@@ -314,7 +314,7 @@ static ssize_t wdm_write
if (r < 0)
goto outnp;
@@ -28522,8 +28554,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/class/cdc-wdm.c linux-2.6.32.21/drivers/u
&desc->flags));
else
diff -urNp linux-2.6.32.21/drivers/usb/class/usblp.c linux-2.6.32.21/drivers/usb/class/usblp.c
---- linux-2.6.32.21/drivers/usb/class/usblp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/class/usblp.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/class/usblp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/class/usblp.c 2010-09-13 08:10:10.000000000 -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 */
@@ -28543,8 +28575,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/class/usblp.c linux-2.6.32.21/drivers/usb
MODULE_DEVICE_TABLE (usb, usblp_ids);
diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.c linux-2.6.32.21/drivers/usb/core/hcd.c
---- linux-2.6.32.21/drivers/usb/core/hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hcd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/core/hcd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/core/hcd.c 2010-09-13 08:10:10.000000000 -0400
@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28564,8 +28596,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.c linux-2.6.32.21/drivers/usb/co
if (mon_ops)
diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.h linux-2.6.32.21/drivers/usb/core/hcd.h
---- linux-2.6.32.21/drivers/usb/core/hcd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hcd.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/core/hcd.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/core/hcd.h 2010-09-13 08:10:10.000000000 -0400
@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
@@ -28594,8 +28626,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hcd.h linux-2.6.32.21/drivers/usb/co
#else
diff -urNp linux-2.6.32.21/drivers/usb/core/hub.c linux-2.6.32.21/drivers/usb/core/hub.c
---- linux-2.6.32.21/drivers/usb/core/hub.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/hub.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/core/hub.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/core/hub.c 2010-09-13 08:10:10.000000000 -0400
@@ -3401,7 +3401,7 @@ static struct usb_device_id hub_id_table
.bDeviceClass = USB_CLASS_HUB},
{ .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
@@ -28606,8 +28638,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/hub.c linux-2.6.32.21/drivers/usb/co
MODULE_DEVICE_TABLE (usb, hub_id_table);
diff -urNp linux-2.6.32.21/drivers/usb/core/message.c linux-2.6.32.21/drivers/usb/core/message.c
---- linux-2.6.32.21/drivers/usb/core/message.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/core/message.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/core/message.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/core/message.c 2010-09-13 08:10:10.000000000 -0400
@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
if (buf) {
@@ -28620,8 +28652,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/core/message.c linux-2.6.32.21/drivers/us
return buf;
memcpy(smallbuf, buf, len);
diff -urNp linux-2.6.32.21/drivers/usb/host/ehci-pci.c linux-2.6.32.21/drivers/usb/host/ehci-pci.c
---- linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/host/ehci-pci.c 2010-09-13 08:10:10.000000000 -0400
@@ -422,7 +422,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,
@@ -28632,8 +28664,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/host/ehci-pci.c linux-2.6.32.21/drivers/u
MODULE_DEVICE_TABLE(pci, pci_ids);
diff -urNp linux-2.6.32.21/drivers/usb/host/uhci-hcd.c linux-2.6.32.21/drivers/usb/host/uhci-hcd.c
---- linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/host/uhci-hcd.c 2010-09-13 08:10:10.000000000 -0400
@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
/* handle any USB UHCI controller */
PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0),
@@ -28644,8 +28676,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/host/uhci-hcd.c linux-2.6.32.21/drivers/u
MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
diff -urNp linux-2.6.32.21/drivers/usb/misc/appledisplay.c linux-2.6.32.21/drivers/usb/misc/appledisplay.c
---- linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/misc/appledisplay.c 2010-09-13 08:10:10.000000000 -0400
@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
return pdata->msgdata[1];
}
@@ -28656,8 +28688,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/misc/appledisplay.c linux-2.6.32.21/drive
.update_status = appledisplay_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/usb/mon/mon_main.c linux-2.6.32.21/drivers/usb/mon/mon_main.c
---- linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/mon/mon_main.c 2010-09-13 08:10:10.000000000 -0400
@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
/*
* Ops
@@ -28668,8 +28700,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/mon/mon_main.c linux-2.6.32.21/drivers/us
.urb_submit_error = mon_submit_error,
.urb_complete = mon_complete,
diff -urNp linux-2.6.32.21/drivers/usb/storage/debug.h linux-2.6.32.21/drivers/usb/storage/debug.h
---- linux-2.6.32.21/drivers/usb/storage/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/debug.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/storage/debug.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/storage/debug.h 2010-09-13 08:10:10.000000000 -0400
@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
#define US_DEBUGPX(x...) printk( x )
#define US_DEBUG(x) x
@@ -28684,8 +28716,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/debug.h linux-2.6.32.21/drivers/u
#endif
diff -urNp linux-2.6.32.21/drivers/usb/storage/usb.c linux-2.6.32.21/drivers/usb/storage/usb.c
---- linux-2.6.32.21/drivers/usb/storage/usb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/usb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/storage/usb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/storage/usb.c 2010-09-13 08:10:10.000000000 -0400
@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
static struct us_unusual_dev us_unusual_dev_list[] = {
@@ -28696,8 +28728,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/usb.c linux-2.6.32.21/drivers/usb
#undef UNUSUAL_DEV
diff -urNp linux-2.6.32.21/drivers/usb/storage/usual-tables.c linux-2.6.32.21/drivers/usb/storage/usual-tables.c
---- linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/usb/storage/usual-tables.c 2010-09-13 08:10:10.000000000 -0400
@@ -48,7 +48,7 @@
struct usb_device_id usb_storage_usb_ids[] = {
@@ -28708,8 +28740,8 @@ diff -urNp linux-2.6.32.21/drivers/usb/storage/usual-tables.c linux-2.6.32.21/dr
EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
diff -urNp linux-2.6.32.21/drivers/uwb/wlp/messages.c linux-2.6.32.21/drivers/uwb/wlp/messages.c
---- linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/uwb/wlp/messages.c 2010-09-13 08:10:10.000000000 -0400
@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
size_t len = skb->len;
size_t used;
@@ -28720,8 +28752,8 @@ diff -urNp linux-2.6.32.21/drivers/uwb/wlp/messages.c linux-2.6.32.21/drivers/uw
char enonce_buf[WLP_WSS_NONCE_STRSIZE];
char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
diff -urNp linux-2.6.32.21/drivers/uwb/wlp/sysfs.c linux-2.6.32.21/drivers/uwb/wlp/sysfs.c
---- linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/uwb/wlp/sysfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
return ret;
}
@@ -28733,8 +28765,8 @@ diff -urNp linux-2.6.32.21/drivers/uwb/wlp/sysfs.c linux-2.6.32.21/drivers/uwb/w
.store = wlp_wss_attr_store,
};
diff -urNp linux-2.6.32.21/drivers/video/atmel_lcdfb.c linux-2.6.32.21/drivers/video/atmel_lcdfb.c
---- linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/atmel_lcdfb.c 2010-09-13 08:10:10.000000000 -0400
@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
}
@@ -28745,8 +28777,8 @@ diff -urNp linux-2.6.32.21/drivers/video/atmel_lcdfb.c linux-2.6.32.21/drivers/v
.get_brightness = atmel_bl_get_brightness,
};
diff -urNp linux-2.6.32.21/drivers/video/aty/aty128fb.c linux-2.6.32.21/drivers/video/aty/aty128fb.c
---- linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/aty/aty128fb.c 2010-09-13 08:10:10.000000000 -0400
@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28757,8 +28789,8 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/aty128fb.c linux-2.6.32.21/drivers/
.update_status = aty128_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/aty/atyfb_base.c linux-2.6.32.21/drivers/video/aty/atyfb_base.c
---- linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/aty/atyfb_base.c 2010-09-13 08:10:10.000000000 -0400
@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -28769,8 +28801,8 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/atyfb_base.c linux-2.6.32.21/driver
.update_status = aty_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/aty/radeon_backlight.c linux-2.6.32.21/drivers/video/aty/radeon_backlight.c
---- linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/aty/radeon_backlight.c 2010-09-13 08:10:10.000000000 -0400
@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -28781,8 +28813,8 @@ diff -urNp linux-2.6.32.21/drivers/video/aty/radeon_backlight.c linux-2.6.32.21/
.update_status = radeon_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c
---- linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
return error ? data->current_brightness : reg_val;
}
@@ -28793,8 +28825,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/adp5520_bl.c linux-2.6.32.21/
.get_brightness = adp5520_bl_get_brightness,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/adx_bl.c linux-2.6.32.21/drivers/video/backlight/adx_bl.c
---- linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/adx_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
return 1;
}
@@ -28805,8 +28837,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/adx_bl.c linux-2.6.32.21/driv
.update_status = adx_backlight_update_status,
.get_brightness = adx_backlight_get_brightness,
diff -urNp linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c
---- linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
return pwm_channel_enable(&pwmbl->pwmc);
}
@@ -28817,8 +28849,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.2
.update_status = atmel_pwm_bl_set_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/backlight.c linux-2.6.32.21/drivers/video/backlight/backlight.c
---- linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/backlight.c 2010-09-13 08:10:10.000000000 -0400
@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
* ERR_PTR() or a pointer to the newly allocated device.
*/
@@ -28829,8 +28861,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/backlight.c linux-2.6.32.21/d
struct backlight_device *new_bd;
int rc;
diff -urNp linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c
---- linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c 2010-09-13 08:10:10.000000000 -0400
@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
}
EXPORT_SYMBOL(corgi_lcd_limit_intensity);
@@ -28841,8 +28873,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/corgi_lcd.c linux-2.6.32.21/d
.update_status = corgi_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c
---- linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c 2010-09-13 08:10:10.000000000 -0400
@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
return intensity;
}
@@ -28853,8 +28885,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/cr_bllcd.c linux-2.6.32.21/dr
.update_status = cr_backlight_set_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/da903x_bl.c linux-2.6.32.21/drivers/video/backlight/da903x_bl.c
---- linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/da903x_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
return data->current_brightness;
}
@@ -28865,8 +28897,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/da903x_bl.c linux-2.6.32.21/d
.get_brightness = da903x_backlight_get_brightness,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/generic_bl.c linux-2.6.32.21/drivers/video/backlight/generic_bl.c
---- linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/generic_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
}
EXPORT_SYMBOL(corgibl_limit_intensity);
@@ -28877,8 +28909,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/generic_bl.c linux-2.6.32.21/
.get_brightness = genericbl_get_intensity,
.update_status = genericbl_send_intensity,
diff -urNp linux-2.6.32.21/drivers/video/backlight/hp680_bl.c linux-2.6.32.21/drivers/video/backlight/hp680_bl.c
---- linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/hp680_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
return current_intensity;
}
@@ -28889,8 +28921,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/hp680_bl.c linux-2.6.32.21/dr
.update_status = hp680bl_set_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c
---- linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -93,7 +93,7 @@ out:
return ret;
}
@@ -28901,8 +28933,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
.update_status = jornada_bl_update_status,
.options = BL_CORE_SUSPENDRESUME,
diff -urNp linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c
---- linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
return kb3886bl_intensity;
}
@@ -28913,8 +28945,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/kb3886_bl.c linux-2.6.32.21/d
.update_status = kb3886bl_send_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/locomolcd.c linux-2.6.32.21/drivers/video/backlight/locomolcd.c
---- linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/locomolcd.c 2010-09-13 08:10:10.000000000 -0400
@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
return current_intensity;
}
@@ -28925,8 +28957,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/locomolcd.c linux-2.6.32.21/d
.update_status = locomolcd_set_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c
---- linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -33,7 +33,7 @@ struct dmi_match_data {
unsigned long iostart;
unsigned long iolen;
@@ -28937,8 +28969,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32.
/* Module parameters. */
diff -urNp linux-2.6.32.21/drivers/video/backlight/omap1_bl.c linux-2.6.32.21/drivers/video/backlight/omap1_bl.c
---- linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/omap1_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
return bl->current_intensity;
}
@@ -28949,8 +28981,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/omap1_bl.c linux-2.6.32.21/dr
.update_status = omapbl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/progear_bl.c linux-2.6.32.21/drivers/video/backlight/progear_bl.c
---- linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/progear_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
return intensity - HW_LEVEL_MIN;
}
@@ -28961,8 +28993,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/progear_bl.c linux-2.6.32.21/
.update_status = progearbl_set_intensity,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/pwm_bl.c linux-2.6.32.21/drivers/video/backlight/pwm_bl.c
---- linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/pwm_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
return bl->props.brightness;
}
@@ -28973,8 +29005,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/pwm_bl.c linux-2.6.32.21/driv
.get_brightness = pwm_backlight_get_brightness,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/tosa_bl.c linux-2.6.32.21/drivers/video/backlight/tosa_bl.c
---- linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/tosa_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
return props->brightness;
}
@@ -28985,8 +29017,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/tosa_bl.c linux-2.6.32.21/dri
.update_status = tosa_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c
---- linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c 2010-09-13 08:10:10.000000000 -0400
@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
return data->current_brightness;
}
@@ -28997,8 +29029,8 @@ diff -urNp linux-2.6.32.21/drivers/video/backlight/wm831x_bl.c linux-2.6.32.21/d
.update_status = wm831x_backlight_update_status,
.get_brightness = wm831x_backlight_get_brightness,
diff -urNp linux-2.6.32.21/drivers/video/bf54x-lq043fb.c linux-2.6.32.21/drivers/video/bf54x-lq043fb.c
---- linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/bf54x-lq043fb.c 2010-09-13 08:10:10.000000000 -0400
@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -29009,8 +29041,8 @@ diff -urNp linux-2.6.32.21/drivers/video/bf54x-lq043fb.c linux-2.6.32.21/drivers
};
diff -urNp linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c
---- linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c 2010-09-13 08:10:10.000000000 -0400
@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
return 0;
}
@@ -29021,8 +29053,8 @@ diff -urNp linux-2.6.32.21/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.21/driv
};
diff -urNp linux-2.6.32.21/drivers/video/fbcmap.c linux-2.6.32.21/drivers/video/fbcmap.c
---- linux-2.6.32.21/drivers/video/fbcmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbcmap.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/fbcmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/fbcmap.c 2010-09-13 08:10:10.000000000 -0400
@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
rc = -ENODEV;
goto out;
@@ -29034,8 +29066,8 @@ diff -urNp linux-2.6.32.21/drivers/video/fbcmap.c linux-2.6.32.21/drivers/video/
goto out1;
}
diff -urNp linux-2.6.32.21/drivers/video/fbmem.c linux-2.6.32.21/drivers/video/fbmem.c
---- linux-2.6.32.21/drivers/video/fbmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbmem.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/fbmem.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/fbmem.c 2010-09-13 08:10:10.000000000 -0400
@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
image->dx += image->width + 8;
}
@@ -29064,8 +29096,8 @@ diff -urNp linux-2.6.32.21/drivers/video/fbmem.c linux-2.6.32.21/drivers/video/f
if (!registered_fb[con2fb.framebuffer])
request_module("fb%d", con2fb.framebuffer);
diff -urNp linux-2.6.32.21/drivers/video/fbmon.c linux-2.6.32.21/drivers/video/fbmon.c
---- linux-2.6.32.21/drivers/video/fbmon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/fbmon.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/fbmon.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/fbmon.c 2010-09-13 08:10:10.000000000 -0400
@@ -45,7 +45,7 @@
#ifdef DEBUG
#define DPRINTK(fmt, args...) printk(fmt,## args)
@@ -29076,8 +29108,8 @@ diff -urNp linux-2.6.32.21/drivers/video/fbmon.c linux-2.6.32.21/drivers/video/f
#define FBMON_FIX_HEADER 1
diff -urNp linux-2.6.32.21/drivers/video/i810/i810_accel.c linux-2.6.32.21/drivers/video/i810/i810_accel.c
---- linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/i810/i810_accel.c 2010-09-13 08:10:10.000000000 -0400
@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
}
}
@@ -29087,8 +29119,8 @@ diff -urNp linux-2.6.32.21/drivers/video/i810/i810_accel.c linux-2.6.32.21/drive
par->dev_flags |= LOCKUP;
info->pixmap.scan_align = 1;
diff -urNp linux-2.6.32.21/drivers/video/i810/i810_main.c linux-2.6.32.21/drivers/video/i810/i810_main.c
---- linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/i810/i810_main.c 2010-09-13 08:10:10.000000000 -0400
@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC,
@@ -29099,8 +29131,8 @@ diff -urNp linux-2.6.32.21/drivers/video/i810/i810_main.c linux-2.6.32.21/driver
static struct pci_driver i810fb_driver = {
diff -urNp linux-2.6.32.21/drivers/video/modedb.c linux-2.6.32.21/drivers/video/modedb.c
---- linux-2.6.32.21/drivers/video/modedb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/modedb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/modedb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/modedb.c 2010-09-13 08:10:10.000000000 -0400
@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
{
/* 640x400 @ 70 Hz, 31.5 kHz hsync */
@@ -29402,8 +29434,8 @@ diff -urNp linux-2.6.32.21/drivers/video/modedb.c linux-2.6.32.21/drivers/video/
};
diff -urNp linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c
---- linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c 2010-09-13 08:10:10.000000000 -0400
@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
return bd->props.brightness;
}
@@ -29414,8 +29446,8 @@ diff -urNp linux-2.6.32.21/drivers/video/nvidia/nv_backlight.c linux-2.6.32.21/d
.update_status = nvidia_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/riva/fbdev.c linux-2.6.32.21/drivers/video/riva/fbdev.c
---- linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/riva/fbdev.c 2010-09-13 08:10:10.000000000 -0400
@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
return bd->props.brightness;
}
@@ -29426,8 +29458,8 @@ diff -urNp linux-2.6.32.21/drivers/video/riva/fbdev.c linux-2.6.32.21/drivers/vi
.update_status = riva_bl_update_status,
};
diff -urNp linux-2.6.32.21/drivers/video/uvesafb.c linux-2.6.32.21/drivers/video/uvesafb.c
---- linux-2.6.32.21/drivers/video/uvesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/uvesafb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/uvesafb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/uvesafb.c 2010-09-13 08:10:10.000000000 -0400
@@ -18,6 +18,7 @@
#include <linux/fb.h>
#include <linux/io.h>
@@ -29504,8 +29536,8 @@ diff -urNp linux-2.6.32.21/drivers/video/uvesafb.c linux-2.6.32.21/drivers/video
framebuffer_release(info);
diff -urNp linux-2.6.32.21/drivers/video/vesafb.c linux-2.6.32.21/drivers/video/vesafb.c
---- linux-2.6.32.21/drivers/video/vesafb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/video/vesafb.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/video/vesafb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/video/vesafb.c 2010-09-13 08:10:10.000000000 -0400
@@ -9,6 +9,7 @@
*/
@@ -29610,8 +29642,8 @@ diff -urNp linux-2.6.32.21/drivers/video/vesafb.c linux-2.6.32.21/drivers/video/
iounmap(info->screen_base);
framebuffer_release(info);
diff -urNp linux-2.6.32.21/drivers/xen/sys-hypervisor.c linux-2.6.32.21/drivers/xen/sys-hypervisor.c
---- linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/drivers/xen/sys-hypervisor.c 2010-09-13 08:10:10.000000000 -0400
@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
return 0;
}
@@ -29622,8 +29654,8 @@ diff -urNp linux-2.6.32.21/drivers/xen/sys-hypervisor.c linux-2.6.32.21/drivers/
.store = hyp_sysfs_store,
};
diff -urNp linux-2.6.32.21/fs/9p/vfs_inode.c linux-2.6.32.21/fs/9p/vfs_inode.c
---- linux-2.6.32.21/fs/9p/vfs_inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/9p/vfs_inode.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/9p/vfs_inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/9p/vfs_inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
static void
v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -29634,8 +29666,8 @@ diff -urNp linux-2.6.32.21/fs/9p/vfs_inode.c linux-2.6.32.21/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.32.21/fs/aio.c linux-2.6.32.21/fs/aio.c
---- linux-2.6.32.21/fs/aio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/aio.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/aio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/aio.c 2010-09-13 08:10:10.000000000 -0400
@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
size += sizeof(struct io_event) * nr_events;
nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -29646,8 +29678,8 @@ diff -urNp linux-2.6.32.21/fs/aio.c linux-2.6.32.21/fs/aio.c
nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
diff -urNp linux-2.6.32.21/fs/attr.c linux-2.6.32.21/fs/attr.c
---- linux-2.6.32.21/fs/attr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/attr.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/attr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/attr.c 2010-09-13 08:10:10.000000000 -0400
@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
unsigned long limit;
@@ -29657,8 +29689,8 @@ diff -urNp linux-2.6.32.21/fs/attr.c linux-2.6.32.21/fs/attr.c
goto out_sig;
if (offset > inode->i_sb->s_maxbytes)
diff -urNp linux-2.6.32.21/fs/autofs/root.c linux-2.6.32.21/fs/autofs/root.c
---- linux-2.6.32.21/fs/autofs/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/autofs/root.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/autofs/root.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/autofs/root.c 2010-09-13 08:10:10.000000000 -0400
@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
set_bit(n,sbi->symlink_bitmap);
sl = &sbi->symlink[n];
@@ -29670,8 +29702,8 @@ diff -urNp linux-2.6.32.21/fs/autofs/root.c linux-2.6.32.21/fs/autofs/root.c
clear_bit(n,sbi->symlink_bitmap);
unlock_kernel();
diff -urNp linux-2.6.32.21/fs/autofs4/symlink.c linux-2.6.32.21/fs/autofs4/symlink.c
---- linux-2.6.32.21/fs/autofs4/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/autofs4/symlink.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/autofs4/symlink.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/autofs4/symlink.c 2010-09-13 08:10:10.000000000 -0400
@@ -15,7 +15,7 @@
static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
{
@@ -29682,8 +29714,8 @@ diff -urNp linux-2.6.32.21/fs/autofs4/symlink.c linux-2.6.32.21/fs/autofs4/symli
}
diff -urNp linux-2.6.32.21/fs/befs/linuxvfs.c linux-2.6.32.21/fs/befs/linuxvfs.c
---- linux-2.6.32.21/fs/befs/linuxvfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/befs/linuxvfs.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/befs/linuxvfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/befs/linuxvfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
{
befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -29694,8 +29726,8 @@ diff -urNp linux-2.6.32.21/fs/befs/linuxvfs.c linux-2.6.32.21/fs/befs/linuxvfs.c
kfree(link);
}
diff -urNp linux-2.6.32.21/fs/binfmt_aout.c linux-2.6.32.21/fs/binfmt_aout.c
---- linux-2.6.32.21/fs/binfmt_aout.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/binfmt_aout.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/binfmt_aout.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/binfmt_aout.c 2010-09-13 08:10:10.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/string.h>
#include <linux/fs.h>
@@ -29764,8 +29796,8 @@ diff -urNp linux-2.6.32.21/fs/binfmt_aout.c linux-2.6.32.21/fs/binfmt_aout.c
fd_offset + ex.a_text);
up_write(&current->mm->mmap_sem);
diff -urNp linux-2.6.32.21/fs/binfmt_elf.c linux-2.6.32.21/fs/binfmt_elf.c
---- linux-2.6.32.21/fs/binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/binfmt_elf.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/binfmt_elf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/binfmt_elf.c 2010-09-13 08:10:10.000000000 -0400
@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
#define elf_core_dump NULL
#endif
@@ -30402,8 +30434,8 @@ diff -urNp linux-2.6.32.21/fs/binfmt_elf.c linux-2.6.32.21/fs/binfmt_elf.c
{
return register_binfmt(&elf_format);
diff -urNp linux-2.6.32.21/fs/binfmt_flat.c linux-2.6.32.21/fs/binfmt_flat.c
---- linux-2.6.32.21/fs/binfmt_flat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/binfmt_flat.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/binfmt_flat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/binfmt_flat.c 2010-09-13 08:10:10.000000000 -0400
@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
realdatastart = (unsigned long) -ENOMEM;
printk("Unable to allocate RAM for process data, errno %d\n",
@@ -30437,8 +30469,8 @@ diff -urNp linux-2.6.32.21/fs/binfmt_flat.c linux-2.6.32.21/fs/binfmt_flat.c
goto err;
}
diff -urNp linux-2.6.32.21/fs/binfmt_misc.c linux-2.6.32.21/fs/binfmt_misc.c
---- linux-2.6.32.21/fs/binfmt_misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/binfmt_misc.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/binfmt_misc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/binfmt_misc.c 2010-09-13 08:10:10.000000000 -0400
@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
static struct tree_descr bm_files[] = {
[2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO},
@@ -30449,8 +30481,8 @@ diff -urNp linux-2.6.32.21/fs/binfmt_misc.c linux-2.6.32.21/fs/binfmt_misc.c
int err = simple_fill_super(sb, 0x42494e4d, bm_files);
if (!err)
diff -urNp linux-2.6.32.21/fs/bio.c linux-2.6.32.21/fs/bio.c
---- linux-2.6.32.21/fs/bio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/bio.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/bio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/bio.c 2010-09-13 08:10:10.000000000 -0400
@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
i = 0;
@@ -30470,8 +30502,8 @@ diff -urNp linux-2.6.32.21/fs/bio.c linux-2.6.32.21/fs/bio.c
__bio_for_each_segment(bvec, bio, i, 0) {
char *addr = page_address(bvec->bv_page);
diff -urNp linux-2.6.32.21/fs/block_dev.c linux-2.6.32.21/fs/block_dev.c
---- linux-2.6.32.21/fs/block_dev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/block_dev.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/block_dev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/block_dev.c 2010-09-13 08:10:10.000000000 -0400
@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
else if (bdev->bd_contains == bdev)
res = 0; /* is a whole device which isn't held */
@@ -30482,8 +30514,8 @@ diff -urNp linux-2.6.32.21/fs/block_dev.c linux-2.6.32.21/fs/block_dev.c
else if (bdev->bd_contains->bd_holder != NULL)
res = -EBUSY; /* is a partition of a held device */
diff -urNp linux-2.6.32.21/fs/btrfs/ctree.c linux-2.6.32.21/fs/btrfs/ctree.c
---- linux-2.6.32.21/fs/btrfs/ctree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/ctree.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/ctree.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/ctree.c 2010-09-13 08:10:10.000000000 -0400
@@ -3645,7 +3645,6 @@ setup_items_for_insert(struct btrfs_tran
ret = 0;
@@ -30493,8 +30525,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/ctree.c linux-2.6.32.21/fs/btrfs/ctree.c
ret = fixup_low_keys(trans, root, path, &disk_key, 1);
}
diff -urNp linux-2.6.32.21/fs/btrfs/disk-io.c linux-2.6.32.21/fs/btrfs/disk-io.c
---- linux-2.6.32.21/fs/btrfs/disk-io.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/disk-io.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/disk-io.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/disk-io.c 2010-09-13 08:10:10.000000000 -0400
@@ -39,7 +39,7 @@
#include "tree-log.h"
#include "free-space-cache.h"
@@ -30514,8 +30546,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/disk-io.c linux-2.6.32.21/fs/btrfs/disk-io.c
.readpage_end_io_hook = btree_readpage_end_io_hook,
.submit_bio_hook = btree_submit_bio_hook,
diff -urNp linux-2.6.32.21/fs/btrfs/extent_io.h linux-2.6.32.21/fs/btrfs/extent_io.h
---- linux-2.6.32.21/fs/btrfs/extent_io.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/extent_io.h 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/extent_io.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/extent_io.h 2010-09-13 08:10:10.000000000 -0400
@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
struct bio *bio, int mirror_num,
unsigned long bio_flags);
@@ -30577,8 +30609,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/extent_io.h linux-2.6.32.21/fs/btrfs/extent_
struct extent_state {
diff -urNp linux-2.6.32.21/fs/btrfs/free-space-cache.c linux-2.6.32.21/fs/btrfs/free-space-cache.c
---- linux-2.6.32.21/fs/btrfs/free-space-cache.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/free-space-cache.c 2010-08-13 18:34:40.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/free-space-cache.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/free-space-cache.c 2010-09-13 08:10:10.000000000 -0400
@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
while(1) {
@@ -30598,8 +30630,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/free-space-cache.c linux-2.6.32.21/fs/btrfs/
if (entry->bitmap && entry->bytes > bytes + empty_size) {
ret = btrfs_bitmap_cluster(block_group, entry, cluster,
diff -urNp linux-2.6.32.21/fs/btrfs/inode.c linux-2.6.32.21/fs/btrfs/inode.c
---- linux-2.6.32.21/fs/btrfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -63,7 +63,7 @@ static const struct inode_operations btr
static const struct address_space_operations btrfs_aops;
static const struct address_space_operations btrfs_symlink_aops;
@@ -30619,8 +30651,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/inode.c linux-2.6.32.21/fs/btrfs/inode.c
.submit_bio_hook = btrfs_submit_bio_hook,
.merge_bio_hook = btrfs_merge_bio_hook,
diff -urNp linux-2.6.32.21/fs/btrfs/sysfs.c linux-2.6.32.21/fs/btrfs/sysfs.c
---- linux-2.6.32.21/fs/btrfs/sysfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/btrfs/sysfs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/btrfs/sysfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/btrfs/sysfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
complete(&root->kobj_unregister);
}
@@ -30637,8 +30669,8 @@ diff -urNp linux-2.6.32.21/fs/btrfs/sysfs.c linux-2.6.32.21/fs/btrfs/sysfs.c
.store = btrfs_root_attr_store,
};
diff -urNp linux-2.6.32.21/fs/buffer.c linux-2.6.32.21/fs/buffer.c
---- linux-2.6.32.21/fs/buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/buffer.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/buffer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/buffer.c 2010-09-13 08:10:10.000000000 -0400
@@ -25,6 +25,7 @@
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -30648,8 +30680,8 @@ diff -urNp linux-2.6.32.21/fs/buffer.c linux-2.6.32.21/fs/buffer.c
#include <linux/file.h>
#include <linux/quotaops.h>
diff -urNp linux-2.6.32.21/fs/cachefiles/bind.c linux-2.6.32.21/fs/cachefiles/bind.c
---- linux-2.6.32.21/fs/cachefiles/bind.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/cachefiles/bind.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/cachefiles/bind.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/cachefiles/bind.c 2010-09-13 08:10:10.000000000 -0400
@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
args);
@@ -30667,8 +30699,8 @@ diff -urNp linux-2.6.32.21/fs/cachefiles/bind.c linux-2.6.32.21/fs/cachefiles/bi
cache->brun_percent < 100);
diff -urNp linux-2.6.32.21/fs/cachefiles/daemon.c linux-2.6.32.21/fs/cachefiles/daemon.c
---- linux-2.6.32.21/fs/cachefiles/daemon.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/cachefiles/daemon.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/cachefiles/daemon.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/cachefiles/daemon.c 2010-09-13 08:10:10.000000000 -0400
@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
if (test_bit(CACHEFILES_DEAD, &cache->flags))
return -EIO;
@@ -30697,8 +30729,8 @@ diff -urNp linux-2.6.32.21/fs/cachefiles/daemon.c linux-2.6.32.21/fs/cachefiles/
cache->bstop_percent = bstop;
diff -urNp linux-2.6.32.21/fs/cachefiles/rdwr.c linux-2.6.32.21/fs/cachefiles/rdwr.c
---- linux-2.6.32.21/fs/cachefiles/rdwr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/cachefiles/rdwr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/cachefiles/rdwr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/cachefiles/rdwr.c 2010-09-13 08:10:10.000000000 -0400
@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
old_fs = get_fs();
set_fs(KERNEL_DS);
@@ -30709,8 +30741,8 @@ diff -urNp linux-2.6.32.21/fs/cachefiles/rdwr.c linux-2.6.32.21/fs/cachefiles/rd
kunmap(page);
if (ret != len)
diff -urNp linux-2.6.32.21/fs/cifs/cifs_uniupr.h linux-2.6.32.21/fs/cifs/cifs_uniupr.h
---- linux-2.6.32.21/fs/cifs/cifs_uniupr.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/cifs/cifs_uniupr.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/cifs/cifs_uniupr.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/cifs/cifs_uniupr.h 2010-09-13 08:10:10.000000000 -0400
@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
{0x0490, 0x04cc, UniCaseRangeU0490},
{0x1e00, 0x1ffc, UniCaseRangeU1e00},
@@ -30721,8 +30753,8 @@ diff -urNp linux-2.6.32.21/fs/cifs/cifs_uniupr.h linux-2.6.32.21/fs/cifs/cifs_un
#endif
diff -urNp linux-2.6.32.21/fs/cifs/link.c linux-2.6.32.21/fs/cifs/link.c
---- linux-2.6.32.21/fs/cifs/link.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/cifs/link.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/cifs/link.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/cifs/link.c 2010-09-13 08:10:10.000000000 -0400
@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -30732,25 +30764,9 @@ diff -urNp linux-2.6.32.21/fs/cifs/link.c linux-2.6.32.21/fs/cifs/link.c
if (!IS_ERR(p))
kfree(p);
}
-diff -urNp linux-2.6.32.21/fs/compat_binfmt_elf.c linux-2.6.32.21/fs/compat_binfmt_elf.c
---- linux-2.6.32.21/fs/compat_binfmt_elf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/compat_binfmt_elf.c 2010-08-13 18:34:41.000000000 -0400
-@@ -29,10 +29,12 @@
- #undef elfhdr
- #undef elf_phdr
- #undef elf_note
-+#undef elf_dyn
- #undef elf_addr_t
- #define elfhdr elf32_hdr
- #define elf_phdr elf32_phdr
- #define elf_note elf32_note
-+#define elf_dyn Elf32_Dyn
- #define elf_addr_t Elf32_Addr
-
- /*
diff -urNp linux-2.6.32.21/fs/compat.c linux-2.6.32.21/fs/compat.c
---- linux-2.6.32.21/fs/compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/compat.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/compat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/compat.c 2010-09-13 08:10:10.000000000 -0400
@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
struct page *page;
@@ -30850,9 +30866,25 @@ diff -urNp linux-2.6.32.21/fs/compat.c linux-2.6.32.21/fs/compat.c
out:
if (bprm->mm)
mmput(bprm->mm);
+diff -urNp linux-2.6.32.21/fs/compat_binfmt_elf.c linux-2.6.32.21/fs/compat_binfmt_elf.c
+--- linux-2.6.32.21/fs/compat_binfmt_elf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/compat_binfmt_elf.c 2010-09-13 08:10:10.000000000 -0400
+@@ -29,10 +29,12 @@
+ #undef elfhdr
+ #undef elf_phdr
+ #undef elf_note
++#undef elf_dyn
+ #undef elf_addr_t
+ #define elfhdr elf32_hdr
+ #define elf_phdr elf32_phdr
+ #define elf_note elf32_note
++#define elf_dyn Elf32_Dyn
+ #define elf_addr_t Elf32_Addr
+
+ /*
diff -urNp linux-2.6.32.21/fs/compat_ioctl.c linux-2.6.32.21/fs/compat_ioctl.c
---- linux-2.6.32.21/fs/compat_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/compat_ioctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/compat_ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/compat_ioctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -1827,15 +1827,15 @@ struct ioctl_trans {
};
@@ -30873,8 +30905,8 @@ diff -urNp linux-2.6.32.21/fs/compat_ioctl.c linux-2.6.32.21/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.32.21/fs/debugfs/inode.c linux-2.6.32.21/fs/debugfs/inode.c
---- linux-2.6.32.21/fs/debugfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/debugfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/debugfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/debugfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
static int debug_fill_super(struct super_block *sb, void *data, int silent)
@@ -30885,8 +30917,8 @@ diff -urNp linux-2.6.32.21/fs/debugfs/inode.c linux-2.6.32.21/fs/debugfs/inode.c
return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
}
diff -urNp linux-2.6.32.21/fs/dlm/lockspace.c linux-2.6.32.21/fs/dlm/lockspace.c
---- linux-2.6.32.21/fs/dlm/lockspace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/dlm/lockspace.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/dlm/lockspace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/dlm/lockspace.c 2010-09-13 08:10:10.000000000 -0400
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
kfree(ls);
}
@@ -30897,8 +30929,8 @@ diff -urNp linux-2.6.32.21/fs/dlm/lockspace.c linux-2.6.32.21/fs/dlm/lockspace.c
.store = dlm_attr_store,
};
diff -urNp linux-2.6.32.21/fs/ecryptfs/inode.c linux-2.6.32.21/fs/ecryptfs/inode.c
---- linux-2.6.32.21/fs/ecryptfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ecryptfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ecryptfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ecryptfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -656,7 +656,7 @@ static int ecryptfs_readlink_lower(struc
old_fs = get_fs();
set_fs(get_ds());
@@ -30918,8 +30950,8 @@ diff -urNp linux-2.6.32.21/fs/ecryptfs/inode.c linux-2.6.32.21/fs/ecryptfs/inode
if (rc < 0)
goto out_free;
diff -urNp linux-2.6.32.21/fs/exec.c linux-2.6.32.21/fs/exec.c
---- linux-2.6.32.21/fs/exec.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/exec.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/exec.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/exec.c 2010-09-13 08:10:10.000000000 -0400
@@ -56,12 +56,24 @@
#include <linux/fsnotify.h>
#include <linux/fs_struct.h>
@@ -31399,8 +31431,8 @@ diff -urNp linux-2.6.32.21/fs/exec.c linux-2.6.32.21/fs/exec.c
* lock_kernel() because format_corename() is controlled by sysctl, which
* uses lock_kernel()
diff -urNp linux-2.6.32.21/fs/ext2/balloc.c linux-2.6.32.21/fs/ext2/balloc.c
---- linux-2.6.32.21/fs/ext2/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext2/balloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext2/balloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext2/balloc.c 2010-09-13 08:10:10.000000000 -0400
@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31411,8 +31443,8 @@ diff -urNp linux-2.6.32.21/fs/ext2/balloc.c linux-2.6.32.21/fs/ext2/balloc.c
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
diff -urNp linux-2.6.32.21/fs/ext2/xattr.c linux-2.6.32.21/fs/ext2/xattr.c
---- linux-2.6.32.21/fs/ext2/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext2/xattr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext2/xattr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext2/xattr.c 2010-09-13 08:10:10.000000000 -0400
@@ -85,8 +85,8 @@
printk("\n"); \
} while (0)
@@ -31425,8 +31457,8 @@ diff -urNp linux-2.6.32.21/fs/ext2/xattr.c linux-2.6.32.21/fs/ext2/xattr.c
static int ext2_xattr_set2(struct inode *, struct buffer_head *,
diff -urNp linux-2.6.32.21/fs/ext3/balloc.c linux-2.6.32.21/fs/ext3/balloc.c
---- linux-2.6.32.21/fs/ext3/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext3/balloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext3/balloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext3/balloc.c 2010-09-13 08:10:10.000000000 -0400
@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -31437,8 +31469,8 @@ diff -urNp linux-2.6.32.21/fs/ext3/balloc.c linux-2.6.32.21/fs/ext3/balloc.c
(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
return 0;
diff -urNp linux-2.6.32.21/fs/ext3/namei.c linux-2.6.32.21/fs/ext3/namei.c
---- linux-2.6.32.21/fs/ext3/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext3/namei.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext3/namei.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext3/namei.c 2010-09-13 08:10:10.000000000 -0400
@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31449,8 +31481,8 @@ diff -urNp linux-2.6.32.21/fs/ext3/namei.c linux-2.6.32.21/fs/ext3/namei.c
bh2 = ext3_append (handle, dir, &newblock, &err);
if (!(bh2)) {
diff -urNp linux-2.6.32.21/fs/ext3/xattr.c linux-2.6.32.21/fs/ext3/xattr.c
---- linux-2.6.32.21/fs/ext3/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext3/xattr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext3/xattr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext3/xattr.c 2010-09-13 08:10:10.000000000 -0400
@@ -89,8 +89,8 @@
printk("\n"); \
} while (0)
@@ -31463,8 +31495,8 @@ diff -urNp linux-2.6.32.21/fs/ext3/xattr.c linux-2.6.32.21/fs/ext3/xattr.c
static void ext3_xattr_cache_insert(struct buffer_head *);
diff -urNp linux-2.6.32.21/fs/ext4/balloc.c linux-2.6.32.21/fs/ext4/balloc.c
---- linux-2.6.32.21/fs/ext4/balloc.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/fs/ext4/balloc.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/fs/ext4/balloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext4/balloc.c 2010-09-13 08:10:10.000000000 -0400
@@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_
/* Hm, nope. Are (enough) root reserved blocks available? */
if (sbi->s_resuid == current_fsuid() ||
@@ -31475,8 +31507,8 @@ diff -urNp linux-2.6.32.21/fs/ext4/balloc.c linux-2.6.32.21/fs/ext4/balloc.c
return 1;
}
diff -urNp linux-2.6.32.21/fs/ext4/ioctl.c linux-2.6.32.21/fs/ext4/ioctl.c
---- linux-2.6.32.21/fs/ext4/ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext4/ioctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext4/ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext4/ioctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -230,6 +230,9 @@ setversion_out:
struct file *donor_filp;
int err;
@@ -31488,8 +31520,8 @@ diff -urNp linux-2.6.32.21/fs/ext4/ioctl.c linux-2.6.32.21/fs/ext4/ioctl.c
!(filp->f_mode & FMODE_WRITE))
return -EBADF;
diff -urNp linux-2.6.32.21/fs/ext4/namei.c linux-2.6.32.21/fs/ext4/namei.c
---- linux-2.6.32.21/fs/ext4/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext4/namei.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext4/namei.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext4/namei.c 2010-09-13 08:10:10.000000000 -0400
@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
char *data1 = (*bh)->b_data, *data2;
unsigned split, move, size;
@@ -31500,8 +31532,8 @@ diff -urNp linux-2.6.32.21/fs/ext4/namei.c linux-2.6.32.21/fs/ext4/namei.c
bh2 = ext4_append (handle, dir, &newblock, &err);
if (!(bh2)) {
diff -urNp linux-2.6.32.21/fs/ext4/super.c linux-2.6.32.21/fs/ext4/super.c
---- linux-2.6.32.21/fs/ext4/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext4/super.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext4/super.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext4/super.c 2010-09-13 08:10:10.000000000 -0400
@@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobje
}
@@ -31512,8 +31544,8 @@ diff -urNp linux-2.6.32.21/fs/ext4/super.c linux-2.6.32.21/fs/ext4/super.c
.store = ext4_attr_store,
};
diff -urNp linux-2.6.32.21/fs/ext4/xattr.c linux-2.6.32.21/fs/ext4/xattr.c
---- linux-2.6.32.21/fs/ext4/xattr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ext4/xattr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ext4/xattr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ext4/xattr.c 2010-09-13 08:10:10.000000000 -0400
@@ -82,8 +82,8 @@
printk("\n"); \
} while (0)
@@ -31526,8 +31558,8 @@ diff -urNp linux-2.6.32.21/fs/ext4/xattr.c linux-2.6.32.21/fs/ext4/xattr.c
static void ext4_xattr_cache_insert(struct buffer_head *);
diff -urNp linux-2.6.32.21/fs/fcntl.c linux-2.6.32.21/fs/fcntl.c
---- linux-2.6.32.21/fs/fcntl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fcntl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fcntl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fcntl.c 2010-09-13 08:10:10.000000000 -0400
@@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct
if (err)
return err;
@@ -31549,8 +31581,8 @@ diff -urNp linux-2.6.32.21/fs/fcntl.c linux-2.6.32.21/fs/fcntl.c
break;
err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
diff -urNp linux-2.6.32.21/fs/fifo.c linux-2.6.32.21/fs/fifo.c
---- linux-2.6.32.21/fs/fifo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fifo.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fifo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fifo.c 2010-09-13 08:10:10.000000000 -0400
@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
*/
filp->f_op = &read_pipefifo_fops;
@@ -31622,8 +31654,8 @@ diff -urNp linux-2.6.32.21/fs/fifo.c linux-2.6.32.21/fs/fifo.c
err_nocleanup:
diff -urNp linux-2.6.32.21/fs/file.c linux-2.6.32.21/fs/file.c
---- linux-2.6.32.21/fs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/file.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/file.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/file.c 2010-09-13 08:10:10.000000000 -0400
@@ -14,6 +14,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@ -31642,8 +31674,8 @@ diff -urNp linux-2.6.32.21/fs/file.c linux-2.6.32.21/fs/file.c
return -EMFILE;
diff -urNp linux-2.6.32.21/fs/fs_struct.c linux-2.6.32.21/fs/fs_struct.c
---- linux-2.6.32.21/fs/fs_struct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fs_struct.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fs_struct.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fs_struct.c 2010-09-13 08:10:10.000000000 -0400
@@ -4,6 +4,7 @@
#include <linux/path.h>
#include <linux/slab.h>
@@ -31724,8 +31756,8 @@ diff -urNp linux-2.6.32.21/fs/fs_struct.c linux-2.6.32.21/fs/fs_struct.c
task_unlock(current);
diff -urNp linux-2.6.32.21/fs/fuse/control.c linux-2.6.32.21/fs/fuse/control.c
---- linux-2.6.32.21/fs/fuse/control.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fuse/control.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fuse/control.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fuse/control.c 2010-09-13 08:10:10.000000000 -0400
@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent)
@@ -31736,8 +31768,8 @@ diff -urNp linux-2.6.32.21/fs/fuse/control.c linux-2.6.32.21/fs/fuse/control.c
int err;
diff -urNp linux-2.6.32.21/fs/fuse/cuse.c linux-2.6.32.21/fs/fuse/cuse.c
---- linux-2.6.32.21/fs/fuse/cuse.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fuse/cuse.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fuse/cuse.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fuse/cuse.c 2010-09-13 08:10:10.000000000 -0400
@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
return rc;
}
@@ -31773,8 +31805,8 @@ diff -urNp linux-2.6.32.21/fs/fuse/cuse.c linux-2.6.32.21/fs/fuse/cuse.c
if (IS_ERR(cuse_class))
return PTR_ERR(cuse_class);
diff -urNp linux-2.6.32.21/fs/fuse/dev.c linux-2.6.32.21/fs/fuse/dev.c
---- linux-2.6.32.21/fs/fuse/dev.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fuse/dev.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fuse/dev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fuse/dev.c 2010-09-13 08:10:10.000000000 -0400
@@ -745,7 +745,7 @@ __releases(&fc->lock)
* request_end(). Otherwise add it to the processing list, and set
* the 'sent' flag.
@@ -31881,8 +31913,8 @@ diff -urNp linux-2.6.32.21/fs/fuse/dev.c linux-2.6.32.21/fs/fuse/dev.c
const struct file_operations fuse_dev_operations = {
.owner = THIS_MODULE,
diff -urNp linux-2.6.32.21/fs/fuse/dir.c linux-2.6.32.21/fs/fuse/dir.c
---- linux-2.6.32.21/fs/fuse/dir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fuse/dir.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fuse/dir.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fuse/dir.c 2010-09-13 08:10:10.000000000 -0400
@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
return link;
}
@@ -31893,8 +31925,8 @@ diff -urNp linux-2.6.32.21/fs/fuse/dir.c linux-2.6.32.21/fs/fuse/dir.c
if (!IS_ERR(link))
free_page((unsigned long) link);
diff -urNp linux-2.6.32.21/fs/fuse/fuse_i.h linux-2.6.32.21/fs/fuse/fuse_i.h
---- linux-2.6.32.21/fs/fuse/fuse_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/fuse/fuse_i.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/fuse/fuse_i.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/fuse/fuse_i.h 2010-09-13 08:10:10.000000000 -0400
@@ -521,6 +521,16 @@ extern const struct file_operations fuse
extern const struct dentry_operations fuse_dentry_operations;
@@ -31913,8 +31945,8 @@ diff -urNp linux-2.6.32.21/fs/fuse/fuse_i.h linux-2.6.32.21/fs/fuse/fuse_i.h
* Inode to nodeid comparison.
*/
diff -urNp linux-2.6.32.21/fs/gfs2/sys.c linux-2.6.32.21/fs/gfs2/sys.c
---- linux-2.6.32.21/fs/gfs2/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/gfs2/sys.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/gfs2/sys.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/gfs2/sys.c 2010-09-13 08:10:10.000000000 -0400
@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
return a->store ? a->store(sdp, buf, len) : len;
}
@@ -31934,8 +31966,8 @@ diff -urNp linux-2.6.32.21/fs/gfs2/sys.c linux-2.6.32.21/fs/gfs2/sys.c
};
diff -urNp linux-2.6.32.21/fs/hfs/inode.c linux-2.6.32.21/fs/hfs/inode.c
---- linux-2.6.32.21/fs/hfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/hfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/hfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/hfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
if (S_ISDIR(main_inode->i_mode)) {
@@ -31955,8 +31987,8 @@ diff -urNp linux-2.6.32.21/fs/hfs/inode.c linux-2.6.32.21/fs/hfs/inode.c
sizeof(struct hfs_cat_file));
if (rec.type != HFS_CDR_FIL ||
diff -urNp linux-2.6.32.21/fs/hfsplus/inode.c linux-2.6.32.21/fs/hfsplus/inode.c
---- linux-2.6.32.21/fs/hfsplus/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/hfsplus/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/hfsplus/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/hfsplus/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
struct hfsplus_cat_folder *folder = &entry.folder;
@@ -31994,8 +32026,8 @@ diff -urNp linux-2.6.32.21/fs/hfsplus/inode.c linux-2.6.32.21/fs/hfsplus/inode.c
sizeof(struct hfsplus_cat_file));
hfsplus_inode_write_fork(inode, &file->data_fork);
diff -urNp linux-2.6.32.21/fs/hugetlbfs/inode.c linux-2.6.32.21/fs/hugetlbfs/inode.c
---- linux-2.6.32.21/fs/hugetlbfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/hugetlbfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/hugetlbfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/hugetlbfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
.kill_sb = kill_litter_super,
};
@@ -32006,8 +32038,8 @@ diff -urNp linux-2.6.32.21/fs/hugetlbfs/inode.c linux-2.6.32.21/fs/hugetlbfs/ino
static int can_do_hugetlb_shm(void)
{
diff -urNp linux-2.6.32.21/fs/ioctl.c linux-2.6.32.21/fs/ioctl.c
---- linux-2.6.32.21/fs/ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ioctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ioctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
u64 phys, u64 len, u32 flags)
{
@@ -32036,8 +32068,8 @@ diff -urNp linux-2.6.32.21/fs/ioctl.c linux-2.6.32.21/fs/ioctl.c
return error;
diff -urNp linux-2.6.32.21/fs/jffs2/debug.h linux-2.6.32.21/fs/jffs2/debug.h
---- linux-2.6.32.21/fs/jffs2/debug.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/jffs2/debug.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/jffs2/debug.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/jffs2/debug.h 2010-09-13 08:10:10.000000000 -0400
@@ -52,13 +52,13 @@
#if CONFIG_JFFS2_FS_DEBUG > 0
#define D1(x) x
@@ -32140,8 +32172,8 @@ diff -urNp linux-2.6.32.21/fs/jffs2/debug.h linux-2.6.32.21/fs/jffs2/debug.h
/* "Sanity" checks */
diff -urNp linux-2.6.32.21/fs/jffs2/erase.c linux-2.6.32.21/fs/jffs2/erase.c
---- linux-2.6.32.21/fs/jffs2/erase.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/jffs2/erase.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/jffs2/erase.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/jffs2/erase.c 2010-09-13 08:10:10.000000000 -0400
@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
struct jffs2_unknown_node marker = {
.magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -32153,8 +32185,8 @@ diff -urNp linux-2.6.32.21/fs/jffs2/erase.c linux-2.6.32.21/fs/jffs2/erase.c
jffs2_prealloc_raw_node_refs(c, jeb, 1);
diff -urNp linux-2.6.32.21/fs/jffs2/summary.h linux-2.6.32.21/fs/jffs2/summary.h
---- linux-2.6.32.21/fs/jffs2/summary.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/jffs2/summary.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/jffs2/summary.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/jffs2/summary.h 2010-09-13 08:10:10.000000000 -0400
@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
#define jffs2_sum_active() (0)
@@ -32184,8 +32216,8 @@ diff -urNp linux-2.6.32.21/fs/jffs2/summary.h linux-2.6.32.21/fs/jffs2/summary.h
#endif /* CONFIG_JFFS2_SUMMARY */
diff -urNp linux-2.6.32.21/fs/jffs2/wbuf.c linux-2.6.32.21/fs/jffs2/wbuf.c
---- linux-2.6.32.21/fs/jffs2/wbuf.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/jffs2/wbuf.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/jffs2/wbuf.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/jffs2/wbuf.c 2010-09-13 08:10:10.000000000 -0400
@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
{
.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -32197,8 +32229,8 @@ diff -urNp linux-2.6.32.21/fs/jffs2/wbuf.c linux-2.6.32.21/fs/jffs2/wbuf.c
/*
diff -urNp linux-2.6.32.21/fs/lockd/svc.c linux-2.6.32.21/fs/lockd/svc.c
---- linux-2.6.32.21/fs/lockd/svc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/lockd/svc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/lockd/svc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/lockd/svc.c 2010-09-13 08:10:10.000000000 -0400
@@ -43,7 +43,7 @@
static struct svc_program nlmsvc_program;
@@ -32209,8 +32241,8 @@ diff -urNp linux-2.6.32.21/fs/lockd/svc.c linux-2.6.32.21/fs/lockd/svc.c
static DEFINE_MUTEX(nlmsvc_mutex);
diff -urNp linux-2.6.32.21/fs/locks.c linux-2.6.32.21/fs/locks.c
---- linux-2.6.32.21/fs/locks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/locks.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/locks.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/locks.c 2010-09-13 08:10:10.000000000 -0400
@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
return;
@@ -32233,8 +32265,8 @@ diff -urNp linux-2.6.32.21/fs/locks.c linux-2.6.32.21/fs/locks.c
lock_kernel();
diff -urNp linux-2.6.32.21/fs/namei.c linux-2.6.32.21/fs/namei.c
---- linux-2.6.32.21/fs/namei.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/namei.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/namei.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/namei.c 2010-09-13 08:10:10.000000000 -0400
@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
error = PTR_ERR(cookie);
@@ -32562,8 +32594,8 @@ diff -urNp linux-2.6.32.21/fs/namei.c linux-2.6.32.21/fs/namei.c
mnt_drop_write(oldnd.path.mnt);
exit5:
diff -urNp linux-2.6.32.21/fs/namespace.c linux-2.6.32.21/fs/namespace.c
---- linux-2.6.32.21/fs/namespace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/namespace.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/namespace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/namespace.c 2010-09-13 08:10:10.000000000 -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);
@@ -32625,8 +32657,8 @@ diff -urNp linux-2.6.32.21/fs/namespace.c linux-2.6.32.21/fs/namespace.c
root = current->fs->root;
path_get(&current->fs->root);
diff -urNp linux-2.6.32.21/fs/nfs/inode.c linux-2.6.32.21/fs/nfs/inode.c
---- linux-2.6.32.21/fs/nfs/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/nfs/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/nfs/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/nfs/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
}
@@ -32648,8 +32680,8 @@ diff -urNp linux-2.6.32.21/fs/nfs/inode.c linux-2.6.32.21/fs/nfs/inode.c
void nfs_fattr_init(struct nfs_fattr *fattr)
diff -urNp linux-2.6.32.21/fs/nfs/nfs4proc.c linux-2.6.32.21/fs/nfs/nfs4proc.c
---- linux-2.6.32.21/fs/nfs/nfs4proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/nfs/nfs4proc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/nfs/nfs4proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/nfs/nfs4proc.c 2010-09-13 08:10:10.000000000 -0400
@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
{
@@ -32921,8 +32953,8 @@ diff -urNp linux-2.6.32.21/fs/nfs/nfs4proc.c linux-2.6.32.21/fs/nfs/nfs4proc.c
err = nfs4_set_lock_state(state, fl);
diff -urNp linux-2.6.32.21/fs/nfsd/lockd.c linux-2.6.32.21/fs/nfsd/lockd.c
---- linux-2.6.32.21/fs/nfsd/lockd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/nfsd/lockd.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/nfsd/lockd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/nfsd/lockd.c 2010-09-13 08:10:10.000000000 -0400
@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
fput(filp);
}
@@ -32933,8 +32965,8 @@ diff -urNp linux-2.6.32.21/fs/nfsd/lockd.c linux-2.6.32.21/fs/nfsd/lockd.c
.fclose = nlm_fclose, /* close file */
};
diff -urNp linux-2.6.32.21/fs/nfsd/vfs.c linux-2.6.32.21/fs/nfsd/vfs.c
---- linux-2.6.32.21/fs/nfsd/vfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/nfsd/vfs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/nfsd/vfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/nfsd/vfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
} else {
oldfs = get_fs();
@@ -32963,8 +32995,8 @@ diff -urNp linux-2.6.32.21/fs/nfsd/vfs.c linux-2.6.32.21/fs/nfsd/vfs.c
if (host_err < 0)
diff -urNp linux-2.6.32.21/fs/nls/nls_base.c linux-2.6.32.21/fs/nls/nls_base.c
---- linux-2.6.32.21/fs/nls/nls_base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/nls/nls_base.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/nls/nls_base.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/nls/nls_base.c 2010-09-13 08:10:10.000000000 -0400
@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
{0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
{0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */},
@@ -32975,8 +33007,8 @@ diff -urNp linux-2.6.32.21/fs/nls/nls_base.c linux-2.6.32.21/fs/nls/nls_base.c
#define UNICODE_MAX 0x0010ffff
diff -urNp linux-2.6.32.21/fs/ntfs/file.c linux-2.6.32.21/fs/ntfs/file.c
---- linux-2.6.32.21/fs/ntfs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ntfs/file.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ntfs/file.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ntfs/file.c 2010-09-13 08:10:10.000000000 -0400
@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
#endif /* NTFS_RW */
};
@@ -32987,8 +33019,8 @@ diff -urNp linux-2.6.32.21/fs/ntfs/file.c linux-2.6.32.21/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.32.21/fs/ocfs2/cluster/masklog.c linux-2.6.32.21/fs/ocfs2/cluster/masklog.c
---- linux-2.6.32.21/fs/ocfs2/cluster/masklog.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ocfs2/cluster/masklog.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ocfs2/cluster/masklog.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ocfs2/cluster/masklog.c 2010-09-13 08:10:10.000000000 -0400
@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
return mlog_mask_store(mlog_attr->mask, buf, count);
}
@@ -32999,8 +33031,8 @@ diff -urNp linux-2.6.32.21/fs/ocfs2/cluster/masklog.c linux-2.6.32.21/fs/ocfs2/c
.store = mlog_store,
};
diff -urNp linux-2.6.32.21/fs/ocfs2/localalloc.c linux-2.6.32.21/fs/ocfs2/localalloc.c
---- linux-2.6.32.21/fs/ocfs2/localalloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ocfs2/localalloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ocfs2/localalloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ocfs2/localalloc.c 2010-09-13 08:10:10.000000000 -0400
@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
goto bail;
}
@@ -33011,8 +33043,8 @@ diff -urNp linux-2.6.32.21/fs/ocfs2/localalloc.c linux-2.6.32.21/fs/ocfs2/locala
status = 0;
bail:
diff -urNp linux-2.6.32.21/fs/ocfs2/ocfs2.h linux-2.6.32.21/fs/ocfs2/ocfs2.h
---- linux-2.6.32.21/fs/ocfs2/ocfs2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ocfs2/ocfs2.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ocfs2/ocfs2.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ocfs2/ocfs2.h 2010-09-13 08:10:10.000000000 -0400
@@ -217,11 +217,11 @@ enum ocfs2_vol_state
struct ocfs2_alloc_stats
@@ -33031,8 +33063,8 @@ diff -urNp linux-2.6.32.21/fs/ocfs2/ocfs2.h linux-2.6.32.21/fs/ocfs2/ocfs2.h
enum ocfs2_local_alloc_state
diff -urNp linux-2.6.32.21/fs/ocfs2/suballoc.c linux-2.6.32.21/fs/ocfs2/suballoc.c
---- linux-2.6.32.21/fs/ocfs2/suballoc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ocfs2/suballoc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ocfs2/suballoc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ocfs2/suballoc.c 2010-09-13 08:10:10.000000000 -0400
@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
mlog_errno(status);
goto bail;
@@ -33079,8 +33111,8 @@ diff -urNp linux-2.6.32.21/fs/ocfs2/suballoc.c linux-2.6.32.21/fs/ocfs2/suballoc
}
if (status < 0) {
diff -urNp linux-2.6.32.21/fs/ocfs2/super.c linux-2.6.32.21/fs/ocfs2/super.c
---- linux-2.6.32.21/fs/ocfs2/super.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/ocfs2/super.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/ocfs2/super.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/ocfs2/super.c 2010-09-13 08:10:10.000000000 -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",
@@ -33116,8 +33148,8 @@ diff -urNp linux-2.6.32.21/fs/ocfs2/super.c linux-2.6.32.21/fs/ocfs2/super.c
/* Copy the blockcheck stats from the superblock probe */
osb->osb_ecc_stats = *stats;
diff -urNp linux-2.6.32.21/fs/open.c linux-2.6.32.21/fs/open.c
---- linux-2.6.32.21/fs/open.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/open.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/open.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/open.c 2010-09-13 08:10:10.000000000 -0400
@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
if (length < 0)
return -EINVAL;
@@ -33292,8 +33324,8 @@ diff -urNp linux-2.6.32.21/fs/open.c linux-2.6.32.21/fs/open.c
out_fput:
fput(file);
diff -urNp linux-2.6.32.21/fs/pipe.c linux-2.6.32.21/fs/pipe.c
---- linux-2.6.32.21/fs/pipe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/pipe.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/pipe.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/pipe.c 2010-09-13 08:10:10.000000000 -0400
@@ -401,9 +401,9 @@ redo:
}
if (bufs) /* More to do? */
@@ -33417,9 +33449,39 @@ diff -urNp linux-2.6.32.21/fs/pipe.c linux-2.6.32.21/fs/pipe.c
inode->i_fop = &rdwr_pipefifo_fops;
/*
+diff -urNp linux-2.6.32.21/fs/proc/Kconfig linux-2.6.32.21/fs/proc/Kconfig
+--- linux-2.6.32.21/fs/proc/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/Kconfig 2010-09-13 08:10:10.000000000 -0400
+@@ -30,12 +30,12 @@ config PROC_FS
+
+ config PROC_KCORE
+ bool "/proc/kcore support" if !ARM
+- depends on PROC_FS && MMU
++ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
+
+ config PROC_VMCORE
+ bool "/proc/vmcore support (EXPERIMENTAL)"
+- depends on PROC_FS && CRASH_DUMP
+- default y
++ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++ default n
+ help
+ Exports the dump image of crashed kernel in ELF format.
+
+@@ -59,8 +59,8 @@ config PROC_SYSCTL
+ limited in memory.
+
+ config PROC_PAGE_MONITOR
+- default y
+- depends on PROC_FS && MMU
++ default n
++ depends on PROC_FS && MMU && !GRKERNSEC
+ bool "Enable /proc page monitoring" if EMBEDDED
+ help
+ Various /proc files exist to monitor process memory utilization:
diff -urNp linux-2.6.32.21/fs/proc/array.c linux-2.6.32.21/fs/proc/array.c
---- linux-2.6.32.21/fs/proc/array.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/array.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/array.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/array.c 2010-09-13 08:10:10.000000000 -0400
@@ -321,6 +321,21 @@ static inline void task_context_switch_c
p->nivcsw);
}
@@ -33511,8 +33573,8 @@ diff -urNp linux-2.6.32.21/fs/proc/array.c linux-2.6.32.21/fs/proc/array.c
+}
+#endif
diff -urNp linux-2.6.32.21/fs/proc/base.c linux-2.6.32.21/fs/proc/base.c
---- linux-2.6.32.21/fs/proc/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/base.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/base.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/base.c 2010-09-13 08:10:10.000000000 -0400
@@ -102,6 +102,22 @@ struct pid_entry {
union proc_op op;
};
@@ -33869,8 +33931,8 @@ diff -urNp linux-2.6.32.21/fs/proc/base.c linux-2.6.32.21/fs/proc/base.c
#endif
#ifdef CONFIG_SCHEDSTATS
diff -urNp linux-2.6.32.21/fs/proc/cmdline.c linux-2.6.32.21/fs/proc/cmdline.c
---- linux-2.6.32.21/fs/proc/cmdline.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/cmdline.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/cmdline.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/cmdline.c 2010-09-13 08:10:10.000000000 -0400
@@ -23,7 +23,11 @@ static const struct file_operations cmdl
static int __init proc_cmdline_init(void)
@@ -33884,8 +33946,8 @@ diff -urNp linux-2.6.32.21/fs/proc/cmdline.c linux-2.6.32.21/fs/proc/cmdline.c
}
module_init(proc_cmdline_init);
diff -urNp linux-2.6.32.21/fs/proc/devices.c linux-2.6.32.21/fs/proc/devices.c
---- linux-2.6.32.21/fs/proc/devices.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/devices.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/devices.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/devices.c 2010-09-13 08:10:10.000000000 -0400
@@ -64,7 +64,11 @@ static const struct file_operations proc
static int __init proc_devices_init(void)
@@ -33899,8 +33961,8 @@ diff -urNp linux-2.6.32.21/fs/proc/devices.c linux-2.6.32.21/fs/proc/devices.c
}
module_init(proc_devices_init);
diff -urNp linux-2.6.32.21/fs/proc/inode.c linux-2.6.32.21/fs/proc/inode.c
---- linux-2.6.32.21/fs/proc/inode.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/inode.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/inode.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/inode.c 2010-09-13 08:10:10.000000000 -0400
@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
if (de->mode) {
inode->i_mode = de->mode;
@@ -33914,8 +33976,8 @@ diff -urNp linux-2.6.32.21/fs/proc/inode.c linux-2.6.32.21/fs/proc/inode.c
if (de->size)
inode->i_size = de->size;
diff -urNp linux-2.6.32.21/fs/proc/internal.h linux-2.6.32.21/fs/proc/internal.h
---- linux-2.6.32.21/fs/proc/internal.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/internal.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/internal.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/internal.h 2010-09-13 08:10:10.000000000 -0400
@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
struct pid *pid, struct task_struct *task);
extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -33926,39 +33988,9 @@ diff -urNp linux-2.6.32.21/fs/proc/internal.h linux-2.6.32.21/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.32.21/fs/proc/Kconfig linux-2.6.32.21/fs/proc/Kconfig
---- linux-2.6.32.21/fs/proc/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/Kconfig 2010-08-13 18:34:41.000000000 -0400
-@@ -30,12 +30,12 @@ config PROC_FS
-
- config PROC_KCORE
- bool "/proc/kcore support" if !ARM
-- depends on PROC_FS && MMU
-+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
-
- config PROC_VMCORE
- bool "/proc/vmcore support (EXPERIMENTAL)"
-- depends on PROC_FS && CRASH_DUMP
-- default y
-+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
-+ default n
- help
- Exports the dump image of crashed kernel in ELF format.
-
-@@ -59,8 +59,8 @@ config PROC_SYSCTL
- limited in memory.
-
- config PROC_PAGE_MONITOR
-- default y
-- depends on PROC_FS && MMU
-+ default n
-+ depends on PROC_FS && MMU && !GRKERNSEC
- bool "Enable /proc page monitoring" if EMBEDDED
- help
- Various /proc files exist to monitor process memory utilization:
diff -urNp linux-2.6.32.21/fs/proc/kcore.c linux-2.6.32.21/fs/proc/kcore.c
---- linux-2.6.32.21/fs/proc/kcore.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/kcore.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/fs/proc/kcore.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/kcore.c 2010-09-13 08:10:10.000000000 -0400
@@ -477,9 +477,10 @@ read_kcore(struct file *file, char __use
* the addresses in the elf_phdr on our list.
*/
@@ -34013,8 +34045,8 @@ diff -urNp linux-2.6.32.21/fs/proc/kcore.c linux-2.6.32.21/fs/proc/kcore.c
return -EPERM;
if (kcore_need_update)
diff -urNp linux-2.6.32.21/fs/proc/meminfo.c linux-2.6.32.21/fs/proc/meminfo.c
---- linux-2.6.32.21/fs/proc/meminfo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/meminfo.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/meminfo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/meminfo.c 2010-09-13 08:10:10.000000000 -0400
@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
vmi.used >> 10,
vmi.largest_chunk >> 10
@@ -34025,8 +34057,8 @@ diff -urNp linux-2.6.32.21/fs/proc/meminfo.c linux-2.6.32.21/fs/proc/meminfo.c
);
diff -urNp linux-2.6.32.21/fs/proc/nommu.c linux-2.6.32.21/fs/proc/nommu.c
---- linux-2.6.32.21/fs/proc/nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/nommu.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/nommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/nommu.c 2010-09-13 08:10:10.000000000 -0400
@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
if (len < 1)
len = 1;
@@ -34037,8 +34069,8 @@ diff -urNp linux-2.6.32.21/fs/proc/nommu.c linux-2.6.32.21/fs/proc/nommu.c
seq_putc(m, '\n');
diff -urNp linux-2.6.32.21/fs/proc/proc_net.c linux-2.6.32.21/fs/proc/proc_net.c
---- linux-2.6.32.21/fs/proc/proc_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/proc_net.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/proc_net.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/proc_net.c 2010-09-13 08:10:10.000000000 -0400
@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
struct task_struct *task;
struct nsproxy *ns;
@@ -34058,8 +34090,8 @@ diff -urNp linux-2.6.32.21/fs/proc/proc_net.c linux-2.6.32.21/fs/proc/proc_net.c
rcu_read_lock();
task = pid_task(proc_pid(dir), PIDTYPE_PID);
diff -urNp linux-2.6.32.21/fs/proc/proc_sysctl.c linux-2.6.32.21/fs/proc/proc_sysctl.c
---- linux-2.6.32.21/fs/proc/proc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/proc_sysctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/proc_sysctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/proc_sysctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -7,6 +7,8 @@
#include <linux/security.h>
#include "internal.h"
@@ -34100,8 +34132,8 @@ diff -urNp linux-2.6.32.21/fs/proc/proc_sysctl.c linux-2.6.32.21/fs/proc/proc_sy
if (table)
stat->mode = (stat->mode & S_IFMT) | table->mode;
diff -urNp linux-2.6.32.21/fs/proc/root.c linux-2.6.32.21/fs/proc/root.c
---- linux-2.6.32.21/fs/proc/root.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/root.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/root.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/root.c 2010-09-13 08:10:10.000000000 -0400
@@ -134,7 +134,15 @@ void __init proc_root_init(void)
#ifdef CONFIG_PROC_DEVICETREE
proc_device_tree_init();
@@ -34119,8 +34151,8 @@ diff -urNp linux-2.6.32.21/fs/proc/root.c linux-2.6.32.21/fs/proc/root.c
}
diff -urNp linux-2.6.32.21/fs/proc/task_mmu.c linux-2.6.32.21/fs/proc/task_mmu.c
---- linux-2.6.32.21/fs/proc/task_mmu.c 2010-08-29 21:08:16.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/task_mmu.c 2010-08-13 18:37:27.000000000 -0400
+--- linux-2.6.32.21/fs/proc/task_mmu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/task_mmu.c 2010-09-13 08:10:10.000000000 -0400
@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
"VmStk:\t%8lu kB\n"
"VmExe:\t%8lu kB\n"
@@ -34242,8 +34274,8 @@ diff -urNp linux-2.6.32.21/fs/proc/task_mmu.c linux-2.6.32.21/fs/proc/task_mmu.c
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
diff -urNp linux-2.6.32.21/fs/proc/task_nommu.c linux-2.6.32.21/fs/proc/task_nommu.c
---- linux-2.6.32.21/fs/proc/task_nommu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/proc/task_nommu.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/proc/task_nommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/proc/task_nommu.c 2010-09-13 08:10:10.000000000 -0400
@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
else
bytes += kobjsize(mm);
@@ -34263,8 +34295,8 @@ diff -urNp linux-2.6.32.21/fs/proc/task_nommu.c linux-2.6.32.21/fs/proc/task_nom
seq_putc(m, '\n');
diff -urNp linux-2.6.32.21/fs/readdir.c linux-2.6.32.21/fs/readdir.c
---- linux-2.6.32.21/fs/readdir.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/readdir.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/readdir.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/readdir.c 2010-09-13 08:10:10.000000000 -0400
@@ -16,6 +16,7 @@
#include <linux/security.h>
#include <linux/syscalls.h>
@@ -34355,8 +34387,8 @@ diff -urNp linux-2.6.32.21/fs/readdir.c linux-2.6.32.21/fs/readdir.c
buf.error = 0;
diff -urNp linux-2.6.32.21/fs/reiserfs/do_balan.c linux-2.6.32.21/fs/reiserfs/do_balan.c
---- linux-2.6.32.21/fs/reiserfs/do_balan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/reiserfs/do_balan.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/reiserfs/do_balan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/reiserfs/do_balan.c 2010-09-13 08:10:10.000000000 -0400
@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
return;
}
@@ -34367,8 +34399,8 @@ diff -urNp linux-2.6.32.21/fs/reiserfs/do_balan.c linux-2.6.32.21/fs/reiserfs/do
/* balance leaf returns 0 except if combining L R and S into
diff -urNp linux-2.6.32.21/fs/reiserfs/item_ops.c linux-2.6.32.21/fs/reiserfs/item_ops.c
---- linux-2.6.32.21/fs/reiserfs/item_ops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/reiserfs/item_ops.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/reiserfs/item_ops.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/reiserfs/item_ops.c 2010-09-13 08:10:10.000000000 -0400
@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
vi->vi_index, vi->vi_type, vi->vi_ih);
}
@@ -34424,8 +34456,8 @@ diff -urNp linux-2.6.32.21/fs/reiserfs/item_ops.c linux-2.6.32.21/fs/reiserfs/it
&indirect_ops,
&direct_ops,
diff -urNp linux-2.6.32.21/fs/reiserfs/procfs.c linux-2.6.32.21/fs/reiserfs/procfs.c
---- linux-2.6.32.21/fs/reiserfs/procfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/reiserfs/procfs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/reiserfs/procfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/reiserfs/procfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
"SMALL_TAILS " : "NO_TAILS ",
replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -34436,8 +34468,8 @@ diff -urNp linux-2.6.32.21/fs/reiserfs/procfs.c linux-2.6.32.21/fs/reiserfs/proc
SF(s_do_balance), SF(s_unneeded_left_neighbor),
SF(s_good_search_by_key_reada), SF(s_bmaps),
diff -urNp linux-2.6.32.21/fs/select.c linux-2.6.32.21/fs/select.c
---- linux-2.6.32.21/fs/select.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/select.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/select.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/select.c 2010-09-13 08:10:10.000000000 -0400
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/slab.h>
@@ -34455,8 +34487,8 @@ diff -urNp linux-2.6.32.21/fs/select.c linux-2.6.32.21/fs/select.c
return -EINVAL;
diff -urNp linux-2.6.32.21/fs/seq_file.c linux-2.6.32.21/fs/seq_file.c
---- linux-2.6.32.21/fs/seq_file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/seq_file.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/seq_file.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/seq_file.c 2010-09-13 08:10:10.000000000 -0400
@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
return 0;
}
@@ -34498,8 +34530,8 @@ diff -urNp linux-2.6.32.21/fs/seq_file.c linux-2.6.32.21/fs/seq_file.c
goto Enomem;
m->count = 0;
diff -urNp linux-2.6.32.21/fs/smbfs/symlink.c linux-2.6.32.21/fs/smbfs/symlink.c
---- linux-2.6.32.21/fs/smbfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/smbfs/symlink.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/smbfs/symlink.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/smbfs/symlink.c 2010-09-13 08:10:10.000000000 -0400
@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -34510,8 +34542,8 @@ diff -urNp linux-2.6.32.21/fs/smbfs/symlink.c linux-2.6.32.21/fs/smbfs/symlink.c
__putname(s);
}
diff -urNp linux-2.6.32.21/fs/splice.c linux-2.6.32.21/fs/splice.c
---- linux-2.6.32.21/fs/splice.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/splice.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/splice.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/splice.c 2010-09-13 08:10:10.000000000 -0400
@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
pipe_lock(pipe);
@@ -34651,8 +34683,8 @@ diff -urNp linux-2.6.32.21/fs/splice.c linux-2.6.32.21/fs/splice.c
pipe_unlock(ipipe);
diff -urNp linux-2.6.32.21/fs/sysfs/file.c linux-2.6.32.21/fs/sysfs/file.c
---- linux-2.6.32.21/fs/sysfs/file.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/sysfs/file.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/sysfs/file.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/sysfs/file.c 2010-09-13 08:10:10.000000000 -0400
@@ -53,7 +53,7 @@ struct sysfs_buffer {
size_t count;
loff_t pos;
@@ -34690,8 +34722,8 @@ diff -urNp linux-2.6.32.21/fs/sysfs/file.c linux-2.6.32.21/fs/sysfs/file.c
char *p;
diff -urNp linux-2.6.32.21/fs/sysfs/symlink.c linux-2.6.32.21/fs/sysfs/symlink.c
---- linux-2.6.32.21/fs/sysfs/symlink.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/sysfs/symlink.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/sysfs/symlink.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/sysfs/symlink.c 2010-09-13 08:10:10.000000000 -0400
@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -34702,8 +34734,8 @@ diff -urNp linux-2.6.32.21/fs/sysfs/symlink.c linux-2.6.32.21/fs/sysfs/symlink.c
free_page((unsigned long)page);
}
diff -urNp linux-2.6.32.21/fs/udf/balloc.c linux-2.6.32.21/fs/udf/balloc.c
---- linux-2.6.32.21/fs/udf/balloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/udf/balloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/udf/balloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/udf/balloc.c 2010-09-13 08:10:10.000000000 -0400
@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
mutex_lock(&sbi->s_alloc_mutex);
@@ -34727,8 +34759,8 @@ diff -urNp linux-2.6.32.21/fs/udf/balloc.c linux-2.6.32.21/fs/udf/balloc.c
bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
partmap->s_partition_len);
diff -urNp linux-2.6.32.21/fs/udf/misc.c linux-2.6.32.21/fs/udf/misc.c
---- linux-2.6.32.21/fs/udf/misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/udf/misc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/udf/misc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/udf/misc.c 2010-09-13 08:10:10.000000000 -0400
@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
iinfo->i_lenEAttr += size;
return (struct genericFormat *)&ea[offset];
@@ -34741,8 +34773,8 @@ diff -urNp linux-2.6.32.21/fs/udf/misc.c linux-2.6.32.21/fs/udf/misc.c
return NULL;
}
diff -urNp linux-2.6.32.21/fs/udf/udfdecl.h linux-2.6.32.21/fs/udf/udfdecl.h
---- linux-2.6.32.21/fs/udf/udfdecl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/udf/udfdecl.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/udf/udfdecl.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/udf/udfdecl.h 2010-09-13 08:10:10.000000000 -0400
@@ -26,7 +26,7 @@ do { \
printk(f, ##a); \
} while (0)
@@ -34753,8 +34785,8 @@ diff -urNp linux-2.6.32.21/fs/udf/udfdecl.h linux-2.6.32.21/fs/udf/udfdecl.h
#define udf_info(f, a...) \
diff -urNp linux-2.6.32.21/fs/utimes.c linux-2.6.32.21/fs/utimes.c
---- linux-2.6.32.21/fs/utimes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/utimes.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/utimes.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/utimes.c 2010-09-13 08:10:10.000000000 -0400
@@ -1,6 +1,7 @@
#include <linux/compiler.h>
#include <linux/file.h>
@@ -34777,8 +34809,8 @@ diff -urNp linux-2.6.32.21/fs/utimes.c linux-2.6.32.21/fs/utimes.c
error = notify_change(path->dentry, &newattrs);
mutex_unlock(&inode->i_mutex);
diff -urNp linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -134,7 +134,7 @@ xfs_find_handle(
}
@@ -34789,8 +34821,8 @@ diff -urNp linux-2.6.32.21/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.21/fs/xfs/l
goto out_put;
diff -urNp linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c
---- linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c 2010-09-13 08:10:10.000000000 -0400
@@ -468,7 +468,7 @@ xfs_vn_put_link(
struct nameidata *nd,
void *p)
@@ -34801,8 +34833,8 @@ diff -urNp linux-2.6.32.21/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.21/fs/xfs/li
if (!IS_ERR(s))
kfree(s);
diff -urNp linux-2.6.32.21/fs/xfs/xfs_bmap.c linux-2.6.32.21/fs/xfs/xfs_bmap.c
---- linux-2.6.32.21/fs/xfs/xfs_bmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/fs/xfs/xfs_bmap.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/fs/xfs/xfs_bmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/fs/xfs/xfs_bmap.c 2010-09-13 08:10:10.000000000 -0400
@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
int nmap,
int ret_nmap);
@@ -34812,118 +34844,1028 @@ diff -urNp linux-2.6.32.21/fs/xfs/xfs_bmap.c linux-2.6.32.21/fs/xfs/xfs_bmap.c
#endif /* DEBUG */
#if defined(XFS_RW_TRACE)
-diff -urNp linux-2.6.32.21/grsecurity/gracl_alloc.c linux-2.6.32.21/grsecurity/gracl_alloc.c
---- linux-2.6.32.21/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_alloc.c 2010-08-13 18:34:41.000000000 -0400
-@@ -0,0 +1,105 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/gracl.h>
-+#include <linux/grsecurity.h>
+diff -urNp linux-2.6.32.21/grsecurity/Kconfig linux-2.6.32.21/grsecurity/Kconfig
+--- linux-2.6.32.21/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.21/grsecurity/Kconfig 2010-09-13 08:10:10.000000000 -0400
+@@ -0,0 +1,982 @@
++#
++# grecurity configuration
++#
+
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
++menu "Grsecurity"
+
-+static __inline__ int
-+alloc_pop(void)
-+{
-+ if (alloc_stack_next == 1)
-+ return 0;
++config GRKERNSEC
++ bool "Grsecurity"
++ select CRYPTO
++ select CRYPTO_SHA256
++ help
++ If you say Y here, you will be able to configure many features
++ that will enhance the security of your system. It is highly
++ recommended that you say Y here and read through the help
++ for each option so that you fully understand the features and
++ can evaluate their usefulness for your machine.
+
-+ kfree(alloc_stack[alloc_stack_next - 2]);
++choice
++ prompt "Security Level"
++ depends on GRKERNSEC
++ default GRKERNSEC_CUSTOM
+
-+ alloc_stack_next--;
++config GRKERNSEC_LOW
++ bool "Low"
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_CHDIR
+
-+ return 1;
-+}
++ help
++ If you choose this option, several of the grsecurity options will
++ be enabled that will give you greater protection against a number
++ of attacks, while assuring that none of your software will have any
++ conflicts with the additional security measures. If you run a lot
++ of unusual software, or you are having problems with the higher
++ security levels, you should say Y here. With this option, the
++ following features are enabled:
+
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+ if (alloc_stack_next >= alloc_stack_size)
-+ return 1;
++ - Linking restrictions
++ - FIFO restrictions
++ - Enforcing RLIMIT_NPROC on execve
++ - Restricted dmesg
++ - Enforced chdir("/") on chroot
++ - Runtime module disabling
+
-+ alloc_stack[alloc_stack_next - 1] = buf;
++config GRKERNSEC_MEDIUM
++ bool "Medium"
++ select PAX
++ select PAX_EI_PAX
++ select PAX_PT_PAX_FLAGS
++ select PAX_HAVE_ACL_FLAGS
++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_SYSCTL
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_FORKFAIL
++ select GRKERNSEC_TIME
++ select GRKERNSEC_SIGNAL
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_UNIX
++ select GRKERNSEC_CHROOT_MOUNT
++ select GRKERNSEC_CHROOT_PIVOT
++ select GRKERNSEC_CHROOT_DOUBLE
++ select GRKERNSEC_CHROOT_CHDIR
++ select GRKERNSEC_CHROOT_MKNOD
++ select GRKERNSEC_PROC
++ select GRKERNSEC_PROC_USERGROUP
++ select PAX_RANDUSTACK
++ select PAX_ASLR
++ select PAX_RANDMMAP
++ select PAX_REFCOUNT if (X86 || SPARC64)
++ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB))
+
-+ alloc_stack_next++;
++ help
++ If you say Y here, several features in addition to those included
++ in the low additional security level will be enabled. These
++ features provide even more security to your system, though in rare
++ cases they may be incompatible with very old or poorly written
++ software. If you enable this option, make sure that your auth
++ service (identd) is running as gid 1001. With this option,
++ the following features (in addition to those provided in the
++ low additional security level) will be enabled:
+
-+ return 0;
-+}
++ - Failed fork logging
++ - Time change logging
++ - Signal logging
++ - Deny mounts in chroot
++ - Deny double chrooting
++ - Deny sysctl writes in chroot
++ - Deny mknod in chroot
++ - Deny access to abstract AF_UNIX sockets out of chroot
++ - Deny pivot_root in chroot
++ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++ - /proc restrictions with special GID set to 10 (usually wheel)
++ - Address Space Layout Randomization (ASLR)
++ - Prevent exploitation of most refcount overflows
++ - Bounds checking of copying between the kernel and userland
+
-+void *
-+acl_alloc(unsigned long len)
-+{
-+ void *ret = NULL;
++config GRKERNSEC_HIGH
++ bool "High"
++ select GRKERNSEC_LINK
++ select GRKERNSEC_FIFO
++ select GRKERNSEC_EXECVE
++ select GRKERNSEC_DMESG
++ select GRKERNSEC_FORKFAIL
++ select GRKERNSEC_TIME
++ select GRKERNSEC_SIGNAL
++ select GRKERNSEC_CHROOT
++ select GRKERNSEC_CHROOT_SHMAT
++ select GRKERNSEC_CHROOT_UNIX
++ select GRKERNSEC_CHROOT_MOUNT
++ select GRKERNSEC_CHROOT_FCHDIR
++ select GRKERNSEC_CHROOT_PIVOT
++ select GRKERNSEC_CHROOT_DOUBLE
++ select GRKERNSEC_CHROOT_CHDIR
++ select GRKERNSEC_CHROOT_MKNOD
++ select GRKERNSEC_CHROOT_CAPS
++ select GRKERNSEC_CHROOT_SYSCTL
++ select GRKERNSEC_CHROOT_FINDTASK
++ select GRKERNSEC_PROC
++ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++ select GRKERNSEC_HIDESYM
++ select GRKERNSEC_BRUTE
++ select GRKERNSEC_PROC_USERGROUP
++ select GRKERNSEC_KMEM
++ select GRKERNSEC_RESLOG
++ select GRKERNSEC_RANDNET
++ select GRKERNSEC_PROC_ADD
++ select GRKERNSEC_CHROOT_CHMOD
++ select GRKERNSEC_CHROOT_NICE
++ select GRKERNSEC_AUDIT_MOUNT
++ select GRKERNSEC_MODHARDEN if (MODULES)
++ select GRKERNSEC_HARDEN_PTRACE
++ select GRKERNSEC_VM86 if (X86_32)
++ select PAX
++ select PAX_RANDUSTACK
++ select PAX_ASLR
++ select PAX_RANDMMAP
++ select PAX_NOEXEC
++ select PAX_MPROTECT
++ select PAX_EI_PAX
++ select PAX_PT_PAX_FLAGS
++ select PAX_HAVE_ACL_FLAGS
++ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
++ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
++ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
++ select PAX_SEGMEXEC if (X86_32)
++ select PAX_PAGEEXEC
++ select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
++ select PAX_EMUTRAMP if (PARISC)
++ select PAX_EMUSIGRT if (PARISC)
++ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
++ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
++ select PAX_REFCOUNT if (X86 || SPARC64)
++ select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
++ help
++ If you say Y here, many of the features of grsecurity will be
++ enabled, which will protect you against many kinds of attacks
++ against your system. The heightened security comes at a cost
++ of an increased chance of incompatibilities with rare software
++ on your machine. Since this security level enables PaX, you should
++ view <http://pax.grsecurity.net> and read about the PaX
++ project. While you are there, download chpax and run it on
++ binaries that cause problems with PaX. Also remember that
++ since the /proc restrictions are enabled, you must run your
++ identd as gid 1001. This security level enables the following
++ features in addition to those listed in the low and medium
++ security levels:
+
-+ if (!len || len > PAGE_SIZE)
-+ goto out;
++ - Additional /proc restrictions
++ - Chmod restrictions in chroot
++ - No signals, ptrace, or viewing of processes outside of chroot
++ - Capability restrictions in chroot
++ - Deny fchdir out of chroot
++ - Priority restrictions in chroot
++ - Segmentation-based implementation of PaX
++ - Mprotect restrictions
++ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++ - Kernel stack randomization
++ - Mount/unmount/remount logging
++ - Kernel symbol hiding
++ - Prevention of memory exhaustion-based exploits
++ - Hardening of module auto-loading
++ - Ptrace restrictions
++ - Restricted vm86 mode
+
-+ ret = kmalloc(len, GFP_KERNEL);
++config GRKERNSEC_CUSTOM
++ bool "Custom"
++ help
++ If you say Y here, you will be able to configure every grsecurity
++ option, which allows you to enable many more features that aren't
++ covered in the basic security levels. These additional features
++ include TPE, socket restrictions, and the sysctl system for
++ grsecurity. It is advised that you read through the help for
++ each option to determine its usefulness in your situation.
+
-+ if (ret) {
-+ if (alloc_push(ret)) {
-+ kfree(ret);
-+ ret = NULL;
-+ }
-+ }
++endchoice
+
-+out:
-+ return ret;
-+}
++menu "Address Space Protection"
++depends on GRKERNSEC
+
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+ if (!len || (num > (PAGE_SIZE / len)))
-+ return NULL;
++config GRKERNSEC_KMEM
++ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++ help
++ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
++ be written to via mmap or otherwise to modify the running kernel.
++ /dev/port will also not be allowed to be opened. If you have module
++ support disabled, enabling this will close up four ways that are
++ currently used to insert malicious code into the running kernel.
++ Even with all these features enabled, we still highly recommend that
++ you use the RBAC system, as it is still possible for an attacker to
++ modify the running kernel through privileged I/O granted by ioperm/iopl.
++ If you are not using XFree86, you may be able to stop this additional
++ case by enabling the 'Disable privileged I/O' option. Though nothing
++ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
++ but only to video memory, which is the only writing we allow in this
++ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
++ not be allowed to mprotect it with PROT_WRITE later.
++ It is highly recommended that you say Y here if you meet all the
++ conditions above.
+
-+ return acl_alloc(num * len);
-+}
++config GRKERNSEC_VM86
++ bool "Restrict VM86 mode"
++ depends on X86_32
+
-+void
-+acl_free_all(void)
-+{
-+ if (gr_acl_is_enabled() || !alloc_stack)
-+ return;
++ help
++ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++ make use of a special execution mode on 32bit x86 processors called
++ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
++ video cards and will still work with this option enabled. The purpose
++ of the option is to prevent exploitation of emulation errors in
++ virtualization of vm86 mode like the one discovered in VMWare in 2009.
++ Nearly all users should be able to enable this option.
+
-+ while (alloc_pop()) ;
++config GRKERNSEC_IO
++ bool "Disable privileged I/O"
++ depends on X86
++ select RTC_CLASS
++ select RTC_INTF_DEV
++ select RTC_DRV_CMOS
+
-+ if (alloc_stack) {
-+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+ kfree(alloc_stack);
-+ else
-+ vfree(alloc_stack);
-+ }
++ help
++ If you say Y here, all ioperm and iopl calls will return an error.
++ Ioperm and iopl can be used to modify the running kernel.
++ Unfortunately, some programs need this access to operate properly,
++ the most notable of which are XFree86 and hwclock. hwclock can be
++ remedied by having RTC support in the kernel, so real-time
++ clock support is enabled if this option is enabled, to ensure
++ that hwclock operates correctly. XFree86 still will not
++ operate correctly with this option enabled, so DO NOT CHOOSE Y
++ IF YOU USE XFree86. If you use XFree86 and you still want to
++ protect your kernel against modification, use the RBAC system.
+
-+ alloc_stack = NULL;
-+ alloc_stack_size = 1;
-+ alloc_stack_next = 1;
++config GRKERNSEC_PROC_MEMMAP
++ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++ default y if (PAX_NOEXEC || PAX_ASLR)
++ depends on PAX_NOEXEC || PAX_ASLR
++ help
++ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++ give no information about the addresses of its mappings if
++ PaX features that rely on random addresses are enabled on the task.
++ If you use PaX it is greatly recommended that you say Y here as it
++ closes up a hole that makes the full ASLR useless for suid
++ binaries.
+
-+ return;
-+}
++config GRKERNSEC_BRUTE
++ bool "Deter exploit bruteforcing"
++ help
++ If you say Y here, attempts to bruteforce exploits against forking
++ daemons such as apache or sshd will be deterred. When a child of a
++ forking daemon is killed by PaX or crashes due to an illegal
++ instruction, the parent process will be delayed 30 seconds upon every
++ subsequent fork until the administrator is able to assess the
++ situation and restart the daemon. It is recommended that you also
++ enable signal logging in the auditing section so that logs are
++ generated when a process performs an illegal instruction.
+
-+int
-+acl_alloc_stack_init(unsigned long size)
-+{
-+ if ((size * sizeof (void *)) <= PAGE_SIZE)
-+ alloc_stack =
-+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
-+ else
-+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
++config GRKERNSEC_MODHARDEN
++ bool "Harden module auto-loading"
++ depends on MODULES
++ help
++ If you say Y here, module auto-loading in response to use of some
++ feature implemented by an unloaded module will be restricted to
++ root users. Enabling this option helps defend against attacks
++ by unprivileged users who abuse the auto-loading behavior to
++ cause a vulnerable module to load that is then exploited.
+
-+ alloc_stack_size = size;
++ If this option prevents a legitimate use of auto-loading for a
++ non-root user, the administrator can execute modprobe manually
++ with the exact name of the module mentioned in the alert log.
++ Alternatively, the administrator can add the module to the list
++ of modules loaded at boot by modifying init scripts.
+
-+ if (!alloc_stack)
-+ return 0;
-+ else
-+ return 1;
-+}
++ Modification of init scripts will most likely be needed on
++ Ubuntu servers with encrypted home directory support enabled,
++ as the first non-root user logging in will cause the ecb(aes),
++ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
++
++config GRKERNSEC_HIDESYM
++ bool "Hide kernel symbols"
++ help
++ If you say Y here, getting information on loaded modules, and
++ displaying all kernel symbols through a syscall will be restricted
++ to users with CAP_SYS_MODULE. For software compatibility reasons,
++ /proc/kallsyms will be restricted to the root user. The RBAC
++ system can hide that entry even from root. Note that this option
++ is only effective provided the following conditions are met:
++ 1) The kernel using grsecurity is not precompiled by some distribution
++ 2) You are using the RBAC system and hiding other files such as your
++ kernel image and System.map. Alternatively, enabling this option
++ causes the permissions on /boot, /lib/modules, and the kernel
++ source directory to change at compile time to prevent
++ reading by non-root users.
++ If the above conditions are met, this option will aid in providing a
++ useful protection against local kernel exploitation of overflows
++ and arbitrary read/write vulnerabilities.
++
++endmenu
++menu "Role Based Access Control Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_NO_RBAC
++ bool "Disable RBAC system"
++ help
++ If you say Y here, the /dev/grsec device will be removed from the kernel,
++ preventing the RBAC system from being enabled. You should only say Y
++ here if you have no intention of using the RBAC system, so as to prevent
++ an attacker with root access from misusing the RBAC system to hide files
++ and processes when loadable module support and /dev/[k]mem have been
++ locked down.
++
++config GRKERNSEC_ACL_HIDEKERN
++ bool "Hide kernel processes"
++ help
++ If you say Y here, all kernel threads will be hidden to all
++ processes but those whose subject has the "view hidden processes"
++ flag.
++
++config GRKERNSEC_ACL_MAXTRIES
++ int "Maximum tries before password lockout"
++ default 3
++ help
++ This option enforces the maximum number of times a user can attempt
++ to authorize themselves with the grsecurity RBAC system before being
++ denied the ability to attempt authorization again for a specified time.
++ The lower the number, the harder it will be to brute-force a password.
++
++config GRKERNSEC_ACL_TIMEOUT
++ int "Time to wait after max password tries, in seconds"
++ default 30
++ help
++ This option specifies the time the user must wait after attempting to
++ authorize to the RBAC system with the maximum number of invalid
++ passwords. The higher the number, the harder it will be to brute-force
++ a password.
++
++endmenu
++menu "Filesystem Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_PROC
++ bool "Proc restrictions"
++ help
++ If you say Y here, the permissions of the /proc filesystem
++ will be altered to enhance system security and privacy. You MUST
++ choose either a user only restriction or a user and group restriction.
++ Depending upon the option you choose, you can either restrict users to
++ see only the processes they themselves run, or choose a group that can
++ view all processes and files normally restricted to root if you choose
++ the "restrict to user only" option. NOTE: If you're running identd as
++ a non-root user, you will have to run it as the group you specify here.
++
++config GRKERNSEC_PROC_USER
++ bool "Restrict /proc to user only"
++ depends on GRKERNSEC_PROC
++ help
++ If you say Y here, non-root users will only be able to view their own
++ processes, and restricts them from viewing network-related information,
++ and viewing kernel symbol and module information.
++
++config GRKERNSEC_PROC_USERGROUP
++ bool "Allow special group"
++ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
++ help
++ If you say Y here, you will be able to select a group that will be
++ able to view all processes, network-related information, and
++ kernel and symbol information. This option is useful if you want
++ to run identd as a non-root user.
++
++config GRKERNSEC_PROC_GID
++ int "GID for special group"
++ depends on GRKERNSEC_PROC_USERGROUP
++ default 1001
++
++config GRKERNSEC_PROC_ADD
++ bool "Additional restrictions"
++ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
++ help
++ If you say Y here, additional restrictions will be placed on
++ /proc that keep normal users from viewing device information and
++ slabinfo information that could be useful for exploits.
++
++config GRKERNSEC_LINK
++ bool "Linking restrictions"
++ help
++ If you say Y here, /tmp race exploits will be prevented, since users
++ will no longer be able to follow symlinks owned by other users in
++ world-writable +t directories (i.e. /tmp), unless the owner of the
++ symlink is the owner of the directory. users will also not be
++ able to hardlink to files they do not own. If the sysctl option is
++ enabled, a sysctl option with name "linking_restrictions" is created.
++
++config GRKERNSEC_FIFO
++ bool "FIFO restrictions"
++ help
++ If you say Y here, users will not be able to write to FIFOs they don't
++ own in world-writable +t directories (i.e. /tmp), unless the owner of
++ the FIFO is the same owner of the directory it's held in. If the sysctl
++ option is enabled, a sysctl option with name "fifo_restrictions" is
++ created.
++
++config GRKERNSEC_ROFS
++ bool "Runtime read-only mount protection"
++ help
++ If you say Y here, a sysctl option with name "romount_protect" will
++ be created. By setting this option to 1 at runtime, filesystems
++ will be protected in the following ways:
++ * No new writable mounts will be allowed
++ * Existing read-only mounts won't be able to be remounted read/write
++ * Write operations will be denied on all block devices
++ This option acts independently of grsec_lock: once it is set to 1,
++ it cannot be turned off. Therefore, please be mindful of the resulting
++ behavior if this option is enabled in an init script on a read-only
++ filesystem. This feature is mainly intended for secure embedded systems.
++
++config GRKERNSEC_CHROOT
++ bool "Chroot jail restrictions"
++ help
++ If you say Y here, you will be able to choose several options that will
++ make breaking out of a chrooted jail much more difficult. If you
++ encounter no software incompatibilities with the following options, it
++ is recommended that you enable each one.
++
++config GRKERNSEC_CHROOT_MOUNT
++ bool "Deny mounts"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ mount or remount filesystems. If the sysctl option is enabled, a
++ sysctl option with name "chroot_deny_mount" is created.
++
++config GRKERNSEC_CHROOT_DOUBLE
++ bool "Deny double-chroots"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to chroot
++ again outside the chroot. This is a widely used method of breaking
++ out of a chroot jail and should not be allowed. If the sysctl
++ option is enabled, a sysctl option with name
++ "chroot_deny_chroot" is created.
++
++config GRKERNSEC_CHROOT_PIVOT
++ bool "Deny pivot_root in chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to use
++ a function called pivot_root() that was introduced in Linux 2.3.41. It
++ works similar to chroot in that it changes the root filesystem. This
++ function could be misused in a chrooted process to attempt to break out
++ of the chroot, and therefore should not be allowed. If the sysctl
++ option is enabled, a sysctl option with name "chroot_deny_pivot" is
++ created.
++
++config GRKERNSEC_CHROOT_CHDIR
++ bool "Enforce chdir(\"/\") on all chroots"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, the current working directory of all newly-chrooted
++ applications will be set to the the root directory of the chroot.
++ The man page on chroot(2) states:
++ Note that this call does not change the current working
++ directory, so that `.' can be outside the tree rooted at
++ `/'. In particular, the super-user can escape from a
++ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
++
++ It is recommended that you say Y here, since it's not known to break
++ any software. If the sysctl option is enabled, a sysctl option with
++ name "chroot_enforce_chdir" is created.
++
++config GRKERNSEC_CHROOT_CHMOD
++ bool "Deny (f)chmod +s"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to chmod
++ or fchmod files to make them have suid or sgid bits. This protects
++ against another published method of breaking a chroot. If the sysctl
++ option is enabled, a sysctl option with name "chroot_deny_chmod" is
++ created.
++
++config GRKERNSEC_CHROOT_FCHDIR
++ bool "Deny fchdir out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, a well-known method of breaking chroots by fchdir'ing
++ to a file descriptor of the chrooting process that points to a directory
++ outside the filesystem will be stopped. If the sysctl option
++ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
++
++config GRKERNSEC_CHROOT_MKNOD
++ bool "Deny mknod"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be allowed to
++ mknod. The problem with using mknod inside a chroot is that it
++ would allow an attacker to create a device entry that is the same
++ as one on the physical root of your system, which could range from
++ anything from the console device to a device for your harddrive (which
++ they could then use to wipe the drive or steal data). It is recommended
++ that you say Y here, unless you run into software incompatibilities.
++ If the sysctl option is enabled, a sysctl option with name
++ "chroot_deny_mknod" is created.
++
++config GRKERNSEC_CHROOT_SHMAT
++ bool "Deny shmat() out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to attach
++ to shared memory segments that were created outside of the chroot jail.
++ It is recommended that you say Y here. If the sysctl option is enabled,
++ a sysctl option with name "chroot_deny_shmat" is created.
++
++config GRKERNSEC_CHROOT_UNIX
++ bool "Deny access to abstract AF_UNIX sockets out of chroot"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ connect to abstract (meaning not belonging to a filesystem) Unix
++ domain sockets that were bound outside of a chroot. It is recommended
++ that you say Y here. If the sysctl option is enabled, a sysctl option
++ with name "chroot_deny_unix" is created.
++
++config GRKERNSEC_CHROOT_FINDTASK
++ bool "Protect outside processes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to
++ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
++ getsid, or view any process outside of the chroot. If the sysctl
++ option is enabled, a sysctl option with name "chroot_findtask" is
++ created.
++
++config GRKERNSEC_CHROOT_NICE
++ bool "Restrict priority changes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, processes inside a chroot will not be able to raise
++ the priority of processes in the chroot, or alter the priority of
++ processes outside the chroot. This provides more security than simply
++ removing CAP_SYS_NICE from the process' capability set. If the
++ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
++ is created.
++
++config GRKERNSEC_CHROOT_SYSCTL
++ bool "Deny sysctl writes"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, an attacker in a chroot will not be able to
++ write to sysctl entries, either by sysctl(2) or through a /proc
++ interface. It is strongly recommended that you say Y here. If the
++ sysctl option is enabled, a sysctl option with name
++ "chroot_deny_sysctl" is created.
++
++config GRKERNSEC_CHROOT_CAPS
++ bool "Capability restrictions"
++ depends on GRKERNSEC_CHROOT
++ help
++ If you say Y here, the capabilities on all root processes within a
++ chroot jail will be lowered to stop module insertion, raw i/o,
++ system and net admin tasks, rebooting the system, modifying immutable
++ files, modifying IPC owned by another, and changing the system time.
++ This is left an option because it can break some apps. Disable this
++ if your chrooted apps are having problems performing those kinds of
++ tasks. If the sysctl option is enabled, a sysctl option with
++ name "chroot_caps" is created.
++
++endmenu
++menu "Kernel Auditing"
++depends on GRKERNSEC
++
++config GRKERNSEC_AUDIT_GROUP
++ bool "Single group for auditing"
++ help
++ If you say Y here, the exec, chdir, and (un)mount logging features
++ will only operate on a group you specify. This option is recommended
++ if you only want to watch certain users instead of having a large
++ amount of logs from the entire system. If the sysctl option is enabled,
++ a sysctl option with name "audit_group" is created.
++
++config GRKERNSEC_AUDIT_GID
++ int "GID for auditing"
++ depends on GRKERNSEC_AUDIT_GROUP
++ default 1007
++
++config GRKERNSEC_EXECLOG
++ bool "Exec logging"
++ help
++ If you say Y here, all execve() calls will be logged (since the
++ other exec*() calls are frontends to execve(), all execution
++ will be logged). Useful for shell-servers that like to keep track
++ of their users. If the sysctl option is enabled, a sysctl option with
++ name "exec_logging" is created.
++ WARNING: This option when enabled will produce a LOT of logs, especially
++ on an active system.
++
++config GRKERNSEC_RESLOG
++ bool "Resource logging"
++ help
++ If you say Y here, all attempts to overstep resource limits will
++ be logged with the resource name, the requested size, and the current
++ limit. It is highly recommended that you say Y here. If the sysctl
++ option is enabled, a sysctl option with name "resource_logging" is
++ created. If the RBAC system is enabled, the sysctl value is ignored.
++
++config GRKERNSEC_CHROOT_EXECLOG
++ bool "Log execs within chroot"
++ help
++ If you say Y here, all executions inside a chroot jail will be logged
++ to syslog. This can cause a large amount of logs if certain
++ applications (eg. djb's daemontools) are installed on the system, and
++ is therefore left as an option. If the sysctl option is enabled, a
++ sysctl option with name "chroot_execlog" is created.
++
++config GRKERNSEC_AUDIT_PTRACE
++ bool "Ptrace logging"
++ help
++ If you say Y here, all attempts to attach to a process via ptrace
++ will be logged. If the sysctl option is enabled, a sysctl option
++ with name "audit_ptrace" is created.
++
++config GRKERNSEC_AUDIT_CHDIR
++ bool "Chdir logging"
++ help
++ If you say Y here, all chdir() calls will be logged. If the sysctl
++ option is enabled, a sysctl option with name "audit_chdir" is created.
++
++config GRKERNSEC_AUDIT_MOUNT
++ bool "(Un)Mount logging"
++ help
++ If you say Y here, all mounts and unmounts will be logged. If the
++ sysctl option is enabled, a sysctl option with name "audit_mount" is
++ created.
++
++config GRKERNSEC_SIGNAL
++ bool "Signal logging"
++ help
++ If you say Y here, certain important signals will be logged, such as
++ SIGSEGV, which will as a result inform you of when a error in a program
++ occurred, which in some cases could mean a possible exploit attempt.
++ If the sysctl option is enabled, a sysctl option with name
++ "signal_logging" is created.
++
++config GRKERNSEC_FORKFAIL
++ bool "Fork failure logging"
++ help
++ If you say Y here, all failed fork() attempts will be logged.
++ This could suggest a fork bomb, or someone attempting to overstep
++ their process limit. If the sysctl option is enabled, a sysctl option
++ with name "forkfail_logging" is created.
++
++config GRKERNSEC_TIME
++ bool "Time change logging"
++ help
++ If you say Y here, any changes of the system clock will be logged.
++ If the sysctl option is enabled, a sysctl option with name
++ "timechange_logging" is created.
++
++config GRKERNSEC_PROC_IPADDR
++ bool "/proc/<pid>/ipaddr support"
++ help
++ If you say Y here, a new entry will be added to each /proc/<pid>
++ directory that contains the IP address of the person using the task.
++ The IP is carried across local TCP and AF_UNIX stream sockets.
++ This information can be useful for IDS/IPSes to perform remote response
++ to a local attack. The entry is readable by only the owner of the
++ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
++ the RBAC system), and thus does not create privacy concerns.
++
++config GRKERNSEC_AUDIT_TEXTREL
++ bool 'ELF text relocations logging (READ HELP)'
++ depends on PAX_MPROTECT
++ help
++ If you say Y here, text relocations will be logged with the filename
++ of the offending library or binary. The purpose of the feature is
++ to help Linux distribution developers get rid of libraries and
++ binaries that need text relocations which hinder the future progress
++ of PaX. Only Linux distribution developers should say Y here, and
++ never on a production machine, as this option creates an information
++ leak that could aid an attacker in defeating the randomization of
++ a single memory region. If the sysctl option is enabled, a sysctl
++ option with name "audit_textrel" is created.
++
++endmenu
++
++menu "Executable Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_EXECVE
++ bool "Enforce RLIMIT_NPROC on execs"
++ help
++ If you say Y here, users with a resource limit on processes will
++ have the value checked during execve() calls. The current system
++ only checks the system limit during fork() calls. If the sysctl option
++ is enabled, a sysctl option with name "execve_limiting" is created.
++
++config GRKERNSEC_DMESG
++ bool "Dmesg(8) restriction"
++ help
++ If you say Y here, non-root users will not be able to use dmesg(8)
++ to view up to the last 4kb of messages in the kernel's log buffer.
++ If the sysctl option is enabled, a sysctl option with name "dmesg" is
++ created.
++
++config GRKERNSEC_HARDEN_PTRACE
++ bool "Deter ptrace-based process snooping"
++ help
++ If you say Y here, TTY sniffers and other malicious monitoring
++ programs implemented through ptrace will be defeated. If you
++ have been using the RBAC system, this option has already been
++ enabled for several years for all users, with the ability to make
++ fine-grained exceptions.
++
++ This option only affects the ability of non-root users to ptrace
++ processes that are not a descendent of the ptracing process.
++ This means that strace ./binary and gdb ./binary will still work,
++ but attaching to arbitrary processes will not. If the sysctl
++ option is enabled, a sysctl option with name "harden_ptrace" is
++ created.
++
++config GRKERNSEC_TPE
++ bool "Trusted Path Execution (TPE)"
++ help
++ If you say Y here, you will be able to choose a gid to add to the
++ supplementary groups of users you want to mark as "untrusted."
++ These users will not be able to execute any files that are not in
++ root-owned directories writable only by root. If the sysctl option
++ is enabled, a sysctl option with name "tpe" is created.
++
++config GRKERNSEC_TPE_ALL
++ bool "Partially restrict non-root users"
++ depends on GRKERNSEC_TPE
++ help
++ If you say Y here, All non-root users other than the ones in the
++ group specified in the main TPE option will only be allowed to
++ execute files in directories they own that are not group or
++ world-writable, or in directories owned by root and writable only by
++ root. If the sysctl option is enabled, a sysctl option with name
++ "tpe_restrict_all" is created.
++
++config GRKERNSEC_TPE_INVERT
++ bool "Invert GID option"
++ depends on GRKERNSEC_TPE
++ help
++ If you say Y here, the group you specify in the TPE configuration will
++ decide what group TPE restrictions will be *disabled* for. This
++ option is useful if you want TPE restrictions to be applied to most
++ users on the system.
++
++config GRKERNSEC_TPE_GID
++ int "GID for untrusted users"
++ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
++ default 1005
++ help
++ If you have selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *disabled* for.
++ If you have not selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *enabled* for.
++ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
++ is created.
++
++config GRKERNSEC_TPE_GID
++ int "GID for trusted users"
++ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
++ default 1005
++ help
++ If you have selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *disabled* for.
++ If you have not selected the "Invert GID option" above, setting this
++ GID determines what group TPE restrictions will be *enabled* for.
++ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
++ is created.
++
++endmenu
++menu "Network Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_RANDNET
++ bool "Larger entropy pools"
++ help
++ If you say Y here, the entropy pools used for many features of Linux
++ and grsecurity will be doubled in size. Since several grsecurity
++ features use additional randomness, it is recommended that you say Y
++ here. Saying Y here has a similar effect as modifying
++ /proc/sys/kernel/random/poolsize.
++
++config GRKERNSEC_BLACKHOLE
++ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
++ help
++ If you say Y here, neither TCP resets nor ICMP
++ destination-unreachable packets will be sent in response to packets
++ sent to ports for which no associated listening process exists.
++ This feature supports both IPV4 and IPV6 and exempts the
++ loopback interface from blackholing. Enabling this feature
++ makes a host more resilient to DoS attacks and reduces network
++ visibility against scanners.
++
++ The blackhole feature as-implemented is equivalent to the FreeBSD
++ blackhole feature, as it prevents RST responses to all packets, not
++ just SYNs. Under most application behavior this causes no
++ problems, but applications (like haproxy) may not close certain
++ connections in a way that cleanly terminates them on the remote
++ end, leaving the remote host in LAST_ACK state. Because of this
++ side-effect and to prevent intentional LAST_ACK DoSes, this
++ feature also adds automatic mitigation against such attacks.
++ The mitigation drastically reduces the amount of time a socket
++ can spend in LAST_ACK state. If you're using haproxy and not
++ all servers it connects to have this option enabled, consider
++ disabling this feature on the haproxy host.
++
++ If the sysctl option is enabled, two sysctl options with names
++ "ip_blackhole" and "lastack_retries" will be created.
++ While "ip_blackhole" takes the standard zero/non-zero on/off
++ toggle, "lastack_retries" uses the same kinds of values as
++ "tcp_retries1" and "tcp_retries2". The default value of 4
++ prevents a socket from lasting more than 45 seconds in LAST_ACK
++ state.
++
++config GRKERNSEC_SOCKET
++ bool "Socket restrictions"
++ help
++ If you say Y here, you will be able to choose from several options.
++ If you assign a GID on your system and add it to the supplementary
++ groups of users you want to restrict socket access to, this patch
++ will perform up to three things, based on the option(s) you choose.
++
++config GRKERNSEC_SOCKET_ALL
++ bool "Deny any sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to connect to other hosts from your machine or run server
++ applications from your machine. If the sysctl option is enabled, a
++ sysctl option with name "socket_all" is created.
++
++config GRKERNSEC_SOCKET_ALL_GID
++ int "GID to deny all sockets for"
++ depends on GRKERNSEC_SOCKET_ALL
++ default 1004
++ help
++ Here you can choose the GID to disable socket access for. Remember to
++ add the users you want socket access disabled for to the GID
++ specified here. If the sysctl option is enabled, a sysctl option
++ with name "socket_all_gid" is created.
++
++config GRKERNSEC_SOCKET_CLIENT
++ bool "Deny client sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to connect to other hosts from your machine, but will be
++ able to run servers. If this option is enabled, all users in the group
++ you specify will have to use passive mode when initiating ftp transfers
++ from the shell on your machine. If the sysctl option is enabled, a
++ sysctl option with name "socket_client" is created.
++
++config GRKERNSEC_SOCKET_CLIENT_GID
++ int "GID to deny client sockets for"
++ depends on GRKERNSEC_SOCKET_CLIENT
++ default 1003
++ help
++ Here you can choose the GID to disable client socket access for.
++ Remember to add the users you want client socket access disabled for to
++ the GID specified here. If the sysctl option is enabled, a sysctl
++ option with name "socket_client_gid" is created.
++
++config GRKERNSEC_SOCKET_SERVER
++ bool "Deny server sockets to group"
++ depends on GRKERNSEC_SOCKET
++ help
++ If you say Y here, you will be able to choose a GID of whose users will
++ be unable to run server applications from your machine. If the sysctl
++ option is enabled, a sysctl option with name "socket_server" is created.
++
++config GRKERNSEC_SOCKET_SERVER_GID
++ int "GID to deny server sockets for"
++ depends on GRKERNSEC_SOCKET_SERVER
++ default 1002
++ help
++ Here you can choose the GID to disable server socket access for.
++ Remember to add the users you want server socket access disabled for to
++ the GID specified here. If the sysctl option is enabled, a sysctl
++ option with name "socket_server_gid" is created.
++
++endmenu
++menu "Sysctl support"
++depends on GRKERNSEC && SYSCTL
++
++config GRKERNSEC_SYSCTL
++ bool "Sysctl support"
++ help
++ If you say Y here, you will be able to change the options that
++ grsecurity runs with at bootup, without having to recompile your
++ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
++ to enable (1) or disable (0) various features. All the sysctl entries
++ are mutable until the "grsec_lock" entry is set to a non-zero value.
++ All features enabled in the kernel configuration are disabled at boot
++ if you do not say Y to the "Turn on features by default" option.
++ All options should be set at startup, and the grsec_lock entry should
++ be set to a non-zero value after all the options are set.
++ *THIS IS EXTREMELY IMPORTANT*
++
++config GRKERNSEC_SYSCTL_DISTRO
++ bool "Extra sysctl support for distro makers (READ HELP)"
++ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
++ help
++ If you say Y here, additional sysctl options will be created
++ for features that affect processes running as root. Therefore,
++ it is critical when using this option that the grsec_lock entry be
++ enabled after boot. Only distros with prebuilt kernel packages
++ with this option enabled that can ensure grsec_lock is enabled
++ after boot should use this option.
++ *Failure to set grsec_lock after boot makes all grsec features
++ this option covers useless*
++
++ Currently this option creates the following sysctl entries:
++ "Disable Privileged I/O": "disable_priv_io"
++
++config GRKERNSEC_SYSCTL_ON
++ bool "Turn on features by default"
++ depends on GRKERNSEC_SYSCTL
++ help
++ If you say Y here, instead of having all features enabled in the
++ kernel configuration disabled at boot time, the features will be
++ enabled at boot time. It is recommended you say Y here unless
++ there is some reason you would want all sysctl-tunable features to
++ be disabled by default. As mentioned elsewhere, it is important
++ to enable the grsec_lock entry once you have finished modifying
++ the sysctl entries.
++
++endmenu
++menu "Logging Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_FLOODTIME
++ int "Seconds in between log messages (minimum)"
++ default 10
++ help
++ This option allows you to enforce the number of seconds between
++ grsecurity log messages. The default should be suitable for most
++ people, however, if you choose to change it, choose a value small enough
++ to allow informative logs to be produced, but large enough to
++ prevent flooding.
++
++config GRKERNSEC_FLOODBURST
++ int "Number of messages in a burst (maximum)"
++ default 4
++ help
++ This option allows you to choose the maximum number of messages allowed
++ within the flood time interval you chose in a separate option. The
++ default should be suitable for most people, however if you find that
++ many of your logs are being interpreted as flooding, you may want to
++ raise this value.
++
++endmenu
++
++endmenu
+diff -urNp linux-2.6.32.21/grsecurity/Makefile linux-2.6.32.21/grsecurity/Makefile
+--- linux-2.6.32.21/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.21/grsecurity/Makefile 2010-09-13 08:10:10.000000000 -0400
+@@ -0,0 +1,29 @@
++# grsecurity's ACL system was originally written in 2001 by Michael Dalton
++# during 2001-2009 it has been completely redesigned by Brad Spengler
++# into an RBAC system
++#
++# All code in this directory and various hooks inserted throughout the kernel
++# are copyright Brad Spengler - Open Source Security, Inc., and released
++# under the GPL v2 or higher
++
++obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
++ grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
++ grsec_time.o grsec_tpe.o grsec_link.o grsec_textrel.o grsec_ptrace.o
++
++obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
++ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
++ gracl_learn.o grsec_log.o
++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
++
++ifndef CONFIG_GRKERNSEC
++obj-y += grsec_disabled.o
++endif
++
++ifdef CONFIG_GRKERNSEC_HIDESYM
++extra-y := grsec_hidesym.o
++$(obj)/grsec_hidesym.o:
++ @-chmod -f 500 /boot
++ @-chmod -f 500 /lib/modules
++ @-chmod -f 700 .
++ @echo ' grsec: protected kernel image paths'
++endif
diff -urNp linux-2.6.32.21/grsecurity/gracl.c linux-2.6.32.21/grsecurity/gracl.c
--- linux-2.6.32.21/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,3919 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -38844,9 +39786,118 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl.c linux-2.6.32.21/grsecurity/gracl.c
+EXPORT_SYMBOL(gr_check_group_change);
+#endif
+
+diff -urNp linux-2.6.32.21/grsecurity/gracl_alloc.c linux-2.6.32.21/grsecurity/gracl_alloc.c
+--- linux-2.6.32.21/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.21/grsecurity/gracl_alloc.c 2010-09-13 08:10:10.000000000 -0400
+@@ -0,0 +1,105 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/gracl.h>
++#include <linux/grsecurity.h>
++
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
++
++static __inline__ int
++alloc_pop(void)
++{
++ if (alloc_stack_next == 1)
++ return 0;
++
++ kfree(alloc_stack[alloc_stack_next - 2]);
++
++ alloc_stack_next--;
++
++ return 1;
++}
++
++static __inline__ int
++alloc_push(void *buf)
++{
++ if (alloc_stack_next >= alloc_stack_size)
++ return 1;
++
++ alloc_stack[alloc_stack_next - 1] = buf;
++
++ alloc_stack_next++;
++
++ return 0;
++}
++
++void *
++acl_alloc(unsigned long len)
++{
++ void *ret = NULL;
++
++ if (!len || len > PAGE_SIZE)
++ goto out;
++
++ ret = kmalloc(len, GFP_KERNEL);
++
++ if (ret) {
++ if (alloc_push(ret)) {
++ kfree(ret);
++ ret = NULL;
++ }
++ }
++
++out:
++ return ret;
++}
++
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++ if (!len || (num > (PAGE_SIZE / len)))
++ return NULL;
++
++ return acl_alloc(num * len);
++}
++
++void
++acl_free_all(void)
++{
++ if (gr_acl_is_enabled() || !alloc_stack)
++ return;
++
++ while (alloc_pop()) ;
++
++ if (alloc_stack) {
++ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++ kfree(alloc_stack);
++ else
++ vfree(alloc_stack);
++ }
++
++ alloc_stack = NULL;
++ alloc_stack_size = 1;
++ alloc_stack_next = 1;
++
++ return;
++}
++
++int
++acl_alloc_stack_init(unsigned long size)
++{
++ if ((size * sizeof (void *)) <= PAGE_SIZE)
++ alloc_stack =
++ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++ else
++ alloc_stack = (void **) vmalloc(size * sizeof (void *));
++
++ alloc_stack_size = size;
++
++ if (!alloc_stack)
++ return 0;
++ else
++ return 1;
++}
diff -urNp linux-2.6.32.21/grsecurity/gracl_cap.c linux-2.6.32.21/grsecurity/gracl_cap.c
--- linux-2.6.32.21/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_cap.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_cap.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,138 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -38988,7 +40039,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_cap.c linux-2.6.32.21/grsecurity/gra
+
diff -urNp linux-2.6.32.21/grsecurity/gracl_fs.c linux-2.6.32.21/grsecurity/gracl_fs.c
--- linux-2.6.32.21/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_fs.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_fs.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,424 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -39416,7 +40467,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_fs.c linux-2.6.32.21/grsecurity/grac
+}
diff -urNp linux-2.6.32.21/grsecurity/gracl_ip.c linux-2.6.32.21/grsecurity/gracl_ip.c
--- linux-2.6.32.21/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_ip.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_ip.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,339 @@
+#include <linux/kernel.h>
+#include <asm/uaccess.h>
@@ -39759,7 +40810,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_ip.c linux-2.6.32.21/grsecurity/grac
+}
diff -urNp linux-2.6.32.21/grsecurity/gracl_learn.c linux-2.6.32.21/grsecurity/gracl_learn.c
--- linux-2.6.32.21/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_learn.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_learn.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,211 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -39974,7 +41025,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_learn.c linux-2.6.32.21/grsecurity/g
+};
diff -urNp linux-2.6.32.21/grsecurity/gracl_res.c linux-2.6.32.21/grsecurity/gracl_res.c
--- linux-2.6.32.21/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_res.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_res.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,67 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40045,7 +41096,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_res.c linux-2.6.32.21/grsecurity/gra
+}
diff -urNp linux-2.6.32.21/grsecurity/gracl_segv.c linux-2.6.32.21/grsecurity/gracl_segv.c
--- linux-2.6.32.21/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_segv.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_segv.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,310 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -40359,7 +41410,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_segv.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/gracl_shm.c linux-2.6.32.21/grsecurity/gracl_shm.c
--- linux-2.6.32.21/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/gracl_shm.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/gracl_shm.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,40 @@
+#include <linux/kernel.h>
+#include <linux/mm.h>
@@ -40403,7 +41454,7 @@ diff -urNp linux-2.6.32.21/grsecurity/gracl_shm.c linux-2.6.32.21/grsecurity/gra
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_chdir.c linux-2.6.32.21/grsecurity/grsec_chdir.c
--- linux-2.6.32.21/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_chdir.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_chdir.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,19 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -40426,7 +41477,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_chdir.c linux-2.6.32.21/grsecurity/g
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_chroot.c linux-2.6.32.21/grsecurity/grsec_chroot.c
--- linux-2.6.32.21/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_chroot.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_chroot.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,389 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -40819,7 +41870,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_chroot.c linux-2.6.32.21/grsecurity/
+#endif
diff -urNp linux-2.6.32.21/grsecurity/grsec_disabled.c linux-2.6.32.21/grsecurity/grsec_disabled.c
--- linux-2.6.32.21/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_disabled.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_disabled.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,431 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -41254,7 +42305,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_disabled.c linux-2.6.32.21/grsecurit
+#endif
diff -urNp linux-2.6.32.21/grsecurity/grsec_exec.c linux-2.6.32.21/grsecurity/grsec_exec.c
--- linux-2.6.32.21/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_exec.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_exec.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,89 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41347,7 +42398,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_exec.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_fifo.c linux-2.6.32.21/grsecurity/grsec_fifo.c
--- linux-2.6.32.21/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_fifo.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_fifo.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,24 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41375,7 +42426,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_fifo.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_fork.c linux-2.6.32.21/grsecurity/grsec_fork.c
--- linux-2.6.32.21/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_fork.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_fork.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,15 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41394,7 +42445,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_fork.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_init.c linux-2.6.32.21/grsecurity/grsec_init.c
--- linux-2.6.32.21/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_init.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_init.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,258 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41656,7 +42707,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_init.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_link.c linux-2.6.32.21/grsecurity/grsec_link.c
--- linux-2.6.32.21/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_link.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_link.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,43 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -41703,7 +42754,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_link.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_log.c linux-2.6.32.21/grsecurity/grsec_log.c
--- linux-2.6.32.21/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_log.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_log.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,306 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42013,7 +43064,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_log.c linux-2.6.32.21/grsecurity/grs
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_mem.c linux-2.6.32.21/grsecurity/grsec_mem.c
--- linux-2.6.32.21/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_mem.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_mem.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,85 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42102,7 +43153,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_mem.c linux-2.6.32.21/grsecurity/grs
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_mount.c linux-2.6.32.21/grsecurity/grsec_mount.c
--- linux-2.6.32.21/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_mount.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_mount.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,62 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42168,7 +43219,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_mount.c linux-2.6.32.21/grsecurity/g
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_ptrace.c linux-2.6.32.21/grsecurity/grsec_ptrace.c
--- linux-2.6.32.21/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_ptrace.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_ptrace.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,14 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42186,7 +43237,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_ptrace.c linux-2.6.32.21/grsecurity/
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_sig.c linux-2.6.32.21/grsecurity/grsec_sig.c
--- linux-2.6.32.21/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_sig.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_sig.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,65 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42255,7 +43306,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_sig.c linux-2.6.32.21/grsecurity/grs
+
diff -urNp linux-2.6.32.21/grsecurity/grsec_sock.c linux-2.6.32.21/grsecurity/grsec_sock.c
--- linux-2.6.32.21/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_sock.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_sock.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,271 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
@@ -42530,7 +43581,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_sock.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_sysctl.c linux-2.6.32.21/grsecurity/grsec_sysctl.c
--- linux-2.6.32.21/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_sysctl.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_sysctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,459 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -42993,7 +44044,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_sysctl.c linux-2.6.32.21/grsecurity/
+#endif
diff -urNp linux-2.6.32.21/grsecurity/grsec_textrel.c linux-2.6.32.21/grsecurity/grsec_textrel.c
--- linux-2.6.32.21/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_textrel.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_textrel.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,16 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43013,7 +44064,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_textrel.c linux-2.6.32.21/grsecurity
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_time.c linux-2.6.32.21/grsecurity/grsec_time.c
--- linux-2.6.32.21/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_time.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_time.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,13 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43030,7 +44081,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_time.c linux-2.6.32.21/grsecurity/gr
+}
diff -urNp linux-2.6.32.21/grsecurity/grsec_tpe.c linux-2.6.32.21/grsecurity/grsec_tpe.c
--- linux-2.6.32.21/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsec_tpe.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsec_tpe.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,38 @@
+#include <linux/kernel.h>
+#include <linux/sched.h>
@@ -43072,7 +44123,7 @@ diff -urNp linux-2.6.32.21/grsecurity/grsec_tpe.c linux-2.6.32.21/grsecurity/grs
+}
diff -urNp linux-2.6.32.21/grsecurity/grsum.c linux-2.6.32.21/grsecurity/grsum.c
--- linux-2.6.32.21/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/grsum.c 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/grsecurity/grsum.c 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,61 @@
+#include <linux/err.h>
+#include <linux/kernel.h>
@@ -43135,1028 +44186,9 @@ diff -urNp linux-2.6.32.21/grsecurity/grsum.c linux-2.6.32.21/grsecurity/grsum.c
+
+ return retval;
+}
-diff -urNp linux-2.6.32.21/grsecurity/Kconfig linux-2.6.32.21/grsecurity/Kconfig
---- linux-2.6.32.21/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/Kconfig 2010-08-13 18:34:41.000000000 -0400
-@@ -0,0 +1,982 @@
-+#
-+# grecurity configuration
-+#
-+
-+menu "Grsecurity"
-+
-+config GRKERNSEC
-+ bool "Grsecurity"
-+ select CRYPTO
-+ select CRYPTO_SHA256
-+ help
-+ If you say Y here, you will be able to configure many features
-+ that will enhance the security of your system. It is highly
-+ recommended that you say Y here and read through the help
-+ for each option so that you fully understand the features and
-+ can evaluate their usefulness for your machine.
-+
-+choice
-+ prompt "Security Level"
-+ depends on GRKERNSEC
-+ default GRKERNSEC_CUSTOM
-+
-+config GRKERNSEC_LOW
-+ bool "Low"
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_CHDIR
-+
-+ help
-+ If you choose this option, several of the grsecurity options will
-+ be enabled that will give you greater protection against a number
-+ of attacks, while assuring that none of your software will have any
-+ conflicts with the additional security measures. If you run a lot
-+ of unusual software, or you are having problems with the higher
-+ security levels, you should say Y here. With this option, the
-+ following features are enabled:
-+
-+ - Linking restrictions
-+ - FIFO restrictions
-+ - Enforcing RLIMIT_NPROC on execve
-+ - Restricted dmesg
-+ - Enforced chdir("/") on chroot
-+ - Runtime module disabling
-+
-+config GRKERNSEC_MEDIUM
-+ bool "Medium"
-+ select PAX
-+ select PAX_EI_PAX
-+ select PAX_PT_PAX_FLAGS
-+ select PAX_HAVE_ACL_FLAGS
-+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_SYSCTL
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_FORKFAIL
-+ select GRKERNSEC_TIME
-+ select GRKERNSEC_SIGNAL
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_UNIX
-+ select GRKERNSEC_CHROOT_MOUNT
-+ select GRKERNSEC_CHROOT_PIVOT
-+ select GRKERNSEC_CHROOT_DOUBLE
-+ select GRKERNSEC_CHROOT_CHDIR
-+ select GRKERNSEC_CHROOT_MKNOD
-+ select GRKERNSEC_PROC
-+ select GRKERNSEC_PROC_USERGROUP
-+ select PAX_RANDUSTACK
-+ select PAX_ASLR
-+ select PAX_RANDMMAP
-+ select PAX_REFCOUNT if (X86 || SPARC64)
-+ select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB))
-+
-+ help
-+ If you say Y here, several features in addition to those included
-+ in the low additional security level will be enabled. These
-+ features provide even more security to your system, though in rare
-+ cases they may be incompatible with very old or poorly written
-+ software. If you enable this option, make sure that your auth
-+ service (identd) is running as gid 1001. With this option,
-+ the following features (in addition to those provided in the
-+ low additional security level) will be enabled:
-+
-+ - Failed fork logging
-+ - Time change logging
-+ - Signal logging
-+ - Deny mounts in chroot
-+ - Deny double chrooting
-+ - Deny sysctl writes in chroot
-+ - Deny mknod in chroot
-+ - Deny access to abstract AF_UNIX sockets out of chroot
-+ - Deny pivot_root in chroot
-+ - Denied writes of /dev/kmem, /dev/mem, and /dev/port
-+ - /proc restrictions with special GID set to 10 (usually wheel)
-+ - Address Space Layout Randomization (ASLR)
-+ - Prevent exploitation of most refcount overflows
-+ - Bounds checking of copying between the kernel and userland
-+
-+config GRKERNSEC_HIGH
-+ bool "High"
-+ select GRKERNSEC_LINK
-+ select GRKERNSEC_FIFO
-+ select GRKERNSEC_EXECVE
-+ select GRKERNSEC_DMESG
-+ select GRKERNSEC_FORKFAIL
-+ select GRKERNSEC_TIME
-+ select GRKERNSEC_SIGNAL
-+ select GRKERNSEC_CHROOT
-+ select GRKERNSEC_CHROOT_SHMAT
-+ select GRKERNSEC_CHROOT_UNIX
-+ select GRKERNSEC_CHROOT_MOUNT
-+ select GRKERNSEC_CHROOT_FCHDIR
-+ select GRKERNSEC_CHROOT_PIVOT
-+ select GRKERNSEC_CHROOT_DOUBLE
-+ select GRKERNSEC_CHROOT_CHDIR
-+ select GRKERNSEC_CHROOT_MKNOD
-+ select GRKERNSEC_CHROOT_CAPS
-+ select GRKERNSEC_CHROOT_SYSCTL
-+ select GRKERNSEC_CHROOT_FINDTASK
-+ select GRKERNSEC_PROC
-+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+ select GRKERNSEC_HIDESYM
-+ select GRKERNSEC_BRUTE
-+ select GRKERNSEC_PROC_USERGROUP
-+ select GRKERNSEC_KMEM
-+ select GRKERNSEC_RESLOG
-+ select GRKERNSEC_RANDNET
-+ select GRKERNSEC_PROC_ADD
-+ select GRKERNSEC_CHROOT_CHMOD
-+ select GRKERNSEC_CHROOT_NICE
-+ select GRKERNSEC_AUDIT_MOUNT
-+ select GRKERNSEC_MODHARDEN if (MODULES)
-+ select GRKERNSEC_HARDEN_PTRACE
-+ select GRKERNSEC_VM86 if (X86_32)
-+ select PAX
-+ select PAX_RANDUSTACK
-+ select PAX_ASLR
-+ select PAX_RANDMMAP
-+ select PAX_NOEXEC
-+ select PAX_MPROTECT
-+ select PAX_EI_PAX
-+ select PAX_PT_PAX_FLAGS
-+ select PAX_HAVE_ACL_FLAGS
-+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
-+ select PAX_MEMORY_UDEREF if (X86_32 && !XEN)
-+ select PAX_RANDKSTACK if (X86_TSC && !X86_64)
-+ select PAX_SEGMEXEC if (X86_32)
-+ select PAX_PAGEEXEC
-+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
-+ select PAX_EMUTRAMP if (PARISC)
-+ select PAX_EMUSIGRT if (PARISC)
-+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
-+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
-+ select PAX_REFCOUNT if (X86 || SPARC64)
-+ select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
-+ help
-+ If you say Y here, many of the features of grsecurity will be
-+ enabled, which will protect you against many kinds of attacks
-+ against your system. The heightened security comes at a cost
-+ of an increased chance of incompatibilities with rare software
-+ on your machine. Since this security level enables PaX, you should
-+ view <http://pax.grsecurity.net> and read about the PaX
-+ project. While you are there, download chpax and run it on
-+ binaries that cause problems with PaX. Also remember that
-+ since the /proc restrictions are enabled, you must run your
-+ identd as gid 1001. This security level enables the following
-+ features in addition to those listed in the low and medium
-+ security levels:
-+
-+ - Additional /proc restrictions
-+ - Chmod restrictions in chroot
-+ - No signals, ptrace, or viewing of processes outside of chroot
-+ - Capability restrictions in chroot
-+ - Deny fchdir out of chroot
-+ - Priority restrictions in chroot
-+ - Segmentation-based implementation of PaX
-+ - Mprotect restrictions
-+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
-+ - Kernel stack randomization
-+ - Mount/unmount/remount logging
-+ - Kernel symbol hiding
-+ - Prevention of memory exhaustion-based exploits
-+ - Hardening of module auto-loading
-+ - Ptrace restrictions
-+ - Restricted vm86 mode
-+
-+config GRKERNSEC_CUSTOM
-+ bool "Custom"
-+ help
-+ If you say Y here, you will be able to configure every grsecurity
-+ option, which allows you to enable many more features that aren't
-+ covered in the basic security levels. These additional features
-+ include TPE, socket restrictions, and the sysctl system for
-+ grsecurity. It is advised that you read through the help for
-+ each option to determine its usefulness in your situation.
-+
-+endchoice
-+
-+menu "Address Space Protection"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_KMEM
-+ bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
-+ help
-+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+ be written to via mmap or otherwise to modify the running kernel.
-+ /dev/port will also not be allowed to be opened. If you have module
-+ support disabled, enabling this will close up four ways that are
-+ currently used to insert malicious code into the running kernel.
-+ Even with all these features enabled, we still highly recommend that
-+ you use the RBAC system, as it is still possible for an attacker to
-+ modify the running kernel through privileged I/O granted by ioperm/iopl.
-+ If you are not using XFree86, you may be able to stop this additional
-+ case by enabling the 'Disable privileged I/O' option. Though nothing
-+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
-+ but only to video memory, which is the only writing we allow in this
-+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
-+ not be allowed to mprotect it with PROT_WRITE later.
-+ It is highly recommended that you say Y here if you meet all the
-+ conditions above.
-+
-+config GRKERNSEC_VM86
-+ bool "Restrict VM86 mode"
-+ depends on X86_32
-+
-+ help
-+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
-+ make use of a special execution mode on 32bit x86 processors called
-+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
-+ video cards and will still work with this option enabled. The purpose
-+ of the option is to prevent exploitation of emulation errors in
-+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
-+ Nearly all users should be able to enable this option.
-+
-+config GRKERNSEC_IO
-+ bool "Disable privileged I/O"
-+ depends on X86
-+ select RTC_CLASS
-+ select RTC_INTF_DEV
-+ select RTC_DRV_CMOS
-+
-+ help
-+ If you say Y here, all ioperm and iopl calls will return an error.
-+ Ioperm and iopl can be used to modify the running kernel.
-+ Unfortunately, some programs need this access to operate properly,
-+ the most notable of which are XFree86 and hwclock. hwclock can be
-+ remedied by having RTC support in the kernel, so real-time
-+ clock support is enabled if this option is enabled, to ensure
-+ that hwclock operates correctly. XFree86 still will not
-+ operate correctly with this option enabled, so DO NOT CHOOSE Y
-+ IF YOU USE XFree86. If you use XFree86 and you still want to
-+ protect your kernel against modification, use the RBAC system.
-+
-+config GRKERNSEC_PROC_MEMMAP
-+ bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
-+ default y if (PAX_NOEXEC || PAX_ASLR)
-+ depends on PAX_NOEXEC || PAX_ASLR
-+ help
-+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
-+ give no information about the addresses of its mappings if
-+ PaX features that rely on random addresses are enabled on the task.
-+ If you use PaX it is greatly recommended that you say Y here as it
-+ closes up a hole that makes the full ASLR useless for suid
-+ binaries.
-+
-+config GRKERNSEC_BRUTE
-+ bool "Deter exploit bruteforcing"
-+ help
-+ If you say Y here, attempts to bruteforce exploits against forking
-+ daemons such as apache or sshd will be deterred. When a child of a
-+ forking daemon is killed by PaX or crashes due to an illegal
-+ instruction, the parent process will be delayed 30 seconds upon every
-+ subsequent fork until the administrator is able to assess the
-+ situation and restart the daemon. It is recommended that you also
-+ enable signal logging in the auditing section so that logs are
-+ generated when a process performs an illegal instruction.
-+
-+config GRKERNSEC_MODHARDEN
-+ bool "Harden module auto-loading"
-+ depends on MODULES
-+ help
-+ If you say Y here, module auto-loading in response to use of some
-+ feature implemented by an unloaded module will be restricted to
-+ root users. Enabling this option helps defend against attacks
-+ by unprivileged users who abuse the auto-loading behavior to
-+ cause a vulnerable module to load that is then exploited.
-+
-+ If this option prevents a legitimate use of auto-loading for a
-+ non-root user, the administrator can execute modprobe manually
-+ with the exact name of the module mentioned in the alert log.
-+ Alternatively, the administrator can add the module to the list
-+ of modules loaded at boot by modifying init scripts.
-+
-+ Modification of init scripts will most likely be needed on
-+ Ubuntu servers with encrypted home directory support enabled,
-+ as the first non-root user logging in will cause the ecb(aes),
-+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
-+
-+config GRKERNSEC_HIDESYM
-+ bool "Hide kernel symbols"
-+ help
-+ If you say Y here, getting information on loaded modules, and
-+ displaying all kernel symbols through a syscall will be restricted
-+ to users with CAP_SYS_MODULE. For software compatibility reasons,
-+ /proc/kallsyms will be restricted to the root user. The RBAC
-+ system can hide that entry even from root. Note that this option
-+ is only effective provided the following conditions are met:
-+ 1) The kernel using grsecurity is not precompiled by some distribution
-+ 2) You are using the RBAC system and hiding other files such as your
-+ kernel image and System.map. Alternatively, enabling this option
-+ causes the permissions on /boot, /lib/modules, and the kernel
-+ source directory to change at compile time to prevent
-+ reading by non-root users.
-+ If the above conditions are met, this option will aid in providing a
-+ useful protection against local kernel exploitation of overflows
-+ and arbitrary read/write vulnerabilities.
-+
-+endmenu
-+menu "Role Based Access Control Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_NO_RBAC
-+ bool "Disable RBAC system"
-+ help
-+ If you say Y here, the /dev/grsec device will be removed from the kernel,
-+ preventing the RBAC system from being enabled. You should only say Y
-+ here if you have no intention of using the RBAC system, so as to prevent
-+ an attacker with root access from misusing the RBAC system to hide files
-+ and processes when loadable module support and /dev/[k]mem have been
-+ locked down.
-+
-+config GRKERNSEC_ACL_HIDEKERN
-+ bool "Hide kernel processes"
-+ help
-+ If you say Y here, all kernel threads will be hidden to all
-+ processes but those whose subject has the "view hidden processes"
-+ flag.
-+
-+config GRKERNSEC_ACL_MAXTRIES
-+ int "Maximum tries before password lockout"
-+ default 3
-+ help
-+ This option enforces the maximum number of times a user can attempt
-+ to authorize themselves with the grsecurity RBAC system before being
-+ denied the ability to attempt authorization again for a specified time.
-+ The lower the number, the harder it will be to brute-force a password.
-+
-+config GRKERNSEC_ACL_TIMEOUT
-+ int "Time to wait after max password tries, in seconds"
-+ default 30
-+ help
-+ This option specifies the time the user must wait after attempting to
-+ authorize to the RBAC system with the maximum number of invalid
-+ passwords. The higher the number, the harder it will be to brute-force
-+ a password.
-+
-+endmenu
-+menu "Filesystem Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_PROC
-+ bool "Proc restrictions"
-+ help
-+ If you say Y here, the permissions of the /proc filesystem
-+ will be altered to enhance system security and privacy. You MUST
-+ choose either a user only restriction or a user and group restriction.
-+ Depending upon the option you choose, you can either restrict users to
-+ see only the processes they themselves run, or choose a group that can
-+ view all processes and files normally restricted to root if you choose
-+ the "restrict to user only" option. NOTE: If you're running identd as
-+ a non-root user, you will have to run it as the group you specify here.
-+
-+config GRKERNSEC_PROC_USER
-+ bool "Restrict /proc to user only"
-+ depends on GRKERNSEC_PROC
-+ help
-+ If you say Y here, non-root users will only be able to view their own
-+ processes, and restricts them from viewing network-related information,
-+ and viewing kernel symbol and module information.
-+
-+config GRKERNSEC_PROC_USERGROUP
-+ bool "Allow special group"
-+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
-+ help
-+ If you say Y here, you will be able to select a group that will be
-+ able to view all processes, network-related information, and
-+ kernel and symbol information. This option is useful if you want
-+ to run identd as a non-root user.
-+
-+config GRKERNSEC_PROC_GID
-+ int "GID for special group"
-+ depends on GRKERNSEC_PROC_USERGROUP
-+ default 1001
-+
-+config GRKERNSEC_PROC_ADD
-+ bool "Additional restrictions"
-+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
-+ help
-+ If you say Y here, additional restrictions will be placed on
-+ /proc that keep normal users from viewing device information and
-+ slabinfo information that could be useful for exploits.
-+
-+config GRKERNSEC_LINK
-+ bool "Linking restrictions"
-+ help
-+ If you say Y here, /tmp race exploits will be prevented, since users
-+ will no longer be able to follow symlinks owned by other users in
-+ world-writable +t directories (i.e. /tmp), unless the owner of the
-+ symlink is the owner of the directory. users will also not be
-+ able to hardlink to files they do not own. If the sysctl option is
-+ enabled, a sysctl option with name "linking_restrictions" is created.
-+
-+config GRKERNSEC_FIFO
-+ bool "FIFO restrictions"
-+ help
-+ If you say Y here, users will not be able to write to FIFOs they don't
-+ own in world-writable +t directories (i.e. /tmp), unless the owner of
-+ the FIFO is the same owner of the directory it's held in. If the sysctl
-+ option is enabled, a sysctl option with name "fifo_restrictions" is
-+ created.
-+
-+config GRKERNSEC_ROFS
-+ bool "Runtime read-only mount protection"
-+ help
-+ If you say Y here, a sysctl option with name "romount_protect" will
-+ be created. By setting this option to 1 at runtime, filesystems
-+ will be protected in the following ways:
-+ * No new writable mounts will be allowed
-+ * Existing read-only mounts won't be able to be remounted read/write
-+ * Write operations will be denied on all block devices
-+ This option acts independently of grsec_lock: once it is set to 1,
-+ it cannot be turned off. Therefore, please be mindful of the resulting
-+ behavior if this option is enabled in an init script on a read-only
-+ filesystem. This feature is mainly intended for secure embedded systems.
-+
-+config GRKERNSEC_CHROOT
-+ bool "Chroot jail restrictions"
-+ help
-+ If you say Y here, you will be able to choose several options that will
-+ make breaking out of a chrooted jail much more difficult. If you
-+ encounter no software incompatibilities with the following options, it
-+ is recommended that you enable each one.
-+
-+config GRKERNSEC_CHROOT_MOUNT
-+ bool "Deny mounts"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ mount or remount filesystems. If the sysctl option is enabled, a
-+ sysctl option with name "chroot_deny_mount" is created.
-+
-+config GRKERNSEC_CHROOT_DOUBLE
-+ bool "Deny double-chroots"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to chroot
-+ again outside the chroot. This is a widely used method of breaking
-+ out of a chroot jail and should not be allowed. If the sysctl
-+ option is enabled, a sysctl option with name
-+ "chroot_deny_chroot" is created.
-+
-+config GRKERNSEC_CHROOT_PIVOT
-+ bool "Deny pivot_root in chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to use
-+ a function called pivot_root() that was introduced in Linux 2.3.41. It
-+ works similar to chroot in that it changes the root filesystem. This
-+ function could be misused in a chrooted process to attempt to break out
-+ of the chroot, and therefore should not be allowed. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_CHDIR
-+ bool "Enforce chdir(\"/\") on all chroots"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, the current working directory of all newly-chrooted
-+ applications will be set to the the root directory of the chroot.
-+ The man page on chroot(2) states:
-+ Note that this call does not change the current working
-+ directory, so that `.' can be outside the tree rooted at
-+ `/'. In particular, the super-user can escape from a
-+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
-+
-+ It is recommended that you say Y here, since it's not known to break
-+ any software. If the sysctl option is enabled, a sysctl option with
-+ name "chroot_enforce_chdir" is created.
-+
-+config GRKERNSEC_CHROOT_CHMOD
-+ bool "Deny (f)chmod +s"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to chmod
-+ or fchmod files to make them have suid or sgid bits. This protects
-+ against another published method of breaking a chroot. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_FCHDIR
-+ bool "Deny fchdir out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
-+ to a file descriptor of the chrooting process that points to a directory
-+ outside the filesystem will be stopped. If the sysctl option
-+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
-+
-+config GRKERNSEC_CHROOT_MKNOD
-+ bool "Deny mknod"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be allowed to
-+ mknod. The problem with using mknod inside a chroot is that it
-+ would allow an attacker to create a device entry that is the same
-+ as one on the physical root of your system, which could range from
-+ anything from the console device to a device for your harddrive (which
-+ they could then use to wipe the drive or steal data). It is recommended
-+ that you say Y here, unless you run into software incompatibilities.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "chroot_deny_mknod" is created.
-+
-+config GRKERNSEC_CHROOT_SHMAT
-+ bool "Deny shmat() out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to attach
-+ to shared memory segments that were created outside of the chroot jail.
-+ It is recommended that you say Y here. If the sysctl option is enabled,
-+ a sysctl option with name "chroot_deny_shmat" is created.
-+
-+config GRKERNSEC_CHROOT_UNIX
-+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ connect to abstract (meaning not belonging to a filesystem) Unix
-+ domain sockets that were bound outside of a chroot. It is recommended
-+ that you say Y here. If the sysctl option is enabled, a sysctl option
-+ with name "chroot_deny_unix" is created.
-+
-+config GRKERNSEC_CHROOT_FINDTASK
-+ bool "Protect outside processes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to
-+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
-+ getsid, or view any process outside of the chroot. If the sysctl
-+ option is enabled, a sysctl option with name "chroot_findtask" is
-+ created.
-+
-+config GRKERNSEC_CHROOT_NICE
-+ bool "Restrict priority changes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, processes inside a chroot will not be able to raise
-+ the priority of processes in the chroot, or alter the priority of
-+ processes outside the chroot. This provides more security than simply
-+ removing CAP_SYS_NICE from the process' capability set. If the
-+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
-+ is created.
-+
-+config GRKERNSEC_CHROOT_SYSCTL
-+ bool "Deny sysctl writes"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, an attacker in a chroot will not be able to
-+ write to sysctl entries, either by sysctl(2) or through a /proc
-+ interface. It is strongly recommended that you say Y here. If the
-+ sysctl option is enabled, a sysctl option with name
-+ "chroot_deny_sysctl" is created.
-+
-+config GRKERNSEC_CHROOT_CAPS
-+ bool "Capability restrictions"
-+ depends on GRKERNSEC_CHROOT
-+ help
-+ If you say Y here, the capabilities on all root processes within a
-+ chroot jail will be lowered to stop module insertion, raw i/o,
-+ system and net admin tasks, rebooting the system, modifying immutable
-+ files, modifying IPC owned by another, and changing the system time.
-+ This is left an option because it can break some apps. Disable this
-+ if your chrooted apps are having problems performing those kinds of
-+ tasks. If the sysctl option is enabled, a sysctl option with
-+ name "chroot_caps" is created.
-+
-+endmenu
-+menu "Kernel Auditing"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_AUDIT_GROUP
-+ bool "Single group for auditing"
-+ help
-+ If you say Y here, the exec, chdir, and (un)mount logging features
-+ will only operate on a group you specify. This option is recommended
-+ if you only want to watch certain users instead of having a large
-+ amount of logs from the entire system. If the sysctl option is enabled,
-+ a sysctl option with name "audit_group" is created.
-+
-+config GRKERNSEC_AUDIT_GID
-+ int "GID for auditing"
-+ depends on GRKERNSEC_AUDIT_GROUP
-+ default 1007
-+
-+config GRKERNSEC_EXECLOG
-+ bool "Exec logging"
-+ help
-+ If you say Y here, all execve() calls will be logged (since the
-+ other exec*() calls are frontends to execve(), all execution
-+ will be logged). Useful for shell-servers that like to keep track
-+ of their users. If the sysctl option is enabled, a sysctl option with
-+ name "exec_logging" is created.
-+ WARNING: This option when enabled will produce a LOT of logs, especially
-+ on an active system.
-+
-+config GRKERNSEC_RESLOG
-+ bool "Resource logging"
-+ help
-+ If you say Y here, all attempts to overstep resource limits will
-+ be logged with the resource name, the requested size, and the current
-+ limit. It is highly recommended that you say Y here. If the sysctl
-+ option is enabled, a sysctl option with name "resource_logging" is
-+ created. If the RBAC system is enabled, the sysctl value is ignored.
-+
-+config GRKERNSEC_CHROOT_EXECLOG
-+ bool "Log execs within chroot"
-+ help
-+ If you say Y here, all executions inside a chroot jail will be logged
-+ to syslog. This can cause a large amount of logs if certain
-+ applications (eg. djb's daemontools) are installed on the system, and
-+ is therefore left as an option. If the sysctl option is enabled, a
-+ sysctl option with name "chroot_execlog" is created.
-+
-+config GRKERNSEC_AUDIT_PTRACE
-+ bool "Ptrace logging"
-+ help
-+ If you say Y here, all attempts to attach to a process via ptrace
-+ will be logged. If the sysctl option is enabled, a sysctl option
-+ with name "audit_ptrace" is created.
-+
-+config GRKERNSEC_AUDIT_CHDIR
-+ bool "Chdir logging"
-+ help
-+ If you say Y here, all chdir() calls will be logged. If the sysctl
-+ option is enabled, a sysctl option with name "audit_chdir" is created.
-+
-+config GRKERNSEC_AUDIT_MOUNT
-+ bool "(Un)Mount logging"
-+ help
-+ If you say Y here, all mounts and unmounts will be logged. If the
-+ sysctl option is enabled, a sysctl option with name "audit_mount" is
-+ created.
-+
-+config GRKERNSEC_SIGNAL
-+ bool "Signal logging"
-+ help
-+ If you say Y here, certain important signals will be logged, such as
-+ SIGSEGV, which will as a result inform you of when a error in a program
-+ occurred, which in some cases could mean a possible exploit attempt.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "signal_logging" is created.
-+
-+config GRKERNSEC_FORKFAIL
-+ bool "Fork failure logging"
-+ help
-+ If you say Y here, all failed fork() attempts will be logged.
-+ This could suggest a fork bomb, or someone attempting to overstep
-+ their process limit. If the sysctl option is enabled, a sysctl option
-+ with name "forkfail_logging" is created.
-+
-+config GRKERNSEC_TIME
-+ bool "Time change logging"
-+ help
-+ If you say Y here, any changes of the system clock will be logged.
-+ If the sysctl option is enabled, a sysctl option with name
-+ "timechange_logging" is created.
-+
-+config GRKERNSEC_PROC_IPADDR
-+ bool "/proc/<pid>/ipaddr support"
-+ help
-+ If you say Y here, a new entry will be added to each /proc/<pid>
-+ directory that contains the IP address of the person using the task.
-+ The IP is carried across local TCP and AF_UNIX stream sockets.
-+ This information can be useful for IDS/IPSes to perform remote response
-+ to a local attack. The entry is readable by only the owner of the
-+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
-+ the RBAC system), and thus does not create privacy concerns.
-+
-+config GRKERNSEC_AUDIT_TEXTREL
-+ bool 'ELF text relocations logging (READ HELP)'
-+ depends on PAX_MPROTECT
-+ help
-+ If you say Y here, text relocations will be logged with the filename
-+ of the offending library or binary. The purpose of the feature is
-+ to help Linux distribution developers get rid of libraries and
-+ binaries that need text relocations which hinder the future progress
-+ of PaX. Only Linux distribution developers should say Y here, and
-+ never on a production machine, as this option creates an information
-+ leak that could aid an attacker in defeating the randomization of
-+ a single memory region. If the sysctl option is enabled, a sysctl
-+ option with name "audit_textrel" is created.
-+
-+endmenu
-+
-+menu "Executable Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_EXECVE
-+ bool "Enforce RLIMIT_NPROC on execs"
-+ help
-+ If you say Y here, users with a resource limit on processes will
-+ have the value checked during execve() calls. The current system
-+ only checks the system limit during fork() calls. If the sysctl option
-+ is enabled, a sysctl option with name "execve_limiting" is created.
-+
-+config GRKERNSEC_DMESG
-+ bool "Dmesg(8) restriction"
-+ help
-+ If you say Y here, non-root users will not be able to use dmesg(8)
-+ to view up to the last 4kb of messages in the kernel's log buffer.
-+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
-+ created.
-+
-+config GRKERNSEC_HARDEN_PTRACE
-+ bool "Deter ptrace-based process snooping"
-+ help
-+ If you say Y here, TTY sniffers and other malicious monitoring
-+ programs implemented through ptrace will be defeated. If you
-+ have been using the RBAC system, this option has already been
-+ enabled for several years for all users, with the ability to make
-+ fine-grained exceptions.
-+
-+ This option only affects the ability of non-root users to ptrace
-+ processes that are not a descendent of the ptracing process.
-+ This means that strace ./binary and gdb ./binary will still work,
-+ but attaching to arbitrary processes will not. If the sysctl
-+ option is enabled, a sysctl option with name "harden_ptrace" is
-+ created.
-+
-+config GRKERNSEC_TPE
-+ bool "Trusted Path Execution (TPE)"
-+ help
-+ If you say Y here, you will be able to choose a gid to add to the
-+ supplementary groups of users you want to mark as "untrusted."
-+ These users will not be able to execute any files that are not in
-+ root-owned directories writable only by root. If the sysctl option
-+ is enabled, a sysctl option with name "tpe" is created.
-+
-+config GRKERNSEC_TPE_ALL
-+ bool "Partially restrict non-root users"
-+ depends on GRKERNSEC_TPE
-+ help
-+ If you say Y here, All non-root users other than the ones in the
-+ group specified in the main TPE option will only be allowed to
-+ execute files in directories they own that are not group or
-+ world-writable, or in directories owned by root and writable only by
-+ root. If the sysctl option is enabled, a sysctl option with name
-+ "tpe_restrict_all" is created.
-+
-+config GRKERNSEC_TPE_INVERT
-+ bool "Invert GID option"
-+ depends on GRKERNSEC_TPE
-+ help
-+ If you say Y here, the group you specify in the TPE configuration will
-+ decide what group TPE restrictions will be *disabled* for. This
-+ option is useful if you want TPE restrictions to be applied to most
-+ users on the system.
-+
-+config GRKERNSEC_TPE_GID
-+ int "GID for untrusted users"
-+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
-+ default 1005
-+ help
-+ If you have selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *disabled* for.
-+ If you have not selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *enabled* for.
-+ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+ is created.
-+
-+config GRKERNSEC_TPE_GID
-+ int "GID for trusted users"
-+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
-+ default 1005
-+ help
-+ If you have selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *disabled* for.
-+ If you have not selected the "Invert GID option" above, setting this
-+ GID determines what group TPE restrictions will be *enabled* for.
-+ If the sysctl option is enabled, a sysctl option with name "tpe_gid"
-+ is created.
-+
-+endmenu
-+menu "Network Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_RANDNET
-+ bool "Larger entropy pools"
-+ help
-+ If you say Y here, the entropy pools used for many features of Linux
-+ and grsecurity will be doubled in size. Since several grsecurity
-+ features use additional randomness, it is recommended that you say Y
-+ here. Saying Y here has a similar effect as modifying
-+ /proc/sys/kernel/random/poolsize.
-+
-+config GRKERNSEC_BLACKHOLE
-+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
-+ help
-+ If you say Y here, neither TCP resets nor ICMP
-+ destination-unreachable packets will be sent in response to packets
-+ sent to ports for which no associated listening process exists.
-+ This feature supports both IPV4 and IPV6 and exempts the
-+ loopback interface from blackholing. Enabling this feature
-+ makes a host more resilient to DoS attacks and reduces network
-+ visibility against scanners.
-+
-+ The blackhole feature as-implemented is equivalent to the FreeBSD
-+ blackhole feature, as it prevents RST responses to all packets, not
-+ just SYNs. Under most application behavior this causes no
-+ problems, but applications (like haproxy) may not close certain
-+ connections in a way that cleanly terminates them on the remote
-+ end, leaving the remote host in LAST_ACK state. Because of this
-+ side-effect and to prevent intentional LAST_ACK DoSes, this
-+ feature also adds automatic mitigation against such attacks.
-+ The mitigation drastically reduces the amount of time a socket
-+ can spend in LAST_ACK state. If you're using haproxy and not
-+ all servers it connects to have this option enabled, consider
-+ disabling this feature on the haproxy host.
-+
-+ If the sysctl option is enabled, two sysctl options with names
-+ "ip_blackhole" and "lastack_retries" will be created.
-+ While "ip_blackhole" takes the standard zero/non-zero on/off
-+ toggle, "lastack_retries" uses the same kinds of values as
-+ "tcp_retries1" and "tcp_retries2". The default value of 4
-+ prevents a socket from lasting more than 45 seconds in LAST_ACK
-+ state.
-+
-+config GRKERNSEC_SOCKET
-+ bool "Socket restrictions"
-+ help
-+ If you say Y here, you will be able to choose from several options.
-+ If you assign a GID on your system and add it to the supplementary
-+ groups of users you want to restrict socket access to, this patch
-+ will perform up to three things, based on the option(s) you choose.
-+
-+config GRKERNSEC_SOCKET_ALL
-+ bool "Deny any sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to connect to other hosts from your machine or run server
-+ applications from your machine. If the sysctl option is enabled, a
-+ sysctl option with name "socket_all" is created.
-+
-+config GRKERNSEC_SOCKET_ALL_GID
-+ int "GID to deny all sockets for"
-+ depends on GRKERNSEC_SOCKET_ALL
-+ default 1004
-+ help
-+ Here you can choose the GID to disable socket access for. Remember to
-+ add the users you want socket access disabled for to the GID
-+ specified here. If the sysctl option is enabled, a sysctl option
-+ with name "socket_all_gid" is created.
-+
-+config GRKERNSEC_SOCKET_CLIENT
-+ bool "Deny client sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to connect to other hosts from your machine, but will be
-+ able to run servers. If this option is enabled, all users in the group
-+ you specify will have to use passive mode when initiating ftp transfers
-+ from the shell on your machine. If the sysctl option is enabled, a
-+ sysctl option with name "socket_client" is created.
-+
-+config GRKERNSEC_SOCKET_CLIENT_GID
-+ int "GID to deny client sockets for"
-+ depends on GRKERNSEC_SOCKET_CLIENT
-+ default 1003
-+ help
-+ Here you can choose the GID to disable client socket access for.
-+ Remember to add the users you want client socket access disabled for to
-+ the GID specified here. If the sysctl option is enabled, a sysctl
-+ option with name "socket_client_gid" is created.
-+
-+config GRKERNSEC_SOCKET_SERVER
-+ bool "Deny server sockets to group"
-+ depends on GRKERNSEC_SOCKET
-+ help
-+ If you say Y here, you will be able to choose a GID of whose users will
-+ be unable to run server applications from your machine. If the sysctl
-+ option is enabled, a sysctl option with name "socket_server" is created.
-+
-+config GRKERNSEC_SOCKET_SERVER_GID
-+ int "GID to deny server sockets for"
-+ depends on GRKERNSEC_SOCKET_SERVER
-+ default 1002
-+ help
-+ Here you can choose the GID to disable server socket access for.
-+ Remember to add the users you want server socket access disabled for to
-+ the GID specified here. If the sysctl option is enabled, a sysctl
-+ option with name "socket_server_gid" is created.
-+
-+endmenu
-+menu "Sysctl support"
-+depends on GRKERNSEC && SYSCTL
-+
-+config GRKERNSEC_SYSCTL
-+ bool "Sysctl support"
-+ help
-+ If you say Y here, you will be able to change the options that
-+ grsecurity runs with at bootup, without having to recompile your
-+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
-+ to enable (1) or disable (0) various features. All the sysctl entries
-+ are mutable until the "grsec_lock" entry is set to a non-zero value.
-+ All features enabled in the kernel configuration are disabled at boot
-+ if you do not say Y to the "Turn on features by default" option.
-+ All options should be set at startup, and the grsec_lock entry should
-+ be set to a non-zero value after all the options are set.
-+ *THIS IS EXTREMELY IMPORTANT*
-+
-+config GRKERNSEC_SYSCTL_DISTRO
-+ bool "Extra sysctl support for distro makers (READ HELP)"
-+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
-+ help
-+ If you say Y here, additional sysctl options will be created
-+ for features that affect processes running as root. Therefore,
-+ it is critical when using this option that the grsec_lock entry be
-+ enabled after boot. Only distros with prebuilt kernel packages
-+ with this option enabled that can ensure grsec_lock is enabled
-+ after boot should use this option.
-+ *Failure to set grsec_lock after boot makes all grsec features
-+ this option covers useless*
-+
-+ Currently this option creates the following sysctl entries:
-+ "Disable Privileged I/O": "disable_priv_io"
-+
-+config GRKERNSEC_SYSCTL_ON
-+ bool "Turn on features by default"
-+ depends on GRKERNSEC_SYSCTL
-+ help
-+ If you say Y here, instead of having all features enabled in the
-+ kernel configuration disabled at boot time, the features will be
-+ enabled at boot time. It is recommended you say Y here unless
-+ there is some reason you would want all sysctl-tunable features to
-+ be disabled by default. As mentioned elsewhere, it is important
-+ to enable the grsec_lock entry once you have finished modifying
-+ the sysctl entries.
-+
-+endmenu
-+menu "Logging Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_FLOODTIME
-+ int "Seconds in between log messages (minimum)"
-+ default 10
-+ help
-+ This option allows you to enforce the number of seconds between
-+ grsecurity log messages. The default should be suitable for most
-+ people, however, if you choose to change it, choose a value small enough
-+ to allow informative logs to be produced, but large enough to
-+ prevent flooding.
-+
-+config GRKERNSEC_FLOODBURST
-+ int "Number of messages in a burst (maximum)"
-+ default 4
-+ help
-+ This option allows you to choose the maximum number of messages allowed
-+ within the flood time interval you chose in a separate option. The
-+ default should be suitable for most people, however if you find that
-+ many of your logs are being interpreted as flooding, you may want to
-+ raise this value.
-+
-+endmenu
-+
-+endmenu
-diff -urNp linux-2.6.32.21/grsecurity/Makefile linux-2.6.32.21/grsecurity/Makefile
---- linux-2.6.32.21/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/grsecurity/Makefile 2010-08-13 18:34:41.000000000 -0400
-@@ -0,0 +1,29 @@
-+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
-+# during 2001-2009 it has been completely redesigned by Brad Spengler
-+# into an RBAC system
-+#
-+# All code in this directory and various hooks inserted throughout the kernel
-+# are copyright Brad Spengler - Open Source Security, Inc., and released
-+# under the GPL v2 or higher
-+
-+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
-+ grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
-+ grsec_time.o grsec_tpe.o grsec_link.o grsec_textrel.o grsec_ptrace.o
-+
-+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
-+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
-+ gracl_learn.o grsec_log.o
-+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
-+
-+ifndef CONFIG_GRKERNSEC
-+obj-y += grsec_disabled.o
-+endif
-+
-+ifdef CONFIG_GRKERNSEC_HIDESYM
-+extra-y := grsec_hidesym.o
-+$(obj)/grsec_hidesym.o:
-+ @-chmod -f 500 /boot
-+ @-chmod -f 500 /lib/modules
-+ @-chmod -f 700 .
-+ @echo ' grsec: protected kernel image paths'
-+endif
diff -urNp linux-2.6.32.21/include/acpi/acoutput.h linux-2.6.32.21/include/acpi/acoutput.h
---- linux-2.6.32.21/include/acpi/acoutput.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/acpi/acoutput.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/acpi/acoutput.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/acpi/acoutput.h 2010-09-13 08:10:10.000000000 -0400
@@ -264,8 +264,8 @@
* leaving no executable debug code!
*/
@@ -44169,8 +44201,8 @@ diff -urNp linux-2.6.32.21/include/acpi/acoutput.h linux-2.6.32.21/include/acpi/
#endif /* ACPI_DEBUG_OUTPUT */
diff -urNp linux-2.6.32.21/include/acpi/acpi_drivers.h linux-2.6.32.21/include/acpi/acpi_drivers.h
---- linux-2.6.32.21/include/acpi/acpi_drivers.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/acpi/acpi_drivers.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/acpi/acpi_drivers.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/acpi/acpi_drivers.h 2010-09-13 08:10:10.000000000 -0400
@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
Dock Station
-------------------------------------------------------------------------- */
@@ -44201,8 +44233,8 @@ diff -urNp linux-2.6.32.21/include/acpi/acpi_drivers.h linux-2.6.32.21/include/a
{
return -ENODEV;
diff -urNp linux-2.6.32.21/include/asm-generic/atomic-long.h linux-2.6.32.21/include/asm-generic/atomic-long.h
---- linux-2.6.32.21/include/asm-generic/atomic-long.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/atomic-long.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/atomic-long.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/atomic-long.h 2010-09-13 08:10:10.000000000 -0400
@@ -22,6 +22,12 @@
typedef atomic64_t atomic_long_t;
@@ -44421,7 +44453,7 @@ diff -urNp linux-2.6.32.21/include/asm-generic/atomic-long.h linux-2.6.32.21/inc
static inline long atomic_long_dec_return(atomic_long_t *l)
{
atomic_t *v = (atomic_t *)l;
-@@ -255,4 +375,35 @@ static inline long atomic_long_add_unles
+@@ -255,4 +375,37 @@ static inline long atomic_long_add_unles
#endif /* BITS_PER_LONG == 64 */
@@ -44433,6 +44465,7 @@ diff -urNp linux-2.6.32.21/include/asm-generic/atomic-long.h linux-2.6.32.21/inc
+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
++ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
+
+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
@@ -44447,6 +44480,7 @@ diff -urNp linux-2.6.32.21/include/asm-generic/atomic-long.h linux-2.6.32.21/inc
+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
+#define atomic_inc_unchecked(v) atomic_inc(v)
++#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
+
+#define atomic_long_read_unchecked(v) atomic_long_read(v)
+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
@@ -44458,8 +44492,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/atomic-long.h linux-2.6.32.21/inc
+
#endif /* _ASM_GENERIC_ATOMIC_LONG_H */
diff -urNp linux-2.6.32.21/include/asm-generic/dma-mapping-common.h linux-2.6.32.21/include/asm-generic/dma-mapping-common.h
---- linux-2.6.32.21/include/asm-generic/dma-mapping-common.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/dma-mapping-common.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/dma-mapping-common.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/dma-mapping-common.h 2010-09-13 08:10:10.000000000 -0400
@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
enum dma_data_direction dir,
struct dma_attrs *attrs)
@@ -44569,8 +44603,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/dma-mapping-common.h linux-2.6.32
BUG_ON(!valid_dma_direction(dir));
if (ops->sync_sg_for_device)
diff -urNp linux-2.6.32.21/include/asm-generic/futex.h linux-2.6.32.21/include/asm-generic/futex.h
---- linux-2.6.32.21/include/asm-generic/futex.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/futex.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/futex.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/futex.h 2010-09-13 08:10:10.000000000 -0400
@@ -6,7 +6,7 @@
#include <asm/errno.h>
@@ -44590,8 +44624,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/futex.h linux-2.6.32.21/include/a
return -ENOSYS;
}
diff -urNp linux-2.6.32.21/include/asm-generic/int-l64.h linux-2.6.32.21/include/asm-generic/int-l64.h
---- linux-2.6.32.21/include/asm-generic/int-l64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/int-l64.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/int-l64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/int-l64.h 2010-09-13 08:10:10.000000000 -0400
@@ -46,6 +46,8 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
@@ -44602,8 +44636,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/int-l64.h linux-2.6.32.21/include
#define U8_C(x) x ## U
#define S16_C(x) x
diff -urNp linux-2.6.32.21/include/asm-generic/int-ll64.h linux-2.6.32.21/include/asm-generic/int-ll64.h
---- linux-2.6.32.21/include/asm-generic/int-ll64.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/int-ll64.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/int-ll64.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/int-ll64.h 2010-09-13 08:10:10.000000000 -0400
@@ -51,6 +51,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
@@ -44614,8 +44648,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/int-ll64.h linux-2.6.32.21/includ
#define U8_C(x) x ## U
#define S16_C(x) x
diff -urNp linux-2.6.32.21/include/asm-generic/kmap_types.h linux-2.6.32.21/include/asm-generic/kmap_types.h
---- linux-2.6.32.21/include/asm-generic/kmap_types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/kmap_types.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/kmap_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/kmap_types.h 2010-09-13 08:10:10.000000000 -0400
@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
KMAP_D(16) KM_IRQ_PTE,
KMAP_D(17) KM_NMI,
@@ -44626,27 +44660,9 @@ diff -urNp linux-2.6.32.21/include/asm-generic/kmap_types.h linux-2.6.32.21/incl
};
#undef KMAP_D
-diff -urNp linux-2.6.32.21/include/asm-generic/pgtable.h linux-2.6.32.21/include/asm-generic/pgtable.h
---- linux-2.6.32.21/include/asm-generic/pgtable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/pgtable.h 2010-08-13 18:34:41.000000000 -0400
-@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
- unsigned long size);
- #endif
-
-+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
-+static inline unsigned long pax_open_kernel(void) { return 0; }
-+#endif
-+
-+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
-+static inline unsigned long pax_close_kernel(void) { return 0; }
-+#endif
-+
- #endif /* !__ASSEMBLY__ */
-
- #endif /* _ASM_GENERIC_PGTABLE_H */
diff -urNp linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h
---- linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h 2010-09-13 08:10:10.000000000 -0400
@@ -1,14 +1,19 @@
#ifndef _PGTABLE_NOPMD_H
#define _PGTABLE_NOPMD_H
@@ -44684,8 +44700,8 @@ diff -urNp linux-2.6.32.21/include/asm-generic/pgtable-nopmd.h linux-2.6.32.21/i
* The "pud_xxx()" functions here are trivial for a folded two-level
* setup: the pmd is never bad, and a pmd always exists (as it's folded
diff -urNp linux-2.6.32.21/include/asm-generic/pgtable-nopud.h linux-2.6.32.21/include/asm-generic/pgtable-nopud.h
---- linux-2.6.32.21/include/asm-generic/pgtable-nopud.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/pgtable-nopud.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/pgtable-nopud.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/pgtable-nopud.h 2010-09-13 08:10:10.000000000 -0400
@@ -1,10 +1,15 @@
#ifndef _PGTABLE_NOPUD_H
#define _PGTABLE_NOPUD_H
@@ -44716,9 +44732,27 @@ diff -urNp linux-2.6.32.21/include/asm-generic/pgtable-nopud.h linux-2.6.32.21/i
/*
* The "pgd_xxx()" functions here are trivial for a folded two-level
* setup: the pud is never bad, and a pud always exists (as it's folded
+diff -urNp linux-2.6.32.21/include/asm-generic/pgtable.h linux-2.6.32.21/include/asm-generic/pgtable.h
+--- linux-2.6.32.21/include/asm-generic/pgtable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/pgtable.h 2010-09-13 08:10:10.000000000 -0400
+@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
+ unsigned long size);
+ #endif
+
++#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
++static inline unsigned long pax_open_kernel(void) { return 0; }
++#endif
++
++#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
++static inline unsigned long pax_close_kernel(void) { return 0; }
++#endif
++
+ #endif /* !__ASSEMBLY__ */
+
+ #endif /* _ASM_GENERIC_PGTABLE_H */
diff -urNp linux-2.6.32.21/include/asm-generic/vmlinux.lds.h linux-2.6.32.21/include/asm-generic/vmlinux.lds.h
---- linux-2.6.32.21/include/asm-generic/vmlinux.lds.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/asm-generic/vmlinux.lds.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/asm-generic/vmlinux.lds.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/asm-generic/vmlinux.lds.h 2010-09-13 08:10:10.000000000 -0400
@@ -199,6 +199,7 @@
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start_rodata) = .; \
@@ -44757,9 +44791,39 @@ diff -urNp linux-2.6.32.21/include/asm-generic/vmlinux.lds.h linux-2.6.32.21/inc
/**
* PERCPU - define output section for percpu area, simple version
+diff -urNp linux-2.6.32.21/include/drm/drmP.h linux-2.6.32.21/include/drm/drmP.h
+--- linux-2.6.32.21/include/drm/drmP.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/drm/drmP.h 2010-09-13 08:10:10.000000000 -0400
+@@ -814,7 +814,7 @@ struct drm_driver {
+ void (*vgaarb_irq)(struct drm_device *dev, bool state);
+
+ /* Driver private ops for this object */
+- struct vm_operations_struct *gem_vm_ops;
++ const struct vm_operations_struct *gem_vm_ops;
+
+ int major;
+ int minor;
+@@ -917,7 +917,7 @@ struct drm_device {
+
+ /** \name Usage Counters */
+ /*@{ */
+- int open_count; /**< Outstanding files open */
++ atomic_t open_count; /**< Outstanding files open */
+ atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
+ atomic_t vma_count; /**< Outstanding vma areas open */
+ int buf_use; /**< Buffers in use -- cannot alloc */
+@@ -928,7 +928,7 @@ struct drm_device {
+ /*@{ */
+ unsigned long counters;
+ enum drm_stat_type types[15];
+- atomic_t counts[15];
++ atomic_unchecked_t counts[15];
+ /*@} */
+
+ struct list_head filelist;
diff -urNp linux-2.6.32.21/include/drm/drm_pciids.h linux-2.6.32.21/include/drm/drm_pciids.h
---- linux-2.6.32.21/include/drm/drm_pciids.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/drm/drm_pciids.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/drm/drm_pciids.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/drm/drm_pciids.h 2010-09-13 08:10:10.000000000 -0400
@@ -377,7 +377,7 @@
{0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
{0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
@@ -44863,39 +44927,9 @@ diff -urNp linux-2.6.32.21/include/drm/drm_pciids.h linux-2.6.32.21/include/drm/
{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.32.21/include/drm/drmP.h linux-2.6.32.21/include/drm/drmP.h
---- linux-2.6.32.21/include/drm/drmP.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/drm/drmP.h 2010-08-13 18:34:41.000000000 -0400
-@@ -814,7 +814,7 @@ struct drm_driver {
- void (*vgaarb_irq)(struct drm_device *dev, bool state);
-
- /* Driver private ops for this object */
-- struct vm_operations_struct *gem_vm_ops;
-+ const struct vm_operations_struct *gem_vm_ops;
-
- int major;
- int minor;
-@@ -917,7 +917,7 @@ struct drm_device {
-
- /** \name Usage Counters */
- /*@{ */
-- int open_count; /**< Outstanding files open */
-+ atomic_t open_count; /**< Outstanding files open */
- atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
- atomic_t vma_count; /**< Outstanding vma areas open */
- int buf_use; /**< Buffers in use -- cannot alloc */
-@@ -928,7 +928,7 @@ struct drm_device {
- /*@{ */
- unsigned long counters;
- enum drm_stat_type types[15];
-- atomic_t counts[15];
-+ atomic_unchecked_t counts[15];
- /*@} */
-
- struct list_head filelist;
diff -urNp linux-2.6.32.21/include/linux/a.out.h linux-2.6.32.21/include/linux/a.out.h
---- linux-2.6.32.21/include/linux/a.out.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/a.out.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/a.out.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/a.out.h 2010-09-13 08:10:10.000000000 -0400
@@ -39,6 +39,14 @@ enum machine_type {
M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
};
@@ -44912,8 +44946,8 @@ diff -urNp linux-2.6.32.21/include/linux/a.out.h linux-2.6.32.21/include/linux/a
#define N_MAGIC(exec) ((exec).a_info & 0xffff)
#endif
diff -urNp linux-2.6.32.21/include/linux/atmdev.h linux-2.6.32.21/include/linux/atmdev.h
---- linux-2.6.32.21/include/linux/atmdev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/atmdev.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/atmdev.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/atmdev.h 2010-09-13 08:10:10.000000000 -0400
@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
#endif
@@ -44924,8 +44958,8 @@ diff -urNp linux-2.6.32.21/include/linux/atmdev.h linux-2.6.32.21/include/linux/
#undef __HANDLE_ITEM
};
diff -urNp linux-2.6.32.21/include/linux/backlight.h linux-2.6.32.21/include/linux/backlight.h
---- linux-2.6.32.21/include/linux/backlight.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/backlight.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/backlight.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/backlight.h 2010-09-13 08:10:10.000000000 -0400
@@ -36,18 +36,18 @@ struct backlight_device;
struct fb_info;
@@ -44968,8 +45002,8 @@ diff -urNp linux-2.6.32.21/include/linux/backlight.h linux-2.6.32.21/include/lin
extern void backlight_force_update(struct backlight_device *bd,
enum backlight_update_reason reason);
diff -urNp linux-2.6.32.21/include/linux/binfmts.h linux-2.6.32.21/include/linux/binfmts.h
---- linux-2.6.32.21/include/linux/binfmts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/binfmts.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/binfmts.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/binfmts.h 2010-09-13 08:10:10.000000000 -0400
@@ -78,6 +78,7 @@ struct linux_binfmt {
int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
int (*load_shlib)(struct file *);
@@ -44979,8 +45013,8 @@ diff -urNp linux-2.6.32.21/include/linux/binfmts.h linux-2.6.32.21/include/linux
int hasvdso;
};
diff -urNp linux-2.6.32.21/include/linux/blkdev.h linux-2.6.32.21/include/linux/blkdev.h
---- linux-2.6.32.21/include/linux/blkdev.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/blkdev.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/blkdev.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/blkdev.h 2010-09-13 08:10:10.000000000 -0400
@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
#endif /* CONFIG_BLK_DEV_INTEGRITY */
@@ -45013,8 +45047,8 @@ diff -urNp linux-2.6.32.21/include/linux/blkdev.h linux-2.6.32.21/include/linux/
extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
diff -urNp linux-2.6.32.21/include/linux/cache.h linux-2.6.32.21/include/linux/cache.h
---- linux-2.6.32.21/include/linux/cache.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/cache.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/cache.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/cache.h 2010-09-13 08:10:10.000000000 -0400
@@ -16,6 +16,10 @@
#define __read_mostly
#endif
@@ -45027,8 +45061,8 @@ diff -urNp linux-2.6.32.21/include/linux/cache.h linux-2.6.32.21/include/linux/c
#define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
#endif
diff -urNp linux-2.6.32.21/include/linux/capability.h linux-2.6.32.21/include/linux/capability.h
---- linux-2.6.32.21/include/linux/capability.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/capability.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/capability.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/capability.h 2010-09-13 08:10:10.000000000 -0400
@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
(security_real_capable_noaudit((t), (cap)) == 0)
@@ -45038,8 +45072,8 @@ diff -urNp linux-2.6.32.21/include/linux/capability.h linux-2.6.32.21/include/li
/* audit system wants to get cap info from files as well */
struct dentry;
diff -urNp linux-2.6.32.21/include/linux/compiler-gcc4.h linux-2.6.32.21/include/linux/compiler-gcc4.h
---- linux-2.6.32.21/include/linux/compiler-gcc4.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/compiler-gcc4.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/compiler-gcc4.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/compiler-gcc4.h 2010-09-13 08:10:10.000000000 -0400
@@ -36,4 +36,8 @@
the kernel context */
#define __cold __attribute__((__cold__))
@@ -45050,8 +45084,8 @@ diff -urNp linux-2.6.32.21/include/linux/compiler-gcc4.h linux-2.6.32.21/include
+#define __bos1(ptr) __bos((ptr), 1)
#endif
diff -urNp linux-2.6.32.21/include/linux/compiler.h linux-2.6.32.21/include/linux/compiler.h
---- linux-2.6.32.21/include/linux/compiler.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/compiler.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/compiler.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/compiler.h 2010-09-13 08:10:10.000000000 -0400
@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
#define __cold
#endif
@@ -45076,8 +45110,8 @@ diff -urNp linux-2.6.32.21/include/linux/compiler.h linux-2.6.32.21/include/linu
#ifndef __section
# define __section(S) __attribute__ ((__section__(#S)))
diff -urNp linux-2.6.32.21/include/linux/decompress/mm.h linux-2.6.32.21/include/linux/decompress/mm.h
---- linux-2.6.32.21/include/linux/decompress/mm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/decompress/mm.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/decompress/mm.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/decompress/mm.h 2010-09-13 08:10:10.000000000 -0400
@@ -78,7 +78,7 @@ static void free(void *where)
* warnings when not needed (indeed large_malloc / large_free are not
* needed by inflate */
@@ -45088,8 +45122,8 @@ diff -urNp linux-2.6.32.21/include/linux/decompress/mm.h linux-2.6.32.21/include
#define large_malloc(a) vmalloc(a)
diff -urNp linux-2.6.32.21/include/linux/dma-mapping.h linux-2.6.32.21/include/linux/dma-mapping.h
---- linux-2.6.32.21/include/linux/dma-mapping.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/dma-mapping.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/dma-mapping.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/dma-mapping.h 2010-09-13 08:10:10.000000000 -0400
@@ -16,50 +16,50 @@ enum dma_data_direction {
};
@@ -45157,8 +45191,8 @@ diff -urNp linux-2.6.32.21/include/linux/dma-mapping.h linux-2.6.32.21/include/l
#define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
diff -urNp linux-2.6.32.21/include/linux/dst.h linux-2.6.32.21/include/linux/dst.h
---- linux-2.6.32.21/include/linux/dst.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/dst.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/dst.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/dst.h 2010-09-13 08:10:10.000000000 -0400
@@ -380,7 +380,7 @@ struct dst_node
struct thread_pool *pool;
@@ -45169,8 +45203,8 @@ diff -urNp linux-2.6.32.21/include/linux/dst.h linux-2.6.32.21/include/linux/dst
/*
* How frequently and how many times transaction
diff -urNp linux-2.6.32.21/include/linux/elf.h linux-2.6.32.21/include/linux/elf.h
---- linux-2.6.32.21/include/linux/elf.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/elf.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/elf.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/elf.h 2010-09-13 08:10:10.000000000 -0400
@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
#define PT_GNU_EH_FRAME 0x6474e550
@@ -45244,8 +45278,8 @@ diff -urNp linux-2.6.32.21/include/linux/elf.h linux-2.6.32.21/include/linux/elf
#endif
diff -urNp linux-2.6.32.21/include/linux/fs.h linux-2.6.32.21/include/linux/fs.h
---- linux-2.6.32.21/include/linux/fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/fs.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/fs.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/fs.h 2010-09-13 08:10:10.000000000 -0400
@@ -90,6 +90,11 @@ struct inodes_stat_t {
/* Expect random access pattern */
#define FMODE_RANDOM ((__force fmode_t)4096)
@@ -45408,8 +45442,8 @@ diff -urNp linux-2.6.32.21/include/linux/fs.h linux-2.6.32.21/include/linux/fs.h
/*
diff -urNp linux-2.6.32.21/include/linux/fs_struct.h linux-2.6.32.21/include/linux/fs_struct.h
---- linux-2.6.32.21/include/linux/fs_struct.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/fs_struct.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/fs_struct.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/fs_struct.h 2010-09-13 08:10:10.000000000 -0400
@@ -4,7 +4,7 @@
#include <linux/path.h>
@@ -45420,8 +45454,8 @@ diff -urNp linux-2.6.32.21/include/linux/fs_struct.h linux-2.6.32.21/include/lin
int umask;
int in_exec;
diff -urNp linux-2.6.32.21/include/linux/genhd.h linux-2.6.32.21/include/linux/genhd.h
---- linux-2.6.32.21/include/linux/genhd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/genhd.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/genhd.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/genhd.h 2010-09-13 08:10:10.000000000 -0400
@@ -161,7 +161,7 @@ struct gendisk {
struct timer_rand_state *random;
@@ -45433,7 +45467,7 @@ diff -urNp linux-2.6.32.21/include/linux/genhd.h linux-2.6.32.21/include/linux/g
struct blk_integrity *integrity;
diff -urNp linux-2.6.32.21/include/linux/gracl.h linux-2.6.32.21/include/linux/gracl.h
--- linux-2.6.32.21/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/gracl.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/gracl.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,310 @@
+#ifndef GR_ACL_H
+#define GR_ACL_H
@@ -45747,7 +45781,7 @@ diff -urNp linux-2.6.32.21/include/linux/gracl.h linux-2.6.32.21/include/linux/g
+
diff -urNp linux-2.6.32.21/include/linux/gralloc.h linux-2.6.32.21/include/linux/gralloc.h
--- linux-2.6.32.21/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/gralloc.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/gralloc.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,9 @@
+#ifndef __GRALLOC_H
+#define __GRALLOC_H
@@ -45760,7 +45794,7 @@ diff -urNp linux-2.6.32.21/include/linux/gralloc.h linux-2.6.32.21/include/linux
+#endif
diff -urNp linux-2.6.32.21/include/linux/grdefs.h linux-2.6.32.21/include/linux/grdefs.h
--- linux-2.6.32.21/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/grdefs.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/grdefs.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,136 @@
+#ifndef GRDEFS_H
+#define GRDEFS_H
@@ -45900,7 +45934,7 @@ diff -urNp linux-2.6.32.21/include/linux/grdefs.h linux-2.6.32.21/include/linux/
+#endif
diff -urNp linux-2.6.32.21/include/linux/grinternal.h linux-2.6.32.21/include/linux/grinternal.h
--- linux-2.6.32.21/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/grinternal.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/grinternal.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,211 @@
+#ifndef __GRINTERNAL_H
+#define __GRINTERNAL_H
@@ -46115,7 +46149,7 @@ diff -urNp linux-2.6.32.21/include/linux/grinternal.h linux-2.6.32.21/include/li
+#endif
diff -urNp linux-2.6.32.21/include/linux/grmsg.h linux-2.6.32.21/include/linux/grmsg.h
--- linux-2.6.32.21/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/grmsg.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/grmsg.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,108 @@
+#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -46227,7 +46261,7 @@ diff -urNp linux-2.6.32.21/include/linux/grmsg.h linux-2.6.32.21/include/linux/g
+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
diff -urNp linux-2.6.32.21/include/linux/grsecurity.h linux-2.6.32.21/include/linux/grsecurity.h
--- linux-2.6.32.21/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/include/linux/grsecurity.h 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/include/linux/grsecurity.h 2010-09-13 08:10:10.000000000 -0400
@@ -0,0 +1,203 @@
+#ifndef GR_SECURITY_H
+#define GR_SECURITY_H
@@ -46433,8 +46467,8 @@ diff -urNp linux-2.6.32.21/include/linux/grsecurity.h linux-2.6.32.21/include/li
+
+#endif
diff -urNp linux-2.6.32.21/include/linux/hdpu_features.h linux-2.6.32.21/include/linux/hdpu_features.h
---- linux-2.6.32.21/include/linux/hdpu_features.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/hdpu_features.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/hdpu_features.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/hdpu_features.h 2010-09-13 08:10:10.000000000 -0400
@@ -3,7 +3,7 @@
struct cpustate_t {
spinlock_t lock;
@@ -46445,8 +46479,8 @@ diff -urNp linux-2.6.32.21/include/linux/hdpu_features.h linux-2.6.32.21/include
int inited;
unsigned long *set_addr;
diff -urNp linux-2.6.32.21/include/linux/highmem.h linux-2.6.32.21/include/linux/highmem.h
---- linux-2.6.32.21/include/linux/highmem.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/highmem.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/highmem.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/highmem.h 2010-09-13 08:10:10.000000000 -0400
@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
kunmap_atomic(kaddr, KM_USER0);
}
@@ -46467,8 +46501,8 @@ diff -urNp linux-2.6.32.21/include/linux/highmem.h linux-2.6.32.21/include/linux
unsigned start1, unsigned end1,
unsigned start2, unsigned end2)
diff -urNp linux-2.6.32.21/include/linux/interrupt.h linux-2.6.32.21/include/linux/interrupt.h
---- linux-2.6.32.21/include/linux/interrupt.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/interrupt.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/interrupt.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/interrupt.h 2010-09-13 08:10:10.000000000 -0400
@@ -362,7 +362,7 @@ enum
/* map softirq index to softirq name. update 'softirq_to_name' in
* kernel/softirq.c when adding a new softirq.
@@ -46493,10 +46527,10 @@ diff -urNp linux-2.6.32.21/include/linux/interrupt.h linux-2.6.32.21/include/lin
extern void softirq_init(void);
#define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
extern void raise_softirq_irqoff(unsigned int nr);
-diff -urNp linux-2.6.32.21/include/linux/jbd2.h linux-2.6.32.21/include/linux/jbd2.h
---- linux-2.6.32.21/include/linux/jbd2.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/jbd2.h 2010-08-13 18:34:41.000000000 -0400
-@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
+diff -urNp linux-2.6.32.21/include/linux/jbd.h linux-2.6.32.21/include/linux/jbd.h
+--- linux-2.6.32.21/include/linux/jbd.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/jbd.h 2010-09-13 08:10:10.000000000 -0400
+@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
} \
} while (0)
#else
@@ -46504,11 +46538,11 @@ diff -urNp linux-2.6.32.21/include/linux/jbd2.h linux-2.6.32.21/include/linux/jb
+#define jbd_debug(f, a...) do {} while (0)
#endif
- static inline void *jbd2_alloc(size_t size, gfp_t flags)
-diff -urNp linux-2.6.32.21/include/linux/jbd.h linux-2.6.32.21/include/linux/jbd.h
---- linux-2.6.32.21/include/linux/jbd.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/jbd.h 2010-08-13 18:34:41.000000000 -0400
-@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
+ static inline void *jbd_alloc(size_t size, gfp_t flags)
+diff -urNp linux-2.6.32.21/include/linux/jbd2.h linux-2.6.32.21/include/linux/jbd2.h
+--- linux-2.6.32.21/include/linux/jbd2.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/jbd2.h 2010-09-13 08:10:10.000000000 -0400
+@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
} \
} while (0)
#else
@@ -46516,10 +46550,10 @@ diff -urNp linux-2.6.32.21/include/linux/jbd.h linux-2.6.32.21/include/linux/jbd
+#define jbd_debug(f, a...) do {} while (0)
#endif
- static inline void *jbd_alloc(size_t size, gfp_t flags)
+ static inline void *jbd2_alloc(size_t size, gfp_t flags)
diff -urNp linux-2.6.32.21/include/linux/kallsyms.h linux-2.6.32.21/include/linux/kallsyms.h
---- linux-2.6.32.21/include/linux/kallsyms.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/kallsyms.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/kallsyms.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/kallsyms.h 2010-09-13 08:10:10.000000000 -0400
@@ -15,7 +15,8 @@
struct module;
@@ -46541,8 +46575,8 @@ diff -urNp linux-2.6.32.21/include/linux/kallsyms.h linux-2.6.32.21/include/linu
/* This macro allows us to keep printk typechecking */
static void __check_printsym_format(const char *fmt, ...)
diff -urNp linux-2.6.32.21/include/linux/kgdb.h linux-2.6.32.21/include/linux/kgdb.h
---- linux-2.6.32.21/include/linux/kgdb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/kgdb.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/kgdb.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/kgdb.h 2010-09-13 08:10:10.000000000 -0400
@@ -251,20 +251,20 @@ struct kgdb_arch {
*/
struct kgdb_io {
@@ -46574,8 +46608,8 @@ diff -urNp linux-2.6.32.21/include/linux/kgdb.h linux-2.6.32.21/include/linux/kg
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.32.21/include/linux/kobject.h linux-2.6.32.21/include/linux/kobject.h
---- linux-2.6.32.21/include/linux/kobject.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/kobject.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/kobject.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/kobject.h 2010-09-13 08:10:10.000000000 -0400
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
struct kobj_type {
@@ -46625,8 +46659,8 @@ diff -urNp linux-2.6.32.21/include/linux/kobject.h linux-2.6.32.21/include/linux
static inline struct kset *to_kset(struct kobject *kobj)
diff -urNp linux-2.6.32.21/include/linux/kvm_host.h linux-2.6.32.21/include/linux/kvm_host.h
---- linux-2.6.32.21/include/linux/kvm_host.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/kvm_host.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/kvm_host.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/kvm_host.h 2010-09-13 08:10:10.000000000 -0400
@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
void vcpu_load(struct kvm_vcpu *vcpu);
void vcpu_put(struct kvm_vcpu *vcpu);
@@ -46646,8 +46680,8 @@ diff -urNp linux-2.6.32.21/include/linux/kvm_host.h linux-2.6.32.21/include/linu
int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
diff -urNp linux-2.6.32.21/include/linux/libata.h linux-2.6.32.21/include/linux/libata.h
---- linux-2.6.32.21/include/linux/libata.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/libata.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/libata.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/libata.h 2010-09-13 08:10:10.000000000 -0400
@@ -64,11 +64,11 @@
#ifdef ATA_VERBOSE_DEBUG
#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
@@ -46714,8 +46748,8 @@ diff -urNp linux-2.6.32.21/include/linux/libata.h linux-2.6.32.21/include/linux/
extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
diff -urNp linux-2.6.32.21/include/linux/lockd/bind.h linux-2.6.32.21/include/linux/lockd/bind.h
---- linux-2.6.32.21/include/linux/lockd/bind.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/lockd/bind.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/lockd/bind.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/lockd/bind.h 2010-09-13 08:10:10.000000000 -0400
@@ -23,13 +23,13 @@ struct svc_rqst;
* This is the set of functions for lockd->nfsd communication
*/
@@ -46734,8 +46768,8 @@ diff -urNp linux-2.6.32.21/include/linux/lockd/bind.h linux-2.6.32.21/include/li
/*
* Similar to nfs_client_initdata, but without the NFS-specific
diff -urNp linux-2.6.32.21/include/linux/mm.h linux-2.6.32.21/include/linux/mm.h
---- linux-2.6.32.21/include/linux/mm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/mm.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/mm.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/mm.h 2010-09-13 08:10:10.000000000 -0400
@@ -102,7 +102,14 @@ extern unsigned int kobjsize(const void
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
@@ -46803,8 +46837,8 @@ diff -urNp linux-2.6.32.21/include/linux/mm.h linux-2.6.32.21/include/linux/mm.h
#endif /* __KERNEL__ */
#endif /* _LINUX_MM_H */
diff -urNp linux-2.6.32.21/include/linux/mm_types.h linux-2.6.32.21/include/linux/mm_types.h
---- linux-2.6.32.21/include/linux/mm_types.h 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/include/linux/mm_types.h 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/include/linux/mm_types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/mm_types.h 2010-09-13 08:10:10.000000000 -0400
@@ -186,6 +186,8 @@ struct vm_area_struct {
#ifdef CONFIG_NUMA
struct mempolicy *vm_policy; /* NUMA policy for the VMA */
@@ -46840,8 +46874,8 @@ diff -urNp linux-2.6.32.21/include/linux/mm_types.h linux-2.6.32.21/include/linu
/* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
diff -urNp linux-2.6.32.21/include/linux/mmu_notifier.h linux-2.6.32.21/include/linux/mmu_notifier.h
---- linux-2.6.32.21/include/linux/mmu_notifier.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/mmu_notifier.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/mmu_notifier.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/mmu_notifier.h 2010-09-13 08:10:10.000000000 -0400
@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
*/
#define ptep_clear_flush_notify(__vma, __address, __ptep) \
@@ -46859,8 +46893,8 @@ diff -urNp linux-2.6.32.21/include/linux/mmu_notifier.h linux-2.6.32.21/include/
#define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
diff -urNp linux-2.6.32.21/include/linux/mmzone.h linux-2.6.32.21/include/linux/mmzone.h
---- linux-2.6.32.21/include/linux/mmzone.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/mmzone.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/mmzone.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/mmzone.h 2010-09-13 08:10:10.000000000 -0400
@@ -343,7 +343,7 @@ struct zone {
unsigned long flags; /* zone flags, see below */
@@ -46871,8 +46905,8 @@ diff -urNp linux-2.6.32.21/include/linux/mmzone.h linux-2.6.32.21/include/linux/
/*
* prev_priority holds the scanning priority for this zone. It is
diff -urNp linux-2.6.32.21/include/linux/mod_devicetable.h linux-2.6.32.21/include/linux/mod_devicetable.h
---- linux-2.6.32.21/include/linux/mod_devicetable.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/mod_devicetable.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/mod_devicetable.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/mod_devicetable.h 2010-09-13 08:10:10.000000000 -0400
@@ -12,7 +12,7 @@
typedef unsigned long kernel_ulong_t;
#endif
@@ -46892,8 +46926,8 @@ diff -urNp linux-2.6.32.21/include/linux/mod_devicetable.h linux-2.6.32.21/inclu
struct hid_device_id {
__u16 bus;
diff -urNp linux-2.6.32.21/include/linux/module.h linux-2.6.32.21/include/linux/module.h
---- linux-2.6.32.21/include/linux/module.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/module.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/module.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/module.h 2010-09-13 08:10:10.000000000 -0400
@@ -287,16 +287,16 @@ struct module
int (*init)(void);
@@ -46967,8 +47001,8 @@ diff -urNp linux-2.6.32.21/include/linux/module.h linux-2.6.32.21/include/linux/
/* Search for module by name: must hold module_mutex. */
diff -urNp linux-2.6.32.21/include/linux/moduleloader.h linux-2.6.32.21/include/linux/moduleloader.h
---- linux-2.6.32.21/include/linux/moduleloader.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/moduleloader.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/moduleloader.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/moduleloader.h 2010-09-13 08:10:10.000000000 -0400
@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
sections. Returns NULL on failure. */
void *module_alloc(unsigned long size);
@@ -46992,8 +47026,8 @@ diff -urNp linux-2.6.32.21/include/linux/moduleloader.h linux-2.6.32.21/include/
or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
diff -urNp linux-2.6.32.21/include/linux/namei.h linux-2.6.32.21/include/linux/namei.h
---- linux-2.6.32.21/include/linux/namei.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/namei.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/namei.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/namei.h 2010-09-13 08:10:10.000000000 -0400
@@ -22,7 +22,7 @@ struct nameidata {
unsigned int flags;
int last_type;
@@ -47019,8 +47053,8 @@ diff -urNp linux-2.6.32.21/include/linux/namei.h linux-2.6.32.21/include/linux/n
return nd->saved_names[nd->depth];
}
diff -urNp linux-2.6.32.21/include/linux/nodemask.h linux-2.6.32.21/include/linux/nodemask.h
---- linux-2.6.32.21/include/linux/nodemask.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/nodemask.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/nodemask.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/nodemask.h 2010-09-13 08:10:10.000000000 -0400
@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
#define any_online_node(mask) \
@@ -47038,8 +47072,8 @@ diff -urNp linux-2.6.32.21/include/linux/nodemask.h linux-2.6.32.21/include/linu
#define num_online_nodes() num_node_state(N_ONLINE)
diff -urNp linux-2.6.32.21/include/linux/oprofile.h linux-2.6.32.21/include/linux/oprofile.h
---- linux-2.6.32.21/include/linux/oprofile.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/oprofile.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/oprofile.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/oprofile.h 2010-09-13 08:10:10.000000000 -0400
@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
char const * name, ulong * val);
@@ -47053,8 +47087,8 @@ diff -urNp linux-2.6.32.21/include/linux/oprofile.h linux-2.6.32.21/include/linu
/** create a directory */
struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
diff -urNp linux-2.6.32.21/include/linux/pipe_fs_i.h linux-2.6.32.21/include/linux/pipe_fs_i.h
---- linux-2.6.32.21/include/linux/pipe_fs_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/pipe_fs_i.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/pipe_fs_i.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/pipe_fs_i.h 2010-09-13 08:10:10.000000000 -0400
@@ -46,9 +46,9 @@ struct pipe_inode_info {
wait_queue_head_t wait;
unsigned int nrbufs, curbuf;
@@ -47069,8 +47103,8 @@ diff -urNp linux-2.6.32.21/include/linux/pipe_fs_i.h linux-2.6.32.21/include/lin
unsigned int w_counter;
struct fasync_struct *fasync_readers;
diff -urNp linux-2.6.32.21/include/linux/poison.h linux-2.6.32.21/include/linux/poison.h
---- linux-2.6.32.21/include/linux/poison.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/poison.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/poison.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/poison.h 2010-09-13 08:10:10.000000000 -0400
@@ -19,8 +19,8 @@
* under normal circumstances, used to verify that nobody uses
* non-initialized list entries.
@@ -47083,8 +47117,8 @@ diff -urNp linux-2.6.32.21/include/linux/poison.h linux-2.6.32.21/include/linux/
/********** include/linux/timer.h **********/
/*
diff -urNp linux-2.6.32.21/include/linux/proc_fs.h linux-2.6.32.21/include/linux/proc_fs.h
---- linux-2.6.32.21/include/linux/proc_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/proc_fs.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/proc_fs.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/proc_fs.h 2010-09-13 08:10:10.000000000 -0400
@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
return proc_create_data(name, mode, parent, proc_fops, NULL);
}
@@ -47106,8 +47140,8 @@ diff -urNp linux-2.6.32.21/include/linux/proc_fs.h linux-2.6.32.21/include/linux
mode_t mode, struct proc_dir_entry *base,
read_proc_t *read_proc, void * data)
diff -urNp linux-2.6.32.21/include/linux/random.h linux-2.6.32.21/include/linux/random.h
---- linux-2.6.32.21/include/linux/random.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/random.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/random.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/random.h 2010-09-13 08:10:10.000000000 -0400
@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
u32 random32(void);
void srandom32(u32 seed);
@@ -47121,8 +47155,8 @@ diff -urNp linux-2.6.32.21/include/linux/random.h linux-2.6.32.21/include/linux/
#endif /* _LINUX_RANDOM_H */
diff -urNp linux-2.6.32.21/include/linux/reiserfs_fs.h linux-2.6.32.21/include/linux/reiserfs_fs.h
---- linux-2.6.32.21/include/linux/reiserfs_fs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/reiserfs_fs.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/reiserfs_fs.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/reiserfs_fs.h 2010-09-13 08:10:10.000000000 -0400
@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
#define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
@@ -47170,8 +47204,8 @@ diff -urNp linux-2.6.32.21/include/linux/reiserfs_fs.h linux-2.6.32.21/include/l
#define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
#define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
diff -urNp linux-2.6.32.21/include/linux/reiserfs_fs_sb.h linux-2.6.32.21/include/linux/reiserfs_fs_sb.h
---- linux-2.6.32.21/include/linux/reiserfs_fs_sb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/reiserfs_fs_sb.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/reiserfs_fs_sb.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/reiserfs_fs_sb.h 2010-09-13 08:10:10.000000000 -0400
@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
/* Comment? -Hans */
wait_queue_head_t s_wait;
@@ -47182,8 +47216,8 @@ diff -urNp linux-2.6.32.21/include/linux/reiserfs_fs_sb.h linux-2.6.32.21/includ
unsigned long s_properties; /* File system properties. Currently holds
on-disk FS format */
diff -urNp linux-2.6.32.21/include/linux/sched.h linux-2.6.32.21/include/linux/sched.h
---- linux-2.6.32.21/include/linux/sched.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/sched.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/sched.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/sched.h 2010-09-13 08:10:10.000000000 -0400
@@ -101,6 +101,7 @@ struct bio;
struct fs_struct;
struct bts_context;
@@ -47400,8 +47434,8 @@ diff -urNp linux-2.6.32.21/include/linux/sched.h linux-2.6.32.21/include/linux/s
#ifdef CONFIG_DEBUG_STACK_USAGE
diff -urNp linux-2.6.32.21/include/linux/screen_info.h linux-2.6.32.21/include/linux/screen_info.h
---- linux-2.6.32.21/include/linux/screen_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/screen_info.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/screen_info.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/screen_info.h 2010-09-13 08:10:10.000000000 -0400
@@ -42,7 +42,8 @@ struct screen_info {
__u16 pages; /* 0x32 */
__u16 vesa_attributes; /* 0x34 */
@@ -47413,8 +47447,8 @@ diff -urNp linux-2.6.32.21/include/linux/screen_info.h linux-2.6.32.21/include/l
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
diff -urNp linux-2.6.32.21/include/linux/security.h linux-2.6.32.21/include/linux/security.h
---- linux-2.6.32.21/include/linux/security.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/security.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/security.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/security.h 2010-09-13 08:10:10.000000000 -0400
@@ -34,6 +34,7 @@
#include <linux/key.h>
#include <linux/xfrm.h>
@@ -47424,8 +47458,8 @@ diff -urNp linux-2.6.32.21/include/linux/security.h linux-2.6.32.21/include/linu
/* Maximum number of letters for an LSM name string */
diff -urNp linux-2.6.32.21/include/linux/shm.h linux-2.6.32.21/include/linux/shm.h
---- linux-2.6.32.21/include/linux/shm.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/shm.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/shm.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/shm.h 2010-09-13 08:10:10.000000000 -0400
@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
pid_t shm_cprid;
pid_t shm_lprid;
@@ -47438,8 +47472,8 @@ diff -urNp linux-2.6.32.21/include/linux/shm.h linux-2.6.32.21/include/linux/shm
/* shm_mode upper byte flags */
diff -urNp linux-2.6.32.21/include/linux/slab.h linux-2.6.32.21/include/linux/slab.h
---- linux-2.6.32.21/include/linux/slab.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/slab.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/slab.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/slab.h 2010-09-13 08:10:10.000000000 -0400
@@ -11,6 +11,7 @@
#include <linux/gfp.h>
@@ -47512,8 +47546,8 @@ diff -urNp linux-2.6.32.21/include/linux/slab.h linux-2.6.32.21/include/linux/sl
+
#endif /* _LINUX_SLAB_H */
diff -urNp linux-2.6.32.21/include/linux/slub_def.h linux-2.6.32.21/include/linux/slub_def.h
---- linux-2.6.32.21/include/linux/slub_def.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/slub_def.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/slub_def.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/slub_def.h 2010-09-13 08:10:10.000000000 -0400
@@ -86,7 +86,7 @@ struct kmem_cache {
struct kmem_cache_order_objects max;
struct kmem_cache_order_objects min;
@@ -47524,8 +47558,8 @@ diff -urNp linux-2.6.32.21/include/linux/slub_def.h linux-2.6.32.21/include/linu
int inuse; /* Offset to metadata */
int align; /* Alignment */
diff -urNp linux-2.6.32.21/include/linux/sonet.h linux-2.6.32.21/include/linux/sonet.h
---- linux-2.6.32.21/include/linux/sonet.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/sonet.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/sonet.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/sonet.h 2010-09-13 08:10:10.000000000 -0400
@@ -61,7 +61,7 @@ struct sonet_stats {
#include <asm/atomic.h>
@@ -47536,8 +47570,8 @@ diff -urNp linux-2.6.32.21/include/linux/sonet.h linux-2.6.32.21/include/linux/s
#undef __HANDLE_ITEM
};
diff -urNp linux-2.6.32.21/include/linux/suspend.h linux-2.6.32.21/include/linux/suspend.h
---- linux-2.6.32.21/include/linux/suspend.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/suspend.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/suspend.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/suspend.h 2010-09-13 08:10:10.000000000 -0400
@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
* which require special recovery actions in that situation.
*/
@@ -47627,8 +47661,8 @@ diff -urNp linux-2.6.32.21/include/linux/suspend.h linux-2.6.32.21/include/linux
static inline bool system_entering_hibernation(void) { return false; }
#endif /* CONFIG_HIBERNATION */
diff -urNp linux-2.6.32.21/include/linux/sysctl.h linux-2.6.32.21/include/linux/sysctl.h
---- linux-2.6.32.21/include/linux/sysctl.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/sysctl.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/sysctl.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/sysctl.h 2010-09-13 08:10:10.000000000 -0400
@@ -164,7 +164,11 @@ enum
KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
};
@@ -47643,8 +47677,8 @@ diff -urNp linux-2.6.32.21/include/linux/sysctl.h linux-2.6.32.21/include/linux/
/* CTL_VM names: */
enum
diff -urNp linux-2.6.32.21/include/linux/sysfs.h linux-2.6.32.21/include/linux/sysfs.h
---- linux-2.6.32.21/include/linux/sysfs.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/sysfs.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/sysfs.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/sysfs.h 2010-09-13 08:10:10.000000000 -0400
@@ -75,8 +75,8 @@ struct bin_attribute {
};
@@ -47657,8 +47691,8 @@ diff -urNp linux-2.6.32.21/include/linux/sysfs.h linux-2.6.32.21/include/linux/s
struct sysfs_dirent;
diff -urNp linux-2.6.32.21/include/linux/thread_info.h linux-2.6.32.21/include/linux/thread_info.h
---- linux-2.6.32.21/include/linux/thread_info.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/thread_info.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/thread_info.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/thread_info.h 2010-09-13 08:10:10.000000000 -0400
@@ -23,7 +23,7 @@ struct restart_block {
};
/* For futex_wait and futex_wait_requeue_pi */
@@ -47669,8 +47703,8 @@ diff -urNp linux-2.6.32.21/include/linux/thread_info.h linux-2.6.32.21/include/l
u32 flags;
u32 bitset;
diff -urNp linux-2.6.32.21/include/linux/tty.h linux-2.6.32.21/include/linux/tty.h
---- linux-2.6.32.21/include/linux/tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/tty.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/tty.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/tty.h 2010-09-13 08:10:10.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/tty_driver.h>
#include <linux/tty_ldisc.h>
@@ -47707,8 +47741,8 @@ diff -urNp linux-2.6.32.21/include/linux/tty.h linux-2.6.32.21/include/linux/tty
/* n_tty.c */
extern struct tty_ldisc_ops tty_ldisc_N_TTY;
diff -urNp linux-2.6.32.21/include/linux/tty_ldisc.h linux-2.6.32.21/include/linux/tty_ldisc.h
---- linux-2.6.32.21/include/linux/tty_ldisc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/tty_ldisc.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/tty_ldisc.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/tty_ldisc.h 2010-09-13 08:10:10.000000000 -0400
@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
struct module *owner;
@@ -47719,8 +47753,8 @@ diff -urNp linux-2.6.32.21/include/linux/tty_ldisc.h linux-2.6.32.21/include/lin
struct tty_ldisc {
diff -urNp linux-2.6.32.21/include/linux/types.h linux-2.6.32.21/include/linux/types.h
---- linux-2.6.32.21/include/linux/types.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/types.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/types.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/types.h 2010-09-13 08:10:10.000000000 -0400
@@ -191,10 +191,26 @@ typedef struct {
volatile int counter;
} atomic_t;
@@ -47749,8 +47783,8 @@ diff -urNp linux-2.6.32.21/include/linux/types.h linux-2.6.32.21/include/linux/t
struct ustat {
diff -urNp linux-2.6.32.21/include/linux/uaccess.h linux-2.6.32.21/include/linux/uaccess.h
---- linux-2.6.32.21/include/linux/uaccess.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/uaccess.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/uaccess.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/uaccess.h 2010-09-13 08:10:10.000000000 -0400
@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
long ret; \
mm_segment_t old_fs = get_fs(); \
@@ -47783,8 +47817,8 @@ diff -urNp linux-2.6.32.21/include/linux/uaccess.h linux-2.6.32.21/include/linux
#endif /* __LINUX_UACCESS_H__ */
diff -urNp linux-2.6.32.21/include/linux/vmalloc.h linux-2.6.32.21/include/linux/vmalloc.h
---- linux-2.6.32.21/include/linux/vmalloc.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/vmalloc.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/vmalloc.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/vmalloc.h 2010-09-13 08:10:10.000000000 -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 */
@@ -47880,8 +47914,8 @@ diff -urNp linux-2.6.32.21/include/linux/vmalloc.h linux-2.6.32.21/include/linux
+
#endif /* _LINUX_VMALLOC_H */
diff -urNp linux-2.6.32.21/include/linux/vmstat.h linux-2.6.32.21/include/linux/vmstat.h
---- linux-2.6.32.21/include/linux/vmstat.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/linux/vmstat.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/linux/vmstat.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/linux/vmstat.h 2010-09-13 08:10:10.000000000 -0400
@@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(in
/*
* Zone based page accounting with per cpu differentials.
@@ -47937,8 +47971,8 @@ diff -urNp linux-2.6.32.21/include/linux/vmstat.h linux-2.6.32.21/include/linux/
static inline void __dec_zone_page_state(struct page *page,
diff -urNp linux-2.6.32.21/include/net/irda/ircomm_tty.h linux-2.6.32.21/include/net/irda/ircomm_tty.h
---- linux-2.6.32.21/include/net/irda/ircomm_tty.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/net/irda/ircomm_tty.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/net/irda/ircomm_tty.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/net/irda/ircomm_tty.h 2010-09-13 08:10:10.000000000 -0400
@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
unsigned short close_delay;
unsigned short closing_wait; /* time to wait before closing */
@@ -47951,8 +47985,8 @@ diff -urNp linux-2.6.32.21/include/net/irda/ircomm_tty.h linux-2.6.32.21/include
/* Protect concurent access to :
* o self->open_count
diff -urNp linux-2.6.32.21/include/net/neighbour.h linux-2.6.32.21/include/net/neighbour.h
---- linux-2.6.32.21/include/net/neighbour.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/net/neighbour.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/net/neighbour.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/net/neighbour.h 2010-09-13 08:10:10.000000000 -0400
@@ -125,12 +125,12 @@ struct neighbour
struct neigh_ops
{
@@ -47973,8 +48007,8 @@ diff -urNp linux-2.6.32.21/include/net/neighbour.h linux-2.6.32.21/include/net/n
struct pneigh_entry
diff -urNp linux-2.6.32.21/include/net/sctp/sctp.h linux-2.6.32.21/include/net/sctp/sctp.h
---- linux-2.6.32.21/include/net/sctp/sctp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/net/sctp/sctp.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/net/sctp/sctp.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/net/sctp/sctp.h 2010-09-13 08:10:10.000000000 -0400
@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
#else /* SCTP_DEBUG */
@@ -47987,8 +48021,8 @@ diff -urNp linux-2.6.32.21/include/net/sctp/sctp.h linux-2.6.32.21/include/net/s
#define SCTP_DISABLE_DEBUG
#define SCTP_ASSERT(expr, str, func)
diff -urNp linux-2.6.32.21/include/net/tcp.h linux-2.6.32.21/include/net/tcp.h
---- linux-2.6.32.21/include/net/tcp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/net/tcp.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/net/tcp.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/net/tcp.h 2010-09-13 08:10:10.000000000 -0400
@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
struct tcp_seq_afinfo {
char *name;
@@ -47998,8 +48032,8 @@ diff -urNp linux-2.6.32.21/include/net/tcp.h linux-2.6.32.21/include/net/tcp.h
struct seq_operations seq_ops;
};
diff -urNp linux-2.6.32.21/include/net/udp.h linux-2.6.32.21/include/net/udp.h
---- linux-2.6.32.21/include/net/udp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/net/udp.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/net/udp.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/net/udp.h 2010-09-13 08:10:10.000000000 -0400
@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
char *name;
sa_family_t family;
@@ -48009,8 +48043,8 @@ diff -urNp linux-2.6.32.21/include/net/udp.h linux-2.6.32.21/include/net/udp.h
struct seq_operations seq_ops;
};
diff -urNp linux-2.6.32.21/include/sound/ac97_codec.h linux-2.6.32.21/include/sound/ac97_codec.h
---- linux-2.6.32.21/include/sound/ac97_codec.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/sound/ac97_codec.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/sound/ac97_codec.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/sound/ac97_codec.h 2010-09-13 08:10:10.000000000 -0400
@@ -419,15 +419,15 @@
struct snd_ac97;
@@ -48044,8 +48078,8 @@ diff -urNp linux-2.6.32.21/include/sound/ac97_codec.h linux-2.6.32.21/include/so
void (*private_free) (struct snd_ac97 *ac97);
/* --- */
diff -urNp linux-2.6.32.21/include/trace/events/irq.h linux-2.6.32.21/include/trace/events/irq.h
---- linux-2.6.32.21/include/trace/events/irq.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/trace/events/irq.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/trace/events/irq.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/trace/events/irq.h 2010-09-13 08:10:10.000000000 -0400
@@ -34,7 +34,7 @@
*/
TRACE_EVENT(irq_handler_entry,
@@ -48083,8 +48117,8 @@ diff -urNp linux-2.6.32.21/include/trace/events/irq.h linux-2.6.32.21/include/tr
TP_ARGS(h, vec),
diff -urNp linux-2.6.32.21/include/video/uvesafb.h linux-2.6.32.21/include/video/uvesafb.h
---- linux-2.6.32.21/include/video/uvesafb.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/include/video/uvesafb.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/include/video/uvesafb.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/include/video/uvesafb.h 2010-09-13 08:10:10.000000000 -0400
@@ -177,6 +177,7 @@ struct uvesafb_par {
u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
u8 pmi_setpal; /* PMI for palette changes */
@@ -48093,9 +48127,21 @@ diff -urNp linux-2.6.32.21/include/video/uvesafb.h linux-2.6.32.21/include/video
void *pmi_start;
void *pmi_pal;
u8 *vbe_state_orig; /*
+diff -urNp linux-2.6.32.21/init/Kconfig linux-2.6.32.21/init/Kconfig
+--- linux-2.6.32.21/init/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/Kconfig 2010-09-13 08:10:10.000000000 -0400
+@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
+
+ config COMPAT_BRK
+ bool "Disable heap randomization"
+- default y
++ default n
+ help
+ Randomizing heap placement makes heap exploits harder, but it
+ also breaks ancient binaries (including anything libc5 based).
diff -urNp linux-2.6.32.21/init/do_mounts.c linux-2.6.32.21/init/do_mounts.c
---- linux-2.6.32.21/init/do_mounts.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/do_mounts.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/do_mounts.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/do_mounts.c 2010-09-13 08:10:10.000000000 -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)
@@ -48142,8 +48188,8 @@ diff -urNp linux-2.6.32.21/init/do_mounts.c linux-2.6.32.21/init/do_mounts.c
+ sys_chroot((__force char __user *)".");
}
diff -urNp linux-2.6.32.21/init/do_mounts.h linux-2.6.32.21/init/do_mounts.h
---- linux-2.6.32.21/init/do_mounts.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/do_mounts.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/do_mounts.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/do_mounts.h 2010-09-13 08:10:10.000000000 -0400
@@ -15,15 +15,15 @@ extern int root_mountflags;
static inline int create_dev(char *name, dev_t dev)
@@ -48164,8 +48210,8 @@ diff -urNp linux-2.6.32.21/init/do_mounts.h linux-2.6.32.21/init/do_mounts.h
if (!S_ISBLK(stat.st_mode))
return 0;
diff -urNp linux-2.6.32.21/init/do_mounts_initrd.c linux-2.6.32.21/init/do_mounts_initrd.c
---- linux-2.6.32.21/init/do_mounts_initrd.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/do_mounts_initrd.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/do_mounts_initrd.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/do_mounts_initrd.c 2010-09-13 08:10:10.000000000 -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);
@@ -48250,8 +48296,8 @@ diff -urNp linux-2.6.32.21/init/do_mounts_initrd.c linux-2.6.32.21/init/do_mount
return 0;
}
diff -urNp linux-2.6.32.21/init/do_mounts_md.c linux-2.6.32.21/init/do_mounts_md.c
---- linux-2.6.32.21/init/do_mounts_md.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/do_mounts_md.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/do_mounts_md.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/do_mounts_md.c 2010-09-13 08:10:10.000000000 -0400
@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
partitioned ? "_d" : "", minor,
md_setup_args[ent].device_names);
@@ -48280,8 +48326,8 @@ diff -urNp linux-2.6.32.21/init/do_mounts_md.c linux-2.6.32.21/init/do_mounts_md
sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
sys_close(fd);
diff -urNp linux-2.6.32.21/init/initramfs.c linux-2.6.32.21/init/initramfs.c
---- linux-2.6.32.21/init/initramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/initramfs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/initramfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/initramfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -74,7 +74,7 @@ static void __init free_hash(void)
}
}
@@ -48390,21 +48436,9 @@ diff -urNp linux-2.6.32.21/init/initramfs.c linux-2.6.32.21/init/initramfs.c
state = SkipIt;
next_state = Reset;
return 0;
-diff -urNp linux-2.6.32.21/init/Kconfig linux-2.6.32.21/init/Kconfig
---- linux-2.6.32.21/init/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/Kconfig 2010-08-13 18:34:41.000000000 -0400
-@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
-
- config COMPAT_BRK
- bool "Disable heap randomization"
-- default y
-+ default n
- help
- Randomizing heap placement makes heap exploits harder, but it
- also breaks ancient binaries (including anything libc5 based).
diff -urNp linux-2.6.32.21/init/main.c linux-2.6.32.21/init/main.c
---- linux-2.6.32.21/init/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/main.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/main.c 2010-09-13 08:10:10.000000000 -0400
@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
#ifdef CONFIG_TC
extern void tc_init(void);
@@ -48550,8 +48584,8 @@ diff -urNp linux-2.6.32.21/init/main.c linux-2.6.32.21/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.32.21/init/noinitramfs.c linux-2.6.32.21/init/noinitramfs.c
---- linux-2.6.32.21/init/noinitramfs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/init/noinitramfs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/init/noinitramfs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/init/noinitramfs.c 2010-09-13 08:10:10.000000000 -0400
@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
{
int err;
@@ -48571,8 +48605,8 @@ diff -urNp linux-2.6.32.21/init/noinitramfs.c linux-2.6.32.21/init/noinitramfs.c
goto out;
diff -urNp linux-2.6.32.21/ipc/ipc_sysctl.c linux-2.6.32.21/ipc/ipc_sysctl.c
---- linux-2.6.32.21/ipc/ipc_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/ipc/ipc_sysctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/ipc/ipc_sysctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/ipc/ipc_sysctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
.extra1 = &zero,
.extra2 = &one,
@@ -48592,8 +48626,8 @@ diff -urNp linux-2.6.32.21/ipc/ipc_sysctl.c linux-2.6.32.21/ipc/ipc_sysctl.c
static int __init ipc_sysctl_init(void)
diff -urNp linux-2.6.32.21/ipc/mqueue.c linux-2.6.32.21/ipc/mqueue.c
---- linux-2.6.32.21/ipc/mqueue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/ipc/mqueue.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/ipc/mqueue.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/ipc/mqueue.c 2010-09-13 08:10:10.000000000 -0400
@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
mq_bytes = (mq_msg_tblsz +
(info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -48603,8 +48637,8 @@ diff -urNp linux-2.6.32.21/ipc/mqueue.c linux-2.6.32.21/ipc/mqueue.c
if (u->mq_bytes + mq_bytes < u->mq_bytes ||
u->mq_bytes + mq_bytes >
diff -urNp linux-2.6.32.21/ipc/shm.c linux-2.6.32.21/ipc/shm.c
---- linux-2.6.32.21/ipc/shm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/ipc/shm.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/ipc/shm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/ipc/shm.c 2010-09-13 08:10:10.000000000 -0400
@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
#endif
@@ -48658,8 +48692,8 @@ diff -urNp linux-2.6.32.21/ipc/shm.c linux-2.6.32.21/ipc/shm.c
shm_unlock(shp);
diff -urNp linux-2.6.32.21/kernel/acct.c linux-2.6.32.21/kernel/acct.c
---- linux-2.6.32.21/kernel/acct.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/acct.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/acct.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/acct.c 2010-09-13 08:10:10.000000000 -0400
@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
*/
flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -48670,8 +48704,8 @@ diff -urNp linux-2.6.32.21/kernel/acct.c linux-2.6.32.21/kernel/acct.c
current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
set_fs(fs);
diff -urNp linux-2.6.32.21/kernel/capability.c linux-2.6.32.21/kernel/capability.c
---- linux-2.6.32.21/kernel/capability.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/capability.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/capability.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/capability.c 2010-09-13 08:10:10.000000000 -0400
@@ -306,10 +306,21 @@ int capable(int cap)
BUG();
}
@@ -48696,8 +48730,8 @@ diff -urNp linux-2.6.32.21/kernel/capability.c linux-2.6.32.21/kernel/capability
EXPORT_SYMBOL(capable);
+EXPORT_SYMBOL(capable_nolog);
diff -urNp linux-2.6.32.21/kernel/configs.c linux-2.6.32.21/kernel/configs.c
---- linux-2.6.32.21/kernel/configs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/configs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/configs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/configs.c 2010-09-13 08:10:10.000000000 -0400
@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
struct proc_dir_entry *entry;
@@ -48719,8 +48753,8 @@ diff -urNp linux-2.6.32.21/kernel/configs.c linux-2.6.32.21/kernel/configs.c
return -ENOMEM;
diff -urNp linux-2.6.32.21/kernel/cpu.c linux-2.6.32.21/kernel/cpu.c
---- linux-2.6.32.21/kernel/cpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/cpu.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/cpu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/cpu.c 2010-09-13 08:10:10.000000000 -0400
@@ -19,7 +19,7 @@
/* Serializes the updates to cpu_online_mask, cpu_present_mask */
static DEFINE_MUTEX(cpu_add_remove_lock);
@@ -48731,8 +48765,8 @@ diff -urNp linux-2.6.32.21/kernel/cpu.c linux-2.6.32.21/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.32.21/kernel/cred.c linux-2.6.32.21/kernel/cred.c
---- linux-2.6.32.21/kernel/cred.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/cred.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/cred.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/cred.c 2010-09-13 08:10:10.000000000 -0400
@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
get_cred(new); /* we will require a ref for the subj creds too */
@@ -48743,8 +48777,8 @@ diff -urNp linux-2.6.32.21/kernel/cred.c linux-2.6.32.21/kernel/cred.c
if (old->euid != new->euid ||
old->egid != new->egid ||
diff -urNp linux-2.6.32.21/kernel/exit.c linux-2.6.32.21/kernel/exit.c
---- linux-2.6.32.21/kernel/exit.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/exit.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/exit.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/exit.c 2010-09-13 08:10:10.000000000 -0400
@@ -56,6 +56,10 @@
#include <asm/mmu_context.h>
#include "cred-internals.h"
@@ -48835,8 +48869,8 @@ diff -urNp linux-2.6.32.21/kernel/exit.c linux-2.6.32.21/kernel/exit.c
get_task_struct(p);
read_unlock(&tasklist_lock);
diff -urNp linux-2.6.32.21/kernel/fork.c linux-2.6.32.21/kernel/fork.c
---- linux-2.6.32.21/kernel/fork.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/kernel/fork.c 2010-08-29 21:10:54.000000000 -0400
+--- linux-2.6.32.21/kernel/fork.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/fork.c 2010-09-13 08:10:10.000000000 -0400
@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
*stackend = STACK_END_MAGIC; /* for overflow detection */
@@ -48976,8 +49010,8 @@ diff -urNp linux-2.6.32.21/kernel/fork.c linux-2.6.32.21/kernel/fork.c
else
new_fs = fs;
diff -urNp linux-2.6.32.21/kernel/futex.c linux-2.6.32.21/kernel/futex.c
---- linux-2.6.32.21/kernel/futex.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/futex.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/futex.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/futex.c 2010-09-13 08:10:10.000000000 -0400
@@ -54,6 +54,7 @@
#include <linux/mount.h>
#include <linux/pagemap.h>
@@ -49046,8 +49080,8 @@ diff -urNp linux-2.6.32.21/kernel/futex.c linux-2.6.32.21/kernel/futex.c
unsigned long uentry;
diff -urNp linux-2.6.32.21/kernel/futex_compat.c linux-2.6.32.21/kernel/futex_compat.c
---- linux-2.6.32.21/kernel/futex_compat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/futex_compat.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/futex_compat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/futex_compat.c 2010-09-13 08:10:10.000000000 -0400
@@ -10,6 +10,7 @@
#include <linux/compat.h>
#include <linux/nsproxy.h>
@@ -49086,8 +49120,8 @@ diff -urNp linux-2.6.32.21/kernel/futex_compat.c linux-2.6.32.21/kernel/futex_co
read_unlock(&tasklist_lock);
}
diff -urNp linux-2.6.32.21/kernel/gcov/base.c linux-2.6.32.21/kernel/gcov/base.c
---- linux-2.6.32.21/kernel/gcov/base.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/gcov/base.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/gcov/base.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/gcov/base.c 2010-09-13 08:10:10.000000000 -0400
@@ -102,11 +102,6 @@ void gcov_enable_events(void)
}
@@ -49110,8 +49144,8 @@ diff -urNp linux-2.6.32.21/kernel/gcov/base.c linux-2.6.32.21/kernel/gcov/base.c
prev->next = info->next;
else
diff -urNp linux-2.6.32.21/kernel/hrtimer.c linux-2.6.32.21/kernel/hrtimer.c
---- linux-2.6.32.21/kernel/hrtimer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/hrtimer.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/hrtimer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/hrtimer.c 2010-09-13 08:10:10.000000000 -0400
@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
local_irq_restore(flags);
}
@@ -49122,8 +49156,8 @@ diff -urNp linux-2.6.32.21/kernel/hrtimer.c linux-2.6.32.21/kernel/hrtimer.c
hrtimer_peek_ahead_timers();
}
diff -urNp linux-2.6.32.21/kernel/kallsyms.c linux-2.6.32.21/kernel/kallsyms.c
---- linux-2.6.32.21/kernel/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/kallsyms.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/kernel/kallsyms.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/kallsyms.c 2010-09-13 08:10:10.000000000 -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)
@@ -49227,8 +49261,8 @@ diff -urNp linux-2.6.32.21/kernel/kallsyms.c linux-2.6.32.21/kernel/kallsyms.c
return -ENOMEM;
reset_iter(iter, 0);
diff -urNp linux-2.6.32.21/kernel/kgdb.c linux-2.6.32.21/kernel/kgdb.c
---- linux-2.6.32.21/kernel/kgdb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/kgdb.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/kgdb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/kgdb.c 2010-09-13 08:10:10.000000000 -0400
@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
/* Guard for recursive entry */
static int exception_level;
@@ -49257,8 +49291,8 @@ diff -urNp linux-2.6.32.21/kernel/kgdb.c linux-2.6.32.21/kernel/kgdb.c
BUG_ON(kgdb_connected);
diff -urNp linux-2.6.32.21/kernel/kmod.c linux-2.6.32.21/kernel/kmod.c
---- linux-2.6.32.21/kernel/kmod.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/kmod.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/kmod.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/kmod.c 2010-09-13 08:10:10.000000000 -0400
@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
if (ret >= MODULE_NAME_LEN)
return -ENAMETOOLONG;
@@ -49279,8 +49313,8 @@ diff -urNp linux-2.6.32.21/kernel/kmod.c linux-2.6.32.21/kernel/kmod.c
* 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.32.21/kernel/kprobes.c linux-2.6.32.21/kernel/kprobes.c
---- linux-2.6.32.21/kernel/kprobes.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/kprobes.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/kprobes.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/kprobes.c 2010-09-13 08:10:10.000000000 -0400
@@ -183,7 +183,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.
@@ -49318,8 +49352,8 @@ diff -urNp linux-2.6.32.21/kernel/kprobes.c linux-2.6.32.21/kernel/kprobes.c
head = &kprobe_table[i];
preempt_disable();
diff -urNp linux-2.6.32.21/kernel/lockdep.c linux-2.6.32.21/kernel/lockdep.c
---- linux-2.6.32.21/kernel/lockdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/lockdep.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/lockdep.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/lockdep.c 2010-09-13 08:10:10.000000000 -0400
@@ -577,6 +577,10 @@ static int static_obj(void *obj)
int i;
#endif
@@ -49350,8 +49384,8 @@ diff -urNp linux-2.6.32.21/kernel/lockdep.c linux-2.6.32.21/kernel/lockdep.c
printk("turning off the locking correctness validator.\n");
dump_stack();
diff -urNp linux-2.6.32.21/kernel/lockdep_proc.c linux-2.6.32.21/kernel/lockdep_proc.c
---- linux-2.6.32.21/kernel/lockdep_proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/lockdep_proc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/lockdep_proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/lockdep_proc.c 2010-09-13 08:10:10.000000000 -0400
@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
static void print_name(struct seq_file *m, struct lock_class *class)
@@ -49362,8 +49396,8 @@ diff -urNp linux-2.6.32.21/kernel/lockdep_proc.c linux-2.6.32.21/kernel/lockdep_
if (!name) {
diff -urNp linux-2.6.32.21/kernel/module.c linux-2.6.32.21/kernel/module.c
---- linux-2.6.32.21/kernel/module.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/module.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/module.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/module.c 2010-09-13 08:10:10.000000000 -0400
@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
static BLOCKING_NOTIFIER_HEAD(module_notify_list);
@@ -49904,8 +49938,8 @@ diff -urNp linux-2.6.32.21/kernel/module.c linux-2.6.32.21/kernel/module.c
}
return mod;
diff -urNp linux-2.6.32.21/kernel/panic.c linux-2.6.32.21/kernel/panic.c
---- linux-2.6.32.21/kernel/panic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/panic.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/panic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/panic.c 2010-09-13 08:10:10.000000000 -0400
@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
*/
void __stack_chk_fail(void)
@@ -49917,8 +49951,8 @@ diff -urNp linux-2.6.32.21/kernel/panic.c linux-2.6.32.21/kernel/panic.c
}
EXPORT_SYMBOL(__stack_chk_fail);
diff -urNp linux-2.6.32.21/kernel/params.c linux-2.6.32.21/kernel/params.c
---- linux-2.6.32.21/kernel/params.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/params.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/params.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/params.c 2010-09-13 08:10:10.000000000 -0400
@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
return ret;
}
@@ -49938,8 +49972,8 @@ diff -urNp linux-2.6.32.21/kernel/params.c linux-2.6.32.21/kernel/params.c
};
diff -urNp linux-2.6.32.21/kernel/pid.c linux-2.6.32.21/kernel/pid.c
---- linux-2.6.32.21/kernel/pid.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/pid.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/pid.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/pid.c 2010-09-13 08:10:10.000000000 -0400
@@ -33,6 +33,7 @@
#include <linux/rculist.h>
#include <linux/bootmem.h>
@@ -49974,8 +50008,8 @@ diff -urNp linux-2.6.32.21/kernel/pid.c linux-2.6.32.21/kernel/pid.c
struct task_struct *find_task_by_vpid(pid_t vnr)
diff -urNp linux-2.6.32.21/kernel/posix-cpu-timers.c linux-2.6.32.21/kernel/posix-cpu-timers.c
---- linux-2.6.32.21/kernel/posix-cpu-timers.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/posix-cpu-timers.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/posix-cpu-timers.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/posix-cpu-timers.c 2010-09-13 08:10:10.000000000 -0400
@@ -6,6 +6,7 @@
#include <linux/posix-timers.h>
#include <linux/errno.h>
@@ -50001,8 +50035,8 @@ diff -urNp linux-2.6.32.21/kernel/posix-cpu-timers.c linux-2.6.32.21/kernel/posi
/*
* At the hard limit, we just die.
diff -urNp linux-2.6.32.21/kernel/power/hibernate.c linux-2.6.32.21/kernel/power/hibernate.c
---- linux-2.6.32.21/kernel/power/hibernate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/power/hibernate.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/power/hibernate.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/power/hibernate.c 2010-09-13 08:10:10.000000000 -0400
@@ -48,14 +48,14 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN;
@@ -50021,8 +50055,8 @@ diff -urNp linux-2.6.32.21/kernel/power/hibernate.c linux-2.6.32.21/kernel/power
if (ops && !(ops->begin && ops->end && ops->pre_snapshot
&& ops->prepare && ops->finish && ops->enter && ops->pre_restore
diff -urNp linux-2.6.32.21/kernel/power/poweroff.c linux-2.6.32.21/kernel/power/poweroff.c
---- linux-2.6.32.21/kernel/power/poweroff.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/power/poweroff.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/power/poweroff.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/power/poweroff.c 2010-09-13 08:10:10.000000000 -0400
@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
.enable_mask = SYSRQ_ENABLE_BOOT,
};
@@ -50033,8 +50067,8 @@ diff -urNp linux-2.6.32.21/kernel/power/poweroff.c linux-2.6.32.21/kernel/power/
register_sysrq_key('o', &sysrq_poweroff_op);
return 0;
diff -urNp linux-2.6.32.21/kernel/power/process.c linux-2.6.32.21/kernel/power/process.c
---- linux-2.6.32.21/kernel/power/process.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/power/process.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/power/process.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/power/process.c 2010-09-13 08:10:10.000000000 -0400
@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
struct timeval start, end;
u64 elapsed_csecs64;
@@ -50075,8 +50109,8 @@ diff -urNp linux-2.6.32.21/kernel/power/process.c linux-2.6.32.21/kernel/power/p
do_gettimeofday(&end);
elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
diff -urNp linux-2.6.32.21/kernel/power/suspend.c linux-2.6.32.21/kernel/power/suspend.c
---- linux-2.6.32.21/kernel/power/suspend.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/power/suspend.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/power/suspend.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/power/suspend.c 2010-09-13 08:10:10.000000000 -0400
@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
[PM_SUSPEND_MEM] = "mem",
};
@@ -50094,8 +50128,8 @@ diff -urNp linux-2.6.32.21/kernel/power/suspend.c linux-2.6.32.21/kernel/power/s
mutex_lock(&pm_mutex);
suspend_ops = ops;
diff -urNp linux-2.6.32.21/kernel/printk.c linux-2.6.32.21/kernel/printk.c
---- linux-2.6.32.21/kernel/printk.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/printk.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/printk.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/printk.c 2010-09-13 08:10:10.000000000 -0400
@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
char c;
int error = 0;
@@ -50109,8 +50143,8 @@ diff -urNp linux-2.6.32.21/kernel/printk.c linux-2.6.32.21/kernel/printk.c
if (error)
return error;
diff -urNp linux-2.6.32.21/kernel/ptrace.c linux-2.6.32.21/kernel/ptrace.c
---- linux-2.6.32.21/kernel/ptrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/ptrace.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/ptrace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/ptrace.c 2010-09-13 08:10:10.000000000 -0400
@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
cred->gid != tcred->egid ||
cred->gid != tcred->sgid ||
@@ -50193,8 +50227,8 @@ diff -urNp linux-2.6.32.21/kernel/ptrace.c linux-2.6.32.21/kernel/ptrace.c
int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
diff -urNp linux-2.6.32.21/kernel/rcutree.c linux-2.6.32.21/kernel/rcutree.c
---- linux-2.6.32.21/kernel/rcutree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/rcutree.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/rcutree.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/rcutree.c 2010-09-13 08:10:10.000000000 -0400
@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
/*
* Do softirq processing for the current CPU.
@@ -50205,8 +50239,8 @@ diff -urNp linux-2.6.32.21/kernel/rcutree.c linux-2.6.32.21/kernel/rcutree.c
/*
* Memory references from any prior RCU read-side critical sections
diff -urNp linux-2.6.32.21/kernel/relay.c linux-2.6.32.21/kernel/relay.c
---- linux-2.6.32.21/kernel/relay.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/relay.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/kernel/relay.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/relay.c 2010-09-13 08:10:10.000000000 -0400
@@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct fi
unsigned int flags,
int *nonpad_ret)
@@ -50225,8 +50259,8 @@ diff -urNp linux-2.6.32.21/kernel/relay.c linux-2.6.32.21/kernel/relay.c
if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
return 0;
diff -urNp linux-2.6.32.21/kernel/resource.c linux-2.6.32.21/kernel/resource.c
---- linux-2.6.32.21/kernel/resource.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/resource.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/resource.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/resource.c 2010-09-13 08:10:10.000000000 -0400
@@ -132,8 +132,18 @@ static const struct file_operations proc
static int __init ioresources_init(void)
@@ -50247,8 +50281,8 @@ diff -urNp linux-2.6.32.21/kernel/resource.c linux-2.6.32.21/kernel/resource.c
}
__initcall(ioresources_init);
diff -urNp linux-2.6.32.21/kernel/sched.c linux-2.6.32.21/kernel/sched.c
---- linux-2.6.32.21/kernel/sched.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/sched.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/sched.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/sched.c 2010-09-13 08:10:10.000000000 -0400
@@ -4848,7 +4848,7 @@ out:
* In CONFIG_NO_HZ case, the idle load balance owner will do the
* rebalancing for all the cpus for whom scheduler ticks are stopped.
@@ -50296,8 +50330,8 @@ diff -urNp linux-2.6.32.21/kernel/sched.c linux-2.6.32.21/kernel/sched.c
static struct ctl_table *sd_alloc_ctl_entry(int n)
diff -urNp linux-2.6.32.21/kernel/signal.c linux-2.6.32.21/kernel/signal.c
---- linux-2.6.32.21/kernel/signal.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/signal.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/signal.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/signal.c 2010-09-13 08:10:10.000000000 -0400
@@ -41,12 +41,12 @@
static struct kmem_cache *sigqueue_cachep;
@@ -50384,8 +50418,8 @@ diff -urNp linux-2.6.32.21/kernel/signal.c linux-2.6.32.21/kernel/signal.c
return ret;
}
diff -urNp linux-2.6.32.21/kernel/smp.c linux-2.6.32.21/kernel/smp.c
---- linux-2.6.32.21/kernel/smp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/smp.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/smp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/smp.c 2010-09-13 08:10:10.000000000 -0400
@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
}
EXPORT_SYMBOL(smp_call_function);
@@ -50414,8 +50448,8 @@ diff -urNp linux-2.6.32.21/kernel/smp.c linux-2.6.32.21/kernel/smp.c
spin_unlock_irq(&call_function.lock);
}
diff -urNp linux-2.6.32.21/kernel/softirq.c linux-2.6.32.21/kernel/softirq.c
---- linux-2.6.32.21/kernel/softirq.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/softirq.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/softirq.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/softirq.c 2010-09-13 08:10:10.000000000 -0400
@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -50471,8 +50505,8 @@ diff -urNp linux-2.6.32.21/kernel/softirq.c linux-2.6.32.21/kernel/softirq.c
struct tasklet_struct *list;
diff -urNp linux-2.6.32.21/kernel/sys.c linux-2.6.32.21/kernel/sys.c
---- linux-2.6.32.21/kernel/sys.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/sys.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/sys.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/sys.c 2010-09-13 08:10:10.000000000 -0400
@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
error = -EACCES;
goto out;
@@ -50609,8 +50643,8 @@ diff -urNp linux-2.6.32.21/kernel/sys.c linux-2.6.32.21/kernel/sys.c
break;
}
diff -urNp linux-2.6.32.21/kernel/sysctl.c linux-2.6.32.21/kernel/sysctl.c
---- linux-2.6.32.21/kernel/sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/sysctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/sysctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/sysctl.c 2010-09-13 08:10:10.000000000 -0400
@@ -63,6 +63,13 @@
static int deprecated_sysctl_warning(struct __sysctl_args *args);
@@ -50733,8 +50767,8 @@ diff -urNp linux-2.6.32.21/kernel/sysctl.c linux-2.6.32.21/kernel/sysctl.c
if (error)
return error;
diff -urNp linux-2.6.32.21/kernel/taskstats.c linux-2.6.32.21/kernel/taskstats.c
---- linux-2.6.32.21/kernel/taskstats.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/taskstats.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/taskstats.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/taskstats.c 2010-09-13 08:10:10.000000000 -0400
@@ -26,9 +26,12 @@
#include <linux/cgroup.h>
#include <linux/fs.h>
@@ -50759,8 +50793,8 @@ diff -urNp linux-2.6.32.21/kernel/taskstats.c linux-2.6.32.21/kernel/taskstats.c
return -ENOMEM;
diff -urNp linux-2.6.32.21/kernel/time/tick-broadcast.c linux-2.6.32.21/kernel/time/tick-broadcast.c
---- linux-2.6.32.21/kernel/time/tick-broadcast.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/time/tick-broadcast.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/time/tick-broadcast.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/time/tick-broadcast.c 2010-09-13 08:10:10.000000000 -0400
@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
* then clear the broadcast bit.
*/
@@ -50771,8 +50805,8 @@ diff -urNp linux-2.6.32.21/kernel/time/tick-broadcast.c linux-2.6.32.21/kernel/t
cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
tick_broadcast_clear_oneshot(cpu);
diff -urNp linux-2.6.32.21/kernel/time.c linux-2.6.32.21/kernel/time.c
---- linux-2.6.32.21/kernel/time.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/time.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/time.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/time.c 2010-09-13 08:10:10.000000000 -0400
@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
return err;
@@ -50811,8 +50845,8 @@ diff -urNp linux-2.6.32.21/kernel/time.c linux-2.6.32.21/kernel/time.c
#if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
return (USEC_PER_SEC / HZ) * j;
diff -urNp linux-2.6.32.21/kernel/timer.c linux-2.6.32.21/kernel/timer.c
---- linux-2.6.32.21/kernel/timer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/timer.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/timer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/timer.c 2010-09-13 08:10:10.000000000 -0400
@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
/*
* This function runs timers and the timer-tq in bottom half context.
@@ -50822,9 +50856,28 @@ diff -urNp linux-2.6.32.21/kernel/timer.c linux-2.6.32.21/kernel/timer.c
{
struct tvec_base *base = __get_cpu_var(tvec_bases);
+diff -urNp linux-2.6.32.21/kernel/trace/Kconfig linux-2.6.32.21/kernel/trace/Kconfig
+--- linux-2.6.32.21/kernel/trace/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/Kconfig 2010-09-13 08:10:11.000000000 -0400
+@@ -126,6 +126,7 @@ if FTRACE
+ config FUNCTION_TRACER
+ bool "Kernel Function Tracer"
+ depends on HAVE_FUNCTION_TRACER
++ depends on !PAX_KERNEXEC
+ select FRAME_POINTER
+ select KALLSYMS
+ select GENERIC_TRACER
+@@ -343,6 +344,7 @@ config POWER_TRACER
+ config STACK_TRACER
+ bool "Trace max stack"
+ depends on HAVE_FUNCTION_TRACER
++ depends on !PAX_KERNEXEC
+ select FUNCTION_TRACER
+ select STACKTRACE
+ select KALLSYMS
diff -urNp linux-2.6.32.21/kernel/trace/ftrace.c linux-2.6.32.21/kernel/trace/ftrace.c
---- linux-2.6.32.21/kernel/trace/ftrace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/ftrace.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/ftrace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/ftrace.c 2010-09-13 08:10:10.000000000 -0400
@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
ip = rec->ip;
@@ -50846,28 +50899,9 @@ diff -urNp linux-2.6.32.21/kernel/trace/ftrace.c linux-2.6.32.21/kernel/trace/ft
}
/*
-diff -urNp linux-2.6.32.21/kernel/trace/Kconfig linux-2.6.32.21/kernel/trace/Kconfig
---- linux-2.6.32.21/kernel/trace/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/Kconfig 2010-08-13 18:34:41.000000000 -0400
-@@ -126,6 +126,7 @@ if FTRACE
- config FUNCTION_TRACER
- bool "Kernel Function Tracer"
- depends on HAVE_FUNCTION_TRACER
-+ depends on !PAX_KERNEXEC
- select FRAME_POINTER
- select KALLSYMS
- select GENERIC_TRACER
-@@ -343,6 +344,7 @@ config POWER_TRACER
- config STACK_TRACER
- bool "Trace max stack"
- depends on HAVE_FUNCTION_TRACER
-+ depends on !PAX_KERNEXEC
- select FUNCTION_TRACER
- select STACKTRACE
- select KALLSYMS
diff -urNp linux-2.6.32.21/kernel/trace/ring_buffer.c linux-2.6.32.21/kernel/trace/ring_buffer.c
---- linux-2.6.32.21/kernel/trace/ring_buffer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/ring_buffer.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/ring_buffer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/ring_buffer.c 2010-09-13 08:10:11.000000000 -0400
@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
* the reader page). But if the next page is a header page,
* its flags will be non zero.
@@ -50878,8 +50912,8 @@ diff -urNp linux-2.6.32.21/kernel/trace/ring_buffer.c linux-2.6.32.21/kernel/tra
struct buffer_page *page, struct list_head *list)
{
diff -urNp linux-2.6.32.21/kernel/trace/trace.c linux-2.6.32.21/kernel/trace/trace.c
---- linux-2.6.32.21/kernel/trace/trace.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/trace.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/trace.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/trace.c 2010-09-13 08:10:11.000000000 -0400
@@ -3808,10 +3808,9 @@ static const struct file_operations trac
};
#endif
@@ -50905,8 +50939,8 @@ diff -urNp linux-2.6.32.21/kernel/trace/trace.c linux-2.6.32.21/kernel/trace/tra
struct dentry *d_tracer;
diff -urNp linux-2.6.32.21/kernel/trace/trace_events.c linux-2.6.32.21/kernel/trace/trace_events.c
---- linux-2.6.32.21/kernel/trace/trace_events.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/trace_events.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/trace_events.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/trace_events.c 2010-09-13 08:10:11.000000000 -0400
@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
* Modules must own their file_operations to keep up with
* reference counting.
@@ -50917,8 +50951,8 @@ diff -urNp linux-2.6.32.21/kernel/trace/trace_events.c linux-2.6.32.21/kernel/tr
struct list_head list;
struct module *mod;
diff -urNp linux-2.6.32.21/kernel/trace/trace_output.c linux-2.6.32.21/kernel/trace/trace_output.c
---- linux-2.6.32.21/kernel/trace/trace_output.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/trace_output.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/trace_output.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/trace_output.c 2010-09-13 08:10:11.000000000 -0400
@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
return 0;
p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -50929,8 +50963,8 @@ diff -urNp linux-2.6.32.21/kernel/trace/trace_output.c linux-2.6.32.21/kernel/tr
s->len = p - s->buffer;
return 1;
diff -urNp linux-2.6.32.21/kernel/trace/trace_stack.c linux-2.6.32.21/kernel/trace/trace_stack.c
---- linux-2.6.32.21/kernel/trace/trace_stack.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/trace/trace_stack.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/trace/trace_stack.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/trace/trace_stack.c 2010-09-13 08:10:11.000000000 -0400
@@ -50,7 +50,7 @@ static inline void check_stack(void)
return;
@@ -50941,8 +50975,8 @@ diff -urNp linux-2.6.32.21/kernel/trace/trace_stack.c linux-2.6.32.21/kernel/tra
local_irq_save(flags);
diff -urNp linux-2.6.32.21/kernel/utsname_sysctl.c linux-2.6.32.21/kernel/utsname_sysctl.c
---- linux-2.6.32.21/kernel/utsname_sysctl.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/kernel/utsname_sysctl.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/kernel/utsname_sysctl.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/kernel/utsname_sysctl.c 2010-09-13 08:10:11.000000000 -0400
@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
.proc_handler = proc_do_uts_string,
.strategy = sysctl_uts_string,
@@ -50961,9 +50995,21 @@ diff -urNp linux-2.6.32.21/kernel/utsname_sysctl.c linux-2.6.32.21/kernel/utsnam
};
static int __init utsname_sysctl_init(void)
+diff -urNp linux-2.6.32.21/lib/Kconfig.debug linux-2.6.32.21/lib/Kconfig.debug
+--- linux-2.6.32.21/lib/Kconfig.debug 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/Kconfig.debug 2010-09-13 08:10:11.000000000 -0400
+@@ -905,7 +905,7 @@ config LATENCYTOP
+ select STACKTRACE
+ select SCHEDSTATS
+ select SCHED_DEBUG
+- depends on HAVE_LATENCYTOP_SUPPORT
++ depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
+ 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.32.21/lib/bug.c linux-2.6.32.21/lib/bug.c
---- linux-2.6.32.21/lib/bug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/bug.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/bug.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/bug.c 2010-09-13 08:10:11.000000000 -0400
@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
return BUG_TRAP_TYPE_NONE;
@@ -50974,8 +51020,8 @@ diff -urNp linux-2.6.32.21/lib/bug.c linux-2.6.32.21/lib/bug.c
printk(KERN_EMERG "------------[ cut here ]------------\n");
diff -urNp linux-2.6.32.21/lib/debugobjects.c linux-2.6.32.21/lib/debugobjects.c
---- linux-2.6.32.21/lib/debugobjects.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/debugobjects.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/debugobjects.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/debugobjects.c 2010-09-13 08:10:11.000000000 -0400
@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
if (limit > 4)
return;
@@ -50986,8 +51032,8 @@ diff -urNp linux-2.6.32.21/lib/debugobjects.c linux-2.6.32.21/lib/debugobjects.c
return;
diff -urNp linux-2.6.32.21/lib/dma-debug.c linux-2.6.32.21/lib/dma-debug.c
---- linux-2.6.32.21/lib/dma-debug.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/dma-debug.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/dma-debug.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/dma-debug.c 2010-09-13 08:10:11.000000000 -0400
@@ -861,7 +861,7 @@ out:
static void check_for_stack(struct device *dev, void *addr)
@@ -50998,8 +51044,8 @@ diff -urNp linux-2.6.32.21/lib/dma-debug.c linux-2.6.32.21/lib/dma-debug.c
"stack [addr=%p]\n", addr);
}
diff -urNp linux-2.6.32.21/lib/idr.c linux-2.6.32.21/lib/idr.c
---- linux-2.6.32.21/lib/idr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/idr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/idr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/idr.c 2010-09-13 08:10:11.000000000 -0400
@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
@@ -51010,8 +51056,8 @@ diff -urNp linux-2.6.32.21/lib/idr.c linux-2.6.32.21/lib/idr.c
return IDR_NEED_TO_GROW;
}
diff -urNp linux-2.6.32.21/lib/inflate.c linux-2.6.32.21/lib/inflate.c
---- linux-2.6.32.21/lib/inflate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/inflate.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/inflate.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/inflate.c 2010-09-13 08:10:11.000000000 -0400
@@ -266,7 +266,7 @@ static void free(void *where)
malloc_ptr = free_mem_ptr;
}
@@ -51021,21 +51067,9 @@ diff -urNp linux-2.6.32.21/lib/inflate.c linux-2.6.32.21/lib/inflate.c
#define free(a) kfree(a)
#endif
-diff -urNp linux-2.6.32.21/lib/Kconfig.debug linux-2.6.32.21/lib/Kconfig.debug
---- linux-2.6.32.21/lib/Kconfig.debug 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/Kconfig.debug 2010-08-13 18:34:41.000000000 -0400
-@@ -905,7 +905,7 @@ config LATENCYTOP
- select STACKTRACE
- select SCHEDSTATS
- select SCHED_DEBUG
-- depends on HAVE_LATENCYTOP_SUPPORT
-+ depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
- 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.32.21/lib/kobject.c linux-2.6.32.21/lib/kobject.c
---- linux-2.6.32.21/lib/kobject.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/kobject.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/kobject.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/kobject.c 2010-09-13 08:10:11.000000000 -0400
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
return ret;
}
@@ -51064,8 +51098,8 @@ diff -urNp linux-2.6.32.21/lib/kobject.c linux-2.6.32.21/lib/kobject.c
{
struct kset *kset;
diff -urNp linux-2.6.32.21/lib/kobject_uevent.c linux-2.6.32.21/lib/kobject_uevent.c
---- linux-2.6.32.21/lib/kobject_uevent.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/kobject_uevent.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/kobject_uevent.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/kobject_uevent.c 2010-09-13 08:10:11.000000000 -0400
@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
const char *subsystem;
struct kobject *top_kobj;
@@ -51076,8 +51110,8 @@ diff -urNp linux-2.6.32.21/lib/kobject_uevent.c linux-2.6.32.21/lib/kobject_ueve
int i = 0;
int retval = 0;
diff -urNp linux-2.6.32.21/lib/parser.c linux-2.6.32.21/lib/parser.c
---- linux-2.6.32.21/lib/parser.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/parser.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/parser.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/parser.c 2010-09-13 08:10:11.000000000 -0400
@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
char *buf;
int ret;
@@ -51088,8 +51122,8 @@ diff -urNp linux-2.6.32.21/lib/parser.c linux-2.6.32.21/lib/parser.c
return -ENOMEM;
memcpy(buf, s->from, s->to - s->from);
diff -urNp linux-2.6.32.21/lib/radix-tree.c linux-2.6.32.21/lib/radix-tree.c
---- linux-2.6.32.21/lib/radix-tree.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/radix-tree.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/radix-tree.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/radix-tree.c 2010-09-13 08:10:11.000000000 -0400
@@ -81,7 +81,7 @@ struct radix_tree_preload {
int nr;
struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -51100,8 +51134,8 @@ diff -urNp linux-2.6.32.21/lib/radix-tree.c linux-2.6.32.21/lib/radix-tree.c
static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
{
diff -urNp linux-2.6.32.21/lib/random32.c linux-2.6.32.21/lib/random32.c
---- linux-2.6.32.21/lib/random32.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/lib/random32.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/lib/random32.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/lib/random32.c 2010-09-13 08:10:11.000000000 -0400
@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
*/
static inline u32 __seed(u32 x, u32 m)
@@ -51113,35 +51147,24 @@ diff -urNp linux-2.6.32.21/lib/random32.c linux-2.6.32.21/lib/random32.c
/**
diff -urNp linux-2.6.32.21/localversion-grsec linux-2.6.32.21/localversion-grsec
--- linux-2.6.32.21/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.21/localversion-grsec 2010-08-13 18:34:41.000000000 -0400
++++ linux-2.6.32.21/localversion-grsec 2010-09-13 08:10:11.000000000 -0400
@@ -0,0 +1 @@
+-grsec
-diff -urNp linux-2.6.32.21/Makefile linux-2.6.32.21/Makefile
---- linux-2.6.32.21/Makefile 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/Makefile 2010-08-29 21:09:26.000000000 -0400
-@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
-
- HOSTCC = gcc
- HOSTCXX = g++
--HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
-
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -644,7 +644,7 @@ export mod_strip_cmd
-
-
- ifeq ($(KBUILD_EXTMOD),)
--core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
-
- vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+diff -urNp linux-2.6.32.21/mm/Kconfig linux-2.6.32.21/mm/Kconfig
+--- linux-2.6.32.21/mm/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/Kconfig 2010-09-13 08:10:11.000000000 -0400
+@@ -228,7 +228,7 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+ int "Low address space to protect from user allocation"
+ depends on MMU
+- default 4096
++ default 65536
+ 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.32.21/mm/filemap.c linux-2.6.32.21/mm/filemap.c
---- linux-2.6.32.21/mm/filemap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/filemap.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/filemap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/filemap.c 2010-09-13 08:10:11.000000000 -0400
@@ -1628,7 +1628,7 @@ int generic_file_mmap(struct file * file
struct address_space *mapping = file->f_mapping;
@@ -51160,8 +51183,8 @@ diff -urNp linux-2.6.32.21/mm/filemap.c linux-2.6.32.21/mm/filemap.c
send_sig(SIGXFSZ, current, 0);
return -EFBIG;
diff -urNp linux-2.6.32.21/mm/fremap.c linux-2.6.32.21/mm/fremap.c
---- linux-2.6.32.21/mm/fremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/fremap.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/fremap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/fremap.c 2010-09-13 08:10:11.000000000 -0400
@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
retry:
vma = find_vma(mm, start);
@@ -51174,9 +51197,18 @@ diff -urNp linux-2.6.32.21/mm/fremap.c linux-2.6.32.21/mm/fremap.c
/*
* Make sure the vma is shared, that it supports prefaulting,
* and that the remapped range is valid and fully within
+@@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
+ /*
+ * drop PG_Mlocked flag for over-mapped range
+ */
+- unsigned int saved_flags = vma->vm_flags;
++ unsigned long saved_flags = vma->vm_flags;
+ munlock_vma_pages_range(vma, start, start + size);
+ vma->vm_flags = saved_flags;
+ }
diff -urNp linux-2.6.32.21/mm/highmem.c linux-2.6.32.21/mm/highmem.c
---- linux-2.6.32.21/mm/highmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/highmem.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/highmem.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/highmem.c 2010-09-13 08:10:11.000000000 -0400
@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
* So no dangers, even with speculative execution.
*/
@@ -51203,8 +51235,8 @@ diff -urNp linux-2.6.32.21/mm/highmem.c linux-2.6.32.21/mm/highmem.c
set_page_address(page, (void *)vaddr);
diff -urNp linux-2.6.32.21/mm/hugetlb.c linux-2.6.32.21/mm/hugetlb.c
---- linux-2.6.32.21/mm/hugetlb.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/hugetlb.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/hugetlb.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/hugetlb.c 2010-09-13 08:10:11.000000000 -0400
@@ -1925,6 +1925,26 @@ static int unmap_ref_private(struct mm_s
return 1;
}
@@ -51284,21 +51316,9 @@ diff -urNp linux-2.6.32.21/mm/hugetlb.c linux-2.6.32.21/mm/hugetlb.c
ptep = huge_pte_alloc(mm, address, huge_page_size(h));
if (!ptep)
return VM_FAULT_OOM;
-diff -urNp linux-2.6.32.21/mm/Kconfig linux-2.6.32.21/mm/Kconfig
---- linux-2.6.32.21/mm/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/Kconfig 2010-08-13 18:34:41.000000000 -0400
-@@ -228,7 +228,7 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
- int "Low address space to protect from user allocation"
- depends on MMU
-- default 4096
-+ default 65536
- 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.32.21/mm/maccess.c linux-2.6.32.21/mm/maccess.c
---- linux-2.6.32.21/mm/maccess.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/maccess.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/maccess.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/maccess.c 2010-09-13 08:10:11.000000000 -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.
@@ -51318,8 +51338,8 @@ diff -urNp linux-2.6.32.21/mm/maccess.c linux-2.6.32.21/mm/maccess.c
long ret;
mm_segment_t old_fs = get_fs();
diff -urNp linux-2.6.32.21/mm/madvise.c linux-2.6.32.21/mm/madvise.c
---- linux-2.6.32.21/mm/madvise.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/madvise.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/madvise.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/madvise.c 2010-09-13 08:10:11.000000000 -0400
@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
pgoff_t pgoff;
unsigned long new_flags = vma->vm_flags;
@@ -51396,9 +51416,30 @@ diff -urNp linux-2.6.32.21/mm/madvise.c linux-2.6.32.21/mm/madvise.c
error = 0;
if (end == start)
goto out;
+diff -urNp linux-2.6.32.21/mm/memory-failure.c linux-2.6.32.21/mm/memory-failure.c
+--- linux-2.6.32.21/mm/memory-failure.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/memory-failure.c 2010-09-13 08:10:11.000000000 -0400
+@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
+
+ int sysctl_memory_failure_recovery __read_mostly = 1;
+
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
+
+ /*
+ * Send all the processes who have the page mapped an ``action optional''
+@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn,
+ return 0;
+ }
+
+- atomic_long_add(1, &mce_bad_pages);
++ atomic_long_add_unchecked(1, &mce_bad_pages);
+
+ /*
+ * We need/can do nothing about count=0 pages.
diff -urNp linux-2.6.32.21/mm/memory.c linux-2.6.32.21/mm/memory.c
---- linux-2.6.32.21/mm/memory.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/mm/memory.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/mm/memory.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/memory.c 2010-09-13 08:10:11.000000000 -0400
@@ -48,6 +48,7 @@
#include <linux/ksm.h>
#include <linux/rmap.h>
@@ -51829,30 +51870,9 @@ diff -urNp linux-2.6.32.21/mm/memory.c linux-2.6.32.21/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.32.21/mm/memory-failure.c linux-2.6.32.21/mm/memory-failure.c
---- linux-2.6.32.21/mm/memory-failure.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/memory-failure.c 2010-08-13 18:34:41.000000000 -0400
-@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
-
- int sysctl_memory_failure_recovery __read_mostly = 1;
-
--atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-
- /*
- * Send all the processes who have the page mapped an ``action optional''
-@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn,
- return 0;
- }
-
-- atomic_long_add(1, &mce_bad_pages);
-+ atomic_long_add_unchecked(1, &mce_bad_pages);
-
- /*
- * We need/can do nothing about count=0 pages.
diff -urNp linux-2.6.32.21/mm/mempolicy.c linux-2.6.32.21/mm/mempolicy.c
---- linux-2.6.32.21/mm/mempolicy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/mempolicy.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/mempolicy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/mempolicy.c 2010-09-13 08:10:11.000000000 -0400
@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
struct vm_area_struct *next;
int err;
@@ -51934,8 +51954,8 @@ diff -urNp linux-2.6.32.21/mm/mempolicy.c linux-2.6.32.21/mm/mempolicy.c
seq_printf(m, " heap");
} else if (vma->vm_start <= mm->start_stack &&
diff -urNp linux-2.6.32.21/mm/migrate.c linux-2.6.32.21/mm/migrate.c
---- linux-2.6.32.21/mm/migrate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/migrate.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/migrate.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/migrate.c 2010-09-13 08:10:11.000000000 -0400
@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
if (!mm)
return -EINVAL;
@@ -51962,8 +51982,8 @@ diff -urNp linux-2.6.32.21/mm/migrate.c linux-2.6.32.21/mm/migrate.c
err = -EPERM;
goto out;
diff -urNp linux-2.6.32.21/mm/mlock.c linux-2.6.32.21/mm/mlock.c
---- linux-2.6.32.21/mm/mlock.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/mm/mlock.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/mm/mlock.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/mlock.c 2010-09-13 08:10:11.000000000 -0400
@@ -13,6 +13,7 @@
#include <linux/pagemap.h>
#include <linux/mempolicy.h>
@@ -51972,25 +51992,29 @@ diff -urNp linux-2.6.32.21/mm/mlock.c linux-2.6.32.21/mm/mlock.c
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/rmap.h>
-@@ -454,6 +455,17 @@ static int do_mlock(unsigned long start,
+@@ -454,6 +455,9 @@ static int do_mlock(unsigned long start,
return -EINVAL;
if (end == start)
return 0;
-+
-+#ifdef CONFIG_PAX_SEGMEXEC
-+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
-+ if (end > SEGMEXEC_TASK_SIZE)
-+ return -EINVAL;
-+ } else
-+#endif
-+
+ if (end > TASK_SIZE)
+ return -EINVAL;
+
vma = find_vma_prev(current->mm, start, &prev);
if (!vma || vma->vm_start > start)
return -ENOMEM;
-@@ -513,6 +525,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
+@@ -464,6 +468,11 @@ static int do_mlock(unsigned long start,
+ for (nstart = start ; ; ) {
+ unsigned int newflags;
+
++#ifdef CONFIG_PAX_SEGMEXEC
++ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
++ break;
++#endif
++
+ /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
+
+ newflags = vma->vm_flags | VM_LOCKED;
+@@ -513,6 +522,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
lock_limit >>= PAGE_SHIFT;
/* check against resource limits */
@@ -51998,33 +52022,35 @@ diff -urNp linux-2.6.32.21/mm/mlock.c linux-2.6.32.21/mm/mlock.c
if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
error = do_mlock(start, len, 1);
up_write(&current->mm->mmap_sem);
-@@ -534,10 +547,10 @@ SYSCALL_DEFINE2(munlock, unsigned long,
+@@ -534,17 +544,23 @@ SYSCALL_DEFINE2(munlock, unsigned long,
static int do_mlockall(int flags)
{
struct vm_area_struct * vma, * prev = NULL;
- unsigned int def_flags = 0;
-+ unsigned int def_flags = current->mm->def_flags & ~VM_LOCKED;
if (flags & MCL_FUTURE)
- def_flags = VM_LOCKED;
-+ def_flags |= VM_LOCKED;
- current->mm->def_flags = def_flags;
+- current->mm->def_flags = def_flags;
++ current->mm->def_flags |= VM_LOCKED;
++ else
++ current->mm->def_flags &= ~VM_LOCKED;
if (flags == MCL_FUTURE)
goto out;
-@@ -545,6 +558,12 @@ static int do_mlockall(int flags)
- for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
- unsigned int newflags;
+ for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
+- unsigned int newflags;
++ unsigned long newflags;
++
+#ifdef CONFIG_PAX_SEGMEXEC
+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
+ break;
+#endif
-+
+
+ BUG_ON(vma->vm_end > TASK_SIZE);
newflags = vma->vm_flags | VM_LOCKED;
if (!(flags & MCL_CURRENT))
newflags &= ~VM_LOCKED;
-@@ -576,6 +595,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
+@@ -576,6 +592,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
lock_limit >>= PAGE_SHIFT;
ret = -ENOMEM;
@@ -52033,8 +52059,8 @@ diff -urNp linux-2.6.32.21/mm/mlock.c linux-2.6.32.21/mm/mlock.c
capable(CAP_IPC_LOCK))
ret = do_mlockall(flags);
diff -urNp linux-2.6.32.21/mm/mmap.c linux-2.6.32.21/mm/mmap.c
---- linux-2.6.32.21/mm/mmap.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/mm/mmap.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/mm/mmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/mmap.c 2010-09-13 08:10:11.000000000 -0400
@@ -45,6 +45,16 @@
#define arch_rebalance_pgtables(addr, len) (addr)
#endif
@@ -53110,8 +53136,8 @@ diff -urNp linux-2.6.32.21/mm/mmap.c linux-2.6.32.21/mm/mmap.c
vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
diff -urNp linux-2.6.32.21/mm/mprotect.c linux-2.6.32.21/mm/mprotect.c
---- linux-2.6.32.21/mm/mprotect.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/mprotect.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/mprotect.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/mprotect.c 2010-09-13 08:10:12.000000000 -0400
@@ -24,10 +24,16 @@
#include <linux/mmu_notifier.h>
#include <linux/migrate.h>
@@ -53310,8 +53336,8 @@ diff -urNp linux-2.6.32.21/mm/mprotect.c linux-2.6.32.21/mm/mprotect.c
if (nstart < prev->vm_end)
diff -urNp linux-2.6.32.21/mm/mremap.c linux-2.6.32.21/mm/mremap.c
---- linux-2.6.32.21/mm/mremap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/mremap.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/mremap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/mremap.c 2010-09-13 08:10:12.000000000 -0400
@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
continue;
pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -53413,8 +53439,8 @@ diff -urNp linux-2.6.32.21/mm/mremap.c linux-2.6.32.21/mm/mremap.c
out:
if (ret & ~PAGE_MASK)
diff -urNp linux-2.6.32.21/mm/nommu.c linux-2.6.32.21/mm/nommu.c
---- linux-2.6.32.21/mm/nommu.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/mm/nommu.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/mm/nommu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/nommu.c 2010-09-13 08:10:12.000000000 -0400
@@ -761,15 +761,6 @@ struct vm_area_struct *find_vma(struct m
EXPORT_SYMBOL(find_vma);
@@ -53432,8 +53458,8 @@ diff -urNp linux-2.6.32.21/mm/nommu.c linux-2.6.32.21/mm/nommu.c
* - not supported under NOMMU conditions
*/
diff -urNp linux-2.6.32.21/mm/page_alloc.c linux-2.6.32.21/mm/page_alloc.c
---- linux-2.6.32.21/mm/page_alloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/page_alloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/page_alloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/page_alloc.c 2010-09-13 08:10:12.000000000 -0400
@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
int bad = 0;
int wasMlocked = __TestClearPageMlocked(page);
@@ -53491,8 +53517,8 @@ diff -urNp linux-2.6.32.21/mm/page_alloc.c linux-2.6.32.21/mm/page_alloc.c
#endif /* CONFIG_SPARSEMEM */
diff -urNp linux-2.6.32.21/mm/percpu.c linux-2.6.32.21/mm/percpu.c
---- linux-2.6.32.21/mm/percpu.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/percpu.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/percpu.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/percpu.c 2010-09-13 08:10:12.000000000 -0400
@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
static unsigned int pcpu_last_unit_cpu __read_mostly;
@@ -53503,8 +53529,8 @@ diff -urNp linux-2.6.32.21/mm/percpu.c linux-2.6.32.21/mm/percpu.c
static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
diff -urNp linux-2.6.32.21/mm/rmap.c linux-2.6.32.21/mm/rmap.c
---- linux-2.6.32.21/mm/rmap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/rmap.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/mm/rmap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/rmap.c 2010-09-13 08:10:12.000000000 -0400
@@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_stru
/* page_table_lock to protect against threads */
spin_lock(&mm->page_table_lock);
@@ -53524,8 +53550,8 @@ diff -urNp linux-2.6.32.21/mm/rmap.c linux-2.6.32.21/mm/rmap.c
list_add_tail(&vma->anon_vma_node, &anon_vma->head);
allocated = NULL;
diff -urNp linux-2.6.32.21/mm/shmem.c linux-2.6.32.21/mm/shmem.c
---- linux-2.6.32.21/mm/shmem.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/shmem.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/shmem.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/shmem.c 2010-09-13 08:10:12.000000000 -0400
@@ -31,7 +31,7 @@
#include <linux/swap.h>
#include <linux/ima.h>
@@ -53536,8 +53562,8 @@ diff -urNp linux-2.6.32.21/mm/shmem.c linux-2.6.32.21/mm/shmem.c
#ifdef CONFIG_SHMEM
/*
diff -urNp linux-2.6.32.21/mm/slab.c linux-2.6.32.21/mm/slab.c
---- linux-2.6.32.21/mm/slab.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/mm/slab.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/mm/slab.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/slab.c 2010-09-13 08:10:12.000000000 -0400
@@ -308,7 +308,7 @@ struct kmem_list3 {
* Need this for bootstrapping a per node allocator.
*/
@@ -53644,8 +53670,8 @@ diff -urNp linux-2.6.32.21/mm/slab.c linux-2.6.32.21/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.32.21/mm/slob.c linux-2.6.32.21/mm/slob.c
---- linux-2.6.32.21/mm/slob.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/slob.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/slob.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/slob.c 2010-09-13 08:10:12.000000000 -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
@@ -53967,8 +53993,8 @@ diff -urNp linux-2.6.32.21/mm/slob.c linux-2.6.32.21/mm/slob.c
trace_kmem_cache_free(_RET_IP_, b);
diff -urNp linux-2.6.32.21/mm/slub.c linux-2.6.32.21/mm/slub.c
---- linux-2.6.32.21/mm/slub.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/slub.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/slub.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/slub.c 2010-09-13 08:10:12.000000000 -0400
@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
page = virt_to_head_page(x);
@@ -54132,8 +54158,8 @@ diff -urNp linux-2.6.32.21/mm/slub.c linux-2.6.32.21/mm/slub.c
}
module_init(slab_proc_init);
diff -urNp linux-2.6.32.21/mm/util.c linux-2.6.32.21/mm/util.c
---- linux-2.6.32.21/mm/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/util.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/util.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/util.c 2010-09-13 08:10:12.000000000 -0400
@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
void arch_pick_mmap_layout(struct mm_struct *mm)
{
@@ -54148,8 +54174,8 @@ diff -urNp linux-2.6.32.21/mm/util.c linux-2.6.32.21/mm/util.c
mm->unmap_area = arch_unmap_area;
}
diff -urNp linux-2.6.32.21/mm/vmalloc.c linux-2.6.32.21/mm/vmalloc.c
---- linux-2.6.32.21/mm/vmalloc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/vmalloc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/vmalloc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/vmalloc.c 2010-09-13 08:10:12.000000000 -0400
@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
pte = pte_offset_kernel(pmd, addr);
@@ -54378,8 +54404,8 @@ diff -urNp linux-2.6.32.21/mm/vmalloc.c linux-2.6.32.21/mm/vmalloc.c
{
struct vm_struct *area;
diff -urNp linux-2.6.32.21/mm/vmstat.c linux-2.6.32.21/mm/vmstat.c
---- linux-2.6.32.21/mm/vmstat.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/mm/vmstat.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/mm/vmstat.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/mm/vmstat.c 2010-09-13 08:10:12.000000000 -0400
@@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
*
* vm_stat contains the global counters
@@ -54429,8 +54455,8 @@ diff -urNp linux-2.6.32.21/mm/vmstat.c linux-2.6.32.21/mm/vmstat.c
return 0;
}
diff -urNp linux-2.6.32.21/net/8021q/vlan.c linux-2.6.32.21/net/8021q/vlan.c
---- linux-2.6.32.21/net/8021q/vlan.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/8021q/vlan.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/8021q/vlan.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/8021q/vlan.c 2010-09-13 08:10:12.000000000 -0400
@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
@@ -54442,8 +54468,8 @@ diff -urNp linux-2.6.32.21/net/8021q/vlan.c linux-2.6.32.21/net/8021q/vlan.c
vn = net_generic(net, vlan_net_id);
diff -urNp linux-2.6.32.21/net/atm/atm_misc.c linux-2.6.32.21/net/atm/atm_misc.c
---- linux-2.6.32.21/net/atm/atm_misc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/atm/atm_misc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/atm/atm_misc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/atm/atm_misc.c 2010-09-13 08:10:13.000000000 -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;
@@ -54481,8 +54507,8 @@ diff -urNp linux-2.6.32.21/net/atm/atm_misc.c linux-2.6.32.21/net/atm/atm_misc.c
#undef __HANDLE_ITEM
}
diff -urNp linux-2.6.32.21/net/atm/proc.c linux-2.6.32.21/net/atm/proc.c
---- linux-2.6.32.21/net/atm/proc.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/atm/proc.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/atm/proc.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/atm/proc.c 2010-09-13 08:10:13.000000000 -0400
@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
const struct k_atm_aal_stats *stats)
{
@@ -54497,8 +54523,8 @@ diff -urNp linux-2.6.32.21/net/atm/proc.c linux-2.6.32.21/net/atm/proc.c
static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
diff -urNp linux-2.6.32.21/net/atm/resources.c linux-2.6.32.21/net/atm/resources.c
---- linux-2.6.32.21/net/atm/resources.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/atm/resources.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/atm/resources.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/atm/resources.c 2010-09-13 08:10:13.000000000 -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)
@@ -54518,8 +54544,8 @@ diff -urNp linux-2.6.32.21/net/atm/resources.c linux-2.6.32.21/net/atm/resources
#undef __HANDLE_ITEM
}
diff -urNp linux-2.6.32.21/net/bridge/br_private.h linux-2.6.32.21/net/bridge/br_private.h
---- linux-2.6.32.21/net/bridge/br_private.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/bridge/br_private.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/bridge/br_private.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/bridge/br_private.h 2010-09-13 08:10:13.000000000 -0400
@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
#ifdef CONFIG_SYSFS
@@ -54530,8 +54556,8 @@ diff -urNp linux-2.6.32.21/net/bridge/br_private.h linux-2.6.32.21/net/bridge/br
/* br_sysfs_br.c */
diff -urNp linux-2.6.32.21/net/bridge/br_stp_if.c linux-2.6.32.21/net/bridge/br_stp_if.c
---- linux-2.6.32.21/net/bridge/br_stp_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/bridge/br_stp_if.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/bridge/br_stp_if.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/bridge/br_stp_if.c 2010-09-13 08:10:13.000000000 -0400
@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
char *envp[] = { NULL };
@@ -54542,8 +54568,8 @@ diff -urNp linux-2.6.32.21/net/bridge/br_stp_if.c linux-2.6.32.21/net/bridge/br_
br->dev->name, r);
diff -urNp linux-2.6.32.21/net/bridge/br_sysfs_if.c linux-2.6.32.21/net/bridge/br_sysfs_if.c
---- linux-2.6.32.21/net/bridge/br_sysfs_if.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/bridge/br_sysfs_if.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/bridge/br_sysfs_if.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/bridge/br_sysfs_if.c 2010-09-13 08:10:13.000000000 -0400
@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
return ret;
}
@@ -54554,8 +54580,8 @@ diff -urNp linux-2.6.32.21/net/bridge/br_sysfs_if.c linux-2.6.32.21/net/bridge/b
.store = brport_store,
};
diff -urNp linux-2.6.32.21/net/core/dev.c linux-2.6.32.21/net/core/dev.c
---- linux-2.6.32.21/net/core/dev.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/net/core/dev.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/net/core/dev.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/core/dev.c 2010-09-13 08:10:13.000000000 -0400
@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
}
EXPORT_SYMBOL(netif_rx_ni);
@@ -54575,8 +54601,8 @@ diff -urNp linux-2.6.32.21/net/core/dev.c linux-2.6.32.21/net/core/dev.c
struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
unsigned long time_limit = jiffies + 2;
diff -urNp linux-2.6.32.21/net/core/flow.c linux-2.6.32.21/net/core/flow.c
---- linux-2.6.32.21/net/core/flow.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/core/flow.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/core/flow.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/core/flow.c 2010-09-13 08:10:13.000000000 -0400
@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
static u32 flow_hash_shift;
@@ -54605,8 +54631,8 @@ diff -urNp linux-2.6.32.21/net/core/flow.c linux-2.6.32.21/net/core/flow.c
#define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
diff -urNp linux-2.6.32.21/net/dccp/ccids/ccid3.c linux-2.6.32.21/net/dccp/ccids/ccid3.c
---- linux-2.6.32.21/net/dccp/ccids/ccid3.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/dccp/ccids/ccid3.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/dccp/ccids/ccid3.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/dccp/ccids/ccid3.c 2010-09-13 08:10:13.000000000 -0400
@@ -41,7 +41,7 @@
static int ccid3_debug;
#define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a)
@@ -54617,8 +54643,8 @@ diff -urNp linux-2.6.32.21/net/dccp/ccids/ccid3.c linux-2.6.32.21/net/dccp/ccids
/*
diff -urNp linux-2.6.32.21/net/dccp/dccp.h linux-2.6.32.21/net/dccp/dccp.h
---- linux-2.6.32.21/net/dccp/dccp.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/dccp/dccp.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/dccp/dccp.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/dccp/dccp.h 2010-09-13 08:10:13.000000000 -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)
@@ -54633,8 +54659,8 @@ diff -urNp linux-2.6.32.21/net/dccp/dccp.h linux-2.6.32.21/net/dccp/dccp.h
extern struct inet_hashinfo dccp_hashinfo;
diff -urNp linux-2.6.32.21/net/decnet/sysctl_net_decnet.c linux-2.6.32.21/net/decnet/sysctl_net_decnet.c
---- linux-2.6.32.21/net/decnet/sysctl_net_decnet.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/decnet/sysctl_net_decnet.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/decnet/sysctl_net_decnet.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/decnet/sysctl_net_decnet.c 2010-09-13 08:10:13.000000000 -0400
@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
if (len > *lenp) len = *lenp;
@@ -54654,8 +54680,8 @@ diff -urNp linux-2.6.32.21/net/decnet/sysctl_net_decnet.c linux-2.6.32.21/net/de
*lenp = len;
diff -urNp linux-2.6.32.21/net/ipv4/inet_hashtables.c linux-2.6.32.21/net/ipv4/inet_hashtables.c
---- linux-2.6.32.21/net/ipv4/inet_hashtables.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/inet_hashtables.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/inet_hashtables.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/inet_hashtables.c 2010-09-13 08:10:14.000000000 -0400
@@ -18,11 +18,14 @@
#include <linux/sched.h>
#include <linux/slab.h>
@@ -54681,8 +54707,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/inet_hashtables.c linux-2.6.32.21/net/ipv4/i
inet_twsk_deschedule(tw, death_row);
inet_twsk_put(tw);
diff -urNp linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-09-13 08:10:14.000000000 -0400
@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
*len = 0;
@@ -54693,8 +54719,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32.2
if (net_ratelimit())
printk("OOM in bsalg (%d)\n", __LINE__);
diff -urNp linux-2.6.32.21/net/ipv4/tcp_ipv4.c linux-2.6.32.21/net/ipv4/tcp_ipv4.c
---- linux-2.6.32.21/net/ipv4/tcp_ipv4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/tcp_ipv4.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/tcp_ipv4.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/tcp_ipv4.c 2010-09-13 08:10:14.000000000 -0400
@@ -84,6 +84,9 @@
int sysctl_tcp_tw_reuse __read_mostly;
int sysctl_tcp_low_latency __read_mostly;
@@ -54750,8 +54776,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/tcp_ipv4.c linux-2.6.32.21/net/ipv4/tcp_ipv4
}
diff -urNp linux-2.6.32.21/net/ipv4/tcp_minisocks.c linux-2.6.32.21/net/ipv4/tcp_minisocks.c
---- linux-2.6.32.21/net/ipv4/tcp_minisocks.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/tcp_minisocks.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/tcp_minisocks.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/tcp_minisocks.c 2010-09-13 08:10:14.000000000 -0400
@@ -26,6 +26,10 @@
#include <net/inet_common.h>
#include <net/xfrm.h>
@@ -54775,8 +54801,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/tcp_minisocks.c linux-2.6.32.21/net/ipv4/tcp
req->rsk_ops->send_reset(sk, skb);
diff -urNp linux-2.6.32.21/net/ipv4/tcp_probe.c linux-2.6.32.21/net/ipv4/tcp_probe.c
---- linux-2.6.32.21/net/ipv4/tcp_probe.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/tcp_probe.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/tcp_probe.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/tcp_probe.c 2010-09-13 08:10:14.000000000 -0400
@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
if (cnt + width >= len)
break;
@@ -54787,8 +54813,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/tcp_probe.c linux-2.6.32.21/net/ipv4/tcp_pro
cnt += width;
}
diff -urNp linux-2.6.32.21/net/ipv4/tcp_timer.c linux-2.6.32.21/net/ipv4/tcp_timer.c
---- linux-2.6.32.21/net/ipv4/tcp_timer.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/tcp_timer.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/tcp_timer.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/tcp_timer.c 2010-09-13 08:10:14.000000000 -0400
@@ -21,6 +21,10 @@
#include <linux/module.h>
#include <net/tcp.h>
@@ -54815,8 +54841,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/tcp_timer.c linux-2.6.32.21/net/ipv4/tcp_tim
/* Has it gone just too far? */
tcp_write_err(sk);
diff -urNp linux-2.6.32.21/net/ipv4/udp.c linux-2.6.32.21/net/ipv4/udp.c
---- linux-2.6.32.21/net/ipv4/udp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv4/udp.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv4/udp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv4/udp.c 2010-09-13 08:10:14.000000000 -0400
@@ -86,6 +86,7 @@
#include <linux/types.h>
#include <linux/fcntl.h>
@@ -54887,8 +54913,8 @@ diff -urNp linux-2.6.32.21/net/ipv4/udp.c linux-2.6.32.21/net/ipv4/udp.c
/*
diff -urNp linux-2.6.32.21/net/ipv6/exthdrs.c linux-2.6.32.21/net/ipv6/exthdrs.c
---- linux-2.6.32.21/net/ipv6/exthdrs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv6/exthdrs.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv6/exthdrs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv6/exthdrs.c 2010-09-13 08:10:14.000000000 -0400
@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
@@ -54899,8 +54925,8 @@ diff -urNp linux-2.6.32.21/net/ipv6/exthdrs.c linux-2.6.32.21/net/ipv6/exthdrs.c
int ipv6_parse_hopopts(struct sk_buff *skb)
diff -urNp linux-2.6.32.21/net/ipv6/raw.c linux-2.6.32.21/net/ipv6/raw.c
---- linux-2.6.32.21/net/ipv6/raw.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv6/raw.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv6/raw.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv6/raw.c 2010-09-13 08:10:14.000000000 -0400
@@ -600,7 +600,7 @@ out:
return err;
}
@@ -54911,8 +54937,8 @@ diff -urNp linux-2.6.32.21/net/ipv6/raw.c linux-2.6.32.21/net/ipv6/raw.c
unsigned int flags)
{
diff -urNp linux-2.6.32.21/net/ipv6/tcp_ipv6.c linux-2.6.32.21/net/ipv6/tcp_ipv6.c
---- linux-2.6.32.21/net/ipv6/tcp_ipv6.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv6/tcp_ipv6.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv6/tcp_ipv6.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv6/tcp_ipv6.c 2010-09-13 08:10:14.000000000 -0400
@@ -88,6 +88,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
}
#endif
@@ -54969,8 +54995,8 @@ diff -urNp linux-2.6.32.21/net/ipv6/tcp_ipv6.c linux-2.6.32.21/net/ipv6/tcp_ipv6
}
diff -urNp linux-2.6.32.21/net/ipv6/udp.c linux-2.6.32.21/net/ipv6/udp.c
---- linux-2.6.32.21/net/ipv6/udp.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/ipv6/udp.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/ipv6/udp.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/ipv6/udp.c 2010-09-13 08:10:14.000000000 -0400
@@ -49,6 +49,10 @@
#include <linux/seq_file.h>
#include "udp_impl.h"
@@ -54993,8 +55019,8 @@ diff -urNp linux-2.6.32.21/net/ipv6/udp.c linux-2.6.32.21/net/ipv6/udp.c
kfree_skb(skb);
diff -urNp linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c
---- linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c 2010-09-13 08:10:14.000000000 -0400
@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
add_wait_queue(&self->open_wait, &wait);
@@ -55118,8 +55144,8 @@ diff -urNp linux-2.6.32.21/net/irda/ircomm/ircomm_tty.c linux-2.6.32.21/net/irda
seq_printf(m, "Max header size: %d\n", self->max_header_size);
diff -urNp linux-2.6.32.21/net/mac80211/ieee80211_i.h linux-2.6.32.21/net/mac80211/ieee80211_i.h
---- linux-2.6.32.21/net/mac80211/ieee80211_i.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/ieee80211_i.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/ieee80211_i.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/ieee80211_i.h 2010-09-13 08:10:14.000000000 -0400
@@ -635,7 +635,7 @@ struct ieee80211_local {
/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
spinlock_t queue_stop_reason_lock;
@@ -55130,8 +55156,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/ieee80211_i.h linux-2.6.32.21/net/mac802
/* number of interfaces with corresponding FIF_ flags */
int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
diff -urNp linux-2.6.32.21/net/mac80211/iface.c linux-2.6.32.21/net/mac80211/iface.c
---- linux-2.6.32.21/net/mac80211/iface.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/iface.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/iface.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/iface.c 2010-09-13 08:10:14.000000000 -0400
@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
break;
}
@@ -55187,8 +55213,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/iface.c linux-2.6.32.21/net/mac80211/ifa
ieee80211_stop_device(local);
diff -urNp linux-2.6.32.21/net/mac80211/main.c linux-2.6.32.21/net/mac80211/main.c
---- linux-2.6.32.21/net/mac80211/main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/main.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/main.c 2010-09-13 08:10:14.000000000 -0400
@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
local->hw.conf.power_level = power;
}
@@ -55199,8 +55225,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/main.c linux-2.6.32.21/net/mac80211/main
/*
* Goal:
diff -urNp linux-2.6.32.21/net/mac80211/pm.c linux-2.6.32.21/net/mac80211/pm.c
---- linux-2.6.32.21/net/mac80211/pm.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/pm.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/pm.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/pm.c 2010-09-13 08:10:14.000000000 -0400
@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
}
@@ -55211,8 +55237,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/pm.c linux-2.6.32.21/net/mac80211/pm.c
local->suspended = true;
diff -urNp linux-2.6.32.21/net/mac80211/rate.c linux-2.6.32.21/net/mac80211/rate.c
---- linux-2.6.32.21/net/mac80211/rate.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/rate.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/rate.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/rate.c 2010-09-13 08:10:14.000000000 -0400
@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
struct rate_control_ref *ref, *old;
@@ -55223,8 +55249,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/rate.c linux-2.6.32.21/net/mac80211/rate
ref = rate_control_alloc(name, local);
diff -urNp linux-2.6.32.21/net/mac80211/tx.c linux-2.6.32.21/net/mac80211/tx.c
---- linux-2.6.32.21/net/mac80211/tx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/tx.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/tx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/tx.c 2010-09-13 08:10:14.000000000 -0400
@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
return cpu_to_le16(dur);
}
@@ -55235,8 +55261,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/tx.c linux-2.6.32.21/net/mac80211/tx.c
{
return local == wdev_priv(dev->ieee80211_ptr);
diff -urNp linux-2.6.32.21/net/mac80211/util.c linux-2.6.32.21/net/mac80211/util.c
---- linux-2.6.32.21/net/mac80211/util.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/mac80211/util.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/mac80211/util.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/mac80211/util.c 2010-09-13 08:10:14.000000000 -0400
@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
local->resuming = true;
@@ -55255,8 +55281,8 @@ diff -urNp linux-2.6.32.21/net/mac80211/util.c linux-2.6.32.21/net/mac80211/util
WARN(local->suspended, "Harware became unavailable "
"upon resume. This is could be a software issue"
diff -urNp linux-2.6.32.21/net/sctp/socket.c linux-2.6.32.21/net/sctp/socket.c
---- linux-2.6.32.21/net/sctp/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/sctp/socket.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/sctp/socket.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/sctp/socket.c 2010-09-13 08:10:14.000000000 -0400
@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
struct sctp_sndrcvinfo *sinfo;
struct sctp_initmsg *sinit;
@@ -55275,8 +55301,8 @@ diff -urNp linux-2.6.32.21/net/sctp/socket.c linux-2.6.32.21/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.32.21/net/socket.c linux-2.6.32.21/net/socket.c
---- linux-2.6.32.21/net/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/socket.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/socket.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/socket.c 2010-09-13 08:10:14.000000000 -0400
@@ -87,6 +87,7 @@
#include <linux/wireless.h>
#include <linux/nsproxy.h>
@@ -55432,8 +55458,8 @@ diff -urNp linux-2.6.32.21/net/socket.c linux-2.6.32.21/net/socket.c
security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
if (err)
diff -urNp linux-2.6.32.21/net/sunrpc/sched.c linux-2.6.32.21/net/sunrpc/sched.c
---- linux-2.6.32.21/net/sunrpc/sched.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/sunrpc/sched.c 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/net/sunrpc/sched.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/sunrpc/sched.c 2010-09-13 08:10:14.000000000 -0400
@@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *w
#ifdef RPC_DEBUG
static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -55448,8 +55474,8 @@ diff -urNp linux-2.6.32.21/net/sunrpc/sched.c linux-2.6.32.21/net/sunrpc/sched.c
#else
static inline void rpc_task_set_debuginfo(struct rpc_task *task)
diff -urNp linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c 2010-09-13 08:10:14.000000000 -0400
@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
len -= *ppos;
if (len > *lenp)
@@ -55460,8 +55486,8 @@ diff -urNp linux-2.6.32.21/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.21/net/su
*lenp = len;
*ppos += len;
diff -urNp linux-2.6.32.21/net/sysctl_net.c linux-2.6.32.21/net/sysctl_net.c
---- linux-2.6.32.21/net/sysctl_net.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/sysctl_net.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/sysctl_net.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/sysctl_net.c 2010-09-13 08:10:14.000000000 -0400
@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
struct ctl_table *table)
{
@@ -55472,8 +55498,8 @@ diff -urNp linux-2.6.32.21/net/sysctl_net.c linux-2.6.32.21/net/sysctl_net.c
return (mode << 6) | (mode << 3) | mode;
}
diff -urNp linux-2.6.32.21/net/tipc/socket.c linux-2.6.32.21/net/tipc/socket.c
---- linux-2.6.32.21/net/tipc/socket.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/tipc/socket.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/tipc/socket.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/tipc/socket.c 2010-09-13 08:10:14.000000000 -0400
@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
} else {
if (res == 0)
@@ -55487,8 +55513,8 @@ diff -urNp linux-2.6.32.21/net/tipc/socket.c linux-2.6.32.21/net/tipc/socket.c
}
diff -urNp linux-2.6.32.21/net/unix/af_unix.c linux-2.6.32.21/net/unix/af_unix.c
---- linux-2.6.32.21/net/unix/af_unix.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/unix/af_unix.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/unix/af_unix.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/unix/af_unix.c 2010-09-13 08:10:14.000000000 -0400
@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
err = -ECONNREFUSED;
if (!S_ISSOCK(inode->i_mode))
@@ -55547,8 +55573,8 @@ diff -urNp linux-2.6.32.21/net/unix/af_unix.c linux-2.6.32.21/net/unix/af_unix.c
} else {
list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
diff -urNp linux-2.6.32.21/net/wireless/wext.c linux-2.6.32.21/net/wireless/wext.c
---- linux-2.6.32.21/net/wireless/wext.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/wireless/wext.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/wireless/wext.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/wireless/wext.c 2010-09-13 08:10:14.000000000 -0400
@@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struc
*/
@@ -55560,8 +55586,8 @@ diff -urNp linux-2.6.32.21/net/wireless/wext.c linux-2.6.32.21/net/wireless/wext
* we can support any size GET requests.
* There is still a limit : -ENOMEM.
diff -urNp linux-2.6.32.21/net/xfrm/xfrm_policy.c linux-2.6.32.21/net/xfrm/xfrm_policy.c
---- linux-2.6.32.21/net/xfrm/xfrm_policy.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/net/xfrm/xfrm_policy.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/net/xfrm/xfrm_policy.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/net/xfrm/xfrm_policy.c 2010-09-13 08:10:14.000000000 -0400
@@ -1477,7 +1477,7 @@ free_dst:
goto out;
}
@@ -55590,8 +55616,8 @@ diff -urNp linux-2.6.32.21/net/xfrm/xfrm_policy.c linux-2.6.32.21/net/xfrm/xfrm_
{
#ifdef CONFIG_XFRM_SUB_POLICY
diff -urNp linux-2.6.32.21/samples/kobject/kset-example.c linux-2.6.32.21/samples/kobject/kset-example.c
---- linux-2.6.32.21/samples/kobject/kset-example.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/samples/kobject/kset-example.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/samples/kobject/kset-example.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/samples/kobject/kset-example.c 2010-09-13 08:10:14.000000000 -0400
@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
}
@@ -55602,8 +55628,8 @@ diff -urNp linux-2.6.32.21/samples/kobject/kset-example.c linux-2.6.32.21/sample
.store = foo_attr_store,
};
diff -urNp linux-2.6.32.21/scripts/basic/fixdep.c linux-2.6.32.21/scripts/basic/fixdep.c
---- linux-2.6.32.21/scripts/basic/fixdep.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/basic/fixdep.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/basic/fixdep.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/basic/fixdep.c 2010-09-13 08:10:14.000000000 -0400
@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
static void parse_config_file(char *map, size_t len)
@@ -55626,8 +55652,8 @@ diff -urNp linux-2.6.32.21/scripts/basic/fixdep.c linux-2.6.32.21/scripts/basic/
if (*p != INT_CONF) {
fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
diff -urNp linux-2.6.32.21/scripts/kallsyms.c linux-2.6.32.21/scripts/kallsyms.c
---- linux-2.6.32.21/scripts/kallsyms.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/kallsyms.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/kallsyms.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/kallsyms.c 2010-09-13 08:10:14.000000000 -0400
@@ -43,10 +43,10 @@ struct text_range {
static unsigned long long _text;
@@ -55644,8 +55670,8 @@ diff -urNp linux-2.6.32.21/scripts/kallsyms.c linux-2.6.32.21/scripts/kallsyms.c
#define text_range_text (&text_ranges[0])
#define text_range_inittext (&text_ranges[1])
diff -urNp linux-2.6.32.21/scripts/mod/file2alias.c linux-2.6.32.21/scripts/mod/file2alias.c
---- linux-2.6.32.21/scripts/mod/file2alias.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/mod/file2alias.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/mod/file2alias.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/mod/file2alias.c 2010-09-13 08:10:14.000000000 -0400
@@ -72,7 +72,7 @@ static void device_id_check(const char *
unsigned long size, unsigned long id_size,
void *symval)
@@ -55701,8 +55727,8 @@ diff -urNp linux-2.6.32.21/scripts/mod/file2alias.c linux-2.6.32.21/scripts/mod/
sprintf(alias, "dmi*");
diff -urNp linux-2.6.32.21/scripts/mod/modpost.c linux-2.6.32.21/scripts/mod/modpost.c
---- linux-2.6.32.21/scripts/mod/modpost.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/mod/modpost.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/mod/modpost.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/mod/modpost.c 2010-09-13 08:10:14.000000000 -0400
@@ -835,6 +835,7 @@ enum mismatch {
INIT_TO_EXIT,
EXIT_TO_INIT,
@@ -55771,8 +55797,8 @@ diff -urNp linux-2.6.32.21/scripts/mod/modpost.c linux-2.6.32.21/scripts/mod/mod
tmp = NOFAIL(malloc(b->pos));
diff -urNp linux-2.6.32.21/scripts/mod/modpost.h linux-2.6.32.21/scripts/mod/modpost.h
---- linux-2.6.32.21/scripts/mod/modpost.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/mod/modpost.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/mod/modpost.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/mod/modpost.h 2010-09-13 08:10:14.000000000 -0400
@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
struct buffer {
@@ -55793,8 +55819,8 @@ diff -urNp linux-2.6.32.21/scripts/mod/modpost.h linux-2.6.32.21/scripts/mod/mod
struct module {
struct module *next;
diff -urNp linux-2.6.32.21/scripts/mod/sumversion.c linux-2.6.32.21/scripts/mod/sumversion.c
---- linux-2.6.32.21/scripts/mod/sumversion.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/mod/sumversion.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/mod/sumversion.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/mod/sumversion.c 2010-09-13 08:10:14.000000000 -0400
@@ -455,7 +455,7 @@ static void write_version(const char *fi
goto out;
}
@@ -55805,8 +55831,8 @@ diff -urNp linux-2.6.32.21/scripts/mod/sumversion.c linux-2.6.32.21/scripts/mod/
filename, strerror(errno));
goto out;
diff -urNp linux-2.6.32.21/scripts/pnmtologo.c linux-2.6.32.21/scripts/pnmtologo.c
---- linux-2.6.32.21/scripts/pnmtologo.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/scripts/pnmtologo.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/scripts/pnmtologo.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/scripts/pnmtologo.c 2010-09-13 08:10:14.000000000 -0400
@@ -237,14 +237,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out);
@@ -55833,90 +55859,9 @@ diff -urNp linux-2.6.32.21/scripts/pnmtologo.c linux-2.6.32.21/scripts/pnmtologo
logoname);
write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-2.6.32.21/security/commoncap.c linux-2.6.32.21/security/commoncap.c
---- linux-2.6.32.21/security/commoncap.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/commoncap.c 2010-08-13 18:34:41.000000000 -0400
-@@ -27,7 +27,7 @@
- #include <linux/sched.h>
- #include <linux/prctl.h>
- #include <linux/securebits.h>
--
-+#include <net/sock.h>
- /*
- * If a non-root user executes a setuid-root binary in
- * !secure(SECURE_NOROOT) mode, then we raise capabilities.
-@@ -50,9 +50,11 @@ static void warn_setuid_and_fcaps_mixed(
- }
- }
-
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
-- NETLINK_CB(skb).eff_cap = current_cap();
-+ NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
- return 0;
- }
-
-diff -urNp linux-2.6.32.21/security/integrity/ima/ima_api.c linux-2.6.32.21/security/integrity/ima/ima_api.c
---- linux-2.6.32.21/security/integrity/ima/ima_api.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/integrity/ima/ima_api.c 2010-08-13 18:34:41.000000000 -0400
-@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
- int result;
-
- /* can overflow, only indicator */
-- atomic_long_inc(&ima_htable.violations);
-+ atomic_long_inc_unchecked(&ima_htable.violations);
-
- entry = kmalloc(sizeof(*entry), GFP_KERNEL);
- if (!entry) {
-diff -urNp linux-2.6.32.21/security/integrity/ima/ima_fs.c linux-2.6.32.21/security/integrity/ima/ima_fs.c
---- linux-2.6.32.21/security/integrity/ima/ima_fs.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/integrity/ima/ima_fs.c 2010-08-13 18:34:41.000000000 -0400
-@@ -27,12 +27,12 @@
- static int valid_policy = 1;
- #define TMPBUFLEN 12
- static ssize_t ima_show_htable_value(char __user *buf, size_t count,
-- loff_t *ppos, atomic_long_t *val)
-+ loff_t *ppos, atomic_long_unchecked_t *val)
- {
- char tmpbuf[TMPBUFLEN];
- ssize_t len;
-
-- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
-+ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
- return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
- }
-
-diff -urNp linux-2.6.32.21/security/integrity/ima/ima.h linux-2.6.32.21/security/integrity/ima/ima.h
---- linux-2.6.32.21/security/integrity/ima/ima.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/integrity/ima/ima.h 2010-08-13 18:34:41.000000000 -0400
-@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
- extern spinlock_t ima_queue_lock;
-
- struct ima_h_table {
-- atomic_long_t len; /* number of stored measurements in the list */
-- atomic_long_t violations;
-+ atomic_long_unchecked_t len; /* number of stored measurements in the list */
-+ atomic_long_unchecked_t violations;
- struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
- };
- extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.21/security/integrity/ima/ima_queue.c linux-2.6.32.21/security/integrity/ima/ima_queue.c
---- linux-2.6.32.21/security/integrity/ima/ima_queue.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/integrity/ima/ima_queue.c 2010-08-13 18:34:41.000000000 -0400
-@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
- INIT_LIST_HEAD(&qe->later);
- list_add_tail_rcu(&qe->later, &ima_measurements);
-
-- atomic_long_inc(&ima_htable.len);
-+ atomic_long_inc_unchecked(&ima_htable.len);
- key = ima_hash_key(entry->digest);
- hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
- return 0;
diff -urNp linux-2.6.32.21/security/Kconfig linux-2.6.32.21/security/Kconfig
---- linux-2.6.32.21/security/Kconfig 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/Kconfig 2010-08-29 21:40:54.000000000 -0400
+--- linux-2.6.32.21/security/Kconfig 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/Kconfig 2010-09-13 08:10:14.000000000 -0400
@@ -4,6 +4,501 @@
menu "Security options"
@@ -56428,9 +56373,90 @@ diff -urNp linux-2.6.32.21/security/Kconfig linux-2.6.32.21/security/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.32.21/security/commoncap.c linux-2.6.32.21/security/commoncap.c
+--- linux-2.6.32.21/security/commoncap.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/commoncap.c 2010-09-13 08:10:14.000000000 -0400
+@@ -27,7 +27,7 @@
+ #include <linux/sched.h>
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
+-
++#include <net/sock.h>
+ /*
+ * If a non-root user executes a setuid-root binary in
+ * !secure(SECURE_NOROOT) mode, then we raise capabilities.
+@@ -50,9 +50,11 @@ static void warn_setuid_and_fcaps_mixed(
+ }
+ }
+
++extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
++
+ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ {
+- NETLINK_CB(skb).eff_cap = current_cap();
++ NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
+ return 0;
+ }
+
+diff -urNp linux-2.6.32.21/security/integrity/ima/ima.h linux-2.6.32.21/security/integrity/ima/ima.h
+--- linux-2.6.32.21/security/integrity/ima/ima.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/integrity/ima/ima.h 2010-09-13 08:10:14.000000000 -0400
+@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
+ extern spinlock_t ima_queue_lock;
+
+ struct ima_h_table {
+- atomic_long_t len; /* number of stored measurements in the list */
+- atomic_long_t violations;
++ atomic_long_unchecked_t len; /* number of stored measurements in the list */
++ atomic_long_unchecked_t violations;
+ struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
+ };
+ extern struct ima_h_table ima_htable;
+diff -urNp linux-2.6.32.21/security/integrity/ima/ima_api.c linux-2.6.32.21/security/integrity/ima/ima_api.c
+--- linux-2.6.32.21/security/integrity/ima/ima_api.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/integrity/ima/ima_api.c 2010-09-13 08:10:14.000000000 -0400
+@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
+ int result;
+
+ /* can overflow, only indicator */
+- atomic_long_inc(&ima_htable.violations);
++ atomic_long_inc_unchecked(&ima_htable.violations);
+
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ if (!entry) {
+diff -urNp linux-2.6.32.21/security/integrity/ima/ima_fs.c linux-2.6.32.21/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.21/security/integrity/ima/ima_fs.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/integrity/ima/ima_fs.c 2010-09-13 08:10:14.000000000 -0400
+@@ -27,12 +27,12 @@
+ static int valid_policy = 1;
+ #define TMPBUFLEN 12
+ static ssize_t ima_show_htable_value(char __user *buf, size_t count,
+- loff_t *ppos, atomic_long_t *val)
++ loff_t *ppos, atomic_long_unchecked_t *val)
+ {
+ char tmpbuf[TMPBUFLEN];
+ ssize_t len;
+
+- len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
++ len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
+ return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+ }
+
+diff -urNp linux-2.6.32.21/security/integrity/ima/ima_queue.c linux-2.6.32.21/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.21/security/integrity/ima/ima_queue.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/integrity/ima/ima_queue.c 2010-09-13 08:10:14.000000000 -0400
+@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
+ INIT_LIST_HEAD(&qe->later);
+ list_add_tail_rcu(&qe->later, &ima_measurements);
+
+- atomic_long_inc(&ima_htable.len);
++ atomic_long_inc_unchecked(&ima_htable.len);
+ key = ima_hash_key(entry->digest);
+ hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
+ return 0;
diff -urNp linux-2.6.32.21/security/min_addr.c linux-2.6.32.21/security/min_addr.c
---- linux-2.6.32.21/security/min_addr.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/security/min_addr.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/security/min_addr.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/security/min_addr.c 2010-09-13 08:10:14.000000000 -0400
@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
*/
static void update_mmap_min_addr(void)
@@ -56448,8 +56474,8 @@ diff -urNp linux-2.6.32.21/security/min_addr.c linux-2.6.32.21/security/min_addr
/*
diff -urNp linux-2.6.32.21/sound/aoa/codecs/onyx.c linux-2.6.32.21/sound/aoa/codecs/onyx.c
---- linux-2.6.32.21/sound/aoa/codecs/onyx.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/aoa/codecs/onyx.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/aoa/codecs/onyx.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/aoa/codecs/onyx.c 2010-09-13 08:10:14.000000000 -0400
@@ -53,7 +53,7 @@ struct onyx {
spdif_locked:1,
analog_locked:1,
@@ -56479,8 +56505,8 @@ diff -urNp linux-2.6.32.21/sound/aoa/codecs/onyx.c linux-2.6.32.21/sound/aoa/cod
mutex_unlock(&onyx->mutex);
diff -urNp linux-2.6.32.21/sound/core/oss/pcm_oss.c linux-2.6.32.21/sound/core/oss/pcm_oss.c
---- linux-2.6.32.21/sound/core/oss/pcm_oss.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/core/oss/pcm_oss.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/core/oss/pcm_oss.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/core/oss/pcm_oss.c 2010-09-13 08:10:14.000000000 -0400
@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
}
}
@@ -56493,8 +56519,8 @@ diff -urNp linux-2.6.32.21/sound/core/oss/pcm_oss.c linux-2.6.32.21/sound/core/o
/*
diff -urNp linux-2.6.32.21/sound/core/seq/seq_lock.h linux-2.6.32.21/sound/core/seq/seq_lock.h
---- linux-2.6.32.21/sound/core/seq/seq_lock.h 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/core/seq/seq_lock.h 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/core/seq/seq_lock.h 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/core/seq/seq_lock.h 2010-09-13 08:10:14.000000000 -0400
@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
#else /* SMP || CONFIG_SND_DEBUG */
@@ -56511,8 +56537,8 @@ diff -urNp linux-2.6.32.21/sound/core/seq/seq_lock.h linux-2.6.32.21/sound/core/
#endif /* SMP || CONFIG_SND_DEBUG */
diff -urNp linux-2.6.32.21/sound/drivers/mts64.c linux-2.6.32.21/sound/drivers/mts64.c
---- linux-2.6.32.21/sound/drivers/mts64.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/drivers/mts64.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/drivers/mts64.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/drivers/mts64.c 2010-09-13 08:10:14.000000000 -0400
@@ -65,7 +65,7 @@ struct mts64 {
struct pardevice *pardev;
int pardev_claimed;
@@ -56562,8 +56588,8 @@ diff -urNp linux-2.6.32.21/sound/drivers/mts64.c linux-2.6.32.21/sound/drivers/m
return 0;
}
diff -urNp linux-2.6.32.21/sound/drivers/portman2x4.c linux-2.6.32.21/sound/drivers/portman2x4.c
---- linux-2.6.32.21/sound/drivers/portman2x4.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/drivers/portman2x4.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/drivers/portman2x4.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/drivers/portman2x4.c 2010-09-13 08:10:14.000000000 -0400
@@ -83,7 +83,7 @@ struct portman {
struct pardevice *pardev;
int pardev_claimed;
@@ -56574,8 +56600,8 @@ diff -urNp linux-2.6.32.21/sound/drivers/portman2x4.c linux-2.6.32.21/sound/driv
struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
};
diff -urNp linux-2.6.32.21/sound/oss/sb_audio.c linux-2.6.32.21/sound/oss/sb_audio.c
---- linux-2.6.32.21/sound/oss/sb_audio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/oss/sb_audio.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/oss/sb_audio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/oss/sb_audio.c 2010-09-13 08:10:14.000000000 -0400
@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
buf16 = (signed short *)(localbuf + localoffs);
while (c)
@@ -56586,8 +56612,8 @@ diff -urNp linux-2.6.32.21/sound/oss/sb_audio.c linux-2.6.32.21/sound/oss/sb_aud
userbuf+useroffs + p,
locallen))
diff -urNp linux-2.6.32.21/sound/pci/ac97/ac97_codec.c linux-2.6.32.21/sound/pci/ac97/ac97_codec.c
---- linux-2.6.32.21/sound/pci/ac97/ac97_codec.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/ac97/ac97_codec.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/pci/ac97/ac97_codec.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/ac97/ac97_codec.c 2010-09-13 08:10:14.000000000 -0400
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
}
@@ -56598,8 +56624,8 @@ diff -urNp linux-2.6.32.21/sound/pci/ac97/ac97_codec.c linux-2.6.32.21/sound/pci
#ifdef CONFIG_SND_AC97_POWER_SAVE
static void do_update_power(struct work_struct *work)
diff -urNp linux-2.6.32.21/sound/pci/ac97/ac97_patch.c linux-2.6.32.21/sound/pci/ac97/ac97_patch.c
---- linux-2.6.32.21/sound/pci/ac97/ac97_patch.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/ac97/ac97_patch.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/pci/ac97/ac97_patch.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/ac97/ac97_patch.c 2010-09-13 08:10:14.000000000 -0400
@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
return 0;
}
@@ -56907,8 +56933,8 @@ diff -urNp linux-2.6.32.21/sound/pci/ac97/ac97_patch.c linux-2.6.32.21/sound/pci
};
diff -urNp linux-2.6.32.21/sound/pci/ens1370.c linux-2.6.32.21/sound/pci/ens1370.c
---- linux-2.6.32.21/sound/pci/ens1370.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/ens1370.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/pci/ens1370.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/ens1370.c 2010-09-13 08:10:14.000000000 -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 */
@@ -56919,8 +56945,8 @@ diff -urNp linux-2.6.32.21/sound/pci/ens1370.c linux-2.6.32.21/sound/pci/ens1370
MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
diff -urNp linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c
---- linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c 2010-09-13 08:10:14.000000000 -0400
@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
cp_ready);
@@ -56937,8 +56963,8 @@ diff -urNp linux-2.6.32.21/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.21/sound
diff -urNp linux-2.6.32.21/sound/pci/intel8x0.c linux-2.6.32.21/sound/pci/intel8x0.c
---- linux-2.6.32.21/sound/pci/intel8x0.c 2010-08-29 21:08:20.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/intel8x0.c 2010-08-29 21:09:26.000000000 -0400
+--- linux-2.6.32.21/sound/pci/intel8x0.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/intel8x0.c 2010-09-13 08:10:14.000000000 -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 */
@@ -56958,8 +56984,8 @@ diff -urNp linux-2.6.32.21/sound/pci/intel8x0.c linux-2.6.32.21/sound/pci/intel8
static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
diff -urNp linux-2.6.32.21/sound/pci/intel8x0m.c linux-2.6.32.21/sound/pci/intel8x0m.c
---- linux-2.6.32.21/sound/pci/intel8x0m.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/sound/pci/intel8x0m.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/sound/pci/intel8x0m.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/sound/pci/intel8x0m.c 2010-09-13 08:10:14.000000000 -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 */
@@ -56979,8 +57005,8 @@ diff -urNp linux-2.6.32.21/sound/pci/intel8x0m.c linux-2.6.32.21/sound/pci/intel
static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
diff -urNp linux-2.6.32.21/usr/gen_init_cpio.c linux-2.6.32.21/usr/gen_init_cpio.c
---- linux-2.6.32.21/usr/gen_init_cpio.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/usr/gen_init_cpio.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/usr/gen_init_cpio.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/usr/gen_init_cpio.c 2010-09-13 08:10:14.000000000 -0400
@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
int retval;
int rc = -1;
@@ -57004,8 +57030,8 @@ diff -urNp linux-2.6.32.21/usr/gen_init_cpio.c linux-2.6.32.21/usr/gen_init_cpio
break;
}
diff -urNp linux-2.6.32.21/virt/kvm/kvm_main.c linux-2.6.32.21/virt/kvm/kvm_main.c
---- linux-2.6.32.21/virt/kvm/kvm_main.c 2010-08-13 16:24:37.000000000 -0400
-+++ linux-2.6.32.21/virt/kvm/kvm_main.c 2010-08-13 18:34:41.000000000 -0400
+--- linux-2.6.32.21/virt/kvm/kvm_main.c 2010-08-26 19:42:20.000000000 -0400
++++ linux-2.6.32.21/virt/kvm/kvm_main.c 2010-09-13 08:10:14.000000000 -0400
@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
return 0;
}
diff --git a/main/samba/APKBUILD b/main/samba/APKBUILD
index d7eb21465..e17b24d04 100644
--- a/main/samba/APKBUILD
+++ b/main/samba/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=samba
-pkgver=3.5.4
-pkgrel=1
+pkgver=3.5.5
+pkgrel=0
pkgdesc="Tools to access a server's filespace and printers via SMB"
url="http://www.samba.org"
license="GPL3"
@@ -118,7 +118,7 @@ tdb() {
usr/bin/tdb*
}
-md5sums="22c8c977eaa18be50f3878c6d0e0c2f0 samba-3.5.4.tar.gz
+md5sums="278728aeeef9db7e27fa6a2ce5b43509 samba-3.5.5.tar.gz
c8a7f6ac5df2f73dbf023e25ea39927b samba.initd
c150433426e18261e6e3eed3930e1a76 samba.confd
b7cafabfb4fa5b3ab5f2e857d8d1c733 samba.logrotate
diff --git a/main/sudo/APKBUILD b/main/sudo/APKBUILD
index 3ed4d5828..d2153b081 100644
--- a/main/sudo/APKBUILD
+++ b/main/sudo/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sudo
-pkgver=1.7.4_p3
+pkgver=1.7.4_p4
if [ "${pkgver%_*}" != "$pkgver" ]; then
_realver=${pkgver%_*}${pkgver#*_}
else
@@ -31,4 +31,4 @@ package() {
make -j1 DESTDIR="$pkgdir" install || return 1
}
-md5sums="950994a454a3eb7a74df5f4bc863bd2b sudo-1.7.4p3.tar.gz"
+md5sums="55d9906535d70a1de347cd3d3550ee87 sudo-1.7.4p4.tar.gz"
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD
index 5fed8f70c..d0683fc94 100644
--- a/main/util-vserver/APKBUILD
+++ b/main/util-vserver/APKBUILD
@@ -2,7 +2,7 @@
pkgname=util-vserver
pkgver=0.30.216_pre2882
_realver=0.30.216-pre2883
-pkgrel=0
+pkgrel=1
pkgdesc="Linux-VServer admin utilities"
url="http://www.nongnu.org/util-vserver/"
license="GPL"
@@ -70,4 +70,4 @@ ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch
da8b70c4fd40e68894b3903ffd121397 validate.patch
04000261fd990a3963b0e98260b481bd alpine.patch
49bca7969cc284adf68e0ef284c0660e setup-vs-template
-1f183cba111f973a9981a35335a55e2e setup-vs-guest"
+253253a488a632d834c1e1ac5424f55b setup-vs-guest"
diff --git a/main/util-vserver/setup-vs-guest b/main/util-vserver/setup-vs-guest
index 2985af96f..5b71e0806 100644
--- a/main/util-vserver/setup-vs-guest
+++ b/main/util-vserver/setup-vs-guest
@@ -156,9 +156,9 @@ last_ipv4_addr_mask() {
ip addr show dev $_iface | awk '$1 == "inet" {print $2}' | tail -n1
}
-valid_ip() {
+valid_ip_and_prefix() {
[ "$1" ] || return 0
- ipcalc -s $1
+ ipcalc -s -m $1 >/dev/null 2>&1 && ! ipcalc -s -m $1/0 >/dev/null 2>&1
}
# ask for hostname
@@ -208,7 +208,7 @@ ask_ifaceopts() {
_mask=${_last_ip_mask#*/}
while true; do
ask "Enter IP address/mask for $_iface:" $_ip/$_mask
- valid_ip $resp && break
+ valid_ip_and_prefix "$resp" 2>&1 && break
echo "$resp is not a valid IPv4 address/mask"
done
_ip_mask=$resp
diff --git a/main/vala/APKBUILD b/main/vala/APKBUILD
index 050df83d5..31df589c6 100644
--- a/main/vala/APKBUILD
+++ b/main/vala/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vala
-pkgver=0.9.7
+pkgver=0.9.8
pkgrel=0
pkgdesc="Compiler for the GObject type system"
url="http://live.gnome.org/Vala"
@@ -23,4 +23,4 @@ package() {
make DESTDIR="$pkgdir" install || return 1
}
-md5sums="917e0ca4447d7d76ca13d686e964e7fc vala-0.9.7.tar.gz"
+md5sums="bd43c1ec97fd5987f0e46790dd5f20ca vala-0.9.8.tar.gz"
diff --git a/main/xfce4-vala/APKBUILD b/main/xfce4-vala/APKBUILD
index e71e5bef0..d106e1f04 100644
--- a/main/xfce4-vala/APKBUILD
+++ b/main/xfce4-vala/APKBUILD
@@ -14,6 +14,11 @@ subpackages=
source="http://archive.xfce.org/src/bindings/xfce4-vala/4.6/xfce4-vala-$pkgver.tar.bz2"
_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ sed -i -e 's/vala-1\.0/vala-0.10/g' configure
+}
+
build() {
cd "$_builddir"
./configure --prefix=/usr \
diff --git a/main/xfsprogs/APKBUILD b/main/xfsprogs/APKBUILD
index 5bd8e70bb..7f5a3b6e0 100644
--- a/main/xfsprogs/APKBUILD
+++ b/main/xfsprogs/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfsprogs
-pkgver=3.1.2
-pkgrel=2
+pkgver=3.1.3
+pkgrel=0
pkgdesc="XFS filesystem utilities"
url="http://oss.sgi.com/projects/xfs/"
license="LGPL"
@@ -36,4 +36,4 @@ package() {
cd "$_builddir"
make -j1 DIST_ROOT="$pkgdir" install install-dev
}
-md5sums="86d10178ee6897cb099c97303e6d9da0 xfsprogs-3.1.2.tar.gz"
+md5sums="a6a4777ded0a36fa692b7eb652a85493 xfsprogs-3.1.3.tar.gz"
diff --git a/testing/apache-mod-auth-ntlm-winbind/APKBUILD b/testing/apache-mod-auth-ntlm-winbind/APKBUILD
new file mode 100644
index 000000000..2a9bba0d9
--- /dev/null
+++ b/testing/apache-mod-auth-ntlm-winbind/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: Jeff Bilyk <jbilyk@gmail.com>
+# Maintainer: Natanael Copa <natanael.copa@gmail.com>
+pkgname=apache-mod-auth-ntlm-winbind
+pkgver=0.1
+pkgrel=0
+pkgdesc="Authentication module for Apache using NTLM protocol with winbind helper"
+url="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/"
+license="Apache2"
+depends="apache2"
+makedepends="autoconf apache2-dev apr-util-dev apr-dev"
+source="http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/mod_auth_ntlm_winbind.c
+http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/configure.in
+http://samba.org/ftp/unpacked/lorikeet/mod_auth_ntlm_winbind/Makefile.in
+mod-auth-ntlm-winbind.conf"
+
+build() {
+ cd "$srcdir"
+ autoconf
+ ./configure
+ make DESTDIR="$pkgdir" || return 1
+}
+
+package() {
+ cd "$srcdir"
+ mkdir -p "$pkgdir"/etc/apache2/conf.d
+ mkdir -p "$pkgdir"/usr/lib/apache2
+ install mod-auth-ntlm-winbind.conf "$pkgdir"/etc/apache2/conf.d/mod-auth-ntlm-winbind.conf
+ install "$srcdir"/.libs/mod_auth_ntlm_winbind.so "$pkgdir"/usr/lib/apache2/mod_auth_ntlm_winbind.so
+}
+
+md5sums="01d32e311e6a404bcf4179c863081818 mod_auth_ntlm_winbind.c
+e1490dae6e468d4bc56154b16e5d8c24 configure.in
+410de8b0ac7ffe5c44a71d094190187d Makefile.in
+331b392c7aaa13b3a9ea8780ce2db3d4 mod-auth-ntlm-winbind.conf"
diff --git a/testing/apache-mod-auth-ntlm-winbind/mod-auth-ntlm-winbind.conf b/testing/apache-mod-auth-ntlm-winbind/mod-auth-ntlm-winbind.conf
new file mode 100644
index 000000000..da7d99133
--- /dev/null
+++ b/testing/apache-mod-auth-ntlm-winbind/mod-auth-ntlm-winbind.conf
@@ -0,0 +1 @@
+LoadModule auth_ntlm_winbind_module lib/apache2/mod_auth_ntlm_winbind.so
diff --git a/testing/tinc/APKBUILD b/testing/tinc/APKBUILD
new file mode 100644
index 000000000..1ae15310e
--- /dev/null
+++ b/testing/tinc/APKBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=tinc
+pkgver=1.0.13
+pkgrel=0
+pkgdesc="tinc is a Virtual Private Network (VPN) daemon"
+url="http://www.tinc-vpn.org/"
+license="GPL-2"
+depends=
+makedepends="zlib-dev lzo-dev openssl-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz
+ tincd.initd
+ tincd.lo.initd
+ tinc.networks"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+prepare() {
+ cd "$_builddir"
+ # apply patches here
+}
+
+build() {
+ cd "$_builddir"
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --enable-jumbograms \
+ --enable-lzo \
+ --enable-zlib
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install
+
+ mkdir "$pkgdir"/etc/tinc
+ install -m755 -D "$srcdir"/tincd.initd "$pkgdir"/etc/init.d/tincd
+ install -m755 -D "$srcdir"/tincd.lo.initd \
+ "$pkgdir"/etc/init.d/tincd.lo
+ install -m644 -D "$srcdir"/tinc.networks \
+ "$pkgdir"/etc/conf.d/tinc.networks
+}
+
+md5sums="86263994d38c750431efd17e9a91a248 tinc-1.0.13.tar.gz
+89d104d38bab84d6f92d27464e48628d tincd.initd
+96d8778284637fa7790a4c6239a72070 tincd.lo.initd
+475d64d9aa410ec7e91f5b079800abc9 tinc.networks"
diff --git a/testing/tinc/tinc.networks b/testing/tinc/tinc.networks
new file mode 100644
index 000000000..e1844ce2b
--- /dev/null
+++ b/testing/tinc/tinc.networks
@@ -0,0 +1,13 @@
+# file: /etc/conf.d/tinc.networks for /etc/init.d/tincd
+
+# In this file you define the tinc networks you want to connect to
+
+# USAGE:
+# you add a network to the init script by defining:
+# NETWORK: your_network_name
+#
+# if you want to connect to multiple VPN's just set them behind each other. e.g.
+# NETWORK: foo
+# NETWORK: bar
+#
+# this would join the network foo and the network bar.
diff --git a/testing/tinc/tincd.initd b/testing/tinc/tincd.initd
new file mode 100644
index 000000000..452687dfb
--- /dev/null
+++ b/testing/tinc/tincd.initd
@@ -0,0 +1,64 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd,v 1.5 2008/04/01 14:08:45 dragonheart Exp $
+
+opts="reload"
+
+depend() {
+ use logger dns
+ need net
+}
+
+checkconfig() {
+ if ! grep -q '^ *NETWORK:' /etc/conf.d/tinc.networks
+ then
+ eerror "No VPN networks configured in /etc/conf.d/tinc.networks"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ ! -f /etc/tinc/"$TINCNET"/tinc.conf ]
+ then
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ else
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ fi
+ done
+}
+
+stop() {
+ ebegin "Stopping tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
+
+reload() {
+ ebegin "Reloading configuration for tinc VPN networks"
+ eend 0
+ awk '/^ *NETWORK:/ { print $2 }' /etc/conf.d/tinc.networks | while read TINCNET
+ do
+ if [ -f /var/run/tinc."$TINCNET".pid ]
+ then
+ ebegin "Reloading tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+ done
+}
diff --git a/testing/tinc/tincd.lo.initd b/testing/tinc/tincd.lo.initd
new file mode 100644
index 000000000..79c185b38
--- /dev/null
+++ b/testing/tinc/tincd.lo.initd
@@ -0,0 +1,46 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tinc/files/tincd.lo,v 1.1 2010/07/18 10:04:56 dragonheart Exp $
+
+opts="reload"
+
+depend()
+{
+ use logger dns
+ need net
+}
+
+start()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /etc/tinc/"$TINCNET"/tinc.conf ] ; then
+ ebegin "Starting tinc network $TINCNET"
+ /usr/sbin/tincd --debug=1 --net="$TINCNET" --logfile=/var/log/tinc.$TINCNET.log --pidfile=/var/run/tinc.$TINCNET.pid
+ eend $?
+ else
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ fi
+}
+
+stop()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /var/run/tinc."$TINCNET".pid ] ; then
+ ebegin "Stopping tinc network $TINCNET"
+ /usr/sbin/tincd --kill --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ else
+ eerror "Cannot start network $TINCNET, /etc/tinc/$TINCNET/tinc.conf does not exist !"
+ fi
+}
+
+reload()
+{
+ TINCNET=${RC_SVCNAME#*.}
+ if [ -f /var/run/tinc."$TINCNET".pid ] ; then
+ ebegin "Reloading configuration for tinc network $TINCNET"
+ /usr/sbin/tincd --kill HUP --pidfile=/var/run/tinc."$TINCNET".pid
+ eend $?
+ fi
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 13:38:33 +0000