diff options
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/APKBUILD | 18 | ||||
| -rw-r--r-- | main/linux-grsec/grsecurity-2.1.14-2.6.32-200912121327.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.31.7-200912102215.patch) | 19373 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig | 4449 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig.x86 | 213 |
4 files changed, 9333 insertions, 14720 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index f5586bcd7..9906bf7c9 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.31.7 -_kernver=2.6.31 -pkgrel=1 +pkgver=2.6.32 +_kernver=2.6.32 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -14,7 +14,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}} install= source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.1.14-2.6.31.7-200912102215.patch + grsecurity-2.1.14-2.6.32-200912121327.patch kernelconfig.x86 " subpackages="$pkgname-dev linux-firmware:firmware" @@ -31,7 +31,7 @@ prepare() { for i in ../*.diff ../*.patch; do [ -f $i ] || continue msg "Applying $i..." - patch -p1 -N < $i || return 1 + patch -s -p1 -N < $i || return 1 done mkdir -p "$srcdir"/build @@ -118,7 +118,7 @@ firmware() { mv "$pkgdir"/lib/firmware "$subpkgdir"/lib/ } -md5sums="84c077a37684e4cbfa67b18154390d8a linux-2.6.31.tar.bz2 -801b9c379a12339c0210dc5d1a8e9537 patch-2.6.31.7.bz2 -60eac674bf7db4ce8498fead1ef9674a grsecurity-2.1.14-2.6.31.7-200912102215.patch -5ecbb0c5bed282ad2e5c34c1f71ba27f kernelconfig.x86" +md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 +e6c460f49a6c31b539b92939f9241abe patch-2.6.32.bz2 +29c693abf5b456896edffefef587b41e grsecurity-2.1.14-2.6.32-200912121327.patch +512be4fb8684a3a04a39b3888744d200 kernelconfig.x86" diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.31.7-200912102215.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.32-200912121327.patch index d22a99a23..f5b5c41f4 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.31.7-200912102215.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.32-200912121327.patch @@ -1,144 +1,6 @@ -diff -urNp linux-2.6.31.7/Documentation/dontdiff linux-2.6.31.7/Documentation/dontdiff ---- linux-2.6.31.7/Documentation/dontdiff 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/Documentation/dontdiff 2009-12-10 22:15:16.000000000 -0500 -@@ -3,6 +3,7 @@ - *.bin - *.cpio - *.csp -+*.dbg - *.dsp - *.dvi - *.elf -@@ -49,11 +50,16 @@ - 53c700_d.h - CVS - ChangeSet -+GPATH -+GRTAGS -+GSYMS -+GTAGS - Image - Kerntypes - Module.markers - Module.symvers - PENDING -+PERF* - SCCS - System.map* - TAGS -@@ -76,7 +82,9 @@ btfixupprep - build - bvmlinux - bzImage* -+capflags.c - classlist.h* -+common-cmds.h - comp*.log - compile.h* - conf -@@ -103,13 +111,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,6 +142,7 @@ mkboot - mkbugboot - mkcpustr - mkdep -+mkpiggy - mkprep - mktables - mktree -@@ -149,6 +159,7 @@ patches* - pca200e.bin - pca200e_ecd.bin2 - piggy.gz -+piggy.S - piggyback - pnmtologo - ppc_defs.h* -@@ -163,6 +174,7 @@ setup - setup.bin - setup.elf - sImage -+slabinfo - sm_tbl* - split-include - syscalltab.h -@@ -186,14 +198,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.31.7/Documentation/kernel-parameters.txt linux-2.6.31.7/Documentation/kernel-parameters.txt ---- linux-2.6.31.7/Documentation/kernel-parameters.txt 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/Documentation/kernel-parameters.txt 2009-12-10 22:15:16.000000000 -0500 -@@ -1776,6 +1776,12 @@ and is between 256 and 4096 characters. - the specified number of seconds. This is to be used if - your oopses keep scrolling off the screen. - -+ 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.31.7/Makefile linux-2.6.31.7/Makefile ---- linux-2.6.31.7/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/Makefile 2009-12-10 22:15:17.000000000 -0500 -@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" - - HOSTCC = gcc - HOSTCXX = g++ --HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer --HOSTCXXFLAGS = -O2 -+HOSTCFLAGS = -Wall -W -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. -@@ -639,7 +639,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.31.7/arch/alpha/include/asm/atomic.h linux-2.6.31.7/arch/alpha/include/asm/atomic.h ---- linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/include/asm/atomic.h linux-2.6.32/arch/alpha/include/asm/atomic.h +--- linux-2.6.32/arch/alpha/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/include/asm/atomic.h 2009-12-04 21:40:47.326556174 -0500 @@ -18,9 +18,11 @@ #define ATOMIC64_INIT(i) ( (atomic64_t) { (i) } ) @@ -183,9 +45,9 @@ diff -urNp linux-2.6.31.7/arch/alpha/include/asm/atomic.h linux-2.6.31.7/arch/al #define atomic64_inc(v) atomic64_add(1,(v)) #define atomic_dec(v) atomic_sub(1,(v)) -diff -urNp linux-2.6.31.7/arch/alpha/include/asm/elf.h linux-2.6.31.7/arch/alpha/include/asm/elf.h ---- linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/include/asm/elf.h linux-2.6.32/arch/alpha/include/asm/elf.h +--- linux-2.6.32/arch/alpha/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/include/asm/elf.h 2009-12-04 21:40:47.347546279 -0500 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -200,9 +62,9 @@ diff -urNp linux-2.6.31.7/arch/alpha/include/asm/elf.h linux-2.6.31.7/arch/alpha /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.31.7/arch/alpha/include/asm/pgtable.h linux-2.6.31.7/arch/alpha/include/asm/pgtable.h ---- linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/include/asm/pgtable.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/include/asm/pgtable.h linux-2.6.32/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32/arch/alpha/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/include/asm/pgtable.h 2009-12-04 21:40:47.348637902 -0500 @@ -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) @@ -221,9 +83,9 @@ diff -urNp linux-2.6.31.7/arch/alpha/include/asm/pgtable.h linux-2.6.31.7/arch/a #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.31.7/arch/alpha/kernel/module.c linux-2.6.31.7/arch/alpha/kernel/module.c ---- linux-2.6.31.7/arch/alpha/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/kernel/module.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/kernel/module.c linux-2.6.32/arch/alpha/kernel/module.c +--- linux-2.6.32/arch/alpha/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/kernel/module.c 2009-12-04 21:40:47.354638397 -0500 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -233,9 +95,9 @@ diff -urNp linux-2.6.31.7/arch/alpha/kernel/module.c linux-2.6.31.7/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.31.7/arch/alpha/kernel/osf_sys.c linux-2.6.31.7/arch/alpha/kernel/osf_sys.c ---- linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/kernel/osf_sys.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/kernel/osf_sys.c linux-2.6.32/arch/alpha/kernel/osf_sys.c +--- linux-2.6.32/arch/alpha/kernel/osf_sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/kernel/osf_sys.c 2009-12-04 21:40:47.356628108 -0500 @@ -1212,6 +1212,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -258,9 +120,9 @@ diff -urNp linux-2.6.31.7/arch/alpha/kernel/osf_sys.c linux-2.6.31.7/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.31.7/arch/alpha/mm/fault.c linux-2.6.31.7/arch/alpha/mm/fault.c ---- linux-2.6.31.7/arch/alpha/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/alpha/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/alpha/mm/fault.c linux-2.6.32/arch/alpha/mm/fault.c +--- linux-2.6.32/arch/alpha/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/alpha/mm/fault.c 2009-12-04 21:40:47.362628200 -0500 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -417,30 +279,20 @@ diff -urNp linux-2.6.31.7/arch/alpha/mm/fault.c linux-2.6.31.7/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/include/asm/atomic.h ---- linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 -@@ -20,6 +20,7 @@ - #ifdef __KERNEL__ - +diff -urNp linux-2.6.32/arch/arm/include/asm/atomic.h linux-2.6.32/arch/arm/include/asm/atomic.h +--- linux-2.6.32/arch/arm/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/include/asm/atomic.h 2009-12-04 21:40:47.399650149 -0500 +@@ -25,7 +25,9 @@ + * atomic_set() is the clrex or dummy strex done on every exception return. + */ #define atomic_read(v) ((v)->counter) +#define atomic_read_unchecked(v) ((v)->counter) + #define atomic_set(v,i) (((v)->counter) = (i)) ++#define atomic_set_unchecked(v,i) (((v)->counter) = (i)) #if __LINUX_ARM_ARCH__ >= 6 -@@ -44,6 +45,11 @@ static inline void atomic_set(atomic_t * - : "cc"); - } - -+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) -+{ -+ atomic_set((atomic_t *)v, i); -+} -+ - static inline void atomic_add(int i, atomic_t *v) - { - unsigned long tmp; -@@ -60,6 +66,11 @@ static inline void atomic_add(int i, ato +@@ -50,6 +52,11 @@ static inline void atomic_add(int i, ato : "cc"); } @@ -452,7 +304,7 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/ static inline int atomic_add_return(int i, atomic_t *v) { unsigned long tmp; -@@ -98,6 +109,11 @@ static inline void atomic_sub(int i, ato +@@ -88,6 +95,11 @@ static inline void atomic_sub(int i, ato : "cc"); } @@ -464,15 +316,7 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/ static inline int atomic_sub_return(int i, atomic_t *v) { unsigned long tmp; -@@ -164,6 +180,7 @@ static inline void atomic_clear_mask(uns - #endif - - #define atomic_set(v,i) (((v)->counter) = (i)) -+#define atomic_set_unchecked(v,i) (((v)->counter) = (i)) - - static inline int atomic_add_return(int i, atomic_t *v) - { -@@ -232,6 +249,7 @@ static inline int atomic_add_unless(atom +@@ -220,6 +232,7 @@ static inline int atomic_add_unless(atom #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) #define atomic_inc(v) atomic_add(1, v) @@ -480,10 +324,10 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/atomic.h linux-2.6.31.7/arch/arm/ #define atomic_dec(v) atomic_sub(1, v) #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) -diff -urNp linux-2.6.31.7/arch/arm/include/asm/elf.h linux-2.6.31.7/arch/arm/include/asm/elf.h ---- linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 -@@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con +diff -urNp linux-2.6.32/arch/arm/include/asm/elf.h linux-2.6.32/arch/arm/include/asm/elf.h +--- linux-2.6.32/arch/arm/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/include/asm/elf.h 2009-12-04 21:40:47.406615901 -0500 +@@ -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. */ @@ -499,9 +343,9 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/elf.h linux-2.6.31.7/arch/arm/inc /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.31.7/arch/arm/include/asm/kmap_types.h linux-2.6.31.7/arch/arm/include/asm/kmap_types.h ---- linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/arm/include/asm/kmap_types.h linux-2.6.32/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32/arch/arm/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/include/asm/kmap_types.h 2009-12-04 21:40:47.412193138 -0500 @@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, @@ -510,10 +354,10 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/kmap_types.h linux-2.6.31.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.31.7/arch/arm/include/asm/uaccess.h linux-2.6.31.7/arch/arm/include/asm/uaccess.h ---- linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500 -@@ -400,6 +400,9 @@ extern unsigned long __must_check __strn +diff -urNp linux-2.6.32/arch/arm/include/asm/uaccess.h linux-2.6.32/arch/arm/include/asm/uaccess.h +--- linux-2.6.32/arch/arm/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/include/asm/uaccess.h 2009-12-04 21:40:47.413651000 -0500 +@@ -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) { @@ -523,7 +367,7 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/uaccess.h linux-2.6.31.7/arch/arm if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else /* security hole - plug it */ -@@ -409,6 +412,9 @@ static inline unsigned long __must_check +@@ -412,6 +415,9 @@ static inline unsigned long __must_check static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -533,21 +377,117 @@ diff -urNp linux-2.6.31.7/arch/arm/include/asm/uaccess.h linux-2.6.31.7/arch/arm if (access_ok(VERIFY_WRITE, to, n)) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c ---- linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/mach-ns9xxx/clock.c 2009-12-10 22:15:15.000000000 -0500 -@@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode - return single_open(file, clk_debugfs_show, NULL); - } - --static struct file_operations clk_debugfs_operations = { -+static const struct file_operations clk_debugfs_operations = { - .open = clk_debugfs_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/arch/arm/mm/mmap.c linux-2.6.31.7/arch/arm/mm/mmap.c ---- linux-2.6.31.7/arch/arm/mm/mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/arm/mm/mmap.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/arm/kernel/kgdb.c linux-2.6.32/arch/arm/kernel/kgdb.c +--- linux-2.6.32/arch/arm/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/kernel/kgdb.c 2009-12-04 21:40:47.433493290 -0500 +@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) + * and we handle the normal undef case within the do_undefinstr + * handler. + */ +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + #ifndef __ARMEB__ + .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} + #else /* ! __ARMEB__ */ +diff -urNp linux-2.6.32/arch/arm/mach-at91/pm.c linux-2.6.32/arch/arm/mach-at91/pm.c +--- linux-2.6.32/arch/arm/mach-at91/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-at91/pm.c 2009-12-04 21:40:47.468230935 -0500 +@@ -348,7 +348,7 @@ static void at91_pm_end(void) + } + + +-static struct platform_suspend_ops at91_pm_ops ={ ++static const struct platform_suspend_ops at91_pm_ops ={ + .valid = at91_pm_valid_state, + .begin = at91_pm_begin, + .enter = at91_pm_enter, +diff -urNp linux-2.6.32/arch/arm/mach-omap1/pm.c linux-2.6.32/arch/arm/mach-omap1/pm.c +--- linux-2.6.32/arch/arm/mach-omap1/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-omap1/pm.c 2009-12-04 21:40:47.504127819 -0500 +@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq + + + +-static struct platform_suspend_ops omap_pm_ops ={ ++static const struct platform_suspend_ops omap_pm_ops ={ + .prepare = omap_pm_prepare, + .enter = omap_pm_enter, + .finish = omap_pm_finish, +diff -urNp linux-2.6.32/arch/arm/mach-omap2/pm24xx.c linux-2.6.32/arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32/arch/arm/mach-omap2/pm24xx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-omap2/pm24xx.c 2009-12-04 21:40:47.507645889 -0500 +@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) + enable_hlt(); + } + +-static struct platform_suspend_ops omap_pm_ops = { ++static const struct platform_suspend_ops omap_pm_ops = { + .prepare = omap2_pm_prepare, + .enter = omap2_pm_enter, + .finish = omap2_pm_finish, +diff -urNp linux-2.6.32/arch/arm/mach-omap2/pm34xx.c linux-2.6.32/arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32/arch/arm/mach-omap2/pm34xx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-omap2/pm34xx.c 2009-12-04 21:40:47.515527772 -0500 +@@ -401,7 +401,7 @@ static void omap3_pm_end(void) + return; + } + +-static struct platform_suspend_ops omap_pm_ops = { ++static const struct platform_suspend_ops omap_pm_ops = { + .begin = omap3_pm_begin, + .end = omap3_pm_end, + .prepare = omap3_pm_prepare, +diff -urNp linux-2.6.32/arch/arm/mach-pnx4008/pm.c linux-2.6.32/arch/arm/mach-pnx4008/pm.c +--- linux-2.6.32/arch/arm/mach-pnx4008/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-pnx4008/pm.c 2009-12-04 21:40:47.530981648 -0500 +@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat + (state == PM_SUSPEND_MEM); + } + +-static struct platform_suspend_ops pnx4008_pm_ops = { ++static const struct platform_suspend_ops pnx4008_pm_ops = { + .enter = pnx4008_pm_enter, + .valid = pnx4008_pm_valid, + }; +diff -urNp linux-2.6.32/arch/arm/mach-pxa/pm.c linux-2.6.32/arch/arm/mach-pxa/pm.c +--- linux-2.6.32/arch/arm/mach-pxa/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-pxa/pm.c 2009-12-04 21:40:47.549606039 -0500 +@@ -95,7 +95,7 @@ void pxa_pm_finish(void) + pxa_cpu_pm_fns->finish(); + } + +-static struct platform_suspend_ops pxa_pm_ops = { ++static const struct platform_suspend_ops pxa_pm_ops = { + .valid = pxa_pm_valid, + .enter = pxa_pm_enter, + .prepare = pxa_pm_prepare, +diff -urNp linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-pxa/sharpsl_pm.c 2009-12-04 21:40:47.556689149 -0500 +@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status + } + + #ifdef CONFIG_PM +-static struct platform_suspend_ops sharpsl_pm_ops = { ++static const struct platform_suspend_ops sharpsl_pm_ops = { + .prepare = pxa_pm_prepare, + .finish = pxa_pm_finish, + .enter = corgi_pxa_pm_enter, +diff -urNp linux-2.6.32/arch/arm/mach-sa1100/pm.c linux-2.6.32/arch/arm/mach-sa1100/pm.c +--- linux-2.6.32/arch/arm/mach-sa1100/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mach-sa1100/pm.c 2009-12-04 21:40:47.556689149 -0500 +@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) + return virt_to_phys(sp); + } + +-static struct platform_suspend_ops sa11x0_pm_ops = { ++static const struct platform_suspend_ops sa11x0_pm_ops = { + .enter = sa11x0_pm_enter, + .valid = suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32/arch/arm/mm/mmap.c linux-2.6.32/arch/arm/mm/mmap.c +--- linux-2.6.32/arch/arm/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/mm/mmap.c 2009-12-04 21:40:47.557654415 -0500 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -584,9 +524,21 @@ diff -urNp linux-2.6.31.7/arch/arm/mm/mmap.c linux-2.6.31.7/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.31.7/arch/avr32/include/asm/atomic.h linux-2.6.31.7/arch/avr32/include/asm/atomic.h ---- linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/avr32/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/arm/plat-s3c/pm.c linux-2.6.32/arch/arm/plat-s3c/pm.c +--- linux-2.6.32/arch/arm/plat-s3c/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/arm/plat-s3c/pm.c 2009-12-04 21:40:47.558675808 -0500 +@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) + s3c_pm_check_cleanup(); + } + +-static struct platform_suspend_ops s3c_pm_ops = { ++static const struct platform_suspend_ops s3c_pm_ops = { + .enter = s3c_pm_enter, + .prepare = s3c_pm_prepare, + .finish = s3c_pm_finish, +diff -urNp linux-2.6.32/arch/avr32/include/asm/atomic.h linux-2.6.32/arch/avr32/include/asm/atomic.h +--- linux-2.6.32/arch/avr32/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/avr32/include/asm/atomic.h 2009-12-04 21:40:47.558675808 -0500 @@ -20,7 +20,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -648,9 +600,9 @@ diff -urNp linux-2.6.31.7/arch/avr32/include/asm/atomic.h linux-2.6.31.7/arch/av #define atomic_dec_return(v) atomic_sub_return(1, v) #define atomic_inc_return(v) atomic_add_return(1, v) -diff -urNp linux-2.6.31.7/arch/avr32/include/asm/elf.h linux-2.6.31.7/arch/avr32/include/asm/elf.h ---- linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/avr32/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/avr32/include/asm/elf.h linux-2.6.32/arch/avr32/include/asm/elf.h +--- linux-2.6.32/arch/avr32/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/avr32/include/asm/elf.h 2009-12-04 21:40:47.572658724 -0500 @@ -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. */ @@ -667,9 +619,9 @@ diff -urNp linux-2.6.31.7/arch/avr32/include/asm/elf.h linux-2.6.31.7/arch/avr32 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/avr32/include/asm/kmap_types.h linux-2.6.32/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32/arch/avr32/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/avr32/include/asm/kmap_types.h 2009-12-04 21:40:47.588771983 -0500 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -680,9 +632,21 @@ diff -urNp linux-2.6.31.7/arch/avr32/include/asm/kmap_types.h linux-2.6.31.7/arc }; #undef D -diff -urNp linux-2.6.31.7/arch/avr32/mm/fault.c linux-2.6.31.7/arch/avr32/mm/fault.c ---- linux-2.6.31.7/arch/avr32/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/avr32/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/avr32/mach-at32ap/pm.c linux-2.6.32/arch/avr32/mach-at32ap/pm.c +--- linux-2.6.32/arch/avr32/mach-at32ap/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/avr32/mach-at32ap/pm.c 2009-12-04 21:40:47.592653565 -0500 +@@ -176,7 +176,7 @@ out: + return 0; + } + +-static struct platform_suspend_ops avr32_pm_ops = { ++static const struct platform_suspend_ops avr32_pm_ops = { + .valid = avr32_pm_valid_state, + .enter = avr32_pm_enter, + }; +diff -urNp linux-2.6.32/arch/avr32/mm/fault.c linux-2.6.32/arch/avr32/mm/fault.c +--- linux-2.6.32/arch/avr32/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/avr32/mm/fault.c 2009-12-04 21:40:47.599660510 -0500 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -724,10 +688,10 @@ diff -urNp linux-2.6.31.7/arch/avr32/mm/fault.c linux-2.6.31.7/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch/blackfin/include/asm/atomic.h ---- linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/blackfin/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 -@@ -15,8 +15,10 @@ +diff -urNp linux-2.6.32/arch/blackfin/include/asm/atomic.h linux-2.6.32/arch/blackfin/include/asm/atomic.h +--- linux-2.6.32/arch/blackfin/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/blackfin/include/asm/atomic.h 2009-12-04 21:40:47.606655263 -0500 +@@ -21,8 +21,10 @@ #define ATOMIC_INIT(i) { (i) } #define atomic_set(v, i) (((v)->counter) = i) @@ -738,7 +702,7 @@ diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch asmlinkage int __raw_uncached_fetch_asm(const volatile int *ptr); -@@ -35,11 +37,21 @@ static inline void atomic_add(int i, ato +@@ -41,11 +43,21 @@ static inline void atomic_add(int i, ato __raw_atomic_update_asm(&v->counter, i); } @@ -760,7 +724,7 @@ diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch static inline int atomic_add_return(int i, atomic_t *v) { return __raw_atomic_update_asm(&v->counter, i); -@@ -55,6 +67,11 @@ static inline void atomic_inc(volatile a +@@ -61,6 +73,11 @@ static inline void atomic_inc(volatile a __raw_atomic_update_asm(&v->counter, 1); } @@ -772,45 +736,33 @@ diff -urNp linux-2.6.31.7/arch/blackfin/include/asm/atomic.h linux-2.6.31.7/arch static inline void atomic_dec(volatile atomic_t *v) { __raw_atomic_update_asm(&v->counter, -1); -diff -urNp linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c ---- linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/blackfin/mach-bf561/coreb.c 2009-12-10 22:15:15.000000000 -0500 -@@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct - return ret; +diff -urNp linux-2.6.32/arch/blackfin/kernel/kgdb.c linux-2.6.32/arch/blackfin/kernel/kgdb.c +--- linux-2.6.32/arch/blackfin/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/blackfin/kernel/kgdb.c 2009-12-04 21:40:47.616037869 -0500 +@@ -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 */ } --static struct file_operations coreb_fops = { -+static const struct file_operations coreb_fops = { - .owner = THIS_MODULE, - .ioctl = coreb_ioctl, - }; -diff -urNp linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c ---- linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/cris/arch-v10/drivers/sync_serial.c 2009-12-10 22:15:15.000000000 -0500 -@@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha - - #define NUMBER_OF_PORTS 2 - --static struct file_operations sync_serial_fops = { -+static const struct file_operations sync_serial_fops = { - .owner = THIS_MODULE, - .write = sync_serial_write, - .read = sync_serial_read, -diff -urNp linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c ---- linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-12-10 22:15:15.000000000 -0500 -@@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + .gdb_bpt_instr = {0xa1}, + #ifdef CONFIG_SMP + .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, +diff -urNp linux-2.6.32/arch/blackfin/mach-common/pm.c linux-2.6.32/arch/blackfin/mach-common/pm.c +--- linux-2.6.32/arch/blackfin/mach-common/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/blackfin/mach-common/pm.c 2009-12-04 21:40:47.629659983 -0500 +@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t return 0; } --struct file_operations gpio_fops = { -+struct struct file_operations gpio_fops = { - .owner = THIS_MODULE, - .poll = gpio_poll, - .ioctl = gpio_ioctl, -diff -urNp linux-2.6.31.7/arch/cris/include/asm/atomic.h linux-2.6.31.7/arch/cris/include/asm/atomic.h ---- linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/cris/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +-struct platform_suspend_ops bfin_pm_ops = { ++const struct platform_suspend_ops bfin_pm_ops = { + .enter = bfin_pm_enter, + .valid = bfin_pm_valid, + }; +diff -urNp linux-2.6.32/arch/cris/include/asm/atomic.h linux-2.6.32/arch/cris/include/asm/atomic.h +--- linux-2.6.32/arch/cris/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/cris/include/asm/atomic.h 2009-12-04 21:40:47.649929496 -0500 @@ -16,7 +16,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -857,9 +809,9 @@ diff -urNp linux-2.6.31.7/arch/cris/include/asm/atomic.h linux-2.6.31.7/arch/cri static inline void atomic_dec(volatile atomic_t *v) { unsigned long flags; -diff -urNp linux-2.6.31.7/arch/frv/include/asm/atomic.h linux-2.6.31.7/arch/frv/include/asm/atomic.h ---- linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/frv/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/frv/include/asm/atomic.h linux-2.6.32/arch/frv/include/asm/atomic.h +--- linux-2.6.32/arch/frv/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/frv/include/asm/atomic.h 2009-12-04 21:40:47.657761625 -0500 @@ -37,7 +37,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -902,9 +854,9 @@ diff -urNp linux-2.6.31.7/arch/frv/include/asm/atomic.h linux-2.6.31.7/arch/frv/ static inline void atomic_dec(atomic_t *v) { atomic_sub_return(1, v); -diff -urNp linux-2.6.31.7/arch/frv/include/asm/kmap_types.h linux-2.6.31.7/arch/frv/include/asm/kmap_types.h ---- linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/frv/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/frv/include/asm/kmap_types.h linux-2.6.32/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32/arch/frv/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/frv/include/asm/kmap_types.h 2009-12-04 21:40:47.665664185 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -913,9 +865,9 @@ diff -urNp linux-2.6.31.7/arch/frv/include/asm/kmap_types.h linux-2.6.31.7/arch/ KM_TYPE_NR }; -diff -urNp linux-2.6.31.7/arch/h8300/include/asm/atomic.h linux-2.6.31.7/arch/h8300/include/asm/atomic.h ---- linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/h8300/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/h8300/include/asm/atomic.h linux-2.6.32/arch/h8300/include/asm/atomic.h +--- linux-2.6.32/arch/h8300/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/h8300/include/asm/atomic.h 2009-12-04 21:40:47.668686141 -0500 @@ -11,7 +11,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -968,9 +920,51 @@ diff -urNp linux-2.6.31.7/arch/h8300/include/asm/atomic.h linux-2.6.31.7/arch/h8 /* * atomic_inc_and_test - increment and test -diff -urNp linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/hp/common/hwsw_iommu.c 2009-12-04 21:40:47.681557744 -0500 +@@ -17,7 +17,7 @@ + #include <linux/swiotlb.h> + #include <asm/machvec.h> + +-extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; ++extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; + + /* swiotlb declarations & definitions: */ + extern int swiotlb_late_init_with_default_size (size_t size); +@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct dev + !sba_dma_ops.dma_supported(dev, *dev->dma_mask); + } + +-struct dma_map_ops *hwsw_dma_get_ops(struct device *dev) ++const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev) + { + if (use_swiotlb(dev)) + return &swiotlb_dma_ops; +diff -urNp linux-2.6.32/arch/ia64/hp/common/sba_iommu.c linux-2.6.32/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32/arch/ia64/hp/common/sba_iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/hp/common/sba_iommu.c 2009-12-04 21:40:47.682723449 -0500 +@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d + }, + }; + +-extern struct dma_map_ops swiotlb_dma_ops; ++extern const struct dma_map_ops swiotlb_dma_ops; + + static int __init + sba_init(void) +@@ -2191,7 +2191,7 @@ sba_page_override(char *str) + + __setup("sbapagesize=",sba_page_override); + +-struct dma_map_ops sba_dma_ops = { ++const struct dma_map_ops sba_dma_ops = { + .alloc_coherent = sba_alloc_coherent, + .free_coherent = sba_free_coherent, + .map_page = sba_map_page, +diff -urNp linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/ia32/binfmt_elf32.c 2009-12-04 21:40:47.682723449 -0500 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -985,23 +979,9 @@ diff -urNp linux-2.6.31.7/arch/ia64/ia32/binfmt_elf32.c linux-2.6.31.7/arch/ia64 /* Ugly but avoids duplication */ #include "../../../fs/binfmt_elf.c" -@@ -69,11 +76,11 @@ ia32_install_gate_page (struct vm_area_s - } - - --static struct vm_operations_struct ia32_shared_page_vm_ops = { -+static const struct vm_operations_struct ia32_shared_page_vm_ops = { - .fault = ia32_install_shared_page - }; - --static struct vm_operations_struct ia32_gate_page_vm_ops = { -+static const struct vm_operations_struct ia32_gate_page_vm_ops = { - .fault = ia32_install_gate_page - }; - -diff -urNp linux-2.6.31.7/arch/ia64/ia32/ia32priv.h linux-2.6.31.7/arch/ia64/ia32/ia32priv.h ---- linux-2.6.31.7/arch/ia64/ia32/ia32priv.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/ia32/ia32priv.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/ia32/ia32priv.h linux-2.6.32/arch/ia64/ia32/ia32priv.h +--- linux-2.6.32/arch/ia64/ia32/ia32priv.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/ia32/ia32priv.h 2009-12-04 21:40:47.688677123 -0500 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -1018,9 +998,9 @@ diff -urNp linux-2.6.31.7/arch/ia64/ia32/ia32priv.h linux-2.6.31.7/arch/ia64/ia3 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.31.7/arch/ia64/include/asm/atomic.h linux-2.6.31.7/arch/ia64/include/asm/atomic.h ---- linux-2.6.31.7/arch/ia64/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/include/asm/atomic.h linux-2.6.32/arch/ia64/include/asm/atomic.h +--- linux-2.6.32/arch/ia64/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/atomic.h 2009-12-04 21:40:47.694673619 -0500 @@ -22,9 +22,11 @@ #define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) @@ -1045,9 +1025,55 @@ diff -urNp linux-2.6.31.7/arch/ia64/include/asm/atomic.h linux-2.6.31.7/arch/ia6 #define atomic_dec(v) atomic_sub(1, (v)) #define atomic64_add(i,v) atomic64_add_return((i), (v)) -diff -urNp linux-2.6.31.7/arch/ia64/include/asm/elf.h linux-2.6.31.7/arch/ia64/include/asm/elf.h ---- linux-2.6.31.7/arch/ia64/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/include/asm/dma-mapping.h linux-2.6.32/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32/arch/ia64/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/dma-mapping.h 2009-12-04 21:40:47.697575975 -0500 +@@ -12,7 +12,7 @@ + + #define ARCH_HAS_DMA_GET_REQUIRED_MASK + +-extern struct dma_map_ops *dma_ops; ++extern const struct dma_map_ops *dma_ops; + extern struct ia64_machine_vector ia64_mv; + extern void set_iommu_machvec(void); + +@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct d + static inline void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *daddr, gfp_t gfp) + { +- struct dma_map_ops *ops = platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops = platform_dma_get_ops(dev); + void *caddr; + + caddr = ops->alloc_coherent(dev, size, daddr, gfp); +@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(s + static inline void dma_free_coherent(struct device *dev, size_t size, + void *caddr, dma_addr_t daddr) + { +- struct dma_map_ops *ops = platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops = platform_dma_get_ops(dev); + debug_dma_free_coherent(dev, size, caddr, daddr); + ops->free_coherent(dev, size, caddr, daddr); + } +@@ -49,13 +49,13 @@ static inline void dma_free_coherent(str + + static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr) + { +- struct dma_map_ops *ops = platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops = platform_dma_get_ops(dev); + return ops->mapping_error(dev, daddr); + } + + static inline int dma_supported(struct device *dev, u64 mask) + { +- struct dma_map_ops *ops = platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops = platform_dma_get_ops(dev); + return ops->dma_supported(dev, mask); + } + +diff -urNp linux-2.6.32/arch/ia64/include/asm/elf.h linux-2.6.32/arch/ia64/include/asm/elf.h +--- linux-2.6.32/arch/ia64/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/elf.h 2009-12-04 21:40:47.702955650 -0500 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -1062,9 +1088,30 @@ diff -urNp linux-2.6.31.7/arch/ia64/include/asm/elf.h linux-2.6.31.7/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.31.7/arch/ia64/include/asm/pgtable.h linux-2.6.31.7/arch/ia64/include/asm/pgtable.h ---- linux-2.6.31.7/arch/ia64/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/include/asm/pgtable.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/include/asm/machvec.h linux-2.6.32/arch/ia64/include/asm/machvec.h +--- linux-2.6.32/arch/ia64/include/asm/machvec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/machvec.h 2009-12-04 21:40:47.704664629 -0500 +@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event + /* DMA-mapping interface: */ + typedef void ia64_mv_dma_init (void); + typedef u64 ia64_mv_dma_get_required_mask (struct device *); +-typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); ++typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *); + + /* + * WARNING: The legacy I/O space is _architected_. Platforms are +@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(co + # endif /* CONFIG_IA64_GENERIC */ + + extern void swiotlb_dma_init(void); +-extern struct dma_map_ops *dma_get_ops(struct device *); ++extern const struct dma_map_ops *dma_get_ops(struct device *); + + /* + * Define default versions so we can extend machvec for new platforms without having +diff -urNp linux-2.6.32/arch/ia64/include/asm/pgtable.h linux-2.6.32/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32/arch/ia64/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/pgtable.h 2009-12-04 21:40:47.705671217 -0500 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -1083,15 +1130,15 @@ diff -urNp linux-2.6.31.7/arch/ia64/include/asm/pgtable.h linux-2.6.31.7/arch/ia #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.31.7/arch/ia64/include/asm/uaccess.h linux-2.6.31.7/arch/ia64/include/asm/uaccess.h ---- linux-2.6.31.7/arch/ia64/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/include/asm/uaccess.h linux-2.6.32/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32/arch/ia64/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/include/asm/uaccess.h 2009-12-11 19:45:15.768514511 -0500 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ \ - if (__access_ok(__cu_to, __cu_len, get_fs())) \ -+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \ ++ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \ __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \ __cu_len; \ }) @@ -1100,13 +1147,34 @@ diff -urNp linux-2.6.31.7/arch/ia64/include/asm/uaccess.h linux-2.6.31.7/arch/ia \ __chk_user_ptr(__cu_from); \ - if (__access_ok(__cu_from, __cu_len, get_fs())) \ -+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \ ++ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \ __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.31.7/arch/ia64/kernel/module.c linux-2.6.31.7/arch/ia64/kernel/module.c ---- linux-2.6.31.7/arch/ia64/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/kernel/module.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/kernel/dma-mapping.c linux-2.6.32/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32/arch/ia64/kernel/dma-mapping.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/dma-mapping.c 2009-12-04 21:40:47.713296259 -0500 +@@ -3,7 +3,7 @@ + /* Set this to 1 if there is a HW IOMMU in the system */ + int iommu_detected __read_mostly; + +-struct dma_map_ops *dma_ops; ++const struct dma_map_ops *dma_ops; + EXPORT_SYMBOL(dma_ops); + + #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) +@@ -16,7 +16,7 @@ static int __init dma_init(void) + } + fs_initcall(dma_init); + +-struct dma_map_ops *dma_get_ops(struct device *dev) ++const struct dma_map_ops *dma_get_ops(struct device *dev) + { + return dma_ops; + } +diff -urNp linux-2.6.32/arch/ia64/kernel/module.c linux-2.6.32/arch/ia64/kernel/module.c +--- linux-2.6.32/arch/ia64/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/module.c 2009-12-04 21:40:47.720570289 -0500 @@ -315,8 +315,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -1195,9 +1263,33 @@ diff -urNp linux-2.6.31.7/arch/ia64/kernel/module.c linux-2.6.31.7/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/kernel/pci-dma.c linux-2.6.32/arch/ia64/kernel/pci-dma.c +--- linux-2.6.32/arch/ia64/kernel/pci-dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/pci-dma.c 2009-12-04 21:40:47.734835448 -0500 +@@ -43,7 +43,7 @@ struct device fallback_dev = { + .dma_mask = &fallback_dev.coherent_dma_mask, + }; + +-extern struct dma_map_ops intel_dma_ops; ++extern const struct dma_map_ops intel_dma_ops; + + static int __init pci_iommu_init(void) + { +diff -urNp linux-2.6.32/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32/arch/ia64/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/pci-swiotlb.c 2009-12-04 21:40:47.735616626 -0500 +@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent + return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); + } + +-struct dma_map_ops swiotlb_dma_ops = { ++const struct dma_map_ops swiotlb_dma_ops = { + .alloc_coherent = ia64_swiotlb_alloc_coherent, + .free_coherent = swiotlb_free_coherent, + .map_page = swiotlb_map_page, +diff -urNp linux-2.6.32/arch/ia64/kernel/sys_ia64.c linux-2.6.32/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.32/arch/ia64/kernel/sys_ia64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/sys_ia64.c 2009-12-04 21:40:47.735616626 -0500 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -1224,9 +1316,9 @@ diff -urNp linux-2.6.31.7/arch/ia64/kernel/sys_ia64.c linux-2.6.31.7/arch/ia64/k goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.31.7/arch/ia64/kernel/topology.c linux-2.6.31.7/arch/ia64/kernel/topology.c ---- linux-2.6.31.7/arch/ia64/kernel/topology.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/kernel/topology.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/kernel/topology.c linux-2.6.32/arch/ia64/kernel/topology.c +--- linux-2.6.32/arch/ia64/kernel/topology.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/topology.c 2009-12-04 21:40:47.736615449 -0500 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject return ret; } @@ -1236,10 +1328,10 @@ diff -urNp linux-2.6.31.7/arch/ia64/kernel/topology.c linux-2.6.31.7/arch/ia64/k .show = cache_show }; -diff -urNp linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S ---- linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S 2009-12-10 22:15:15.000000000 -0500 -@@ -245,7 +245,7 @@ SECTIONS +diff -urNp linux-2.6.32/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32/arch/ia64/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/kernel/vmlinux.lds.S 2009-12-04 21:40:47.737638589 -0500 +@@ -190,7 +190,7 @@ SECTIONS /* Per-cpu data: */ . = ALIGN(PERCPU_PAGE_SIZE); PERCPU_VADDR(PERCPU_ADDR, :percpu) @@ -1248,9 +1340,9 @@ diff -urNp linux-2.6.31.7/arch/ia64/kernel/vmlinux.lds.S linux-2.6.31.7/arch/ia6 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits * into percpu page size */ -diff -urNp linux-2.6.31.7/arch/ia64/mm/fault.c linux-2.6.31.7/arch/ia64/mm/fault.c ---- linux-2.6.31.7/arch/ia64/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/mm/fault.c linux-2.6.32/arch/ia64/mm/fault.c +--- linux-2.6.32/arch/ia64/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/mm/fault.c 2009-12-04 21:40:47.741669782 -0500 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -1300,9 +1392,9 @@ diff -urNp linux-2.6.31.7/arch/ia64/mm/fault.c linux-2.6.31.7/arch/ia64/mm/fault survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.31.7/arch/ia64/mm/init.c linux-2.6.31.7/arch/ia64/mm/init.c ---- linux-2.6.31.7/arch/ia64/mm/init.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/mm/init.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/mm/init.c linux-2.6.32/arch/ia64/mm/init.c +--- linux-2.6.32/arch/ia64/mm/init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/mm/init.c 2009-12-04 21:40:47.742667300 -0500 @@ -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; @@ -1323,42 +1415,21 @@ diff -urNp linux-2.6.31.7/arch/ia64/mm/init.c linux-2.6.31.7/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.31.7/arch/ia64/pci/pci.c linux-2.6.31.7/arch/ia64/pci/pci.c ---- linux-2.6.31.7/arch/ia64/pci/pci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/ia64/pci/pci.c 2009-12-10 22:15:15.000000000 -0500 -@@ -56,10 +56,13 @@ int raw_pci_read(unsigned int seg, unsig - if ((seg | reg) <= 255) { - addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg); - mode = 0; -- } else { -+ } else if (sal_revision >= SAL_VERSION_CODE(3,2)) { - addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg); - mode = 1; -+ } else { -+ return -EINVAL; - } -+ - result = ia64_sal_pci_config_read(addr, mode, len, &data); - if (result != 0) - return -EINVAL; -@@ -80,10 +83,13 @@ int raw_pci_write(unsigned int seg, unsi - if ((seg | reg) <= 255) { - addr = PCI_SAL_ADDRESS(seg, bus, devfn, reg); - mode = 0; -- } else { -+ } else if (sal_revision >= SAL_VERSION_CODE(3,2)) { - addr = PCI_SAL_EXT_ADDRESS(seg, bus, devfn, reg); - mode = 1; -+ } else { -+ return -EINVAL; - } -+ - result = ia64_sal_pci_config_write(addr, mode, len, value); - if (result != 0) - return -EINVAL; -diff -urNp linux-2.6.31.7/arch/m32r/include/asm/atomic.h linux-2.6.31.7/arch/m32r/include/asm/atomic.h ---- linux-2.6.31.7/arch/m32r/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/m32r/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/ia64/sn/pci/pci_dma.c linux-2.6.32/arch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32/arch/ia64/sn/pci/pci_dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/ia64/sn/pci/pci_dma.c 2009-12-04 21:40:47.742667300 -0500 +@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * + return ret; + } + +-static struct dma_map_ops sn_dma_ops = { ++static const struct dma_map_ops sn_dma_ops = { + .alloc_coherent = sn_dma_alloc_coherent, + .free_coherent = sn_dma_free_coherent, + .map_page = sn_dma_map_page, +diff -urNp linux-2.6.32/arch/m32r/include/asm/atomic.h linux-2.6.32/arch/m32r/include/asm/atomic.h +--- linux-2.6.32/arch/m32r/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/m32r/include/asm/atomic.h 2009-12-04 21:40:47.743633358 -0500 @@ -29,6 +29,14 @@ #define atomic_read(v) ((v)->counter) @@ -1401,9 +1472,9 @@ diff -urNp linux-2.6.31.7/arch/m32r/include/asm/atomic.h linux-2.6.31.7/arch/m32 /* Atomic operations are already serializing on m32r */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.31.7/arch/m32r/lib/usercopy.c linux-2.6.31.7/arch/m32r/lib/usercopy.c ---- linux-2.6.31.7/arch/m32r/lib/usercopy.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/m32r/lib/usercopy.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/m32r/lib/usercopy.c linux-2.6.32/arch/m32r/lib/usercopy.c +--- linux-2.6.32/arch/m32r/lib/usercopy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/m32r/lib/usercopy.c 2009-12-04 21:40:47.744667538 -0500 @@ -14,6 +14,9 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from, unsigned long n) @@ -1424,9 +1495,9 @@ diff -urNp linux-2.6.31.7/arch/m32r/lib/usercopy.c linux-2.6.31.7/arch/m32r/lib/ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -diff -urNp linux-2.6.31.7/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.7/arch/m68k/include/asm/atomic_mm.h ---- linux-2.6.31.7/arch/m68k/include/asm/atomic_mm.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/m68k/include/asm/atomic_mm.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/m68k/include/asm/atomic_mm.h linux-2.6.32/arch/m68k/include/asm/atomic_mm.h +--- linux-2.6.32/arch/m68k/include/asm/atomic_mm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/m68k/include/asm/atomic_mm.h 2009-12-04 21:40:47.744667538 -0500 @@ -16,23 +16,40 @@ #define ATOMIC_INIT(i) { (i) } @@ -1468,9 +1539,9 @@ diff -urNp linux-2.6.31.7/arch/m68k/include/asm/atomic_mm.h linux-2.6.31.7/arch/ static inline void atomic_dec(atomic_t *v) { __asm__ __volatile__("subql #1,%0" : "+m" (*v)); -diff -urNp linux-2.6.31.7/arch/m68k/include/asm/atomic_no.h linux-2.6.31.7/arch/m68k/include/asm/atomic_no.h ---- linux-2.6.31.7/arch/m68k/include/asm/atomic_no.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/m68k/include/asm/atomic_no.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/m68k/include/asm/atomic_no.h linux-2.6.32/arch/m68k/include/asm/atomic_no.h +--- linux-2.6.32/arch/m68k/include/asm/atomic_no.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/m68k/include/asm/atomic_no.h 2009-12-04 21:40:47.744667538 -0500 @@ -16,7 +16,9 @@ #define ATOMIC_INIT(i) { (i) } @@ -1517,9 +1588,21 @@ diff -urNp linux-2.6.31.7/arch/m68k/include/asm/atomic_no.h linux-2.6.31.7/arch/ /* * atomic_inc_and_test - increment and test * @v: pointer of type atomic_t -diff -urNp linux-2.6.31.7/arch/mips/include/asm/atomic.h linux-2.6.31.7/arch/mips/include/asm/atomic.h ---- linux-2.6.31.7/arch/mips/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/alchemy/devboards/pm.c linux-2.6.32/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32/arch/mips/alchemy/devboards/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/alchemy/devboards/pm.c 2009-12-04 21:40:47.745675857 -0500 +@@ -78,7 +78,7 @@ static void db1x_pm_end(void) + + } + +-static struct platform_suspend_ops db1x_pm_ops = { ++static const struct platform_suspend_ops db1x_pm_ops = { + .valid = suspend_valid_only_mem, + .begin = db1x_pm_begin, + .enter = db1x_pm_enter, +diff -urNp linux-2.6.32/arch/mips/include/asm/atomic.h linux-2.6.32/arch/mips/include/asm/atomic.h +--- linux-2.6.32/arch/mips/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/include/asm/atomic.h 2009-12-04 21:40:47.810623028 -0500 @@ -32,6 +32,14 @@ #define atomic_read(v) ((v)->counter) @@ -1561,9 +1644,9 @@ diff -urNp linux-2.6.31.7/arch/mips/include/asm/atomic.h linux-2.6.31.7/arch/mip /* * atomic_dec - decrement and test -diff -urNp linux-2.6.31.7/arch/mips/include/asm/elf.h linux-2.6.31.7/arch/mips/include/asm/elf.h ---- linux-2.6.31.7/arch/mips/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/include/asm/elf.h linux-2.6.32/arch/mips/include/asm/elf.h +--- linux-2.6.32/arch/mips/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/include/asm/elf.h 2009-12-04 21:40:47.819305730 -0500 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1576,10 +1659,10 @@ diff -urNp linux-2.6.31.7/arch/mips/include/asm/elf.h linux-2.6.31.7/arch/mips/i +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.31.7/arch/mips/include/asm/page.h linux-2.6.31.7/arch/mips/include/asm/page.h ---- linux-2.6.31.7/arch/mips/include/asm/page.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/include/asm/page.h 2009-12-10 22:15:15.000000000 -0500 -@@ -92,7 +92,7 @@ extern void copy_user_highpage(struct pa +diff -urNp linux-2.6.32/arch/mips/include/asm/page.h linux-2.6.32/arch/mips/include/asm/page.h +--- linux-2.6.32/arch/mips/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/include/asm/page.h 2009-12-04 21:40:47.819685707 -0500 +@@ -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; #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32)) @@ -1588,10 +1671,10 @@ diff -urNp linux-2.6.31.7/arch/mips/include/asm/page.h linux-2.6.31.7/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.31.7/arch/mips/include/asm/system.h linux-2.6.31.7/arch/mips/include/asm/system.h ---- linux-2.6.31.7/arch/mips/include/asm/system.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/include/asm/system.h 2009-12-10 22:15:15.000000000 -0500 -@@ -217,6 +217,6 @@ extern void per_cpu_trap_init(void); +diff -urNp linux-2.6.32/arch/mips/include/asm/system.h linux-2.6.32/arch/mips/include/asm/system.h +--- linux-2.6.32/arch/mips/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/include/asm/system.h 2009-12-04 21:40:47.819685707 -0500 +@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1599,9 +1682,9 @@ diff -urNp linux-2.6.31.7/arch/mips/include/asm/system.h linux-2.6.31.7/arch/mip +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.31.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.7/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.31.7/arch/mips/kernel/binfmt_elfn32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/kernel/binfmt_elfn32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32/arch/mips/kernel/binfmt_elfn32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/kernel/binfmt_elfn32.c 2009-12-04 21:40:47.825568526 -0500 @@ -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) @@ -1616,9 +1699,9 @@ diff -urNp linux-2.6.31.7/arch/mips/kernel/binfmt_elfn32.c linux-2.6.31.7/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.31.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.31.7/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.31.7/arch/mips/kernel/binfmt_elfo32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/kernel/binfmt_elfo32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32/arch/mips/kernel/binfmt_elfo32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/kernel/binfmt_elfo32.c 2009-12-04 21:40:47.825568526 -0500 @@ -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) @@ -1633,9 +1716,20 @@ diff -urNp linux-2.6.31.7/arch/mips/kernel/binfmt_elfo32.c linux-2.6.31.7/arch/m #include <asm/processor.h> /* -diff -urNp linux-2.6.31.7/arch/mips/kernel/process.c linux-2.6.31.7/arch/mips/kernel/process.c ---- linux-2.6.31.7/arch/mips/kernel/process.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/kernel/process.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/kernel/kgdb.c linux-2.6.32/arch/mips/kernel/kgdb.c +--- linux-2.6.32/arch/mips/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/kernel/kgdb.c 2009-12-04 21:40:47.836078463 -0500 +@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto + return -1; + } + ++/* cannot be const */ + struct kgdb_arch arch_kgdb_ops; + + /* +diff -urNp linux-2.6.32/arch/mips/kernel/process.c linux-2.6.32/arch/mips/kernel/process.c +--- linux-2.6.32/arch/mips/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/kernel/process.c 2009-12-04 21:40:47.836686052 -0500 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1652,10 +1746,10 @@ diff -urNp linux-2.6.31.7/arch/mips/kernel/process.c linux-2.6.31.7/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.31.7/arch/mips/kernel/syscall.c linux-2.6.31.7/arch/mips/kernel/syscall.c ---- linux-2.6.31.7/arch/mips/kernel/syscall.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/kernel/syscall.c 2009-12-10 22:15:15.000000000 -0500 -@@ -99,6 +99,11 @@ unsigned long arch_get_unmapped_area(str +diff -urNp linux-2.6.32/arch/mips/kernel/syscall.c linux-2.6.32/arch/mips/kernel/syscall.c +--- linux-2.6.32/arch/mips/kernel/syscall.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/kernel/syscall.c 2009-12-04 21:40:47.837490563 -0500 +@@ -101,6 +101,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) do_color_align = 1; @@ -1667,7 +1761,7 @@ diff -urNp linux-2.6.31.7/arch/mips/kernel/syscall.c linux-2.6.31.7/arch/mips/ke if (addr) { if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); -@@ -109,7 +114,7 @@ unsigned long arch_get_unmapped_area(str +@@ -111,7 +116,7 @@ unsigned long arch_get_unmapped_area(str (!vmm || addr + len <= vmm->vm_start)) return addr; } @@ -1676,9 +1770,9 @@ diff -urNp linux-2.6.31.7/arch/mips/kernel/syscall.c linux-2.6.31.7/arch/mips/ke if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.31.7/arch/mips/mm/fault.c linux-2.6.31.7/arch/mips/mm/fault.c ---- linux-2.6.31.7/arch/mips/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mips/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mips/mm/fault.c linux-2.6.32/arch/mips/mm/fault.c +--- linux-2.6.32/arch/mips/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mips/mm/fault.c 2009-12-04 21:40:47.846241459 -0500 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1703,9 +1797,9 @@ diff -urNp linux-2.6.31.7/arch/mips/mm/fault.c linux-2.6.31.7/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.31.7/arch/mn10300/include/asm/atomic.h linux-2.6.31.7/arch/mn10300/include/asm/atomic.h ---- linux-2.6.31.7/arch/mn10300/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mn10300/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/mn10300/include/asm/atomic.h linux-2.6.32/arch/mn10300/include/asm/atomic.h +--- linux-2.6.32/arch/mn10300/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/mn10300/include/asm/atomic.h 2009-12-04 21:40:47.846614056 -0500 @@ -34,6 +34,15 @@ #define atomic_read(v) ((v)->counter) @@ -1771,21 +1865,9 @@ diff -urNp linux-2.6.31.7/arch/mn10300/include/asm/atomic.h linux-2.6.31.7/arch/ static inline void atomic_dec(atomic_t *v) { atomic_sub_return(1, v); -diff -urNp linux-2.6.31.7/arch/mn10300/kernel/setup.c linux-2.6.31.7/arch/mn10300/kernel/setup.c ---- linux-2.6.31.7/arch/mn10300/kernel/setup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/mn10300/kernel/setup.c 2009-12-10 22:15:15.000000000 -0500 -@@ -285,7 +285,7 @@ static void c_stop(struct seq_file *m, v - { - } - --struct seq_operations cpuinfo_op = { -+const struct seq_operations cpuinfo_op = { - .start = c_start, - .next = c_next, - .stop = c_stop, -diff -urNp linux-2.6.31.7/arch/parisc/include/asm/atomic.h linux-2.6.31.7/arch/parisc/include/asm/atomic.h ---- linux-2.6.31.7/arch/parisc/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/include/asm/atomic.h linux-2.6.32/arch/parisc/include/asm/atomic.h +--- linux-2.6.32/arch/parisc/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/include/asm/atomic.h 2009-12-04 21:40:47.846614056 -0500 @@ -177,6 +177,18 @@ static __inline__ int __atomic_add_retur return ret; } @@ -1844,9 +1926,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/include/asm/atomic.h linux-2.6.31.7/arch/p #define atomic_dec(v) ((void)(__atomic_add_return( -1,(v)))) #define atomic_add_return(i,v) (__atomic_add_return( (i),(v))) -diff -urNp linux-2.6.31.7/arch/parisc/include/asm/elf.h linux-2.6.31.7/arch/parisc/include/asm/elf.h ---- linux-2.6.31.7/arch/parisc/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/include/asm/elf.h linux-2.6.32/arch/parisc/include/asm/elf.h +--- linux-2.6.32/arch/parisc/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/include/asm/elf.h 2009-12-04 21:40:47.846614056 -0500 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1861,9 +1943,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/include/asm/elf.h linux-2.6.31.7/arch/pari /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.31.7/arch/parisc/include/asm/pgtable.h linux-2.6.31.7/arch/parisc/include/asm/pgtable.h ---- linux-2.6.31.7/arch/parisc/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/include/asm/pgtable.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/include/asm/pgtable.h linux-2.6.32/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32/arch/parisc/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/include/asm/pgtable.h 2009-12-04 21:40:47.847687132 -0500 @@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD @@ -1882,9 +1964,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/include/asm/pgtable.h linux-2.6.31.7/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.31.7/arch/parisc/kernel/module.c linux-2.6.31.7/arch/parisc/kernel/module.c ---- linux-2.6.31.7/arch/parisc/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/kernel/module.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/kernel/module.c linux-2.6.32/arch/parisc/kernel/module.c +--- linux-2.6.32/arch/parisc/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/kernel/module.c 2009-12-04 21:40:47.854864883 -0500 @@ -95,16 +95,38 @@ /* three functions to determine where in the module core @@ -1985,9 +2067,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/kernel/module.c linux-2.6.31.7/arch/parisc DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.31.7/arch/parisc/kernel/sys_parisc.c linux-2.6.31.7/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.31.7/arch/parisc/kernel/sys_parisc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/kernel/sys_parisc.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/kernel/sys_parisc.c linux-2.6.32/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32/arch/parisc/kernel/sys_parisc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/kernel/sys_parisc.c 2009-12-04 21:40:47.856697121 -0500 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1997,9 +2079,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/kernel/sys_parisc.c linux-2.6.31.7/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.31.7/arch/parisc/kernel/traps.c linux-2.6.31.7/arch/parisc/kernel/traps.c ---- linux-2.6.31.7/arch/parisc/kernel/traps.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/kernel/traps.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/kernel/traps.c linux-2.6.32/arch/parisc/kernel/traps.c +--- linux-2.6.32/arch/parisc/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/kernel/traps.c 2009-12-04 21:40:47.879574819 -0500 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); @@ -2011,9 +2093,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/kernel/traps.c linux-2.6.31.7/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.31.7/arch/parisc/mm/fault.c linux-2.6.31.7/arch/parisc/mm/fault.c ---- linux-2.6.31.7/arch/parisc/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/parisc/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/parisc/mm/fault.c linux-2.6.32/arch/parisc/mm/fault.c +--- linux-2.6.32/arch/parisc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/parisc/mm/fault.c 2009-12-04 21:40:47.879574819 -0500 @@ -15,6 +15,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -2183,9 +2265,9 @@ diff -urNp linux-2.6.31.7/arch/parisc/mm/fault.c linux-2.6.31.7/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/atomic.h linux-2.6.31.7/arch/powerpc/include/asm/atomic.h ---- linux-2.6.31.7/arch/powerpc/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/include/asm/atomic.h linux-2.6.32/arch/powerpc/include/asm/atomic.h +--- linux-2.6.32/arch/powerpc/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/atomic.h 2009-12-04 21:40:47.880701192 -0500 @@ -24,11 +24,21 @@ static __inline__ int atomic_read(const return t; } @@ -2244,9 +2326,93 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/atomic.h linux-2.6.31.7/arch/ static __inline__ int atomic_inc_return(atomic_t *v) { int t; -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/elf.h linux-2.6.31.7/arch/powerpc/include/asm/elf.h ---- linux-2.6.31.7/arch/powerpc/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/include/asm/device.h linux-2.6.32/arch/powerpc/include/asm/device.h +--- linux-2.6.32/arch/powerpc/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/device.h 2009-12-04 21:40:47.880701192 -0500 +@@ -14,7 +14,7 @@ struct dev_archdata { + struct device_node *of_node; + + /* DMA operations on that device */ +- struct dma_map_ops *dma_ops; ++ const struct dma_map_ops *dma_ops; + + /* + * When an iommu is in use, dma_data is used as a ptr to the base of the +diff -urNp linux-2.6.32/arch/powerpc/include/asm/dma-mapping.h linux-2.6.32/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32/arch/powerpc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/dma-mapping.h 2009-12-04 21:40:47.880701192 -0500 +@@ -67,11 +67,11 @@ static inline unsigned long device_to_ma + * Available generic sets of operations + */ + #ifdef CONFIG_PPC64 +-extern struct dma_map_ops dma_iommu_ops; ++extern const struct dma_map_ops dma_iommu_ops; + #endif +-extern struct dma_map_ops dma_direct_ops; ++extern const struct dma_map_ops dma_direct_ops; + +-static inline struct dma_map_ops *get_dma_ops(struct device *dev) ++static inline const struct dma_map_ops *get_dma_ops(struct device *dev) + { + /* We don't handle the NULL dev case for ISA for now. We could + * do it via an out of line call but it is not needed for now. The +@@ -84,7 +84,7 @@ static inline struct dma_map_ops *get_dm + return dev->archdata.dma_ops; + } + +-static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) ++static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops) + { + dev->archdata.dma_ops = ops; + } +@@ -118,7 +118,7 @@ static inline void set_dma_offset(struct + + static inline int dma_supported(struct device *dev, u64 mask) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + + if (unlikely(dma_ops == NULL)) + return 0; +@@ -132,7 +132,7 @@ static inline int dma_supported(struct d + + static inline int dma_set_mask(struct device *dev, u64 dma_mask) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + + if (unlikely(dma_ops == NULL)) + return -EIO; +@@ -147,7 +147,7 @@ static inline int dma_set_mask(struct de + static inline void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, gfp_t flag) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + void *cpu_addr; + + BUG_ON(!dma_ops); +@@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(s + static inline void dma_free_coherent(struct device *dev, size_t size, + void *cpu_addr, dma_addr_t dma_handle) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + + BUG_ON(!dma_ops); + +@@ -173,7 +173,7 @@ static inline void dma_free_coherent(str + + static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) + { +- struct dma_map_ops *dma_ops = get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops = get_dma_ops(dev); + + if (dma_ops->mapping_error) + return dma_ops->mapping_error(dev, dma_addr); +diff -urNp linux-2.6.32/arch/powerpc/include/asm/elf.h linux-2.6.32/arch/powerpc/include/asm/elf.h +--- linux-2.6.32/arch/powerpc/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/elf.h 2009-12-04 21:40:47.881690816 -0500 @@ -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. */ @@ -2279,9 +2445,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/elf.h linux-2.6.31.7/arch/pow #endif /* __KERNEL__ */ /* -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.31.7/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.31.7/arch/powerpc/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/include/asm/kmap_types.h linux-2.6.32/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32/arch/powerpc/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/kmap_types.h 2009-12-04 21:40:47.881690816 -0500 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -2290,25 +2456,10 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/kmap_types.h linux-2.6.31.7/a KM_TYPE_NR }; -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/page.h linux-2.6.31.7/arch/powerpc/include/asm/page.h ---- linux-2.6.31.7/arch/powerpc/include/asm/page.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/page.h 2009-12-10 22:15:15.000000000 -0500 -@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; - * and needs to be executable. This means the whole heap ends - * up being executable. - */ --#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ -- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -+#define VM_DATA_DEFAULT_FLAGS32 \ -+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ -+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) - - #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/page_64.h linux-2.6.31.7/arch/powerpc/include/asm/page_64.h ---- linux-2.6.31.7/arch/powerpc/include/asm/page_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/page_64.h 2009-12-10 22:15:15.000000000 -0500 -@@ -170,15 +170,18 @@ do { \ +diff -urNp linux-2.6.32/arch/powerpc/include/asm/page_64.h linux-2.6.32/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32/arch/powerpc/include/asm/page_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/page_64.h 2009-12-04 21:40:47.881690816 -0500 +@@ -180,15 +180,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. */ @@ -2329,10 +2480,39 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/page_64.h linux-2.6.31.7/arch #include <asm-generic/getorder.h> -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/pte-common.h linux-2.6.31.7/arch/powerpc/include/asm/pte-common.h ---- linux-2.6.31.7/arch/powerpc/include/asm/pte-common.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/pte-common.h 2009-12-10 22:15:15.000000000 -0500 -@@ -121,11 +121,11 @@ extern unsigned long bad_call_to_PMD_PAG +diff -urNp linux-2.6.32/arch/powerpc/include/asm/page.h linux-2.6.32/arch/powerpc/include/asm/page.h +--- linux-2.6.32/arch/powerpc/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/page.h 2009-12-04 21:40:47.881690816 -0500 +@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; + * and needs to be executable. This means the whole heap ends + * up being executable. + */ +-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ +- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) ++#define VM_DATA_DEFAULT_FLAGS32 \ ++ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ ++ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) + + #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +diff -urNp linux-2.6.32/arch/powerpc/include/asm/pci.h linux-2.6.32/arch/powerpc/include/asm/pci.h +--- linux-2.6.32/arch/powerpc/include/asm/pci.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/pci.h 2009-12-04 21:40:47.882692363 -0500 +@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq + } + + #ifdef CONFIG_PCI +-extern void set_pci_dma_ops(struct dma_map_ops *dma_ops); +-extern struct dma_map_ops *get_pci_dma_ops(void); ++extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops); ++extern const struct dma_map_ops *get_pci_dma_ops(void); + #else /* CONFIG_PCI */ + #define set_pci_dma_ops(d) + #define get_pci_dma_ops() NULL +diff -urNp linux-2.6.32/arch/powerpc/include/asm/pte-common.h linux-2.6.32/arch/powerpc/include/asm/pte-common.h +--- linux-2.6.32/arch/powerpc/include/asm/pte-common.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/pte-common.h 2009-12-04 21:40:47.882692363 -0500 +@@ -123,11 +123,11 @@ extern unsigned long bad_call_to_PMD_PAG */ #define PAGE_NONE __pgprot(_PAGE_BASE) #define PAGE_SHARED __pgprot(_PAGE_BASE | _PAGE_USER | _PAGE_RW) @@ -2347,9 +2527,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/pte-common.h linux-2.6.31.7/a #define __P000 PAGE_NONE #define __P001 PAGE_READONLY -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.31.7/arch/powerpc/include/asm/pte-hash32.h ---- linux-2.6.31.7/arch/powerpc/include/asm/pte-hash32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/pte-hash32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/include/asm/pte-hash32.h linux-2.6.32/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32/arch/powerpc/include/asm/pte-hash32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/pte-hash32.h 2009-12-04 21:40:47.882692363 -0500 @@ -21,6 +21,7 @@ #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ #define _PAGE_USER 0x004 /* usermode access allowed */ @@ -2358,10 +2538,10 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/pte-hash32.h linux-2.6.31.7/a #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/reg.h linux-2.6.31.7/arch/powerpc/include/asm/reg.h ---- linux-2.6.31.7/arch/powerpc/include/asm/reg.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/reg.h 2009-12-10 22:15:15.000000000 -0500 -@@ -195,6 +195,7 @@ +diff -urNp linux-2.6.32/arch/powerpc/include/asm/reg.h linux-2.6.32/arch/powerpc/include/asm/reg.h +--- linux-2.6.32/arch/powerpc/include/asm/reg.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/reg.h 2009-12-04 21:40:47.883692177 -0500 +@@ -191,6 +191,7 @@ #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ #define DSISR_NOHPTE 0x40000000 /* no translation found */ @@ -2369,9 +2549,21 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/reg.h linux-2.6.31.7/arch/pow #define DSISR_PROTFAULT 0x08000000 /* protection fault */ #define DSISR_ISSTORE 0x02000000 /* access was a store */ #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ -diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/include/asm/swiotlb.h linux-2.6.32/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32/arch/powerpc/include/asm/swiotlb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/swiotlb.h 2009-12-04 21:40:47.883692177 -0500 +@@ -13,7 +13,7 @@ + + #include <linux/swiotlb.h> + +-extern struct dma_map_ops swiotlb_dma_ops; ++extern const struct dma_map_ops swiotlb_dma_ops; + + static inline void dma_mark_clean(void *addr, size_t size) {} + +diff -urNp linux-2.6.32/arch/powerpc/include/asm/uaccess.h linux-2.6.32/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32/arch/powerpc/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/include/asm/uaccess.h 2009-12-11 19:45:15.832330646 -0500 @@ -327,52 +327,6 @@ do { \ extern unsigned long __copy_tofrom_user(void __user *to, const void __user *from, unsigned long size); @@ -2425,27 +2617,29 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch static inline unsigned long __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) { -@@ -396,6 +350,9 @@ static inline unsigned long __copy_from_ +@@ -396,6 +350,10 @@ static inline unsigned long __copy_from_ if (ret == 0) return 0; } ++ + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); + return __copy_tofrom_user((__force void __user *)to, from, n); } -@@ -422,6 +379,9 @@ static inline unsigned long __copy_to_us +@@ -422,6 +380,10 @@ static inline unsigned long __copy_to_us if (ret == 0) return 0; } ++ + if (!__builtin_constant_p(n)) + check_object_size(from, n, true); + return __copy_tofrom_user(to, (__force const void __user *)from, n); } -@@ -439,6 +399,97 @@ static inline unsigned long __copy_to_us +@@ -439,6 +401,92 @@ static inline unsigned long __copy_to_us return __copy_to_user_inatomic(to, from, size); } @@ -2456,13 +2650,12 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch +{ + unsigned long over; + -+ if (((long)n < 0) || (n > INT_MAX)) ++ if ((long)n < 0) + return n; + + if (access_ok(VERIFY_READ, from, n)) { + if (!__builtin_constant_p(n)) + check_object_size(to, n, false); -+ + return __copy_tofrom_user((__force void __user *)to, from, n); + } + if ((unsigned long)from < TASK_SIZE) { @@ -2480,7 +2673,7 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch +{ + unsigned long over; + -+ if (((long)n < 0) || (n > INT_MAX)) ++ if ((long)n < 0) + return n; + + if (access_ok(VERIFY_WRITE, to, n)) { @@ -2503,10 +2696,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch +#define __copy_in_user(to, from, size) \ + __copy_tofrom_user((to), (from), (size)) + -+static inline unsigned long __must_check copy_from_user(void *to, -+ const void __user *from, unsigned long n) ++static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) +{ -+ if (unlikely(((long)n < 0) || (n > INT_MAX))) ++ if ((long)n < 0 || n > INT_MAX) + return n; + + if (!__builtin_constant_p(n)) @@ -2516,14 +2708,12 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch + n = __copy_from_user(to, from, n); + else + memset(to, 0, n); -+ + return n; +} + -+static inline unsigned long __must_check copy_to_user(void __user *to, -+ const void *from, unsigned long n) ++static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) +{ -+ if (unlikely(((long)n < 0) || (n > INT_MAX))) ++ if ((long)n < 0 || n > INT_MAX) + return n; + + if (likely(access_ok(VERIFY_WRITE, to, n))) { @@ -2531,7 +2721,6 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch + check_object_size(from, n, true); + n = __copy_to_user(to, from, n); + } -+ + return n; +} + @@ -2543,9 +2732,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/include/asm/uaccess.h linux-2.6.31.7/arch extern unsigned long __clear_user(void __user *addr, unsigned long size); static inline unsigned long clear_user(void __user *addr, unsigned long size) -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.31.7/arch/powerpc/kernel/cacheinfo.c ---- linux-2.6.31.7/arch/powerpc/kernel/cacheinfo.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/cacheinfo.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/kernel/cacheinfo.c linux-2.6.32/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32/arch/powerpc/kernel/cacheinfo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/cacheinfo.c 2009-12-04 21:40:47.884697881 -0500 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde &cache_assoc_attr, }; @@ -2555,9 +2744,78 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/cacheinfo.c linux-2.6.31.7/arch/po .show = cache_index_show, }; -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/module_32.c linux-2.6.31.7/arch/powerpc/kernel/module_32.c ---- linux-2.6.31.7/arch/powerpc/kernel/module_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/module_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/kernel/dma.c linux-2.6.32/arch/powerpc/kernel/dma.c +--- linux-2.6.32/arch/powerpc/kernel/dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/dma.c 2009-12-04 21:40:47.885689947 -0500 +@@ -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/arch/powerpc/kernel/dma-iommu.c linux-2.6.32/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32/arch/powerpc/kernel/dma-iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/dma-iommu.c 2009-12-04 21:40:47.884697881 -0500 +@@ -89,7 +89,7 @@ static int dma_iommu_dma_supported(struc + return 1; + } + +-struct dma_map_ops dma_iommu_ops = { ++const struct dma_map_ops dma_iommu_ops = { + .alloc_coherent = dma_iommu_alloc_coherent, + .free_coherent = dma_iommu_free_coherent, + .map_sg = dma_iommu_map_sg, +diff -urNp linux-2.6.32/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32/arch/powerpc/kernel/dma-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/dma-swiotlb.c 2009-12-04 21:40:47.884697881 -0500 +@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; + * map_page, and unmap_page on highmem, use normal dma_ops + * for everything else. + */ +-struct dma_map_ops swiotlb_dma_ops = { ++const struct dma_map_ops swiotlb_dma_ops = { + .alloc_coherent = dma_direct_alloc_coherent, + .free_coherent = dma_direct_free_coherent, + .map_sg = swiotlb_map_sg_attrs, +diff -urNp linux-2.6.32/arch/powerpc/kernel/ibmebus.c linux-2.6.32/arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32/arch/powerpc/kernel/ibmebus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/ibmebus.c 2009-12-04 21:40:47.885689947 -0500 +@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct + return 1; + } + +-static struct dma_map_ops ibmebus_dma_ops = { ++static const struct dma_map_ops ibmebus_dma_ops = { + .alloc_coherent = ibmebus_alloc_coherent, + .free_coherent = ibmebus_free_coherent, + .map_sg = ibmebus_map_sg, +diff -urNp linux-2.6.32/arch/powerpc/kernel/kgdb.c linux-2.6.32/arch/powerpc/kernel/kgdb.c +--- linux-2.6.32/arch/powerpc/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/kgdb.c 2009-12-04 21:40:47.885689947 -0500 +@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct + if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) + return 0; + +- if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr)) ++ if (*(u32 *) (regs->nip) == *(const u32 *) (&arch_kgdb_ops.gdb_bpt_instr)) + regs->nip += 4; + + return 1; +@@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vecto + /* + * Global data + */ +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, + }; + +diff -urNp linux-2.6.32/arch/powerpc/kernel/module_32.c linux-2.6.32/arch/powerpc/kernel/module_32.c +--- linux-2.6.32/arch/powerpc/kernel/module_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/module_32.c 2009-12-04 21:40:47.886691874 -0500 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -2587,10 +2845,31 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/module_32.c linux-2.6.31.7/arch/po /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/process.c linux-2.6.31.7/arch/powerpc/kernel/process.c ---- linux-2.6.31.7/arch/powerpc/kernel/process.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/process.c 2009-12-10 22:15:15.000000000 -0500 -@@ -1147,36 +1147,3 @@ unsigned long arch_align_stack(unsigned +diff -urNp linux-2.6.32/arch/powerpc/kernel/pci-common.c linux-2.6.32/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32/arch/powerpc/kernel/pci-common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/pci-common.c 2009-12-04 21:40:47.887658758 -0500 +@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; + unsigned int ppc_pci_flags = 0; + + +-static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; ++static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops; + +-void set_pci_dma_ops(struct dma_map_ops *dma_ops) ++void set_pci_dma_ops(const struct dma_map_ops *dma_ops) + { + pci_dma_ops = dma_ops; + } + +-struct dma_map_ops *get_pci_dma_ops(void) ++const struct dma_map_ops *get_pci_dma_ops(void) + { + return pci_dma_ops; + } +diff -urNp linux-2.6.32/arch/powerpc/kernel/process.c linux-2.6.32/arch/powerpc/kernel/process.c +--- linux-2.6.32/arch/powerpc/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/process.c 2009-12-04 21:40:47.887658758 -0500 +@@ -1153,51 +1153,3 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() & ~PAGE_MASK; return sp & ~0xf; } @@ -2610,7 +2889,22 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/process.c linux-2.6.31.7/arch/powe - -unsigned long arch_randomize_brk(struct mm_struct *mm) -{ -- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd()); +- unsigned long base = mm->brk; +- unsigned long ret; +- +-#ifdef CONFIG_PPC_STD_MMU_64 +- /* +- * If we are using 1TB segments and we are allowed to randomise +- * the heap, we can put it above 1TB so it is backed by a 1TB +- * segment. Otherwise the heap will be in the bottom 1TB +- * which always uses 256MB segments and this may result in a +- * performance penalty. +- */ +- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T)) +- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T); +-#endif +- +- ret = PAGE_ALIGN(base + brk_rnd()); - - if (ret < mm->brk) - return mm->brk; @@ -2627,21 +2921,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/process.c linux-2.6.31.7/arch/powe - - return ret; -} -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/setup-common.c linux-2.6.31.7/arch/powerpc/kernel/setup-common.c ---- linux-2.6.31.7/arch/powerpc/kernel/setup-common.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/setup-common.c 2009-12-10 22:15:15.000000000 -0500 -@@ -328,7 +328,7 @@ static void c_stop(struct seq_file *m, v - { - } - --struct seq_operations cpuinfo_op = { -+const struct seq_operations cpuinfo_op = { - .start =c_start, - .next = c_next, - .stop = c_stop, -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/signal_32.c linux-2.6.31.7/arch/powerpc/kernel/signal_32.c ---- linux-2.6.31.7/arch/powerpc/kernel/signal_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/signal_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/kernel/signal_32.c linux-2.6.32/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32/arch/powerpc/kernel/signal_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/signal_32.c 2009-12-04 21:40:47.887658758 -0500 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -2651,9 +2933,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/signal_32.c linux-2.6.31.7/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/signal_64.c linux-2.6.31.7/arch/powerpc/kernel/signal_64.c ---- linux-2.6.31.7/arch/powerpc/kernel/signal_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/signal_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/kernel/signal_64.c linux-2.6.32/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32/arch/powerpc/kernel/signal_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/signal_64.c 2009-12-04 21:40:47.888697606 -0500 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -2663,10 +2945,10 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/signal_64.c linux-2.6.31.7/arch/po regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.31.7/arch/powerpc/kernel/sys_ppc32.c ---- linux-2.6.31.7/arch/powerpc/kernel/sys_ppc32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/sys_ppc32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -552,10 +552,10 @@ asmlinkage long compat_sys_sysctl(struct +diff -urNp linux-2.6.32/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32/arch/powerpc/kernel/sys_ppc32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/sys_ppc32.c 2009-12-04 21:40:47.888697606 -0500 +@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct if (oldlenp) { if (!error) { if (get_user(oldlen, oldlenp) || @@ -2679,10 +2961,10 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/sys_ppc32.c linux-2.6.31.7/arch/po } return error; } -diff -urNp linux-2.6.31.7/arch/powerpc/kernel/vdso.c linux-2.6.31.7/arch/powerpc/kernel/vdso.c ---- linux-2.6.31.7/arch/powerpc/kernel/vdso.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kernel/vdso.c 2009-12-10 22:15:15.000000000 -0500 -@@ -35,6 +35,7 @@ +diff -urNp linux-2.6.32/arch/powerpc/kernel/vdso.c linux-2.6.32/arch/powerpc/kernel/vdso.c +--- linux-2.6.32/arch/powerpc/kernel/vdso.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/vdso.c 2009-12-04 21:40:47.889693552 -0500 +@@ -36,6 +36,7 @@ #include <asm/firmware.h> #include <asm/vdso.h> #include <asm/vdso_datapage.h> @@ -2690,7 +2972,7 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/vdso.c linux-2.6.31.7/arch/powerpc #include "setup.h" -@@ -211,7 +212,7 @@ int arch_setup_additional_pages(struct l +@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l vdso_base = VDSO32_MBASE; #endif @@ -2699,30 +2981,29 @@ diff -urNp linux-2.6.31.7/arch/powerpc/kernel/vdso.c linux-2.6.31.7/arch/powerpc /* vDSO has a problem and was disabled, just don't "enable" it for the * process -@@ -228,7 +229,7 @@ int arch_setup_additional_pages(struct l - */ - down_write(&mm->mmap_sem); +@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l vdso_base = get_unmapped_area(NULL, vdso_base, -- vdso_pages << PAGE_SHIFT, 0, 0); -+ vdso_pages << PAGE_SHIFT, 0, MAP_PRIVATE | MAP_EXECUTABLE); + (vdso_pages << PAGE_SHIFT) + + ((VDSO_ALIGNMENT - 1) & PAGE_MASK), +- 0, 0); ++ 0, MAP_PRIVATE | MAP_EXECUTABLE); if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.31.7/arch/powerpc/kvm/timing.c linux-2.6.31.7/arch/powerpc/kvm/timing.c ---- linux-2.6.31.7/arch/powerpc/kvm/timing.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/kvm/timing.c 2009-12-10 22:15:15.000000000 -0500 -@@ -201,7 +201,7 @@ static int kvmppc_exit_timing_open(struc - return single_open(file, kvmppc_exit_timing_show, inode->i_private); - } - --static struct file_operations kvmppc_exit_timing_fops = { -+static const struct file_operations kvmppc_exit_timing_fops = { - .owner = THIS_MODULE, - .open = kvmppc_exit_timing_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/arch/powerpc/lib/usercopy_64.c linux-2.6.31.7/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.31.7/arch/powerpc/lib/usercopy_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/lib/usercopy_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/kernel/vio.c linux-2.6.32/arch/powerpc/kernel/vio.c +--- linux-2.6.32/arch/powerpc/kernel/vio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/kernel/vio.c 2009-12-04 21:40:47.889693552 -0500 +@@ -601,6 +601,7 @@ static void vio_dma_iommu_unmap_sg(struc + vio_cmo_dealloc(viodev, alloc_size); + } + ++/* cannot be const */ + struct dma_map_ops vio_dma_mapping_ops = { + .alloc_coherent = vio_dma_iommu_alloc_coherent, + .free_coherent = vio_dma_iommu_free_coherent, +diff -urNp linux-2.6.32/arch/powerpc/lib/usercopy_64.c linux-2.6.32/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32/arch/powerpc/lib/usercopy_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/lib/usercopy_64.c 2009-12-04 21:40:47.889693552 -0500 @@ -9,22 +9,6 @@ #include <linux/module.h> #include <asm/uaccess.h> @@ -2754,13 +3035,13 @@ diff -urNp linux-2.6.31.7/arch/powerpc/lib/usercopy_64.c linux-2.6.31.7/arch/pow -EXPORT_SYMBOL(copy_to_user); EXPORT_SYMBOL(copy_in_user); -diff -urNp linux-2.6.31.7/arch/powerpc/mm/fault.c linux-2.6.31.7/arch/powerpc/mm/fault.c ---- linux-2.6.31.7/arch/powerpc/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/mm/fault.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/mm/fault.c linux-2.6.32/arch/powerpc/mm/fault.c +--- linux-2.6.32/arch/powerpc/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/mm/fault.c 2009-12-04 21:40:47.890689181 -0500 @@ -30,6 +30,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> - #include <linux/perf_counter.h> + #include <linux/perf_event.h> +#include <linux/slab.h> +#include <linux/pagemap.h> +#include <linux/compiler.h> @@ -2861,9 +3142,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/mm/fault.c linux-2.6.31.7/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.31.7/arch/powerpc/mm/mmap_64.c linux-2.6.31.7/arch/powerpc/mm/mmap_64.c ---- linux-2.6.31.7/arch/powerpc/mm/mmap_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/mm/mmap_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/mm/mmap_64.c linux-2.6.32/arch/powerpc/mm/mmap_64.c +--- linux-2.6.32/arch/powerpc/mm/mmap_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/mm/mmap_64.c 2009-12-04 21:40:47.890689181 -0500 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { @@ -2887,9 +3168,9 @@ diff -urNp linux-2.6.31.7/arch/powerpc/mm/mmap_64.c linux-2.6.31.7/arch/powerpc/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.31.7/arch/powerpc/mm/slice.c linux-2.6.31.7/arch/powerpc/mm/slice.c ---- linux-2.6.31.7/arch/powerpc/mm/slice.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/mm/slice.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/powerpc/mm/slice.c linux-2.6.32/arch/powerpc/mm/slice.c +--- linux-2.6.32/arch/powerpc/mm/slice.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/mm/slice.c 2009-12-04 21:40:47.890689181 -0500 @@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un if (fixed && addr > (mm->task_size - len)) return -EINVAL; @@ -2902,130 +3183,79 @@ diff -urNp linux-2.6.31.7/arch/powerpc/mm/slice.c linux-2.6.31.7/arch/powerpc/mm /* If hint, make sure it matches our alignment restrictions */ if (!fixed && addr) { addr = _ALIGN_UP(addr, 1ul << pshift); -diff -urNp linux-2.6.31.7/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.31.7/arch/powerpc/platforms/cell/spufs/file.c ---- linux-2.6.31.7/arch/powerpc/platforms/cell/spufs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/platforms/cell/spufs/file.c 2009-12-10 22:15:15.000000000 -0500 -@@ -147,7 +147,7 @@ static int __fops ## _open(struct inode - __simple_attr_check_format(__fmt, 0ull); \ - return spufs_attr_open(inode, file, __get, __set, __fmt); \ - } \ --static struct file_operations __fops = { \ -+static const struct file_operations __fops = { \ - .owner = THIS_MODULE, \ - .open = __fops ## _open, \ - .release = spufs_attr_release, \ -@@ -309,7 +309,7 @@ static int spufs_mem_mmap_access(struct - return len; - } - --static struct vm_operations_struct spufs_mem_mmap_vmops = { -+static const struct vm_operations_struct spufs_mem_mmap_vmops = { - .fault = spufs_mem_mmap_fault, - .access = spufs_mem_mmap_access, - }; -@@ -436,7 +436,7 @@ static int spufs_cntl_mmap_fault(struct - return spufs_ps_fault(vma, vmf, 0x4000, SPUFS_CNTL_MAP_SIZE); - } - --static struct vm_operations_struct spufs_cntl_mmap_vmops = { -+static const struct vm_operations_struct spufs_cntl_mmap_vmops = { - .fault = spufs_cntl_mmap_fault, - }; - -@@ -1143,7 +1143,7 @@ spufs_signal1_mmap_fault(struct vm_area_ - #endif - } - --static struct vm_operations_struct spufs_signal1_mmap_vmops = { -+static const struct vm_operations_struct spufs_signal1_mmap_vmops = { - .fault = spufs_signal1_mmap_fault, - }; - -@@ -1279,7 +1279,7 @@ spufs_signal2_mmap_fault(struct vm_area_ - #endif - } - --static struct vm_operations_struct spufs_signal2_mmap_vmops = { -+static const struct vm_operations_struct spufs_signal2_mmap_vmops = { - .fault = spufs_signal2_mmap_fault, - }; - -@@ -1397,7 +1397,7 @@ spufs_mss_mmap_fault(struct vm_area_stru - return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_MSS_MAP_SIZE); - } - --static struct vm_operations_struct spufs_mss_mmap_vmops = { -+static const struct vm_operations_struct spufs_mss_mmap_vmops = { - .fault = spufs_mss_mmap_fault, - }; - -@@ -1458,7 +1458,7 @@ spufs_psmap_mmap_fault(struct vm_area_st - return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_PS_MAP_SIZE); - } - --static struct vm_operations_struct spufs_psmap_mmap_vmops = { -+static const struct vm_operations_struct spufs_psmap_mmap_vmops = { - .fault = spufs_psmap_mmap_fault, - }; - -@@ -1517,7 +1517,7 @@ spufs_mfc_mmap_fault(struct vm_area_stru - return spufs_ps_fault(vma, vmf, 0x3000, SPUFS_MFC_MAP_SIZE); - } - --static struct vm_operations_struct spufs_mfc_mmap_vmops = { -+static const struct vm_operations_struct spufs_mfc_mmap_vmops = { - .fault = spufs_mfc_mmap_fault, - }; - -diff -urNp linux-2.6.31.7/arch/powerpc/platforms/pseries/dtl.c linux-2.6.31.7/arch/powerpc/platforms/pseries/dtl.c ---- linux-2.6.31.7/arch/powerpc/platforms/pseries/dtl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/platforms/pseries/dtl.c 2009-12-10 22:15:15.000000000 -0500 -@@ -209,7 +209,7 @@ static ssize_t dtl_file_read(struct file - return n_read * sizeof(struct dtl_entry); - } - --static struct file_operations dtl_fops = { -+static const struct file_operations dtl_fops = { - .open = dtl_file_open, - .release = dtl_file_release, - .read = dtl_file_read, -diff -urNp linux-2.6.31.7/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.31.7/arch/powerpc/platforms/pseries/hvCall_inst.c ---- linux-2.6.31.7/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-12-10 22:15:15.000000000 -0500 -@@ -71,7 +71,7 @@ static int hc_show(struct seq_file *m, v - return 0; +diff -urNp linux-2.6.32/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.32/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32/arch/powerpc/platforms/52xx/lite5200_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/platforms/52xx/lite5200_pm.c 2009-12-04 21:40:47.891647504 -0500 +@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) + lite5200_pm_target_state = PM_SUSPEND_ON; + } + +-static struct platform_suspend_ops lite5200_pm_ops = { ++static const struct platform_suspend_ops lite5200_pm_ops = { + .valid = lite5200_pm_valid, + .begin = lite5200_pm_begin, + .prepare = lite5200_pm_prepare, +diff -urNp linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2009-12-04 21:40:47.891647504 -0500 +@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) + iounmap(mbar); + } + +-static struct platform_suspend_ops mpc52xx_pm_ops = { ++static const struct platform_suspend_ops mpc52xx_pm_ops = { + .valid = mpc52xx_pm_valid, + .prepare = mpc52xx_pm_prepare, + .enter = mpc52xx_pm_enter, +diff -urNp linux-2.6.32/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32/arch/powerpc/platforms/83xx/suspend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/platforms/83xx/suspend.c 2009-12-04 21:40:47.891647504 -0500 +@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) + return ret; } --static struct seq_operations hcall_inst_seq_ops = { -+static const struct seq_operations hcall_inst_seq_ops = { - .start = hc_start, - .next = hc_next, - .stop = hc_stop, -diff -urNp linux-2.6.31.7/arch/s390/hypfs/inode.c linux-2.6.31.7/arch/s390/hypfs/inode.c ---- linux-2.6.31.7/arch/s390/hypfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/s390/hypfs/inode.c 2009-12-10 22:15:15.000000000 -0500 -@@ -41,7 +41,7 @@ struct hypfs_sb_info { - - static const struct file_operations hypfs_file_ops; - static struct file_system_type hypfs_type; --static struct super_operations hypfs_s_ops; -+static const struct super_operations hypfs_s_ops; - - /* start of list of all dentries, which have to be deleted on update */ - static struct dentry *hypfs_last_dentry; -@@ -476,7 +476,7 @@ static struct file_system_type hypfs_typ - .kill_sb = hypfs_kill_super - }; - --static struct super_operations hypfs_s_ops = { -+static const struct super_operations hypfs_s_ops = { - .statfs = simple_statfs, - .drop_inode = hypfs_drop_inode, - .show_options = hypfs_show_options, -diff -urNp linux-2.6.31.7/arch/s390/include/asm/atomic.h linux-2.6.31.7/arch/s390/include/asm/atomic.h ---- linux-2.6.31.7/arch/s390/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/s390/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 -@@ -71,19 +71,31 @@ static inline int atomic_read(const atom +-static struct platform_suspend_ops mpc83xx_suspend_ops = { ++static const struct platform_suspend_ops mpc83xx_suspend_ops = { + .valid = mpc83xx_suspend_valid, + .begin = mpc83xx_suspend_begin, + .enter = mpc83xx_suspend_enter, +diff -urNp linux-2.6.32/arch/powerpc/platforms/cell/iommu.c linux-2.6.32/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32/arch/powerpc/platforms/cell/iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/platforms/cell/iommu.c 2009-12-04 21:40:47.892691540 -0500 +@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc + + static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); + +-struct dma_map_ops dma_iommu_fixed_ops = { ++const struct dma_map_ops dma_iommu_fixed_ops = { + .alloc_coherent = dma_fixed_alloc_coherent, + .free_coherent = dma_fixed_free_coherent, + .map_sg = dma_fixed_map_sg, +diff -urNp linux-2.6.32/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32/arch/powerpc/platforms/ps3/system-bus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/powerpc/platforms/ps3/system-bus.c 2009-12-04 21:40:47.892691540 -0500 +@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi + return mask >= DMA_BIT_MASK(32); + } + +-static struct dma_map_ops ps3_sb_dma_ops = { ++static const struct dma_map_ops ps3_sb_dma_ops = { + .alloc_coherent = ps3_alloc_coherent, + .free_coherent = ps3_free_coherent, + .map_sg = ps3_sb_map_sg, +@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops + .unmap_page = ps3_unmap_page, + }; + +-static struct dma_map_ops ps3_ioc0_dma_ops = { ++static const struct dma_map_ops ps3_ioc0_dma_ops = { + .alloc_coherent = ps3_alloc_coherent, + .free_coherent = ps3_free_coherent, + .map_sg = ps3_ioc0_map_sg, +diff -urNp linux-2.6.32/arch/s390/include/asm/atomic.h linux-2.6.32/arch/s390/include/asm/atomic.h +--- linux-2.6.32/arch/s390/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/s390/include/asm/atomic.h 2009-12-04 21:40:47.893657145 -0500 +@@ -61,19 +61,31 @@ static inline int atomic_read(const atom return v->counter; } @@ -3045,7 +3275,7 @@ diff -urNp linux-2.6.31.7/arch/s390/include/asm/atomic.h linux-2.6.31.7/arch/s39 + atomic_set((atomic_t *)v, i); +} + - static __inline__ int atomic_add_return(int i, atomic_t * v) + static inline int atomic_add_return(int i, atomic_t *v) { return __CS_LOOP(v, i, "ar"); } @@ -3057,7 +3287,7 @@ diff -urNp linux-2.6.31.7/arch/s390/include/asm/atomic.h linux-2.6.31.7/arch/s39 #define atomic_inc_return(_v) atomic_add_return(1, _v) #define atomic_inc_and_test(_v) (atomic_add_return(1, _v) == 0) -@@ -92,6 +104,7 @@ static __inline__ int atomic_sub_return( +@@ -82,6 +94,7 @@ static inline int atomic_sub_return(int return __CS_LOOP(v, i, "sr"); } #define atomic_sub(_i, _v) atomic_sub_return(_i, _v) @@ -3065,9 +3295,9 @@ diff -urNp linux-2.6.31.7/arch/s390/include/asm/atomic.h linux-2.6.31.7/arch/s39 #define atomic_sub_and_test(_i, _v) (atomic_sub_return(_i, _v) == 0) #define atomic_dec(_v) atomic_sub_return(1, _v) #define atomic_dec_return(_v) atomic_sub_return(1, _v) -diff -urNp linux-2.6.31.7/arch/s390/include/asm/uaccess.h linux-2.6.31.7/arch/s390/include/asm/uaccess.h ---- linux-2.6.31.7/arch/s390/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/s390/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/s390/include/asm/uaccess.h linux-2.6.32/arch/s390/include/asm/uaccess.h +--- linux-2.6.32/arch/s390/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/s390/include/asm/uaccess.h 2009-12-04 21:40:47.893657145 -0500 @@ -232,6 +232,10 @@ static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { @@ -3100,10 +3330,10 @@ diff -urNp linux-2.6.31.7/arch/s390/include/asm/uaccess.h linux-2.6.31.7/arch/s3 if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); else -diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/kernel/module.c ---- linux-2.6.31.7/arch/s390/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/s390/kernel/module.c 2009-12-10 22:15:15.000000000 -0500 -@@ -164,11 +164,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, +diff -urNp linux-2.6.32/arch/s390/kernel/module.c linux-2.6.32/arch/s390/kernel/module.c +--- linux-2.6.32/arch/s390/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/s390/kernel/module.c 2009-12-04 21:40:47.893657145 -0500 +@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start offsets for got and plt. */ @@ -3120,7 +3350,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker return 0; } -@@ -254,7 +254,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base if (info->got_initialized == 0) { Elf_Addr *gotent; @@ -3129,7 +3359,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker info->got_offset; *gotent = val; info->got_initialized = 1; -@@ -278,7 +278,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base else if (r_type == R_390_GOTENT || r_type == R_390_GOTPLTENT) *(unsigned int *) loc = @@ -3138,7 +3368,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker else if (r_type == R_390_GOT64 || r_type == R_390_GOTPLT64) *(unsigned long *) loc = val; -@@ -292,7 +292,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -294,7 +294,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */ if (info->plt_initialized == 0) { unsigned int *ip; @@ -3147,7 +3377,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker info->plt_offset; #ifndef CONFIG_64BIT ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ -@@ -317,7 +317,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base val - loc + 0xffffUL < 0x1ffffeUL) || (r_type == R_390_PLT32DBL && val - loc + 0xffffffffULL < 0x1fffffffeULL))) @@ -3156,7 +3386,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker me->arch.plt_offset + info->plt_offset; val += rela->r_addend - loc; -@@ -339,7 +339,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base case R_390_GOTOFF32: /* 32 bit offset to GOT. */ case R_390_GOTOFF64: /* 64 bit offset to GOT. */ val = val + rela->r_addend - @@ -3165,7 +3395,7 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker if (r_type == R_390_GOTOFF16) *(unsigned short *) loc = val; else if (r_type == R_390_GOTOFF32) -@@ -349,7 +349,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base break; case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */ case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */ @@ -3174,9 +3404,21 @@ diff -urNp linux-2.6.31.7/arch/s390/kernel/module.c linux-2.6.31.7/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.31.7/arch/sh/include/asm/atomic.h linux-2.6.31.7/arch/sh/include/asm/atomic.h ---- linux-2.6.31.7/arch/sh/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sh/include/asm/atomic.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32/arch/sh/boards/mach-hp6xx/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sh/boards/mach-hp6xx/pm.c 2009-12-04 21:40:47.894688526 -0500 +@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ + return 0; + } + +-static struct platform_suspend_ops hp6x0_pm_ops = { ++static const struct platform_suspend_ops hp6x0_pm_ops = { + .enter = hp6x0_pm_enter, + .valid = suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32/arch/sh/include/asm/atomic.h linux-2.6.32/arch/sh/include/asm/atomic.h +--- linux-2.6.32/arch/sh/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sh/include/asm/atomic.h 2009-12-04 21:40:47.894688526 -0500 @@ -14,7 +14,9 @@ #define ATOMIC_INIT(i) ( (atomic_t) { (i) } ) @@ -3197,9 +3439,9 @@ diff -urNp linux-2.6.31.7/arch/sh/include/asm/atomic.h linux-2.6.31.7/arch/sh/in #define atomic_dec(v) atomic_sub(1,(v)) #if !defined(CONFIG_GUSA_RB) && !defined(CONFIG_CPU_SH4A) -diff -urNp linux-2.6.31.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.31.7/arch/sh/kernel/cpu/sh4/sq.c ---- linux-2.6.31.7/arch/sh/kernel/cpu/sh4/sq.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sh/kernel/cpu/sh4/sq.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32/arch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32/arch/sh/kernel/cpu/sh4/sq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sh/kernel/cpu/sh4/sq.c 2009-12-04 21:40:47.911037024 -0500 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ NULL, }; @@ -3209,21 +3451,33 @@ diff -urNp linux-2.6.31.7/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.31.7/arch/sh/ker .show = sq_sysfs_show, .store = sq_sysfs_store, }; -diff -urNp linux-2.6.31.7/arch/sparc/Makefile linux-2.6.31.7/arch/sparc/Makefile ---- linux-2.6.31.7/arch/sparc/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/Makefile 2009-12-10 22:15:15.000000000 -0500 -@@ -77,7 +77,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc - # Export what is needed by arch/sparc/boot/Makefile - export VMLINUX_INIT VMLINUX_MAIN - VMLINUX_INIT := $(head-y) $(init-y) --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/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32/arch/sh/kernel/cpu/shmobile/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sh/kernel/cpu/shmobile/pm.c 2009-12-04 21:40:47.911037024 -0500 +@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s + return 0; + } + +-static struct platform_suspend_ops sh_pm_ops = { ++static const struct platform_suspend_ops sh_pm_ops = { + .enter = sh_pm_enter, + .valid = suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32/arch/sh/kernel/kgdb.c linux-2.6.32/arch/sh/kernel/kgdb.c +--- linux-2.6.32/arch/sh/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sh/kernel/kgdb.c 2009-12-04 21:40:47.911694785 -0500 +@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) + { + } -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/atomic_32.h linux-2.6.31.7/arch/sparc/include/asm/atomic_32.h ---- linux-2.6.31.7/arch/sparc/include/asm/atomic_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/atomic_32.h 2009-12-10 22:15:15.000000000 -0500 +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + /* Breakpoint instruction: trapa #0x3c */ + #ifdef CONFIG_CPU_LITTLE_ENDIAN + .gdb_bpt_instr = { 0x3c, 0xc3 }, +diff -urNp linux-2.6.32/arch/sparc/include/asm/atomic_32.h linux-2.6.32/arch/sparc/include/asm/atomic_32.h +--- linux-2.6.32/arch/sparc/include/asm/atomic_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/atomic_32.h 2009-12-04 21:40:47.911694785 -0500 @@ -24,12 +24,17 @@ extern int atomic_cmpxchg(atomic_t *, in #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) extern int atomic_add_unless(atomic_t *, int, int); @@ -3242,9 +3496,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/atomic_32.h linux-2.6.31.7/arch #define atomic_dec(v) ((void)__atomic_add_return( -1, (v))) #define atomic_add_return(i, v) (__atomic_add_return( (int)(i), (v))) -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/atomic_64.h linux-2.6.31.7/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.31.7/arch/sparc/include/asm/atomic_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/atomic_64.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/include/asm/atomic_64.h linux-2.6.32/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32/arch/sparc/include/asm/atomic_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/atomic_64.h 2009-12-04 21:40:47.911694785 -0500 @@ -14,14 +14,18 @@ #define ATOMIC64_INIT(i) { (i) } @@ -3338,9 +3592,43 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/atomic_64.h linux-2.6.31.7/arch } #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/elf_32.h linux-2.6.31.7/arch/sparc/include/asm/elf_32.h ---- linux-2.6.31.7/arch/sparc/include/asm/elf_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/elf_32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/include/asm/dma-mapping.h linux-2.6.32/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32/arch/sparc/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/dma-mapping.h 2009-12-04 21:40:47.912694918 -0500 +@@ -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) + +-extern struct dma_map_ops *dma_ops, pci32_dma_ops; ++extern struct const dma_map_ops *dma_ops, pci32_dma_ops; + extern struct bus_type pci_bus_type; + +-static inline struct dma_map_ops *get_dma_ops(struct device *dev) ++static inline const struct dma_map_ops *get_dma_ops(struct device *dev) + { + #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI) + if (dev->bus == &pci_bus_type) +@@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dm + static inline void *dma_alloc_coherent(struct device *dev, size_t size, + dma_addr_t *dma_handle, gfp_t flag) + { +- struct dma_map_ops *ops = get_dma_ops(dev); ++ const struct dma_map_ops *ops = get_dma_ops(dev); + void *cpu_addr; + + cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag); +@@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(s + static inline void dma_free_coherent(struct device *dev, size_t size, + void *cpu_addr, dma_addr_t dma_handle) + { +- struct dma_map_ops *ops = get_dma_ops(dev); ++ const struct dma_map_ops *ops = get_dma_ops(dev); + + 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/arch/sparc/include/asm/elf_32.h linux-2.6.32/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32/arch/sparc/include/asm/elf_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/elf_32.h 2009-12-04 21:40:47.912694918 -0500 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -3355,9 +3643,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/elf_32.h linux-2.6.31.7/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/elf_64.h linux-2.6.31.7/arch/sparc/include/asm/elf_64.h ---- linux-2.6.31.7/arch/sparc/include/asm/elf_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/elf_64.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/include/asm/elf_64.h linux-2.6.32/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32/arch/sparc/include/asm/elf_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/elf_64.h 2009-12-04 21:40:47.912694918 -0500 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -3371,9 +3659,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/elf_64.h linux-2.6.31.7/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.31.7/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.31.7/arch/sparc/include/asm/pgtable_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/pgtable_32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/include/asm/pgtable_32.h linux-2.6.32/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32/arch/sparc/include/asm/pgtable_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/pgtable_32.h 2009-12-04 21:40:47.912694918 -0500 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -3405,9 +3693,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/pgtable_32.h linux-2.6.31.7/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.31.7/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.31.7/arch/sparc/include/asm/pgtsrmmu.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/pgtsrmmu.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32/arch/sparc/include/asm/pgtsrmmu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/pgtsrmmu.h 2009-12-04 21:40:47.913613294 -0500 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -3422,10 +3710,10 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.31.7/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h ---- linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h 2009-12-10 22:15:15.000000000 -0500 -@@ -99,7 +99,12 @@ static void inline __read_lock(raw_rwloc +diff -urNp linux-2.6.32/arch/sparc/include/asm/spinlock_64.h linux-2.6.32/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32/arch/sparc/include/asm/spinlock_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/spinlock_64.h 2009-12-04 21:40:47.913613294 -0500 +@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw __asm__ __volatile__ ( "1: ldsw [%2], %0\n" " brlz,pn %0, 2f\n" @@ -3439,7 +3727,7 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" -@@ -112,7 +117,7 @@ static void inline __read_lock(raw_rwloc +@@ -112,7 +117,7 @@ static void inline arch_read_lock(raw_rw " .previous" : "=&r" (tmp1), "=&r" (tmp2) : "r" (lock) @@ -3447,8 +3735,8 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.7/ar + : "memory", "cc"); } - static int inline __read_trylock(raw_rwlock_t *lock) -@@ -123,7 +128,12 @@ static int inline __read_trylock(raw_rwl + static int inline arch_read_trylock(raw_rwlock_t *lock) +@@ -123,7 +128,12 @@ static int inline arch_read_trylock(raw_ "1: ldsw [%2], %0\n" " brlz,a,pn %0, 2f\n" " mov 0, %0\n" @@ -3462,7 +3750,7 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.7/ar " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%icc, 1b\n" -@@ -142,7 +152,12 @@ static void inline __read_unlock(raw_rwl +@@ -142,7 +152,12 @@ static void inline arch_read_unlock(raw_ __asm__ __volatile__( "1: lduw [%2], %0\n" @@ -3470,16 +3758,16 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/spinlock_64.h linux-2.6.31.7/ar +" subcc %0, 1, %1\n" + +#ifdef CONFIG_PAX_REFCOUNT -+" tvs %%icc, 6\n" ++" tvs %%icc, 6\n" +#endif + " cas [%2], %0, %1\n" " cmp %0, %1\n" " bne,pn %%xcc, 1b\n" -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.31.7/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.31.7/arch/sparc/include/asm/uaccess_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/uaccess_32.h 2009-12-10 22:15:15.000000000 -0500 -@@ -249,27 +249,49 @@ extern unsigned long __copy_user(void __ +diff -urNp linux-2.6.32/arch/sparc/include/asm/uaccess_32.h linux-2.6.32/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32/arch/sparc/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/uaccess_32.h 2009-12-04 21:40:47.913613294 -0500 +@@ -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) { @@ -3527,52 +3815,124 @@ diff -urNp linux-2.6.31.7/arch/sparc/include/asm/uaccess_32.h linux-2.6.31.7/arc + if ((long)n < 0) + return n; + -+ if (!__builtin_constant_p(n)) -+ check_object_size(to, n, false); -+ return __copy_user((__force void __user *) to, from, n); } -diff -urNp linux-2.6.31.7/arch/sparc/include/asm/uaccess_64.h linux-2.6.31.7/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.31.7/arch/sparc/include/asm/uaccess_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/include/asm/uaccess_64.h 2009-12-10 22:15:15.000000000 -0500 -@@ -212,7 +212,15 @@ extern unsigned long copy_from_user_fixu +diff -urNp linux-2.6.32/arch/sparc/include/asm/uaccess_64.h linux-2.6.32/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32/arch/sparc/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/include/asm/uaccess_64.h 2009-12-11 19:45:15.860525695 -0500 +@@ -212,8 +212,15 @@ extern unsigned long copy_from_user_fixu static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) { - unsigned long ret = ___copy_from_user(to, from, size); + unsigned long ret; -+ -+ if (unlikely(((long)size > INT_MAX) || ((long)size < 0))) + ++ if ((long)size < 0 || size > INT_MAX) + return size; + + if (!__builtin_constant_p(size)) + check_object_size(to, size, false); + -+ ret = ___copy_from_user(to, from, size); - ++ ret = ___copy_from_user(to, from, size); if (unlikely(ret)) ret = copy_from_user_fixup(to, from, size); -@@ -228,7 +236,15 @@ extern unsigned long copy_to_user_fixup( + return ret; +@@ -228,8 +235,15 @@ extern unsigned long copy_to_user_fixup( static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long size) { - unsigned long ret = ___copy_to_user(to, from, size); + unsigned long ret; + -+ if (unlikely(((long)size > INT_MAX) || ((long)size < 0))) ++ if ((long)size < 0 || size > INT_MAX) + return size; + + if (!__builtin_constant_p(size)) + check_object_size(from, size, true); -+ -+ ret = ___copy_to_user(to, from, size); ++ ret = ___copy_to_user(to, from, size); if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); -diff -urNp linux-2.6.31.7/arch/sparc/kernel/Makefile linux-2.6.31.7/arch/sparc/kernel/Makefile ---- linux-2.6.31.7/arch/sparc/kernel/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/kernel/Makefile 2009-12-10 22:15:15.000000000 -0500 + return ret; +diff -urNp linux-2.6.32/arch/sparc/kernel/iommu.c linux-2.6.32/arch/sparc/kernel/iommu.c +--- linux-2.6.32/arch/sparc/kernel/iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/iommu.c 2009-12-04 21:40:47.915657076 -0500 +@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc + spin_unlock_irqrestore(&iommu->lock, flags); + } + +-static struct dma_map_ops sun4u_dma_ops = { ++static const struct dma_map_ops sun4u_dma_ops = { + .alloc_coherent = dma_4u_alloc_coherent, + .free_coherent = dma_4u_free_coherent, + .map_page = dma_4u_map_page, +@@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops + .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu, + }; + +-struct dma_map_ops *dma_ops = &sun4u_dma_ops; ++const struct dma_map_ops *dma_ops = &sun4u_dma_ops; + EXPORT_SYMBOL(dma_ops); + + extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); +diff -urNp linux-2.6.32/arch/sparc/kernel/ioport.c linux-2.6.32/arch/sparc/kernel/ioport.c +--- linux-2.6.32/arch/sparc/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/ioport.c 2009-12-04 21:40:47.915657076 -0500 +@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru + BUG(); + } + +-struct dma_map_ops sbus_dma_ops = { ++const struct dma_map_ops sbus_dma_ops = { + .alloc_coherent = sbus_alloc_coherent, + .free_coherent = sbus_free_coherent, + .map_page = sbus_map_page, +@@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops = { + .sync_sg_for_device = sbus_sync_sg_for_device, + }; + +-struct dma_map_ops *dma_ops = &sbus_dma_ops; ++const struct dma_map_ops *dma_ops = &sbus_dma_ops; + EXPORT_SYMBOL(dma_ops); + + static int __init sparc_register_ioport(void) +@@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(str + } + } + +-struct dma_map_ops pci32_dma_ops = { ++const struct dma_map_ops pci32_dma_ops = { + .alloc_coherent = pci32_alloc_coherent, + .free_coherent = pci32_free_coherent, + .map_page = pci32_map_page, +diff -urNp linux-2.6.32/arch/sparc/kernel/kgdb_32.c linux-2.6.32/arch/sparc/kernel/kgdb_32.c +--- linux-2.6.32/arch/sparc/kernel/kgdb_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/kgdb_32.c 2009-12-04 21:40:47.915657076 -0500 +@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) + { + } + +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + /* Breakpoint instruction: ta 0x7d */ + .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, + }; +diff -urNp linux-2.6.32/arch/sparc/kernel/kgdb_64.c linux-2.6.32/arch/sparc/kernel/kgdb_64.c +--- linux-2.6.32/arch/sparc/kernel/kgdb_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/kgdb_64.c 2009-12-04 21:40:47.916695821 -0500 +@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) + { + } + +-struct kgdb_arch arch_kgdb_ops = { ++const struct kgdb_arch arch_kgdb_ops = { + /* Breakpoint instruction: ta 0x72 */ + .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, + }; +diff -urNp linux-2.6.32/arch/sparc/kernel/Makefile linux-2.6.32/arch/sparc/kernel/Makefile +--- linux-2.6.32/arch/sparc/kernel/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/Makefile 2009-12-04 21:40:47.914702369 -0500 @@ -3,7 +3,7 @@ # @@ -3582,9 +3942,21 @@ diff -urNp linux-2.6.31.7/arch/sparc/kernel/Makefile linux-2.6.31.7/arch/sparc/k extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.31.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.31.7/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.31.7/arch/sparc/kernel/sys_sparc_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/kernel/sys_sparc_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/kernel/pci_sun4v.c linux-2.6.32/arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32/arch/sparc/kernel/pci_sun4v.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/pci_sun4v.c 2009-12-04 21:40:47.916695821 -0500 +@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic + spin_unlock_irqrestore(&iommu->lock, flags); + } + +-static struct dma_map_ops sun4v_dma_ops = { ++static const struct dma_map_ops sun4v_dma_ops = { + .alloc_coherent = dma_4v_alloc_coherent, + .free_coherent = dma_4v_free_coherent, + .map_page = dma_4v_map_page, +diff -urNp linux-2.6.32/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32/arch/sparc/kernel/sys_sparc_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/sys_sparc_32.c 2009-12-04 21:40:47.921685083 -0500 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -3594,9 +3966,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/kernel/sys_sparc_32.c linux-2.6.31.7/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.31.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.31.7/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.31.7/arch/sparc/kernel/sys_sparc_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/kernel/sys_sparc_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32/arch/sparc/kernel/sys_sparc_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/sys_sparc_64.c 2009-12-04 21:40:47.922719930 -0500 @@ -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. @@ -3675,9 +4047,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/kernel/sys_sparc_64.c linux-2.6.31.7/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.31.7/arch/sparc/kernel/traps_64.c linux-2.6.31.7/arch/sparc/kernel/traps_64.c ---- linux-2.6.31.7/arch/sparc/kernel/traps_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/kernel/traps_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/kernel/traps_64.c linux-2.6.32/arch/sparc/kernel/traps_64.c +--- linux-2.6.32/arch/sparc/kernel/traps_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/kernel/traps_64.c 2009-12-04 21:40:47.923642958 -0500 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl -= 0x100; @@ -3709,9 +4081,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/kernel/traps_64.c linux-2.6.31.7/arch/sparc dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); sprintf (buffer, "Bad trap %lx at tl>0", lvl); -diff -urNp linux-2.6.31.7/arch/sparc/lib/atomic32.c linux-2.6.31.7/arch/sparc/lib/atomic32.c ---- linux-2.6.31.7/arch/sparc/lib/atomic32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/lib/atomic32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/lib/atomic32.c linux-2.6.32/arch/sparc/lib/atomic32.c +--- linux-2.6.32/arch/sparc/lib/atomic32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/lib/atomic32.c 2009-12-04 21:40:47.923642958 -0500 @@ -80,6 +80,12 @@ void atomic_set(atomic_t *v, int i) } EXPORT_SYMBOL(atomic_set); @@ -3725,9 +4097,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/lib/atomic32.c linux-2.6.31.7/arch/sparc/li unsigned long ___set_bit(unsigned long *addr, unsigned long mask) { unsigned long old, flags; -diff -urNp linux-2.6.31.7/arch/sparc/lib/atomic_64.S linux-2.6.31.7/arch/sparc/lib/atomic_64.S ---- linux-2.6.31.7/arch/sparc/lib/atomic_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/lib/atomic_64.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/lib/atomic_64.S linux-2.6.32/arch/sparc/lib/atomic_64.S +--- linux-2.6.32/arch/sparc/lib/atomic_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/lib/atomic_64.S 2009-12-04 21:40:47.923642958 -0500 @@ -18,7 +18,12 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ BACKOFF_SETUP(%o2) @@ -3880,9 +4252,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/lib/atomic_64.S linux-2.6.31.7/arch/sparc/l casx [%o1], %g1, %g7 cmp %g1, %g7 bne,pn %xcc, 2f -diff -urNp linux-2.6.31.7/arch/sparc/lib/ksyms.c linux-2.6.31.7/arch/sparc/lib/ksyms.c ---- linux-2.6.31.7/arch/sparc/lib/ksyms.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/lib/ksyms.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/lib/ksyms.c linux-2.6.32/arch/sparc/lib/ksyms.c +--- linux-2.6.32/arch/sparc/lib/ksyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/lib/ksyms.c 2009-12-04 21:40:47.924726898 -0500 @@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); /* Atomic counter implementation. */ @@ -3894,9 +4266,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/lib/ksyms.c linux-2.6.31.7/arch/sparc/lib/k EXPORT_SYMBOL(atomic_sub_ret); EXPORT_SYMBOL(atomic64_add); EXPORT_SYMBOL(atomic64_add_ret); -diff -urNp linux-2.6.31.7/arch/sparc/lib/rwsem_64.S linux-2.6.31.7/arch/sparc/lib/rwsem_64.S ---- linux-2.6.31.7/arch/sparc/lib/rwsem_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/lib/rwsem_64.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/lib/rwsem_64.S linux-2.6.32/arch/sparc/lib/rwsem_64.S +--- linux-2.6.32/arch/sparc/lib/rwsem_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/lib/rwsem_64.S 2009-12-04 21:40:47.924726898 -0500 @@ -11,7 +11,12 @@ .globl __down_read __down_read: @@ -3995,21 +4367,21 @@ diff -urNp linux-2.6.31.7/arch/sparc/lib/rwsem_64.S linux-2.6.31.7/arch/sparc/li cas [%o0], %g3, %g7 cmp %g3, %g7 bne,pn %icc, 1b -diff -urNp linux-2.6.31.7/arch/sparc/mm/Makefile linux-2.6.31.7/arch/sparc/mm/Makefile ---- linux-2.6.31.7/arch/sparc/mm/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/mm/Makefile 2009-12-10 22:15:15.000000000 -0500 -@@ -2,7 +2,7 @@ - # - - asflags-y := -ansi --ccflags-y := -Werror -+#ccflags-y := -Werror +diff -urNp linux-2.6.32/arch/sparc/Makefile linux-2.6.32/arch/sparc/Makefile +--- linux-2.6.32/arch/sparc/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/Makefile 2009-12-04 20:41:38.323502420 -0500 +@@ -73,7 +73,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) - obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o - obj-y += fault_$(BITS).o -diff -urNp linux-2.6.31.7/arch/sparc/mm/fault_32.c linux-2.6.31.7/arch/sparc/mm/fault_32.c ---- linux-2.6.31.7/arch/sparc/mm/fault_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/mm/fault_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/mm/fault_32.c linux-2.6.32/arch/sparc/mm/fault_32.c +--- linux-2.6.32/arch/sparc/mm/fault_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/mm/fault_32.c 2009-12-04 21:40:47.925695716 -0500 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -4313,9 +4685,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/mm/fault_32.c linux-2.6.31.7/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.31.7/arch/sparc/mm/fault_64.c linux-2.6.31.7/arch/sparc/mm/fault_64.c ---- linux-2.6.31.7/arch/sparc/mm/fault_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/mm/fault_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/sparc/mm/fault_64.c linux-2.6.32/arch/sparc/mm/fault_64.c +--- linux-2.6.32/arch/sparc/mm/fault_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/mm/fault_64.c 2009-12-04 21:40:47.926687949 -0500 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -4773,10 +5145,10 @@ diff -urNp linux-2.6.31.7/arch/sparc/mm/fault_64.c linux-2.6.31.7/arch/sparc/mm/ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.31.7/arch/sparc/mm/init_32.c linux-2.6.31.7/arch/sparc/mm/init_32.c ---- linux-2.6.31.7/arch/sparc/mm/init_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/mm/init_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -316,6 +316,9 @@ extern void device_scan(void); +diff -urNp linux-2.6.32/arch/sparc/mm/init_32.c linux-2.6.32/arch/sparc/mm/init_32.c +--- linux-2.6.32/arch/sparc/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/mm/init_32.c 2009-12-04 21:40:47.927682233 -0500 +@@ -317,6 +317,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -4786,7 +5158,7 @@ diff -urNp linux-2.6.31.7/arch/sparc/mm/init_32.c linux-2.6.31.7/arch/sparc/mm/i void __init paging_init(void) { switch(sparc_cpu_model) { -@@ -341,17 +344,17 @@ void __init paging_init(void) +@@ -345,17 +348,17 @@ void __init paging_init(void) /* Initialize the protection map with non-constant, MMU dependent values. */ protection_map[0] = PAGE_NONE; @@ -4810,10 +5182,22 @@ diff -urNp linux-2.6.31.7/arch/sparc/mm/init_32.c linux-2.6.31.7/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.31.7/arch/sparc/mm/srmmu.c linux-2.6.31.7/arch/sparc/mm/srmmu.c ---- linux-2.6.31.7/arch/sparc/mm/srmmu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/sparc/mm/srmmu.c 2009-12-10 22:15:15.000000000 -0500 -@@ -2149,6 +2149,13 @@ void __init ld_mmu_srmmu(void) +diff -urNp linux-2.6.32/arch/sparc/mm/Makefile linux-2.6.32/arch/sparc/mm/Makefile +--- linux-2.6.32/arch/sparc/mm/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/mm/Makefile 2009-12-04 21:40:47.924726898 -0500 +@@ -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/arch/sparc/mm/srmmu.c linux-2.6.32/arch/sparc/mm/srmmu.c +--- linux-2.6.32/arch/sparc/mm/srmmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/sparc/mm/srmmu.c 2009-12-04 21:40:47.928642430 -0500 +@@ -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)); BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY)); @@ -4827,9 +5211,9 @@ diff -urNp linux-2.6.31.7/arch/sparc/mm/srmmu.c linux-2.6.31.7/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.31.7/arch/um/include/asm/kmap_types.h linux-2.6.31.7/arch/um/include/asm/kmap_types.h ---- linux-2.6.31.7/arch/um/include/asm/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/um/include/asm/kmap_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/um/include/asm/kmap_types.h linux-2.6.32/arch/um/include/asm/kmap_types.h +--- linux-2.6.32/arch/um/include/asm/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/um/include/asm/kmap_types.h 2009-12-04 21:40:47.929706570 -0500 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -4838,9 +5222,9 @@ diff -urNp linux-2.6.31.7/arch/um/include/asm/kmap_types.h linux-2.6.31.7/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.31.7/arch/um/include/asm/page.h linux-2.6.31.7/arch/um/include/asm/page.h ---- linux-2.6.31.7/arch/um/include/asm/page.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/um/include/asm/page.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/um/include/asm/page.h linux-2.6.32/arch/um/include/asm/page.h +--- linux-2.6.32/arch/um/include/asm/page.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/um/include/asm/page.h 2009-12-04 21:40:47.929706570 -0500 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -4851,9 +5235,9 @@ diff -urNp linux-2.6.31.7/arch/um/include/asm/page.h linux-2.6.31.7/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.31.7/arch/um/sys-i386/syscalls.c linux-2.6.31.7/arch/um/sys-i386/syscalls.c ---- linux-2.6.31.7/arch/um/sys-i386/syscalls.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/um/sys-i386/syscalls.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/um/sys-i386/syscalls.c linux-2.6.32/arch/um/sys-i386/syscalls.c +--- linux-2.6.32/arch/um/sys-i386/syscalls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/um/sys-i386/syscalls.c 2009-12-04 21:40:47.930876173 -0500 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -4876,116 +5260,9 @@ diff -urNp linux-2.6.31.7/arch/um/sys-i386/syscalls.c linux-2.6.31.7/arch/um/sys /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.31.7/arch/x86/Kconfig linux-2.6.31.7/arch/x86/Kconfig ---- linux-2.6.31.7/arch/x86/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/Kconfig 2009-12-10 22:15:15.000000000 -0500 -@@ -1098,7 +1098,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 -@@ -1416,7 +1416,7 @@ config X86_PAT - - 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). -@@ -1507,6 +1507,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. - -@@ -1571,6 +1572,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 -@@ -1602,9 +1604,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.31.7/arch/x86/Kconfig.cpu linux-2.6.31.7/arch/x86/Kconfig.cpu ---- linux-2.6.31.7/arch/x86/Kconfig.cpu 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/Kconfig.cpu 2009-12-10 22:15:15.000000000 -0500 -@@ -331,7 +331,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 -@@ -351,7 +351,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 -@@ -397,7 +397,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) -+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64) - - config X86_MINIMUM_CPU_FAMILY - int -diff -urNp linux-2.6.31.7/arch/x86/Kconfig.debug linux-2.6.31.7/arch/x86/Kconfig.debug ---- linux-2.6.31.7/arch/x86/Kconfig.debug 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/Kconfig.debug 2009-12-10 22:15:15.000000000 -0500 -@@ -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.31.7/arch/x86/Makefile linux-2.6.31.7/arch/x86/Makefile ---- linux-2.6.31.7/arch/x86/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/Makefile 2009-12-10 22:15:16.000000000 -0500 -@@ -188,3 +188,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.31.7/arch/x86/boot/bitops.h linux-2.6.31.7/arch/x86/boot/bitops.h ---- linux-2.6.31.7/arch/x86/boot/bitops.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/bitops.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/bitops.h linux-2.6.32/arch/x86/boot/bitops.h +--- linux-2.6.32/arch/x86/boot/bitops.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/bitops.h 2009-12-04 21:40:47.942658220 -0500 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -5004,9 +5281,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/bitops.h linux-2.6.31.7/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.31.7/arch/x86/boot/boot.h linux-2.6.31.7/arch/x86/boot/boot.h ---- linux-2.6.31.7/arch/x86/boot/boot.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/boot.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/boot.h linux-2.6.32/arch/x86/boot/boot.h +--- linux-2.6.32/arch/x86/boot/boot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/boot.h 2009-12-04 21:40:47.942658220 -0500 @@ -82,7 +82,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -5025,10 +5302,10 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/boot.h linux-2.6.31.7/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_32.S linux-2.6.31.7/arch/x86/boot/compressed/head_32.S ---- linux-2.6.31.7/arch/x86/boot/compressed/head_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/compressed/head_32.S 2009-12-10 22:15:15.000000000 -0500 -@@ -75,7 +75,7 @@ ENTRY(startup_32) +diff -urNp linux-2.6.32/arch/x86/boot/compressed/head_32.S linux-2.6.32/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32/arch/x86/boot/compressed/head_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/compressed/head_32.S 2009-12-04 21:40:47.942658220 -0500 +@@ -76,7 +76,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx #else @@ -5037,7 +5314,7 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_32.S linux-2.6.31.7/arch #endif /* Target address to relocate to for decompression */ -@@ -148,7 +148,7 @@ relocated: +@@ -149,7 +149,7 @@ relocated: * and where it was actually loaded. */ movl %ebp, %ebx @@ -5046,7 +5323,7 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_32.S linux-2.6.31.7/arch jz 2f /* Nothing to be done if loaded at compiled addr. */ /* * Process relocations. -@@ -156,8 +156,7 @@ relocated: +@@ -157,8 +157,7 @@ relocated: 1: subl $4, %edi movl (%edi), %ecx @@ -5056,10 +5333,10 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_32.S linux-2.6.31.7/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_64.S linux-2.6.31.7/arch/x86/boot/compressed/head_64.S ---- linux-2.6.31.7/arch/x86/boot/compressed/head_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/compressed/head_64.S 2009-12-10 22:15:15.000000000 -0500 -@@ -90,7 +90,7 @@ ENTRY(startup_32) +diff -urNp linux-2.6.32/arch/x86/boot/compressed/head_64.S linux-2.6.32/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32/arch/x86/boot/compressed/head_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/compressed/head_64.S 2009-12-04 21:40:47.942658220 -0500 +@@ -91,7 +91,7 @@ ENTRY(startup_32) notl %eax andl %eax, %ebx #else @@ -5068,7 +5345,7 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_64.S linux-2.6.31.7/arch #endif /* Target address to relocate to for decompression */ -@@ -233,7 +233,7 @@ ENTRY(startup_64) +@@ -234,7 +234,7 @@ ENTRY(startup_64) notq %rax andq %rax, %rbp #else @@ -5077,9 +5354,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/head_64.S linux-2.6.31.7/arch #endif /* Target address to relocate to for decompression */ -diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/misc.c linux-2.6.31.7/arch/x86/boot/compressed/misc.c ---- linux-2.6.31.7/arch/x86/boot/compressed/misc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/compressed/misc.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/compressed/misc.c linux-2.6.32/arch/x86/boot/compressed/misc.c +--- linux-2.6.32/arch/x86/boot/compressed/misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/compressed/misc.c 2009-12-04 21:40:47.943697399 -0500 @@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE @@ -5098,9 +5375,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/misc.c linux-2.6.31.7/arch/x8 error("Wrong destination address"); #endif -diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.31.7/arch/x86/boot/compressed/mkpiggy.c ---- linux-2.6.31.7/arch/x86/boot/compressed/mkpiggy.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/compressed/mkpiggy.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32/arch/x86/boot/compressed/mkpiggy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/compressed/mkpiggy.c 2009-12-04 21:40:47.943697399 -0500 @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) offs = (olen > ilen) ? olen - ilen : 0; @@ -5110,9 +5387,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/mkpiggy.c linux-2.6.31.7/arch offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ printf(".section \".rodata.compressed\",\"a\",@progbits\n"); -diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/relocs.c linux-2.6.31.7/arch/x86/boot/compressed/relocs.c ---- linux-2.6.31.7/arch/x86/boot/compressed/relocs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/compressed/relocs.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/compressed/relocs.c linux-2.6.32/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32/arch/x86/boot/compressed/relocs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/compressed/relocs.c 2009-12-04 21:40:47.943697399 -0500 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -5313,9 +5590,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/compressed/relocs.c linux-2.6.31.7/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.31.7/arch/x86/boot/cpucheck.c linux-2.6.31.7/arch/x86/boot/cpucheck.c ---- linux-2.6.31.7/arch/x86/boot/cpucheck.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/cpucheck.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/cpucheck.c linux-2.6.32/arch/x86/boot/cpucheck.c +--- linux-2.6.32/arch/x86/boot/cpucheck.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/cpucheck.c 2009-12-04 21:40:47.943697399 -0500 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -5411,9 +5688,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/cpucheck.c linux-2.6.31.7/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.31.7/arch/x86/boot/header.S linux-2.6.31.7/arch/x86/boot/header.S ---- linux-2.6.31.7/arch/x86/boot/header.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/header.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/boot/header.S linux-2.6.32/arch/x86/boot/header.S +--- linux-2.6.32/arch/x86/boot/header.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/header.S 2009-12-04 21:40:47.943697399 -0500 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical # single linked list of # struct setup_data @@ -5423,10 +5700,10 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/header.S linux-2.6.31.7/arch/x86/boot/he #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) #define VO_INIT_SIZE (VO__end - VO__text) -diff -urNp linux-2.6.31.7/arch/x86/boot/video-vesa.c linux-2.6.31.7/arch/x86/boot/video-vesa.c ---- linux-2.6.31.7/arch/x86/boot/video-vesa.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/boot/video-vesa.c 2009-12-10 22:15:15.000000000 -0500 -@@ -205,6 +205,7 @@ static void vesa_store_pm_info(void) +diff -urNp linux-2.6.32/arch/x86/boot/video-vesa.c linux-2.6.32/arch/x86/boot/video-vesa.c +--- linux-2.6.32/arch/x86/boot/video-vesa.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/boot/video-vesa.c 2009-12-04 21:40:47.945198140 -0500 +@@ -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; @@ -5434,9 +5711,9 @@ diff -urNp linux-2.6.31.7/arch/x86/boot/video-vesa.c linux-2.6.31.7/arch/x86/boo } /* -diff -urNp linux-2.6.31.7/arch/x86/ia32/ia32_signal.c linux-2.6.31.7/arch/x86/ia32/ia32_signal.c ---- linux-2.6.31.7/arch/x86/ia32/ia32_signal.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/ia32/ia32_signal.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/ia32/ia32_signal.c linux-2.6.32/arch/x86/ia32/ia32_signal.c +--- linux-2.6.32/arch/x86/ia32/ia32_signal.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/ia32/ia32_signal.c 2009-12-04 21:40:47.945697580 -0500 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, @@ -5455,10 +5732,10 @@ diff -urNp linux-2.6.31.7/arch/x86/ia32/ia32_signal.c linux-2.6.31.7/arch/x86/ia }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/alternative.h linux-2.6.31.7/arch/x86/include/asm/alternative.h ---- linux-2.6.31.7/arch/x86/include/asm/alternative.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/alternative.h 2009-12-10 22:15:15.000000000 -0500 -@@ -87,7 +87,7 @@ const unsigned char *const *find_nop_tab +diff -urNp linux-2.6.32/arch/x86/include/asm/alternative.h linux-2.6.32/arch/x86/include/asm/alternative.h +--- linux-2.6.32/arch/x86/include/asm/alternative.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/alternative.h 2009-12-04 21:40:47.945697580 -0500 +@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ ".previous\n" \ @@ -5467,9 +5744,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/alternative.h linux-2.6.31.7/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" -diff -urNp linux-2.6.31.7/arch/x86/include/asm/apm.h linux-2.6.31.7/arch/x86/include/asm/apm.h ---- linux-2.6.31.7/arch/x86/include/asm/apm.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/apm.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/apm.h linux-2.6.32/arch/x86/include/asm/apm.h +--- linux-2.6.32/arch/x86/include/asm/apm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/apm.h 2009-12-04 21:40:47.945697580 -0500 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" @@ -5488,9 +5765,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/apm.h linux-2.6.31.7/arch/x86/inc "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t" -diff -urNp linux-2.6.31.7/arch/x86/include/asm/atomic_32.h linux-2.6.31.7/arch/x86/include/asm/atomic_32.h ---- linux-2.6.31.7/arch/x86/include/asm/atomic_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/atomic_32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/atomic_32.h linux-2.6.32/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32/arch/x86/include/asm/atomic_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/atomic_32.h 2009-12-04 21:40:47.946694287 -0500 @@ -25,6 +25,17 @@ static inline int atomic_read(const atom } @@ -5770,9 +6047,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/atomic_32.h linux-2.6.31.7/arch/x } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -diff -urNp linux-2.6.31.7/arch/x86/include/asm/atomic_64.h linux-2.6.31.7/arch/x86/include/asm/atomic_64.h ---- linux-2.6.31.7/arch/x86/include/asm/atomic_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/atomic_64.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/atomic_64.h linux-2.6.32/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32/arch/x86/include/asm/atomic_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/atomic_64.h 2009-12-04 21:40:47.946694287 -0500 @@ -24,6 +24,17 @@ static inline int atomic_read(const atom } @@ -6265,9 +6542,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/atomic_64.h linux-2.6.31.7/arch/x } /** -diff -urNp linux-2.6.31.7/arch/x86/include/asm/boot.h linux-2.6.31.7/arch/x86/include/asm/boot.h ---- linux-2.6.31.7/arch/x86/include/asm/boot.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/boot.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/boot.h linux-2.6.32/arch/x86/include/asm/boot.h +--- linux-2.6.32/arch/x86/include/asm/boot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/boot.h 2009-12-04 21:40:47.947696663 -0500 @@ -11,10 +11,15 @@ #include <asm/pgtable_types.h> @@ -6285,10 +6562,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/boot.h linux-2.6.31.7/arch/x86/in /* Minimum kernel alignment, as a power of two */ #ifdef CONFIG_X86_64 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT -diff -urNp linux-2.6.31.7/arch/x86/include/asm/cache.h linux-2.6.31.7/arch/x86/include/asm/cache.h ---- linux-2.6.31.7/arch/x86/include/asm/cache.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/cache.h 2009-12-10 22:15:15.000000000 -0500 -@@ -6,6 +6,7 @@ +diff -urNp linux-2.6.32/arch/x86/include/asm/cache.h linux-2.6.32/arch/x86/include/asm/cache.h +--- linux-2.6.32/arch/x86/include/asm/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/cache.h 2009-12-04 21:40:47.947696663 -0500 +@@ -8,6 +8,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) #define __read_mostly __attribute__((__section__(".data.read_mostly"))) @@ -6296,9 +6573,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/cache.h linux-2.6.31.7/arch/x86/i #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/checksum_32.h linux-2.6.31.7/arch/x86/include/asm/checksum_32.h ---- linux-2.6.31.7/arch/x86/include/asm/checksum_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/checksum_32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/checksum_32.h linux-2.6.32/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32/arch/x86/include/asm/checksum_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/checksum_32.h 2009-12-04 21:40:47.947696663 -0500 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -6332,9 +6609,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/checksum_32.h linux-2.6.31.7/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.31.7/arch/x86/include/asm/desc.h linux-2.6.31.7/arch/x86/include/asm/desc.h ---- linux-2.6.31.7/arch/x86/include/asm/desc.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/desc.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/desc.h linux-2.6.32/arch/x86/include/asm/desc.h +--- linux-2.6.32/arch/x86/include/asm/desc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/desc.h 2009-12-04 21:40:47.948697624 -0500 @@ -4,6 +4,7 @@ #include <asm/desc_defs.h> #include <asm/ldt.h> @@ -6428,7 +6705,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/desc.h linux-2.6.31.7/arch/x86/in } #define _LDT_empty(info) \ -@@ -379,4 +389,16 @@ static inline void set_system_intr_gate_ +@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_ _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } @@ -6445,9 +6722,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/desc.h linux-2.6.31.7/arch/x86/in +#endif + #endif /* _ASM_X86_DESC_H */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/device.h linux-2.6.31.7/arch/x86/include/asm/device.h ---- linux-2.6.31.7/arch/x86/include/asm/device.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/device.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/device.h linux-2.6.32/arch/x86/include/asm/device.h +--- linux-2.6.32/arch/x86/include/asm/device.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/device.h 2009-12-04 21:40:47.948697624 -0500 @@ -6,7 +6,7 @@ struct dev_archdata { void *acpi_handle; #endif @@ -6457,10 +6734,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/device.h linux-2.6.31.7/arch/x86/ #endif #ifdef CONFIG_DMAR void *iommu; /* hook for IOMMU specific extension */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h ---- linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h 2009-12-10 22:15:15.000000000 -0500 -@@ -19,9 +19,9 @@ extern int iommu_merge; +diff -urNp linux-2.6.32/arch/x86/include/asm/dma-mapping.h linux-2.6.32/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32/arch/x86/include/asm/dma-mapping.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/dma-mapping.h 2009-12-04 21:40:47.948697624 -0500 +@@ -25,9 +25,9 @@ extern int iommu_merge; extern struct device x86_dma_fallback_dev; extern int panic_on_overflow; @@ -6472,7 +6749,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h linux-2.6.31.7/arch { #ifdef CONFIG_X86_32 return dma_ops; -@@ -38,7 +38,7 @@ static inline struct dma_map_ops *get_dm +@@ -44,7 +44,7 @@ static inline struct dma_map_ops *get_dm /* Make sure we keep the same behaviour */ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { @@ -6481,7 +6758,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h linux-2.6.31.7/arch if (ops->mapping_error) return ops->mapping_error(dev, dma_addr); -@@ -98,7 +98,7 @@ static inline void * +@@ -122,7 +122,7 @@ static inline void * dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { @@ -6490,7 +6767,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h linux-2.6.31.7/arch void *memory; gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); -@@ -127,7 +127,7 @@ dma_alloc_coherent(struct device *dev, s +@@ -149,7 +149,7 @@ dma_alloc_coherent(struct device *dev, s static inline void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t bus) { @@ -6499,10 +6776,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/dma-mapping.h linux-2.6.31.7/arch WARN_ON(irqs_disabled()); /* for portability */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/e820.h linux-2.6.31.7/arch/x86/include/asm/e820.h ---- linux-2.6.31.7/arch/x86/include/asm/e820.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/e820.h 2009-12-10 22:15:15.000000000 -0500 -@@ -135,7 +135,7 @@ extern char *memory_setup(void); +diff -urNp linux-2.6.32/arch/x86/include/asm/e820.h linux-2.6.32/arch/x86/include/asm/e820.h +--- linux-2.6.32/arch/x86/include/asm/e820.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/e820.h 2009-12-04 21:40:47.949618092 -0500 +@@ -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) @@ -6511,9 +6788,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/e820.h linux-2.6.31.7/arch/x86/in #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/elf.h linux-2.6.31.7/arch/x86/include/asm/elf.h ---- linux-2.6.31.7/arch/x86/include/asm/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/elf.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/elf.h linux-2.6.32/arch/x86/include/asm/elf.h +--- linux-2.6.32/arch/x86/include/asm/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/elf.h 2009-12-04 21:40:47.949618092 -0500 @@ -263,7 +263,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -6567,9 +6844,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/elf.h linux-2.6.31.7/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/futex.h linux-2.6.31.7/arch/x86/include/asm/futex.h ---- linux-2.6.31.7/arch/x86/include/asm/futex.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/futex.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/futex.h linux-2.6.32/arch/x86/include/asm/futex.h +--- linux-2.6.32/arch/x86/include/asm/futex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/futex.h 2009-12-04 21:40:47.950699763 -0500 @@ -11,6 +11,40 @@ #include <asm/processor.h> #include <asm/system.h> @@ -6681,10 +6958,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/futex.h linux-2.6.31.7/arch/x86/i : "memory" ); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/i387.h linux-2.6.31.7/arch/x86/include/asm/i387.h ---- linux-2.6.31.7/arch/x86/include/asm/i387.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/i387.h 2009-12-10 22:15:15.000000000 -0500 -@@ -194,13 +194,8 @@ static inline int fxrstor_checking(struc +diff -urNp linux-2.6.32/arch/x86/include/asm/i387.h linux-2.6.32/arch/x86/include/asm/i387.h +--- linux-2.6.32/arch/x86/include/asm/i387.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/i387.h 2009-12-04 21:40:47.951657788 -0500 +@@ -195,13 +195,8 @@ static inline int fxrstor_checking(struc } /* We need a safe address that is cheap to find and that is already @@ -6700,9 +6977,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/i387.h linux-2.6.31.7/arch/x86/in /* * These must be called with preempt disabled -diff -urNp linux-2.6.31.7/arch/x86/include/asm/io_64.h linux-2.6.31.7/arch/x86/include/asm/io_64.h ---- linux-2.6.31.7/arch/x86/include/asm/io_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/io_64.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/io_64.h linux-2.6.32/arch/x86/include/asm/io_64.h +--- linux-2.6.32/arch/x86/include/asm/io_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/io_64.h 2009-12-04 21:40:47.951657788 -0500 @@ -140,6 +140,17 @@ __OUTS(l) #include <linux/vmalloc.h> @@ -6721,9 +6998,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/io_64.h linux-2.6.31.7/arch/x86/i #include <asm-generic/iomap.h> void __memcpy_fromio(void *, unsigned long, unsigned); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/iommu.h linux-2.6.31.7/arch/x86/include/asm/iommu.h ---- linux-2.6.31.7/arch/x86/include/asm/iommu.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/iommu.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/iommu.h linux-2.6.32/arch/x86/include/asm/iommu.h +--- linux-2.6.32/arch/x86/include/asm/iommu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/iommu.h 2009-12-04 21:40:47.951657788 -0500 @@ -3,7 +3,7 @@ extern void pci_iommu_shutdown(void); @@ -6733,10 +7010,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/iommu.h linux-2.6.31.7/arch/x86/i extern int force_iommu, no_iommu; extern int iommu_detected; extern int iommu_pass_through; -diff -urNp linux-2.6.31.7/arch/x86/include/asm/irqflags.h linux-2.6.31.7/arch/x86/include/asm/irqflags.h ---- linux-2.6.31.7/arch/x86/include/asm/irqflags.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/irqflags.h 2009-12-10 22:15:15.000000000 -0500 -@@ -147,6 +147,27 @@ static inline unsigned long __raw_local_ +diff -urNp linux-2.6.32/arch/x86/include/asm/irqflags.h linux-2.6.32/arch/x86/include/asm/irqflags.h +--- linux-2.6.32/arch/x86/include/asm/irqflags.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/irqflags.h 2009-12-04 21:40:47.952737484 -0500 +@@ -146,6 +146,27 @@ static inline unsigned long __raw_local_ #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit #define GET_CR0_INTO_EAX movl %cr0, %eax @@ -6764,11 +7041,11 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/irqflags.h linux-2.6.31.7/arch/x8 #endif -diff -urNp linux-2.6.31.7/arch/x86/include/asm/kvm_host.h linux-2.6.31.7/arch/x86/include/asm/kvm_host.h ---- linux-2.6.31.7/arch/x86/include/asm/kvm_host.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/kvm_host.h 2009-12-10 22:15:15.000000000 -0500 -@@ -528,7 +528,7 @@ struct kvm_x86_ops { - u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio); +diff -urNp linux-2.6.32/arch/x86/include/asm/kvm_host.h linux-2.6.32/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32/arch/x86/include/asm/kvm_host.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/kvm_host.h 2009-12-04 21:40:47.952737484 -0500 +@@ -530,7 +530,7 @@ struct kvm_x86_ops { + const struct trace_print_flags *exit_reasons_str; }; -extern struct kvm_x86_ops *kvm_x86_ops; @@ -6776,9 +7053,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/kvm_host.h linux-2.6.31.7/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/local.h linux-2.6.31.7/arch/x86/include/asm/local.h ---- linux-2.6.31.7/arch/x86/include/asm/local.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/local.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/local.h linux-2.6.32/arch/x86/include/asm/local.h +--- linux-2.6.32/arch/x86/include/asm/local.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/local.h 2009-12-04 21:40:47.952737484 -0500 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -7003,9 +7280,26 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/local.h linux-2.6.31.7/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.31.7/arch/x86/include/asm/microcode.h linux-2.6.31.7/arch/x86/include/asm/microcode.h ---- linux-2.6.31.7/arch/x86/include/asm/microcode.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/microcode.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/microcode.h linux-2.6.32/arch/x86/include/asm/microcode.h +--- linux-2.6.32/arch/x86/include/asm/microcode.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/microcode.h 2009-12-04 21:40:47.953622474 -0500 +@@ -12,13 +12,13 @@ struct device; + enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; + + struct microcode_ops { +- enum ucode_state (*request_microcode_user) (int cpu, ++ enum ucode_state (* const request_microcode_user) (int cpu, + const void __user *buf, size_t size); + +- enum ucode_state (*request_microcode_fw) (int cpu, ++ enum ucode_state (* const request_microcode_fw) (int cpu, + struct device *device); + +- void (*microcode_fini_cpu) (int cpu); ++ void (* const microcode_fini_cpu) (int cpu); + + /* + * The generic 'microcode_core' part guarantees that @@ -38,18 +38,18 @@ struct ucode_cpu_info { extern struct ucode_cpu_info ucode_cpu_info[]; @@ -7029,12 +7323,12 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/microcode.h linux-2.6.31.7/arch/x { return NULL; } -diff -urNp linux-2.6.31.7/arch/x86/include/asm/mman.h linux-2.6.31.7/arch/x86/include/asm/mman.h ---- linux-2.6.31.7/arch/x86/include/asm/mman.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/mman.h 2009-12-10 22:15:15.000000000 -0500 -@@ -17,4 +17,14 @@ - #define MCL_CURRENT 1 /* lock all current mappings */ - #define MCL_FUTURE 2 /* lock all future mappings */ +diff -urNp linux-2.6.32/arch/x86/include/asm/mman.h linux-2.6.32/arch/x86/include/asm/mman.h +--- linux-2.6.32/arch/x86/include/asm/mman.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/mman.h 2009-12-04 21:40:47.953622474 -0500 +@@ -5,4 +5,14 @@ + + #include <asm-generic/mman.h> +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ @@ -7047,38 +7341,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/mman.h linux-2.6.31.7/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/mmu.h linux-2.6.31.7/arch/x86/include/asm/mmu.h ---- linux-2.6.31.7/arch/x86/include/asm/mmu.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/mmu.h 2009-12-10 22:15:15.000000000 -0500 -@@ -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.31.7/arch/x86/include/asm/mmu_context.h linux-2.6.31.7/arch/x86/include/asm/mmu_context.h ---- linux-2.6.31.7/arch/x86/include/asm/mmu_context.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/mmu_context.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/mmu_context.h linux-2.6.32/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32/arch/x86/include/asm/mmu_context.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/mmu_context.h 2009-12-04 21:40:47.954658496 -0500 @@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { @@ -7089,7 +7354,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/mmu_context.h linux-2.6.31.7/arch if (likely(prev != next)) { /* stop flush ipis for the previous mm */ - cpu_clear(cpu, prev->cpu_vm_mask); + cpumask_clear_cpu(cpu, mm_cpumask(prev)); #ifdef CONFIG_SMP +#ifdef CONFIG_X86_32 + tlbstate = percpu_read(cpu_tlbstate.state); @@ -7144,10 +7409,39 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/mmu_context.h linux-2.6.31.7/arch } } #endif -diff -urNp linux-2.6.31.7/arch/x86/include/asm/module.h linux-2.6.31.7/arch/x86/include/asm/module.h ---- linux-2.6.31.7/arch/x86/include/asm/module.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/module.h 2009-12-10 22:15:15.000000000 -0500 -@@ -74,7 +74,12 @@ struct mod_arch_specific {}; +diff -urNp linux-2.6.32/arch/x86/include/asm/mmu.h linux-2.6.32/arch/x86/include/asm/mmu.h +--- linux-2.6.32/arch/x86/include/asm/mmu.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/mmu.h 2009-12-04 21:40:47.953622474 -0500 +@@ -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/arch/x86/include/asm/module.h linux-2.6.32/arch/x86/include/asm/module.h +--- linux-2.6.32/arch/x86/include/asm/module.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/module.h 2009-12-04 20:41:38.351625045 -0500 +@@ -65,7 +65,12 @@ # else # define MODULE_STACKSIZE "" # endif @@ -7161,9 +7455,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/module.h linux-2.6.31.7/arch/x86/ #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/page_32_types.h linux-2.6.31.7/arch/x86/include/asm/page_32_types.h ---- linux-2.6.31.7/arch/x86/include/asm/page_32_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/page_32_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/page_32_types.h linux-2.6.32/arch/x86/include/asm/page_32_types.h +--- linux-2.6.32/arch/x86/include/asm/page_32_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/page_32_types.h 2009-12-04 21:40:47.954658496 -0500 @@ -15,6 +15,10 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -7175,9 +7469,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/page_32_types.h linux-2.6.31.7/ar #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.31.7/arch/x86/include/asm/page_64_types.h linux-2.6.31.7/arch/x86/include/asm/page_64_types.h ---- linux-2.6.31.7/arch/x86/include/asm/page_64_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/page_64_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/page_64_types.h linux-2.6.32/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32/arch/x86/include/asm/page_64_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/page_64_types.h 2009-12-04 21:40:47.954658496 -0500 @@ -39,6 +39,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -7188,23 +7482,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/page_64_types.h linux-2.6.31.7/ar /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 47 -diff -urNp linux-2.6.31.7/arch/x86/include/asm/paravirt.h linux-2.6.31.7/arch/x86/include/asm/paravirt.h ---- linux-2.6.31.7/arch/x86/include/asm/paravirt.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/paravirt.h 2009-12-10 22:15:15.000000000 -0500 -@@ -350,6 +350,12 @@ struct pv_mmu_ops { - an mfn. We can tell which is which from the index. */ - void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, - phys_addr_t phys, pgprot_t flags); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ unsigned long (*pax_open_kernel)(void); -+ unsigned long (*pax_close_kernel)(void); -+#endif -+ - }; - - struct raw_spinlock; -@@ -1439,6 +1445,21 @@ static inline void __set_fixmap(unsigned +diff -urNp linux-2.6.32/arch/x86/include/asm/paravirt.h linux-2.6.32/arch/x86/include/asm/paravirt.h +--- linux-2.6.32/arch/x86/include/asm/paravirt.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/paravirt.h 2009-12-04 21:40:47.955656553 -0500 +@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned pv_mmu_ops.set_fixmap(idx, phys, flags); } @@ -7223,10 +7504,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/paravirt.h linux-2.6.31.7/arch/x8 +static inline unsigned long pax_close_kernel(void) { return 0; } +#endif + - void _paravirt_nop(void); - u32 _paravirt_ident_32(u32); - u64 _paravirt_ident_64(u64); -@@ -1572,7 +1593,7 @@ static inline unsigned long __raw_local_ + #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS) + + static inline int __raw_spin_is_locked(struct raw_spinlock *lock) +@@ -845,7 +860,7 @@ static inline unsigned long __raw_local_ static inline void raw_local_irq_restore(unsigned long f) { @@ -7235,7 +7516,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/paravirt.h linux-2.6.31.7/arch/x8 } static inline void raw_local_irq_disable(void) -@@ -1670,7 +1691,7 @@ static inline unsigned long __raw_local_ +@@ -945,7 +960,7 @@ extern void default_banner(void); #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) @@ -7244,7 +7525,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/paravirt.h linux-2.6.31.7/arch/x8 #endif #define INTERRUPT_RETURN \ -@@ -1695,6 +1716,31 @@ static inline unsigned long __raw_local_ +@@ -970,6 +985,31 @@ extern void default_banner(void); jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret32)) #ifdef CONFIG_X86_32 @@ -7276,10 +7557,34 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/paravirt.h linux-2.6.31.7/arch/x8 #define GET_CR0_INTO_EAX \ push %ecx; push %edx; \ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pci_x86.h linux-2.6.31.7/arch/x86/include/asm/pci_x86.h ---- linux-2.6.31.7/arch/x86/include/asm/pci_x86.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pci_x86.h 2009-12-10 22:15:15.000000000 -0500 -@@ -95,10 +95,10 @@ struct pci_raw_ops { +diff -urNp linux-2.6.32/arch/x86/include/asm/paravirt_types.h linux-2.6.32/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32/arch/x86/include/asm/paravirt_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/paravirt_types.h 2009-12-04 21:40:47.955656553 -0500 +@@ -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, + phys_addr_t phys, pgprot_t flags); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ unsigned long (*pax_open_kernel)(void); ++ unsigned long (*pax_close_kernel)(void); ++#endif ++ + }; + + struct raw_spinlock; +diff -urNp linux-2.6.32/arch/x86/include/asm/pci_x86.h linux-2.6.32/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32/arch/x86/include/asm/pci_x86.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pci_x86.h 2009-12-04 21:40:47.956697196 -0500 +@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct + extern void (*pcibios_disable_irq)(struct pci_dev *dev); + + struct pci_raw_ops { +- int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn, ++ int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn, + int reg, int len, u32 *val); +- int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn, ++ int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn, int reg, int len, u32 val); }; @@ -7293,9 +7598,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pci_x86.h linux-2.6.31.7/arch/x86 extern bool port_cf9_safe; /* arch_initcall level */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgalloc.h linux-2.6.31.7/arch/x86/include/asm/pgalloc.h ---- linux-2.6.31.7/arch/x86/include/asm/pgalloc.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgalloc.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/pgalloc.h linux-2.6.32/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32/arch/x86/include/asm/pgalloc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgalloc.h 2009-12-04 21:40:47.957640646 -0500 @@ -58,6 +58,13 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -7310,9 +7615,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgalloc.h linux-2.6.31.7/arch/x86 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); } -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.31.7/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable-2level.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable-2level.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/pgtable-2level.h linux-2.6.32/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32/arch/x86/include/asm/pgtable-2level.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable-2level.h 2009-12-04 21:40:47.958620422 -0500 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7323,9 +7628,85 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable-2level.h linux-2.6.31.7/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.31.7/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable-3level.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable-3level.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/pgtable_32.h linux-2.6.32/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32/arch/x86/include/asm/pgtable_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable_32.h 2009-12-04 21:40:47.959611560 -0500 +@@ -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/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32/arch/x86/include/asm/pgtable_32_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable_32_types.h 2009-12-04 21:40:47.959611560 -0500 +@@ -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/arch/x86/include/asm/pgtable-3level.h linux-2.6.32/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32/arch/x86/include/asm/pgtable-3level.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable-3level.h 2009-12-04 21:40:47.958620422 -0500 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -7343,10 +7724,47 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable-3level.h linux-2.6.31.7/a } /* -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable.h linux-2.6.31.7/arch/x86/include/asm/pgtable.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable.h 2009-12-10 22:15:15.000000000 -0500 -@@ -84,12 +84,51 @@ static inline void __init paravirt_paget +diff -urNp linux-2.6.32/arch/x86/include/asm/pgtable_64.h linux-2.6.32/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32/arch/x86/include/asm/pgtable_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable_64.h 2009-12-11 19:45:15.887531221 -0500 +@@ -16,9 +16,12 @@ + + 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 pmd_t level2_ident_pgt[512*4]; + extern pgd_t init_level4_pgt[]; + + #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/arch/x86/include/asm/pgtable.h linux-2.6.32/arch/x86/include/asm/pgtable.h +--- linux-2.6.32/arch/x86/include/asm/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable.h 2009-12-04 21:40:47.959611560 -0500 +@@ -74,12 +74,51 @@ extern struct list_head pgd_list; #define arch_end_context_switch(prev) do {} while(0) @@ -7398,7 +7816,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable.h linux-2.6.31.7/arch/x86 static inline int pte_dirty(pte_t pte) { return pte_flags(pte) & _PAGE_DIRTY; -@@ -172,9 +211,29 @@ static inline pte_t pte_wrprotect(pte_t +@@ -167,9 +206,29 @@ static inline pte_t pte_wrprotect(pte_t return pte_clear_flags(pte, _PAGE_RW); } @@ -7429,7 +7847,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable.h linux-2.6.31.7/arch/x86 } static inline pte_t pte_mkdirty(pte_t pte) -@@ -482,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *p +@@ -472,7 +531,7 @@ static inline pud_t *pud_offset(pgd_t *p static inline int pgd_bad(pgd_t pgd) { @@ -7438,7 +7856,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable.h linux-2.6.31.7/arch/x86 } static inline int pgd_none(pgd_t pgd) -@@ -623,7 +682,9 @@ static inline void ptep_set_wrprotect(st +@@ -613,7 +672,9 @@ static inline void ptep_set_wrprotect(st */ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) { @@ -7449,112 +7867,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable.h linux-2.6.31.7/arch/x86 } -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable_32.h linux-2.6.31.7/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable_32.h 2009-12-10 22:15:15.000000000 -0500 -@@ -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.31.7/arch/x86/include/asm/pgtable_32_types.h linux-2.6.31.7/arch/x86/include/asm/pgtable_32_types.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable_32_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable_32_types.h 2009-12-10 22:15:15.000000000 -0500 -@@ -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.31.7/arch/x86/include/asm/pgtable_64.h linux-2.6.31.7/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable_64.h 2009-12-10 22:15:15.000000000 -0500 -@@ -16,9 +16,12 @@ - - 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 pmd_t level2_ident_pgt[512*4]; - extern pgd_t init_level4_pgt[]; - - #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) -diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h ---- linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/pgtable_types.h linux-2.6.32/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32/arch/x86/include/asm/pgtable_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/pgtable_types.h 2009-12-04 21:40:47.960701842 -0500 @@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ @@ -7622,10 +7937,11 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h linux-2.6.31.7/ar #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -277,7 +280,15 @@ static inline pteval_t pte_flags(pte_t p - typedef struct page *pgtable_t; +@@ -278,7 +281,16 @@ typedef struct page *pgtable_t; extern pteval_t __supported_pte_mask; + extern void set_nx(void); ++ +#ifdef CONFIG_X86_32 +#ifdef CONFIG_X86_PAE extern int nx_enabled; @@ -7638,10 +7954,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/pgtable_types.h linux-2.6.31.7/ar #define pgprot_writecombine pgprot_writecombine extern pgprot_t pgprot_writecombine(pgprot_t prot); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x86/include/asm/processor.h ---- linux-2.6.31.7/arch/x86/include/asm/processor.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/processor.h 2009-12-10 22:15:15.000000000 -0500 -@@ -271,7 +271,7 @@ struct tss_struct { +diff -urNp linux-2.6.32/arch/x86/include/asm/processor.h linux-2.6.32/arch/x86/include/asm/processor.h +--- linux-2.6.32/arch/x86/include/asm/processor.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/processor.h 2009-12-04 21:40:47.961632408 -0500 +@@ -272,7 +272,7 @@ struct tss_struct { } ____cacheline_aligned; @@ -7650,7 +7966,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x /* * Save the original ist values for checking stack pointers during debugging -@@ -900,8 +900,17 @@ static inline void spin_lock_prefetch(co +@@ -911,8 +911,17 @@ static inline void spin_lock_prefetch(co */ #define TASK_SIZE PAGE_OFFSET #define TASK_SIZE_MAX TASK_SIZE @@ -7669,7 +7985,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x #define INIT_THREAD { \ .sp0 = sizeof(init_stack) + (long)&init_stack, \ -@@ -918,7 +927,7 @@ static inline void spin_lock_prefetch(co +@@ -929,7 +938,7 @@ static inline void spin_lock_prefetch(co */ #define INIT_TSS { \ .x86_tss = { \ @@ -7678,7 +7994,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ -@@ -929,11 +938,7 @@ static inline void spin_lock_prefetch(co +@@ -940,11 +949,7 @@ static inline void spin_lock_prefetch(co extern unsigned long thread_saved_pc(struct task_struct *tsk); #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) @@ -7691,7 +8007,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. -@@ -948,7 +953,7 @@ extern unsigned long thread_saved_pc(str +@@ -959,7 +964,7 @@ extern unsigned long thread_saved_pc(str #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ @@ -7700,7 +8016,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x __regs__ - 1; \ }) -@@ -964,7 +969,7 @@ extern unsigned long thread_saved_pc(str +@@ -975,7 +980,7 @@ extern unsigned long thread_saved_pc(str * space during mmap's. */ #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ @@ -7709,7 +8025,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ IA32_PAGE_OFFSET : TASK_SIZE_MAX) -@@ -1001,6 +1006,10 @@ extern void start_thread(struct pt_regs +@@ -1012,6 +1017,10 @@ extern void start_thread(struct pt_regs */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) @@ -7720,9 +8036,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/processor.h linux-2.6.31.7/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/ptrace.h linux-2.6.31.7/arch/x86/include/asm/ptrace.h ---- linux-2.6.31.7/arch/x86/include/asm/ptrace.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/ptrace.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/ptrace.h linux-2.6.32/arch/x86/include/asm/ptrace.h +--- linux-2.6.32/arch/x86/include/asm/ptrace.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/ptrace.h 2009-12-04 21:40:47.961632408 -0500 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -7759,9 +8075,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/ptrace.h linux-2.6.31.7/arch/x86/ #endif } -diff -urNp linux-2.6.31.7/arch/x86/include/asm/reboot.h linux-2.6.31.7/arch/x86/include/asm/reboot.h ---- linux-2.6.31.7/arch/x86/include/asm/reboot.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/reboot.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/reboot.h linux-2.6.32/arch/x86/include/asm/reboot.h +--- linux-2.6.32/arch/x86/include/asm/reboot.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/reboot.h 2009-12-04 21:40:47.961632408 -0500 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -7771,9 +8087,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/reboot.h linux-2.6.31.7/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/rwsem.h linux-2.6.31.7/arch/x86/include/asm/rwsem.h ---- linux-2.6.31.7/arch/x86/include/asm/rwsem.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/rwsem.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/rwsem.h linux-2.6.32/arch/x86/include/asm/rwsem.h +--- linux-2.6.32/arch/x86/include/asm/rwsem.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/rwsem.h 2009-12-04 21:40:47.961632408 -0500 @@ -106,10 +106,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -8006,9 +8322,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/rwsem.h linux-2.6.31.7/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/segment.h linux-2.6.31.7/arch/x86/include/asm/segment.h ---- linux-2.6.31.7/arch/x86/include/asm/segment.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/segment.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/segment.h linux-2.6.32/arch/x86/include/asm/segment.h +--- linux-2.6.32/arch/x86/include/asm/segment.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/segment.h 2009-12-04 21:40:47.962707917 -0500 @@ -88,7 +88,7 @@ #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) @@ -8040,9 +8356,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/segment.h linux-2.6.31.7/arch/x86 #else -diff -urNp linux-2.6.31.7/arch/x86/include/asm/spinlock.h linux-2.6.31.7/arch/x86/include/asm/spinlock.h ---- linux-2.6.31.7/arch/x86/include/asm/spinlock.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/spinlock.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/spinlock.h linux-2.6.32/arch/x86/include/asm/spinlock.h +--- linux-2.6.32/arch/x86/include/asm/spinlock.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/spinlock.h 2009-12-04 21:40:47.962707917 -0500 @@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { @@ -8146,10 +8462,10 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/spinlock.h linux-2.6.31.7/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.31.7/arch/x86/include/asm/system.h linux-2.6.31.7/arch/x86/include/asm/system.h ---- linux-2.6.31.7/arch/x86/include/asm/system.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/system.h 2009-12-10 22:15:15.000000000 -0500 -@@ -227,7 +227,7 @@ static inline unsigned long get_limit(un +diff -urNp linux-2.6.32/arch/x86/include/asm/system.h linux-2.6.32/arch/x86/include/asm/system.h +--- linux-2.6.32/arch/x86/include/asm/system.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/system.h 2009-12-04 21:40:47.963624223 -0500 +@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; asm("lsll %1,%0" : "=r" (__limit) : "r" (segment)); @@ -8158,7 +8474,7 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/system.h linux-2.6.31.7/arch/x86/ } static inline void native_clts(void) -@@ -367,7 +367,7 @@ void enable_hlt(void); +@@ -340,7 +340,7 @@ void enable_hlt(void); void cpu_idle_wait(void); @@ -8167,210 +8483,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/system.h linux-2.6.31.7/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.31.7/arch/x86/include/asm/uaccess.h linux-2.6.31.7/arch/x86/include/asm/uaccess.h ---- linux-2.6.31.7/arch/x86/include/asm/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/uaccess.h 2009-12-10 22:15:15.000000000 -0500 -@@ -8,8 +8,11 @@ - #include <linux/thread_info.h> - #include <linux/prefetch.h> - #include <linux/string.h> -+#include <linux/sched.h> -+#include <linux/slab.h> - #include <asm/asm.h> - #include <asm/page.h> -+#include <asm/segment.h> - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -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,29 @@ - * 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)) { \ -+ for (; __addr_ao <= __end_ao; __addr_ao += PAGE_SIZE) { \ -+ char __c_ao; \ -+ if (__size > PAGE_SIZE) \ -+ cond_resched(); \ -+ if (__get_user(__c_ao, (char __user *)__addr_ao))\ -+ break; \ -+ if (type != VERIFY_WRITE) \ -+ continue; \ -+ if (__put_user(__c_ao, (char __user *)__addr_ao))\ -+ break; \ -+ } \ -+ } \ -+ __ret_ao; \ -+}) - - /* - * The exception table consists of pairs of addresses: the first is the -@@ -183,13 +213,21 @@ extern int __get_user_bad(void); - asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ - : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") - -- -+#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 +235,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 +415,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 +450,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,7 +469,7 @@ do { \ - int __gu_err; \ - unsigned long __gu_val; \ - __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ -- (x) = (__force __typeof__(*(ptr)))__gu_val; \ -+ (x) = (__typeof__(*(ptr)))__gu_val; \ - __gu_err; \ - }) - -@@ -438,21 +483,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 +580,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 +617,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.31.7/arch/x86/include/asm/uaccess_32.h linux-2.6.31.7/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.31.7/arch/x86/include/asm/uaccess_32.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/uaccess_32.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/uaccess_32.h linux-2.6.32/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32/arch/x86/include/asm/uaccess_32.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/uaccess_32.h 2009-12-04 21:40:47.963624223 -0500 @@ -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) @@ -8500,9 +8615,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/uaccess_32.h linux-2.6.31.7/arch/ long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.31.7/arch/x86/include/asm/uaccess_64.h linux-2.6.31.7/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.31.7/arch/x86/include/asm/uaccess_64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/uaccess_64.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/uaccess_64.h linux-2.6.32/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32/arch/x86/include/asm/uaccess_64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/uaccess_64.h 2009-12-04 21:40:47.964700551 -0500 @@ -10,6 +10,8 @@ #include <linux/lockdep.h> #include <asm/page.h> @@ -8653,9 +8768,210 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/uaccess_64.h linux-2.6.31.7/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.31.7/arch/x86/include/asm/vgtod.h linux-2.6.31.7/arch/x86/include/asm/vgtod.h ---- linux-2.6.31.7/arch/x86/include/asm/vgtod.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/vgtod.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/uaccess.h linux-2.6.32/arch/x86/include/asm/uaccess.h +--- linux-2.6.32/arch/x86/include/asm/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/uaccess.h 2009-12-04 21:40:47.963624223 -0500 +@@ -8,8 +8,11 @@ + #include <linux/thread_info.h> + #include <linux/prefetch.h> + #include <linux/string.h> ++#include <linux/sched.h> ++#include <linux/slab.h> + #include <asm/asm.h> + #include <asm/page.h> ++#include <asm/segment.h> + + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 +@@ -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,29 @@ + * 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)) { \ ++ for (; __addr_ao <= __end_ao; __addr_ao += PAGE_SIZE) { \ ++ char __c_ao; \ ++ if (__size > PAGE_SIZE) \ ++ cond_resched(); \ ++ if (__get_user(__c_ao, (char __user *)__addr_ao))\ ++ break; \ ++ if (type != VERIFY_WRITE) \ ++ continue; \ ++ if (__put_user(__c_ao, (char __user *)__addr_ao))\ ++ break; \ ++ } \ ++ } \ ++ __ret_ao; \ ++}) + + /* + * The exception table consists of pairs of addresses: the first is the +@@ -183,13 +213,21 @@ extern int __get_user_bad(void); + asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") + +- ++#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 +235,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 +415,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 +450,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,7 +469,7 @@ do { \ + int __gu_err; \ + unsigned long __gu_val; \ + __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ +- (x) = (__force __typeof__(*(ptr)))__gu_val; \ ++ (x) = (__typeof__(*(ptr)))__gu_val; \ + __gu_err; \ + }) + +@@ -438,21 +483,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 +580,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 +617,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/arch/x86/include/asm/vgtod.h linux-2.6.32/arch/x86/include/asm/vgtod.h +--- linux-2.6.32/arch/x86/include/asm/vgtod.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/vgtod.h 2009-12-04 21:40:47.964700551 -0500 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -8664,9 +8980,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/vgtod.h linux-2.6.31.7/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.31.7/arch/x86/include/asm/vmi.h linux-2.6.31.7/arch/x86/include/asm/vmi.h ---- linux-2.6.31.7/arch/x86/include/asm/vmi.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/vmi.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/vmi.h linux-2.6.32/arch/x86/include/asm/vmi.h +--- linux-2.6.32/arch/x86/include/asm/vmi.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/vmi.h 2009-12-04 21:40:47.964700551 -0500 @@ -191,6 +191,7 @@ struct vrom_header { u8 reserved[96]; /* Reserved for headers */ char vmi_init[8]; /* VMI_Init jump point */ @@ -8675,9 +8991,9 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/vmi.h linux-2.6.31.7/arch/x86/inc } __attribute__((packed)); struct pnp_header { -diff -urNp linux-2.6.31.7/arch/x86/include/asm/vsyscall.h linux-2.6.31.7/arch/x86/include/asm/vsyscall.h ---- linux-2.6.31.7/arch/x86/include/asm/vsyscall.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/include/asm/vsyscall.h 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/include/asm/vsyscall.h linux-2.6.32/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32/arch/x86/include/asm/vsyscall.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/include/asm/vsyscall.h 2009-12-04 21:40:47.965613429 -0500 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -8708,10 +9024,101 @@ diff -urNp linux-2.6.31.7/arch/x86/include/asm/vsyscall.h linux-2.6.31.7/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/boot.c linux-2.6.31.7/arch/x86/kernel/acpi/boot.c ---- linux-2.6.31.7/arch/x86/kernel/acpi/boot.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/acpi/boot.c 2009-12-10 22:15:15.000000000 -0500 -@@ -1609,7 +1609,7 @@ static struct dmi_system_id __initdata a +diff -urNp linux-2.6.32/arch/x86/Kconfig linux-2.6.32/arch/x86/Kconfig +--- linux-2.6.32/arch/x86/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/Kconfig 2009-12-04 21:40:47.940709419 -0500 +@@ -1089,7 +1089,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 +@@ -1415,7 +1415,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). +@@ -1502,6 +1502,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. + +@@ -1566,6 +1567,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 +@@ -1597,9 +1599,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/arch/x86/Kconfig.cpu linux-2.6.32/arch/x86/Kconfig.cpu +--- linux-2.6.32/arch/x86/Kconfig.cpu 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/Kconfig.cpu 2009-12-04 21:40:47.941633247 -0500 +@@ -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/arch/x86/Kconfig.debug linux-2.6.32/arch/x86/Kconfig.debug +--- linux-2.6.32/arch/x86/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/Kconfig.debug 2009-12-04 21:40:47.941633247 -0500 +@@ -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/arch/x86/kernel/acpi/boot.c linux-2.6.32/arch/x86/kernel/acpi/boot.c +--- linux-2.6.32/arch/x86/kernel/acpi/boot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/acpi/boot.c 2009-12-04 21:40:47.966629129 -0500 +@@ -1508,7 +1508,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, }, @@ -8720,9 +9127,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/boot.c linux-2.6.31.7/arch/x86/ke }; /* -diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.31.7/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.31.7/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.32/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/acpi/realmode/wakeup.S 2009-12-04 21:40:47.966629129 -0500 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -8732,9 +9139,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.31.7/ wrmsr 1: -diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/sleep.c linux-2.6.31.7/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.31.7/arch/x86/kernel/acpi/sleep.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/acpi/sleep.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/acpi/sleep.c linux-2.6.32/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32/arch/x86/kernel/acpi/sleep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/acpi/sleep.c 2009-12-04 21:40:47.966629129 -0500 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -8779,9 +9186,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/sleep.c linux-2.6.31.7/arch/x86/k } -diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.31.7/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.31.7/arch/x86/kernel/acpi/wakeup_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/acpi/wakeup_32.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32/arch/x86/kernel/acpi/wakeup_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/acpi/wakeup_32.S 2009-12-04 21:40:47.967695398 -0500 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -8798,10 +9205,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.31.7/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.31.7/arch/x86/kernel/alternative.c linux-2.6.31.7/arch/x86/kernel/alternative.c ---- linux-2.6.31.7/arch/x86/kernel/alternative.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/alternative.c 2009-12-10 22:15:15.000000000 -0500 -@@ -400,7 +400,7 @@ void apply_paravirt(struct paravirt_patc +diff -urNp linux-2.6.32/arch/x86/kernel/alternative.c linux-2.6.32/arch/x86/kernel/alternative.c +--- linux-2.6.32/arch/x86/kernel/alternative.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/alternative.c 2009-12-04 21:40:47.967695398 -0500 +@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ @@ -8810,15 +9217,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/alternative.c linux-2.6.31.7/arch/x86/ used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); -@@ -485,11 +485,16 @@ void __init alternative_instructions(voi - * instructions. And on the local CPU you need to be protected again NMI or MCE - * handlers seeing an inconsistent instruction while you patch. - */ --void *text_poke_early(void *addr, const void *opcode, size_t len) -+void *__kprobes text_poke_early(void *addr, const void *opcode, size_t len) +@@ -497,7 +497,11 @@ static void *__init_or_module text_poke_ { unsigned long flags; -+ local_irq_save(flags); - memcpy(addr, opcode, len); + @@ -8826,10 +9227,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/alternative.c linux-2.6.31.7/arch/x86/ + memcpy(ktla_ktva(addr), opcode, len); + pax_close_kernel(); + - local_irq_restore(flags); sync_core(); + local_irq_restore(flags); /* Could also do a CLFLUSH here to speed up CPU recovery; but -@@ -512,35 +517,21 @@ void *text_poke_early(void *addr, const +@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_ */ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) { @@ -8873,10 +9274,22 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/alternative.c linux-2.6.31.7/arch/x86/ + BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c ---- linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c 2009-12-10 22:15:15.000000000 -0500 -@@ -719,7 +719,7 @@ struct IO_APIC_route_entry **alloc_ioapi +diff -urNp linux-2.6.32/arch/x86/kernel/amd_iommu.c linux-2.6.32/arch/x86/kernel/amd_iommu.c +--- linux-2.6.32/arch/x86/kernel/amd_iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/amd_iommu.c 2009-12-04 21:40:47.968641935 -0500 +@@ -2069,7 +2069,7 @@ static void prealloc_protection_domains( + } + } + +-static struct dma_map_ops amd_iommu_dma_ops = { ++static const struct dma_map_ops amd_iommu_dma_ops = { + .alloc_coherent = alloc_coherent, + .free_coherent = free_coherent, + .map_page = map_page, +diff -urNp linux-2.6.32/arch/x86/kernel/apic/io_apic.c linux-2.6.32/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32/arch/x86/kernel/apic/io_apic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/apic/io_apic.c 2009-12-04 21:40:47.969700540 -0500 +@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, GFP_ATOMIC); if (!ioapic_entries) @@ -8885,7 +9298,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c linux-2.6.31.7/arch/x86 for (apic = 0; apic < nr_ioapics; apic++) { ioapic_entries[apic] = -@@ -736,7 +736,7 @@ nomem: +@@ -728,7 +728,7 @@ nomem: kfree(ioapic_entries[apic]); kfree(ioapic_entries); @@ -8894,7 +9307,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c linux-2.6.31.7/arch/x86 } /* -@@ -1153,7 +1153,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, +@@ -1145,7 +1145,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, } EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); @@ -8903,7 +9316,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c linux-2.6.31.7/arch/x86 { /* Used to the online set of cpus does not change * during assign_irq_vector. -@@ -1161,7 +1161,7 @@ void lock_vector_lock(void) +@@ -1153,7 +1153,7 @@ void lock_vector_lock(void) spin_lock(&vector_lock); } @@ -8912,19 +9325,19 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apic/io_apic.c linux-2.6.31.7/arch/x86 { spin_unlock(&vector_lock); } -diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kernel/apm_32.c ---- linux-2.6.31.7/arch/x86/kernel/apm_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/apm_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -403,7 +403,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitq - static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue); - static struct apm_user *user_list; - static DEFINE_SPINLOCK(user_list_lock); --static const struct desc_struct bad_bios_desc = { { { 0, 0x00409200 } } }; -+static const struct desc_struct bad_bios_desc = { { { 0, 0x00409300 } } }; +diff -urNp linux-2.6.32/arch/x86/kernel/apm_32.c linux-2.6.32/arch/x86/kernel/apm_32.c +--- linux-2.6.32/arch/x86/kernel/apm_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/apm_32.c 2009-12-04 21:40:47.980698134 -0500 +@@ -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. + */ +-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, ++static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093, + (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); static const char driver_version[] = "1.16ac"; /* no spaces */ - -@@ -580,7 +580,10 @@ static long __apm_bios_call(void *_call) +@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call) BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; @@ -8935,7 +9348,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne apm_irq_save(flags); APM_DO_SAVE_SEGS; -@@ -589,7 +592,11 @@ static long __apm_bios_call(void *_call) +@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call) &call->esi); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); @@ -8947,7 +9360,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne put_cpu(); return call->eax & 0xff; -@@ -656,7 +663,10 @@ static long __apm_bios_call_simple(void +@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; @@ -8958,7 +9371,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne apm_irq_save(flags); APM_DO_SAVE_SEGS; -@@ -664,7 +674,11 @@ static long __apm_bios_call_simple(void +@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void &call->eax); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); @@ -8970,7 +9383,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne put_cpu(); return error; } -@@ -967,7 +981,7 @@ recalc: +@@ -975,7 +989,7 @@ recalc: static void apm_power_off(void) { @@ -8979,7 +9392,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ 0x8e, 0xd0, /* movw ax,ss */ 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ -@@ -1925,7 +1939,10 @@ static const struct file_operations apm_ +@@ -1933,7 +1947,10 @@ static const struct file_operations apm_ static struct miscdevice apm_device = { APM_MINOR_DEV, "apm_bios", @@ -8991,7 +9404,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne }; -@@ -2246,7 +2263,7 @@ static struct dmi_system_id __initdata a +@@ -2254,7 +2271,7 @@ static struct dmi_system_id __initdata a { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, }, @@ -9000,37 +9413,25 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/apm_32.c linux-2.6.31.7/arch/x86/kerne }; /* -@@ -2337,8 +2354,11 @@ static int __init apm_init(void) - * This is for buggy BIOS's that refer to (real mode) segment 0x40 - * even though they are called in protected mode. - */ -+ -+ pax_open_kernel(); - set_base(bad_bios_desc, __va((unsigned long)0x40 << 4)); - _set_limit((char *)&bad_bios_desc, 4095 - (0x40 << 4)); -+ pax_close_kernel(); - - /* - * Set up the long jump entry point to the APM BIOS, which is called -@@ -2358,12 +2378,15 @@ static int __init apm_init(void) +@@ -2357,12 +2374,15 @@ static int __init apm_init(void) * code to that CPU. */ gdt = get_cpu_gdt_table(0); + + pax_open_kernel(); - set_base(gdt[APM_CS >> 3], - __va((unsigned long)apm_info.bios.cseg << 4)); - set_base(gdt[APM_CS_16 >> 3], - __va((unsigned long)apm_info.bios.cseg_16 << 4)); - set_base(gdt[APM_DS >> 3], - __va((unsigned long)apm_info.bios.dseg << 4)); + set_desc_base(&gdt[APM_CS >> 3], + (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4)); + set_desc_base(&gdt[APM_CS_16 >> 3], + (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4)); + set_desc_base(&gdt[APM_DS >> 3], + (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4)); + pax_close_kernel(); proc_create("apm", 0, NULL, &apm_file_ops); -diff -urNp linux-2.6.31.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.31.7/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.31.7/arch/x86/kernel/asm-offsets_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/asm-offsets_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/asm-offsets_32.c linux-2.6.32/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32/arch/x86/kernel/asm-offsets_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/asm-offsets_32.c 2009-12-04 21:40:47.981709672 -0500 @@ -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); @@ -9043,10 +9444,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/asm-offsets_32.c linux-2.6.31.7/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.31.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.31.7/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.31.7/arch/x86/kernel/asm-offsets_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/asm-offsets_64.c 2009-12-10 22:15:15.000000000 -0500 -@@ -114,6 +114,7 @@ int main(void) +diff -urNp linux-2.6.32/arch/x86/kernel/asm-offsets_64.c linux-2.6.32/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32/arch/x86/kernel/asm-offsets_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/asm-offsets_64.c 2009-12-04 21:40:47.981709672 -0500 +@@ -115,6 +115,7 @@ int main(void) ENTRY(cr8); BLANK(); #undef ENTRY @@ -9054,24 +9455,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/asm-offsets_64.c linux-2.6.31.7/arch/x DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/Makefile linux-2.6.31.7/arch/x86/kernel/cpu/Makefile ---- linux-2.6.31.7/arch/x86/kernel/cpu/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/Makefile 2009-12-10 22:15:15.000000000 -0500 -@@ -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 -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/kernel/cpu/common.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/common.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/common.c 2009-12-10 22:15:15.000000000 -0500 -@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitcon +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/common.c linux-2.6.32/arch/x86/kernel/cpu/common.c +--- linux-2.6.32/arch/x86/kernel/cpu/common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/common.c 2009-12-04 21:40:47.982702545 -0500 +@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; @@ -9085,45 +9472,45 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k - * TLS descriptors are currently at a different place compared to i386. - * Hopefully nobody expects them at a fixed place (Wine?) - */ -- [GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } }, -- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } }, -- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } }, -- [GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } }, -- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } }, -- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } }, +- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff), -#else -- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, -- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } }, -- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } }, -- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff200 } } }, +- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff), - /* - * Segments used for calling PnP BIOS have byte granularity. - * They code segments and data segments have fixed 64k limits, - * the transfer segment sizes are set at run time. - */ - /* 32-bit code */ -- [GDT_ENTRY_PNPBIOS_CS32] = { { { 0x0000ffff, 0x00409a00 } } }, +- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff), - /* 16-bit code */ -- [GDT_ENTRY_PNPBIOS_CS16] = { { { 0x0000ffff, 0x00009a00 } } }, +- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff), - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_DS] = { { { 0x0000ffff, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff), - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_TS1] = { { { 0x00000000, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0), - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_TS2] = { { { 0x00000000, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0), - /* - * The APM segments have byte granularity and their bases - * are set at run time. All have 64k limits. - */ - /* 32-bit code */ -- [GDT_ENTRY_APMBIOS_BASE] = { { { 0x0000ffff, 0x00409a00 } } }, +- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff), - /* 16-bit code */ -- [GDT_ENTRY_APMBIOS_BASE+1] = { { { 0x0000ffff, 0x00009a00 } } }, +- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff), - /* data */ -- [GDT_ENTRY_APMBIOS_BASE+2] = { { { 0x0000ffff, 0x00409200 } } }, +- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff), - -- [GDT_ENTRY_ESPFIX_SS] = { { { 0x0000ffff, 0x00cf9200 } } }, -- [GDT_ENTRY_PERCPU] = { { { 0x0000ffff, 0x00cf9200 } } }, +- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), +- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff), - GDT_STACK_CANARY_INIT -#endif -} }; @@ -9132,7 +9519,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k static int __init x86_xsave_setup(char *s) { setup_clear_cpu_cap(X86_FEATURE_XSAVE); -@@ -345,7 +291,7 @@ void switch_to_new_gdt(int cpu) +@@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu) { struct desc_ptr gdt_descr; @@ -9141,7 +9528,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); /* Reload the per-cpu base */ -@@ -799,6 +745,10 @@ static void __cpuinit identify_cpu(struc +@@ -798,6 +744,10 @@ static void __cpuinit identify_cpu(struc /* Filter out anything that depends on CPUID levels we don't have */ filter_cpuid_features(c, true); @@ -9152,16 +9539,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { const char *p; -@@ -982,7 +932,7 @@ static __init int setup_disablecpuid(cha - __setup("clearcpuid=", setup_disablecpuid); - - #ifdef CONFIG_X86_64 --struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table }; -+struct desc_ptr idt_descr __read_only = { 256 * 16 - 1, (unsigned long) idt_table }; - - DEFINE_PER_CPU_FIRST(union irq_stack_union, - irq_stack_union) __aligned(PAGE_SIZE); -@@ -1092,7 +1042,7 @@ void __cpuinit cpu_init(void) +@@ -1101,7 +1051,7 @@ void __cpuinit cpu_init(void) int i; cpu = stack_smp_processor_id(); @@ -9170,7 +9548,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k orig_ist = &per_cpu(orig_ist, cpu); #ifdef CONFIG_NUMA -@@ -1190,7 +1140,7 @@ void __cpuinit cpu_init(void) +@@ -1199,7 +1149,7 @@ void __cpuinit cpu_init(void) { int cpu = smp_processor_id(); struct task_struct *curr = current; @@ -9179,21 +9557,21 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/common.c linux-2.6.31.7/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-12-10 22:15:15.000000000 -0500 -@@ -586,7 +586,7 @@ static const struct dmi_system_id sw_any +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-12-04 21:40:47.982702545 -0500 +@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, }, - { } + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } }; - #endif -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-12-10 22:15:15.000000000 -0500 + static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-12-04 21:40:47.983660654 -0500 @@ -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 }, @@ -9203,9 +9581,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/intel.c linux-2.6.31.7/arch/x86/kernel/cpu/intel.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/intel.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/intel.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/intel.c linux-2.6.32/arch/x86/kernel/cpu/intel.c +--- linux-2.6.32/arch/x86/kernel/cpu/intel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/intel.c 2009-12-04 21:40:47.983660654 -0500 @@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. @@ -9215,10 +9593,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/intel.c linux-2.6.31.7/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.31.7/arch/x86/kernel/cpu/intel_cacheinfo.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-12-10 22:15:15.000000000 -0500 -@@ -842,7 +842,7 @@ static ssize_t store(struct kobject * ko +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/intel_cacheinfo.c 2009-12-04 21:40:47.984618894 -0500 +@@ -860,7 +860,7 @@ static ssize_t store(struct kobject *kob return ret; } @@ -9227,10 +9605,36 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.31.7/a .show = show, .store = store, }; -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c 2009-12-10 22:15:15.000000000 -0500 -@@ -1370,14 +1370,14 @@ void __cpuinit mcheck_init(struct cpuinf +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/Makefile linux-2.6.32/arch/x86/kernel/cpu/Makefile +--- linux-2.6.32/arch/x86/kernel/cpu/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/Makefile 2009-12-04 21:40:47.981709672 -0500 +@@ -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/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-12-04 21:40:47.985628793 -0500 +@@ -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/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mcheck/mce.c 2009-12-04 21:40:47.985628793 -0500 +@@ -1428,14 +1428,14 @@ void __cpuinit mcheck_init(struct cpuinf */ static DEFINE_SPINLOCK(mce_state_lock); @@ -9247,7 +9651,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.7/arch/x spin_unlock(&mce_state_lock); return -EBUSY; -@@ -1385,7 +1385,7 @@ static int mce_open(struct inode *inode, +@@ -1443,7 +1443,7 @@ static int mce_open(struct inode *inode, if (file->f_flags & O_EXCL) open_exclu = 1; @@ -9256,7 +9660,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.7/arch/x spin_unlock(&mce_state_lock); -@@ -1396,7 +1396,7 @@ static int mce_release(struct inode *ino +@@ -1454,7 +1454,7 @@ static int mce_release(struct inode *ino { spin_lock(&mce_state_lock); @@ -9265,7 +9669,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.7/arch/x open_exclu = 0; spin_unlock(&mce_state_lock); -@@ -1536,6 +1536,7 @@ static struct miscdevice mce_log_device +@@ -1594,6 +1594,7 @@ static struct miscdevice mce_log_device MISC_MCELOG_MINOR, "mcelog", &mce_chrdev_ops, @@ -9273,22 +9677,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.31.7/arch/x }; /* -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce_amd.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mcheck/mce_amd.c 2009-12-10 22:15:15.000000000 -0500 -@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob - return ret; - } - --static struct sysfs_ops threshold_ops = { -+static const struct sysfs_ops threshold_ops = { - .show = show, - .store = store, - }; -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/amd.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-10 22:15:15.000000000 -0500 -@@ -101,7 +101,7 @@ static int amd_validate_add_page(unsigne +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/amd.c 2009-12-04 21:40:47.986698266 -0500 +@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base return 0; } @@ -9297,84 +9689,104 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.31.7/arch/x86 .vendor = X86_VENDOR_AMD, .set = amd_set_mtrr, .get = amd_get_mtrr, -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/centaur.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-10 22:15:15.000000000 -0500 -@@ -205,7 +205,7 @@ static int centaur_validate_add_page(uns +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/centaur.c 2009-12-04 21:40:47.986698266 -0500 +@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long return 0; } -static struct mtrr_ops centaur_mtrr_ops = { +static const struct mtrr_ops centaur_mtrr_ops = { .vendor = X86_VENDOR_CENTAUR, - // .init = centaur_mcr_init, .set = centaur_set_mcr, -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/cyrix.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-10 22:15:15.000000000 -0500 -@@ -254,7 +254,7 @@ static void cyrix_set_all(void) + .get = centaur_get_mcr, +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/cyrix.c 2009-12-04 21:40:47.986698266 -0500 +@@ -265,7 +265,7 @@ static void cyrix_set_all(void) post_set(); } -static struct mtrr_ops cyrix_mtrr_ops = { +static const struct mtrr_ops cyrix_mtrr_ops = { .vendor = X86_VENDOR_CYRIX, - // .init = cyrix_arr_init, .set_all = cyrix_set_all, -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-10 22:15:15.000000000 -0500 -@@ -23,14 +23,14 @@ static struct fixed_range_block fixed_ra - { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ - { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ - { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ + .set = cyrix_set_arr, +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.32/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/generic.c 2009-12-04 21:40:47.987546130 -0500 +@@ -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 */ + { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ - {} + { 0, 0 } }; static unsigned long smp_changes_mask; - static int mtrr_state_set; - u64 mtrr_tom2; - --struct mtrr_state_type mtrr_state = {}; -+struct mtrr_state_type mtrr_state; - EXPORT_SYMBOL_GPL(mtrr_state); - - /** -@@ -718,7 +718,7 @@ int positive_have_wrcomb(void) - - /* generic structure... +@@ -752,7 +752,7 @@ int positive_have_wrcomb(void) + /* + * Generic structure... */ -struct mtrr_ops generic_mtrr_ops = { +const struct mtrr_ops generic_mtrr_ops = { - .use_intel_if = 1, - .set_all = generic_set_all, - .get = generic_get_mtrr, -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/main.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/main.c 2009-12-10 22:15:15.000000000 -0500 -@@ -54,14 +54,14 @@ static DEFINE_MUTEX(mtrr_mutex); - + .use_intel_if = 1, + .set_all = generic_set_all, + .get = generic_get_mtrr, +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/main.c 2009-12-04 21:40:47.987546130 -0500 +@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); u64 size_or_mask, size_and_mask; + static bool mtrr_aps_delayed_init; --static struct mtrr_ops * mtrr_ops[X86_VENDOR_NUM] = {}; -+static const struct mtrr_ops * mtrr_ops[X86_VENDOR_NUM] __read_only; +-static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM]; ++static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only; --struct mtrr_ops * mtrr_if = NULL; -+const struct mtrr_ops * mtrr_if = NULL; +-struct mtrr_ops *mtrr_if; ++const struct mtrr_ops *mtrr_if; static void set_mtrr(unsigned int reg, unsigned long base, unsigned long size, mtrr_type type); --void set_mtrr_ops(struct mtrr_ops * ops) -+void set_mtrr_ops(const struct mtrr_ops * ops) +-void set_mtrr_ops(struct mtrr_ops *ops) ++void set_mtrr_ops(const struct mtrr_ops *ops) { if (ops->vendor && ops->vendor < X86_VENDOR_NUM) mtrr_ops[ops->vendor] = ops; -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/mtrr.h ---- linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-10 22:15:15.000000000 -0500 -@@ -33,7 +33,7 @@ extern int generic_get_free_region(unsig +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/mtrr/mtrr.h 2009-12-04 21:40:47.988626319 -0500 +@@ -12,19 +12,19 @@ + extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; + + struct mtrr_ops { +- u32 vendor; +- u32 use_intel_if; +- void (*set)(unsigned int reg, unsigned long base, ++ const u32 vendor; ++ const u32 use_intel_if; ++ void (* const set)(unsigned int reg, unsigned long base, + unsigned long size, mtrr_type type); +- void (*set_all)(void); ++ void (* const set_all)(void); + +- void (*get)(unsigned int reg, unsigned long *base, ++ void (* const get)(unsigned int reg, unsigned long *base, + unsigned long *size, mtrr_type *type); +- int (*get_free_region)(unsigned long base, unsigned long size, ++ int (* const get_free_region)(unsigned long base, unsigned long size, + int replace_reg); +- int (*validate_add_page)(unsigned long base, unsigned long size, ++ int (* const validate_add_page)(unsigned long base, unsigned long size, + unsigned int type); +- int (*have_wrcomb)(void); ++ int (* const have_wrcomb)(void); + }; + + extern int generic_get_free_region(unsigned long base, unsigned long size, +@@ -32,7 +32,7 @@ extern int generic_get_free_region(unsig extern int generic_validate_add_page(unsigned long base, unsigned long size, unsigned int type); @@ -9383,34 +9795,22 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.31.7/arch/x8 extern int positive_have_wrcomb(void); -@@ -54,10 +54,10 @@ void fill_mtrr_var_range(unsigned int in +@@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int in u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi); void get_mtrr_state(void); --extern void set_mtrr_ops(struct mtrr_ops * ops); -+extern void set_mtrr_ops(const struct mtrr_ops * ops); +-extern void set_mtrr_ops(struct mtrr_ops *ops); ++extern void set_mtrr_ops(const struct mtrr_ops *ops); extern u64 size_or_mask, size_and_mask; --extern struct mtrr_ops * mtrr_if; -+extern const struct mtrr_ops * mtrr_if; +-extern struct mtrr_ops *mtrr_if; ++extern const struct mtrr_ops *mtrr_if; #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/perf_counter.c linux-2.6.31.7/arch/x86/kernel/cpu/perf_counter.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/perf_counter.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/perf_counter.c 2009-12-10 22:15:15.000000000 -0500 -@@ -1920,7 +1920,7 @@ perf_callchain_user(struct pt_regs *regs - break; - - callchain_store(entry, frame.return_address); -- fp = frame.next_frame; -+ fp = (__force const void __user *)frame.next_frame; - } - } - -diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.31.7/arch/x86/kernel/cpu/perfctr-watchdog.c ---- linux-2.6.31.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/perfctr-watchdog.c 2009-12-04 21:40:47.989713529 -0500 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { /* Interface defining a CPU specific perfctr watchdog */ @@ -9428,9 +9828,37 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.31.7/ unsigned perfctr; unsigned evntsel; u64 checkbit; -diff -urNp linux-2.6.31.7/arch/x86/kernel/crash.c linux-2.6.31.7/arch/x86/kernel/crash.c ---- linux-2.6.31.7/arch/x86/kernel/crash.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/crash.c 2009-12-10 22:15:15.000000000 -0500 +@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = { + #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL + #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK + ++/* cannot be const */ + static struct wd_ops intel_arch_wd_ops; + + static int setup_intel_arch_watchdog(unsigned nmi_hz) +@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns + return 1; + } + ++/* cannot be const */ + static struct wd_ops intel_arch_wd_ops __read_mostly = { + .reserve = single_msr_reserve, + .unreserve = single_msr_unreserve, +diff -urNp linux-2.6.32/arch/x86/kernel/cpu/perf_event.c linux-2.6.32/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32/arch/x86/kernel/cpu/perf_event.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/cpu/perf_event.c 2009-12-04 21:40:47.989713529 -0500 +@@ -2252,7 +2252,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/arch/x86/kernel/crash.c linux-2.6.32/arch/x86/kernel/crash.c +--- linux-2.6.32/arch/x86/kernel/crash.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/crash.c 2009-12-04 21:40:47.989713529 -0500 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; @@ -9440,9 +9868,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/crash.c linux-2.6.31.7/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.31.7/arch/x86/kernel/doublefault_32.c linux-2.6.31.7/arch/x86/kernel/doublefault_32.c ---- linux-2.6.31.7/arch/x86/kernel/doublefault_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/doublefault_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/doublefault_32.c linux-2.6.32/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32/arch/x86/kernel/doublefault_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/doublefault_32.c 2009-12-04 21:40:47.990703288 -0500 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -9461,7 +9889,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/doublefault_32.c linux-2.6.31.7/arch/x printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size); -@@ -60,10 +60,10 @@ struct tss_struct doublefault_tss __cach +@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach /* 0x2 bit is always set */ .flags = X86_EFLAGS_SF | 0x2, .sp = STACK_START, @@ -9474,40 +9902,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/doublefault_32.c linux-2.6.31.7/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.31.7/arch/x86/kernel/dumpstack.c linux-2.6.31.7/arch/x86/kernel/dumpstack.c ---- linux-2.6.31.7/arch/x86/kernel/dumpstack.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/dumpstack.c 2009-12-10 22:15:15.000000000 -0500 -@@ -181,7 +181,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); -@@ -242,7 +242,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) -@@ -296,7 +296,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.31.7/arch/x86/kernel/dumpstack_32.c linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -113,11 +113,12 @@ void show_registers(struct pt_regs *regs +diff -urNp linux-2.6.32/arch/x86/kernel/dumpstack_32.c linux-2.6.32/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32/arch/x86/kernel/dumpstack_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/dumpstack_32.c 2009-12-04 21:40:47.990703288 -0500 +@@ -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.. */ @@ -9521,7 +9919,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c linux-2.6.31.7/arch/x86 printk(KERN_EMERG "Stack:\n"); show_stack_log_lvl(NULL, regs, ®s->sp, -@@ -125,10 +126,10 @@ void show_registers(struct pt_regs *regs +@@ -124,10 +125,10 @@ void show_registers(struct pt_regs *regs printk(KERN_EMERG "Code: "); @@ -9534,7 +9932,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c linux-2.6.31.7/arch/x86 code_len = code_len - code_prologue + 1; } for (i = 0; i < code_len; i++, ip++) { -@@ -137,7 +138,7 @@ void show_registers(struct pt_regs *regs +@@ -136,7 +137,7 @@ void show_registers(struct pt_regs *regs printk(" Bad EIP value."); break; } @@ -9543,7 +9941,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c linux-2.6.31.7/arch/x86 printk("<%02x> ", c); else printk("%02x ", c); -@@ -150,6 +151,7 @@ int is_valid_bugaddr(unsigned long ip) +@@ -149,6 +150,7 @@ int is_valid_bugaddr(unsigned long ip) { unsigned short ud2; @@ -9551,9 +9949,39 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/dumpstack_32.c linux-2.6.31.7/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.31.7/arch/x86/kernel/e820.c linux-2.6.31.7/arch/x86/kernel/e820.c ---- linux-2.6.31.7/arch/x86/kernel/e820.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/e820.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/dumpstack.c linux-2.6.32/arch/x86/kernel/dumpstack.c +--- linux-2.6.32/arch/x86/kernel/dumpstack.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/dumpstack.c 2009-12-04 21:40:47.990703288 -0500 +@@ -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/arch/x86/kernel/e820.c linux-2.6.32/arch/x86/kernel/e820.c +--- linux-2.6.32/arch/x86/kernel/e820.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/e820.c 2009-12-04 21:40:47.991704412 -0500 @@ -733,7 +733,10 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { @@ -9566,9 +9994,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/e820.c linux-2.6.31.7/arch/x86/kernel/ }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.31.7/arch/x86/kernel/efi_32.c linux-2.6.31.7/arch/x86/kernel/efi_32.c ---- linux-2.6.31.7/arch/x86/kernel/efi_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/efi_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/efi_32.c linux-2.6.32/arch/x86/kernel/efi_32.c +--- linux-2.6.32/arch/x86/kernel/efi_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/efi_32.c 2009-12-04 21:40:47.991704412 -0500 @@ -38,70 +38,38 @@ */ @@ -9649,9 +10077,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/efi_32.c linux-2.6.31.7/arch/x86/kerne /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.31.7/arch/x86/kernel/efi_stub_32.S linux-2.6.31.7/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.31.7/arch/x86/kernel/efi_stub_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/efi_stub_32.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/efi_stub_32.S linux-2.6.32/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32/arch/x86/kernel/efi_stub_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/efi_stub_32.S 2009-12-04 21:40:47.991704412 -0500 @@ -6,6 +6,7 @@ */ @@ -9750,9 +10178,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/efi_stub_32.S linux-2.6.31.7/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.31.7/arch/x86/kernel/entry_32.S linux-2.6.31.7/arch/x86/kernel/entry_32.S ---- linux-2.6.31.7/arch/x86/kernel/entry_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/entry_32.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/entry_32.S linux-2.6.32/arch/x86/kernel/entry_32.S +--- linux-2.6.32/arch/x86/kernel/entry_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/entry_32.S 2009-12-04 21:40:47.993657147 -0500 @@ -191,7 +191,7 @@ #endif /* CONFIG_X86_32_LAZY_GS */ @@ -10006,10 +10434,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/entry_32.S linux-2.6.31.7/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.31.7/arch/x86/kernel/entry_64.S linux-2.6.31.7/arch/x86/kernel/entry_64.S ---- linux-2.6.31.7/arch/x86/kernel/entry_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/entry_64.S 2009-12-10 22:15:15.000000000 -0500 -@@ -1074,7 +1074,12 @@ ENTRY(\sym) +diff -urNp linux-2.6.32/arch/x86/kernel/entry_64.S linux-2.6.32/arch/x86/kernel/entry_64.S +--- linux-2.6.32/arch/x86/kernel/entry_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/entry_64.S 2009-12-04 21:40:47.994617710 -0500 +@@ -1068,7 +1068,12 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ @@ -10023,9 +10451,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/entry_64.S linux-2.6.31.7/arch/x86/ker subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) -diff -urNp linux-2.6.31.7/arch/x86/kernel/ftrace.c linux-2.6.31.7/arch/x86/kernel/ftrace.c ---- linux-2.6.31.7/arch/x86/kernel/ftrace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/ftrace.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/ftrace.c linux-2.6.32/arch/x86/kernel/ftrace.c +--- linux-2.6.32/arch/x86/kernel/ftrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/ftrace.c 2009-12-04 21:40:47.994617710 -0500 @@ -284,9 +284,9 @@ int ftrace_update_ftrace_func(ftrace_fun unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; @@ -10038,16 +10466,18 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ftrace.c linux-2.6.31.7/arch/x86/kerne return ret; } -diff -urNp linux-2.6.31.7/arch/x86/kernel/head32.c linux-2.6.31.7/arch/x86/kernel/head32.c ---- linux-2.6.31.7/arch/x86/kernel/head32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/head32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -13,12 +13,13 @@ - #include <asm/e820.h> +diff -urNp linux-2.6.32/arch/x86/kernel/head32.c linux-2.6.32/arch/x86/kernel/head32.c +--- linux-2.6.32/arch/x86/kernel/head32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/head32.c 2009-12-04 21:40:47.994617710 -0500 +@@ -16,6 +16,7 @@ + #include <asm/apic.h> + #include <asm/io_apic.h> #include <asm/bios_ebda.h> - #include <asm/trampoline.h> +#include <asm/boot.h> - void __init i386_start_kernel(void) + static void __init i386_default_early_setup(void) + { +@@ -31,7 +32,7 @@ void __init i386_start_kernel(void) { reserve_trampoline_memory(); @@ -10056,9 +10486,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head32.c linux-2.6.31.7/arch/x86/kerne #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kernel/head_32.S ---- linux-2.6.31.7/arch/x86/kernel/head_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/head_32.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/head_32.S linux-2.6.32/arch/x86/kernel/head_32.S +--- linux-2.6.32/arch/x86/kernel/head_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/head_32.S 2009-12-04 21:40:47.995699934 -0500 @@ -19,10 +19,17 @@ #include <asm/setup.h> #include <asm/processor-flags.h> @@ -10106,7 +10536,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern @@ -80,6 +89,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) * can. */ - .section .text.head,"ax",@progbits + __HEAD + +#ifdef CONFIG_PAX_KERNEXEC + jmp startup_32 @@ -10181,20 +10611,22 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern bad_subarch: WEAK(lguest_entry) -@@ -154,9 +214,9 @@ WEAK(xen_entry) +@@ -154,10 +214,10 @@ WEAK(xen_entry) __INITDATA subarch_entries: - .long default_entry /* normal x86/PC */ - .long lguest_entry /* lguest hypervisor */ - .long xen_entry /* Xen hypervisor */ +- .long default_entry /* Moorestown MID */ + .long ta(default_entry) /* normal x86/PC */ + .long ta(lguest_entry) /* lguest hypervisor */ + .long ta(xen_entry) /* Xen hypervisor */ ++ .long ta(default_entry) /* Moorestown MID */ num_subarch_entries = (. - subarch_entries) / 4 .previous #endif /* CONFIG_PARAVIRT */ -@@ -217,8 +277,11 @@ default_entry: +@@ -218,8 +278,11 @@ default_entry: movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ @@ -10208,7 +10640,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern #else /* Not PAE */ page_pde_offset = (__PAGE_OFFSET >> 20); -@@ -248,8 +311,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); +@@ -249,8 +312,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ @@ -10222,7 +10654,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern #endif jmp 3f /* -@@ -296,6 +362,7 @@ ENTRY(startup_32_smp) +@@ -297,6 +363,7 @@ ENTRY(startup_32_smp) orl %edx,%eax movl %eax,%cr4 @@ -10230,7 +10662,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern btl $5, %eax # check if PAE is enabled jnc 6f -@@ -311,13 +378,16 @@ ENTRY(startup_32_smp) +@@ -312,13 +379,17 @@ ENTRY(startup_32_smp) jnc 6f /* Setup EFER (Extended Feature Enable Register) */ @@ -10245,10 +10677,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4) + movl $1,pa(nx_enabled) +#endif ++ 6: /* -@@ -343,9 +413,7 @@ ENTRY(startup_32_smp) +@@ -344,9 +415,7 @@ ENTRY(startup_32_smp) #ifdef CONFIG_SMP cmpb $0, ready @@ -10259,7 +10692,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern #endif /* CONFIG_SMP */ /* -@@ -423,7 +491,7 @@ is386: movl $2,%ecx # set MP +@@ -424,7 +493,7 @@ is386: movl $2,%ecx # set MP 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. @@ -10268,7 +10701,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern movl %eax,%ds movl %eax,%es -@@ -437,8 +505,11 @@ is386: movl $2,%ecx # set MP +@@ -438,8 +507,11 @@ is386: movl $2,%ecx # set MP */ cmpb $0,ready jne 1f @@ -10281,7 +10714,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) shrl $16, %ecx movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) -@@ -456,10 +527,6 @@ is386: movl $2,%ecx # set MP +@@ -457,10 +529,6 @@ is386: movl $2,%ecx # set MP #ifdef CONFIG_SMP movb ready, %cl movb $1, ready @@ -10292,7 +10725,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern #endif /* CONFIG_SMP */ jmp *(initial_code) -@@ -545,22 +612,22 @@ early_page_fault: +@@ -546,22 +614,22 @@ early_page_fault: jmp early_fault early_fault: @@ -10320,7 +10753,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern hlt_loop: hlt jmp hlt_loop -@@ -568,8 +635,11 @@ hlt_loop: +@@ -569,8 +637,11 @@ hlt_loop: /* This is the default interrupt "handler" :-) */ ALIGN ignore_int: @@ -10333,7 +10766,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern pushl %eax pushl %ecx pushl %edx -@@ -578,9 +648,6 @@ ignore_int: +@@ -579,9 +650,6 @@ ignore_int: movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es @@ -10343,11 +10776,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern pushl 16(%esp) pushl 24(%esp) pushl 32(%esp) -@@ -607,27 +674,37 @@ ENTRY(initial_code) +@@ -608,27 +676,37 @@ ENTRY(initial_code) /* * BSS section */ --.section ".bss.page_aligned","wa" +-__PAGE_ALIGNED_BSS - .align PAGE_SIZE_asm #ifdef CONFIG_X86_PAE +.section .swapper_pg_pmd,"a",@progbits @@ -10379,14 +10812,14 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern * This starts the data section. */ #ifdef CONFIG_X86_PAE --.section ".data.page_aligned","wa" +-__PAGE_ALIGNED_DATA - /* Page-aligned for the benefit of paravirt? */ - .align PAGE_SIZE_asm +.section .swapper_pg_dir,"a",@progbits ENTRY(swapper_pg_dir) .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ # if KPMDS == 3 -@@ -650,11 +727,12 @@ ENTRY(swapper_pg_dir) +@@ -651,11 +729,12 @@ ENTRY(swapper_pg_dir) .data ENTRY(stack_start) @@ -10400,7 +10833,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern early_recursion_flag: .long 0 -@@ -690,7 +768,7 @@ fault_msg: +@@ -691,7 +770,7 @@ fault_msg: .word 0 # 32 bit align gdt_desc.address boot_gdt_descr: .word __BOOT_DS+7 @@ -10409,7 +10842,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern .word 0 # 32-bit align idt_desc.address idt_descr: -@@ -701,7 +779,7 @@ idt_descr: +@@ -702,7 +781,7 @@ idt_descr: .word 0 # 32 bit align gdt_desc.address ENTRY(early_gdt_descr) .word GDT_ENTRIES*8-1 @@ -10418,7 +10851,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern /* * The boot_gdt must mirror the equivalent in setup.S and is -@@ -710,5 +788,59 @@ ENTRY(early_gdt_descr) +@@ -711,5 +790,59 @@ ENTRY(early_gdt_descr) .align L1_CACHE_BYTES ENTRY(boot_gdt) .fill GDT_ENTRY_BOOT_CS,8,0 @@ -10480,9 +10913,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_32.S linux-2.6.31.7/arch/x86/kern + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.31.7/arch/x86/kernel/head_64.S linux-2.6.31.7/arch/x86/kernel/head_64.S ---- linux-2.6.31.7/arch/x86/kernel/head_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/head_64.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/head_64.S linux-2.6.32/arch/x86/kernel/head_64.S +--- linux-2.6.32/arch/x86/kernel/head_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/head_64.S 2009-12-04 21:40:47.996630746 -0500 @@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) @@ -10493,7 +10926,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_64.S linux-2.6.31.7/arch/x86/kern +L3_VMEMMAP_START = pud_index(VMEMMAP_START) .text - .section .text.head + __HEAD @@ -85,35 +89,22 @@ startup_64: */ addq %rbp, init_level4_pgt + 0(%rip) @@ -10717,13 +11150,13 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/head_64.S linux-2.6.31.7/arch/x86/kern - .skip IDT_ENTRIES * 16 + .fill 512,8,0 - .section .bss.page_aligned, "aw", @nobits + __PAGE_ALIGNED_BSS .align PAGE_SIZE -diff -urNp linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -10,8 +10,12 @@ - EXPORT_SYMBOL(mcount); +diff -urNp linux-2.6.32/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32/arch/x86/kernel/i386_ksyms_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/i386_ksyms_32.c 2009-12-04 21:40:47.997619012 -0500 +@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); + EXPORT_SYMBOL(cmpxchg8b_emu); #endif +EXPORT_SYMBOL_GPL(cpu_gdt_table); @@ -10735,7 +11168,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.7/arch/x8 EXPORT_SYMBOL(__get_user_1); EXPORT_SYMBOL(__get_user_2); -@@ -26,3 +30,7 @@ EXPORT_SYMBOL(strstr); +@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr); EXPORT_SYMBOL(csum_partial); EXPORT_SYMBOL(empty_zero_page); @@ -10743,10 +11176,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/i386_ksyms_32.c linux-2.6.31.7/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); +#endif -diff -urNp linux-2.6.31.7/arch/x86/kernel/init_task.c linux-2.6.31.7/arch/x86/kernel/init_task.c ---- linux-2.6.31.7/arch/x86/kernel/init_task.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/init_task.c 2009-12-10 22:15:15.000000000 -0500 -@@ -39,5 +39,5 @@ EXPORT_SYMBOL(init_task); +diff -urNp linux-2.6.32/arch/x86/kernel/init_task.c linux-2.6.32/arch/x86/kernel/init_task.c +--- linux-2.6.32/arch/x86/kernel/init_task.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/init_task.c 2009-12-04 21:40:47.997619012 -0500 +@@ -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. */ @@ -10754,9 +11187,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/init_task.c linux-2.6.31.7/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.31.7/arch/x86/kernel/ioport.c linux-2.6.31.7/arch/x86/kernel/ioport.c ---- linux-2.6.31.7/arch/x86/kernel/ioport.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/ioport.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/ioport.c linux-2.6.32/arch/x86/kernel/ioport.c +--- linux-2.6.32/arch/x86/kernel/ioport.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/ioport.c 2009-12-04 21:40:48.005201255 -0500 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -10801,9 +11234,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ioport.c linux-2.6.31.7/arch/x86/kerne } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.31.7/arch/x86/kernel/irq_32.c linux-2.6.31.7/arch/x86/kernel/irq_32.c ---- linux-2.6.31.7/arch/x86/kernel/irq_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/irq_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/irq_32.c linux-2.6.32/arch/x86/kernel/irq_32.c +--- linux-2.6.32/arch/x86/kernel/irq_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/irq_32.c 2009-12-04 21:40:48.005201255 -0500 @@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; @@ -10822,9 +11255,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/irq_32.c linux-2.6.31.7/arch/x86/kerne call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.31.7/arch/x86/kernel/kgdb.c linux-2.6.31.7/arch/x86/kernel/kgdb.c ---- linux-2.6.31.7/arch/x86/kernel/kgdb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/kgdb.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/kgdb.c linux-2.6.32/arch/x86/kernel/kgdb.c +--- linux-2.6.32/arch/x86/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/kgdb.c 2009-12-04 21:40:48.005201255 -0500 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception return instruction_pointer(regs); } @@ -10834,9 +11267,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/kgdb.c linux-2.6.31.7/arch/x86/kernel/ /* Breakpoint instruction: */ .gdb_bpt_instr = { 0xcc }, .flags = KGDB_HW_BREAKPOINT, -diff -urNp linux-2.6.31.7/arch/x86/kernel/kprobes.c linux-2.6.31.7/arch/x86/kernel/kprobes.c ---- linux-2.6.31.7/arch/x86/kernel/kprobes.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/kprobes.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/kprobes.c linux-2.6.32/arch/x86/kernel/kprobes.c +--- linux-2.6.32/arch/x86/kernel/kprobes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/kprobes.c 2009-12-04 21:40:48.006658515 -0500 @@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -10919,17 +11352,17 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/kprobes.c linux-2.6.31.7/arch/x86/kern return ret; switch (val) { -diff -urNp linux-2.6.31.7/arch/x86/kernel/ldt.c linux-2.6.31.7/arch/x86/kernel/ldt.c ---- linux-2.6.31.7/arch/x86/kernel/ldt.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/ldt.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/ldt.c linux-2.6.32/arch/x86/kernel/ldt.c +--- linux-2.6.32/arch/x86/kernel/ldt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/ldt.c 2009-12-04 21:40:48.006658515 -0500 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP preempt_disable(); - load_LDT(pc); + load_LDT_nolock(pc); - if (!cpus_equal(current->mm->cpu_vm_mask, - cpumask_of_cpu(smp_processor_id()))) + if (!cpumask_equal(mm_cpumask(current->mm), + cpumask_of(smp_processor_id()))) smp_call_function(flush_ldt, current->mm, 1); preempt_enable(); #else @@ -10986,9 +11419,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ldt.c linux-2.6.31.7/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.31.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.31.7/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.31.7/arch/x86/kernel/machine_kexec_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/machine_kexec_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/machine_kexec_32.c linux-2.6.32/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32/arch/x86/kernel/machine_kexec_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/machine_kexec_32.c 2009-12-04 21:40:48.008054069 -0500 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -11016,10 +11449,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/machine_kexec_32.c linux-2.6.31.7/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_amd.c linux-2.6.31.7/arch/x86/kernel/microcode_amd.c ---- linux-2.6.31.7/arch/x86/kernel/microcode_amd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/microcode_amd.c 2009-12-10 22:15:15.000000000 -0500 -@@ -340,7 +340,7 @@ static void microcode_fini_cpu_amd(int c +diff -urNp linux-2.6.32/arch/x86/kernel/microcode_amd.c linux-2.6.32/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32/arch/x86/kernel/microcode_amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/microcode_amd.c 2009-12-04 21:40:48.008054069 -0500 +@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c uci->mc = NULL; } @@ -11028,7 +11461,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_amd.c linux-2.6.31.7/arch/x8 .request_microcode_user = request_microcode_user, .request_microcode_fw = request_microcode_fw, .collect_cpu_info = collect_cpu_info_amd, -@@ -348,7 +348,7 @@ static struct microcode_ops microcode_am +@@ -354,7 +354,7 @@ static struct microcode_ops microcode_am .microcode_fini_cpu = microcode_fini_cpu_amd, }; @@ -11037,9 +11470,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_amd.c linux-2.6.31.7/arch/x8 { return µcode_amd_ops; } -diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_core.c linux-2.6.31.7/arch/x86/kernel/microcode_core.c ---- linux-2.6.31.7/arch/x86/kernel/microcode_core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/microcode_core.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/microcode_core.c linux-2.6.32/arch/x86/kernel/microcode_core.c +--- linux-2.6.32/arch/x86/kernel/microcode_core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/microcode_core.c 2009-12-04 21:40:48.008652654 -0500 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); #define MICROCODE_VERSION "2.00" @@ -11049,9 +11482,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_core.c linux-2.6.31.7/arch/x /* * Synchronization. -diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_intel.c linux-2.6.31.7/arch/x86/kernel/microcode_intel.c ---- linux-2.6.31.7/arch/x86/kernel/microcode_intel.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/microcode_intel.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/microcode_intel.c linux-2.6.32/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32/arch/x86/kernel/microcode_intel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/microcode_intel.c 2009-12-04 21:40:48.008652654 -0500 @@ -443,13 +443,13 @@ static enum ucode_state request_microcod static int get_ucode_user(void *to, const void *from, size_t n) @@ -11086,9 +11519,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/microcode_intel.c linux-2.6.31.7/arch/ { return µcode_intel_ops; } -diff -urNp linux-2.6.31.7/arch/x86/kernel/module.c linux-2.6.31.7/arch/x86/kernel/module.c ---- linux-2.6.31.7/arch/x86/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/module.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/module.c linux-2.6.32/arch/x86/kernel/module.c +--- linux-2.6.32/arch/x86/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/module.c 2009-12-04 21:40:48.009718910 -0500 @@ -34,7 +34,7 @@ #define DEBUGP(fmt...) #endif @@ -11260,31 +11693,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/module.c linux-2.6.31.7/arch/x86/kerne #if 0 if ((s64)val != *(s32 *)loc) goto overflow; -diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.31.7/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.31.7/arch/x86/kernel/paravirt-spinlocks.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/paravirt-spinlocks.c 2009-12-10 22:15:15.000000000 -0500 -@@ -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.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/kernel/paravirt.c ---- linux-2.6.31.7/arch/x86/kernel/paravirt.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/paravirt.c 2009-12-10 22:15:15.000000000 -0500 -@@ -54,7 +54,7 @@ u64 _paravirt_ident_64(u64 x) - return x; - } - --static void __init default_banner(void) -+static void default_banner(void) - { - printk(KERN_INFO "Booting paravirtualized kernel on %s\n", - pv_info.name); -@@ -125,9 +125,9 @@ unsigned paravirt_patch_jmp(void *insnbu +diff -urNp linux-2.6.32/arch/x86/kernel/paravirt.c linux-2.6.32/arch/x86/kernel/paravirt.c +--- linux-2.6.32/arch/x86/kernel/paravirt.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/paravirt.c 2009-12-04 21:40:48.009718910 -0500 +@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu /* Neat trick to map patch type back to the call within the * corresponding structure. */ @@ -11296,7 +11708,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker .pv_init_ops = pv_init_ops, .pv_time_ops = pv_time_ops, .pv_cpu_ops = pv_cpu_ops, -@@ -138,13 +138,13 @@ static void *get_call_destination(u8 typ +@@ -133,13 +133,13 @@ static void *get_call_destination(u8 typ .pv_lock_ops = pv_lock_ops, #endif }; @@ -11312,7 +11724,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker unsigned ret; if (opfunc == NULL) -@@ -183,7 +183,7 @@ unsigned paravirt_patch_insns(void *insn +@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn if (insn_len > len || start == NULL) insn_len = len; else @@ -11321,7 +11733,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker return insn_len; } -@@ -311,21 +311,21 @@ void arch_flush_lazy_mmu_mode(void) +@@ -294,22 +294,22 @@ void arch_flush_lazy_mmu_mode(void) preempt_enable(); } @@ -11336,26 +11748,19 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker -struct pv_init_ops pv_init_ops = { +struct pv_init_ops pv_init_ops __read_only = { .patch = native_patch, - .banner = default_banner, - .arch_setup = paravirt_nop, - .memory_setup = machine_specific_memory_setup, }; -struct pv_time_ops pv_time_ops = { +struct pv_time_ops pv_time_ops __read_only = { - .time_init = hpet_time_init, - .get_wallclock = native_get_wallclock, - .set_wallclock = native_set_wallclock, -@@ -333,7 +333,7 @@ struct pv_time_ops pv_time_ops = { - .get_tsc_khz = native_calibrate_tsc, + .sched_clock = native_sched_clock, }; -struct pv_irq_ops pv_irq_ops = { +struct pv_irq_ops pv_irq_ops __read_only = { - .init_IRQ = native_init_IRQ, .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl), -@@ -346,7 +346,7 @@ struct pv_irq_ops pv_irq_ops = { + .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable), +@@ -321,7 +321,7 @@ struct pv_irq_ops pv_irq_ops = { #endif }; @@ -11364,25 +11769,25 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker .cpuid = native_cpuid, .get_debugreg = native_get_debugreg, .set_debugreg = native_set_debugreg, -@@ -406,7 +406,7 @@ struct pv_cpu_ops pv_cpu_ops = { +@@ -382,7 +382,7 @@ struct pv_cpu_ops pv_cpu_ops = { .end_context_switch = paravirt_nop, }; -struct pv_apic_ops pv_apic_ops = { +struct pv_apic_ops pv_apic_ops __read_only = { #ifdef CONFIG_X86_LOCAL_APIC - .setup_boot_clock = setup_boot_APIC_clock, - .setup_secondary_clock = setup_secondary_APIC_clock, -@@ -422,7 +422,7 @@ struct pv_apic_ops pv_apic_ops = { + .startup_ipi_hook = paravirt_nop, + #endif +@@ -396,7 +396,7 @@ struct pv_apic_ops pv_apic_ops = { #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64) #endif -struct pv_mmu_ops pv_mmu_ops = { +struct pv_mmu_ops pv_mmu_ops __read_only = { - #ifndef CONFIG_X86_64 - .pagetable_setup_start = native_pagetable_setup_start, - .pagetable_setup_done = native_pagetable_setup_done, -@@ -500,6 +500,12 @@ struct pv_mmu_ops pv_mmu_ops = { + + .read_cr2 = native_read_cr2, + .write_cr2 = native_write_cr2, +@@ -467,6 +467,12 @@ struct pv_mmu_ops pv_mmu_ops = { }, .set_fixmap = native_set_fixmap, @@ -11395,10 +11800,34 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/paravirt.c linux-2.6.31.7/arch/x86/ker }; EXPORT_SYMBOL_GPL(pv_time_ops); -diff -urNp linux-2.6.31.7/arch/x86/kernel/pci-dma.c linux-2.6.31.7/arch/x86/kernel/pci-dma.c ---- linux-2.6.31.7/arch/x86/kernel/pci-dma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/pci-dma.c 2009-12-10 22:15:15.000000000 -0500 -@@ -13,7 +13,7 @@ +diff -urNp linux-2.6.32/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32/arch/x86/kernel/paravirt-spinlocks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/paravirt-spinlocks.c 2009-12-04 21:40:48.009718910 -0500 +@@ -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/arch/x86/kernel/pci-calgary_64.c linux-2.6.32/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32/arch/x86/kernel/pci-calgary_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/pci-calgary_64.c 2009-12-04 21:40:48.010703871 -0500 +@@ -470,7 +470,7 @@ static void calgary_free_coherent(struct + free_pages((unsigned long)vaddr, get_order(size)); + } + +-static struct dma_map_ops calgary_dma_ops = { ++static const struct dma_map_ops calgary_dma_ops = { + .alloc_coherent = calgary_alloc_coherent, + .free_coherent = calgary_free_coherent, + .map_sg = calgary_map_sg, +diff -urNp linux-2.6.32/arch/x86/kernel/pci-dma.c linux-2.6.32/arch/x86/kernel/pci-dma.c +--- linux-2.6.32/arch/x86/kernel/pci-dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/pci-dma.c 2009-12-04 21:40:48.010703871 -0500 +@@ -14,7 +14,7 @@ static int forbid_dac __read_mostly; @@ -11407,7 +11836,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/pci-dma.c linux-2.6.31.7/arch/x86/kern EXPORT_SYMBOL(dma_ops); static int iommu_sac_force __read_mostly; -@@ -234,7 +234,7 @@ early_param("iommu", iommu_setup); +@@ -243,7 +243,7 @@ early_param("iommu", iommu_setup); int dma_supported(struct device *dev, u64 mask) { @@ -11416,62 +11845,46 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/pci-dma.c linux-2.6.31.7/arch/x86/kern #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { -diff -urNp linux-2.6.31.7/arch/x86/kernel/pci-nommu.c linux-2.6.31.7/arch/x86/kernel/pci-nommu.c ---- linux-2.6.31.7/arch/x86/kernel/pci-nommu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/pci-nommu.c 2009-12-10 22:15:15.000000000 -0500 -@@ -79,7 +79,7 @@ static void nommu_free_coherent(struct d - free_pages((unsigned long)vaddr, get_order(size)); +diff -urNp linux-2.6.32/arch/x86/kernel/pci-gart_64.c linux-2.6.32/arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32/arch/x86/kernel/pci-gart_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/pci-gart_64.c 2009-12-04 21:40:48.011653914 -0500 +@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag + return -1; + } + +-static struct dma_map_ops gart_dma_ops = { ++static const struct dma_map_ops gart_dma_ops = { + .map_sg = gart_map_sg, + .unmap_sg = gart_unmap_sg, + .map_page = gart_map_page, +diff -urNp linux-2.6.32/arch/x86/kernel/pci-nommu.c linux-2.6.32/arch/x86/kernel/pci-nommu.c +--- linux-2.6.32/arch/x86/kernel/pci-nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/pci-nommu.c 2009-12-04 21:40:48.011653914 -0500 +@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str + flush_write_buffers(); } -struct dma_map_ops nommu_dma_ops = { +const struct dma_map_ops nommu_dma_ops = { - .alloc_coherent = dma_generic_alloc_coherent, - .free_coherent = nommu_free_coherent, - .map_sg = nommu_map_sg, -diff -urNp linux-2.6.31.7/arch/x86/kernel/process.c linux-2.6.31.7/arch/x86/kernel/process.c ---- linux-2.6.31.7/arch/x86/kernel/process.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/process.c 2009-12-10 22:15:15.000000000 -0500 -@@ -76,7 +76,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); -@@ -108,6 +108,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; -@@ -611,17 +614,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.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/kernel/process_32.c ---- linux-2.6.31.7/arch/x86/kernel/process_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/process_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -70,6 +70,7 @@ EXPORT_PER_CPU_SYMBOL(current_task); + .alloc_coherent = dma_generic_alloc_coherent, + .free_coherent = nommu_free_coherent, + .map_sg = nommu_map_sg, +diff -urNp linux-2.6.32/arch/x86/kernel/pci-swiotlb.c linux-2.6.32/arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32/arch/x86/kernel/pci-swiotlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/pci-swiotlb.c 2009-12-04 21:40:48.011653914 -0500 +@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( + return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); + } + +-static struct dma_map_ops swiotlb_dma_ops = { ++static const struct dma_map_ops swiotlb_dma_ops = { + .mapping_error = swiotlb_dma_mapping_error, + .alloc_coherent = x86_swiotlb_alloc_coherent, + .free_coherent = swiotlb_free_coherent, +diff -urNp linux-2.6.32/arch/x86/kernel/process_32.c linux-2.6.32/arch/x86/kernel/process_32.c +--- linux-2.6.32/arch/x86/kernel/process_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/process_32.c 2009-12-04 21:40:48.012616394 -0500 +@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as unsigned long thread_saved_pc(struct task_struct *tsk) { return ((unsigned long *)tsk->thread.sp)[3]; @@ -11479,7 +11892,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k } #ifndef CONFIG_SMP -@@ -132,7 +133,7 @@ void __show_regs(struct pt_regs *regs, i +@@ -129,7 +130,7 @@ void __show_regs(struct pt_regs *regs, i unsigned short ss, gs; const char *board; @@ -11488,7 +11901,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k sp = regs->sp; ss = regs->ss & 0xffff; gs = get_user_gs(regs); -@@ -213,8 +214,8 @@ int kernel_thread(int (*fn)(void *), voi +@@ -210,8 +211,8 @@ int kernel_thread(int (*fn)(void *), voi regs.bx = (unsigned long) fn; regs.dx = (unsigned long) arg; @@ -11499,7 +11912,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k regs.fs = __KERNEL_PERCPU; regs.gs = __KERNEL_STACK_CANARY; regs.orig_ax = -1; -@@ -250,7 +251,7 @@ int copy_thread(unsigned long clone_flag +@@ -247,7 +248,7 @@ int copy_thread(unsigned long clone_flag struct task_struct *tsk; int err; @@ -11508,7 +11921,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k *childregs = *regs; childregs->ax = 0; childregs->sp = sp; -@@ -279,6 +280,7 @@ int copy_thread(unsigned long clone_flag +@@ -276,6 +277,7 @@ int copy_thread(unsigned long clone_flag * Set a new TLS for the child thread? */ if (clone_flags & CLONE_SETTLS) @@ -11516,16 +11929,16 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k err = do_set_thread_area(p, -1, (struct user_desc __user *)childregs->si, 0); -@@ -349,7 +351,7 @@ __switch_to(struct task_struct *prev_p, +@@ -346,7 +348,7 @@ __switch_to(struct task_struct *prev_p, struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; int cpu = smp_processor_id(); - struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct tss_struct *tss = init_tss + cpu; + bool preload_fpu; /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ - -@@ -377,6 +379,11 @@ __switch_to(struct task_struct *prev_p, +@@ -381,6 +383,11 @@ __switch_to(struct task_struct *prev_p, */ lazy_save_gs(prev->gs); @@ -11537,7 +11950,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k /* * Load the per-thread Thread-Local Storage descriptor. */ -@@ -495,3 +502,27 @@ unsigned long get_wchan(struct task_stru +@@ -497,3 +504,27 @@ unsigned long get_wchan(struct task_stru return 0; } @@ -11565,10 +11978,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_32.c linux-2.6.31.7/arch/x86/k + load_sp0(init_tss + smp_processor_id(), thread); +} +#endif -diff -urNp linux-2.6.31.7/arch/x86/kernel/process_64.c linux-2.6.31.7/arch/x86/kernel/process_64.c ---- linux-2.6.31.7/arch/x86/kernel/process_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/process_64.c 2009-12-10 22:15:15.000000000 -0500 -@@ -94,7 +94,7 @@ static void __exit_idle(void) +diff -urNp linux-2.6.32/arch/x86/kernel/process_64.c linux-2.6.32/arch/x86/kernel/process_64.c +--- linux-2.6.32/arch/x86/kernel/process_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/process_64.c 2009-12-04 21:40:48.012616394 -0500 +@@ -91,7 +91,7 @@ static void __exit_idle(void) void exit_idle(void) { /* idle loop has pid 0 */ @@ -11577,7 +11990,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_64.c linux-2.6.31.7/arch/x86/k return; __exit_idle(); } -@@ -173,7 +173,7 @@ void __show_regs(struct pt_regs *regs, i +@@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, i if (!board) board = ""; printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n", @@ -11586,16 +11999,16 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_64.c linux-2.6.31.7/arch/x86/k init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version, board); -@@ -384,7 +384,7 @@ __switch_to(struct task_struct *prev_p, +@@ -381,7 +381,7 @@ __switch_to(struct task_struct *prev_p, struct thread_struct *prev = &prev_p->thread; struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); - struct tss_struct *tss = &per_cpu(init_tss, cpu); + struct tss_struct *tss = init_tss + cpu; unsigned fsindex, gsindex; + bool preload_fpu; - /* we're going to use this soon, after a few expensive things */ -@@ -543,12 +543,11 @@ unsigned long get_wchan(struct task_stru +@@ -549,12 +549,11 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); @@ -11610,10 +12023,50 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/process_64.c linux-2.6.31.7/arch/x86/k return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kernel/ptrace.c ---- linux-2.6.31.7/arch/x86/kernel/ptrace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/ptrace.c 2009-12-10 22:15:15.000000000 -0500 -@@ -934,7 +934,7 @@ static const struct user_regset_view use +diff -urNp linux-2.6.32/arch/x86/kernel/process.c linux-2.6.32/arch/x86/kernel/process.c +--- linux-2.6.32/arch/x86/kernel/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/process.c 2009-12-04 21:40:48.011653914 -0500 +@@ -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); +@@ -105,6 +105,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; +@@ -596,17 +599,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/arch/x86/kernel/ptrace.c linux-2.6.32/arch/x86/kernel/ptrace.c +--- linux-2.6.32/arch/x86/kernel/ptrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/ptrace.c 2009-12-04 21:40:48.013713148 -0500 +@@ -925,7 +925,7 @@ static const struct user_regset_view use long arch_ptrace(struct task_struct *child, long request, long addr, long data) { int ret; @@ -11622,7 +12075,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne switch (request) { /* read the word at location addr in the USER area. */ -@@ -1021,14 +1021,14 @@ long arch_ptrace(struct task_struct *chi +@@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *chi if (addr < 0) return -EIO; ret = do_get_thread_area(child, addr, @@ -11639,7 +12092,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne break; #endif -@@ -1047,12 +1047,12 @@ long arch_ptrace(struct task_struct *chi +@@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *chi #ifdef CONFIG_X86_PTRACE_BTS case PTRACE_BTS_CONFIG: ret = ptrace_bts_config @@ -11654,7 +12107,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne break; case PTRACE_BTS_SIZE: -@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi +@@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *chi case PTRACE_BTS_GET: ret = ptrace_bts_read_record @@ -11663,7 +12116,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne break; case PTRACE_BTS_CLEAR: -@@ -1070,7 +1070,7 @@ long arch_ptrace(struct task_struct *chi +@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi case PTRACE_BTS_DRAIN: ret = ptrace_bts_drain @@ -11672,7 +12125,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne break; #endif /* CONFIG_X86_PTRACE_BTS */ -@@ -1454,7 +1454,7 @@ void send_sigtrap(struct task_struct *ts +@@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *ts info.si_code = si_code; /* User-mode ip? */ @@ -11681,10 +12134,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/ptrace.c linux-2.6.31.7/arch/x86/kerne /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kernel/reboot.c ---- linux-2.6.31.7/arch/x86/kernel/reboot.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/reboot.c 2009-12-10 22:15:15.000000000 -0500 -@@ -31,7 +31,7 @@ void (*pm_power_off)(void); +diff -urNp linux-2.6.32/arch/x86/kernel/reboot.c linux-2.6.32/arch/x86/kernel/reboot.c +--- linux-2.6.32/arch/x86/kernel/reboot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/reboot.c 2009-12-04 21:40:48.014634572 -0500 +@@ -33,7 +33,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); static const struct desc_ptr no_idt = {}; @@ -11693,7 +12146,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne enum reboot_type reboot_type = BOOT_KBD; int reboot_force; -@@ -257,7 +257,7 @@ static struct dmi_system_id __initdata r +@@ -259,7 +259,7 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_PRODUCT_NAME, "SBC-FITPC2"), }, }, @@ -11702,7 +12155,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne }; static int __init reboot_init(void) -@@ -273,12 +273,12 @@ core_initcall(reboot_init); +@@ -275,12 +275,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ @@ -11714,13 +12167,13 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne - 0x0000000000000000ULL, /* Null descriptor */ - 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ - 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */ -+ {{{0x00000000, 0x00000000}}}, /* Null descriptor */ -+ {{{0x0000ffff, 0x00009b00}}}, /* 16-bit real-mode 64k code at 0x00000000 */ -+ {{{0x0100ffff, 0x00009300}}} /* 16-bit real-mode 64k data at 0x00000100 */ ++ GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */ ++ GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */ ++ GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */ }; static const struct desc_ptr -@@ -327,7 +327,7 @@ static const unsigned char jump_to_bios +@@ -329,7 +329,7 @@ static const unsigned char jump_to_bios * specified by the code and length parameters. * We assume that length will aways be less that 100! */ @@ -11729,7 +12182,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne { local_irq_disable(); -@@ -347,8 +347,8 @@ void machine_real_restart(const unsigned +@@ -349,8 +349,8 @@ void machine_real_restart(const unsigned /* Remap the kernel at virtual address zero, as well as offset zero from the kernel segment. This assumes the kernel segment starts at virtual address PAGE_OFFSET. */ @@ -11740,7 +12193,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne /* * Use `swapper_pg_dir' as our page directory. -@@ -360,16 +360,15 @@ void machine_real_restart(const unsigned +@@ -362,16 +362,15 @@ void machine_real_restart(const unsigned boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -11760,10 +12213,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/reboot.c linux-2.6.31.7/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.31.7/arch/x86/kernel/setup.c linux-2.6.31.7/arch/x86/kernel/setup.c ---- linux-2.6.31.7/arch/x86/kernel/setup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/setup.c 2009-12-10 22:15:15.000000000 -0500 -@@ -768,14 +768,14 @@ void __init setup_arch(char **cmdline_p) +diff -urNp linux-2.6.32/arch/x86/kernel/setup.c linux-2.6.32/arch/x86/kernel/setup.c +--- linux-2.6.32/arch/x86/kernel/setup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/setup.c 2009-12-04 21:40:48.014634572 -0500 +@@ -762,14 +762,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY; @@ -11783,9 +12236,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/setup.c linux-2.6.31.7/arch/x86/kernel data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.31.7/arch/x86/kernel/setup_percpu.c linux-2.6.31.7/arch/x86/kernel/setup_percpu.c ---- linux-2.6.31.7/arch/x86/kernel/setup_percpu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/setup_percpu.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/setup_percpu.c linux-2.6.32/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32/arch/x86/kernel/setup_percpu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/setup_percpu.c 2009-12-04 21:40:48.014634572 -0500 @@ -25,19 +25,17 @@ # define DBG(x...) #endif @@ -11809,21 +12262,20 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/setup_percpu.c linux-2.6.31.7/arch/x86 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET, }; EXPORT_SYMBOL(__per_cpu_offset); -@@ -429,13 +427,15 @@ early_param("percpu_alloc", percpu_alloc +@@ -158,13 +156,15 @@ static void __init pcpup_populate_pte(un static inline void setup_percpu_segment(int cpu) { #ifdef CONFIG_X86_32 - struct desc_struct gdt; -- ++ struct desc_struct d, *gdt = get_cpu_gdt_table(cpu); ++ unsigned long base = per_cpu_offset(cpu); ++ const unsigned long limit = VMALLOC_END - base - 1; + - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, - 0x2 | DESCTYPE_S, 0x8); - gdt.s = 1; - write_gdt_entry(get_cpu_gdt_table(cpu), - GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); -+ struct desc_struct d, *gdt = get_cpu_gdt_table(cpu); -+ unsigned long base = per_cpu_offset(cpu); -+ const unsigned long limit = VMALLOC_END - base - 1; -+ + if (limit < 64*1024) + pack_descriptor(&d, base, limit, 0x80 | DESCTYPE_S | 0x3, 0x4); + else @@ -11832,7 +12284,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/setup_percpu.c linux-2.6.31.7/arch/x86 #endif } -@@ -486,6 +486,11 @@ void __init setup_per_cpu_areas(void) +@@ -212,6 +212,11 @@ void __init setup_per_cpu_areas(void) /* alrighty, percpu areas up and running */ delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start; for_each_possible_cpu(cpu) { @@ -11841,10 +12293,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/setup_percpu.c linux-2.6.31.7/arch/x86 + unsigned long canary = per_cpu(stack_canary, cpu); +#endif +#endif - per_cpu_offset(cpu) = delta + cpu * pcpu_unit_size; + per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu]; per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu); per_cpu(cpu_number, cpu) = cpu; -@@ -513,6 +518,12 @@ void __init setup_per_cpu_areas(void) +@@ -239,6 +244,12 @@ void __init setup_per_cpu_areas(void) early_per_cpu_map(x86_cpu_to_node_map, cpu); #endif #endif @@ -11857,9 +12309,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/setup_percpu.c linux-2.6.31.7/arch/x86 /* * Up to this point, the boot CPU has been using .data.init * area. Reload any changed state for the boot CPU. -diff -urNp linux-2.6.31.7/arch/x86/kernel/signal.c linux-2.6.31.7/arch/x86/kernel/signal.c ---- linux-2.6.31.7/arch/x86/kernel/signal.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/signal.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/signal.c linux-2.6.32/arch/x86/kernel/signal.c +--- linux-2.6.32/arch/x86/kernel/signal.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/signal.c 2009-12-04 21:40:48.015703426 -0500 @@ -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. @@ -11931,10 +12383,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/signal.c linux-2.6.31.7/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.31.7/arch/x86/kernel/smpboot.c linux-2.6.31.7/arch/x86/kernel/smpboot.c ---- linux-2.6.31.7/arch/x86/kernel/smpboot.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/smpboot.c 2009-12-10 22:15:15.000000000 -0500 -@@ -727,7 +727,11 @@ do_rest: +diff -urNp linux-2.6.32/arch/x86/kernel/smpboot.c linux-2.6.32/arch/x86/kernel/smpboot.c +--- linux-2.6.32/arch/x86/kernel/smpboot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/smpboot.c 2009-12-04 21:40:48.015703426 -0500 +@@ -729,7 +729,11 @@ do_rest: (unsigned long)task_stack_page(c_idle.idle) - KERNEL_STACK_OFFSET + THREAD_SIZE; #endif @@ -11946,15 +12398,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/smpboot.c linux-2.6.31.7/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start.sp = (void *) c_idle.idle->thread.sp; -diff -urNp linux-2.6.31.7/arch/x86/kernel/step.c linux-2.6.31.7/arch/x86/kernel/step.c ---- linux-2.6.31.7/arch/x86/kernel/step.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/step.c 2009-12-10 22:15:15.000000000 -0500 -@@ -23,22 +23,20 @@ unsigned long convert_ip_to_linear(struc - * and APM bios ones we just ignore here. - */ - if ((seg & SEGMENT_TI_MASK) == SEGMENT_LDT) { -- u32 *desc; -+ struct desc_struct *desc; +diff -urNp linux-2.6.32/arch/x86/kernel/step.c linux-2.6.32/arch/x86/kernel/step.c +--- linux-2.6.32/arch/x86/kernel/step.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/step.c 2009-12-04 21:40:48.016701511 -0500 +@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc + struct desc_struct *desc; unsigned long base; - seg &= ~7UL; @@ -11962,24 +12410,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/step.c linux-2.6.31.7/arch/x86/kernel/ mutex_lock(&child->mm->context.lock); - if (unlikely((seg >> 3) >= child->mm->context.size)) -- addr = -1L; /* bogus selector, access would fault */ + if (unlikely(seg >= child->mm->context.size)) -+ addr = -EINVAL; + addr = -1L; /* bogus selector, access would fault */ else { -- desc = child->mm->context.ldt + seg; -- base = ((desc[0] >> 16) | -- ((desc[1] & 0xff) << 16) | -- (desc[1] & 0xff000000)); -+ desc = &child->mm->context.ldt[seg]; -+ base = (desc->a >> 16) | ((desc->b & 0xff) << 16) | (desc->b & 0xff000000); - - /* 16-bit code segment? */ -- if (!((desc[1] >> 22) & 1)) -+ if (!((desc->b >> 22) & 1)) - addr &= 0xffff; - addr += base; - } -@@ -54,6 +52,9 @@ static int is_setting_trap_flag(struct t + desc = child->mm->context.ldt + seg; +@@ -53,6 +53,9 @@ static int is_setting_trap_flag(struct t unsigned char opcode[15]; unsigned long addr = convert_ip_to_linear(child, regs); @@ -11989,7 +12424,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/step.c linux-2.6.31.7/arch/x86/kernel/ copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0); for (i = 0; i < copied; i++) { switch (opcode[i]) { -@@ -75,7 +76,7 @@ static int is_setting_trap_flag(struct t +@@ -74,7 +77,7 @@ static int is_setting_trap_flag(struct t #ifdef CONFIG_X86_64 case 0x40 ... 0x4f: @@ -11998,9 +12433,17 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/step.c linux-2.6.31.7/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.31.7/arch/x86/kernel/sys_i386_32.c linux-2.6.31.7/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.31.7/arch/x86/kernel/sys_i386_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/sys_i386_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/syscall_table_32.S linux-2.6.32/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32/arch/x86/kernel/syscall_table_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/syscall_table_32.S 2009-12-04 21:40:48.017617166 -0500 +@@ -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/arch/x86/kernel/sys_i386_32.c linux-2.6.32/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32/arch/x86/kernel/sys_i386_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/sys_i386_32.c 2009-12-04 21:40:48.017617166 -0500 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -12247,9 +12690,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/sys_i386_32.c linux-2.6.31.7/arch/x86/ } case 1: /* iBCS2 emulator entry point */ if (!segment_eq(get_fs(), get_ds())) -diff -urNp linux-2.6.31.7/arch/x86/kernel/sys_x86_64.c linux-2.6.31.7/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.31.7/arch/x86/kernel/sys_x86_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/sys_x86_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/sys_x86_64.c linux-2.6.32/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32/arch/x86/kernel/sys_x86_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/sys_x86_64.c 2009-12-04 21:40:48.017617166 -0500 @@ -47,8 +47,8 @@ out: return error; } @@ -12331,32 +12774,33 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/sys_x86_64.c linux-2.6.31.7/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.31.7/arch/x86/kernel/syscall_table_32.S linux-2.6.31.7/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.31.7/arch/x86/kernel/syscall_table_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/syscall_table_32.S 2009-12-10 22:15:15.000000000 -0500 -@@ -1,3 +1,4 @@ -+.section .rodata,"a",@progbits - ENTRY(sys_call_table) - .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ - .long sys_exit -diff -urNp linux-2.6.31.7/arch/x86/kernel/time_32.c linux-2.6.31.7/arch/x86/kernel/time_32.c ---- linux-2.6.31.7/arch/x86/kernel/time_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/time_32.c 2009-12-10 22:15:15.000000000 -0500 -@@ -47,22 +47,32 @@ unsigned long profile_pc(struct pt_regs +diff -urNp linux-2.6.32/arch/x86/kernel/time.c linux-2.6.32/arch/x86/kernel/time.c +--- linux-2.6.32/arch/x86/kernel/time.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/time.c 2009-12-04 21:40:48.017617166 -0500 +@@ -26,17 +26,13 @@ + int timer_ack; + #endif + +-#ifdef CONFIG_X86_64 +-volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; +-#endif +- + unsigned long profile_pc(struct pt_regs *regs) + { unsigned long pc = instruction_pointer(regs); - #ifdef CONFIG_SMP - if (!user_mode_vm(regs) && in_lock_functions(pc)) { + if (!user_mode(regs) && in_lock_functions(pc)) { #ifdef CONFIG_FRAME_POINTER - return *(unsigned long *)(regs->bp + sizeof(long)); + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long))); #else - unsigned long *sp = (unsigned long *)®s->sp; - - /* Return address is either directly at stack pointer - or above a saved flags. Eflags has bits 22-31 zero, - kernel addresses don't. */ + unsigned long *sp = + (unsigned long *)kernel_stack_pointer(regs); +@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs + * or above a saved flags. Eflags has bits 22-31 zero, + * kernel addresses don't. + */ + +#ifdef CONFIG_PAX_KERNEXEC + return ktla_ktva(sp[0]); @@ -12369,38 +12813,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/time_32.c linux-2.6.31.7/arch/x86/kern + +#endif } - #endif -+ -+ if (!user_mode(regs)) -+ pc = ktla_ktva(pc); -+ return pc; } - EXPORT_SYMBOL(profile_pc); -diff -urNp linux-2.6.31.7/arch/x86/kernel/time_64.c linux-2.6.31.7/arch/x86/kernel/time_64.c ---- linux-2.6.31.7/arch/x86/kernel/time_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/time_64.c 2009-12-10 22:15:15.000000000 -0500 -@@ -25,8 +25,6 @@ - #include <asm/time.h> - #include <asm/timer.h> - --volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES; -- - unsigned long profile_pc(struct pt_regs *regs) - { - unsigned long pc = instruction_pointer(regs); -@@ -34,7 +32,7 @@ unsigned long profile_pc(struct pt_regs - /* Assume the lock function has either no stack frame or a copy - of flags from PUSHF - Eflags always has bits 22 and up cleared unlike kernel addresses. */ -- if (!user_mode_vm(regs) && in_lock_functions(pc)) { -+ if (!user_mode(regs) && in_lock_functions(pc)) { - #ifdef CONFIG_FRAME_POINTER - return *(unsigned long *)(regs->bp + sizeof(long)); - #else -diff -urNp linux-2.6.31.7/arch/x86/kernel/tls.c linux-2.6.31.7/arch/x86/kernel/tls.c ---- linux-2.6.31.7/arch/x86/kernel/tls.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/tls.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/tls.c linux-2.6.32/arch/x86/kernel/tls.c +--- linux-2.6.32/arch/x86/kernel/tls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/tls.c 2009-12-04 21:40:48.018705655 -0500 @@ -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; @@ -12413,10 +12830,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/tls.c linux-2.6.31.7/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.31.7/arch/x86/kernel/trampoline_32.S linux-2.6.31.7/arch/x86/kernel/trampoline_32.S ---- linux-2.6.31.7/arch/x86/kernel/trampoline_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/trampoline_32.S 2009-12-10 22:15:15.000000000 -0500 -@@ -31,6 +31,12 @@ +diff -urNp linux-2.6.32/arch/x86/kernel/trampoline_32.S linux-2.6.32/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32/arch/x86/kernel/trampoline_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/trampoline_32.S 2009-12-04 21:40:48.018705655 -0500 +@@ -32,6 +32,12 @@ #include <asm/segment.h> #include <asm/page_types.h> @@ -12427,9 +12844,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/trampoline_32.S linux-2.6.31.7/arch/x8 +#endif + /* We can free up trampoline after bootup if cpu hotplug is not supported. */ - #ifndef CONFIG_HOTPLUG_CPU - .section ".cpuinit.data","aw",@progbits -@@ -64,7 +70,7 @@ r_base = . + __CPUINITRODATA + .code16 +@@ -60,7 +66,7 @@ r_base = . inc %ax # protected mode (PE) bit lmsw %ax # into protected mode # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S @@ -12438,25 +12855,23 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/trampoline_32.S linux-2.6.31.7/arch/x8 # These need to be in the same 64K segment as the above; # hence we don't use the boot_gdt_descr defined in head.S -diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel/traps.c ---- linux-2.6.31.7/arch/x86/kernel/traps.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/traps.c 2009-12-10 22:15:15.000000000 -0500 -@@ -70,14 +70,6 @@ asmlinkage int system_call(void); +diff -urNp linux-2.6.32/arch/x86/kernel/traps.c linux-2.6.32/arch/x86/kernel/traps.c +--- linux-2.6.32/arch/x86/kernel/traps.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/traps.c 2009-12-04 21:40:48.018705655 -0500 +@@ -69,12 +69,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ char ignore_fpu_irq; - -/* - * The IDT has to be page-aligned to simplify the Pentium -- * F0 0F bug workaround.. We have a special link segment -- * for this. +- * F0 0F bug workaround. - */ --gate_desc idt_table[256] -- __attribute__((__section__(".data.idt"))) = { { { { 0, 0 } } }, }; +-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, }; #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); -@@ -115,7 +107,7 @@ static inline void preempt_conditional_c +@@ -112,7 +106,7 @@ static inline void preempt_conditional_c static inline void die_if_kernel(const char *str, struct pt_regs *regs, long err) { @@ -12465,7 +12880,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel die(str, regs, err); } #endif -@@ -127,7 +119,7 @@ do_trap(int trapnr, int signr, char *str +@@ -124,7 +118,7 @@ do_trap(int trapnr, int signr, char *str struct task_struct *tsk = current; #ifdef CONFIG_X86_32 @@ -12474,7 +12889,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel /* * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. -@@ -138,7 +130,7 @@ do_trap(int trapnr, int signr, char *str +@@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str } #endif @@ -12483,7 +12898,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel goto kernel_trap; #ifdef CONFIG_X86_32 -@@ -161,7 +153,7 @@ trap_signal: +@@ -158,7 +152,7 @@ trap_signal: printk_ratelimit()) { printk(KERN_INFO "%s[%d] trap %s ip:%lx sp:%lx error:%lx", @@ -12492,7 +12907,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); printk("\n"); -@@ -180,6 +172,12 @@ kernel_trap: +@@ -177,6 +171,12 @@ kernel_trap: tsk->thread.trap_no = trapnr; die(str, regs, error_code); } @@ -12505,7 +12920,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel return; #ifdef CONFIG_X86_32 -@@ -268,14 +266,30 @@ do_general_protection(struct pt_regs *re +@@ -265,14 +265,30 @@ do_general_protection(struct pt_regs *re conditional_sti(regs); #ifdef CONFIG_X86_32 @@ -12538,7 +12953,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; -@@ -308,6 +322,13 @@ gp_in_kernel: +@@ -305,6 +321,13 @@ gp_in_kernel: if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) return; @@ -12552,7 +12967,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel die("general protection fault", regs, error_code); } -@@ -561,7 +582,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -558,7 +581,7 @@ dotraplinkage void __kprobes do_debug(st } #ifdef CONFIG_X86_32 @@ -12561,7 +12976,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel goto debug_vm86; #endif -@@ -573,7 +594,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -570,7 +593,7 @@ dotraplinkage void __kprobes do_debug(st * kernel space (but re-enable TF when returning to user mode). */ if (condition & DR_STEP) { @@ -12570,7 +12985,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel goto clear_TF_reenable; } -@@ -760,7 +781,7 @@ do_simd_coprocessor_error(struct pt_regs +@@ -757,7 +780,7 @@ do_simd_coprocessor_error(struct pt_regs * Handle strange cache flush from user space exception * in all other cases. This is undocumented behaviour. */ @@ -12579,33 +12994,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/traps.c linux-2.6.31.7/arch/x86/kernel handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -@@ -789,19 +810,14 @@ do_spurious_interrupt_bug(struct pt_regs - #ifdef CONFIG_X86_32 - unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp) - { -- struct desc_struct *gdt = get_cpu_gdt_table(smp_processor_id()); - unsigned long base = (kesp - uesp) & -THREAD_SIZE; - unsigned long new_kesp = kesp - base; - unsigned long lim_pages = (new_kesp | (THREAD_SIZE - 1)) >> PAGE_SHIFT; -- __u64 desc = *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS]; -+ struct desc_struct ss; - - /* Set up base for espfix segment */ -- desc &= 0x00f0ff0000000000ULL; -- desc |= ((((__u64)base) << 16) & 0x000000ffffff0000ULL) | -- ((((__u64)base) << 32) & 0xff00000000000000ULL) | -- ((((__u64)lim_pages) << 32) & 0x000f000000000000ULL) | -- (lim_pages & 0xffff); -- *(__u64 *)&gdt[GDT_ENTRY_ESPFIX_SS] = desc; -+ pack_descriptor(&ss, base, lim_pages, 0x93, 0xC); -+ write_gdt_entry(get_cpu_gdt_table(smp_processor_id()), GDT_ENTRY_ESPFIX_SS, &ss, DESCTYPE_S); - - return new_kesp; - } -diff -urNp linux-2.6.31.7/arch/x86/kernel/tsc.c linux-2.6.31.7/arch/x86/kernel/tsc.c ---- linux-2.6.31.7/arch/x86/kernel/tsc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/tsc.c 2009-12-10 22:15:15.000000000 -0500 -@@ -790,7 +790,7 @@ static struct dmi_system_id __initdata b +diff -urNp linux-2.6.32/arch/x86/kernel/tsc.c linux-2.6.32/arch/x86/kernel/tsc.c +--- linux-2.6.32/arch/x86/kernel/tsc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/tsc.c 2009-12-04 21:40:48.019705037 -0500 +@@ -794,7 +794,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, }, @@ -12614,9 +13006,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/tsc.c linux-2.6.31.7/arch/x86/kernel/t }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.31.7/arch/x86/kernel/vm86_32.c linux-2.6.31.7/arch/x86/kernel/vm86_32.c ---- linux-2.6.31.7/arch/x86/kernel/vm86_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/vm86_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/vm86_32.c linux-2.6.32/arch/x86/kernel/vm86_32.c +--- linux-2.6.32/arch/x86/kernel/vm86_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/vm86_32.c 2009-12-04 21:40:48.031491852 -0500 @@ -41,6 +41,7 @@ #include <linux/ptrace.h> #include <linux/audit.h> @@ -12681,9 +13073,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vm86_32.c linux-2.6.31.7/arch/x86/kern if (get_user(segoffs, intr_ptr)) goto cannot_handle; if ((segoffs >> 16) == BIOSSEG) -diff -urNp linux-2.6.31.7/arch/x86/kernel/vmi_32.c linux-2.6.31.7/arch/x86/kernel/vmi_32.c ---- linux-2.6.31.7/arch/x86/kernel/vmi_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/vmi_32.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/vmi_32.c linux-2.6.32/arch/x86/kernel/vmi_32.c +--- linux-2.6.32/arch/x86/kernel/vmi_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/vmi_32.c 2009-12-04 21:40:48.031491852 -0500 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); @@ -12843,9 +13235,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmi_32.c linux-2.6.31.7/arch/x86/kerne return; local_irq_save(flags); -diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S ---- linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/vmlinux.lds.S linux-2.6.32/arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32/arch/x86/kernel/vmlinux.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/vmlinux.lds.S 2009-12-04 21:40:48.032713929 -0500 @@ -26,6 +26,22 @@ #include <asm/page_types.h> #include <asm/cache.h> @@ -12869,7 +13261,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ #undef i386 /* in case the preprocessor is a 32bit one */ -@@ -34,46 +50,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF +@@ -34,40 +50,49 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF #ifdef CONFIG_X86_32 OUTPUT_ARCH(i386) ENTRY(phys_startup_32) @@ -12889,13 +13281,11 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ + module PT_LOAD FLAGS(5); /* R_E */ + data PT_LOAD FLAGS(6); /* RW_ */ #ifdef CONFIG_X86_64 -- user PT_LOAD FLAGS(7); /* RWE */ -+ user PT_LOAD FLAGS(5); /* R_E */ + user PT_LOAD FLAGS(5); /* R_E */ +#endif + init.begin PT_LOAD FLAGS(6); /* RW_ */ #ifdef CONFIG_SMP -- percpu PT_LOAD FLAGS(7); /* RWE */ -+ percpu PT_LOAD FLAGS(6); /* RW_ */ + percpu PT_LOAD FLAGS(6); /* RW_ */ #endif + text.init PT_LOAD FLAGS(5); /* R_E */ + text.exit PT_LOAD FLAGS(5); /* R_E */ @@ -12917,28 +13307,21 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ #endif /* Text and read-only data */ - -- /* bootstrapping code */ -- .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) { +- .text : AT(ADDR(.text) - LOAD_OFFSET) { +- _text = .; + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { -+ /* bootstrapping code */ + /* bootstrapping code */ +#ifdef CONFIG_X86_32 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; +#else + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; +#endif + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; - _text = .; - *(.text.head) -- } :text = 0x9090 - -- /* The rest of the text */ -- .text : AT(ADDR(.text) - LOAD_OFFSET) { -+ /* The rest of the text */ ++ _text = .; + HEAD_TEXT #ifdef CONFIG_X86_32 - /* not really needed, already page aligned */ . = ALIGN(PAGE_SIZE); -@@ -88,11 +111,12 @@ SECTIONS +@@ -82,28 +107,64 @@ SECTIONS IRQENTRY_TEXT *(.fixup) *(.gnu.warning) @@ -12952,14 +13335,8 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ + . = ALIGN(PAGE_SIZE); + NOTES :rodata :note - /* Exception table */ - . = ALIGN(16); -@@ -100,22 +124,57 @@ SECTIONS - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; -- } :text = 0x9090 -+ } :rodata +- EXCEPTION_TABLE(16) :text = 0x9090 ++ EXCEPTION_TABLE(16) :rodata RO_DATA(PAGE_SIZE) @@ -13015,8 +13392,8 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ -#endif PAGE_ALIGNED_DATA(PAGE_SIZE) - *(.data.idt) -@@ -182,12 +241,6 @@ SECTIONS + +@@ -166,12 +227,6 @@ SECTIONS } vgetcpu_mode = VVIRT(.vgetcpu_mode); @@ -13029,7 +13406,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { *(.vsyscall_3) } -@@ -205,12 +258,19 @@ SECTIONS +@@ -187,12 +242,19 @@ SECTIONS #endif /* CONFIG_X86_64 */ /* Init code and data - will be freed after init */ @@ -13052,22 +13429,23 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ /* * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the * output PHDR, so the next output section - .init.text - should -@@ -219,18 +279,26 @@ SECTIONS +@@ -201,12 +263,25 @@ SECTIONS PERCPU_VADDR(0, :percpu) #endif -- .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { -+ init_begin = .; -+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) { - _sinittext = .; - INIT_TEXT - _einittext = .; -- } +- INIT_TEXT_SECTION(PAGE_SIZE) -#ifdef CONFIG_X86_64 - :init -#endif ++ . = ALIGN(PAGE_SIZE); ++ init_begin = .; ++ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) { ++ VMLINUX_SYMBOL(_sinittext) = .; ++ INIT_TEXT ++ VMLINUX_SYMBOL(_einittext) = .; + } :text.init -+ + +- INIT_DATA_SECTION(16) + /* + * .exit.text is discard at runtime, not link time, to deal with + * references from .altinstructions and .eh_frame @@ -13077,15 +13455,12 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ + . = ALIGN(16); + } :text.exit + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text); ++ ++ INIT_DATA_SECTION(16) :init - .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { - INIT_DATA -- } -+ } :init - - . = ALIGN(16); - .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { -@@ -276,14 +344,6 @@ SECTIONS + .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { + __x86_cpu_dev_start = .; +@@ -232,19 +307,11 @@ SECTIONS *(.altinstr_replacement) } @@ -13100,16 +13475,13 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA } -@@ -297,7 +357,7 @@ SECTIONS - } - #endif -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP) +#ifndef CONFIG_SMP PERCPU(PAGE_SIZE) #endif -@@ -320,12 +380,6 @@ SECTIONS +@@ -267,12 +334,6 @@ SECTIONS . = ALIGN(PAGE_SIZE); } @@ -13122,7 +13494,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ /* BSS */ . = ALIGN(PAGE_SIZE); .bss : AT(ADDR(.bss) - LOAD_OFFSET) { -@@ -341,6 +395,7 @@ SECTIONS +@@ -288,6 +349,7 @@ SECTIONS __brk_base = .; . += 64 * 1024; /* 64k alignment slop space */ *(.brk_reservation) /* areas brk users have reserved */ @@ -13130,7 +13502,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ __brk_limit = .; } -@@ -369,13 +424,12 @@ SECTIONS +@@ -316,13 +378,12 @@ SECTIONS * for the boot processor. */ #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load @@ -13145,9 +13517,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vmlinux.lds.S linux-2.6.31.7/arch/x86/ "kernel image bigger than KERNEL_IMAGE_SIZE"); #ifdef CONFIG_SMP -diff -urNp linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/vsyscall_64.c linux-2.6.32/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32/arch/x86/kernel/vsyscall_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/vsyscall_64.c 2009-12-04 21:40:48.032713929 -0500 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -13156,7 +13528,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c linux-2.6.31.7/arch/x86/ vsyscall_gtod_data.clock.vread = clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; vsyscall_gtod_data.clock.mask = clock->mask; -@@ -201,7 +202,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s +@@ -202,7 +203,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s We do this here because otherwise user space would do it on its own in a likely inferior way (no access to jiffies). If you don't like it pass NULL. */ @@ -13165,10 +13537,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c linux-2.6.31.7/arch/x86/ p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -@@ -240,13 +241,13 @@ static ctl_table kernel_table2[] = { +@@ -233,13 +234,13 @@ static ctl_table kernel_table2[] = { .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = vsyscall_sysctl_change }, + .proc_handler = proc_dointvec }, - {} + { 0, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL } }; @@ -13181,9 +13553,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/vsyscall_64.c linux-2.6.31.7/arch/x86/ }; #endif -diff -urNp linux-2.6.31.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.31.7/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.31.7/arch/x86/kernel/x8664_ksyms_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/x8664_ksyms_64.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32/arch/x86/kernel/x8664_ksyms_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/x8664_ksyms_64.c 2009-12-04 21:40:48.032713929 -0500 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -13193,9 +13565,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.31.7/arch/x EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.31.7/arch/x86/kernel/xsave.c linux-2.6.31.7/arch/x86/kernel/xsave.c ---- linux-2.6.31.7/arch/x86/kernel/xsave.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kernel/xsave.c 2009-12-10 22:15:15.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/kernel/xsave.c linux-2.6.32/arch/x86/kernel/xsave.c +--- linux-2.6.32/arch/x86/kernel/xsave.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kernel/xsave.c 2009-12-04 21:40:48.033713734 -0500 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ fx_sw_user->xstate_size > fx_sw_user->extended_size) return -1; @@ -13223,10 +13595,38 @@ diff -urNp linux-2.6.31.7/arch/x86/kernel/xsave.c linux-2.6.31.7/arch/x86/kernel buf); if (unlikely(err)) { /* -diff -urNp linux-2.6.31.7/arch/x86/kvm/svm.c linux-2.6.31.7/arch/x86/kvm/svm.c ---- linux-2.6.31.7/arch/x86/kvm/svm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kvm/svm.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2300,9 +2300,12 @@ static int handle_exit(struct kvm_run *k +diff -urNp linux-2.6.32/arch/x86/kvm/emulate.c linux-2.6.32/arch/x86/kvm/emulate.c +--- linux-2.6.32/arch/x86/kvm/emulate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kvm/emulate.c 2009-12-04 21:40:48.033713734 -0500 +@@ -389,6 +389,7 @@ static u32 group2_table[] = { + + #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ + do { \ ++ unsigned long _tmp; \ + __asm__ __volatile__ ( \ + _PRE_EFLAGS("0", "4", "2") \ + _op _suffix " %"_x"3,%1; " \ +@@ -402,8 +403,6 @@ static u32 group2_table[] = { + /* Raw emulation: instruction has two explicit operands. */ + #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ + do { \ +- unsigned long _tmp; \ +- \ + switch ((_dst).bytes) { \ + case 2: \ + ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ +@@ -419,7 +418,6 @@ static u32 group2_table[] = { + + #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ + do { \ +- unsigned long _tmp; \ + switch ((_dst).bytes) { \ + case 1: \ + ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ +diff -urNp linux-2.6.32/arch/x86/kvm/svm.c linux-2.6.32/arch/x86/kvm/svm.c +--- linux-2.6.32/arch/x86/kvm/svm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kvm/svm.c 2009-12-04 21:40:48.034706478 -0500 +@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k static void reload_tss(struct kvm_vcpu *vcpu) { int cpu = raw_smp_processor_id(); @@ -13240,8 +13640,8 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/svm.c linux-2.6.31.7/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -2686,7 +2689,7 @@ static u64 svm_get_mt_mask(struct kvm_vc - return 0; +@@ -2839,7 +2842,7 @@ static bool svm_gb_page_enable(void) + return true; } -static struct kvm_x86_ops svm_x86_ops = { @@ -13249,10 +13649,10 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/svm.c linux-2.6.31.7/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c ---- linux-2.6.31.7/arch/x86/kvm/vmx.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kvm/vmx.c 2009-12-10 22:15:16.000000000 -0500 -@@ -521,7 +521,11 @@ static void reload_tss(void) +diff -urNp linux-2.6.32/arch/x86/kvm/vmx.c linux-2.6.32/arch/x86/kvm/vmx.c +--- linux-2.6.32/arch/x86/kvm/vmx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kvm/vmx.c 2009-12-04 21:40:48.035647920 -0500 +@@ -566,7 +566,11 @@ static void reload_tss(void) kvm_get_gdt(&gdt); descs = (void *)gdt.base; @@ -13264,7 +13664,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c load_TR_desc(); } -@@ -1336,8 +1340,11 @@ static __init int hardware_setup(void) +@@ -1388,8 +1392,11 @@ static __init int hardware_setup(void) if (!cpu_has_vmx_flexpriority()) flexpriority_enabled = 0; @@ -13276,9 +13676,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c + pax_close_kernel(); + } - return alloc_kvm_area(); - } -@@ -2239,7 +2246,7 @@ static int vmx_vcpu_setup(struct vcpu_vm + if (enable_ept && !cpu_has_vmx_ept_2m_page()) + kvm_disable_largepages(); +@@ -2339,7 +2346,7 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); @@ -13287,7 +13687,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); -@@ -3493,6 +3500,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3682,6 +3689,12 @@ static void vmx_vcpu_run(struct kvm_vcpu "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " @@ -13300,7 +13700,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -3539,6 +3552,11 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3728,6 +3741,11 @@ static void vmx_vcpu_run(struct kvm_vcpu [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) @@ -13312,7 +13712,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c : "cc", "memory" , R"bx", R"di", R"si" #ifdef CONFIG_X86_64 -@@ -3555,7 +3573,7 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3746,7 +3764,7 @@ static void vmx_vcpu_run(struct kvm_vcpu if (vmx->rmode.irq.pending) fixup_rmode_irq(vmx); @@ -13321,8 +13721,8 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c vmx->launched = 1; vmx_complete_interrupts(vmx); -@@ -3698,7 +3716,7 @@ static u64 vmx_get_mt_mask(struct kvm_vc - return ret; +@@ -3921,7 +3939,7 @@ static bool vmx_gb_page_enable(void) + return false; } -static struct kvm_x86_ops vmx_x86_ops = { @@ -13330,17 +13730,20 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/vmx.c linux-2.6.31.7/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.31.7/arch/x86/kvm/x86.c linux-2.6.31.7/arch/x86/kvm/x86.c ---- linux-2.6.31.7/arch/x86/kvm/x86.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kvm/x86.c 2009-12-10 22:15:16.000000000 -0500 -@@ -73,42 +73,42 @@ static int kvm_dev_ioctl_get_supported_c - struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, - u32 function, u32 index); +diff -urNp linux-2.6.32/arch/x86/kvm/x86.c linux-2.6.32/arch/x86/kvm/x86.c +--- linux-2.6.32/arch/x86/kvm/x86.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/kvm/x86.c 2009-12-04 21:40:48.037626803 -0500 +@@ -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); -struct kvm_x86_ops *kvm_x86_ops; +const struct kvm_x86_ops *kvm_x86_ops; EXPORT_SYMBOL_GPL(kvm_x86_ops); + int ignore_msrs = 0; + module_param_named(ignore_msrs, ignore_msrs, bool, S_IRUGO | S_IWUSR); + struct kvm_stats_debugfs_item debugfs_entries[] = { - { "pf_fixed", VCPU_STAT(pf_fixed) }, - { "pf_guest", VCPU_STAT(pf_guest) }, @@ -13409,7 +13812,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/x86.c linux-2.6.31.7/arch/x86/kvm/x86.c { NULL } }; -@@ -1492,7 +1492,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1654,7 +1654,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -13418,7 +13821,7 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/x86.c linux-2.6.31.7/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -2817,10 +2817,10 @@ static struct notifier_block kvmclock_cp +@@ -3127,10 +3127,10 @@ static struct notifier_block kvmclock_cp .notifier_call = kvmclock_cpufreq_notifier }; @@ -13431,37 +13834,9 @@ diff -urNp linux-2.6.31.7/arch/x86/kvm/x86.c linux-2.6.31.7/arch/x86/kvm/x86.c if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.31.7/arch/x86/kvm/x86_emulate.c linux-2.6.31.7/arch/x86/kvm/x86_emulate.c ---- linux-2.6.31.7/arch/x86/kvm/x86_emulate.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/kvm/x86_emulate.c 2009-12-10 22:15:16.000000000 -0500 -@@ -382,6 +382,7 @@ static u32 group2_table[] = { - - #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ - do { \ -+ unsigned long _tmp; \ - __asm__ __volatile__ ( \ - _PRE_EFLAGS("0", "4", "2") \ - _op _suffix " %"_x"3,%1; " \ -@@ -395,8 +396,6 @@ static u32 group2_table[] = { - /* Raw emulation: instruction has two explicit operands. */ - #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ - do { \ -- unsigned long _tmp; \ -- \ - switch ((_dst).bytes) { \ - case 2: \ - ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ -@@ -412,7 +411,6 @@ static u32 group2_table[] = { - - #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ - do { \ -- unsigned long _tmp; \ - switch ((_dst).bytes) { \ - case 1: \ - ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ -diff -urNp linux-2.6.31.7/arch/x86/lib/checksum_32.S linux-2.6.31.7/arch/x86/lib/checksum_32.S ---- linux-2.6.31.7/arch/x86/lib/checksum_32.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/checksum_32.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/checksum_32.S linux-2.6.32/arch/x86/lib/checksum_32.S +--- linux-2.6.32/arch/x86/lib/checksum_32.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/checksum_32.S 2009-12-04 21:40:48.037626803 -0500 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -13707,9 +14082,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/checksum_32.S linux-2.6.31.7/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.31.7/arch/x86/lib/clear_page_64.S linux-2.6.31.7/arch/x86/lib/clear_page_64.S ---- linux-2.6.31.7/arch/x86/lib/clear_page_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/clear_page_64.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/clear_page_64.S linux-2.6.32/arch/x86/lib/clear_page_64.S +--- linux-2.6.32/arch/x86/lib/clear_page_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/clear_page_64.S 2009-12-04 21:40:48.038668995 -0500 @@ -43,7 +43,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -13719,9 +14094,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/clear_page_64.S linux-2.6.31.7/arch/x86/l 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.7/arch/x86/lib/copy_page_64.S linux-2.6.31.7/arch/x86/lib/copy_page_64.S ---- linux-2.6.31.7/arch/x86/lib/copy_page_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/copy_page_64.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/copy_page_64.S linux-2.6.32/arch/x86/lib/copy_page_64.S +--- linux-2.6.32/arch/x86/lib/copy_page_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/copy_page_64.S 2009-12-04 21:40:48.038668995 -0500 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -13731,9 +14106,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/copy_page_64.S linux-2.6.31.7/arch/x86/li 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.7/arch/x86/lib/copy_user_64.S linux-2.6.31.7/arch/x86/lib/copy_user_64.S ---- linux-2.6.31.7/arch/x86/lib/copy_user_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/copy_user_64.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/copy_user_64.S linux-2.6.32/arch/x86/lib/copy_user_64.S +--- linux-2.6.32/arch/x86/lib/copy_user_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/copy_user_64.S 2009-12-04 21:40:48.038668995 -0500 @@ -21,7 +21,7 @@ .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ @@ -13785,9 +14160,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/copy_user_64.S linux-2.6.31.7/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.31.7/arch/x86/lib/getuser.S linux-2.6.31.7/arch/x86/lib/getuser.S ---- linux-2.6.31.7/arch/x86/lib/getuser.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/getuser.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/getuser.S linux-2.6.32/arch/x86/lib/getuser.S +--- linux-2.6.32/arch/x86/lib/getuser.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/getuser.S 2009-12-04 21:40:48.038668995 -0500 @@ -33,6 +33,7 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -13869,9 +14244,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/getuser.S linux-2.6.31.7/arch/x86/lib/get xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.31.7/arch/x86/lib/memcpy_64.S linux-2.6.31.7/arch/x86/lib/memcpy_64.S ---- linux-2.6.31.7/arch/x86/lib/memcpy_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/memcpy_64.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/memcpy_64.S linux-2.6.32/arch/x86/lib/memcpy_64.S +--- linux-2.6.32/arch/x86/lib/memcpy_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/memcpy_64.S 2009-12-04 21:40:48.039719113 -0500 @@ -128,7 +128,7 @@ ENDPROC(__memcpy) * It is also a lot simpler. Use this when possible: */ @@ -13881,9 +14256,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/memcpy_64.S linux-2.6.31.7/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.7/arch/x86/lib/memset_64.S linux-2.6.31.7/arch/x86/lib/memset_64.S ---- linux-2.6.31.7/arch/x86/lib/memset_64.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/memset_64.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/memset_64.S linux-2.6.32/arch/x86/lib/memset_64.S +--- linux-2.6.32/arch/x86/lib/memset_64.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/memset_64.S 2009-12-04 21:40:48.039719113 -0500 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -13893,9 +14268,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/memset_64.S linux-2.6.31.7/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.31.7/arch/x86/lib/mmx_32.c linux-2.6.31.7/arch/x86/lib/mmx_32.c ---- linux-2.6.31.7/arch/x86/lib/mmx_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/mmx_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/mmx_32.c linux-2.6.32/arch/x86/lib/mmx_32.c +--- linux-2.6.32/arch/x86/lib/mmx_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/mmx_32.c 2009-12-04 21:40:48.039719113 -0500 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -14211,9 +14586,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/mmx_32.c linux-2.6.31.7/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.31.7/arch/x86/lib/putuser.S linux-2.6.31.7/arch/x86/lib/putuser.S ---- linux-2.6.31.7/arch/x86/lib/putuser.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/putuser.S 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/putuser.S linux-2.6.32/arch/x86/lib/putuser.S +--- linux-2.6.32/arch/x86/lib/putuser.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/putuser.S 2009-12-04 21:40:48.040710703 -0500 @@ -15,6 +15,7 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -14317,9 +14692,9 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/putuser.S linux-2.6.31.7/arch/x86/lib/put movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.31.7/arch/x86/lib/usercopy_32.c linux-2.6.31.7/arch/x86/lib/usercopy_32.c ---- linux-2.6.31.7/arch/x86/lib/usercopy_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/lib/usercopy_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/lib/usercopy_32.c linux-2.6.32/arch/x86/lib/usercopy_32.c +--- linux-2.6.32/arch/x86/lib/usercopy_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/lib/usercopy_32.c 2009-12-04 21:40:48.042056637 -0500 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -15288,9 +15663,25 @@ diff -urNp linux-2.6.31.7/arch/x86/lib/usercopy_32.c linux-2.6.31.7/arch/x86/lib +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.31.7/arch/x86/mm/extable.c linux-2.6.31.7/arch/x86/mm/extable.c ---- linux-2.6.31.7/arch/x86/mm/extable.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/extable.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/Makefile linux-2.6.32/arch/x86/Makefile +--- linux-2.6.32/arch/x86/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/Makefile 2009-12-04 21:40:47.941633247 -0500 +@@ -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/arch/x86/mm/extable.c linux-2.6.32/arch/x86/mm/extable.c +--- linux-2.6.32/arch/x86/mm/extable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/extable.c 2009-12-04 21:40:48.042639313 -0500 @@ -1,14 +1,71 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -15364,13 +15755,13 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/extable.c linux-2.6.31.7/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c ---- linux-2.6.31.7/arch/x86/mm/fault.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/fault.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/fault.c linux-2.6.32/arch/x86/mm/fault.c +--- linux-2.6.32/arch/x86/mm/fault.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/fault.c 2009-12-05 12:32:41.213036332 -0500 @@ -11,10 +11,14 @@ #include <linux/kprobes.h> /* __kprobes, ... */ #include <linux/mmiotrace.h> /* kmmio_handler, ... */ - #include <linux/perf_counter.h> /* perf_swcounter_event */ + #include <linux/perf_event.h> /* perf_sw_event */ +#include <linux/unistd.h> +#include <linux/compiler.h> @@ -15391,7 +15782,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, 14)) ret = 1; -@@ -171,6 +175,30 @@ force_sig_info_fault(int si_signo, int s +@@ -172,6 +176,30 @@ force_sig_info_fault(int si_signo, int s force_sig_info(si_signo, &info, tsk); } @@ -15422,7 +15813,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c DEFINE_SPINLOCK(pgd_lock); LIST_HEAD(pgd_list); -@@ -543,7 +571,7 @@ static int is_errata93(struct pt_regs *r +@@ -535,7 +563,7 @@ static int is_errata93(struct pt_regs *r static int is_errata100(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_64 @@ -15431,7 +15822,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c return 1; #endif return 0; -@@ -570,7 +598,7 @@ static int is_f00f_bug(struct pt_regs *r +@@ -562,7 +590,7 @@ static int is_f00f_bug(struct pt_regs *r } static const char nx_warning[] = KERN_CRIT @@ -15440,7 +15831,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c static void show_fault_oops(struct pt_regs *regs, unsigned long error_code, -@@ -579,15 +607,27 @@ show_fault_oops(struct pt_regs *regs, un +@@ -571,15 +599,26 @@ show_fault_oops(struct pt_regs *regs, un if (!oops_may_print()) return; @@ -15456,11 +15847,10 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c } +#ifdef CONFIG_PAX_KERNEXEC -+ if (init_mm.start_code <= address && address < init_mm.end_code) -+ { ++ if (init_mm.start_code <= address && address < init_mm.end_code) { + if (current->signal->curr_ip) -+ printk(KERN_ERR "PAX: From %u.%u.%u.%u: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", -+ NIPQUAD(current->signal->curr_ip), current->comm, task_pid_nr(current), current_uid(), current_euid()); ++ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", ++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid()); + else + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", + current->comm, task_pid_nr(current), current_uid(), current_euid()); @@ -15470,7 +15860,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c printk(KERN_ALERT "BUG: unable to handle kernel "); if (address < PAGE_SIZE) printk(KERN_CONT "NULL pointer dereference"); -@@ -712,6 +752,68 @@ __bad_area_nosemaphore(struct pt_regs *r +@@ -704,6 +743,68 @@ __bad_area_nosemaphore(struct pt_regs *r unsigned long address, int si_code) { struct task_struct *tsk = current; @@ -15539,7 +15929,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c /* User mode accesses just cause a SIGSEGV */ if (error_code & PF_USER) { -@@ -846,6 +948,106 @@ static int spurious_fault_check(unsigned +@@ -848,6 +949,106 @@ static int spurious_fault_check(unsigned return 1; } @@ -15646,7 +16036,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c /* * Handle a spurious fault caused by a stale TLB entry. * -@@ -912,6 +1114,9 @@ int show_unhandled_signals = 1; +@@ -914,6 +1115,9 @@ int show_unhandled_signals = 1; static inline int access_error(unsigned long error_code, int write, struct vm_area_struct *vma) { @@ -15656,7 +16046,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c if (write) { /* write, present and write, not present: */ if (unlikely(!(vma->vm_flags & VM_WRITE))) -@@ -945,17 +1150,16 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -947,17 +1151,16 @@ do_page_fault(struct pt_regs *regs, unsi { struct vm_area_struct *vma; struct task_struct *tsk; @@ -15677,7 +16067,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c /* * Detect and handle instructions that would cause a page fault for * both a tracked kernel page and a userspace page. -@@ -1015,7 +1219,7 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1017,7 +1220,7 @@ do_page_fault(struct pt_regs *regs, unsi * User-mode registers count as a user access even for any * potential system fault or CPU buglet: */ @@ -15686,7 +16076,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c local_irq_enable(); error_code |= PF_USER; } else { -@@ -1069,6 +1273,11 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1071,6 +1274,11 @@ do_page_fault(struct pt_regs *regs, unsi might_sleep(); } @@ -15698,7 +16088,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c vma = find_vma(mm, address); if (unlikely(!vma)) { bad_area(regs, error_code, address); -@@ -1080,18 +1289,24 @@ do_page_fault(struct pt_regs *regs, unsi +@@ -1082,18 +1290,24 @@ do_page_fault(struct pt_regs *regs, unsi bad_area(regs, error_code, address); return; } @@ -15734,7 +16124,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c if (unlikely(expand_stack(vma, address))) { bad_area(regs, error_code, address); return; -@@ -1135,3 +1350,174 @@ good_area: +@@ -1137,3 +1351,174 @@ good_area: up_read(&mm->mmap_sem); } @@ -15909,9 +16299,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/fault.c linux-2.6.31.7/arch/x86/mm/fault.c + printk("\n"); +} +#endif -diff -urNp linux-2.6.31.7/arch/x86/mm/gup.c linux-2.6.31.7/arch/x86/mm/gup.c ---- linux-2.6.31.7/arch/x86/mm/gup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/gup.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/gup.c linux-2.6.32/arch/x86/mm/gup.c +--- linux-2.6.32/arch/x86/mm/gup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/gup.c 2009-12-04 21:40:48.043709729 -0500 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long addr = start; len = (unsigned long) nr_pages << PAGE_SHIFT; @@ -15921,9 +16311,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/gup.c linux-2.6.31.7/arch/x86/mm/gup.c (void __user *)start, len))) return 0; -diff -urNp linux-2.6.31.7/arch/x86/mm/highmem_32.c linux-2.6.31.7/arch/x86/mm/highmem_32.c ---- linux-2.6.31.7/arch/x86/mm/highmem_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/highmem_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/highmem_32.c linux-2.6.32/arch/x86/mm/highmem_32.c +--- linux-2.6.32/arch/x86/mm/highmem_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/highmem_32.c 2009-12-04 21:40:48.043709729 -0500 @@ -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); @@ -15935,9 +16325,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/highmem_32.c linux-2.6.31.7/arch/x86/mm/hi return (void *)vaddr; } -diff -urNp linux-2.6.31.7/arch/x86/mm/hugetlbpage.c linux-2.6.31.7/arch/x86/mm/hugetlbpage.c ---- linux-2.6.31.7/arch/x86/mm/hugetlbpage.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/hugetlbpage.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/hugetlbpage.c linux-2.6.32/arch/x86/mm/hugetlbpage.c +--- linux-2.6.32/arch/x86/mm/hugetlbpage.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/hugetlbpage.c 2009-12-04 21:40:48.043709729 -0500 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -16072,176 +16462,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/hugetlbpage.c linux-2.6.31.7/arch/x86/mm/h (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.31.7/arch/x86/mm/init.c linux-2.6.31.7/arch/x86/mm/init.c ---- linux-2.6.31.7/arch/x86/mm/init.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/init.c 2009-12-10 22:15:16.000000000 -0500 -@@ -28,11 +28,10 @@ int direct_gbpages - #endif - ; - -+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) - int nx_enabled; - --#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) --static int disable_nx __cpuinitdata; -- -+#ifndef CONFIG_PAX_PAGEEXEC - /* - * noexec = on|off - * -@@ -46,32 +45,26 @@ static int __init noexec_setup(char *str - if (!str) - return -EINVAL; - if (!strncmp(str, "on", 2)) { -- __supported_pte_mask |= _PAGE_NX; -- disable_nx = 0; -+ nx_enabled = 1; - } else if (!strncmp(str, "off", 3)) { -- disable_nx = 1; -- __supported_pte_mask &= ~_PAGE_NX; -+ nx_enabled = 0; - } - return 0; - } - early_param("noexec", noexec_setup); - #endif -+#endif - - #ifdef CONFIG_X86_PAE - static void __init set_nx(void) - { -- unsigned int v[4], l, h; -- -- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) { -- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]); -+ if (!nx_enabled && cpu_has_nx) { -+ unsigned l, h; - -- if ((v[3] & (1 << 20)) && !disable_nx) { -- rdmsr(MSR_EFER, l, h); -- l |= EFER_NX; -- wrmsr(MSR_EFER, l, h); -- nx_enabled = 1; -- __supported_pte_mask |= _PAGE_NX; -- } -+ __supported_pte_mask &= ~_PAGE_NX; -+ rdmsr(MSR_EFER, l, h); -+ l &= ~EFER_NX; -+ wrmsr(MSR_EFER, l, h); - } - } - #else -@@ -86,7 +79,7 @@ void __cpuinit check_efer(void) - unsigned long efer; - - rdmsrl(MSR_EFER, efer); -- if (!(efer & EFER_NX) || disable_nx) -+ if (!(efer & EFER_NX) || !nx_enabled) - __supported_pte_mask &= ~_PAGE_NX; - } - #endif -@@ -394,7 +387,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; -@@ -442,6 +441,83 @@ void free_init_pages(char *what, unsigne - - void free_initmem(void) - { -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pgd_t *pgd; -+ pud_t *pud; -+ pmd_t *pmd; -+ -+#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 -+ 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 ((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 ((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.31.7/arch/x86/mm/init_32.c linux-2.6.31.7/arch/x86/mm/init_32.c ---- linux-2.6.31.7/arch/x86/mm/init_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/init_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/init_32.c linux-2.6.32/arch/x86/mm/init_32.c +--- linux-2.6.32/arch/x86/mm/init_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/init_32.c 2009-12-04 21:40:48.044667789 -0500 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) } @@ -16258,7 +16481,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_32.c linux-2.6.31.7/arch/x86/mm/init_ -#ifdef CONFIG_X86_PAE - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) { - if (after_bootmem) -- pmd_table = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); +- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE); - else - pmd_table = (pmd_t *)alloc_low_page(); - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT); @@ -16476,7 +16699,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_32.c linux-2.6.31.7/arch/x86/mm/init_ EXPORT_SYMBOL_GPL(__supported_pte_mask); /* user-defined highmem size */ -@@ -883,7 +882,7 @@ void __init mem_init(void) +@@ -881,7 +880,7 @@ void __init mem_init(void) set_highmem_pages_init(); codesize = (unsigned long) &_etext - (unsigned long) &_text; @@ -16484,8 +16707,8 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_32.c linux-2.6.31.7/arch/x86/mm/init_ + datasize = (unsigned long) &_edata - (unsigned long) &_sdata; initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; - kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT); -@@ -929,10 +928,10 @@ void __init mem_init(void) + printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, " +@@ -923,10 +922,10 @@ void __init mem_init(void) ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10, @@ -16499,9 +16722,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_32.c linux-2.6.31.7/arch/x86/mm/init_ ((unsigned long)&_etext - (unsigned long)&_text) >> 10); /* -diff -urNp linux-2.6.31.7/arch/x86/mm/init_64.c linux-2.6.31.7/arch/x86/mm/init_64.c ---- linux-2.6.31.7/arch/x86/mm/init_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/init_64.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/init_64.c linux-2.6.32/arch/x86/mm/init_64.c +--- linux-2.6.32/arch/x86/mm/init_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/init_64.c 2009-12-04 21:40:48.045705003 -0500 @@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd = fill_pmd(pud, vaddr); pte = fill_pte(pmd, vaddr); @@ -16529,7 +16752,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_64.c linux-2.6.31.7/arch/x86/mm/init_ } pmd = pmd_offset(pud, phys); BUG_ON(!pmd_none(*pmd)); -@@ -848,8 +848,8 @@ int kern_addr_valid(unsigned long addr) +@@ -842,8 +842,8 @@ int kern_addr_valid(unsigned long addr) static struct vm_area_struct gate_vma = { .vm_start = VSYSCALL_START, .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), @@ -16540,7 +16763,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_64.c linux-2.6.31.7/arch/x86/mm/init_ }; struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -@@ -883,7 +883,7 @@ int in_gate_area_no_task(unsigned long a +@@ -877,7 +877,7 @@ int in_gate_area_no_task(unsigned long a const char *arch_vma_name(struct vm_area_struct *vma) { @@ -16549,10 +16772,112 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/init_64.c linux-2.6.31.7/arch/x86/mm/init_ return "[vdso]"; if (vma == &gate_vma) return "[vsyscall]"; -diff -urNp linux-2.6.31.7/arch/x86/mm/iomap_32.c linux-2.6.31.7/arch/x86/mm/iomap_32.c ---- linux-2.6.31.7/arch/x86/mm/iomap_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/iomap_32.c 2009-12-10 22:15:16.000000000 -0500 -@@ -42,7 +42,11 @@ void *kmap_atomic_prot_pfn(unsigned long +diff -urNp linux-2.6.32/arch/x86/mm/init.c linux-2.6.32/arch/x86/mm/init.c +--- linux-2.6.32/arch/x86/mm/init.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/init.c 2009-12-04 21:40:48.044667789 -0500 +@@ -331,7 +331,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 +385,83 @@ void free_init_pages(char *what, unsigne + + void free_initmem(void) + { ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ pgd_t *pgd; ++ pud_t *pud; ++ pmd_t *pmd; ++ ++#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 ++ 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 ((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 ((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/arch/x86/mm/iomap_32.c linux-2.6.32/arch/x86/mm/iomap_32.c +--- linux-2.6.32/arch/x86/mm/iomap_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/iomap_32.c 2009-12-04 21:40:48.045705003 -0500 +@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long debug_kmap_atomic(type); idx = type + KM_TYPE_NR * smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); @@ -16564,10 +16889,10 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/iomap_32.c linux-2.6.31.7/arch/x86/mm/ioma arch_flush_lazy_mmu_mode(); return (void *)vaddr; -diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/ioremap.c ---- linux-2.6.31.7/arch/x86/mm/ioremap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/ioremap.c 2009-12-10 22:15:16.000000000 -0500 -@@ -111,8 +111,8 @@ int page_is_ram(unsigned long pagenr) +diff -urNp linux-2.6.32/arch/x86/mm/ioremap.c linux-2.6.32/arch/x86/mm/ioremap.c +--- linux-2.6.32/arch/x86/mm/ioremap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/ioremap.c 2009-12-04 21:40:48.045705003 -0500 +@@ -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. */ @@ -16578,7 +16903,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/iorem return 0; for (i = 0; i < e820.nr_map; i++) { -@@ -207,10 +207,7 @@ static void __iomem *__ioremap_caller(re +@@ -137,10 +137,7 @@ static void __iomem *__ioremap_caller(re /* * Don't allow anybody to remap normal RAM that we're using.. */ @@ -16590,7 +16915,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/iorem int is_ram = page_is_ram(pfn); if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) -@@ -272,6 +269,8 @@ static void __iomem *__ioremap_caller(re +@@ -191,6 +188,8 @@ static void __iomem *__ioremap_caller(re break; } @@ -16599,7 +16924,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/iorem /* * Ok, go for it.. */ -@@ -489,7 +488,7 @@ static int __init early_ioremap_debug_se +@@ -407,7 +406,7 @@ static int __init early_ioremap_debug_se early_param("early_ioremap_debug", early_ioremap_debug_setup); static __initdata int after_paging_init; @@ -16608,7 +16933,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/iorem static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) { -@@ -521,8 +520,7 @@ void __init early_ioremap_init(void) +@@ -439,8 +438,7 @@ void __init early_ioremap_init(void) slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i); pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); @@ -16618,9 +16943,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/ioremap.c linux-2.6.31.7/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.31.7/arch/x86/mm/mmap.c linux-2.6.31.7/arch/x86/mm/mmap.c ---- linux-2.6.31.7/arch/x86/mm/mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/mmap.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/mmap.c linux-2.6.32/arch/x86/mm/mmap.c +--- linux-2.6.32/arch/x86/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/mmap.c 2009-12-04 21:40:48.046709421 -0500 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size * Leave an at least ~128 MB hole with possible stack randomization. */ @@ -16702,9 +17027,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/mmap.c linux-2.6.31.7/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.31.7/arch/x86/mm/numa_32.c linux-2.6.31.7/arch/x86/mm/numa_32.c ---- linux-2.6.31.7/arch/x86/mm/numa_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/numa_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/numa_32.c linux-2.6.32/arch/x86/mm/numa_32.c +--- linux-2.6.32/arch/x86/mm/numa_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/numa_32.c 2009-12-04 21:40:48.046709421 -0500 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -16713,22 +17038,10 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/numa_32.c linux-2.6.31.7/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.31.7/arch/x86/mm/pageattr-test.c linux-2.6.31.7/arch/x86/mm/pageattr-test.c ---- linux-2.6.31.7/arch/x86/mm/pageattr-test.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/pageattr-test.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/arch/x86/mm/pageattr.c linux-2.6.31.7/arch/x86/mm/pageattr.c ---- linux-2.6.31.7/arch/x86/mm/pageattr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/pageattr.c 2009-12-10 22:15:16.000000000 -0500 -@@ -267,9 +267,10 @@ static inline pgprot_t static_protection +diff -urNp linux-2.6.32/arch/x86/mm/pageattr.c linux-2.6.32/arch/x86/mm/pageattr.c +--- linux-2.6.32/arch/x86/mm/pageattr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/pageattr.c 2009-12-04 21:40:48.047699252 -0500 +@@ -268,9 +268,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping */ @@ -16740,7 +17053,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pageattr.c linux-2.6.31.7/arch/x86/mm/page /* * The .rodata section needs to be read-only. Using the pfn * catches all aliases. -@@ -277,6 +278,7 @@ static inline pgprot_t static_protection +@@ -278,6 +279,7 @@ static inline pgprot_t static_protection if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT, __pa((unsigned long)__end_rodata) >> PAGE_SHIFT)) pgprot_val(forbidden) |= _PAGE_RW; @@ -16748,7 +17061,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pageattr.c linux-2.6.31.7/arch/x86/mm/page prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden)); -@@ -330,7 +332,10 @@ EXPORT_SYMBOL_GPL(lookup_address); +@@ -331,7 +333,10 @@ EXPORT_SYMBOL_GPL(lookup_address); static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) { /* change init_mm */ @@ -16759,10 +17072,22 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pageattr.c linux-2.6.31.7/arch/x86/mm/page #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.31.7/arch/x86/mm/pat.c linux-2.6.31.7/arch/x86/mm/pat.c ---- linux-2.6.31.7/arch/x86/mm/pat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/pat.c 2009-12-10 22:15:16.000000000 -0500 -@@ -213,7 +213,7 @@ chk_conflict(struct memtype *new, struct +diff -urNp linux-2.6.32/arch/x86/mm/pageattr-test.c linux-2.6.32/arch/x86/mm/pageattr-test.c +--- linux-2.6.32/arch/x86/mm/pageattr-test.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/pageattr-test.c 2009-12-04 21:40:48.047699252 -0500 +@@ -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/arch/x86/mm/pat.c linux-2.6.32/arch/x86/mm/pat.c +--- linux-2.6.32/arch/x86/mm/pat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/pat.c 2009-12-04 21:40:48.048668296 -0500 +@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct conflict: printk(KERN_INFO "%s:%d conflicting memory types " @@ -16771,7 +17096,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pat.c linux-2.6.31.7/arch/x86/mm/pat.c new->end, cattr_name(new->type), cattr_name(entry->type)); return -EBUSY; } -@@ -487,7 +487,7 @@ int free_memtype(u64 start, u64 end) +@@ -559,7 +559,7 @@ unlock_ret: if (err) { printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n", @@ -16780,7 +17105,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pat.c linux-2.6.31.7/arch/x86/mm/pat.c } dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); -@@ -588,7 +588,7 @@ int kernel_map_sync_memtype(u64 base, un +@@ -755,7 +755,7 @@ int kernel_map_sync_memtype(u64 base, un printk(KERN_INFO "%s:%d ioremap_change_attr failed %s " "for %Lx-%Lx\n", @@ -16789,7 +17114,7 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pat.c linux-2.6.31.7/arch/x86/mm/pat.c cattr_name(flags), base, (unsigned long long)(base + size)); return -EINVAL; -@@ -628,7 +628,7 @@ static int reserve_pfn_range(u64 paddr, +@@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr, free_memtype(paddr, paddr + size); printk(KERN_ERR "%s:%d map pfn expected mapping type %s" " for %Lx-%Lx, got %s\n", @@ -16798,18 +17123,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pat.c linux-2.6.31.7/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -@@ -827,7 +827,7 @@ static int memtype_seq_show(struct seq_f - return 0; - } - --static struct seq_operations memtype_seq_ops = { -+static const struct seq_operations memtype_seq_ops = { - .start = memtype_seq_start, - .next = memtype_seq_next, - .stop = memtype_seq_stop, -diff -urNp linux-2.6.31.7/arch/x86/mm/pgtable_32.c linux-2.6.31.7/arch/x86/mm/pgtable_32.c ---- linux-2.6.31.7/arch/x86/mm/pgtable_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/pgtable_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/pgtable_32.c linux-2.6.32/arch/x86/mm/pgtable_32.c +--- linux-2.6.32/arch/x86/mm/pgtable_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/pgtable_32.c 2009-12-04 21:40:48.048668296 -0500 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, return; } @@ -16824,9 +17140,77 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/pgtable_32.c linux-2.6.31.7/arch/x86/mm/pg /* * It's enough to flush this one mapping. -diff -urNp linux-2.6.31.7/arch/x86/mm/tlb.c linux-2.6.31.7/arch/x86/mm/tlb.c ---- linux-2.6.31.7/arch/x86/mm/tlb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/mm/tlb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/mm/setup_nx.c linux-2.6.32/arch/x86/mm/setup_nx.c +--- linux-2.6.32/arch/x86/mm/setup_nx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/setup_nx.c 2009-12-04 21:40:48.049631334 -0500 +@@ -4,11 +4,10 @@ + + #include <asm/pgtable.h> + ++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) + int nx_enabled; + +-#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) +-static int disable_nx __cpuinitdata; +- ++#ifndef CONFIG_PAX_PAGEEXEC + /* + * noexec = on|off + * +@@ -22,32 +21,26 @@ static int __init noexec_setup(char *str + if (!str) + return -EINVAL; + if (!strncmp(str, "on", 2)) { +- __supported_pte_mask |= _PAGE_NX; +- disable_nx = 0; ++ nx_enabled = 1; + } else if (!strncmp(str, "off", 3)) { +- disable_nx = 1; +- __supported_pte_mask &= ~_PAGE_NX; ++ nx_enabled = 0; + } + return 0; + } + early_param("noexec", noexec_setup); + #endif ++#endif + + #ifdef CONFIG_X86_PAE + void __init set_nx(void) + { +- unsigned int v[4], l, h; ++ if (!nx_enabled && cpu_has_nx) { ++ unsigned l, h; + +- if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) { +- cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]); +- +- if ((v[3] & (1 << 20)) && !disable_nx) { +- rdmsr(MSR_EFER, l, h); +- l |= EFER_NX; +- wrmsr(MSR_EFER, l, h); +- nx_enabled = 1; +- __supported_pte_mask |= _PAGE_NX; +- } ++ __supported_pte_mask &= ~_PAGE_NX; ++ rdmsr(MSR_EFER, l, h); ++ l &= ~EFER_NX; ++ wrmsr(MSR_EFER, l, h); + } + } + #else +@@ -62,7 +55,7 @@ void __cpuinit check_efer(void) + unsigned long efer; + + rdmsrl(MSR_EFER, efer); +- if (!(efer & EFER_NX) || disable_nx) ++ if (!(efer & EFER_NX) || !nx_enabled) + __supported_pte_mask &= ~_PAGE_NX; + } + #endif +diff -urNp linux-2.6.32/arch/x86/mm/tlb.c linux-2.6.32/arch/x86/mm/tlb.c +--- linux-2.6.32/arch/x86/mm/tlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/mm/tlb.c 2009-12-04 21:40:48.049631334 -0500 @@ -12,7 +12,7 @@ #include <asm/uv/uv.h> @@ -16836,9 +17220,9 @@ diff -urNp linux-2.6.31.7/arch/x86/mm/tlb.c linux-2.6.31.7/arch/x86/mm/tlb.c /* * Smarter SMP flushing macros. -diff -urNp linux-2.6.31.7/arch/x86/oprofile/backtrace.c linux-2.6.31.7/arch/x86/oprofile/backtrace.c ---- linux-2.6.31.7/arch/x86/oprofile/backtrace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/oprofile/backtrace.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/oprofile/backtrace.c linux-2.6.32/arch/x86/oprofile/backtrace.c +--- linux-2.6.32/arch/x86/oprofile/backtrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/oprofile/backtrace.c 2009-12-04 21:40:48.049631334 -0500 @@ -37,7 +37,7 @@ static void backtrace_address(void *data unsigned int *depth = data; @@ -16866,10 +17250,10 @@ diff -urNp linux-2.6.31.7/arch/x86/oprofile/backtrace.c linux-2.6.31.7/arch/x86/ unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, -diff -urNp linux-2.6.31.7/arch/x86/oprofile/op_model_p4.c linux-2.6.31.7/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.31.7/arch/x86/oprofile/op_model_p4.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/oprofile/op_model_p4.c 2009-12-10 22:15:16.000000000 -0500 -@@ -48,7 +48,7 @@ static inline void setup_num_counters(vo +diff -urNp linux-2.6.32/arch/x86/oprofile/op_model_p4.c linux-2.6.32/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32/arch/x86/oprofile/op_model_p4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/oprofile/op_model_p4.c 2009-12-04 21:40:48.050705501 -0500 +@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo #endif } @@ -16878,9 +17262,9 @@ diff -urNp linux-2.6.31.7/arch/x86/oprofile/op_model_p4.c linux-2.6.31.7/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.31.7/arch/x86/pci/common.c linux-2.6.31.7/arch/x86/pci/common.c ---- linux-2.6.31.7/arch/x86/pci/common.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/common.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/common.c linux-2.6.32/arch/x86/pci/common.c +--- linux-2.6.32/arch/x86/pci/common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/common.c 2009-12-04 21:40:48.050705501 -0500 @@ -31,8 +31,8 @@ int noioapicreroute = 1; int pcibios_last_bus = -1; unsigned long pirq_table_addr; @@ -16901,9 +17285,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/common.c linux-2.6.31.7/arch/x86/pci/comm }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.31.7/arch/x86/pci/direct.c linux-2.6.31.7/arch/x86/pci/direct.c ---- linux-2.6.31.7/arch/x86/pci/direct.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/direct.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/direct.c linux-2.6.32/arch/x86/pci/direct.c +--- linux-2.6.32/arch/x86/pci/direct.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/direct.c 2009-12-04 21:40:48.050705501 -0500 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int #undef PCI_CONF1_ADDRESS @@ -16930,10 +17314,10 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/direct.c linux-2.6.31.7/arch/x86/pci/dire +static int __init pci_sanity_check(const struct pci_raw_ops *o) { u32 x = 0; - int devfn; -diff -urNp linux-2.6.31.7/arch/x86/pci/fixup.c linux-2.6.31.7/arch/x86/pci/fixup.c ---- linux-2.6.31.7/arch/x86/pci/fixup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/fixup.c 2009-12-10 22:15:16.000000000 -0500 + int year, devfn; +diff -urNp linux-2.6.32/arch/x86/pci/fixup.c linux-2.6.32/arch/x86/pci/fixup.c +--- linux-2.6.32/arch/x86/pci/fixup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/fixup.c 2009-12-04 21:40:48.051641761 -0500 @@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, @@ -16952,21 +17336,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/fixup.c linux-2.6.31.7/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.31.7/arch/x86/pci/i386.c linux-2.6.31.7/arch/x86/pci/i386.c ---- linux-2.6.31.7/arch/x86/pci/i386.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/i386.c 2009-12-10 22:15:16.000000000 -0500 -@@ -266,7 +266,7 @@ void pcibios_set_master(struct pci_dev * - pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); - } - --static struct vm_operations_struct pci_mmap_ops = { -+static const struct vm_operations_struct pci_mmap_ops = { - .access = generic_access_phys, - }; - -diff -urNp linux-2.6.31.7/arch/x86/pci/irq.c linux-2.6.31.7/arch/x86/pci/irq.c ---- linux-2.6.31.7/arch/x86/pci/irq.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/irq.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/irq.c linux-2.6.32/arch/x86/pci/irq.c +--- linux-2.6.32/arch/x86/pci/irq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/irq.c 2009-12-04 21:40:48.051641761 -0500 @@ -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) }, @@ -16985,9 +17357,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/irq.c linux-2.6.31.7/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.31.7/arch/x86/pci/mmconfig_32.c linux-2.6.31.7/arch/x86/pci/mmconfig_32.c ---- linux-2.6.31.7/arch/x86/pci/mmconfig_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/mmconfig_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/mmconfig_32.c linux-2.6.32/arch/x86/pci/mmconfig_32.c +--- linux-2.6.32/arch/x86/pci/mmconfig_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/mmconfig_32.c 2009-12-04 21:40:48.052706902 -0500 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -16997,9 +17369,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/mmconfig_32.c linux-2.6.31.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.31.7/arch/x86/pci/mmconfig_64.c linux-2.6.31.7/arch/x86/pci/mmconfig_64.c ---- linux-2.6.31.7/arch/x86/pci/mmconfig_64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/mmconfig_64.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/mmconfig_64.c linux-2.6.32/arch/x86/pci/mmconfig_64.c +--- linux-2.6.32/arch/x86/pci/mmconfig_64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/mmconfig_64.c 2009-12-04 21:40:48.052706902 -0500 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int return 0; } @@ -17009,9 +17381,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/mmconfig_64.c linux-2.6.31.7/arch/x86/pci .read = pci_mmcfg_read, .write = pci_mmcfg_write, }; -diff -urNp linux-2.6.31.7/arch/x86/pci/numaq_32.c linux-2.6.31.7/arch/x86/pci/numaq_32.c ---- linux-2.6.31.7/arch/x86/pci/numaq_32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/numaq_32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/numaq_32.c linux-2.6.32/arch/x86/pci/numaq_32.c +--- linux-2.6.32/arch/x86/pci/numaq_32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/numaq_32.c 2009-12-04 21:40:48.052706902 -0500 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i #undef PCI_CONF1_MQ_ADDRESS @@ -17021,9 +17393,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/numaq_32.c linux-2.6.31.7/arch/x86/pci/nu .read = pci_conf1_mq_read, .write = pci_conf1_mq_write }; -diff -urNp linux-2.6.31.7/arch/x86/pci/olpc.c linux-2.6.31.7/arch/x86/pci/olpc.c ---- linux-2.6.31.7/arch/x86/pci/olpc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/olpc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/olpc.c linux-2.6.32/arch/x86/pci/olpc.c +--- linux-2.6.32/arch/x86/pci/olpc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/olpc.c 2009-12-04 21:40:48.053714477 -0500 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s return 0; } @@ -17033,9 +17405,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/olpc.c linux-2.6.31.7/arch/x86/pci/olpc.c .read = pci_olpc_read, .write = pci_olpc_write, }; -diff -urNp linux-2.6.31.7/arch/x86/pci/pcbios.c linux-2.6.31.7/arch/x86/pci/pcbios.c ---- linux-2.6.31.7/arch/x86/pci/pcbios.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/pci/pcbios.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/pci/pcbios.c linux-2.6.32/arch/x86/pci/pcbios.c +--- linux-2.6.32/arch/x86/pci/pcbios.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/pci/pcbios.c 2009-12-04 21:40:48.053714477 -0500 @@ -56,50 +56,93 @@ union bios32 { static struct { unsigned long address; @@ -17358,9 +17730,9 @@ diff -urNp linux-2.6.31.7/arch/x86/pci/pcbios.c linux-2.6.31.7/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.31.7/arch/x86/power/cpu.c linux-2.6.31.7/arch/x86/power/cpu.c ---- linux-2.6.31.7/arch/x86/power/cpu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/power/cpu.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/power/cpu.c linux-2.6.32/arch/x86/power/cpu.c +--- linux-2.6.32/arch/x86/power/cpu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/power/cpu.c 2009-12-04 21:40:48.054634433 -0500 @@ -126,7 +126,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { @@ -17380,21 +17752,21 @@ diff -urNp linux-2.6.31.7/arch/x86/power/cpu.c linux-2.6.31.7/arch/x86/power/cpu syscall_init(); /* This sets MSR_*STAR and related */ #endif -diff -urNp linux-2.6.31.7/arch/x86/vdso/Makefile linux-2.6.31.7/arch/x86/vdso/Makefile ---- linux-2.6.31.7/arch/x86/vdso/Makefile 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/Makefile 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/vdso/Makefile linux-2.6.32/arch/x86/vdso/Makefile +--- linux-2.6.32/arch/x86/vdso/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/Makefile 2009-12-04 21:40:48.054634433 -0500 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) --VDSO_LDFLAGS = -fPIC -shared $(call ld-option, -Wl$(comma)--hash-style=sysv) -+VDSO_LDFLAGS = -fPIC -shared --no-undefined $(call ld-option, -Wl$(comma)--hash-style=sysv) +-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) ++VDSO_LDFLAGS = -fPIC -shared --no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) GCOV_PROFILE := n # -diff -urNp linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/vdso/vclock_gettime.c linux-2.6.32/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32/arch/x86/vdso/vclock_gettime.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/vclock_gettime.c 2009-12-04 21:40:48.054634433 -0500 @@ -22,24 +22,48 @@ #include <asm/hpet.h> #include <asm/unistd.h> @@ -17448,18 +17820,18 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c linux-2.6.31.7/arch/x86 return (v * gtod->clock.mult) >> gtod->clock.shift; } -@@ -88,7 +112,9 @@ notrace static noinline int do_monotonic +@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { -- if (likely(gtod->sysctl_enabled && gtod->clock.vread)) +- if (likely(gtod->sysctl_enabled)) + if (likely(gtod->sysctl_enabled && + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) || + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])))) switch (clock) { case CLOCK_REALTIME: - return do_realtime(ts); -@@ -100,10 +126,20 @@ notrace int __vdso_clock_gettime(clockid + if (likely(gtod->clock.vread)) +@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid int clock_gettime(clockid_t, struct timespec *) __attribute__((weak, alias("__vdso_clock_gettime"))); @@ -17482,7 +17854,7 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c linux-2.6.31.7/arch/x86 if (likely(tv != NULL)) { BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != offsetof(struct timespec, tv_nsec) || -@@ -118,9 +154,7 @@ notrace int __vdso_gettimeofday(struct t +@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct t } return 0; } @@ -17493,22 +17865,9 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vclock_gettime.c linux-2.6.31.7/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.31.7/arch/x86/vdso/vdso.lds.S linux-2.6.31.7/arch/x86/vdso/vdso.lds.S ---- linux-2.6.31.7/arch/x86/vdso/vdso.lds.S 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/vdso.lds.S 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/arch/x86/vdso/vdso32-setup.c linux-2.6.31.7/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.31.7/arch/x86/vdso/vdso32-setup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/vdso32-setup.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/vdso/vdso32-setup.c linux-2.6.32/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32/arch/x86/vdso/vdso32-setup.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/vdso32-setup.c 2009-12-04 21:40:48.055710144 -0500 @@ -25,6 +25,7 @@ #include <asm/tlbflush.h> #include <asm/vdso.h> @@ -17609,9 +17968,22 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vdso32-setup.c linux-2.6.31.7/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.31.7/arch/x86/vdso/vextern.h linux-2.6.31.7/arch/x86/vdso/vextern.h ---- linux-2.6.31.7/arch/x86/vdso/vextern.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/vextern.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/vdso/vdso.lds.S linux-2.6.32/arch/x86/vdso/vdso.lds.S +--- linux-2.6.32/arch/x86/vdso/vdso.lds.S 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/vdso.lds.S 2009-12-04 21:40:48.055710144 -0500 +@@ -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/arch/x86/vdso/vextern.h linux-2.6.32/arch/x86/vdso/vextern.h +--- linux-2.6.32/arch/x86/vdso/vextern.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/vextern.h 2009-12-04 21:40:48.055710144 -0500 @@ -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. */ @@ -17619,9 +17991,9 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vextern.h linux-2.6.31.7/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.31.7/arch/x86/vdso/vma.c linux-2.6.31.7/arch/x86/vdso/vma.c ---- linux-2.6.31.7/arch/x86/vdso/vma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/vdso/vma.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/vdso/vma.c linux-2.6.32/arch/x86/vdso/vma.c +--- linux-2.6.32/arch/x86/vdso/vma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/vdso/vma.c 2009-12-04 21:40:48.056710331 -0500 @@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) if (!vbase) goto oom; @@ -17668,21 +18040,9 @@ diff -urNp linux-2.6.31.7/arch/x86/vdso/vma.c linux-2.6.31.7/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.31.7/arch/x86/xen/debugfs.c linux-2.6.31.7/arch/x86/xen/debugfs.c ---- linux-2.6.31.7/arch/x86/xen/debugfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/xen/debugfs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -100,7 +100,7 @@ static int xen_array_release(struct inod - return 0; - } - --static struct file_operations u32_array_fops = { -+static const struct file_operations u32_array_fops = { - .owner = THIS_MODULE, - .open = u32_array_open, - .release= xen_array_release, -diff -urNp linux-2.6.31.7/arch/x86/xen/enlighten.c linux-2.6.31.7/arch/x86/xen/enlighten.c ---- linux-2.6.31.7/arch/x86/xen/enlighten.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/xen/enlighten.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/xen/enlighten.c linux-2.6.32/arch/x86/xen/enlighten.c +--- linux-2.6.32/arch/x86/xen/enlighten.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/xen/enlighten.c 2009-12-04 21:40:48.057813242 -0500 @@ -70,8 +70,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); struct shared_info xen_dummy_shared_info; @@ -17701,7 +18061,7 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/enlighten.c linux-2.6.31.7/arch/x86/xen/e end = start + __get_cpu_var(idt_desc).size + 1; xen_mc_flush(); -@@ -1126,13 +1124,6 @@ asmlinkage void __init xen_start_kernel( +@@ -1127,13 +1125,6 @@ asmlinkage void __init xen_start_kernel( machine_ops = xen_machine_ops; @@ -17715,10 +18075,10 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/enlighten.c linux-2.6.31.7/arch/x86/xen/e xen_smp_init(); pgd = (pgd_t *)xen_start_info->pt_base; -diff -urNp linux-2.6.31.7/arch/x86/xen/mmu.c linux-2.6.31.7/arch/x86/xen/mmu.c ---- linux-2.6.31.7/arch/x86/xen/mmu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/xen/mmu.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1707,6 +1707,8 @@ __init pgd_t *xen_setup_kernel_pagetable +diff -urNp linux-2.6.32/arch/x86/xen/mmu.c linux-2.6.32/arch/x86/xen/mmu.c +--- linux-2.6.32/arch/x86/xen/mmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/xen/mmu.c 2009-12-04 21:40:48.058737623 -0500 +@@ -1710,6 +1710,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); convert_pfn_mfn(level3_kernel_pgt); @@ -17727,7 +18087,7 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/mmu.c linux-2.6.31.7/arch/x86/xen/mmu.c l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); -@@ -1725,7 +1727,10 @@ __init pgd_t *xen_setup_kernel_pagetable +@@ -1728,7 +1730,10 @@ __init pgd_t *xen_setup_kernel_pagetable set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); @@ -17738,9 +18098,9 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/mmu.c linux-2.6.31.7/arch/x86/xen/mmu.c set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); -diff -urNp linux-2.6.31.7/arch/x86/xen/smp.c linux-2.6.31.7/arch/x86/xen/smp.c ---- linux-2.6.31.7/arch/x86/xen/smp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/xen/smp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/xen/smp.c linux-2.6.32/arch/x86/xen/smp.c +--- linux-2.6.32/arch/x86/xen/smp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/xen/smp.c 2009-12-04 21:40:48.058737623 -0500 @@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); @@ -17764,9 +18124,9 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/smp.c linux-2.6.31.7/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.31.7/arch/x86/xen/xen-ops.h linux-2.6.31.7/arch/x86/xen/xen-ops.h ---- linux-2.6.31.7/arch/x86/xen/xen-ops.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/x86/xen/xen-ops.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/x86/xen/xen-ops.h linux-2.6.32/arch/x86/xen/xen-ops.h +--- linux-2.6.32/arch/x86/xen/xen-ops.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/x86/xen/xen-ops.h 2009-12-04 21:40:48.058737623 -0500 @@ -10,8 +10,6 @@ extern const char xen_hypervisor_callback[]; extern const char xen_failsafe_callback[]; @@ -17776,9 +18136,9 @@ diff -urNp linux-2.6.31.7/arch/x86/xen/xen-ops.h linux-2.6.31.7/arch/x86/xen/xen struct trap_info; void xen_copy_trap_info(struct trap_info *traps); -diff -urNp linux-2.6.31.7/arch/xtensa/include/asm/atomic.h linux-2.6.31.7/arch/xtensa/include/asm/atomic.h ---- linux-2.6.31.7/arch/xtensa/include/asm/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/arch/xtensa/include/asm/atomic.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/arch/xtensa/include/asm/atomic.h linux-2.6.32/arch/xtensa/include/asm/atomic.h +--- linux-2.6.32/arch/xtensa/include/asm/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/arch/xtensa/include/asm/atomic.h 2009-12-04 21:40:48.059706684 -0500 @@ -49,6 +49,14 @@ #define atomic_read(v) ((v)->counter) @@ -17842,9 +18202,9 @@ diff -urNp linux-2.6.31.7/arch/xtensa/include/asm/atomic.h linux-2.6.31.7/arch/x /** * atomic_inc - increment atomic variable -diff -urNp linux-2.6.31.7/block/blk-integrity.c linux-2.6.31.7/block/blk-integrity.c ---- linux-2.6.31.7/block/blk-integrity.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/block/blk-integrity.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/block/blk-integrity.c linux-2.6.32/block/blk-integrity.c +--- linux-2.6.32/block/blk-integrity.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/block/blk-integrity.c 2009-12-04 21:40:48.059706684 -0500 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs NULL, }; @@ -17854,9 +18214,9 @@ diff -urNp linux-2.6.31.7/block/blk-integrity.c linux-2.6.31.7/block/blk-integri .show = &integrity_attr_show, .store = &integrity_attr_store, }; -diff -urNp linux-2.6.31.7/block/blk-map.c linux-2.6.31.7/block/blk-map.c ---- linux-2.6.31.7/block/blk-map.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/block/blk-map.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/block/blk-map.c linux-2.6.32/block/blk-map.c +--- linux-2.6.32/block/blk-map.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/block/blk-map.c 2009-12-11 19:45:15.910531293 -0500 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ * direct dma. else, set up kernel bounce buffers */ @@ -17866,9 +18226,18 @@ diff -urNp linux-2.6.31.7/block/blk-map.c linux-2.6.31.7/block/blk-map.c bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask); else bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask); -diff -urNp linux-2.6.31.7/block/blk-sysfs.c linux-2.6.31.7/block/blk-sysfs.c ---- linux-2.6.31.7/block/blk-sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/block/blk-sysfs.c 2009-12-10 22:15:16.000000000 -0500 +@@ -297,7 +297,7 @@ int blk_rq_map_kern(struct request_queue + if (!len || !kbuf) + return -EINVAL; + +- do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf); ++ do_copy = !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kbuf); + if (do_copy) + bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); + else +diff -urNp linux-2.6.32/block/blk-sysfs.c linux-2.6.32/block/blk-sysfs.c +--- linux-2.6.32/block/blk-sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/block/blk-sysfs.c 2009-12-04 21:40:48.060703156 -0500 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kob kmem_cache_free(blk_requestq_cachep, q); } @@ -17878,10 +18247,10 @@ diff -urNp linux-2.6.31.7/block/blk-sysfs.c linux-2.6.31.7/block/blk-sysfs.c .show = queue_attr_show, .store = queue_attr_store, }; -diff -urNp linux-2.6.31.7/block/elevator.c linux-2.6.31.7/block/elevator.c ---- linux-2.6.31.7/block/elevator.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/block/elevator.c 2009-12-10 22:15:16.000000000 -0500 -@@ -901,7 +901,7 @@ elv_attr_store(struct kobject *kobj, str +diff -urNp linux-2.6.32/block/elevator.c linux-2.6.32/block/elevator.c +--- linux-2.6.32/block/elevator.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/block/elevator.c 2009-12-04 21:40:48.061715687 -0500 +@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str return error; } @@ -17890,9 +18259,9 @@ diff -urNp linux-2.6.31.7/block/elevator.c linux-2.6.31.7/block/elevator.c .show = elv_attr_show, .store = elv_attr_store, }; -diff -urNp linux-2.6.31.7/crypto/lrw.c linux-2.6.31.7/crypto/lrw.c ---- linux-2.6.31.7/crypto/lrw.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/crypto/lrw.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/crypto/lrw.c linux-2.6.32/crypto/lrw.c +--- linux-2.6.32/crypto/lrw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/crypto/lrw.c 2009-12-04 21:40:48.061715687 -0500 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -17902,10 +18271,147 @@ diff -urNp linux-2.6.31.7/crypto/lrw.c linux-2.6.31.7/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.31.7/drivers/acpi/blacklist.c linux-2.6.31.7/drivers/acpi/blacklist.c ---- linux-2.6.31.7/drivers/acpi/blacklist.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/blacklist.c 2009-12-10 22:15:16.000000000 -0500 -@@ -71,7 +71,7 @@ static struct acpi_blacklist_item acpi_b +diff -urNp linux-2.6.32/Documentation/dontdiff linux-2.6.32/Documentation/dontdiff +--- linux-2.6.32/Documentation/dontdiff 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/Documentation/dontdiff 2009-12-04 21:40:47.302622585 -0500 +@@ -3,6 +3,7 @@ + *.bin + *.cpio + *.csp ++*.dbg + *.dsp + *.dvi + *.elf +@@ -40,6 +41,7 @@ + *.ver + *.xml + *_MODULES ++*_reg_safe.h + *_vga16.c + *~ + *.9 +@@ -49,11 +51,16 @@ + 53c700_d.h + CVS + ChangeSet ++GPATH ++GRTAGS ++GSYMS ++GTAGS + Image + Kerntypes + Module.markers + Module.symvers + PENDING ++PERF* + SCCS + System.map* + TAGS +@@ -76,7 +83,9 @@ btfixupprep + build + bvmlinux + bzImage* ++capflags.c + classlist.h* ++common-cmds.h + comp*.log + compile.h* + conf +@@ -103,13 +112,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 +143,9 @@ mkboot + mkbugboot + mkcpustr + mkdep ++mkpiggy + mkprep ++mkregtable + mktables + mktree + modpost +@@ -149,6 +161,7 @@ patches* + pca200e.bin + pca200e_ecd.bin2 + piggy.gz ++piggy.S + piggyback + pnmtologo + ppc_defs.h* +@@ -163,6 +176,7 @@ setup + setup.bin + setup.elf + sImage ++slabinfo + sm_tbl* + split-include + syscalltab.h +@@ -186,14 +200,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/Documentation/kernel-parameters.txt linux-2.6.32/Documentation/kernel-parameters.txt +--- linux-2.6.32/Documentation/kernel-parameters.txt 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/Documentation/kernel-parameters.txt 2009-12-04 21:40:47.320607237 -0500 +@@ -1833,6 +1833,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/drivers/acpi/battery.c linux-2.6.32/drivers/acpi/battery.c +--- linux-2.6.32/drivers/acpi/battery.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/battery.c 2009-12-04 21:40:48.062704968 -0500 +@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); + } + + static struct battery_file { +- struct file_operations ops; ++ const struct file_operations ops; + mode_t mode; + const char *name; + } acpi_battery_file[] = { +diff -urNp linux-2.6.32/drivers/acpi/blacklist.c linux-2.6.32/drivers/acpi/blacklist.c +--- linux-2.6.32/drivers/acpi/blacklist.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/blacklist.c 2009-12-04 21:40:48.062704968 -0500 +@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -17914,10 +18420,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/blacklist.c linux-2.6.31.7/drivers/acpi/b }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.31.7/drivers/acpi/dock.c linux-2.6.31.7/drivers/acpi/dock.c ---- linux-2.6.31.7/drivers/acpi/dock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/dock.c 2009-12-10 22:15:16.000000000 -0500 -@@ -75,7 +75,7 @@ struct dock_dependent_device { +diff -urNp linux-2.6.32/drivers/acpi/dock.c linux-2.6.32/drivers/acpi/dock.c +--- linux-2.6.32/drivers/acpi/dock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/dock.c 2009-12-04 21:40:48.063657589 -0500 +@@ -77,7 +77,7 @@ struct dock_dependent_device { struct list_head list; struct list_head hotplug_list; acpi_handle handle; @@ -17935,10 +18441,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/dock.c linux-2.6.31.7/drivers/acpi/dock.c void *context) { struct dock_dependent_device *dd; -diff -urNp linux-2.6.31.7/drivers/acpi/osl.c linux-2.6.31.7/drivers/acpi/osl.c ---- linux-2.6.31.7/drivers/acpi/osl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/osl.c 2009-12-10 22:15:16.000000000 -0500 -@@ -521,6 +521,8 @@ acpi_os_read_memory(acpi_physical_addres +diff -urNp linux-2.6.32/drivers/acpi/osl.c linux-2.6.32/drivers/acpi/osl.c +--- linux-2.6.32/drivers/acpi/osl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/osl.c 2009-12-04 21:40:48.063657589 -0500 +@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; virt_addr = ioremap(phys_addr, width); @@ -17947,7 +18453,7 @@ diff -urNp linux-2.6.31.7/drivers/acpi/osl.c linux-2.6.31.7/drivers/acpi/osl.c if (!value) value = &dummy; -@@ -549,6 +551,8 @@ acpi_os_write_memory(acpi_physical_addre +@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_addre void __iomem *virt_addr; virt_addr = ioremap(phys_addr, width); @@ -17956,10 +18462,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/osl.c linux-2.6.31.7/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.31.7/drivers/acpi/processor_core.c linux-2.6.31.7/drivers/acpi/processor_core.c ---- linux-2.6.31.7/drivers/acpi/processor_core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/processor_core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -712,7 +712,7 @@ static int __cpuinit acpi_processor_star +diff -urNp linux-2.6.32/drivers/acpi/processor_core.c linux-2.6.32/drivers/acpi/processor_core.c +--- linux-2.6.32/drivers/acpi/processor_core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/processor_core.c 2009-12-04 21:40:48.064629153 -0500 +@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( return 0; } @@ -17968,10 +18474,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/processor_core.c linux-2.6.31.7/drivers/a /* * Buggy BIOS check -diff -urNp linux-2.6.31.7/drivers/acpi/processor_idle.c linux-2.6.31.7/drivers/acpi/processor_idle.c ---- linux-2.6.31.7/drivers/acpi/processor_idle.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/processor_idle.c 2009-12-10 22:15:16.000000000 -0500 -@@ -108,7 +108,7 @@ static struct dmi_system_id __cpuinitdat +diff -urNp linux-2.6.32/drivers/acpi/processor_idle.c linux-2.6.32/drivers/acpi/processor_idle.c +--- linux-2.6.32/drivers/acpi/processor_idle.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/processor_idle.c 2009-12-04 21:40:48.064629153 -0500 +@@ -110,7 +110,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, (void *)2}, @@ -17980,9 +18486,9 @@ diff -urNp linux-2.6.31.7/drivers/acpi/processor_idle.c linux-2.6.31.7/drivers/a }; -diff -urNp linux-2.6.31.7/drivers/acpi/sleep.c linux-2.6.31.7/drivers/acpi/sleep.c ---- linux-2.6.31.7/drivers/acpi/sleep.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/sleep.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/acpi/sleep.c linux-2.6.32/drivers/acpi/sleep.c +--- linux-2.6.32/drivers/acpi/sleep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/sleep.c 2009-12-04 21:40:48.065648679 -0500 @@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp } } @@ -18001,7 +18507,7 @@ diff -urNp linux-2.6.31.7/drivers/acpi/sleep.c linux-2.6.31.7/drivers/acpi/sleep .valid = acpi_suspend_state_valid, .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_disable_gpes, -@@ -512,7 +512,7 @@ static void acpi_pm_enable_gpes(void) +@@ -552,7 +552,7 @@ static void acpi_pm_enable_gpes(void) acpi_enable_all_runtime_gpes(); } @@ -18010,7 +18516,7 @@ diff -urNp linux-2.6.31.7/drivers/acpi/sleep.c linux-2.6.31.7/drivers/acpi/sleep .begin = acpi_hibernation_begin, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot, -@@ -565,7 +565,7 @@ static int acpi_hibernation_pre_snapshot +@@ -605,7 +605,7 @@ static int acpi_hibernation_pre_snapshot * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has * been requested. */ @@ -18019,19 +18525,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/sleep.c linux-2.6.31.7/drivers/acpi/sleep .begin = acpi_hibernation_begin_old, .end = acpi_pm_end, .pre_snapshot = acpi_hibernation_pre_snapshot_old, -diff -urNp linux-2.6.31.7/drivers/acpi/video.c linux-2.6.31.7/drivers/acpi/video.c ---- linux-2.6.31.7/drivers/acpi/video.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/acpi/video.c 2009-12-10 22:15:16.000000000 -0500 -@@ -283,7 +283,7 @@ static int acpi_video_device_brightness_ - struct file *file); - static ssize_t acpi_video_device_write_brightness(struct file *file, - const char __user *buffer, size_t count, loff_t *data); --static struct file_operations acpi_video_device_brightness_fops = { -+static const struct file_operations acpi_video_device_brightness_fops = { - .owner = THIS_MODULE, - .open = acpi_video_device_brightness_open_fs, - .read = seq_read, -@@ -357,7 +357,7 @@ static int acpi_video_set_brightness(str +diff -urNp linux-2.6.32/drivers/acpi/video.c linux-2.6.32/drivers/acpi/video.c +--- linux-2.6.32/drivers/acpi/video.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/acpi/video.c 2009-12-04 21:40:48.066629382 -0500 +@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str vd->brightness->levels[request_level]); } @@ -18040,10 +18537,10 @@ diff -urNp linux-2.6.31.7/drivers/acpi/video.c linux-2.6.31.7/drivers/acpi/video .get_brightness = acpi_video_get_brightness, .update_status = acpi_video_set_brightness, }; -diff -urNp linux-2.6.31.7/drivers/ata/ahci.c linux-2.6.31.7/drivers/ata/ahci.c ---- linux-2.6.31.7/drivers/ata/ahci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/ahci.c 2009-12-10 22:15:16.000000000 -0500 -@@ -351,7 +351,7 @@ static struct scsi_host_template ahci_sh +diff -urNp linux-2.6.32/drivers/ata/ahci.c linux-2.6.32/drivers/ata/ahci.c +--- linux-2.6.32/drivers/ata/ahci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/ahci.c 2009-12-04 21:40:48.067649743 -0500 +@@ -385,7 +385,7 @@ static struct scsi_host_template ahci_sh .sdev_attrs = ahci_sdev_attrs, }; @@ -18052,7 +18549,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/ahci.c linux-2.6.31.7/drivers/ata/ahci.c .inherits = &sata_pmp_port_ops, .qc_defer = sata_pmp_qc_defer_cmd_switch, -@@ -388,17 +388,17 @@ static struct ata_port_operations ahci_o +@@ -422,17 +422,17 @@ static struct ata_port_operations ahci_o .port_stop = ahci_port_stop, }; @@ -18073,7 +18570,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/ahci.c linux-2.6.31.7/drivers/ata/ahci.c .inherits = &ahci_ops, .softreset = ahci_sb600_softreset, .pmp_softreset = ahci_sb600_softreset, -@@ -630,7 +630,7 @@ static const struct pci_device_id ahci_p +@@ -671,7 +671,7 @@ static const struct pci_device_id ahci_p { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, @@ -18082,9 +18579,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/ahci.c linux-2.6.31.7/drivers/ata/ahci.c }; -diff -urNp linux-2.6.31.7/drivers/ata/ata_generic.c linux-2.6.31.7/drivers/ata/ata_generic.c ---- linux-2.6.31.7/drivers/ata/ata_generic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/ata_generic.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/ata_generic.c linux-2.6.32/drivers/ata/ata_generic.c +--- linux-2.6.32/drivers/ata/ata_generic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/ata_generic.c 2009-12-04 21:40:48.075066396 -0500 @@ -95,7 +95,7 @@ static struct scsi_host_template generic ATA_BMDMA_SHT(DRV_NAME), }; @@ -18094,9 +18591,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/ata_generic.c linux-2.6.31.7/drivers/ata/a .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_mode = generic_set_mode, -diff -urNp linux-2.6.31.7/drivers/ata/ata_piix.c linux-2.6.31.7/drivers/ata/ata_piix.c ---- linux-2.6.31.7/drivers/ata/ata_piix.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/ata_piix.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/ata_piix.c linux-2.6.32/drivers/ata/ata_piix.c +--- linux-2.6.32/drivers/ata/ata_piix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/ata_piix.c 2009-12-04 21:40:48.075711503 -0500 @@ -291,7 +291,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (PCH) */ @@ -18160,10 +18657,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/ata_piix.c linux-2.6.31.7/drivers/ata/ata_ }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.31.7/drivers/ata/libata-acpi.c linux-2.6.31.7/drivers/ata/libata-acpi.c ---- linux-2.6.31.7/drivers/ata/libata-acpi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/libata-acpi.c 2009-12-10 22:15:16.000000000 -0500 -@@ -233,12 +233,12 @@ static void ata_acpi_dev_uevent(acpi_han +diff -urNp linux-2.6.32/drivers/ata/libata-acpi.c linux-2.6.32/drivers/ata/libata-acpi.c +--- linux-2.6.32/drivers/ata/libata-acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/libata-acpi.c 2009-12-04 21:40:48.076739951 -0500 +@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han ata_acpi_uevent(dev->link->ap, dev, event); } @@ -18178,9 +18675,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-acpi.c linux-2.6.31.7/drivers/ata/l .handler = ata_acpi_ap_notify_dock, .uevent = ata_acpi_ap_uevent, }; -diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/libata-core.c ---- linux-2.6.31.7/drivers/ata/libata-core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/libata-core.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/libata-core.c linux-2.6.32/drivers/ata/libata-core.c +--- linux-2.6.32/drivers/ata/libata-core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/libata-core.c 2009-12-04 21:40:48.078634247 -0500 @@ -896,7 +896,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, @@ -18190,7 +18687,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l }; /** -@@ -3141,7 +3141,7 @@ static const struct ata_timing ata_timin +@@ -3163,7 +3163,7 @@ static const struct ata_timing ata_timin { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, @@ -18199,7 +18696,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l }; #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4339,7 +4339,7 @@ static const struct ata_blacklist_entry +@@ -4361,7 +4361,7 @@ static const struct ata_blacklist_entry { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, /* End Marker */ @@ -18208,7 +18705,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -@@ -5909,7 +5909,7 @@ static void ata_host_stop(struct device +@@ -5937,7 +5937,7 @@ static void ata_host_stop(struct device * LOCKING: * None. */ @@ -18217,7 +18714,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l { static DEFINE_SPINLOCK(lock); const struct ata_port_operations *cur; -@@ -5921,6 +5921,7 @@ static void ata_finalize_port_ops(struct +@@ -5949,6 +5949,7 @@ static void ata_finalize_port_ops(struct return; spin_lock(&lock); @@ -18225,7 +18722,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l for (cur = ops->inherits; cur; cur = cur->inherits) { void **inherit = (void **)cur; -@@ -5934,8 +5935,9 @@ static void ata_finalize_port_ops(struct +@@ -5962,8 +5963,9 @@ static void ata_finalize_port_ops(struct if (IS_ERR(*pp)) *pp = NULL; @@ -18236,7 +18733,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l spin_unlock(&lock); } -@@ -6032,7 +6034,7 @@ int ata_host_start(struct ata_host *host +@@ -6060,7 +6062,7 @@ int ata_host_start(struct ata_host *host */ /* KILLME - the only user left is ipr */ void ata_host_init(struct ata_host *host, struct device *dev, @@ -18245,7 +18742,7 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l { spin_lock_init(&host->lock); host->dev = dev; -@@ -6695,7 +6697,7 @@ static void ata_dummy_error_handler(stru +@@ -6723,7 +6725,7 @@ static void ata_dummy_error_handler(stru /* truly dummy */ } @@ -18254,36 +18751,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-core.c linux-2.6.31.7/drivers/ata/l .qc_prep = ata_noop_qc_prep, .qc_issue = ata_dummy_qc_issue, .error_handler = ata_dummy_error_handler, -diff -urNp linux-2.6.31.7/drivers/ata/libata-eh.c linux-2.6.31.7/drivers/ata/libata-eh.c ---- linux-2.6.31.7/drivers/ata/libata-eh.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/libata-eh.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3154,9 +3154,9 @@ static int ata_eh_handle_dev_fail(struct - * RETURNS: - * 0 on success, -errno on failure. - */ --int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, -- ata_reset_fn_t softreset, ata_reset_fn_t hardreset, -- ata_postreset_fn_t postreset, -+int ata_eh_recover(struct ata_port *ap, const ata_prereset_fn_t prereset, -+ const ata_reset_fn_t softreset, const ata_reset_fn_t hardreset, -+ const ata_postreset_fn_t postreset, - struct ata_link **r_failed_link) - { - struct ata_link *link; -@@ -3417,9 +3417,9 @@ void ata_eh_finish(struct ata_port *ap) - * LOCKING: - * Kernel thread context (may sleep). - */ --void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, -- ata_reset_fn_t softreset, ata_reset_fn_t hardreset, -- ata_postreset_fn_t postreset) -+void ata_do_eh(struct ata_port *ap, const ata_prereset_fn_t prereset, -+ const ata_reset_fn_t softreset, const ata_reset_fn_t hardreset, -+ const ata_postreset_fn_t postreset) - { - struct ata_device *dev; - int rc; -@@ -3448,7 +3448,7 @@ void ata_do_eh(struct ata_port *ap, ata_ +diff -urNp linux-2.6.32/drivers/ata/libata-eh.c linux-2.6.32/drivers/ata/libata-eh.c +--- linux-2.6.32/drivers/ata/libata-eh.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/libata-eh.c 2009-12-04 21:40:48.080720128 -0500 +@@ -3580,7 +3580,7 @@ void ata_do_eh(struct ata_port *ap, ata_ */ void ata_std_error_handler(struct ata_port *ap) { @@ -18292,10 +18763,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-eh.c linux-2.6.31.7/drivers/ata/lib ata_reset_fn_t hardreset = ops->hardreset; /* ignore built-in hardreset if SCR access is not available */ -diff -urNp linux-2.6.31.7/drivers/ata/libata-pmp.c linux-2.6.31.7/drivers/ata/libata-pmp.c ---- linux-2.6.31.7/drivers/ata/libata-pmp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/libata-pmp.c 2009-12-10 22:15:16.000000000 -0500 -@@ -839,7 +839,7 @@ static int sata_pmp_handle_link_fail(str +diff -urNp linux-2.6.32/drivers/ata/libata-pmp.c linux-2.6.32/drivers/ata/libata-pmp.c +--- linux-2.6.32/drivers/ata/libata-pmp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/libata-pmp.c 2009-12-04 21:40:48.080720128 -0500 +@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str */ static int sata_pmp_eh_recover(struct ata_port *ap) { @@ -18304,34 +18775,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/libata-pmp.c linux-2.6.31.7/drivers/ata/li int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; struct ata_link *pmp_link = &ap->link; struct ata_device *pmp_dev = pmp_link->device; -diff -urNp linux-2.6.31.7/drivers/ata/libata.h linux-2.6.31.7/drivers/ata/libata.h ---- linux-2.6.31.7/drivers/ata/libata.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/libata.h 2009-12-10 22:15:16.000000000 -0500 -@@ -38,7 +38,7 @@ struct ata_scsi_args { - void (*done)(struct scsi_cmnd *); - }; - --static inline int ata_is_builtin_hardreset(ata_reset_fn_t reset) -+static inline int ata_is_builtin_hardreset(const ata_reset_fn_t reset) - { - if (reset == sata_std_hardreset) - return 1; -@@ -169,9 +169,9 @@ extern int ata_eh_reset(struct ata_link - ata_prereset_fn_t prereset, ata_reset_fn_t softreset, - ata_reset_fn_t hardreset, ata_postreset_fn_t postreset); - extern int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); --extern int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, -- ata_reset_fn_t softreset, ata_reset_fn_t hardreset, -- ata_postreset_fn_t postreset, -+extern int ata_eh_recover(struct ata_port *ap, const ata_prereset_fn_t prereset, -+ const ata_reset_fn_t softreset, const ata_reset_fn_t hardreset, -+ const ata_postreset_fn_t postreset, - struct ata_link **r_failed_disk); - extern void ata_eh_finish(struct ata_port *ap); - -diff -urNp linux-2.6.31.7/drivers/ata/pata_acpi.c linux-2.6.31.7/drivers/ata/pata_acpi.c ---- linux-2.6.31.7/drivers/ata/pata_acpi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_acpi.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_acpi.c linux-2.6.32/drivers/ata/pata_acpi.c +--- linux-2.6.32/drivers/ata/pata_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_acpi.c 2009-12-04 21:40:48.081712462 -0500 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -18341,9 +18787,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_acpi.c linux-2.6.31.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .qc_issue = pacpi_qc_issue, .cable_detect = pacpi_cable_detect, -diff -urNp linux-2.6.31.7/drivers/ata/pata_ali.c linux-2.6.31.7/drivers/ata/pata_ali.c ---- linux-2.6.31.7/drivers/ata/pata_ali.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_ali.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_ali.c linux-2.6.32/drivers/ata/pata_ali.c +--- linux-2.6.32/drivers/ata/pata_ali.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_ali.c 2009-12-04 21:40:48.081712462 -0500 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht * Port operations for PIO only ALi */ @@ -18389,9 +18835,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_ali.c linux-2.6.31.7/drivers/ata/pata .inherits = &ali_dma_base_ops, .check_atapi_dma = ali_check_atapi_dma, .dev_config = ali_warn_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/pata_amd.c linux-2.6.31.7/drivers/ata/pata_amd.c ---- linux-2.6.31.7/drivers/ata/pata_amd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_amd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_amd.c linux-2.6.32/drivers/ata/pata_amd.c +--- linux-2.6.32/drivers/ata/pata_amd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_amd.c 2009-12-04 21:40:48.082660808 -0500 @@ -397,28 +397,28 @@ static const struct ata_port_operations .prereset = amd_pre_reset, }; @@ -18441,9 +18887,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_amd.c linux-2.6.31.7/drivers/ata/pata .inherits = &nv_base_port_ops, .set_piomode = nv133_set_piomode, .set_dmamode = nv133_set_dmamode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_artop.c linux-2.6.31.7/drivers/ata/pata_artop.c ---- linux-2.6.31.7/drivers/ata/pata_artop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_artop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_artop.c linux-2.6.32/drivers/ata/pata_artop.c +--- linux-2.6.32/drivers/ata/pata_artop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_artop.c 2009-12-04 21:40:48.082660808 -0500 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_s ATA_BMDMA_SHT(DRV_NAME), }; @@ -18462,9 +18908,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_artop.c linux-2.6.31.7/drivers/ata/pa .inherits = &ata_bmdma_port_ops, .cable_detect = artop6260_cable_detect, .set_piomode = artop6260_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_at32.c linux-2.6.31.7/drivers/ata/pata_at32.c ---- linux-2.6.31.7/drivers/ata/pata_at32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_at32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_at32.c linux-2.6.32/drivers/ata/pata_at32.c +--- linux-2.6.32/drivers/ata/pata_at32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_at32.c 2009-12-04 21:40:48.082660808 -0500 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh ATA_PIO_SHT(DRV_NAME), }; @@ -18474,9 +18920,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_at32.c linux-2.6.31.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = pata_at32_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_at91.c linux-2.6.31.7/drivers/ata/pata_at91.c ---- linux-2.6.31.7/drivers/ata/pata_at91.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_at91.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_at91.c linux-2.6.32/drivers/ata/pata_at91.c +--- linux-2.6.32/drivers/ata/pata_at91.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_at91.c 2009-12-04 21:40:48.083726360 -0500 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at ATA_PIO_SHT(DRV_NAME), }; @@ -18486,9 +18932,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_at91.c linux-2.6.31.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .sff_data_xfer = pata_at91_data_xfer_noirq, -diff -urNp linux-2.6.31.7/drivers/ata/pata_atiixp.c linux-2.6.31.7/drivers/ata/pata_atiixp.c ---- linux-2.6.31.7/drivers/ata/pata_atiixp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_atiixp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_atiixp.c linux-2.6.32/drivers/ata/pata_atiixp.c +--- linux-2.6.32/drivers/ata/pata_atiixp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_atiixp.c 2009-12-04 21:40:48.083726360 -0500 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18498,9 +18944,21 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_atiixp.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.31.7/drivers/ata/pata_bf54x.c linux-2.6.31.7/drivers/ata/pata_bf54x.c ---- linux-2.6.31.7/drivers/ata/pata_bf54x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_bf54x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_atp867x.c linux-2.6.32/drivers/ata/pata_atp867x.c +--- linux-2.6.32/drivers/ata/pata_atp867x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_atp867x.c 2009-12-04 21:40:48.083726360 -0500 +@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x + ATA_BMDMA_SHT(DRV_NAME), + }; + +-static struct ata_port_operations atp867x_ops = { ++static const struct ata_port_operations atp867x_ops = { + .inherits = &ata_bmdma_port_ops, + .cable_detect = atp867x_cable_detect, + .set_piomode = atp867x_set_piomode, +diff -urNp linux-2.6.32/drivers/ata/pata_bf54x.c linux-2.6.32/drivers/ata/pata_bf54x.c +--- linux-2.6.32/drivers/ata/pata_bf54x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_bf54x.c 2009-12-04 21:40:48.084712658 -0500 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -18510,9 +18968,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_bf54x.c linux-2.6.31.7/drivers/ata/pa .inherits = &ata_sff_port_ops, .set_piomode = bfin_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cmd640.c linux-2.6.31.7/drivers/ata/pata_cmd640.c ---- linux-2.6.31.7/drivers/ata/pata_cmd640.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cmd640.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cmd640.c linux-2.6.32/drivers/ata/pata_cmd640.c +--- linux-2.6.32/drivers/ata/pata_cmd640.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cmd640.c 2009-12-04 21:40:48.084712658 -0500 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18522,9 +18980,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cmd640.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, /* In theory xfer_noirq is not needed once we kill the prefetcher */ .sff_data_xfer = ata_sff_data_xfer_noirq, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cmd64x.c linux-2.6.31.7/drivers/ata/pata_cmd64x.c ---- linux-2.6.31.7/drivers/ata/pata_cmd64x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cmd64x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cmd64x.c linux-2.6.32/drivers/ata/pata_cmd64x.c +--- linux-2.6.32/drivers/ata/pata_cmd64x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cmd64x.c 2009-12-04 21:40:48.085620801 -0500 @@ -275,18 +275,18 @@ static const struct ata_port_operations .set_dmamode = cmd64x_set_dmamode, }; @@ -18547,9 +19005,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cmd64x.c linux-2.6.31.7/drivers/ata/p .inherits = &cmd64x_base_ops, .bmdma_stop = cmd648_bmdma_stop, .cable_detect = cmd648_cable_detect, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5520.c linux-2.6.31.7/drivers/ata/pata_cs5520.c ---- linux-2.6.31.7/drivers/ata/pata_cs5520.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cs5520.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cs5520.c linux-2.6.32/drivers/ata/pata_cs5520.c +--- linux-2.6.32/drivers/ata/pata_cs5520.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cs5520.c 2009-12-04 21:40:48.085620801 -0500 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18559,9 +19017,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5520.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5530.c linux-2.6.31.7/drivers/ata/pata_cs5530.c ---- linux-2.6.31.7/drivers/ata/pata_cs5530.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cs5530.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cs5530.c linux-2.6.32/drivers/ata/pata_cs5530.c +--- linux-2.6.32/drivers/ata/pata_cs5530.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cs5530.c 2009-12-04 21:40:48.085620801 -0500 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -18571,9 +19029,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5530.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5535.c linux-2.6.31.7/drivers/ata/pata_cs5535.c ---- linux-2.6.31.7/drivers/ata/pata_cs5535.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cs5535.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cs5535.c linux-2.6.32/drivers/ata/pata_cs5535.c +--- linux-2.6.32/drivers/ata/pata_cs5535.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cs5535.c 2009-12-04 21:40:48.085620801 -0500 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18583,9 +19041,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5535.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = cs5535_cable_detect, .set_piomode = cs5535_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5536.c linux-2.6.31.7/drivers/ata/pata_cs5536.c ---- linux-2.6.31.7/drivers/ata/pata_cs5536.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cs5536.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cs5536.c linux-2.6.32/drivers/ata/pata_cs5536.c +--- linux-2.6.32/drivers/ata/pata_cs5536.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cs5536.c 2009-12-04 21:40:48.086708470 -0500 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18595,9 +19053,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cs5536.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = cs5536_cable_detect, .set_piomode = cs5536_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_cypress.c linux-2.6.31.7/drivers/ata/pata_cypress.c ---- linux-2.6.31.7/drivers/ata/pata_cypress.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_cypress.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_cypress.c linux-2.6.32/drivers/ata/pata_cypress.c +--- linux-2.6.32/drivers/ata/pata_cypress.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_cypress.c 2009-12-04 21:40:48.086708470 -0500 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 ATA_BMDMA_SHT(DRV_NAME), }; @@ -18607,9 +19065,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_cypress.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = cy82c693_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_efar.c linux-2.6.31.7/drivers/ata/pata_efar.c ---- linux-2.6.31.7/drivers/ata/pata_efar.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_efar.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_efar.c linux-2.6.32/drivers/ata/pata_efar.c +--- linux-2.6.32/drivers/ata/pata_efar.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_efar.c 2009-12-04 21:40:48.088622537 -0500 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -18619,9 +19077,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_efar.c linux-2.6.31.7/drivers/ata/pat .inherits = &ata_bmdma_port_ops, .cable_detect = efar_cable_detect, .set_piomode = efar_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt366.c linux-2.6.31.7/drivers/ata/pata_hpt366.c ---- linux-2.6.31.7/drivers/ata/pata_hpt366.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_hpt366.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_hpt366.c linux-2.6.32/drivers/ata/pata_hpt366.c +--- linux-2.6.32/drivers/ata/pata_hpt366.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_hpt366.c 2009-12-04 21:40:48.088622537 -0500 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ * Configuration for HPT366/68 */ @@ -18631,9 +19089,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt366.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = hpt36x_cable_detect, .mode_filter = hpt366_filter, -diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt37x.c linux-2.6.31.7/drivers/ata/pata_hpt37x.c ---- linux-2.6.31.7/drivers/ata/pata_hpt37x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_hpt37x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_hpt37x.c linux-2.6.32/drivers/ata/pata_hpt37x.c +--- linux-2.6.32/drivers/ata/pata_hpt37x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_hpt37x.c 2009-12-04 21:40:48.089650325 -0500 @@ -578,7 +578,7 @@ static struct scsi_host_template hpt37x_ * Configuration for HPT370 */ @@ -18670,9 +19128,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt37x.c linux-2.6.31.7/drivers/ata/p .inherits = &hpt372_port_ops, .prereset = hpt374_fn1_pre_reset, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt3x2n.c linux-2.6.31.7/drivers/ata/pata_hpt3x2n.c ---- linux-2.6.31.7/drivers/ata/pata_hpt3x2n.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_hpt3x2n.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_hpt3x2n.c linux-2.6.32/drivers/ata/pata_hpt3x2n.c +--- linux-2.6.32/drivers/ata/pata_hpt3x2n.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_hpt3x2n.c 2009-12-04 21:40:48.089650325 -0500 @@ -334,7 +334,7 @@ static struct scsi_host_template hpt3x2n * Configuration for HPT3x2n. */ @@ -18682,9 +19140,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt3x2n.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_stop = hpt3x2n_bmdma_stop, -diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt3x3.c linux-2.6.31.7/drivers/ata/pata_hpt3x3.c ---- linux-2.6.31.7/drivers/ata/pata_hpt3x3.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_hpt3x3.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_hpt3x3.c linux-2.6.32/drivers/ata/pata_hpt3x3.c +--- linux-2.6.32/drivers/ata/pata_hpt3x3.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_hpt3x3.c 2009-12-04 21:40:48.090727983 -0500 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18694,9 +19152,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_hpt3x3.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = hpt3x3_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_icside.c linux-2.6.31.7/drivers/ata/pata_icside.c ---- linux-2.6.31.7/drivers/ata/pata_icside.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_icside.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_icside.c linux-2.6.32/drivers/ata/pata_icside.c +--- linux-2.6.32/drivers/ata/pata_icside.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_icside.c 2009-12-04 21:40:48.090727983 -0500 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct } } @@ -18706,9 +19164,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_icside.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_sff_port_ops, /* no need to build any PRD tables for DMA */ .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.31.7/drivers/ata/pata_isapnp.c linux-2.6.31.7/drivers/ata/pata_isapnp.c ---- linux-2.6.31.7/drivers/ata/pata_isapnp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_isapnp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_isapnp.c linux-2.6.32/drivers/ata/pata_isapnp.c +--- linux-2.6.32/drivers/ata/pata_isapnp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_isapnp.c 2009-12-04 21:40:48.090727983 -0500 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ ATA_PIO_SHT(DRV_NAME), }; @@ -18724,9 +19182,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_isapnp.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, /* No altstatus so we don't want to use the lost interrupt poll */ -diff -urNp linux-2.6.31.7/drivers/ata/pata_it8213.c linux-2.6.31.7/drivers/ata/pata_it8213.c ---- linux-2.6.31.7/drivers/ata/pata_it8213.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_it8213.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_it8213.c linux-2.6.32/drivers/ata/pata_it8213.c +--- linux-2.6.32/drivers/ata/pata_it8213.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_it8213.c 2009-12-04 21:40:48.091639894 -0500 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ }; @@ -18736,9 +19194,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_it8213.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .cable_detect = it8213_cable_detect, .set_piomode = it8213_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_it821x.c linux-2.6.31.7/drivers/ata/pata_it821x.c ---- linux-2.6.31.7/drivers/ata/pata_it821x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_it821x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_it821x.c linux-2.6.32/drivers/ata/pata_it821x.c +--- linux-2.6.32/drivers/ata/pata_it821x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_it821x.c 2009-12-04 21:40:48.091639894 -0500 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -18766,9 +19224,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_it821x.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .check_atapi_dma= it821x_check_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.31.7/drivers/ata/pata_ixp4xx_cf.c ---- linux-2.6.31.7/drivers/ata/pata_ixp4xx_cf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_ixp4xx_cf.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32/drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32/drivers/ata/pata_ixp4xx_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_ixp4xx_cf.c 2009-12-04 21:40:48.091639894 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ ATA_PIO_SHT(DRV_NAME), }; @@ -18778,9 +19236,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_ixp4xx_cf.c linux-2.6.31.7/drivers/at .inherits = &ata_sff_port_ops, .sff_data_xfer = ixp4xx_mmio_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_jmicron.c linux-2.6.31.7/drivers/ata/pata_jmicron.c ---- linux-2.6.31.7/drivers/ata/pata_jmicron.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_jmicron.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_jmicron.c linux-2.6.32/drivers/ata/pata_jmicron.c +--- linux-2.6.32/drivers/ata/pata_jmicron.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_jmicron.c 2009-12-04 21:40:48.092716441 -0500 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron ATA_BMDMA_SHT(DRV_NAME), }; @@ -18790,9 +19248,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_jmicron.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .prereset = jmicron_pre_reset, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_legacy.c linux-2.6.31.7/drivers/ata/pata_legacy.c ---- linux-2.6.31.7/drivers/ata/pata_legacy.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_legacy.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_legacy.c linux-2.6.32/drivers/ata/pata_legacy.c +--- linux-2.6.32/drivers/ata/pata_legacy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_legacy.c 2009-12-04 21:40:48.093714975 -0500 @@ -106,7 +106,7 @@ struct legacy_probe { struct legacy_controller { @@ -18904,9 +19362,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_legacy.c linux-2.6.31.7/drivers/ata/p struct legacy_data *ld = &legacy_data[probe->slot]; struct ata_host *host = NULL; struct ata_port *ap; -diff -urNp linux-2.6.31.7/drivers/ata/pata_marvell.c linux-2.6.31.7/drivers/ata/pata_marvell.c ---- linux-2.6.31.7/drivers/ata/pata_marvell.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_marvell.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_marvell.c linux-2.6.32/drivers/ata/pata_marvell.c +--- linux-2.6.32/drivers/ata/pata_marvell.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_marvell.c 2009-12-04 21:40:48.093714975 -0500 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell ATA_BMDMA_SHT(DRV_NAME), }; @@ -18916,9 +19374,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_marvell.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = marvell_cable_detect, .prereset = marvell_pre_reset, -diff -urNp linux-2.6.31.7/drivers/ata/pata_mpc52xx.c linux-2.6.31.7/drivers/ata/pata_mpc52xx.c ---- linux-2.6.31.7/drivers/ata/pata_mpc52xx.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_mpc52xx.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_mpc52xx.c linux-2.6.32/drivers/ata/pata_mpc52xx.c +--- linux-2.6.32/drivers/ata/pata_mpc52xx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_mpc52xx.c 2009-12-04 21:40:48.093714975 -0500 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx ATA_PIO_SHT(DRV_NAME), }; @@ -18928,9 +19386,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_mpc52xx.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_sff_port_ops, .sff_dev_select = mpc52xx_ata_dev_select, .set_piomode = mpc52xx_ata_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_mpiix.c linux-2.6.31.7/drivers/ata/pata_mpiix.c ---- linux-2.6.31.7/drivers/ata/pata_mpiix.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_mpiix.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_mpiix.c linux-2.6.32/drivers/ata/pata_mpiix.c +--- linux-2.6.32/drivers/ata/pata_mpiix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_mpiix.c 2009-12-04 21:40:48.094711293 -0500 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s ATA_PIO_SHT(DRV_NAME), }; @@ -18940,9 +19398,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_mpiix.c linux-2.6.31.7/drivers/ata/pa .inherits = &ata_sff_port_ops, .qc_issue = mpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_netcell.c linux-2.6.31.7/drivers/ata/pata_netcell.c ---- linux-2.6.31.7/drivers/ata/pata_netcell.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_netcell.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_netcell.c linux-2.6.32/drivers/ata/pata_netcell.c +--- linux-2.6.32/drivers/ata/pata_netcell.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_netcell.c 2009-12-04 21:40:48.094711293 -0500 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell ATA_BMDMA_SHT(DRV_NAME), }; @@ -18952,9 +19410,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_netcell.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_80wire, .read_id = netcell_read_id, -diff -urNp linux-2.6.31.7/drivers/ata/pata_ninja32.c linux-2.6.31.7/drivers/ata/pata_ninja32.c ---- linux-2.6.31.7/drivers/ata/pata_ninja32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_ninja32.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_ninja32.c linux-2.6.32/drivers/ata/pata_ninja32.c +--- linux-2.6.32/drivers/ata/pata_ninja32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_ninja32.c 2009-12-04 21:40:48.094711293 -0500 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 ATA_BMDMA_SHT(DRV_NAME), }; @@ -18964,9 +19422,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_ninja32.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .sff_dev_select = ninja32_dev_select, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_ns87410.c linux-2.6.31.7/drivers/ata/pata_ns87410.c ---- linux-2.6.31.7/drivers/ata/pata_ns87410.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_ns87410.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_ns87410.c linux-2.6.32/drivers/ata/pata_ns87410.c +--- linux-2.6.32/drivers/ata/pata_ns87410.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_ns87410.c 2009-12-04 21:40:48.094711293 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 ATA_PIO_SHT(DRV_NAME), }; @@ -18976,9 +19434,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_ns87410.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_sff_port_ops, .qc_issue = ns87410_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_ns87415.c linux-2.6.31.7/drivers/ata/pata_ns87415.c ---- linux-2.6.31.7/drivers/ata/pata_ns87415.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_ns87415.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_ns87415.c linux-2.6.32/drivers/ata/pata_ns87415.c +--- linux-2.6.32/drivers/ata/pata_ns87415.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_ns87415.c 2009-12-04 21:40:48.095714705 -0500 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at } #endif /* 87560 SuperIO Support */ @@ -18997,9 +19455,20 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_ns87415.c linux-2.6.31.7/drivers/ata/ .inherits = &ns87415_pata_ops, .sff_tf_read = ns87560_tf_read, .sff_check_status = ns87560_check_status, -diff -urNp linux-2.6.31.7/drivers/ata/pata_oldpiix.c linux-2.6.31.7/drivers/ata/pata_oldpiix.c ---- linux-2.6.31.7/drivers/ata/pata_oldpiix.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_oldpiix.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_octeon_cf.c linux-2.6.32/drivers/ata/pata_octeon_cf.c +--- linux-2.6.32/drivers/ata/pata_octeon_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_octeon_cf.c 2009-12-04 21:40:48.095714705 -0500 +@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s + return 0; + } + ++/* cannot be const */ + static struct ata_port_operations octeon_cf_ops = { + .inherits = &ata_sff_port_ops, + .check_atapi_dma = octeon_cf_check_atapi_dma, +diff -urNp linux-2.6.32/drivers/ata/pata_oldpiix.c linux-2.6.32/drivers/ata/pata_oldpiix.c +--- linux-2.6.32/drivers/ata/pata_oldpiix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_oldpiix.c 2009-12-04 21:40:48.095714705 -0500 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix ATA_BMDMA_SHT(DRV_NAME), }; @@ -19009,9 +19478,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_oldpiix.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = oldpiix_qc_issue, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_opti.c linux-2.6.31.7/drivers/ata/pata_opti.c ---- linux-2.6.31.7/drivers/ata/pata_opti.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_opti.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_opti.c linux-2.6.32/drivers/ata/pata_opti.c +--- linux-2.6.32/drivers/ata/pata_opti.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_opti.c 2009-12-04 21:40:48.095714705 -0500 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh ATA_PIO_SHT(DRV_NAME), }; @@ -19021,9 +19490,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_opti.c linux-2.6.31.7/drivers/ata/pat .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_piomode = opti_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_optidma.c linux-2.6.31.7/drivers/ata/pata_optidma.c ---- linux-2.6.31.7/drivers/ata/pata_optidma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_optidma.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_optidma.c linux-2.6.32/drivers/ata/pata_optidma.c +--- linux-2.6.32/drivers/ata/pata_optidma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_optidma.c 2009-12-04 21:40:48.096714211 -0500 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma ATA_BMDMA_SHT(DRV_NAME), }; @@ -19042,9 +19511,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_optidma.c linux-2.6.31.7/drivers/ata/ .inherits = &optidma_port_ops, .set_piomode = optiplus_set_pio_mode, .set_dmamode = optiplus_set_dma_mode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_palmld.c linux-2.6.31.7/drivers/ata/pata_palmld.c ---- linux-2.6.31.7/drivers/ata/pata_palmld.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_palmld.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_palmld.c linux-2.6.32/drivers/ata/pata_palmld.c +--- linux-2.6.32/drivers/ata/pata_palmld.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_palmld.c 2009-12-04 21:40:48.096714211 -0500 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ ATA_PIO_SHT(DRV_NAME), }; @@ -19054,9 +19523,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_palmld.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pata_pcmcia.c linux-2.6.31.7/drivers/ata/pata_pcmcia.c ---- linux-2.6.31.7/drivers/ata/pata_pcmcia.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_pcmcia.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_pcmcia.c linux-2.6.32/drivers/ata/pata_pcmcia.c +--- linux-2.6.32/drivers/ata/pata_pcmcia.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_pcmcia.c 2009-12-04 21:40:48.096714211 -0500 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ ATA_PIO_SHT(DRV_NAME), }; @@ -19083,9 +19552,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_pcmcia.c linux-2.6.31.7/drivers/ata/p info = kzalloc(sizeof(*info), GFP_KERNEL); if (info == NULL) -diff -urNp linux-2.6.31.7/drivers/ata/pata_pdc2027x.c linux-2.6.31.7/drivers/ata/pata_pdc2027x.c ---- linux-2.6.31.7/drivers/ata/pata_pdc2027x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_pdc2027x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_pdc2027x.c linux-2.6.32/drivers/ata/pata_pdc2027x.c +--- linux-2.6.32/drivers/ata/pata_pdc2027x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_pdc2027x.c 2009-12-04 21:40:48.097711855 -0500 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 ATA_BMDMA_SHT(DRV_NAME), }; @@ -19103,9 +19572,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_pdc2027x.c linux-2.6.31.7/drivers/ata .inherits = &pdc2027x_pata100_ops, .mode_filter = pdc2027x_mode_filter, .set_piomode = pdc2027x_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.31.7/drivers/ata/pata_pdc202xx_old.c ---- linux-2.6.31.7/drivers/ata/pata_pdc202xx_old.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_pdc202xx_old.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_pdc202xx_old.c linux-2.6.32/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32/drivers/ata/pata_pdc202xx_old.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_pdc202xx_old.c 2009-12-04 21:40:48.097711855 -0500 @@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x ATA_BMDMA_SHT(DRV_NAME), }; @@ -19124,9 +19593,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_pdc202xx_old.c linux-2.6.31.7/drivers .inherits = &pdc2024x_port_ops, .check_atapi_dma = pdc2026x_check_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/pata_platform.c linux-2.6.31.7/drivers/ata/pata_platform.c ---- linux-2.6.31.7/drivers/ata/pata_platform.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_platform.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_platform.c linux-2.6.32/drivers/ata/pata_platform.c +--- linux-2.6.32/drivers/ata/pata_platform.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_platform.c 2009-12-04 21:40:48.098715977 -0500 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl ATA_PIO_SHT(DRV_NAME), }; @@ -19136,9 +19605,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_platform.c linux-2.6.31.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.31.7/drivers/ata/pata_qdi.c linux-2.6.31.7/drivers/ata/pata_qdi.c ---- linux-2.6.31.7/drivers/ata/pata_qdi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_qdi.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_qdi.c linux-2.6.32/drivers/ata/pata_qdi.c +--- linux-2.6.32/drivers/ata/pata_qdi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_qdi.c 2009-12-04 21:40:48.098715977 -0500 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht ATA_PIO_SHT(DRV_NAME), }; @@ -19157,9 +19626,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_qdi.c linux-2.6.31.7/drivers/ata/pata .inherits = &qdi6500_port_ops, .set_piomode = qdi6580_set_piomode, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_radisys.c linux-2.6.31.7/drivers/ata/pata_radisys.c ---- linux-2.6.31.7/drivers/ata/pata_radisys.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_radisys.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_radisys.c linux-2.6.32/drivers/ata/pata_radisys.c +--- linux-2.6.32/drivers/ata/pata_radisys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_radisys.c 2009-12-04 21:40:48.098715977 -0500 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys ATA_BMDMA_SHT(DRV_NAME), }; @@ -19169,9 +19638,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_radisys.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .qc_issue = radisys_qc_issue, .cable_detect = ata_cable_unknown, -diff -urNp linux-2.6.31.7/drivers/ata/pata_rb532_cf.c linux-2.6.31.7/drivers/ata/pata_rb532_cf.c ---- linux-2.6.31.7/drivers/ata/pata_rb532_cf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_rb532_cf.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_rb532_cf.c linux-2.6.32/drivers/ata/pata_rb532_cf.c +--- linux-2.6.32/drivers/ata/pata_rb532_cf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_rb532_cf.c 2009-12-04 21:40:48.098715977 -0500 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle return IRQ_HANDLED; } @@ -19181,9 +19650,21 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_rb532_cf.c linux-2.6.31.7/drivers/ata .inherits = &ata_sff_port_ops, .sff_data_xfer = ata_sff_data_xfer32, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_rz1000.c linux-2.6.31.7/drivers/ata/pata_rz1000.c ---- linux-2.6.31.7/drivers/ata/pata_rz1000.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_rz1000.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_rdc.c linux-2.6.32/drivers/ata/pata_rdc.c +--- linux-2.6.32/drivers/ata/pata_rdc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_rdc.c 2009-12-04 21:40:48.099711735 -0500 +@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p + pci_write_config_byte(dev, 0x48, udma_enable); + } + +-static struct ata_port_operations rdc_pata_ops = { ++static const struct ata_port_operations rdc_pata_ops = { + .inherits = &ata_bmdma32_port_ops, + .cable_detect = rdc_pata_cable_detect, + .set_piomode = rdc_set_piomode, +diff -urNp linux-2.6.32/drivers/ata/pata_rz1000.c linux-2.6.32/drivers/ata/pata_rz1000.c +--- linux-2.6.32/drivers/ata/pata_rz1000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_rz1000.c 2009-12-04 21:40:48.099711735 -0500 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ ATA_PIO_SHT(DRV_NAME), }; @@ -19193,9 +19674,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_rz1000.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_sff_port_ops, .cable_detect = ata_cable_40wire, .set_mode = rz1000_set_mode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_sc1200.c linux-2.6.31.7/drivers/ata/pata_sc1200.c ---- linux-2.6.31.7/drivers/ata/pata_sc1200.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_sc1200.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_sc1200.c linux-2.6.32/drivers/ata/pata_sc1200.c +--- linux-2.6.32/drivers/ata/pata_sc1200.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_sc1200.c 2009-12-04 21:40:48.099711735 -0500 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ .sg_tablesize = LIBATA_DUMB_MAX_PRD, }; @@ -19205,9 +19686,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_sc1200.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma_port_ops, .qc_prep = ata_sff_dumb_qc_prep, .qc_issue = sc1200_qc_issue, -diff -urNp linux-2.6.31.7/drivers/ata/pata_scc.c linux-2.6.31.7/drivers/ata/pata_scc.c ---- linux-2.6.31.7/drivers/ata/pata_scc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_scc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_scc.c linux-2.6.32/drivers/ata/pata_scc.c +--- linux-2.6.32/drivers/ata/pata_scc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_scc.c 2009-12-04 21:40:48.100693877 -0500 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19217,9 +19698,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_scc.c linux-2.6.31.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .set_piomode = scc_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_sch.c linux-2.6.31.7/drivers/ata/pata_sch.c ---- linux-2.6.31.7/drivers/ata/pata_sch.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_sch.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_sch.c linux-2.6.32/drivers/ata/pata_sch.c +--- linux-2.6.32/drivers/ata/pata_sch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_sch.c 2009-12-04 21:40:48.100693877 -0500 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19229,9 +19710,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_sch.c linux-2.6.31.7/drivers/ata/pata .inherits = &ata_bmdma_port_ops, .cable_detect = ata_cable_unknown, .set_piomode = sch_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_serverworks.c linux-2.6.31.7/drivers/ata/pata_serverworks.c ---- linux-2.6.31.7/drivers/ata/pata_serverworks.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_serverworks.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_serverworks.c linux-2.6.32/drivers/ata/pata_serverworks.c +--- linux-2.6.32/drivers/ata/pata_serverworks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_serverworks.c 2009-12-04 21:40:48.101670693 -0500 @@ -299,7 +299,7 @@ static struct scsi_host_template serverw ATA_BMDMA_SHT(DRV_NAME), }; @@ -19250,9 +19731,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_serverworks.c linux-2.6.31.7/drivers/ .inherits = &serverworks_osb4_port_ops, .mode_filter = serverworks_csb_filter, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_sil680.c linux-2.6.31.7/drivers/ata/pata_sil680.c ---- linux-2.6.31.7/drivers/ata/pata_sil680.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_sil680.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_sil680.c linux-2.6.32/drivers/ata/pata_sil680.c +--- linux-2.6.32/drivers/ata/pata_sil680.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_sil680.c 2009-12-04 21:40:48.101670693 -0500 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -19262,9 +19743,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_sil680.c linux-2.6.31.7/drivers/ata/p .inherits = &ata_bmdma32_port_ops, .cable_detect = sil680_cable_detect, .set_piomode = sil680_set_piomode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_sis.c linux-2.6.31.7/drivers/ata/pata_sis.c ---- linux-2.6.31.7/drivers/ata/pata_sis.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_sis.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_sis.c linux-2.6.32/drivers/ata/pata_sis.c +--- linux-2.6.32/drivers/ata/pata_sis.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_sis.c 2009-12-04 21:40:48.101670693 -0500 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19320,9 +19801,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_sis.c linux-2.6.31.7/drivers/ata/pata .inherits = &sis_base_ops, .set_piomode = sis_old_set_piomode, .set_dmamode = sis_old_set_dmamode, -diff -urNp linux-2.6.31.7/drivers/ata/pata_sl82c105.c linux-2.6.31.7/drivers/ata/pata_sl82c105.c ---- linux-2.6.31.7/drivers/ata/pata_sl82c105.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_sl82c105.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_sl82c105.c linux-2.6.32/drivers/ata/pata_sl82c105.c +--- linux-2.6.32/drivers/ata/pata_sl82c105.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_sl82c105.c 2009-12-04 21:40:48.101670693 -0500 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 ATA_BMDMA_SHT(DRV_NAME), }; @@ -19332,9 +19813,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_sl82c105.c linux-2.6.31.7/drivers/ata .inherits = &ata_bmdma_port_ops, .qc_defer = sl82c105_qc_defer, .bmdma_start = sl82c105_bmdma_start, -diff -urNp linux-2.6.31.7/drivers/ata/pata_triflex.c linux-2.6.31.7/drivers/ata/pata_triflex.c ---- linux-2.6.31.7/drivers/ata/pata_triflex.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_triflex.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_triflex.c linux-2.6.32/drivers/ata/pata_triflex.c +--- linux-2.6.32/drivers/ata/pata_triflex.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_triflex.c 2009-12-04 21:40:48.102710925 -0500 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex ATA_BMDMA_SHT(DRV_NAME), }; @@ -19344,9 +19825,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_triflex.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_bmdma_port_ops, .bmdma_start = triflex_bmdma_start, .bmdma_stop = triflex_bmdma_stop, -diff -urNp linux-2.6.31.7/drivers/ata/pata_via.c linux-2.6.31.7/drivers/ata/pata_via.c ---- linux-2.6.31.7/drivers/ata/pata_via.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_via.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_via.c linux-2.6.32/drivers/ata/pata_via.c +--- linux-2.6.32/drivers/ata/pata_via.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_via.c 2009-12-04 21:40:48.102710925 -0500 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19365,9 +19846,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_via.c linux-2.6.31.7/drivers/ata/pata .inherits = &via_port_ops, .sff_data_xfer = ata_sff_data_xfer_noirq, }; -diff -urNp linux-2.6.31.7/drivers/ata/pata_winbond.c linux-2.6.31.7/drivers/ata/pata_winbond.c ---- linux-2.6.31.7/drivers/ata/pata_winbond.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pata_winbond.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pata_winbond.c linux-2.6.32/drivers/ata/pata_winbond.c +--- linux-2.6.32/drivers/ata/pata_winbond.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pata_winbond.c 2009-12-04 21:40:48.111677567 -0500 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond ATA_PIO_SHT(DRV_NAME), }; @@ -19377,9 +19858,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/pata_winbond.c linux-2.6.31.7/drivers/ata/ .inherits = &ata_sff_port_ops, .sff_data_xfer = winbond_data_xfer, .cable_detect = ata_cable_40wire, -diff -urNp linux-2.6.31.7/drivers/ata/pdc_adma.c linux-2.6.31.7/drivers/ata/pdc_adma.c ---- linux-2.6.31.7/drivers/ata/pdc_adma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/pdc_adma.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/pdc_adma.c linux-2.6.32/drivers/ata/pdc_adma.c +--- linux-2.6.32/drivers/ata/pdc_adma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/pdc_adma.c 2009-12-04 21:40:48.111677567 -0500 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_at .dma_boundary = ADMA_DMA_BOUNDARY, }; @@ -19389,10 +19870,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/pdc_adma.c linux-2.6.31.7/drivers/ata/pdc_ .inherits = &ata_sff_port_ops, .lost_interrupt = ATA_OP_NULL, -diff -urNp linux-2.6.31.7/drivers/ata/sata_fsl.c linux-2.6.31.7/drivers/ata/sata_fsl.c ---- linux-2.6.31.7/drivers/ata/sata_fsl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_fsl.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1254,7 +1254,7 @@ static struct scsi_host_template sata_fs +diff -urNp linux-2.6.32/drivers/ata/sata_fsl.c linux-2.6.32/drivers/ata/sata_fsl.c +--- linux-2.6.32/drivers/ata/sata_fsl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_fsl.c 2009-12-04 21:40:48.112723942 -0500 +@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -19400,10 +19881,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_fsl.c linux-2.6.31.7/drivers/ata/sata +static const struct ata_port_operations sata_fsl_ops = { .inherits = &sata_pmp_port_ops, - .qc_prep = sata_fsl_qc_prep, -diff -urNp linux-2.6.31.7/drivers/ata/sata_inic162x.c linux-2.6.31.7/drivers/ata/sata_inic162x.c ---- linux-2.6.31.7/drivers/ata/sata_inic162x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_inic162x.c 2009-12-10 22:15:16.000000000 -0500 + .qc_defer = ata_std_qc_defer, +diff -urNp linux-2.6.32/drivers/ata/sata_inic162x.c linux-2.6.32/drivers/ata/sata_inic162x.c +--- linux-2.6.32/drivers/ata/sata_inic162x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_inic162x.c 2009-12-04 21:40:48.112723942 -0500 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po return 0; } @@ -19413,9 +19894,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_inic162x.c linux-2.6.31.7/drivers/ata .inherits = &sata_port_ops, .check_atapi_dma = inic_check_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/sata_mv.c linux-2.6.31.7/drivers/ata/sata_mv.c ---- linux-2.6.31.7/drivers/ata/sata_mv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_mv.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_mv.c linux-2.6.32/drivers/ata/sata_mv.c +--- linux-2.6.32/drivers/ata/sata_mv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_mv.c 2009-12-04 21:40:48.114634277 -0500 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht .dma_boundary = MV_DMA_BOUNDARY, }; @@ -19443,9 +19924,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_mv.c linux-2.6.31.7/drivers/ata/sata_ .inherits = &mv6_ops, .dev_config = ATA_OP_NULL, .qc_prep = mv_qc_prep_iie, -diff -urNp linux-2.6.31.7/drivers/ata/sata_nv.c linux-2.6.31.7/drivers/ata/sata_nv.c ---- linux-2.6.31.7/drivers/ata/sata_nv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_nv.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_nv.c linux-2.6.32/drivers/ata/sata_nv.c +--- linux-2.6.32/drivers/ata/sata_nv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_nv.c 2009-12-04 21:40:48.114634277 -0500 @@ -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. @@ -19488,10 +19969,10 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_nv.c linux-2.6.31.7/drivers/ata/sata_ .inherits = &nv_generic_ops, .qc_defer = ata_std_qc_defer, -diff -urNp linux-2.6.31.7/drivers/ata/sata_promise.c linux-2.6.31.7/drivers/ata/sata_promise.c ---- linux-2.6.31.7/drivers/ata/sata_promise.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_promise.c 2009-12-10 22:15:16.000000000 -0500 -@@ -184,7 +184,7 @@ static const struct ata_port_operations +diff -urNp linux-2.6.32/drivers/ata/sata_promise.c linux-2.6.32/drivers/ata/sata_promise.c +--- linux-2.6.32/drivers/ata/sata_promise.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_promise.c 2009-12-04 21:40:48.115715485 -0500 +@@ -195,7 +195,7 @@ static const struct ata_port_operations .error_handler = pdc_error_handler, }; @@ -19500,13 +19981,15 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_promise.c linux-2.6.31.7/drivers/ata/ .inherits = &pdc_common_ops, .cable_detect = pdc_sata_cable_detect, .freeze = pdc_sata_freeze, -@@ -196,12 +196,12 @@ static struct ata_port_operations pdc_sa - }; +@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sa - /* First-generation chips need a more restrictive ->check_atapi_dma op */ + /* First-generation chips need a more restrictive ->check_atapi_dma op, + and ->freeze/thaw that ignore the hotplug controls. */ -static struct ata_port_operations pdc_old_sata_ops = { +static const struct ata_port_operations pdc_old_sata_ops = { .inherits = &pdc_sata_ops, + .freeze = pdc_freeze, + .thaw = pdc_thaw, .check_atapi_dma = pdc_old_sata_check_atapi_dma, }; @@ -19515,9 +19998,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_promise.c linux-2.6.31.7/drivers/ata/ .inherits = &pdc_common_ops, .cable_detect = pdc_pata_cable_detect, .freeze = pdc_freeze, -diff -urNp linux-2.6.31.7/drivers/ata/sata_qstor.c linux-2.6.31.7/drivers/ata/sata_qstor.c ---- linux-2.6.31.7/drivers/ata/sata_qstor.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_qstor.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_qstor.c linux-2.6.32/drivers/ata/sata_qstor.c +--- linux-2.6.32/drivers/ata/sata_qstor.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_qstor.c 2009-12-04 21:40:48.115715485 -0500 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ .dma_boundary = QS_DMA_BOUNDARY, }; @@ -19527,21 +20010,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_qstor.c linux-2.6.31.7/drivers/ata/sa .inherits = &ata_sff_port_ops, .check_atapi_dma = qs_check_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/sata_sil.c linux-2.6.31.7/drivers/ata/sata_sil.c ---- linux-2.6.31.7/drivers/ata/sata_sil.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_sil.c 2009-12-10 22:15:16.000000000 -0500 -@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht - .sg_tablesize = ATA_MAX_PRD - }; - --static struct ata_port_operations sil_ops = { -+static const struct ata_port_operations sil_ops = { - .inherits = &ata_bmdma32_port_ops, - .dev_config = sil_dev_config, - .set_mode = sil_set_mode, -diff -urNp linux-2.6.31.7/drivers/ata/sata_sil24.c linux-2.6.31.7/drivers/ata/sata_sil24.c ---- linux-2.6.31.7/drivers/ata/sata_sil24.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_sil24.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_sil24.c linux-2.6.32/drivers/ata/sata_sil24.c +--- linux-2.6.32/drivers/ata/sata_sil24.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_sil24.c 2009-12-04 21:40:48.116716011 -0500 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s .dma_boundary = ATA_DMA_BOUNDARY, }; @@ -19551,9 +20022,21 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_sil24.c linux-2.6.31.7/drivers/ata/sa .inherits = &sata_pmp_port_ops, .qc_defer = sil24_qc_defer, -diff -urNp linux-2.6.31.7/drivers/ata/sata_sis.c linux-2.6.31.7/drivers/ata/sata_sis.c ---- linux-2.6.31.7/drivers/ata/sata_sis.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_sis.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_sil.c linux-2.6.32/drivers/ata/sata_sil.c +--- linux-2.6.32/drivers/ata/sata_sil.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_sil.c 2009-12-04 21:40:48.116716011 -0500 +@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht + .sg_tablesize = ATA_MAX_PRD + }; + +-static struct ata_port_operations sil_ops = { ++static const struct ata_port_operations sil_ops = { + .inherits = &ata_bmdma32_port_ops, + .dev_config = sil_dev_config, + .set_mode = sil_set_mode, +diff -urNp linux-2.6.32/drivers/ata/sata_sis.c linux-2.6.32/drivers/ata/sata_sis.c +--- linux-2.6.32/drivers/ata/sata_sis.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_sis.c 2009-12-04 21:40:48.117718737 -0500 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19563,9 +20046,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_sis.c linux-2.6.31.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = sis_scr_read, .scr_write = sis_scr_write, -diff -urNp linux-2.6.31.7/drivers/ata/sata_svw.c linux-2.6.31.7/drivers/ata/sata_svw.c ---- linux-2.6.31.7/drivers/ata/sata_svw.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_svw.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_svw.c linux-2.6.32/drivers/ata/sata_svw.c +--- linux-2.6.32/drivers/ata/sata_svw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_svw.c 2009-12-04 21:40:48.117718737 -0500 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata }; @@ -19575,9 +20058,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_svw.c linux-2.6.31.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .sff_tf_load = k2_sata_tf_load, .sff_tf_read = k2_sata_tf_read, -diff -urNp linux-2.6.31.7/drivers/ata/sata_sx4.c linux-2.6.31.7/drivers/ata/sata_sx4.c ---- linux-2.6.31.7/drivers/ata/sata_sx4.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_sx4.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_sx4.c linux-2.6.32/drivers/ata/sata_sx4.c +--- linux-2.6.32/drivers/ata/sata_sx4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_sx4.c 2009-12-04 21:40:48.118652887 -0500 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat }; @@ -19587,9 +20070,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_sx4.c linux-2.6.31.7/drivers/ata/sata .inherits = &ata_sff_port_ops, .check_atapi_dma = pdc_check_atapi_dma, -diff -urNp linux-2.6.31.7/drivers/ata/sata_uli.c linux-2.6.31.7/drivers/ata/sata_uli.c ---- linux-2.6.31.7/drivers/ata/sata_uli.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_uli.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_uli.c linux-2.6.32/drivers/ata/sata_uli.c +--- linux-2.6.32/drivers/ata/sata_uli.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_uli.c 2009-12-04 21:40:48.118652887 -0500 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht ATA_BMDMA_SHT(DRV_NAME), }; @@ -19599,9 +20082,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_uli.c linux-2.6.31.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, .scr_read = uli_scr_read, .scr_write = uli_scr_write, -diff -urNp linux-2.6.31.7/drivers/ata/sata_via.c linux-2.6.31.7/drivers/ata/sata_via.c ---- linux-2.6.31.7/drivers/ata/sata_via.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_via.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_via.c linux-2.6.32/drivers/ata/sata_via.c +--- linux-2.6.32/drivers/ata/sata_via.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_via.c 2009-12-04 21:40:48.118652887 -0500 @@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh ATA_BMDMA_SHT(DRV_NAME), }; @@ -19639,9 +20122,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_via.c linux-2.6.31.7/drivers/ata/sata .inherits = &svia_base_ops, .hardreset = sata_std_hardreset, .scr_read = vt8251_scr_read, -diff -urNp linux-2.6.31.7/drivers/ata/sata_vsc.c linux-2.6.31.7/drivers/ata/sata_vsc.c ---- linux-2.6.31.7/drivers/ata/sata_vsc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ata/sata_vsc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ata/sata_vsc.c linux-2.6.32/drivers/ata/sata_vsc.c +--- linux-2.6.32/drivers/ata/sata_vsc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ata/sata_vsc.c 2009-12-04 21:40:48.119716591 -0500 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat }; @@ -19651,9 +20134,9 @@ diff -urNp linux-2.6.31.7/drivers/ata/sata_vsc.c linux-2.6.31.7/drivers/ata/sata .inherits = &ata_bmdma_port_ops, /* The IRQ handling is not quite standard SFF behaviour so we cannot use the default lost interrupt handler */ -diff -urNp linux-2.6.31.7/drivers/atm/adummy.c linux-2.6.31.7/drivers/atm/adummy.c ---- linux-2.6.31.7/drivers/atm/adummy.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/adummy.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/adummy.c linux-2.6.32/drivers/atm/adummy.c +--- linux-2.6.32/drivers/atm/adummy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/adummy.c 2009-12-04 21:40:48.119716591 -0500 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -19663,9 +20146,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/adummy.c linux-2.6.31.7/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.31.7/drivers/atm/ambassador.c linux-2.6.31.7/drivers/atm/ambassador.c ---- linux-2.6.31.7/drivers/atm/ambassador.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/ambassador.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/ambassador.c linux-2.6.32/drivers/atm/ambassador.c +--- linux-2.6.32/drivers/atm/ambassador.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/ambassador.c 2009-12-04 21:40:48.120719772 -0500 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -19693,7 +20176,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/ambassador.c linux-2.6.31.7/drivers/atm/am } } else { -@@ -1349,7 +1349,7 @@ static int amb_send (struct atm_vcc * at +@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * at } if (check_area (skb->data, skb->len)) { @@ -19702,9 +20185,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/ambassador.c linux-2.6.31.7/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.31.7/drivers/atm/atmtcp.c linux-2.6.31.7/drivers/atm/atmtcp.c ---- linux-2.6.31.7/drivers/atm/atmtcp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/atmtcp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/atmtcp.c linux-2.6.32/drivers/atm/atmtcp.c +--- linux-2.6.32/drivers/atm/atmtcp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/atmtcp.c 2009-12-04 21:40:48.123724282 -0500 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -19754,9 +20237,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/atmtcp.c linux-2.6.31.7/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.31.7/drivers/atm/eni.c linux-2.6.31.7/drivers/atm/eni.c ---- linux-2.6.31.7/drivers/atm/eni.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/eni.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/eni.c linux-2.6.32/drivers/atm/eni.c +--- linux-2.6.32/drivers/atm/eni.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/eni.c 2009-12-04 21:40:48.124692252 -0500 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -19802,9 +20285,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/eni.c linux-2.6.31.7/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.31.7/drivers/atm/firestream.c linux-2.6.31.7/drivers/atm/firestream.c ---- linux-2.6.31.7/drivers/atm/firestream.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/firestream.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/firestream.c linux-2.6.32/drivers/atm/firestream.c +--- linux-2.6.32/drivers/atm/firestream.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/firestream.c 2009-12-04 21:40:48.124692252 -0500 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -19838,9 +20321,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/firestream.c linux-2.6.31.7/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.31.7/drivers/atm/fore200e.c linux-2.6.31.7/drivers/atm/fore200e.c ---- linux-2.6.31.7/drivers/atm/fore200e.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/fore200e.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/fore200e.c linux-2.6.32/drivers/atm/fore200e.c +--- linux-2.6.32/drivers/atm/fore200e.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/fore200e.c 2009-12-04 21:40:48.125718736 -0500 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -19897,10 +20380,10 @@ diff -urNp linux-2.6.31.7/drivers/atm/fore200e.c linux-2.6.31.7/drivers/atm/fore fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c ---- linux-2.6.31.7/drivers/atm/he.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/he.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1728,7 +1728,7 @@ he_service_rbrq(struct he_dev *he_dev, i +diff -urNp linux-2.6.32/drivers/atm/he.c linux-2.6.32/drivers/atm/he.c +--- linux-2.6.32/drivers/atm/he.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/he.c 2009-12-04 21:40:48.126718091 -0500 +@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { hprintk("HBUF_ERR! (cid 0x%x)\n", cid); @@ -19909,7 +20392,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c goto return_host_buffers; } -@@ -1761,7 +1761,7 @@ he_service_rbrq(struct he_dev *he_dev, i +@@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, i RBRQ_LEN_ERR(he_dev->rbrq_head) ? "LEN_ERR" : "", vcc->vpi, vcc->vci); @@ -19918,7 +20401,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c goto return_host_buffers; } -@@ -1820,7 +1820,7 @@ he_service_rbrq(struct he_dev *he_dev, i +@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, i vcc->push(vcc, skb); spin_lock(&he_dev->global_lock); @@ -19927,7 +20410,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c return_host_buffers: ++pdus_assembled; -@@ -2165,7 +2165,7 @@ __enqueue_tpd(struct he_dev *he_dev, str +@@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, str tpd->vcc->pop(tpd->vcc, tpd->skb); else dev_kfree_skb_any(tpd->skb); @@ -19936,7 +20419,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c } pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status)); return; -@@ -2577,7 +2577,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_b vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -19945,7 +20428,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c return -EINVAL; } -@@ -2588,7 +2588,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_b vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -19954,7 +20437,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c return -EINVAL; } #endif -@@ -2600,7 +2600,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_b vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -19963,7 +20446,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2642,7 +2642,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_b vcc->pop(vcc, skb); else dev_kfree_skb_any(skb); @@ -19972,7 +20455,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c spin_unlock_irqrestore(&he_dev->global_lock, flags); return -ENOMEM; } -@@ -2673,7 +2673,7 @@ he_send(struct atm_vcc *vcc, struct sk_b +@@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_b __enqueue_tpd(he_dev, tpd, cid); spin_unlock_irqrestore(&he_dev->global_lock, flags); @@ -19981,9 +20464,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/he.c linux-2.6.31.7/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.31.7/drivers/atm/horizon.c linux-2.6.31.7/drivers/atm/horizon.c ---- linux-2.6.31.7/drivers/atm/horizon.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/horizon.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/horizon.c linux-2.6.32/drivers/atm/horizon.c +--- linux-2.6.32/drivers/atm/horizon.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/horizon.c 2009-12-04 21:40:48.159774828 -0500 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -20002,9 +20485,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/horizon.c linux-2.6.31.7/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.31.7/drivers/atm/idt77252.c linux-2.6.31.7/drivers/atm/idt77252.c ---- linux-2.6.31.7/drivers/atm/idt77252.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/idt77252.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/idt77252.c linux-2.6.32/drivers/atm/idt77252.c +--- linux-2.6.32/drivers/atm/idt77252.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/idt77252.c 2009-12-04 21:40:48.160717375 -0500 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -20159,9 +20642,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/idt77252.c linux-2.6.31.7/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.31.7/drivers/atm/iphase.c linux-2.6.31.7/drivers/atm/iphase.c ---- linux-2.6.31.7/drivers/atm/iphase.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/iphase.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/iphase.c linux-2.6.32/drivers/atm/iphase.c +--- linux-2.6.32/drivers/atm/iphase.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/iphase.c 2009-12-04 21:40:48.162676137 -0500 @@ -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)) @@ -20258,9 +20741,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/iphase.c linux-2.6.31.7/drivers/atm/iphase if (iavcc->vc_desc_cnt > 10) { vcc->tx_quota = vcc->tx_quota * 3 / 4; printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); -diff -urNp linux-2.6.31.7/drivers/atm/lanai.c linux-2.6.31.7/drivers/atm/lanai.c ---- linux-2.6.31.7/drivers/atm/lanai.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/lanai.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/lanai.c linux-2.6.32/drivers/atm/lanai.c +--- linux-2.6.32/drivers/atm/lanai.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/lanai.c 2009-12-04 21:40:48.163618401 -0500 @@ -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); @@ -20315,9 +20798,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/lanai.c linux-2.6.31.7/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.31.7/drivers/atm/nicstar.c linux-2.6.31.7/drivers/atm/nicstar.c ---- linux-2.6.31.7/drivers/atm/nicstar.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/nicstar.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/nicstar.c linux-2.6.32/drivers/atm/nicstar.c +--- linux-2.6.32/drivers/atm/nicstar.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/nicstar.c 2009-12-04 21:40:48.164654772 -0500 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -20520,10 +21003,10 @@ diff -urNp linux-2.6.31.7/drivers/atm/nicstar.c linux-2.6.31.7/drivers/atm/nicst } } -diff -urNp linux-2.6.31.7/drivers/atm/solos-pci.c linux-2.6.31.7/drivers/atm/solos-pci.c ---- linux-2.6.31.7/drivers/atm/solos-pci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/solos-pci.c 2009-12-10 22:15:16.000000000 -0500 -@@ -663,7 +663,7 @@ void solos_bh(unsigned long card_arg) +diff -urNp linux-2.6.32/drivers/atm/solos-pci.c linux-2.6.32/drivers/atm/solos-pci.c +--- linux-2.6.32/drivers/atm/solos-pci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/solos-pci.c 2009-12-04 21:40:48.165724417 -0500 +@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); vcc->push(vcc, skb); @@ -20532,7 +21015,7 @@ diff -urNp linux-2.6.31.7/drivers/atm/solos-pci.c linux-2.6.31.7/drivers/atm/sol break; case PKT_STATUS: -@@ -966,7 +966,7 @@ static uint32_t fpga_tx(struct solos_car +@@ -1011,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_car vcc = SKB_CB(oldskb)->vcc; if (vcc) { @@ -20541,9 +21024,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/solos-pci.c linux-2.6.31.7/drivers/atm/sol solos_pop(vcc, oldskb); } else dev_kfree_skb_irq(oldskb); -diff -urNp linux-2.6.31.7/drivers/atm/suni.c linux-2.6.31.7/drivers/atm/suni.c ---- linux-2.6.31.7/drivers/atm/suni.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/suni.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/suni.c linux-2.6.32/drivers/atm/suni.c +--- linux-2.6.32/drivers/atm/suni.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/suni.c 2009-12-04 21:40:48.165724417 -0500 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -20555,9 +21038,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/suni.c linux-2.6.31.7/drivers/atm/suni.c static void suni_hz(unsigned long from_timer) -diff -urNp linux-2.6.31.7/drivers/atm/uPD98402.c linux-2.6.31.7/drivers/atm/uPD98402.c ---- linux-2.6.31.7/drivers/atm/uPD98402.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/uPD98402.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/uPD98402.c linux-2.6.32/drivers/atm/uPD98402.c +--- linux-2.6.32/drivers/atm/uPD98402.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/uPD98402.c 2009-12-04 21:40:48.166726434 -0500 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -20602,9 +21085,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/uPD98402.c linux-2.6.31.7/drivers/atm/uPD9 return 0; } -diff -urNp linux-2.6.31.7/drivers/atm/zatm.c linux-2.6.31.7/drivers/atm/zatm.c ---- linux-2.6.31.7/drivers/atm/zatm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/atm/zatm.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/atm/zatm.c linux-2.6.32/drivers/atm/zatm.c +--- linux-2.6.32/drivers/atm/zatm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/atm/zatm.c 2009-12-04 21:40:48.166726434 -0500 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -20632,9 +21115,9 @@ diff -urNp linux-2.6.31.7/drivers/atm/zatm.c linux-2.6.31.7/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.31.7/drivers/base/bus.c linux-2.6.31.7/drivers/base/bus.c ---- linux-2.6.31.7/drivers/base/bus.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/base/bus.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/base/bus.c linux-2.6.32/drivers/base/bus.c +--- linux-2.6.32/drivers/base/bus.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/base/bus.c 2009-12-04 21:40:48.167610979 -0500 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob return ret; } @@ -20662,9 +21145,9 @@ diff -urNp linux-2.6.31.7/drivers/base/bus.c linux-2.6.31.7/drivers/base/bus.c .filter = bus_uevent_filter, }; -diff -urNp linux-2.6.31.7/drivers/base/class.c linux-2.6.31.7/drivers/base/class.c ---- linux-2.6.31.7/drivers/base/class.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/base/class.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/base/class.c linux-2.6.32/drivers/base/class.c +--- linux-2.6.32/drivers/base/class.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/base/class.c 2009-12-04 21:40:48.167610979 -0500 @@ -61,7 +61,7 @@ static void class_release(struct kobject "be careful\n", class->name); } @@ -20674,9 +21157,9 @@ diff -urNp linux-2.6.31.7/drivers/base/class.c linux-2.6.31.7/drivers/base/class .show = class_attr_show, .store = class_attr_store, }; -diff -urNp linux-2.6.31.7/drivers/base/core.c linux-2.6.31.7/drivers/base/core.c ---- linux-2.6.31.7/drivers/base/core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/base/core.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/base/core.c linux-2.6.32/drivers/base/core.c +--- linux-2.6.32/drivers/base/core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/base/core.c 2009-12-04 21:40:48.168727131 -0500 @@ -93,7 +93,7 @@ static ssize_t dev_attr_store(struct kob return ret; } @@ -20686,7 +21169,7 @@ diff -urNp linux-2.6.31.7/drivers/base/core.c linux-2.6.31.7/drivers/base/core.c .show = dev_attr_show, .store = dev_attr_store, }; -@@ -242,7 +242,7 @@ static int dev_uevent(struct kset *kset, +@@ -245,7 +245,7 @@ static int dev_uevent(struct kset *kset, return retval; } @@ -20695,9 +21178,9 @@ diff -urNp linux-2.6.31.7/drivers/base/core.c linux-2.6.31.7/drivers/base/core.c .filter = dev_uevent_filter, .name = dev_uevent_name, .uevent = dev_uevent, -diff -urNp linux-2.6.31.7/drivers/base/memory.c linux-2.6.31.7/drivers/base/memory.c ---- linux-2.6.31.7/drivers/base/memory.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/base/memory.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/base/memory.c linux-2.6.32/drivers/base/memory.c +--- linux-2.6.32/drivers/base/memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/base/memory.c 2009-12-04 21:40:48.168727131 -0500 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks return retval; } @@ -20707,9 +21190,9 @@ diff -urNp linux-2.6.31.7/drivers/base/memory.c linux-2.6.31.7/drivers/base/memo .name = memory_uevent_name, .uevent = memory_uevent, }; -diff -urNp linux-2.6.31.7/drivers/base/sys.c linux-2.6.31.7/drivers/base/sys.c ---- linux-2.6.31.7/drivers/base/sys.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/base/sys.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/base/sys.c linux-2.6.32/drivers/base/sys.c +--- linux-2.6.32/drivers/base/sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/base/sys.c 2009-12-04 21:40:48.168727131 -0500 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc return -EIO; } @@ -20728,30 +21211,9 @@ diff -urNp linux-2.6.31.7/drivers/base/sys.c linux-2.6.31.7/drivers/base/sys.c .show = sysdev_class_show, .store = sysdev_class_store, }; -diff -urNp linux-2.6.31.7/drivers/block/cciss.c linux-2.6.31.7/drivers/block/cciss.c ---- linux-2.6.31.7/drivers/block/cciss.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/block/cciss.c 2009-12-10 22:15:16.000000000 -0500 -@@ -363,7 +363,7 @@ static void cciss_seq_stop(struct seq_fi - h->busy_configuring = 0; - } - --static struct seq_operations cciss_seq_ops = { -+static const struct seq_operations cciss_seq_ops = { - .start = cciss_seq_start, - .show = cciss_seq_show, - .next = cciss_seq_next, -@@ -426,7 +426,7 @@ out: - return err; - } - --static struct file_operations cciss_proc_fops = { -+static const struct file_operations cciss_proc_fops = { - .owner = THIS_MODULE, - .open = cciss_seq_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/drivers/block/pktcdvd.c linux-2.6.31.7/drivers/block/pktcdvd.c ---- linux-2.6.31.7/drivers/block/pktcdvd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/block/pktcdvd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/block/pktcdvd.c linux-2.6.32/drivers/block/pktcdvd.c +--- linux-2.6.32/drivers/block/pktcdvd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/block/pktcdvd.c 2009-12-04 21:40:48.170641107 -0500 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob return len; } @@ -20761,33 +21223,9 @@ diff -urNp linux-2.6.31.7/drivers/block/pktcdvd.c linux-2.6.31.7/drivers/block/p .show = kobj_pkt_show, .store = kobj_pkt_store }; -diff -urNp linux-2.6.31.7/drivers/char/agp/agp.h linux-2.6.31.7/drivers/char/agp/agp.h ---- linux-2.6.31.7/drivers/char/agp/agp.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/agp/agp.h 2009-12-10 22:15:16.000000000 -0500 -@@ -126,7 +126,7 @@ struct agp_bridge_driver { - struct agp_bridge_data { - const struct agp_version *version; - const struct agp_bridge_driver *driver; -- struct vm_operations_struct *vm_ops; -+ const struct vm_operations_struct *vm_ops; - void *previous_size; - void *current_size; - void *dev_private_data; -diff -urNp linux-2.6.31.7/drivers/char/agp/alpha-agp.c linux-2.6.31.7/drivers/char/agp/alpha-agp.c ---- linux-2.6.31.7/drivers/char/agp/alpha-agp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/agp/alpha-agp.c 2009-12-10 22:15:16.000000000 -0500 -@@ -40,7 +40,7 @@ static struct aper_size_info_fixed alpha - { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ - }; - --struct vm_operations_struct alpha_core_agp_vm_ops = { -+const struct vm_operations_struct alpha_core_agp_vm_ops = { - .fault = alpha_core_agp_vm_fault, - }; - -diff -urNp linux-2.6.31.7/drivers/char/agp/frontend.c linux-2.6.31.7/drivers/char/agp/frontend.c ---- linux-2.6.31.7/drivers/char/agp/frontend.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/agp/frontend.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/agp/frontend.c linux-2.6.32/drivers/char/agp/frontend.c +--- linux-2.6.32/drivers/char/agp/frontend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/agp/frontend.c 2009-12-04 21:40:48.170641107 -0500 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -20797,10 +21235,10 @@ diff -urNp linux-2.6.31.7/drivers/char/agp/frontend.c linux-2.6.31.7/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.31.7/drivers/char/agp/intel-agp.c linux-2.6.31.7/drivers/char/agp/intel-agp.c ---- linux-2.6.31.7/drivers/char/agp/intel-agp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/agp/intel-agp.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2424,7 +2424,7 @@ static struct pci_device_id agp_intel_pc +diff -urNp linux-2.6.32/drivers/char/agp/intel-agp.c linux-2.6.32/drivers/char/agp/intel-agp.c +--- linux-2.6.32/drivers/char/agp/intel-agp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/agp/intel-agp.c 2009-12-04 21:40:48.171719336 -0500 +@@ -2566,7 +2566,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), ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), @@ -20809,34 +21247,10 @@ diff -urNp linux-2.6.31.7/drivers/char/agp/intel-agp.c linux-2.6.31.7/drivers/ch }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.31.7/drivers/char/apm-emulation.c linux-2.6.31.7/drivers/char/apm-emulation.c ---- linux-2.6.31.7/drivers/char/apm-emulation.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/apm-emulation.c 2009-12-10 22:15:16.000000000 -0500 -@@ -393,7 +393,7 @@ static int apm_open(struct inode * inode - return as ? 0 : -ENOMEM; - } - --static struct file_operations apm_bios_fops = { -+static const struct file_operations apm_bios_fops = { - .owner = THIS_MODULE, - .read = apm_read, - .poll = apm_poll, -diff -urNp linux-2.6.31.7/drivers/char/bfin-otp.c linux-2.6.31.7/drivers/char/bfin-otp.c ---- linux-2.6.31.7/drivers/char/bfin-otp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/bfin-otp.c 2009-12-10 22:15:16.000000000 -0500 -@@ -133,7 +133,7 @@ static ssize_t bfin_otp_write(struct fil - # define bfin_otp_write NULL - #endif - --static struct file_operations bfin_otp_fops = { -+static const struct file_operations bfin_otp_fops = { - .owner = THIS_MODULE, - .read = bfin_otp_read, - .write = bfin_otp_write, -diff -urNp linux-2.6.31.7/drivers/char/hpet.c linux-2.6.31.7/drivers/char/hpet.c ---- linux-2.6.31.7/drivers/char/hpet.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hpet.c 2009-12-10 22:15:16.000000000 -0500 -@@ -995,7 +995,7 @@ static struct acpi_driver hpet_acpi_driv +diff -urNp linux-2.6.32/drivers/char/hpet.c linux-2.6.32/drivers/char/hpet.c +--- linux-2.6.32/drivers/char/hpet.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hpet.c 2009-12-04 21:40:48.181571445 -0500 +@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -20845,9 +21259,9 @@ diff -urNp linux-2.6.31.7/drivers/char/hpet.c linux-2.6.31.7/drivers/char/hpet.c static int __init hpet_init(void) { -diff -urNp linux-2.6.31.7/drivers/char/hvc_beat.c linux-2.6.31.7/drivers/char/hvc_beat.c ---- linux-2.6.31.7/drivers/char/hvc_beat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_beat.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/hvc_beat.c linux-2.6.32/drivers/char/hvc_beat.c +--- linux-2.6.32/drivers/char/hvc_beat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_beat.c 2009-12-04 21:40:48.202588860 -0500 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v return cnt; } @@ -20857,9 +21271,9 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_beat.c linux-2.6.31.7/drivers/char/hv .get_chars = hvc_beat_get_chars, .put_chars = hvc_beat_put_chars, }; -diff -urNp linux-2.6.31.7/drivers/char/hvc_console.c linux-2.6.31.7/drivers/char/hvc_console.c ---- linux-2.6.31.7/drivers/char/hvc_console.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_console.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/hvc_console.c linux-2.6.32/drivers/char/hvc_console.c +--- linux-2.6.32/drivers/char/hvc_console.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_console.c 2009-12-04 21:40:48.202588860 -0500 @@ -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. @@ -20878,7 +21292,7 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_console.c linux-2.6.31.7/drivers/char { struct hvc_struct *hp; -@@ -751,7 +751,7 @@ static const struct tty_operations hvc_o +@@ -749,7 +749,7 @@ static const struct tty_operations hvc_o }; struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, @@ -20887,10 +21301,10 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_console.c linux-2.6.31.7/drivers/char { struct hvc_struct *hp; int i; -diff -urNp linux-2.6.31.7/drivers/char/hvc_console.h linux-2.6.31.7/drivers/char/hvc_console.h ---- linux-2.6.31.7/drivers/char/hvc_console.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_console.h 2009-12-10 22:15:16.000000000 -0500 -@@ -54,7 +54,7 @@ struct hvc_struct { +diff -urNp linux-2.6.32/drivers/char/hvc_console.h linux-2.6.32/drivers/char/hvc_console.h +--- linux-2.6.32/drivers/char/hvc_console.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_console.h 2009-12-04 21:40:48.203740843 -0500 +@@ -55,7 +55,7 @@ struct hvc_struct { int outbuf_size; int n_outbuf; uint32_t vtermno; @@ -20899,7 +21313,7 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_console.h linux-2.6.31.7/drivers/char int irq_requested; int data; struct winsize ws; -@@ -75,11 +75,11 @@ struct hv_ops { +@@ -76,11 +76,11 @@ struct hv_ops { }; /* Register a vterm and a slot index for use as a console (console_init) */ @@ -20913,9 +21327,9 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_console.h linux-2.6.31.7/drivers/char /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ extern int hvc_remove(struct hvc_struct *hp); -diff -urNp linux-2.6.31.7/drivers/char/hvc_iseries.c linux-2.6.31.7/drivers/char/hvc_iseries.c ---- linux-2.6.31.7/drivers/char/hvc_iseries.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_iseries.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/hvc_iseries.c linux-2.6.32/drivers/char/hvc_iseries.c +--- linux-2.6.32/drivers/char/hvc_iseries.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_iseries.c 2009-12-04 21:40:48.203740843 -0500 @@ -197,7 +197,7 @@ done: return sent; } @@ -20925,10 +21339,10 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_iseries.c linux-2.6.31.7/drivers/char .get_chars = get_chars, .put_chars = put_chars, .notifier_add = notifier_add_irq, -diff -urNp linux-2.6.31.7/drivers/char/hvc_iucv.c linux-2.6.31.7/drivers/char/hvc_iucv.c ---- linux-2.6.31.7/drivers/char/hvc_iucv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_iucv.c 2009-12-10 22:15:16.000000000 -0500 -@@ -920,7 +920,7 @@ static int hvc_iucv_pm_restore_thaw(stru +diff -urNp linux-2.6.32/drivers/char/hvc_iucv.c linux-2.6.32/drivers/char/hvc_iucv.c +--- linux-2.6.32/drivers/char/hvc_iucv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_iucv.c 2009-12-04 21:40:48.203740843 -0500 +@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru /* HVC operations */ @@ -20937,9 +21351,9 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_iucv.c linux-2.6.31.7/drivers/char/hv .get_chars = hvc_iucv_get_chars, .put_chars = hvc_iucv_put_chars, .notifier_add = hvc_iucv_notifier_add, -diff -urNp linux-2.6.31.7/drivers/char/hvc_rtas.c linux-2.6.31.7/drivers/char/hvc_rtas.c ---- linux-2.6.31.7/drivers/char/hvc_rtas.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_rtas.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/hvc_rtas.c linux-2.6.32/drivers/char/hvc_rtas.c +--- linux-2.6.32/drivers/char/hvc_rtas.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_rtas.c 2009-12-04 21:40:48.204723311 -0500 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ return i; } @@ -20949,45 +21363,9 @@ diff -urNp linux-2.6.31.7/drivers/char/hvc_rtas.c linux-2.6.31.7/drivers/char/hv .get_chars = hvc_rtas_read_console, .put_chars = hvc_rtas_write_console, }; -diff -urNp linux-2.6.31.7/drivers/char/hvc_udbg.c linux-2.6.31.7/drivers/char/hvc_udbg.c ---- linux-2.6.31.7/drivers/char/hvc_udbg.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_udbg.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/drivers/char/hvc_vio.c linux-2.6.31.7/drivers/char/hvc_vio.c ---- linux-2.6.31.7/drivers/char/hvc_vio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_vio.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/drivers/char/hvc_xen.c linux-2.6.31.7/drivers/char/hvc_xen.c ---- linux-2.6.31.7/drivers/char/hvc_xen.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvc_xen.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/drivers/char/hvcs.c linux-2.6.31.7/drivers/char/hvcs.c ---- linux-2.6.31.7/drivers/char/hvcs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/hvcs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/hvcs.c linux-2.6.32/drivers/char/hvcs.c +--- linux-2.6.32/drivers/char/hvcs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvcs.c 2009-12-04 21:40:48.213615600 -0500 @@ -269,7 +269,7 @@ struct hvcs_struct { unsigned int index; @@ -21082,10 +21460,46 @@ diff -urNp linux-2.6.31.7/drivers/char/hvcs.c linux-2.6.31.7/drivers/char/hvcs.c return 0; return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; -diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c 2009-12-10 22:15:16.000000000 -0500 -@@ -413,7 +413,7 @@ struct ipmi_smi { +diff -urNp linux-2.6.32/drivers/char/hvc_udbg.c linux-2.6.32/drivers/char/hvc_udbg.c +--- linux-2.6.32/drivers/char/hvc_udbg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_udbg.c 2009-12-04 21:40:48.204723311 -0500 +@@ -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/drivers/char/hvc_vio.c linux-2.6.32/drivers/char/hvc_vio.c +--- linux-2.6.32/drivers/char/hvc_vio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_vio.c 2009-12-04 21:40:48.204723311 -0500 +@@ -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/drivers/char/hvc_xen.c linux-2.6.32/drivers/char/hvc_xen.c +--- linux-2.6.32/drivers/char/hvc_xen.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/hvc_xen.c 2009-12-04 21:40:48.212794047 -0500 +@@ -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/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32/drivers/char/ipmi/ipmi_msghandler.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/ipmi/ipmi_msghandler.c 2009-12-04 21:40:48.215634825 -0500 +@@ -414,7 +414,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -21094,7 +21508,7 @@ diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.7/dri /* * run_to_completion duplicate of smb_info, smi_info -@@ -446,9 +446,9 @@ static DEFINE_MUTEX(smi_watchers_mutex); +@@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex); #define ipmi_inc_stat(intf, stat) \ @@ -21106,7 +21520,7 @@ diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.7/dri static int is_lan_addr(struct ipmi_addr *addr) { -@@ -2807,7 +2807,7 @@ int ipmi_register_smi(struct ipmi_smi_ha +@@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_ha INIT_LIST_HEAD(&intf->cmd_rcvrs); init_waitqueue_head(&intf->waitq); for (i = 0; i < IPMI_NUM_STATS; i++) @@ -21115,9 +21529,9 @@ diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.31.7/dri intf->proc_dir = NULL; -diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.31.7/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.31.7/drivers/char/ipmi/ipmi_si_intf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/ipmi/ipmi_si_intf.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32/drivers/char/ipmi/ipmi_si_intf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/ipmi/ipmi_si_intf.c 2009-12-04 21:40:48.216725165 -0500 @@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; @@ -21148,9 +21562,9 @@ diff -urNp linux-2.6.31.7/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.31.7/driver new_smi->interrupt_disabled = 0; atomic_set(&new_smi->stop_operation, 0); -diff -urNp linux-2.6.31.7/drivers/char/keyboard.c linux-2.6.31.7/drivers/char/keyboard.c ---- linux-2.6.31.7/drivers/char/keyboard.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/keyboard.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/keyboard.c linux-2.6.32/drivers/char/keyboard.c +--- linux-2.6.32/drivers/char/keyboard.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/keyboard.c 2009-12-04 21:40:48.223637245 -0500 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -21177,9 +21591,9 @@ diff -urNp linux-2.6.31.7/drivers/char/keyboard.c linux-2.6.31.7/drivers/char/ke }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.31.7/drivers/char/mem.c linux-2.6.31.7/drivers/char/mem.c ---- linux-2.6.31.7/drivers/char/mem.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/mem.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/mem.c linux-2.6.32/drivers/char/mem.c +--- linux-2.6.32/drivers/char/mem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/mem.c 2009-12-11 20:50:42.354215373 -0500 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -21211,15 +21625,6 @@ diff -urNp linux-2.6.31.7/drivers/char/mem.c linux-2.6.31.7/drivers/char/mem.c written = 0; #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED -@@ -301,7 +311,7 @@ static inline int private_mapping_ok(str - } - #endif - --static struct vm_operations_struct mmap_mem_ops = { -+static const struct vm_operations_struct mmap_mem_ops = { - #ifdef CONFIG_HAVE_IOREMAP_PROT - .access = generic_access_phys - #endif @@ -324,6 +334,11 @@ static int mmap_mem(struct file * file, &vma->vm_page_prot)) return -EINVAL; @@ -21269,43 +21674,19 @@ diff -urNp linux-2.6.31.7/drivers/char/mem.c linux-2.6.31.7/drivers/char/mem.c #define open_kmem open_mem #define open_oldmem open_mem -@@ -888,6 +917,9 @@ static const struct { +@@ -886,6 +915,9 @@ static const struct memdev { #ifdef CONFIG_CRASH_DUMP - {12,"oldmem", S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops, NULL}, + [12] = { "oldmem", 0, &oldmem_fops, NULL }, #endif +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) -+ {13,"grsec", S_IRUSR | S_IWUGO, &grsec_fops}, ++ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL }, +#endif }; static int memory_open(struct inode *inode, struct file *filp) -diff -urNp linux-2.6.31.7/drivers/char/misc.c linux-2.6.31.7/drivers/char/misc.c ---- linux-2.6.31.7/drivers/char/misc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/misc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -91,7 +91,7 @@ static int misc_seq_show(struct seq_file - } - - --static struct seq_operations misc_seq_ops = { -+static const struct seq_operations misc_seq_ops = { - .start = misc_seq_start, - .next = misc_seq_next, - .stop = misc_seq_stop, -diff -urNp linux-2.6.31.7/drivers/char/mspec.c linux-2.6.31.7/drivers/char/mspec.c ---- linux-2.6.31.7/drivers/char/mspec.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/mspec.c 2009-12-10 22:15:16.000000000 -0500 -@@ -239,7 +239,7 @@ mspec_fault(struct vm_area_struct *vma, - return VM_FAULT_NOPAGE; - } - --static struct vm_operations_struct mspec_vm_ops = { -+static const struct vm_operations_struct mspec_vm_ops = { - .open = mspec_open, - .close = mspec_close, - .fault = mspec_fault, -diff -urNp linux-2.6.31.7/drivers/char/nvram.c linux-2.6.31.7/drivers/char/nvram.c ---- linux-2.6.31.7/drivers/char/nvram.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/nvram.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/nvram.c linux-2.6.32/drivers/char/nvram.c +--- linux-2.6.32/drivers/char/nvram.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/nvram.c 2009-12-04 21:40:48.223637245 -0500 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -21318,9 +21699,9 @@ diff -urNp linux-2.6.31.7/drivers/char/nvram.c linux-2.6.31.7/drivers/char/nvram }; static int __init nvram_init(void) -diff -urNp linux-2.6.31.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.31.7/drivers/char/pcmcia/ipwireless/tty.c ---- linux-2.6.31.7/drivers/char/pcmcia/ipwireless/tty.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/pcmcia/ipwireless/tty.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32/drivers/char/pcmcia/ipwireless/tty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/pcmcia/ipwireless/tty.c 2009-12-04 21:40:48.223637245 -0500 @@ -51,7 +51,7 @@ struct ipw_tty { int tty_type; struct ipw_network *network; @@ -21435,10 +21816,43 @@ diff -urNp linux-2.6.31.7/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.31.7/dr do_ipw_close(ttyj); ipwireless_disassociate_network_ttys(network, ttyj->channel_idx); -diff -urNp linux-2.6.31.7/drivers/char/random.c linux-2.6.31.7/drivers/char/random.c ---- linux-2.6.31.7/drivers/char/random.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/random.c 2009-12-10 22:15:16.000000000 -0500 -@@ -253,8 +253,13 @@ +diff -urNp linux-2.6.32/drivers/char/pty.c linux-2.6.32/drivers/char/pty.c +--- linux-2.6.32/drivers/char/pty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/pty.c 2009-12-04 21:40:48.224611535 -0500 +@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode + return ret; + } + +-static struct file_operations ptmx_fops; ++static const struct file_operations ptmx_fops = { ++ .llseek = no_llseek, ++ .read = tty_read, ++ .write = tty_write, ++ .poll = tty_poll, ++ .unlocked_ioctl = tty_ioctl, ++ .compat_ioctl = tty_compat_ioctl, ++ .open = ptmx_open, ++ .release = tty_release, ++ .fasync = tty_fasync, ++}; ++ + + static void __init unix98_pty_init(void) + { +@@ -736,9 +747,6 @@ static void __init unix98_pty_init(void) + register_sysctl_table(pty_root_table); + + /* Now create the /dev/ptmx special device */ +- tty_default_fops(&ptmx_fops); +- ptmx_fops.open = ptmx_open; +- + cdev_init(&ptmx_cdev, &ptmx_fops); + if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || + register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) +diff -urNp linux-2.6.32/drivers/char/random.c linux-2.6.32/drivers/char/random.c +--- linux-2.6.32/drivers/char/random.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/random.c 2009-12-04 21:40:48.227673612 -0500 +@@ -254,8 +254,13 @@ /* * Configuration information */ @@ -21452,7 +21866,7 @@ diff -urNp linux-2.6.31.7/drivers/char/random.c linux-2.6.31.7/drivers/char/rand #define SEC_XFER_SIZE 512 /* -@@ -291,10 +296,17 @@ static struct poolinfo { +@@ -292,10 +297,17 @@ static struct poolinfo { int poolwords; int tap1, tap2, tap3, tap4, tap5; } poolinfo_table[] = { @@ -21470,7 +21884,7 @@ diff -urNp linux-2.6.31.7/drivers/char/random.c linux-2.6.31.7/drivers/char/rand #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, -@@ -1204,7 +1216,7 @@ EXPORT_SYMBOL(generate_random_uuid); +@@ -1218,7 +1230,7 @@ EXPORT_SYMBOL(generate_random_uuid); #include <linux/sysctl.h> static int min_read_thresh = 8, min_write_thresh; @@ -21479,10 +21893,10 @@ diff -urNp linux-2.6.31.7/drivers/char/random.c linux-2.6.31.7/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.31.7/drivers/char/sonypi.c linux-2.6.31.7/drivers/char/sonypi.c ---- linux-2.6.31.7/drivers/char/sonypi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/sonypi.c 2009-12-10 22:15:16.000000000 -0500 -@@ -490,7 +490,7 @@ static struct sonypi_device { +diff -urNp linux-2.6.32/drivers/char/sonypi.c linux-2.6.32/drivers/char/sonypi.c +--- linux-2.6.32/drivers/char/sonypi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/sonypi.c 2009-12-04 21:40:48.227673612 -0500 +@@ -491,7 +491,7 @@ static struct sonypi_device { spinlock_t fifo_lock; wait_queue_head_t fifo_proc_list; struct fasync_struct *fifo_async; @@ -21491,7 +21905,7 @@ diff -urNp linux-2.6.31.7/drivers/char/sonypi.c linux-2.6.31.7/drivers/char/sony int model; struct input_dev *input_jog_dev; struct input_dev *input_key_dev; -@@ -894,7 +894,7 @@ static int sonypi_misc_fasync(int fd, st +@@ -895,7 +895,7 @@ static int sonypi_misc_fasync(int fd, st static int sonypi_misc_release(struct inode *inode, struct file *file) { mutex_lock(&sonypi_device.lock); @@ -21500,7 +21914,7 @@ diff -urNp linux-2.6.31.7/drivers/char/sonypi.c linux-2.6.31.7/drivers/char/sony mutex_unlock(&sonypi_device.lock); return 0; } -@@ -904,9 +904,9 @@ static int sonypi_misc_open(struct inode +@@ -905,9 +905,9 @@ static int sonypi_misc_open(struct inode lock_kernel(); mutex_lock(&sonypi_device.lock); /* Flush input queue on first open */ @@ -21512,9 +21926,9 @@ diff -urNp linux-2.6.31.7/drivers/char/sonypi.c linux-2.6.31.7/drivers/char/sony mutex_unlock(&sonypi_device.lock); unlock_kernel(); return 0; -diff -urNp linux-2.6.31.7/drivers/char/tpm/tpm_bios.c linux-2.6.31.7/drivers/char/tpm/tpm_bios.c ---- linux-2.6.31.7/drivers/char/tpm/tpm_bios.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/tpm/tpm_bios.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/tpm/tpm_bios.c linux-2.6.32/drivers/char/tpm/tpm_bios.c +--- linux-2.6.32/drivers/char/tpm/tpm_bios.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/tpm/tpm_bios.c 2009-12-04 21:40:48.228740507 -0500 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start event = addr; @@ -21543,23 +21957,6 @@ diff -urNp linux-2.6.31.7/drivers/char/tpm/tpm_bios.c linux-2.6.31.7/drivers/cha return 0; } -@@ -343,14 +344,14 @@ static int tpm_ascii_bios_measurements_s - return 0; - } - --static struct seq_operations tpm_ascii_b_measurments_seqops = { -+static const struct seq_operations tpm_ascii_b_measurments_seqops = { - .start = tpm_bios_measurements_start, - .next = tpm_bios_measurements_next, - .stop = tpm_bios_measurements_stop, - .show = tpm_ascii_bios_measurements_show, - }; - --static struct seq_operations tpm_binary_b_measurments_seqops = { -+static const struct seq_operations tpm_binary_b_measurments_seqops = { - .start = tpm_bios_measurements_start, - .next = tpm_bios_measurements_next, - .stop = tpm_bios_measurements_stop, @@ -409,6 +410,11 @@ static int read_log(struct tpm_bios_log log->bios_event_log_end = log->bios_event_log + len; @@ -21572,9 +21969,100 @@ diff -urNp linux-2.6.31.7/drivers/char/tpm/tpm_bios.c linux-2.6.31.7/drivers/cha memcpy(log->bios_event_log, virt, len); -diff -urNp linux-2.6.31.7/drivers/char/tty_ldisc.c linux-2.6.31.7/drivers/char/tty_ldisc.c ---- linux-2.6.31.7/drivers/char/tty_ldisc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/tty_ldisc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/char/tty_io.c linux-2.6.32/drivers/char/tty_io.c +--- linux-2.6.32/drivers/char/tty_io.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/tty_io.c 2009-12-04 21:40:48.228740507 -0500 +@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list + DEFINE_MUTEX(tty_mutex); + EXPORT_SYMBOL(tty_mutex); + +-static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *); +-static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *); + ssize_t redirected_tty_write(struct file *, const char __user *, + size_t, loff_t *); +-static unsigned int tty_poll(struct file *, poll_table *); + static int tty_open(struct inode *, struct file *); +-static int tty_release(struct inode *, struct file *); + long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +-#ifdef CONFIG_COMPAT +-static long tty_compat_ioctl(struct file *file, unsigned int cmd, +- unsigned long arg); +-#else +-#define tty_compat_ioctl NULL +-#endif +-static int tty_fasync(int fd, struct file *filp, int on); + static void release_tty(struct tty_struct *tty, int idx); + static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); + static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty); +@@ -870,7 +859,7 @@ EXPORT_SYMBOL(start_tty); + * read calls may be outstanding in parallel. + */ + +-static ssize_t tty_read(struct file *file, char __user *buf, size_t count, ++ssize_t tty_read(struct file *file, char __user *buf, size_t count, + loff_t *ppos) + { + int i; +@@ -1045,7 +1034,7 @@ void tty_write_message(struct tty_struct + * write method will not be invoked in parallel for each device. + */ + +-static ssize_t tty_write(struct file *file, const char __user *buf, ++ssize_t tty_write(struct file *file, const char __user *buf, + size_t count, loff_t *ppos) + { + struct tty_struct *tty; +@@ -1865,7 +1854,7 @@ static int tty_open(struct inode *inode, + * Takes bkl. See tty_release_dev + */ + +-static int tty_release(struct inode *inode, struct file *filp) ++int tty_release(struct inode *inode, struct file *filp) + { + lock_kernel(); + tty_release_dev(filp); +@@ -1885,7 +1874,7 @@ static int tty_release(struct inode *ino + * may be re-entered freely by other callers. + */ + +-static unsigned int tty_poll(struct file *filp, poll_table *wait) ++unsigned int tty_poll(struct file *filp, poll_table *wait) + { + struct tty_struct *tty; + struct tty_ldisc *ld; +@@ -1902,7 +1891,7 @@ static unsigned int tty_poll(struct file + return ret; + } + +-static int tty_fasync(int fd, struct file *filp, int on) ++int tty_fasync(int fd, struct file *filp, int on) + { + struct tty_struct *tty; + unsigned long flags; +@@ -2579,7 +2568,7 @@ long tty_ioctl(struct file *file, unsign + } + + #ifdef CONFIG_COMPAT +-static long tty_compat_ioctl(struct file *file, unsigned int cmd, ++long tty_compat_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) + { + struct inode *inode = file->f_dentry->d_inode; +@@ -3046,11 +3035,6 @@ struct tty_struct *get_current_tty(void) + } + EXPORT_SYMBOL_GPL(get_current_tty); + +-void tty_default_fops(struct file_operations *fops) +-{ +- *fops = tty_fops; +-} +- + /* + * 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/drivers/char/tty_ldisc.c linux-2.6.32/drivers/char/tty_ldisc.c +--- linux-2.6.32/drivers/char/tty_ldisc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/tty_ldisc.c 2009-12-04 21:40:48.239516850 -0500 @@ -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; @@ -21602,19 +22090,39 @@ diff -urNp linux-2.6.31.7/drivers/char/tty_ldisc.c linux-2.6.31.7/drivers/char/t ret = -EBUSY; else tty_ldiscs[disc] = NULL; -@@ -175,7 +175,7 @@ static struct tty_ldisc *tty_ldisc_try_g - err = -EAGAIN; - else { - /* lock it */ +@@ -156,7 +156,7 @@ static struct tty_ldisc_ops *get_ldops(i + if (ldops) { + ret = ERR_PTR(-EAGAIN); + if (try_module_get(ldops->owner)) { - ldops->refcount++; + atomic_inc(&ldops->refcount); - ld->ops = ldops; - atomic_set(&ld->users, 1); - err = 0; -diff -urNp linux-2.6.31.7/drivers/char/vt_ioctl.c linux-2.6.31.7/drivers/char/vt_ioctl.c ---- linux-2.6.31.7/drivers/char/vt_ioctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/vt_ioctl.c 2009-12-10 22:15:16.000000000 -0500 -@@ -97,6 +97,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ + ret = ldops; + } + } +@@ -169,7 +169,7 @@ static void put_ldops(struct tty_ldisc_o + unsigned long flags; + + spin_lock_irqsave(&tty_ldisc_lock, flags); +- ldops->refcount--; ++ atomic_dec(&ldops->refcount); + module_put(ldops->owner); + spin_unlock_irqrestore(&tty_ldisc_lock, flags); + } +diff -urNp linux-2.6.32/drivers/char/virtio_console.c linux-2.6.32/drivers/char/virtio_console.c +--- linux-2.6.32/drivers/char/virtio_console.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/virtio_console.c 2009-12-04 21:40:48.240612166 -0500 +@@ -44,6 +44,7 @@ static unsigned int in_len; + static char *in, *inbuf; + + /* The operations for our console. */ ++/* cannot be const */ + static struct hv_ops virtio_cons; + + /* The hvc device */ +diff -urNp linux-2.6.32/drivers/char/vt_ioctl.c linux-2.6.32/drivers/char/vt_ioctl.c +--- linux-2.6.32/drivers/char/vt_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/char/vt_ioctl.c 2009-12-04 20:41:38.547683056 -0500 +@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) return -EPERM; @@ -21627,7 +22135,7 @@ diff -urNp linux-2.6.31.7/drivers/char/vt_ioctl.c linux-2.6.31.7/drivers/char/vt if (!i && v == K_NOSUCHMAP) { /* deallocate map */ key_map = key_maps[s]; -@@ -237,6 +243,13 @@ do_kdgkb_ioctl(int cmd, struct kbsentry +@@ -366,6 +372,13 @@ do_kdgkb_ioctl(int cmd, struct kbsentry goto reterr; } @@ -21641,22 +22149,10 @@ diff -urNp linux-2.6.31.7/drivers/char/vt_ioctl.c linux-2.6.31.7/drivers/char/vt q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.31.7/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.31.7/drivers/char/xilinx_hwicap/xilinx_hwicap.c ---- linux-2.6.31.7/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-12-10 22:15:16.000000000 -0500 -@@ -559,7 +559,7 @@ static int hwicap_release(struct inode * - return status; - } - --static struct file_operations hwicap_fops = { -+static const struct file_operations hwicap_fops = { - .owner = THIS_MODULE, - .write = hwicap_write, - .read = hwicap_read, -diff -urNp linux-2.6.31.7/drivers/cpufreq/cpufreq.c linux-2.6.31.7/drivers/cpufreq/cpufreq.c ---- linux-2.6.31.7/drivers/cpufreq/cpufreq.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/cpufreq/cpufreq.c 2009-12-10 22:15:16.000000000 -0500 -@@ -745,7 +745,7 @@ static void cpufreq_sysfs_release(struct +diff -urNp linux-2.6.32/drivers/cpufreq/cpufreq.c linux-2.6.32/drivers/cpufreq/cpufreq.c +--- linux-2.6.32/drivers/cpufreq/cpufreq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/cpufreq/cpufreq.c 2009-12-04 21:40:48.250630139 -0500 +@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct complete(&policy->kobj_unregister); } @@ -21665,9 +22161,9 @@ diff -urNp linux-2.6.31.7/drivers/cpufreq/cpufreq.c linux-2.6.31.7/drivers/cpufr .show = show, .store = store, }; -diff -urNp linux-2.6.31.7/drivers/cpuidle/sysfs.c linux-2.6.31.7/drivers/cpuidle/sysfs.c ---- linux-2.6.31.7/drivers/cpuidle/sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/cpuidle/sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/cpuidle/sysfs.c linux-2.6.32/drivers/cpuidle/sysfs.c +--- linux-2.6.32/drivers/cpuidle/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/cpuidle/sysfs.c 2009-12-04 21:40:48.250630139 -0500 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj return ret; } @@ -21686,9 +22182,33 @@ diff -urNp linux-2.6.31.7/drivers/cpuidle/sysfs.c linux-2.6.31.7/drivers/cpuidle .show = cpuidle_state_show, }; -diff -urNp linux-2.6.31.7/drivers/edac/edac_core.h linux-2.6.31.7/drivers/edac/edac_core.h ---- linux-2.6.31.7/drivers/edac/edac_core.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/edac/edac_core.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/dma/ioat/dma.c linux-2.6.32/drivers/dma/ioat/dma.c +--- linux-2.6.32/drivers/dma/ioat/dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/dma/ioat/dma.c 2009-12-04 21:40:48.251632871 -0500 +@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str + return entry->show(&chan->common, page); + } + +-struct sysfs_ops ioat_sysfs_ops = { ++const struct sysfs_ops ioat_sysfs_ops = { + .show = ioat_attr_show, + }; + +diff -urNp linux-2.6.32/drivers/dma/ioat/dma.h linux-2.6.32/drivers/dma/ioat/dma.h +--- linux-2.6.32/drivers/dma/ioat/dma.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/dma/ioat/dma.h 2009-12-04 21:40:48.251632871 -0500 +@@ -329,7 +329,7 @@ bool ioat_cleanup_preamble(struct ioat_c + unsigned long *phys_complete); + void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); + void ioat_kobject_del(struct ioatdma_device *device); +-extern struct sysfs_ops ioat_sysfs_ops; ++extern const struct sysfs_ops ioat_sysfs_ops; + extern struct ioat_sysfs_entry ioat_version_attr; + extern struct ioat_sysfs_entry ioat_cap_attr; + #endif /* IOATDMA_H */ +diff -urNp linux-2.6.32/drivers/edac/edac_core.h linux-2.6.32/drivers/edac/edac_core.h +--- linux-2.6.32/drivers/edac/edac_core.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/edac/edac_core.h 2009-12-04 21:40:48.251632871 -0500 @@ -99,11 +99,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -21706,9 +22226,9 @@ diff -urNp linux-2.6.31.7/drivers/edac/edac_core.h linux-2.6.31.7/drivers/edac/e #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.31.7/drivers/edac/edac_device_sysfs.c linux-2.6.31.7/drivers/edac/edac_device_sysfs.c ---- linux-2.6.31.7/drivers/edac/edac_device_sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/edac/edac_device_sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/edac/edac_device_sysfs.c linux-2.6.32/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32/drivers/edac/edac_device_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/edac/edac_device_sysfs.c 2009-12-04 21:40:48.252730875 -0500 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s } @@ -21736,9 +22256,9 @@ diff -urNp linux-2.6.31.7/drivers/edac/edac_device_sysfs.c linux-2.6.31.7/driver .show = edac_dev_block_show, .store = edac_dev_block_store }; -diff -urNp linux-2.6.31.7/drivers/edac/edac_mc_sysfs.c linux-2.6.31.7/drivers/edac/edac_mc_sysfs.c ---- linux-2.6.31.7/drivers/edac/edac_mc_sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/edac/edac_mc_sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/edac/edac_mc_sysfs.c linux-2.6.32/drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32/drivers/edac/edac_mc_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/edac/edac_mc_sysfs.c 2009-12-04 21:40:48.252730875 -0500 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob return -EIO; } @@ -21757,9 +22277,9 @@ diff -urNp linux-2.6.31.7/drivers/edac/edac_mc_sysfs.c linux-2.6.31.7/drivers/ed .show = mcidev_show, .store = mcidev_store }; -diff -urNp linux-2.6.31.7/drivers/edac/edac_pci_sysfs.c linux-2.6.31.7/drivers/edac/edac_pci_sysfs.c ---- linux-2.6.31.7/drivers/edac/edac_pci_sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/edac/edac_pci_sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/edac/edac_pci_sysfs.c linux-2.6.32/drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32/drivers/edac/edac_pci_sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/edac/edac_pci_sysfs.c 2009-12-04 21:40:48.253628178 -0500 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s } @@ -21778,9 +22298,9 @@ diff -urNp linux-2.6.31.7/drivers/edac/edac_pci_sysfs.c linux-2.6.31.7/drivers/e .show = edac_pci_dev_show, .store = edac_pci_dev_store }; -diff -urNp linux-2.6.31.7/drivers/firmware/dmi_scan.c linux-2.6.31.7/drivers/firmware/dmi_scan.c ---- linux-2.6.31.7/drivers/firmware/dmi_scan.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/firmware/dmi_scan.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/firmware/dmi_scan.c linux-2.6.32/drivers/firmware/dmi_scan.c +--- linux-2.6.32/drivers/firmware/dmi_scan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/firmware/dmi_scan.c 2009-12-04 21:40:48.253628178 -0500 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } @@ -21793,9 +22313,9 @@ diff -urNp linux-2.6.31.7/drivers/firmware/dmi_scan.c linux-2.6.31.7/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.31.7/drivers/firmware/edd.c linux-2.6.31.7/drivers/firmware/edd.c ---- linux-2.6.31.7/drivers/firmware/edd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/firmware/edd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/firmware/edd.c linux-2.6.32/drivers/firmware/edd.c +--- linux-2.6.32/drivers/firmware/edd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/firmware/edd.c 2009-12-04 21:40:48.254685137 -0500 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str return ret; } @@ -21805,9 +22325,9 @@ diff -urNp linux-2.6.31.7/drivers/firmware/edd.c linux-2.6.31.7/drivers/firmware .show = edd_attr_show, }; -diff -urNp linux-2.6.31.7/drivers/firmware/efivars.c linux-2.6.31.7/drivers/firmware/efivars.c ---- linux-2.6.31.7/drivers/firmware/efivars.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/firmware/efivars.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/firmware/efivars.c linux-2.6.32/drivers/firmware/efivars.c +--- linux-2.6.32/drivers/firmware/efivars.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/firmware/efivars.c 2009-12-04 21:40:48.254685137 -0500 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct return ret; } @@ -21817,9 +22337,9 @@ diff -urNp linux-2.6.31.7/drivers/firmware/efivars.c linux-2.6.31.7/drivers/firm .show = efivar_attr_show, .store = efivar_attr_store, }; -diff -urNp linux-2.6.31.7/drivers/firmware/iscsi_ibft.c linux-2.6.31.7/drivers/firmware/iscsi_ibft.c ---- linux-2.6.31.7/drivers/firmware/iscsi_ibft.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/firmware/iscsi_ibft.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/firmware/iscsi_ibft.c linux-2.6.32/drivers/firmware/iscsi_ibft.c +--- linux-2.6.32/drivers/firmware/iscsi_ibft.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/firmware/iscsi_ibft.c 2009-12-04 21:40:48.254685137 -0500 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc return ret; } @@ -21829,9 +22349,9 @@ diff -urNp linux-2.6.31.7/drivers/firmware/iscsi_ibft.c linux-2.6.31.7/drivers/f .show = ibft_show_attribute, }; -diff -urNp linux-2.6.31.7/drivers/firmware/memmap.c linux-2.6.31.7/drivers/firmware/memmap.c ---- linux-2.6.31.7/drivers/firmware/memmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/firmware/memmap.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/firmware/memmap.c linux-2.6.32/drivers/firmware/memmap.c +--- linux-2.6.32/drivers/firmware/memmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/firmware/memmap.c 2009-12-04 21:40:48.255735665 -0500 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { NULL }; @@ -21841,21 +22361,9 @@ diff -urNp linux-2.6.31.7/drivers/firmware/memmap.c linux-2.6.31.7/drivers/firmw .show = memmap_attr_show, }; -diff -urNp linux-2.6.31.7/drivers/gpio/gpiolib.c linux-2.6.31.7/drivers/gpio/gpiolib.c ---- linux-2.6.31.7/drivers/gpio/gpiolib.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpio/gpiolib.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1244,7 +1244,7 @@ static int gpiolib_open(struct inode *in - return single_open(file, gpiolib_show, NULL); - } - --static struct file_operations gpiolib_operations = { -+static const struct file_operations gpiolib_operations = { - .open = gpiolib_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_drv.c linux-2.6.31.7/drivers/gpu/drm/drm_drv.c ---- linux-2.6.31.7/drivers/gpu/drm/drm_drv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/drm_drv.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/drm_drv.c linux-2.6.32/drivers/gpu/drm/drm_drv.c +--- linux-2.6.32/drivers/gpu/drm/drm_drv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/drm_drv.c 2009-12-04 21:40:48.255735665 -0500 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; @@ -21865,9 +22373,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_drv.c linux-2.6.31.7/drivers/gpu/d ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_fops.c linux-2.6.31.7/drivers/gpu/drm/drm_fops.c ---- linux-2.6.31.7/drivers/gpu/drm/drm_fops.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/drm_fops.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/drm_fops.c linux-2.6.32/drivers/gpu/drm/drm_fops.c +--- linux-2.6.32/drivers/gpu/drm/drm_fops.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/drm_fops.c 2009-12-04 21:40:48.256614705 -0500 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * } @@ -21919,9 +22427,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_fops.c linux-2.6.31.7/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.31.7/drivers/gpu/drm/drm_ioctl.c ---- linux-2.6.31.7/drivers/gpu/drm/drm_ioctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/drm_ioctl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/drm_ioctl.c linux-2.6.32/drivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32/drivers/gpu/drm/drm_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/drm_ioctl.c 2009-12-04 21:40:48.256614705 -0500 @@ -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); @@ -21931,9 +22439,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_ioctl.c linux-2.6.31.7/drivers/gpu stats->data[i].type = dev->types[i]; } -diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_lock.c linux-2.6.31.7/drivers/gpu/drm/drm_lock.c ---- linux-2.6.31.7/drivers/gpu/drm/drm_lock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/drm_lock.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/drm_lock.c linux-2.6.32/drivers/gpu/drm/drm_lock.c +--- linux-2.6.32/drivers/gpu/drm/drm_lock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/drm_lock.c 2009-12-04 21:40:48.257753681 -0500 @@ -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; @@ -21952,45 +22460,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_lock.c linux-2.6.31.7/drivers/gpu/ /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.31.7/drivers/gpu/drm/drm_vm.c linux-2.6.31.7/drivers/gpu/drm/drm_vm.c ---- linux-2.6.31.7/drivers/gpu/drm/drm_vm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/drm_vm.c 2009-12-10 22:15:16.000000000 -0500 -@@ -369,28 +369,28 @@ static int drm_vm_sg_fault(struct vm_are - } - - /** AGP virtual memory operations */ --static struct vm_operations_struct drm_vm_ops = { -+static const struct vm_operations_struct drm_vm_ops = { - .fault = drm_vm_fault, - .open = drm_vm_open, - .close = drm_vm_close, - }; - - /** Shared virtual memory operations */ --static struct vm_operations_struct drm_vm_shm_ops = { -+static const struct vm_operations_struct drm_vm_shm_ops = { - .fault = drm_vm_shm_fault, - .open = drm_vm_open, - .close = drm_vm_shm_close, - }; - - /** DMA virtual memory operations */ --static struct vm_operations_struct drm_vm_dma_ops = { -+static const struct vm_operations_struct drm_vm_dma_ops = { - .fault = drm_vm_dma_fault, - .open = drm_vm_open, - .close = drm_vm_close, - }; - - /** Scatter-gather virtual memory operations */ --static struct vm_operations_struct drm_vm_sg_ops = { -+static const struct vm_operations_struct drm_vm_sg_ops = { - .fault = drm_vm_sg_fault, - .open = drm_vm_open, - .close = drm_vm_close, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.31.7/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.31.7/drivers/gpu/drm/i810/i810_dma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i810/i810_dma.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32/drivers/gpu/drm/i810/i810_dma.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i810/i810_dma.c 2009-12-04 21:40:48.257753681 -0500 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -22013,96 +22485,33 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i810/i810_dma.c linux-2.6.31.7/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo.h linux-2.6.31.7/drivers/gpu/drm/i915/dvo.h ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo.h 2009-12-10 22:15:16.000000000 -0500 -@@ -51,14 +51,14 @@ struct intel_dvo_dev_ops { - * Initialize the device at startup time. - * Returns NULL if the device does not exist. - */ -- bool (*init)(struct intel_dvo_device *dvo, -+ bool (* const init)(struct intel_dvo_device *dvo, - struct i2c_adapter *i2cbus); - - /* - * Called to allow the output a chance to create properties after the - * RandR objects have been created. - */ -- void (*create_resources)(struct intel_dvo_device *dvo); -+ void (* const create_resources)(struct intel_dvo_device *dvo); - - /* - * Turn on/off output or set intermediate power levels if available. -@@ -67,17 +67,17 @@ struct intel_dvo_dev_ops { - * If the mode is DPMSModeOff, the output must be disabled, - * as the DPLL may be disabled afterwards. - */ -- void (*dpms)(struct intel_dvo_device *dvo, int mode); -+ void (* const dpms)(struct intel_dvo_device *dvo, int mode); - - /* - * Saves the output's state for restoration on VT switch. - */ -- void (*save)(struct intel_dvo_device *dvo); -+ void (* const save)(struct intel_dvo_device *dvo); - - /* - * Restore's the output's state at VT switch. - */ -- void (*restore)(struct intel_dvo_device *dvo); -+ void (* const restore)(struct intel_dvo_device *dvo); - - /* - * Callback for testing a video mode for a given output. -@@ -88,7 +88,7 @@ struct intel_dvo_dev_ops { - * - * \return MODE_OK if the mode is valid, or another MODE_* otherwise. - */ -- int (*mode_valid)(struct intel_dvo_device *dvo, -+ int (* const mode_valid)(struct intel_dvo_device *dvo, - struct drm_display_mode *mode); - - /* -@@ -98,19 +98,19 @@ struct intel_dvo_dev_ops { - * timings, which is used for panels with fixed timings or for - * buses with clock limitations. - */ -- bool (*mode_fixup)(struct intel_dvo_device *dvo, -+ bool (* const mode_fixup)(struct intel_dvo_device *dvo, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode); - - /* - * Callback for preparing mode changes on an output - */ -- void (*prepare)(struct intel_dvo_device *dvo); -+ void (* const prepare)(struct intel_dvo_device *dvo); - - /* - * Callback for committing mode changes on an output - */ -- void (*commit)(struct intel_dvo_device *dvo); -+ void (* const commit)(struct intel_dvo_device *dvo); - - /* - * Callback for setting up a video mode after fixups have been made. -@@ -119,14 +119,14 @@ struct intel_dvo_dev_ops { - * must be all that's necessary for the output, to turn the output on - * after this function is called. - */ -- void (*mode_set)(struct intel_dvo_device *dvo, -+ void (* const mode_set)(struct intel_dvo_device *dvo, - struct drm_display_mode *mode, - struct drm_display_mode *adjusted_mode); +diff -urNp linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-04 21:40:48.258640992 -0500 +@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ + } + } - /* - * Probe for a connected output, and return detect_status. - */ -- enum drm_connector_status (*detect)(struct intel_dvo_device *dvo); -+ enum drm_connector_status (* const detect)(struct intel_dvo_device *dvo); +-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/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-04 21:40:48.258640992 -0500 +@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ + } + } - /** - * Query the device for the modes it provides. +-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/drivers/gpu/drm/i915/dvo.h linux-2.6.32/drivers/gpu/drm/i915/dvo.h +--- linux-2.6.32/drivers/gpu/drm/i915/dvo.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo.h 2009-12-04 21:40:48.258640992 -0500 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { * * \return singly-linked list of modes or NULL if no modes found. @@ -22135,33 +22544,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo.h linux-2.6.31.7/drivers/gpu/ +extern const struct intel_dvo_dev_ops ch7017_ops; #endif /* _INTEL_DVO_H */ -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7017.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7017.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7xxx.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ch7xxx.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ivch.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo_ivch.c 2009-12-04 21:40:48.259631235 -0500 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv } } @@ -22171,9 +22556,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.31.7/drivers .init = ivch_init, .dpms = ivch_dpms, .save = ivch_save, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.31.7/drivers/gpu/drm/i915/dvo_sil164.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo_sil164.c 2009-12-04 21:40:48.263648325 -0500 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ } } @@ -22183,9 +22568,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.31.7/drive .init = sil164_init, .detect = sil164_detect, .mode_valid = sil164_mode_valid, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.31.7/drivers/gpu/drm/i915/dvo_tfp410.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/dvo_tfp410.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/dvo_tfp410.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32/drivers/gpu/drm/i915/dvo_tfp410.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/dvo_tfp410.c 2009-12-04 21:40:48.263648325 -0500 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ } } @@ -22195,10 +22580,10 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.31.7/drive .init = tfp410_init, .detect = tfp410_detect, .mode_valid = tfp410_mode_valid, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.31.7/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.31.7/drivers/gpu/drm/i915/i915_drv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/i915/i915_drv.c 2009-12-10 22:15:16.000000000 -0500 -@@ -152,7 +152,7 @@ i915_pci_resume(struct pci_dev *pdev) +diff -urNp linux-2.6.32/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32/drivers/gpu/drm/i915/i915_drv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/i915/i915_drv.c 2009-12-04 21:40:48.263648325 -0500 +@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) return i915_resume(dev); } @@ -22207,26 +22592,46 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/i915/i915_drv.c linux-2.6.31.7/drivers .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_atombios.c ---- linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_atombios.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_atombios.c 2009-12-10 22:15:16.000000000 -0500 -@@ -425,13 +425,13 @@ bool radeon_get_atom_connector_info_from - return true; +diff -urNp linux-2.6.32/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32/drivers/gpu/drm/radeon/mkregtable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/radeon/mkregtable.c 2009-12-04 21:40:48.265649589 -0500 +@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, + regex_t mask_rex; + regmatch_t match[4]; + char buf[1024]; +- size_t end; ++ long end; + int len; + int done = 0; + int r; + unsigned o; + struct offset *offset; + char last_reg_s[10]; +- int last_reg; ++ unsigned long last_reg; + + if (regcomp + (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { +diff -urNp linux-2.6.32/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32/drivers/gpu/drm/radeon/radeon_atombios.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/radeon/radeon_atombios.c 2009-12-04 21:40:48.265649589 -0500 +@@ -496,13 +496,13 @@ static uint16_t atombios_get_connector_o + } } -struct bios_connector { +static struct bios_connector { bool valid; - uint8_t line_mux; + uint16_t line_mux; uint16_t devices; int connector_type; struct radeon_i2c_bus_rec ddc_bus; -}; -+} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];; ++} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; bool radeon_get_atom_connector_info_from_supported_devices_table(struct drm_device -@@ -447,7 +447,6 @@ bool radeon_get_atom_connector_info_from +@@ -518,7 +518,6 @@ bool radeon_get_atom_connector_info_from uint8_t dac; union atom_supported_devices *supported_devices; int i, j; @@ -22234,10 +22639,10 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.31. atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); -diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_state.c ---- linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_state.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_state.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3007,7 +3007,7 @@ static int radeon_cp_getparam(struct drm +diff -urNp linux-2.6.32/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.32/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32/drivers/gpu/drm/radeon/radeon_state.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/radeon/radeon_state.c 2009-12-04 21:40:48.266729137 -0500 +@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm { drm_radeon_private_t *dev_priv = dev->dev_private; drm_radeon_getparam_t *param = data; @@ -22246,15 +22651,15 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_state.c linux-2.6.31.7/d DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); -diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c ---- linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-10 22:15:16.000000000 -0500 -@@ -500,27 +500,10 @@ void radeon_ttm_fini(struct radeon_devic +diff -urNp linux-2.6.32/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/radeon/radeon_ttm.c 2009-12-04 21:40:48.267731642 -0500 +@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic DRM_INFO("radeon: ttm finalized\n"); } -static struct vm_operations_struct radeon_ttm_vm_ops; --static struct vm_operations_struct *ttm_vm_ops = NULL; +-static const struct vm_operations_struct *ttm_vm_ops = NULL; - -static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -{ @@ -22277,7 +22682,7 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.7/dri if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) { return drm_mmap(filp, vma); -@@ -528,20 +511,9 @@ int radeon_mmap(struct file *filp, struc +@@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struc file_priv = (struct drm_file *)filp->private_data; rdev = file_priv->minor->dev->dev_private; @@ -22300,9 +22705,21 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.31.7/dri } -diff -urNp linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_bo_vm.c ---- linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo.c 2009-12-04 21:40:48.267731642 -0500 +@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a + NULL + }; + +-static struct sysfs_ops ttm_bo_global_ops = { ++static const struct sysfs_ops ttm_bo_global_ops = { + .show = &ttm_bo_global_show + }; + +diff -urNp linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/ttm/ttm_bo_vm.c 2009-12-04 21:40:48.268701971 -0500 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are { struct ttm_buffer_object *bo = (struct ttm_buffer_object *) @@ -22323,18 +22740,9 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.31.7/drivers /* * Work around locking order reversal in fault / nopfn * between mmap_sem and bo_reserve: Perform a trylock operation -@@ -228,7 +232,7 @@ static void ttm_bo_vm_close(struct vm_ar - vma->vm_private_data = NULL; - } - --static struct vm_operations_struct ttm_bo_vm_ops = { -+static const struct vm_operations_struct ttm_bo_vm_ops = { - .fault = ttm_bo_vm_fault, - .open = ttm_bo_vm_open, - .close = ttm_bo_vm_close -diff -urNp linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c ---- linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32/drivers/gpu/drm/ttm/ttm_global.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/ttm/ttm_global.c 2009-12-04 21:40:48.268701971 -0500 @@ -36,7 +36,7 @@ struct ttm_global_item { struct mutex mutex; @@ -22368,19 +22776,19 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.7/driver mutex_lock(&item->mutex); - if (item->refcount == 0) { + if (atomic_read(&item->refcount) == 0) { - item->object = kmalloc(ref->size, GFP_KERNEL); + item->object = kzalloc(ref->size, GFP_KERNEL); if (unlikely(item->object == NULL)) { ret = -ENOMEM; -@@ -82,7 +82,7 @@ int ttm_global_item_ref(struct ttm_globa - if (unlikely(ret != 0)) +@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_globa goto out_err; -- ++item->refcount; -+ atomic_inc(&item->refcount); } +- ++item->refcount; ++ atomic_inc(&item->refcount); ref->object = item->object; object = item->object; -@@ -101,9 +101,9 @@ void ttm_global_item_unref(struct ttm_gl + mutex_unlock(&item->mutex); +@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_gl struct ttm_global_item *item = &glob[ref->global_type]; mutex_lock(&item->mutex); @@ -22390,34 +22798,23 @@ diff -urNp linux-2.6.31.7/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.31.7/driver - if (--item->refcount == 0) { + if (atomic_dec_and_test(&item->refcount)) { ref->release(ref); - kfree(item->object); item->object = NULL; -diff -urNp linux-2.6.31.7/drivers/hwmon/fschmd.c linux-2.6.31.7/drivers/hwmon/fschmd.c ---- linux-2.6.31.7/drivers/hwmon/fschmd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/fschmd.c 2009-12-10 22:15:16.000000000 -0500 -@@ -915,7 +915,7 @@ static int watchdog_ioctl(struct inode * - return ret; - } + } +diff -urNp linux-2.6.32/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32/drivers/gpu/drm/ttm/ttm_memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/gpu/drm/ttm/ttm_memory.c 2009-12-04 21:40:48.268701971 -0500 +@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at + NULL + }; --static struct file_operations watchdog_fops = { -+static const struct file_operations watchdog_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .open = watchdog_open, -diff -urNp linux-2.6.31.7/drivers/hwmon/fscpos.c linux-2.6.31.7/drivers/hwmon/fscpos.c ---- linux-2.6.31.7/drivers/hwmon/fscpos.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/fscpos.c 2009-12-10 22:15:16.000000000 -0500 -@@ -240,7 +240,6 @@ static ssize_t set_pwm(struct i2c_client - unsigned long v = simple_strtoul(buf, NULL, 10); - - /* Range: 0..255 */ -- if (v < 0) v = 0; - if (v > 255) v = 255; - - mutex_lock(&data->update_lock); -diff -urNp linux-2.6.31.7/drivers/hwmon/k8temp.c linux-2.6.31.7/drivers/hwmon/k8temp.c ---- linux-2.6.31.7/drivers/hwmon/k8temp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/k8temp.c 2009-12-10 22:15:16.000000000 -0500 +-static struct sysfs_ops ttm_mem_zone_ops = { ++static const struct sysfs_ops ttm_mem_zone_ops = { + .show = &ttm_mem_zone_show, + .store = &ttm_mem_zone_store + }; +diff -urNp linux-2.6.32/drivers/hwmon/k8temp.c linux-2.6.32/drivers/hwmon/k8temp.c +--- linux-2.6.32/drivers/hwmon/k8temp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/hwmon/k8temp.c 2009-12-04 21:40:48.269613442 -0500 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -22427,9 +22824,9 @@ diff -urNp linux-2.6.31.7/drivers/hwmon/k8temp.c linux-2.6.31.7/drivers/hwmon/k8 }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.31.7/drivers/hwmon/sis5595.c linux-2.6.31.7/drivers/hwmon/sis5595.c ---- linux-2.6.31.7/drivers/hwmon/sis5595.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/sis5595.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/hwmon/sis5595.c linux-2.6.32/drivers/hwmon/sis5595.c +--- linux-2.6.32/drivers/hwmon/sis5595.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/hwmon/sis5595.c 2009-12-04 21:40:48.269613442 -0500 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -22439,9 +22836,9 @@ diff -urNp linux-2.6.31.7/drivers/hwmon/sis5595.c linux-2.6.31.7/drivers/hwmon/s }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.31.7/drivers/hwmon/via686a.c linux-2.6.31.7/drivers/hwmon/via686a.c ---- linux-2.6.31.7/drivers/hwmon/via686a.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/via686a.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/hwmon/via686a.c linux-2.6.32/drivers/hwmon/via686a.c +--- linux-2.6.32/drivers/hwmon/via686a.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/hwmon/via686a.c 2009-12-04 21:40:48.270670119 -0500 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -22451,9 +22848,9 @@ diff -urNp linux-2.6.31.7/drivers/hwmon/via686a.c linux-2.6.31.7/drivers/hwmon/v }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.31.7/drivers/hwmon/vt8231.c linux-2.6.31.7/drivers/hwmon/vt8231.c ---- linux-2.6.31.7/drivers/hwmon/vt8231.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/vt8231.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/hwmon/vt8231.c linux-2.6.32/drivers/hwmon/vt8231.c +--- linux-2.6.32/drivers/hwmon/vt8231.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/hwmon/vt8231.c 2009-12-04 21:40:48.270670119 -0500 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -22463,9 +22860,9 @@ diff -urNp linux-2.6.31.7/drivers/hwmon/vt8231.c linux-2.6.31.7/drivers/hwmon/vt }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.31.7/drivers/hwmon/w83791d.c linux-2.6.31.7/drivers/hwmon/w83791d.c ---- linux-2.6.31.7/drivers/hwmon/w83791d.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/hwmon/w83791d.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/hwmon/w83791d.c linux-2.6.32/drivers/hwmon/w83791d.c +--- linux-2.6.32/drivers/hwmon/w83791d.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/hwmon/w83791d.c 2009-12-04 21:40:48.271668039 -0500 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -22477,9 +22874,9 @@ diff -urNp linux-2.6.31.7/drivers/hwmon/w83791d.c linux-2.6.31.7/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-i801.c linux-2.6.31.7/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.31.7/drivers/i2c/busses/i2c-i801.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/i2c/busses/i2c-i801.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/i2c/busses/i2c-i801.c linux-2.6.32/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.32/drivers/i2c/busses/i2c-i801.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/i2c/busses/i2c-i801.c 2009-12-04 21:40:48.271668039 -0500 @@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, @@ -22489,10 +22886,10 @@ diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-i801.c linux-2.6.31.7/drivers/i }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c 2009-12-10 22:15:16.000000000 -0500 -@@ -123,7 +123,7 @@ static struct dmi_system_id __devinitdat +diff -urNp linux-2.6.32/drivers/i2c/busses/i2c-piix4.c linux-2.6.32/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.32/drivers/i2c/busses/i2c-piix4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/i2c/busses/i2c-piix4.c 2009-12-04 21:40:48.272730419 -0500 +@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, }, @@ -22501,7 +22898,7 @@ diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.7/drivers/ }; static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, -@@ -489,7 +489,7 @@ static struct pci_device_id piix4_ids[] +@@ -491,7 +491,7 @@ static struct pci_device_id piix4_ids[] PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, @@ -22510,9 +22907,9 @@ diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-piix4.c linux-2.6.31.7/drivers/ }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.31.7/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.31.7/drivers/i2c/busses/i2c-sis630.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/i2c/busses/i2c-sis630.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/i2c/busses/i2c-sis630.c linux-2.6.32/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.32/drivers/i2c/busses/i2c-sis630.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/i2c/busses/i2c-sis630.c 2009-12-04 21:40:48.273628669 -0500 @@ -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) }, @@ -22522,9 +22919,9 @@ diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-sis630.c linux-2.6.31.7/drivers }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.31.7/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.31.7/drivers/i2c/busses/i2c-sis96x.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/i2c/busses/i2c-sis96x.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.32/drivers/i2c/busses/i2c-sis96x.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/i2c/busses/i2c-sis96x.c 2009-12-04 21:40:48.273628669 -0500 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -22534,21 +22931,21 @@ diff -urNp linux-2.6.31.7/drivers/i2c/busses/i2c-sis96x.c linux-2.6.31.7/drivers }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.31.7/drivers/ieee1394/dma.c linux-2.6.31.7/drivers/ieee1394/dma.c ---- linux-2.6.31.7/drivers/ieee1394/dma.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/dma.c 2009-12-10 22:15:16.000000000 -0500 -@@ -247,7 +247,7 @@ static int dma_region_pagefault(struct v - return 0; - } - --static struct vm_operations_struct dma_region_vm_ops = { -+static const struct vm_operations_struct dma_region_vm_ops = { - .fault = dma_region_pagefault, - }; - -diff -urNp linux-2.6.31.7/drivers/ieee1394/dv1394.c linux-2.6.31.7/drivers/ieee1394/dv1394.c ---- linux-2.6.31.7/drivers/ieee1394/dv1394.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/dv1394.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ide/ide-cd.c linux-2.6.32/drivers/ide/ide-cd.c +--- linux-2.6.32/drivers/ide/ide-cd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ide/ide-cd.c 2009-12-11 19:45:16.229444088 -0500 +@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ + alignment = queue_dma_alignment(q) | q->dma_pad_mask; + if ((unsigned long)buf & alignment + || blk_rq_bytes(rq) & q->dma_pad_mask +- || object_is_on_stack(buf)) ++ || object_starts_on_stack(buf)) + drive->dma = 0; + } + } +diff -urNp linux-2.6.32/drivers/ieee1394/dv1394.c linux-2.6.32/drivers/ieee1394/dv1394.c +--- linux-2.6.32/drivers/ieee1394/dv1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/dv1394.c 2009-12-04 21:40:48.274660938 -0500 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -22567,10 +22964,10 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/dv1394.c linux-2.6.31.7/drivers/ieee1 }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.31.7/drivers/ieee1394/eth1394.c linux-2.6.31.7/drivers/ieee1394/eth1394.c ---- linux-2.6.31.7/drivers/ieee1394/eth1394.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/eth1394.c 2009-12-10 22:15:16.000000000 -0500 -@@ -445,7 +445,7 @@ static const struct ieee1394_device_id e +diff -urNp linux-2.6.32/drivers/ieee1394/eth1394.c linux-2.6.32/drivers/ieee1394/eth1394.c +--- linux-2.6.32/drivers/ieee1394/eth1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/eth1394.c 2009-12-04 21:40:48.274660938 -0500 +@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, }, @@ -22579,9 +22976,9 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/eth1394.c linux-2.6.31.7/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.31.7/drivers/ieee1394/hosts.c linux-2.6.31.7/drivers/ieee1394/hosts.c ---- linux-2.6.31.7/drivers/ieee1394/hosts.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/hosts.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ieee1394/hosts.c linux-2.6.32/drivers/ieee1394/hosts.c +--- linux-2.6.32/drivers/ieee1394/hosts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/hosts.c 2009-12-04 21:40:48.275731446 -0500 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -22590,9 +22987,9 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/hosts.c linux-2.6.31.7/drivers/ieee13 .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.31.7/drivers/ieee1394/ohci1394.c linux-2.6.31.7/drivers/ieee1394/ohci1394.c ---- linux-2.6.31.7/drivers/ieee1394/ohci1394.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/ohci1394.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ieee1394/ohci1394.c linux-2.6.32/drivers/ieee1394/ohci1394.c +--- linux-2.6.32/drivers/ieee1394/ohci1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/ohci1394.c 2009-12-04 21:40:48.303669088 -0500 @@ -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) @@ -22614,10 +23011,10 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/ohci1394.c linux-2.6.31.7/drivers/iee }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.31.7/drivers/ieee1394/raw1394.c linux-2.6.31.7/drivers/ieee1394/raw1394.c ---- linux-2.6.31.7/drivers/ieee1394/raw1394.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/raw1394.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2999,7 +2999,7 @@ static const struct ieee1394_device_id r +diff -urNp linux-2.6.32/drivers/ieee1394/raw1394.c linux-2.6.32/drivers/ieee1394/raw1394.c +--- linux-2.6.32/drivers/ieee1394/raw1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/raw1394.c 2009-12-04 21:40:48.304734166 -0500 +@@ -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, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff}, @@ -22626,9 +23023,9 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/raw1394.c linux-2.6.31.7/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.31.7/drivers/ieee1394/sbp2.c linux-2.6.31.7/drivers/ieee1394/sbp2.c ---- linux-2.6.31.7/drivers/ieee1394/sbp2.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/sbp2.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/ieee1394/sbp2.c linux-2.6.32/drivers/ieee1394/sbp2.c +--- linux-2.6.32/drivers/ieee1394/sbp2.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/sbp2.c 2009-12-04 21:40:48.305640910 -0500 @@ -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, @@ -22638,7 +23035,7 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/sbp2.c linux-2.6.31.7/drivers/ieee139 }; MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); -@@ -2112,7 +2112,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot +@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); MODULE_LICENSE("GPL"); @@ -22647,10 +23044,10 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/sbp2.c linux-2.6.31.7/drivers/ieee139 { int ret; -diff -urNp linux-2.6.31.7/drivers/ieee1394/video1394.c linux-2.6.31.7/drivers/ieee1394/video1394.c ---- linux-2.6.31.7/drivers/ieee1394/video1394.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/ieee1394/video1394.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1310,7 +1310,7 @@ static const struct ieee1394_device_id v +diff -urNp linux-2.6.32/drivers/ieee1394/video1394.c linux-2.6.32/drivers/ieee1394/video1394.c +--- linux-2.6.32/drivers/ieee1394/video1394.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/ieee1394/video1394.c 2009-12-04 21:40:48.305640910 -0500 +@@ -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 }, @@ -22659,9 +23056,9 @@ diff -urNp linux-2.6.31.7/drivers/ieee1394/video1394.c linux-2.6.31.7/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.31.7/drivers/infiniband/core/cm.c linux-2.6.31.7/drivers/infiniband/core/cm.c ---- linux-2.6.31.7/drivers/infiniband/core/cm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/infiniband/core/cm.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/infiniband/core/cm.c linux-2.6.32/drivers/infiniband/core/cm.c +--- linux-2.6.32/drivers/infiniband/core/cm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/infiniband/core/cm.c 2009-12-04 21:40:48.307705583 -0500 @@ -3597,7 +3597,7 @@ static ssize_t cm_show_counter(struct ko atomic_long_read(&group->counter[cm_attr->index])); } @@ -22671,9 +23068,9 @@ diff -urNp linux-2.6.31.7/drivers/infiniband/core/cm.c linux-2.6.31.7/drivers/in .show = cm_show_counter }; -diff -urNp linux-2.6.31.7/drivers/infiniband/core/sysfs.c linux-2.6.31.7/drivers/infiniband/core/sysfs.c ---- linux-2.6.31.7/drivers/infiniband/core/sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/infiniband/core/sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/infiniband/core/sysfs.c linux-2.6.32/drivers/infiniband/core/sysfs.c +--- linux-2.6.32/drivers/infiniband/core/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/infiniband/core/sysfs.c 2009-12-04 21:40:48.307705583 -0500 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob return port_attr->show(p, port_attr, buf); } @@ -22683,46 +23080,10 @@ diff -urNp linux-2.6.31.7/drivers/infiniband/core/sysfs.c linux-2.6.31.7/drivers .show = port_attr_show }; -diff -urNp linux-2.6.31.7/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.31.7/drivers/infiniband/hw/ehca/ehca_uverbs.c ---- linux-2.6.31.7/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -95,7 +95,7 @@ static void ehca_mm_close(struct vm_area - vma->vm_start, vma->vm_end, *count); - } - --static struct vm_operations_struct vm_ops = { -+static const struct vm_operations_struct vm_ops = { - .open = ehca_mm_open, - .close = ehca_mm_close, - }; -diff -urNp linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_file_ops.c ---- linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1151,7 +1151,7 @@ static int ipath_file_vma_fault(struct v - return 0; - } - --static struct vm_operations_struct ipath_file_vm_ops = { -+static const struct vm_operations_struct ipath_file_vm_ops = { - .fault = ipath_file_vma_fault, - }; - -diff -urNp linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_mmap.c ---- linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-12-10 22:15:16.000000000 -0500 -@@ -74,7 +74,7 @@ static void ipath_vma_close(struct vm_ar - kref_put(&ip->ref, ipath_release_mmap_info); - } - --static struct vm_operations_struct ipath_vm_ops = { -+static const struct vm_operations_struct ipath_vm_ops = { - .open = ipath_vma_open, - .close = ipath_vma_close, - }; -diff -urNp linux-2.6.31.7/drivers/input/keyboard/atkbd.c linux-2.6.31.7/drivers/input/keyboard/atkbd.c ---- linux-2.6.31.7/drivers/input/keyboard/atkbd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/keyboard/atkbd.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1188,7 +1188,7 @@ static struct serio_device_id atkbd_seri +diff -urNp linux-2.6.32/drivers/input/keyboard/atkbd.c linux-2.6.32/drivers/input/keyboard/atkbd.c +--- linux-2.6.32/drivers/input/keyboard/atkbd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/keyboard/atkbd.c 2009-12-04 21:40:48.308738383 -0500 +@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -22731,10 +23092,10 @@ diff -urNp linux-2.6.31.7/drivers/input/keyboard/atkbd.c linux-2.6.31.7/drivers/ }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.31.7/drivers/input/mouse/lifebook.c linux-2.6.31.7/drivers/input/mouse/lifebook.c ---- linux-2.6.31.7/drivers/input/mouse/lifebook.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/mouse/lifebook.c 2009-12-10 22:15:16.000000000 -0500 -@@ -116,7 +116,7 @@ static const struct dmi_system_id lifebo +diff -urNp linux-2.6.32/drivers/input/mouse/lifebook.c linux-2.6.32/drivers/input/mouse/lifebook.c +--- linux-2.6.32/drivers/input/mouse/lifebook.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/mouse/lifebook.c 2009-12-04 21:40:48.308738383 -0500 +@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, }, @@ -22743,10 +23104,10 @@ diff -urNp linux-2.6.31.7/drivers/input/mouse/lifebook.c linux-2.6.31.7/drivers/ }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.31.7/drivers/input/mouse/psmouse-base.c linux-2.6.31.7/drivers/input/mouse/psmouse-base.c ---- linux-2.6.31.7/drivers/input/mouse/psmouse-base.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/mouse/psmouse-base.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1380,7 +1380,7 @@ static struct serio_device_id psmouse_se +diff -urNp linux-2.6.32/drivers/input/mouse/psmouse-base.c linux-2.6.32/drivers/input/mouse/psmouse-base.c +--- linux-2.6.32/drivers/input/mouse/psmouse-base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/mouse/psmouse-base.c 2009-12-04 21:40:48.309736597 -0500 +@@ -1407,7 +1407,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -22755,9 +23116,9 @@ diff -urNp linux-2.6.31.7/drivers/input/mouse/psmouse-base.c linux-2.6.31.7/driv }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.31.7/drivers/input/mouse/synaptics.c linux-2.6.31.7/drivers/input/mouse/synaptics.c ---- linux-2.6.31.7/drivers/input/mouse/synaptics.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/mouse/synaptics.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/input/mouse/synaptics.c linux-2.6.32/drivers/input/mouse/synaptics.c +--- linux-2.6.32/drivers/input/mouse/synaptics.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/mouse/synaptics.c 2009-12-04 21:40:48.309736597 -0500 @@ -437,7 +437,7 @@ static void synaptics_process_packet(str break; case 2: @@ -22767,19 +23128,29 @@ diff -urNp linux-2.6.31.7/drivers/input/mouse/synaptics.c linux-2.6.31.7/drivers break; case 4 ... 15: if (SYN_CAP_PALMDETECT(priv->capabilities)) -@@ -663,7 +663,7 @@ static const struct dmi_system_id toshib +@@ -652,7 +652,6 @@ static const struct dmi_system_id toshib + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"), }, - +- + }, + { + .ident = "Toshiba Portege M300", +@@ -661,9 +660,8 @@ static const struct dmi_system_id toshib + DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"), + }, +- }, - { } + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } }; #endif -diff -urNp linux-2.6.31.7/drivers/input/mousedev.c linux-2.6.31.7/drivers/input/mousedev.c ---- linux-2.6.31.7/drivers/input/mousedev.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/mousedev.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1056,7 +1056,7 @@ static struct input_handler mousedev_han +diff -urNp linux-2.6.32/drivers/input/mousedev.c linux-2.6.32/drivers/input/mousedev.c +--- linux-2.6.32/drivers/input/mousedev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/mousedev.c 2009-12-04 21:40:48.309736597 -0500 +@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX static struct miscdevice psaux_mouse = { @@ -22788,9 +23159,9 @@ diff -urNp linux-2.6.31.7/drivers/input/mousedev.c linux-2.6.31.7/drivers/input/ }; static int psaux_registered; #endif -diff -urNp linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.32/drivers/input/serio/i8042-x86ia64io.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/serio/i8042-x86ia64io.h 2009-12-04 21:40:48.310627289 -0500 @@ -167,7 +167,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, @@ -22800,7 +23171,7 @@ diff -urNp linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.7/d }; /* -@@ -390,7 +390,7 @@ static struct dmi_system_id __initdata i +@@ -401,7 +401,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), }, }, @@ -22809,8 +23180,8 @@ diff -urNp linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.7/d }; static struct dmi_system_id __initdata i8042_dmi_reset_table[] = { -@@ -436,7 +436,7 @@ static struct dmi_system_id __initdata i - DMI_MATCH(DMI_PRODUCT_NAME, "N10"), +@@ -468,7 +468,7 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), }, }, - { } @@ -22818,16 +23189,25 @@ diff -urNp linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.7/d }; #ifdef CONFIG_PNP -@@ -455,7 +455,7 @@ static struct dmi_system_id __initdata i +@@ -487,7 +487,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), }, }, - { } + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } }; + + static struct dmi_system_id __initdata i8042_dmi_laptop_table[] = { +@@ -515,7 +515,7 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ + }, + }, +- { } ++ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } + }; #endif -@@ -522,7 +522,7 @@ static struct dmi_system_id __initdata i +@@ -582,7 +582,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), }, }, @@ -22836,10 +23216,10 @@ diff -urNp linux-2.6.31.7/drivers/input/serio/i8042-x86ia64io.h linux-2.6.31.7/d }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.31.7/drivers/input/serio/serio_raw.c linux-2.6.31.7/drivers/input/serio/serio_raw.c ---- linux-2.6.31.7/drivers/input/serio/serio_raw.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/input/serio/serio_raw.c 2009-12-10 22:15:16.000000000 -0500 -@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_ +diff -urNp linux-2.6.32/drivers/input/serio/serio_raw.c linux-2.6.32/drivers/input/serio/serio_raw.c +--- linux-2.6.32/drivers/input/serio/serio_raw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/input/serio/serio_raw.c 2009-12-04 21:40:48.310627289 -0500 +@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -22848,56 +23228,10 @@ diff -urNp linux-2.6.31.7/drivers/input/serio/serio_raw.c linux-2.6.31.7/drivers }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.31.7/drivers/isdn/capi/kcapi_proc.c linux-2.6.31.7/drivers/isdn/capi/kcapi_proc.c ---- linux-2.6.31.7/drivers/isdn/capi/kcapi_proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/isdn/capi/kcapi_proc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -89,14 +89,14 @@ static int contrstats_show(struct seq_fi - return 0; - } - --static struct seq_operations seq_controller_ops = { -+static const struct seq_operations seq_controller_ops = { - .start = controller_start, - .next = controller_next, - .stop = controller_stop, - .show = controller_show, - }; - --static struct seq_operations seq_contrstats_ops = { -+static const struct seq_operations seq_contrstats_ops = { - .start = controller_start, - .next = controller_next, - .stop = controller_stop, -@@ -194,14 +194,14 @@ applstats_show(struct seq_file *seq, voi - return 0; - } - --static struct seq_operations seq_applications_ops = { -+static const struct seq_operations seq_applications_ops = { - .start = applications_start, - .next = applications_next, - .stop = applications_stop, - .show = applications_show, - }; - --static struct seq_operations seq_applstats_ops = { -+static const struct seq_operations seq_applstats_ops = { - .start = applications_start, - .next = applications_next, - .stop = applications_stop, -@@ -264,7 +264,7 @@ static int capi_driver_show(struct seq_f - return 0; - } - --static struct seq_operations seq_capi_driver_ops = { -+static const struct seq_operations seq_capi_driver_ops = { - .start = capi_driver_start, - .next = capi_driver_next, - .stop = capi_driver_stop, -diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/common.c linux-2.6.31.7/drivers/isdn/gigaset/common.c ---- linux-2.6.31.7/drivers/isdn/gigaset/common.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/isdn/gigaset/common.c 2009-12-10 22:15:16.000000000 -0500 -@@ -665,7 +665,7 @@ struct cardstate *gigaset_initcs(struct +diff -urNp linux-2.6.32/drivers/isdn/gigaset/common.c linux-2.6.32/drivers/isdn/gigaset/common.c +--- linux-2.6.32/drivers/isdn/gigaset/common.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/isdn/gigaset/common.c 2009-12-04 21:40:48.321888353 -0500 +@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct cs->commands_pending = 0; cs->cur_at_seq = 0; cs->gotfwver = -1; @@ -22906,9 +23240,9 @@ diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/common.c linux-2.6.31.7/drivers/i cs->dev = NULL; cs->tty = NULL; cs->tty_dev = NULL; -diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/gigaset.h linux-2.6.31.7/drivers/isdn/gigaset/gigaset.h ---- linux-2.6.31.7/drivers/isdn/gigaset/gigaset.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/isdn/gigaset/gigaset.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/isdn/gigaset/gigaset.h linux-2.6.32/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32/drivers/isdn/gigaset/gigaset.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/isdn/gigaset/gigaset.h 2009-12-04 21:40:48.322738537 -0500 @@ -446,7 +446,7 @@ struct cardstate { spinlock_t cmdlock; unsigned curlen, cmdbytes; @@ -22918,9 +23252,9 @@ diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/gigaset.h linux-2.6.31.7/drivers/ struct tty_struct *tty; struct tasklet_struct if_wake_tasklet; unsigned control_state; -diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/interface.c linux-2.6.31.7/drivers/isdn/gigaset/interface.c ---- linux-2.6.31.7/drivers/isdn/gigaset/interface.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/isdn/gigaset/interface.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/isdn/gigaset/interface.c linux-2.6.32/drivers/isdn/gigaset/interface.c +--- linux-2.6.32/drivers/isdn/gigaset/interface.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/isdn/gigaset/interface.c 2009-12-04 21:40:48.322738537 -0500 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt return -ERESTARTSYS; // FIXME -EINTR? tty->driver_data = cs; @@ -23008,10 +23342,10 @@ diff -urNp linux-2.6.31.7/drivers/isdn/gigaset/interface.c linux-2.6.31.7/driver dev_warn(cs->dev, "%s: device not opened\n", __func__); goto out; } -diff -urNp linux-2.6.31.7/drivers/lguest/core.c linux-2.6.31.7/drivers/lguest/core.c ---- linux-2.6.31.7/drivers/lguest/core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/lguest/core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -92,9 +92,17 @@ static __init int map_switcher(void) +diff -urNp linux-2.6.32/drivers/lguest/core.c linux-2.6.32/drivers/lguest/core.c +--- linux-2.6.32/drivers/lguest/core.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/lguest/core.c 2009-12-04 21:40:48.333233792 -0500 +@@ -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. */ @@ -23029,21 +23363,9 @@ diff -urNp linux-2.6.31.7/drivers/lguest/core.c linux-2.6.31.7/drivers/lguest/co if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.31.7/drivers/lguest/lguest_user.c linux-2.6.31.7/drivers/lguest/lguest_user.c ---- linux-2.6.31.7/drivers/lguest/lguest_user.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/lguest/lguest_user.c 2009-12-10 22:15:16.000000000 -0500 -@@ -508,7 +508,7 @@ static int close(struct inode *inode, st - * uses: reading and writing a character device called /dev/lguest. All the - * work happens in the read(), write() and close() routines: - */ --static struct file_operations lguest_fops = { -+static const struct file_operations lguest_fops = { - .owner = THIS_MODULE, - .release = close, - .write = write, -diff -urNp linux-2.6.31.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.31.7/drivers/macintosh/via-pmu-backlight.c ---- linux-2.6.31.7/drivers/macintosh/via-pmu-backlight.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/macintosh/via-pmu-backlight.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/macintosh/via-pmu-backlight.c linux-2.6.32/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32/drivers/macintosh/via-pmu-backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/macintosh/via-pmu-backlight.c 2009-12-04 21:40:48.333744030 -0500 @@ -15,7 +15,7 @@ #define MAX_PMU_LEVEL 0xFF @@ -23062,9 +23384,9 @@ diff -urNp linux-2.6.31.7/drivers/macintosh/via-pmu-backlight.c linux-2.6.31.7/d .get_brightness = pmu_backlight_get_brightness, .update_status = pmu_backlight_update_status, -diff -urNp linux-2.6.31.7/drivers/macintosh/via-pmu.c linux-2.6.31.7/drivers/macintosh/via-pmu.c ---- linux-2.6.31.7/drivers/macintosh/via-pmu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/macintosh/via-pmu.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/macintosh/via-pmu.c linux-2.6.32/drivers/macintosh/via-pmu.c +--- linux-2.6.32/drivers/macintosh/via-pmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/macintosh/via-pmu.c 2009-12-04 21:40:48.333744030 -0500 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); } @@ -23074,9 +23396,9 @@ diff -urNp linux-2.6.31.7/drivers/macintosh/via-pmu.c linux-2.6.31.7/drivers/mac .enter = powerbook_sleep, .valid = pmu_sleep_valid, }; -diff -urNp linux-2.6.31.7/drivers/md/bitmap.c linux-2.6.31.7/drivers/md/bitmap.c ---- linux-2.6.31.7/drivers/md/bitmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/md/bitmap.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/md/bitmap.c linux-2.6.32/drivers/md/bitmap.c +--- linux-2.6.32/drivers/md/bitmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/md/bitmap.c 2009-12-04 21:40:48.334735746 -0500 @@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) @@ -23086,9 +23408,9 @@ diff -urNp linux-2.6.31.7/drivers/md/bitmap.c linux-2.6.31.7/drivers/md/bitmap.c # endif #endif -diff -urNp linux-2.6.31.7/drivers/md/dm-sysfs.c linux-2.6.31.7/drivers/md/dm-sysfs.c ---- linux-2.6.31.7/drivers/md/dm-sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/md/dm-sysfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/md/dm-sysfs.c linux-2.6.32/drivers/md/dm-sysfs.c +--- linux-2.6.32/drivers/md/dm-sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/md/dm-sysfs.c 2009-12-04 21:40:48.335616188 -0500 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { NULL, }; @@ -23098,9 +23420,9 @@ diff -urNp linux-2.6.31.7/drivers/md/dm-sysfs.c linux-2.6.31.7/drivers/md/dm-sys .show = dm_attr_show, }; -diff -urNp linux-2.6.31.7/drivers/md/dm-table.c linux-2.6.31.7/drivers/md/dm-table.c ---- linux-2.6.31.7/drivers/md/dm-table.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/md/dm-table.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/md/dm-table.c linux-2.6.32/drivers/md/dm-table.c +--- linux-2.6.32/drivers/md/dm-table.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/md/dm-table.c 2009-12-04 21:40:48.335616188 -0500 @@ -359,7 +359,7 @@ static int device_area_is_invalid(struct if (!dev_size) return 0; @@ -23110,10 +23432,10 @@ diff -urNp linux-2.6.31.7/drivers/md/dm-table.c linux-2.6.31.7/drivers/md/dm-tab DMWARN("%s: %s too small for target: " "start=%llu, len=%llu, dev_size=%llu", dm_device_name(ti->table->md), bdevname(bdev, b), -diff -urNp linux-2.6.31.7/drivers/md/md.c linux-2.6.31.7/drivers/md/md.c ---- linux-2.6.31.7/drivers/md/md.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/md/md.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2474,7 +2474,7 @@ static void rdev_free(struct kobject *ko +diff -urNp linux-2.6.32/drivers/md/md.c linux-2.6.32/drivers/md/md.c +--- linux-2.6.32/drivers/md/md.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/md/md.c 2009-12-04 21:40:48.337663616 -0500 +@@ -2505,7 +2505,7 @@ static void rdev_free(struct kobject *ko mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); kfree(rdev); } @@ -23122,7 +23444,7 @@ diff -urNp linux-2.6.31.7/drivers/md/md.c linux-2.6.31.7/drivers/md/md.c .show = rdev_attr_show, .store = rdev_attr_store, }; -@@ -3844,7 +3844,7 @@ static void md_free(struct kobject *ko) +@@ -3875,7 +3875,7 @@ static void md_free(struct kobject *ko) kfree(mddev); } @@ -23131,7 +23453,7 @@ diff -urNp linux-2.6.31.7/drivers/md/md.c linux-2.6.31.7/drivers/md/md.c .show = md_attr_show, .store = md_attr_store, }; -@@ -5963,7 +5963,7 @@ static int md_seq_show(struct seq_file * +@@ -5997,7 +5997,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -23140,7 +23462,7 @@ diff -urNp linux-2.6.31.7/drivers/md/md.c linux-2.6.31.7/drivers/md/md.c } seq_printf(seq, "\n"); -@@ -6057,7 +6057,7 @@ static int is_mddev_idle(mddev_t *mddev, +@@ -6091,7 +6091,7 @@ static int is_mddev_idle(mddev_t *mddev, struct gendisk *disk = rdev->bdev->bd_contains->bd_disk; curr_events = (int)part_stat_read(&disk->part0, sectors[0]) + (int)part_stat_read(&disk->part0, sectors[1]) - @@ -23149,9 +23471,9 @@ diff -urNp linux-2.6.31.7/drivers/md/md.c linux-2.6.31.7/drivers/md/md.c /* sync IO will cause sync_io to increase before the disk_stats * as sync_io is counted when a request starts, and * disk_stats is counted when it completes. -diff -urNp linux-2.6.31.7/drivers/md/md.h linux-2.6.31.7/drivers/md/md.h ---- linux-2.6.31.7/drivers/md/md.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/md/md.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/md/md.h linux-2.6.32/drivers/md/md.h +--- linux-2.6.32/drivers/md/md.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/md/md.h 2009-12-04 21:40:48.338647074 -0500 @@ -303,7 +303,7 @@ static inline void rdev_dec_pending(mdk_ static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) @@ -23161,105 +23483,20 @@ diff -urNp linux-2.6.31.7/drivers/md/md.h linux-2.6.31.7/drivers/md/md.h } struct mdk_personality -diff -urNp linux-2.6.31.7/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.31.7/drivers/media/dvb/dvb-core/dmxdev.c ---- linux-2.6.31.7/drivers/media/dvb/dvb-core/dmxdev.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/dvb/dvb-core/dmxdev.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1086,7 +1086,7 @@ static unsigned int dvb_dvr_poll(struct - return mask; - } - --static struct file_operations dvb_dvr_fops = { -+static const struct file_operations dvb_dvr_fops = { - .owner = THIS_MODULE, - .read = dvb_dvr_read, - .write = dvb_dvr_write, -diff -urNp linux-2.6.31.7/drivers/media/dvb/firewire/firedtv-ci.c linux-2.6.31.7/drivers/media/dvb/firewire/firedtv-ci.c ---- linux-2.6.31.7/drivers/media/dvb/firewire/firedtv-ci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/dvb/firewire/firedtv-ci.c 2009-12-10 22:15:16.000000000 -0500 -@@ -215,7 +215,7 @@ static unsigned int fdtv_ca_io_poll(stru - return POLLIN; - } - --static struct file_operations fdtv_ca_fops = { -+static const struct file_operations fdtv_ca_fops = { - .owner = THIS_MODULE, - .ioctl = dvb_generic_ioctl, - .open = dvb_generic_open, -diff -urNp linux-2.6.31.7/drivers/media/video/cafe_ccic.c linux-2.6.31.7/drivers/media/video/cafe_ccic.c ---- linux-2.6.31.7/drivers/media/video/cafe_ccic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/cafe_ccic.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1326,7 +1326,7 @@ static void cafe_v4l_vm_close(struct vm_ - mutex_unlock(&sbuf->cam->s_mutex); - } - --static struct vm_operations_struct cafe_v4l_vm_ops = { -+static const struct vm_operations_struct cafe_v4l_vm_ops = { - .open = cafe_v4l_vm_open, - .close = cafe_v4l_vm_close - }; -diff -urNp linux-2.6.31.7/drivers/media/video/et61x251/et61x251_core.c linux-2.6.31.7/drivers/media/video/et61x251/et61x251_core.c ---- linux-2.6.31.7/drivers/media/video/et61x251/et61x251_core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/et61x251/et61x251_core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1494,7 +1494,7 @@ static void et61x251_vm_close(struct vm_ - } - - --static struct vm_operations_struct et61x251_vm_ops = { -+static const struct vm_operations_struct et61x251_vm_ops = { - .open = et61x251_vm_open, - .close = et61x251_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/gspca/gspca.c linux-2.6.31.7/drivers/media/video/gspca/gspca.c ---- linux-2.6.31.7/drivers/media/video/gspca/gspca.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/gspca/gspca.c 2009-12-10 22:15:16.000000000 -0500 -@@ -99,7 +99,7 @@ static void gspca_vm_close(struct vm_are - frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED; - } - --static struct vm_operations_struct gspca_vm_ops = { -+static const struct vm_operations_struct gspca_vm_ops = { - .open = gspca_vm_open, - .close = gspca_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/meye.c linux-2.6.31.7/drivers/media/video/meye.c ---- linux-2.6.31.7/drivers/media/video/meye.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/meye.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1589,7 +1589,7 @@ static void meye_vm_close(struct vm_area - meye.vma_use_count[idx]--; - } - --static struct vm_operations_struct meye_vm_ops = { -+static const struct vm_operations_struct meye_vm_ops = { - .open = meye_vm_open, - .close = meye_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.31.7/drivers/media/video/sn9c102/sn9c102_core.c ---- linux-2.6.31.7/drivers/media/video/sn9c102/sn9c102_core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/sn9c102/sn9c102_core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2075,7 +2075,7 @@ static void sn9c102_vm_close(struct vm_a - } - - --static struct vm_operations_struct sn9c102_vm_ops = { -+static const struct vm_operations_struct sn9c102_vm_ops = { - .open = sn9c102_vm_open, - .close = sn9c102_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/stk-webcam.c linux-2.6.31.7/drivers/media/video/stk-webcam.c ---- linux-2.6.31.7/drivers/media/video/stk-webcam.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/stk-webcam.c 2009-12-10 22:15:16.000000000 -0500 -@@ -790,7 +790,7 @@ static void stk_v4l_vm_close(struct vm_a - if (sbuf->mapcount == 0) - sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED; - } --static struct vm_operations_struct stk_v4l_vm_ops = { -+static const struct vm_operations_struct stk_v4l_vm_ops = { - .open = stk_v4l_vm_open, - .close = stk_v4l_vm_close - }; -diff -urNp linux-2.6.31.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.31.7/drivers/media/video/usbvideo/konicawc.c ---- linux-2.6.31.7/drivers/media/video/usbvideo/konicawc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/usbvideo/konicawc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32/drivers/media/dvb/dvb-core/dvbdev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/media/dvb/dvb-core/dvbdev.c 2009-12-04 21:40:48.338647074 -0500 +@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt + const struct dvb_device *template, void *priv, int type) + { + struct dvb_device *dvbdev; ++ /* cannot be const */ + struct file_operations *dvbdevfops; + struct device *clsdev; + int minor; +diff -urNp linux-2.6.32/drivers/media/video/usbvideo/konicawc.c linux-2.6.32/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32/drivers/media/video/usbvideo/konicawc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/media/video/usbvideo/konicawc.c 2009-12-04 21:40:48.338647074 -0500 @@ -225,7 +225,7 @@ static void konicawc_register_input(stru int error; @@ -23269,9 +23506,9 @@ diff -urNp linux-2.6.31.7/drivers/media/video/usbvideo/konicawc.c linux-2.6.31.7 cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.31.7/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.31.7/drivers/media/video/usbvideo/quickcam_messenger.c ---- linux-2.6.31.7/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/media/video/usbvideo/quickcam_messenger.c linux-2.6.32/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/media/video/usbvideo/quickcam_messenger.c 2009-12-04 21:40:48.339741592 -0500 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qc int error; @@ -23281,69 +23518,9 @@ diff -urNp linux-2.6.31.7/drivers/media/video/usbvideo/quickcam_messenger.c linu cam->input = input_dev = input_allocate_device(); if (!input_dev) { -diff -urNp linux-2.6.31.7/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.31.7/drivers/media/video/uvc/uvc_v4l2.c ---- linux-2.6.31.7/drivers/media/video/uvc/uvc_v4l2.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/uvc/uvc_v4l2.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1063,7 +1063,7 @@ static void uvc_vm_close(struct vm_area_ - buffer->vma_use_count--; - } - --static struct vm_operations_struct uvc_vm_ops = { -+static const struct vm_operations_struct uvc_vm_ops = { - .open = uvc_vm_open, - .close = uvc_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/videobuf-dma-contig.c linux-2.6.31.7/drivers/media/video/videobuf-dma-contig.c ---- linux-2.6.31.7/drivers/media/video/videobuf-dma-contig.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/videobuf-dma-contig.c 2009-12-10 22:15:16.000000000 -0500 -@@ -105,7 +105,7 @@ static void videobuf_vm_close(struct vm_ - } - } - --static struct vm_operations_struct videobuf_vm_ops = { -+static const struct vm_operations_struct videobuf_vm_ops = { - .open = videobuf_vm_open, - .close = videobuf_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/vino.c linux-2.6.31.7/drivers/media/video/vino.c ---- linux-2.6.31.7/drivers/media/video/vino.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/vino.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3858,7 +3858,7 @@ static void vino_vm_close(struct vm_area - dprintk("vino_vm_close(): count = %d\n", fb->map_count); - } - --static struct vm_operations_struct vino_vm_ops = { -+static const struct vm_operations_struct vino_vm_ops = { - .open = vino_vm_open, - .close = vino_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/zc0301/zc0301_core.c linux-2.6.31.7/drivers/media/video/zc0301/zc0301_core.c ---- linux-2.6.31.7/drivers/media/video/zc0301/zc0301_core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/zc0301/zc0301_core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -933,7 +933,7 @@ static void zc0301_vm_close(struct vm_ar - } - - --static struct vm_operations_struct zc0301_vm_ops = { -+static const struct vm_operations_struct zc0301_vm_ops = { - .open = zc0301_vm_open, - .close = zc0301_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/media/video/zoran/zoran_driver.c linux-2.6.31.7/drivers/media/video/zoran/zoran_driver.c ---- linux-2.6.31.7/drivers/media/video/zoran/zoran_driver.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/media/video/zoran/zoran_driver.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3172,7 +3172,7 @@ zoran_vm_close (struct vm_area_struct *v - mutex_unlock(&zr->resource_lock); - } - --static struct vm_operations_struct zoran_vm_ops = { -+static const struct vm_operations_struct zoran_vm_ops = { - .open = zoran_vm_open, - .close = zoran_vm_close, - }; -diff -urNp linux-2.6.31.7/drivers/message/i2o/i2o_proc.c linux-2.6.31.7/drivers/message/i2o/i2o_proc.c ---- linux-2.6.31.7/drivers/message/i2o/i2o_proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/message/i2o/i2o_proc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/message/i2o/i2o_proc.c linux-2.6.32/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32/drivers/message/i2o/i2o_proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/message/i2o/i2o_proc.c 2009-12-04 21:40:48.339741592 -0500 @@ -259,13 +259,6 @@ static char *scsi_devices[] = { "Array Controller Device" }; @@ -23430,33 +23607,9 @@ diff -urNp linux-2.6.31.7/drivers/message/i2o/i2o_proc.c linux-2.6.31.7/drivers/ return 0; } -diff -urNp linux-2.6.31.7/drivers/mfd/ab3100-core.c linux-2.6.31.7/drivers/mfd/ab3100-core.c ---- linux-2.6.31.7/drivers/mfd/ab3100-core.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/mfd/ab3100-core.c 2009-12-10 22:15:16.000000000 -0500 -@@ -465,7 +465,7 @@ static int ab3100_get_set_reg_open_file( - return 0; - } - --static int ab3100_get_set_reg(struct file *file, -+static ssize_t ab3100_get_set_reg(struct file *file, - const char __user *user_buf, - size_t count, loff_t *ppos) - { -diff -urNp linux-2.6.31.7/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.31.7/drivers/misc/ibmasm/ibmasmfs.c ---- linux-2.6.31.7/drivers/misc/ibmasm/ibmasmfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/misc/ibmasm/ibmasmfs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct fil - return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt); - } - --static struct super_operations ibmasmfs_s_ops = { -+static const struct super_operations ibmasmfs_s_ops = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, - }; -diff -urNp linux-2.6.31.7/drivers/misc/kgdbts.c linux-2.6.31.7/drivers/misc/kgdbts.c ---- linux-2.6.31.7/drivers/misc/kgdbts.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/misc/kgdbts.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/misc/kgdbts.c linux-2.6.32/drivers/misc/kgdbts.c +--- linux-2.6.32/drivers/misc/kgdbts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/misc/kgdbts.c 2009-12-04 21:40:48.340739893 -0500 @@ -118,7 +118,7 @@ } while (0) #define MAX_CONFIG_LEN 40 @@ -23475,75 +23628,9 @@ diff -urNp linux-2.6.31.7/drivers/misc/kgdbts.c linux-2.6.31.7/drivers/misc/kgdb .name = "kgdbts", .read_char = kgdbts_get_char, .write_char = kgdbts_put_char, -diff -urNp linux-2.6.31.7/drivers/misc/phantom.c linux-2.6.31.7/drivers/misc/phantom.c ---- linux-2.6.31.7/drivers/misc/phantom.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/misc/phantom.c 2009-12-10 22:15:16.000000000 -0500 -@@ -271,7 +271,7 @@ static unsigned int phantom_poll(struct - return mask; - } - --static struct file_operations phantom_file_ops = { -+static const struct file_operations phantom_file_ops = { - .open = phantom_open, - .release = phantom_release, - .unlocked_ioctl = phantom_ioctl, -diff -urNp linux-2.6.31.7/drivers/misc/sgi-gru/grufile.c linux-2.6.31.7/drivers/misc/sgi-gru/grufile.c ---- linux-2.6.31.7/drivers/misc/sgi-gru/grufile.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/misc/sgi-gru/grufile.c 2009-12-10 22:15:16.000000000 -0500 -@@ -53,7 +53,7 @@ struct gru_stats_s gru_stats; - /* Guaranteed user available resources on each node */ - static int max_user_cbrs, max_user_dsr_bytes; - --static struct file_operations gru_fops; -+static const struct file_operations gru_fops; - static struct miscdevice gru_miscdev; - - -@@ -426,7 +426,7 @@ static void __exit gru_exit(void) - gru_proc_exit(); - } - --static struct file_operations gru_fops = { -+static const struct file_operations gru_fops = { - .owner = THIS_MODULE, - .unlocked_ioctl = gru_file_unlocked_ioctl, - .mmap = gru_file_mmap, -@@ -438,7 +438,7 @@ static struct miscdevice gru_miscdev = { - .fops = &gru_fops, - }; - --struct vm_operations_struct gru_vm_ops = { -+const struct vm_operations_struct gru_vm_ops = { - .close = gru_vma_close, - .fault = gru_fault, - }; -diff -urNp linux-2.6.31.7/drivers/misc/sgi-gru/grutables.h linux-2.6.31.7/drivers/misc/sgi-gru/grutables.h ---- linux-2.6.31.7/drivers/misc/sgi-gru/grutables.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/misc/sgi-gru/grutables.h 2009-12-10 22:15:16.000000000 -0500 -@@ -624,7 +624,7 @@ static inline int is_kernel_context(stru - */ - struct gru_unload_context_req; - --extern struct vm_operations_struct gru_vm_ops; -+extern const struct vm_operations_struct gru_vm_ops; - extern struct device *grudev; - - extern struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, -diff -urNp linux-2.6.31.7/drivers/mmc/core/debugfs.c linux-2.6.31.7/drivers/mmc/core/debugfs.c ---- linux-2.6.31.7/drivers/mmc/core/debugfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/mmc/core/debugfs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -240,7 +240,7 @@ static int mmc_ext_csd_release(struct in - return 0; - } - --static struct file_operations mmc_dbg_ext_csd_fops = { -+static const struct file_operations mmc_dbg_ext_csd_fops = { - .open = mmc_ext_csd_open, - .read = mmc_ext_csd_read, - .release = mmc_ext_csd_release, -diff -urNp linux-2.6.31.7/drivers/mtd/devices/doc2000.c linux-2.6.31.7/drivers/mtd/devices/doc2000.c ---- linux-2.6.31.7/drivers/mtd/devices/doc2000.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/mtd/devices/doc2000.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/mtd/devices/doc2000.c linux-2.6.32/drivers/mtd/devices/doc2000.c +--- linux-2.6.32/drivers/mtd/devices/doc2000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/mtd/devices/doc2000.c 2009-12-04 21:40:48.341617679 -0500 @@ -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 */ @@ -23553,9 +23640,9 @@ diff -urNp linux-2.6.31.7/drivers/mtd/devices/doc2000.c linux-2.6.31.7/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.31.7/drivers/mtd/devices/doc2001.c linux-2.6.31.7/drivers/mtd/devices/doc2001.c ---- linux-2.6.31.7/drivers/mtd/devices/doc2001.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/mtd/devices/doc2001.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/mtd/devices/doc2001.c linux-2.6.32/drivers/mtd/devices/doc2001.c +--- linux-2.6.32/drivers/mtd/devices/doc2001.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/mtd/devices/doc2001.c 2009-12-04 20:41:38.577227139 -0500 @@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt /* Don't allow read past end of device */ if (from >= this->totlen) @@ -23565,22 +23652,60 @@ diff -urNp linux-2.6.31.7/drivers/mtd/devices/doc2001.c linux-2.6.31.7/drivers/m /* Don't allow a single read to cross a 512-byte block boundary */ if (from + len > ((from | 0x1ff) + 1)) -diff -urNp linux-2.6.31.7/drivers/mtd/ubi/build.c linux-2.6.31.7/drivers/mtd/ubi/build.c ---- linux-2.6.31.7/drivers/mtd/ubi/build.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/mtd/ubi/build.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1257,7 +1257,7 @@ static int __init bytes_str_to_int(const - unsigned long result; +diff -urNp linux-2.6.32/drivers/mtd/ubi/build.c linux-2.6.32/drivers/mtd/ubi/build.c +--- linux-2.6.32/drivers/mtd/ubi/build.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/mtd/ubi/build.c 2009-12-04 21:40:48.341617679 -0500 +@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); + static int __init bytes_str_to_int(const char *str) + { + char *endp; +- unsigned long result; ++ unsigned long result, scale = 1; result = simple_strtoul(str, &endp, 0); -- if (str == endp || result < 0) { -+ if (str == endp) { - printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", - str); + if (str == endp || result >= INT_MAX) { +@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const + + switch (*endp) { + case 'G': +- result *= 1024; ++ scale *= 1024; + case 'M': +- result *= 1024; ++ scale *= 1024; + case 'K': +- result *= 1024; ++ scale *= 1024; + if (endp[1] == 'i' && endp[2] == 'B') + endp += 2; + case '\0': +@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const return -EINVAL; -diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/e1000e/82571.c ---- linux-2.6.31.7/drivers/net/e1000e/82571.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/e1000e/82571.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(s + } + +- return result; ++ if ((intoverflow_t)result*scale >= INT_MAX) { ++ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", ++ str); ++ return -EINVAL; ++ } ++ ++ return result*scale; + } + + /** +diff -urNp linux-2.6.32/drivers/net/e1000e/82571.c linux-2.6.32/drivers/net/e1000e/82571.c +--- linux-2.6.32/drivers/net/e1000e/82571.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/e1000e/82571.c 2009-12-04 21:40:48.342742235 -0500 +@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s + { + struct e1000_hw *hw = &adapter->hw; + struct e1000_mac_info *mac = &hw->mac; ++ /* cannot be const */ + struct e1000_mac_operations *func = &mac->ops; + u32 swsm = 0; + u32 swsm2 = 0; +@@ -1656,7 +1657,7 @@ static void e1000_clear_hw_cntrs_82571(s temp = er32(ICRXDMTC); } @@ -23589,7 +23714,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/ /* .check_mng_mode: mac type dependent */ /* .check_for_link: media type dependent */ .id_led_init = e1000e_id_led_init, -@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e8257 +@@ -1674,7 +1675,7 @@ static struct e1000_mac_operations e8257 .setup_led = e1000e_setup_led_generic, }; @@ -23598,7 +23723,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/ .acquire_phy = e1000_get_hw_semaphore_82571, .check_reset_block = e1000e_check_reset_block_generic, .commit_phy = NULL, -@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_p +@@ -1691,7 +1692,7 @@ static struct e1000_phy_operations e82_p .cfg_on_link_up = NULL, }; @@ -23607,7 +23732,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/ .acquire_phy = e1000_get_hw_semaphore_82571, .check_reset_block = e1000e_check_reset_block_generic, .commit_phy = e1000e_phy_sw_reset, -@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_p +@@ -1708,7 +1709,7 @@ static struct e1000_phy_operations e82_p .cfg_on_link_up = NULL, }; @@ -23616,7 +23741,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/ .acquire_phy = e1000_get_hw_semaphore_82571, .check_reset_block = e1000e_check_reset_block_generic, .commit_phy = e1000e_phy_sw_reset, -@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_p +@@ -1725,7 +1726,7 @@ static struct e1000_phy_operations e82_p .cfg_on_link_up = NULL, }; @@ -23625,10 +23750,10 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/82571.c linux-2.6.31.7/drivers/net/ .acquire_nvm = e1000_acquire_nvm_82571, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_82571, -diff -urNp linux-2.6.31.7/drivers/net/e1000e/e1000.h linux-2.6.31.7/drivers/net/e1000e/e1000.h ---- linux-2.6.31.7/drivers/net/e1000e/e1000.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/e1000e/e1000.h 2009-12-10 22:15:16.000000000 -0500 -@@ -359,9 +359,9 @@ struct e1000_info { +diff -urNp linux-2.6.32/drivers/net/e1000e/e1000.h linux-2.6.32/drivers/net/e1000e/e1000.h +--- linux-2.6.32/drivers/net/e1000e/e1000.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/e1000e/e1000.h 2009-12-04 21:40:48.342742235 -0500 +@@ -375,9 +375,9 @@ struct e1000_info { u32 pba; u32 max_hw_frame_size; s32 (*get_variants)(struct e1000_adapter *); @@ -23641,10 +23766,18 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/e1000.h linux-2.6.31.7/drivers/net/ }; /* hardware capability, feature, and workaround flags */ -diff -urNp linux-2.6.31.7/drivers/net/e1000e/es2lan.c linux-2.6.31.7/drivers/net/e1000e/es2lan.c ---- linux-2.6.31.7/drivers/net/e1000e/es2lan.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/e1000e/es2lan.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es +diff -urNp linux-2.6.32/drivers/net/e1000e/es2lan.c linux-2.6.32/drivers/net/e1000e/es2lan.c +--- linux-2.6.32/drivers/net/e1000e/es2lan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/e1000e/es2lan.c 2009-12-04 21:40:48.343743361 -0500 +@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es + { + struct e1000_hw *hw = &adapter->hw; + struct e1000_mac_info *mac = &hw->mac; ++ /* cannot be const */ + struct e1000_mac_operations *func = &mac->ops; + + /* Set media type */ +@@ -1365,7 +1366,7 @@ static void e1000_clear_hw_cntrs_80003es temp = er32(ICRXDMTC); } @@ -23653,7 +23786,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/es2lan.c linux-2.6.31.7/drivers/net .id_led_init = e1000e_id_led_init, .check_mng_mode = e1000e_check_mng_mode_generic, /* check_for_link dependent on media type */ -@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_m +@@ -1383,7 +1384,7 @@ static struct e1000_mac_operations es2_m .setup_led = e1000e_setup_led_generic, }; @@ -23662,7 +23795,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/es2lan.c linux-2.6.31.7/drivers/net .acquire_phy = e1000_acquire_phy_80003es2lan, .check_reset_block = e1000e_check_reset_block_generic, .commit_phy = e1000e_phy_sw_reset, -@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_p +@@ -1400,7 +1401,7 @@ static struct e1000_phy_operations es2_p .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan, }; @@ -23671,10 +23804,48 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/es2lan.c linux-2.6.31.7/drivers/net .acquire_nvm = e1000_acquire_nvm_80003es2lan, .read_nvm = e1000e_read_nvm_eerd, .release_nvm = e1000_release_nvm_80003es2lan, -diff -urNp linux-2.6.31.7/drivers/net/e1000e/hw.h linux-2.6.31.7/drivers/net/e1000e/hw.h ---- linux-2.6.31.7/drivers/net/e1000e/hw.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/e1000e/hw.h 2009-12-10 22:15:16.000000000 -0500 -@@ -774,13 +774,13 @@ struct e1000_phy_operations { +diff -urNp linux-2.6.32/drivers/net/e1000e/hw.h linux-2.6.32/drivers/net/e1000e/hw.h +--- linux-2.6.32/drivers/net/e1000e/hw.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/e1000e/hw.h 2009-12-04 21:40:48.344737981 -0500 +@@ -755,34 +755,34 @@ struct e1000_mac_operations { + + /* Function pointers for the PHY. */ + struct e1000_phy_operations { +- s32 (*acquire_phy)(struct e1000_hw *); +- s32 (*check_polarity)(struct e1000_hw *); +- s32 (*check_reset_block)(struct e1000_hw *); +- s32 (*commit_phy)(struct e1000_hw *); +- s32 (*force_speed_duplex)(struct e1000_hw *); +- s32 (*get_cfg_done)(struct e1000_hw *hw); +- s32 (*get_cable_length)(struct e1000_hw *); +- s32 (*get_phy_info)(struct e1000_hw *); +- s32 (*read_phy_reg)(struct e1000_hw *, u32, u16 *); +- s32 (*read_phy_reg_locked)(struct e1000_hw *, u32, u16 *); +- void (*release_phy)(struct e1000_hw *); +- s32 (*reset_phy)(struct e1000_hw *); +- s32 (*set_d0_lplu_state)(struct e1000_hw *, bool); +- s32 (*set_d3_lplu_state)(struct e1000_hw *, bool); +- s32 (*write_phy_reg)(struct e1000_hw *, u32, u16); +- s32 (*write_phy_reg_locked)(struct e1000_hw *, u32, u16); +- s32 (*cfg_on_link_up)(struct e1000_hw *); ++ s32 (* acquire_phy)(struct e1000_hw *); ++ s32 (* check_polarity)(struct e1000_hw *); ++ s32 (* check_reset_block)(struct e1000_hw *); ++ s32 (* commit_phy)(struct e1000_hw *); ++ s32 (* force_speed_duplex)(struct e1000_hw *); ++ s32 (* get_cfg_done)(struct e1000_hw *hw); ++ s32 (* get_cable_length)(struct e1000_hw *); ++ s32 (* get_phy_info)(struct e1000_hw *); ++ s32 (* read_phy_reg)(struct e1000_hw *, u32, u16 *); ++ s32 (* read_phy_reg_locked)(struct e1000_hw *, u32, u16 *); ++ void (* release_phy)(struct e1000_hw *); ++ s32 (* reset_phy)(struct e1000_hw *); ++ s32 (* set_d0_lplu_state)(struct e1000_hw *, bool); ++ s32 (* set_d3_lplu_state)(struct e1000_hw *, bool); ++ s32 (* write_phy_reg)(struct e1000_hw *, u32, u16); ++ s32 (* write_phy_reg_locked)(struct e1000_hw *, u32, u16); ++ s32 (* cfg_on_link_up)(struct e1000_hw *); + }; /* Function pointers for the NVM. */ struct e1000_nvm_operations { @@ -23695,10 +23866,19 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/hw.h linux-2.6.31.7/drivers/net/e10 }; struct e1000_mac_info { -diff -urNp linux-2.6.31.7/drivers/net/e1000e/ich8lan.c linux-2.6.31.7/drivers/net/e1000e/ich8lan.c ---- linux-2.6.31.7/drivers/net/e1000e/ich8lan.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/e1000e/ich8lan.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3078,7 +3078,7 @@ static void e1000_clear_hw_cntrs_ich8lan +@@ -856,7 +856,7 @@ struct e1000_phy_info { + }; + + struct e1000_nvm_info { +- struct e1000_nvm_operations ops; ++ const struct e1000_nvm_operations ops; + + enum e1000_nvm_type type; + enum e1000_nvm_override override; +diff -urNp linux-2.6.32/drivers/net/e1000e/ich8lan.c linux-2.6.32/drivers/net/e1000e/ich8lan.c +--- linux-2.6.32/drivers/net/e1000e/ich8lan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/e1000e/ich8lan.c 2009-12-04 21:40:48.345617483 -0500 +@@ -3451,7 +3451,7 @@ static void e1000_clear_hw_cntrs_ich8lan } } @@ -23707,7 +23887,7 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/ich8lan.c linux-2.6.31.7/drivers/ne .id_led_init = e1000e_id_led_init, .check_mng_mode = e1000_check_mng_mode_ich8lan, .check_for_link = e1000_check_for_copper_link_ich8lan, -@@ -3096,7 +3096,7 @@ static struct e1000_mac_operations ich8_ +@@ -3469,7 +3469,7 @@ static struct e1000_mac_operations ich8_ /* id_led_init dependent on mac type */ }; @@ -23716,19 +23896,19 @@ diff -urNp linux-2.6.31.7/drivers/net/e1000e/ich8lan.c linux-2.6.31.7/drivers/ne .acquire_phy = e1000_acquire_swflag_ich8lan, .check_reset_block = e1000_check_reset_block_ich8lan, .commit_phy = NULL, -@@ -3112,7 +3112,7 @@ static struct e1000_phy_operations ich8_ +@@ -3485,7 +3485,7 @@ static struct e1000_phy_operations ich8_ .write_phy_reg = e1000e_write_phy_reg_igp, }; -static struct e1000_nvm_operations ich8_nvm_ops = { +static const struct e1000_nvm_operations ich8_nvm_ops = { - .acquire_nvm = e1000_acquire_swflag_ich8lan, + .acquire_nvm = e1000_acquire_nvm_ich8lan, .read_nvm = e1000_read_nvm_ich8lan, - .release_nvm = e1000_release_swflag_ich8lan, -diff -urNp linux-2.6.31.7/drivers/net/ibmveth.c linux-2.6.31.7/drivers/net/ibmveth.c ---- linux-2.6.31.7/drivers/net/ibmveth.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/ibmveth.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1576,7 +1576,7 @@ static struct attribute * veth_pool_attr + .release_nvm = e1000_release_nvm_ich8lan, +diff -urNp linux-2.6.32/drivers/net/ibmveth.c linux-2.6.32/drivers/net/ibmveth.c +--- linux-2.6.32/drivers/net/ibmveth.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/ibmveth.c 2009-12-04 21:40:48.348759035 -0500 +@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr NULL, }; @@ -23737,10 +23917,10 @@ diff -urNp linux-2.6.31.7/drivers/net/ibmveth.c linux-2.6.31.7/drivers/net/ibmve .show = veth_pool_show, .store = veth_pool_store, }; -diff -urNp linux-2.6.31.7/drivers/net/igb/e1000_82575.c linux-2.6.31.7/drivers/net/igb/e1000_82575.c ---- linux-2.6.31.7/drivers/net/igb/e1000_82575.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/igb/e1000_82575.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1461,7 +1461,7 @@ void igb_vmdq_set_replication_pf(struct +diff -urNp linux-2.6.32/drivers/net/igb/e1000_82575.c linux-2.6.32/drivers/net/igb/e1000_82575.c +--- linux-2.6.32/drivers/net/igb/e1000_82575.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/igb/e1000_82575.c 2009-12-04 21:40:48.349688652 -0500 +@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct wr32(E1000_VT_CTL, vt_ctl); } @@ -23749,7 +23929,7 @@ diff -urNp linux-2.6.31.7/drivers/net/igb/e1000_82575.c linux-2.6.31.7/drivers/n .reset_hw = igb_reset_hw_82575, .init_hw = igb_init_hw_82575, .check_for_link = igb_check_for_link_82575, -@@ -1470,13 +1470,13 @@ static struct e1000_mac_operations e1000 +@@ -1409,13 +1409,13 @@ static struct e1000_mac_operations e1000 .get_speed_and_duplex = igb_get_speed_and_duplex_copper, }; @@ -23765,9 +23945,9 @@ diff -urNp linux-2.6.31.7/drivers/net/igb/e1000_82575.c linux-2.6.31.7/drivers/n .acquire = igb_acquire_nvm_82575, .read = igb_read_nvm_eerd, .release = igb_release_nvm_82575, -diff -urNp linux-2.6.31.7/drivers/net/igb/e1000_hw.h linux-2.6.31.7/drivers/net/igb/e1000_hw.h ---- linux-2.6.31.7/drivers/net/igb/e1000_hw.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/igb/e1000_hw.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/net/igb/e1000_hw.h linux-2.6.32/drivers/net/igb/e1000_hw.h +--- linux-2.6.32/drivers/net/igb/e1000_hw.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/igb/e1000_hw.h 2009-12-04 21:40:48.349688652 -0500 @@ -302,17 +302,17 @@ struct e1000_phy_operations { }; @@ -23793,10 +23973,19 @@ diff -urNp linux-2.6.31.7/drivers/net/igb/e1000_hw.h linux-2.6.31.7/drivers/net/ }; extern const struct e1000_info e1000_82575_info; -diff -urNp linux-2.6.31.7/drivers/net/irda/vlsi_ir.c linux-2.6.31.7/drivers/net/irda/vlsi_ir.c ---- linux-2.6.31.7/drivers/net/irda/vlsi_ir.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/irda/vlsi_ir.c 2009-12-10 22:15:16.000000000 -0500 -@@ -906,13 +906,12 @@ static int vlsi_hard_start_xmit(struct s +@@ -397,7 +397,7 @@ struct e1000_phy_info { + }; + + struct e1000_nvm_info { +- struct e1000_nvm_operations ops; ++ const struct e1000_nvm_operations ops; + + enum e1000_nvm_type type; + enum e1000_nvm_override override; +diff -urNp linux-2.6.32/drivers/net/irda/vlsi_ir.c linux-2.6.32/drivers/net/irda/vlsi_ir.c +--- linux-2.6.32/drivers/net/irda/vlsi_ir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/irda/vlsi_ir.c 2009-12-04 21:40:48.350741926 -0500 +@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); netif_wake_queue(ndev); @@ -23811,10 +24000,10 @@ diff -urNp linux-2.6.31.7/drivers/net/irda/vlsi_ir.c linux-2.6.31.7/drivers/net/ + } spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); - return 0; -diff -urNp linux-2.6.31.7/drivers/net/iseries_veth.c linux-2.6.31.7/drivers/net/iseries_veth.c ---- linux-2.6.31.7/drivers/net/iseries_veth.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/iseries_veth.c 2009-12-10 22:15:16.000000000 -0500 + return NETDEV_TX_OK; +diff -urNp linux-2.6.32/drivers/net/iseries_veth.c linux-2.6.32/drivers/net/iseries_veth.c +--- linux-2.6.32/drivers/net/iseries_veth.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/iseries_veth.c 2009-12-04 21:40:48.351739344 -0500 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul NULL }; @@ -23833,10 +24022,10 @@ diff -urNp linux-2.6.31.7/drivers/net/iseries_veth.c linux-2.6.31.7/drivers/net/ .show = veth_port_attribute_show }; -diff -urNp linux-2.6.31.7/drivers/net/pcnet32.c linux-2.6.31.7/drivers/net/pcnet32.c ---- linux-2.6.31.7/drivers/net/pcnet32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/pcnet32.c 2009-12-10 22:15:16.000000000 -0500 -@@ -78,7 +78,7 @@ static int cards_found; +diff -urNp linux-2.6.32/drivers/net/pcnet32.c linux-2.6.32/drivers/net/pcnet32.c +--- linux-2.6.32/drivers/net/pcnet32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/pcnet32.c 2009-12-04 21:40:48.352738657 -0500 +@@ -79,7 +79,7 @@ static int cards_found; /* * VLB I/O addresses */ @@ -23845,10 +24034,10 @@ diff -urNp linux-2.6.31.7/drivers/net/pcnet32.c linux-2.6.31.7/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.31.7/drivers/net/tg3.h linux-2.6.31.7/drivers/net/tg3.h ---- linux-2.6.31.7/drivers/net/tg3.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/tg3.h 2009-12-10 22:15:16.000000000 -0500 -@@ -89,6 +89,7 @@ +diff -urNp linux-2.6.32/drivers/net/tg3.h linux-2.6.32/drivers/net/tg3.h +--- linux-2.6.32/drivers/net/tg3.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/tg3.h 2009-12-04 21:40:48.353701400 -0500 +@@ -95,6 +95,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 #define CHIPREV_ID_5750_A3 0x4003 @@ -23856,9 +24045,9 @@ diff -urNp linux-2.6.31.7/drivers/net/tg3.h linux-2.6.31.7/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/hso.c ---- linux-2.6.31.7/drivers/net/usb/hso.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/usb/hso.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/net/usb/hso.c linux-2.6.32/drivers/net/usb/hso.c +--- linux-2.6.32/drivers/net/usb/hso.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/usb/hso.c 2009-12-04 21:40:48.354739323 -0500 @@ -258,7 +258,7 @@ struct hso_serial { /* from usb_serial_port */ @@ -23868,7 +24057,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h spinlock_t serial_lock; int (*write_data) (struct hso_serial *serial); -@@ -1179,7 +1179,7 @@ static void put_rxbuf_data_and_resubmit_ +@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ struct urb *urb; urb = serial->rx_urb[0]; @@ -23877,7 +24066,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h count = put_rxbuf_data(urb, serial); if (count == -1) return; -@@ -1215,7 +1215,7 @@ static void hso_std_serial_read_bulk_cal +@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_cal DUMP1(urb->transfer_buffer, urb->actual_length); /* Anyone listening? */ @@ -23886,7 +24075,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h return; if (status == 0) { -@@ -1310,8 +1310,7 @@ static int hso_serial_open(struct tty_st +@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st spin_unlock_irq(&serial->serial_lock); /* check for port already opened, if not set the termios */ @@ -23896,7 +24085,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h tty->low_latency = 1; serial->rx_state = RX_IDLE; /* Force default termio settings */ -@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_st +@@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_st result = hso_start_serial_device(serial->parent, GFP_KERNEL); if (result) { hso_stop_serial_device(serial->parent); @@ -23905,7 +24094,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h kref_put(&serial->parent->ref, hso_serial_ref_free); } } else { -@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_ +@@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_ /* reset the rts and dtr */ /* do the actual close */ @@ -23915,11 +24104,11 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h - if (serial->open_count <= 0) { - serial->open_count = 0; + if (atomic_read(&serial->open_count) <= 0) { -+ atomic_set(&serial->open_count, 0); ++ atomic_set(&serial->open_count, 0); spin_lock_irq(&serial->serial_lock); if (serial->tty == tty) { serial->tty->driver_data = NULL; -@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struc +@@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struc /* the actual setup */ spin_lock_irqsave(&serial->serial_lock, flags); @@ -23928,7 +24117,7 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h _hso_serial_set_termios(tty, old); else tty->termios = old; -@@ -3089,7 +3088,7 @@ static int hso_resume(struct usb_interfa +@@ -3095,7 +3094,7 @@ static int hso_resume(struct usb_interfa /* Start all serial ports */ for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) { if (serial_table[i] && (serial_table[i]->interface == iface)) { @@ -23937,10 +24126,46 @@ diff -urNp linux-2.6.31.7/drivers/net/usb/hso.c linux-2.6.31.7/drivers/net/usb/h result = hso_start_serial_device(serial_table[i], GFP_NOIO); hso_kick_transmit(dev2ser(serial_table[i])); -diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-3945.c ---- linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-3945.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2867,7 +2867,7 @@ static struct iwl_hcmd_utils_ops iwl3945 +diff -urNp linux-2.6.32/drivers/net/wireless/b43/debugfs.c linux-2.6.32/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32/drivers/net/wireless/b43/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/b43/debugfs.c 2009-12-04 21:40:48.355694750 -0500 +@@ -43,7 +43,7 @@ static struct dentry *rootdir; + struct b43_debugfs_fops { + ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); + int (*write)(struct b43_wldev *dev, const char *buf, size_t count); +- struct file_operations fops; ++ const struct file_operations fops; + /* Offset of struct b43_dfs_file in struct b43_dfsentry */ + size_t file_struct_offset; + }; +diff -urNp linux-2.6.32/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32/drivers/net/wireless/b43legacy/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/b43legacy/debugfs.c 2009-12-04 21:40:48.355694750 -0500 +@@ -44,7 +44,7 @@ static struct dentry *rootdir; + struct b43legacy_debugfs_fops { + ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); + int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count); +- struct file_operations fops; ++ const struct file_operations fops; + /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ + size_t file_struct_offset; + /* Take wl->irq_lock before calling read/write? */ +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-1000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-1000.c 2009-12-04 21:40:48.355694750 -0500 +@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = + }, + }; + +-static struct iwl_ops iwl1000_ops = { ++static const struct iwl_ops iwl1000_ops = { + .ucode = &iwl5000_ucode, + .lib = &iwl1000_lib, + .hcmd = &iwl5000_hcmd, +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-3945.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-3945.c 2009-12-04 21:40:48.356714021 -0500 +@@ -2876,7 +2876,7 @@ static struct iwl_hcmd_utils_ops iwl3945 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, }; @@ -23949,10 +24174,10 @@ diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.31.7 .ucode = &iwl3945_ucode, .lib = &iwl3945_lib, .hcmd = &iwl3945_hcmd, -diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-4965.c ---- linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-4965.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2324,7 +2324,7 @@ static struct iwl_lib_ops iwl4965_lib = +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-4965.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-4965.c 2009-12-04 21:40:48.357741158 -0500 +@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = }, }; @@ -23961,10 +24186,10 @@ diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.31.7 .ucode = &iwl4965_ucode, .lib = &iwl4965_lib, .hcmd = &iwl4965_hcmd, -diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-5000.c ---- linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-5000.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1597,14 +1597,14 @@ static struct iwl_lib_ops iwl5150_lib = +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-5000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-5000.c 2009-12-04 21:40:48.358656006 -0500 +@@ -1627,14 +1627,14 @@ static struct iwl_lib_ops iwl5150_lib = }, }; @@ -23981,22 +24206,22 @@ diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.31.7 .ucode = &iwl5000_ucode, .lib = &iwl5150_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-6000.c ---- linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-10 22:15:16.000000000 -0500 -@@ -68,7 +68,7 @@ static struct iwl_hcmd_utils_ops iwl6000 +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-6000.c 2009-12-04 21:40:48.359640433 -0500 +@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 .calc_rssi = iwl5000_calc_rssi, }; -static struct iwl_ops iwl6000_ops = { +static const struct iwl_ops iwl6000_ops = { .ucode = &iwl5000_ucode, - .lib = &iwl5000_lib, + .lib = &iwl6000_lib, .hcmd = &iwl5000_hcmd, -diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-dev.h ---- linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-12-10 22:15:16.000000000 -0500 -@@ -65,7 +65,7 @@ extern struct iwl_cfg iwl1000_bgn_cfg; +diff -urNp linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/iwlwifi/iwl-dev.h 2009-12-04 21:40:48.359640433 -0500 +@@ -67,7 +67,7 @@ struct iwl_tx_queue; /* shared structures from iwl-5000.c */ extern struct iwl_mod_params iwl50_mod_params; @@ -24005,10 +24230,22 @@ diff -urNp linux-2.6.31.7/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.31.7/ extern struct iwl_ucode_ops iwl5000_ucode; extern struct iwl_lib_ops iwl5000_lib; extern struct iwl_hcmd_ops iwl5000_hcmd; -diff -urNp linux-2.6.31.7/drivers/oprofile/buffer_sync.c linux-2.6.31.7/drivers/oprofile/buffer_sync.c ---- linux-2.6.31.7/drivers/oprofile/buffer_sync.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/oprofile/buffer_sync.c 2009-12-10 22:15:16.000000000 -0500 -@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en +diff -urNp linux-2.6.32/drivers/net/wireless/libertas/debugfs.c linux-2.6.32/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32/drivers/net/wireless/libertas/debugfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/net/wireless/libertas/debugfs.c 2009-12-04 21:40:48.360677043 -0500 +@@ -708,7 +708,7 @@ out_unlock: + struct lbs_debugfs_files { + const char *name; + int perm; +- struct file_operations fops; ++ const struct file_operations fops; + }; + + static const struct lbs_debugfs_files debugfs_files[] = { +diff -urNp linux-2.6.32/drivers/oprofile/buffer_sync.c linux-2.6.32/drivers/oprofile/buffer_sync.c +--- linux-2.6.32/drivers/oprofile/buffer_sync.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/buffer_sync.c 2009-12-04 21:40:48.360677043 -0500 +@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; if (cookie == INVALID_COOKIE) { @@ -24017,7 +24254,7 @@ diff -urNp linux-2.6.31.7/drivers/oprofile/buffer_sync.c linux-2.6.31.7/drivers/ offset = pc; } if (cookie != last_cookie) { -@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct +@@ -384,14 +384,14 @@ add_sample(struct mm_struct *mm, struct /* add userspace sample */ if (!mm) { @@ -24034,7 +24271,7 @@ diff -urNp linux-2.6.31.7/drivers/oprofile/buffer_sync.c linux-2.6.31.7/drivers/ return 0; } -@@ -561,7 +561,7 @@ void sync_buffer(int cpu) +@@ -560,7 +560,7 @@ void sync_buffer(int cpu) /* ignore backtraces if failed to add a sample */ if (state == sb_bt_start) { state = sb_bt_ignore; @@ -24043,22 +24280,46 @@ diff -urNp linux-2.6.31.7/drivers/oprofile/buffer_sync.c linux-2.6.31.7/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.31.7/drivers/oprofile/event_buffer.c linux-2.6.31.7/drivers/oprofile/event_buffer.c ---- linux-2.6.31.7/drivers/oprofile/event_buffer.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/oprofile/event_buffer.c 2009-12-10 22:15:16.000000000 -0500 -@@ -42,7 +42,7 @@ static atomic_t buffer_ready = ATOMIC_IN - void add_event_entry(unsigned long value) - { +diff -urNp linux-2.6.32/drivers/oprofile/event_buffer.c linux-2.6.32/drivers/oprofile/event_buffer.c +--- linux-2.6.32/drivers/oprofile/event_buffer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/event_buffer.c 2009-12-04 21:40:48.360677043 -0500 +@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value + } + if (buffer_pos == buffer_size) { - atomic_inc(&oprofile_stats.event_lost_overflow); + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow); return; } -diff -urNp linux-2.6.31.7/drivers/oprofile/oprofile_stats.c linux-2.6.31.7/drivers/oprofile/oprofile_stats.c ---- linux-2.6.31.7/drivers/oprofile/oprofile_stats.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/oprofile/oprofile_stats.c 2009-12-10 22:15:16.000000000 -0500 -@@ -30,10 +30,10 @@ void oprofile_reset_stats(void) +diff -urNp linux-2.6.32/drivers/oprofile/oprof.c linux-2.6.32/drivers/oprofile/oprof.c +--- linux-2.6.32/drivers/oprofile/oprof.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/oprof.c 2009-12-04 21:40:48.360677043 -0500 +@@ -110,7 +110,7 @@ static void switch_worker(struct work_st + if (oprofile_ops.switch_events()) + return; + +- atomic_inc(&oprofile_stats.multiplex_counter); ++ atomic_inc_unchecked(&oprofile_stats.multiplex_counter); + start_switch_worker(); + } + +diff -urNp linux-2.6.32/drivers/oprofile/oprofilefs.c linux-2.6.32/drivers/oprofile/oprofilefs.c +--- linux-2.6.32/drivers/oprofile/oprofilefs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/oprofilefs.c 2009-12-04 21:40:48.361739767 -0500 +@@ -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/drivers/oprofile/oprofile_stats.c linux-2.6.32/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32/drivers/oprofile/oprofile_stats.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/oprofile_stats.c 2009-12-04 21:40:48.361739767 -0500 +@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) cpu_buf->sample_invalid_eip = 0; } @@ -24066,17 +24327,19 @@ diff -urNp linux-2.6.31.7/drivers/oprofile/oprofile_stats.c linux-2.6.31.7/drive - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0); - atomic_set(&oprofile_stats.event_lost_overflow, 0); - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0); +- atomic_set(&oprofile_stats.multiplex_counter, 0); + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0); + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0); + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0); + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0); ++ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0); } -diff -urNp linux-2.6.31.7/drivers/oprofile/oprofile_stats.h linux-2.6.31.7/drivers/oprofile/oprofile_stats.h ---- linux-2.6.31.7/drivers/oprofile/oprofile_stats.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/oprofile/oprofile_stats.h 2009-12-10 22:15:16.000000000 -0500 -@@ -13,10 +13,10 @@ +diff -urNp linux-2.6.32/drivers/oprofile/oprofile_stats.h linux-2.6.32/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32/drivers/oprofile/oprofile_stats.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/oprofile/oprofile_stats.h 2009-12-04 21:40:48.361739767 -0500 +@@ -13,11 +13,11 @@ #include <asm/atomic.h> struct oprofile_stat_struct { @@ -24084,37 +24347,18 @@ diff -urNp linux-2.6.31.7/drivers/oprofile/oprofile_stats.h linux-2.6.31.7/drive - atomic_t sample_lost_no_mapping; - atomic_t bt_lost_no_mapping; - atomic_t event_lost_overflow; +- atomic_t multiplex_counter; + atomic_unchecked_t sample_lost_no_mm; + atomic_unchecked_t sample_lost_no_mapping; + atomic_unchecked_t bt_lost_no_mapping; + atomic_unchecked_t event_lost_overflow; ++ atomic_unchecked_t multiplex_counter; }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.31.7/drivers/oprofile/oprofilefs.c linux-2.6.31.7/drivers/oprofile/oprofilefs.c ---- linux-2.6.31.7/drivers/oprofile/oprofilefs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/oprofile/oprofilefs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -35,7 +35,7 @@ static struct inode *oprofilefs_get_inod - } - - --static struct super_operations s_ops = { -+static const struct super_operations s_ops = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, - }; -@@ -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.31.7/drivers/parisc/pdc_stable.c linux-2.6.31.7/drivers/parisc/pdc_stable.c ---- linux-2.6.31.7/drivers/parisc/pdc_stable.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/parisc/pdc_stable.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/parisc/pdc_stable.c linux-2.6.32/drivers/parisc/pdc_stable.c +--- linux-2.6.32/drivers/parisc/pdc_stable.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/parisc/pdc_stable.c 2009-12-04 21:40:48.362741417 -0500 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj return ret; } @@ -24124,9 +24368,9 @@ diff -urNp linux-2.6.31.7/drivers/parisc/pdc_stable.c linux-2.6.31.7/drivers/par .show = pdcspath_attr_show, .store = pdcspath_attr_store, }; -diff -urNp linux-2.6.31.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.31.7/drivers/pci/hotplug/acpiphp_glue.c ---- linux-2.6.31.7/drivers/pci/hotplug/acpiphp_glue.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/hotplug/acpiphp_glue.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32/drivers/pci/hotplug/acpiphp_glue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/hotplug/acpiphp_glue.c 2009-12-04 21:40:48.362741417 -0500 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif } @@ -24136,9 +24380,9 @@ diff -urNp linux-2.6.31.7/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.31.7/driv .handler = handle_hotplug_event_func, }; -diff -urNp linux-2.6.31.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.31.7/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.31.7/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/hotplug/cpqphp_nvram.c 2009-12-04 21:40:48.363659122 -0500 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -24153,9 +24397,9 @@ diff -urNp linux-2.6.31.7/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.31.7/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.31.7/drivers/pci/hotplug/fakephp.c linux-2.6.31.7/drivers/pci/hotplug/fakephp.c ---- linux-2.6.31.7/drivers/pci/hotplug/fakephp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/hotplug/fakephp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/hotplug/fakephp.c linux-2.6.32/drivers/pci/hotplug/fakephp.c +--- linux-2.6.32/drivers/pci/hotplug/fakephp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/hotplug/fakephp.c 2009-12-04 21:40:48.363659122 -0500 @@ -73,7 +73,7 @@ static void legacy_release(struct kobjec } @@ -24165,9 +24409,21 @@ diff -urNp linux-2.6.31.7/drivers/pci/hotplug/fakephp.c linux-2.6.31.7/drivers/p .store = legacy_store, .show = legacy_show }, .release = &legacy_release, -diff -urNp linux-2.6.31.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.31.7/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.31.7/drivers/pci/pcie/portdrv_pci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/pcie/portdrv_pci.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/intel-iommu.c linux-2.6.32/drivers/pci/intel-iommu.c +--- linux-2.6.32/drivers/pci/intel-iommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/intel-iommu.c 2009-12-04 21:40:48.364656775 -0500 +@@ -2937,7 +2937,7 @@ static int intel_mapping_error(struct de + return !dma_addr; + } + +-struct dma_map_ops intel_dma_ops = { ++const struct dma_map_ops intel_dma_ops = { + .alloc_coherent = intel_alloc_coherent, + .free_coherent = intel_free_coherent, + .map_sg = intel_map_sg, +diff -urNp linux-2.6.32/drivers/pci/pcie/portdrv_pci.c linux-2.6.32/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.32/drivers/pci/pcie/portdrv_pci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/pcie/portdrv_pci.c 2009-12-04 21:40:48.365740553 -0500 @@ -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 */ @@ -24177,9 +24433,9 @@ diff -urNp linux-2.6.31.7/drivers/pci/pcie/portdrv_pci.c linux-2.6.31.7/drivers/ }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.31.7/drivers/pci/proc.c linux-2.6.31.7/drivers/pci/proc.c ---- linux-2.6.31.7/drivers/pci/proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/proc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/proc.c linux-2.6.32/drivers/pci/proc.c +--- linux-2.6.32/drivers/pci/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/proc.c 2009-12-04 20:41:38.594500156 -0500 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -24197,9 +24453,9 @@ diff -urNp linux-2.6.31.7/drivers/pci/proc.c linux-2.6.31.7/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.31.7/drivers/pci/slot.c linux-2.6.31.7/drivers/pci/slot.c ---- linux-2.6.31.7/drivers/pci/slot.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pci/slot.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pci/slot.c linux-2.6.32/drivers/pci/slot.c +--- linux-2.6.32/drivers/pci/slot.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pci/slot.c 2009-12-04 21:40:48.365740553 -0500 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc return attribute->store ? attribute->store(slot, buf, len) : -EIO; } @@ -24209,9 +24465,9 @@ diff -urNp linux-2.6.31.7/drivers/pci/slot.c linux-2.6.31.7/drivers/pci/slot.c .show = pci_slot_attr_show, .store = pci_slot_attr_store, }; -diff -urNp linux-2.6.31.7/drivers/pcmcia/ti113x.h linux-2.6.31.7/drivers/pcmcia/ti113x.h ---- linux-2.6.31.7/drivers/pcmcia/ti113x.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pcmcia/ti113x.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pcmcia/ti113x.h linux-2.6.32/drivers/pcmcia/ti113x.h +--- linux-2.6.32/drivers/pcmcia/ti113x.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pcmcia/ti113x.h 2009-12-04 21:40:48.365740553 -0500 @@ -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), @@ -24221,9 +24477,9 @@ diff -urNp linux-2.6.31.7/drivers/pcmcia/ti113x.h linux-2.6.31.7/drivers/pcmcia/ }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.31.7/drivers/pcmcia/yenta_socket.c linux-2.6.31.7/drivers/pcmcia/yenta_socket.c ---- linux-2.6.31.7/drivers/pcmcia/yenta_socket.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pcmcia/yenta_socket.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pcmcia/yenta_socket.c linux-2.6.32/drivers/pcmcia/yenta_socket.c +--- linux-2.6.32/drivers/pcmcia/yenta_socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pcmcia/yenta_socket.c 2009-12-04 21:40:48.366740373 -0500 @@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -24233,10 +24489,10 @@ diff -urNp linux-2.6.31.7/drivers/pcmcia/yenta_socket.c linux-2.6.31.7/drivers/p }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.31.7/drivers/platform/x86/acer-wmi.c linux-2.6.31.7/drivers/platform/x86/acer-wmi.c ---- linux-2.6.31.7/drivers/platform/x86/acer-wmi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/acer-wmi.c 2009-12-10 22:15:16.000000000 -0500 -@@ -916,7 +916,7 @@ static int update_bl_status(struct backl +diff -urNp linux-2.6.32/drivers/platform/x86/acer-wmi.c linux-2.6.32/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32/drivers/platform/x86/acer-wmi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/acer-wmi.c 2009-12-04 21:40:48.367665312 -0500 +@@ -918,7 +918,7 @@ static int update_bl_status(struct backl return 0; } @@ -24245,21 +24501,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/acer-wmi.c linux-2.6.31.7/drivers .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/asus-laptop.c linux-2.6.31.7/drivers/platform/x86/asus-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/asus-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/asus-laptop.c 2009-12-10 22:15:16.000000000 -0500 -@@ -232,7 +232,7 @@ static struct backlight_device *asus_bac - */ - static int read_brightness(struct backlight_device *bd); - static int update_bl_status(struct backlight_device *bd); --static struct backlight_ops asusbl_ops = { -+static const struct backlight_ops asusbl_ops = { - .get_brightness = read_brightness, - .update_status = update_bl_status, - }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/asus_acpi.c linux-2.6.31.7/drivers/platform/x86/asus_acpi.c ---- linux-2.6.31.7/drivers/platform/x86/asus_acpi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/asus_acpi.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/asus_acpi.c linux-2.6.32/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32/drivers/platform/x86/asus_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/asus_acpi.c 2009-12-04 21:40:48.368745547 -0500 @@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ return 0; } @@ -24269,9 +24513,21 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/asus_acpi.c linux-2.6.31.7/driver .get_brightness = read_brightness, .update_status = set_brightness_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/compal-laptop.c linux-2.6.31.7/drivers/platform/x86/compal-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/compal-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/compal-laptop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/asus-laptop.c linux-2.6.32/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32/drivers/platform/x86/asus-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/asus-laptop.c 2009-12-04 21:40:48.367665312 -0500 +@@ -249,7 +249,7 @@ static struct backlight_device *asus_bac + */ + static int read_brightness(struct backlight_device *bd); + static int update_bl_status(struct backlight_device *bd); +-static struct backlight_ops asusbl_ops = { ++static const struct backlight_ops asusbl_ops = { + .get_brightness = read_brightness, + .update_status = update_bl_status, + }; +diff -urNp linux-2.6.32/drivers/platform/x86/compal-laptop.c linux-2.6.32/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32/drivers/platform/x86/compal-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/compal-laptop.c 2009-12-04 21:40:48.369680327 -0500 @@ -163,7 +163,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -24281,9 +24537,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/compal-laptop.c linux-2.6.31.7/dr .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/dell-laptop.c linux-2.6.31.7/drivers/platform/x86/dell-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/dell-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/dell-laptop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/dell-laptop.c linux-2.6.32/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32/drivers/platform/x86/dell-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/dell-laptop.c 2009-12-04 21:40:48.369680327 -0500 @@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac return buffer.output[1]; } @@ -24293,10 +24549,10 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/dell-laptop.c linux-2.6.31.7/driv .get_brightness = dell_get_intensity, .update_status = dell_send_intensity, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.31.7/drivers/platform/x86/eeepc-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/eeepc-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/eeepc-laptop.c 2009-12-10 22:15:16.000000000 -0500 -@@ -234,7 +234,7 @@ static struct device *eeepc_hwmon_device +diff -urNp linux-2.6.32/drivers/platform/x86/eeepc-laptop.c linux-2.6.32/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32/drivers/platform/x86/eeepc-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/eeepc-laptop.c 2009-12-04 21:40:48.370753998 -0500 +@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device */ static int read_brightness(struct backlight_device *bd); static int update_bl_status(struct backlight_device *bd); @@ -24305,10 +24561,10 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/eeepc-laptop.c linux-2.6.31.7/dri .get_brightness = read_brightness, .update_status = update_bl_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.31.7/drivers/platform/x86/fujitsu-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/fujitsu-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/fujitsu-laptop.c 2009-12-10 22:15:16.000000000 -0500 -@@ -442,7 +442,7 @@ static int bl_update_status(struct backl +diff -urNp linux-2.6.32/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32/drivers/platform/x86/fujitsu-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/fujitsu-laptop.c 2009-12-04 21:40:48.370753998 -0500 +@@ -436,7 +436,7 @@ static int bl_update_status(struct backl return ret; } @@ -24317,9 +24573,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/fujitsu-laptop.c linux-2.6.31.7/d .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/msi-laptop.c linux-2.6.31.7/drivers/platform/x86/msi-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/msi-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/msi-laptop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/msi-laptop.c linux-2.6.32/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32/drivers/platform/x86/msi-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/msi-laptop.c 2009-12-04 21:40:48.371611717 -0500 @@ -161,7 +161,7 @@ static int bl_update_status(struct backl return set_lcd_level(b->props.brightness); } @@ -24329,9 +24585,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/msi-laptop.c linux-2.6.31.7/drive .get_brightness = bl_get_brightness, .update_status = bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.31.7/drivers/platform/x86/panasonic-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/panasonic-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/panasonic-laptop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/panasonic-laptop.c linux-2.6.32/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32/drivers/platform/x86/panasonic-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/panasonic-laptop.c 2009-12-04 21:40:48.372647913 -0500 @@ -352,7 +352,7 @@ static int bl_set_status(struct backligh return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); } @@ -24341,9 +24597,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/panasonic-laptop.c linux-2.6.31.7 .get_brightness = bl_get, .update_status = bl_set_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/sony-laptop.c linux-2.6.31.7/drivers/platform/x86/sony-laptop.c ---- linux-2.6.31.7/drivers/platform/x86/sony-laptop.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/sony-laptop.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/sony-laptop.c linux-2.6.32/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32/drivers/platform/x86/sony-laptop.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/sony-laptop.c 2009-12-04 21:40:48.373624154 -0500 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness } @@ -24353,10 +24609,10 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/sony-laptop.c linux-2.6.31.7/driv .update_status = sony_backlight_update_status, .get_brightness = sony_backlight_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.31.7/drivers/platform/x86/thinkpad_acpi.c ---- linux-2.6.31.7/drivers/platform/x86/thinkpad_acpi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/thinkpad_acpi.c 2009-12-10 22:15:16.000000000 -0500 -@@ -5635,7 +5635,7 @@ static int brightness_get(struct backlig +diff -urNp linux-2.6.32/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32/drivers/platform/x86/thinkpad_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/thinkpad_acpi.c 2009-12-04 21:40:48.375638697 -0500 +@@ -6095,7 +6095,7 @@ static int brightness_get(struct backlig return status & TP_EC_BACKLIGHT_LVLMSK; } @@ -24365,9 +24621,9 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/thinkpad_acpi.c linux-2.6.31.7/dr .get_brightness = brightness_get, .update_status = brightness_update_status, }; -diff -urNp linux-2.6.31.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.31.7/drivers/platform/x86/toshiba_acpi.c ---- linux-2.6.31.7/drivers/platform/x86/toshiba_acpi.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/platform/x86/toshiba_acpi.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/platform/x86/toshiba_acpi.c linux-2.6.32/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32/drivers/platform/x86/toshiba_acpi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/platform/x86/toshiba_acpi.c 2009-12-04 21:40:48.375638697 -0500 @@ -671,7 +671,7 @@ static acpi_status remove_device(void) return AE_OK; } @@ -24377,19 +24633,19 @@ diff -urNp linux-2.6.31.7/drivers/platform/x86/toshiba_acpi.c linux-2.6.31.7/dri .get_brightness = get_lcd, .update_status = set_lcd_status, }; -diff -urNp linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c 2009-12-10 22:15:16.000000000 -0500 -@@ -60,7 +60,7 @@ set_base(gdt[(selname) >> 3], (u32)(addr - set_limit(gdt[(selname) >> 3], size); \ +diff -urNp linux-2.6.32/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32/drivers/pnp/pnpbios/bioscalls.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pnp/pnpbios/bioscalls.c 2009-12-04 21:40:48.376742320 -0500 +@@ -60,7 +60,7 @@ do { \ + set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ } while(0) --static struct desc_struct bad_bios_desc; -+static struct desc_struct bad_bios_desc __read_only; +-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092, ++static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093, + (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); /* - * At some point we want to use this stack frame pointer to unwind -@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func +@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func cpu = get_cpu(); save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8]; @@ -24400,7 +24656,7 @@ diff -urNp linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.7/drivers /* On some boxes IRQ's during PnP BIOS calls are deadly. */ spin_lock_irqsave(&pnp_bios_lock, flags); -@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func +@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func :"memory"); spin_unlock_irqrestore(&pnp_bios_lock, flags); @@ -24411,7 +24667,7 @@ diff -urNp linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.7/drivers put_cpu(); /* If we get here and this is set then the PnP BIOS faulted on us. */ -@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 n +@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 n return status; } @@ -24420,28 +24676,25 @@ diff -urNp linux-2.6.31.7/drivers/pnp/pnpbios/bioscalls.c linux-2.6.31.7/drivers { int i; -@@ -476,8 +482,10 @@ void pnpbios_calls_init(union pnp_bios_i +@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_i pnp_bios_callpoint.offset = header->fields.pm16offset; pnp_bios_callpoint.segment = PNP_CS16; + pax_open_kernel(); + - bad_bios_desc.a = 0; -- bad_bios_desc.b = 0x00409200; -+ bad_bios_desc.b = 0x00409300; - - set_base(bad_bios_desc, __va((unsigned long)0x40 << 4)); - _set_limit((char *)&bad_bios_desc, 4095 - (0x40 << 4)); -@@ -491,4 +499,6 @@ void pnpbios_calls_init(union pnp_bios_i - set_base(gdt[GDT_ENTRY_PNPBIOS_DS], - __va(header->fields.pm16dseg)); + for_each_possible_cpu(i) { + struct desc_struct *gdt = get_cpu_gdt_table(i); + if (!gdt) +@@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_i + set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS], + (unsigned long)__va(header->fields.pm16dseg)); } + + pax_close_kernel(); } -diff -urNp linux-2.6.31.7/drivers/pnp/quirks.c linux-2.6.31.7/drivers/pnp/quirks.c ---- linux-2.6.31.7/drivers/pnp/quirks.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pnp/quirks.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pnp/quirks.c linux-2.6.32/drivers/pnp/quirks.c +--- linux-2.6.32/drivers/pnp/quirks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pnp/quirks.c 2009-12-04 21:40:48.376742320 -0500 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -24451,9 +24704,9 @@ diff -urNp linux-2.6.31.7/drivers/pnp/quirks.c linux-2.6.31.7/drivers/pnp/quirks }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.31.7/drivers/pnp/resource.c linux-2.6.31.7/drivers/pnp/resource.c ---- linux-2.6.31.7/drivers/pnp/resource.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/pnp/resource.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/pnp/resource.c linux-2.6.32/drivers/pnp/resource.c +--- linux-2.6.32/drivers/pnp/resource.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/pnp/resource.c 2009-12-04 21:40:48.376742320 -0500 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -24472,34 +24725,10 @@ diff -urNp linux-2.6.31.7/drivers/pnp/resource.c linux-2.6.31.7/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.31.7/drivers/s390/cio/qdio_debug.c linux-2.6.31.7/drivers/s390/cio/qdio_debug.c ---- linux-2.6.31.7/drivers/s390/cio/qdio_debug.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/s390/cio/qdio_debug.c 2009-12-10 22:15:16.000000000 -0500 -@@ -144,7 +144,7 @@ static void remove_debugfs_entry(struct - } - } - --static struct file_operations debugfs_fops = { -+static const struct file_operations debugfs_fops = { - .owner = THIS_MODULE, - .open = qstat_seq_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/drivers/s390/cio/qdio_perf.c linux-2.6.31.7/drivers/s390/cio/qdio_perf.c ---- linux-2.6.31.7/drivers/s390/cio/qdio_perf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/s390/cio/qdio_perf.c 2009-12-10 22:15:16.000000000 -0500 -@@ -84,7 +84,7 @@ static int qdio_perf_seq_open(struct ino - return single_open(filp, qdio_perf_proc_show, NULL); - } - --static struct file_operations qdio_perf_proc_fops = { -+static const struct file_operations qdio_perf_proc_fops = { - .owner = THIS_MODULE, - .open = qdio_perf_seq_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/drivers/scsi/ipr.c linux-2.6.31.7/drivers/scsi/ipr.c ---- linux-2.6.31.7/drivers/scsi/ipr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/scsi/ipr.c 2009-12-10 22:15:16.000000000 -0500 -@@ -5262,7 +5262,7 @@ static bool ipr_qc_fill_rtf(struct ata_q +diff -urNp linux-2.6.32/drivers/scsi/ipr.c linux-2.6.32/drivers/scsi/ipr.c +--- linux-2.6.32/drivers/scsi/ipr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/scsi/ipr.c 2009-12-04 21:40:48.378709786 -0500 +@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q return true; } @@ -24508,10 +24737,10 @@ diff -urNp linux-2.6.31.7/drivers/scsi/ipr.c linux-2.6.31.7/drivers/scsi/ipr.c .phy_reset = ipr_ata_phy_reset, .hardreset = ipr_sata_reset, .post_internal_cmd = ipr_ata_post_internal, -diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c 2009-12-10 22:15:16.000000000 -0500 -@@ -73,12 +73,12 @@ struct fc_exch_mgr { +diff -urNp linux-2.6.32/drivers/scsi/libfc/fc_exch.c linux-2.6.32/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32/drivers/scsi/libfc/fc_exch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/scsi/libfc/fc_exch.c 2009-12-04 21:40:48.379742413 -0500 +@@ -86,12 +86,12 @@ struct fc_exch_mgr { * all together if not used XXX */ struct { @@ -24528,9 +24757,9 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc + atomic_unchecked_t seq_not_found; + atomic_unchecked_t non_bls_resp; } stats; - struct fc_exch **exches; /* for exch pointers indexed by xid */ }; -@@ -523,7 +523,7 @@ struct fc_exch *fc_exch_alloc(struct fc_ + #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq) +@@ -510,7 +510,7 @@ static struct fc_exch *fc_exch_em_alloc( /* allocate memory for exchange */ ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC); if (!ep) { @@ -24539,16 +24768,16 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc goto out; } memset(ep, 0, sizeof(*ep)); -@@ -568,7 +568,7 @@ out: +@@ -557,7 +557,7 @@ out: return ep; err: - spin_unlock_bh(&mp->em_lock); + spin_unlock_bh(&pool->lock); - atomic_inc(&mp->stats.no_free_exch_xid); + atomic_inc_unchecked(&mp->stats.no_free_exch_xid); mempool_free(ep, mp->ep_pool); return NULL; } -@@ -671,7 +671,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_look xid = ntohs(fh->fh_ox_id); /* we originated exch */ ep = fc_exch_find(mp, xid); if (!ep) { @@ -24557,7 +24786,7 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc reject = FC_RJT_OX_ID; goto out; } -@@ -701,7 +701,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_look ep = fc_exch_find(mp, xid); if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) { if (ep) { @@ -24566,7 +24795,7 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc reject = FC_RJT_RX_ID; goto rel; } -@@ -712,7 +712,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_look } xid = ep->xid; /* get our XID */ } else if (!ep) { @@ -24575,7 +24804,7 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc reject = FC_RJT_RX_ID; /* XID not found */ goto out; } -@@ -733,7 +733,7 @@ static enum fc_pf_rjt_reason fc_seq_look +@@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_look } else { sp = &ep->seq; if (sp->id != fh->fh_seq_id) { @@ -24584,7 +24813,7 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */ goto rel; } -@@ -1145,22 +1145,22 @@ static void fc_exch_recv_seq_resp(struct +@@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct ep = fc_exch_find(mp, ntohs(fh->fh_ox_id)); if (!ep) { @@ -24611,7 +24840,7 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc goto rel; } sof = fr_sof(fp); -@@ -1171,7 +1171,7 @@ static void fc_exch_recv_seq_resp(struct +@@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct } else { sp = &ep->seq; if (sp->id != fh->fh_seq_id) { @@ -24620,22 +24849,21 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libfc/fc_exch.c linux-2.6.31.7/drivers/sc goto rel; } } -@@ -1230,10 +1230,10 @@ static void fc_exch_recv_resp(struct fc_ - +@@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_ sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */ - if (!sp) { + + if (!sp) - atomic_inc(&mp->stats.xid_not_found); + atomic_inc_unchecked(&mp->stats.xid_not_found); - FC_EM_DBG(mp, "seq lookup failed\n"); - } else { + else - atomic_inc(&mp->stats.non_bls_resp); + atomic_inc_unchecked(&mp->stats.non_bls_resp); - FC_EM_DBG(mp, "non-BLS response to sequence"); - } + fc_frame_free(fp); -diff -urNp linux-2.6.31.7/drivers/scsi/libsas/sas_ata.c linux-2.6.31.7/drivers/scsi/libsas/sas_ata.c ---- linux-2.6.31.7/drivers/scsi/libsas/sas_ata.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/scsi/libsas/sas_ata.c 2009-12-10 22:15:16.000000000 -0500 + } +diff -urNp linux-2.6.32/drivers/scsi/libsas/sas_ata.c linux-2.6.32/drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32/drivers/scsi/libsas/sas_ata.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/scsi/libsas/sas_ata.c 2009-12-04 21:40:48.380739261 -0500 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l } } @@ -24645,9 +24873,9 @@ diff -urNp linux-2.6.31.7/drivers/scsi/libsas/sas_ata.c linux-2.6.31.7/drivers/s .phy_reset = sas_ata_phy_reset, .post_internal_cmd = sas_ata_post_internal, .qc_prep = ata_noop_qc_prep, -diff -urNp linux-2.6.31.7/drivers/scsi/scsi_logging.h linux-2.6.31.7/drivers/scsi/scsi_logging.h ---- linux-2.6.31.7/drivers/scsi/scsi_logging.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/scsi/scsi_logging.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/scsi/scsi_logging.h linux-2.6.32/drivers/scsi/scsi_logging.h +--- linux-2.6.32/drivers/scsi/scsi_logging.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/scsi/scsi_logging.h 2009-12-04 21:40:48.380739261 -0500 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -24657,150 +24885,31 @@ diff -urNp linux-2.6.31.7/drivers/scsi/scsi_logging.h linux-2.6.31.7/drivers/scs #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.31.7/drivers/scsi/sg.c linux-2.6.31.7/drivers/scsi/sg.c ---- linux-2.6.31.7/drivers/scsi/sg.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/scsi/sg.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1185,7 +1185,7 @@ sg_vma_fault(struct vm_area_struct *vma, - return VM_FAULT_SIGBUS; - } - --static struct vm_operations_struct sg_mmap_vm_ops = { -+static const struct vm_operations_struct sg_mmap_vm_ops = { - .fault = sg_vma_fault, - }; - -@@ -1317,7 +1317,7 @@ static void sg_rq_end_io(struct request - } - } - --static struct file_operations sg_fops = { -+static const struct file_operations sg_fops = { - .owner = THIS_MODULE, - .read = sg_read, - .write = sg_write, -@@ -2194,8 +2194,11 @@ static int sg_proc_seq_show_int(struct s - static int sg_proc_single_open_adio(struct inode *inode, struct file *file); - static ssize_t sg_proc_write_adio(struct file *filp, const char __user *buffer, - size_t count, loff_t *off); --static struct file_operations adio_fops = { -- /* .owner, .read and .llseek added in sg_proc_init() */ -+ -+static const struct file_operations adio_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_single_open_adio, - .write = sg_proc_write_adio, - .release = single_release, -@@ -2204,7 +2207,10 @@ static struct file_operations adio_fops - static int sg_proc_single_open_dressz(struct inode *inode, struct file *file); - static ssize_t sg_proc_write_dressz(struct file *filp, - const char __user *buffer, size_t count, loff_t *off); --static struct file_operations dressz_fops = { -+static const struct file_operations dressz_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_single_open_dressz, - .write = sg_proc_write_dressz, - .release = single_release, -@@ -2212,14 +2218,20 @@ static struct file_operations dressz_fop - - static int sg_proc_seq_show_version(struct seq_file *s, void *v); - static int sg_proc_single_open_version(struct inode *inode, struct file *file); --static struct file_operations version_fops = { -+static const struct file_operations version_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_single_open_version, - .release = single_release, - }; - - static int sg_proc_seq_show_devhdr(struct seq_file *s, void *v); - static int sg_proc_single_open_devhdr(struct inode *inode, struct file *file); --static struct file_operations devhdr_fops = { -+static const struct file_operations devhdr_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_single_open_devhdr, - .release = single_release, - }; -@@ -2229,11 +2241,14 @@ static int sg_proc_open_dev(struct inode - static void * dev_seq_start(struct seq_file *s, loff_t *pos); - static void * dev_seq_next(struct seq_file *s, void *v, loff_t *pos); - static void dev_seq_stop(struct seq_file *s, void *v); --static struct file_operations dev_fops = { -+static const struct file_operations dev_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_open_dev, - .release = seq_release, - }; --static struct seq_operations dev_seq_ops = { -+static const struct seq_operations dev_seq_ops = { - .start = dev_seq_start, - .next = dev_seq_next, - .stop = dev_seq_stop, -@@ -2242,11 +2257,14 @@ static struct seq_operations dev_seq_ops - - static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v); - static int sg_proc_open_devstrs(struct inode *inode, struct file *file); --static struct file_operations devstrs_fops = { -+static const struct file_operations devstrs_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_open_devstrs, - .release = seq_release, - }; --static struct seq_operations devstrs_seq_ops = { -+static const struct seq_operations devstrs_seq_ops = { - .start = dev_seq_start, - .next = dev_seq_next, - .stop = dev_seq_stop, -@@ -2255,11 +2273,14 @@ static struct seq_operations devstrs_seq - - static int sg_proc_seq_show_debug(struct seq_file *s, void *v); - static int sg_proc_open_debug(struct inode *inode, struct file *file); --static struct file_operations debug_fops = { -+static const struct file_operations debug_fops = { -+ .owner = THIS_MODULE, -+ .read = seq_read, -+ .llseek = seq_lseek, - .open = sg_proc_open_debug, - .release = seq_release, - }; --static struct seq_operations debug_seq_ops = { -+static const struct seq_operations debug_seq_ops = { - .start = dev_seq_start, - .next = dev_seq_next, - .stop = dev_seq_stop, -@@ -2269,7 +2290,7 @@ static struct seq_operations debug_seq_o - - struct sg_proc_leaf { - const char * name; -- struct file_operations * fops; -+ const struct file_operations * fops; - }; - - static struct sg_proc_leaf sg_proc_leaf_arr[] = { -@@ -2295,9 +2316,6 @@ sg_proc_init(void) - for (k = 0; k < num_leaves; ++k) { - leaf = &sg_proc_leaf_arr[k]; - mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO; -- leaf->fops->owner = THIS_MODULE; -- leaf->fops->read = seq_read; -- leaf->fops->llseek = seq_lseek; - proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops); - } - return 0; -diff -urNp linux-2.6.31.7/drivers/serial/8250_pci.c linux-2.6.31.7/drivers/serial/8250_pci.c ---- linux-2.6.31.7/drivers/serial/8250_pci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/serial/8250_pci.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3591,7 +3591,7 @@ static struct pci_device_id serial_pci_t +diff -urNp linux-2.6.32/drivers/scsi/sg.c linux-2.6.32/drivers/scsi/sg.c +--- linux-2.6.32/drivers/scsi/sg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/scsi/sg.c 2009-12-04 21:40:48.381653658 -0500 +@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { + const struct file_operations * fops; + }; + +-static struct sg_proc_leaf sg_proc_leaf_arr[] = { ++static const struct sg_proc_leaf sg_proc_leaf_arr[] = { + {"allow_dio", &adio_fops}, + {"debug", &debug_fops}, + {"def_reserved_size", &dressz_fops}, +@@ -2307,7 +2307,7 @@ sg_proc_init(void) + { + int k, mask; + int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr); +- struct sg_proc_leaf * leaf; ++ const struct sg_proc_leaf * leaf; + + sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); + if (!sg_proc_sgp) +diff -urNp linux-2.6.32/drivers/serial/8250_pci.c linux-2.6.32/drivers/serial/8250_pci.c +--- linux-2.6.32/drivers/serial/8250_pci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/serial/8250_pci.c 2009-12-04 21:40:48.391663699 -0500 +@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00, pbn_default }, @@ -24809,9 +24918,9 @@ diff -urNp linux-2.6.31.7/drivers/serial/8250_pci.c linux-2.6.31.7/drivers/seria }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.31.7/drivers/serial/kgdboc.c linux-2.6.31.7/drivers/serial/kgdboc.c ---- linux-2.6.31.7/drivers/serial/kgdboc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/serial/kgdboc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/serial/kgdboc.c linux-2.6.32/drivers/serial/kgdboc.c +--- linux-2.6.32/drivers/serial/kgdboc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/serial/kgdboc.c 2009-12-04 21:40:48.391663699 -0500 @@ -18,7 +18,7 @@ #define MAX_CONFIG_LEN 40 @@ -24830,22 +24939,10 @@ diff -urNp linux-2.6.31.7/drivers/serial/kgdboc.c linux-2.6.31.7/drivers/serial/ .name = "kgdboc", .read_char = kgdboc_get_char, .write_char = kgdboc_put_char, -diff -urNp linux-2.6.31.7/drivers/spi/spidev.c linux-2.6.31.7/drivers/spi/spidev.c ---- linux-2.6.31.7/drivers/spi/spidev.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/spi/spidev.c 2009-12-10 22:15:16.000000000 -0500 -@@ -537,7 +537,7 @@ static int spidev_release(struct inode * - return status; - } - --static struct file_operations spidev_fops = { -+static const struct file_operations spidev_fops = { - .owner = THIS_MODULE, - /* REVISIT switch to aio primitives, so that userspace - * gets more complete API coverage. It'll simplify things -diff -urNp linux-2.6.31.7/drivers/staging/android/binder.c linux-2.6.31.7/drivers/staging/android/binder.c ---- linux-2.6.31.7/drivers/staging/android/binder.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/android/binder.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2717,7 +2717,7 @@ static void binder_vma_close(struct vm_a +diff -urNp linux-2.6.32/drivers/staging/android/binder.c linux-2.6.32/drivers/staging/android/binder.c +--- linux-2.6.32/drivers/staging/android/binder.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/android/binder.c 2009-12-04 21:40:48.392747393 -0500 +@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } @@ -24854,10 +24951,10 @@ diff -urNp linux-2.6.31.7/drivers/staging/android/binder.c linux-2.6.31.7/driver .open = binder_vma_open, .close = binder_vma_close, }; -diff -urNp linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c ---- linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c 2009-12-10 22:15:16.000000000 -0500 -@@ -454,7 +454,7 @@ static int b3dfg_vma_fault(struct vm_are +diff -urNp linux-2.6.32/drivers/staging/b3dfg/b3dfg.c linux-2.6.32/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32/drivers/staging/b3dfg/b3dfg.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/b3dfg/b3dfg.c 2009-12-04 21:40:48.393746773 -0500 +@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are return VM_FAULT_NOPAGE; } @@ -24866,7 +24963,7 @@ diff -urNp linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.7/drivers/s .fault = b3dfg_vma_fault, }; -@@ -854,7 +854,7 @@ static int b3dfg_mmap(struct file *filp, +@@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp, return r; } @@ -24875,46 +24972,193 @@ diff -urNp linux-2.6.31.7/drivers/staging/b3dfg/b3dfg.c linux-2.6.31.7/drivers/s .owner = THIS_MODULE, .open = b3dfg_open, .release = b3dfg_release, -diff -urNp linux-2.6.31.7/drivers/staging/comedi/comedi_fops.c linux-2.6.31.7/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.31.7/drivers/staging/comedi/comedi_fops.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/comedi/comedi_fops.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1370,7 +1370,7 @@ void comedi_unmap(struct vm_area_struct +diff -urNp linux-2.6.32/drivers/staging/comedi/comedi_fops.c linux-2.6.32/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32/drivers/staging/comedi/comedi_fops.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/comedi/comedi_fops.c 2009-12-04 21:40:48.394746521 -0500 +@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } -static struct vm_operations_struct comedi_vm_ops = { +static const struct vm_operations_struct comedi_vm_ops = { - .close = comedi_unmap, + .close = comedi_unmap, }; -diff -urNp linux-2.6.31.7/drivers/staging/cpc-usb/cpc-usb_drv.c linux-2.6.31.7/drivers/staging/cpc-usb/cpc-usb_drv.c ---- linux-2.6.31.7/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/cpc-usb/cpc-usb_drv.c 2009-12-10 22:15:16.000000000 -0500 -@@ -104,7 +104,7 @@ static void cpcusb_read_interrupt_callba +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/adsp_driver.c linux-2.6.32/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/adsp_driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/adsp_driver.c 2009-12-04 21:40:48.394746521 -0500 +@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi + static dev_t adsp_devno; + static struct class *adsp_class; - static int cpcusb_setup_intrep(CPC_USB_T *card); +-static struct file_operations adsp_fops = { ++static const struct file_operations adsp_fops = { + .owner = THIS_MODULE, + .open = adsp_open, + .unlocked_ioctl = adsp_ioctl, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_aac.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_aac.c 2009-12-04 21:40:48.395715938 -0500 +@@ -1022,7 +1022,7 @@ done: + return rc; + } --static struct file_operations cpcusb_fops = { -+static const struct file_operations cpcusb_fops = { - /* - * The owner field is part of the module-locking - * mechanism. The idea is that the kernel knows -diff -urNp linux-2.6.31.7/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.31.7/drivers/staging/epl/EplApiLinuxKernel.c ---- linux-2.6.31.7/drivers/staging/epl/EplApiLinuxKernel.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/epl/EplApiLinuxKernel.c 2009-12-10 22:15:16.000000000 -0500 -@@ -203,7 +203,7 @@ static int EplLinIoctl(struct inode *pDe - module_init(EplLinInit); - module_exit(EplLinExit); - --static struct file_operations EplLinFileOps_g = { -+static const struct file_operations EplLinFileOps_g = { +-static struct file_operations audio_aac_fops = { ++static const struct file_operations audio_aac_fops = { + .owner = THIS_MODULE, + .open = audio_open, + .release = audio_release, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_amrnb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_amrnb.c 2009-12-04 21:40:48.395715938 -0500 +@@ -833,7 +833,7 @@ done: + return rc; + } + +-static struct file_operations audio_amrnb_fops = { ++static const struct file_operations audio_amrnb_fops = { + .owner = THIS_MODULE, + .open = audamrnb_open, + .release = audamrnb_release, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_evrc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_evrc.c 2009-12-04 21:40:48.396744051 -0500 +@@ -805,7 +805,7 @@ dma_fail: + return rc; + } + +-static struct file_operations audio_evrc_fops = { ++static const struct file_operations audio_evrc_fops = { + .owner = THIS_MODULE, + .open = audevrc_open, + .release = audevrc_release, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_in.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_in.c 2009-12-04 21:40:48.396744051 -0500 +@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino + return 0; + } + +-static struct file_operations audio_fops = { ++static const struct file_operations audio_fops = { + .owner = THIS_MODULE, + .open = audio_in_open, + .release = audio_in_release, +@@ -922,7 +922,7 @@ static struct file_operations audio_fops + .unlocked_ioctl = audio_in_ioctl, + }; + +-static struct file_operations audpre_fops = { ++static const struct file_operations audpre_fops = { + .owner = THIS_MODULE, + .open = audpre_open, + .unlocked_ioctl = audpre_ioctl, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_mp3.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_mp3.c 2009-12-04 21:40:48.396744051 -0500 +@@ -941,7 +941,7 @@ done: + return rc; + } + +-static struct file_operations audio_mp3_fops = { ++static const struct file_operations audio_mp3_fops = { + .owner = THIS_MODULE, + .open = audio_open, + .release = audio_release, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_out.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_out.c 2009-12-04 21:40:48.397745232 -0500 +@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod + return 0; + } + +-static struct file_operations audio_fops = { ++static const struct file_operations audio_fops = { + .owner = THIS_MODULE, + .open = audio_open, + .release = audio_release, +@@ -819,7 +819,7 @@ static struct file_operations audio_fops + .unlocked_ioctl = audio_ioctl, + }; + +-static struct file_operations audpp_fops = { ++static const struct file_operations audpp_fops = { + .owner = THIS_MODULE, + .open = audpp_open, + .unlocked_ioctl = audpp_ioctl, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.32/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/audio_qcelp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/audio_qcelp.c 2009-12-04 21:40:48.397745232 -0500 +@@ -816,7 +816,7 @@ err: + return rc; + } + +-static struct file_operations audio_qcelp_fops = { ++static const struct file_operations audio_qcelp_fops = { .owner = THIS_MODULE, - .open = EplLinOpen, - .release = EplLinRelease, -diff -urNp linux-2.6.31.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.31.7/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.31.7/drivers/staging/go7007/go7007-v4l2.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/go7007/go7007-v4l2.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1717,7 +1717,7 @@ static int go7007_vm_fault(struct vm_are + .open = audqcelp_open, + .release = audqcelp_release, +diff -urNp linux-2.6.32/drivers/staging/dream/qdsp5/snd.c linux-2.6.32/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32/drivers/staging/dream/qdsp5/snd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/qdsp5/snd.c 2009-12-04 21:40:48.398747289 -0500 +@@ -242,7 +242,7 @@ err: + return rc; + } + +-static struct file_operations snd_fops = { ++static const struct file_operations snd_fops = { + .owner = THIS_MODULE, + .open = snd_open, + .release = snd_release, +diff -urNp linux-2.6.32/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32/drivers/staging/dream/smd/smd_qmi.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/smd/smd_qmi.c 2009-12-04 21:40:48.398747289 -0500 +@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, + return 0; + } + +-static struct file_operations qmi_fops = { ++static const struct file_operations qmi_fops = { + .owner = THIS_MODULE, + .read = qmi_read, + .write = qmi_write, +diff -urNp linux-2.6.32/drivers/staging/dream/smd/smd_rpcrouter_device.c linux-2.6.32/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32/drivers/staging/dream/smd/smd_rpcrouter_device.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dream/smd/smd_rpcrouter_device.c 2009-12-04 21:40:48.399557670 -0500 +@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file + return rc; + } + +-static struct file_operations rpcrouter_server_fops = { ++static const struct file_operations rpcrouter_server_fops = { + .owner = THIS_MODULE, + .open = rpcrouter_open, + .release = rpcrouter_release, +@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_ + .unlocked_ioctl = rpcrouter_ioctl, + }; + +-static struct file_operations rpcrouter_router_fops = { ++static const struct file_operations rpcrouter_router_fops = { + .owner = THIS_MODULE, + .open = rpcrouter_open, + .release = rpcrouter_release, +diff -urNp linux-2.6.32/drivers/staging/dst/dcore.c linux-2.6.32/drivers/staging/dst/dcore.c +--- linux-2.6.32/drivers/staging/dst/dcore.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/dst/dcore.c 2009-12-04 21:40:48.399557670 -0500 +@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi + return 0; + } + +-static struct block_device_operations dst_blk_ops = { ++static const struct block_device_operations dst_blk_ops = { + .open = dst_bdev_open, + .release = dst_bdev_release, + .owner = THIS_MODULE, +diff -urNp linux-2.6.32/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32/drivers/staging/go7007/go7007-v4l2.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/go7007/go7007-v4l2.c 2009-12-04 21:40:48.400637903 -0500 +@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -24923,10 +25167,22 @@ diff -urNp linux-2.6.31.7/drivers/staging/go7007/go7007-v4l2.c linux-2.6.31.7/dr .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.31.7/drivers/staging/panel/panel.c linux-2.6.31.7/drivers/staging/panel/panel.c ---- linux-2.6.31.7/drivers/staging/panel/panel.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/panel/panel.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1263,7 +1263,7 @@ static int lcd_release(struct inode *ino +diff -urNp linux-2.6.32/drivers/staging/hv/blkvsc_drv.c linux-2.6.32/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32/drivers/staging/hv/blkvsc_drv.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/hv/blkvsc_drv.c 2009-12-04 21:40:48.401671489 -0500 +@@ -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/drivers/staging/panel/panel.c linux-2.6.32/drivers/staging/panel/panel.c +--- linux-2.6.32/drivers/staging/panel/panel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/panel/panel.c 2009-12-04 21:40:48.401671489 -0500 +@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -24935,7 +25191,7 @@ diff -urNp linux-2.6.31.7/drivers/staging/panel/panel.c linux-2.6.31.7/drivers/s .write = lcd_write, .open = lcd_open, .release = lcd_release, -@@ -1519,7 +1519,7 @@ static int keypad_release(struct inode * +@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode * return 0; } @@ -24944,21 +25200,9 @@ diff -urNp linux-2.6.31.7/drivers/staging/panel/panel.c linux-2.6.31.7/drivers/s .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.31.7/drivers/staging/pata_rdc/pata_rdc.c linux-2.6.31.7/drivers/staging/pata_rdc/pata_rdc.c ---- linux-2.6.31.7/drivers/staging/pata_rdc/pata_rdc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/pata_rdc/pata_rdc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -875,7 +875,7 @@ static struct scsi_host_template rdc_pat - ATA_BMDMA_SHT(KBUILD_MODNAME), - }; - --static struct ata_port_operations rdc_pata_ops = { -+static const struct ata_port_operations rdc_pata_ops = { - .inherits = &ata_bmdma_port_ops, - - .port_start = rdc_pata_port_start, -diff -urNp linux-2.6.31.7/drivers/staging/phison/phison.c linux-2.6.31.7/drivers/staging/phison/phison.c ---- linux-2.6.31.7/drivers/staging/phison/phison.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/phison/phison.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/staging/phison/phison.c linux-2.6.32/drivers/staging/phison/phison.c +--- linux-2.6.32/drivers/staging/phison/phison.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/phison/phison.c 2009-12-04 21:40:48.402660409 -0500 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_ ATA_BMDMA_SHT(DRV_NAME), }; @@ -24968,10 +25212,10 @@ diff -urNp linux-2.6.31.7/drivers/staging/phison/phison.c linux-2.6.31.7/drivers .inherits = &ata_bmdma_port_ops, .prereset = phison_pre_reset, }; -diff -urNp linux-2.6.31.7/drivers/staging/poch/poch.c linux-2.6.31.7/drivers/staging/poch/poch.c ---- linux-2.6.31.7/drivers/staging/poch/poch.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/poch/poch.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1056,7 +1056,7 @@ static int poch_ioctl(struct inode *inod +diff -urNp linux-2.6.32/drivers/staging/poch/poch.c linux-2.6.32/drivers/staging/poch/poch.c +--- linux-2.6.32/drivers/staging/poch/poch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/poch/poch.c 2009-12-04 21:40:48.402660409 -0500 +@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -24980,31 +25224,34 @@ diff -urNp linux-2.6.31.7/drivers/staging/poch/poch.c linux-2.6.31.7/drivers/sta .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.31.7/drivers/staging/rtl8192su/ieee80211/proc.c linux-2.6.31.7/drivers/staging/rtl8192su/ieee80211/proc.c ---- linux-2.6.31.7/drivers/staging/rtl8192su/ieee80211/proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/staging/rtl8192su/ieee80211/proc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -87,7 +87,7 @@ static int c_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations crypto_seq_ops = { -+static const struct seq_operations crypto_seq_ops = { - .start = c_start, - .next = c_next, - .stop = c_stop, -@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode - return seq_open(file, &crypto_seq_ops); - } - --static struct file_operations proc_crypto_ops = { -+static const struct file_operations proc_crypto_ops = { - .open = crypto_info_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/drivers/uio/uio.c linux-2.6.31.7/drivers/uio/uio.c ---- linux-2.6.31.7/drivers/uio/uio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/uio/uio.c 2009-12-10 22:15:16.000000000 -0500 -@@ -128,7 +128,7 @@ static ssize_t map_type_show(struct kobj +diff -urNp linux-2.6.32/drivers/staging/sep/sep_driver.c linux-2.6.32/drivers/staging/sep/sep_driver.c +--- linux-2.6.32/drivers/staging/sep/sep_driver.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/sep/sep_driver.c 2009-12-04 21:40:48.403750167 -0500 +@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver + static dev_t sep_devno; + + /* the files operations structure of the driver */ +-static struct file_operations sep_file_operations = { ++static const struct file_operations sep_file_operations = { + .owner = THIS_MODULE, + .ioctl = sep_ioctl, + .poll = sep_poll, +diff -urNp linux-2.6.32/drivers/staging/vme/devices/vme_user.c linux-2.6.32/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32/drivers/staging/vme/devices/vme_user.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/staging/vme/devices/vme_user.c 2009-12-04 21:40:48.404638932 -0500 +@@ -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); + +-static struct file_operations vme_user_fops = { ++static const struct file_operations vme_user_fops = { + .open = vme_user_open, + .release = vme_user_release, + .read = vme_user_read, +diff -urNp linux-2.6.32/drivers/uio/uio.c linux-2.6.32/drivers/uio/uio.c +--- linux-2.6.32/drivers/uio/uio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/uio/uio.c 2009-12-04 21:40:48.405627223 -0500 +@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj return entry->show(mem, buf); } @@ -25013,7 +25260,7 @@ diff -urNp linux-2.6.31.7/drivers/uio/uio.c linux-2.6.31.7/drivers/uio/uio.c .show = map_type_show, }; -@@ -216,7 +216,7 @@ static ssize_t portio_type_show(struct k +@@ -217,7 +217,7 @@ static ssize_t portio_type_show(struct k return entry->show(port, buf); } @@ -25022,18 +25269,9 @@ diff -urNp linux-2.6.31.7/drivers/uio/uio.c linux-2.6.31.7/drivers/uio/uio.c .show = portio_type_show, }; -@@ -658,7 +658,7 @@ static int uio_vma_fault(struct vm_area_ - return 0; - } - --static struct vm_operations_struct uio_vm_ops = { -+static const struct vm_operations_struct uio_vm_ops = { - .open = uio_vma_open, - .close = uio_vma_close, - .fault = uio_vma_fault, -diff -urNp linux-2.6.31.7/drivers/usb/atm/usbatm.c linux-2.6.31.7/drivers/usb/atm/usbatm.c ---- linux-2.6.31.7/drivers/usb/atm/usbatm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/atm/usbatm.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/atm/usbatm.c linux-2.6.32/drivers/usb/atm/usbatm.c +--- linux-2.6.32/drivers/usb/atm/usbatm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/atm/usbatm.c 2009-12-04 21:40:48.405627223 -0500 @@ -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", @@ -25113,10 +25351,10 @@ diff -urNp linux-2.6.31.7/drivers/usb/atm/usbatm.c linux-2.6.31.7/drivers/usb/at if (!left--) { if (instance->disconnected) -diff -urNp linux-2.6.31.7/drivers/usb/class/cdc-acm.c linux-2.6.31.7/drivers/usb/class/cdc-acm.c ---- linux-2.6.31.7/drivers/usb/class/cdc-acm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/class/cdc-acm.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1528,7 +1528,7 @@ static struct usb_device_id acm_ids[] = +diff -urNp linux-2.6.32/drivers/usb/class/cdc-acm.c linux-2.6.32/drivers/usb/class/cdc-acm.c +--- linux-2.6.32/drivers/usb/class/cdc-acm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/class/cdc-acm.c 2009-12-04 21:40:48.406755188 -0500 +@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ @@ -25125,9 +25363,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/class/cdc-acm.c linux-2.6.31.7/drivers/usb }; MODULE_DEVICE_TABLE(usb, acm_ids); -diff -urNp linux-2.6.31.7/drivers/usb/class/usblp.c linux-2.6.31.7/drivers/usb/class/usblp.c ---- linux-2.6.31.7/drivers/usb/class/usblp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/class/usblp.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/class/usblp.c linux-2.6.32/drivers/usb/class/usblp.c +--- linux-2.6.32/drivers/usb/class/usblp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/class/usblp.c 2009-12-04 21:40:48.407627244 -0500 @@ -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 */ @@ -25146,22 +25384,10 @@ diff -urNp linux-2.6.31.7/drivers/usb/class/usblp.c linux-2.6.31.7/drivers/usb/c }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.31.7/drivers/usb/class/usbtmc.c linux-2.6.31.7/drivers/usb/class/usbtmc.c ---- linux-2.6.31.7/drivers/usb/class/usbtmc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/class/usbtmc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -970,7 +970,7 @@ static long usbtmc_ioctl(struct file *fi - return retval; - } - --static struct file_operations fops = { -+static const struct file_operations fops = { - .owner = THIS_MODULE, - .read = usbtmc_read, - .write = usbtmc_write, -diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.c linux-2.6.31.7/drivers/usb/core/hcd.c ---- linux-2.6.31.7/drivers/usb/core/hcd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/core/hcd.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2199,7 +2199,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd +diff -urNp linux-2.6.32/drivers/usb/core/hcd.c linux-2.6.32/drivers/usb/core/hcd.c +--- linux-2.6.32/drivers/usb/core/hcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/core/hcd.c 2009-12-04 21:40:48.407627244 -0500 +@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) @@ -25170,7 +25396,7 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.c linux-2.6.31.7/drivers/usb/core /* * The registration is unlocked. -@@ -2209,7 +2209,7 @@ struct usb_mon_operations *mon_ops; +@@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops; * symbols from usbcore, usbcore gets referenced and cannot be unloaded first. */ @@ -25179,10 +25405,19 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.c linux-2.6.31.7/drivers/usb/core { if (mon_ops) -diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.h linux-2.6.31.7/drivers/usb/core/hcd.h ---- linux-2.6.31.7/drivers/usb/core/hcd.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/core/hcd.h 2009-12-10 22:15:16.000000000 -0500 -@@ -487,7 +487,7 @@ struct usb_mon_operations { +diff -urNp linux-2.6.32/drivers/usb/core/hcd.h linux-2.6.32/drivers/usb/core/hcd.h +--- linux-2.6.32/drivers/usb/core/hcd.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/core/hcd.h 2009-12-04 21:40:48.408753292 -0500 +@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { + #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) + + struct usb_mon_operations { +- void (*urb_submit)(struct usb_bus *bus, struct urb *urb); +- void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err); +- void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status); ++ void (* const urb_submit)(struct usb_bus *bus, struct urb *urb); ++ void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err); ++ void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status); /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */ }; @@ -25191,7 +25426,7 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.h linux-2.6.31.7/drivers/usb/core static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb) { -@@ -509,7 +509,7 @@ static inline void usbmon_urb_complete(s +@@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(s (*mon_ops->urb_complete)(bus, urb, status); } @@ -25200,10 +25435,10 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/hcd.h linux-2.6.31.7/drivers/usb/core void usb_mon_deregister(void); #else -diff -urNp linux-2.6.31.7/drivers/usb/core/hub.c linux-2.6.31.7/drivers/usb/core/hub.c ---- linux-2.6.31.7/drivers/usb/core/hub.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/core/hub.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3284,7 +3284,7 @@ static struct usb_device_id hub_id_table +diff -urNp linux-2.6.32/drivers/usb/core/hub.c linux-2.6.32/drivers/usb/core/hub.c +--- linux-2.6.32/drivers/usb/core/hub.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/core/hub.c 2009-12-04 21:40:48.410745750 -0500 +@@ -3374,7 +3374,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, .bInterfaceClass = USB_CLASS_HUB}, @@ -25212,31 +25447,10 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/hub.c linux-2.6.31.7/drivers/usb/core }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.31.7/drivers/usb/core/inode.c linux-2.6.31.7/drivers/usb/core/inode.c ---- linux-2.6.31.7/drivers/usb/core/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/core/inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -48,7 +48,7 @@ - #define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO) - #define USBFS_DEFAULT_LISTMODE S_IRUGO - --static struct super_operations usbfs_ops; -+static const struct super_operations usbfs_ops; - static const struct file_operations default_file_operations; - static struct vfsmount *usbfs_mount; - static int usbfs_mount_count; /* = 0 */ -@@ -449,7 +449,7 @@ static const struct file_operations defa - .llseek = default_file_lseek, - }; - --static struct super_operations usbfs_ops = { -+static const struct super_operations usbfs_ops = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, - .remount_fs = remount, -diff -urNp linux-2.6.31.7/drivers/usb/core/message.c linux-2.6.31.7/drivers/usb/core/message.c ---- linux-2.6.31.7/drivers/usb/core/message.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/core/message.c 2009-12-10 22:15:16.000000000 -0500 -@@ -926,8 +926,8 @@ char *usb_cache_string(struct usb_device +diff -urNp linux-2.6.32/drivers/usb/core/message.c linux-2.6.32/drivers/usb/core/message.c +--- linux-2.6.32/drivers/usb/core/message.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/core/message.c 2009-12-04 21:40:48.411717572 -0500 +@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device buf = kmalloc(MAX_USB_STRING_SIZE, GFP_KERNEL); if (buf) { len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE); @@ -25247,33 +25461,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/core/message.c linux-2.6.31.7/drivers/usb/ if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.31.7/drivers/usb/gadget/inode.c linux-2.6.31.7/drivers/usb/gadget/inode.c ---- linux-2.6.31.7/drivers/usb/gadget/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/gadget/inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2033,7 +2033,7 @@ gadgetfs_create_file (struct super_block - return inode; - } - --static struct super_operations gadget_fs_operations = { -+static const struct super_operations gadget_fs_operations = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, - }; -diff -urNp linux-2.6.31.7/drivers/usb/gadget/printer.c linux-2.6.31.7/drivers/usb/gadget/printer.c ---- linux-2.6.31.7/drivers/usb/gadget/printer.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/gadget/printer.c 2009-12-10 22:15:16.000000000 -0500 -@@ -875,7 +875,7 @@ printer_ioctl(struct file *fd, unsigned - } - - /* used after endpoint configuration */ --static struct file_operations printer_io_operations = { -+static const struct file_operations printer_io_operations = { - .owner = THIS_MODULE, - .open = printer_open, - .read = printer_read, -diff -urNp linux-2.6.31.7/drivers/usb/host/ehci-pci.c linux-2.6.31.7/drivers/usb/host/ehci-pci.c ---- linux-2.6.31.7/drivers/usb/host/ehci-pci.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/host/ehci-pci.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/host/ehci-pci.c linux-2.6.32/drivers/usb/host/ehci-pci.c +--- linux-2.6.32/drivers/usb/host/ehci-pci.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/host/ehci-pci.c 2009-12-04 21:40:48.411717572 -0500 @@ -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, @@ -25283,9 +25473,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/host/ehci-pci.c linux-2.6.31.7/drivers/usb }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.31.7/drivers/usb/host/uhci-hcd.c linux-2.6.31.7/drivers/usb/host/uhci-hcd.c ---- linux-2.6.31.7/drivers/usb/host/uhci-hcd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/host/uhci-hcd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/host/uhci-hcd.c linux-2.6.32/drivers/usb/host/uhci-hcd.c +--- linux-2.6.32/drivers/usb/host/uhci-hcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/host/uhci-hcd.c 2009-12-04 21:40:48.412643507 -0500 @@ -927,7 +927,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -25295,39 +25485,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/host/uhci-hcd.c linux-2.6.31.7/drivers/usb }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.31.7/drivers/usb/host/whci/debug.c linux-2.6.31.7/drivers/usb/host/whci/debug.c ---- linux-2.6.31.7/drivers/usb/host/whci/debug.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/host/whci/debug.c 2009-12-10 22:15:16.000000000 -0500 -@@ -134,7 +134,7 @@ static int pzl_open(struct inode *inode, - return single_open(file, pzl_print, inode->i_private); - } - --static struct file_operations di_fops = { -+static const struct file_operations di_fops = { - .open = di_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -142,7 +142,7 @@ static struct file_operations di_fops = - .owner = THIS_MODULE, - }; - --static struct file_operations asl_fops = { -+static const struct file_operations asl_fops = { - .open = asl_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -150,7 +150,7 @@ static struct file_operations asl_fops = - .owner = THIS_MODULE, - }; - --static struct file_operations pzl_fops = { -+static const struct file_operations pzl_fops = { - .open = pzl_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/drivers/usb/misc/appledisplay.c linux-2.6.31.7/drivers/usb/misc/appledisplay.c ---- linux-2.6.31.7/drivers/usb/misc/appledisplay.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/misc/appledisplay.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/misc/appledisplay.c linux-2.6.32/drivers/usb/misc/appledisplay.c +--- linux-2.6.32/drivers/usb/misc/appledisplay.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/misc/appledisplay.c 2009-12-04 21:40:48.412643507 -0500 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes return pdata->msgdata[1]; } @@ -25337,21 +25497,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/misc/appledisplay.c linux-2.6.31.7/drivers .get_brightness = appledisplay_bl_get_brightness, .update_status = appledisplay_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/usb/mon/mon_bin.c linux-2.6.31.7/drivers/usb/mon/mon_bin.c ---- linux-2.6.31.7/drivers/usb/mon/mon_bin.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/mon/mon_bin.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1187,7 +1187,7 @@ static int mon_bin_vma_fault(struct vm_a - return 0; - } - --static struct vm_operations_struct mon_bin_vm_ops = { -+static const struct vm_operations_struct mon_bin_vm_ops = { - .open = mon_bin_vma_open, - .close = mon_bin_vma_close, - .fault = mon_bin_vma_fault, -diff -urNp linux-2.6.31.7/drivers/usb/mon/mon_main.c linux-2.6.31.7/drivers/usb/mon/mon_main.c ---- linux-2.6.31.7/drivers/usb/mon/mon_main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/mon/mon_main.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/mon/mon_main.c linux-2.6.32/drivers/usb/mon/mon_main.c +--- linux-2.6.32/drivers/usb/mon/mon_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/mon/mon_main.c 2009-12-04 21:40:48.412643507 -0500 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { /* * Ops @@ -25361,9 +25509,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/mon/mon_main.c linux-2.6.31.7/drivers/usb/ .urb_submit = mon_submit, .urb_submit_error = mon_submit_error, .urb_complete = mon_complete, -diff -urNp linux-2.6.31.7/drivers/usb/storage/debug.h linux-2.6.31.7/drivers/usb/storage/debug.h ---- linux-2.6.31.7/drivers/usb/storage/debug.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/storage/debug.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/storage/debug.h linux-2.6.32/drivers/usb/storage/debug.h +--- linux-2.6.32/drivers/usb/storage/debug.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/storage/debug.h 2009-12-04 21:40:48.412643507 -0500 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -25377,9 +25525,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/storage/debug.h linux-2.6.31.7/drivers/usb #endif #endif -diff -urNp linux-2.6.31.7/drivers/usb/storage/usb.c linux-2.6.31.7/drivers/usb/storage/usb.c ---- linux-2.6.31.7/drivers/usb/storage/usb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/storage/usb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/storage/usb.c linux-2.6.32/drivers/usb/storage/usb.c +--- linux-2.6.32/drivers/usb/storage/usb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/storage/usb.c 2009-12-04 21:40:48.413751024 -0500 @@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l static struct us_unusual_dev us_unusual_dev_list[] = { @@ -25389,9 +25537,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/storage/usb.c linux-2.6.31.7/drivers/usb/s }; #undef UNUSUAL_DEV -diff -urNp linux-2.6.31.7/drivers/usb/storage/usual-tables.c linux-2.6.31.7/drivers/usb/storage/usual-tables.c ---- linux-2.6.31.7/drivers/usb/storage/usual-tables.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/usb/storage/usual-tables.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/usb/storage/usual-tables.c linux-2.6.32/drivers/usb/storage/usual-tables.c +--- linux-2.6.32/drivers/usb/storage/usual-tables.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/usb/storage/usual-tables.c 2009-12-04 21:40:48.413751024 -0500 @@ -48,7 +48,7 @@ struct usb_device_id usb_storage_usb_ids[] = { @@ -25401,39 +25549,9 @@ diff -urNp linux-2.6.31.7/drivers/usb/storage/usual-tables.c linux-2.6.31.7/driv }; EXPORT_SYMBOL_GPL(usb_storage_usb_ids); -diff -urNp linux-2.6.31.7/drivers/uwb/uwb-debug.c linux-2.6.31.7/drivers/uwb/uwb-debug.c ---- linux-2.6.31.7/drivers/uwb/uwb-debug.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/uwb/uwb-debug.c 2009-12-10 22:15:16.000000000 -0500 -@@ -205,7 +205,7 @@ static ssize_t command_write(struct file - return ret < 0 ? ret : len; - } - --static struct file_operations command_fops = { -+static const struct file_operations command_fops = { - .open = command_open, - .write = command_write, - .read = NULL, -@@ -255,7 +255,7 @@ static int reservations_open(struct inod - return single_open(file, reservations_print, inode->i_private); - } - --static struct file_operations reservations_fops = { -+static const struct file_operations reservations_fops = { - .open = reservations_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -283,7 +283,7 @@ static int drp_avail_open(struct inode * - return single_open(file, drp_avail_print, inode->i_private); - } - --static struct file_operations drp_avail_fops = { -+static const struct file_operations drp_avail_fops = { - .open = drp_avail_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/drivers/uwb/wlp/messages.c linux-2.6.31.7/drivers/uwb/wlp/messages.c ---- linux-2.6.31.7/drivers/uwb/wlp/messages.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/uwb/wlp/messages.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/uwb/wlp/messages.c linux-2.6.32/drivers/uwb/wlp/messages.c +--- linux-2.6.32/drivers/uwb/wlp/messages.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/uwb/wlp/messages.c 2009-12-04 21:40:48.414746824 -0500 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -25443,20 +25561,10 @@ diff -urNp linux-2.6.31.7/drivers/uwb/wlp/messages.c linux-2.6.31.7/drivers/uwb/ enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.31.7/drivers/uwb/wlp/sysfs.c linux-2.6.31.7/drivers/uwb/wlp/sysfs.c ---- linux-2.6.31.7/drivers/uwb/wlp/sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/uwb/wlp/sysfs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -602,8 +602,7 @@ ssize_t wlp_wss_attr_show(struct kobject - * Sysfs operation for forwarding write call to the store method of the - * attribute owner - */ --static --ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr, -+static ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr, - const char *buf, size_t count) - { - struct wlp_wss_attribute *wss_attr = attr_to_wlp_wss_attr(attr); -@@ -615,8 +614,7 @@ ssize_t wlp_wss_attr_store(struct kobjec +diff -urNp linux-2.6.32/drivers/uwb/wlp/sysfs.c linux-2.6.32/drivers/uwb/wlp/sysfs.c +--- linux-2.6.32/drivers/uwb/wlp/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/uwb/wlp/sysfs.c 2009-12-04 21:40:48.414746824 -0500 +@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec return ret; } @@ -25466,9 +25574,9 @@ diff -urNp linux-2.6.31.7/drivers/uwb/wlp/sysfs.c linux-2.6.31.7/drivers/uwb/wlp .show = wlp_wss_attr_show, .store = wlp_wss_attr_store, }; -diff -urNp linux-2.6.31.7/drivers/video/atmel_lcdfb.c linux-2.6.31.7/drivers/video/atmel_lcdfb.c ---- linux-2.6.31.7/drivers/video/atmel_lcdfb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/atmel_lcdfb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/atmel_lcdfb.c linux-2.6.32/drivers/video/atmel_lcdfb.c +--- linux-2.6.32/drivers/video/atmel_lcdfb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/atmel_lcdfb.c 2009-12-04 21:40:48.415745253 -0500 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); } @@ -25478,9 +25586,9 @@ diff -urNp linux-2.6.31.7/drivers/video/atmel_lcdfb.c linux-2.6.31.7/drivers/vid .update_status = atmel_bl_update_status, .get_brightness = atmel_bl_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/video/aty/aty128fb.c linux-2.6.31.7/drivers/video/aty/aty128fb.c ---- linux-2.6.31.7/drivers/video/aty/aty128fb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/aty/aty128fb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/aty/aty128fb.c linux-2.6.32/drivers/video/aty/aty128fb.c +--- linux-2.6.32/drivers/video/aty/aty128fb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/aty/aty128fb.c 2009-12-04 21:40:48.415745253 -0500 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru return bd->props.brightness; } @@ -25490,10 +25598,10 @@ diff -urNp linux-2.6.31.7/drivers/video/aty/aty128fb.c linux-2.6.31.7/drivers/vi .get_brightness = aty128_bl_get_brightness, .update_status = aty128_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/aty/atyfb_base.c linux-2.6.31.7/drivers/video/aty/atyfb_base.c ---- linux-2.6.31.7/drivers/video/aty/atyfb_base.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/aty/atyfb_base.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2165,7 +2165,7 @@ static int aty_bl_get_brightness(struct +diff -urNp linux-2.6.32/drivers/video/aty/atyfb_base.c linux-2.6.32/drivers/video/aty/atyfb_base.c +--- linux-2.6.32/drivers/video/aty/atyfb_base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/aty/atyfb_base.c 2009-12-04 21:40:48.417642682 -0500 +@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct return bd->props.brightness; } @@ -25502,9 +25610,9 @@ diff -urNp linux-2.6.31.7/drivers/video/aty/atyfb_base.c linux-2.6.31.7/drivers/ .get_brightness = aty_bl_get_brightness, .update_status = aty_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/aty/radeon_backlight.c linux-2.6.31.7/drivers/video/aty/radeon_backlight.c ---- linux-2.6.31.7/drivers/video/aty/radeon_backlight.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/aty/radeon_backlight.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/aty/radeon_backlight.c linux-2.6.32/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32/drivers/video/aty/radeon_backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/aty/radeon_backlight.c 2009-12-04 21:40:48.417642682 -0500 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru return bd->props.brightness; } @@ -25514,9 +25622,33 @@ diff -urNp linux-2.6.31.7/drivers/video/aty/radeon_backlight.c linux-2.6.31.7/dr .get_brightness = radeon_bl_get_brightness, .update_status = radeon_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.31.7/drivers/video/backlight/atmel-pwm-bl.c ---- linux-2.6.31.7/drivers/video/backlight/atmel-pwm-bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/atmel-pwm-bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/adp5520_bl.c linux-2.6.32/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32/drivers/video/backlight/adp5520_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/adp5520_bl.c 2009-12-04 21:40:48.418652223 -0500 +@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str + return error ? data->current_brightness : reg_val; + } + +-static struct backlight_ops adp5520_bl_ops = { ++static const struct backlight_ops adp5520_bl_ops = { + .update_status = adp5520_bl_update_status, + .get_brightness = adp5520_bl_get_brightness, + }; +diff -urNp linux-2.6.32/drivers/video/backlight/adx_bl.c linux-2.6.32/drivers/video/backlight/adx_bl.c +--- linux-2.6.32/drivers/video/backlight/adx_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/adx_bl.c 2009-12-04 21:40:48.418652223 -0500 +@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct + return 1; + } + +-static struct backlight_ops adx_backlight_ops = { ++static const struct backlight_ops adx_backlight_ops = { + .options = 0, + .update_status = adx_backlight_update_status, + .get_brightness = adx_backlight_get_brightness, +diff -urNp linux-2.6.32/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32/drivers/video/backlight/atmel-pwm-bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/atmel-pwm-bl.c 2009-12-04 21:40:48.418652223 -0500 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct return pwm_channel_enable(&pwmbl->pwmc); } @@ -25526,10 +25658,10 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.31.7/ .get_brightness = atmel_pwm_bl_get_intensity, .update_status = atmel_pwm_bl_set_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/backlight.c linux-2.6.31.7/drivers/video/backlight/backlight.c ---- linux-2.6.31.7/drivers/video/backlight/backlight.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/backlight.c 2009-12-10 22:15:16.000000000 -0500 -@@ -227,7 +227,7 @@ static struct device_attribute bl_device +diff -urNp linux-2.6.32/drivers/video/backlight/backlight.c linux-2.6.32/drivers/video/backlight/backlight.c +--- linux-2.6.32/drivers/video/backlight/backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/backlight.c 2009-12-04 21:40:48.419716470 -0500 +@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); * ERR_PTR() or a pointer to the newly allocated device. */ struct backlight_device *backlight_device_register(const char *name, @@ -25538,10 +25670,10 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/backlight.c linux-2.6.31.7/dri { struct backlight_device *new_bd; int rc; -diff -urNp linux-2.6.31.7/drivers/video/backlight/corgi_lcd.c linux-2.6.31.7/drivers/video/backlight/corgi_lcd.c ---- linux-2.6.31.7/drivers/video/backlight/corgi_lcd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/corgi_lcd.c 2009-12-10 22:15:16.000000000 -0500 -@@ -450,7 +450,7 @@ void corgi_lcd_limit_intensity(int limit +diff -urNp linux-2.6.32/drivers/video/backlight/corgi_lcd.c linux-2.6.32/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32/drivers/video/backlight/corgi_lcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/corgi_lcd.c 2009-12-04 21:40:48.419716470 -0500 +@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit } EXPORT_SYMBOL(corgi_lcd_limit_intensity); @@ -25550,9 +25682,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/corgi_lcd.c linux-2.6.31.7/dri .get_brightness = corgi_bl_get_intensity, .update_status = corgi_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/cr_bllcd.c linux-2.6.31.7/drivers/video/backlight/cr_bllcd.c ---- linux-2.6.31.7/drivers/video/backlight/cr_bllcd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/cr_bllcd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/cr_bllcd.c linux-2.6.32/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32/drivers/video/backlight/cr_bllcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/cr_bllcd.c 2009-12-04 21:40:48.419716470 -0500 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st return intensity; } @@ -25562,9 +25694,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/cr_bllcd.c linux-2.6.31.7/driv .get_brightness = cr_backlight_get_intensity, .update_status = cr_backlight_set_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/da903x_bl.c linux-2.6.31.7/drivers/video/backlight/da903x_bl.c ---- linux-2.6.31.7/drivers/video/backlight/da903x_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/da903x_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/da903x_bl.c linux-2.6.32/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32/drivers/video/backlight/da903x_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/da903x_bl.c 2009-12-04 21:40:48.420751026 -0500 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne return data->current_brightness; } @@ -25574,9 +25706,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/da903x_bl.c linux-2.6.31.7/dri .update_status = da903x_backlight_update_status, .get_brightness = da903x_backlight_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/generic_bl.c linux-2.6.31.7/drivers/video/backlight/generic_bl.c ---- linux-2.6.31.7/drivers/video/backlight/generic_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/generic_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/generic_bl.c linux-2.6.32/drivers/video/backlight/generic_bl.c +--- linux-2.6.32/drivers/video/backlight/generic_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/generic_bl.c 2009-12-04 21:40:48.420751026 -0500 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) } EXPORT_SYMBOL(corgibl_limit_intensity); @@ -25586,9 +25718,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/generic_bl.c linux-2.6.31.7/dr .options = BL_CORE_SUSPENDRESUME, .get_brightness = genericbl_get_intensity, .update_status = genericbl_send_intensity, -diff -urNp linux-2.6.31.7/drivers/video/backlight/hp680_bl.c linux-2.6.31.7/drivers/video/backlight/hp680_bl.c ---- linux-2.6.31.7/drivers/video/backlight/hp680_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/hp680_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/hp680_bl.c linux-2.6.32/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32/drivers/video/backlight/hp680_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/hp680_bl.c 2009-12-04 21:40:48.420751026 -0500 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct return current_intensity; } @@ -25598,9 +25730,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/hp680_bl.c linux-2.6.31.7/driv .get_brightness = hp680bl_get_intensity, .update_status = hp680bl_set_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/jornada720_bl.c linux-2.6.31.7/drivers/video/backlight/jornada720_bl.c ---- linux-2.6.31.7/drivers/video/backlight/jornada720_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/jornada720_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/jornada720_bl.c linux-2.6.32/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32/drivers/video/backlight/jornada720_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/jornada720_bl.c 2009-12-04 21:40:48.421694480 -0500 @@ -93,7 +93,7 @@ out: return ret; } @@ -25610,9 +25742,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/jornada720_bl.c linux-2.6.31.7 .get_brightness = jornada_bl_get_brightness, .update_status = jornada_bl_update_status, .options = BL_CORE_SUSPENDRESUME, -diff -urNp linux-2.6.31.7/drivers/video/backlight/kb3886_bl.c linux-2.6.31.7/drivers/video/backlight/kb3886_bl.c ---- linux-2.6.31.7/drivers/video/backlight/kb3886_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/kb3886_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/kb3886_bl.c linux-2.6.32/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32/drivers/video/backlight/kb3886_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/kb3886_bl.c 2009-12-04 21:40:48.421694480 -0500 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct return kb3886bl_intensity; } @@ -25622,9 +25754,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/kb3886_bl.c linux-2.6.31.7/dri .get_brightness = kb3886bl_get_intensity, .update_status = kb3886bl_send_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/locomolcd.c linux-2.6.31.7/drivers/video/backlight/locomolcd.c ---- linux-2.6.31.7/drivers/video/backlight/locomolcd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/locomolcd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/locomolcd.c linux-2.6.32/drivers/video/backlight/locomolcd.c +--- linux-2.6.32/drivers/video/backlight/locomolcd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/locomolcd.c 2009-12-04 21:40:48.422639958 -0500 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc return current_intensity; } @@ -25634,9 +25766,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/locomolcd.c linux-2.6.31.7/dri .get_brightness = locomolcd_get_intensity, .update_status = locomolcd_set_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.31.7/drivers/video/backlight/mbp_nvidia_bl.c ---- linux-2.6.31.7/drivers/video/backlight/mbp_nvidia_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/mbp_nvidia_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.32/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32/drivers/video/backlight/mbp_nvidia_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/mbp_nvidia_bl.c 2009-12-04 21:40:48.422639958 -0500 @@ -33,7 +33,7 @@ struct dmi_match_data { unsigned long iostart; unsigned long iolen; @@ -25646,9 +25778,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/mbp_nvidia_bl.c linux-2.6.31.7 }; /* Module parameters. */ -diff -urNp linux-2.6.31.7/drivers/video/backlight/omap1_bl.c linux-2.6.31.7/drivers/video/backlight/omap1_bl.c ---- linux-2.6.31.7/drivers/video/backlight/omap1_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/omap1_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/omap1_bl.c linux-2.6.32/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32/drivers/video/backlight/omap1_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/omap1_bl.c 2009-12-04 21:40:48.422639958 -0500 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b return bl->current_intensity; } @@ -25658,9 +25790,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/omap1_bl.c linux-2.6.31.7/driv .get_brightness = omapbl_get_intensity, .update_status = omapbl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/progear_bl.c linux-2.6.31.7/drivers/video/backlight/progear_bl.c ---- linux-2.6.31.7/drivers/video/backlight/progear_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/progear_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/progear_bl.c linux-2.6.32/drivers/video/backlight/progear_bl.c +--- linux-2.6.32/drivers/video/backlight/progear_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/progear_bl.c 2009-12-04 21:40:48.422639958 -0500 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc return intensity - HW_LEVEL_MIN; } @@ -25670,9 +25802,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/progear_bl.c linux-2.6.31.7/dr .get_brightness = progearbl_get_intensity, .update_status = progearbl_set_intensity, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/pwm_bl.c linux-2.6.31.7/drivers/video/backlight/pwm_bl.c ---- linux-2.6.31.7/drivers/video/backlight/pwm_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/pwm_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/pwm_bl.c linux-2.6.32/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32/drivers/video/backlight/pwm_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/pwm_bl.c 2009-12-04 21:40:48.422639958 -0500 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( return bl->props.brightness; } @@ -25682,9 +25814,9 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/pwm_bl.c linux-2.6.31.7/driver .update_status = pwm_backlight_update_status, .get_brightness = pwm_backlight_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/video/backlight/tosa_bl.c linux-2.6.31.7/drivers/video/backlight/tosa_bl.c ---- linux-2.6.31.7/drivers/video/backlight/tosa_bl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/backlight/tosa_bl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/tosa_bl.c linux-2.6.32/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32/drivers/video/backlight/tosa_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/tosa_bl.c 2009-12-04 21:40:48.423667342 -0500 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct return props->brightness; } @@ -25694,9 +25826,21 @@ diff -urNp linux-2.6.31.7/drivers/video/backlight/tosa_bl.c linux-2.6.31.7/drive .get_brightness = tosa_bl_get_brightness, .update_status = tosa_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/bf54x-lq043fb.c linux-2.6.31.7/drivers/video/bf54x-lq043fb.c ---- linux-2.6.31.7/drivers/video/bf54x-lq043fb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/bf54x-lq043fb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/backlight/wm831x_bl.c linux-2.6.32/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32/drivers/video/backlight/wm831x_bl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/backlight/wm831x_bl.c 2009-12-04 21:40:48.423667342 -0500 +@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne + return data->current_brightness; + } + +-static struct backlight_ops wm831x_backlight_ops = { ++static const struct backlight_ops wm831x_backlight_ops = { + .options = BL_CORE_SUSPENDRESUME, + .update_status = wm831x_backlight_update_status, + .get_brightness = wm831x_backlight_get_brightness, +diff -urNp linux-2.6.32/drivers/video/bf54x-lq043fb.c linux-2.6.32/drivers/video/bf54x-lq043fb.c +--- linux-2.6.32/drivers/video/bf54x-lq043fb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/bf54x-lq043fb.c 2009-12-04 21:40:48.423667342 -0500 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct back return 0; } @@ -25706,9 +25850,9 @@ diff -urNp linux-2.6.31.7/drivers/video/bf54x-lq043fb.c linux-2.6.31.7/drivers/v .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.31.7/drivers/video/bfin-t350mcqb-fb.c ---- linux-2.6.31.7/drivers/video/bfin-t350mcqb-fb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/bfin-t350mcqb-fb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32/drivers/video/bfin-t350mcqb-fb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/bfin-t350mcqb-fb.c 2009-12-04 21:40:48.424705337 -0500 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct back return 0; } @@ -25718,21 +25862,9 @@ diff -urNp linux-2.6.31.7/drivers/video/bfin-t350mcqb-fb.c linux-2.6.31.7/driver .get_brightness = bl_get_brightness, }; -diff -urNp linux-2.6.31.7/drivers/video/fb_defio.c linux-2.6.31.7/drivers/video/fb_defio.c ---- linux-2.6.31.7/drivers/video/fb_defio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/fb_defio.c 2009-12-10 22:15:16.000000000 -0500 -@@ -125,7 +125,7 @@ page_already_added: - return 0; - } - --static struct vm_operations_struct fb_deferred_io_vm_ops = { -+static const struct vm_operations_struct fb_deferred_io_vm_ops = { - .fault = fb_deferred_io_fault, - .page_mkwrite = fb_deferred_io_mkwrite, - }; -diff -urNp linux-2.6.31.7/drivers/video/fbmem.c linux-2.6.31.7/drivers/video/fbmem.c ---- linux-2.6.31.7/drivers/video/fbmem.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/fbmem.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/fbmem.c linux-2.6.32/drivers/video/fbmem.c +--- linux-2.6.32/drivers/video/fbmem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/fbmem.c 2009-12-04 21:40:48.424705337 -0500 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } @@ -25751,7 +25883,7 @@ diff -urNp linux-2.6.31.7/drivers/video/fbmem.c linux-2.6.31.7/drivers/video/fbm info->fbops->fb_imageblit(info, image); image->dy -= image->height + 8; } -@@ -1108,7 +1108,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1119,7 +1119,7 @@ static long do_fb_ioctl(struct fb_info * return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; @@ -25760,9 +25892,9 @@ diff -urNp linux-2.6.31.7/drivers/video/fbmem.c linux-2.6.31.7/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.31.7/drivers/video/fbmon.c linux-2.6.31.7/drivers/video/fbmon.c ---- linux-2.6.31.7/drivers/video/fbmon.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/fbmon.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/fbmon.c linux-2.6.32/drivers/video/fbmon.c +--- linux-2.6.32/drivers/video/fbmon.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/fbmon.c 2009-12-04 21:40:48.425746684 -0500 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -25772,9 +25904,9 @@ diff -urNp linux-2.6.31.7/drivers/video/fbmon.c linux-2.6.31.7/drivers/video/fbm #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.31.7/drivers/video/i810/i810_accel.c linux-2.6.31.7/drivers/video/i810/i810_accel.c ---- linux-2.6.31.7/drivers/video/i810/i810_accel.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/i810/i810_accel.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/i810/i810_accel.c linux-2.6.32/drivers/video/i810/i810_accel.c +--- linux-2.6.32/drivers/video/i810/i810_accel.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/i810/i810_accel.c 2009-12-04 21:40:48.425746684 -0500 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -25783,9 +25915,9 @@ diff -urNp linux-2.6.31.7/drivers/video/i810/i810_accel.c linux-2.6.31.7/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.31.7/drivers/video/i810/i810_main.c linux-2.6.31.7/drivers/video/i810/i810_main.c ---- linux-2.6.31.7/drivers/video/i810/i810_main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/i810/i810_main.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/i810/i810_main.c linux-2.6.32/drivers/video/i810/i810_main.c +--- linux-2.6.32/drivers/video/i810/i810_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/i810/i810_main.c 2009-12-04 21:40:48.426747526 -0500 @@ -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, @@ -25795,9 +25927,9 @@ diff -urNp linux-2.6.31.7/drivers/video/i810/i810_main.c linux-2.6.31.7/drivers/ }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.31.7/drivers/video/modedb.c linux-2.6.31.7/drivers/video/modedb.c ---- linux-2.6.31.7/drivers/video/modedb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/modedb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/modedb.c linux-2.6.32/drivers/video/modedb.c +--- linux-2.6.32/drivers/video/modedb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/modedb.c 2009-12-04 21:40:48.436631994 -0500 @@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -26098,9 +26230,9 @@ diff -urNp linux-2.6.31.7/drivers/video/modedb.c linux-2.6.31.7/drivers/video/mo }, }; -diff -urNp linux-2.6.31.7/drivers/video/nvidia/nv_backlight.c linux-2.6.31.7/drivers/video/nvidia/nv_backlight.c ---- linux-2.6.31.7/drivers/video/nvidia/nv_backlight.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/nvidia/nv_backlight.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/nvidia/nv_backlight.c linux-2.6.32/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32/drivers/video/nvidia/nv_backlight.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/nvidia/nv_backlight.c 2009-12-04 21:40:48.436631994 -0500 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru return bd->props.brightness; } @@ -26110,21 +26242,9 @@ diff -urNp linux-2.6.31.7/drivers/video/nvidia/nv_backlight.c linux-2.6.31.7/dri .get_brightness = nvidia_bl_get_brightness, .update_status = nvidia_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/omap/dispc.c linux-2.6.31.7/drivers/video/omap/dispc.c ---- linux-2.6.31.7/drivers/video/omap/dispc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/omap/dispc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1013,7 +1013,7 @@ static void mmap_user_close(struct vm_ar - atomic_dec(&dispc.map_count[plane]); - } - --static struct vm_operations_struct mmap_user_ops = { -+static const struct vm_operations_struct mmap_user_ops = { - .open = mmap_user_open, - .close = mmap_user_close, - }; -diff -urNp linux-2.6.31.7/drivers/video/riva/fbdev.c linux-2.6.31.7/drivers/video/riva/fbdev.c ---- linux-2.6.31.7/drivers/video/riva/fbdev.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/riva/fbdev.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/riva/fbdev.c linux-2.6.32/drivers/video/riva/fbdev.c +--- linux-2.6.32/drivers/video/riva/fbdev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/riva/fbdev.c 2009-12-04 21:40:48.437614728 -0500 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct return bd->props.brightness; } @@ -26134,9 +26254,9 @@ diff -urNp linux-2.6.31.7/drivers/video/riva/fbdev.c linux-2.6.31.7/drivers/vide .get_brightness = riva_bl_get_brightness, .update_status = riva_bl_update_status, }; -diff -urNp linux-2.6.31.7/drivers/video/uvesafb.c linux-2.6.31.7/drivers/video/uvesafb.c ---- linux-2.6.31.7/drivers/video/uvesafb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/uvesafb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/uvesafb.c linux-2.6.32/drivers/video/uvesafb.c +--- linux-2.6.32/drivers/video/uvesafb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/uvesafb.c 2009-12-04 21:40:48.437614728 -0500 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -26187,7 +26307,7 @@ diff -urNp linux-2.6.31.7/drivers/video/uvesafb.c linux-2.6.31.7/drivers/video/u printk(KERN_INFO "uvesafb: protected mode interface info at " "%04x:%04x\n", (u16)task->t.regs.es, (u16)task->t.regs.edi); -@@ -1827,6 +1850,11 @@ out: +@@ -1799,6 +1822,11 @@ out: if (par->vbe_modes) kfree(par->vbe_modes); @@ -26199,7 +26319,7 @@ diff -urNp linux-2.6.31.7/drivers/video/uvesafb.c linux-2.6.31.7/drivers/video/u framebuffer_release(info); return err; } -@@ -1853,6 +1881,12 @@ static int uvesafb_remove(struct platfor +@@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platfor kfree(par->vbe_state_orig); if (par->vbe_state_saved) kfree(par->vbe_state_saved); @@ -26212,9 +26332,9 @@ diff -urNp linux-2.6.31.7/drivers/video/uvesafb.c linux-2.6.31.7/drivers/video/u } framebuffer_release(info); -diff -urNp linux-2.6.31.7/drivers/video/vesafb.c linux-2.6.31.7/drivers/video/vesafb.c ---- linux-2.6.31.7/drivers/video/vesafb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/video/vesafb.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/video/vesafb.c linux-2.6.32/drivers/video/vesafb.c +--- linux-2.6.32/drivers/video/vesafb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/video/vesafb.c 2009-12-04 21:40:48.438702797 -0500 @@ -9,6 +9,7 @@ */ @@ -26318,9 +26438,9 @@ diff -urNp linux-2.6.31.7/drivers/video/vesafb.c linux-2.6.31.7/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.31.7/drivers/xen/sys-hypervisor.c linux-2.6.31.7/drivers/xen/sys-hypervisor.c ---- linux-2.6.31.7/drivers/xen/sys-hypervisor.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/drivers/xen/sys-hypervisor.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/drivers/xen/sys-hypervisor.c linux-2.6.32/drivers/xen/sys-hypervisor.c +--- linux-2.6.32/drivers/xen/sys-hypervisor.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/drivers/xen/sys-hypervisor.c 2009-12-04 21:40:48.438702797 -0500 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko return 0; } @@ -26330,10 +26450,10 @@ diff -urNp linux-2.6.31.7/drivers/xen/sys-hypervisor.c linux-2.6.31.7/drivers/xe .show = hyp_sysfs_show, .store = hyp_sysfs_store, }; -diff -urNp linux-2.6.31.7/fs/9p/vfs_inode.c linux-2.6.31.7/fs/9p/vfs_inode.c ---- linux-2.6.31.7/fs/9p/vfs_inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/9p/vfs_inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1025,7 +1025,7 @@ static void *v9fs_vfs_follow_link(struct +diff -urNp linux-2.6.32/fs/9p/vfs_inode.c linux-2.6.32/fs/9p/vfs_inode.c +--- linux-2.6.32/fs/9p/vfs_inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/9p/vfs_inode.c 2009-12-04 21:40:48.439696375 -0500 +@@ -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) { @@ -26342,61 +26462,10 @@ diff -urNp linux-2.6.31.7/fs/9p/vfs_inode.c linux-2.6.31.7/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.31.7/fs/afs/flock.c linux-2.6.31.7/fs/afs/flock.c ---- linux-2.6.31.7/fs/afs/flock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/afs/flock.c 2009-12-10 22:15:16.000000000 -0500 -@@ -21,7 +21,7 @@ static void afs_fl_release_private(struc - static struct workqueue_struct *afs_lock_manager; - static DEFINE_MUTEX(afs_lock_manager_mutex); - --static struct file_lock_operations afs_lock_ops = { -+static const struct file_lock_operations afs_lock_ops = { - .fl_copy_lock = afs_fl_copy_lock, - .fl_release_private = afs_fl_release_private, - }; -diff -urNp linux-2.6.31.7/fs/afs/proc.c linux-2.6.31.7/fs/afs/proc.c ---- linux-2.6.31.7/fs/afs/proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/afs/proc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -28,7 +28,7 @@ static int afs_proc_cells_show(struct se - static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf, - size_t size, loff_t *_pos); - --static struct seq_operations afs_proc_cells_ops = { -+static const struct seq_operations afs_proc_cells_ops = { - .start = afs_proc_cells_start, - .next = afs_proc_cells_next, - .stop = afs_proc_cells_stop, -@@ -70,7 +70,7 @@ static void *afs_proc_cell_volumes_next( - static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v); - static int afs_proc_cell_volumes_show(struct seq_file *m, void *v); - --static struct seq_operations afs_proc_cell_volumes_ops = { -+static const struct seq_operations afs_proc_cell_volumes_ops = { - .start = afs_proc_cell_volumes_start, - .next = afs_proc_cell_volumes_next, - .stop = afs_proc_cell_volumes_stop, -@@ -95,7 +95,7 @@ static void *afs_proc_cell_vlservers_nex - static void afs_proc_cell_vlservers_stop(struct seq_file *p, void *v); - static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v); - --static struct seq_operations afs_proc_cell_vlservers_ops = { -+static const struct seq_operations afs_proc_cell_vlservers_ops = { - .start = afs_proc_cell_vlservers_start, - .next = afs_proc_cell_vlservers_next, - .stop = afs_proc_cell_vlservers_stop, -@@ -119,7 +119,7 @@ static void *afs_proc_cell_servers_next( - static void afs_proc_cell_servers_stop(struct seq_file *p, void *v); - static int afs_proc_cell_servers_show(struct seq_file *m, void *v); - --static struct seq_operations afs_proc_cell_servers_ops = { -+static const struct seq_operations afs_proc_cell_servers_ops = { - .start = afs_proc_cell_servers_start, - .next = afs_proc_cell_servers_next, - .stop = afs_proc_cell_servers_stop, -diff -urNp linux-2.6.31.7/fs/aio.c linux-2.6.31.7/fs/aio.c ---- linux-2.6.31.7/fs/aio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/aio.c 2009-12-10 22:15:16.000000000 -0500 -@@ -114,7 +114,7 @@ static int aio_setup_ring(struct kioctx +diff -urNp linux-2.6.32/fs/aio.c linux-2.6.32/fs/aio.c +--- linux-2.6.32/fs/aio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/aio.c 2009-12-04 21:40:48.440635707 -0500 +@@ -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; @@ -26405,9 +26474,20 @@ diff -urNp linux-2.6.31.7/fs/aio.c linux-2.6.31.7/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.31.7/fs/autofs/root.c linux-2.6.31.7/fs/autofs/root.c ---- linux-2.6.31.7/fs/autofs/root.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/autofs/root.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/attr.c linux-2.6.32/fs/attr.c +--- linux-2.6.32/fs/attr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/attr.c 2009-12-04 21:01:56.020792154 -0500 +@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode + unsigned long limit; + + limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; ++ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1); + if (limit != RLIM_INFINITY && offset > limit) + goto out_sig; + if (offset > inode->i_sb->s_maxbytes) +diff -urNp linux-2.6.32/fs/autofs/root.c linux-2.6.32/fs/autofs/root.c +--- linux-2.6.32/fs/autofs/root.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/autofs/root.c 2009-12-04 21:40:48.440635707 -0500 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; @@ -26418,9 +26498,9 @@ diff -urNp linux-2.6.31.7/fs/autofs/root.c linux-2.6.31.7/fs/autofs/root.c if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.31.7/fs/autofs4/symlink.c linux-2.6.31.7/fs/autofs4/symlink.c ---- linux-2.6.31.7/fs/autofs4/symlink.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/autofs4/symlink.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/autofs4/symlink.c linux-2.6.32/fs/autofs4/symlink.c +--- linux-2.6.32/fs/autofs4/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/autofs4/symlink.c 2009-12-04 21:40:48.441749957 -0500 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -26430,9 +26510,9 @@ diff -urNp linux-2.6.31.7/fs/autofs4/symlink.c linux-2.6.31.7/fs/autofs4/symlink return NULL; } -diff -urNp linux-2.6.31.7/fs/befs/linuxvfs.c linux-2.6.31.7/fs/befs/linuxvfs.c ---- linux-2.6.31.7/fs/befs/linuxvfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/befs/linuxvfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/befs/linuxvfs.c linux-2.6.32/fs/befs/linuxvfs.c +--- linux-2.6.32/fs/befs/linuxvfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/befs/linuxvfs.c 2009-12-04 21:40:48.441749957 -0500 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -26442,9 +26522,9 @@ diff -urNp linux-2.6.31.7/fs/befs/linuxvfs.c linux-2.6.31.7/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.31.7/fs/binfmt_aout.c linux-2.6.31.7/fs/binfmt_aout.c ---- linux-2.6.31.7/fs/binfmt_aout.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/binfmt_aout.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/binfmt_aout.c linux-2.6.32/fs/binfmt_aout.c +--- linux-2.6.32/fs/binfmt_aout.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/binfmt_aout.c 2009-12-04 21:40:48.442699810 -0500 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -26512,9 +26592,9 @@ diff -urNp linux-2.6.31.7/fs/binfmt_aout.c linux-2.6.31.7/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c ---- linux-2.6.31.7/fs/binfmt_elf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/binfmt_elf.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/binfmt_elf.c linux-2.6.32/fs/binfmt_elf.c +--- linux-2.6.32/fs/binfmt_elf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/binfmt_elf.c 2009-12-05 12:28:00.334059142 -0500 @@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -27007,10 +27087,10 @@ diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c - goto end_coredump; + goto end_coredump; \ + } while (0); - #define DUMP_SEEK(off) \ - if (!dump_seek(file, (off))) \ - goto end_coredump; -@@ -1411,9 +1702,9 @@ static void fill_auxv_note(struct memelf + + static void fill_elf_header(struct elfhdr *elf, int segs, + u16 machine, u32 flags, u8 osabi) +@@ -1408,9 +1699,9 @@ static void fill_auxv_note(struct memelf { elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv; int i = 0; @@ -27022,7 +27102,7 @@ diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } -@@ -1991,7 +2282,7 @@ static int elf_core_dump(long signr, str +@@ -1996,7 +2287,7 @@ static int elf_core_dump(long signr, str phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -27031,7 +27111,7 @@ diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c phdr.p_memsz = vma->vm_end - vma->vm_start; offset += phdr.p_filesz; phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; -@@ -2023,7 +2314,7 @@ static int elf_core_dump(long signr, str +@@ -2029,7 +2320,7 @@ static int elf_core_dump(long signr, str unsigned long addr; unsigned long end; @@ -27040,15 +27120,15 @@ diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2043,6 +2334,7 @@ static int elf_core_dump(long signr, str - flush_cache_page(tmp_vma, addr, - page_to_pfn(page)); - kaddr = kmap(page); -+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1); - if ((size += PAGE_SIZE) > limit || - !dump_write(file, kaddr, - PAGE_SIZE)) { -@@ -2073,6 +2365,97 @@ out: +@@ -2038,6 +2329,7 @@ static int elf_core_dump(long signr, str + page = get_dump_page(addr); + if (page) { + void *kaddr = kmap(page); ++ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1); + stop = ((size += PAGE_SIZE) > limit) || + !dump_write(file, kaddr, PAGE_SIZE); + kunmap(page); +@@ -2065,6 +2357,97 @@ out: #endif /* USE_ELF_CORE_DUMP */ @@ -27146,10 +27226,10 @@ diff -urNp linux-2.6.31.7/fs/binfmt_elf.c linux-2.6.31.7/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.31.7/fs/binfmt_flat.c linux-2.6.31.7/fs/binfmt_flat.c ---- linux-2.6.31.7/fs/binfmt_flat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/binfmt_flat.c 2009-12-10 22:15:16.000000000 -0500 -@@ -565,7 +565,9 @@ static int load_flat_file(struct linux_b +diff -urNp linux-2.6.32/fs/binfmt_flat.c linux-2.6.32/fs/binfmt_flat.c +--- linux-2.6.32/fs/binfmt_flat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/binfmt_flat.c 2009-12-04 21:40:48.444658538 -0500 +@@ -563,7 +563,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", (int)-realdatastart); @@ -27159,9 +27239,9 @@ diff -urNp linux-2.6.31.7/fs/binfmt_flat.c linux-2.6.31.7/fs/binfmt_flat.c ret = realdatastart; goto err; } -@@ -589,8 +591,10 @@ static int load_flat_file(struct linux_b +@@ -587,8 +589,10 @@ static int load_flat_file(struct linux_b } - if (result >= (unsigned long)-4096) { + if (IS_ERR_VALUE(result)) { printk("Unable to read data+bss, errno %d\n", (int)-result); + down_write(¤t->mm->mmap_sem); do_munmap(current->mm, textpos, text_len); @@ -27170,9 +27250,9 @@ diff -urNp linux-2.6.31.7/fs/binfmt_flat.c linux-2.6.31.7/fs/binfmt_flat.c ret = result; goto err; } -@@ -659,8 +663,10 @@ static int load_flat_file(struct linux_b +@@ -657,8 +661,10 @@ static int load_flat_file(struct linux_b } - if (result >= (unsigned long)-4096) { + if (IS_ERR_VALUE(result)) { printk("Unable to read code+data+bss, errno %d\n",(int)-result); + down_write(¤t->mm->mmap_sem); do_munmap(current->mm, textpos, text_len + data_len + extra + @@ -27181,9 +27261,9 @@ diff -urNp linux-2.6.31.7/fs/binfmt_flat.c linux-2.6.31.7/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.31.7/fs/binfmt_misc.c linux-2.6.31.7/fs/binfmt_misc.c ---- linux-2.6.31.7/fs/binfmt_misc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/binfmt_misc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/binfmt_misc.c linux-2.6.32/fs/binfmt_misc.c +--- linux-2.6.32/fs/binfmt_misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/binfmt_misc.c 2009-12-04 21:40:48.444658538 -0500 @@ -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}, @@ -27193,9 +27273,9 @@ diff -urNp linux-2.6.31.7/fs/binfmt_misc.c linux-2.6.31.7/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.31.7/fs/bio.c linux-2.6.31.7/fs/bio.c ---- linux-2.6.31.7/fs/bio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/bio.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/bio.c linux-2.6.32/fs/bio.c +--- linux-2.6.32/fs/bio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/bio.c 2009-12-04 21:40:48.444658538 -0500 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr i = 0; @@ -27205,7 +27285,7 @@ diff -urNp linux-2.6.31.7/fs/bio.c linux-2.6.31.7/fs/bio.c if (!bslab->slab && entry == -1) entry = i; -@@ -1196,7 +1196,7 @@ static void bio_copy_kern_endio(struct b +@@ -1212,7 +1212,7 @@ static void bio_copy_kern_endio(struct b const int read = bio_data_dir(bio) == READ; struct bio_map_data *bmd = bio->bi_private; int i; @@ -27214,10 +27294,10 @@ diff -urNp linux-2.6.31.7/fs/bio.c linux-2.6.31.7/fs/bio.c __bio_for_each_segment(bvec, bio, i, 0) { char *addr = page_address(bvec->bv_page); -diff -urNp linux-2.6.31.7/fs/btrfs/ctree.c linux-2.6.31.7/fs/btrfs/ctree.c ---- linux-2.6.31.7/fs/btrfs/ctree.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/ctree.c 2009-12-10 22:15:16.000000000 -0500 -@@ -3562,7 +3562,6 @@ setup_items_for_insert(struct btrfs_tran +diff -urNp linux-2.6.32/fs/btrfs/ctree.c linux-2.6.32/fs/btrfs/ctree.c +--- linux-2.6.32/fs/btrfs/ctree.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/ctree.c 2009-12-04 21:40:48.447719247 -0500 +@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran ret = 0; if (slot == 0) { @@ -27225,55 +27305,94 @@ diff -urNp linux-2.6.31.7/fs/btrfs/ctree.c linux-2.6.31.7/fs/btrfs/ctree.c btrfs_cpu_key_to_disk(&disk_key, cpu_key); ret = fixup_low_keys(trans, root, path, &disk_key, 1); } -diff -urNp linux-2.6.31.7/fs/btrfs/ctree.h linux-2.6.31.7/fs/btrfs/ctree.h ---- linux-2.6.31.7/fs/btrfs/ctree.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/ctree.h 2009-12-10 22:15:16.000000000 -0500 -@@ -2286,7 +2286,7 @@ int btrfs_sync_file(struct file *file, s - int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, - int skip_pinned); - int btrfs_check_file(struct btrfs_root *root, struct inode *inode); --extern struct file_operations btrfs_file_operations; -+extern const struct file_operations btrfs_file_operations; - int btrfs_drop_extents(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct inode *inode, - u64 start, u64 end, u64 locked_end, -diff -urNp linux-2.6.31.7/fs/btrfs/disk-io.c linux-2.6.31.7/fs/btrfs/disk-io.c ---- linux-2.6.31.7/fs/btrfs/disk-io.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/disk-io.c 2009-12-10 22:15:16.000000000 -0500 -@@ -772,7 +772,7 @@ static void btree_invalidatepage(struct - } - } - --static struct address_space_operations btree_aops = { -+static const struct address_space_operations btree_aops = { - .readpage = btree_readpage, - .writepage = btree_writepage, - .writepages = btree_writepages, -diff -urNp linux-2.6.31.7/fs/btrfs/file.c linux-2.6.31.7/fs/btrfs/file.c ---- linux-2.6.31.7/fs/btrfs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1203,7 +1203,7 @@ out: - return ret > 0 ? EIO : ret; - } - --static struct vm_operations_struct btrfs_file_vm_ops = { -+static const struct vm_operations_struct btrfs_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = btrfs_page_mkwrite, - }; -@@ -1215,7 +1215,7 @@ static int btrfs_file_mmap(struct file * +diff -urNp linux-2.6.32/fs/btrfs/disk-io.c linux-2.6.32/fs/btrfs/disk-io.c +--- linux-2.6.32/fs/btrfs/disk-io.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/disk-io.c 2009-12-04 21:40:48.448635968 -0500 +@@ -39,7 +39,7 @@ + #include "tree-log.h" + #include "free-space-cache.h" + +-static struct extent_io_ops btree_extent_io_ops; ++static const struct extent_io_ops btree_extent_io_ops; + static void end_workqueue_fn(struct btrfs_work *work); + static void free_fs_root(struct btrfs_root *root); + +@@ -2585,7 +2585,7 @@ out: return 0; } --struct file_operations btrfs_file_operations = { -+const struct file_operations btrfs_file_operations = { - .llseek = generic_file_llseek, - .read = do_sync_read, - .aio_read = generic_file_aio_read, -diff -urNp linux-2.6.31.7/fs/btrfs/free-space-cache.c linux-2.6.31.7/fs/btrfs/free-space-cache.c ---- linux-2.6.31.7/fs/btrfs/free-space-cache.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/free-space-cache.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1066,8 +1066,6 @@ u64 btrfs_alloc_from_cluster(struct btrf +-static struct extent_io_ops btree_extent_io_ops = { ++static const struct extent_io_ops btree_extent_io_ops = { + .write_cache_pages_lock_hook = btree_lock_page_hook, + .readpage_end_io_hook = btree_readpage_end_io_hook, + .submit_bio_hook = btree_submit_bio_hook, +diff -urNp linux-2.6.32/fs/btrfs/extent_io.h linux-2.6.32/fs/btrfs/extent_io.h +--- linux-2.6.32/fs/btrfs/extent_io.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/extent_io.h 2009-12-04 21:40:48.448635968 -0500 +@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s + struct bio *bio, int mirror_num, + unsigned long bio_flags); + struct extent_io_ops { +- int (*fill_delalloc)(struct inode *inode, struct page *locked_page, ++ int (* const fill_delalloc)(struct inode *inode, struct page *locked_page, + u64 start, u64 end, int *page_started, + unsigned long *nr_written); +- int (*writepage_start_hook)(struct page *page, u64 start, u64 end); +- int (*writepage_io_hook)(struct page *page, u64 start, u64 end); ++ int (* const writepage_start_hook)(struct page *page, u64 start, u64 end); ++ int (* const writepage_io_hook)(struct page *page, u64 start, u64 end); + extent_submit_bio_hook_t *submit_bio_hook; +- int (*merge_bio_hook)(struct page *page, unsigned long offset, ++ int (* const merge_bio_hook)(struct page *page, unsigned long offset, + size_t size, struct bio *bio, + unsigned long bio_flags); +- int (*readpage_io_hook)(struct page *page, u64 start, u64 end); +- int (*readpage_io_failed_hook)(struct bio *bio, struct page *page, ++ int (* const readpage_io_hook)(struct page *page, u64 start, u64 end); ++ int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page, + u64 start, u64 end, + struct extent_state *state); +- int (*writepage_io_failed_hook)(struct bio *bio, struct page *page, ++ int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page, + u64 start, u64 end, + struct extent_state *state); +- int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end, ++ int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end, + struct extent_state *state); +- int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end, ++ int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end, + struct extent_state *state, int uptodate); +- int (*set_bit_hook)(struct inode *inode, u64 start, u64 end, ++ int (* const set_bit_hook)(struct inode *inode, u64 start, u64 end, + unsigned long old, unsigned long bits); +- int (*clear_bit_hook)(struct inode *inode, struct extent_state *state, ++ int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state, + unsigned long bits); +- int (*merge_extent_hook)(struct inode *inode, ++ int (* const merge_extent_hook)(struct inode *inode, + struct extent_state *new, + struct extent_state *other); +- int (*split_extent_hook)(struct inode *inode, ++ int (* const split_extent_hook)(struct inode *inode, + struct extent_state *orig, u64 split); +- int (*write_cache_pages_lock_hook)(struct page *page); ++ int (* const write_cache_pages_lock_hook)(struct page *page); + }; + + struct extent_io_tree { +@@ -88,7 +88,7 @@ struct extent_io_tree { + u64 dirty_bytes; + spinlock_t lock; + spinlock_t buffer_lock; +- struct extent_io_ops *ops; ++ const struct extent_io_ops *ops; + }; + + struct extent_state { +diff -urNp linux-2.6.32/fs/btrfs/free-space-cache.c linux-2.6.32/fs/btrfs/free-space-cache.c +--- linux-2.6.32/fs/btrfs/free-space-cache.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/free-space-cache.c 2009-12-04 21:40:48.449750176 -0500 +@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf while(1) { if (entry->bytes < bytes || entry->offset < min_start) { @@ -27282,7 +27401,7 @@ diff -urNp linux-2.6.31.7/fs/btrfs/free-space-cache.c linux-2.6.31.7/fs/btrfs/fr node = rb_next(&entry->offset_index); if (!node) break; -@@ -1218,7 +1216,7 @@ again: +@@ -1226,7 +1224,7 @@ again: */ while (entry->bitmap || found_bitmap || (!entry->bitmap && entry->bytes < min_bytes)) { @@ -27291,123 +27410,30 @@ diff -urNp linux-2.6.31.7/fs/btrfs/free-space-cache.c linux-2.6.31.7/fs/btrfs/fr if (entry->bitmap && entry->bytes > bytes + empty_size) { ret = btrfs_bitmap_cluster(block_group, entry, cluster, -diff -urNp linux-2.6.31.7/fs/btrfs/inode.c linux-2.6.31.7/fs/btrfs/inode.c ---- linux-2.6.31.7/fs/btrfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -55,14 +55,14 @@ struct btrfs_iget_args { - struct btrfs_root *root; - }; - --static struct inode_operations btrfs_dir_inode_operations; --static struct inode_operations btrfs_symlink_inode_operations; --static struct inode_operations btrfs_dir_ro_inode_operations; --static struct inode_operations btrfs_special_inode_operations; --static struct inode_operations btrfs_file_inode_operations; --static struct address_space_operations btrfs_aops; --static struct address_space_operations btrfs_symlink_aops; --static struct file_operations btrfs_dir_file_operations; -+static const struct inode_operations btrfs_dir_inode_operations; -+static const struct inode_operations btrfs_symlink_inode_operations; -+static const struct inode_operations btrfs_dir_ro_inode_operations; -+static const struct inode_operations btrfs_special_inode_operations; -+static const struct inode_operations btrfs_file_inode_operations; -+static const struct address_space_operations btrfs_aops; -+static const struct address_space_operations btrfs_symlink_aops; -+static const struct file_operations btrfs_dir_file_operations; - static struct extent_io_ops btrfs_extent_io_ops; +diff -urNp linux-2.6.32/fs/btrfs/inode.c linux-2.6.32/fs/btrfs/inode.c +--- linux-2.6.32/fs/btrfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/inode.c 2009-12-04 21:40:48.451640908 -0500 +@@ -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; + static const struct file_operations btrfs_dir_file_operations; +-static struct extent_io_ops btrfs_extent_io_ops; ++static const struct extent_io_ops btrfs_extent_io_ops; static struct kmem_cache *btrfs_inode_cachep; -@@ -5201,7 +5201,7 @@ static int btrfs_permission(struct inode - return generic_permission(inode, mask, btrfs_check_acl); - } - --static struct inode_operations btrfs_dir_inode_operations = { -+static const struct inode_operations btrfs_dir_inode_operations = { - .getattr = btrfs_getattr, - .lookup = btrfs_lookup, - .create = btrfs_create, -@@ -5219,11 +5219,11 @@ static struct inode_operations btrfs_dir - .removexattr = btrfs_removexattr, - .permission = btrfs_permission, - }; --static struct inode_operations btrfs_dir_ro_inode_operations = { -+static const struct inode_operations btrfs_dir_ro_inode_operations = { - .lookup = btrfs_lookup, - .permission = btrfs_permission, - }; --static struct file_operations btrfs_dir_file_operations = { -+static const struct file_operations btrfs_dir_file_operations = { - .llseek = generic_file_llseek, - .read = generic_read_dir, - .readdir = btrfs_real_readdir, -@@ -5259,7 +5259,7 @@ static struct extent_io_ops btrfs_extent - * - * For now we're avoiding this by dropping bmap. - */ --static struct address_space_operations btrfs_aops = { -+static const struct address_space_operations btrfs_aops = { - .readpage = btrfs_readpage, - .writepage = btrfs_writepage, - .writepages = btrfs_writepages, -@@ -5271,14 +5271,14 @@ static struct address_space_operations b - .set_page_dirty = btrfs_set_page_dirty, - }; - --static struct address_space_operations btrfs_symlink_aops = { -+static const struct address_space_operations btrfs_symlink_aops = { - .readpage = btrfs_readpage, - .writepage = btrfs_writepage, - .invalidatepage = btrfs_invalidatepage, - .releasepage = btrfs_releasepage, - }; - --static struct inode_operations btrfs_file_inode_operations = { -+static const struct inode_operations btrfs_file_inode_operations = { - .truncate = btrfs_truncate, - .getattr = btrfs_getattr, - .setattr = btrfs_setattr, -@@ -5290,7 +5290,7 @@ static struct inode_operations btrfs_fil - .fallocate = btrfs_fallocate, - .fiemap = btrfs_fiemap, - }; --static struct inode_operations btrfs_special_inode_operations = { -+static const struct inode_operations btrfs_special_inode_operations = { - .getattr = btrfs_getattr, - .setattr = btrfs_setattr, - .permission = btrfs_permission, -@@ -5299,7 +5299,7 @@ static struct inode_operations btrfs_spe - .listxattr = btrfs_listxattr, - .removexattr = btrfs_removexattr, - }; --static struct inode_operations btrfs_symlink_inode_operations = { -+static const struct inode_operations btrfs_symlink_inode_operations = { - .readlink = generic_readlink, - .follow_link = page_follow_link_light, - .put_link = page_put_link, -diff -urNp linux-2.6.31.7/fs/btrfs/super.c linux-2.6.31.7/fs/btrfs/super.c ---- linux-2.6.31.7/fs/btrfs/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -51,7 +51,7 @@ - #include "export.h" - #include "compression.h" - --static struct super_operations btrfs_super_ops; -+static const struct super_operations btrfs_super_ops; - - static void btrfs_put_super(struct super_block *sb) - { -@@ -675,7 +675,7 @@ static int btrfs_unfreeze(struct super_b - return 0; - } - --static struct super_operations btrfs_super_ops = { -+static const struct super_operations btrfs_super_ops = { - .delete_inode = btrfs_delete_inode, - .put_super = btrfs_put_super, - .sync_fs = btrfs_sync_fs, -diff -urNp linux-2.6.31.7/fs/btrfs/sysfs.c linux-2.6.31.7/fs/btrfs/sysfs.c ---- linux-2.6.31.7/fs/btrfs/sysfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/btrfs/sysfs.c 2009-12-10 22:15:16.000000000 -0500 + struct kmem_cache *btrfs_trans_handle_cachep; +@@ -5854,7 +5854,7 @@ static const struct file_operations btrf + .fsync = btrfs_sync_file, + }; + +-static struct extent_io_ops btrfs_extent_io_ops = { ++static const struct extent_io_ops btrfs_extent_io_ops = { + .fill_delalloc = run_delalloc_range, + .submit_bio_hook = btrfs_submit_bio_hook, + .merge_bio_hook = btrfs_merge_bio_hook, +diff -urNp linux-2.6.32/fs/btrfs/sysfs.c linux-2.6.32/fs/btrfs/sysfs.c +--- linux-2.6.32/fs/btrfs/sysfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/btrfs/sysfs.c 2009-12-04 21:40:48.451640908 -0500 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko complete(&root->kobj_unregister); } @@ -27423,9 +27449,9 @@ diff -urNp linux-2.6.31.7/fs/btrfs/sysfs.c linux-2.6.31.7/fs/btrfs/sysfs.c .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, }; -diff -urNp linux-2.6.31.7/fs/buffer.c linux-2.6.31.7/fs/buffer.c ---- linux-2.6.31.7/fs/buffer.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/buffer.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/buffer.c linux-2.6.32/fs/buffer.c +--- linux-2.6.32/fs/buffer.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/buffer.c 2009-12-04 20:41:38.680702831 -0500 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -27434,41 +27460,21 @@ diff -urNp linux-2.6.31.7/fs/buffer.c linux-2.6.31.7/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -@@ -2233,6 +2234,7 @@ int generic_cont_expand_simple(struct in - - err = -EFBIG; - limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; -+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long) size, 1); - if (limit != RLIM_INFINITY && size > (loff_t)limit) { - send_sig(SIGXFSZ, current, 0); - goto out; -diff -urNp linux-2.6.31.7/fs/cachefiles/rdwr.c linux-2.6.31.7/fs/cachefiles/rdwr.c ---- linux-2.6.31.7/fs/cachefiles/rdwr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/cachefiles/rdwr.c 2009-12-10 22:15:16.000000000 -0500 -@@ -839,7 +839,7 @@ int cachefiles_write_page(struct fscache +diff -urNp linux-2.6.32/fs/cachefiles/rdwr.c linux-2.6.32/fs/cachefiles/rdwr.c +--- linux-2.6.32/fs/cachefiles/rdwr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/cachefiles/rdwr.c 2009-12-04 21:40:48.452681465 -0500 +@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache old_fs = get_fs(); set_fs(KERNEL_DS); ret = file->f_op->write( -- file, (const void __user *) data, PAGE_SIZE, -+ file, (__force const void __user *) data, PAGE_SIZE, - &pos); +- file, (const void __user *) data, len, &pos); ++ file, (__force const void __user *) data, len, &pos); set_fs(old_fs); kunmap(page); -diff -urNp linux-2.6.31.7/fs/cifs/cifs_dfs_ref.c linux-2.6.31.7/fs/cifs/cifs_dfs_ref.c ---- linux-2.6.31.7/fs/cifs/cifs_dfs_ref.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/cifs/cifs_dfs_ref.c 2009-12-10 22:15:16.000000000 -0500 -@@ -385,7 +385,7 @@ out_err: - goto out; - } - --struct inode_operations cifs_dfs_referral_inode_operations = { -+const struct inode_operations cifs_dfs_referral_inode_operations = { - .follow_link = cifs_dfs_follow_mountpoint, - }; - -diff -urNp linux-2.6.31.7/fs/cifs/cifs_uniupr.h linux-2.6.31.7/fs/cifs/cifs_uniupr.h ---- linux-2.6.31.7/fs/cifs/cifs_uniupr.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/cifs/cifs_uniupr.h 2009-12-10 22:15:16.000000000 -0500 + if (ret != len) +diff -urNp linux-2.6.32/fs/cifs/cifs_uniupr.h linux-2.6.32/fs/cifs/cifs_uniupr.h +--- linux-2.6.32/fs/cifs/cifs_uniupr.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/cifs/cifs_uniupr.h 2009-12-04 21:40:48.452681465 -0500 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -27478,21 +27484,9 @@ diff -urNp linux-2.6.31.7/fs/cifs/cifs_uniupr.h linux-2.6.31.7/fs/cifs/cifs_uniu }; #endif -diff -urNp linux-2.6.31.7/fs/cifs/cifsfs.h linux-2.6.31.7/fs/cifs/cifsfs.h ---- linux-2.6.31.7/fs/cifs/cifsfs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/cifs/cifsfs.h 2009-12-10 22:15:16.000000000 -0500 -@@ -67,7 +67,7 @@ extern int cifs_setattr(struct dentry *, - - extern const struct inode_operations cifs_file_inode_ops; - extern const struct inode_operations cifs_symlink_inode_ops; --extern struct inode_operations cifs_dfs_referral_inode_operations; -+extern const struct inode_operations cifs_dfs_referral_inode_operations; - - - /* Functions related to files and directories */ -diff -urNp linux-2.6.31.7/fs/cifs/link.c linux-2.6.31.7/fs/cifs/link.c ---- linux-2.6.31.7/fs/cifs/link.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/cifs/link.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/cifs/link.c linux-2.6.32/fs/cifs/link.c +--- linux-2.6.32/fs/cifs/link.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/cifs/link.c 2009-12-04 21:40:48.452681465 -0500 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) @@ -27502,10 +27496,26 @@ diff -urNp linux-2.6.31.7/fs/cifs/link.c linux-2.6.31.7/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c ---- linux-2.6.31.7/fs/compat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/compat.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1417,14 +1417,12 @@ static int compat_copy_strings(int argc, +diff -urNp linux-2.6.32/fs/compat_binfmt_elf.c linux-2.6.32/fs/compat_binfmt_elf.c +--- linux-2.6.32/fs/compat_binfmt_elf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/compat_binfmt_elf.c 2009-12-04 21:40:48.454614392 -0500 +@@ -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/fs/compat.c linux-2.6.32/fs/compat.c +--- linux-2.6.32/fs/compat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/compat.c 2009-12-04 21:40:48.453655476 -0500 +@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -27520,7 +27530,7 @@ diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c ret = get_user_pages(current, bprm->mm, pos, 1, 1, 1, &page, NULL); if (ret <= 0) { -@@ -1470,6 +1468,11 @@ int compat_do_execve(char * filename, +@@ -1463,6 +1461,11 @@ int compat_do_execve(char * filename, compat_uptr_t __user *envp, struct pt_regs * regs) { @@ -27532,7 +27542,7 @@ diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1506,6 +1509,14 @@ int compat_do_execve(char * filename, +@@ -1499,6 +1502,14 @@ int compat_do_execve(char * filename, bprm->filename = filename; bprm->interp = filename; @@ -27547,7 +27557,7 @@ diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1535,9 +1546,40 @@ int compat_do_execve(char * filename, +@@ -1528,9 +1539,40 @@ int compat_do_execve(char * filename, if (retval < 0) goto out; @@ -27587,9 +27597,9 @@ diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c + fput(old_exec_file); +#endif - /* execve succeeded */ - current->fs->in_exec = 0; -@@ -1548,6 +1590,14 @@ int compat_do_execve(char * filename, + current->stack_start = current->mm->start_stack; + +@@ -1543,6 +1585,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; @@ -27604,25 +27614,9 @@ diff -urNp linux-2.6.31.7/fs/compat.c linux-2.6.31.7/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.31.7/fs/compat_binfmt_elf.c linux-2.6.31.7/fs/compat_binfmt_elf.c ---- linux-2.6.31.7/fs/compat_binfmt_elf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/compat_binfmt_elf.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/fs/compat_ioctl.c linux-2.6.31.7/fs/compat_ioctl.c ---- linux-2.6.31.7/fs/compat_ioctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/compat_ioctl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/compat_ioctl.c linux-2.6.32/fs/compat_ioctl.c +--- linux-2.6.32/fs/compat_ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/compat_ioctl.c 2009-12-04 21:40:48.455647701 -0500 @@ -1827,15 +1827,15 @@ struct ioctl_trans { }; @@ -27642,9 +27636,9 @@ diff -urNp linux-2.6.31.7/fs/compat_ioctl.c linux-2.6.31.7/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.31.7/fs/debugfs/inode.c linux-2.6.31.7/fs/debugfs/inode.c ---- linux-2.6.31.7/fs/debugfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/debugfs/inode.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/debugfs/inode.c linux-2.6.32/fs/debugfs/inode.c +--- linux-2.6.32/fs/debugfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/debugfs/inode.c 2009-12-04 21:40:48.456696682 -0500 @@ -118,7 +118,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) @@ -27654,50 +27648,9 @@ diff -urNp linux-2.6.31.7/fs/debugfs/inode.c linux-2.6.31.7/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.31.7/fs/dlm/debug_fs.c linux-2.6.31.7/fs/dlm/debug_fs.c ---- linux-2.6.31.7/fs/dlm/debug_fs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/dlm/debug_fs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -386,9 +386,9 @@ static int table_seq_show(struct seq_fil - return rv; - } - --static struct seq_operations format1_seq_ops; --static struct seq_operations format2_seq_ops; --static struct seq_operations format3_seq_ops; -+static const struct seq_operations format1_seq_ops; -+static const struct seq_operations format2_seq_ops; -+static const struct seq_operations format3_seq_ops; - - static void *table_seq_start(struct seq_file *seq, loff_t *pos) - { -@@ -534,21 +534,21 @@ static void table_seq_stop(struct seq_fi - } - } - --static struct seq_operations format1_seq_ops = { -+static const struct seq_operations format1_seq_ops = { - .start = table_seq_start, - .next = table_seq_next, - .stop = table_seq_stop, - .show = table_seq_show, - }; - --static struct seq_operations format2_seq_ops = { -+static const struct seq_operations format2_seq_ops = { - .start = table_seq_start, - .next = table_seq_next, - .stop = table_seq_stop, - .show = table_seq_show, - }; - --static struct seq_operations format3_seq_ops = { -+static const struct seq_operations format3_seq_ops = { - .start = table_seq_start, - .next = table_seq_next, - .stop = table_seq_stop, -diff -urNp linux-2.6.31.7/fs/dlm/lockspace.c linux-2.6.31.7/fs/dlm/lockspace.c ---- linux-2.6.31.7/fs/dlm/lockspace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/dlm/lockspace.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/dlm/lockspace.c linux-2.6.32/fs/dlm/lockspace.c +--- linux-2.6.32/fs/dlm/lockspace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/dlm/lockspace.c 2009-12-04 21:40:48.456696682 -0500 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc kfree(ls); } @@ -27707,21 +27660,9 @@ diff -urNp linux-2.6.31.7/fs/dlm/lockspace.c linux-2.6.31.7/fs/dlm/lockspace.c .show = dlm_attr_show, .store = dlm_attr_store, }; -diff -urNp linux-2.6.31.7/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.31.7/fs/ecryptfs/ecryptfs_kernel.h ---- linux-2.6.31.7/fs/ecryptfs/ecryptfs_kernel.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ecryptfs/ecryptfs_kernel.h 2009-12-10 22:15:16.000000000 -0500 -@@ -582,7 +582,7 @@ extern const struct inode_operations ecr - extern const struct inode_operations ecryptfs_symlink_iops; - extern const struct super_operations ecryptfs_sops; - extern const struct dentry_operations ecryptfs_dops; --extern struct address_space_operations ecryptfs_aops; -+extern const struct address_space_operations ecryptfs_aops; - extern int ecryptfs_verbosity; - extern unsigned int ecryptfs_message_buf_len; - extern signed long ecryptfs_message_wait_timeout; -diff -urNp linux-2.6.31.7/fs/ecryptfs/inode.c linux-2.6.31.7/fs/ecryptfs/inode.c ---- linux-2.6.31.7/fs/ecryptfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ecryptfs/inode.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ecryptfs/inode.c linux-2.6.32/fs/ecryptfs/inode.c +--- linux-2.6.32/fs/ecryptfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ecryptfs/inode.c 2009-12-04 21:40:48.457673314 -0500 @@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, old_fs = get_fs(); set_fs(get_ds()); @@ -27740,25 +27681,13 @@ diff -urNp linux-2.6.31.7/fs/ecryptfs/inode.c linux-2.6.31.7/fs/ecryptfs/inode.c set_fs(old_fs); if (rc < 0) goto out_free; -diff -urNp linux-2.6.31.7/fs/ecryptfs/mmap.c linux-2.6.31.7/fs/ecryptfs/mmap.c ---- linux-2.6.31.7/fs/ecryptfs/mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ecryptfs/mmap.c 2009-12-10 22:15:16.000000000 -0500 -@@ -545,7 +545,7 @@ static sector_t ecryptfs_bmap(struct add - return rc; - } - --struct address_space_operations ecryptfs_aops = { -+const struct address_space_operations ecryptfs_aops = { - .writepage = ecryptfs_writepage, - .readpage = ecryptfs_readpage, - .write_begin = ecryptfs_write_begin, -diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c ---- linux-2.6.31.7/fs/exec.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/exec.c 2009-12-10 22:15:16.000000000 -0500 -@@ -55,12 +55,24 @@ - #include <linux/kmod.h> +diff -urNp linux-2.6.32/fs/exec.c linux-2.6.32/fs/exec.c +--- linux-2.6.32/fs/exec.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/exec.c 2009-12-12 13:27:25.369409476 -0500 +@@ -56,12 +56,24 @@ #include <linux/fsnotify.h> #include <linux/fs_struct.h> + #include <linux/pipe_fs_i.h> +#include <linux/random.h> +#include <linux/seq_file.h> + @@ -27779,8 +27708,8 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c + int core_uses_pid; char core_pattern[CORENAME_MAX_SIZE] = "core"; - int suid_dumpable = 0; -@@ -113,7 +125,7 @@ SYSCALL_DEFINE1(uselib, const char __use + unsigned int core_pipe_limit; +@@ -115,7 +127,7 @@ SYSCALL_DEFINE1(uselib, const char __use goto out; file = do_filp_open(AT_FDCWD, tmp, @@ -27789,7 +27718,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c MAY_READ | MAY_EXEC | MAY_OPEN); putname(tmp); error = PTR_ERR(file); -@@ -161,18 +173,10 @@ static struct page *get_arg_page(struct +@@ -163,18 +175,10 @@ static struct page *get_arg_page(struct int write) { struct page *page; @@ -27811,7 +27740,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c return NULL; if (write) { -@@ -244,6 +248,11 @@ static int __bprm_mm_init(struct linux_b +@@ -246,6 +250,11 @@ static int __bprm_mm_init(struct linux_b vma->vm_end = STACK_TOP_MAX; vma->vm_start = vma->vm_end - PAGE_SIZE; vma->vm_flags = VM_STACK_FLAGS; @@ -27823,7 +27752,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); err = insert_vm_struct(mm, vma); if (err) -@@ -252,6 +261,12 @@ static int __bprm_mm_init(struct linux_b +@@ -254,6 +263,12 @@ static int __bprm_mm_init(struct linux_b mm->stack_vm = mm->total_vm = 1; up_write(&mm->mmap_sem); bprm->p = vma->vm_end - sizeof(void *); @@ -27836,7 +27765,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c return 0; err: up_write(&mm->mmap_sem); -@@ -473,7 +488,7 @@ int copy_strings_kernel(int argc,char ** +@@ -475,7 +490,7 @@ int copy_strings_kernel(int argc,char ** int r; mm_segment_t oldfs = get_fs(); set_fs(KERNEL_DS); @@ -27845,7 +27774,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c set_fs(oldfs); return r; } -@@ -503,7 +518,8 @@ static int shift_arg_pages(struct vm_are +@@ -505,7 +520,8 @@ static int shift_arg_pages(struct vm_are unsigned long new_end = old_end - shift; struct mmu_gather *tlb; @@ -27855,7 +27784,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c /* * ensure there are no vmas between where we want to go -@@ -512,6 +528,10 @@ static int shift_arg_pages(struct vm_are +@@ -514,6 +530,10 @@ static int shift_arg_pages(struct vm_are if (vma != find_vma(mm, new_start)) return -EFAULT; @@ -27866,7 +27795,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c /* * cover the whole range: [new_start, old_end) */ -@@ -600,6 +620,14 @@ int setup_arg_pages(struct linux_binprm +@@ -602,6 +622,14 @@ int setup_arg_pages(struct linux_binprm bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -27881,7 +27810,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c vm_flags = VM_STACK_FLAGS; /* -@@ -613,21 +641,24 @@ int setup_arg_pages(struct linux_binprm +@@ -615,19 +643,24 @@ int setup_arg_pages(struct linux_binprm vm_flags &= ~VM_EXEC; vm_flags |= mm->def_flags; @@ -27906,25 +27835,14 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c - /* Move stack pages down in memory. */ - if (stack_shift) { - ret = shift_arg_pages(vma, stack_shift); -- if (ret) { -- up_write(&mm->mmap_sem); -- return ret; -- } +- if (ret) +- goto out_unlock; - } - #ifdef CONFIG_STACK_GROWSUP stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; #else -@@ -639,7 +670,7 @@ int setup_arg_pages(struct linux_binprm - - out_unlock: - up_write(&mm->mmap_sem); -- return 0; -+ return ret; - } - EXPORT_SYMBOL(setup_arg_pages); - -@@ -651,7 +682,7 @@ struct file *open_exec(const char *name) +@@ -651,7 +684,7 @@ struct file *open_exec(const char *name) int err; file = do_filp_open(AT_FDCWD, name, @@ -27933,7 +27851,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c MAY_EXEC | MAY_OPEN); if (IS_ERR(file)) goto out; -@@ -688,7 +719,7 @@ int kernel_read(struct file *file, loff_ +@@ -688,7 +721,7 @@ int kernel_read(struct file *file, loff_ old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -27942,7 +27860,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c set_fs(old_fs); return result; } -@@ -1085,7 +1116,7 @@ int check_unsafe_exec(struct linux_binpr +@@ -1088,7 +1121,7 @@ int check_unsafe_exec(struct linux_binpr } rcu_read_unlock(); @@ -27951,7 +27869,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c bprm->unsafe |= LSM_UNSAFE_SHARE; } else { res = -EAGAIN; -@@ -1284,6 +1315,11 @@ int do_execve(char * filename, +@@ -1287,6 +1320,11 @@ int do_execve(char * filename, char __user *__user *envp, struct pt_regs * regs) { @@ -27963,7 +27881,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1320,6 +1356,18 @@ int do_execve(char * filename, +@@ -1323,6 +1361,18 @@ int do_execve(char * filename, bprm->filename = filename; bprm->interp = filename; @@ -27982,7 +27900,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1349,10 +1397,41 @@ int do_execve(char * filename, +@@ -1352,10 +1402,41 @@ int do_execve(char * filename, if (retval < 0) goto out; @@ -28023,9 +27941,9 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c + fput(old_exec_file); +#endif - /* execve succeeded */ - current->fs->in_exec = 0; -@@ -1363,6 +1442,14 @@ int do_execve(char * filename, + current->stack_start = current->mm->start_stack; + +@@ -1368,6 +1449,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; @@ -28040,7 +27958,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c out: if (bprm->mm) mmput (bprm->mm); -@@ -1528,6 +1615,164 @@ out: +@@ -1531,6 +1620,169 @@ out: return ispipe; } @@ -28155,7 +28073,7 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c + up_read(&mm->mmap_sem); + } + if (tsk->signal->curr_ip) -+ printk(KERN_ERR "PAX: From %u.%u.%u.%u: execution attempt in: %s, %08lx-%08lx %08lx\n", NIPQUAD(tsk->signal->curr_ip), path_fault, start, end, offset); ++ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset); + else + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset); + printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, " @@ -28172,8 +28090,8 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c +void pax_report_refcount_overflow(struct pt_regs *regs) +{ + if (current->signal->curr_ip) -+ printk(KERN_ERR "PAX: From %u.%u.%u.%u: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", -+ NIPQUAD(current->signal->curr_ip), current->comm, task_pid_nr(current), current_uid(), current_euid()); ++ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", ++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid()); + else + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", + current->comm, task_pid_nr(current), current_uid(), current_euid()); @@ -28187,7 +28105,8 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c +void pax_report_leak_to_user(const void *ptr, unsigned long len) +{ + if (current->signal->curr_ip) -+ printk(KERN_ERR "PAX: From %u.%u.%u.%u: kernel memory leak attempt detected from %p (%lu bytes)\n", NIPQUAD(current->signal->curr_ip), ptr, len); ++ printk(KERN_ERR "PAX: From %pI4: kernel memory leak attempt detected from %p (%lu bytes)\n", ++ ¤t->signal->curr_ip, ptr, len); + else + printk(KERN_ERR "PAX: kernel memory leak attempt detected from %p (%lu bytes)\n", ptr, len); + dump_stack(); @@ -28196,7 +28115,11 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c + +void pax_report_overflow_from_user(const void *ptr, unsigned long len) +{ -+ printk(KERN_ERR "PAX: kernel memory overflow attempt detected to %p (%lu bytes)\n", ptr, len); ++ if (current->signal->curr_ip) ++ printk(KERN_ERR "PAX: From %pI4: kernel memory overflow attempt detected to %p (%lu bytes)\n", ++ ¤t->signal->curr_ip, ptr, len); ++ else ++ printk(KERN_ERR "PAX: kernel memory overflow attempt detected to %p (%lu bytes)\n", ptr, len); + dump_stack(); + do_group_exit(SIGKILL); +} @@ -28205,7 +28128,30 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1787,6 +2032,10 @@ void do_coredump(long signr, int exit_co +@@ -1733,17 +1985,17 @@ static void wait_for_dump_helpers(struct + pipe = file->f_path.dentry->d_inode->i_pipe; + + pipe_lock(pipe); +- pipe->readers++; +- pipe->writers--; ++ atomic_inc(&pipe->readers); ++ atomic_dec(&pipe->writers); + +- while ((pipe->readers > 1) && (!signal_pending(current))) { ++ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) { + wake_up_interruptible_sync(&pipe->wait); + kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN); + pipe_wait(pipe); + } + +- pipe->readers--; +- pipe->writers++; ++ atomic_dec(&pipe->readers); ++ atomic_inc(&pipe->writers); + pipe_unlock(pipe); + + } +@@ -1814,6 +2066,10 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); @@ -28216,9 +28162,9 @@ diff -urNp linux-2.6.31.7/fs/exec.c linux-2.6.31.7/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.31.7/fs/ext2/balloc.c linux-2.6.31.7/fs/ext2/balloc.c ---- linux-2.6.31.7/fs/ext2/balloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext2/balloc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext2/balloc.c linux-2.6.32/fs/ext2/balloc.c +--- linux-2.6.32/fs/ext2/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext2/balloc.c 2009-12-04 20:41:38.709697669 -0500 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -28228,9 +28174,9 @@ diff -urNp linux-2.6.31.7/fs/ext2/balloc.c linux-2.6.31.7/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.31.7/fs/ext3/balloc.c linux-2.6.31.7/fs/ext3/balloc.c ---- linux-2.6.31.7/fs/ext3/balloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext3/balloc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext3/balloc.c linux-2.6.32/fs/ext3/balloc.c +--- linux-2.6.32/fs/ext3/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext3/balloc.c 2009-12-04 20:41:38.742584319 -0500 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -28240,9 +28186,9 @@ diff -urNp linux-2.6.31.7/fs/ext3/balloc.c linux-2.6.31.7/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.31.7/fs/ext3/namei.c linux-2.6.31.7/fs/ext3/namei.c ---- linux-2.6.31.7/fs/ext3/namei.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext3/namei.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext3/namei.c linux-2.6.32/fs/ext3/namei.c +--- linux-2.6.32/fs/ext3/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext3/namei.c 2009-12-04 21:40:48.459576818 -0500 @@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -28252,9 +28198,9 @@ diff -urNp linux-2.6.31.7/fs/ext3/namei.c linux-2.6.31.7/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.31.7/fs/ext3/xattr.c linux-2.6.31.7/fs/ext3/xattr.c ---- linux-2.6.31.7/fs/ext3/xattr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext3/xattr.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext3/xattr.c linux-2.6.32/fs/ext3/xattr.c +--- linux-2.6.32/fs/ext3/xattr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext3/xattr.c 2009-12-04 21:40:48.461639431 -0500 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -28266,9 +28212,9 @@ diff -urNp linux-2.6.31.7/fs/ext3/xattr.c linux-2.6.31.7/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.31.7/fs/ext4/balloc.c linux-2.6.31.7/fs/ext4/balloc.c ---- linux-2.6.31.7/fs/ext4/balloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/balloc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext4/balloc.c linux-2.6.32/fs/ext4/balloc.c +--- linux-2.6.32/fs/ext4/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext4/balloc.c 2009-12-04 20:41:38.747585164 -0500 @@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || @@ -28278,117 +28224,23 @@ diff -urNp linux-2.6.31.7/fs/ext4/balloc.c linux-2.6.31.7/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.31.7/fs/ext4/file.c linux-2.6.31.7/fs/ext4/file.c ---- linux-2.6.31.7/fs/ext4/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -130,7 +130,7 @@ force_commit: - return ret; - } - --static struct vm_operations_struct ext4_file_vm_ops = { -+static const struct vm_operations_struct ext4_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = ext4_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/ext4/ioctl.c linux-2.6.31.7/fs/ext4/ioctl.c ---- linux-2.6.31.7/fs/ext4/ioctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/ioctl.c 2009-12-10 22:15:20.000000000 -0500 -@@ -221,32 +221,39 @@ setversion_out: +diff -urNp linux-2.6.32/fs/ext4/ioctl.c linux-2.6.32/fs/ext4/ioctl.c +--- linux-2.6.32/fs/ext4/ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext4/ioctl.c 2009-12-11 19:48:16.165301397 -0500 +@@ -221,6 +221,9 @@ setversion_out: struct file *donor_filp; int err; -+ if (!(filp->f_mode & FMODE_READ) || -+ !(filp->f_mode & FMODE_WRITE)) -+ return -EBADF; ++ /* temporary workaround for bugs in here */ ++ return -EOPNOTSUPP; + if (copy_from_user(&me, (struct move_extent __user *)arg, sizeof(me))) return -EFAULT; -+ me.moved_len = 0; - - donor_filp = fget(me.donor_fd); - if (!donor_filp) - return -EBADF; - -- if (!capable(CAP_DAC_OVERRIDE)) { -- if ((current->real_cred->fsuid != inode->i_uid) || -- !(inode->i_mode & S_IRUSR) || -- !(donor_filp->f_dentry->d_inode->i_mode & -- S_IRUSR)) { -- fput(donor_filp); -- return -EACCES; -- } -+ if (!(donor_filp->f_mode & FMODE_WRITE)) { -+ err = -EBADF; -+ goto mext_out; - } - -+ err = mnt_want_write(filp->f_path.mnt); -+ if (err) -+ goto mext_out; -+ - err = ext4_move_extents(filp, donor_filp, me.orig_start, - me.donor_start, me.len, &me.moved_len); -- fput(donor_filp); -+ mnt_drop_write(filp->f_path.mnt); -+ if (me.moved_len > 0) -+ file_remove_suid(donor_filp); - -- if (!err) -- if (copy_to_user((struct move_extent *)arg, -- &me, sizeof(me))) -- return -EFAULT; -+ if (copy_to_user((struct move_extent *)arg, &me, sizeof(me))) -+ err = -EFAULT; -+ -+mext_out: -+ fput(donor_filp); - return err; - } - -diff -urNp linux-2.6.31.7/fs/ext4/mballoc.c linux-2.6.31.7/fs/ext4/mballoc.c ---- linux-2.6.31.7/fs/ext4/mballoc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/mballoc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2205,7 +2205,7 @@ static void ext4_mb_seq_history_stop(str - { - } - --static struct seq_operations ext4_mb_seq_history_ops = { -+static const struct seq_operations ext4_mb_seq_history_ops = { - .start = ext4_mb_seq_history_start, - .next = ext4_mb_seq_history_next, - .stop = ext4_mb_seq_history_stop, -@@ -2287,7 +2287,7 @@ static ssize_t ext4_mb_seq_history_write - return count; - } - --static struct file_operations ext4_mb_seq_history_fops = { -+static const struct file_operations ext4_mb_seq_history_fops = { - .owner = THIS_MODULE, - .open = ext4_mb_seq_history_open, - .read = seq_read, -@@ -2366,7 +2366,7 @@ static void ext4_mb_seq_groups_stop(stru - { - } - --static struct seq_operations ext4_mb_seq_groups_ops = { -+static const struct seq_operations ext4_mb_seq_groups_ops = { - .start = ext4_mb_seq_groups_start, - .next = ext4_mb_seq_groups_next, - .stop = ext4_mb_seq_groups_stop, -@@ -2387,7 +2387,7 @@ static int ext4_mb_seq_groups_open(struc - - } - --static struct file_operations ext4_mb_seq_groups_fops = { -+static const struct file_operations ext4_mb_seq_groups_fops = { - .owner = THIS_MODULE, - .open = ext4_mb_seq_groups_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/fs/ext4/move_extent.c linux-2.6.31.7/fs/ext4/move_extent.c ---- linux-2.6.31.7/fs/ext4/move_extent.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/move_extent.c 2009-12-10 22:15:20.000000000 -0500 -@@ -905,6 +905,13 @@ mext_check_arguments(struct inode *orig_ +diff -urNp linux-2.6.32/fs/ext4/move_extent.c linux-2.6.32/fs/ext4/move_extent.c +--- linux-2.6.32/fs/ext4/move_extent.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext4/move_extent.c 2009-12-11 19:46:35.423796706 -0500 +@@ -985,6 +985,13 @@ mext_check_arguments(struct inode *orig_ return -EINVAL; } @@ -28402,9 +28254,9 @@ diff -urNp linux-2.6.31.7/fs/ext4/move_extent.c linux-2.6.31.7/fs/ext4/move_exte /* Ext4 move extent does not support swapfile */ if (IS_SWAPFILE(orig_inode) || IS_SWAPFILE(donor_inode)) { ext4_debug("ext4 move extent: The argument files should " -diff -urNp linux-2.6.31.7/fs/ext4/namei.c linux-2.6.31.7/fs/ext4/namei.c ---- linux-2.6.31.7/fs/ext4/namei.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/namei.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ext4/namei.c linux-2.6.32/fs/ext4/namei.c +--- linux-2.6.32/fs/ext4/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext4/namei.c 2009-12-04 21:40:48.462612734 -0500 @@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; @@ -28414,10 +28266,10 @@ diff -urNp linux-2.6.31.7/fs/ext4/namei.c linux-2.6.31.7/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.31.7/fs/ext4/super.c linux-2.6.31.7/fs/ext4/super.c ---- linux-2.6.31.7/fs/ext4/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ext4/super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2242,7 +2242,7 @@ static void ext4_sb_release(struct kobje +diff -urNp linux-2.6.32/fs/ext4/super.c linux-2.6.32/fs/ext4/super.c +--- linux-2.6.32/fs/ext4/super.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ext4/super.c 2009-12-04 21:40:48.463761429 -0500 +@@ -2251,7 +2251,7 @@ static void ext4_sb_release(struct kobje } @@ -28426,10 +28278,10 @@ diff -urNp linux-2.6.31.7/fs/ext4/super.c linux-2.6.31.7/fs/ext4/super.c .show = ext4_attr_show, .store = ext4_attr_store, }; -diff -urNp linux-2.6.31.7/fs/fcntl.c linux-2.6.31.7/fs/fcntl.c ---- linux-2.6.31.7/fs/fcntl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fcntl.c 2009-12-10 22:15:16.000000000 -0500 -@@ -271,6 +271,7 @@ static long do_fcntl(int fd, unsigned in +diff -urNp linux-2.6.32/fs/fcntl.c linux-2.6.32/fs/fcntl.c +--- linux-2.6.32/fs/fcntl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fcntl.c 2009-12-04 20:41:38.753628969 -0500 +@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: case F_DUPFD_CLOEXEC: @@ -28437,7 +28289,7 @@ diff -urNp linux-2.6.31.7/fs/fcntl.c linux-2.6.31.7/fs/fcntl.c if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) break; err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0); -@@ -421,7 +422,8 @@ static inline int sigio_perm(struct task +@@ -500,7 +501,8 @@ static inline int sigio_perm(struct task ret = ((fown->euid == 0 || fown->euid == cred->suid || fown->euid == cred->uid || fown->uid == cred->suid || fown->uid == cred->uid) && @@ -28447,9 +28299,9 @@ diff -urNp linux-2.6.31.7/fs/fcntl.c linux-2.6.31.7/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.31.7/fs/fifo.c linux-2.6.31.7/fs/fifo.c ---- linux-2.6.31.7/fs/fifo.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fifo.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/fifo.c linux-2.6.32/fs/fifo.c +--- linux-2.6.32/fs/fifo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fifo.c 2009-12-04 21:40:48.463761429 -0500 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode */ filp->f_op = &read_pipefifo_fops; @@ -28520,10 +28372,10 @@ diff -urNp linux-2.6.31.7/fs/fifo.c linux-2.6.31.7/fs/fifo.c free_pipe_info(inode); err_nocleanup: -diff -urNp linux-2.6.31.7/fs/file.c linux-2.6.31.7/fs/file.c ---- linux-2.6.31.7/fs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -13,6 +13,7 @@ +diff -urNp linux-2.6.32/fs/file.c linux-2.6.32/fs/file.c +--- linux-2.6.32/fs/file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/file.c 2009-12-04 20:41:38.764037457 -0500 +@@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/file.h> @@ -28531,7 +28383,7 @@ diff -urNp linux-2.6.31.7/fs/file.c linux-2.6.31.7/fs/file.c #include <linux/fdtable.h> #include <linux/bitops.h> #include <linux/interrupt.h> -@@ -256,6 +257,8 @@ int expand_files(struct files_struct *fi +@@ -257,6 +258,8 @@ int expand_files(struct files_struct *fi * N.B. For clone tasks sharing a files structure, this test * will limit the total number of files that can be opened. */ @@ -28540,9 +28392,9 @@ diff -urNp linux-2.6.31.7/fs/file.c linux-2.6.31.7/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.31.7/fs/fs_struct.c linux-2.6.31.7/fs/fs_struct.c ---- linux-2.6.31.7/fs/fs_struct.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fs_struct.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/fs_struct.c linux-2.6.32/fs/fs_struct.c +--- linux-2.6.32/fs/fs_struct.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fs_struct.c 2009-12-04 21:40:48.463761429 -0500 @@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk) task_lock(tsk); write_lock(&fs->lock); @@ -28594,10 +28446,10 @@ diff -urNp linux-2.6.31.7/fs/fs_struct.c linux-2.6.31.7/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-2.6.31.7/fs/fuse/control.c linux-2.6.31.7/fs/fuse/control.c ---- linux-2.6.31.7/fs/fuse/control.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fuse/control.c 2009-12-10 22:15:16.000000000 -0500 -@@ -161,7 +161,7 @@ void fuse_ctl_remove_conn(struct fuse_co +diff -urNp linux-2.6.32/fs/fuse/control.c linux-2.6.32/fs/fuse/control.c +--- linux-2.6.32/fs/fuse/control.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fuse/control.c 2009-12-04 21:40:48.464759416 -0500 +@@ -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) { @@ -28606,9 +28458,55 @@ diff -urNp linux-2.6.31.7/fs/fuse/control.c linux-2.6.31.7/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.31.7/fs/fuse/dev.c linux-2.6.31.7/fs/fuse/dev.c ---- linux-2.6.31.7/fs/fuse/dev.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fuse/dev.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/fuse/cuse.c linux-2.6.32/fs/fuse/cuse.c +--- linux-2.6.32/fs/fuse/cuse.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fuse/cuse.c 2009-12-04 21:40:48.464759416 -0500 +@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i + return rc; + } + +-static struct file_operations cuse_channel_fops; /* initialized during init */ +- ++static const struct file_operations cuse_channel_fops = { /* initialized during init */ ++ .owner = THIS_MODULE, ++ .llseek = no_llseek, ++ .read = do_sync_read, ++ .aio_read = fuse_dev_read, ++ .write = do_sync_write, ++ .aio_write = fuse_dev_write, ++ .poll = fuse_dev_poll, ++ .open = cuse_channel_open, ++ .release = cuse_channel_release, ++ .fasync = fuse_dev_fasync, ++}; + + /************************************************************************** + * Misc stuff and module initializatiion +@@ -575,12 +585,6 @@ static int __init cuse_init(void) + for (i = 0; i < CUSE_CONNTBL_LEN; i++) + INIT_LIST_HEAD(&cuse_conntbl[i]); + +- /* inherit and extend fuse_dev_operations */ +- cuse_channel_fops = fuse_dev_operations; +- cuse_channel_fops.owner = THIS_MODULE; +- cuse_channel_fops.open = cuse_channel_open; +- cuse_channel_fops.release = cuse_channel_release; +- + cuse_class = class_create(THIS_MODULE, "cuse"); + if (IS_ERR(cuse_class)) + return PTR_ERR(cuse_class); +diff -urNp linux-2.6.32/fs/fuse/dev.c linux-2.6.32/fs/fuse/dev.c +--- linux-2.6.32/fs/fuse/dev.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fuse/dev.c 2009-12-04 21:40:48.464759416 -0500 +@@ -745,7 +745,7 @@ __releases(&fc->lock) + * request_end(). Otherwise add it to the processing list, and set + * the 'sent' flag. + */ +-static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, ++ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t pos) + { + int err; @@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struc { struct fuse_notify_inval_entry_out outarg; @@ -28652,10 +28550,37 @@ diff -urNp linux-2.6.31.7/fs/fuse/dev.c linux-2.6.31.7/fs/fuse/dev.c return err; } -diff -urNp linux-2.6.31.7/fs/fuse/dir.c linux-2.6.31.7/fs/fuse/dir.c ---- linux-2.6.31.7/fs/fuse/dir.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fuse/dir.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1125,7 +1125,7 @@ static char *read_link(struct dentry *de +@@ -987,7 +990,7 @@ static int copy_out_args(struct fuse_cop + * it from the list and copy the rest of the buffer to the request. + * The request is finished by calling request_end() + */ +-static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, ++ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, + unsigned long nr_segs, loff_t pos) + { + int err; +@@ -1084,7 +1087,7 @@ static ssize_t fuse_dev_write(struct kio + return err; + } + +-static unsigned fuse_dev_poll(struct file *file, poll_table *wait) ++unsigned fuse_dev_poll(struct file *file, poll_table *wait) + { + unsigned mask = POLLOUT | POLLWRNORM; + struct fuse_conn *fc = fuse_get_conn(file); +@@ -1210,7 +1213,7 @@ int fuse_dev_release(struct inode *inode + } + EXPORT_SYMBOL_GPL(fuse_dev_release); + +-static int fuse_dev_fasync(int fd, struct file *file, int on) ++int fuse_dev_fasync(int fd, struct file *file, int on) + { + struct fuse_conn *fc = fuse_get_conn(file); + if (!fc) +diff -urNp linux-2.6.32/fs/fuse/dir.c linux-2.6.32/fs/fuse/dir.c +--- linux-2.6.32/fs/fuse/dir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fuse/dir.c 2009-12-04 21:40:48.465756567 -0500 +@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de return link; } @@ -28664,34 +28589,30 @@ diff -urNp linux-2.6.31.7/fs/fuse/dir.c linux-2.6.31.7/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.31.7/fs/fuse/file.c linux-2.6.31.7/fs/fuse/file.c ---- linux-2.6.31.7/fs/fuse/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/fuse/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1314,7 +1314,7 @@ static int fuse_page_mkwrite(struct vm_a - return 0; - } +diff -urNp linux-2.6.32/fs/fuse/fuse_i.h linux-2.6.32/fs/fuse/fuse_i.h +--- linux-2.6.32/fs/fuse/fuse_i.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/fuse/fuse_i.h 2009-12-04 21:40:48.465756567 -0500 +@@ -521,6 +521,16 @@ extern const struct file_operations fuse --static struct vm_operations_struct fuse_file_vm_ops = { -+static const struct vm_operations_struct fuse_file_vm_ops = { - .close = fuse_vma_close, - .fault = filemap_fault, - .page_mkwrite = fuse_page_mkwrite, -diff -urNp linux-2.6.31.7/fs/gfs2/file.c linux-2.6.31.7/fs/gfs2/file.c ---- linux-2.6.31.7/fs/gfs2/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/gfs2/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -419,7 +419,7 @@ out: - return ret; - } + extern const struct dentry_operations fuse_dentry_operations; --static struct vm_operations_struct gfs2_vm_ops = { -+static const struct vm_operations_struct gfs2_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = gfs2_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/gfs2/sys.c linux-2.6.31.7/fs/gfs2/sys.c ---- linux-2.6.31.7/fs/gfs2/sys.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/gfs2/sys.c 2009-12-10 22:15:16.000000000 -0500 -@@ -48,7 +48,7 @@ static ssize_t gfs2_attr_store(struct ko ++extern ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov, ++ unsigned long nr_segs, loff_t pos); ++ ++extern ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov, ++ unsigned long nr_segs, loff_t pos); ++ ++extern unsigned fuse_dev_poll(struct file *file, poll_table *wait); ++ ++extern int fuse_dev_fasync(int fd, struct file *file, int on); ++ + /** + * Inode to nodeid comparison. + */ +diff -urNp linux-2.6.32/fs/gfs2/sys.c linux-2.6.32/fs/gfs2/sys.c +--- linux-2.6.32/fs/gfs2/sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/gfs2/sys.c 2009-12-04 21:40:48.466752747 -0500 +@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko return a->store ? a->store(sdp, buf, len) : len; } @@ -28700,7 +28621,7 @@ diff -urNp linux-2.6.31.7/fs/gfs2/sys.c linux-2.6.31.7/fs/gfs2/sys.c .show = gfs2_attr_show, .store = gfs2_attr_store, }; -@@ -574,7 +574,7 @@ static int gfs2_uevent(struct kset *kset +@@ -584,7 +584,7 @@ static int gfs2_uevent(struct kset *kset return 0; } @@ -28709,9 +28630,9 @@ diff -urNp linux-2.6.31.7/fs/gfs2/sys.c linux-2.6.31.7/fs/gfs2/sys.c .uevent = gfs2_uevent, }; -diff -urNp linux-2.6.31.7/fs/hfs/inode.c linux-2.6.31.7/fs/hfs/inode.c ---- linux-2.6.31.7/fs/hfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/hfs/inode.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/hfs/inode.c linux-2.6.32/fs/hfs/inode.c +--- linux-2.6.32/fs/hfs/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/hfs/inode.c 2009-12-04 21:40:48.467709209 -0500 @@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { @@ -28730,9 +28651,9 @@ diff -urNp linux-2.6.31.7/fs/hfs/inode.c linux-2.6.31.7/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.31.7/fs/hfsplus/inode.c linux-2.6.31.7/fs/hfsplus/inode.c ---- linux-2.6.31.7/fs/hfsplus/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/hfsplus/inode.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/hfsplus/inode.c linux-2.6.32/fs/hfsplus/inode.c +--- linux-2.6.32/fs/hfsplus/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/hfsplus/inode.c 2009-12-04 21:40:48.467709209 -0500 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -28769,9 +28690,9 @@ diff -urNp linux-2.6.31.7/fs/hfsplus/inode.c linux-2.6.31.7/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.31.7/fs/ioctl.c linux-2.6.31.7/fs/ioctl.c ---- linux-2.6.31.7/fs/ioctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ioctl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ioctl.c linux-2.6.32/fs/ioctl.c +--- linux-2.6.32/fs/ioctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ioctl.c 2009-12-04 21:40:48.467709209 -0500 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema u64 phys, u64 len, u32 flags) { @@ -28781,7 +28702,7 @@ diff -urNp linux-2.6.31.7/fs/ioctl.c linux-2.6.31.7/fs/ioctl.c /* only count the extents */ if (fieinfo->fi_extents_max == 0) { -@@ -206,7 +206,7 @@ static int ioctl_fiemap(struct file *fil +@@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *fil fieinfo.fi_flags = fiemap.fm_flags; fieinfo.fi_extents_max = fiemap.fm_extent_count; @@ -28790,7 +28711,7 @@ diff -urNp linux-2.6.31.7/fs/ioctl.c linux-2.6.31.7/fs/ioctl.c if (fiemap.fm_extent_count != 0 && !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start, -@@ -219,7 +219,7 @@ static int ioctl_fiemap(struct file *fil +@@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *fil error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len); fiemap.fm_flags = fieinfo.fi_flags; fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped; @@ -28799,48 +28720,9 @@ diff -urNp linux-2.6.31.7/fs/ioctl.c linux-2.6.31.7/fs/ioctl.c error = -EFAULT; return error; -diff -urNp linux-2.6.31.7/fs/jbd2/journal.c linux-2.6.31.7/fs/jbd2/journal.c ---- linux-2.6.31.7/fs/jbd2/journal.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/jbd2/journal.c 2009-12-10 22:15:16.000000000 -0500 -@@ -768,7 +768,7 @@ static void jbd2_seq_history_stop(struct - { - } - --static struct seq_operations jbd2_seq_history_ops = { -+static const struct seq_operations jbd2_seq_history_ops = { - .start = jbd2_seq_history_start, - .next = jbd2_seq_history_next, - .stop = jbd2_seq_history_stop, -@@ -818,7 +818,7 @@ static int jbd2_seq_history_release(stru - return seq_release(inode, file); - } - --static struct file_operations jbd2_seq_history_fops = { -+static const struct file_operations jbd2_seq_history_fops = { - .owner = THIS_MODULE, - .open = jbd2_seq_history_open, - .read = seq_read, -@@ -872,7 +872,7 @@ static void jbd2_seq_info_stop(struct se - { - } - --static struct seq_operations jbd2_seq_info_ops = { -+static const struct seq_operations jbd2_seq_info_ops = { - .start = jbd2_seq_info_start, - .next = jbd2_seq_info_next, - .stop = jbd2_seq_info_stop, -@@ -920,7 +920,7 @@ static int jbd2_seq_info_release(struct - return seq_release(inode, file); - } - --static struct file_operations jbd2_seq_info_fops = { -+static const struct file_operations jbd2_seq_info_fops = { - .owner = THIS_MODULE, - .open = jbd2_seq_info_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/fs/jffs2/debug.h linux-2.6.31.7/fs/jffs2/debug.h ---- linux-2.6.31.7/fs/jffs2/debug.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/jffs2/debug.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/jffs2/debug.h linux-2.6.32/fs/jffs2/debug.h +--- linux-2.6.32/fs/jffs2/debug.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/jffs2/debug.h 2009-12-04 21:40:48.468760523 -0500 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -28942,9 +28824,9 @@ diff -urNp linux-2.6.31.7/fs/jffs2/debug.h linux-2.6.31.7/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.31.7/fs/jffs2/erase.c linux-2.6.31.7/fs/jffs2/erase.c ---- linux-2.6.31.7/fs/jffs2/erase.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/jffs2/erase.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/jffs2/erase.c linux-2.6.32/fs/jffs2/erase.c +--- linux-2.6.32/fs/jffs2/erase.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/jffs2/erase.c 2009-12-04 21:40:48.468760523 -0500 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -28955,9 +28837,9 @@ diff -urNp linux-2.6.31.7/fs/jffs2/erase.c linux-2.6.31.7/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.31.7/fs/jffs2/summary.h linux-2.6.31.7/fs/jffs2/summary.h ---- linux-2.6.31.7/fs/jffs2/summary.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/jffs2/summary.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/jffs2/summary.h linux-2.6.32/fs/jffs2/summary.h +--- linux-2.6.32/fs/jffs2/summary.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/jffs2/summary.h 2009-12-04 21:40:48.468760523 -0500 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -28986,9 +28868,9 @@ diff -urNp linux-2.6.31.7/fs/jffs2/summary.h linux-2.6.31.7/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.31.7/fs/jffs2/wbuf.c linux-2.6.31.7/fs/jffs2/wbuf.c ---- linux-2.6.31.7/fs/jffs2/wbuf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/jffs2/wbuf.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/jffs2/wbuf.c linux-2.6.32/fs/jffs2/wbuf.c +--- linux-2.6.32/fs/jffs2/wbuf.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/jffs2/wbuf.c 2009-12-04 21:40:48.469645169 -0500 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -28999,21 +28881,9 @@ diff -urNp linux-2.6.31.7/fs/jffs2/wbuf.c linux-2.6.31.7/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.31.7/fs/lockd/clntproc.c linux-2.6.31.7/fs/lockd/clntproc.c ---- linux-2.6.31.7/fs/lockd/clntproc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/lockd/clntproc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -458,7 +458,7 @@ static void nlmclnt_locks_release_privat - nlm_put_lockowner(fl->fl_u.nfs_fl.owner); - } - --static struct file_lock_operations nlmclnt_lock_ops = { -+static const struct file_lock_operations nlmclnt_lock_ops = { - .fl_copy_lock = nlmclnt_locks_copy_lock, - .fl_release_private = nlmclnt_locks_release_private, - }; -diff -urNp linux-2.6.31.7/fs/lockd/svc.c linux-2.6.31.7/fs/lockd/svc.c ---- linux-2.6.31.7/fs/lockd/svc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/lockd/svc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/lockd/svc.c linux-2.6.32/fs/lockd/svc.c +--- linux-2.6.32/fs/lockd/svc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/lockd/svc.c 2009-12-04 21:40:48.469645169 -0500 @@ -43,7 +43,7 @@ static struct svc_program nlmsvc_program; @@ -29023,30 +28893,9 @@ diff -urNp linux-2.6.31.7/fs/lockd/svc.c linux-2.6.31.7/fs/lockd/svc.c EXPORT_SYMBOL_GPL(nlmsvc_ops); static DEFINE_MUTEX(nlmsvc_mutex); -diff -urNp linux-2.6.31.7/fs/lockd/svclock.c linux-2.6.31.7/fs/lockd/svclock.c ---- linux-2.6.31.7/fs/lockd/svclock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/lockd/svclock.c 2009-12-10 22:15:16.000000000 -0500 -@@ -705,7 +705,7 @@ static int nlmsvc_same_owner(struct file - return fl1->fl_owner == fl2->fl_owner && fl1->fl_pid == fl2->fl_pid; - } - --struct lock_manager_operations nlmsvc_lock_operations = { -+const struct lock_manager_operations nlmsvc_lock_operations = { - .fl_compare_owner = nlmsvc_same_owner, - .fl_notify = nlmsvc_notify_blocked, - .fl_grant = nlmsvc_grant_deferred, -diff -urNp linux-2.6.31.7/fs/locks.c linux-2.6.31.7/fs/locks.c ---- linux-2.6.31.7/fs/locks.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/locks.c 2009-12-10 22:15:16.000000000 -0500 -@@ -434,7 +434,7 @@ static int lease_mylease_callback(struct - return fl->fl_file == try->fl_file; - } - --static struct lock_manager_operations lease_manager_ops = { -+static const struct lock_manager_operations lease_manager_ops = { - .fl_break = lease_break_callback, - .fl_release_private = lease_release_private_callback, - .fl_mylease = lease_mylease_callback, +diff -urNp linux-2.6.32/fs/locks.c linux-2.6.32/fs/locks.c +--- linux-2.6.32/fs/locks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/locks.c 2009-12-04 21:40:48.470753589 -0500 @@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil return; @@ -29068,10 +28917,10 @@ diff -urNp linux-2.6.31.7/fs/locks.c linux-2.6.31.7/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.31.7/fs/namei.c linux-2.6.31.7/fs/namei.c ---- linux-2.6.31.7/fs/namei.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/namei.c 2009-12-10 22:15:16.000000000 -0500 -@@ -631,7 +631,7 @@ static __always_inline int __do_follow_l +diff -urNp linux-2.6.32/fs/namei.c linux-2.6.32/fs/namei.c +--- linux-2.6.32/fs/namei.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/namei.c 2009-12-04 21:40:48.472622837 -0500 +@@ -637,7 +637,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); if (!IS_ERR(cookie)) { @@ -29080,7 +28929,7 @@ diff -urNp linux-2.6.31.7/fs/namei.c linux-2.6.31.7/fs/namei.c error = 0; if (s) error = __vfs_follow_link(nd, s); -@@ -662,6 +662,13 @@ static inline int do_follow_link(struct +@@ -668,6 +668,13 @@ static inline int do_follow_link(struct err = security_inode_follow_link(path->dentry, nd); if (err) goto loop; @@ -29397,9 +29246,9 @@ diff -urNp linux-2.6.31.7/fs/namei.c linux-2.6.31.7/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.31.7/fs/namespace.c linux-2.6.31.7/fs/namespace.c ---- linux-2.6.31.7/fs/namespace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/namespace.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/namespace.c linux-2.6.32/fs/namespace.c +--- linux-2.6.32/fs/namespace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/namespace.c 2009-12-04 20:41:38.785713119 -0500 @@ -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); @@ -29420,7 +29269,7 @@ diff -urNp linux-2.6.31.7/fs/namespace.c linux-2.6.31.7/fs/namespace.c return retval; } -@@ -1940,6 +1946,16 @@ long do_mount(char *dev_name, char *dir_ +@@ -1955,6 +1961,16 @@ long do_mount(char *dev_name, char *dir_ if (retval) goto dput_out; @@ -29437,7 +29286,7 @@ diff -urNp linux-2.6.31.7/fs/namespace.c linux-2.6.31.7/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -1954,6 +1970,9 @@ long do_mount(char *dev_name, char *dir_ +@@ -1969,6 +1985,9 @@ long do_mount(char *dev_name, char *dir_ dev_name, data_page); dput_out: path_put(&path); @@ -29447,7 +29296,7 @@ diff -urNp linux-2.6.31.7/fs/namespace.c linux-2.6.31.7/fs/namespace.c return retval; } -@@ -2158,6 +2177,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ +@@ -2175,6 +2194,12 @@ SYSCALL_DEFINE2(pivot_root, const char _ goto out1; } @@ -29460,52 +29309,10 @@ diff -urNp linux-2.6.31.7/fs/namespace.c linux-2.6.31.7/fs/namespace.c read_lock(¤t->fs->lock); root = current->fs->root; path_get(¤t->fs->root); -diff -urNp linux-2.6.31.7/fs/nfs/client.c linux-2.6.31.7/fs/nfs/client.c ---- linux-2.6.31.7/fs/nfs/client.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfs/client.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1533,7 +1533,7 @@ static void *nfs_server_list_next(struct - static void nfs_server_list_stop(struct seq_file *p, void *v); - static int nfs_server_list_show(struct seq_file *m, void *v); - --static struct seq_operations nfs_server_list_ops = { -+static const struct seq_operations nfs_server_list_ops = { - .start = nfs_server_list_start, - .next = nfs_server_list_next, - .stop = nfs_server_list_stop, -@@ -1554,7 +1554,7 @@ static void *nfs_volume_list_next(struct - static void nfs_volume_list_stop(struct seq_file *p, void *v); - static int nfs_volume_list_show(struct seq_file *m, void *v); - --static struct seq_operations nfs_volume_list_ops = { -+static const struct seq_operations nfs_volume_list_ops = { - .start = nfs_volume_list_start, - .next = nfs_volume_list_next, - .stop = nfs_volume_list_stop, -diff -urNp linux-2.6.31.7/fs/nfs/file.c linux-2.6.31.7/fs/nfs/file.c ---- linux-2.6.31.7/fs/nfs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -59,7 +59,7 @@ static int nfs_lock(struct file *filp, i - static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl); - static int nfs_setlease(struct file *file, long arg, struct file_lock **fl); - --static struct vm_operations_struct nfs_file_vm_ops; -+static const struct vm_operations_struct nfs_file_vm_ops; - - const struct file_operations nfs_file_operations = { - .llseek = nfs_file_llseek, -@@ -526,7 +526,7 @@ out_unlock: - return VM_FAULT_SIGBUS; - } - --static struct vm_operations_struct nfs_file_vm_ops = { -+static const struct vm_operations_struct nfs_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = nfs_vm_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c ---- linux-2.6.31.7/fs/nfs/nfs4proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfs/nfs4proc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1128,7 +1128,7 @@ static int _nfs4_do_open_reclaim(struct +diff -urNp linux-2.6.32/fs/nfs/nfs4proc.c linux-2.6.32/fs/nfs/nfs4proc.c +--- linux-2.6.32/fs/nfs/nfs4proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/nfs/nfs4proc.c 2009-12-04 21:40:48.474667457 -0500 +@@ -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) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29514,7 +29321,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = _nfs4_do_open_reclaim(ctx, state); -@@ -1170,7 +1170,7 @@ static int _nfs4_open_delegation_recall( +@@ -1173,7 +1173,7 @@ static int _nfs4_open_delegation_recall( int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid) { @@ -29523,7 +29330,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c struct nfs_server *server = NFS_SERVER(state->inode); int err; do { -@@ -1486,7 +1486,7 @@ static int _nfs4_open_expired(struct nfs +@@ -1491,7 +1491,7 @@ static int _nfs4_open_expired(struct nfs static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29532,7 +29339,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -1584,7 +1584,7 @@ out_err: +@@ -1589,7 +1589,7 @@ out_err: static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) { @@ -29541,7 +29348,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c struct nfs4_state *res; int status; -@@ -1675,7 +1675,7 @@ static int nfs4_do_setattr(struct inode +@@ -1680,7 +1680,7 @@ static int nfs4_do_setattr(struct inode struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(inode); @@ -29550,7 +29357,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2019,7 +2019,7 @@ static int _nfs4_server_capabilities(str +@@ -2046,7 +2046,7 @@ static int _nfs4_server_capabilities(str int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) { @@ -29559,7 +29366,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2053,7 +2053,7 @@ static int _nfs4_lookup_root(struct nfs_ +@@ -2080,7 +2080,7 @@ static int _nfs4_lookup_root(struct nfs_ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *info) { @@ -29568,7 +29375,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2142,7 +2142,7 @@ static int _nfs4_proc_getattr(struct nfs +@@ -2169,7 +2169,7 @@ static int _nfs4_proc_getattr(struct nfs static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29577,7 +29384,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2230,7 +2230,7 @@ static int nfs4_proc_lookupfh(struct nfs +@@ -2257,7 +2257,7 @@ static int nfs4_proc_lookupfh(struct nfs struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29586,7 +29393,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -2259,7 +2259,7 @@ static int _nfs4_proc_lookup(struct inod +@@ -2286,7 +2286,7 @@ static int _nfs4_proc_lookup(struct inod static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -29595,7 +29402,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2323,7 +2323,7 @@ static int _nfs4_proc_access(struct inod +@@ -2350,7 +2350,7 @@ static int _nfs4_proc_access(struct inod static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) { @@ -29604,7 +29411,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2379,7 +2379,7 @@ static int _nfs4_proc_readlink(struct in +@@ -2406,7 +2406,7 @@ static int _nfs4_proc_readlink(struct in static int nfs4_proc_readlink(struct inode *inode, struct page *page, unsigned int pgbase, unsigned int pglen) { @@ -29613,7 +29420,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2477,7 +2477,7 @@ static int _nfs4_proc_remove(struct inod +@@ -2504,7 +2504,7 @@ static int _nfs4_proc_remove(struct inod static int nfs4_proc_remove(struct inode *dir, struct qstr *name) { @@ -29622,7 +29429,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2551,7 +2551,7 @@ static int _nfs4_proc_rename(struct inod +@@ -2578,7 +2578,7 @@ static int _nfs4_proc_rename(struct inod static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, struct inode *new_dir, struct qstr *new_name) { @@ -29631,7 +29438,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2598,7 +2598,7 @@ static int _nfs4_proc_link(struct inode +@@ -2625,7 +2625,7 @@ static int _nfs4_proc_link(struct inode static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) { @@ -29640,7 +29447,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2690,7 +2690,7 @@ out: +@@ -2717,7 +2717,7 @@ out: static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { @@ -29649,7 +29456,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2721,7 +2721,7 @@ out: +@@ -2748,7 +2748,7 @@ out: static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) { @@ -29658,7 +29465,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2770,7 +2770,7 @@ static int _nfs4_proc_readdir(struct den +@@ -2797,7 +2797,7 @@ static int _nfs4_proc_readdir(struct den static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, u64 cookie, struct page *page, unsigned int count, int plus) { @@ -29667,7 +29474,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2818,7 +2818,7 @@ out: +@@ -2845,7 +2845,7 @@ out: static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) { @@ -29676,7 +29483,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2850,7 +2850,7 @@ static int _nfs4_proc_statfs(struct nfs_ +@@ -2877,7 +2877,7 @@ static int _nfs4_proc_statfs(struct nfs_ static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) { @@ -29685,7 +29492,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2881,7 +2881,7 @@ static int _nfs4_do_fsinfo(struct nfs_se +@@ -2908,7 +2908,7 @@ static int _nfs4_do_fsinfo(struct nfs_se static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) { @@ -29694,7 +29501,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -2927,7 +2927,7 @@ static int _nfs4_proc_pathconf(struct nf +@@ -2954,7 +2954,7 @@ static int _nfs4_proc_pathconf(struct nf static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_pathconf *pathconf) { @@ -29703,7 +29510,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -3226,7 +3226,7 @@ out_free: +@@ -3253,7 +3253,7 @@ out_free: static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) { @@ -29712,7 +29519,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c ssize_t ret; do { ret = __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -3282,7 +3282,7 @@ static int __nfs4_proc_set_acl(struct in +@@ -3309,7 +3309,7 @@ static int __nfs4_proc_set_acl(struct in static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) { @@ -29721,7 +29528,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -3547,7 +3547,7 @@ out: +@@ -3574,7 +3574,7 @@ out: int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) { struct nfs_server *server = NFS_SERVER(inode); @@ -29730,7 +29537,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3620,7 +3620,7 @@ out: +@@ -3647,7 +3647,7 @@ out: static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -29739,7 +29546,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -3994,7 +3994,7 @@ static int _nfs4_do_setlk(struct nfs4_st +@@ -4021,7 +4021,7 @@ static int _nfs4_do_setlk(struct nfs4_st static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29748,7 +29555,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -4012,7 +4012,7 @@ static int nfs4_lock_reclaim(struct nfs4 +@@ -4039,7 +4039,7 @@ static int nfs4_lock_reclaim(struct nfs4 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29757,7 +29564,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, request); -@@ -4067,7 +4067,7 @@ out: +@@ -4094,7 +4094,7 @@ out: static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -29766,7 +29573,7 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; do { -@@ -4127,7 +4127,7 @@ nfs4_proc_lock(struct file *filp, int cm +@@ -4154,7 +4154,7 @@ nfs4_proc_lock(struct file *filp, int cm int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -29775,33 +29582,9 @@ diff -urNp linux-2.6.31.7/fs/nfs/nfs4proc.c linux-2.6.31.7/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.31.7/fs/nfs/nfs4state.c linux-2.6.31.7/fs/nfs/nfs4state.c ---- linux-2.6.31.7/fs/nfs/nfs4state.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfs/nfs4state.c 2009-12-10 22:15:16.000000000 -0500 -@@ -638,7 +638,7 @@ static void nfs4_fl_release_lock(struct - nfs4_put_lock_state(fl->fl_u.nfs4_fl.owner); - } - --static struct file_lock_operations nfs4_fl_lock_ops = { -+static const struct file_lock_operations nfs4_fl_lock_ops = { - .fl_copy_lock = nfs4_fl_copy_lock, - .fl_release_private = nfs4_fl_release_lock, - }; -diff -urNp linux-2.6.31.7/fs/nfsd/export.c linux-2.6.31.7/fs/nfsd/export.c ---- linux-2.6.31.7/fs/nfsd/export.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfsd/export.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1505,7 +1505,7 @@ static int e_show(struct seq_file *m, vo - return svc_export_show(m, &svc_export_cache, cp); - } - --struct seq_operations nfs_exports_op = { -+const struct seq_operations nfs_exports_op = { - .start = e_start, - .next = e_next, - .stop = e_stop, -diff -urNp linux-2.6.31.7/fs/nfsd/lockd.c linux-2.6.31.7/fs/nfsd/lockd.c ---- linux-2.6.31.7/fs/nfsd/lockd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfsd/lockd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/nfsd/lockd.c linux-2.6.32/fs/nfsd/lockd.c +--- linux-2.6.32/fs/nfsd/lockd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/nfsd/lockd.c 2009-12-04 21:40:48.474667457 -0500 @@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) fput(filp); } @@ -29811,43 +29594,10 @@ diff -urNp linux-2.6.31.7/fs/nfsd/lockd.c linux-2.6.31.7/fs/nfsd/lockd.c .fopen = nlm_fopen, /* open file for locking */ .fclose = nlm_fclose, /* close file */ }; -diff -urNp linux-2.6.31.7/fs/nfsd/nfs4state.c linux-2.6.31.7/fs/nfsd/nfs4state.c ---- linux-2.6.31.7/fs/nfsd/nfs4state.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfsd/nfs4state.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2163,7 +2163,7 @@ int nfsd_change_deleg_cb(struct file_loc - return -EAGAIN; - } - --static struct lock_manager_operations nfsd_lease_mng_ops = { -+static const struct lock_manager_operations nfsd_lease_mng_ops = { - .fl_break = nfsd_break_deleg_cb, - .fl_release_private = nfsd_release_deleg_cb, - .fl_copy_lock = nfsd_copy_lock_deleg_cb, -@@ -3368,7 +3368,7 @@ nfs4_transform_lock_offset(struct file_l - - /* Hack!: For now, we're defining this just so we can use a pointer to it - * as a unique cookie to identify our (NFSv4's) posix locks. */ --static struct lock_manager_operations nfsd_posix_mng_ops = { -+static const struct lock_manager_operations nfsd_posix_mng_ops = { - }; - - static inline void -diff -urNp linux-2.6.31.7/fs/nfsd/nfsctl.c linux-2.6.31.7/fs/nfsd/nfsctl.c ---- linux-2.6.31.7/fs/nfsd/nfsctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfsd/nfsctl.c 2009-12-10 22:15:16.000000000 -0500 -@@ -174,7 +174,7 @@ static const struct file_operations expo - - extern int nfsd_pool_stats_open(struct inode *inode, struct file *file); - --static struct file_operations pool_stats_operations = { -+static const struct file_operations pool_stats_operations = { - .open = nfsd_pool_stats_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/fs/nfsd/vfs.c linux-2.6.31.7/fs/nfsd/vfs.c ---- linux-2.6.31.7/fs/nfsd/vfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nfsd/vfs.c 2009-12-10 22:15:16.000000000 -0500 -@@ -930,7 +930,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st +diff -urNp linux-2.6.32/fs/nfsd/vfs.c linux-2.6.32/fs/nfsd/vfs.c +--- linux-2.6.32/fs/nfsd/vfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/nfsd/vfs.c 2009-12-04 21:40:48.475650978 -0500 +@@ -940,7 +940,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st } else { oldfs = get_fs(); set_fs(KERNEL_DS); @@ -29856,7 +29606,7 @@ diff -urNp linux-2.6.31.7/fs/nfsd/vfs.c linux-2.6.31.7/fs/nfsd/vfs.c set_fs(oldfs); } -@@ -1053,7 +1053,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s +@@ -1063,7 +1063,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s /* Write the data. */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -29865,7 +29615,7 @@ diff -urNp linux-2.6.31.7/fs/nfsd/vfs.c linux-2.6.31.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) goto out_nfserr; -@@ -1528,7 +1528,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st +@@ -1538,7 +1538,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st */ oldfs = get_fs(); set_fs(KERNEL_DS); @@ -29874,162 +29624,9 @@ diff -urNp linux-2.6.31.7/fs/nfsd/vfs.c linux-2.6.31.7/fs/nfsd/vfs.c set_fs(oldfs); if (host_err < 0) -diff -urNp linux-2.6.31.7/fs/nilfs2/btnode.c linux-2.6.31.7/fs/nilfs2/btnode.c ---- linux-2.6.31.7/fs/nilfs2/btnode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/btnode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -47,7 +47,7 @@ void nilfs_btnode_cache_init_once(struct - INIT_LIST_HEAD(&btnc->i_mmap_nonlinear); - } - --static struct address_space_operations def_btnode_aops = { -+static const struct address_space_operations def_btnode_aops = { - .sync_page = block_sync_page, - }; - -diff -urNp linux-2.6.31.7/fs/nilfs2/dir.c linux-2.6.31.7/fs/nilfs2/dir.c ---- linux-2.6.31.7/fs/nilfs2/dir.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/dir.c 2009-12-10 22:15:16.000000000 -0500 -@@ -697,7 +697,7 @@ not_empty: - return 0; - } - --struct file_operations nilfs_dir_operations = { -+const struct file_operations nilfs_dir_operations = { - .llseek = generic_file_llseek, - .read = generic_read_dir, - .readdir = nilfs_readdir, -diff -urNp linux-2.6.31.7/fs/nilfs2/file.c linux-2.6.31.7/fs/nilfs2/file.c ---- linux-2.6.31.7/fs/nilfs2/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -117,7 +117,7 @@ static int nilfs_page_mkwrite(struct vm_ - return 0; - } - --struct vm_operations_struct nilfs_file_vm_ops = { -+const struct vm_operations_struct nilfs_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = nilfs_page_mkwrite, - }; -@@ -134,7 +134,7 @@ static int nilfs_file_mmap(struct file * - * We have mostly NULL's here: the current defaults are ok for - * the nilfs filesystem. - */ --struct file_operations nilfs_file_operations = { -+const struct file_operations nilfs_file_operations = { - .llseek = generic_file_llseek, - .read = do_sync_read, - .write = do_sync_write, -@@ -151,7 +151,7 @@ struct file_operations nilfs_file_operat - .splice_read = generic_file_splice_read, - }; - --struct inode_operations nilfs_file_inode_operations = { -+const struct inode_operations nilfs_file_inode_operations = { - .truncate = nilfs_truncate, - .setattr = nilfs_setattr, - .permission = nilfs_permission, -diff -urNp linux-2.6.31.7/fs/nilfs2/gcinode.c linux-2.6.31.7/fs/nilfs2/gcinode.c ---- linux-2.6.31.7/fs/nilfs2/gcinode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/gcinode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -52,7 +52,7 @@ - #include "dat.h" - #include "ifile.h" - --static struct address_space_operations def_gcinode_aops = { -+static const struct address_space_operations def_gcinode_aops = { - .sync_page = block_sync_page, - }; - -diff -urNp linux-2.6.31.7/fs/nilfs2/inode.c linux-2.6.31.7/fs/nilfs2/inode.c ---- linux-2.6.31.7/fs/nilfs2/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -238,7 +238,7 @@ nilfs_direct_IO(int rw, struct kiocb *io - return size; - } - --struct address_space_operations nilfs_aops = { -+const struct address_space_operations nilfs_aops = { - .writepage = nilfs_writepage, - .readpage = nilfs_readpage, - .sync_page = block_sync_page, -diff -urNp linux-2.6.31.7/fs/nilfs2/mdt.c linux-2.6.31.7/fs/nilfs2/mdt.c ---- linux-2.6.31.7/fs/nilfs2/mdt.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/mdt.c 2009-12-10 22:15:16.000000000 -0500 -@@ -430,7 +430,7 @@ nilfs_mdt_write_page(struct page *page, - } - - --static struct address_space_operations def_mdt_aops = { -+static const struct address_space_operations def_mdt_aops = { - .writepage = nilfs_mdt_write_page, - .sync_page = block_sync_page, - }; -diff -urNp linux-2.6.31.7/fs/nilfs2/namei.c linux-2.6.31.7/fs/nilfs2/namei.c ---- linux-2.6.31.7/fs/nilfs2/namei.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/namei.c 2009-12-10 22:15:16.000000000 -0500 -@@ -448,7 +448,7 @@ out: - return err; - } - --struct inode_operations nilfs_dir_inode_operations = { -+const struct inode_operations nilfs_dir_inode_operations = { - .create = nilfs_create, - .lookup = nilfs_lookup, - .link = nilfs_link, -@@ -462,12 +462,12 @@ struct inode_operations nilfs_dir_inode_ - .permission = nilfs_permission, - }; - --struct inode_operations nilfs_special_inode_operations = { -+const struct inode_operations nilfs_special_inode_operations = { - .setattr = nilfs_setattr, - .permission = nilfs_permission, - }; - --struct inode_operations nilfs_symlink_inode_operations = { -+const struct inode_operations nilfs_symlink_inode_operations = { - .readlink = generic_readlink, - .follow_link = page_follow_link_light, - .put_link = page_put_link, -diff -urNp linux-2.6.31.7/fs/nilfs2/nilfs.h linux-2.6.31.7/fs/nilfs2/nilfs.h ---- linux-2.6.31.7/fs/nilfs2/nilfs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/nilfs.h 2009-12-10 22:15:16.000000000 -0500 -@@ -294,13 +294,13 @@ void nilfs_clear_gcdat_inode(struct the_ - /* - * Inodes and files operations - */ --extern struct file_operations nilfs_dir_operations; --extern struct inode_operations nilfs_file_inode_operations; --extern struct file_operations nilfs_file_operations; --extern struct address_space_operations nilfs_aops; --extern struct inode_operations nilfs_dir_inode_operations; --extern struct inode_operations nilfs_special_inode_operations; --extern struct inode_operations nilfs_symlink_inode_operations; -+extern const struct file_operations nilfs_dir_operations; -+extern const struct inode_operations nilfs_file_inode_operations; -+extern const struct file_operations nilfs_file_operations; -+extern const struct address_space_operations nilfs_aops; -+extern const struct inode_operations nilfs_dir_inode_operations; -+extern const struct inode_operations nilfs_special_inode_operations; -+extern const struct inode_operations nilfs_symlink_inode_operations; - - /* - * filesystem type -diff -urNp linux-2.6.31.7/fs/nilfs2/super.c linux-2.6.31.7/fs/nilfs2/super.c ---- linux-2.6.31.7/fs/nilfs2/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nilfs2/super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -529,7 +529,7 @@ static int nilfs_statfs(struct dentry *d - return 0; - } - --static struct super_operations nilfs_sops = { -+static const struct super_operations nilfs_sops = { - .alloc_inode = nilfs_alloc_inode, - .destroy_inode = nilfs_destroy_inode, - .dirty_inode = nilfs_dirty_inode, -diff -urNp linux-2.6.31.7/fs/nls/nls_base.c linux-2.6.31.7/fs/nls/nls_base.c ---- linux-2.6.31.7/fs/nls/nls_base.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/nls/nls_base.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/nls/nls_base.c linux-2.6.32/fs/nls/nls_base.c +--- linux-2.6.32/fs/nls/nls_base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/nls/nls_base.c 2009-12-04 21:40:48.475650978 -0500 @@ -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 */}, @@ -30039,10 +29636,10 @@ diff -urNp linux-2.6.31.7/fs/nls/nls_base.c linux-2.6.31.7/fs/nls/nls_base.c }; #define UNICODE_MAX 0x0010ffff -diff -urNp linux-2.6.31.7/fs/ntfs/file.c linux-2.6.31.7/fs/ntfs/file.c ---- linux-2.6.31.7/fs/ntfs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ntfs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -2291,6 +2291,6 @@ const struct inode_operations ntfs_file_ +diff -urNp linux-2.6.32/fs/ntfs/file.c linux-2.6.32/fs/ntfs/file.c +--- linux-2.6.32/fs/ntfs/file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ntfs/file.c 2009-12-04 21:40:48.476748112 -0500 +@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -30051,22 +29648,10 @@ diff -urNp linux-2.6.31.7/fs/ntfs/file.c linux-2.6.31.7/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops __read_only; -diff -urNp linux-2.6.31.7/fs/ocfs2/cluster/heartbeat.c linux-2.6.31.7/fs/ocfs2/cluster/heartbeat.c ---- linux-2.6.31.7/fs/ocfs2/cluster/heartbeat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/cluster/heartbeat.c 2009-12-10 22:15:16.000000000 -0500 -@@ -966,7 +966,7 @@ static ssize_t o2hb_debug_read(struct fi - } - #endif /* CONFIG_DEBUG_FS */ - --static struct file_operations o2hb_debug_fops = { -+static const struct file_operations o2hb_debug_fops = { - .open = o2hb_debug_open, - .release = o2hb_debug_release, - .read = o2hb_debug_read, -diff -urNp linux-2.6.31.7/fs/ocfs2/cluster/masklog.c linux-2.6.31.7/fs/ocfs2/cluster/masklog.c ---- linux-2.6.31.7/fs/ocfs2/cluster/masklog.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/cluster/masklog.c 2009-12-10 22:15:16.000000000 -0500 -@@ -134,7 +134,7 @@ static ssize_t mlog_store(struct kobject +diff -urNp linux-2.6.32/fs/ocfs2/cluster/masklog.c linux-2.6.32/fs/ocfs2/cluster/masklog.c +--- linux-2.6.32/fs/ocfs2/cluster/masklog.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ocfs2/cluster/masklog.c 2009-12-04 21:40:48.477676106 -0500 +@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject return mlog_mask_store(mlog_attr->mask, buf, count); } @@ -30075,97 +29660,10 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/cluster/masklog.c linux-2.6.31.7/fs/ocfs2/clu .show = mlog_show, .store = mlog_store, }; -diff -urNp linux-2.6.31.7/fs/ocfs2/cluster/netdebug.c linux-2.6.31.7/fs/ocfs2/cluster/netdebug.c ---- linux-2.6.31.7/fs/ocfs2/cluster/netdebug.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/cluster/netdebug.c 2009-12-10 22:15:16.000000000 -0500 -@@ -163,7 +163,7 @@ static void nst_seq_stop(struct seq_file - { - } - --static struct seq_operations nst_seq_ops = { -+static const struct seq_operations nst_seq_ops = { - .start = nst_seq_start, - .next = nst_seq_next, - .stop = nst_seq_stop, -@@ -207,7 +207,7 @@ static int nst_fop_release(struct inode - return seq_release_private(inode, file); - } - --static struct file_operations nst_seq_fops = { -+static const struct file_operations nst_seq_fops = { - .open = nst_fop_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -344,7 +344,7 @@ static void sc_seq_stop(struct seq_file - { - } - --static struct seq_operations sc_seq_ops = { -+static const struct seq_operations sc_seq_ops = { - .start = sc_seq_start, - .next = sc_seq_next, - .stop = sc_seq_stop, -@@ -388,7 +388,7 @@ static int sc_fop_release(struct inode * - return seq_release_private(inode, file); - } - --static struct file_operations sc_seq_fops = { -+static const struct file_operations sc_seq_fops = { - .open = sc_fop_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/fs/ocfs2/dlm/dlmdebug.c linux-2.6.31.7/fs/ocfs2/dlm/dlmdebug.c ---- linux-2.6.31.7/fs/ocfs2/dlm/dlmdebug.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/dlm/dlmdebug.c 2009-12-10 22:15:16.000000000 -0500 -@@ -479,7 +479,7 @@ bail: - return -ENOMEM; - } - --static struct file_operations debug_purgelist_fops = { -+static const struct file_operations debug_purgelist_fops = { - .open = debug_purgelist_open, - .release = debug_buffer_release, - .read = debug_buffer_read, -@@ -539,7 +539,7 @@ bail: - return -ENOMEM; - } - --static struct file_operations debug_mle_fops = { -+static const struct file_operations debug_mle_fops = { - .open = debug_mle_open, - .release = debug_buffer_release, - .read = debug_buffer_read, -@@ -683,7 +683,7 @@ static int lockres_seq_show(struct seq_f - return 0; - } - --static struct seq_operations debug_lockres_ops = { -+static const struct seq_operations debug_lockres_ops = { - .start = lockres_seq_start, - .stop = lockres_seq_stop, - .next = lockres_seq_next, -@@ -742,7 +742,7 @@ static int debug_lockres_release(struct - return seq_release_private(inode, file); - } - --static struct file_operations debug_lockres_fops = { -+static const struct file_operations debug_lockres_fops = { - .open = debug_lockres_open, - .release = debug_lockres_release, - .read = seq_read, -@@ -926,7 +926,7 @@ bail: - return -ENOMEM; - } - --static struct file_operations debug_state_fops = { -+static const struct file_operations debug_state_fops = { - .open = debug_state_open, - .release = debug_buffer_release, - .read = debug_buffer_read, -diff -urNp linux-2.6.31.7/fs/ocfs2/localalloc.c linux-2.6.31.7/fs/ocfs2/localalloc.c ---- linux-2.6.31.7/fs/ocfs2/localalloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/localalloc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1186,7 +1186,7 @@ static int ocfs2_local_alloc_slide_windo +diff -urNp linux-2.6.32/fs/ocfs2/localalloc.c linux-2.6.32/fs/ocfs2/localalloc.c +--- linux-2.6.32/fs/ocfs2/localalloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ocfs2/localalloc.c 2009-12-04 21:40:48.477676106 -0500 +@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -30174,22 +29672,10 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/localalloc.c linux-2.6.31.7/fs/ocfs2/localall status = 0; bail: -diff -urNp linux-2.6.31.7/fs/ocfs2/mmap.c linux-2.6.31.7/fs/ocfs2/mmap.c ---- linux-2.6.31.7/fs/ocfs2/mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/mmap.c 2009-12-10 22:15:16.000000000 -0500 -@@ -202,7 +202,7 @@ out: - return ret; - } - --static struct vm_operations_struct ocfs2_file_vm_ops = { -+static const struct vm_operations_struct ocfs2_file_vm_ops = { - .fault = ocfs2_fault, - .page_mkwrite = ocfs2_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/ocfs2/ocfs2.h linux-2.6.31.7/fs/ocfs2/ocfs2.h ---- linux-2.6.31.7/fs/ocfs2/ocfs2.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/ocfs2.h 2009-12-10 22:15:16.000000000 -0500 -@@ -191,11 +191,11 @@ enum ocfs2_vol_state +diff -urNp linux-2.6.32/fs/ocfs2/ocfs2.h linux-2.6.32/fs/ocfs2/ocfs2.h +--- linux-2.6.32/fs/ocfs2/ocfs2.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ocfs2/ocfs2.h 2009-12-04 21:40:48.478761218 -0500 +@@ -217,11 +217,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats { @@ -30206,9 +29692,9 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/ocfs2.h linux-2.6.31.7/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c ---- linux-2.6.31.7/fs/ocfs2/suballoc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/suballoc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ocfs2/suballoc.c linux-2.6.32/fs/ocfs2/suballoc.c +--- linux-2.6.32/fs/ocfs2/suballoc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ocfs2/suballoc.c 2009-12-04 21:40:48.479733682 -0500 @@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; @@ -30218,7 +29704,7 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -1650,7 +1650,7 @@ int ocfs2_claim_metadata(struct ocfs2_su +@@ -1651,7 +1651,7 @@ int ocfs2_claim_metadata(struct ocfs2_su mlog_errno(status); goto bail; } @@ -30227,7 +29713,7 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c *blkno_start = bg_blkno + (u64) *suballoc_bit_start; ac->ac_bits_given += (*num_bits); -@@ -1724,7 +1724,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s +@@ -1725,7 +1725,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s mlog_errno(status); goto bail; } @@ -30236,7 +29722,7 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c BUG_ON(num_bits != 1); -@@ -1826,7 +1826,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1827,7 +1827,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ cluster_start, num_clusters); if (!status) @@ -30245,7 +29731,7 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -1854,7 +1854,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1855,7 +1855,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, bg_blkno, bg_bit_off); @@ -30254,9 +29740,9 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/suballoc.c linux-2.6.31.7/fs/ocfs2/suballoc.c } } if (status < 0) { -diff -urNp linux-2.6.31.7/fs/ocfs2/super.c linux-2.6.31.7/fs/ocfs2/super.c ---- linux-2.6.31.7/fs/ocfs2/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ocfs2/super.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/ocfs2/super.c linux-2.6.32/fs/ocfs2/super.c +--- linux-2.6.32/fs/ocfs2/super.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/ocfs2/super.c 2009-12-04 21:40:48.480630764 -0500 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s "%10s => GlobalAllocs: %d LocalAllocs: %d " "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", @@ -30274,16 +29760,7 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/super.c linux-2.6.31.7/fs/ocfs2/super.c out += snprintf(buf + out, len - out, "%10s => State: %u Descriptor: %llu Size: %u bits " -@@ -373,7 +373,7 @@ static ssize_t ocfs2_debug_read(struct f - } - #endif /* CONFIG_DEBUG_FS */ - --static struct file_operations ocfs2_osb_debug_fops = { -+static const struct file_operations ocfs2_osb_debug_fops = { - .open = ocfs2_osb_debug_open, - .release = ocfs2_debug_release, - .read = ocfs2_debug_read, -@@ -1991,11 +1991,11 @@ static int ocfs2_initialize_super(struct +@@ -1998,11 +1998,11 @@ static int ocfs2_initialize_super(struct spin_lock_init(&osb->osb_xattr_lock); ocfs2_init_inode_steal_slot(osb); @@ -30300,93 +29777,9 @@ diff -urNp linux-2.6.31.7/fs/ocfs2/super.c linux-2.6.31.7/fs/ocfs2/super.c /* Copy the blockcheck stats from the superblock probe */ osb->osb_ecc_stats = *stats; -diff -urNp linux-2.6.31.7/fs/omfs/dir.c linux-2.6.31.7/fs/omfs/dir.c ---- linux-2.6.31.7/fs/omfs/dir.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/omfs/dir.c 2009-12-10 22:15:16.000000000 -0500 -@@ -489,7 +489,7 @@ out: - return ret; - } - --struct inode_operations omfs_dir_inops = { -+const struct inode_operations omfs_dir_inops = { - .lookup = omfs_lookup, - .mkdir = omfs_mkdir, - .rename = omfs_rename, -@@ -498,7 +498,7 @@ struct inode_operations omfs_dir_inops = - .rmdir = omfs_rmdir, - }; - --struct file_operations omfs_dir_operations = { -+const struct file_operations omfs_dir_operations = { - .read = generic_read_dir, - .readdir = omfs_readdir, - .llseek = generic_file_llseek, -diff -urNp linux-2.6.31.7/fs/omfs/file.c linux-2.6.31.7/fs/omfs/file.c ---- linux-2.6.31.7/fs/omfs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/omfs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -322,7 +322,7 @@ static sector_t omfs_bmap(struct address - return generic_block_bmap(mapping, block, omfs_get_block); - } - --struct file_operations omfs_file_operations = { -+const struct file_operations omfs_file_operations = { - .llseek = generic_file_llseek, - .read = do_sync_read, - .write = do_sync_write, -@@ -333,11 +333,11 @@ struct file_operations omfs_file_operati - .splice_read = generic_file_splice_read, - }; - --struct inode_operations omfs_file_inops = { -+const struct inode_operations omfs_file_inops = { - .truncate = omfs_truncate - }; - --struct address_space_operations omfs_aops = { -+const struct address_space_operations omfs_aops = { - .readpage = omfs_readpage, - .readpages = omfs_readpages, - .writepage = omfs_writepage, -diff -urNp linux-2.6.31.7/fs/omfs/inode.c linux-2.6.31.7/fs/omfs/inode.c ---- linux-2.6.31.7/fs/omfs/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/omfs/inode.c 2009-12-10 22:15:16.000000000 -0500 -@@ -278,7 +278,7 @@ static int omfs_statfs(struct dentry *de - return 0; - } - --static struct super_operations omfs_sops = { -+static const struct super_operations omfs_sops = { - .write_inode = omfs_write_inode, - .delete_inode = omfs_delete_inode, - .put_super = omfs_put_super, -diff -urNp linux-2.6.31.7/fs/omfs/omfs.h linux-2.6.31.7/fs/omfs/omfs.h ---- linux-2.6.31.7/fs/omfs/omfs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/omfs/omfs.h 2009-12-10 22:15:16.000000000 -0500 -@@ -44,16 +44,16 @@ extern int omfs_allocate_range(struct su - extern int omfs_clear_range(struct super_block *sb, u64 block, int count); - - /* dir.c */ --extern struct file_operations omfs_dir_operations; --extern struct inode_operations omfs_dir_inops; -+extern const struct file_operations omfs_dir_operations; -+extern const struct inode_operations omfs_dir_inops; - extern int omfs_make_empty(struct inode *inode, struct super_block *sb); - extern int omfs_is_bad(struct omfs_sb_info *sbi, struct omfs_header *header, - u64 fsblock); - - /* file.c */ --extern struct file_operations omfs_file_operations; --extern struct inode_operations omfs_file_inops; --extern struct address_space_operations omfs_aops; -+extern const struct file_operations omfs_file_operations; -+extern const struct inode_operations omfs_file_inops; -+extern const struct address_space_operations omfs_aops; - extern void omfs_make_empty_table(struct buffer_head *bh, int offset); - extern int omfs_shrink_inode(struct inode *inode); - -diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c ---- linux-2.6.31.7/fs/open.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/open.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/open.c linux-2.6.32/fs/open.c +--- linux-2.6.32/fs/open.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/open.c 2009-12-04 20:41:38.792707479 -0500 @@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -30397,7 +29790,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | time_attrs; if (filp) { -@@ -510,6 +513,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con +@@ -511,6 +514,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con if (__mnt_is_readonly(path.mnt)) res = -EROFS; @@ -30407,7 +29800,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c out_path_release: path_put(&path); out: -@@ -536,6 +542,8 @@ SYSCALL_DEFINE1(chdir, const char __user +@@ -537,6 +543,8 @@ SYSCALL_DEFINE1(chdir, const char __user if (error) goto dput_and_out; @@ -30416,7 +29809,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c set_fs_pwd(current->fs, &path); dput_and_out: -@@ -562,6 +570,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd +@@ -563,6 +571,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd goto out_putf; error = inode_permission(inode, MAY_EXEC | MAY_ACCESS); @@ -30430,7 +29823,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c if (!error) set_fs_pwd(current->fs, &file->f_path); out_putf: -@@ -587,7 +602,18 @@ SYSCALL_DEFINE1(chroot, const char __use +@@ -588,7 +603,18 @@ SYSCALL_DEFINE1(chroot, const char __use if (!capable(CAP_SYS_CHROOT)) goto dput_and_out; @@ -30449,7 +29842,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c error = 0; dput_and_out: path_put(&path); -@@ -615,13 +641,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd +@@ -616,13 +642,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd err = mnt_want_write_file(file); if (err) goto out_putf; @@ -30478,7 +29871,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(file->f_path.mnt); out_putf: fput(file); -@@ -644,13 +685,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons +@@ -645,13 +686,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto dput_and_out; @@ -30507,7 +29900,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(path.mnt); dput_and_out: path_put(&path); -@@ -663,12 +719,15 @@ SYSCALL_DEFINE2(chmod, const char __user +@@ -664,12 +720,15 @@ SYSCALL_DEFINE2(chmod, const char __user return sys_fchmodat(AT_FDCWD, filename, mode); } @@ -30524,7 +29917,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { newattrs.ia_valid |= ATTR_UID; -@@ -699,7 +758,7 @@ SYSCALL_DEFINE3(chown, const char __user +@@ -700,7 +759,7 @@ SYSCALL_DEFINE3(chown, const char __user error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -30533,7 +29926,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -724,7 +783,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons +@@ -725,7 +784,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -30542,7 +29935,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -743,7 +802,7 @@ SYSCALL_DEFINE3(lchown, const char __use +@@ -744,7 +803,7 @@ SYSCALL_DEFINE3(lchown, const char __use error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -30551,7 +29944,7 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -766,7 +825,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd +@@ -767,7 +826,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd goto out_fput; dentry = file->f_path.dentry; audit_inode(NULL, dentry); @@ -30560,9 +29953,9 @@ diff -urNp linux-2.6.31.7/fs/open.c linux-2.6.31.7/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.31.7/fs/pipe.c linux-2.6.31.7/fs/pipe.c ---- linux-2.6.31.7/fs/pipe.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/pipe.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/pipe.c linux-2.6.32/fs/pipe.c +--- linux-2.6.32/fs/pipe.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/pipe.c 2009-12-04 21:40:48.480630764 -0500 @@ -401,9 +401,9 @@ redo: } if (bufs) /* More to do? */ @@ -30686,42 +30079,12 @@ diff -urNp linux-2.6.31.7/fs/pipe.c linux-2.6.31.7/fs/pipe.c inode->i_fop = &rdwr_pipefifo_fops; /* -diff -urNp linux-2.6.31.7/fs/proc/Kconfig linux-2.6.31.7/fs/proc/Kconfig ---- linux-2.6.31.7/fs/proc/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/Kconfig 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/fs/proc/array.c linux-2.6.31.7/fs/proc/array.c ---- linux-2.6.31.7/fs/proc/array.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/array.c 2009-12-10 22:15:16.000000000 -0500 -@@ -321,6 +321,21 @@ static inline void task_context_switch_c - p->nivcsw); +diff -urNp linux-2.6.32/fs/proc/array.c linux-2.6.32/fs/proc/array.c +--- linux-2.6.32/fs/proc/array.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/array.c 2009-12-05 12:34:05.981845167 -0500 +@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct } + #endif /* CONFIG_MMU */ +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) +static inline void task_pax(struct seq_file *m, struct task_struct *p) @@ -30741,10 +30104,10 @@ diff -urNp linux-2.6.31.7/fs/proc/array.c linux-2.6.31.7/fs/proc/array.c int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -340,9 +355,20 @@ int proc_pid_status(struct seq_file *m, - task_show_regs(m, task); +@@ -430,9 +445,20 @@ int proc_pid_status(struct seq_file *m, #endif task_context_switch_counts(m, task); + task_show_stack_usage(m, task); + +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR) + task_pax(m, task); @@ -30762,7 +30125,7 @@ diff -urNp linux-2.6.31.7/fs/proc/array.c linux-2.6.31.7/fs/proc/array.c static int do_task_stat(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task, int whole) { -@@ -439,6 +465,19 @@ static int do_task_stat(struct seq_file +@@ -529,6 +555,19 @@ static int do_task_stat(struct seq_file gtime = task_gtime(task); } @@ -30782,23 +30145,23 @@ diff -urNp linux-2.6.31.7/fs/proc/array.c linux-2.6.31.7/fs/proc/array.c /* scale priority and nice values from timeslices to -20..20 */ /* to make it look like a "normal" Unix priority/nice value */ priority = task_prio(task); -@@ -479,9 +518,15 @@ static int do_task_stat(struct seq_file +@@ -569,9 +608,15 @@ static int do_task_stat(struct seq_file vsize, mm ? get_mm_rss(mm) : 0, rsslim, +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->start_code : 0), + PAX_RAND_FLAGS(mm) ? 1 : (mm ? mm->end_code : 0), -+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0), ++ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? task->stack_start : 0), +#else mm ? mm->start_code : 0, mm ? mm->end_code : 0, - (permitted && mm) ? mm->start_stack : 0, + (permitted && mm) ? task->stack_start : 0, +#endif esp, eip, /* The signal information here is obsolete. -@@ -534,3 +579,10 @@ int proc_pid_statm(struct seq_file *m, s +@@ -624,3 +669,10 @@ int proc_pid_statm(struct seq_file *m, s return 0; } @@ -30806,12 +30169,12 @@ diff -urNp linux-2.6.31.7/fs/proc/array.c linux-2.6.31.7/fs/proc/array.c +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR +int proc_pid_ipaddr(struct task_struct *task, char *buffer) +{ -+ return sprintf(buffer, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip)); ++ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); +} +#endif -diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c ---- linux-2.6.31.7/fs/proc/base.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/base.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/base.c linux-2.6.32/fs/proc/base.c +--- linux-2.6.32/fs/proc/base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/base.c 2009-12-04 20:41:38.844713518 -0500 @@ -213,6 +213,9 @@ static int check_mem_permission(struct t if (task == current) return 0; @@ -30887,7 +30250,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1438,7 +1461,11 @@ static struct inode *proc_pid_make_inode +@@ -1455,7 +1478,11 @@ static struct inode *proc_pid_make_inode rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -30899,7 +30262,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1456,6 +1483,9 @@ static int pid_getattr(struct vfsmount * +@@ -1473,6 +1500,9 @@ static int pid_getattr(struct vfsmount * struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -30909,7 +30272,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1463,12 +1493,34 @@ static int pid_getattr(struct vfsmount * +@@ -1480,12 +1510,34 @@ static int pid_getattr(struct vfsmount * stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -30945,7 +30308,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c } } rcu_read_unlock(); -@@ -1500,11 +1552,20 @@ static int pid_revalidate(struct dentry +@@ -1517,11 +1569,20 @@ static int pid_revalidate(struct dentry if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -30966,7 +30329,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1625,7 +1686,8 @@ static int proc_fd_info(struct inode *in +@@ -1642,7 +1703,8 @@ static int proc_fd_info(struct inode *in int fd = proc_fd(inode); if (task) { @@ -30976,7 +30339,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1877,12 +1939,22 @@ static const struct file_operations proc +@@ -1894,12 +1956,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -31001,7 +30364,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c return rv; } -@@ -1991,6 +2063,9 @@ static struct dentry *proc_pident_lookup +@@ -2008,6 +2080,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -31011,7 +30374,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2035,6 +2110,9 @@ static int proc_pident_readdir(struct fi +@@ -2052,6 +2127,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -31021,7 +30384,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2401,6 +2479,9 @@ static struct dentry *proc_base_lookup(s +@@ -2418,6 +2496,9 @@ static struct dentry *proc_base_lookup(s if (p > last) goto out; @@ -31031,7 +30394,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c error = proc_base_instantiate(dir, dentry, task, p); out: -@@ -2487,7 +2568,7 @@ static const struct pid_entry tgid_base_ +@@ -2504,7 +2585,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -31040,7 +30403,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2515,7 +2596,7 @@ static const struct pid_entry tgid_base_ +@@ -2532,7 +2613,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -31049,7 +30412,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2545,6 +2626,9 @@ static const struct pid_entry tgid_base_ +@@ -2562,6 +2643,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -31059,7 +30422,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2673,7 +2757,14 @@ static struct dentry *proc_pid_instantia +@@ -2686,7 +2770,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -31074,7 +30437,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2715,7 +2806,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2728,7 +2819,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -31086,7 +30449,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2780,6 +2875,10 @@ int proc_pid_readdir(struct file * filp, +@@ -2793,6 +2888,10 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); @@ -31097,7 +30460,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2798,6 +2897,20 @@ int proc_pid_readdir(struct file * filp, +@@ -2811,6 +2910,20 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -31118,7 +30481,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c filp->f_pos = iter.tgid + TGID_OFFSET; if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) { put_task_struct(iter.task); -@@ -2825,7 +2938,7 @@ static const struct pid_entry tid_base_s +@@ -2838,7 +2951,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -31127,7 +30490,7 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2852,7 +2965,7 @@ static const struct pid_entry tid_base_s +@@ -2865,7 +2978,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -31136,9 +30499,9 @@ diff -urNp linux-2.6.31.7/fs/proc/base.c linux-2.6.31.7/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.31.7/fs/proc/cmdline.c linux-2.6.31.7/fs/proc/cmdline.c ---- linux-2.6.31.7/fs/proc/cmdline.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/cmdline.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/cmdline.c linux-2.6.32/fs/proc/cmdline.c +--- linux-2.6.32/fs/proc/cmdline.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/cmdline.c 2009-12-04 20:41:38.844713518 -0500 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -31151,9 +30514,9 @@ diff -urNp linux-2.6.31.7/fs/proc/cmdline.c linux-2.6.31.7/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.31.7/fs/proc/devices.c linux-2.6.31.7/fs/proc/devices.c ---- linux-2.6.31.7/fs/proc/devices.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/devices.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/devices.c linux-2.6.32/fs/proc/devices.c +--- linux-2.6.32/fs/proc/devices.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/devices.c 2009-12-04 20:41:38.845709324 -0500 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -31166,9 +30529,9 @@ diff -urNp linux-2.6.31.7/fs/proc/devices.c linux-2.6.31.7/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.31.7/fs/proc/inode.c linux-2.6.31.7/fs/proc/inode.c ---- linux-2.6.31.7/fs/proc/inode.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/inode.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/inode.c linux-2.6.32/fs/proc/inode.c +--- linux-2.6.32/fs/proc/inode.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/inode.c 2009-12-04 20:41:38.846636479 -0500 @@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; @@ -31181,9 +30544,9 @@ diff -urNp linux-2.6.31.7/fs/proc/inode.c linux-2.6.31.7/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.31.7/fs/proc/internal.h linux-2.6.31.7/fs/proc/internal.h ---- linux-2.6.31.7/fs/proc/internal.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/internal.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/internal.h linux-2.6.32/fs/proc/internal.h +--- linux-2.6.32/fs/proc/internal.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/internal.h 2009-12-04 20:41:38.848633483 -0500 @@ -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, @@ -31194,55 +30557,52 @@ diff -urNp linux-2.6.31.7/fs/proc/internal.h linux-2.6.31.7/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.31.7/fs/proc/kcore.c linux-2.6.31.7/fs/proc/kcore.c ---- linux-2.6.31.7/fs/proc/kcore.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/kcore.c 2009-12-10 22:15:16.000000000 -0500 -@@ -314,16 +314,16 @@ read_kcore(struct file *file, char __use - tsz = buflen; - - while (buflen) { -- struct kcore_list *m; -+ struct kcore_list *kc; - - read_lock(&kclist_lock); -- for (m=kclist; m; m=m->next) { -- if (start >= m->addr && start < (m->addr+m->size)) -+ for (kc=kclist; kc; kc=kc->next) { -+ if (start >= kc->addr && start < (kc->addr+kc->size)) - break; - } - read_unlock(&kclist_lock); - -- if (m == NULL) { -+ if (kc == NULL) { - if (clear_user(buffer, tsz)) - return -EFAULT; - } else if (is_vmalloc_addr((void *)start)) { -@@ -368,7 +368,7 @@ read_kcore(struct file *file, char __use - */ - vmsize = __copy_from_user_inatomic( - elf_buf + (vmstart - start), -- (char *)vmstart, vmsize); -+ (char __user *)vmstart, vmsize); - } - read_unlock(&vmlist_lock); - if (copy_to_user(buffer, elf_buf, tsz)) { -@@ -410,10 +410,12 @@ read_kcore(struct file *file, char __use +diff -urNp linux-2.6.32/fs/proc/Kconfig linux-2.6.32/fs/proc/Kconfig +--- linux-2.6.32/fs/proc/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/Kconfig 2009-12-04 20:41:38.848633483 -0500 +@@ -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/fs/proc/kcore.c linux-2.6.32/fs/proc/kcore.c +--- linux-2.6.32/fs/proc/kcore.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/kcore.c 2009-12-04 20:59:44.308112362 -0500 +@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use - static int __init proc_kcore_init(void) + static int open_kcore(struct inode *inode, struct file *filp) { -+#if !defined(CONFIG_GRKERNSEC_PROC_ADD) && !defined(CONFIG_GRKERNSEC_HIDESYM) - proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations); - if (proc_root_kcore) - proc_root_kcore->size = - (size_t)high_memory - PAGE_OFFSET + PAGE_SIZE; ++#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM) ++ return -EPERM; +#endif - return 0; - } - module_init(proc_kcore_init); -diff -urNp linux-2.6.31.7/fs/proc/nommu.c linux-2.6.31.7/fs/proc/nommu.c ---- linux-2.6.31.7/fs/proc/nommu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/nommu.c 2009-12-10 22:15:16.000000000 -0500 + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; + if (kcore_need_update) +diff -urNp linux-2.6.32/fs/proc/nommu.c linux-2.6.32/fs/proc/nommu.c +--- linux-2.6.32/fs/proc/nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/nommu.c 2009-12-04 21:40:48.481675855 -0500 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -31252,18 +30612,9 @@ diff -urNp linux-2.6.31.7/fs/proc/nommu.c linux-2.6.31.7/fs/proc/nommu.c } seq_putc(m, '\n'); -@@ -109,7 +109,7 @@ static void *nommu_region_list_next(stru - return rb_next((struct rb_node *) v); - } - --static struct seq_operations proc_nommu_region_list_seqop = { -+static const struct seq_operations proc_nommu_region_list_seqop = { - .start = nommu_region_list_start, - .next = nommu_region_list_next, - .stop = nommu_region_list_stop, -diff -urNp linux-2.6.31.7/fs/proc/proc_net.c linux-2.6.31.7/fs/proc/proc_net.c ---- linux-2.6.31.7/fs/proc/proc_net.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/proc_net.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/proc_net.c linux-2.6.32/fs/proc/proc_net.c +--- linux-2.6.32/fs/proc/proc_net.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/proc_net.c 2009-12-04 20:41:38.850650139 -0500 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -31282,9 +30633,9 @@ diff -urNp linux-2.6.31.7/fs/proc/proc_net.c linux-2.6.31.7/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.31.7/fs/proc/proc_sysctl.c linux-2.6.31.7/fs/proc/proc_sysctl.c ---- linux-2.6.31.7/fs/proc/proc_sysctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/proc_sysctl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/proc_sysctl.c linux-2.6.32/fs/proc/proc_sysctl.c +--- linux-2.6.32/fs/proc/proc_sysctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/proc_sysctl.c 2009-12-04 20:41:38.851624932 -0500 @@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" @@ -31324,9 +30675,9 @@ diff -urNp linux-2.6.31.7/fs/proc/proc_sysctl.c linux-2.6.31.7/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -diff -urNp linux-2.6.31.7/fs/proc/root.c linux-2.6.31.7/fs/proc/root.c ---- linux-2.6.31.7/fs/proc/root.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/root.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/root.c linux-2.6.32/fs/proc/root.c +--- linux-2.6.32/fs/proc/root.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/root.c 2009-12-04 20:41:38.852708762 -0500 @@ -134,7 +134,15 @@ void __init proc_root_init(void) #ifdef CONFIG_PROC_DEVICETREE proc_device_tree_init(); @@ -31343,9 +30694,9 @@ diff -urNp linux-2.6.31.7/fs/proc/root.c linux-2.6.31.7/fs/proc/root.c proc_sys_init(); } -diff -urNp linux-2.6.31.7/fs/proc/task_mmu.c linux-2.6.31.7/fs/proc/task_mmu.c ---- linux-2.6.31.7/fs/proc/task_mmu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/task_mmu.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/task_mmu.c linux-2.6.32/fs/proc/task_mmu.c +--- linux-2.6.32/fs/proc/task_mmu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/task_mmu.c 2009-12-04 21:40:48.482667496 -0500 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -31432,9 +30783,9 @@ diff -urNp linux-2.6.31.7/fs/proc/task_mmu.c linux-2.6.31.7/fs/proc/task_mmu.c + (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack)) { name = "[stack]"; - } - } else { -@@ -384,9 +410,16 @@ static int show_smap(struct seq_file *m, + } else { + unsigned long stack_start; +@@ -403,9 +429,16 @@ static int show_smap(struct seq_file *m, }; memset(&mss, 0, sizeof mss); @@ -31454,7 +30805,7 @@ diff -urNp linux-2.6.31.7/fs/proc/task_mmu.c linux-2.6.31.7/fs/proc/task_mmu.c show_map_vma(m, vma); -@@ -402,7 +435,11 @@ static int show_smap(struct seq_file *m, +@@ -421,7 +454,11 @@ static int show_smap(struct seq_file *m, "Swap: %8lu kB\n" "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n", @@ -31466,9 +30817,9 @@ diff -urNp linux-2.6.31.7/fs/proc/task_mmu.c linux-2.6.31.7/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.31.7/fs/proc/task_nommu.c linux-2.6.31.7/fs/proc/task_nommu.c ---- linux-2.6.31.7/fs/proc/task_nommu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/proc/task_nommu.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/proc/task_nommu.c linux-2.6.32/fs/proc/task_nommu.c +--- linux-2.6.32/fs/proc/task_nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/proc/task_nommu.c 2009-12-04 21:40:48.482667496 -0500 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -31487,9 +30838,9 @@ diff -urNp linux-2.6.31.7/fs/proc/task_nommu.c linux-2.6.31.7/fs/proc/task_nommu } seq_putc(m, '\n'); -diff -urNp linux-2.6.31.7/fs/readdir.c linux-2.6.31.7/fs/readdir.c ---- linux-2.6.31.7/fs/readdir.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/readdir.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/readdir.c linux-2.6.32/fs/readdir.c +--- linux-2.6.32/fs/readdir.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/readdir.c 2009-12-04 20:41:38.862147495 -0500 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -31579,9 +30930,9 @@ diff -urNp linux-2.6.31.7/fs/readdir.c linux-2.6.31.7/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.31.7/fs/reiserfs/do_balan.c linux-2.6.31.7/fs/reiserfs/do_balan.c ---- linux-2.6.31.7/fs/reiserfs/do_balan.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/reiserfs/do_balan.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/reiserfs/do_balan.c linux-2.6.32/fs/reiserfs/do_balan.c +--- linux-2.6.32/fs/reiserfs/do_balan.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/reiserfs/do_balan.c 2009-12-04 21:40:48.483783475 -0500 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -31591,9 +30942,9 @@ diff -urNp linux-2.6.31.7/fs/reiserfs/do_balan.c linux-2.6.31.7/fs/reiserfs/do_b do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.31.7/fs/reiserfs/item_ops.c linux-2.6.31.7/fs/reiserfs/item_ops.c ---- linux-2.6.31.7/fs/reiserfs/item_ops.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/reiserfs/item_ops.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/reiserfs/item_ops.c linux-2.6.32/fs/reiserfs/item_ops.c +--- linux-2.6.32/fs/reiserfs/item_ops.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/reiserfs/item_ops.c 2009-12-04 21:40:48.483783475 -0500 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i vi->vi_index, vi->vi_type, vi->vi_ih); } @@ -31644,13 +30995,13 @@ diff -urNp linux-2.6.31.7/fs/reiserfs/item_ops.c linux-2.6.31.7/fs/reiserfs/item #endif -struct item_operations *item_ops[TYPE_ANY + 1] = { -+const struct item_operations *item_ops[TYPE_ANY + 1] = { ++const struct item_operations * const item_ops[TYPE_ANY + 1] = { &stat_data_ops, &indirect_ops, &direct_ops, -diff -urNp linux-2.6.31.7/fs/reiserfs/procfs.c linux-2.6.31.7/fs/reiserfs/procfs.c ---- linux-2.6.31.7/fs/reiserfs/procfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/reiserfs/procfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/reiserfs/procfs.c linux-2.6.32/fs/reiserfs/procfs.c +--- linux-2.6.32/fs/reiserfs/procfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/reiserfs/procfs.c 2009-12-04 21:40:48.484756376 -0500 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m "SMALL_TAILS " : "NO_TAILS ", replay_only(sb) ? "REPLAY_ONLY " : "", @@ -31660,22 +31011,10 @@ diff -urNp linux-2.6.31.7/fs/reiserfs/procfs.c linux-2.6.31.7/fs/reiserfs/procfs SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), SF(s_do_balance), SF(s_unneeded_left_neighbor), SF(s_good_search_by_key_reada), SF(s_bmaps), -diff -urNp linux-2.6.31.7/fs/romfs/super.c linux-2.6.31.7/fs/romfs/super.c ---- linux-2.6.31.7/fs/romfs/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/romfs/super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -284,7 +284,7 @@ static const struct file_operations romf - .readdir = romfs_readdir, - }; - --static struct inode_operations romfs_dir_inode_operations = { -+static const struct inode_operations romfs_dir_inode_operations = { - .lookup = romfs_lookup, - }; - -diff -urNp linux-2.6.31.7/fs/select.c linux-2.6.31.7/fs/select.c ---- linux-2.6.31.7/fs/select.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/select.c 2009-12-10 22:15:16.000000000 -0500 -@@ -19,6 +19,7 @@ +diff -urNp linux-2.6.32/fs/select.c linux-2.6.32/fs/select.c +--- linux-2.6.32/fs/select.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/select.c 2009-12-04 20:41:38.877811101 -0500 +@@ -20,6 +20,7 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/poll.h> @@ -31683,7 +31022,7 @@ diff -urNp linux-2.6.31.7/fs/select.c linux-2.6.31.7/fs/select.c #include <linux/personality.h> /* for STICKY_TIMEOUTS */ #include <linux/file.h> #include <linux/fdtable.h> -@@ -814,6 +815,7 @@ int do_sys_poll(struct pollfd __user *uf +@@ -821,6 +822,7 @@ int do_sys_poll(struct pollfd __user *uf struct poll_list *walk = head; unsigned long todo = nfds; @@ -31691,16 +31030,16 @@ diff -urNp linux-2.6.31.7/fs/select.c linux-2.6.31.7/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.31.7/fs/seq_file.c linux-2.6.31.7/fs/seq_file.c ---- linux-2.6.31.7/fs/seq_file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/seq_file.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/seq_file.c linux-2.6.32/fs/seq_file.c +--- linux-2.6.32/fs/seq_file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/seq_file.c 2009-12-04 21:40:48.486121445 -0500 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } if (!m->buf) { - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL); + m->size = PAGE_SIZE; -+ m->buf = kmalloc(m->size, GFP_KERNEL); ++ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!m->buf) return -ENOMEM; } @@ -31720,7 +31059,7 @@ diff -urNp linux-2.6.31.7/fs/seq_file.c linux-2.6.31.7/fs/seq_file.c if (!m->buf) { - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL); + m->size = PAGE_SIZE; -+ m->buf = kmalloc(m->size, GFP_KERNEL); ++ m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!m->buf) goto Enomem; } @@ -31734,9 +31073,9 @@ diff -urNp linux-2.6.31.7/fs/seq_file.c linux-2.6.31.7/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.31.7/fs/smbfs/symlink.c linux-2.6.31.7/fs/smbfs/symlink.c ---- linux-2.6.31.7/fs/smbfs/symlink.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/smbfs/symlink.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/smbfs/symlink.c linux-2.6.32/fs/smbfs/symlink.c +--- linux-2.6.32/fs/smbfs/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/smbfs/symlink.c 2009-12-04 21:40:48.486121445 -0500 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -31746,9 +31085,9 @@ diff -urNp linux-2.6.31.7/fs/smbfs/symlink.c linux-2.6.31.7/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c ---- linux-2.6.31.7/fs/splice.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/splice.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/splice.c linux-2.6.32/fs/splice.c +--- linux-2.6.32/fs/splice.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/splice.c 2009-12-04 21:40:48.486677406 -0500 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode pipe_lock(pipe); @@ -31770,7 +31109,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c } pipe_unlock(pipe); -@@ -529,7 +529,7 @@ static ssize_t kernel_readv(struct file +@@ -531,7 +531,7 @@ static ssize_t kernel_readv(struct file old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -31779,7 +31118,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c set_fs(old_fs); return res; -@@ -544,7 +544,7 @@ static ssize_t kernel_write(struct file +@@ -546,7 +546,7 @@ static ssize_t kernel_write(struct file old_fs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ @@ -31788,7 +31127,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c set_fs(old_fs); return res; -@@ -586,7 +586,7 @@ ssize_t default_file_splice_read(struct +@@ -588,7 +588,7 @@ ssize_t default_file_splice_read(struct goto err; this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset); @@ -31797,7 +31136,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c vec[i].iov_len = this_len; pages[i] = page; spd.nr_pages++; -@@ -806,10 +806,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed); +@@ -808,10 +808,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed); int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd) { while (!pipe->nrbufs) { @@ -31810,7 +31149,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c return 0; if (sd->flags & SPLICE_F_NONBLOCK) -@@ -1152,7 +1152,7 @@ ssize_t splice_direct_to_actor(struct fi +@@ -1146,7 +1146,7 @@ ssize_t splice_direct_to_actor(struct fi * out of the pipe right after the splice_to_pipe(). So set * PIPE_READERS appropriately. */ @@ -31819,7 +31158,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c current->splice_pipe = pipe; } -@@ -1710,9 +1710,9 @@ static int ipipe_prep(struct pipe_inode_ +@@ -1704,9 +1704,9 @@ static int ipipe_prep(struct pipe_inode_ ret = -ERESTARTSYS; break; } @@ -31831,7 +31170,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c if (flags & SPLICE_F_NONBLOCK) { ret = -EAGAIN; break; -@@ -1744,7 +1744,7 @@ static int opipe_prep(struct pipe_inode_ +@@ -1738,7 +1738,7 @@ static int opipe_prep(struct pipe_inode_ pipe_lock(pipe); while (pipe->nrbufs >= PIPE_BUFFERS) { @@ -31840,7 +31179,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c send_sig(SIGPIPE, current, 0); ret = -EPIPE; break; -@@ -1757,9 +1757,9 @@ static int opipe_prep(struct pipe_inode_ +@@ -1751,9 +1751,9 @@ static int opipe_prep(struct pipe_inode_ ret = -ERESTARTSYS; break; } @@ -31852,7 +31191,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c } pipe_unlock(pipe); -@@ -1795,14 +1795,14 @@ retry: +@@ -1789,14 +1789,14 @@ retry: pipe_double_lock(ipipe, opipe); do { @@ -31869,7 +31208,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c break; /* -@@ -1902,7 +1902,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1896,7 +1896,7 @@ static int link_pipe(struct pipe_inode_i pipe_double_lock(ipipe, opipe); do { @@ -31878,7 +31217,7 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c send_sig(SIGPIPE, current, 0); if (!ret) ret = -EPIPE; -@@ -1947,7 +1947,7 @@ static int link_pipe(struct pipe_inode_i +@@ -1941,7 +1941,7 @@ static int link_pipe(struct pipe_inode_i * return EAGAIN if we have the potential of some data in the * future, otherwise just return 0 */ @@ -31887,51 +31226,9 @@ diff -urNp linux-2.6.31.7/fs/splice.c linux-2.6.31.7/fs/splice.c ret = -EAGAIN; pipe_unlock(ipipe); -diff -urNp linux-2.6.31.7/fs/squashfs/super.c linux-2.6.31.7/fs/squashfs/super.c ---- linux-2.6.31.7/fs/squashfs/super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/squashfs/super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -44,7 +44,7 @@ - #include "squashfs.h" - - static struct file_system_type squashfs_fs_type; --static struct super_operations squashfs_super_ops; -+static const struct super_operations squashfs_super_ops; - - static int supported_squashfs_filesystem(short major, short minor, short comp) - { -@@ -444,7 +444,7 @@ static struct file_system_type squashfs_ - .fs_flags = FS_REQUIRES_DEV - }; - --static struct super_operations squashfs_super_ops = { -+static const struct super_operations squashfs_super_ops = { - .alloc_inode = squashfs_alloc_inode, - .destroy_inode = squashfs_destroy_inode, - .statfs = squashfs_statfs, -diff -urNp linux-2.6.31.7/fs/sysfs/bin.c linux-2.6.31.7/fs/sysfs/bin.c ---- linux-2.6.31.7/fs/sysfs/bin.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/sysfs/bin.c 2009-12-10 22:15:16.000000000 -0500 -@@ -40,7 +40,7 @@ struct bin_buffer { - struct mutex mutex; - void *buffer; - int mmapped; -- struct vm_operations_struct *vm_ops; -+ const struct vm_operations_struct *vm_ops; - struct file *file; - struct hlist_node list; - }; -@@ -331,7 +331,7 @@ static int bin_migrate(struct vm_area_st - } - #endif - --static struct vm_operations_struct bin_vm_ops = { -+static const struct vm_operations_struct bin_vm_ops = { - .open = bin_vma_open, - .close = bin_vma_close, - .fault = bin_fault, -diff -urNp linux-2.6.31.7/fs/sysfs/file.c linux-2.6.31.7/fs/sysfs/file.c ---- linux-2.6.31.7/fs/sysfs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/sysfs/file.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/sysfs/file.c linux-2.6.32/fs/sysfs/file.c +--- linux-2.6.32/fs/sysfs/file.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/sysfs/file.c 2009-12-04 21:40:48.487720397 -0500 @@ -53,7 +53,7 @@ struct sysfs_buffer { size_t count; loff_t pos; @@ -31968,10 +31265,10 @@ diff -urNp linux-2.6.31.7/fs/sysfs/file.c linux-2.6.31.7/fs/sysfs/file.c int error = -EACCES; char *p; -diff -urNp linux-2.6.31.7/fs/sysfs/symlink.c linux-2.6.31.7/fs/sysfs/symlink.c ---- linux-2.6.31.7/fs/sysfs/symlink.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/sysfs/symlink.c 2009-12-10 22:15:16.000000000 -0500 -@@ -203,7 +203,7 @@ static void *sysfs_follow_link(struct de +diff -urNp linux-2.6.32/fs/sysfs/symlink.c linux-2.6.32/fs/sysfs/symlink.c +--- linux-2.6.32/fs/sysfs/symlink.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/sysfs/symlink.c 2009-12-04 21:40:48.487720397 -0500 +@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) { @@ -31980,21 +31277,9 @@ diff -urNp linux-2.6.31.7/fs/sysfs/symlink.c linux-2.6.31.7/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.31.7/fs/ubifs/file.c linux-2.6.31.7/fs/ubifs/file.c ---- linux-2.6.31.7/fs/ubifs/file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/ubifs/file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -1536,7 +1536,7 @@ out_unlock: - return err; - } - --static struct vm_operations_struct ubifs_file_vm_ops = { -+static const struct vm_operations_struct ubifs_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = ubifs_vm_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/udf/balloc.c linux-2.6.31.7/fs/udf/balloc.c ---- linux-2.6.31.7/fs/udf/balloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/udf/balloc.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/udf/balloc.c linux-2.6.32/fs/udf/balloc.c +--- linux-2.6.32/fs/udf/balloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/udf/balloc.c 2009-12-04 21:40:48.488762591 -0500 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); @@ -32017,9 +31302,9 @@ diff -urNp linux-2.6.31.7/fs/udf/balloc.c linux-2.6.31.7/fs/udf/balloc.c udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, partmap->s_partition_len); -diff -urNp linux-2.6.31.7/fs/utimes.c linux-2.6.31.7/fs/utimes.c ---- linux-2.6.31.7/fs/utimes.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/utimes.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/utimes.c linux-2.6.32/fs/utimes.c +--- linux-2.6.32/fs/utimes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/utimes.c 2009-12-04 20:41:38.880719368 -0500 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -32041,31 +31326,10 @@ diff -urNp linux-2.6.31.7/fs/utimes.c linux-2.6.31.7/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.31.7/fs/xfs/linux-2.6/xfs_file.c linux-2.6.31.7/fs/xfs/linux-2.6/xfs_file.c ---- linux-2.6.31.7/fs/xfs/linux-2.6/xfs_file.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/xfs/linux-2.6/xfs_file.c 2009-12-10 22:15:16.000000000 -0500 -@@ -42,7 +42,7 @@ - - #include <linux/dcache.h> - --static struct vm_operations_struct xfs_file_vm_ops; -+static const struct vm_operations_struct xfs_file_vm_ops; - - STATIC ssize_t - xfs_file_aio_read( -@@ -271,7 +271,7 @@ const struct file_operations xfs_dir_fil - .fsync = xfs_file_fsync, - }; - --static struct vm_operations_struct xfs_file_vm_ops = { -+static const struct vm_operations_struct xfs_file_vm_ops = { - .fault = filemap_fault, - .page_mkwrite = xfs_vm_page_mkwrite, - }; -diff -urNp linux-2.6.31.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.31.7/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.31.7/fs/xfs/linux-2.6/xfs_iops.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/xfs/linux-2.6/xfs_iops.c 2009-12-10 22:15:16.000000000 -0500 -@@ -478,7 +478,7 @@ xfs_vn_put_link( +diff -urNp linux-2.6.32/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.32/fs/xfs/linux-2.6/xfs_iops.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/xfs/linux-2.6/xfs_iops.c 2009-12-04 21:40:48.488762591 -0500 +@@ -468,7 +468,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) { @@ -32074,30 +31338,9 @@ diff -urNp linux-2.6.31.7/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.31.7/fs/xfs/linu if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.31.7/fs/xfs/linux-2.6/xfs_super.c linux-2.6.31.7/fs/xfs/linux-2.6/xfs_super.c ---- linux-2.6.31.7/fs/xfs/linux-2.6/xfs_super.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/xfs/linux-2.6/xfs_super.c 2009-12-10 22:15:16.000000000 -0500 -@@ -67,7 +67,7 @@ - #include <linux/freezer.h> - #include <linux/parser.h> - --static struct super_operations xfs_super_operations; -+static const struct super_operations xfs_super_operations; - static kmem_zone_t *xfs_ioend_zone; - mempool_t *xfs_ioend_pool; - -@@ -1532,7 +1532,7 @@ xfs_fs_get_sb( - mnt); - } - --static struct super_operations xfs_super_operations = { -+static const struct super_operations xfs_super_operations = { - .alloc_inode = xfs_fs_alloc_inode, - .destroy_inode = xfs_fs_destroy_inode, - .write_inode = xfs_fs_write_inode, -diff -urNp linux-2.6.31.7/fs/xfs/xfs_bmap.c linux-2.6.31.7/fs/xfs/xfs_bmap.c ---- linux-2.6.31.7/fs/xfs/xfs_bmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/fs/xfs/xfs_bmap.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/fs/xfs/xfs_bmap.c linux-2.6.32/fs/xfs/xfs_bmap.c +--- linux-2.6.32/fs/xfs/xfs_bmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/fs/xfs/xfs_bmap.c 2009-12-04 21:40:48.491611717 -0500 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -32107,983 +31350,118 @@ diff -urNp linux-2.6.31.7/fs/xfs/xfs_bmap.c linux-2.6.31.7/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.31.7/grsecurity/Kconfig linux-2.6.31.7/grsecurity/Kconfig ---- linux-2.6.31.7/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/Kconfig 2009-12-10 22:15:16.000000000 -0500 -@@ -0,0 +1,937 @@ -+# -+# 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 || PPC32 || PPC64) && (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 (X86 && (!X86_32 || X86_WP_WORKS_OK)) -+ select PAX_MEMORY_UDEREF if (X86_32) -+ 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_REFCOUNT if (X86 || SPARC64) -+ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || 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_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. +diff -urNp linux-2.6.32/grsecurity/gracl_alloc.c linux-2.6.32/grsecurity/gracl_alloc.c +--- linux-2.6.32/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_alloc.c 2009-12-04 20:41:38.880719368 -0500 +@@ -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> + -+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. ++static unsigned long alloc_stack_next = 1; ++static unsigned long alloc_stack_size = 1; ++static void **alloc_stack; + -+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. ++static __inline__ int ++alloc_pop(void) ++{ ++ if (alloc_stack_next == 1) ++ return 0; + -+endmenu -+menu "Network Protections" -+depends on GRKERNSEC ++ kfree(alloc_stack[alloc_stack_next - 2]); + -+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. ++ alloc_stack_next--; + -+config GRKERNSEC_BLACKHOLE -+ bool "TCP/UDP blackhole" -+ help -+ If you say Y here, neither TCP resets nor ICMP -+ destination-unreachable packets will be sent in response to packets -+ send 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. ++ return 1; ++} + -+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. ++static __inline__ int ++alloc_push(void *buf) ++{ ++ if (alloc_stack_next >= alloc_stack_size) ++ return 1; + -+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. ++ alloc_stack[alloc_stack_next - 1] = buf; + -+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. ++ alloc_stack_next++; + -+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. ++ return 0; ++} + -+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. ++void * ++acl_alloc(unsigned long len) ++{ ++ void *ret = NULL; + -+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. ++ if (!len || len > PAGE_SIZE) ++ goto out; + -+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. ++ ret = kmalloc(len, GFP_KERNEL); + -+endmenu -+menu "Sysctl support" -+depends on GRKERNSEC && SYSCTL ++ if (ret) { ++ if (alloc_push(ret)) { ++ kfree(ret); ++ ret = NULL; ++ } ++ } + -+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* ++out: ++ return ret; ++} + -+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. ++void * ++acl_alloc_num(unsigned long num, unsigned long len) ++{ ++ if (!len || (num > (PAGE_SIZE / len))) ++ return NULL; + -+endmenu -+menu "Logging Options" -+depends on GRKERNSEC ++ return acl_alloc(num * len); ++} + -+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. ++void ++acl_free_all(void) ++{ ++ if (gr_acl_is_enabled() || !alloc_stack) ++ return; + -+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. ++ while (alloc_pop()) ; + -+endmenu ++ if (alloc_stack) { ++ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE) ++ kfree(alloc_stack); ++ else ++ vfree(alloc_stack); ++ } + -+endmenu -diff -urNp linux-2.6.31.7/grsecurity/Makefile linux-2.6.31.7/grsecurity/Makefile ---- linux-2.6.31.7/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/Makefile 2009-12-10 22:15:16.000000000 -0500 -@@ -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 ++ alloc_stack = NULL; ++ alloc_stack_size = 1; ++ alloc_stack_next = 1; + -+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 ++ return; ++} + -+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 ++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 *)); + -+ifndef CONFIG_GRKERNSEC -+obj-y += grsec_disabled.o -+endif ++ alloc_stack_size = size; + -+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.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c ---- linux-2.6.31.7/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl.c 2009-12-10 22:15:16.000000000 -0500 ++ if (!alloc_stack) ++ return 0; ++ else ++ return 1; ++} +diff -urNp linux-2.6.32/grsecurity/gracl.c linux-2.6.32/grsecurity/gracl.c +--- linux-2.6.32/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl.c 2009-12-11 20:51:54.534459275 -0500 @@ -0,0 +1,3912 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -35006,7 +33384,7 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype, + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, NIPQUAD(task->signal->curr_ip)); ++ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->curr_ip); + + return; +} @@ -35020,7 +33398,7 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype, + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ 1UL, 1UL, path, (unsigned long) mode, NIPQUAD(task->signal->curr_ip)); ++ 1UL, 1UL, path, (unsigned long) mode, &task->signal->curr_ip); + + return; +} @@ -35035,7 +33413,7 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype, + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry, + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename, -+ type, real, effective, fs, NIPQUAD(task->signal->curr_ip)); ++ type, real, effective, fs, &task->signal->curr_ip); + + return; +} @@ -35968,8 +34346,8 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c +write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos) +{ + struct gr_arg_wrapper uwrap; -+ unsigned char *sprole_salt; -+ unsigned char *sprole_sum; ++ unsigned char *sprole_salt = NULL; ++ unsigned char *sprole_sum = NULL; + int error = sizeof (struct gr_arg_wrapper); + int error2 = 0; + @@ -36400,7 +34778,7 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, + task->role->roletype, cred->uid, cred->gid, acl->filename, + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max, -+ "", (unsigned long) res, NIPQUAD(task->signal->curr_ip)); ++ "", (unsigned long) res, &task->signal->curr_ip); + } + + return; @@ -36997,118 +35375,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl.c linux-2.6.31.7/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.31.7/grsecurity/gracl_alloc.c linux-2.6.31.7/grsecurity/gracl_alloc.c ---- linux-2.6.31.7/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_alloc.c 2009-12-10 22:15:16.000000000 -0500 -@@ -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.31.7/grsecurity/gracl_cap.c linux-2.6.31.7/grsecurity/gracl_cap.c ---- linux-2.6.31.7/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_cap.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_cap.c linux-2.6.32/grsecurity/gracl_cap.c +--- linux-2.6.32/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_cap.c 2009-12-05 12:37:01.630131297 -0500 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -37199,7 +35468,7 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_cap.c linux-2.6.31.7/grsecurity/gracl + gr_to_filename(task->exec_file->f_path.dentry, + task->exec_file->f_path.mnt) : curracl->filename, + curracl->filename, 0UL, -+ 0UL, "", (unsigned long) cap, NIPQUAD(task->signal->curr_ip)); ++ 0UL, "", (unsigned long) cap, &task->signal->curr_ip); + return 1; + } + @@ -37241,9 +35510,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_cap.c linux-2.6.31.7/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.31.7/grsecurity/gracl_fs.c linux-2.6.31.7/grsecurity/gracl_fs.c ---- linux-2.6.31.7/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_fs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_fs.c linux-2.6.32/grsecurity/gracl_fs.c +--- linux-2.6.32/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_fs.c 2009-12-04 20:41:38.887716041 -0500 @@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -37669,10 +35938,10 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_fs.c linux-2.6.31.7/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ip.c ---- linux-2.6.31.7/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_ip.c 2009-12-10 22:15:16.000000000 -0500 -@@ -0,0 +1,340 @@ +diff -urNp linux-2.6.32/grsecurity/gracl_ip.c linux-2.6.32/grsecurity/gracl_ip.c +--- linux-2.6.32/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_ip.c 2009-12-05 12:36:48.119146098 -0500 +@@ -0,0 +1,339 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> +#include <asm/errno.h> @@ -37785,9 +36054,8 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ + gr_to_filename(current->exec_file->f_path.dentry, + current->exec_file->f_path.mnt) : + curr->filename, curr->filename, -+ NIPQUAD(fakeip), 0, type, -+ protocol, GR_CONNECT, -+NIPQUAD(current->signal->curr_ip)); ++ &fakeip, 0, type, ++ protocol, GR_CONNECT, ¤t->signal->curr_ip); + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) { + __u32 fakeip = 0; + security_learn(GR_IP_LEARN_MSG, current->role->rolename, @@ -37796,8 +36064,8 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ + gr_to_filename(current->exec_file->f_path.dentry, + current->exec_file->f_path.mnt) : + curr->filename, curr->filename, -+ NIPQUAD(fakeip), 0, type, -+ protocol, GR_BIND, NIPQUAD(current->signal->curr_ip)); ++ &fakeip, 0, type, ++ protocol, GR_BIND, ¤t->signal->curr_ip); + } + /* we'll log when they use connect or bind */ + goto exit; @@ -37888,8 +36156,8 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ + gr_to_filename(current->exec_file->f_path.dentry, + current->exec_file->f_path.mnt) : + curr->filename, curr->filename, -+ NIPQUAD(ip_addr), ip_port, type, -+ sk->sk_protocol, mode, NIPQUAD(current->signal->curr_ip)); ++ &ip_addr, ip_port, type, ++ sk->sk_protocol, mode, ¤t->signal->curr_ip); + return 0; + } + @@ -37943,9 +36211,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ + +denied: + if (mode == GR_BIND) -+ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, NIPQUAD(ip_addr), ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); ++ gr_log_int5_str2(GR_DONT_AUDIT, GR_BIND_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); + else if (mode == GR_CONNECT) -+ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, NIPQUAD(ip_addr), ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); ++ gr_log_int5_str2(GR_DONT_AUDIT, GR_CONNECT_ACL_MSG, &ip_addr, ip_port, gr_socktype_to_name(type), gr_proto_to_name(sk->sk_protocol)); + + return -EACCES; +} @@ -38013,9 +36281,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_ip.c linux-2.6.31.7/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.31.7/grsecurity/gracl_learn.c linux-2.6.31.7/grsecurity/gracl_learn.c ---- linux-2.6.31.7/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_learn.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_learn.c linux-2.6.32/grsecurity/gracl_learn.c +--- linux-2.6.32/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_learn.c 2009-12-04 20:41:38.888714841 -0500 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -38228,9 +36496,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_learn.c linux-2.6.31.7/grsecurity/gra + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.31.7/grsecurity/gracl_res.c linux-2.6.31.7/grsecurity/gracl_res.c ---- linux-2.6.31.7/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_res.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_res.c linux-2.6.32/grsecurity/gracl_res.c +--- linux-2.6.32/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_res.c 2009-12-04 20:41:38.888714841 -0500 @@ -0,0 +1,58 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38290,9 +36558,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_res.c linux-2.6.31.7/grsecurity/gracl + + return; +} -diff -urNp linux-2.6.31.7/grsecurity/gracl_segv.c linux-2.6.31.7/grsecurity/gracl_segv.c ---- linux-2.6.31.7/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_segv.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_segv.c linux-2.6.32/grsecurity/gracl_segv.c +--- linux-2.6.32/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_segv.c 2009-12-04 20:41:38.888714841 -0500 @@ -0,0 +1,307 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -38601,9 +36869,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_segv.c linux-2.6.31.7/grsecurity/grac + + return; +} -diff -urNp linux-2.6.31.7/grsecurity/gracl_shm.c linux-2.6.31.7/grsecurity/gracl_shm.c ---- linux-2.6.31.7/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/gracl_shm.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/gracl_shm.c linux-2.6.32/grsecurity/gracl_shm.c +--- linux-2.6.32/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/gracl_shm.c 2009-12-04 20:41:38.888714841 -0500 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -38642,9 +36910,9 @@ diff -urNp linux-2.6.31.7/grsecurity/gracl_shm.c linux-2.6.31.7/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_chdir.c linux-2.6.31.7/grsecurity/grsec_chdir.c ---- linux-2.6.31.7/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_chdir.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_chdir.c linux-2.6.32/grsecurity/grsec_chdir.c +--- linux-2.6.32/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_chdir.c 2009-12-04 20:41:38.888714841 -0500 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -38665,9 +36933,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_chdir.c linux-2.6.31.7/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_chroot.c linux-2.6.31.7/grsecurity/grsec_chroot.c ---- linux-2.6.31.7/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_chroot.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_chroot.c linux-2.6.32/grsecurity/grsec_chroot.c +--- linux-2.6.32/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_chroot.c 2009-12-04 20:41:38.889717345 -0500 @@ -0,0 +1,348 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39017,9 +37285,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_chroot.c linux-2.6.31.7/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.31.7/grsecurity/grsec_disabled.c linux-2.6.31.7/grsecurity/grsec_disabled.c ---- linux-2.6.31.7/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_disabled.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_disabled.c linux-2.6.32/grsecurity/grsec_disabled.c +--- linux-2.6.32/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_disabled.c 2009-12-04 20:41:38.889717345 -0500 @@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -39447,9 +37715,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_disabled.c linux-2.6.31.7/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.31.7/grsecurity/grsec_exec.c linux-2.6.31.7/grsecurity/grsec_exec.c ---- linux-2.6.31.7/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_exec.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_exec.c linux-2.6.32/grsecurity/grsec_exec.c +--- linux-2.6.32/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_exec.c 2009-12-04 20:41:38.889717345 -0500 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39540,9 +37808,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_exec.c linux-2.6.31.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_fifo.c linux-2.6.31.7/grsecurity/grsec_fifo.c ---- linux-2.6.31.7/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_fifo.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_fifo.c linux-2.6.32/grsecurity/grsec_fifo.c +--- linux-2.6.32/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_fifo.c 2009-12-04 20:41:38.889717345 -0500 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39568,9 +37836,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_fifo.c linux-2.6.31.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_fork.c linux-2.6.31.7/grsecurity/grsec_fork.c ---- linux-2.6.31.7/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_fork.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_fork.c linux-2.6.32/grsecurity/grsec_fork.c +--- linux-2.6.32/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_fork.c 2009-12-04 20:41:38.889717345 -0500 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39587,9 +37855,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_fork.c linux-2.6.31.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_init.c linux-2.6.31.7/grsecurity/grsec_init.c ---- linux-2.6.31.7/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_init.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_init.c linux-2.6.32/grsecurity/grsec_init.c +--- linux-2.6.32/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_init.c 2009-12-04 20:41:38.890719133 -0500 @@ -0,0 +1,231 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39822,9 +38090,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_init.c linux-2.6.31.7/grsecurity/grse + + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_link.c linux-2.6.31.7/grsecurity/grsec_link.c ---- linux-2.6.31.7/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_link.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_link.c linux-2.6.32/grsecurity/grsec_link.c +--- linux-2.6.32/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_link.c 2009-12-04 20:41:38.890719133 -0500 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39869,9 +38137,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_link.c linux-2.6.31.7/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_log.c linux-2.6.31.7/grsecurity/grsec_log.c ---- linux-2.6.31.7/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_log.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_log.c linux-2.6.32/grsecurity/grsec_log.c +--- linux-2.6.32/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_log.c 2009-12-05 12:38:12.577989152 -0500 @@ -0,0 +1,294 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -39932,11 +38200,11 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_log.c linux-2.6.31.7/grsecurity/grsec +set_fmt: + memset(buf, 0, PAGE_SIZE); + if (current->signal->curr_ip && gr_acl_is_enabled()) { -+ sprintf(fmt, "%s%s", loglevel, "grsec: From %u.%u.%u.%u: (%.64s:%c:%.950s) "); -+ snprintf(buf, PAGE_SIZE - 1, fmt, NIPQUAD(current->signal->curr_ip), current->role->rolename, gr_roletype_to_char(), current->acl->filename); ++ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) "); ++ snprintf(buf, PAGE_SIZE - 1, fmt, ¤t->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename); + } else if (current->signal->curr_ip) { -+ sprintf(fmt, "%s%s", loglevel, "grsec: From %u.%u.%u.%u: "); -+ snprintf(buf, PAGE_SIZE - 1, fmt, NIPQUAD(current->signal->curr_ip)); ++ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: "); ++ snprintf(buf, PAGE_SIZE - 1, fmt, ¤t->signal->curr_ip); + } else if (gr_acl_is_enabled()) { + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) "); + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename); @@ -40013,7 +38281,7 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_log.c linux-2.6.31.7/grsecurity/grsec + switch (argtypes) { + case GR_TTYSNIFF: + task = va_arg(ap, struct task_struct *); -+ gr_log_middle_varargs(audit, msg, NIPQUAD(task->signal->curr_ip), gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid); ++ gr_log_middle_varargs(audit, msg, &task->signal->curr_ip, gr_task_fullpath0(task), task->comm, task->pid, gr_parent_task_fullpath0(task), task->parent->comm, task->parent->pid); + break; + case GR_SYSCTL_HIDDEN: + str1 = va_arg(ap, char *); @@ -40157,7 +38425,7 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_log.c linux-2.6.31.7/grsecurity/grsec + cred = __task_cred(task); + pcred = __task_cred(task->parent); + -+ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, NIPQUAD(task->signal->curr_ip), tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, NIPQUAD(task->parent->signal->curr_ip), tty_name(task->parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid); ++ gr_log_middle_varargs(audit, msg, gr_task_fullpath(task), task->comm, task->pid, &task->signal->curr_ip, tty_name(task->signal->tty, cur_tty), cred->uid, cred->euid, cred->gid, cred->egid, wday, whr, wmin, wsec, cday, chr, cmin, csec, (task->flags & PF_SIGNALED) ? "killed by signal" : "exited", ulong1, gr_parent_task_fullpath(task), task->parent->comm, task->parent->pid, &task->parent->signal->curr_ip, tty_name(task->parent->signal->tty, parent_tty), pcred->uid, pcred->euid, pcred->gid, pcred->egid); + } + break; + default: @@ -40167,9 +38435,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_log.c linux-2.6.31.7/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_mem.c linux-2.6.31.7/grsecurity/grsec_mem.c ---- linux-2.6.31.7/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_mem.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_mem.c linux-2.6.32/grsecurity/grsec_mem.c +--- linux-2.6.32/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_mem.c 2009-12-04 20:41:38.891720793 -0500 @@ -0,0 +1,85 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40256,9 +38524,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_mem.c linux-2.6.31.7/grsecurity/grsec + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_mount.c linux-2.6.31.7/grsecurity/grsec_mount.c ---- linux-2.6.31.7/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_mount.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_mount.c linux-2.6.32/grsecurity/grsec_mount.c +--- linux-2.6.32/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_mount.c 2009-12-04 20:41:38.891720793 -0500 @@ -0,0 +1,62 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40322,9 +38590,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_mount.c linux-2.6.31.7/grsecurity/grs +#endif + return 0; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_sig.c linux-2.6.31.7/grsecurity/grsec_sig.c ---- linux-2.6.31.7/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_sig.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_sig.c linux-2.6.32/grsecurity/grsec_sig.c +--- linux-2.6.32/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_sig.c 2009-12-04 20:41:38.891720793 -0500 @@ -0,0 +1,65 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -40391,9 +38659,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_sig.c linux-2.6.31.7/grsecurity/grsec + return; +} + -diff -urNp linux-2.6.31.7/grsecurity/grsec_sock.c linux-2.6.31.7/grsecurity/grsec_sock.c ---- linux-2.6.31.7/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_sock.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_sock.c linux-2.6.32/grsecurity/grsec_sock.c +--- linux-2.6.32/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_sock.c 2009-12-04 20:41:38.891720793 -0500 @@ -0,0 +1,269 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -40664,9 +38932,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_sock.c linux-2.6.31.7/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_sysctl.c linux-2.6.31.7/grsecurity/grsec_sysctl.c ---- linux-2.6.31.7/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_sysctl.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_sysctl.c linux-2.6.32/grsecurity/grsec_sysctl.c +--- linux-2.6.32/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_sysctl.c 2009-12-04 20:41:38.892715756 -0500 @@ -0,0 +1,419 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41087,9 +39355,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_sysctl.c linux-2.6.31.7/grsecurity/gr + { .ctl_name = 0 } +}; +#endif -diff -urNp linux-2.6.31.7/grsecurity/grsec_textrel.c linux-2.6.31.7/grsecurity/grsec_textrel.c ---- linux-2.6.31.7/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_textrel.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_textrel.c linux-2.6.32/grsecurity/grsec_textrel.c +--- linux-2.6.32/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_textrel.c 2009-12-04 20:41:38.892715756 -0500 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41107,9 +39375,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_textrel.c linux-2.6.31.7/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_time.c linux-2.6.31.7/grsecurity/grsec_time.c ---- linux-2.6.31.7/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_time.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_time.c linux-2.6.32/grsecurity/grsec_time.c +--- linux-2.6.32/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_time.c 2009-12-04 20:41:38.892715756 -0500 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41124,9 +39392,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_time.c linux-2.6.31.7/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.31.7/grsecurity/grsec_tpe.c linux-2.6.31.7/grsecurity/grsec_tpe.c ---- linux-2.6.31.7/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsec_tpe.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsec_tpe.c linux-2.6.32/grsecurity/grsec_tpe.c +--- linux-2.6.32/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsec_tpe.c 2009-12-04 20:41:38.892715756 -0500 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -41166,9 +39434,9 @@ diff -urNp linux-2.6.31.7/grsecurity/grsec_tpe.c linux-2.6.31.7/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.31.7/grsecurity/grsum.c linux-2.6.31.7/grsecurity/grsum.c ---- linux-2.6.31.7/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/grsecurity/grsum.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/grsum.c linux-2.6.32/grsecurity/grsum.c +--- linux-2.6.32/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/grsum.c 2009-12-04 20:41:38.893714687 -0500 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -41229,9 +39497,983 @@ diff -urNp linux-2.6.31.7/grsecurity/grsum.c linux-2.6.31.7/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.31.7/include/acpi/acpi_drivers.h linux-2.6.31.7/include/acpi/acpi_drivers.h ---- linux-2.6.31.7/include/acpi/acpi_drivers.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/acpi/acpi_drivers.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/grsecurity/Kconfig linux-2.6.32/grsecurity/Kconfig +--- linux-2.6.32/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/Kconfig 2009-12-04 20:41:38.894616171 -0500 +@@ -0,0 +1,937 @@ ++# ++# 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 || PPC32 || PPC64) && (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 (X86 && (!X86_32 || X86_WP_WORKS_OK)) ++ select PAX_MEMORY_UDEREF if (X86_32) ++ 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_REFCOUNT if (X86 || SPARC64) ++ select PAX_USERCOPY if ((X86 || PPC32 || PPC64 || 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_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" ++ help ++ If you say Y here, neither TCP resets nor ICMP ++ destination-unreachable packets will be sent in response to packets ++ send 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. ++ ++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_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/grsecurity/Makefile linux-2.6.32/grsecurity/Makefile +--- linux-2.6.32/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/grsecurity/Makefile 2009-12-04 20:41:38.894616171 -0500 +@@ -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 ++ ++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/include/acpi/acpi_drivers.h linux-2.6.32/include/acpi/acpi_drivers.h +--- linux-2.6.32/include/acpi/acpi_drivers.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/acpi/acpi_drivers.h 2009-12-04 21:40:48.495757693 -0500 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp Dock Station -------------------------------------------------------------------------- */ @@ -41261,9 +40503,9 @@ diff -urNp linux-2.6.31.7/include/acpi/acpi_drivers.h linux-2.6.31.7/include/acp void *context) { return -ENODEV; -diff -urNp linux-2.6.31.7/include/asm-generic/atomic.h linux-2.6.31.7/include/asm-generic/atomic.h ---- linux-2.6.31.7/include/asm-generic/atomic.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/atomic.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/atomic.h linux-2.6.32/include/asm-generic/atomic.h +--- linux-2.6.32/include/asm-generic/atomic.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/atomic.h 2009-12-04 21:40:48.495757693 -0500 @@ -36,6 +36,15 @@ #define atomic_read(v) ((v)->counter) @@ -41329,9 +40571,9 @@ diff -urNp linux-2.6.31.7/include/asm-generic/atomic.h linux-2.6.31.7/include/as static inline void atomic_dec(atomic_t *v) { atomic_sub_return(1, v); -diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31.7/include/asm-generic/dma-mapping-common.h ---- linux-2.6.31.7/include/asm-generic/dma-mapping-common.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/dma-mapping-common.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/dma-mapping-common.h linux-2.6.32/include/asm-generic/dma-mapping-common.h +--- linux-2.6.32/include/asm-generic/dma-mapping-common.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/dma-mapping-common.h 2009-12-04 21:40:48.496764094 -0500 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ enum dma_data_direction dir, struct dma_attrs *attrs) @@ -41395,7 +40637,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_for_cpu) -@@ -110,7 +110,7 @@ static inline void dma_sync_single_for_d +@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_d dma_addr_t addr, size_t size, enum dma_data_direction dir) { @@ -41404,7 +40646,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_for_device) -@@ -125,7 +125,7 @@ static inline void dma_sync_single_range +@@ -123,7 +123,7 @@ static inline void dma_sync_single_range size_t size, enum dma_data_direction dir) { @@ -41413,7 +40655,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_range_for_cpu) { -@@ -143,7 +143,7 @@ static inline void dma_sync_single_range +@@ -140,7 +140,7 @@ static inline void dma_sync_single_range size_t size, enum dma_data_direction dir) { @@ -41422,7 +40664,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_single_range_for_device) { -@@ -159,7 +159,7 @@ static inline void +@@ -155,7 +155,7 @@ static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction dir) { @@ -41431,7 +40673,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_cpu) -@@ -172,7 +172,7 @@ static inline void +@@ -167,7 +167,7 @@ static inline void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction dir) { @@ -41440,9 +40682,9 @@ diff -urNp linux-2.6.31.7/include/asm-generic/dma-mapping-common.h linux-2.6.31. BUG_ON(!valid_dma_direction(dir)); if (ops->sync_sg_for_device) -diff -urNp linux-2.6.31.7/include/asm-generic/futex.h linux-2.6.31.7/include/asm-generic/futex.h ---- linux-2.6.31.7/include/asm-generic/futex.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/futex.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/futex.h linux-2.6.32/include/asm-generic/futex.h +--- linux-2.6.32/include/asm-generic/futex.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/futex.h 2009-12-04 21:40:48.498527508 -0500 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -41461,9 +40703,9 @@ diff -urNp linux-2.6.31.7/include/asm-generic/futex.h linux-2.6.31.7/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.31.7/include/asm-generic/int-l64.h linux-2.6.31.7/include/asm-generic/int-l64.h ---- linux-2.6.31.7/include/asm-generic/int-l64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/int-l64.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/int-l64.h linux-2.6.32/include/asm-generic/int-l64.h +--- linux-2.6.32/include/asm-generic/int-l64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/int-l64.h 2009-12-04 21:40:48.498527508 -0500 @@ -46,6 +46,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -41473,9 +40715,9 @@ diff -urNp linux-2.6.31.7/include/asm-generic/int-l64.h linux-2.6.31.7/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.31.7/include/asm-generic/int-ll64.h linux-2.6.31.7/include/asm-generic/int-ll64.h ---- linux-2.6.31.7/include/asm-generic/int-ll64.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/int-ll64.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/int-ll64.h linux-2.6.32/include/asm-generic/int-ll64.h +--- linux-2.6.32/include/asm-generic/int-ll64.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/int-ll64.h 2009-12-04 21:40:48.499755489 -0500 @@ -51,6 +51,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -41485,22 +40727,22 @@ diff -urNp linux-2.6.31.7/include/asm-generic/int-ll64.h linux-2.6.31.7/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.31.7/include/asm-generic/kmap_types.h linux-2.6.31.7/include/asm-generic/kmap_types.h ---- linux-2.6.31.7/include/asm-generic/kmap_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/kmap_types.h 2009-12-10 22:15:16.000000000 -0500 -@@ -27,7 +27,8 @@ D(15) KM_UML_USERCOPY, /* UML specific, - D(16) KM_IRQ_PTE, - D(17) KM_NMI, - D(18) KM_NMI_PTE, --D(19) KM_TYPE_NR -+D(19) KM_CLEARPAGE, -+D(20) KM_TYPE_NR - }; - - #undef D -diff -urNp linux-2.6.31.7/include/asm-generic/pgtable.h linux-2.6.31.7/include/asm-generic/pgtable.h ---- linux-2.6.31.7/include/asm-generic/pgtable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/pgtable.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/asm-generic/kmap_types.h linux-2.6.32/include/asm-generic/kmap_types.h +--- linux-2.6.32/include/asm-generic/kmap_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/kmap_types.h 2009-12-04 21:40:48.499755489 -0500 +@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, + KMAP_D(16) KM_IRQ_PTE, + KMAP_D(17) KM_NMI, + KMAP_D(18) KM_NMI_PTE, +-KMAP_D(19) KM_TYPE_NR ++KMAP_D(19) KM_CLEARPAGE, ++KMAP_D(20) KM_TYPE_NR + }; + + #undef KMAP_D +diff -urNp linux-2.6.32/include/asm-generic/pgtable.h linux-2.6.32/include/asm-generic/pgtable.h +--- linux-2.6.32/include/asm-generic/pgtable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/pgtable.h 2009-12-04 21:40:48.499755489 -0500 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar unsigned long size); #endif @@ -41516,10 +40758,10 @@ diff -urNp linux-2.6.31.7/include/asm-generic/pgtable.h linux-2.6.31.7/include/a #endif /* !__ASSEMBLY__ */ #endif /* _ASM_GENERIC_PGTABLE_H */ -diff -urNp linux-2.6.31.7/include/asm-generic/vmlinux.lds.h linux-2.6.31.7/include/asm-generic/vmlinux.lds.h ---- linux-2.6.31.7/include/asm-generic/vmlinux.lds.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/asm-generic/vmlinux.lds.h 2009-12-10 22:15:16.000000000 -0500 -@@ -201,6 +201,7 @@ +diff -urNp linux-2.6.32/include/asm-generic/vmlinux.lds.h linux-2.6.32/include/asm-generic/vmlinux.lds.h +--- linux-2.6.32/include/asm-generic/vmlinux.lds.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/asm-generic/vmlinux.lds.h 2009-12-04 21:40:48.501387412 -0500 +@@ -199,6 +199,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ @@ -41527,7 +40769,7 @@ diff -urNp linux-2.6.31.7/include/asm-generic/vmlinux.lds.h linux-2.6.31.7/inclu *(__vermagic) /* Kernel version magic */ \ *(__markers_strings) /* Markers: strings */ \ *(__tracepoints_strings)/* Tracepoints: strings */ \ -@@ -641,22 +642,24 @@ +@@ -656,22 +657,24 @@ * section in the linker script will go there too. @phdr should have * a leading colon. * @@ -41557,39 +40799,9 @@ diff -urNp linux-2.6.31.7/include/asm-generic/vmlinux.lds.h linux-2.6.31.7/inclu /** * PERCPU - define output section for percpu area, simple version -diff -urNp linux-2.6.31.7/include/drm/drmP.h linux-2.6.31.7/include/drm/drmP.h ---- linux-2.6.31.7/include/drm/drmP.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/drm/drmP.h 2009-12-10 22:15:16.000000000 -0500 -@@ -787,7 +787,7 @@ struct drm_driver { - void (*gem_free_object) (struct drm_gem_object *obj); - - /* 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; -@@ -890,7 +890,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 */ -@@ -901,7 +901,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.31.7/include/drm/drm_pciids.h linux-2.6.31.7/include/drm/drm_pciids.h ---- linux-2.6.31.7/include/drm/drm_pciids.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/drm/drm_pciids.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/drm/drm_pciids.h linux-2.6.32/include/drm/drm_pciids.h +--- linux-2.6.32/include/drm/drm_pciids.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/drm/drm_pciids.h 2009-12-04 21:40:48.501782751 -0500 @@ -375,7 +375,7 @@ {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ @@ -41693,9 +40905,39 @@ diff -urNp linux-2.6.31.7/include/drm/drm_pciids.h linux-2.6.31.7/include/drm/dr {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.31.7/include/linux/a.out.h linux-2.6.31.7/include/linux/a.out.h ---- linux-2.6.31.7/include/linux/a.out.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/a.out.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/drm/drmP.h linux-2.6.32/include/drm/drmP.h +--- linux-2.6.32/include/drm/drmP.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/drm/drmP.h 2009-12-04 21:40:48.501782751 -0500 +@@ -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/include/linux/a.out.h linux-2.6.32/include/linux/a.out.h +--- linux-2.6.32/include/linux/a.out.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/a.out.h 2009-12-04 21:40:48.502930242 -0500 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -41711,21 +40953,9 @@ diff -urNp linux-2.6.31.7/include/linux/a.out.h linux-2.6.31.7/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.31.7/include/linux/agp_backend.h linux-2.6.31.7/include/linux/agp_backend.h ---- linux-2.6.31.7/include/linux/agp_backend.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/agp_backend.h 2009-12-10 22:15:16.000000000 -0500 -@@ -53,7 +53,7 @@ struct agp_kern_info { - int current_memory; - bool cant_use_aperture; - unsigned long page_mask; -- struct vm_operations_struct *vm_ops; -+ const struct vm_operations_struct *vm_ops; - }; - - /* -diff -urNp linux-2.6.31.7/include/linux/atmdev.h linux-2.6.31.7/include/linux/atmdev.h ---- linux-2.6.31.7/include/linux/atmdev.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/atmdev.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/atmdev.h linux-2.6.32/include/linux/atmdev.h +--- linux-2.6.32/include/linux/atmdev.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/atmdev.h 2009-12-04 21:40:48.502930242 -0500 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -41735,10 +40965,10 @@ diff -urNp linux-2.6.31.7/include/linux/atmdev.h linux-2.6.31.7/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.31.7/include/linux/backlight.h linux-2.6.31.7/include/linux/backlight.h ---- linux-2.6.31.7/include/linux/backlight.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/backlight.h 2009-12-10 22:15:16.000000000 -0500 -@@ -31,18 +31,18 @@ struct backlight_device; +diff -urNp linux-2.6.32/include/linux/backlight.h linux-2.6.32/include/linux/backlight.h +--- linux-2.6.32/include/linux/backlight.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/backlight.h 2009-12-04 21:40:48.504050109 -0500 +@@ -36,18 +36,18 @@ struct backlight_device; struct fb_info; struct backlight_ops { @@ -41761,7 +40991,7 @@ diff -urNp linux-2.6.31.7/include/linux/backlight.h linux-2.6.31.7/include/linux }; /* This structure defines all the properties of a backlight */ -@@ -81,7 +81,7 @@ struct backlight_device { +@@ -86,7 +86,7 @@ struct backlight_device { registered this device has been unloaded, and if class_get_devdata() points to something in the body of that driver, it is also invalid. */ struct mutex ops_lock; @@ -41770,18 +41000,18 @@ diff -urNp linux-2.6.31.7/include/linux/backlight.h linux-2.6.31.7/include/linux /* The framebuffer notifier block */ struct notifier_block fb_notif; -@@ -98,7 +98,7 @@ static inline void backlight_update_stat +@@ -103,7 +103,7 @@ static inline void backlight_update_stat } extern struct backlight_device *backlight_device_register(const char *name, - struct device *dev, void *devdata, struct backlight_ops *ops); + struct device *dev, void *devdata, const struct backlight_ops *ops); extern void backlight_device_unregister(struct backlight_device *bd); - - #define to_backlight_device(obj) container_of(obj, struct backlight_device, dev) -diff -urNp linux-2.6.31.7/include/linux/binfmts.h linux-2.6.31.7/include/linux/binfmts.h ---- linux-2.6.31.7/include/linux/binfmts.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/binfmts.h 2009-12-10 22:15:16.000000000 -0500 + extern void backlight_force_update(struct backlight_device *bd, + enum backlight_update_reason reason); +diff -urNp linux-2.6.32/include/linux/binfmts.h linux-2.6.32/include/linux/binfmts.h +--- linux-2.6.32/include/linux/binfmts.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/binfmts.h 2009-12-04 21:40:48.504050109 -0500 @@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); @@ -41790,9 +41020,43 @@ diff -urNp linux-2.6.31.7/include/linux/binfmts.h linux-2.6.31.7/include/linux/b unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.31.7/include/linux/cache.h linux-2.6.31.7/include/linux/cache.h ---- linux-2.6.31.7/include/linux/cache.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/cache.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/blkdev.h linux-2.6.32/include/linux/blkdev.h +--- linux-2.6.32/include/linux/blkdev.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/blkdev.h 2009-12-11 19:45:15.957525884 -0500 +@@ -1253,19 +1253,19 @@ static inline int blk_integrity_rq(struc + #endif /* CONFIG_BLK_DEV_INTEGRITY */ + + struct block_device_operations { +- int (*open) (struct block_device *, fmode_t); +- int (*release) (struct gendisk *, fmode_t); +- int (*locked_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); +- int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); +- int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); +- int (*direct_access) (struct block_device *, sector_t, ++ int (* const open) (struct block_device *, fmode_t); ++ int (* const release) (struct gendisk *, fmode_t); ++ int (* const locked_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); ++ int (* const ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); ++ int (* const compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long); ++ int (* const direct_access) (struct block_device *, sector_t, + void **, unsigned long *); +- int (*media_changed) (struct gendisk *); +- unsigned long long (*set_capacity) (struct gendisk *, ++ int (* const media_changed) (struct gendisk *); ++ unsigned long long (* const set_capacity) (struct gendisk *, + unsigned long long); +- int (*revalidate_disk) (struct gendisk *); +- int (*getgeo)(struct block_device *, struct hd_geometry *); +- struct module *owner; ++ int (* const revalidate_disk) (struct gendisk *); ++ int (*const getgeo)(struct block_device *, struct hd_geometry *); ++ struct module * const owner; + }; + + extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, +diff -urNp linux-2.6.32/include/linux/cache.h linux-2.6.32/include/linux/cache.h +--- linux-2.6.32/include/linux/cache.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/cache.h 2009-12-04 21:40:48.504716397 -0500 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -41804,9 +41068,9 @@ diff -urNp linux-2.6.31.7/include/linux/cache.h linux-2.6.31.7/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.31.7/include/linux/capability.h linux-2.6.31.7/include/linux/capability.h ---- linux-2.6.31.7/include/linux/capability.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/capability.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/capability.h linux-2.6.32/include/linux/capability.h +--- linux-2.6.32/include/linux/capability.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/capability.h 2009-12-04 20:41:38.959980079 -0500 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -41815,21 +41079,9 @@ diff -urNp linux-2.6.31.7/include/linux/capability.h linux-2.6.31.7/include/linu /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.31.7/include/linux/cgroup.h linux-2.6.31.7/include/linux/cgroup.h ---- linux-2.6.31.7/include/linux/cgroup.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/cgroup.h 2009-12-10 22:15:16.000000000 -0500 -@@ -37,7 +37,7 @@ extern void cgroup_exit(struct task_stru - extern int cgroupstats_build(struct cgroupstats *stats, - struct dentry *dentry); - --extern struct file_operations proc_cgroup_operations; -+extern const struct file_operations proc_cgroup_operations; - - /* Define the enumeration of all cgroup subsystems */ - #define SUBSYS(_x) _x ## _subsys_id, -diff -urNp linux-2.6.31.7/include/linux/compiler-gcc4.h linux-2.6.31.7/include/linux/compiler-gcc4.h ---- linux-2.6.31.7/include/linux/compiler-gcc4.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/compiler-gcc4.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/compiler-gcc4.h linux-2.6.32/include/linux/compiler-gcc4.h +--- linux-2.6.32/include/linux/compiler-gcc4.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/compiler-gcc4.h 2009-12-04 21:40:48.504716397 -0500 @@ -36,4 +36,8 @@ the kernel context */ #define __cold __attribute__((__cold__)) @@ -41839,9 +41091,9 @@ diff -urNp linux-2.6.31.7/include/linux/compiler-gcc4.h linux-2.6.31.7/include/l +#define __bos0(ptr) __bos((ptr), 0) +#define __bos1(ptr) __bos((ptr), 1) #endif -diff -urNp linux-2.6.31.7/include/linux/compiler.h linux-2.6.31.7/include/linux/compiler.h ---- linux-2.6.31.7/include/linux/compiler.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/compiler.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/compiler.h linux-2.6.32/include/linux/compiler.h +--- linux-2.6.32/include/linux/compiler.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/compiler.h 2009-12-04 21:40:48.504716397 -0500 @@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ #define __cold #endif @@ -41865,20 +41117,9 @@ diff -urNp linux-2.6.31.7/include/linux/compiler.h linux-2.6.31.7/include/linux/ /* Simple shorthand for a section definition */ #ifndef __section # define __section(S) __attribute__ ((__section__(#S))) -diff -urNp linux-2.6.31.7/include/linux/cpumask.h linux-2.6.31.7/include/linux/cpumask.h ---- linux-2.6.31.7/include/linux/cpumask.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/cpumask.h 2009-12-10 22:15:16.000000000 -0500 -@@ -142,7 +142,6 @@ - #include <linux/bitmap.h> - - typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t; --extern cpumask_t _unused_cpumask_arg_; - - #ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS - #define cpu_set(cpu, dst) __cpu_set((cpu), &(dst)) -diff -urNp linux-2.6.31.7/include/linux/decompress/mm.h linux-2.6.31.7/include/linux/decompress/mm.h ---- linux-2.6.31.7/include/linux/decompress/mm.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/decompress/mm.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/decompress/mm.h linux-2.6.32/include/linux/decompress/mm.h +--- linux-2.6.32/include/linux/decompress/mm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/decompress/mm.h 2009-12-04 21:40:48.506022650 -0500 @@ -68,7 +68,7 @@ static void free(void *where) * warnings when not needed (indeed large_malloc / large_free are not * needed by inflate */ @@ -41888,9 +41129,9 @@ diff -urNp linux-2.6.31.7/include/linux/decompress/mm.h linux-2.6.31.7/include/l #define free(a) kfree(a) #define large_malloc(a) vmalloc(a) -diff -urNp linux-2.6.31.7/include/linux/elf.h linux-2.6.31.7/include/linux/elf.h ---- linux-2.6.31.7/include/linux/elf.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/elf.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/elf.h linux-2.6.32/include/linux/elf.h +--- linux-2.6.32/include/linux/elf.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/elf.h 2009-12-04 21:40:48.506022650 -0500 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -41947,7 +41188,7 @@ diff -urNp linux-2.6.31.7/include/linux/elf.h linux-2.6.31.7/include/linux/elf.h #define ELFMAG0 0x7f /* EI_MAG */ #define ELFMAG1 'E' #define ELFMAG2 'L' -@@ -385,6 +413,7 @@ extern Elf32_Dyn _DYNAMIC []; +@@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC []; #define elf_phdr elf32_phdr #define elf_note elf32_note #define elf_addr_t Elf32_Off @@ -41955,7 +41196,7 @@ diff -urNp linux-2.6.31.7/include/linux/elf.h linux-2.6.31.7/include/linux/elf.h #else -@@ -393,6 +422,7 @@ extern Elf64_Dyn _DYNAMIC []; +@@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC []; #define elf_phdr elf64_phdr #define elf_note elf64_note #define elf_addr_t Elf64_Off @@ -41963,9 +41204,9 @@ diff -urNp linux-2.6.31.7/include/linux/elf.h linux-2.6.31.7/include/linux/elf.h #endif -diff -urNp linux-2.6.31.7/include/linux/fs.h linux-2.6.31.7/include/linux/fs.h ---- linux-2.6.31.7/include/linux/fs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/fs.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/fs.h linux-2.6.32/include/linux/fs.h +--- linux-2.6.32/include/linux/fs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/fs.h 2009-12-04 21:40:48.506935234 -0500 @@ -87,6 +87,10 @@ struct inodes_stat_t { */ #define FMODE_NOCMTIME ((__force fmode_t)2048) @@ -41977,7 +41218,66 @@ diff -urNp linux-2.6.31.7/include/linux/fs.h linux-2.6.31.7/include/linux/fs.h /* * The below are the various read and write types that we support. Some of * them include behavioral modifiers that send information down to the -@@ -1024,19 +1028,19 @@ static inline int file_check_writeable(s +@@ -565,41 +569,41 @@ typedef int (*read_actor_t)(read_descrip + unsigned long, unsigned long); + + struct address_space_operations { +- int (*writepage)(struct page *page, struct writeback_control *wbc); +- int (*readpage)(struct file *, struct page *); +- void (*sync_page)(struct page *); ++ int (* const writepage)(struct page *page, struct writeback_control *wbc); ++ int (* const readpage)(struct file *, struct page *); ++ void (* const sync_page)(struct page *); + + /* Write back some dirty pages from this mapping. */ +- int (*writepages)(struct address_space *, struct writeback_control *); ++ int (* const writepages)(struct address_space *, struct writeback_control *); + + /* Set a page dirty. Return true if this dirtied it */ +- int (*set_page_dirty)(struct page *page); ++ int (* const set_page_dirty)(struct page *page); + +- int (*readpages)(struct file *filp, struct address_space *mapping, ++ int (* const readpages)(struct file *filp, struct address_space *mapping, + struct list_head *pages, unsigned nr_pages); + +- int (*write_begin)(struct file *, struct address_space *mapping, ++ int (* const write_begin)(struct file *, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata); +- int (*write_end)(struct file *, struct address_space *mapping, ++ int (* const write_end)(struct file *, struct address_space *mapping, + loff_t pos, unsigned len, unsigned copied, + struct page *page, void *fsdata); + + /* Unfortunately this kludge is needed for FIBMAP. Don't use it */ +- sector_t (*bmap)(struct address_space *, sector_t); +- void (*invalidatepage) (struct page *, unsigned long); +- int (*releasepage) (struct page *, gfp_t); +- ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov, ++ sector_t (* const bmap)(struct address_space *, sector_t); ++ void (* const invalidatepage) (struct page *, unsigned long); ++ int (* const releasepage) (struct page *, gfp_t); ++ ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov, + loff_t offset, unsigned long nr_segs); +- int (*get_xip_mem)(struct address_space *, pgoff_t, int, ++ int (* const get_xip_mem)(struct address_space *, pgoff_t, int, + void **, unsigned long *); + /* migrate the contents of a page to the specified target */ +- int (*migratepage) (struct address_space *, ++ int (* const migratepage) (struct address_space *, + struct page *, struct page *); +- int (*launder_page) (struct page *); +- int (*is_partially_uptodate) (struct page *, read_descriptor_t *, ++ int (* const launder_page) (struct page *); ++ int (* const is_partially_uptodate) (struct page *, read_descriptor_t *, + unsigned long); +- int (*error_remove_page)(struct address_space *, struct page *); ++ int (* const error_remove_page)(struct address_space *, struct page *); + }; + + /* +@@ -1027,19 +1031,19 @@ static inline int file_check_writeable(s typedef struct files_struct *fl_owner_t; struct file_lock_operations { @@ -42007,18 +41307,7 @@ diff -urNp linux-2.6.31.7/include/linux/fs.h linux-2.6.31.7/include/linux/fs.h }; struct lock_manager { -@@ -1067,8 +1071,8 @@ struct file_lock { - struct fasync_struct * fl_fasync; /* for lease break notifications */ - unsigned long fl_break_time; /* for nonblocking lease breaks */ - -- struct file_lock_operations *fl_ops; /* Callbacks for filesystems */ -- struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ -+ const struct file_lock_operations *fl_ops; /* Callbacks for filesystems */ -+ const struct lock_manager_operations *fl_lmops; /* Callbacks for lockmanagers */ - union { - struct nfs_lock_info nfs_fl; - struct nfs4_lock_info nfs4_fl; -@@ -1435,7 +1439,7 @@ struct fiemap_extent_info { +@@ -1436,7 +1440,7 @@ struct fiemap_extent_info { unsigned int fi_flags; /* Flags as passed from user */ unsigned int fi_extents_mapped; /* Number of mapped extents */ unsigned int fi_extents_max; /* Size of fiemap_extent array */ @@ -42027,18 +41316,60 @@ diff -urNp linux-2.6.31.7/include/linux/fs.h linux-2.6.31.7/include/linux/fs.h * array */ }; int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical, -@@ -2430,7 +2434,7 @@ static int __fops ## _open(struct inode - __simple_attr_check_format(__fmt, 0ull); \ - return simple_attr_open(inode, file, __get, __set, __fmt); \ - } \ --static struct file_operations __fops = { \ -+static const struct file_operations __fops = { \ - .owner = THIS_MODULE, \ - .open = __fops ## _open, \ - .release = simple_attr_release, \ -diff -urNp linux-2.6.31.7/include/linux/fs_struct.h linux-2.6.31.7/include/linux/fs_struct.h ---- linux-2.6.31.7/include/linux/fs_struct.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/fs_struct.h 2009-12-10 22:15:16.000000000 -0500 +@@ -1553,30 +1557,30 @@ extern ssize_t vfs_writev(struct file *, + unsigned long, loff_t *); + + struct super_operations { +- struct inode *(*alloc_inode)(struct super_block *sb); +- void (*destroy_inode)(struct inode *); ++ struct inode *(* const alloc_inode)(struct super_block *sb); ++ void (* const destroy_inode)(struct inode *); + +- void (*dirty_inode) (struct inode *); +- int (*write_inode) (struct inode *, int); +- void (*drop_inode) (struct inode *); +- void (*delete_inode) (struct inode *); +- void (*put_super) (struct super_block *); +- void (*write_super) (struct super_block *); +- int (*sync_fs)(struct super_block *sb, int wait); +- int (*freeze_fs) (struct super_block *); +- int (*unfreeze_fs) (struct super_block *); +- int (*statfs) (struct dentry *, struct kstatfs *); +- int (*remount_fs) (struct super_block *, int *, char *); +- void (*clear_inode) (struct inode *); +- void (*umount_begin) (struct super_block *); ++ void (* const dirty_inode) (struct inode *); ++ int (* const write_inode) (struct inode *, int); ++ void (* const drop_inode) (struct inode *); ++ void (* const delete_inode) (struct inode *); ++ void (* const put_super) (struct super_block *); ++ void (* const write_super) (struct super_block *); ++ int (* const sync_fs)(struct super_block *sb, int wait); ++ int (* const freeze_fs) (struct super_block *); ++ int (* const unfreeze_fs) (struct super_block *); ++ int (* const statfs) (struct dentry *, struct kstatfs *); ++ int (* const remount_fs) (struct super_block *, int *, char *); ++ void (* const clear_inode) (struct inode *); ++ void (* const umount_begin) (struct super_block *); + +- int (*show_options)(struct seq_file *, struct vfsmount *); +- int (*show_stats)(struct seq_file *, struct vfsmount *); ++ int (* const show_options)(struct seq_file *, struct vfsmount *); ++ int (* const show_stats)(struct seq_file *, struct vfsmount *); + #ifdef CONFIG_QUOTA +- ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t); +- ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); ++ ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t); ++ ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t); + #endif +- int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); ++ int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); + }; + + /* +diff -urNp linux-2.6.32/include/linux/fs_struct.h linux-2.6.32/include/linux/fs_struct.h +--- linux-2.6.32/include/linux/fs_struct.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/fs_struct.h 2009-12-04 21:40:48.507784700 -0500 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -42048,9 +41379,9 @@ diff -urNp linux-2.6.31.7/include/linux/fs_struct.h linux-2.6.31.7/include/linux rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.31.7/include/linux/genhd.h linux-2.6.31.7/include/linux/genhd.h ---- linux-2.6.31.7/include/linux/genhd.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/genhd.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/genhd.h linux-2.6.32/include/linux/genhd.h +--- linux-2.6.32/include/linux/genhd.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/genhd.h 2009-12-04 21:40:48.507784700 -0500 @@ -161,7 +161,7 @@ struct gendisk { struct timer_rand_state *random; @@ -42060,9 +41391,9 @@ diff -urNp linux-2.6.31.7/include/linux/genhd.h linux-2.6.31.7/include/linux/gen struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.31.7/include/linux/gracl.h linux-2.6.31.7/include/linux/gracl.h ---- linux-2.6.31.7/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/gracl.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/gracl.h linux-2.6.32/include/linux/gracl.h +--- linux-2.6.32/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/gracl.h 2009-12-04 20:41:39.000637716 -0500 @@ -0,0 +1,309 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -42373,9 +41704,9 @@ diff -urNp linux-2.6.31.7/include/linux/gracl.h linux-2.6.31.7/include/linux/gra + +#endif + -diff -urNp linux-2.6.31.7/include/linux/gralloc.h linux-2.6.31.7/include/linux/gralloc.h ---- linux-2.6.31.7/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/gralloc.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/gralloc.h linux-2.6.32/include/linux/gralloc.h +--- linux-2.6.32/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/gralloc.h 2009-12-04 20:41:39.000637716 -0500 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -42386,9 +41717,9 @@ diff -urNp linux-2.6.31.7/include/linux/gralloc.h linux-2.6.31.7/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.31.7/include/linux/grdefs.h linux-2.6.31.7/include/linux/grdefs.h ---- linux-2.6.31.7/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/grdefs.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/grdefs.h linux-2.6.32/include/linux/grdefs.h +--- linux-2.6.32/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/grdefs.h 2009-12-04 20:41:39.001731360 -0500 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -42526,9 +41857,9 @@ diff -urNp linux-2.6.31.7/include/linux/grdefs.h linux-2.6.31.7/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.31.7/include/linux/grinternal.h linux-2.6.31.7/include/linux/grinternal.h ---- linux-2.6.31.7/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/grinternal.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/grinternal.h linux-2.6.32/include/linux/grinternal.h +--- linux-2.6.32/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/grinternal.h 2009-12-04 20:41:39.003624507 -0500 @@ -0,0 +1,212 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -42742,12 +42073,12 @@ diff -urNp linux-2.6.31.7/include/linux/grinternal.h linux-2.6.31.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.31.7/include/linux/grmsg.h linux-2.6.31.7/include/linux/grmsg.h ---- linux-2.6.31.7/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/grmsg.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/grmsg.h linux-2.6.32/include/linux/grmsg.h +--- linux-2.6.32/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/grmsg.h 2009-12-05 12:38:55.392696435 -0500 @@ -0,0 +1,107 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" -+#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" ++#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" +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by " +#define GR_STOPMOD_MSG "denied modification of module state by " +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by " @@ -42762,8 +42093,8 @@ diff -urNp linux-2.6.31.7/include/linux/grmsg.h linux-2.6.31.7/include/linux/grm +#define GR_MEM_WRITE_MSG "denied write of /dev/mem by " +#define GR_MEM_MMAP_MSG "denied mmap write of /dev/[k]mem by " +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by " -+#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%u.%u.%u.%u" -+#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%u.%u.%u.%u" ++#define GR_LEARN_AUDIT_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%lu\t%lu\t%.4095s\t%lu\t%pI4" ++#define GR_ID_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%c\t%d\t%d\t%d\t%pI4" +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by " +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by " +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by " @@ -42771,7 +42102,7 @@ diff -urNp linux-2.6.31.7/include/linux/grmsg.h linux-2.6.31.7/include/linux/grm +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by " +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by " +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by " -+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%u.%u.%u.%u %.480s[%.16s:%d], parent %.480s[%.16s:%d] against " ++#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against " +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by " +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by " +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by " @@ -42837,9 +42168,9 @@ diff -urNp linux-2.6.31.7/include/linux/grmsg.h linux-2.6.31.7/include/linux/grm +#define GR_SOCK2_MSG "denied socket(%d,%.16s,%.16s) by " +#define GR_BIND_MSG "denied bind() by " +#define GR_CONNECT_MSG "denied connect() by " -+#define GR_BIND_ACL_MSG "denied bind() to %u.%u.%u.%u port %u sock type %.16s protocol %.16s by " -+#define GR_CONNECT_ACL_MSG "denied connect() to %u.%u.%u.%u port %u sock type %.16s protocol %.16s by " -+#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%u.%u.%u.%u\t%u\t%u\t%u\t%u\t%u.%u.%u.%u" ++#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by " ++#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by " ++#define GR_IP_LEARN_MSG "%s\t%u\t%u\t%u\t%.4095s\t%.4095s\t%pI4\t%u\t%u\t%u\t%u\t%pI4" +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process " +#define GR_CAP_ACL_MSG "use of %s denied for " +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for " @@ -42853,9 +42184,9 @@ diff -urNp linux-2.6.31.7/include/linux/grmsg.h linux-2.6.31.7/include/linux/grm +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " +#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " +#define GR_VM86_MSG "denied use of vm86 by " -diff -urNp linux-2.6.31.7/include/linux/grsecurity.h linux-2.6.31.7/include/linux/grsecurity.h ---- linux-2.6.31.7/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/include/linux/grsecurity.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/grsecurity.h linux-2.6.32/include/linux/grsecurity.h +--- linux-2.6.32/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/include/linux/grsecurity.h 2009-12-04 20:41:39.005734587 -0500 @@ -0,0 +1,200 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H @@ -43057,9 +42388,9 @@ diff -urNp linux-2.6.31.7/include/linux/grsecurity.h linux-2.6.31.7/include/linu +#endif + +#endif -diff -urNp linux-2.6.31.7/include/linux/hdpu_features.h linux-2.6.31.7/include/linux/hdpu_features.h ---- linux-2.6.31.7/include/linux/hdpu_features.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/hdpu_features.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/hdpu_features.h linux-2.6.32/include/linux/hdpu_features.h +--- linux-2.6.32/include/linux/hdpu_features.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/hdpu_features.h 2009-12-04 21:40:48.507784700 -0500 @@ -3,7 +3,7 @@ struct cpustate_t { spinlock_t lock; @@ -43069,9 +42400,9 @@ diff -urNp linux-2.6.31.7/include/linux/hdpu_features.h linux-2.6.31.7/include/l unsigned char cached_val; int inited; unsigned long *set_addr; -diff -urNp linux-2.6.31.7/include/linux/highmem.h linux-2.6.31.7/include/linux/highmem.h ---- linux-2.6.31.7/include/linux/highmem.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/highmem.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/highmem.h linux-2.6.32/include/linux/highmem.h +--- linux-2.6.32/include/linux/highmem.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/highmem.h 2009-12-04 21:40:48.509083830 -0500 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -43091,22 +42422,10 @@ diff -urNp linux-2.6.31.7/include/linux/highmem.h linux-2.6.31.7/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.31.7/include/linux/hugetlb.h linux-2.6.31.7/include/linux/hugetlb.h ---- linux-2.6.31.7/include/linux/hugetlb.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/hugetlb.h 2009-12-10 22:15:16.000000000 -0500 -@@ -146,7 +146,7 @@ static inline struct hugetlbfs_sb_info * - } - - extern const struct file_operations hugetlbfs_file_operations; --extern struct vm_operations_struct hugetlb_vm_ops; -+extern const struct vm_operations_struct hugetlb_vm_ops; - struct file *hugetlb_file_setup(const char *name, size_t size, int acct, - struct user_struct **user); - int hugetlb_get_quota(struct address_space *mapping, long delta); -diff -urNp linux-2.6.31.7/include/linux/interrupt.h linux-2.6.31.7/include/linux/interrupt.h ---- linux-2.6.31.7/include/linux/interrupt.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/interrupt.h 2009-12-10 22:15:16.000000000 -0500 -@@ -355,7 +355,7 @@ enum +diff -urNp linux-2.6.32/include/linux/interrupt.h linux-2.6.32/include/linux/interrupt.h +--- linux-2.6.32/include/linux/interrupt.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/interrupt.h 2009-12-04 21:40:48.509083830 -0500 +@@ -357,7 +357,7 @@ enum /* map softirq index to softirq name. update 'softirq_to_name' in * kernel/softirq.c when adding a new softirq. */ @@ -43115,10 +42434,10 @@ diff -urNp linux-2.6.31.7/include/linux/interrupt.h linux-2.6.31.7/include/linux /* softirq mask and active fields moved to irq_cpustat_t in * asm/hardirq.h to get better cache usage. KAO -diff -urNp linux-2.6.31.7/include/linux/jbd.h linux-2.6.31.7/include/linux/jbd.h ---- linux-2.6.31.7/include/linux/jbd.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/jbd.h 2009-12-10 22:15:16.000000000 -0500 -@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; +diff -urNp linux-2.6.32/include/linux/jbd2.h linux-2.6.32/include/linux/jbd2.h +--- linux-2.6.32/include/linux/jbd2.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/jbd2.h 2009-12-04 21:40:48.509786080 -0500 +@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) #else @@ -43126,11 +42445,11 @@ diff -urNp linux-2.6.31.7/include/linux/jbd.h linux-2.6.31.7/include/linux/jbd.h +#define jbd_debug(f, a...) do {} while (0) #endif - static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.31.7/include/linux/jbd2.h linux-2.6.31.7/include/linux/jbd2.h ---- linux-2.6.31.7/include/linux/jbd2.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/jbd2.h 2009-12-10 22:15:16.000000000 -0500 -@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; + static inline void *jbd2_alloc(size_t size, gfp_t flags) +diff -urNp linux-2.6.32/include/linux/jbd.h linux-2.6.32/include/linux/jbd.h +--- linux-2.6.32/include/linux/jbd.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/jbd.h 2009-12-04 21:40:48.509786080 -0500 +@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) #else @@ -43138,10 +42457,10 @@ diff -urNp linux-2.6.31.7/include/linux/jbd2.h linux-2.6.31.7/include/linux/jbd2 +#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.31.7/include/linux/kallsyms.h linux-2.6.31.7/include/linux/kallsyms.h ---- linux-2.6.31.7/include/linux/kallsyms.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/kallsyms.h 2009-12-10 22:15:16.000000000 -0500 + static inline void *jbd_alloc(size_t size, gfp_t flags) +diff -urNp linux-2.6.32/include/linux/kallsyms.h linux-2.6.32/include/linux/kallsyms.h +--- linux-2.6.32/include/linux/kallsyms.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/kallsyms.h 2009-12-04 20:41:39.015733219 -0500 @@ -15,7 +15,8 @@ struct module; @@ -43162,15 +42481,29 @@ diff -urNp linux-2.6.31.7/include/linux/kallsyms.h linux-2.6.31.7/include/linux/ /* This macro allows us to keep printk typechecking */ static void __check_printsym_format(const char *fmt, ...) -diff -urNp linux-2.6.31.7/include/linux/kgdb.h linux-2.6.31.7/include/linux/kgdb.h ---- linux-2.6.31.7/include/linux/kgdb.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/kgdb.h 2009-12-10 22:15:16.000000000 -0500 -@@ -259,12 +259,12 @@ struct kgdb_io { - void (*post_exception) (void); +diff -urNp linux-2.6.32/include/linux/kgdb.h linux-2.6.32/include/linux/kgdb.h +--- linux-2.6.32/include/linux/kgdb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/kgdb.h 2009-12-04 21:40:48.510686227 -0500 +@@ -251,20 +251,20 @@ struct kgdb_arch { + */ + struct kgdb_io { + const char *name; +- int (*read_char) (void); +- void (*write_char) (u8); +- void (*flush) (void); +- int (*init) (void); +- void (*pre_exception) (void); +- void (*post_exception) (void); ++ int (* const read_char) (void); ++ void (* const write_char) (u8); ++ void (* const flush) (void); ++ int (* const init) (void); ++ void (* const pre_exception) (void); ++ void (* const post_exception) (void); }; -extern struct kgdb_arch arch_kgdb_ops; -+extern const struct kgdb_arch arch_kgdb_ops; ++extern const struct kgdb_arch arch_kgdb_ops; extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs); @@ -43181,28 +42514,9 @@ diff -urNp linux-2.6.31.7/include/linux/kgdb.h linux-2.6.31.7/include/linux/kgdb extern int kgdb_hex2long(char **ptr, unsigned long *long_val); extern int kgdb_mem2hex(char *mem, char *buf, int count); -diff -urNp linux-2.6.31.7/include/linux/kmemcheck.h linux-2.6.31.7/include/linux/kmemcheck.h ---- linux-2.6.31.7/include/linux/kmemcheck.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/kmemcheck.h 2009-12-10 22:15:16.000000000 -0500 -@@ -137,13 +137,13 @@ static inline void kmemcheck_mark_initia - int name##_end[0]; - - #define kmemcheck_annotate_bitfield(ptr, name) \ -- do if (ptr) { \ -+ if (ptr) { \ - int _n = (long) &((ptr)->name##_end) \ - - (long) &((ptr)->name##_begin); \ - BUILD_BUG_ON(_n < 0); \ - \ - kmemcheck_mark_initialized(&((ptr)->name##_begin), _n); \ -- } while (0) -+ } - - #define kmemcheck_annotate_variable(var) \ - do { \ -diff -urNp linux-2.6.31.7/include/linux/kobject.h linux-2.6.31.7/include/linux/kobject.h ---- linux-2.6.31.7/include/linux/kobject.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/kobject.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/kobject.h linux-2.6.32/include/linux/kobject.h +--- linux-2.6.32/include/linux/kobject.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/kobject.h 2009-12-04 21:40:48.510686227 -0500 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob struct kobj_type { @@ -43251,10 +42565,10 @@ diff -urNp linux-2.6.31.7/include/linux/kobject.h linux-2.6.31.7/include/linux/k struct kobject *parent_kobj); static inline struct kset *to_kset(struct kobject *kobj) -diff -urNp linux-2.6.31.7/include/linux/kvm_host.h linux-2.6.31.7/include/linux/kvm_host.h ---- linux-2.6.31.7/include/linux/kvm_host.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/kvm_host.h 2009-12-10 22:15:16.000000000 -0500 -@@ -173,7 +173,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc +diff -urNp linux-2.6.32/include/linux/kvm_host.h linux-2.6.32/include/linux/kvm_host.h +--- linux-2.6.32/include/linux/kvm_host.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/kvm_host.h 2009-12-04 21:40:48.510686227 -0500 +@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -43263,7 +42577,7 @@ diff -urNp linux-2.6.31.7/include/linux/kvm_host.h linux-2.6.31.7/include/linux/ struct module *module); void kvm_exit(void); -@@ -280,7 +280,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( +@@ -311,7 +311,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( struct kvm_guest_debug *dbg); int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); @@ -43272,9 +42586,9 @@ diff -urNp linux-2.6.31.7/include/linux/kvm_host.h linux-2.6.31.7/include/linux/ void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/libata.h ---- linux-2.6.31.7/include/linux/libata.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/libata.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/libata.h linux-2.6.32/include/linux/libata.h +--- linux-2.6.32/include/linux/libata.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/libata.h 2009-12-04 21:40:48.512497130 -0500 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -43290,21 +42604,7 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li #endif /* ATA_DEBUG */ #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) -@@ -460,10 +460,10 @@ struct ata_queued_cmd; - - /* typedefs */ - typedef void (*ata_qc_cb_t) (struct ata_queued_cmd *qc); --typedef int (*ata_prereset_fn_t)(struct ata_link *link, unsigned long deadline); --typedef int (*ata_reset_fn_t)(struct ata_link *link, unsigned int *classes, -+typedef int (* const ata_prereset_fn_t)(struct ata_link *link, unsigned long deadline); -+typedef int (* ata_reset_fn_t)(struct ata_link *link, unsigned int *classes, - unsigned long deadline); --typedef void (*ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes); -+typedef void (* const ata_postreset_fn_t)(struct ata_link *link, unsigned int *classes); - - /* - * host pm policy: If you alter this, you also need to alter libata-scsi.c -@@ -509,11 +509,11 @@ struct ata_ioports { +@@ -521,11 +521,11 @@ struct ata_ioports { struct ata_host { spinlock_t lock; @@ -43318,7 +42618,7 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li unsigned long flags; #ifdef CONFIG_ATA_ACPI acpi_handle acpi_handle; -@@ -693,7 +693,7 @@ struct ata_link { +@@ -706,7 +706,7 @@ struct ata_link { struct ata_port { struct Scsi_Host *scsi_host; /* our co-allocated scsi host */ @@ -43327,147 +42627,7 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li spinlock_t *lock; /* Flags owned by the EH context. Only EH should touch these once the port is active */ -@@ -775,26 +775,26 @@ struct ata_port_operations { - /* - * Command execution - */ -- int (*qc_defer)(struct ata_queued_cmd *qc); -- int (*check_atapi_dma)(struct ata_queued_cmd *qc); -- void (*qc_prep)(struct ata_queued_cmd *qc); -- unsigned int (*qc_issue)(struct ata_queued_cmd *qc); -- bool (*qc_fill_rtf)(struct ata_queued_cmd *qc); -+ int (* const qc_defer)(struct ata_queued_cmd *qc); -+ int (* const check_atapi_dma)(struct ata_queued_cmd *qc); -+ void (* const qc_prep)(struct ata_queued_cmd *qc); -+ unsigned int (* const qc_issue)(struct ata_queued_cmd *qc); -+ bool (* const qc_fill_rtf)(struct ata_queued_cmd *qc); - - /* - * Configuration and exception handling - */ -- int (*cable_detect)(struct ata_port *ap); -- unsigned long (*mode_filter)(struct ata_device *dev, unsigned long xfer_mask); -- void (*set_piomode)(struct ata_port *ap, struct ata_device *dev); -- void (*set_dmamode)(struct ata_port *ap, struct ata_device *dev); -- int (*set_mode)(struct ata_link *link, struct ata_device **r_failed_dev); -- unsigned int (*read_id)(struct ata_device *dev, struct ata_taskfile *tf, u16 *id); -+ int (* const cable_detect)(struct ata_port *ap); -+ unsigned long (* const mode_filter)(struct ata_device *dev, unsigned long xfer_mask); -+ void (* const set_piomode)(struct ata_port *ap, struct ata_device *dev); -+ void (* const set_dmamode)(struct ata_port *ap, struct ata_device *dev); -+ int (* const set_mode)(struct ata_link *link, struct ata_device **r_failed_dev); -+ unsigned int (* const read_id)(struct ata_device *dev, struct ata_taskfile *tf, u16 *id); - -- void (*dev_config)(struct ata_device *dev); -+ void (* const dev_config)(struct ata_device *dev); - -- void (*freeze)(struct ata_port *ap); -- void (*thaw)(struct ata_port *ap); -+ void (* const freeze)(struct ata_port *ap); -+ void (* const thaw)(struct ata_port *ap); - ata_prereset_fn_t prereset; - ata_reset_fn_t softreset; - ata_reset_fn_t hardreset; -@@ -803,64 +803,64 @@ struct ata_port_operations { - ata_reset_fn_t pmp_softreset; - ata_reset_fn_t pmp_hardreset; - ata_postreset_fn_t pmp_postreset; -- void (*error_handler)(struct ata_port *ap); -- void (*lost_interrupt)(struct ata_port *ap); -- void (*post_internal_cmd)(struct ata_queued_cmd *qc); -+ void (* const error_handler)(struct ata_port *ap); -+ void (* const lost_interrupt)(struct ata_port *ap); -+ void (* const post_internal_cmd)(struct ata_queued_cmd *qc); - - /* - * Optional features - */ -- int (*scr_read)(struct ata_link *link, unsigned int sc_reg, u32 *val); -- int (*scr_write)(struct ata_link *link, unsigned int sc_reg, u32 val); -- void (*pmp_attach)(struct ata_port *ap); -- void (*pmp_detach)(struct ata_port *ap); -- int (*enable_pm)(struct ata_port *ap, enum link_pm policy); -- void (*disable_pm)(struct ata_port *ap); -+ int (* const scr_read)(struct ata_link *link, unsigned int sc_reg, u32 *val); -+ int (* const scr_write)(struct ata_link *link, unsigned int sc_reg, u32 val); -+ void (* const pmp_attach)(struct ata_port *ap); -+ void (* const pmp_detach)(struct ata_port *ap); -+ int (* const enable_pm)(struct ata_port *ap, enum link_pm policy); -+ void (* const disable_pm)(struct ata_port *ap); - - /* - * Start, stop, suspend and resume - */ -- int (*port_suspend)(struct ata_port *ap, pm_message_t mesg); -- int (*port_resume)(struct ata_port *ap); -- int (*port_start)(struct ata_port *ap); -- void (*port_stop)(struct ata_port *ap); -- void (*host_stop)(struct ata_host *host); -+ int (* const port_suspend)(struct ata_port *ap, pm_message_t mesg); -+ int (* const port_resume)(struct ata_port *ap); -+ int (* const port_start)(struct ata_port *ap); -+ void (* const port_stop)(struct ata_port *ap); -+ void (* const host_stop)(struct ata_host *host); - - #ifdef CONFIG_ATA_SFF - /* - * SFF / taskfile oriented ops - */ -- void (*sff_dev_select)(struct ata_port *ap, unsigned int device); -- u8 (*sff_check_status)(struct ata_port *ap); -- u8 (*sff_check_altstatus)(struct ata_port *ap); -- void (*sff_tf_load)(struct ata_port *ap, const struct ata_taskfile *tf); -- void (*sff_tf_read)(struct ata_port *ap, struct ata_taskfile *tf); -- void (*sff_exec_command)(struct ata_port *ap, -+ void (* const sff_dev_select)(struct ata_port *ap, unsigned int device); -+ u8 (* sff_check_status)(struct ata_port *ap); -+ u8 (* const sff_check_altstatus)(struct ata_port *ap); -+ void (* sff_tf_load)(struct ata_port *ap, const struct ata_taskfile *tf); -+ void (* sff_tf_read)(struct ata_port *ap, struct ata_taskfile *tf); -+ void (* sff_exec_command)(struct ata_port *ap, - const struct ata_taskfile *tf); -- unsigned int (*sff_data_xfer)(struct ata_device *dev, -+ unsigned int (* sff_data_xfer)(struct ata_device *dev, - unsigned char *buf, unsigned int buflen, int rw); -- u8 (*sff_irq_on)(struct ata_port *); -- void (*sff_irq_clear)(struct ata_port *); -+ u8 (* const sff_irq_on)(struct ata_port *); -+ void (* const sff_irq_clear)(struct ata_port *); - -- void (*bmdma_setup)(struct ata_queued_cmd *qc); -- void (*bmdma_start)(struct ata_queued_cmd *qc); -- void (*bmdma_stop)(struct ata_queued_cmd *qc); -- u8 (*bmdma_status)(struct ata_port *ap); -+ void (* const bmdma_setup)(struct ata_queued_cmd *qc); -+ void (* const bmdma_start)(struct ata_queued_cmd *qc); -+ void (* const bmdma_stop)(struct ata_queued_cmd *qc); -+ u8 (* const bmdma_status)(struct ata_port *ap); - -- void (*drain_fifo)(struct ata_queued_cmd *qc); -+ void (* const drain_fifo)(struct ata_queued_cmd *qc); - #endif /* CONFIG_ATA_SFF */ - -- ssize_t (*em_show)(struct ata_port *ap, char *buf); -- ssize_t (*em_store)(struct ata_port *ap, const char *message, -+ ssize_t (* const em_show)(struct ata_port *ap, char *buf); -+ ssize_t (* const em_store)(struct ata_port *ap, const char *message, - size_t size); -- ssize_t (*sw_activity_show)(struct ata_device *dev, char *buf); -- ssize_t (*sw_activity_store)(struct ata_device *dev, -+ ssize_t (* const sw_activity_show)(struct ata_device *dev, char *buf); -+ ssize_t (* const sw_activity_store)(struct ata_device *dev, - enum sw_activity val); - /* - * Obsolete - */ -- void (*phy_reset)(struct ata_port *ap); -- void (*eng_timeout)(struct ata_port *ap); -+ void (* const phy_reset)(struct ata_port *ap); -+ void (* const eng_timeout)(struct ata_port *ap); - - /* - * ->inherits must be the last field and all the preceding -@@ -875,7 +875,7 @@ struct ata_port_info { +@@ -888,7 +888,7 @@ struct ata_port_info { unsigned long pio_mask; unsigned long mwdma_mask; unsigned long udma_mask; @@ -43476,7 +42636,7 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li void *private_data; }; -@@ -899,7 +899,7 @@ extern const unsigned long sata_deb_timi +@@ -912,7 +912,7 @@ extern const unsigned long sata_deb_timi extern const unsigned long sata_deb_timing_hotplug[]; extern const unsigned long sata_deb_timing_long[]; @@ -43485,7 +42645,7 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li extern const struct ata_port_info ata_dummy_port_info; static inline const unsigned long * -@@ -945,7 +945,7 @@ extern int ata_host_activate(struct ata_ +@@ -958,7 +958,7 @@ extern int ata_host_activate(struct ata_ struct scsi_host_template *sht); extern void ata_host_detach(struct ata_host *host); extern void ata_host_init(struct ata_host *, struct device *, @@ -43494,11 +42654,19 @@ diff -urNp linux-2.6.31.7/include/linux/libata.h linux-2.6.31.7/include/linux/li extern int ata_scsi_detect(struct scsi_host_template *sht); extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); -diff -urNp linux-2.6.31.7/include/linux/lockd/bind.h linux-2.6.31.7/include/linux/lockd/bind.h ---- linux-2.6.31.7/include/linux/lockd/bind.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/lockd/bind.h 2009-12-10 22:15:16.000000000 -0500 -@@ -29,7 +29,7 @@ struct nlmsvc_binding { - void (*fclose)(struct file *); +diff -urNp linux-2.6.32/include/linux/lockd/bind.h linux-2.6.32/include/linux/lockd/bind.h +--- linux-2.6.32/include/linux/lockd/bind.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/lockd/bind.h 2009-12-04 21:40:48.512497130 -0500 +@@ -23,13 +23,13 @@ struct svc_rqst; + * This is the set of functions for lockd->nfsd communication + */ + struct nlmsvc_binding { +- __be32 (*fopen)(struct svc_rqst *, ++ __be32 (* const fopen)(struct svc_rqst *, + struct nfs_fh *, + struct file **); +- void (*fclose)(struct file *); ++ void (* const fclose)(struct file *); }; -extern struct nlmsvc_binding * nlmsvc_ops; @@ -43506,24 +42674,12 @@ diff -urNp linux-2.6.31.7/include/linux/lockd/bind.h linux-2.6.31.7/include/linu /* * Similar to nfs_client_initdata, but without the NFS-specific -diff -urNp linux-2.6.31.7/include/linux/lockd/lockd.h linux-2.6.31.7/include/linux/lockd/lockd.h ---- linux-2.6.31.7/include/linux/lockd/lockd.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/lockd/lockd.h 2009-12-10 22:15:16.000000000 -0500 -@@ -395,7 +395,7 @@ static inline int nlm_compare_locks(cons - &&(fl1->fl_type == fl2->fl_type || fl2->fl_type == F_UNLCK); - } - --extern struct lock_manager_operations nlmsvc_lock_operations; -+extern const struct lock_manager_operations nlmsvc_lock_operations; - - #endif /* __KERNEL__ */ - -diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h ---- linux-2.6.31.7/include/linux/mm.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/mm.h 2009-12-10 22:15:16.000000000 -0500 -@@ -104,6 +104,10 @@ extern unsigned int kobjsize(const void - #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */ +diff -urNp linux-2.6.32/include/linux/mm.h linux-2.6.32/include/linux/mm.h +--- linux-2.6.32/include/linux/mm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/mm.h 2009-12-04 21:40:48.512497130 -0500 +@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ + #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ +#ifdef CONFIG_PAX_PAGEEXEC +#define VM_PAGEEXEC 0x80000000 /* vma->vm_page_prot needs special handling */ @@ -43532,7 +42688,7 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS #endif -@@ -871,6 +875,8 @@ struct shrinker { +@@ -880,6 +884,8 @@ struct shrinker { extern void register_shrinker(struct shrinker *); extern void unregister_shrinker(struct shrinker *); @@ -43541,7 +42697,7 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); -@@ -1141,6 +1147,7 @@ out: +@@ -1152,6 +1158,7 @@ out: } extern int do_munmap(struct mm_struct *, unsigned long, size_t); @@ -43549,7 +42705,7 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h extern unsigned long do_brk(unsigned long, unsigned long); -@@ -1195,6 +1202,10 @@ extern struct vm_area_struct * find_vma( +@@ -1206,6 +1213,10 @@ extern struct vm_area_struct * find_vma( extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -43560,7 +42716,7 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1211,7 +1222,6 @@ static inline unsigned long vma_pages(st +@@ -1222,7 +1233,6 @@ static inline unsigned long vma_pages(st return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; } @@ -43568,11 +42724,10 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); -@@ -1303,5 +1313,12 @@ void vmemmap_populate_print_last(void); - extern int account_locked_memory(struct mm_struct *mm, struct rlimit *rlim, - size_t size); - extern void refund_locked_memory(struct mm_struct *mm, size_t size); -+ +@@ -1322,5 +1332,11 @@ extern int sysctl_memory_failure_early_k + extern int sysctl_memory_failure_recovery; + extern atomic_long_t mce_bad_pages; + +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot); +#else @@ -43581,18 +42736,9 @@ diff -urNp linux-2.6.31.7/include/linux/mm.h linux-2.6.31.7/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.31.7/include/linux/mm_types.h linux-2.6.31.7/include/linux/mm_types.h ---- linux-2.6.31.7/include/linux/mm_types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/mm_types.h 2009-12-10 22:15:16.000000000 -0500 -@@ -171,7 +171,7 @@ struct vm_area_struct { - struct anon_vma *anon_vma; /* Serialized by page_table_lock */ - - /* Function pointers to deal with this struct. */ -- struct vm_operations_struct * vm_ops; -+ const struct vm_operations_struct * vm_ops; - - /* Information about our backing store: */ - unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE +diff -urNp linux-2.6.32/include/linux/mm_types.h linux-2.6.32/include/linux/mm_types.h +--- linux-2.6.32/include/linux/mm_types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/mm_types.h 2009-12-04 21:40:48.513764541 -0500 @@ -186,6 +186,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ @@ -43602,7 +42748,7 @@ diff -urNp linux-2.6.31.7/include/linux/mm_types.h linux-2.6.31.7/include/linux/ }; struct core_thread { -@@ -286,6 +288,24 @@ struct mm_struct { +@@ -287,6 +289,24 @@ struct mm_struct { #ifdef CONFIG_MMU_NOTIFIER struct mmu_notifier_mm *mmu_notifier_mm; #endif @@ -43627,10 +42773,10 @@ diff -urNp linux-2.6.31.7/include/linux/mm_types.h linux-2.6.31.7/include/linux/ }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.31.7/include/linux/mmu_notifier.h linux-2.6.31.7/include/linux/mmu_notifier.h ---- linux-2.6.31.7/include/linux/mmu_notifier.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/mmu_notifier.h 2009-12-10 22:15:16.000000000 -0500 -@@ -217,12 +217,12 @@ static inline void mmu_notifier_mm_destr +diff -urNp linux-2.6.32/include/linux/mmu_notifier.h linux-2.6.32/include/linux/mmu_notifier.h +--- linux-2.6.32/include/linux/mmu_notifier.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/mmu_notifier.h 2009-12-04 21:40:48.513764541 -0500 +@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr */ #define ptep_clear_flush_notify(__vma, __address, __ptep) \ ({ \ @@ -43646,9 +42792,9 @@ diff -urNp linux-2.6.31.7/include/linux/mmu_notifier.h linux-2.6.31.7/include/li }) #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ -diff -urNp linux-2.6.31.7/include/linux/mod_devicetable.h linux-2.6.31.7/include/linux/mod_devicetable.h ---- linux-2.6.31.7/include/linux/mod_devicetable.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/mod_devicetable.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/mod_devicetable.h linux-2.6.32/include/linux/mod_devicetable.h +--- linux-2.6.32/include/linux/mod_devicetable.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/mod_devicetable.h 2009-12-04 21:40:48.513764541 -0500 @@ -12,7 +12,7 @@ typedef unsigned long kernel_ulong_t; #endif @@ -43667,10 +42813,10 @@ diff -urNp linux-2.6.31.7/include/linux/mod_devicetable.h linux-2.6.31.7/include struct hid_device_id { __u16 bus; -diff -urNp linux-2.6.31.7/include/linux/module.h linux-2.6.31.7/include/linux/module.h ---- linux-2.6.31.7/include/linux/module.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/module.h 2009-12-10 22:15:16.000000000 -0500 -@@ -283,16 +283,16 @@ struct module +diff -urNp linux-2.6.32/include/linux/module.h linux-2.6.32/include/linux/module.h +--- linux-2.6.32/include/linux/module.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/module.h 2009-12-11 19:45:15.974536186 -0500 +@@ -287,16 +287,16 @@ struct module int (*init)(void); /* If this is non-NULL, vfree after init() returns */ @@ -43691,7 +42837,7 @@ diff -urNp linux-2.6.31.7/include/linux/module.h linux-2.6.31.7/include/linux/mo /* Arch-specific module values */ struct mod_arch_specific arch; -@@ -389,16 +389,46 @@ struct module *__module_address(unsigned +@@ -393,16 +393,46 @@ struct module *__module_address(unsigned bool is_module_address(unsigned long addr); bool is_module_text_address(unsigned long addr); @@ -43742,21 +42888,9 @@ diff -urNp linux-2.6.31.7/include/linux/module.h linux-2.6.31.7/include/linux/mo } /* Search for module by name: must hold module_mutex. */ -@@ -451,7 +481,11 @@ void symbol_put_addr(void *addr); - static inline local_t *__module_ref_addr(struct module *mod, int cpu) - { - #ifdef CONFIG_SMP -+#ifdef CONFIG_X86_32 -+ return (local_t *) (mod->refptr + __per_cpu_offset[cpu]); -+#else - return (local_t *) (mod->refptr + per_cpu_offset(cpu)); -+#endif - #else - return &mod->ref; - #endif -diff -urNp linux-2.6.31.7/include/linux/moduleloader.h linux-2.6.31.7/include/linux/moduleloader.h ---- linux-2.6.31.7/include/linux/moduleloader.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/moduleloader.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/moduleloader.h linux-2.6.32/include/linux/moduleloader.h +--- linux-2.6.32/include/linux/moduleloader.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/moduleloader.h 2009-12-04 21:40:48.515735634 -0500 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -43779,9 +42913,9 @@ diff -urNp linux-2.6.31.7/include/linux/moduleloader.h linux-2.6.31.7/include/li /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.31.7/include/linux/namei.h linux-2.6.31.7/include/linux/namei.h ---- linux-2.6.31.7/include/linux/namei.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/namei.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/namei.h linux-2.6.32/include/linux/namei.h +--- linux-2.6.32/include/linux/namei.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/namei.h 2009-12-04 21:40:48.515735634 -0500 @@ -22,7 +22,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -43802,25 +42936,13 @@ diff -urNp linux-2.6.31.7/include/linux/namei.h linux-2.6.31.7/include/linux/nam } -static inline char *nd_get_link(struct nameidata *nd) -+static inline const char *nd_get_link(struct nameidata *nd) ++static inline const char *nd_get_link(const struct nameidata *nd) { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.31.7/include/linux/nfsd/nfsd.h linux-2.6.31.7/include/linux/nfsd/nfsd.h ---- linux-2.6.31.7/include/linux/nfsd/nfsd.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/nfsd/nfsd.h 2009-12-10 22:15:16.000000000 -0500 -@@ -57,7 +57,7 @@ extern u32 nfsd_supported_minorversion - extern struct mutex nfsd_mutex; - extern struct svc_serv *nfsd_serv; - --extern struct seq_operations nfs_exports_op; -+extern const struct seq_operations nfs_exports_op; - - /* - * Function prototypes. -diff -urNp linux-2.6.31.7/include/linux/nodemask.h linux-2.6.31.7/include/linux/nodemask.h ---- linux-2.6.31.7/include/linux/nodemask.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/nodemask.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/nodemask.h linux-2.6.32/include/linux/nodemask.h +--- linux-2.6.32/include/linux/nodemask.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/nodemask.h 2009-12-04 21:40:48.516662879 -0500 @@ -464,11 +464,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -43837,21 +42959,24 @@ diff -urNp linux-2.6.31.7/include/linux/nodemask.h linux-2.6.31.7/include/linux/ }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.31.7/include/linux/oprofile.h linux-2.6.31.7/include/linux/oprofile.h ---- linux-2.6.31.7/include/linux/oprofile.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/oprofile.h 2009-12-10 22:15:16.000000000 -0500 -@@ -128,7 +128,7 @@ int oprofilefs_create_ro_ulong(struct su +diff -urNp linux-2.6.32/include/linux/oprofile.h linux-2.6.32/include/linux/oprofile.h +--- linux-2.6.32/include/linux/oprofile.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/oprofile.h 2009-12-04 21:40:48.516662879 -0500 +@@ -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); - /** Create a file for read-only access to an atomic_t. */ +-/** Create a file for read-only access to an atomic_t. */ ++/** Create a file for read-only access to an atomic_unchecked_t. */ 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); /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.31.7/include/linux/pipe_fs_i.h linux-2.6.31.7/include/linux/pipe_fs_i.h ---- linux-2.6.31.7/include/linux/pipe_fs_i.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/pipe_fs_i.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/pipe_fs_i.h linux-2.6.32/include/linux/pipe_fs_i.h +--- linux-2.6.32/include/linux/pipe_fs_i.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/pipe_fs_i.h 2009-12-04 21:40:48.516662879 -0500 @@ -46,9 +46,9 @@ struct pipe_inode_info { wait_queue_head_t wait; unsigned int nrbufs, curbuf; @@ -43865,9 +42990,9 @@ diff -urNp linux-2.6.31.7/include/linux/pipe_fs_i.h linux-2.6.31.7/include/linux unsigned int r_counter; unsigned int w_counter; struct fasync_struct *fasync_readers; -diff -urNp linux-2.6.31.7/include/linux/poison.h linux-2.6.31.7/include/linux/poison.h ---- linux-2.6.31.7/include/linux/poison.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/poison.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/poison.h linux-2.6.32/include/linux/poison.h +--- linux-2.6.32/include/linux/poison.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/poison.h 2009-12-04 21:40:48.516662879 -0500 @@ -7,8 +7,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -43879,10 +43004,10 @@ diff -urNp linux-2.6.31.7/include/linux/poison.h linux-2.6.31.7/include/linux/po /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.31.7/include/linux/proc_fs.h linux-2.6.31.7/include/linux/proc_fs.h ---- linux-2.6.31.7/include/linux/proc_fs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/proc_fs.h 2009-12-10 22:15:16.000000000 -0500 -@@ -146,6 +146,19 @@ static inline struct proc_dir_entry *pro +diff -urNp linux-2.6.32/include/linux/proc_fs.h linux-2.6.32/include/linux/proc_fs.h +--- linux-2.6.32/include/linux/proc_fs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/proc_fs.h 2009-12-04 20:41:39.020726510 -0500 +@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -43902,9 +43027,9 @@ diff -urNp linux-2.6.31.7/include/linux/proc_fs.h linux-2.6.31.7/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.31.7/include/linux/random.h linux-2.6.31.7/include/linux/random.h ---- linux-2.6.31.7/include/linux/random.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/random.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/random.h linux-2.6.32/include/linux/random.h +--- linux-2.6.32/include/linux/random.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/random.h 2009-12-04 21:40:48.516662879 -0500 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -43917,9 +43042,9 @@ diff -urNp linux-2.6.31.7/include/linux/random.h linux-2.6.31.7/include/linux/ra #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.31.7/include/linux/reiserfs_fs.h linux-2.6.31.7/include/linux/reiserfs_fs.h ---- linux-2.6.31.7/include/linux/reiserfs_fs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/reiserfs_fs.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/reiserfs_fs.h linux-2.6.32/include/linux/reiserfs_fs.h +--- linux-2.6.32/include/linux/reiserfs_fs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/reiserfs_fs.h 2009-12-04 21:40:48.518617208 -0500 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ @@ -43962,13 +43087,13 @@ diff -urNp linux-2.6.31.7/include/linux/reiserfs_fs.h linux-2.6.31.7/include/lin }; -extern struct item_operations *item_ops[TYPE_ANY + 1]; -+extern const struct item_operations *item_ops[TYPE_ANY + 1]; ++extern const struct item_operations * const item_ops[TYPE_ANY + 1]; #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.31.7/include/linux/reiserfs_fs_sb.h linux-2.6.31.7/include/linux/reiserfs_fs_sb.h ---- linux-2.6.31.7/include/linux/reiserfs_fs_sb.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/reiserfs_fs_sb.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/reiserfs_fs_sb.h linux-2.6.32/include/linux/reiserfs_fs_sb.h +--- linux-2.6.32/include/linux/reiserfs_fs_sb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/reiserfs_fs_sb.h 2009-12-04 21:40:48.518617208 -0500 @@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; @@ -43978,22 +43103,21 @@ diff -urNp linux-2.6.31.7/include/linux/reiserfs_fs_sb.h linux-2.6.31.7/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sched.h ---- linux-2.6.31.7/include/linux/sched.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/sched.h 2009-12-10 22:15:16.000000000 -0500 -@@ -99,6 +99,7 @@ struct bio; +diff -urNp linux-2.6.32/include/linux/sched.h linux-2.6.32/include/linux/sched.h +--- linux-2.6.32/include/linux/sched.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/sched.h 2009-12-11 20:45:34.720348030 -0500 +@@ -101,6 +101,7 @@ struct bio; struct fs_struct; struct bts_context; - struct perf_counter_context; + struct perf_event_context; +struct linux_binprm; /* * List of flags we want to share for kernel threads, -@@ -629,6 +630,15 @@ struct signal_struct { - unsigned audit_tty; +@@ -664,6 +665,15 @@ struct signal_struct { struct tty_audit_buf *tty_audit_buf; #endif -+ + +#ifdef CONFIG_GRKERNSEC + u32 curr_ip; + u32 gr_saddr; @@ -44002,10 +43126,11 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch + u16 gr_dport; + u8 used_accept:1; +#endif ++ + int oom_adj; /* OOM kill score adjustment (bit shift) */ }; - /* Context switch must be unlocked if interrupts are to be enabled */ -@@ -1165,7 +1175,7 @@ struct sched_rt_entity { +@@ -1214,7 +1224,7 @@ struct rcu_node; struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ @@ -44014,7 +43139,7 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch atomic_t usage; unsigned int flags; /* per process flags, defined below */ unsigned int ptrace; -@@ -1269,8 +1279,8 @@ struct task_struct { +@@ -1326,8 +1336,8 @@ struct task_struct { struct list_head thread_group; struct completion *vfork_done; /* for vfork() */ @@ -44025,7 +43150,7 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; -@@ -1284,15 +1294,6 @@ struct task_struct { +@@ -1341,16 +1351,6 @@ struct task_struct { struct task_cputime cputime_expires; struct list_head cpu_timers[3]; @@ -44037,31 +43162,41 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch - struct mutex cred_guard_mutex; /* guard against foreign influences on - * credential calculations - * (notably. ptrace) */ +- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */ - char comm[TASK_COMM_LEN]; /* executable name excluding path - access with [gs]et_task_comm (which lock it with task_lock()) -@@ -1429,6 +1430,16 @@ struct task_struct { - struct mutex perf_counter_mutex; - struct list_head perf_counter_list; +@@ -1434,6 +1434,15 @@ struct task_struct { + int hardirq_context; + int softirq_context; #endif + +/* process credentials */ + const struct cred *real_cred; /* objective and real subjective task + * credentials (COW) */ -+ const struct cred *cred; /* effective (overridable) subjective task -+ * credentials (COW) */ + struct mutex cred_guard_mutex; /* guard against foreign influences on + * credential calculations + * (notably. ptrace) */ ++ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */ + - #ifdef CONFIG_NUMA - struct mempolicy *mempolicy; /* Protected by alloc_lock */ - short il_next; -@@ -1480,8 +1491,66 @@ struct task_struct { - /* bitmask of trace recursion */ - unsigned long trace_recursion; - #endif /* CONFIG_TRACING */ + #ifdef CONFIG_LOCKDEP + # define MAX_LOCK_DEPTH 48UL + u64 curr_chain_key; +@@ -1454,6 +1463,9 @@ struct task_struct { + + struct backing_dev_info *backing_dev_info; + ++ const struct cred *cred; /* effective (overridable) subjective task ++ * credentials (COW) */ ++ + struct io_context *io_context; + + unsigned long ptrace_message; +@@ -1517,6 +1529,18 @@ struct task_struct { + unsigned long default_timer_slack_ns; + + struct list_head *scm_work_list; + +#ifdef CONFIG_GRKERNSEC + /* grsecurity */ @@ -44074,6 +43209,11 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch + u8 brute; +#endif + + #ifdef CONFIG_FUNCTION_GRAPH_TRACER + /* Index of current stored adress in ret_stack */ + int curr_ret_stack; +@@ -1541,6 +1565,52 @@ struct task_struct { + unsigned long stack_start; }; +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */ @@ -44125,7 +43265,7 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -2046,7 +2115,7 @@ extern void __cleanup_sighand(struct sig +@@ -2133,7 +2203,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -44134,7 +43274,7 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2159,8 +2228,8 @@ static inline void unlock_task_sighand(s +@@ -2246,8 +2316,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -44145,18 +43285,43 @@ diff -urNp linux-2.6.31.7/include/linux/sched.h linux-2.6.31.7/include/linux/sch static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -@@ -2175,7 +2244,7 @@ static inline unsigned long *end_of_stac +@@ -2262,13 +2332,31 @@ static inline unsigned long *end_of_stac #endif -static inline int object_is_on_stack(void *obj) -+static inline int object_is_on_stack(const void *obj) ++static inline int object_starts_on_stack(void *obj) { - void *stack = task_stack_page(current); +- void *stack = task_stack_page(current); ++ const void *stack = task_stack_page(current); + + return (obj >= stack) && (obj < (stack + THREAD_SIZE)); + } -diff -urNp linux-2.6.31.7/include/linux/screen_info.h linux-2.6.31.7/include/linux/screen_info.h ---- linux-2.6.31.7/include/linux/screen_info.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/screen_info.h 2009-12-10 22:15:16.000000000 -0500 ++/* 0: not at all, 1: fully, -1: partially (implies an error) */ ++static inline int object_is_on_stack(const void *obj, unsigned long len) ++{ ++ const void *stack = task_stack_page(current); ++ const void *stackend = stack + THREAD_SIZE; ++ ++ if (obj + len < obj) ++ return -1; ++ ++ if (stack <= obj && obj + len <= stackend) ++ return 1; ++ ++ if (obj + len <= stack || stackend <= obj) ++ return 0; ++ ++ return -1; ++} ++ + extern void thread_info_cache_init(void); + + #ifdef CONFIG_DEBUG_STACK_USAGE +diff -urNp linux-2.6.32/include/linux/screen_info.h linux-2.6.32/include/linux/screen_info.h +--- linux-2.6.32/include/linux/screen_info.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/screen_info.h 2009-12-04 21:40:48.520759956 -0500 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -44167,9 +43332,9 @@ diff -urNp linux-2.6.31.7/include/linux/screen_info.h linux-2.6.31.7/include/lin } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.31.7/include/linux/security.h linux-2.6.31.7/include/linux/security.h ---- linux-2.6.31.7/include/linux/security.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/security.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/security.h linux-2.6.32/include/linux/security.h +--- linux-2.6.32/include/linux/security.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/security.h 2009-12-04 20:41:39.064630993 -0500 @@ -34,6 +34,7 @@ #include <linux/key.h> #include <linux/xfrm.h> @@ -44178,9 +43343,9 @@ diff -urNp linux-2.6.31.7/include/linux/security.h linux-2.6.31.7/include/linux/ #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.31.7/include/linux/shm.h linux-2.6.31.7/include/linux/shm.h ---- linux-2.6.31.7/include/linux/shm.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/shm.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/shm.h linux-2.6.32/include/linux/shm.h +--- linux-2.6.32/include/linux/shm.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/shm.h 2009-12-04 20:41:39.073728036 -0500 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -44192,9 +43357,9 @@ diff -urNp linux-2.6.31.7/include/linux/shm.h linux-2.6.31.7/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.31.7/include/linux/slab.h linux-2.6.31.7/include/linux/slab.h ---- linux-2.6.31.7/include/linux/slab.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/slab.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/slab.h linux-2.6.32/include/linux/slab.h +--- linux-2.6.32/include/linux/slab.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/slab.h 2009-12-04 21:40:48.520759956 -0500 @@ -11,6 +11,7 @@ #include <linux/gfp.h> @@ -44266,9 +43431,9 @@ diff -urNp linux-2.6.31.7/include/linux/slab.h linux-2.6.31.7/include/linux/slab +}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.31.7/include/linux/slub_def.h linux-2.6.31.7/include/linux/slub_def.h ---- linux-2.6.31.7/include/linux/slub_def.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/slub_def.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/slub_def.h linux-2.6.32/include/linux/slub_def.h +--- linux-2.6.32/include/linux/slub_def.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/slub_def.h 2009-12-04 21:40:48.521760989 -0500 @@ -86,7 +86,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -44278,9 +43443,9 @@ diff -urNp linux-2.6.31.7/include/linux/slub_def.h linux-2.6.31.7/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.31.7/include/linux/sonet.h linux-2.6.31.7/include/linux/sonet.h ---- linux-2.6.31.7/include/linux/sonet.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/sonet.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/sonet.h linux-2.6.32/include/linux/sonet.h +--- linux-2.6.32/include/linux/sonet.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/sonet.h 2009-12-04 21:40:48.521760989 -0500 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -44290,9 +43455,34 @@ diff -urNp linux-2.6.31.7/include/linux/sonet.h linux-2.6.31.7/include/linux/son __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.31.7/include/linux/suspend.h linux-2.6.31.7/include/linux/suspend.h ---- linux-2.6.31.7/include/linux/suspend.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/suspend.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/suspend.h linux-2.6.32/include/linux/suspend.h +--- linux-2.6.32/include/linux/suspend.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/suspend.h 2009-12-04 21:40:48.521760989 -0500 +@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; + * which require special recovery actions in that situation. + */ + struct platform_suspend_ops { +- int (*valid)(suspend_state_t state); +- int (*begin)(suspend_state_t state); +- int (*prepare)(void); +- int (*prepare_late)(void); +- int (*enter)(suspend_state_t state); +- void (*wake)(void); +- void (*finish)(void); +- void (*end)(void); +- void (*recover)(void); ++ int (* const valid)(suspend_state_t state); ++ int (* const begin)(suspend_state_t state); ++ int (* const prepare)(void); ++ int (* const prepare_late)(void); ++ int (* const enter)(suspend_state_t state); ++ void (* const wake)(void); ++ void (* const finish)(void); ++ void (* const end)(void); ++ void (* const recover)(void); + }; + + #ifdef CONFIG_SUSPEND @@ -120,7 +120,7 @@ struct platform_suspend_ops { * suspend_set_ops - set platform dependent suspend operations * @ops: The new suspend operations to set. @@ -44302,6 +43492,42 @@ diff -urNp linux-2.6.31.7/include/linux/suspend.h linux-2.6.31.7/include/linux/s extern int suspend_valid_only_mem(suspend_state_t state); /** +@@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t st + #else /* !CONFIG_SUSPEND */ + #define suspend_valid_only_mem NULL + +-static inline void suspend_set_ops(struct platform_suspend_ops *ops) {} ++static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {} + static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; } + #endif /* !CONFIG_SUSPEND */ + +@@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone + * platforms which require special recovery actions in that situation. + */ + struct platform_hibernation_ops { +- int (*begin)(void); +- void (*end)(void); +- int (*pre_snapshot)(void); +- void (*finish)(void); +- int (*prepare)(void); +- int (*enter)(void); +- void (*leave)(void); +- int (*pre_restore)(void); +- void (*restore_cleanup)(void); +- void (*recover)(void); ++ int (* const begin)(void); ++ void (* const end)(void); ++ int (* const pre_snapshot)(void); ++ void (* const finish)(void); ++ int (* const prepare)(void); ++ int (* const enter)(void); ++ void (* const leave)(void); ++ int (* const pre_restore)(void); ++ void (* const restore_cleanup)(void); ++ void (* const recover)(void); + }; + + #ifdef CONFIG_HIBERNATION @@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct extern void swsusp_unset_page_free(struct page *); extern unsigned long get_safe_page(gfp_t gfp_mask); @@ -44320,10 +43546,10 @@ diff -urNp linux-2.6.31.7/include/linux/suspend.h linux-2.6.31.7/include/linux/s static inline int hibernate(void) { return -ENOSYS; } static inline bool system_entering_hibernation(void) { return false; } #endif /* CONFIG_HIBERNATION */ -diff -urNp linux-2.6.31.7/include/linux/sysctl.h linux-2.6.31.7/include/linux/sysctl.h ---- linux-2.6.31.7/include/linux/sysctl.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/sysctl.h 2009-12-10 22:15:16.000000000 -0500 -@@ -165,7 +165,11 @@ enum +diff -urNp linux-2.6.32/include/linux/sysctl.h linux-2.6.32/include/linux/sysctl.h +--- linux-2.6.32/include/linux/sysctl.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/sysctl.h 2009-12-04 21:40:48.522759961 -0500 +@@ -164,7 +164,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -44336,9 +43562,9 @@ diff -urNp linux-2.6.31.7/include/linux/sysctl.h linux-2.6.31.7/include/linux/sy /* CTL_VM names: */ enum -diff -urNp linux-2.6.31.7/include/linux/sysfs.h linux-2.6.31.7/include/linux/sysfs.h ---- linux-2.6.31.7/include/linux/sysfs.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/sysfs.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/sysfs.h linux-2.6.32/include/linux/sysfs.h +--- linux-2.6.32/include/linux/sysfs.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/sysfs.h 2009-12-04 21:40:48.523771085 -0500 @@ -75,8 +75,8 @@ struct bin_attribute { }; @@ -44350,9 +43576,9 @@ diff -urNp linux-2.6.31.7/include/linux/sysfs.h linux-2.6.31.7/include/linux/sys }; struct sysfs_dirent; -diff -urNp linux-2.6.31.7/include/linux/thread_info.h linux-2.6.31.7/include/linux/thread_info.h ---- linux-2.6.31.7/include/linux/thread_info.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/thread_info.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/thread_info.h linux-2.6.32/include/linux/thread_info.h +--- linux-2.6.32/include/linux/thread_info.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/thread_info.h 2009-12-04 21:40:48.523771085 -0500 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait and futex_wait_requeue_pi */ @@ -44362,9 +43588,47 @@ diff -urNp linux-2.6.31.7/include/linux/thread_info.h linux-2.6.31.7/include/lin u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.31.7/include/linux/tty_ldisc.h linux-2.6.31.7/include/linux/tty_ldisc.h ---- linux-2.6.31.7/include/linux/tty_ldisc.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/tty_ldisc.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/tty.h linux-2.6.32/include/linux/tty.h +--- linux-2.6.32/include/linux/tty.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/tty.h 2009-12-04 21:40:48.523771085 -0500 +@@ -13,6 +13,7 @@ + #include <linux/tty_driver.h> + #include <linux/tty_ldisc.h> + #include <linux/mutex.h> ++#include <linux/poll.h> + + #include <asm/system.h> + +@@ -432,7 +433,6 @@ extern int tty_perform_flush(struct tty_ + extern dev_t tty_devnum(struct tty_struct *tty); + extern void proc_clear_tty(struct task_struct *p); + extern struct tty_struct *get_current_tty(void); +-extern void tty_default_fops(struct file_operations *fops); + extern struct tty_struct *alloc_tty_struct(void); + extern void free_tty_struct(struct tty_struct *tty); + extern void initialize_tty_struct(struct tty_struct *tty, +@@ -482,6 +482,18 @@ extern void tty_ldisc_begin(void); + /* This last one is just for the tty layer internals and shouldn't be used elsewhere */ + extern void tty_ldisc_enable(struct tty_struct *tty); + ++/* tty_io.c */ ++extern ssize_t tty_read(struct file *, char __user *, size_t, loff_t *); ++extern ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *); ++extern unsigned int tty_poll(struct file *, poll_table *); ++#ifdef CONFIG_COMPAT ++extern long tty_compat_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg); ++#else ++#define tty_compat_ioctl NULL ++#endif ++extern int tty_release(struct inode *, struct file *); ++extern int tty_fasync(int fd, struct file *filp, int on); + + /* n_tty.c */ + extern struct tty_ldisc_ops tty_ldisc_N_TTY; +diff -urNp linux-2.6.32/include/linux/tty_ldisc.h linux-2.6.32/include/linux/tty_ldisc.h +--- linux-2.6.32/include/linux/tty_ldisc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/tty_ldisc.h 2009-12-04 21:40:48.524759026 -0500 @@ -139,7 +139,7 @@ struct tty_ldisc_ops { struct module *owner; @@ -44374,9 +43638,9 @@ diff -urNp linux-2.6.31.7/include/linux/tty_ldisc.h linux-2.6.31.7/include/linux }; struct tty_ldisc { -diff -urNp linux-2.6.31.7/include/linux/types.h linux-2.6.31.7/include/linux/types.h ---- linux-2.6.31.7/include/linux/types.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/types.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/types.h linux-2.6.32/include/linux/types.h +--- linux-2.6.32/include/linux/types.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/types.h 2009-12-04 21:40:48.524759026 -0500 @@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -44404,9 +43668,9 @@ diff -urNp linux-2.6.31.7/include/linux/types.h linux-2.6.31.7/include/linux/typ #endif struct ustat { -diff -urNp linux-2.6.31.7/include/linux/uaccess.h linux-2.6.31.7/include/linux/uaccess.h ---- linux-2.6.31.7/include/linux/uaccess.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/uaccess.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/uaccess.h linux-2.6.32/include/linux/uaccess.h +--- linux-2.6.32/include/linux/uaccess.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/uaccess.h 2009-12-04 21:40:48.525664282 -0500 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -44438,9 +43702,9 @@ diff -urNp linux-2.6.31.7/include/linux/uaccess.h linux-2.6.31.7/include/linux/u +extern long probe_kernel_write(void *dst, const void *src, size_t size); #endif /* __LINUX_UACCESS_H__ */ -diff -urNp linux-2.6.31.7/include/linux/vmalloc.h linux-2.6.31.7/include/linux/vmalloc.h ---- linux-2.6.31.7/include/linux/vmalloc.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/linux/vmalloc.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/linux/vmalloc.h linux-2.6.32/include/linux/vmalloc.h +--- linux-2.6.32/include/linux/vmalloc.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/linux/vmalloc.h 2009-12-04 21:40:48.525664282 -0500 @@ -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 */ @@ -44453,9 +43717,9 @@ diff -urNp linux-2.6.31.7/include/linux/vmalloc.h linux-2.6.31.7/include/linux/v /* bits [20..32] reserved for arch specific ioremap internals */ /* -@@ -115,4 +120,81 @@ extern rwlock_t vmlist_lock; - extern struct vm_struct *vmlist; - extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); +@@ -121,4 +126,81 @@ struct vm_struct **pcpu_get_vm_areas(con + + void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms); +#define vmalloc(x) \ +({ \ @@ -44535,9 +43799,9 @@ diff -urNp linux-2.6.31.7/include/linux/vmalloc.h linux-2.6.31.7/include/linux/v +}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.31.7/include/net/irda/ircomm_tty.h linux-2.6.31.7/include/net/irda/ircomm_tty.h ---- linux-2.6.31.7/include/net/irda/ircomm_tty.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/net/irda/ircomm_tty.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/net/irda/ircomm_tty.h linux-2.6.32/include/net/irda/ircomm_tty.h +--- linux-2.6.32/include/net/irda/ircomm_tty.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/net/irda/ircomm_tty.h 2009-12-04 21:40:48.525664282 -0500 @@ -105,8 +105,8 @@ struct ircomm_tty_cb { unsigned short close_delay; unsigned short closing_wait; /* time to wait before closing */ @@ -44549,9 +43813,31 @@ diff -urNp linux-2.6.31.7/include/net/irda/ircomm_tty.h linux-2.6.31.7/include/n /* Protect concurent access to : * o self->open_count -diff -urNp linux-2.6.31.7/include/net/sctp/sctp.h linux-2.6.31.7/include/net/sctp/sctp.h ---- linux-2.6.31.7/include/net/sctp/sctp.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/net/sctp/sctp.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/net/neighbour.h linux-2.6.32/include/net/neighbour.h +--- linux-2.6.32/include/net/neighbour.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/net/neighbour.h 2009-12-04 21:40:48.526627126 -0500 +@@ -125,12 +125,12 @@ struct neighbour + struct neigh_ops + { + int family; +- void (*solicit)(struct neighbour *, struct sk_buff*); +- void (*error_report)(struct neighbour *, struct sk_buff*); +- int (*output)(struct sk_buff*); +- int (*connected_output)(struct sk_buff*); +- int (*hh_output)(struct sk_buff*); +- int (*queue_xmit)(struct sk_buff*); ++ void (* const solicit)(struct neighbour *, struct sk_buff*); ++ void (* const error_report)(struct neighbour *, struct sk_buff*); ++ int (* const output)(struct sk_buff*); ++ int (* const connected_output)(struct sk_buff*); ++ int (* const hh_output)(struct sk_buff*); ++ int (* const queue_xmit)(struct sk_buff*); + }; + + struct pneigh_entry +diff -urNp linux-2.6.32/include/net/sctp/sctp.h linux-2.6.32/include/net/sctp/sctp.h +--- linux-2.6.32/include/net/sctp/sctp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/net/sctp/sctp.h 2009-12-04 21:40:48.526627126 -0500 @@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -44563,50 +43849,55 @@ diff -urNp linux-2.6.31.7/include/net/sctp/sctp.h linux-2.6.31.7/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.31.7/include/net/tcp.h linux-2.6.31.7/include/net/tcp.h ---- linux-2.6.31.7/include/net/tcp.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/net/tcp.h 2009-12-10 22:15:16.000000000 -0500 -@@ -667,26 +667,26 @@ struct tcp_congestion_ops { - unsigned long flags; +diff -urNp linux-2.6.32/include/net/tcp.h linux-2.6.32/include/net/tcp.h +--- linux-2.6.32/include/net/tcp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/net/tcp.h 2009-12-04 21:40:48.526627126 -0500 +@@ -1414,6 +1414,7 @@ enum tcp_seq_states { + struct tcp_seq_afinfo { + char *name; + sa_family_t family; ++ /* cannot be const */ + struct file_operations seq_fops; + struct seq_operations seq_ops; + }; +diff -urNp linux-2.6.32/include/net/udp.h linux-2.6.32/include/net/udp.h +--- linux-2.6.32/include/net/udp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/net/udp.h 2009-12-04 21:40:48.527757065 -0500 +@@ -187,6 +187,7 @@ struct udp_seq_afinfo { + char *name; + sa_family_t family; + struct udp_table *udp_table; ++ /* cannot be const */ + struct file_operations seq_fops; + struct seq_operations seq_ops; + }; +diff -urNp linux-2.6.32/include/sound/ac97_codec.h linux-2.6.32/include/sound/ac97_codec.h +--- linux-2.6.32/include/sound/ac97_codec.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/sound/ac97_codec.h 2009-12-04 21:40:48.527757065 -0500 +@@ -419,15 +419,15 @@ + struct snd_ac97; + + struct snd_ac97_build_ops { +- int (*build_3d) (struct snd_ac97 *ac97); +- int (*build_specific) (struct snd_ac97 *ac97); +- int (*build_spdif) (struct snd_ac97 *ac97); +- int (*build_post_spdif) (struct snd_ac97 *ac97); ++ int (* const build_3d) (struct snd_ac97 *ac97); ++ int (* const build_specific) (struct snd_ac97 *ac97); ++ int (* const build_spdif) (struct snd_ac97 *ac97); ++ int (* const build_post_spdif) (struct snd_ac97 *ac97); + #ifdef CONFIG_PM +- void (*suspend) (struct snd_ac97 *ac97); +- void (*resume) (struct snd_ac97 *ac97); ++ void (* const suspend) (struct snd_ac97 *ac97); ++ void (* const resume) (struct snd_ac97 *ac97); + #endif +- void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */ ++ void (* const update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */ + }; - /* initialize private data (optional) */ -- void (*init)(struct sock *sk); -+ void (* const init)(struct sock *sk); - /* cleanup private data (optional) */ -- void (*release)(struct sock *sk); -+ void (* const release)(struct sock *sk); - - /* return slow start threshold (required) */ -- u32 (*ssthresh)(struct sock *sk); -+ u32 (* const ssthresh)(struct sock *sk); - /* lower bound for congestion window (optional) */ -- u32 (*min_cwnd)(const struct sock *sk); -+ u32 (* const min_cwnd)(const struct sock *sk); - /* do new cwnd calculation (required) */ -- void (*cong_avoid)(struct sock *sk, u32 ack, u32 in_flight); -+ void (* const cong_avoid)(struct sock *sk, u32 ack, u32 in_flight); - /* call before changing ca_state (optional) */ -- void (*set_state)(struct sock *sk, u8 new_state); -+ void (* const set_state)(struct sock *sk, u8 new_state); - /* call when cwnd event occurs (optional) */ -- void (*cwnd_event)(struct sock *sk, enum tcp_ca_event ev); -+ void (* const cwnd_event)(struct sock *sk, enum tcp_ca_event ev); - /* new value of cwnd after loss (optional) */ -- u32 (*undo_cwnd)(struct sock *sk); -+ u32 (* const undo_cwnd)(struct sock *sk); - /* hook for packet ack accounting (optional) */ -- void (*pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us); -+ void (* const pkts_acked)(struct sock *sk, u32 num_acked, s32 rtt_us); - /* get info for inet_diag (optional) */ -- void (*get_info)(struct sock *sk, u32 ext, struct sk_buff *skb); -+ void (* const get_info)(struct sock *sk, u32 ext, struct sk_buff *skb); - - char name[TCP_CA_NAME_MAX]; - struct module *owner; -diff -urNp linux-2.6.31.7/include/sound/ac97_codec.h linux-2.6.31.7/include/sound/ac97_codec.h ---- linux-2.6.31.7/include/sound/ac97_codec.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/sound/ac97_codec.h 2009-12-10 22:15:16.000000000 -0500 -@@ -474,7 +474,7 @@ struct snd_ac97_template { + struct snd_ac97_bus_ops { +@@ -477,7 +477,7 @@ struct snd_ac97_template { struct snd_ac97 { /* -- lowlevel (hardware) driver specific -- */ @@ -44615,21 +43906,9 @@ diff -urNp linux-2.6.31.7/include/sound/ac97_codec.h linux-2.6.31.7/include/soun void *private_data; void (*private_free) (struct snd_ac97 *ac97); /* --- */ -diff -urNp linux-2.6.31.7/include/sound/core.h linux-2.6.31.7/include/sound/core.h ---- linux-2.6.31.7/include/sound/core.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/sound/core.h 2009-12-10 22:15:16.000000000 -0500 -@@ -430,7 +430,7 @@ static inline int __snd_bug_on(int cond) - */ - #define snd_printdd(format, args...) snd_printk(format, ##args) - #else --#define snd_printdd(format, args...) /* nothing */ -+#define snd_printdd(format, args...) do {} while (0) - #endif - - -diff -urNp linux-2.6.31.7/include/video/uvesafb.h linux-2.6.31.7/include/video/uvesafb.h ---- linux-2.6.31.7/include/video/uvesafb.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/include/video/uvesafb.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/include/video/uvesafb.h linux-2.6.32/include/video/uvesafb.h +--- linux-2.6.32/include/video/uvesafb.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/include/video/uvesafb.h 2009-12-04 21:40:48.528613688 -0500 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -44638,33 +43917,9 @@ diff -urNp linux-2.6.31.7/include/video/uvesafb.h linux-2.6.31.7/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.31.7/init/Kconfig linux-2.6.31.7/init/Kconfig ---- linux-2.6.31.7/init/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/Kconfig 2009-12-10 22:15:16.000000000 -0500 -@@ -1014,7 +1014,7 @@ config STRIP_ASM_SYMS - - 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). -@@ -1101,9 +1101,9 @@ config HAVE_GENERIC_DMA_COHERENT - - config SLABINFO - bool -- depends on PROC_FS -+ depends on PROC_FS && !GRKERNSEC_PROC_ADD - depends on SLAB || SLUB_DEBUG -- default y -+ default n - - config RT_MUTEXES - boolean -diff -urNp linux-2.6.31.7/init/do_mounts.c linux-2.6.31.7/init/do_mounts.c ---- linux-2.6.31.7/init/do_mounts.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/do_mounts.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/init/do_mounts.c linux-2.6.32/init/do_mounts.c +--- linux-2.6.32/init/do_mounts.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/do_mounts.c 2009-12-04 21:40:48.529634492 -0500 @@ -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) @@ -44701,19 +43956,18 @@ diff -urNp linux-2.6.31.7/init/do_mounts.c linux-2.6.31.7/init/do_mounts.c termios.c_lflag |= ICANON; sys_ioctl(fd, TCSETSF, (long)&termios); sys_close(fd); -@@ -415,7 +415,7 @@ void __init prepare_namespace(void) - +@@ -416,6 +416,6 @@ void __init prepare_namespace(void) mount_root(); out: + devtmpfs_mount("dev"); - sys_mount(".", "/", NULL, MS_MOVE, NULL); - sys_chroot("."); + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); + sys_chroot((__force char __user *)"."); } - -diff -urNp linux-2.6.31.7/init/do_mounts.h linux-2.6.31.7/init/do_mounts.h ---- linux-2.6.31.7/init/do_mounts.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/do_mounts.h 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/init/do_mounts.h linux-2.6.32/init/do_mounts.h +--- linux-2.6.32/init/do_mounts.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/do_mounts.h 2009-12-04 21:40:48.529634492 -0500 @@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) @@ -44733,9 +43987,9 @@ diff -urNp linux-2.6.31.7/init/do_mounts.h linux-2.6.31.7/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.31.7/init/do_mounts_initrd.c linux-2.6.31.7/init/do_mounts_initrd.c ---- linux-2.6.31.7/init/do_mounts_initrd.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/do_mounts_initrd.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/init/do_mounts_initrd.c linux-2.6.32/init/do_mounts_initrd.c +--- linux-2.6.32/init/do_mounts_initrd.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/do_mounts_initrd.c 2009-12-04 21:40:48.529634492 -0500 @@ -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); @@ -44819,9 +44073,9 @@ diff -urNp linux-2.6.31.7/init/do_mounts_initrd.c linux-2.6.31.7/init/do_mounts_ + sys_unlink((__force const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.31.7/init/do_mounts_md.c linux-2.6.31.7/init/do_mounts_md.c ---- linux-2.6.31.7/init/do_mounts_md.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/do_mounts_md.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/init/do_mounts_md.c linux-2.6.32/init/do_mounts_md.c +--- linux-2.6.32/init/do_mounts_md.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/do_mounts_md.c 2009-12-04 21:40:48.530742972 -0500 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -44849,9 +44103,9 @@ diff -urNp linux-2.6.31.7/init/do_mounts_md.c linux-2.6.31.7/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.31.7/init/initramfs.c linux-2.6.31.7/init/initramfs.c ---- linux-2.6.31.7/init/initramfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/initramfs.c 2009-12-10 22:15:16.000000000 -0500 +diff -urNp linux-2.6.32/init/initramfs.c linux-2.6.32/init/initramfs.c +--- linux-2.6.32/init/initramfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/initramfs.c 2009-12-04 21:40:48.530742972 -0500 @@ -74,7 +74,7 @@ static void __init free_hash(void) } } @@ -44960,10 +44214,34 @@ diff -urNp linux-2.6.31.7/init/initramfs.c linux-2.6.31.7/init/initramfs.c state = SkipIt; next_state = Reset; return 0; -diff -urNp linux-2.6.31.7/init/main.c linux-2.6.31.7/init/main.c ---- linux-2.6.31.7/init/main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/main.c 2009-12-10 22:15:17.000000000 -0500 -@@ -96,6 +96,7 @@ static inline void mark_rodata_ro(void) +diff -urNp linux-2.6.32/init/Kconfig linux-2.6.32/init/Kconfig +--- linux-2.6.32/init/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/Kconfig 2009-12-04 21:40:48.528613688 -0500 +@@ -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). +@@ -1116,9 +1116,9 @@ config HAVE_GENERIC_DMA_COHERENT + + config SLABINFO + bool +- depends on PROC_FS ++ depends on PROC_FS && !GRKERNSEC_PROC_ADD + depends on SLAB || SLUB_DEBUG +- default y ++ default n + + config RT_MUTEXES + boolean +diff -urNp linux-2.6.32/init/main.c linux-2.6.32/init/main.c +--- linux-2.6.32/init/main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/main.c 2009-12-04 21:40:48.531614101 -0500 +@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); #endif @@ -44971,7 +44249,7 @@ diff -urNp linux-2.6.31.7/init/main.c linux-2.6.31.7/init/main.c enum system_states system_state __read_mostly; EXPORT_SYMBOL(system_state); -@@ -182,6 +183,35 @@ static int __init set_reset_devices(char +@@ -183,6 +184,35 @@ static int __init set_reset_devices(char __setup("reset_devices", set_reset_devices); @@ -45007,16 +44285,7 @@ diff -urNp linux-2.6.31.7/init/main.c linux-2.6.31.7/init/main.c static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; -@@ -370,7 +400,7 @@ static void __init setup_nr_cpu_ids(void - } - - #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA --unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; -+unsigned long __per_cpu_offset[NR_CPUS] __read_only; - - EXPORT_SYMBOL(__per_cpu_offset); - -@@ -729,52 +759,53 @@ int initcall_debug; +@@ -702,52 +732,53 @@ int initcall_debug; core_param(initcall_debug, initcall_debug, bool, 0644); static char msgbuf[64]; @@ -45086,7 +44355,7 @@ diff -urNp linux-2.6.31.7/init/main.c linux-2.6.31.7/init/main.c } -@@ -913,11 +944,13 @@ static int __init kernel_init(void * unu +@@ -886,11 +917,13 @@ static int __init kernel_init(void * unu if (!ramdisk_execute_command) ramdisk_execute_command = "/init"; @@ -45101,9 +44370,9 @@ diff -urNp linux-2.6.31.7/init/main.c linux-2.6.31.7/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.31.7/init/noinitramfs.c linux-2.6.31.7/init/noinitramfs.c ---- linux-2.6.31.7/init/noinitramfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/init/noinitramfs.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/init/noinitramfs.c linux-2.6.32/init/noinitramfs.c +--- linux-2.6.32/init/noinitramfs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/init/noinitramfs.c 2009-12-04 21:40:48.531614101 -0500 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -45122,9 +44391,9 @@ diff -urNp linux-2.6.31.7/init/noinitramfs.c linux-2.6.31.7/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.31.7/ipc/ipc_sysctl.c linux-2.6.31.7/ipc/ipc_sysctl.c ---- linux-2.6.31.7/ipc/ipc_sysctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/ipc/ipc_sysctl.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/ipc/ipc_sysctl.c linux-2.6.32/ipc/ipc_sysctl.c +--- linux-2.6.32/ipc/ipc_sysctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/ipc/ipc_sysctl.c 2009-12-04 21:40:48.531614101 -0500 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -45143,18 +44412,9 @@ diff -urNp linux-2.6.31.7/ipc/ipc_sysctl.c linux-2.6.31.7/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.31.7/ipc/mqueue.c linux-2.6.31.7/ipc/mqueue.c ---- linux-2.6.31.7/ipc/mqueue.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/ipc/mqueue.c 2009-12-10 22:15:17.000000000 -0500 -@@ -77,7 +77,7 @@ struct mqueue_inode_info { - - static const struct inode_operations mqueue_dir_inode_operations; - static const struct file_operations mqueue_file_operations; --static struct super_operations mqueue_super_ops; -+static const struct super_operations mqueue_super_ops; - static void remove_notification(struct mqueue_inode_info *info); - - static struct kmem_cache *mqueue_inode_cachep; +diff -urNp linux-2.6.32/ipc/mqueue.c linux-2.6.32/ipc/mqueue.c +--- linux-2.6.32/ipc/mqueue.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/ipc/mqueue.c 2009-12-04 20:41:39.210365605 -0500 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -45163,27 +44423,9 @@ diff -urNp linux-2.6.31.7/ipc/mqueue.c linux-2.6.31.7/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -@@ -1224,7 +1225,7 @@ static const struct file_operations mque - .read = mqueue_read_file, - }; - --static struct super_operations mqueue_super_ops = { -+static const struct super_operations mqueue_super_ops = { - .alloc_inode = mqueue_alloc_inode, - .destroy_inode = mqueue_destroy_inode, - .statfs = simple_statfs, -diff -urNp linux-2.6.31.7/ipc/shm.c linux-2.6.31.7/ipc/shm.c ---- linux-2.6.31.7/ipc/shm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/ipc/shm.c 2009-12-10 22:15:17.000000000 -0500 -@@ -55,7 +55,7 @@ struct shm_file_data { - #define shm_file_data(file) (*((struct shm_file_data **)&(file)->private_data)) - - static const struct file_operations shm_file_operations; --static struct vm_operations_struct shm_vm_ops; -+static const struct vm_operations_struct shm_vm_ops; - - #define shm_ids(ns) ((ns)->ids[IPC_SHM_IDS]) - +diff -urNp linux-2.6.32/ipc/shm.c linux-2.6.32/ipc/shm.c +--- linux-2.6.32/ipc/shm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/ipc/shm.c 2009-12-04 20:41:39.211654223 -0500 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -45199,15 +44441,6 @@ diff -urNp linux-2.6.31.7/ipc/shm.c linux-2.6.31.7/ipc/shm.c void shm_init_ns(struct ipc_namespace *ns) { ns->shm_ctlmax = SHMMAX; -@@ -312,7 +320,7 @@ static const struct file_operations shm_ - .get_unmapped_area = shm_get_unmapped_area, - }; - --static struct vm_operations_struct shm_vm_ops = { -+static const struct vm_operations_struct shm_vm_ops = { - .open = shm_open, /* callback for a new vm-area open */ - .close = shm_close, /* callback for when the vm-area is released */ - .fault = shm_fault, @@ -395,6 +403,14 @@ static int newseg(struct ipc_namespace * shp->shm_lprid = 0; shp->shm_atim = shp->shm_dtim = 0; @@ -45245,21 +44478,9 @@ diff -urNp linux-2.6.31.7/ipc/shm.c linux-2.6.31.7/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.31.7/ipc/util.c linux-2.6.31.7/ipc/util.c ---- linux-2.6.31.7/ipc/util.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/ipc/util.c 2009-12-10 22:15:17.000000000 -0500 -@@ -942,7 +942,7 @@ static int sysvipc_proc_show(struct seq_ - return iface->show(s, it); - } - --static struct seq_operations sysvipc_proc_seqops = { -+static const struct seq_operations sysvipc_proc_seqops = { - .start = sysvipc_proc_start, - .stop = sysvipc_proc_stop, - .next = sysvipc_proc_next, -diff -urNp linux-2.6.31.7/kernel/acct.c linux-2.6.31.7/kernel/acct.c ---- linux-2.6.31.7/kernel/acct.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/acct.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/acct.c linux-2.6.32/kernel/acct.c +--- linux-2.6.32/kernel/acct.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/acct.c 2009-12-04 21:40:48.531614101 -0500 @@ -578,7 +578,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -45269,9 +44490,9 @@ diff -urNp linux-2.6.31.7/kernel/acct.c linux-2.6.31.7/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.31.7/kernel/capability.c linux-2.6.31.7/kernel/capability.c ---- linux-2.6.31.7/kernel/capability.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/capability.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/capability.c linux-2.6.32/kernel/capability.c +--- linux-2.6.32/kernel/capability.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/capability.c 2009-12-04 20:41:39.220748284 -0500 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -45295,95 +44516,9 @@ diff -urNp linux-2.6.31.7/kernel/capability.c linux-2.6.31.7/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.31.7/kernel/cgroup.c linux-2.6.31.7/kernel/cgroup.c ---- linux-2.6.31.7/kernel/cgroup.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/cgroup.c 2009-12-10 22:15:17.000000000 -0500 -@@ -596,8 +596,8 @@ void cgroup_unlock(void) - static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode); - static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); - static int cgroup_populate_dir(struct cgroup *cgrp); --static struct inode_operations cgroup_dir_inode_operations; --static struct file_operations proc_cgroupstats_operations; -+static const struct inode_operations cgroup_dir_inode_operations; -+static const struct file_operations proc_cgroupstats_operations; - - static struct backing_dev_info cgroup_backing_dev_info = { - .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, -@@ -960,7 +960,7 @@ static int cgroup_remount(struct super_b - return ret; - } - --static struct super_operations cgroup_ops = { -+static const struct super_operations cgroup_ops = { - .statfs = simple_statfs, - .drop_inode = generic_delete_inode, - .show_options = cgroup_show_options, -@@ -1643,7 +1643,7 @@ static int cgroup_seqfile_release(struct - return single_release(inode, file); - } - --static struct file_operations cgroup_seqfile_operations = { -+static const struct file_operations cgroup_seqfile_operations = { - .read = seq_read, - .write = cgroup_file_write, - .llseek = seq_lseek, -@@ -1702,7 +1702,7 @@ static int cgroup_rename(struct inode *o - return simple_rename(old_dir, old_dentry, new_dir, new_dentry); - } - --static struct file_operations cgroup_file_operations = { -+static const struct file_operations cgroup_file_operations = { - .read = cgroup_file_read, - .write = cgroup_file_write, - .llseek = generic_file_llseek, -@@ -1710,7 +1710,7 @@ static struct file_operations cgroup_fil - .release = cgroup_file_release, - }; - --static struct inode_operations cgroup_dir_inode_operations = { -+static const struct inode_operations cgroup_dir_inode_operations = { - .lookup = simple_lookup, - .mkdir = cgroup_mkdir, - .rmdir = cgroup_rmdir, -@@ -2313,7 +2313,7 @@ static int cgroup_tasks_show(struct seq_ - return seq_printf(s, "%d\n", *(int *)v); - } - --static struct seq_operations cgroup_tasks_seq_operations = { -+static const struct seq_operations cgroup_tasks_seq_operations = { - .start = cgroup_tasks_start, - .stop = cgroup_tasks_stop, - .next = cgroup_tasks_next, -@@ -2350,7 +2350,7 @@ static int cgroup_tasks_release(struct i - return seq_release(inode, file); - } - --static struct file_operations cgroup_tasks_operations = { -+static const struct file_operations cgroup_tasks_operations = { - .read = seq_read, - .llseek = seq_lseek, - .write = cgroup_file_write, -@@ -3016,7 +3016,7 @@ static int cgroup_open(struct inode *ino - return single_open(file, proc_cgroup_show, pid); - } - --struct file_operations proc_cgroup_operations = { -+const struct file_operations proc_cgroup_operations = { - .open = cgroup_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -3045,7 +3045,7 @@ static int cgroupstats_open(struct inode - return single_open(file, proc_cgroupstats_show, NULL); - } - --static struct file_operations proc_cgroupstats_operations = { -+static const struct file_operations proc_cgroupstats_operations = { - .open = cgroupstats_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/kernel/configs.c linux-2.6.31.7/kernel/configs.c ---- linux-2.6.31.7/kernel/configs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/configs.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/configs.c linux-2.6.32/kernel/configs.c +--- linux-2.6.32/kernel/configs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/configs.c 2009-12-04 20:41:39.237514833 -0500 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -45404,9 +44539,9 @@ diff -urNp linux-2.6.31.7/kernel/configs.c linux-2.6.31.7/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.31.7/kernel/cpu.c linux-2.6.31.7/kernel/cpu.c ---- linux-2.6.31.7/kernel/cpu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/cpu.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/cpu.c linux-2.6.32/kernel/cpu.c +--- linux-2.6.32/kernel/cpu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/cpu.c 2009-12-04 21:40:48.532759694 -0500 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -45416,10 +44551,10 @@ diff -urNp linux-2.6.31.7/kernel/cpu.c linux-2.6.31.7/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.31.7/kernel/cred.c linux-2.6.31.7/kernel/cred.c ---- linux-2.6.31.7/kernel/cred.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/cred.c 2009-12-10 22:15:17.000000000 -0500 -@@ -366,6 +366,8 @@ int commit_creds(struct cred *new) +diff -urNp linux-2.6.32/kernel/cred.c linux-2.6.32/kernel/cred.c +--- linux-2.6.32/kernel/cred.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/cred.c 2009-12-04 20:41:39.244515863 -0500 +@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -45428,9 +44563,9 @@ diff -urNp linux-2.6.31.7/kernel/cred.c linux-2.6.31.7/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.31.7/kernel/exit.c linux-2.6.31.7/kernel/exit.c ---- linux-2.6.31.7/kernel/exit.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/exit.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/exit.c linux-2.6.32/kernel/exit.c +--- linux-2.6.32/kernel/exit.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/exit.c 2009-12-04 21:40:48.532759694 -0500 @@ -56,6 +56,10 @@ #include <asm/mmu_context.h> #include "cred-internals.h" @@ -45501,7 +44636,7 @@ diff -urNp linux-2.6.31.7/kernel/exit.c linux-2.6.31.7/kernel/exit.c /* * If we were started as result of loading a module, close all of the * user space pages. We don't need them, and if we didn't close them -@@ -953,6 +981,9 @@ NORET_TYPE void do_exit(long code) +@@ -957,6 +985,9 @@ NORET_TYPE void do_exit(long code) tsk->exit_code = code; taskstats_exit(tsk, group_dead); @@ -45511,7 +44646,7 @@ diff -urNp linux-2.6.31.7/kernel/exit.c linux-2.6.31.7/kernel/exit.c exit_mm(tsk); if (group_dead) -@@ -1169,7 +1200,7 @@ static int wait_task_zombie(struct wait_ +@@ -1172,7 +1203,7 @@ static int wait_task_zombie(struct wait_ if (unlikely(wo->wo_flags & WNOWAIT)) { int exit_code = p->exit_code; @@ -45520,10 +44655,10 @@ diff -urNp linux-2.6.31.7/kernel/exit.c linux-2.6.31.7/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c ---- linux-2.6.31.7/kernel/fork.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/fork.c 2009-12-10 22:15:17.000000000 -0500 -@@ -244,7 +244,7 @@ static struct task_struct *dup_task_stru +diff -urNp linux-2.6.32/kernel/fork.c linux-2.6.32/kernel/fork.c +--- linux-2.6.32/kernel/fork.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/fork.c 2009-12-04 21:40:48.533635473 -0500 +@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru *stackend = STACK_END_MAGIC; /* for overflow detection */ #ifdef CONFIG_CC_STACKPROTECTOR @@ -45532,7 +44667,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c #endif /* One for us, one for whoever does the "release_task()" (usually parent) */ -@@ -281,8 +281,8 @@ static int dup_mmap(struct mm_struct *mm +@@ -293,8 +293,8 @@ static int dup_mmap(struct mm_struct *mm mm->locked_vm = 0; mm->mmap = NULL; mm->mmap_cache = NULL; @@ -45543,7 +44678,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c mm->map_count = 0; cpumask_clear(mm_cpumask(mm)); mm->mm_rb = RB_ROOT; -@@ -319,6 +319,7 @@ static int dup_mmap(struct mm_struct *mm +@@ -334,6 +334,7 @@ static int dup_mmap(struct mm_struct *mm tmp->vm_flags &= ~VM_LOCKED; tmp->vm_mm = mm; tmp->vm_next = NULL; @@ -45551,7 +44686,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c anon_vma_link(tmp); file = tmp->vm_file; if (file) { -@@ -366,6 +367,31 @@ static int dup_mmap(struct mm_struct *mm +@@ -381,6 +382,31 @@ static int dup_mmap(struct mm_struct *mm if (retval) goto out; } @@ -45583,24 +44718,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); retval = 0; -@@ -573,6 +599,7 @@ void mm_release(struct task_struct *tsk, - * the value intact in a core dump, and to save the unnecessary - * trouble otherwise. Userland only wants this done for a sys_exit. - */ -+ - if (tsk->clear_child_tid) { - if (!(tsk->flags & PF_SIGNALED) && - atomic_read(&mm->mm_users) > 1) { -@@ -582,7 +609,7 @@ void mm_release(struct task_struct *tsk, - */ - put_user(0, tsk->clear_child_tid); - sys_futex(tsk->clear_child_tid, FUTEX_WAKE, -- 1, NULL, NULL, 0); -+ 1, NULL, NULL, 0); - } - tsk->clear_child_tid = NULL; - } -@@ -700,7 +727,7 @@ static int copy_fs(unsigned long clone_f +@@ -731,7 +757,7 @@ static int copy_fs(unsigned long clone_f write_unlock(&fs->lock); return -EAGAIN; } @@ -45609,7 +44727,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c write_unlock(&fs->lock); return 0; } -@@ -983,6 +1010,9 @@ static struct task_struct *copy_process( +@@ -1027,6 +1053,9 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -45619,7 +44737,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c if (atomic_read(&p->real_cred->user->processes) >= p->signal->rlim[RLIMIT_NPROC].rlim_cur) { if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1139,6 +1169,8 @@ static struct task_struct *copy_process( +@@ -1179,6 +1208,8 @@ static struct task_struct *copy_process( goto bad_fork_free_pid; } @@ -45628,7 +44746,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1308,6 +1340,8 @@ bad_fork_cleanup_count: +@@ -1344,6 +1375,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -45637,7 +44755,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c return ERR_PTR(retval); } -@@ -1401,6 +1435,8 @@ long do_fork(unsigned long clone_flags, +@@ -1437,6 +1470,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -45646,7 +44764,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1533,7 +1569,7 @@ static int unshare_fs(unsigned long unsh +@@ -1569,7 +1604,7 @@ static int unshare_fs(unsigned long unsh return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -45655,7 +44773,7 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1656,7 +1692,7 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1692,7 +1727,7 @@ SYSCALL_DEFINE1(unshare, unsigned long, fs = current->fs; write_lock(&fs->lock); current->fs = new_fs; @@ -45664,9 +44782,9 @@ diff -urNp linux-2.6.31.7/kernel/fork.c linux-2.6.31.7/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c ---- linux-2.6.31.7/kernel/futex.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/futex.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/futex.c linux-2.6.32/kernel/futex.c +--- linux-2.6.32/kernel/futex.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/futex.c 2009-12-11 20:48:23.735421834 -0500 @@ -54,6 +54,7 @@ #include <linux/mount.h> #include <linux/pagemap.h> @@ -45675,7 +44793,7 @@ diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c #include <linux/signal.h> #include <linux/module.h> #include <linux/magic.h> -@@ -222,6 +223,11 @@ get_futex_key(u32 __user *uaddr, int fsh +@@ -223,6 +224,11 @@ get_futex_key(u32 __user *uaddr, int fsh struct page *page; int err; @@ -45687,7 +44805,7 @@ diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c /* * The futex address must be "naturally" aligned. */ -@@ -1801,7 +1807,7 @@ retry: +@@ -1825,7 +1831,7 @@ retry: restart = ¤t_thread_info()->restart_block; restart->fn = futex_wait_restart; @@ -45696,19 +44814,19 @@ diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; -@@ -2337,7 +2343,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2358,7 +2364,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi { struct robust_list_head __user *head; unsigned long ret; - const struct cred *cred = current_cred(), *pcred; -+ const struct cred *cred = current_cred(); +#ifndef CONFIG_GRKERNSEC_PROC_MEMMAP ++ const struct cred *cred = current_cred(); + const struct cred *pcred; +#endif if (!futex_cmpxchg_enabled) return -ENOSYS; -@@ -2353,11 +2362,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi +@@ -2374,11 +2383,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pi if (!p) goto err_unlock; ret = -EPERM; @@ -45725,7 +44843,7 @@ diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c head = p->robust_list; rcu_read_unlock(); } -@@ -2419,7 +2433,7 @@ retry: +@@ -2440,7 +2454,7 @@ retry: */ static inline int fetch_robust_entry(struct robust_list __user **entry, struct robust_list __user * __user *head, @@ -45734,9 +44852,9 @@ diff -urNp linux-2.6.31.7/kernel/futex.c linux-2.6.31.7/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.31.7/kernel/futex_compat.c linux-2.6.31.7/kernel/futex_compat.c ---- linux-2.6.31.7/kernel/futex_compat.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/futex_compat.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/futex_compat.c linux-2.6.32/kernel/futex_compat.c +--- linux-2.6.32/kernel/futex_compat.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/futex_compat.c 2009-12-04 20:41:39.272776635 -0500 @@ -10,6 +10,7 @@ #include <linux/compat.h> #include <linux/nsproxy.h> @@ -45774,9 +44892,9 @@ diff -urNp linux-2.6.31.7/kernel/futex_compat.c linux-2.6.31.7/kernel/futex_comp head = p->compat_robust_list; read_unlock(&tasklist_lock); } -diff -urNp linux-2.6.31.7/kernel/gcov/base.c linux-2.6.31.7/kernel/gcov/base.c ---- linux-2.6.31.7/kernel/gcov/base.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/gcov/base.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/gcov/base.c linux-2.6.32/kernel/gcov/base.c +--- linux-2.6.32/kernel/gcov/base.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/gcov/base.c 2009-12-04 21:40:48.534760046 -0500 @@ -102,11 +102,6 @@ void gcov_enable_events(void) } @@ -45798,9 +44916,9 @@ diff -urNp linux-2.6.31.7/kernel/gcov/base.c linux-2.6.31.7/kernel/gcov/base.c if (prev) prev->next = info->next; else -diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c ---- linux-2.6.31.7/kernel/kallsyms.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/kallsyms.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/kallsyms.c linux-2.6.32/kernel/kallsyms.c +--- linux-2.6.32/kernel/kallsyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/kallsyms.c 2009-12-04 21:40:48.534760046 -0500 @@ -11,6 +11,9 @@ * Changed the compression method from stem compression to "table lookup" * compression (see scripts/kallsyms.c for a more complete description) @@ -45821,7 +44939,7 @@ diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c if (addr >= (unsigned long)_sinittext && addr <= (unsigned long)_einittext) return 1; -@@ -66,6 +72,9 @@ static inline int is_kernel_text(unsigne +@@ -67,6 +73,9 @@ static inline int is_kernel_text(unsigne static inline int is_kernel(unsigned long addr) { @@ -45831,7 +44949,7 @@ diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) return 1; return in_gate_area_no_task(addr); -@@ -412,7 +421,6 @@ static unsigned long get_ksymbol_core(st +@@ -413,7 +422,6 @@ static unsigned long get_ksymbol_core(st static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) { @@ -45839,7 +44957,7 @@ diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c iter->nameoff = get_symbol_offset(new_pos); iter->pos = new_pos; } -@@ -460,6 +468,11 @@ static int s_show(struct seq_file *m, vo +@@ -461,6 +469,11 @@ static int s_show(struct seq_file *m, vo { struct kallsym_iter *iter = m->private; @@ -45851,7 +44969,7 @@ diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c /* Some debugging symbols have no name. Ignore them. */ if (!iter->name[0]) return 0; -@@ -500,7 +513,7 @@ static int kallsyms_open(struct inode *i +@@ -501,7 +514,7 @@ static int kallsyms_open(struct inode *i struct kallsym_iter *iter; int ret; @@ -45860,17 +44978,9 @@ diff -urNp linux-2.6.31.7/kernel/kallsyms.c linux-2.6.31.7/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -@@ -523,6 +536,7 @@ static const struct file_operations kall - static int __init kallsyms_init(void) - { - proc_create("kallsyms", 0444, NULL, &kallsyms_operations); -+ - return 0; - } - device_initcall(kallsyms_init); -diff -urNp linux-2.6.31.7/kernel/kgdb.c linux-2.6.31.7/kernel/kgdb.c ---- linux-2.6.31.7/kernel/kgdb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/kgdb.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/kgdb.c linux-2.6.32/kernel/kgdb.c +--- linux-2.6.32/kernel/kgdb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/kgdb.c 2009-12-04 21:40:48.534760046 -0500 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered; /* Guard for recursive entry */ static int exception_level; @@ -45898,10 +45008,10 @@ diff -urNp linux-2.6.31.7/kernel/kgdb.c linux-2.6.31.7/kernel/kgdb.c { BUG_ON(kgdb_connected); -diff -urNp linux-2.6.31.7/kernel/kmod.c linux-2.6.31.7/kernel/kmod.c ---- linux-2.6.31.7/kernel/kmod.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/kmod.c 2009-12-10 22:15:17.000000000 -0500 -@@ -84,6 +84,18 @@ int __request_module(bool wait, const ch +diff -urNp linux-2.6.32/kernel/kmod.c linux-2.6.32/kernel/kmod.c +--- linux-2.6.32/kernel/kmod.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/kmod.c 2009-12-04 20:41:39.283554037 -0500 +@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch if (ret >= MODULE_NAME_LEN) return -ENAMETOOLONG; @@ -45920,10 +45030,10 @@ diff -urNp linux-2.6.31.7/kernel/kmod.c linux-2.6.31.7/kernel/kmod.c /* If modprobe needs a service that is in a module, we get a recursive * loop. Limit the number of running kmod threads to max_threads/2 or * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method -diff -urNp linux-2.6.31.7/kernel/kprobes.c linux-2.6.31.7/kernel/kprobes.c ---- linux-2.6.31.7/kernel/kprobes.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/kprobes.c 2009-12-10 22:15:17.000000000 -0500 -@@ -184,7 +184,7 @@ static kprobe_opcode_t __kprobes *__get_ +diff -urNp linux-2.6.32/kernel/kprobes.c linux-2.6.32/kernel/kprobes.c +--- linux-2.6.32/kernel/kprobes.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/kprobes.c 2009-12-04 21:40:48.535763094 -0500 +@@ -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. */ @@ -45932,46 +45042,19 @@ diff -urNp linux-2.6.31.7/kernel/kprobes.c linux-2.6.31.7/kernel/kprobes.c if (!kip->insns) { kfree(kip); return NULL; -@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(st - hlist_add_head(&kip->hlist, - &kprobe_insn_pages); - } else { +@@ -220,7 +220,7 @@ static int __kprobes collect_one_slot(st + */ + if (!list_is_singular(&kprobe_insn_pages)) { + list_del(&kip->list); - module_free(NULL, kip->insns); + module_free_exec(NULL, kip->insns); kfree(kip); } return 1; -@@ -1329,7 +1329,7 @@ static int __kprobes show_kprobe_addr(st - return 0; - } - --static struct seq_operations kprobes_seq_ops = { -+static const struct seq_operations kprobes_seq_ops = { - .start = kprobe_seq_start, - .next = kprobe_seq_next, - .stop = kprobe_seq_stop, -@@ -1341,7 +1341,7 @@ static int __kprobes kprobes_open(struct - return seq_open(filp, &kprobes_seq_ops); - } - --static struct file_operations debugfs_kprobes_operations = { -+static const struct file_operations debugfs_kprobes_operations = { - .open = kprobes_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -1523,7 +1523,7 @@ static ssize_t write_enabled_file_bool(s - return count; - } - --static struct file_operations fops_kp = { -+static const struct file_operations fops_kp = { - .read = read_enabled_file_bool, - .write = write_enabled_file_bool, - }; -diff -urNp linux-2.6.31.7/kernel/lockdep.c linux-2.6.31.7/kernel/lockdep.c ---- linux-2.6.31.7/kernel/lockdep.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/lockdep.c 2009-12-10 22:15:17.000000000 -0500 -@@ -630,6 +630,10 @@ static int static_obj(void *obj) +diff -urNp linux-2.6.32/kernel/lockdep.c linux-2.6.32/kernel/lockdep.c +--- linux-2.6.32/kernel/lockdep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/lockdep.c 2009-12-04 21:40:48.536695865 -0500 +@@ -577,6 +577,10 @@ static int static_obj(void *obj) int i; #endif @@ -45982,7 +45065,7 @@ diff -urNp linux-2.6.31.7/kernel/lockdep.c linux-2.6.31.7/kernel/lockdep.c /* * static variable? */ -@@ -642,8 +646,7 @@ static int static_obj(void *obj) +@@ -592,8 +596,7 @@ static int static_obj(void *obj) */ for_each_possible_cpu(i) { start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); @@ -45992,7 +45075,7 @@ diff -urNp linux-2.6.31.7/kernel/lockdep.c linux-2.6.31.7/kernel/lockdep.c if ((addr >= start) && (addr < end)) return 1; -@@ -760,6 +763,7 @@ register_lock_class(struct lockdep_map * +@@ -710,6 +713,7 @@ register_lock_class(struct lockdep_map * if (!static_obj(lock->key)) { debug_locks_off(); printk("INFO: trying to register non-static key.\n"); @@ -46000,22 +45083,10 @@ diff -urNp linux-2.6.31.7/kernel/lockdep.c linux-2.6.31.7/kernel/lockdep.c printk("the code is fine but needs lockdep annotation.\n"); printk("turning off the locking correctness validator.\n"); dump_stack(); -diff -urNp linux-2.6.31.7/kernel/lockdep_proc.c linux-2.6.31.7/kernel/lockdep_proc.c ---- linux-2.6.31.7/kernel/lockdep_proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/lockdep_proc.c 2009-12-10 22:15:17.000000000 -0500 -@@ -670,7 +670,7 @@ static int ls_show(struct seq_file *m, v - return 0; - } - --static struct seq_operations lockstat_ops = { -+static const struct seq_operations lockstat_ops = { - .start = ls_start, - .next = ls_next, - .stop = ls_stop, -diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c ---- linux-2.6.31.7/kernel/module.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/module.c 2009-12-10 22:15:17.000000000 -0500 -@@ -83,7 +83,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq +diff -urNp linux-2.6.32/kernel/module.c linux-2.6.32/kernel/module.c +--- linux-2.6.32/kernel/module.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/module.c 2009-12-04 21:40:48.537658216 -0500 +@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); /* Bounds of module allocation, for speeding __module_address */ @@ -46025,7 +45096,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c int register_module_notifier(struct notifier_block * nb) { -@@ -239,7 +240,7 @@ bool each_symbol(bool (*fn)(const struct +@@ -245,7 +246,7 @@ bool each_symbol(bool (*fn)(const struct return true; list_for_each_entry_rcu(mod, &modules, list) { @@ -46034,7 +45105,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c { mod->syms, mod->syms + mod->num_syms, mod->crcs, NOT_GPL_ONLY, false }, { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms, -@@ -261,7 +262,7 @@ bool each_symbol(bool (*fn)(const struct +@@ -267,7 +268,7 @@ bool each_symbol(bool (*fn)(const struct #endif }; @@ -46043,7 +45114,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c return true; } return false; -@@ -436,7 +437,7 @@ static void *percpu_modalloc(unsigned lo +@@ -442,7 +443,7 @@ static void *percpu_modalloc(unsigned lo void *ptr; int cpu; @@ -46052,7 +45123,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -549,7 +550,11 @@ static void percpu_modcopy(void *pcpudes +@@ -555,7 +556,11 @@ static void percpu_modcopy(void *pcpudes int cpu; for_each_possible_cpu(cpu) @@ -46064,7 +45135,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c } #else /* ... !CONFIG_SMP */ -@@ -1516,7 +1521,8 @@ static void free_module(struct module *m +@@ -1526,7 +1531,8 @@ static void free_module(struct module *m destroy_params(mod->kp, mod->num_kp); /* This may be NULL, but that's OK */ @@ -46074,7 +45145,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c kfree(mod->args); if (mod->percpu) percpu_modfree(mod->percpu); -@@ -1525,10 +1531,12 @@ static void free_module(struct module *m +@@ -1535,10 +1541,12 @@ static void free_module(struct module *m percpu_modfree(mod->refptr); #endif /* Free lock-classes: */ @@ -46086,10 +45157,10 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c - module_free(mod, mod->module_core); + module_free_exec(mod, mod->module_core_rx); + module_free(mod, mod->module_core_rw); - } - void *__symbol_get(const char *symbol) -@@ -1618,7 +1626,9 @@ static int simplify_symbols(Elf_Shdr *se + #ifdef CONFIG_MPU + update_protections(current->mm); +@@ -1632,7 +1640,9 @@ static int simplify_symbols(Elf_Shdr *se strtab + sym[i].st_name, mod); /* Ok if resolved. */ if (ksym) { @@ -46099,7 +45170,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c break; } -@@ -1637,7 +1647,9 @@ static int simplify_symbols(Elf_Shdr *se +@@ -1651,7 +1661,9 @@ static int simplify_symbols(Elf_Shdr *se secbase = (unsigned long)mod->percpu; else secbase = sechdrs[sym[i].st_shndx].sh_addr; @@ -46109,7 +45180,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c break; } } -@@ -1698,11 +1710,12 @@ static void layout_sections(struct modul +@@ -1712,11 +1724,12 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || strstarts(secstrings + s->sh_name, ".init")) continue; @@ -46125,7 +45196,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c } DEBUGP("Init section allocation order:\n"); -@@ -1715,12 +1728,13 @@ static void layout_sections(struct modul +@@ -1729,12 +1742,13 @@ static void layout_sections(struct modul || s->sh_entsize != ~0UL || !strstarts(secstrings + s->sh_name, ".init")) continue; @@ -46143,25 +45214,84 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c } } -@@ -1864,9 +1878,14 @@ static void add_kallsyms(struct module * +@@ -1838,9 +1852,8 @@ static int is_exported(const char *name, + + /* As per nm */ + static char elf_type(const Elf_Sym *sym, +- Elf_Shdr *sechdrs, +- const char *secstrings, +- struct module *mod) ++ const Elf_Shdr *sechdrs, ++ const char *secstrings) + { + if (ELF_ST_BIND(sym->st_info) == STB_WEAK) { + if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT) +@@ -1915,7 +1928,7 @@ static unsigned long layout_symtab(struc + + /* Put symbol section at end of init part of module. */ + symsect->sh_flags |= SHF_ALLOC; +- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect, ++ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect, + symindex) | INIT_OFFSET_MASK; + DEBUGP("\t%s\n", secstrings + symsect->sh_name); + +@@ -1932,19 +1945,19 @@ static unsigned long layout_symtab(struc + } + + /* Append room for core symbols at end of core part. */ +- symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1); +- mod->core_size = symoffs + ndst * sizeof(Elf_Sym); ++ symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1); ++ mod->core_size_rx = symoffs + ndst * sizeof(Elf_Sym); + + /* Put string table section at end of init part of module. */ + strsect->sh_flags |= SHF_ALLOC; +- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect, ++ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect, + strindex) | INIT_OFFSET_MASK; + DEBUGP("\t%s\n", secstrings + strsect->sh_name); + + /* Append room for core symbols' strings at end of core part. */ +- *pstroffs = mod->core_size; ++ *pstroffs = mod->core_size_rx; + __set_bit(0, strmap); +- mod->core_size += bitmap_weight(strmap, strsect->sh_size); ++ mod->core_size_rx += bitmap_weight(strmap, strsect->sh_size); + + return symoffs; + } +@@ -1968,12 +1981,14 @@ static void add_kallsyms(struct module * + mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym); mod->strtab = (void *)sechdrs[strindex].sh_addr; ++ pax_open_kernel(); ++ /* Set types up while we still have access to sections. */ -- for (i = 0; i < mod->num_symtab; i++) -- mod->symtab[i].st_info + for (i = 0; i < mod->num_symtab; i++) + mod->symtab[i].st_info - = elf_type(&mod->symtab[i], sechdrs, secstrings, mod); ++ = elf_type(&mod->symtab[i], sechdrs, secstrings); + +- mod->core_symtab = dst = mod->module_core + symoffs; ++ mod->core_symtab = dst = mod->module_core_rx + symoffs; + src = mod->symtab; + *dst = *src; + for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) { +@@ -1985,10 +2000,12 @@ static void add_kallsyms(struct module * + } + mod->core_num_syms = ndst; + +- mod->core_strtab = s = mod->module_core + stroffs; ++ mod->core_strtab = s = mod->module_core_rx + stroffs; + for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i) + if (test_bit(i, strmap)) + *++s = mod->strtab[i]; + -+ for (i = 0; i < mod->num_symtab; i++) { -+ char type = elf_type(&mod->symtab[i], sechdrs, secstrings, mod); -+ pax_open_kernel(); -+ mod->symtab[i].st_info = type; -+ pax_close_kernel(); -+ } -+ ++ pax_close_kernel(); } #else - static inline void add_kallsyms(struct module *mod, -@@ -1887,16 +1906,30 @@ static void dynamic_debug_setup(struct _ + static inline unsigned long layout_symtab(struct module *mod, +@@ -2025,16 +2042,30 @@ static void dynamic_debug_setup(struct _ #endif } @@ -46197,7 +45327,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c } return ret; } -@@ -1908,8 +1941,8 @@ static void kmemleak_load_module(struct +@@ -2046,8 +2077,8 @@ static void kmemleak_load_module(struct unsigned int i; /* only scan the sections containing data */ @@ -46208,7 +45338,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c sizeof(struct module), GFP_KERNEL); for (i = 1; i < hdr->e_shnum; i++) { -@@ -1919,8 +1952,8 @@ static void kmemleak_load_module(struct +@@ -2057,8 +2088,8 @@ static void kmemleak_load_module(struct && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0) continue; @@ -46219,8 +45349,8 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c sechdrs[i].sh_size, GFP_KERNEL); } } -@@ -2100,7 +2133,7 @@ static noinline struct module *load_modu - layout_sections(mod, hdr, sechdrs, secstrings); +@@ -2244,7 +2275,7 @@ static noinline struct module *load_modu + secstrings, &stroffs, strmap); /* Do the allocs. */ - ptr = module_alloc_update_bounds(mod->core_size); @@ -46228,7 +45358,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* * The pointer to this block is stored in the module structure * which is inside the block. Just mark it as not being a -@@ -2111,23 +2144,47 @@ static noinline struct module *load_modu +@@ -2255,23 +2286,47 @@ static noinline struct module *load_modu err = -ENOMEM; goto free_percpu; } @@ -46249,12 +45379,9 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c - if (!ptr && mod->init_size) { + kmemleak_not_leak(ptr); + if (!ptr && mod->init_size_rw) { - err = -ENOMEM; -- goto free_core; ++ err = -ENOMEM; + goto free_core_rw; - } -- memset(ptr, 0, mod->init_size); -- mod->module_init = ptr; ++ } + memset(ptr, 0, mod->init_size_rw); + mod->module_init_rw = ptr; + @@ -46273,9 +45400,12 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c + ptr = module_alloc_update_bounds_rx(mod->init_size_rx); + kmemleak_not_leak(ptr); + if (!ptr && mod->init_size_rx) { -+ err = -ENOMEM; + err = -ENOMEM; +- goto free_core; + goto free_core_rx; -+ } + } +- memset(ptr, 0, mod->init_size); +- mod->module_init = ptr; + + pax_open_kernel(); + memset(ptr, 0, mod->init_size_rx); @@ -46284,7 +45414,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ DEBUGP("final section addresses:\n"); -@@ -2137,17 +2194,41 @@ static noinline struct module *load_modu +@@ -2281,17 +2336,41 @@ static noinline struct module *load_modu if (!(sechdrs[i].sh_flags & SHF_ALLOC)) continue; @@ -46335,7 +45465,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); } /* Module has been moved. */ -@@ -2159,7 +2240,7 @@ static noinline struct module *load_modu +@@ -2303,7 +2382,7 @@ static noinline struct module *load_modu mod->name); if (!mod->refptr) { err = -ENOMEM; @@ -46344,7 +45474,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c } #endif /* Now we've moved module, initialize linked lists, etc. */ -@@ -2272,8 +2353,8 @@ static noinline struct module *load_modu +@@ -2412,8 +2491,8 @@ static noinline struct module *load_modu /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { @@ -46354,7 +45484,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* Not a valid relocation section? */ if (info >= hdr->e_shnum) -@@ -2331,12 +2412,12 @@ static noinline struct module *load_modu +@@ -2474,12 +2553,12 @@ static noinline struct module *load_modu * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -46373,13 +45503,13 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c set_fs(old_fs); -@@ -2381,12 +2462,16 @@ static noinline struct module *load_modu +@@ -2527,12 +2606,16 @@ static noinline struct module *load_modu free_unload: module_unload_free(mod); #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) -- free_init: + free_init_rx: percpu_modfree(mod->refptr); +- free_init: #endif - module_free(mod, mod->module_init); - free_core: @@ -46394,10 +45524,10 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* mod will be freed with core. Don't access it beyond this line! */ free_percpu: if (percpu) -@@ -2482,10 +2567,12 @@ SYSCALL_DEFINE3(init_module, void __user - /* Drop initial reference. */ - module_put(mod); - trim_init_extable(mod); +@@ -2634,10 +2717,12 @@ SYSCALL_DEFINE3(init_module, void __user + mod->symtab = mod->core_symtab; + mod->strtab = mod->core_strtab; + #endif - module_free(mod, mod->module_init); - mod->module_init = NULL; - mod->init_size = 0; @@ -46411,7 +45541,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c mutex_unlock(&module_mutex); return 0; -@@ -2516,10 +2603,16 @@ static const char *get_ksymbol(struct mo +@@ -2668,10 +2753,16 @@ static const char *get_ksymbol(struct mo unsigned long nextval; /* At worse, next value is at end of module */ @@ -46431,7 +45561,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* Scan for closest preceeding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -2765,7 +2858,7 @@ static int m_show(struct seq_file *m, vo +@@ -2917,7 +3008,7 @@ static int m_show(struct seq_file *m, vo char buf[8]; seq_printf(m, "%s %u", @@ -46440,7 +45570,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c print_unload_info(m, mod); /* Informative for users. */ -@@ -2774,7 +2867,7 @@ static int m_show(struct seq_file *m, vo +@@ -2926,7 +3017,7 @@ static int m_show(struct seq_file *m, vo mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -46449,7 +45579,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c /* Taints info */ if (mod->taints) -@@ -2810,7 +2903,17 @@ static const struct file_operations proc +@@ -2962,7 +3053,17 @@ static const struct file_operations proc static int __init proc_modules_init(void) { @@ -46467,7 +45597,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c return 0; } module_init(proc_modules_init); -@@ -2869,12 +2972,12 @@ struct module *__module_address(unsigned +@@ -3021,12 +3122,12 @@ struct module *__module_address(unsigned { struct module *mod; @@ -46483,7 +45613,7 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c return mod; return NULL; } -@@ -2908,11 +3011,20 @@ bool is_module_text_address(unsigned lon +@@ -3060,11 +3161,20 @@ bool is_module_text_address(unsigned lon */ struct module *__module_text_address(unsigned long addr) { @@ -46507,10 +45637,10 @@ diff -urNp linux-2.6.31.7/kernel/module.c linux-2.6.31.7/kernel/module.c mod = NULL; } return mod; -diff -urNp linux-2.6.31.7/kernel/panic.c linux-2.6.31.7/kernel/panic.c ---- linux-2.6.31.7/kernel/panic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/panic.c 2009-12-10 22:15:17.000000000 -0500 -@@ -391,7 +391,8 @@ EXPORT_SYMBOL(warn_slowpath_null); +diff -urNp linux-2.6.32/kernel/panic.c linux-2.6.32/kernel/panic.c +--- linux-2.6.32/kernel/panic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/panic.c 2009-12-04 21:40:48.537658216 -0500 +@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) { @@ -46520,10 +45650,10 @@ diff -urNp linux-2.6.31.7/kernel/panic.c linux-2.6.31.7/kernel/panic.c __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); -diff -urNp linux-2.6.31.7/kernel/params.c linux-2.6.31.7/kernel/params.c ---- linux-2.6.31.7/kernel/params.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/params.c 2009-12-10 22:15:17.000000000 -0500 -@@ -724,7 +724,7 @@ static ssize_t module_attr_store(struct +diff -urNp linux-2.6.32/kernel/params.c linux-2.6.32/kernel/params.c +--- linux-2.6.32/kernel/params.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/params.c 2009-12-04 21:40:48.538708260 -0500 +@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct return ret; } @@ -46532,7 +45662,7 @@ diff -urNp linux-2.6.31.7/kernel/params.c linux-2.6.31.7/kernel/params.c .show = module_attr_show, .store = module_attr_store, }; -@@ -738,7 +738,7 @@ static int uevent_filter(struct kset *ks +@@ -739,7 +739,7 @@ static int uevent_filter(struct kset *ks return 0; } @@ -46541,21 +45671,9 @@ diff -urNp linux-2.6.31.7/kernel/params.c linux-2.6.31.7/kernel/params.c .filter = uevent_filter, }; -diff -urNp linux-2.6.31.7/kernel/perf_counter.c linux-2.6.31.7/kernel/perf_counter.c ---- linux-2.6.31.7/kernel/perf_counter.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/perf_counter.c 2009-12-10 22:15:17.000000000 -0500 -@@ -2231,7 +2231,7 @@ static void perf_mmap_close(struct vm_ar - } - } - --static struct vm_operations_struct perf_mmap_vmops = { -+static const struct vm_operations_struct perf_mmap_vmops = { - .open = perf_mmap_open, - .close = perf_mmap_close, - .fault = perf_mmap_fault, -diff -urNp linux-2.6.31.7/kernel/pid.c linux-2.6.31.7/kernel/pid.c ---- linux-2.6.31.7/kernel/pid.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/pid.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/pid.c linux-2.6.32/kernel/pid.c +--- linux-2.6.32/kernel/pid.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/pid.c 2009-12-04 21:40:48.538708260 -0500 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -46589,9 +45707,9 @@ diff -urNp linux-2.6.31.7/kernel/pid.c linux-2.6.31.7/kernel/pid.c } struct task_struct *find_task_by_vpid(pid_t vnr) -diff -urNp linux-2.6.31.7/kernel/posix-cpu-timers.c linux-2.6.31.7/kernel/posix-cpu-timers.c ---- linux-2.6.31.7/kernel/posix-cpu-timers.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/posix-cpu-timers.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/posix-cpu-timers.c linux-2.6.32/kernel/posix-cpu-timers.c +--- linux-2.6.32/kernel/posix-cpu-timers.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/posix-cpu-timers.c 2009-12-04 20:41:39.313777426 -0500 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -46599,8 +45717,8 @@ diff -urNp linux-2.6.31.7/kernel/posix-cpu-timers.c linux-2.6.31.7/kernel/posix- +#include <linux/security.h> #include <asm/uaccess.h> #include <linux/kernel_stat.h> - -@@ -1041,6 +1042,7 @@ static void check_thread_timers(struct t + #include <trace/events/timer.h> +@@ -1044,6 +1045,7 @@ static void check_thread_timers(struct t __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); return; } @@ -46608,7 +45726,7 @@ diff -urNp linux-2.6.31.7/kernel/posix-cpu-timers.c linux-2.6.31.7/kernel/posix- if (tsk->rt.timeout > DIV_ROUND_UP(*soft, USEC_PER_SEC/HZ)) { /* * At the soft limit, send a SIGXCPU every second. -@@ -1196,6 +1198,7 @@ static void check_process_timers(struct +@@ -1206,6 +1208,7 @@ static void check_process_timers(struct __group_send_sig_info(SIGKILL, SEND_SIG_PRIV, tsk); return; } @@ -46616,9 +45734,9 @@ diff -urNp linux-2.6.31.7/kernel/posix-cpu-timers.c linux-2.6.31.7/kernel/posix- if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { /* * At the soft limit, send a SIGXCPU every second. -diff -urNp linux-2.6.31.7/kernel/power/hibernate.c linux-2.6.31.7/kernel/power/hibernate.c ---- linux-2.6.31.7/kernel/power/hibernate.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/power/hibernate.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/power/hibernate.c linux-2.6.32/kernel/power/hibernate.c +--- linux-2.6.32/kernel/power/hibernate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/power/hibernate.c 2009-12-04 21:40:48.539759493 -0500 @@ -48,14 +48,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; @@ -46636,9 +45754,9 @@ diff -urNp linux-2.6.31.7/kernel/power/hibernate.c linux-2.6.31.7/kernel/power/h { if (ops && !(ops->begin && ops->end && ops->pre_snapshot && ops->prepare && ops->finish && ops->enter && ops->pre_restore -diff -urNp linux-2.6.31.7/kernel/power/poweroff.c linux-2.6.31.7/kernel/power/poweroff.c ---- linux-2.6.31.7/kernel/power/poweroff.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/power/poweroff.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/power/poweroff.c linux-2.6.32/kernel/power/poweroff.c +--- linux-2.6.32/kernel/power/poweroff.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/power/poweroff.c 2009-12-04 21:40:48.539759493 -0500 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -46648,10 +45766,10 @@ diff -urNp linux-2.6.31.7/kernel/power/poweroff.c linux-2.6.31.7/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.31.7/kernel/power/process.c linux-2.6.31.7/kernel/power/process.c ---- linux-2.6.31.7/kernel/power/process.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/power/process.c 2009-12-10 22:15:17.000000000 -0500 -@@ -36,12 +36,15 @@ static int try_to_freeze_tasks(bool sig_ +diff -urNp linux-2.6.32/kernel/power/process.c linux-2.6.32/kernel/power/process.c +--- linux-2.6.32/kernel/power/process.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/power/process.c 2009-12-04 21:40:48.539759493 -0500 +@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ struct timeval start, end; u64 elapsed_csecs64; unsigned int elapsed_csecs; @@ -46667,7 +45785,7 @@ diff -urNp linux-2.6.31.7/kernel/power/process.c linux-2.6.31.7/kernel/power/pro read_lock(&tasklist_lock); do_each_thread(g, p) { if (frozen(p) || !freezeable(p)) -@@ -56,15 +59,17 @@ static int try_to_freeze_tasks(bool sig_ +@@ -57,15 +60,17 @@ static int try_to_freeze_tasks(bool sig_ * It is "frozen enough". If the task does wake * up, it will immediately call try_to_freeze. */ @@ -46690,9 +45808,9 @@ diff -urNp linux-2.6.31.7/kernel/power/process.c linux-2.6.31.7/kernel/power/pro do_gettimeofday(&end); elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); -diff -urNp linux-2.6.31.7/kernel/power/suspend.c linux-2.6.31.7/kernel/power/suspend.c ---- linux-2.6.31.7/kernel/power/suspend.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/power/suspend.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/power/suspend.c linux-2.6.32/kernel/power/suspend.c +--- linux-2.6.32/kernel/power/suspend.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/power/suspend.c 2009-12-04 21:40:48.540621805 -0500 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M [PM_SUSPEND_MEM] = "mem", }; @@ -46709,10 +45827,10 @@ diff -urNp linux-2.6.31.7/kernel/power/suspend.c linux-2.6.31.7/kernel/power/sus { mutex_lock(&pm_mutex); suspend_ops = ops; -diff -urNp linux-2.6.31.7/kernel/printk.c linux-2.6.31.7/kernel/printk.c ---- linux-2.6.31.7/kernel/printk.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/printk.c 2009-12-10 22:15:17.000000000 -0500 -@@ -272,6 +272,11 @@ int do_syslog(int type, char __user *buf +diff -urNp linux-2.6.32/kernel/printk.c linux-2.6.32/kernel/printk.c +--- linux-2.6.32/kernel/printk.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/printk.c 2009-12-04 20:41:39.314767580 -0500 +@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -46724,9 +45842,9 @@ diff -urNp linux-2.6.31.7/kernel/printk.c linux-2.6.31.7/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c ---- linux-2.6.31.7/kernel/ptrace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/ptrace.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/ptrace.c linux-2.6.32/kernel/ptrace.c +--- linux-2.6.32/kernel/ptrace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/ptrace.c 2009-12-04 21:40:48.540621805 -0500 @@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || @@ -46744,7 +45862,7 @@ diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c + if (!dumpable && !capable_nolog(CAP_SYS_PTRACE)) return -EPERM; - return security_ptrace_may_access(task, mode); + return security_ptrace_access_check(task, mode); @@ -199,7 +199,7 @@ int ptrace_attach(struct task_struct *ta goto unlock_tasklist; @@ -46754,7 +45872,7 @@ diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c task->ptrace |= PT_PTRACE_CAP; __ptrace_link(task, current); -@@ -529,18 +529,18 @@ int ptrace_request(struct task_struct *c +@@ -532,18 +532,18 @@ int ptrace_request(struct task_struct *c ret = ptrace_setoptions(child, data); break; case PTRACE_GETEVENTMSG: @@ -46776,7 +45894,7 @@ diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c sizeof siginfo)) ret = -EFAULT; else -@@ -618,6 +618,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l +@@ -621,6 +621,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l goto out; } @@ -46788,7 +45906,7 @@ diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c if (request == PTRACE_ATTACH) { ret = ptrace_attach(child); /* -@@ -650,7 +655,7 @@ int generic_ptrace_peekdata(struct task_ +@@ -653,7 +658,7 @@ int generic_ptrace_peekdata(struct task_ copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0); if (copied != sizeof(tmp)) return -EIO; @@ -46797,90 +45915,9 @@ diff -urNp linux-2.6.31.7/kernel/ptrace.c linux-2.6.31.7/kernel/ptrace.c } int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) -diff -urNp linux-2.6.31.7/kernel/rcupreempt_trace.c linux-2.6.31.7/kernel/rcupreempt_trace.c ---- linux-2.6.31.7/kernel/rcupreempt_trace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/rcupreempt_trace.c 2009-12-10 22:15:17.000000000 -0500 -@@ -261,17 +261,17 @@ static ssize_t rcuctrs_read(struct file - return bcount; - } - --static struct file_operations rcustats_fops = { -+static const struct file_operations rcustats_fops = { - .owner = THIS_MODULE, - .read = rcustats_read, - }; - --static struct file_operations rcugp_fops = { -+static const struct file_operations rcugp_fops = { - .owner = THIS_MODULE, - .read = rcugp_read, - }; - --static struct file_operations rcuctrs_fops = { -+static const struct file_operations rcuctrs_fops = { - .owner = THIS_MODULE, - .read = rcuctrs_read, - }; -diff -urNp linux-2.6.31.7/kernel/rcutree_trace.c linux-2.6.31.7/kernel/rcutree_trace.c ---- linux-2.6.31.7/kernel/rcutree_trace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/rcutree_trace.c 2009-12-10 22:15:17.000000000 -0500 -@@ -88,7 +88,7 @@ static int rcudata_open(struct inode *in - return single_open(file, show_rcudata, NULL); - } - --static struct file_operations rcudata_fops = { -+static const struct file_operations rcudata_fops = { - .owner = THIS_MODULE, - .open = rcudata_open, - .read = seq_read, -@@ -136,7 +136,7 @@ static int rcudata_csv_open(struct inode - return single_open(file, show_rcudata_csv, NULL); - } - --static struct file_operations rcudata_csv_fops = { -+static const struct file_operations rcudata_csv_fops = { - .owner = THIS_MODULE, - .open = rcudata_csv_open, - .read = seq_read, -@@ -183,7 +183,7 @@ static int rcuhier_open(struct inode *in - return single_open(file, show_rcuhier, NULL); - } - --static struct file_operations rcuhier_fops = { -+static const struct file_operations rcuhier_fops = { - .owner = THIS_MODULE, - .open = rcuhier_open, - .read = seq_read, -@@ -205,7 +205,7 @@ static int rcugp_open(struct inode *inod - return single_open(file, show_rcugp, NULL); - } - --static struct file_operations rcugp_fops = { -+static const struct file_operations rcugp_fops = { - .owner = THIS_MODULE, - .open = rcugp_open, - .read = seq_read, -@@ -255,7 +255,7 @@ static int rcu_pending_open(struct inode - return single_open(file, show_rcu_pending, NULL); - } - --static struct file_operations rcu_pending_fops = { -+static const struct file_operations rcu_pending_fops = { - .owner = THIS_MODULE, - .open = rcu_pending_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/kernel/relay.c linux-2.6.31.7/kernel/relay.c ---- linux-2.6.31.7/kernel/relay.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/relay.c 2009-12-10 22:15:17.000000000 -0500 -@@ -60,7 +60,7 @@ static int relay_buf_fault(struct vm_are - /* - * vm_ops for relay file mappings. - */ --static struct vm_operations_struct relay_file_mmap_ops = { -+static const struct vm_operations_struct relay_file_mmap_ops = { - .fault = relay_buf_fault, - .close = relay_file_mmap_close, - }; +diff -urNp linux-2.6.32/kernel/relay.c linux-2.6.32/kernel/relay.c +--- linux-2.6.32/kernel/relay.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/relay.c 2009-12-04 21:40:48.540621805 -0500 @@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi return 0; @@ -46890,9 +45927,9 @@ diff -urNp linux-2.6.31.7/kernel/relay.c linux-2.6.31.7/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.31.7/kernel/resource.c linux-2.6.31.7/kernel/resource.c ---- linux-2.6.31.7/kernel/resource.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/resource.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/resource.c linux-2.6.32/kernel/resource.c +--- linux-2.6.32/kernel/resource.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/resource.c 2009-12-04 20:41:39.316747779 -0500 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -46912,19 +45949,10 @@ diff -urNp linux-2.6.31.7/kernel/resource.c linux-2.6.31.7/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c ---- linux-2.6.31.7/kernel/sched.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/sched.c 2009-12-10 22:15:17.000000000 -0500 -@@ -820,7 +820,7 @@ static int sched_feat_open(struct inode - return single_open(filp, sched_feat_show, NULL); - } - --static struct file_operations sched_feat_fops = { -+static const struct file_operations sched_feat_fops = { - .open = sched_feat_open, - .write = sched_feat_write, - .read = seq_read, -@@ -5978,6 +5978,8 @@ int can_nice(const struct task_struct *p +diff -urNp linux-2.6.32/kernel/sched.c linux-2.6.32/kernel/sched.c +--- linux-2.6.32/kernel/sched.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/sched.c 2009-12-04 21:40:48.542759895 -0500 +@@ -6072,6 +6072,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -46933,7 +45961,7 @@ diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } -@@ -6011,7 +6013,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -6105,7 +6107,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -46943,7 +45971,7 @@ diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c return -EPERM; retval = security_task_setnice(current, nice); -@@ -6153,6 +6156,8 @@ recheck: +@@ -6255,6 +6258,8 @@ recheck: if (rt_policy(policy)) { unsigned long rlim_rtprio; @@ -46952,7 +45980,7 @@ diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c if (!lock_task_sighand(p, &flags)) return -ESRCH; rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; -@@ -7300,7 +7305,7 @@ static struct ctl_table sd_ctl_dir[] = { +@@ -7406,7 +7411,7 @@ static struct ctl_table sd_ctl_dir[] = { .procname = "sched_domain", .mode = 0555, }, @@ -46961,7 +45989,7 @@ diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c }; static struct ctl_table sd_ctl_root[] = { -@@ -7310,7 +7315,7 @@ static struct ctl_table sd_ctl_root[] = +@@ -7416,7 +7421,7 @@ static struct ctl_table sd_ctl_root[] = .mode = 0555, .child = sd_ctl_dir, }, @@ -46970,9 +45998,9 @@ diff -urNp linux-2.6.31.7/kernel/sched.c linux-2.6.31.7/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.31.7/kernel/signal.c linux-2.6.31.7/kernel/signal.c ---- linux-2.6.31.7/kernel/signal.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/signal.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/signal.c linux-2.6.32/kernel/signal.c +--- linux-2.6.32/kernel/signal.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/signal.c 2009-12-11 20:41:35.118449536 -0500 @@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc */ user = get_uid(__task_cred(t)->user); @@ -47013,7 +46041,7 @@ diff -urNp linux-2.6.31.7/kernel/signal.c linux-2.6.31.7/kernel/signal.c specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { return send_signal(sig, info, t, 0); -@@ -1005,6 +1011,9 @@ force_sig_info(int sig, struct siginfo * +@@ -1019,6 +1025,9 @@ force_sig_info(int sig, struct siginfo * ret = specific_send_sig_info(sig, info, t); spin_unlock_irqrestore(&t->sighand->siglock, flags); @@ -47023,19 +46051,23 @@ diff -urNp linux-2.6.31.7/kernel/signal.c linux-2.6.31.7/kernel/signal.c return ret; } -@@ -1079,6 +1088,8 @@ int group_send_sig_info(int sig, struct - ret = __group_send_sig_info(sig, info, p); - unlock_task_sighand(p, &flags); - } +@@ -1078,8 +1087,11 @@ int group_send_sig_info(int sig, struct + { + int ret = check_kill_permission(sig, info, p); + +- if (!ret && sig) ++ if (!ret && sig) { + ret = do_send_sig_info(sig, info, p, true); + if (!ret) + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p); - } ++ } return ret; -diff -urNp linux-2.6.31.7/kernel/smp.c linux-2.6.31.7/kernel/smp.c ---- linux-2.6.31.7/kernel/smp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/smp.c 2009-12-10 22:15:17.000000000 -0500 -@@ -451,22 +451,22 @@ int smp_call_function(void (*func)(void + } +diff -urNp linux-2.6.32/kernel/smp.c linux-2.6.32/kernel/smp.c +--- linux-2.6.32/kernel/smp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/smp.c 2009-12-04 21:40:48.543765351 -0500 +@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void } EXPORT_SYMBOL(smp_call_function); @@ -47062,21 +46094,21 @@ diff -urNp linux-2.6.31.7/kernel/smp.c linux-2.6.31.7/kernel/smp.c { spin_unlock_irq(&call_function.lock); } -diff -urNp linux-2.6.31.7/kernel/softirq.c linux-2.6.31.7/kernel/softirq.c ---- linux-2.6.31.7/kernel/softirq.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/softirq.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/softirq.c linux-2.6.32/kernel/softirq.c +--- linux-2.6.32/kernel/softirq.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/softirq.c 2009-12-04 21:40:48.544762418 -0500 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); -char *softirq_to_name[NR_SOFTIRQS] = { +const char * const softirq_to_name[NR_SOFTIRQS] = { - "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", "TASKLET", "SCHED", "HRTIMER", "RCU" }; -diff -urNp linux-2.6.31.7/kernel/sys.c linux-2.6.31.7/kernel/sys.c ---- linux-2.6.31.7/kernel/sys.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/sys.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/sys.c linux-2.6.32/kernel/sys.c +--- linux-2.6.32/kernel/sys.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/sys.c 2009-12-04 21:40:48.545700913 -0500 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; @@ -47203,7 +46235,7 @@ diff -urNp linux-2.6.31.7/kernel/sys.c linux-2.6.31.7/kernel/sys.c if (gid != old_fsgid) { new->fsgid = gid; goto change_okay; -@@ -1443,7 +1477,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi +@@ -1459,7 +1493,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi error = get_dumpable(me->mm); break; case PR_SET_DUMPABLE: @@ -47212,10 +46244,10 @@ diff -urNp linux-2.6.31.7/kernel/sys.c linux-2.6.31.7/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c ---- linux-2.6.31.7/kernel/sysctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/sysctl.c 2009-12-10 22:15:17.000000000 -0500 -@@ -65,6 +65,13 @@ +diff -urNp linux-2.6.32/kernel/sysctl.c linux-2.6.32/kernel/sysctl.c +--- linux-2.6.32/kernel/sysctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/sysctl.c 2009-12-04 21:40:48.546759047 -0500 +@@ -63,6 +63,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); #if defined(CONFIG_SYSCTL) @@ -47229,15 +46261,15 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c /* External variables not in a header file. */ extern int C_A_D; -@@ -163,6 +170,7 @@ static int proc_do_cad_pid(struct ctl_ta - static int proc_taint(struct ctl_table *table, int write, struct file *filp, +@@ -168,6 +175,7 @@ static int proc_do_cad_pid(struct ctl_ta + static int proc_taint(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); #endif +extern ctl_table grsecurity_table[]; static struct ctl_table root_table[]; static struct ctl_table_root sysctl_table_root; -@@ -195,6 +203,21 @@ extern struct ctl_table epoll_table[]; +@@ -200,6 +208,21 @@ extern struct ctl_table epoll_table[]; int sysctl_legacy_va_layout; #endif @@ -47259,7 +46291,7 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c extern int prove_locking; extern int lock_stat; -@@ -246,6 +269,24 @@ static int max_wakeup_granularity_ns = N +@@ -251,6 +274,24 @@ static int max_wakeup_granularity_ns = N #endif static struct ctl_table kern_table[] = { @@ -47281,10 +46313,10 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c + }, +#endif + - #ifdef CONFIG_SCHED_DEBUG { .ctl_name = CTL_UNNUMBERED, -@@ -1734,6 +1775,8 @@ static int do_sysctl_strategy(struct ctl + .procname = "sched_child_runs_first", +@@ -1800,6 +1841,8 @@ static int do_sysctl_strategy(struct ctl return 0; } @@ -47293,7 +46325,7 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c static int parse_table(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp, void __user *newval, size_t newlen, -@@ -1752,7 +1795,7 @@ repeat: +@@ -1818,7 +1861,7 @@ repeat: if (n == table->ctl_name) { int error; if (table->child) { @@ -47302,7 +46334,7 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c return -EPERM; name++; nlen--; -@@ -1837,6 +1880,33 @@ int sysctl_perm(struct ctl_table_root *r +@@ -1903,6 +1946,33 @@ int sysctl_perm(struct ctl_table_root *r int error; int mode; @@ -47336,9 +46368,9 @@ diff -urNp linux-2.6.31.7/kernel/sysctl.c linux-2.6.31.7/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.31.7/kernel/taskstats.c linux-2.6.31.7/kernel/taskstats.c ---- linux-2.6.31.7/kernel/taskstats.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/taskstats.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/taskstats.c linux-2.6.32/kernel/taskstats.c +--- linux-2.6.32/kernel/taskstats.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/taskstats.c 2009-12-04 20:41:39.364614829 -0500 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -47362,9 +46394,9 @@ diff -urNp linux-2.6.31.7/kernel/taskstats.c linux-2.6.31.7/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.31.7/kernel/time/tick-broadcast.c linux-2.6.31.7/kernel/time/tick-broadcast.c ---- linux-2.6.31.7/kernel/time/tick-broadcast.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/time/tick-broadcast.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/time/tick-broadcast.c linux-2.6.32/kernel/time/tick-broadcast.c +--- linux-2.6.32/kernel/time/tick-broadcast.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/time/tick-broadcast.c 2009-12-04 21:40:48.546759047 -0500 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -47374,33 +46406,9 @@ diff -urNp linux-2.6.31.7/kernel/time/tick-broadcast.c linux-2.6.31.7/kernel/tim cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.31.7/kernel/time/timer_list.c linux-2.6.31.7/kernel/time/timer_list.c ---- linux-2.6.31.7/kernel/time/timer_list.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/time/timer_list.c 2009-12-10 22:15:17.000000000 -0500 -@@ -275,7 +275,7 @@ static int timer_list_open(struct inode - return single_open(filp, timer_list_show, NULL); - } - --static struct file_operations timer_list_fops = { -+static const struct file_operations timer_list_fops = { - .open = timer_list_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/kernel/time/timer_stats.c linux-2.6.31.7/kernel/time/timer_stats.c ---- linux-2.6.31.7/kernel/time/timer_stats.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/time/timer_stats.c 2009-12-10 22:15:17.000000000 -0500 -@@ -395,7 +395,7 @@ static int tstats_open(struct inode *ino - return single_open(filp, tstats_show, NULL); - } - --static struct file_operations tstats_fops = { -+static const struct file_operations tstats_fops = { - .open = tstats_open, - .read = seq_read, - .write = tstats_write, -diff -urNp linux-2.6.31.7/kernel/time.c linux-2.6.31.7/kernel/time.c ---- linux-2.6.31.7/kernel/time.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/time.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/time.c linux-2.6.32/kernel/time.c +--- linux-2.6.32/kernel/time.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/time.c 2009-12-04 21:40:48.546759047 -0500 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -47438,10 +46446,10 @@ diff -urNp linux-2.6.31.7/kernel/time.c linux-2.6.31.7/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.31.7/kernel/trace/Kconfig linux-2.6.31.7/kernel/trace/Kconfig ---- linux-2.6.31.7/kernel/trace/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/trace/Kconfig 2009-12-10 22:15:17.000000000 -0500 -@@ -111,6 +111,7 @@ if FTRACE +diff -urNp linux-2.6.32/kernel/trace/Kconfig linux-2.6.32/kernel/trace/Kconfig +--- linux-2.6.32/kernel/trace/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/trace/Kconfig 2009-12-04 20:41:39.366722123 -0500 +@@ -126,6 +126,7 @@ if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer" depends on HAVE_FUNCTION_TRACER @@ -47449,7 +46457,7 @@ diff -urNp linux-2.6.31.7/kernel/trace/Kconfig linux-2.6.31.7/kernel/trace/Kconf select FRAME_POINTER select KALLSYMS select GENERIC_TRACER -@@ -326,6 +327,7 @@ config POWER_TRACER +@@ -343,6 +344,7 @@ config POWER_TRACER config STACK_TRACER bool "Trace max stack" depends on HAVE_FUNCTION_TRACER @@ -47457,90 +46465,10 @@ diff -urNp linux-2.6.31.7/kernel/trace/Kconfig linux-2.6.31.7/kernel/trace/Kconf select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.31.7/kernel/trace/ftrace.c linux-2.6.31.7/kernel/trace/ftrace.c ---- linux-2.6.31.7/kernel/trace/ftrace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/trace/ftrace.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1562,7 +1562,7 @@ static int t_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations show_ftrace_seq_ops = { -+static const struct seq_operations show_ftrace_seq_ops = { - .start = t_start, - .next = t_next, - .stop = t_stop, -@@ -2560,7 +2560,7 @@ static int g_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations ftrace_graph_seq_ops = { -+static const struct seq_operations ftrace_graph_seq_ops = { - .start = g_start, - .next = g_next, - .stop = g_stop, -diff -urNp linux-2.6.31.7/kernel/trace/trace.c linux-2.6.31.7/kernel/trace/trace.c ---- linux-2.6.31.7/kernel/trace/trace.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/trace/trace.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1885,7 +1885,7 @@ static int s_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations tracer_seq_ops = { -+static const struct seq_operations tracer_seq_ops = { - .start = s_start, - .next = s_next, - .stop = s_stop, -@@ -2097,7 +2097,7 @@ static int t_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations show_traces_seq_ops = { -+static const struct seq_operations show_traces_seq_ops = { - .start = t_start, - .next = t_next, - .stop = t_stop, -@@ -2292,23 +2292,23 @@ tracing_trace_options_read(struct file * - /* Try to assign a tracer specific option */ - static int set_tracer_option(struct tracer *trace, char *cmp, int neg) - { -- struct tracer_flags *trace_flags = trace->flags; -+ struct tracer_flags *tracer_flags = trace->flags; - struct tracer_opt *opts = NULL; - int ret = 0, i = 0; - int len; - -- for (i = 0; trace_flags->opts[i].name; i++) { -- opts = &trace_flags->opts[i]; -+ for (i = 0; tracer_flags->opts[i].name; i++) { -+ opts = &tracer_flags->opts[i]; - len = strlen(opts->name); - - if (strncmp(cmp, opts->name, len) == 0) { -- ret = trace->set_flag(trace_flags->val, -+ ret = trace->set_flag(tracer_flags->val, - opts->bit, !neg); - break; - } - } - /* Not found */ -- if (!trace_flags->opts[i].name) -+ if (!tracer_flags->opts[i].name) - return -EINVAL; - - /* Refused to handle */ -@@ -2316,9 +2316,9 @@ static int set_tracer_option(struct trac - return ret; - - if (neg) -- trace_flags->val &= ~opts->bit; -+ tracer_flags->val &= ~opts->bit; - else -- trace_flags->val |= opts->bit; -+ tracer_flags->val |= opts->bit; - - return 0; - } -@@ -3685,10 +3685,9 @@ static const struct file_operations trac +diff -urNp linux-2.6.32/kernel/trace/trace.c linux-2.6.32/kernel/trace/trace.c +--- linux-2.6.32/kernel/trace/trace.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/trace/trace.c 2009-12-04 21:40:48.547744240 -0500 +@@ -3792,10 +3792,9 @@ static const struct file_operations trac }; #endif @@ -47552,7 +46480,7 @@ diff -urNp linux-2.6.31.7/kernel/trace/trace.c linux-2.6.31.7/kernel/trace/trace static int once; if (d_tracer) -@@ -3708,10 +3707,9 @@ struct dentry *tracing_init_dentry(void) +@@ -3815,10 +3814,9 @@ struct dentry *tracing_init_dentry(void) return d_tracer; } @@ -47564,10 +46492,22 @@ diff -urNp linux-2.6.31.7/kernel/trace/trace.c linux-2.6.31.7/kernel/trace/trace static int once; struct dentry *d_tracer; -diff -urNp linux-2.6.31.7/kernel/trace/trace_output.c linux-2.6.31.7/kernel/trace/trace_output.c ---- linux-2.6.31.7/kernel/trace/trace_output.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/trace/trace_output.c 2009-12-10 22:15:17.000000000 -0500 -@@ -234,7 +234,7 @@ int trace_seq_path(struct trace_seq *s, +diff -urNp linux-2.6.32/kernel/trace/trace_events.c linux-2.6.32/kernel/trace/trace_events.c +--- linux-2.6.32/kernel/trace/trace_events.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/trace/trace_events.c 2009-12-04 21:40:48.548771557 -0500 +@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list + * Modules must own their file_operations to keep up with + * reference counting. + */ ++ ++/* cannot be const */ + struct ftrace_module_file_ops { + struct list_head list; + struct module *mod; +diff -urNp linux-2.6.32/kernel/trace/trace_output.c linux-2.6.32/kernel/trace/trace_output.c +--- linux-2.6.32/kernel/trace/trace_output.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/trace/trace_output.c 2009-12-04 21:40:48.548771557 -0500 +@@ -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); if (!IS_ERR(p)) { @@ -47576,9 +46516,21 @@ diff -urNp linux-2.6.31.7/kernel/trace/trace_output.c linux-2.6.31.7/kernel/trac if (p) { s->len = p - s->buffer; return 1; -diff -urNp linux-2.6.31.7/kernel/utsname_sysctl.c linux-2.6.31.7/kernel/utsname_sysctl.c ---- linux-2.6.31.7/kernel/utsname_sysctl.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/kernel/utsname_sysctl.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/kernel/trace/trace_stack.c linux-2.6.32/kernel/trace/trace_stack.c +--- linux-2.6.32/kernel/trace/trace_stack.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/trace/trace_stack.c 2009-12-11 19:45:16.319390875 -0500 +@@ -50,7 +50,7 @@ static inline void check_stack(void) + return; + + /* we do not handle interrupt stacks yet */ +- if (!object_is_on_stack(&this_size)) ++ if (!object_starts_on_stack(&this_size)) + return; + + local_irq_save(flags); +diff -urNp linux-2.6.32/kernel/utsname_sysctl.c linux-2.6.32/kernel/utsname_sysctl.c +--- linux-2.6.32/kernel/utsname_sysctl.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/kernel/utsname_sysctl.c 2009-12-04 21:40:48.548771557 -0500 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -47597,21 +46549,45 @@ diff -urNp linux-2.6.31.7/kernel/utsname_sysctl.c linux-2.6.31.7/kernel/utsname_ }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.31.7/lib/Kconfig.debug linux-2.6.31.7/lib/Kconfig.debug ---- linux-2.6.31.7/lib/Kconfig.debug 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/Kconfig.debug 2009-12-10 22:15:17.000000000 -0500 -@@ -866,7 +866,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.31.7/lib/inflate.c linux-2.6.31.7/lib/inflate.c ---- linux-2.6.31.7/lib/inflate.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/inflate.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/bug.c linux-2.6.32/lib/bug.c +--- linux-2.6.32/lib/bug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/bug.c 2009-12-04 21:40:48.548771557 -0500 +@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l + return BUG_TRAP_TYPE_NONE; + + bug = find_bug(bugaddr); ++ if (!bug) ++ return BUG_TRAP_TYPE_NONE; + + printk(KERN_EMERG "------------[ cut here ]------------\n"); + +diff -urNp linux-2.6.32/lib/debugobjects.c linux-2.6.32/lib/debugobjects.c +--- linux-2.6.32/lib/debugobjects.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/debugobjects.c 2009-12-11 19:45:16.337581694 -0500 +@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi + if (limit > 4) + return; + +- is_on_stack = object_is_on_stack(addr); ++ is_on_stack = object_starts_on_stack(addr); + if (is_on_stack == onstack) + return; + +diff -urNp linux-2.6.32/lib/dma-debug.c linux-2.6.32/lib/dma-debug.c +--- linux-2.6.32/lib/dma-debug.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/dma-debug.c 2009-12-11 19:45:16.344571762 -0500 +@@ -857,7 +857,7 @@ out: + + static void check_for_stack(struct device *dev, void *addr) + { +- if (object_is_on_stack(addr)) ++ if (object_starts_on_stack(addr)) + err_printk(dev, NULL, "DMA-API: device driver maps memory from" + "stack [addr=%p]\n", addr); + } +diff -urNp linux-2.6.32/lib/inflate.c linux-2.6.32/lib/inflate.c +--- linux-2.6.32/lib/inflate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/inflate.c 2009-12-04 21:40:48.549758272 -0500 @@ -266,7 +266,7 @@ static void free(void *where) malloc_ptr = free_mem_ptr; } @@ -47621,9 +46597,21 @@ diff -urNp linux-2.6.31.7/lib/inflate.c linux-2.6.31.7/lib/inflate.c #define free(a) kfree(a) #endif -diff -urNp linux-2.6.31.7/lib/kobject.c linux-2.6.31.7/lib/kobject.c ---- linux-2.6.31.7/lib/kobject.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/kobject.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/Kconfig.debug linux-2.6.32/lib/Kconfig.debug +--- linux-2.6.32/lib/Kconfig.debug 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/Kconfig.debug 2009-12-04 20:41:39.387712447 -0500 +@@ -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/lib/kobject.c linux-2.6.32/lib/kobject.c +--- linux-2.6.32/lib/kobject.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/kobject.c 2009-12-04 21:40:48.550764031 -0500 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko return ret; } @@ -47651,9 +46639,9 @@ diff -urNp linux-2.6.31.7/lib/kobject.c linux-2.6.31.7/lib/kobject.c struct kobject *parent_kobj) { struct kset *kset; -diff -urNp linux-2.6.31.7/lib/kobject_uevent.c linux-2.6.31.7/lib/kobject_uevent.c ---- linux-2.6.31.7/lib/kobject_uevent.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/kobject_uevent.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/kobject_uevent.c linux-2.6.32/lib/kobject_uevent.c +--- linux-2.6.32/lib/kobject_uevent.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/kobject_uevent.c 2009-12-04 21:40:48.550764031 -0500 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k const char *subsystem; struct kobject *top_kobj; @@ -47663,9 +46651,9 @@ diff -urNp linux-2.6.31.7/lib/kobject_uevent.c linux-2.6.31.7/lib/kobject_uevent u64 seq; int i = 0; int retval = 0; -diff -urNp linux-2.6.31.7/lib/parser.c linux-2.6.31.7/lib/parser.c ---- linux-2.6.31.7/lib/parser.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/parser.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/parser.c linux-2.6.32/lib/parser.c +--- linux-2.6.32/lib/parser.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/parser.c 2009-12-04 21:40:48.551679119 -0500 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -47675,9 +46663,9 @@ diff -urNp linux-2.6.31.7/lib/parser.c linux-2.6.31.7/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.31.7/lib/radix-tree.c linux-2.6.31.7/lib/radix-tree.c ---- linux-2.6.31.7/lib/radix-tree.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/radix-tree.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/radix-tree.c linux-2.6.32/lib/radix-tree.c +--- linux-2.6.32/lib/radix-tree.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/radix-tree.c 2009-12-04 21:40:48.551679119 -0500 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -47687,9 +46675,9 @@ diff -urNp linux-2.6.31.7/lib/radix-tree.c linux-2.6.31.7/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.31.7/lib/random32.c linux-2.6.31.7/lib/random32.c ---- linux-2.6.31.7/lib/random32.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/lib/random32.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/lib/random32.c linux-2.6.32/lib/random32.c +--- linux-2.6.32/lib/random32.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/lib/random32.c 2009-12-04 21:40:48.551679119 -0500 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -47699,36 +46687,38 @@ diff -urNp linux-2.6.31.7/lib/random32.c linux-2.6.31.7/lib/random32.c } /** -diff -urNp linux-2.6.31.7/localversion-grsec linux-2.6.31.7/localversion-grsec ---- linux-2.6.31.7/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.31.7/localversion-grsec 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/localversion-grsec linux-2.6.32/localversion-grsec +--- linux-2.6.32/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.32/localversion-grsec 2009-12-04 20:41:39.387712447 -0500 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.31.7/mm/Kconfig linux-2.6.31.7/mm/Kconfig ---- linux-2.6.31.7/mm/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/Kconfig 2009-12-10 22:15:17.000000000 -0500 -@@ -216,7 +216,7 @@ config MMU_NOTIFIER +diff -urNp linux-2.6.32/Makefile linux-2.6.32/Makefile +--- linux-2.6.32/Makefile 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/Makefile 2009-12-04 21:40:47.321628531 -0500 +@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" - config DEFAULT_MMAP_MIN_ADDR - int "Low address space to protect from user allocation" -- 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.31.7/mm/filemap.c linux-2.6.31.7/mm/filemap.c ---- linux-2.6.31.7/mm/filemap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/filemap.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1648,7 +1648,7 @@ page_not_uptodate: - } - EXPORT_SYMBOL(filemap_fault); + 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 --struct vm_operations_struct generic_file_vm_ops = { -+const struct vm_operations_struct generic_file_vm_ops = { - .fault = filemap_fault, - }; -@@ -1659,7 +1659,7 @@ int generic_file_mmap(struct file * file + 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/mm/filemap.c linux-2.6.32/mm/filemap.c +--- linux-2.6.32/mm/filemap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/filemap.c 2009-12-04 21:40:48.552710957 -0500 +@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; if (!mapping->a_ops->readpage) @@ -47737,7 +46727,7 @@ diff -urNp linux-2.6.31.7/mm/filemap.c linux-2.6.31.7/mm/filemap.c file_accessed(file); vma->vm_ops = &generic_file_vm_ops; vma->vm_flags |= VM_CAN_NONLINEAR; -@@ -2019,6 +2019,7 @@ inline int generic_write_checks(struct f +@@ -1982,6 +1982,7 @@ inline int generic_write_checks(struct f *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -47745,21 +46735,9 @@ diff -urNp linux-2.6.31.7/mm/filemap.c linux-2.6.31.7/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.31.7/mm/filemap_xip.c linux-2.6.31.7/mm/filemap_xip.c ---- linux-2.6.31.7/mm/filemap_xip.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/filemap_xip.c 2009-12-10 22:15:17.000000000 -0500 -@@ -296,7 +296,7 @@ out: - } - } - --static struct vm_operations_struct xip_file_vm_ops = { -+static const struct vm_operations_struct xip_file_vm_ops = { - .fault = xip_file_fault, - }; - -diff -urNp linux-2.6.31.7/mm/fremap.c linux-2.6.31.7/mm/fremap.c ---- linux-2.6.31.7/mm/fremap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/fremap.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/fremap.c linux-2.6.32/mm/fremap.c +--- linux-2.6.32/mm/fremap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/fremap.c 2009-12-04 21:40:48.553690256 -0500 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -47772,9 +46750,9 @@ diff -urNp linux-2.6.31.7/mm/fremap.c linux-2.6.31.7/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.31.7/mm/highmem.c linux-2.6.31.7/mm/highmem.c ---- linux-2.6.31.7/mm/highmem.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/highmem.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/highmem.c linux-2.6.32/mm/highmem.c +--- linux-2.6.32/mm/highmem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/highmem.c 2009-12-04 21:40:48.553690256 -0500 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) * So no dangers, even with speculative execution. */ @@ -47800,19 +46778,10 @@ diff -urNp linux-2.6.31.7/mm/highmem.c linux-2.6.31.7/mm/highmem.c pkmap_count[last_pkmap_nr] = 1; set_page_address(page, (void *)vaddr); -diff -urNp linux-2.6.31.7/mm/hugetlb.c linux-2.6.31.7/mm/hugetlb.c ---- linux-2.6.31.7/mm/hugetlb.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/hugetlb.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1689,7 +1689,7 @@ static int hugetlb_vm_op_fault(struct vm - return 0; - } - --struct vm_operations_struct hugetlb_vm_ops = { -+const struct vm_operations_struct hugetlb_vm_ops = { - .fault = hugetlb_vm_op_fault, - .open = hugetlb_vm_op_open, - .close = hugetlb_vm_op_close, -@@ -1892,6 +1892,26 @@ static int unmap_ref_private(struct mm_s +diff -urNp linux-2.6.32/mm/hugetlb.c linux-2.6.32/mm/hugetlb.c +--- linux-2.6.32/mm/hugetlb.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/hugetlb.c 2009-12-04 21:40:48.554757001 -0500 +@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s return 1; } @@ -47839,7 +46808,7 @@ diff -urNp linux-2.6.31.7/mm/hugetlb.c linux-2.6.31.7/mm/hugetlb.c static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma, unsigned long address, pte_t *ptep, pte_t pte, struct page *pagecache_page) -@@ -1963,6 +1983,11 @@ retry_avoidcopy: +@@ -1995,6 +2015,11 @@ retry_avoidcopy: huge_ptep_clear_flush(vma, address, ptep); set_huge_pte_at(mm, address, ptep, make_huge_pte(vma, new_page, 1)); @@ -47851,7 +46820,7 @@ diff -urNp linux-2.6.31.7/mm/hugetlb.c linux-2.6.31.7/mm/hugetlb.c /* Make the old page be freed below */ new_page = old_page; } -@@ -2072,6 +2097,10 @@ retry: +@@ -2124,6 +2149,10 @@ retry: && (vma->vm_flags & VM_SHARED))); set_huge_pte_at(mm, address, ptep, new_pte); @@ -47862,7 +46831,7 @@ diff -urNp linux-2.6.31.7/mm/hugetlb.c linux-2.6.31.7/mm/hugetlb.c if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) { /* Optimization, do the COW without a second fault */ ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page); -@@ -2100,6 +2129,28 @@ int hugetlb_fault(struct mm_struct *mm, +@@ -2152,6 +2181,28 @@ int hugetlb_fault(struct mm_struct *mm, static DEFINE_MUTEX(hugetlb_instantiation_mutex); struct hstate *h = hstate_vma(vma); @@ -47891,9 +46860,21 @@ diff -urNp linux-2.6.31.7/mm/hugetlb.c linux-2.6.31.7/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.31.7/mm/maccess.c linux-2.6.31.7/mm/maccess.c ---- linux-2.6.31.7/mm/maccess.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/maccess.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/Kconfig linux-2.6.32/mm/Kconfig +--- linux-2.6.32/mm/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/Kconfig 2009-12-04 20:41:39.469297222 -0500 +@@ -227,7 +227,7 @@ config KSM + + config DEFAULT_MMAP_MIN_ADDR + int "Low address space to protect from user allocation" +- 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/mm/maccess.c linux-2.6.32/mm/maccess.c +--- linux-2.6.32/mm/maccess.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/maccess.c 2009-12-04 21:40:48.555663103 -0500 @@ -14,7 +14,7 @@ * Safely read from address @src to the buffer at @dst. If a kernel fault * happens, handle that and return -EFAULT. @@ -47912,12 +46893,12 @@ diff -urNp linux-2.6.31.7/mm/maccess.c linux-2.6.31.7/mm/maccess.c { long ret; mm_segment_t old_fs = get_fs(); -diff -urNp linux-2.6.31.7/mm/madvise.c linux-2.6.31.7/mm/madvise.c ---- linux-2.6.31.7/mm/madvise.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/madvise.c 2009-12-10 22:15:17.000000000 -0500 -@@ -43,6 +43,10 @@ static long madvise_behavior(struct vm_a +diff -urNp linux-2.6.32/mm/madvise.c linux-2.6.32/mm/madvise.c +--- linux-2.6.32/mm/madvise.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/madvise.c 2009-12-04 21:40:48.555663103 -0500 +@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; - int new_flags = vma->vm_flags; + unsigned long new_flags = vma->vm_flags; +#ifdef CONFIG_PAX_SEGMEXEC + struct vm_area_struct *vma_m; @@ -47926,7 +46907,7 @@ diff -urNp linux-2.6.31.7/mm/madvise.c linux-2.6.31.7/mm/madvise.c switch (behavior) { case MADV_NORMAL: new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ; -@@ -92,6 +96,13 @@ success: +@@ -103,6 +107,13 @@ success: /* * vm_flags is protected by the mmap_sem held in write mode. */ @@ -47940,25 +46921,41 @@ diff -urNp linux-2.6.31.7/mm/madvise.c linux-2.6.31.7/mm/madvise.c vma->vm_flags = new_flags; out: -@@ -235,6 +246,17 @@ madvise_vma(struct vm_area_struct *vma, - - case MADV_DONTNEED: - error = madvise_dontneed(vma, prev, start, end); +@@ -161,6 +172,11 @@ static long madvise_dontneed(struct vm_a + struct vm_area_struct ** prev, + unsigned long start, unsigned long end) + { + +#ifdef CONFIG_PAX_SEGMEXEC -+ if (!error) { -+ struct vm_area_struct *vma_m, *prev_m; ++ struct vm_area_struct *vma_m; ++#endif + -+ vma_m = pax_find_mirror_vma(vma); -+ if (vma_m) -+ error = madvise_dontneed(vma_m, &prev_m, start + SEGMEXEC_TASK_SIZE, end + SEGMEXEC_TASK_SIZE); -+ } + *prev = vma; + if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP)) + return -EINVAL; +@@ -173,6 +189,21 @@ static long madvise_dontneed(struct vm_a + zap_page_range(vma, start, end - start, &details); + } else + zap_page_range(vma, start, end - start, NULL); ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ vma_m = pax_find_mirror_vma(vma); ++ if (vma_m) { ++ if (unlikely(vma->vm_flags & VM_NONLINEAR)) { ++ struct zap_details details = { ++ .nonlinear_vma = vma_m, ++ .last_index = ULONG_MAX, ++ }; ++ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details); ++ } else ++ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL); ++ } +#endif + - break; + return 0; + } - default: -@@ -328,6 +350,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, +@@ -359,6 +390,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, if (end < start) goto out; @@ -47975,41 +46972,40 @@ diff -urNp linux-2.6.31.7/mm/madvise.c linux-2.6.31.7/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c ---- linux-2.6.31.7/mm/memory.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/memory.c 2009-12-10 22:15:17.000000000 -0500 -@@ -47,6 +47,7 @@ - #include <linux/pagemap.h> +diff -urNp linux-2.6.32/mm/memory.c linux-2.6.32/mm/memory.c +--- linux-2.6.32/mm/memory.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/memory.c 2009-12-04 21:40:48.558328913 -0500 +@@ -48,6 +48,7 @@ + #include <linux/ksm.h> #include <linux/rmap.h> #include <linux/module.h> +#include <linux/security.h> #include <linux/delayacct.h> #include <linux/init.h> #include <linux/writeback.h> -@@ -1228,11 +1229,11 @@ int __get_user_pages(struct task_struct - vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); +@@ -1251,10 +1252,10 @@ int __get_user_pages(struct task_struct + (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); i = 0; - do { + while (nr_pages) { struct vm_area_struct *vma; - unsigned int foll_flags; - vma = find_extend_vma(mm, start); + vma = find_vma(mm, start); if (!vma && in_gate_area(tsk, start)) { unsigned long pg = start & PAGE_MASK; struct vm_area_struct *gate_vma = get_gate_vma(tsk); -@@ -1274,7 +1275,7 @@ int __get_user_pages(struct task_struct +@@ -1296,7 +1297,7 @@ int __get_user_pages(struct task_struct continue; } - if (!vma || + if (!vma || start < vma->vm_start || (vma->vm_flags & (VM_IO | VM_PFNMAP)) || - (!ignore && !(vm_flags & vma->vm_flags))) + !(vm_flags & vma->vm_flags)) return i ? : -EFAULT; -@@ -1360,7 +1361,7 @@ int __get_user_pages(struct task_struct +@@ -1371,7 +1372,7 @@ int __get_user_pages(struct task_struct start += PAGE_SIZE; nr_pages--; } while (nr_pages && start < vma->vm_end); @@ -48018,7 +47014,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c return i; } -@@ -1926,6 +1927,186 @@ static inline void cow_user_page(struct +@@ -1967,6 +1968,186 @@ static inline void cow_user_page(struct copy_user_highpage(dst, src, va, vma); } @@ -48205,7 +47201,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2098,6 +2279,12 @@ gotten: +@@ -2146,6 +2327,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -48218,7 +47214,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter(mm, file_rss); -@@ -2144,6 +2331,10 @@ gotten: +@@ -2197,6 +2384,10 @@ gotten: page_remove_rmap(old_page); } @@ -48229,15 +47225,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -2425,6 +2616,7 @@ int vmtruncate(struct inode * inode, lof - unsigned long limit; - - limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; -+ gr_learn_resource(current, RLIMIT_FSIZE, offset, 1); - if (limit != RLIM_INFINITY && offset > limit) - goto out_sig; - if (offset > inode->i_sb->s_maxbytes) -@@ -2587,6 +2779,11 @@ static int do_swap_page(struct mm_struct +@@ -2594,6 +2785,11 @@ static int do_swap_page(struct mm_struct swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -48249,7 +47237,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c unlock_page(page); if (flags & FAULT_FLAG_WRITE) { -@@ -2598,6 +2795,11 @@ static int do_swap_page(struct mm_struct +@@ -2605,6 +2801,11 @@ static int do_swap_page(struct mm_struct /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, pte); @@ -48261,11 +47249,19 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -2644,12 +2846,23 @@ static int do_anonymous_page(struct mm_s - page_table = pte_offset_map_lock(mm, pmd, address, &ptl); +@@ -2628,7 +2829,7 @@ static int do_anonymous_page(struct mm_s + unsigned long address, pte_t *page_table, pmd_t *pmd, + unsigned int flags) + { +- struct page *page; ++ struct page *page = NULL; + spinlock_t *ptl; + pte_t entry; + +@@ -2663,6 +2864,11 @@ static int do_anonymous_page(struct mm_s if (!pte_none(*page_table)) goto release; -+ + +#ifdef CONFIG_PAX_SEGMEXEC + if (pax_find_mirror_vma(vma)) + BUG_ON(!trylock_page(page)); @@ -48273,19 +47269,21 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c + inc_mm_counter(mm, anon_rss); page_add_new_anon_rmap(page, vma, address); - set_pte_at(mm, address, page_table, entry); + setpte: +@@ -2670,6 +2876,12 @@ setpte: /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, entry); + +#ifdef CONFIG_PAX_SEGMEXEC -+ pax_mirror_anon_pte(vma, address, page, ptl); ++ if (page) ++ pax_mirror_anon_pte(vma, address, page, ptl); +#endif + unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -2786,6 +2999,12 @@ static int __do_fault(struct mm_struct * +@@ -2812,6 +3024,12 @@ static int __do_fault(struct mm_struct * */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -48298,7 +47296,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -2805,6 +3024,14 @@ static int __do_fault(struct mm_struct * +@@ -2831,6 +3049,14 @@ static int __do_fault(struct mm_struct * /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, entry); @@ -48313,7 +47311,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -2952,6 +3179,12 @@ static inline int handle_pte_fault(struc +@@ -2978,6 +3204,12 @@ static inline int handle_pte_fault(struc if (flags & FAULT_FLAG_WRITE) flush_tlb_page(vma, address); } @@ -48326,7 +47324,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -2968,6 +3201,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -2994,6 +3226,10 @@ int handle_mm_fault(struct mm_struct *mm pmd_t *pmd; pte_t *pte; @@ -48337,7 +47335,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -2975,6 +3212,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -3001,6 +3237,34 @@ int handle_mm_fault(struct mm_struct *mm if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -48372,7 +47370,7 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); if (!pud) -@@ -3072,7 +3337,7 @@ static int __init gate_vma_init(void) +@@ -3098,7 +3362,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -48381,9 +47379,9 @@ diff -urNp linux-2.6.31.7/mm/memory.c linux-2.6.31.7/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.31.7/mm/mempolicy.c linux-2.6.31.7/mm/mempolicy.c ---- linux-2.6.31.7/mm/mempolicy.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/mempolicy.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/mempolicy.c linux-2.6.32/mm/mempolicy.c +--- linux-2.6.32/mm/mempolicy.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/mempolicy.c 2009-12-04 21:40:48.558766361 -0500 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -48464,10 +47462,10 @@ diff -urNp linux-2.6.31.7/mm/mempolicy.c linux-2.6.31.7/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.31.7/mm/migrate.c linux-2.6.31.7/mm/migrate.c ---- linux-2.6.31.7/mm/migrate.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/migrate.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1087,6 +1087,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +diff -urNp linux-2.6.32/mm/migrate.c linux-2.6.32/mm/migrate.c +--- linux-2.6.32/mm/migrate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/migrate.c 2009-12-04 20:41:39.527807682 -0500 +@@ -1103,6 +1103,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, if (!mm) return -EINVAL; @@ -48482,7 +47480,7 @@ diff -urNp linux-2.6.31.7/mm/migrate.c linux-2.6.31.7/mm/migrate.c /* * Check if this process has the right to modify the specified * process. The right exists if the process has administrative -@@ -1096,8 +1104,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, +@@ -1112,8 +1120,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, rcu_read_lock(); tcred = __task_cred(task); if (cred->euid != tcred->suid && cred->euid != tcred->uid && @@ -48492,9 +47490,9 @@ diff -urNp linux-2.6.31.7/mm/migrate.c linux-2.6.31.7/mm/migrate.c rcu_read_unlock(); err = -EPERM; goto out; -diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c ---- linux-2.6.31.7/mm/mlock.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/mlock.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/mlock.c linux-2.6.32/mm/mlock.c +--- linux-2.6.32/mm/mlock.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/mlock.c 2009-12-04 21:40:48.587074672 -0500 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -48503,7 +47501,7 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c #include <linux/sched.h> #include <linux/module.h> #include <linux/rmap.h> -@@ -412,6 +413,17 @@ static int do_mlock(unsigned long start, +@@ -435,6 +436,17 @@ static int do_mlock(unsigned long start, return -EINVAL; if (end == start) return 0; @@ -48521,7 +47519,7 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c vma = find_vma_prev(current->mm, start, &prev); if (!vma || vma->vm_start > start) return -ENOMEM; -@@ -471,6 +483,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st +@@ -494,6 +506,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st lock_limit >>= PAGE_SHIFT; /* check against resource limits */ @@ -48529,7 +47527,7 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c if ((locked <= lock_limit) || capable(CAP_IPC_LOCK)) error = do_mlock(start, len, 1); up_write(¤t->mm->mmap_sem); -@@ -492,10 +505,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, +@@ -515,10 +528,10 @@ SYSCALL_DEFINE2(munlock, unsigned long, static int do_mlockall(int flags) { struct vm_area_struct * vma, * prev = NULL; @@ -48542,7 +47540,7 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c current->mm->def_flags = def_flags; if (flags == MCL_FUTURE) goto out; -@@ -503,6 +516,12 @@ static int do_mlockall(int flags) +@@ -526,6 +539,12 @@ static int do_mlockall(int flags) for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { unsigned int newflags; @@ -48555,7 +47553,7 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c newflags = vma->vm_flags | VM_LOCKED; if (!(flags & MCL_CURRENT)) newflags &= ~VM_LOCKED; -@@ -534,6 +553,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) +@@ -557,6 +576,7 @@ SYSCALL_DEFINE1(mlockall, int, flags) lock_limit >>= PAGE_SHIFT; ret = -ENOMEM; @@ -48563,9 +47561,9 @@ diff -urNp linux-2.6.31.7/mm/mlock.c linux-2.6.31.7/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c ---- linux-2.6.31.7/mm/mmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/mmap.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/mmap.c linux-2.6.32/mm/mmap.c +--- linux-2.6.32/mm/mmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/mmap.c 2009-12-04 21:40:48.588775715 -0500 @@ -45,6 +45,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -48627,7 +47625,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (rlim < RLIM_INFINITY && (brk - mm->start_brk) + (mm->end_data - mm->start_data) > rlim) goto out; -@@ -696,6 +717,12 @@ static int +@@ -694,6 +715,12 @@ static int can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags, struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff) { @@ -48640,7 +47638,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (is_mergeable_vma(vma, file, vm_flags) && is_mergeable_anon_vma(anon_vma, vma->anon_vma)) { if (vma->vm_pgoff == vm_pgoff) -@@ -715,6 +742,12 @@ static int +@@ -713,6 +740,12 @@ static int can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff) { @@ -48653,7 +47651,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (is_mergeable_vma(vma, file, vm_flags) && is_mergeable_anon_vma(anon_vma, vma->anon_vma)) { pgoff_t vm_pglen; -@@ -757,12 +790,19 @@ can_vma_merge_after(struct vm_area_struc +@@ -755,12 +788,19 @@ can_vma_merge_after(struct vm_area_struc struct vm_area_struct *vma_merge(struct mm_struct *mm, struct vm_area_struct *prev, unsigned long addr, unsigned long end, unsigned long vm_flags, @@ -48674,7 +47672,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * We later require that vma->vm_flags == vm_flags, * so this tests vma->vm_flags & VM_SPECIAL, too. -@@ -778,6 +818,15 @@ struct vm_area_struct *vma_merge(struct +@@ -776,6 +816,15 @@ struct vm_area_struct *vma_merge(struct if (next && next->vm_end == end) /* cases 6, 7, 8 */ next = next->vm_next; @@ -48690,7 +47688,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * Can it merge with the predecessor? */ -@@ -797,9 +846,24 @@ struct vm_area_struct *vma_merge(struct +@@ -795,9 +844,24 @@ struct vm_area_struct *vma_merge(struct /* cases 1, 6 */ vma_adjust(prev, prev->vm_start, next->vm_end, prev->vm_pgoff, NULL); @@ -48716,7 +47714,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return prev; } -@@ -810,12 +874,27 @@ struct vm_area_struct *vma_merge(struct +@@ -808,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mpol_equal(policy, vma_policy(next)) && can_vma_merge_before(next, vm_flags, anon_vma, file, pgoff+pglen)) { @@ -48746,7 +47744,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return area; } -@@ -890,14 +969,11 @@ none: +@@ -888,14 +967,11 @@ none: void vm_stat_account(struct mm_struct *mm, unsigned long flags, struct file *file, long pages) { @@ -48762,7 +47760,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c mm->stack_vm += pages; if (flags & (VM_RESERVED|VM_IO)) mm->reserved_vm += pages; -@@ -924,7 +1000,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -922,7 +998,7 @@ unsigned long do_mmap_pgoff(struct file * (the exception is when the underlying filesystem is noexec * mounted, in which case we dont add PROT_EXEC.) */ @@ -48771,7 +47769,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC))) prot |= PROT_EXEC; -@@ -934,15 +1010,15 @@ unsigned long do_mmap_pgoff(struct file +@@ -932,15 +1008,15 @@ unsigned long do_mmap_pgoff(struct file if (!(flags & MAP_FIXED)) addr = round_hint_to_min(addr); @@ -48791,7 +47789,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* offset overflow? */ if ((pgoff + (len >> PAGE_SHIFT)) < pgoff) return -EOVERFLOW; -@@ -954,7 +1030,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -970,7 +1046,7 @@ unsigned long do_mmap_pgoff(struct file /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -48800,7 +47798,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (addr & ~PAGE_MASK) return addr; -@@ -965,6 +1041,26 @@ unsigned long do_mmap_pgoff(struct file +@@ -981,6 +1057,26 @@ unsigned long do_mmap_pgoff(struct file vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; @@ -48824,10 +47822,10 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c + vm_flags &= ~VM_PAGEEXEC; +#endif + - if (flags & MAP_LOCKED) { + if (flags & MAP_LOCKED) if (!can_do_mlock()) return -EPERM; -@@ -978,6 +1074,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -992,6 +1088,7 @@ unsigned long do_mmap_pgoff(struct file locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; @@ -48835,7 +47833,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -1051,6 +1148,9 @@ unsigned long do_mmap_pgoff(struct file +@@ -1065,6 +1162,9 @@ unsigned long do_mmap_pgoff(struct file if (error) return error; @@ -48845,7 +47843,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return mmap_region(file, addr, len, flags, vm_flags, pgoff); } EXPORT_SYMBOL(do_mmap_pgoff); -@@ -1063,10 +1163,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); +@@ -1077,10 +1177,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); */ int vma_wants_writenotify(struct vm_area_struct *vma) { @@ -48858,7 +47856,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1115,14 +1215,24 @@ unsigned long mmap_region(struct file *f +@@ -1129,14 +1229,24 @@ unsigned long mmap_region(struct file *f unsigned long charged = 0; struct inode *inode = file ? file->f_path.dentry->d_inode : NULL; @@ -48885,7 +47883,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c } /* Check against address space limit. */ -@@ -1171,6 +1281,16 @@ munmap_back: +@@ -1185,6 +1295,16 @@ munmap_back: goto unacct_error; } @@ -48902,7 +47900,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -1193,6 +1313,19 @@ munmap_back: +@@ -1207,6 +1327,19 @@ munmap_back: error = file->f_op->mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -48921,8 +47919,8 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c + if (vm_flags & VM_EXECUTABLE) added_exe_file_vma(mm); - } else if (vm_flags & VM_SHARED) { -@@ -1216,6 +1349,11 @@ munmap_back: + +@@ -1230,6 +1363,11 @@ munmap_back: vma_link(mm, vma, prev, rb_link, rb_parent); file = vma->vm_file; @@ -48934,7 +47932,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* Once vma denies write, undo our temporary denial count */ if (correct_wcount) atomic_inc(&inode->i_writecount); -@@ -1224,6 +1362,7 @@ out: +@@ -1238,6 +1376,7 @@ out: mm->total_vm += len >> PAGE_SHIFT; vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT); @@ -48942,7 +47940,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (vm_flags & VM_LOCKED) { /* * makes pages present; downgrades, drops, reacquires mmap_sem -@@ -1246,6 +1385,12 @@ unmap_and_free_vma: +@@ -1260,6 +1399,12 @@ unmap_and_free_vma: unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); charged = 0; free_vma: @@ -48955,7 +47953,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c kmem_cache_free(vm_area_cachep, vma); unacct_error: if (charged) -@@ -1279,6 +1424,10 @@ arch_get_unmapped_area(struct file *filp +@@ -1293,6 +1438,10 @@ arch_get_unmapped_area(struct file *filp if (flags & MAP_FIXED) return addr; @@ -48966,7 +47964,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); -@@ -1287,10 +1436,10 @@ arch_get_unmapped_area(struct file *filp +@@ -1301,10 +1450,10 @@ arch_get_unmapped_area(struct file *filp return addr; } if (len > mm->cached_hole_size) { @@ -48980,7 +47978,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c } full_search: -@@ -1301,9 +1450,8 @@ full_search: +@@ -1315,9 +1464,8 @@ full_search: * Start a new search - just in case we missed * some holes. */ @@ -48992,7 +47990,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -@@ -1325,10 +1473,16 @@ full_search: +@@ -1339,10 +1487,16 @@ full_search: void arch_unmap_area(struct mm_struct *mm, unsigned long addr) { @@ -49010,7 +48008,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c mm->free_area_cache = addr; mm->cached_hole_size = ~0UL; } -@@ -1346,7 +1500,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1360,7 +1514,7 @@ arch_get_unmapped_area_topdown(struct fi { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; @@ -49019,7 +48017,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -1355,6 +1509,10 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1369,6 +1523,10 @@ arch_get_unmapped_area_topdown(struct fi if (flags & MAP_FIXED) return addr; @@ -49030,7 +48028,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* requesting a specific address */ if (addr) { addr = PAGE_ALIGN(addr); -@@ -1412,13 +1570,21 @@ bottomup: +@@ -1426,13 +1584,21 @@ bottomup: * can happen with large stack limits and large mmap() * allocations. */ @@ -49054,7 +48052,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c mm->cached_hole_size = ~0UL; return addr; -@@ -1427,6 +1593,12 @@ bottomup: +@@ -1441,6 +1607,12 @@ bottomup: void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) { @@ -49067,7 +48065,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * Is this a new hole at the highest possible address? */ -@@ -1434,8 +1606,10 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1448,8 +1620,10 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = addr; /* dont allow allocations above current base */ @@ -49079,7 +48077,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c } unsigned long -@@ -1535,6 +1709,27 @@ out: +@@ -1549,6 +1723,27 @@ out: return prev ? prev->vm_next : vma; } @@ -49107,7 +48105,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1551,6 +1746,7 @@ static int acct_stack_growth(struct vm_a +@@ -1565,6 +1760,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -49115,7 +48113,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (size > rlim[RLIMIT_STACK].rlim_cur) return -ENOMEM; -@@ -1560,6 +1756,7 @@ static int acct_stack_growth(struct vm_a +@@ -1574,6 +1770,7 @@ static int acct_stack_growth(struct vm_a unsigned long limit; locked = mm->locked_vm + grow; limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; @@ -49123,7 +48121,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -1595,35 +1792,40 @@ static +@@ -1609,35 +1806,40 @@ static #endif int expand_upwards(struct vm_area_struct *vma, unsigned long address) { @@ -49174,7 +48172,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c unsigned long size, grow; size = address - vma->vm_start; -@@ -1633,6 +1835,8 @@ int expand_upwards(struct vm_area_struct +@@ -1647,6 +1849,8 @@ int expand_upwards(struct vm_area_struct if (!error) vma->vm_end = address; } @@ -49183,7 +48181,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c anon_vma_unlock(vma); return error; } -@@ -1644,7 +1848,8 @@ int expand_upwards(struct vm_area_struct +@@ -1658,7 +1862,8 @@ int expand_upwards(struct vm_area_struct static int expand_downwards(struct vm_area_struct *vma, unsigned long address) { @@ -49193,7 +48191,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * We must make sure the anon_vma is allocated -@@ -1658,6 +1863,15 @@ static int expand_downwards(struct vm_ar +@@ -1672,6 +1877,15 @@ static int expand_downwards(struct vm_ar if (error) return error; @@ -49209,7 +48207,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c anon_vma_lock(vma); /* -@@ -1667,9 +1881,15 @@ static int expand_downwards(struct vm_ar +@@ -1681,9 +1895,15 @@ static int expand_downwards(struct vm_ar */ /* Somebody else might have raced and expanded it already */ @@ -49226,7 +48224,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -1677,9 +1897,20 @@ static int expand_downwards(struct vm_ar +@@ -1691,9 +1911,20 @@ static int expand_downwards(struct vm_ar if (!error) { vma->vm_start = address; vma->vm_pgoff -= grow; @@ -49247,7 +48245,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return error; } -@@ -1755,6 +1986,13 @@ static void remove_vma_list(struct mm_st +@@ -1769,6 +2000,13 @@ static void remove_vma_list(struct mm_st do { long nrpages = vma_pages(vma); @@ -49261,7 +48259,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma); -@@ -1799,6 +2037,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1813,6 +2051,16 @@ detach_vmas_to_be_unmapped(struct mm_str insertion_point = (prev ? &prev->vm_next : &mm->mmap); do { @@ -49278,7 +48276,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1818,6 +2066,108 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1832,6 +2080,108 @@ detach_vmas_to_be_unmapped(struct mm_str * Split a vma into two pieces at address 'addr', a new vma is allocated * either for the first part or the tail. */ @@ -49387,7 +48385,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, unsigned long addr, int new_below) { -@@ -1869,17 +2219,37 @@ int split_vma(struct mm_struct * mm, str +@@ -1883,17 +2233,37 @@ int split_vma(struct mm_struct * mm, str return 0; } @@ -49425,7 +48423,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -1943,6 +2313,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -1957,6 +2327,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -49434,7 +48432,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return 0; } -@@ -1955,22 +2327,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -1969,22 +2341,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a profile_munmap(addr); @@ -49463,7 +48461,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -1984,6 +2352,11 @@ unsigned long do_brk(unsigned long addr, +@@ -1998,6 +2366,11 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -49475,7 +48473,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -2001,19 +2374,34 @@ unsigned long do_brk(unsigned long addr, +@@ -2015,19 +2388,34 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -49511,7 +48509,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -2027,22 +2415,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2041,22 +2429,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -49538,7 +48536,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2056,10 +2444,21 @@ unsigned long do_brk(unsigned long addr, +@@ -2070,10 +2458,21 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -49561,7 +48559,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -2068,11 +2467,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2082,11 +2481,12 @@ unsigned long do_brk(unsigned long addr, vma->vm_page_prot = vm_get_page_prot(flags); vma_link(mm, vma, prev, rb_link, rb_parent); out: @@ -49576,7 +48574,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return addr; } -@@ -2118,8 +2518,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2133,8 +2533,10 @@ void exit_mmap(struct mm_struct *mm) * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ @@ -49588,7 +48586,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2133,6 +2535,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2148,6 +2550,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -49599,7 +48597,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2155,7 +2561,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2170,7 +2576,22 @@ int insert_vm_struct(struct mm_struct * if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -49622,7 +48620,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c return 0; } -@@ -2173,6 +2594,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2188,6 +2609,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -49631,7 +48629,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2216,6 +2639,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2231,6 +2654,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -49667,7 +48665,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2226,7 +2678,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2241,7 +2693,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; @@ -49676,16 +48674,7 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2267,7 +2719,7 @@ static void special_mapping_close(struct - { - } - --static struct vm_operations_struct special_mapping_vmops = { -+static const struct vm_operations_struct special_mapping_vmops = { - .close = special_mapping_close, - .fault = special_mapping_fault, - }; -@@ -2295,6 +2747,15 @@ int install_special_mapping(struct mm_st +@@ -2310,6 +2762,15 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -49701,13 +48690,13 @@ diff -urNp linux-2.6.31.7/mm/mmap.c linux-2.6.31.7/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.31.7/mm/mprotect.c linux-2.6.31.7/mm/mprotect.c ---- linux-2.6.31.7/mm/mprotect.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/mprotect.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/mprotect.c linux-2.6.32/mm/mprotect.c +--- linux-2.6.32/mm/mprotect.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/mprotect.c 2009-12-04 21:40:48.588775715 -0500 @@ -24,10 +24,16 @@ #include <linux/mmu_notifier.h> #include <linux/migrate.h> - #include <linux/perf_counter.h> + #include <linux/perf_event.h> + +#ifdef CONFIG_PAX_MPROTECT +#include <linux/elf.h> @@ -49830,8 +48819,8 @@ diff -urNp linux-2.6.31.7/mm/mprotect.c linux-2.6.31.7/mm/mprotect.c vma->vm_flags = newflags; + +#ifdef CONFIG_PAX_MPROTECT -+ if (current->binfmt && current->binfmt->handle_mprotect) -+ current->binfmt->handle_mprotect(vma, newflags); ++ if (mm->binfmt && mm->binfmt->handle_mprotect) ++ mm->binfmt->handle_mprotect(vma, newflags); +#endif + vma->vm_page_prot = pgprot_modify(vma->vm_page_prot, @@ -49877,8 +48866,8 @@ diff -urNp linux-2.6.31.7/mm/mprotect.c linux-2.6.31.7/mm/mprotect.c + } + +#ifdef CONFIG_PAX_MPROTECT -+ if (current->binfmt && current->binfmt->handle_mprotect) -+ current->binfmt->handle_mprotect(vma, vm_flags); ++ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect) ++ current->mm->binfmt->handle_mprotect(vma, vm_flags); +#endif + for (nstart = start ; ; ) { @@ -49887,17 +48876,17 @@ diff -urNp linux-2.6.31.7/mm/mprotect.c linux-2.6.31.7/mm/mprotect.c @@ -301,6 +416,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, if (error) goto out; - perf_counter_mmap(vma); + perf_event_mmap(vma); + + track_exec_limit(current->mm, nstart, tmp, vm_flags); + nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c ---- linux-2.6.31.7/mm/mremap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/mremap.c 2009-12-10 22:15:17.000000000 -0500 -@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str +diff -urNp linux-2.6.32/mm/mremap.c linux-2.6.32/mm/mremap.c +--- linux-2.6.32/mm/mremap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/mremap.c 2009-12-04 21:40:48.589764742 -0500 +@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr); @@ -49910,7 +48899,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c set_pte_at(mm, new_addr, new_pte, pte); } -@@ -262,6 +268,7 @@ unsigned long do_mremap(unsigned long ad +@@ -276,6 +282,7 @@ unsigned long do_mremap(unsigned long ad struct vm_area_struct *vma; unsigned long ret = -EINVAL; unsigned long charged = 0; @@ -49918,7 +48907,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE)) goto out; -@@ -280,6 +287,15 @@ unsigned long do_mremap(unsigned long ad +@@ -294,6 +301,15 @@ unsigned long do_mremap(unsigned long ad if (!new_len) goto out; @@ -49934,7 +48923,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c /* new_addr is only valid if MREMAP_FIXED is specified */ if (flags & MREMAP_FIXED) { if (new_addr & ~PAGE_MASK) -@@ -287,16 +303,13 @@ unsigned long do_mremap(unsigned long ad +@@ -301,16 +317,13 @@ unsigned long do_mremap(unsigned long ad if (!(flags & MREMAP_MAYMOVE)) goto out; @@ -49953,7 +48942,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c goto out; ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1); -@@ -334,6 +347,14 @@ unsigned long do_mremap(unsigned long ad +@@ -348,6 +361,14 @@ unsigned long do_mremap(unsigned long ad ret = -EINVAL; goto out; } @@ -49968,7 +48957,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c /* We can't remap across vm area boundaries */ if (old_len > vma->vm_end - addr) goto out; -@@ -367,7 +388,7 @@ unsigned long do_mremap(unsigned long ad +@@ -381,7 +402,7 @@ unsigned long do_mremap(unsigned long ad if (old_len == vma->vm_end - addr && !((flags & MREMAP_FIXED) && (addr != new_addr)) && (old_len != new_len || !(flags & MREMAP_MAYMOVE))) { @@ -49977,7 +48966,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c if (vma->vm_next) max_addr = vma->vm_next->vm_start; /* can we just expand the current mapping? */ -@@ -385,6 +406,7 @@ unsigned long do_mremap(unsigned long ad +@@ -399,6 +420,7 @@ unsigned long do_mremap(unsigned long ad addr + new_len); } ret = addr; @@ -49985,7 +48974,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c goto out; } } -@@ -395,8 +417,8 @@ unsigned long do_mremap(unsigned long ad +@@ -409,8 +431,8 @@ unsigned long do_mremap(unsigned long ad */ ret = -ENOMEM; if (flags & MREMAP_MAYMOVE) { @@ -49995,7 +48984,7 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; -@@ -411,7 +433,12 @@ unsigned long do_mremap(unsigned long ad +@@ -425,7 +447,12 @@ unsigned long do_mremap(unsigned long ad if (ret) goto out; } @@ -50008,19 +48997,10 @@ diff -urNp linux-2.6.31.7/mm/mremap.c linux-2.6.31.7/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.31.7/mm/nommu.c linux-2.6.31.7/mm/nommu.c ---- linux-2.6.31.7/mm/nommu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/nommu.c 2009-12-10 22:15:17.000000000 -0500 -@@ -79,7 +79,7 @@ static struct kmem_cache *vm_region_jar; - struct rb_root nommu_region_tree = RB_ROOT; - DECLARE_RWSEM(nommu_region_sem); - --struct vm_operations_struct generic_file_vm_ops = { -+const struct vm_operations_struct generic_file_vm_ops = { - }; - - /* -@@ -780,15 +780,6 @@ struct vm_area_struct *find_vma(struct m +diff -urNp linux-2.6.32/mm/nommu.c linux-2.6.32/mm/nommu.c +--- linux-2.6.32/mm/nommu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/nommu.c 2009-12-04 21:40:48.589764742 -0500 +@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); /* @@ -50036,12 +49016,12 @@ diff -urNp linux-2.6.31.7/mm/nommu.c linux-2.6.31.7/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.31.7/mm/page_alloc.c linux-2.6.31.7/mm/page_alloc.c ---- linux-2.6.31.7/mm/page_alloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/page_alloc.c 2009-12-10 22:15:17.000000000 -0500 -@@ -559,6 +559,10 @@ static void __free_pages_ok(struct page +diff -urNp linux-2.6.32/mm/page_alloc.c linux-2.6.32/mm/page_alloc.c +--- linux-2.6.32/mm/page_alloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/page_alloc.c 2009-12-04 21:40:48.590782994 -0500 +@@ -585,6 +585,10 @@ static void __free_pages_ok(struct page int bad = 0; - int wasMlocked = TestClearPageMlocked(page); + int wasMlocked = __TestClearPageMlocked(page); +#ifdef CONFIG_PAX_MEMORY_SANITIZE + unsigned long index = 1UL << order; @@ -50050,7 +49030,7 @@ diff -urNp linux-2.6.31.7/mm/page_alloc.c linux-2.6.31.7/mm/page_alloc.c kmemcheck_free_shadow(page, order); for (i = 0 ; i < (1 << order) ; ++i) -@@ -571,6 +575,12 @@ static void __free_pages_ok(struct page +@@ -597,6 +601,12 @@ static void __free_pages_ok(struct page debug_check_no_obj_freed(page_address(page), PAGE_SIZE << order); } @@ -50063,7 +49043,7 @@ diff -urNp linux-2.6.31.7/mm/page_alloc.c linux-2.6.31.7/mm/page_alloc.c arch_free_page(page, order); kernel_map_pages(page, 1 << order, 0); -@@ -662,8 +672,10 @@ static int prep_new_page(struct page *pa +@@ -700,8 +710,10 @@ static int prep_new_page(struct page *pa arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); @@ -50074,7 +49054,7 @@ diff -urNp linux-2.6.31.7/mm/page_alloc.c linux-2.6.31.7/mm/page_alloc.c if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); -@@ -1039,6 +1051,11 @@ static void free_hot_cold_page(struct pa +@@ -1095,6 +1107,11 @@ static void free_hot_cold_page(struct pa debug_check_no_locks_freed(page_address(page), PAGE_SIZE); debug_check_no_obj_freed(page_address(page), PAGE_SIZE); } @@ -50086,22 +49066,22 @@ diff -urNp linux-2.6.31.7/mm/page_alloc.c linux-2.6.31.7/mm/page_alloc.c arch_free_page(page, 0); kernel_map_pages(page, 1, 0); -diff -urNp linux-2.6.31.7/mm/percpu.c linux-2.6.31.7/mm/percpu.c ---- linux-2.6.31.7/mm/percpu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/percpu.c 2009-12-10 22:15:17.000000000 -0500 -@@ -105,7 +105,7 @@ static int pcpu_nr_slots __read_mostly; - static size_t pcpu_chunk_struct_size __read_mostly; +diff -urNp linux-2.6.32/mm/percpu.c linux-2.6.32/mm/percpu.c +--- linux-2.6.32/mm/percpu.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/percpu.c 2009-12-04 21:40:48.591766879 -0500 +@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu + static unsigned int pcpu_last_unit_cpu __read_mostly; /* the address of the first chunk which starts with the kernel static area */ -void *pcpu_base_addr __read_mostly; +void *pcpu_base_addr __read_only; EXPORT_SYMBOL_GPL(pcpu_base_addr); - /* -diff -urNp linux-2.6.31.7/mm/rmap.c linux-2.6.31.7/mm/rmap.c ---- linux-2.6.31.7/mm/rmap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/rmap.c 2009-12-10 22:15:17.000000000 -0500 -@@ -103,6 +103,10 @@ int anon_vma_prepare(struct vm_area_stru + static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ +diff -urNp linux-2.6.32/mm/rmap.c linux-2.6.32/mm/rmap.c +--- linux-2.6.32/mm/rmap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/rmap.c 2009-12-04 21:40:48.607496166 -0500 +@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -50112,7 +49092,7 @@ diff -urNp linux-2.6.31.7/mm/rmap.c linux-2.6.31.7/mm/rmap.c anon_vma = find_mergeable_anon_vma(vma); allocated = NULL; if (!anon_vma) { -@@ -116,6 +120,15 @@ int anon_vma_prepare(struct vm_area_stru +@@ -121,6 +125,15 @@ int anon_vma_prepare(struct vm_area_stru /* page_table_lock to protect against threads */ spin_lock(&mm->page_table_lock); if (likely(!vma->anon_vma)) { @@ -50128,9 +49108,9 @@ diff -urNp linux-2.6.31.7/mm/rmap.c linux-2.6.31.7/mm/rmap.c vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.31.7/mm/shmem.c linux-2.6.31.7/mm/shmem.c ---- linux-2.6.31.7/mm/shmem.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/shmem.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/shmem.c linux-2.6.32/mm/shmem.c +--- linux-2.6.32/mm/shmem.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/shmem.c 2009-12-04 20:41:39.577828867 -0500 @@ -31,7 +31,7 @@ #include <linux/swap.h> #include <linux/ima.h> @@ -50140,27 +49120,9 @@ diff -urNp linux-2.6.31.7/mm/shmem.c linux-2.6.31.7/mm/shmem.c #ifdef CONFIG_SHMEM /* -@@ -219,7 +219,7 @@ static const struct file_operations shme - static const struct inode_operations shmem_inode_operations; - static const struct inode_operations shmem_dir_inode_operations; - static const struct inode_operations shmem_special_inode_operations; --static struct vm_operations_struct shmem_vm_ops; -+static const struct vm_operations_struct shmem_vm_ops; - - static struct backing_dev_info shmem_backing_dev_info __read_mostly = { - .ra_pages = 0, /* No readahead */ -@@ -2497,7 +2497,7 @@ static const struct super_operations shm - .put_super = shmem_put_super, - }; - --static struct vm_operations_struct shmem_vm_ops = { -+static const struct vm_operations_struct shmem_vm_ops = { - .fault = shmem_fault, - #ifdef CONFIG_NUMA - .set_policy = shmem_set_policy, -diff -urNp linux-2.6.31.7/mm/slab.c linux-2.6.31.7/mm/slab.c ---- linux-2.6.31.7/mm/slab.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/slab.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/slab.c linux-2.6.32/mm/slab.c +--- linux-2.6.32/mm/slab.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/slab.c 2009-12-11 19:45:16.050541522 -0500 @@ -308,7 +308,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ @@ -50197,18 +49159,16 @@ diff -urNp linux-2.6.31.7/mm/slab.c linux-2.6.31.7/mm/slab.c /* internal cache of cache description objs */ static struct kmem_cache cache_cache = { -@@ -4473,15 +4473,64 @@ static const struct file_operations proc +@@ -4084,7 +4084,7 @@ out: + schedule_delayed_work(work, round_jiffies_relative(REAPTIMEOUT_CPUC)); + } + +-#ifdef CONFIG_SLABINFO ++#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) - static int __init slab_proc_init(void) + static void print_slabinfo_header(struct seq_file *m) { -+#if !defined(CONFIG_GRKERNSEC_PROC_ADD) - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); - #ifdef CONFIG_DEBUG_SLAB_LEAK - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations); - #endif -+#endif - return 0; - } +@@ -4482,6 +4482,51 @@ static int __init slab_proc_init(void) module_init(slab_proc_init); #endif @@ -50233,13 +49193,11 @@ diff -urNp linux-2.6.31.7/mm/slab.c linux-2.6.31.7/mm/slab.c + + page = virt_to_head_page(ptr); + -+ /* XXX: can get a little tighter with this stack check */ -+ if (!PageSlab(page) && object_is_on_stack(ptr) && -+ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - -+ (unsigned long)ptr))) -+ goto report; -+ else if (!PageSlab(page)) ++ if (!PageSlab(page)) { ++ if (object_is_on_stack(ptr, n) == -1) ++ goto report; + return; ++ } + + cachep = page_get_cache(page); + slabp = page_get_slab(page); @@ -50262,9 +49220,9 @@ diff -urNp linux-2.6.31.7/mm/slab.c linux-2.6.31.7/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c ---- linux-2.6.31.7/mm/slob.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/slob.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/mm/slob.c linux-2.6.32/mm/slob.c +--- linux-2.6.32/mm/slob.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/slob.c 2009-12-11 19:45:16.110547147 -0500 @@ -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 @@ -50410,7 +49368,7 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c EXPORT_SYMBOL(__kmalloc_node); void kfree(const void *block) -@@ -528,13 +540,86 @@ void kfree(const void *block) +@@ -528,13 +540,84 @@ void kfree(const void *block) sp = slob_page(block); if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); @@ -50446,13 +49404,11 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c + return; + + sp = slob_page(ptr); -+ /* XXX: can get a little tighter with this stack check */ -+ if (!PageSlobPage((struct page*)sp) && object_is_on_stack(ptr) && -+ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - -+ (unsigned long)ptr))) -+ goto report; -+ else if (!PageSlobPage((struct page*)sp)) ++ if (!PageSlab((struct page*)sp)) { ++ if (object_is_on_stack(ptr, n) == -1) ++ goto report; + return; ++ } + + if (sp->size) { + base = page_address(&sp->page); @@ -50500,7 +49456,7 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c /* can't use ksize for kmem_cache_alloc memory, only kmalloc */ size_t ksize(const void *block) { -@@ -547,10 +632,10 @@ size_t ksize(const void *block) +@@ -547,10 +630,10 @@ size_t ksize(const void *block) sp = slob_page(block); if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); @@ -50514,7 +49470,7 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c } EXPORT_SYMBOL(ksize); -@@ -605,17 +690,25 @@ void *kmem_cache_alloc_node(struct kmem_ +@@ -605,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_ { void *b; @@ -50540,7 +49496,7 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c if (c->ctor) c->ctor(b); -@@ -627,10 +720,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); +@@ -627,10 +718,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); static void __kmem_cache_free(void *b, int size) { @@ -50559,7 +49515,7 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c } static void kmem_rcu_free(struct rcu_head *head) -@@ -643,15 +742,24 @@ static void kmem_rcu_free(struct rcu_hea +@@ -643,15 +740,24 @@ static void kmem_rcu_free(struct rcu_hea void kmem_cache_free(struct kmem_cache *c, void *b) { @@ -50587,10 +49543,10 @@ diff -urNp linux-2.6.31.7/mm/slob.c linux-2.6.31.7/mm/slob.c } trace_kmem_cache_free(_RET_IP_, b); -diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c ---- linux-2.6.31.7/mm/slub.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/slub.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1915,7 +1915,7 @@ static int slub_min_objects; +diff -urNp linux-2.6.32/mm/slub.c linux-2.6.32/mm/slub.c +--- linux-2.6.32/mm/slub.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/slub.c 2009-12-11 19:45:16.134555228 -0500 +@@ -1937,7 +1937,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will occur. * (Could be removed. This was introduced to pacify the merge skeptics.) */ @@ -50599,7 +49555,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c /* * Calculate the order of allocation given an slab object size. -@@ -2458,7 +2458,7 @@ static int kmem_cache_open(struct kmem_c +@@ -2493,7 +2493,7 @@ static int kmem_cache_open(struct kmem_c * list to avoid pounding the page allocator excessively. */ set_min_partial(s, ilog2(s->size)); @@ -50608,7 +49564,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c #ifdef CONFIG_NUMA s->remote_node_defrag_ratio = 1000; #endif -@@ -2595,8 +2595,7 @@ static inline int kmem_cache_close(struc +@@ -2630,8 +2630,7 @@ static inline int kmem_cache_close(struc void kmem_cache_destroy(struct kmem_cache *s) { down_write(&slub_lock); @@ -50618,7 +49574,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c list_del(&s->list); up_write(&slub_lock); if (kmem_cache_close(s)) { -@@ -2875,6 +2874,48 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -2915,6 +2914,46 @@ void *__kmalloc_node(size_t size, gfp_t EXPORT_SYMBOL(__kmalloc_node); #endif @@ -50641,13 +49597,11 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c + + page = get_object_page(ptr); + -+ /* XXX: can get a little tighter with this stack check */ -+ if (!page && object_is_on_stack(ptr) && -+ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - -+ (unsigned long)ptr))) -+ goto report; -+ else if (!page) ++ if (!page) { ++ if (object_is_on_stack(ptr, n) == -1) ++ goto report; + return; ++ } + + s = page->slab; + offset = (ptr - page_address(page)) % s->size; @@ -50667,7 +49621,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c size_t ksize(const void *object) { struct page *page; -@@ -3146,7 +3187,7 @@ void __init kmem_cache_init(void) +@@ -3186,7 +3225,7 @@ void __init kmem_cache_init(void) */ create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node", sizeof(struct kmem_cache_node), GFP_NOWAIT); @@ -50676,7 +49630,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c caches++; hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI); -@@ -3240,7 +3281,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3293,7 +3332,7 @@ static int slab_unmergeable(struct kmem_ /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -50685,7 +49639,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c return 1; return 0; -@@ -3297,7 +3338,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3353,7 +3392,7 @@ struct kmem_cache *kmem_cache_create(con if (s) { int cpu; @@ -50694,7 +49648,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3316,7 +3357,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3372,7 +3411,7 @@ struct kmem_cache *kmem_cache_create(con if (sysfs_slab_alias(s, name)) { down_write(&slub_lock); @@ -50703,7 +49657,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c up_write(&slub_lock); goto err; } -@@ -4045,7 +4086,7 @@ SLAB_ATTR_RO(ctor); +@@ -4101,7 +4140,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -50712,7 +49666,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c } SLAB_ATTR_RO(aliases); -@@ -4447,7 +4488,7 @@ static void kmem_cache_release(struct ko +@@ -4503,7 +4542,7 @@ static void kmem_cache_release(struct ko kfree(s); } @@ -50721,7 +49675,7 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c .show = slab_attr_show, .store = slab_attr_store, }; -@@ -4466,7 +4507,7 @@ static int uevent_filter(struct kset *ks +@@ -4522,7 +4561,7 @@ static int uevent_filter(struct kset *ks return 0; } @@ -50730,19 +49684,18 @@ diff -urNp linux-2.6.31.7/mm/slub.c linux-2.6.31.7/mm/slub.c .filter = uevent_filter, }; -@@ -4726,7 +4767,9 @@ static const struct file_operations proc - - static int __init slab_proc_init(void) - { -+#if !defined(CONFIG_GRKERNSEC_PROC_ADD) - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations); -+#endif - return 0; - } - module_init(slab_proc_init); -diff -urNp linux-2.6.31.7/mm/util.c linux-2.6.31.7/mm/util.c ---- linux-2.6.31.7/mm/util.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/util.c 2009-12-10 22:15:17.000000000 -0500 +@@ -4696,7 +4735,7 @@ __initcall(slab_sysfs_init); + /* + * The /proc/slabinfo ABI + */ +-#ifdef CONFIG_SLABINFO ++#if defined(CONFIG_SLABINFO) && !defined(CONFIG_GRKERNSEC_PROC_ADD) + static void print_slabinfo_header(struct seq_file *m) + { + seq_puts(m, "slabinfo - version: 2.1\n"); +diff -urNp linux-2.6.32/mm/util.c linux-2.6.32/mm/util.c +--- linux-2.6.32/mm/util.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/util.c 2009-12-04 21:40:48.610752611 -0500 @@ -224,6 +224,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { @@ -50756,10 +49709,10 @@ diff -urNp linux-2.6.31.7/mm/util.c linux-2.6.31.7/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c ---- linux-2.6.31.7/mm/vmalloc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/mm/vmalloc.c 2009-12-10 22:15:17.000000000 -0500 -@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, +diff -urNp linux-2.6.32/mm/vmalloc.c linux-2.6.32/mm/vmalloc.c +--- linux-2.6.32/mm/vmalloc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/mm/vmalloc.c 2009-12-04 21:40:48.610752611 -0500 +@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, pte = pte_offset_kernel(pmd, addr); do { @@ -50781,7 +49734,7 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c } while (pte++, addr += PAGE_SIZE, addr != end); } -@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, un unsigned long end, pgprot_t prot, struct page **pages, int *nr) { pte_t *pte; @@ -50789,7 +49742,7 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c /* * nr is a running index into the array which helps higher level -@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -101,17 +113,30 @@ static int vmap_pte_range(pmd_t *pmd, un pte = pte_alloc_kernel(pmd, addr); if (!pte) return -ENOMEM; @@ -50825,7 +49778,7 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c } static int vmap_pmd_range(pud_t *pud, unsigned long addr, -@@ -193,11 +218,20 @@ static inline int is_vmalloc_or_module_a +@@ -192,11 +217,20 @@ int is_vmalloc_or_module_addr(const void * and fall back on vmalloc() if that fails. Others * just put it in the vmalloc space. */ @@ -50865,8 +49818,8 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c p = &(*p)->rb_right; else BUG(); -@@ -1132,6 +1166,16 @@ static struct vm_struct *__get_vm_area_n - unsigned long align = 1; +@@ -1164,6 +1198,16 @@ static struct vm_struct *__get_vm_area_n + struct vm_struct *area; BUG_ON(in_interrupt()); + @@ -50882,8 +49835,8 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1371,6 +1415,11 @@ void *vmap(struct page **pages, unsigned - if (count > num_physpages) +@@ -1389,6 +1433,11 @@ void *vmap(struct page **pages, unsigned + if (count > totalram_pages) return NULL; +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) @@ -50894,37 +49847,37 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1478,6 +1527,13 @@ static void *__vmalloc_node(unsigned lon - if (!size || (size >> PAGE_SHIFT) > num_physpages) +@@ -1499,6 +1548,13 @@ static void *__vmalloc_node(unsigned lon + if (!size || (size >> PAGE_SHIFT) > totalram_pages) return NULL; +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) + if (!(pgprot_val(prot) & _PAGE_NX)) -+ area = __get_vm_area_node(size, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END, ++ area = __get_vm_area_node(size, align, VM_ALLOC | VM_KERNEXEC, VMALLOC_START, VMALLOC_END, + node, gfp_mask, caller); + else +#endif + - area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END, - node, gfp_mask, caller); + area = __get_vm_area_node(size, align, VM_ALLOC, VMALLOC_START, + VMALLOC_END, node, gfp_mask, caller); -@@ -1496,6 +1552,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1517,6 +1573,7 @@ static void *__vmalloc_node(unsigned lon return addr; } +#undef __vmalloc void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { - return __vmalloc_node(size, gfp_mask, prot, -1, -@@ -1512,6 +1569,7 @@ EXPORT_SYMBOL(__vmalloc); + return __vmalloc_node(size, 1, gfp_mask, prot, -1, +@@ -1533,6 +1590,7 @@ EXPORT_SYMBOL(__vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ +#undef vmalloc void *vmalloc(unsigned long size) { - return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1526,6 +1584,7 @@ EXPORT_SYMBOL(vmalloc); + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, +@@ -1547,6 +1605,7 @@ EXPORT_SYMBOL(vmalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -50932,15 +49885,15 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1552,6 +1611,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1574,6 +1633,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ +#undef vmalloc_node void *vmalloc_node(unsigned long size, int node) { - return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1574,10 +1634,10 @@ EXPORT_SYMBOL(vmalloc_node); + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, +@@ -1596,10 +1656,10 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -50948,20 +49901,20 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c +#undef vmalloc_exec void *vmalloc_exec(unsigned long size) { -- return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC, -+ return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC, +- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC, ++ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC, -1, __builtin_return_address(0)); } -@@ -1596,6 +1656,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1618,6 +1678,7 @@ void *vmalloc_exec(unsigned long size) * Allocate enough 32bit PA addressable pages to cover @size from the * page level allocator and map them into contiguous kernel virtual space. */ +#undef vmalloc_32 void *vmalloc_32(unsigned long size) { - return __vmalloc_node(size, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1610,6 +1671,7 @@ EXPORT_SYMBOL(vmalloc_32); + return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL, +@@ -1632,6 +1693,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -50969,9 +49922,9 @@ diff -urNp linux-2.6.31.7/mm/vmalloc.c linux-2.6.31.7/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.31.7/net/atm/atm_misc.c linux-2.6.31.7/net/atm/atm_misc.c ---- linux-2.6.31.7/net/atm/atm_misc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/atm/atm_misc.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/atm/atm_misc.c linux-2.6.32/net/atm/atm_misc.c +--- linux-2.6.32/net/atm/atm_misc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/atm/atm_misc.c 2009-12-04 21:40:48.611767140 -0500 @@ -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; @@ -51008,9 +49961,9 @@ diff -urNp linux-2.6.31.7/net/atm/atm_misc.c linux-2.6.31.7/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.31.7/net/atm/proc.c linux-2.6.31.7/net/atm/proc.c ---- linux-2.6.31.7/net/atm/proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/atm/proc.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/atm/proc.c linux-2.6.32/net/atm/proc.c +--- linux-2.6.32/net/atm/proc.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/atm/proc.c 2009-12-04 21:40:48.611767140 -0500 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s const struct k_atm_aal_stats *stats) { @@ -51024,9 +49977,9 @@ diff -urNp linux-2.6.31.7/net/atm/proc.c linux-2.6.31.7/net/atm/proc.c } static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) -diff -urNp linux-2.6.31.7/net/atm/resources.c linux-2.6.31.7/net/atm/resources.c ---- linux-2.6.31.7/net/atm/resources.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/atm/resources.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/atm/resources.c linux-2.6.32/net/atm/resources.c +--- linux-2.6.32/net/atm/resources.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/atm/resources.c 2009-12-04 21:40:48.611767140 -0500 @@ -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) @@ -51045,10 +49998,10 @@ diff -urNp linux-2.6.31.7/net/atm/resources.c linux-2.6.31.7/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.31.7/net/bridge/br_private.h linux-2.6.31.7/net/bridge/br_private.h ---- linux-2.6.31.7/net/bridge/br_private.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/bridge/br_private.h 2009-12-10 22:15:17.000000000 -0500 -@@ -250,7 +250,7 @@ extern void br_ifinfo_notify(int event, +diff -urNp linux-2.6.32/net/bridge/br_private.h linux-2.6.32/net/bridge/br_private.h +--- linux-2.6.32/net/bridge/br_private.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/bridge/br_private.h 2009-12-04 21:40:48.611767140 -0500 +@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, #ifdef CONFIG_SYSFS /* br_sysfs_if.c */ @@ -51057,9 +50010,9 @@ diff -urNp linux-2.6.31.7/net/bridge/br_private.h linux-2.6.31.7/net/bridge/br_p extern int br_sysfs_addif(struct net_bridge_port *p); /* br_sysfs_br.c */ -diff -urNp linux-2.6.31.7/net/bridge/br_stp_if.c linux-2.6.31.7/net/bridge/br_stp_if.c ---- linux-2.6.31.7/net/bridge/br_stp_if.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/bridge/br_stp_if.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/bridge/br_stp_if.c linux-2.6.32/net/bridge/br_stp_if.c +--- linux-2.6.32/net/bridge/br_stp_if.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/bridge/br_stp_if.c 2009-12-04 21:40:48.612773889 -0500 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -51069,10 +50022,10 @@ diff -urNp linux-2.6.31.7/net/bridge/br_stp_if.c linux-2.6.31.7/net/bridge/br_st printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.31.7/net/bridge/br_sysfs_if.c linux-2.6.31.7/net/bridge/br_sysfs_if.c ---- linux-2.6.31.7/net/bridge/br_sysfs_if.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/bridge/br_sysfs_if.c 2009-12-10 22:15:17.000000000 -0500 -@@ -203,7 +203,7 @@ static ssize_t brport_store(struct kobje +diff -urNp linux-2.6.32/net/bridge/br_sysfs_if.c linux-2.6.32/net/bridge/br_sysfs_if.c +--- linux-2.6.32/net/bridge/br_sysfs_if.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/bridge/br_sysfs_if.c 2009-12-04 21:40:48.612773889 -0500 +@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje return ret; } @@ -51081,9 +50034,9 @@ diff -urNp linux-2.6.31.7/net/bridge/br_sysfs_if.c linux-2.6.31.7/net/bridge/br_ .show = brport_show, .store = brport_store, }; -diff -urNp linux-2.6.31.7/net/core/flow.c linux-2.6.31.7/net/core/flow.c ---- linux-2.6.31.7/net/core/flow.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/core/flow.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/core/flow.c linux-2.6.32/net/core/flow.c +--- linux-2.6.32/net/core/flow.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/core/flow.c 2009-12-04 21:40:48.613513048 -0500 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -51111,10 +50064,10 @@ diff -urNp linux-2.6.31.7/net/core/flow.c linux-2.6.31.7/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.31.7/net/dccp/ccids/ccid3.c linux-2.6.31.7/net/dccp/ccids/ccid3.c ---- linux-2.6.31.7/net/dccp/ccids/ccid3.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/dccp/ccids/ccid3.c 2009-12-10 22:15:17.000000000 -0500 -@@ -43,7 +43,7 @@ +diff -urNp linux-2.6.32/net/dccp/ccids/ccid3.c linux-2.6.32/net/dccp/ccids/ccid3.c +--- linux-2.6.32/net/dccp/ccids/ccid3.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/dccp/ccids/ccid3.c 2009-12-04 21:40:48.613513048 -0500 +@@ -41,7 +41,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) #else @@ -51123,9 +50076,9 @@ diff -urNp linux-2.6.31.7/net/dccp/ccids/ccid3.c linux-2.6.31.7/net/dccp/ccids/c #endif /* -diff -urNp linux-2.6.31.7/net/dccp/dccp.h linux-2.6.31.7/net/dccp/dccp.h ---- linux-2.6.31.7/net/dccp/dccp.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/dccp/dccp.h 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/dccp/dccp.h linux-2.6.32/net/dccp/dccp.h +--- linux-2.6.32/net/dccp/dccp.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/dccp/dccp.h 2009-12-04 21:40:48.613513048 -0500 @@ -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) @@ -51139,9 +50092,9 @@ diff -urNp linux-2.6.31.7/net/dccp/dccp.h linux-2.6.31.7/net/dccp/dccp.h #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.31.7/net/ipv4/inet_hashtables.c linux-2.6.31.7/net/ipv4/inet_hashtables.c ---- linux-2.6.31.7/net/ipv4/inet_hashtables.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv4/inet_hashtables.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv4/inet_hashtables.c linux-2.6.32/net/ipv4/inet_hashtables.c +--- linux-2.6.32/net/ipv4/inet_hashtables.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv4/inet_hashtables.c 2009-12-04 20:41:39.623212149 -0500 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -51166,9 +50119,9 @@ diff -urNp linux-2.6.31.7/net/ipv4/inet_hashtables.c linux-2.6.31.7/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.31.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.31.7/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.31.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.32/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.32/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-12-04 21:40:48.614663600 -0500 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -51178,10 +50131,10 @@ diff -urNp linux-2.6.31.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.31.7/ if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.31.7/net/ipv4/tcp_ipv4.c linux-2.6.31.7/net/ipv4/tcp_ipv4.c ---- linux-2.6.31.7/net/ipv4/tcp_ipv4.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv4/tcp_ipv4.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1504,6 +1504,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc +diff -urNp linux-2.6.32/net/ipv4/tcp_ipv4.c linux-2.6.32/net/ipv4/tcp_ipv4.c +--- linux-2.6.32/net/ipv4/tcp_ipv4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv4/tcp_ipv4.c 2009-12-04 20:41:39.668750650 -0500 +@@ -1542,6 +1542,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc return 0; reset: @@ -51191,7 +50144,7 @@ diff -urNp linux-2.6.31.7/net/ipv4/tcp_ipv4.c linux-2.6.31.7/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(rsk, skb); discard: kfree_skb(skb); -@@ -1612,6 +1615,9 @@ no_tcp_socket: +@@ -1650,6 +1653,9 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -51201,10 +50154,10 @@ diff -urNp linux-2.6.31.7/net/ipv4/tcp_ipv4.c linux-2.6.31.7/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.31.7/net/ipv4/tcp_minisocks.c linux-2.6.31.7/net/ipv4/tcp_minisocks.c ---- linux-2.6.31.7/net/ipv4/tcp_minisocks.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv4/tcp_minisocks.c 2009-12-10 22:15:17.000000000 -0500 -@@ -695,8 +695,11 @@ listen_overflow: +diff -urNp linux-2.6.32/net/ipv4/tcp_minisocks.c linux-2.6.32/net/ipv4/tcp_minisocks.c +--- linux-2.6.32/net/ipv4/tcp_minisocks.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv4/tcp_minisocks.c 2009-12-04 20:41:39.676275360 -0500 +@@ -672,8 +672,11 @@ listen_overflow: embryonic_reset: NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS); @@ -51216,9 +50169,9 @@ diff -urNp linux-2.6.31.7/net/ipv4/tcp_minisocks.c linux-2.6.31.7/net/ipv4/tcp_m inet_csk_reqsk_queue_drop(sk, req, prev); return NULL; -diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c ---- linux-2.6.31.7/net/ipv4/udp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv4/udp.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv4/udp.c linux-2.6.32/net/ipv4/udp.c +--- linux-2.6.32/net/ipv4/udp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv4/udp.c 2009-12-04 20:41:39.691604541 -0500 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -51227,7 +50180,7 @@ diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c #include <linux/socket.h> #include <linux/sockios.h> #include <linux/igmp.h> -@@ -369,6 +370,9 @@ found: +@@ -371,6 +372,9 @@ found: return s; } @@ -51237,7 +50190,7 @@ diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c /* * This routine is called by the ICMP module when it gets some * sort of error condition. If err < 0 then the socket should -@@ -631,9 +635,18 @@ int udp_sendmsg(struct kiocb *iocb, stru +@@ -639,9 +643,18 @@ int udp_sendmsg(struct kiocb *iocb, stru dport = usin->sin_port; if (dport == 0) return -EINVAL; @@ -51256,7 +50209,7 @@ diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c daddr = inet->daddr; dport = inet->dport; /* Open fast path for connected socket. -@@ -934,6 +947,10 @@ try_again: +@@ -945,6 +958,10 @@ try_again: if (!skb) goto out; @@ -51267,7 +50220,7 @@ diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c ulen = skb->len - sizeof(struct udphdr); copied = len; if (copied > ulen) -@@ -1322,6 +1339,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, +@@ -1335,6 +1352,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, goto csum_error; UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -51277,9 +50230,9 @@ diff -urNp linux-2.6.31.7/net/ipv4/udp.c linux-2.6.31.7/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.31.7/net/ipv6/exthdrs.c linux-2.6.31.7/net/ipv6/exthdrs.c ---- linux-2.6.31.7/net/ipv6/exthdrs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv6/exthdrs.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv6/exthdrs.c linux-2.6.32/net/ipv6/exthdrs.c +--- linux-2.6.32/net/ipv6/exthdrs.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv6/exthdrs.c 2009-12-04 21:40:48.615769863 -0500 @@ -630,7 +630,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -51289,48 +50242,9 @@ diff -urNp linux-2.6.31.7/net/ipv6/exthdrs.c linux-2.6.31.7/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.31.7/net/ipv6/ip6mr.c linux-2.6.31.7/net/ipv6/ip6mr.c ---- linux-2.6.31.7/net/ipv6/ip6mr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv6/ip6mr.c 2009-12-10 22:15:17.000000000 -0500 -@@ -204,7 +204,7 @@ static int ip6mr_vif_seq_show(struct seq - return 0; - } - --static struct seq_operations ip6mr_vif_seq_ops = { -+static const struct seq_operations ip6mr_vif_seq_ops = { - .start = ip6mr_vif_seq_start, - .next = ip6mr_vif_seq_next, - .stop = ip6mr_vif_seq_stop, -@@ -217,7 +217,7 @@ static int ip6mr_vif_open(struct inode * - sizeof(struct ipmr_vif_iter)); - } - --static struct file_operations ip6mr_vif_fops = { -+static const struct file_operations ip6mr_vif_fops = { - .owner = THIS_MODULE, - .open = ip6mr_vif_open, - .read = seq_read, -@@ -328,7 +328,7 @@ static int ipmr_mfc_seq_show(struct seq_ - return 0; - } - --static struct seq_operations ipmr_mfc_seq_ops = { -+static const struct seq_operations ipmr_mfc_seq_ops = { - .start = ipmr_mfc_seq_start, - .next = ipmr_mfc_seq_next, - .stop = ipmr_mfc_seq_stop, -@@ -341,7 +341,7 @@ static int ipmr_mfc_open(struct inode *i - sizeof(struct ipmr_mfc_iter)); - } - --static struct file_operations ip6mr_mfc_fops = { -+static const struct file_operations ip6mr_mfc_fops = { - .owner = THIS_MODULE, - .open = ipmr_mfc_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/net/ipv6/raw.c linux-2.6.31.7/net/ipv6/raw.c ---- linux-2.6.31.7/net/ipv6/raw.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv6/raw.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv6/raw.c linux-2.6.32/net/ipv6/raw.c +--- linux-2.6.32/net/ipv6/raw.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv6/raw.c 2009-12-04 21:40:48.615769863 -0500 @@ -600,7 +600,7 @@ out: return err; } @@ -51340,10 +50254,10 @@ diff -urNp linux-2.6.31.7/net/ipv6/raw.c linux-2.6.31.7/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.31.7/net/ipv6/tcp_ipv6.c linux-2.6.31.7/net/ipv6/tcp_ipv6.c ---- linux-2.6.31.7/net/ipv6/tcp_ipv6.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv6/tcp_ipv6.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1577,6 +1577,9 @@ static int tcp_v6_do_rcv(struct sock *sk +diff -urNp linux-2.6.32/net/ipv6/tcp_ipv6.c linux-2.6.32/net/ipv6/tcp_ipv6.c +--- linux-2.6.32/net/ipv6/tcp_ipv6.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv6/tcp_ipv6.c 2009-12-04 20:41:39.728756027 -0500 +@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; reset: @@ -51353,7 +50267,7 @@ diff -urNp linux-2.6.31.7/net/ipv6/tcp_ipv6.c linux-2.6.31.7/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1699,6 +1702,9 @@ no_tcp_socket: +@@ -1700,6 +1703,9 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -51363,9 +50277,9 @@ diff -urNp linux-2.6.31.7/net/ipv6/tcp_ipv6.c linux-2.6.31.7/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.31.7/net/ipv6/udp.c linux-2.6.31.7/net/ipv6/udp.c ---- linux-2.6.31.7/net/ipv6/udp.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/ipv6/udp.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/ipv6/udp.c linux-2.6.32/net/ipv6/udp.c +--- linux-2.6.32/net/ipv6/udp.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/ipv6/udp.c 2009-12-04 20:41:39.735510962 -0500 @@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -51376,9 +50290,9 @@ diff -urNp linux-2.6.31.7/net/ipv6/udp.c linux-2.6.31.7/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.31.7/net/irda/ircomm/ircomm_tty.c linux-2.6.31.7/net/irda/ircomm/ircomm_tty.c ---- linux-2.6.31.7/net/irda/ircomm/ircomm_tty.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/irda/ircomm/ircomm_tty.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/irda/ircomm/ircomm_tty.c linux-2.6.32/net/irda/ircomm/ircomm_tty.c +--- linux-2.6.32/net/irda/ircomm/ircomm_tty.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/irda/ircomm/ircomm_tty.c 2009-12-04 21:40:48.616765546 -0500 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st add_wait_queue(&self->open_wait, &wait); @@ -51501,42 +50415,21 @@ diff -urNp linux-2.6.31.7/net/irda/ircomm/ircomm_tty.c linux-2.6.31.7/net/irda/i seq_printf(m, "Max data size: %d\n", self->max_data_size); seq_printf(m, "Max header size: %d\n", self->max_header_size); -diff -urNp linux-2.6.31.7/net/key/af_key.c linux-2.6.31.7/net/key/af_key.c ---- linux-2.6.31.7/net/key/af_key.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/key/af_key.c 2009-12-10 22:15:17.000000000 -0500 -@@ -3705,7 +3705,7 @@ static void pfkey_seq_stop(struct seq_fi - read_unlock(&pfkey_table_lock); - } - --static struct seq_operations pfkey_seq_ops = { -+static const struct seq_operations pfkey_seq_ops = { - .start = pfkey_seq_start, - .next = pfkey_seq_next, - .stop = pfkey_seq_stop, -@@ -3718,7 +3718,7 @@ static int pfkey_seq_open(struct inode * - sizeof(struct seq_net_private)); - } - --static struct file_operations pfkey_proc_ops = { -+static const struct file_operations pfkey_proc_ops = { - .open = pfkey_seq_open, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.31.7/net/mac80211/ieee80211_i.h linux-2.6.31.7/net/mac80211/ieee80211_i.h ---- linux-2.6.31.7/net/mac80211/ieee80211_i.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/ieee80211_i.h 2009-12-10 22:15:17.000000000 -0500 -@@ -609,7 +609,7 @@ struct ieee80211_local { +diff -urNp linux-2.6.32/net/mac80211/ieee80211_i.h linux-2.6.32/net/mac80211/ieee80211_i.h +--- linux-2.6.32/net/mac80211/ieee80211_i.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/ieee80211_i.h 2009-12-04 21:40:48.617641883 -0500 +@@ -634,7 +634,7 @@ struct ieee80211_local { + /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; - struct net_device *mdev; /* wmaster# - "master" 802.11 device */ - int open_count; + atomic_t open_count; int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ - int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss; -diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface.c ---- linux-2.6.31.7/net/mac80211/iface.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/iface.c 2009-12-10 22:15:17.000000000 -0500 + int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; +diff -urNp linux-2.6.32/net/mac80211/iface.c linux-2.6.32/net/mac80211/iface.c +--- linux-2.6.32/net/mac80211/iface.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/iface.c 2009-12-04 21:40:48.617641883 -0500 @@ -164,7 +164,7 @@ static int ieee80211_open(struct net_dev break; } @@ -51546,7 +50439,7 @@ diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface res = drv_start(local); if (res) goto err_del_bss; -@@ -198,7 +198,7 @@ static int ieee80211_open(struct net_dev +@@ -194,7 +194,7 @@ static int ieee80211_open(struct net_dev * Validate the MAC address for this device. */ if (!is_valid_ether_addr(dev->dev_addr)) { @@ -51555,16 +50448,7 @@ diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface drv_stop(local); return -EADDRNOTAVAIL; } -@@ -281,7 +281,7 @@ static int ieee80211_open(struct net_dev - } - } - -- if (local->open_count == 0) { -+ if (atomic_read(&local->open_count) == 0) { - res = dev_open(local->mdev); - WARN_ON(res); - if (res) -@@ -303,7 +303,7 @@ static int ieee80211_open(struct net_dev +@@ -290,7 +290,7 @@ static int ieee80211_open(struct net_dev hw_reconf_flags |= __ieee80211_recalc_idle(local); @@ -51573,7 +50457,7 @@ diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface if (hw_reconf_flags) { ieee80211_hw_config(local, hw_reconf_flags); /* -@@ -331,7 +331,7 @@ static int ieee80211_open(struct net_dev +@@ -318,7 +318,7 @@ static int ieee80211_open(struct net_dev err_del_interface: drv_remove_interface(local, &conf); err_stop: @@ -51582,7 +50466,7 @@ diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface drv_stop(local); err_del_bss: sdata->bss = NULL; -@@ -429,7 +429,7 @@ static int ieee80211_stop(struct net_dev +@@ -418,7 +418,7 @@ static int ieee80211_stop(struct net_dev WARN_ON(!list_empty(&sdata->u.ap.vlans)); } @@ -51591,19 +50475,19 @@ diff -urNp linux-2.6.31.7/net/mac80211/iface.c linux-2.6.31.7/net/mac80211/iface switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: -@@ -554,7 +554,7 @@ static int ieee80211_stop(struct net_dev +@@ -524,7 +524,7 @@ static int ieee80211_stop(struct net_dev ieee80211_recalc_ps(local, -1); - if (local->open_count == 0) { + if (atomic_read(&local->open_count) == 0) { - if (netif_running(local->mdev)) - dev_close(local->mdev); + ieee80211_clear_tx_pending(local); + ieee80211_stop_device(local); -diff -urNp linux-2.6.31.7/net/mac80211/main.c linux-2.6.31.7/net/mac80211/main.c ---- linux-2.6.31.7/net/mac80211/main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/main.c 2009-12-10 22:15:17.000000000 -0500 -@@ -193,7 +193,7 @@ int ieee80211_hw_config(struct ieee80211 +diff -urNp linux-2.6.32/net/mac80211/main.c linux-2.6.32/net/mac80211/main.c +--- linux-2.6.32/net/mac80211/main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/main.c 2009-12-04 21:40:48.617641883 -0500 +@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -51612,59 +50496,35 @@ diff -urNp linux-2.6.31.7/net/mac80211/main.c linux-2.6.31.7/net/mac80211/main.c ret = drv_config(local, changed); /* * Goal: -diff -urNp linux-2.6.31.7/net/mac80211/pm.c linux-2.6.31.7/net/mac80211/pm.c ---- linux-2.6.31.7/net/mac80211/pm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/pm.c 2009-12-10 22:15:17.000000000 -0500 -@@ -103,7 +103,7 @@ int __ieee80211_suspend(struct ieee80211 +diff -urNp linux-2.6.32/net/mac80211/pm.c linux-2.6.32/net/mac80211/pm.c +--- linux-2.6.32/net/mac80211/pm.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/pm.c 2009-12-04 21:40:48.618773555 -0500 +@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 } /* stop hardware - this must stop RX */ -- if (local->open_count) { -+ if (atomic_read(&local->open_count)) { - ieee80211_led_radio(local, false); - drv_stop(local); - } -diff -urNp linux-2.6.31.7/net/mac80211/rate.c linux-2.6.31.7/net/mac80211/rate.c ---- linux-2.6.31.7/net/mac80211/rate.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/rate.c 2009-12-10 22:15:17.000000000 -0500 -@@ -258,7 +258,7 @@ int ieee80211_init_rate_ctrl_alg(struct +- if (local->open_count) ++ if (atomic_read(&local->open_count)) + ieee80211_stop_device(local); + + local->suspended = true; +diff -urNp linux-2.6.32/net/mac80211/rate.c linux-2.6.32/net/mac80211/rate.c +--- linux-2.6.32/net/mac80211/rate.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/rate.c 2009-12-04 21:40:48.618773555 -0500 +@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; ASSERT_RTNL(); -- if (local->open_count || netif_running(local->mdev)) -+ if (atomic_read(&local->open_count) || netif_running(local->mdev)) +- if (local->open_count) ++ if (atomic_read(&local->open_count)) return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.31.7/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.31.7/net/mac80211/rc80211_minstrel_debugfs.c ---- linux-2.6.31.7/net/mac80211/rc80211_minstrel_debugfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/rc80211_minstrel_debugfs.c 2009-12-10 22:15:17.000000000 -0500 -@@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *ino - return 0; - } - --static struct file_operations minstrel_stat_fops = { -+static const struct file_operations minstrel_stat_fops = { - .owner = THIS_MODULE, - .open = minstrel_stats_open, - .read = minstrel_stats_read, -diff -urNp linux-2.6.31.7/net/mac80211/rc80211_pid_debugfs.c linux-2.6.31.7/net/mac80211/rc80211_pid_debugfs.c ---- linux-2.6.31.7/net/mac80211/rc80211_pid_debugfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/rc80211_pid_debugfs.c 2009-12-10 22:15:17.000000000 -0500 -@@ -198,7 +198,7 @@ static ssize_t rate_control_pid_events_r - - #undef RC_PID_PRINT_BUF_SIZE - --static struct file_operations rc_pid_fop_events = { -+static const struct file_operations rc_pid_fop_events = { - .owner = THIS_MODULE, - .read = rate_control_pid_events_read, - .poll = rate_control_pid_events_poll, -diff -urNp linux-2.6.31.7/net/mac80211/util.c linux-2.6.31.7/net/mac80211/util.c ---- linux-2.6.31.7/net/mac80211/util.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/mac80211/util.c 2009-12-10 22:15:17.000000000 -0500 -@@ -991,7 +991,7 @@ int ieee80211_reconfig(struct ieee80211_ - local->suspended = false; +diff -urNp linux-2.6.32/net/mac80211/util.c linux-2.6.32/net/mac80211/util.c +--- linux-2.6.32/net/mac80211/util.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/mac80211/util.c 2009-12-04 21:40:48.618773555 -0500 +@@ -1030,7 +1030,7 @@ int ieee80211_reconfig(struct ieee80211_ + local->resuming = true; /* restart hardware */ - if (local->open_count) { @@ -51672,22 +50532,10 @@ diff -urNp linux-2.6.31.7/net/mac80211/util.c linux-2.6.31.7/net/mac80211/util.c res = drv_start(local); ieee80211_led_radio(local, true); -diff -urNp linux-2.6.31.7/net/packet/af_packet.c linux-2.6.31.7/net/packet/af_packet.c ---- linux-2.6.31.7/net/packet/af_packet.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/packet/af_packet.c 2009-12-10 22:15:17.000000000 -0500 -@@ -2086,7 +2086,7 @@ static void packet_mm_close(struct vm_ar - atomic_dec(&pkt_sk(sk)->mapped); - } - --static struct vm_operations_struct packet_mmap_ops = { -+static const struct vm_operations_struct packet_mmap_ops = { - .open = packet_mm_open, - .close =packet_mm_close, - }; -diff -urNp linux-2.6.31.7/net/sctp/socket.c linux-2.6.31.7/net/sctp/socket.c ---- linux-2.6.31.7/net/sctp/socket.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/sctp/socket.c 2009-12-10 22:15:17.000000000 -0500 -@@ -1471,7 +1471,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc +diff -urNp linux-2.6.32/net/sctp/socket.c linux-2.6.32/net/sctp/socket.c +--- linux-2.6.32/net/sctp/socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/sctp/socket.c 2009-12-04 21:40:48.621651536 -0500 +@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; sctp_assoc_t associd = 0; @@ -51696,7 +50544,7 @@ diff -urNp linux-2.6.31.7/net/sctp/socket.c linux-2.6.31.7/net/sctp/socket.c int err; sctp_scope_t scope; long timeo; -@@ -5790,7 +5790,6 @@ pp_found: +@@ -5802,7 +5802,6 @@ pp_found: */ int reuse = sk->sk_reuse; struct sock *sk2; @@ -51704,18 +50552,18 @@ diff -urNp linux-2.6.31.7/net/sctp/socket.c linux-2.6.31.7/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.31.7/net/socket.c linux-2.6.31.7/net/socket.c ---- linux-2.6.31.7/net/socket.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/socket.c 2009-12-10 22:15:17.000000000 -0500 -@@ -86,6 +86,7 @@ - #include <linux/audit.h> +diff -urNp linux-2.6.32/net/socket.c linux-2.6.32/net/socket.c +--- linux-2.6.32/net/socket.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/socket.c 2009-12-04 21:02:50.412906690 -0500 +@@ -87,6 +87,7 @@ #include <linux/wireless.h> #include <linux/nsproxy.h> + #include <linux/magic.h> +#include <linux/in.h> #include <asm/uaccess.h> #include <asm/unistd.h> -@@ -96,6 +97,21 @@ +@@ -97,6 +98,21 @@ #include <net/sock.h> #include <linux/netfilter.h> @@ -51737,16 +50585,7 @@ diff -urNp linux-2.6.31.7/net/socket.c linux-2.6.31.7/net/socket.c static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, unsigned long nr_segs, loff_t pos); -@@ -285,7 +301,7 @@ static int init_inodecache(void) - return 0; - } - --static struct super_operations sockfs_ops = { -+static const struct super_operations sockfs_ops = { - .alloc_inode = sock_alloc_inode, - .destroy_inode =sock_destroy_inode, - .statfs = simple_statfs, -@@ -299,7 +315,7 @@ static int sockfs_get_sb(struct file_sys +@@ -298,7 +314,7 @@ static int sockfs_get_sb(struct file_sys mnt); } @@ -51870,21 +50709,9 @@ diff -urNp linux-2.6.31.7/net/socket.c linux-2.6.31.7/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.31.7/net/sunrpc/rpc_pipe.c linux-2.6.31.7/net/sunrpc/rpc_pipe.c ---- linux-2.6.31.7/net/sunrpc/rpc_pipe.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/sunrpc/rpc_pipe.c 2009-12-10 22:15:17.000000000 -0500 -@@ -858,7 +858,7 @@ EXPORT_SYMBOL_GPL(rpc_unlink); - /* - * populate the filesystem - */ --static struct super_operations s_ops = { -+static const struct super_operations s_ops = { - .alloc_inode = rpc_alloc_inode, - .destroy_inode = rpc_destroy_inode, - .statfs = simple_statfs, -diff -urNp linux-2.6.31.7/net/unix/af_unix.c linux-2.6.31.7/net/unix/af_unix.c ---- linux-2.6.31.7/net/unix/af_unix.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/unix/af_unix.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/net/unix/af_unix.c linux-2.6.32/net/unix/af_unix.c +--- linux-2.6.32/net/unix/af_unix.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/net/unix/af_unix.c 2009-12-04 20:41:39.766516980 -0500 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -51942,21 +50769,9 @@ diff -urNp linux-2.6.31.7/net/unix/af_unix.c linux-2.6.31.7/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.31.7/net/xfrm/xfrm_proc.c linux-2.6.31.7/net/xfrm/xfrm_proc.c ---- linux-2.6.31.7/net/xfrm/xfrm_proc.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/net/xfrm/xfrm_proc.c 2009-12-10 22:15:17.000000000 -0500 -@@ -60,7 +60,7 @@ static int xfrm_statistics_seq_open(stru - return single_open_net(inode, file, xfrm_statistics_seq_show); - } - --static struct file_operations xfrm_statistics_seq_fops = { -+static const struct file_operations xfrm_statistics_seq_fops = { - .owner = THIS_MODULE, - .open = xfrm_statistics_seq_open, - .read = seq_read, -diff -urNp linux-2.6.31.7/samples/kobject/kset-example.c linux-2.6.31.7/samples/kobject/kset-example.c ---- linux-2.6.31.7/samples/kobject/kset-example.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/samples/kobject/kset-example.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/samples/kobject/kset-example.c linux-2.6.32/samples/kobject/kset-example.c +--- linux-2.6.32/samples/kobject/kset-example.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/samples/kobject/kset-example.c 2009-12-04 21:40:48.622695597 -0500 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob } @@ -51966,36 +50781,12 @@ diff -urNp linux-2.6.31.7/samples/kobject/kset-example.c linux-2.6.31.7/samples/ .show = foo_attr_show, .store = foo_attr_store, }; -diff -urNp linux-2.6.31.7/samples/markers/marker-example.c linux-2.6.31.7/samples/markers/marker-example.c ---- linux-2.6.31.7/samples/markers/marker-example.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/samples/markers/marker-example.c 2009-12-10 22:15:17.000000000 -0500 -@@ -26,7 +26,7 @@ static int my_open(struct inode *inode, - return -EPERM; - } - --static struct file_operations mark_ops = { -+static const struct file_operations mark_ops = { - .open = my_open, - }; +diff -urNp linux-2.6.32/scripts/basic/fixdep.c linux-2.6.32/scripts/basic/fixdep.c +--- linux-2.6.32/scripts/basic/fixdep.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/basic/fixdep.c 2009-12-04 21:40:48.622695597 -0500 +@@ -222,9 +222,9 @@ static void use_config(char *m, int slen -diff -urNp linux-2.6.31.7/samples/tracepoints/tracepoint-sample.c linux-2.6.31.7/samples/tracepoints/tracepoint-sample.c ---- linux-2.6.31.7/samples/tracepoints/tracepoint-sample.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/samples/tracepoints/tracepoint-sample.c 2009-12-10 22:15:17.000000000 -0500 -@@ -28,7 +28,7 @@ static int my_open(struct inode *inode, - return -EPERM; - } - --static struct file_operations mark_ops = { -+static const struct file_operations mark_ops = { - .open = my_open, - }; - -diff -urNp linux-2.6.31.7/scripts/basic/fixdep.c linux-2.6.31.7/scripts/basic/fixdep.c ---- linux-2.6.31.7/scripts/basic/fixdep.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/basic/fixdep.c 2009-12-10 22:15:17.000000000 -0500 -@@ -224,9 +224,9 @@ void use_config(char *m, int slen) - - void parse_config_file(char *map, size_t len) + static void parse_config_file(char *map, size_t len) { - int *end = (int *) (map + len); + unsigned int *end = (unsigned int *) (map + len); @@ -52005,8 +50796,8 @@ diff -urNp linux-2.6.31.7/scripts/basic/fixdep.c linux-2.6.31.7/scripts/basic/fi char *p, *q; for (; m < end; m++) { -@@ -373,7 +373,7 @@ void print_deps(void) - void traps(void) +@@ -371,7 +371,7 @@ static void print_deps(void) + static void traps(void) { static char test[] __attribute__((aligned(sizeof(int)))) = "CONF"; - int *p = (int *)test; @@ -52014,9 +50805,9 @@ diff -urNp linux-2.6.31.7/scripts/basic/fixdep.c linux-2.6.31.7/scripts/basic/fi if (*p != INT_CONF) { fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", -diff -urNp linux-2.6.31.7/scripts/kallsyms.c linux-2.6.31.7/scripts/kallsyms.c ---- linux-2.6.31.7/scripts/kallsyms.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/kallsyms.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/scripts/kallsyms.c linux-2.6.32/scripts/kallsyms.c +--- linux-2.6.32/scripts/kallsyms.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/kallsyms.c 2009-12-04 21:40:48.622695597 -0500 @@ -43,10 +43,10 @@ struct text_range { static unsigned long long _text; @@ -52032,45 +50823,9 @@ diff -urNp linux-2.6.31.7/scripts/kallsyms.c linux-2.6.31.7/scripts/kallsyms.c }; #define text_range_text (&text_ranges[0]) #define text_range_inittext (&text_ranges[1]) -diff -urNp linux-2.6.31.7/scripts/kconfig/lkc.h linux-2.6.31.7/scripts/kconfig/lkc.h ---- linux-2.6.31.7/scripts/kconfig/lkc.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/kconfig/lkc.h 2009-12-10 22:15:17.000000000 -0500 -@@ -97,7 +97,7 @@ void menu_add_expr(enum prop_type type, - void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep); - void menu_add_option(int token, char *arg); - void menu_finalize(struct menu *parent); --void menu_set_type(int type); -+void menu_set_type(unsigned int type); - - /* util.c */ - struct file *file_lookup(const char *name); -diff -urNp linux-2.6.31.7/scripts/kconfig/mconf.c linux-2.6.31.7/scripts/kconfig/mconf.c ---- linux-2.6.31.7/scripts/kconfig/mconf.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/kconfig/mconf.c 2009-12-10 22:15:17.000000000 -0500 -@@ -361,7 +361,7 @@ static char filename[PATH_MAX+1]; - static void set_config_filename(const char *config_filename) - { - static char menu_backtitle[PATH_MAX+128]; -- int size; -+ unsigned int size; - struct symbol *sym; - - sym = sym_lookup("KERNELVERSION", 0); -diff -urNp linux-2.6.31.7/scripts/kconfig/menu.c linux-2.6.31.7/scripts/kconfig/menu.c ---- linux-2.6.31.7/scripts/kconfig/menu.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/kconfig/menu.c 2009-12-10 22:15:17.000000000 -0500 -@@ -104,7 +104,7 @@ void menu_add_dep(struct expr *dep) - current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep)); - } - --void menu_set_type(int type) -+void menu_set_type(unsigned int type) - { - struct symbol *sym = current_entry->sym; - -diff -urNp linux-2.6.31.7/scripts/mod/file2alias.c linux-2.6.31.7/scripts/mod/file2alias.c ---- linux-2.6.31.7/scripts/mod/file2alias.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/mod/file2alias.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/scripts/mod/file2alias.c linux-2.6.32/scripts/mod/file2alias.c +--- linux-2.6.32/scripts/mod/file2alias.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/mod/file2alias.c 2009-12-04 21:40:48.623706592 -0500 @@ -72,7 +72,7 @@ static void device_id_check(const char * unsigned long size, unsigned long id_size, void *symval) @@ -52116,7 +50871,7 @@ diff -urNp linux-2.6.31.7/scripts/mod/file2alias.c linux-2.6.31.7/scripts/mod/fi buf_printf(&mod->dev_table_buf, "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -@@ -690,7 +690,7 @@ static void dmi_ascii_filter(char *d, co +@@ -699,7 +699,7 @@ static void dmi_ascii_filter(char *d, co static int do_dmi_entry(const char *filename, struct dmi_system_id *id, char *alias) { @@ -52125,9 +50880,9 @@ diff -urNp linux-2.6.31.7/scripts/mod/file2alias.c linux-2.6.31.7/scripts/mod/fi sprintf(alias, "dmi*"); -diff -urNp linux-2.6.31.7/scripts/mod/modpost.c linux-2.6.31.7/scripts/mod/modpost.c ---- linux-2.6.31.7/scripts/mod/modpost.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/mod/modpost.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/scripts/mod/modpost.c linux-2.6.32/scripts/mod/modpost.c +--- linux-2.6.32/scripts/mod/modpost.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/mod/modpost.c 2009-12-04 21:40:48.624625667 -0500 @@ -835,6 +835,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, @@ -52195,9 +50950,9 @@ diff -urNp linux-2.6.31.7/scripts/mod/modpost.c linux-2.6.31.7/scripts/mod/modpo goto close_write; tmp = NOFAIL(malloc(b->pos)); -diff -urNp linux-2.6.31.7/scripts/mod/modpost.h linux-2.6.31.7/scripts/mod/modpost.h ---- linux-2.6.31.7/scripts/mod/modpost.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/mod/modpost.h 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/scripts/mod/modpost.h linux-2.6.32/scripts/mod/modpost.h +--- linux-2.6.32/scripts/mod/modpost.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/mod/modpost.h 2009-12-04 21:40:48.624625667 -0500 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e struct buffer { @@ -52217,10 +50972,10 @@ diff -urNp linux-2.6.31.7/scripts/mod/modpost.h linux-2.6.31.7/scripts/mod/modpo struct module { struct module *next; -diff -urNp linux-2.6.31.7/scripts/mod/sumversion.c linux-2.6.31.7/scripts/mod/sumversion.c ---- linux-2.6.31.7/scripts/mod/sumversion.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/mod/sumversion.c 2009-12-10 22:15:17.000000000 -0500 -@@ -457,7 +457,7 @@ static void write_version(const char *fi +diff -urNp linux-2.6.32/scripts/mod/sumversion.c linux-2.6.32/scripts/mod/sumversion.c +--- linux-2.6.32/scripts/mod/sumversion.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/mod/sumversion.c 2009-12-04 21:40:48.624625667 -0500 +@@ -455,7 +455,7 @@ static void write_version(const char *fi goto out; } @@ -52229,9 +50984,9 @@ diff -urNp linux-2.6.31.7/scripts/mod/sumversion.c linux-2.6.31.7/scripts/mod/su warn("writing sum in %s failed: %s\n", filename, strerror(errno)); goto out; -diff -urNp linux-2.6.31.7/scripts/pnmtologo.c linux-2.6.31.7/scripts/pnmtologo.c ---- linux-2.6.31.7/scripts/pnmtologo.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/scripts/pnmtologo.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/scripts/pnmtologo.c linux-2.6.32/scripts/pnmtologo.c +--- linux-2.6.32/scripts/pnmtologo.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/scripts/pnmtologo.c 2009-12-04 21:40:48.625667723 -0500 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -52258,9 +51013,34 @@ diff -urNp linux-2.6.31.7/scripts/pnmtologo.c linux-2.6.31.7/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.31.7/security/Kconfig linux-2.6.31.7/security/Kconfig ---- linux-2.6.31.7/security/Kconfig 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/security/Kconfig 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/security/commoncap.c linux-2.6.32/security/commoncap.c +--- linux-2.6.32/security/commoncap.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/security/commoncap.c 2009-12-04 20:41:39.774845610 -0500 +@@ -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/security/Kconfig linux-2.6.32/security/Kconfig +--- linux-2.6.32/security/Kconfig 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/security/Kconfig 2009-12-04 21:42:15.691519291 -0500 @@ -4,6 +4,465 @@ menu "Security options" @@ -52727,100 +51507,18 @@ diff -urNp linux-2.6.31.7/security/Kconfig linux-2.6.31.7/security/Kconfig config KEYS bool "Enable access key retention support" help -diff -urNp linux-2.6.31.7/security/commoncap.c linux-2.6.31.7/security/commoncap.c ---- linux-2.6.31.7/security/commoncap.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/security/commoncap.c 2009-12-10 22:15:17.000000000 -0500 -@@ -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.31.7/security/integrity/ima/ima_fs.c linux-2.6.31.7/security/integrity/ima/ima_fs.c ---- linux-2.6.31.7/security/integrity/ima/ima_fs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/security/integrity/ima/ima_fs.c 2009-12-10 22:15:17.000000000 -0500 -@@ -43,7 +43,7 @@ static ssize_t ima_show_htable_violation - return ima_show_htable_value(buf, count, ppos, &ima_htable.violations); - } - --static struct file_operations ima_htable_violations_ops = { -+static const struct file_operations ima_htable_violations_ops = { - .read = ima_show_htable_violations - }; - -@@ -55,7 +55,7 @@ static ssize_t ima_show_measurements_cou - - } - --static struct file_operations ima_measurements_count_ops = { -+static const struct file_operations ima_measurements_count_ops = { - .read = ima_show_measurements_count - }; - -@@ -146,7 +146,7 @@ static int ima_measurements_show(struct - return 0; - } - --static struct seq_operations ima_measurments_seqops = { -+static const struct seq_operations ima_measurments_seqops = { - .start = ima_measurements_start, - .next = ima_measurements_next, - .stop = ima_measurements_stop, -@@ -158,7 +158,7 @@ static int ima_measurements_open(struct - return seq_open(file, &ima_measurments_seqops); - } - --static struct file_operations ima_measurements_ops = { -+static const struct file_operations ima_measurements_ops = { - .open = ima_measurements_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -221,7 +221,7 @@ static int ima_ascii_measurements_show(s - return 0; - } - --static struct seq_operations ima_ascii_measurements_seqops = { -+static const struct seq_operations ima_ascii_measurements_seqops = { - .start = ima_measurements_start, - .next = ima_measurements_next, - .stop = ima_measurements_stop, -@@ -233,7 +233,7 @@ static int ima_ascii_measurements_open(s - return seq_open(file, &ima_ascii_measurements_seqops); - } - --static struct file_operations ima_ascii_measurements_ops = { -+static const struct file_operations ima_ascii_measurements_ops = { - .open = ima_ascii_measurements_open, - .read = seq_read, - .llseek = seq_lseek, -@@ -313,7 +313,7 @@ static int ima_release_policy(struct ino - return 0; - } - --static struct file_operations ima_measure_policy_ops = { -+static const struct file_operations ima_measure_policy_ops = { - .open = ima_open_policy, - .write = ima_write_policy, - .release = ima_release_policy -diff -urNp linux-2.6.31.7/security/min_addr.c linux-2.6.31.7/security/min_addr.c ---- linux-2.6.31.7/security/min_addr.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/security/min_addr.c 2009-12-10 22:15:17.000000000 -0500 +@@ -146,7 +605,7 @@ config INTEL_TXT + config LSM_MMAP_MIN_ADDR + int "Low address space for LSM to protect from user allocation" + depends on SECURITY && SECURITY_SELINUX +- default 65536 ++ default 32768 + 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/security/min_addr.c linux-2.6.32/security/min_addr.c +--- linux-2.6.32/security/min_addr.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/security/min_addr.c 2009-12-05 14:41:46.991212305 -0500 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG */ static void update_mmap_min_addr(void) @@ -52844,42 +51542,12 @@ diff -urNp linux-2.6.31.7/security/min_addr.c linux-2.6.31.7/security/min_addr.c + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; + - ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos); + ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos); update_mmap_min_addr(); -diff -urNp linux-2.6.31.7/security/smack/smackfs.c linux-2.6.31.7/security/smack/smackfs.c ---- linux-2.6.31.7/security/smack/smackfs.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/security/smack/smackfs.c 2009-12-10 22:15:17.000000000 -0500 -@@ -187,7 +187,7 @@ static void load_seq_stop(struct seq_fil - /* No-op */ - } - --static struct seq_operations load_seq_ops = { -+static const struct seq_operations load_seq_ops = { - .start = load_seq_start, - .next = load_seq_next, - .show = load_seq_show, -@@ -503,7 +503,7 @@ static void cipso_seq_stop(struct seq_fi - /* No-op */ - } - --static struct seq_operations cipso_seq_ops = { -+static const struct seq_operations cipso_seq_ops = { - .start = cipso_seq_start, - .stop = cipso_seq_stop, - .next = cipso_seq_next, -@@ -697,7 +697,7 @@ static void netlbladdr_seq_stop(struct s - /* No-op */ - } - --static struct seq_operations netlbladdr_seq_ops = { -+static const struct seq_operations netlbladdr_seq_ops = { - .start = netlbladdr_seq_start, - .stop = netlbladdr_seq_stop, - .next = netlbladdr_seq_next, -diff -urNp linux-2.6.31.7/sound/aoa/codecs/onyx.c linux-2.6.31.7/sound/aoa/codecs/onyx.c ---- linux-2.6.31.7/sound/aoa/codecs/onyx.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/aoa/codecs/onyx.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/aoa/codecs/onyx.c linux-2.6.32/sound/aoa/codecs/onyx.c +--- linux-2.6.32/sound/aoa/codecs/onyx.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/aoa/codecs/onyx.c 2009-12-04 21:40:48.626696290 -0500 @@ -53,7 +53,7 @@ struct onyx { spdif_locked:1, analog_locked:1, @@ -52908,10 +51576,10 @@ diff -urNp linux-2.6.31.7/sound/aoa/codecs/onyx.c linux-2.6.31.7/sound/aoa/codec onyx->spdif_locked = onyx->analog_locked = 0; mutex_unlock(&onyx->mutex); -diff -urNp linux-2.6.31.7/sound/core/oss/pcm_oss.c linux-2.6.31.7/sound/core/oss/pcm_oss.c ---- linux-2.6.31.7/sound/core/oss/pcm_oss.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/core/oss/pcm_oss.c 2009-12-10 22:15:17.000000000 -0500 -@@ -2943,8 +2943,8 @@ static void snd_pcm_oss_proc_done(struct +diff -urNp linux-2.6.32/sound/core/oss/pcm_oss.c linux-2.6.32/sound/core/oss/pcm_oss.c +--- linux-2.6.32/sound/core/oss/pcm_oss.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/core/oss/pcm_oss.c 2009-12-04 21:40:48.627769690 -0500 +@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct } } #else /* !CONFIG_SND_VERBOSE_PROCFS */ @@ -52922,9 +51590,9 @@ diff -urNp linux-2.6.31.7/sound/core/oss/pcm_oss.c linux-2.6.31.7/sound/core/oss #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.31.7/sound/core/seq/seq_lock.h linux-2.6.31.7/sound/core/seq/seq_lock.h ---- linux-2.6.31.7/sound/core/seq/seq_lock.h 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/core/seq/seq_lock.h 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/core/seq/seq_lock.h linux-2.6.32/sound/core/seq/seq_lock.h +--- linux-2.6.32/sound/core/seq/seq_lock.h 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/core/seq/seq_lock.h 2009-12-04 21:40:48.627769690 -0500 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -52940,9 +51608,9 @@ diff -urNp linux-2.6.31.7/sound/core/seq/seq_lock.h linux-2.6.31.7/sound/core/se #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.31.7/sound/drivers/mts64.c linux-2.6.31.7/sound/drivers/mts64.c ---- linux-2.6.31.7/sound/drivers/mts64.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/drivers/mts64.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/drivers/mts64.c linux-2.6.32/sound/drivers/mts64.c +--- linux-2.6.32/sound/drivers/mts64.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/drivers/mts64.c 2009-12-04 21:40:48.628706066 -0500 @@ -65,7 +65,7 @@ struct mts64 { struct pardevice *pardev; int pardev_claimed; @@ -52991,9 +51659,9 @@ diff -urNp linux-2.6.31.7/sound/drivers/mts64.c linux-2.6.31.7/sound/drivers/mts return 0; } -diff -urNp linux-2.6.31.7/sound/drivers/portman2x4.c linux-2.6.31.7/sound/drivers/portman2x4.c ---- linux-2.6.31.7/sound/drivers/portman2x4.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/drivers/portman2x4.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/drivers/portman2x4.c linux-2.6.32/sound/drivers/portman2x4.c +--- linux-2.6.32/sound/drivers/portman2x4.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/drivers/portman2x4.c 2009-12-04 21:40:48.628706066 -0500 @@ -83,7 +83,7 @@ struct portman { struct pardevice *pardev; int pardev_claimed; @@ -53003,21 +51671,129 @@ diff -urNp linux-2.6.31.7/sound/drivers/portman2x4.c linux-2.6.31.7/sound/driver int mode[PORTMAN_NUM_INPUT_PORTS]; struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; }; -diff -urNp linux-2.6.31.7/sound/pci/ac97/ac97_codec.c linux-2.6.31.7/sound/pci/ac97/ac97_codec.c ---- linux-2.6.31.7/sound/pci/ac97/ac97_codec.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/pci/ac97/ac97_codec.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/pci/ac97/ac97_codec.c linux-2.6.32/sound/pci/ac97/ac97_codec.c +--- linux-2.6.32/sound/pci/ac97/ac97_codec.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/pci/ac97/ac97_codec.c 2009-12-04 21:40:48.630659203 -0500 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc } /* build_ops to do nothing */ -static struct snd_ac97_build_ops null_build_ops; -+static const struct snd_ac97_build_ops null_build_ops __read_only; ++static const struct snd_ac97_build_ops null_build_ops; #ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power(struct work_struct *work) -diff -urNp linux-2.6.31.7/sound/pci/ac97/ac97_patch.c linux-2.6.31.7/sound/pci/ac97/ac97_patch.c ---- linux-2.6.31.7/sound/pci/ac97/ac97_patch.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/pci/ac97/ac97_patch.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/pci/ac97/ac97_patch.c linux-2.6.32/sound/pci/ac97/ac97_patch.c +--- linux-2.6.32/sound/pci/ac97/ac97_patch.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/pci/ac97/ac97_patch.c 2009-12-04 21:40:48.631647283 -0500 +@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd + return 0; + } + +-static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = { ++static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = { + .build_spdif = patch_yamaha_ymf743_build_spdif, + .build_3d = patch_yamaha_ymf7x3_3d, + }; +@@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdi + return 0; + } + +-static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { ++static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = { + .build_3d = patch_yamaha_ymf7x3_3d, + .build_post_spdif = patch_yamaha_ymf753_post_spdif + }; +@@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific + return 0; + } + +-static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = { ++static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = { + .build_specific = patch_wolfson_wm9703_specific, + }; + +@@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific + return 0; + } + +-static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = { ++static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = { + .build_specific = patch_wolfson_wm9704_specific, + }; + +@@ -555,7 +555,7 @@ static int patch_wolfson_wm9705_specific + return 0; + } + +-static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = { ++static const struct snd_ac97_build_ops patch_wolfson_wm9705_ops = { + .build_specific = patch_wolfson_wm9705_specific, + }; + +@@ -692,7 +692,7 @@ static int patch_wolfson_wm9711_specific + return 0; + } + +-static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = { ++static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = { + .build_specific = patch_wolfson_wm9711_specific, + }; + +@@ -886,7 +886,7 @@ static void patch_wolfson_wm9713_resume + } + #endif + +-static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = { ++static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = { + .build_specific = patch_wolfson_wm9713_specific, + .build_3d = patch_wolfson_wm9713_3d, + #ifdef CONFIG_PM +@@ -991,7 +991,7 @@ static int patch_sigmatel_stac97xx_speci + return 0; + } + +-static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = { ++static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = { + .build_3d = patch_sigmatel_stac9700_3d, + .build_specific = patch_sigmatel_stac97xx_specific + }; +@@ -1038,7 +1038,7 @@ static int patch_sigmatel_stac9708_speci + return patch_sigmatel_stac97xx_specific(ac97); + } + +-static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = { ++static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = { + .build_3d = patch_sigmatel_stac9708_3d, + .build_specific = patch_sigmatel_stac9708_specific + }; +@@ -1267,7 +1267,7 @@ static int patch_sigmatel_stac9758_speci + return 0; + } + +-static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = { ++static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = { + .build_3d = patch_sigmatel_stac9700_3d, + .build_specific = patch_sigmatel_stac9758_specific + }; +@@ -1342,7 +1342,7 @@ static int patch_cirrus_build_spdif(stru + return 0; + } + +-static struct snd_ac97_build_ops patch_cirrus_ops = { ++static const struct snd_ac97_build_ops patch_cirrus_ops = { + .build_spdif = patch_cirrus_build_spdif + }; + +@@ -1399,7 +1399,7 @@ static int patch_conexant_build_spdif(st + return 0; + } + +-static struct snd_ac97_build_ops patch_conexant_ops = { ++static const struct snd_ac97_build_ops patch_conexant_ops = { + .build_spdif = patch_conexant_build_spdif + }; + @@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a { AC97_VIDEO, 0x9f1f }, { AC97_AUX, 0x9f1f }, @@ -53027,6 +51803,177 @@ diff -urNp linux-2.6.31.7/sound/pci/ac97/ac97_patch.c linux-2.6.31.7/sound/pci/a }; static int patch_ad1819(struct snd_ac97 * ac97) +@@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct + } + } + +-static struct snd_ac97_build_ops patch_ad1881_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1881_build_ops = { + #ifdef CONFIG_PM + .resume = ad18xx_resume + #endif +@@ -1662,7 +1662,7 @@ static int patch_ad1885_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_ad1885_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1885_build_ops = { + .build_specific = &patch_ad1885_specific, + #ifdef CONFIG_PM + .resume = ad18xx_resume +@@ -1689,7 +1689,7 @@ static int patch_ad1886_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_ad1886_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1886_build_ops = { + .build_specific = &patch_ad1886_specific, + #ifdef CONFIG_PM + .resume = ad18xx_resume +@@ -1893,7 +1893,7 @@ static int patch_ad1981a_specific(struct + ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); + } + +-static struct snd_ac97_build_ops patch_ad1981a_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1981a_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1981a_specific, + #ifdef CONFIG_PM +@@ -1948,7 +1948,7 @@ static int patch_ad1981b_specific(struct + ARRAY_SIZE(snd_ac97_ad1981x_jack_sense)); + } + +-static struct snd_ac97_build_ops patch_ad1981b_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1981b_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1981b_specific, + #ifdef CONFIG_PM +@@ -2087,7 +2087,7 @@ static int patch_ad1888_specific(struct + return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls)); + } + +-static struct snd_ac97_build_ops patch_ad1888_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1888_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1888_specific, + #ifdef CONFIG_PM +@@ -2136,7 +2136,7 @@ static int patch_ad1980_specific(struct + return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1); + } + +-static struct snd_ac97_build_ops patch_ad1980_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1980_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1980_specific, + #ifdef CONFIG_PM +@@ -2251,7 +2251,7 @@ static int patch_ad1985_specific(struct + ARRAY_SIZE(snd_ac97_ad1985_controls)); + } + +-static struct snd_ac97_build_ops patch_ad1985_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1985_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1985_specific, + #ifdef CONFIG_PM +@@ -2543,7 +2543,7 @@ static int patch_ad1986_specific(struct + ARRAY_SIZE(snd_ac97_ad1985_controls)); + } + +-static struct snd_ac97_build_ops patch_ad1986_build_ops = { ++static const struct snd_ac97_build_ops patch_ad1986_build_ops = { + .build_post_spdif = patch_ad198x_post_spdif, + .build_specific = patch_ad1986_specific, + #ifdef CONFIG_PM +@@ -2648,7 +2648,7 @@ static int patch_alc650_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_alc650_ops = { ++static const struct snd_ac97_build_ops patch_alc650_ops = { + .build_specific = patch_alc650_specific, + .update_jacks = alc650_update_jacks + }; +@@ -2800,7 +2800,7 @@ static int patch_alc655_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_alc655_ops = { ++static const struct snd_ac97_build_ops patch_alc655_ops = { + .build_specific = patch_alc655_specific, + .update_jacks = alc655_update_jacks + }; +@@ -2912,7 +2912,7 @@ static int patch_alc850_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_alc850_ops = { ++static const struct snd_ac97_build_ops patch_alc850_ops = { + .build_specific = patch_alc850_specific, + .update_jacks = alc850_update_jacks + }; +@@ -2974,7 +2974,7 @@ static int patch_cm9738_specific(struct + return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls)); + } + +-static struct snd_ac97_build_ops patch_cm9738_ops = { ++static const struct snd_ac97_build_ops patch_cm9738_ops = { + .build_specific = patch_cm9738_specific, + .update_jacks = cm9738_update_jacks + }; +@@ -3065,7 +3065,7 @@ static int patch_cm9739_post_spdif(struc + return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif)); + } + +-static struct snd_ac97_build_ops patch_cm9739_ops = { ++static const struct snd_ac97_build_ops patch_cm9739_ops = { + .build_specific = patch_cm9739_specific, + .build_post_spdif = patch_cm9739_post_spdif, + .update_jacks = cm9739_update_jacks +@@ -3239,7 +3239,7 @@ static int patch_cm9761_specific(struct + return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls)); + } + +-static struct snd_ac97_build_ops patch_cm9761_ops = { ++static const struct snd_ac97_build_ops patch_cm9761_ops = { + .build_specific = patch_cm9761_specific, + .build_post_spdif = patch_cm9761_post_spdif, + .update_jacks = cm9761_update_jacks +@@ -3335,7 +3335,7 @@ static int patch_cm9780_specific(struct + return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls)); + } + +-static struct snd_ac97_build_ops patch_cm9780_ops = { ++static const struct snd_ac97_build_ops patch_cm9780_ops = { + .build_specific = patch_cm9780_specific, + .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */ + }; +@@ -3455,7 +3455,7 @@ static int patch_vt1616_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_vt1616_ops = { ++static const struct snd_ac97_build_ops patch_vt1616_ops = { + .build_specific = patch_vt1616_specific + }; + +@@ -3809,7 +3809,7 @@ static int patch_it2646_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_it2646_ops = { ++static const struct snd_ac97_build_ops patch_it2646_ops = { + .build_specific = patch_it2646_specific, + .update_jacks = it2646_update_jacks + }; +@@ -3843,7 +3843,7 @@ static int patch_si3036_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_si3036_ops = { ++static const struct snd_ac97_build_ops patch_si3036_ops = { + .build_specific = patch_si3036_specific, + }; + @@ -3876,7 +3876,7 @@ static struct snd_ac97_res_table lm4550_ { AC97_AUX, 0x1f1f }, { AC97_PCM, 0x1f1f }, @@ -53036,9 +51983,18 @@ diff -urNp linux-2.6.31.7/sound/pci/ac97/ac97_patch.c linux-2.6.31.7/sound/pci/a }; static int patch_lm4550(struct snd_ac97 *ac97) -diff -urNp linux-2.6.31.7/sound/pci/ens1370.c linux-2.6.31.7/sound/pci/ens1370.c ---- linux-2.6.31.7/sound/pci/ens1370.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/pci/ens1370.c 2009-12-10 22:15:17.000000000 -0500 +@@ -3910,7 +3910,7 @@ static int patch_ucb1400_specific(struct + return 0; + } + +-static struct snd_ac97_build_ops patch_ucb1400_ops = { ++static const struct snd_ac97_build_ops patch_ucb1400_ops = { + .build_specific = patch_ucb1400_specific, + }; + +diff -urNp linux-2.6.32/sound/pci/ens1370.c linux-2.6.32/sound/pci/ens1370.c +--- linux-2.6.32/sound/pci/ens1370.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/pci/ens1370.c 2009-12-04 21:40:48.632773733 -0500 @@ -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 */ @@ -53048,9 +52004,9 @@ diff -urNp linux-2.6.31.7/sound/pci/ens1370.c linux-2.6.31.7/sound/pci/ens1370.c }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.31.7/sound/pci/intel8x0.c linux-2.6.31.7/sound/pci/intel8x0.c ---- linux-2.6.31.7/sound/pci/intel8x0.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/pci/intel8x0.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/pci/intel8x0.c linux-2.6.32/sound/pci/intel8x0.c +--- linux-2.6.32/sound/pci/intel8x0.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/pci/intel8x0.c 2009-12-04 21:40:48.642531133 -0500 @@ -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 */ @@ -53060,7 +52016,7 @@ diff -urNp linux-2.6.31.7/sound/pci/intel8x0.c linux-2.6.31.7/sound/pci/intel8x0 }; MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); -@@ -2105,7 +2105,7 @@ static struct ac97_quirk ac97_quirks[] _ +@@ -2123,7 +2123,7 @@ static struct ac97_quirk ac97_quirks[] _ .type = AC97_TUNE_HP_ONLY }, #endif @@ -53069,9 +52025,9 @@ diff -urNp linux-2.6.31.7/sound/pci/intel8x0.c linux-2.6.31.7/sound/pci/intel8x0 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.31.7/sound/pci/intel8x0m.c linux-2.6.31.7/sound/pci/intel8x0m.c ---- linux-2.6.31.7/sound/pci/intel8x0m.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/pci/intel8x0m.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/sound/pci/intel8x0m.c linux-2.6.32/sound/pci/intel8x0m.c +--- linux-2.6.32/sound/pci/intel8x0m.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/sound/pci/intel8x0m.c 2009-12-04 21:40:48.642531133 -0500 @@ -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 */ @@ -53090,45 +52046,9 @@ diff -urNp linux-2.6.31.7/sound/pci/intel8x0m.c linux-2.6.31.7/sound/pci/intel8x }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.31.7/sound/usb/usx2y/us122l.c linux-2.6.31.7/sound/usb/usx2y/us122l.c ---- linux-2.6.31.7/sound/usb/usx2y/us122l.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/usb/usx2y/us122l.c 2009-12-10 22:15:17.000000000 -0500 -@@ -154,7 +154,7 @@ static void usb_stream_hwdep_vm_close(st - snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count)); - } - --static struct vm_operations_struct usb_stream_hwdep_vm_ops = { -+static const struct vm_operations_struct usb_stream_hwdep_vm_ops = { - .open = usb_stream_hwdep_vm_open, - .fault = usb_stream_hwdep_vm_fault, - .close = usb_stream_hwdep_vm_close, -diff -urNp linux-2.6.31.7/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.31.7/sound/usb/usx2y/usX2Yhwdep.c ---- linux-2.6.31.7/sound/usb/usx2y/usX2Yhwdep.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/usb/usx2y/usX2Yhwdep.c 2009-12-10 22:15:17.000000000 -0500 -@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct - return 0; - } - --static struct vm_operations_struct us428ctls_vm_ops = { -+static const struct vm_operations_struct us428ctls_vm_ops = { - .fault = snd_us428ctls_vm_fault, - }; - -diff -urNp linux-2.6.31.7/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.31.7/sound/usb/usx2y/usx2yhwdeppcm.c ---- linux-2.6.31.7/sound/usb/usx2y/usx2yhwdeppcm.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/sound/usb/usx2y/usx2yhwdeppcm.c 2009-12-10 22:15:17.000000000 -0500 -@@ -697,7 +697,7 @@ static int snd_usX2Y_hwdep_pcm_vm_fault( - } - - --static struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { -+static const struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { - .open = snd_usX2Y_hwdep_pcm_vm_open, - .close = snd_usX2Y_hwdep_pcm_vm_close, - .fault = snd_usX2Y_hwdep_pcm_vm_fault, -diff -urNp linux-2.6.31.7/usr/gen_init_cpio.c linux-2.6.31.7/usr/gen_init_cpio.c ---- linux-2.6.31.7/usr/gen_init_cpio.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/usr/gen_init_cpio.c 2009-12-10 22:15:17.000000000 -0500 +diff -urNp linux-2.6.32/usr/gen_init_cpio.c linux-2.6.32/usr/gen_init_cpio.c +--- linux-2.6.32/usr/gen_init_cpio.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/usr/gen_init_cpio.c 2009-12-04 21:40:48.643783253 -0500 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, int retval; int rc = -1; @@ -53151,10 +52071,34 @@ diff -urNp linux-2.6.31.7/usr/gen_init_cpio.c linux-2.6.31.7/usr/gen_init_cpio.c } else break; } -diff -urNp linux-2.6.31.7/virt/kvm/kvm_main.c linux-2.6.31.7/virt/kvm/kvm_main.c ---- linux-2.6.31.7/virt/kvm/kvm_main.c 2009-12-08 14:13:50.000000000 -0500 -+++ linux-2.6.31.7/virt/kvm/kvm_main.c 2009-12-10 22:15:17.000000000 -0500 -@@ -2353,6 +2353,9 @@ static struct miscdevice kvm_dev = { +diff -urNp linux-2.6.32/virt/kvm/kvm_main.c linux-2.6.32/virt/kvm/kvm_main.c +--- linux-2.6.32/virt/kvm/kvm_main.c 2009-12-02 22:51:21.000000000 -0500 ++++ linux-2.6.32/virt/kvm/kvm_main.c 2009-12-04 21:40:48.643783253 -0500 +@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode + return 0; + } + ++/* cannot be const */ + static struct file_operations kvm_vcpu_fops = { + .release = kvm_vcpu_release, + .unlocked_ioctl = kvm_vcpu_ioctl, +@@ -2341,6 +2342,7 @@ static int kvm_vm_mmap(struct file *file + return 0; + } + ++/* cannot be const */ + static struct file_operations kvm_vm_fops = { + .release = kvm_vm_release, + .unlocked_ioctl = kvm_vm_ioctl, +@@ -2428,6 +2430,7 @@ out: + return r; + } + ++/* cannot be const */ + static struct file_operations kvm_chardev_ops = { + .unlocked_ioctl = kvm_dev_ioctl, + .compat_ioctl = kvm_dev_ioctl, +@@ -2437,6 +2440,9 @@ static struct miscdevice kvm_dev = { KVM_MINOR, "kvm", &kvm_chardev_ops, @@ -53164,16 +52108,7 @@ diff -urNp linux-2.6.31.7/virt/kvm/kvm_main.c linux-2.6.31.7/virt/kvm/kvm_main.c }; static void hardware_enable(void *junk) -@@ -2512,7 +2515,7 @@ static int vcpu_stat_get(void *_offset, - - DEFINE_SIMPLE_ATTRIBUTE(vcpu_stat_fops, vcpu_stat_get, NULL, "%llu\n"); - --static struct file_operations *stat_fops[] = { -+static const struct file_operations *stat_fops[] = { - [KVM_STAT_VCPU] = &vcpu_stat_fops, - [KVM_STAT_VM] = &vm_stat_fops, - }; -@@ -2584,7 +2587,7 @@ static void kvm_sched_out(struct preempt +@@ -2711,7 +2717,7 @@ static void kvm_sched_out(struct preempt kvm_arch_vcpu_put(vcpu); } diff --git a/main/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig deleted file mode 100644 index 7cd012f2f..000000000 --- a/main/linux-grsec/kernelconfig +++ /dev/null @@ -1,4449 +0,0 @@ -# -# Automatically generated make config: don't edit -# Linux kernel version: 2.6.30.7 -# Fri Sep 18 08:02:48 2009 -# -# CONFIG_64BIT is not set -CONFIG_X86_32=y -# CONFIG_X86_64 is not set -CONFIG_X86=y -CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" -CONFIG_GENERIC_TIME=y -CONFIG_GENERIC_CMOS_UPDATE=y -CONFIG_CLOCKSOURCE_WATCHDOG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_STACKTRACE_SUPPORT=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y -CONFIG_MMU=y -CONFIG_ZONE_DMA=y -CONFIG_GENERIC_ISA_DMA=y -CONFIG_GENERIC_IOMAP=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_HWEIGHT=y -CONFIG_GENERIC_GPIO=y -CONFIG_ARCH_MAY_HAVE_PC_FDC=y -# CONFIG_RWSEM_GENERIC_SPINLOCK is not set -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y -CONFIG_GENERIC_CALIBRATE_DELAY=y -# CONFIG_GENERIC_TIME_VSYSCALL is not set -CONFIG_ARCH_HAS_CPU_RELAX=y -CONFIG_ARCH_HAS_DEFAULT_IDLE=y -CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y -CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y -# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -# CONFIG_ZONE_DMA32 is not set -CONFIG_ARCH_POPULATES_NODE_MAP=y -# CONFIG_AUDIT_ARCH is not set -CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y -CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y -CONFIG_GENERIC_HARDIRQS=y -CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y -CONFIG_GENERIC_IRQ_PROBE=y -CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_USE_GENERIC_SMP_HELPERS=y -CONFIG_X86_32_SMP=y -CONFIG_X86_HT=y -CONFIG_X86_TRAMPOLINE=y -CONFIG_X86_32_LAZY_GS=y -CONFIG_KTIME_SCALAR=y -CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" - -# -# General setup -# -CONFIG_EXPERIMENTAL=y -CONFIG_LOCK_KERNEL=y -CONFIG_INIT_ENV_ARG_LIMIT=32 -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_BZIP2=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_BZIP2 is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -# CONFIG_POSIX_MQUEUE is not set -CONFIG_BSD_PROCESS_ACCT=y -CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_TASKSTATS is not set -# CONFIG_AUDIT is not set - -# -# RCU Subsystem -# -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set -# CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set -CONFIG_IKCONFIG=m -CONFIG_IKCONFIG_PROC=y -CONFIG_LOG_BUF_SHIFT=14 -CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -CONFIG_GROUP_SCHED=y -CONFIG_FAIR_GROUP_SCHED=y -# CONFIG_RT_GROUP_SCHED is not set -CONFIG_USER_SCHED=y -# CONFIG_CGROUP_SCHED is not set -# CONFIG_CGROUPS is not set -# CONFIG_SYSFS_DEPRECATED_V2 is not set -# CONFIG_RELAY is not set -# CONFIG_NAMESPACES is not set -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_CC_OPTIMIZE_FOR_SIZE=y -CONFIG_SYSCTL=y -CONFIG_ANON_INODES=y -CONFIG_EMBEDDED=y -CONFIG_UID16=y -CONFIG_SYSCTL_SYSCALL=y -# CONFIG_KALLSYMS is not set -# CONFIG_STRIP_ASM_SYMS is not set -CONFIG_HOTPLUG=y -CONFIG_PRINTK=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_PCSPKR_PLATFORM=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_PCI_QUIRKS=y -# CONFIG_SLUB_DEBUG is not set -# CONFIG_COMPAT_BRK is not set -# CONFIG_SLAB is not set -CONFIG_SLUB=y -# CONFIG_SLOB is not set -CONFIG_PROFILING=y -CONFIG_TRACEPOINTS=y -# CONFIG_MARKERS is not set -CONFIG_OPROFILE=m -# CONFIG_OPROFILE_IBS is not set -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_IOREMAP_PROT=y -CONFIG_HAVE_KPROBES=y -CONFIG_HAVE_KRETPROBES=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_SLOW_WORK=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_RT_MUTEXES=y -CONFIG_BASE_SMALL=0 -CONFIG_MODULES=y -# CONFIG_MODULE_FORCE_LOAD is not set -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_MODVERSIONS=y -# CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_STOP_MACHINE=y -CONFIG_BLOCK=y -CONFIG_LBD=y -CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_INTEGRITY is not set - -# -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=m -CONFIG_IOSCHED_DEADLINE=m -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" -CONFIG_PREEMPT_NOTIFIERS=y -CONFIG_FREEZER=y - -# -# Processor type and features -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -CONFIG_GENERIC_CLOCKEVENTS_BUILD=y -CONFIG_SMP=y -# CONFIG_SPARSE_IRQ is not set -CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set -CONFIG_X86_EXTENDED_PLATFORM=y -# CONFIG_X86_ELAN is not set -# CONFIG_X86_RDC321X is not set -# CONFIG_X86_32_NON_STANDARD is not set -CONFIG_SCHED_OMIT_FRAME_POINTER=y -CONFIG_PARAVIRT_GUEST=y -# CONFIG_PARAVIRT_CLOCK is not set -# CONFIG_MEMTEST is not set -# CONFIG_M386 is not set -# CONFIG_M486 is not set -CONFIG_M586=y -# CONFIG_M586TSC is not set -# CONFIG_M586MMX is not set -# CONFIG_M686 is not set -# CONFIG_MPENTIUMII is not set -# CONFIG_MPENTIUMIII is not set -# CONFIG_MPENTIUMM is not set -# CONFIG_MPENTIUM4 is not set -# CONFIG_MK6 is not set -# CONFIG_MK7 is not set -# CONFIG_MK8 is not set -# CONFIG_MCRUSOE is not set -# CONFIG_MEFFICEON is not set -# CONFIG_MWINCHIPC6 is not set -# CONFIG_MWINCHIP3D is not set -# CONFIG_MGEODEGX1 is not set -# CONFIG_MGEODE_LX is not set -# CONFIG_MCYRIXIII is not set -# CONFIG_MVIAC3_2 is not set -# CONFIG_MVIAC7 is not set -# CONFIG_MPSC is not set -# CONFIG_MCORE2 is not set -# CONFIG_GENERIC_CPU is not set -CONFIG_X86_GENERIC=y -CONFIG_X86_CPU=y -CONFIG_X86_L1_CACHE_BYTES=64 -CONFIG_X86_INTERNODE_CACHE_BYTES=64 -CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=5 -CONFIG_X86_XADD=y -# CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_WP_WORKS_OK=y -CONFIG_X86_INVLPG=y -CONFIG_X86_BSWAP=y -CONFIG_X86_POPAD_OK=y -CONFIG_X86_ALIGNMENT_16=y -CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 -# CONFIG_PROCESSOR_SELECT is not set -CONFIG_CPU_SUP_INTEL=y -CONFIG_CPU_SUP_CYRIX_32=y -CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR=y -CONFIG_CPU_SUP_TRANSMETA_32=y -CONFIG_CPU_SUP_UMC_32=y -CONFIG_HPET_TIMER=y -CONFIG_HPET_EMULATE_RTC=y -CONFIG_DMI=y -# CONFIG_IOMMU_HELPER is not set -# CONFIG_IOMMU_API is not set -CONFIG_NR_CPUS=8 -CONFIG_SCHED_SMT=y -CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -CONFIG_X86_LOCAL_APIC=y -CONFIG_X86_IO_APIC=y -# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set -# CONFIG_X86_MCE is not set -CONFIG_VM86=y -CONFIG_TOSHIBA=m -CONFIG_I8K=m -CONFIG_X86_REBOOTFIXUPS=y -CONFIG_MICROCODE=m -CONFIG_MICROCODE_INTEL=y -CONFIG_MICROCODE_AMD=y -CONFIG_MICROCODE_OLD_INTERFACE=y -CONFIG_X86_MSR=m -CONFIG_X86_CPUID=m -CONFIG_X86_CPU_DEBUG=m -# CONFIG_NOHIGHMEM is not set -CONFIG_HIGHMEM4G=y -# CONFIG_HIGHMEM64G is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_3G_OPT is not set -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_2G_OPT is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_HIGHMEM=y -# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set -CONFIG_ARCH_FLATMEM_ENABLE=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set -# CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_SPARSEMEM_STATIC=y -CONFIG_PAGEFLAGS_EXTENDED=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -# CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=1 -CONFIG_BOUNCE=y -CONFIG_VIRT_TO_BUS=y -CONFIG_UNEVICTABLE_LRU=y -CONFIG_HAVE_MLOCK=y -CONFIG_HAVE_MLOCKED_PAGE_BIT=y -CONFIG_MMU_NOTIFIER=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -# CONFIG_HIGHPTE is not set -# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set -CONFIG_X86_RESERVE_LOW_64K=y -CONFIG_MATH_EMULATION=y -CONFIG_MTRR=y -CONFIG_MTRR_SANITIZER=y -CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 -CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 -CONFIG_X86_PAT=y -# CONFIG_SECCOMP is not set -# CONFIG_CC_STACKPROTECTOR is not set -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -CONFIG_HZ_300=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=300 -CONFIG_SCHED_HRTICK=y -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set -CONFIG_PHYSICAL_START=0x100000 -# CONFIG_RELOCATABLE is not set -CONFIG_PHYSICAL_ALIGN=0x100000 -CONFIG_HOTPLUG_CPU=y -# CONFIG_CMDLINE_BOOL is not set -CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y - -# -# Power management and ACPI options -# -CONFIG_PM=y -# CONFIG_PM_DEBUG is not set -CONFIG_PM_SLEEP_SMP=y -CONFIG_PM_SLEEP=y -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_HIBERNATION is not set -CONFIG_ACPI=y -CONFIG_ACPI_SLEEP=y -CONFIG_ACPI_PROCFS=y -CONFIG_ACPI_PROCFS_POWER=y -CONFIG_ACPI_SYSFS_POWER=y -CONFIG_ACPI_PROC_EVENT=y -CONFIG_ACPI_AC=m -CONFIG_ACPI_BATTERY=m -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_DOCK=y -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_HOTPLUG_CPU=y -CONFIG_ACPI_THERMAL=m -# CONFIG_ACPI_CUSTOM_DSDT is not set -CONFIG_ACPI_BLACKLIST_YEAR=2000 -# CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_PCI_SLOT=m -CONFIG_X86_PM_TIMER=y -CONFIG_ACPI_CONTAINER=m -CONFIG_ACPI_SBS=m -# CONFIG_APM is not set - -# -# CPU Frequency scaling -# -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_TABLE=m -# CONFIG_CPU_FREQ_DEBUG is not set -CONFIG_CPU_FREQ_STAT=m -# CONFIG_CPU_FREQ_STAT_DETAILS is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=m -CONFIG_CPU_FREQ_GOV_USERSPACE=m -CONFIG_CPU_FREQ_GOV_ONDEMAND=m -CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - -# -# CPUFreq processor drivers -# -CONFIG_X86_ACPI_CPUFREQ=m -CONFIG_X86_POWERNOW_K6=m -CONFIG_X86_POWERNOW_K7=m -CONFIG_X86_POWERNOW_K7_ACPI=y -CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_GX_SUSPMOD=m -CONFIG_X86_SPEEDSTEP_CENTRINO=m -CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y -CONFIG_X86_SPEEDSTEP_ICH=m -CONFIG_X86_SPEEDSTEP_SMI=m -CONFIG_X86_P4_CLOCKMOD=m -CONFIG_X86_CPUFREQ_NFORCE2=m -CONFIG_X86_LONGRUN=m -CONFIG_X86_LONGHAUL=m -CONFIG_X86_E_POWERSAVER=m - -# -# shared options -# -CONFIG_X86_SPEEDSTEP_LIB=m -CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y - -# -# Bus options (PCI etc.) -# -CONFIG_PCI=y -# CONFIG_PCI_GOBIOS is not set -# CONFIG_PCI_GOMMCONFIG is not set -# CONFIG_PCI_GODIRECT is not set -# CONFIG_PCI_GOOLPC is not set -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_MMCONFIG=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCIEPORTBUS=y -CONFIG_HOTPLUG_PCI_PCIE=m -# CONFIG_PCIEAER is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_ARCH_SUPPORTS_MSI=y -# CONFIG_PCI_MSI is not set -CONFIG_PCI_LEGACY=y -CONFIG_PCI_STUB=m -CONFIG_HT_IRQ=y -# CONFIG_PCI_IOV is not set -CONFIG_ISA_DMA_API=y -CONFIG_ISA=y -# CONFIG_EISA is not set -# CONFIG_MCA is not set -CONFIG_SCx200=m -CONFIG_SCx200HR_TIMER=m -# CONFIG_OLPC is not set -CONFIG_K8_NB=y -CONFIG_PCCARD=m -# CONFIG_PCMCIA_DEBUG is not set -CONFIG_PCMCIA=m -CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_PCMCIA_IOCTL=y -CONFIG_CARDBUS=y - -# -# PC-card bridges -# -CONFIG_YENTA=m -CONFIG_YENTA_O2=y -CONFIG_YENTA_RICOH=y -CONFIG_YENTA_TI=y -CONFIG_YENTA_ENE_TUNE=y -CONFIG_YENTA_TOSHIBA=y -CONFIG_PD6729=m -CONFIG_I82092=m -CONFIG_I82365=m -CONFIG_TCIC=m -CONFIG_PCMCIA_PROBE=y -CONFIG_PCCARD_NONSTATIC=m -CONFIG_HOTPLUG_PCI=m -CONFIG_HOTPLUG_PCI_FAKE=m -CONFIG_HOTPLUG_PCI_COMPAQ=m -# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set -CONFIG_HOTPLUG_PCI_IBM=m -CONFIG_HOTPLUG_PCI_ACPI=m -CONFIG_HOTPLUG_PCI_ACPI_IBM=m -CONFIG_HOTPLUG_PCI_CPCI=y -CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m -CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m -CONFIG_HOTPLUG_PCI_SHPC=m - -# -# Executable file formats / Emulations -# -CONFIG_BINFMT_ELF=y -# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_HAVE_AOUT=y -CONFIG_BINFMT_AOUT=m -CONFIG_BINFMT_MISC=m -CONFIG_HAVE_ATOMIC_IOMAP=y -CONFIG_NET=y - -# -# Networking options -# -CONFIG_PACKET=m -CONFIG_PACKET_MMAP=y -CONFIG_UNIX=y -CONFIG_XFRM=y -CONFIG_XFRM_USER=m -CONFIG_XFRM_SUB_POLICY=y -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_STATISTICS is not set -CONFIG_XFRM_IPCOMP=m -CONFIG_NET_KEY=m -CONFIG_NET_KEY_MIGRATE=y -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -CONFIG_IP_ADVANCED_ROUTER=y -CONFIG_ASK_IP_FIB_HASH=y -# CONFIG_IP_FIB_TRIE is not set -CONFIG_IP_FIB_HASH=y -CONFIG_IP_MULTIPLE_TABLES=y -CONFIG_IP_ROUTE_MULTIPATH=y -CONFIG_IP_ROUTE_VERBOSE=y -CONFIG_IP_PNP=y -CONFIG_IP_PNP_DHCP=y -CONFIG_IP_PNP_BOOTP=y -CONFIG_IP_PNP_RARP=y -CONFIG_NET_IPIP=m -CONFIG_NET_IPGRE=m -CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_IP_MROUTE=y -# CONFIG_IP_PIMSM_V1 is not set -CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y -CONFIG_SYN_COOKIES=y -CONFIG_INET_AH=m -CONFIG_INET_ESP=m -CONFIG_INET_IPCOMP=m -CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=m -CONFIG_INET_XFRM_MODE_TRANSPORT=m -CONFIG_INET_XFRM_MODE_TUNNEL=m -CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=y -CONFIG_INET_DIAG=m -CONFIG_INET_TCP_DIAG=m -CONFIG_TCP_CONG_ADVANCED=y -CONFIG_TCP_CONG_BIC=m -CONFIG_TCP_CONG_CUBIC=y -CONFIG_TCP_CONG_WESTWOOD=m -CONFIG_TCP_CONG_HTCP=m -CONFIG_TCP_CONG_HSTCP=m -CONFIG_TCP_CONG_HYBLA=m -CONFIG_TCP_CONG_VEGAS=m -CONFIG_TCP_CONG_SCALABLE=m -CONFIG_TCP_CONG_LP=m -CONFIG_TCP_CONG_VENO=m -CONFIG_TCP_CONG_YEAH=m -CONFIG_TCP_CONG_ILLINOIS=m -# CONFIG_DEFAULT_BIC is not set -CONFIG_DEFAULT_CUBIC=y -# CONFIG_DEFAULT_HTCP is not set -# CONFIG_DEFAULT_VEGAS is not set -# CONFIG_DEFAULT_WESTWOOD is not set -# CONFIG_DEFAULT_RENO is not set -CONFIG_DEFAULT_TCP_CONG="cubic" -CONFIG_TCP_MD5SIG=y -CONFIG_IPV6=m -CONFIG_IPV6_PRIVACY=y -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -CONFIG_INET6_AH=m -CONFIG_INET6_ESP=m -CONFIG_INET6_IPCOMP=m -CONFIG_IPV6_MIP6=m -CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=m -CONFIG_INET6_XFRM_MODE_TRANSPORT=m -CONFIG_INET6_XFRM_MODE_TUNNEL=m -CONFIG_INET6_XFRM_MODE_BEET=m -CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m -CONFIG_IPV6_SIT=m -CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=m -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_IPV6_SUBTREES=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_PIMSM_V2=y -CONFIG_NETLABEL=y -CONFIG_NETWORK_SECMARK=y -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set -CONFIG_NETFILTER_ADVANCED=y -CONFIG_BRIDGE_NETFILTER=y - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_NETLINK=m -CONFIG_NETFILTER_NETLINK_QUEUE=m -CONFIG_NETFILTER_NETLINK_LOG=m -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CT_ACCT=y -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CT_PROTO_DCCP=m -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m -CONFIG_NF_CONNTRACK_AMANDA=m -CONFIG_NF_CONNTRACK_FTP=m -CONFIG_NF_CONNTRACK_H323=m -CONFIG_NF_CONNTRACK_IRC=m -CONFIG_NF_CONNTRACK_NETBIOS_NS=m -CONFIG_NF_CONNTRACK_PPTP=m -CONFIG_NF_CONNTRACK_SANE=m -CONFIG_NF_CONNTRACK_SIP=m -CONFIG_NF_CONNTRACK_TFTP=m -CONFIG_NF_CT_NETLINK=m -CONFIG_NETFILTER_TPROXY=m -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m -CONFIG_NETFILTER_XT_TARGET_CONNMARK=m -CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m -CONFIG_NETFILTER_XT_TARGET_LED=m -CONFIG_NETFILTER_XT_TARGET_MARK=m -CONFIG_NETFILTER_XT_TARGET_NFLOG=m -CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m -CONFIG_NETFILTER_XT_TARGET_RATEEST=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m -CONFIG_NETFILTER_XT_TARGET_SECMARK=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m -CONFIG_NETFILTER_XT_MATCH_CLUSTER=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m -CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m -CONFIG_NETFILTER_XT_MATCH_CONNMARK=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_DCCP=m -CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_NETFILTER_XT_MATCH_ESP=m -CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m -CONFIG_NETFILTER_XT_MATCH_HELPER=m -CONFIG_NETFILTER_XT_MATCH_HL=m -CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_LENGTH=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MARK=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_OWNER=m -CONFIG_NETFILTER_XT_MATCH_POLICY=m -CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m -CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m -CONFIG_NETFILTER_XT_MATCH_QUOTA=m -CONFIG_NETFILTER_XT_MATCH_RATEEST=m -CONFIG_NETFILTER_XT_MATCH_REALM=m -CONFIG_NETFILTER_XT_MATCH_RECENT=m -# CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT is not set -CONFIG_NETFILTER_XT_MATCH_SCTP=m -CONFIG_NETFILTER_XT_MATCH_SOCKET=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_STATISTIC=m -CONFIG_NETFILTER_XT_MATCH_STRING=m -CONFIG_NETFILTER_XT_MATCH_TCPMSS=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_MATCH_U32=m -CONFIG_IP_VS=m -CONFIG_IP_VS_IPV6=y -# CONFIG_IP_VS_DEBUG is not set -CONFIG_IP_VS_TAB_BITS=12 - -# -# IPVS transport protocol load balancing support -# -CONFIG_IP_VS_PROTO_TCP=y -CONFIG_IP_VS_PROTO_UDP=y -CONFIG_IP_VS_PROTO_AH_ESP=y -CONFIG_IP_VS_PROTO_ESP=y -CONFIG_IP_VS_PROTO_AH=y - -# -# IPVS scheduler -# -CONFIG_IP_VS_RR=m -CONFIG_IP_VS_WRR=m -CONFIG_IP_VS_LC=m -CONFIG_IP_VS_WLC=m -CONFIG_IP_VS_LBLC=m -CONFIG_IP_VS_LBLCR=m -CONFIG_IP_VS_DH=m -CONFIG_IP_VS_SH=m -CONFIG_IP_VS_SED=m -CONFIG_IP_VS_NQ=m - -# -# IPVS application helper -# -CONFIG_IP_VS_FTP=m - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_PROC_COMPAT=y -CONFIG_IP_NF_QUEUE=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_ADDRTYPE=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_LOG=m -CONFIG_IP_NF_TARGET_ULOG=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_NF_NAT_SNMP_BASIC=m -CONFIG_NF_NAT_PROTO_DCCP=m -CONFIG_NF_NAT_PROTO_GRE=m -CONFIG_NF_NAT_PROTO_UDPLITE=m -CONFIG_NF_NAT_PROTO_SCTP=m -CONFIG_NF_NAT_FTP=m -CONFIG_NF_NAT_IRC=m -CONFIG_NF_NAT_TFTP=m -CONFIG_NF_NAT_AMANDA=m -CONFIG_NF_NAT_PPTP=m -CONFIG_NF_NAT_H323=m -CONFIG_NF_NAT_SIP=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m -CONFIG_IP_NF_ARPTABLES=m -CONFIG_IP_NF_ARPFILTER=m -CONFIG_IP_NF_ARP_MANGLE=m - -# -# IPv6: Netfilter Configuration -# -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_IP6_NF_QUEUE=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_TARGET_LOG=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m - -# -# DECnet: Netfilter Configuration -# -CONFIG_DECNET_NF_GRABULATOR=m -CONFIG_BRIDGE_NF_EBTABLES=m -CONFIG_BRIDGE_EBT_BROUTE=m -CONFIG_BRIDGE_EBT_T_FILTER=m -CONFIG_BRIDGE_EBT_T_NAT=m -CONFIG_BRIDGE_EBT_802_3=m -CONFIG_BRIDGE_EBT_AMONG=m -CONFIG_BRIDGE_EBT_ARP=m -CONFIG_BRIDGE_EBT_IP=m -CONFIG_BRIDGE_EBT_IP6=m -CONFIG_BRIDGE_EBT_LIMIT=m -CONFIG_BRIDGE_EBT_MARK=m -CONFIG_BRIDGE_EBT_PKTTYPE=m -CONFIG_BRIDGE_EBT_STP=m -CONFIG_BRIDGE_EBT_VLAN=m -CONFIG_BRIDGE_EBT_ARPREPLY=m -CONFIG_BRIDGE_EBT_DNAT=m -CONFIG_BRIDGE_EBT_MARK_T=m -CONFIG_BRIDGE_EBT_REDIRECT=m -CONFIG_BRIDGE_EBT_SNAT=m -CONFIG_BRIDGE_EBT_LOG=m -CONFIG_BRIDGE_EBT_ULOG=m -CONFIG_BRIDGE_EBT_NFLOG=m -CONFIG_IP_DCCP=m -CONFIG_INET_DCCP_DIAG=m - -# -# DCCP CCIDs Configuration (EXPERIMENTAL) -# -# CONFIG_IP_DCCP_CCID2_DEBUG is not set -CONFIG_IP_DCCP_CCID3=y -# CONFIG_IP_DCCP_CCID3_DEBUG is not set -CONFIG_IP_DCCP_CCID3_RTO=100 -CONFIG_IP_DCCP_TFRC_LIB=y -CONFIG_IP_SCTP=m -# CONFIG_SCTP_DBG_MSG is not set -# CONFIG_SCTP_DBG_OBJCNT is not set -# CONFIG_SCTP_HMAC_NONE is not set -CONFIG_SCTP_HMAC_SHA1=y -# CONFIG_SCTP_HMAC_MD5 is not set -CONFIG_RDS=m -# CONFIG_RDS_DEBUG is not set -CONFIG_TIPC=m -# CONFIG_TIPC_ADVANCED is not set -# CONFIG_TIPC_DEBUG is not set -CONFIG_ATM=m -CONFIG_ATM_CLIP=m -# CONFIG_ATM_CLIP_NO_ICMP is not set -CONFIG_ATM_LANE=m -CONFIG_ATM_MPOA=m -CONFIG_ATM_BR2684=m -# CONFIG_ATM_BR2684_IPFILTER is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -# CONFIG_NET_DSA is not set -CONFIG_VLAN_8021Q=m -# CONFIG_VLAN_8021Q_GVRP is not set -CONFIG_DECNET=m -CONFIG_DECNET_ROUTER=y -CONFIG_LLC=m -CONFIG_LLC2=m -CONFIG_IPX=m -# CONFIG_IPX_INTERN is not set -CONFIG_ATALK=m -CONFIG_DEV_APPLETALK=m -CONFIG_LTPC=m -CONFIG_COPS=m -CONFIG_COPS_DAYNA=y -CONFIG_COPS_TANGENT=y -CONFIG_IPDDP=m -CONFIG_IPDDP_ENCAP=y -CONFIG_IPDDP_DECAP=y -CONFIG_X25=m -CONFIG_LAPB=m -CONFIG_ECONET=m -CONFIG_ECONET_AUNUDP=y -CONFIG_ECONET_NATIVE=y -CONFIG_WAN_ROUTER=m -CONFIG_PHONET=m -CONFIG_NET_SCHED=y - -# -# Queueing/Scheduling -# -CONFIG_NET_SCH_CBQ=m -CONFIG_NET_SCH_HTB=m -CONFIG_NET_SCH_HFSC=m -CONFIG_NET_SCH_ATM=m -CONFIG_NET_SCH_PRIO=m -CONFIG_NET_SCH_MULTIQ=m -CONFIG_NET_SCH_RED=m -CONFIG_NET_SCH_SFQ=m -CONFIG_NET_SCH_TEQL=m -CONFIG_NET_SCH_TBF=m -CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m -CONFIG_NET_SCH_NETEM=m -CONFIG_NET_SCH_DRR=m -CONFIG_NET_SCH_INGRESS=m - -# -# Classification -# -CONFIG_NET_CLS=y -CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m -CONFIG_NET_CLS_ROUTE4=m -CONFIG_NET_CLS_ROUTE=y -CONFIG_NET_CLS_FW=m -CONFIG_NET_CLS_U32=m -CONFIG_CLS_U32_PERF=y -CONFIG_CLS_U32_MARK=y -CONFIG_NET_CLS_RSVP=m -CONFIG_NET_CLS_RSVP6=m -CONFIG_NET_CLS_FLOW=m -CONFIG_NET_EMATCH=y -CONFIG_NET_EMATCH_STACK=32 -CONFIG_NET_EMATCH_CMP=m -CONFIG_NET_EMATCH_NBYTE=m -CONFIG_NET_EMATCH_U32=m -CONFIG_NET_EMATCH_META=m -CONFIG_NET_EMATCH_TEXT=m -CONFIG_NET_CLS_ACT=y -CONFIG_NET_ACT_POLICE=m -CONFIG_NET_ACT_GACT=m -CONFIG_GACT_PROB=y -CONFIG_NET_ACT_MIRRED=m -CONFIG_NET_ACT_IPT=m -CONFIG_NET_ACT_NAT=m -CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_ACT_SIMP=m -CONFIG_NET_ACT_SKBEDIT=m -# CONFIG_NET_CLS_IND is not set -CONFIG_NET_SCH_FIFO=y -# CONFIG_DCB is not set - -# -# Network testing -# -CONFIG_NET_PKTGEN=m -# CONFIG_NET_DROP_MONITOR is not set -# CONFIG_HAMRADIO is not set -CONFIG_CAN=m -CONFIG_CAN_RAW=m -CONFIG_CAN_BCM=m - -# -# CAN Device Drivers -# -CONFIG_CAN_VCAN=m -# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_IRDA=m - -# -# IrDA protocols -# -CONFIG_IRLAN=m -CONFIG_IRNET=m -CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y - -# -# IrDA options -# -CONFIG_IRDA_CACHE_LAST_LSAP=y -CONFIG_IRDA_FAST_RR=y -# CONFIG_IRDA_DEBUG is not set - -# -# Infrared-port device drivers -# - -# -# SIR device drivers -# -CONFIG_IRTTY_SIR=m - -# -# Dongle support -# -CONFIG_DONGLE=y -CONFIG_ESI_DONGLE=m -CONFIG_ACTISYS_DONGLE=m -CONFIG_TEKRAM_DONGLE=m -CONFIG_TOIM3232_DONGLE=m -CONFIG_LITELINK_DONGLE=m -CONFIG_MA600_DONGLE=m -CONFIG_GIRBIL_DONGLE=m -CONFIG_MCP2120_DONGLE=m -CONFIG_OLD_BELKIN_DONGLE=m -CONFIG_ACT200L_DONGLE=m -CONFIG_KINGSUN_DONGLE=m -CONFIG_KSDAZZLE_DONGLE=m -CONFIG_KS959_DONGLE=m - -# -# FIR device drivers -# -CONFIG_USB_IRDA=m -CONFIG_SIGMATEL_FIR=m -CONFIG_NSC_FIR=m -CONFIG_WINBOND_FIR=m -CONFIG_TOSHIBA_FIR=m -CONFIG_SMC_IRCC_FIR=m -CONFIG_ALI_FIR=m -CONFIG_VLSI_FIR=m -CONFIG_VIA_FIR=m -CONFIG_MCS_FIR=m -CONFIG_BT=m -CONFIG_BT_L2CAP=m -CONFIG_BT_SCO=m -CONFIG_BT_RFCOMM=m -CONFIG_BT_RFCOMM_TTY=y -CONFIG_BT_BNEP=m -CONFIG_BT_BNEP_MC_FILTER=y -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_CMTP=m -CONFIG_BT_HIDP=m - -# -# Bluetooth device drivers -# -CONFIG_BT_HCIBTUSB=m -CONFIG_BT_HCIBTSDIO=m -CONFIG_BT_HCIUART=m -CONFIG_BT_HCIUART_H4=y -CONFIG_BT_HCIUART_BCSP=y -CONFIG_BT_HCIUART_LL=y -CONFIG_BT_HCIBCM203X=m -CONFIG_BT_HCIBPA10X=m -CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIDTL1=m -CONFIG_BT_HCIBT3C=m -CONFIG_BT_HCIBLUECARD=m -CONFIG_BT_HCIBTUART=m -CONFIG_BT_HCIVHCI=m -CONFIG_AF_RXRPC=m -# CONFIG_AF_RXRPC_DEBUG is not set -CONFIG_RXKAD=m -CONFIG_FIB_RULES=y -CONFIG_WIRELESS=y -CONFIG_CFG80211=m -# CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_WIRELESS_OLD_REGULATORY=y -CONFIG_WIRELESS_EXT=y -CONFIG_WIRELESS_EXT_SYSFS=y -CONFIG_LIB80211=m -CONFIG_LIB80211_CRYPT_WEP=m -CONFIG_LIB80211_CRYPT_CCMP=m -CONFIG_LIB80211_CRYPT_TKIP=m -# CONFIG_LIB80211_DEBUG is not set -CONFIG_MAC80211=m - -# -# Rate control algorithm selection -# -CONFIG_MAC80211_RC_PID=y -CONFIG_MAC80211_RC_MINSTREL=y -CONFIG_MAC80211_RC_DEFAULT_PID=y -# CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set -CONFIG_MAC80211_RC_DEFAULT="pid" -CONFIG_MAC80211_MESH=y -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_WIMAX=m -CONFIG_WIMAX_DEBUG_LEVEL=8 -CONFIG_RFKILL=m -CONFIG_RFKILL_INPUT=m -CONFIG_RFKILL_LEDS=y -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -CONFIG_NET_9P_RDMA=m -# CONFIG_NET_9P_DEBUG is not set - -# -# Device Drivers -# - -# -# Generic Driver Options -# -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" -CONFIG_STANDALONE=y -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_FW_LOADER=m -# CONFIG_FIRMWARE_IN_KERNEL is not set -CONFIG_EXTRA_FIRMWARE="" -# CONFIG_SYS_HYPERVISOR is not set -CONFIG_CONNECTOR=m -CONFIG_MTD=m -# CONFIG_MTD_DEBUG is not set -CONFIG_MTD_CONCAT=m -CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_TESTS=m -CONFIG_MTD_REDBOOT_PARTS=m -CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 -# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set -# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set -CONFIG_MTD_AR7_PARTS=m - -# -# User Modules And Translation Layers -# -CONFIG_MTD_CHAR=m -CONFIG_HAVE_MTD_OTP=y -CONFIG_MTD_BLKDEVS=m -CONFIG_MTD_BLOCK=m -CONFIG_MTD_BLOCK_RO=m -CONFIG_FTL=m -CONFIG_NFTL=m -CONFIG_NFTL_RW=y -CONFIG_INFTL=m -CONFIG_RFD_FTL=m -CONFIG_SSFDC=m -CONFIG_MTD_OOPS=m - -# -# RAM/ROM/Flash chip drivers -# -CONFIG_MTD_CFI=m -CONFIG_MTD_JEDECPROBE=m -CONFIG_MTD_GEN_PROBE=m -# CONFIG_MTD_CFI_ADV_OPTIONS is not set -CONFIG_MTD_MAP_BANK_WIDTH_1=y -CONFIG_MTD_MAP_BANK_WIDTH_2=y -CONFIG_MTD_MAP_BANK_WIDTH_4=y -# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set -# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set -CONFIG_MTD_CFI_I1=y -CONFIG_MTD_CFI_I2=y -# CONFIG_MTD_CFI_I4 is not set -# CONFIG_MTD_CFI_I8 is not set -CONFIG_MTD_CFI_INTELEXT=m -CONFIG_MTD_CFI_AMDSTD=m -CONFIG_MTD_CFI_STAA=m -CONFIG_MTD_CFI_UTIL=m -CONFIG_MTD_RAM=m -CONFIG_MTD_ROM=m -CONFIG_MTD_ABSENT=m - -# -# Mapping drivers for chip access -# -CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=m -# CONFIG_MTD_PHYSMAP_COMPAT is not set -CONFIG_MTD_SC520CDP=m -CONFIG_MTD_NETSC520=m -CONFIG_MTD_TS5500=m -CONFIG_MTD_SBC_GXX=m -CONFIG_MTD_SCx200_DOCFLASH=m -CONFIG_MTD_AMD76XROM=m -CONFIG_MTD_ICHXROM=m -CONFIG_MTD_ESB2ROM=m -CONFIG_MTD_CK804XROM=m -CONFIG_MTD_SCB2_FLASH=m -CONFIG_MTD_NETtel=m -CONFIG_MTD_DILNETPC=m -CONFIG_MTD_DILNETPC_BOOTSIZE=0x80000 -CONFIG_MTD_L440GX=m -CONFIG_MTD_PCI=m -CONFIG_MTD_INTEL_VR_NOR=m -CONFIG_MTD_PLATRAM=m - -# -# Self-contained MTD device drivers -# -CONFIG_MTD_PMC551=m -CONFIG_MTD_PMC551_BUGFIX=y -# CONFIG_MTD_PMC551_DEBUG is not set -CONFIG_MTD_DATAFLASH=m -# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set -# CONFIG_MTD_DATAFLASH_OTP is not set -CONFIG_MTD_M25P80=m -CONFIG_M25PXX_USE_FAST_READ=y -CONFIG_MTD_SLRAM=m -CONFIG_MTD_PHRAM=m -CONFIG_MTD_MTDRAM=m -CONFIG_MTDRAM_TOTAL_SIZE=4096 -CONFIG_MTDRAM_ERASE_SIZE=128 -CONFIG_MTD_BLOCK2MTD=m - -# -# Disk-On-Chip Device Drivers -# -CONFIG_MTD_DOC2000=m -CONFIG_MTD_DOC2001=m -CONFIG_MTD_DOC2001PLUS=m -CONFIG_MTD_DOCPROBE=m -CONFIG_MTD_DOCECC=m -CONFIG_MTD_DOCPROBE_ADVANCED=y -CONFIG_MTD_DOCPROBE_ADDRESS=0x0000 -# CONFIG_MTD_DOCPROBE_HIGH is not set -# CONFIG_MTD_DOCPROBE_55AA is not set -CONFIG_MTD_NAND=m -# CONFIG_MTD_NAND_VERIFY_WRITE is not set -CONFIG_MTD_NAND_ECC_SMC=y -# CONFIG_MTD_NAND_MUSEUM_IDS is not set -CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_DISKONCHIP=m -# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set -CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0 -# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set -CONFIG_MTD_NAND_CAFE=m -CONFIG_MTD_NAND_CS553X=m -CONFIG_MTD_NAND_NANDSIM=m -CONFIG_MTD_NAND_PLATFORM=m -CONFIG_MTD_ALAUDA=m -CONFIG_MTD_ONENAND=m -# CONFIG_MTD_ONENAND_VERIFY_WRITE is not set -CONFIG_MTD_ONENAND_OTP=y -CONFIG_MTD_ONENAND_2X_PROGRAM=y -CONFIG_MTD_ONENAND_SIM=m - -# -# LPDDR flash memory drivers -# -CONFIG_MTD_LPDDR=m -CONFIG_MTD_QINFO_PROBE=m - -# -# UBI - Unsorted block images -# -CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MTD_UBI_BEB_RESERVE=1 -# CONFIG_MTD_UBI_GLUEBI is not set - -# -# UBI debugging options -# -# CONFIG_MTD_UBI_DEBUG is not set -CONFIG_PARPORT=m -CONFIG_PARPORT_PC=m -CONFIG_PARPORT_SERIAL=m -# CONFIG_PARPORT_PC_FIFO is not set -# CONFIG_PARPORT_PC_SUPERIO is not set -CONFIG_PARPORT_PC_PCMCIA=m -# CONFIG_PARPORT_GSC is not set -CONFIG_PARPORT_AX88796=m -# CONFIG_PARPORT_1284 is not set -CONFIG_PARPORT_NOT_PC=y -CONFIG_PNP=y -# CONFIG_PNP_DEBUG_MESSAGES is not set - -# -# Protocols -# -CONFIG_ISAPNP=y -CONFIG_PNPBIOS=y -# CONFIG_PNPBIOS_PROC_FS is not set -CONFIG_PNPACPI=y -CONFIG_BLK_DEV=y -CONFIG_BLK_DEV_FD=m -CONFIG_BLK_DEV_XD=m -# CONFIG_PARIDE is not set -CONFIG_BLK_CPQ_DA=m -CONFIG_BLK_CPQ_CISS_DA=m -CONFIG_CISS_SCSI_TAPE=y -CONFIG_BLK_DEV_DAC960=m -CONFIG_BLK_DEV_UMEM=m -# CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m -CONFIG_BLK_DEV_SX8=m -CONFIG_BLK_DEV_UB=m -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_BLK_DEV_XIP is not set -CONFIG_CDROM_PKTCDVD=m -CONFIG_CDROM_PKTCDVD_BUFFERS=8 -# CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_ATA_OVER_ETH=m -CONFIG_VIRTIO_BLK=m -# CONFIG_BLK_DEV_HD is not set -CONFIG_MISC_DEVICES=y -CONFIG_IBM_ASM=m -CONFIG_PHANTOM=m -CONFIG_SGI_IOC4=m -CONFIG_TIFM_CORE=m -CONFIG_TIFM_7XX1=m -CONFIG_ICS932S401=m -CONFIG_ENCLOSURE_SERVICES=m -CONFIG_HP_ILO=m -CONFIG_DELL_LAPTOP=m -CONFIG_ISL29003=m -CONFIG_C2PORT=m -CONFIG_C2PORT_DURAMAR_2150=m - -# -# EEPROM support -# -CONFIG_EEPROM_AT24=m -CONFIG_EEPROM_AT25=m -CONFIG_EEPROM_LEGACY=m -CONFIG_EEPROM_93CX6=m -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_RAID_ATTRS=m -CONFIG_SCSI=m -CONFIG_SCSI_DMA=y -CONFIG_SCSI_TGT=m -CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=m -CONFIG_CHR_DEV_ST=m -CONFIG_CHR_DEV_OSST=m -CONFIG_BLK_DEV_SR=m -CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=m -CONFIG_CHR_DEV_SCH=m -CONFIG_SCSI_ENCLOSURE=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# -CONFIG_SCSI_MULTI_LUN=y -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y -CONFIG_SCSI_WAIT_SCAN=m - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=m -CONFIG_SCSI_FC_ATTRS=m -CONFIG_SCSI_FC_TGT_ATTRS=y -CONFIG_SCSI_ISCSI_ATTRS=m -CONFIG_SCSI_SAS_ATTRS=m -CONFIG_SCSI_SAS_LIBSAS=m -CONFIG_SCSI_SAS_ATA=y -CONFIG_SCSI_SAS_HOST_SMP=y -# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set -CONFIG_SCSI_SRP_ATTRS=m -CONFIG_SCSI_SRP_TGT_ATTRS=y -CONFIG_SCSI_LOWLEVEL=y -CONFIG_ISCSI_TCP=m -CONFIG_SCSI_CXGB3_ISCSI=m -CONFIG_BLK_DEV_3W_XXXX_RAID=m -CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_7000FASST=m -CONFIG_SCSI_ACARD=m -CONFIG_SCSI_AHA152X=m -CONFIG_SCSI_AHA1542=m -CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=m -CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 -CONFIG_AIC7XXX_RESET_DELAY_MS=15000 -# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set -CONFIG_AIC7XXX_DEBUG_ENABLE=y -CONFIG_AIC7XXX_DEBUG_MASK=0 -CONFIG_AIC7XXX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC7XXX_OLD=m -CONFIG_SCSI_AIC79XX=m -CONFIG_AIC79XX_CMDS_PER_DEVICE=32 -CONFIG_AIC79XX_RESET_DELAY_MS=15000 -# CONFIG_AIC79XX_BUILD_FIRMWARE is not set -CONFIG_AIC79XX_DEBUG_ENABLE=y -CONFIG_AIC79XX_DEBUG_MASK=0 -CONFIG_AIC79XX_REG_PRETTY_PRINT=y -CONFIG_SCSI_AIC94XX=m -# CONFIG_AIC94XX_DEBUG is not set -CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m -CONFIG_SCSI_IN2000=m -CONFIG_SCSI_ARCMSR=m -CONFIG_MEGARAID_NEWGEN=y -CONFIG_MEGARAID_MM=m -CONFIG_MEGARAID_MAILBOX=m -CONFIG_MEGARAID_LEGACY=m -CONFIG_MEGARAID_SAS=m -CONFIG_SCSI_MPT2SAS=m -CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -# CONFIG_SCSI_MPT2SAS_LOGGING is not set -CONFIG_SCSI_HPTIOP=m -CONFIG_SCSI_BUSLOGIC=m -CONFIG_SCSI_FLASHPOINT=y -CONFIG_LIBFC=m -CONFIG_LIBFCOE=m -CONFIG_FCOE=m -CONFIG_FCOE_FNIC=m -CONFIG_SCSI_DMX3191D=m -CONFIG_SCSI_DTC3280=m -CONFIG_SCSI_EATA=m -# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set -# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set -CONFIG_SCSI_EATA_MAX_TAGS=16 -CONFIG_SCSI_FUTURE_DOMAIN=m -CONFIG_SCSI_GDTH=m -CONFIG_SCSI_GENERIC_NCR5380=m -CONFIG_SCSI_GENERIC_NCR5380_MMIO=m -CONFIG_SCSI_GENERIC_NCR53C400=y -CONFIG_SCSI_IPS=m -CONFIG_SCSI_INITIO=m -CONFIG_SCSI_INIA100=m -CONFIG_SCSI_PPA=m -CONFIG_SCSI_IMM=m -# CONFIG_SCSI_IZIP_EPP16 is not set -# CONFIG_SCSI_IZIP_SLOW_CTR is not set -CONFIG_SCSI_MVSAS=m -CONFIG_SCSI_NCR53C406A=m -CONFIG_SCSI_STEX=m -CONFIG_SCSI_SYM53C8XX_2=m -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y -CONFIG_SCSI_IPR=m -CONFIG_SCSI_IPR_TRACE=y -# CONFIG_SCSI_IPR_DUMP is not set -CONFIG_SCSI_PAS16=m -CONFIG_SCSI_QLOGIC_FAS=m -CONFIG_SCSI_QLOGIC_1280=m -CONFIG_SCSI_QLA_FC=m -CONFIG_SCSI_QLA_ISCSI=m -CONFIG_SCSI_LPFC=m -# CONFIG_SCSI_LPFC_DEBUG_FS is not set -CONFIG_SCSI_SYM53C416=m -CONFIG_SCSI_DC395x=m -CONFIG_SCSI_DC390T=m -CONFIG_SCSI_T128=m -CONFIG_SCSI_U14_34F=m -# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set -# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set -CONFIG_SCSI_U14_34F_MAX_TAGS=8 -CONFIG_SCSI_ULTRASTOR=m -CONFIG_SCSI_NSP32=m -CONFIG_SCSI_DEBUG=m -CONFIG_SCSI_SRP=m -CONFIG_SCSI_LOWLEVEL_PCMCIA=y -CONFIG_PCMCIA_AHA152X=m -CONFIG_PCMCIA_FDOMAIN=m -CONFIG_PCMCIA_NINJA_SCSI=m -CONFIG_PCMCIA_QLOGIC=m -CONFIG_PCMCIA_SYM53C500=m -CONFIG_SCSI_DH=m -CONFIG_SCSI_DH_RDAC=m -CONFIG_SCSI_DH_HP_SW=m -CONFIG_SCSI_DH_EMC=m -CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m -CONFIG_SCSI_OSD_ULD=m -CONFIG_SCSI_OSD_DPRINT_SENSE=1 -# CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=m -# CONFIG_ATA_NONSTANDARD is not set -CONFIG_ATA_ACPI=y -CONFIG_SATA_PMP=y -CONFIG_SATA_AHCI=m -CONFIG_SATA_SIL24=m -CONFIG_ATA_SFF=y -CONFIG_SATA_SVW=m -CONFIG_ATA_PIIX=m -CONFIG_SATA_MV=m -CONFIG_SATA_NV=m -CONFIG_PDC_ADMA=m -CONFIG_SATA_QSTOR=m -CONFIG_SATA_PROMISE=m -CONFIG_SATA_SX4=m -CONFIG_SATA_SIL=m -CONFIG_SATA_SIS=m -CONFIG_SATA_ULI=m -CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=m -CONFIG_SATA_INIC162X=m -CONFIG_PATA_ACPI=m -CONFIG_PATA_ALI=m -CONFIG_PATA_AMD=m -CONFIG_PATA_ARTOP=m -CONFIG_PATA_ATIIXP=m -CONFIG_PATA_CMD640_PCI=m -CONFIG_PATA_CMD64X=m -CONFIG_PATA_CS5520=m -CONFIG_PATA_CS5530=m -CONFIG_PATA_CS5535=m -CONFIG_PATA_CS5536=m -CONFIG_PATA_CYPRESS=m -CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m -CONFIG_PATA_HPT366=m -CONFIG_PATA_HPT37X=m -CONFIG_PATA_HPT3X2N=m -CONFIG_PATA_HPT3X3=m -CONFIG_PATA_HPT3X3_DMA=y -CONFIG_PATA_ISAPNP=m -CONFIG_PATA_IT821X=m -CONFIG_PATA_IT8213=m -CONFIG_PATA_JMICRON=m -CONFIG_PATA_LEGACY=m -CONFIG_PATA_TRIFLEX=m -CONFIG_PATA_MARVELL=m -CONFIG_PATA_MPIIX=m -CONFIG_PATA_OLDPIIX=m -CONFIG_PATA_NETCELL=m -CONFIG_PATA_NINJA32=m -CONFIG_PATA_NS87410=m -CONFIG_PATA_NS87415=m -CONFIG_PATA_OPTI=m -CONFIG_PATA_OPTIDMA=m -CONFIG_PATA_PCMCIA=m -CONFIG_PATA_PDC_OLD=m -CONFIG_PATA_QDI=m -CONFIG_PATA_RADISYS=m -CONFIG_PATA_RZ1000=m -CONFIG_PATA_SC1200=m -CONFIG_PATA_SERVERWORKS=m -CONFIG_PATA_PDC2027X=m -CONFIG_PATA_SIL680=m -CONFIG_PATA_SIS=m -CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=m -CONFIG_PATA_WINBOND_VLB=m -CONFIG_PATA_PLATFORM=m -CONFIG_PATA_SCH=m -CONFIG_MD=y -CONFIG_BLK_DEV_MD=y -# CONFIG_MD_AUTODETECT is not set -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -CONFIG_MD_RAID6_PQ=m -CONFIG_MD_MULTIPATH=m -CONFIG_MD_FAULTY=m -CONFIG_BLK_DEV_DM=m -# CONFIG_DM_DEBUG is not set -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -CONFIG_DM_MULTIPATH=m -CONFIG_DM_DELAY=m -# CONFIG_DM_UEVENT is not set -CONFIG_FUSION=y -CONFIG_FUSION_SPI=m -CONFIG_FUSION_FC=m -CONFIG_FUSION_SAS=m -CONFIG_FUSION_MAX_SGE=128 -CONFIG_FUSION_CTL=m -# CONFIG_FUSION_LOGGING is not set - -# -# IEEE 1394 (FireWire) support -# - -# -# Enable only one of the two stacks, unless you know what you are doing -# -CONFIG_FIREWIRE=m -CONFIG_FIREWIRE_OHCI=m -CONFIG_FIREWIRE_OHCI_DEBUG=y -CONFIG_FIREWIRE_SBP2=m -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_DV1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_I2O=m -CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y -CONFIG_I2O_EXT_ADAPTEC=y -CONFIG_I2O_CONFIG=m -CONFIG_I2O_CONFIG_OLD_IOCTL=y -CONFIG_I2O_BUS=m -CONFIG_I2O_BLOCK=m -CONFIG_I2O_SCSI=m -CONFIG_I2O_PROC=m -# CONFIG_MACINTOSH_DRIVERS is not set -CONFIG_NETDEVICES=y -CONFIG_COMPAT_NET_DEV_OPS=y -CONFIG_IFB=m -CONFIG_DUMMY=m -CONFIG_BONDING=m -CONFIG_MACVLAN=m -CONFIG_EQUALIZER=m -CONFIG_TUN=m -CONFIG_VETH=m -CONFIG_NET_SB1000=m -CONFIG_ARCNET=m -CONFIG_ARCNET_1201=m -CONFIG_ARCNET_1051=m -CONFIG_ARCNET_RAW=m -CONFIG_ARCNET_CAP=m -CONFIG_ARCNET_COM90xx=m -CONFIG_ARCNET_COM90xxIO=m -CONFIG_ARCNET_RIM_I=m -CONFIG_ARCNET_COM20020=m -CONFIG_ARCNET_COM20020_ISA=m -CONFIG_ARCNET_COM20020_PCI=m -CONFIG_PHYLIB=m - -# -# MII PHY device drivers -# -CONFIG_MARVELL_PHY=m -CONFIG_DAVICOM_PHY=m -CONFIG_QSEMI_PHY=m -CONFIG_LXT_PHY=m -CONFIG_CICADA_PHY=m -CONFIG_VITESSE_PHY=m -CONFIG_SMSC_PHY=m -CONFIG_BROADCOM_PHY=m -CONFIG_ICPLUS_PHY=m -CONFIG_REALTEK_PHY=m -CONFIG_NATIONAL_PHY=m -CONFIG_STE10XP=m -CONFIG_LSI_ET1011C_PHY=m -CONFIG_MDIO_BITBANG=m -CONFIG_MDIO_GPIO=m -CONFIG_NET_ETHERNET=y -CONFIG_MII=m -CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m -CONFIG_CASSINI=m -CONFIG_NET_VENDOR_3COM=y -CONFIG_EL1=m -CONFIG_EL2=m -CONFIG_ELPLUS=m -CONFIG_EL16=m -CONFIG_EL3=m -CONFIG_3C515=m -CONFIG_VORTEX=m -CONFIG_TYPHOON=m -CONFIG_LANCE=m -CONFIG_NET_VENDOR_SMC=y -CONFIG_WD80x3=m -CONFIG_ULTRA=m -CONFIG_SMC9194=m -CONFIG_ENC28J60=m -# CONFIG_ENC28J60_WRITEVERIFY is not set -CONFIG_ETHOC=m -CONFIG_NET_VENDOR_RACAL=y -CONFIG_NI52=m -CONFIG_NI65=m -CONFIG_DNET=m -CONFIG_NET_TULIP=y -CONFIG_DE2104X=m -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set -CONFIG_DE4X5=m -CONFIG_WINBOND_840=m -CONFIG_DM9102=m -CONFIG_ULI526X=m -CONFIG_PCMCIA_XIRCOM=m -CONFIG_AT1700=m -CONFIG_DEPCA=m -CONFIG_HP100=m -CONFIG_NET_ISA=y -CONFIG_E2100=m -CONFIG_EWRK3=m -CONFIG_EEXPRESS=m -CONFIG_EEXPRESS_PRO=m -CONFIG_HPLAN_PLUS=m -CONFIG_HPLAN=m -CONFIG_LP486E=m -CONFIG_ETH16I=m -CONFIG_NE2000=m -CONFIG_ZNET=m -CONFIG_SEEQ8005=m -# CONFIG_IBM_NEW_EMAC_ZMII is not set -# CONFIG_IBM_NEW_EMAC_RGMII is not set -# CONFIG_IBM_NEW_EMAC_TAH is not set -# CONFIG_IBM_NEW_EMAC_EMAC4 is not set -# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set -# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set -# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set -CONFIG_NET_PCI=y -CONFIG_PCNET32=m -CONFIG_AMD8111_ETH=m -CONFIG_ADAPTEC_STARFIRE=m -CONFIG_AC3200=m -CONFIG_APRICOT=m -CONFIG_B44=m -CONFIG_B44_PCI_AUTOSELECT=y -CONFIG_B44_PCICORE_AUTOSELECT=y -CONFIG_B44_PCI=y -CONFIG_FORCEDETH=m -# CONFIG_FORCEDETH_NAPI is not set -CONFIG_CS89x0=m -CONFIG_E100=m -CONFIG_FEALNX=m -CONFIG_NATSEMI=m -CONFIG_NE2K_PCI=m -CONFIG_8139CP=m -CONFIG_8139TOO=m -CONFIG_8139TOO_PIO=y -# CONFIG_8139TOO_TUNE_TWISTER is not set -# CONFIG_8139TOO_8129 is not set -# CONFIG_8139_OLD_RX_RESET is not set -CONFIG_R6040=m -CONFIG_SIS900=m -CONFIG_EPIC100=m -CONFIG_SMSC9420=m -CONFIG_SUNDANCE=m -# CONFIG_SUNDANCE_MMIO is not set -CONFIG_TLAN=m -CONFIG_VIA_RHINE=m -# CONFIG_VIA_RHINE_MMIO is not set -CONFIG_SC92031=m -CONFIG_NET_POCKET=y -CONFIG_ATP=m -CONFIG_DE600=m -CONFIG_DE620=m -CONFIG_ATL2=m -CONFIG_NETDEV_1000=y -CONFIG_ACENIC=m -# CONFIG_ACENIC_OMIT_TIGON_I is not set -CONFIG_DL2K=m -CONFIG_E1000=m -CONFIG_E1000E=m -CONFIG_IP1000=m -CONFIG_IGB=m -CONFIG_IGBVF=m -CONFIG_NS83820=m -CONFIG_HAMACHI=m -CONFIG_YELLOWFIN=m -CONFIG_R8169=m -CONFIG_R8169_VLAN=y -CONFIG_SIS190=m -CONFIG_SKGE=m -# CONFIG_SKGE_DEBUG is not set -CONFIG_SKY2=m -# CONFIG_SKY2_DEBUG is not set -CONFIG_VIA_VELOCITY=m -CONFIG_TIGON3=m -CONFIG_BNX2=m -CONFIG_QLA3XXX=m -CONFIG_ATL1=m -CONFIG_ATL1E=m -CONFIG_ATL1C=m -CONFIG_JME=m -CONFIG_NETDEV_10000=y -CONFIG_CHELSIO_T1=m -CONFIG_CHELSIO_T1_1G=y -CONFIG_CHELSIO_T3_DEPENDS=y -CONFIG_CHELSIO_T3=m -CONFIG_ENIC=m -CONFIG_IXGBE=m -CONFIG_IXGB=m -CONFIG_S2IO=m -CONFIG_VXGE=m -# CONFIG_VXGE_DEBUG_TRACE_ALL is not set -CONFIG_MYRI10GE=m -CONFIG_NETXEN_NIC=m -CONFIG_NIU=m -CONFIG_MLX4_EN=m -CONFIG_MLX4_CORE=m -CONFIG_MLX4_DEBUG=y -CONFIG_TEHUTI=m -CONFIG_BNX2X=m -CONFIG_QLGE=m -CONFIG_SFC=m -CONFIG_SFC_MTD=y -CONFIG_BE2NET=m -# CONFIG_TR is not set - -# -# Wireless LAN -# -CONFIG_WLAN_PRE80211=y -CONFIG_STRIP=m -CONFIG_ARLAN=m -CONFIG_WAVELAN=m -CONFIG_PCMCIA_WAVELAN=m -CONFIG_PCMCIA_NETWAVE=m -CONFIG_WLAN_80211=y -CONFIG_PCMCIA_RAYCS=m -CONFIG_LIBERTAS=m -CONFIG_LIBERTAS_USB=m -CONFIG_LIBERTAS_CS=m -CONFIG_LIBERTAS_SDIO=m -CONFIG_LIBERTAS_SPI=m -# CONFIG_LIBERTAS_DEBUG is not set -CONFIG_LIBERTAS_THINFIRM=m -CONFIG_LIBERTAS_THINFIRM_USB=m -CONFIG_AIRO=m -CONFIG_ATMEL=m -CONFIG_PCI_ATMEL=m -CONFIG_PCMCIA_ATMEL=m -CONFIG_AT76C50X_USB=m -CONFIG_AIRO_CS=m -CONFIG_PCMCIA_WL3501=m -CONFIG_PRISM54=m -CONFIG_USB_ZD1201=m -CONFIG_USB_NET_RNDIS_WLAN=m -CONFIG_RTL8180=m -CONFIG_RTL8187=m -CONFIG_ADM8211=m -CONFIG_MAC80211_HWSIM=m -CONFIG_MWL8K=m -CONFIG_P54_COMMON=m -CONFIG_P54_USB=m -CONFIG_P54_PCI=m -CONFIG_P54_SPI=m -CONFIG_P54_LEDS=y -CONFIG_ATH5K=m -# CONFIG_ATH5K_DEBUG is not set -CONFIG_ATH9K=m -# CONFIG_ATH9K_DEBUG is not set -CONFIG_AR9170_USB=m -CONFIG_AR9170_LEDS=y -CONFIG_IPW2100=m -CONFIG_IPW2100_MONITOR=y -# CONFIG_IPW2100_DEBUG is not set -CONFIG_IPW2200=m -CONFIG_IPW2200_MONITOR=y -CONFIG_IPW2200_RADIOTAP=y -CONFIG_IPW2200_PROMISCUOUS=y -CONFIG_IPW2200_QOS=y -# CONFIG_IPW2200_DEBUG is not set -CONFIG_LIBIPW=m -# CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_RFKILL is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set -CONFIG_HOSTAP=m -CONFIG_HOSTAP_FIRMWARE=y -CONFIG_HOSTAP_FIRMWARE_NVRAM=y -CONFIG_HOSTAP_PLX=m -CONFIG_HOSTAP_PCI=m -CONFIG_HOSTAP_CS=m -CONFIG_B43=m -CONFIG_B43_PCI_AUTOSELECT=y -CONFIG_B43_PCICORE_AUTOSELECT=y -CONFIG_B43_PCMCIA=y -CONFIG_B43_PIO=y -CONFIG_B43_LEDS=y -CONFIG_B43_RFKILL=y -# CONFIG_B43_DEBUG is not set -CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_PCI_AUTOSELECT=y -CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y -CONFIG_B43LEGACY_LEDS=y -CONFIG_B43LEGACY_RFKILL=y -CONFIG_B43LEGACY_DEBUG=y -CONFIG_B43LEGACY_DMA=y -CONFIG_B43LEGACY_PIO=y -CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y -# CONFIG_B43LEGACY_DMA_MODE is not set -# CONFIG_B43LEGACY_PIO_MODE is not set -CONFIG_ZD1211RW=m -# CONFIG_ZD1211RW_DEBUG is not set -CONFIG_RT2X00=m -CONFIG_RT2400PCI=m -CONFIG_RT2500PCI=m -CONFIG_RT61PCI=m -CONFIG_RT2500USB=m -CONFIG_RT73USB=m -CONFIG_RT2X00_LIB_PCI=m -CONFIG_RT2X00_LIB_USB=m -CONFIG_RT2X00_LIB=m -CONFIG_RT2X00_LIB_FIRMWARE=y -CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_RFKILL=y -CONFIG_RT2X00_LIB_LEDS=y -# CONFIG_RT2X00_DEBUG is not set -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m - -# -# WiMAX Wireless Broadband devices -# -CONFIG_WIMAX_I2400M=m -CONFIG_WIMAX_I2400M_USB=m -CONFIG_WIMAX_I2400M_SDIO=m -CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 - -# -# USB Network Adapters -# -CONFIG_USB_CATC=m -CONFIG_USB_KAWETH=m -CONFIG_USB_PEGASUS=m -CONFIG_USB_RTL8150=m -CONFIG_USB_USBNET=m -CONFIG_USB_NET_AX8817X=m -CONFIG_USB_NET_CDCETHER=m -CONFIG_USB_NET_CDC_EEM=m -CONFIG_USB_NET_DM9601=m -CONFIG_USB_NET_SMSC95XX=m -CONFIG_USB_NET_GL620A=m -CONFIG_USB_NET_NET1080=m -CONFIG_USB_NET_PLUSB=m -CONFIG_USB_NET_MCS7830=m -CONFIG_USB_NET_RNDIS_HOST=m -CONFIG_USB_NET_CDC_SUBSET=m -CONFIG_USB_ALI_M5632=y -CONFIG_USB_AN2720=y -CONFIG_USB_BELKIN=y -CONFIG_USB_ARMLINUX=y -CONFIG_USB_EPSON2888=y -CONFIG_USB_KC2190=y -CONFIG_USB_NET_ZAURUS=m -CONFIG_USB_HSO=m -CONFIG_NET_PCMCIA=y -CONFIG_PCMCIA_3C589=m -CONFIG_PCMCIA_3C574=m -CONFIG_PCMCIA_FMVJ18X=m -CONFIG_PCMCIA_PCNET=m -CONFIG_PCMCIA_NMCLAN=m -CONFIG_PCMCIA_SMC91C92=m -CONFIG_PCMCIA_XIRC2PS=m -CONFIG_PCMCIA_AXNET=m -CONFIG_ARCNET_COM20020_CS=m -CONFIG_WAN=y -CONFIG_HOSTESS_SV11=m -CONFIG_COSA=m -CONFIG_LANMEDIA=m -CONFIG_SEALEVEL_4021=m -CONFIG_HDLC=m -CONFIG_HDLC_RAW=m -CONFIG_HDLC_RAW_ETH=m -CONFIG_HDLC_CISCO=m -CONFIG_HDLC_FR=m -CONFIG_HDLC_PPP=m -CONFIG_HDLC_X25=m -CONFIG_PCI200SYN=m -CONFIG_WANXL=m -# CONFIG_WANXL_BUILD_FIRMWARE is not set -CONFIG_PC300TOO=m -CONFIG_N2=m -CONFIG_C101=m -CONFIG_FARSYNC=m -CONFIG_DSCC4=m -CONFIG_DSCC4_PCISYNC=y -CONFIG_DSCC4_PCI_RST=y -CONFIG_DLCI=m -CONFIG_DLCI_MAX=8 -CONFIG_SDLA=m -CONFIG_WAN_ROUTER_DRIVERS=m -CONFIG_CYCLADES_SYNC=m -CONFIG_CYCLOMX_X25=y -CONFIG_LAPBETHER=m -CONFIG_X25_ASY=m -CONFIG_SBNI=m -CONFIG_SBNI_MULTILINE=y -CONFIG_ATM_DRIVERS=y -CONFIG_ATM_DUMMY=m -CONFIG_ATM_TCP=m -CONFIG_ATM_LANAI=m -CONFIG_ATM_ENI=m -# CONFIG_ATM_ENI_DEBUG is not set -# CONFIG_ATM_ENI_TUNE_BURST is not set -CONFIG_ATM_FIRESTREAM=m -CONFIG_ATM_ZATM=m -# CONFIG_ATM_ZATM_DEBUG is not set -CONFIG_ATM_NICSTAR=m -CONFIG_ATM_NICSTAR_USE_SUNI=y -CONFIG_ATM_NICSTAR_USE_IDT77105=y -CONFIG_ATM_IDT77252=m -# CONFIG_ATM_IDT77252_DEBUG is not set -# CONFIG_ATM_IDT77252_RCV_ALL is not set -CONFIG_ATM_IDT77252_USE_SUNI=y -CONFIG_ATM_AMBASSADOR=m -# CONFIG_ATM_AMBASSADOR_DEBUG is not set -CONFIG_ATM_HORIZON=m -# CONFIG_ATM_HORIZON_DEBUG is not set -CONFIG_ATM_IA=m -# CONFIG_ATM_IA_DEBUG is not set -CONFIG_ATM_FORE200E=m -CONFIG_ATM_FORE200E_USE_TASKLET=y -CONFIG_ATM_FORE200E_TX_RETRY=16 -CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m -CONFIG_ATM_HE_USE_SUNI=y -CONFIG_ATM_SOLOS=m -CONFIG_FDDI=y -CONFIG_DEFXX=m -# CONFIG_DEFXX_MMIO is not set -CONFIG_SKFP=m -CONFIG_HIPPI=y -CONFIG_ROADRUNNER=m -# CONFIG_ROADRUNNER_LARGE_RINGS is not set -CONFIG_PLIP=m -CONFIG_PPP=m -CONFIG_PPP_MULTILINK=y -CONFIG_PPP_FILTER=y -CONFIG_PPP_ASYNC=m -CONFIG_PPP_SYNC_TTY=m -CONFIG_PPP_DEFLATE=m -CONFIG_PPP_BSDCOMP=m -CONFIG_PPP_MPPE=m -CONFIG_PPPOE=m -CONFIG_PPPOATM=m -CONFIG_PPPOL2TP=m -CONFIG_SLIP=m -CONFIG_SLIP_COMPRESSED=y -CONFIG_SLHC=m -CONFIG_SLIP_SMART=y -CONFIG_SLIP_MODE_SLIP6=y -# CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y -CONFIG_VIRTIO_NET=m -CONFIG_ISDN=y -CONFIG_MISDN=m -CONFIG_MISDN_DSP=m -CONFIG_MISDN_L1OIP=m - -# -# mISDN hardware drivers -# -CONFIG_MISDN_HFCPCI=m -CONFIG_MISDN_HFCMULTI=m -CONFIG_MISDN_HFCUSB=m -# CONFIG_ISDN_I4L is not set -CONFIG_ISDN_CAPI=m -# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set -# CONFIG_CAPI_TRACE is not set -CONFIG_ISDN_CAPI_MIDDLEWARE=y -CONFIG_ISDN_CAPI_CAPI20=m -CONFIG_ISDN_CAPI_CAPIFS_BOOL=y -CONFIG_ISDN_CAPI_CAPIFS=m - -# -# CAPI hardware drivers -# -CONFIG_CAPI_AVM=y -CONFIG_ISDN_DRV_AVMB1_B1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCI=m -CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y -CONFIG_ISDN_DRV_AVMB1_T1ISA=m -CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m -CONFIG_ISDN_DRV_AVMB1_AVM_CS=m -CONFIG_ISDN_DRV_AVMB1_T1PCI=m -CONFIG_ISDN_DRV_AVMB1_C4=m -CONFIG_CAPI_EICON=y -CONFIG_ISDN_DIVAS=m -CONFIG_ISDN_DIVAS_BRIPCI=y -CONFIG_ISDN_DIVAS_PRIPCI=y -CONFIG_ISDN_DIVAS_DIVACAPI=m -CONFIG_ISDN_DIVAS_USERIDI=m -CONFIG_ISDN_DIVAS_MAINT=m -CONFIG_PHONE=m -CONFIG_PHONE_IXJ=m -CONFIG_PHONE_IXJ_PCMCIA=m - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_FF_MEMLESS=m -CONFIG_INPUT_POLLDEV=m - -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=m -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=m -CONFIG_INPUT_EVDEV=m -CONFIG_INPUT_EVBUG=m - -# -# Input Device Drivers -# -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -CONFIG_KEYBOARD_SUNKBD=m -CONFIG_KEYBOARD_LKKBD=m -CONFIG_KEYBOARD_XTKBD=m -CONFIG_KEYBOARD_NEWTON=m -CONFIG_KEYBOARD_STOWAWAY=m -CONFIG_KEYBOARD_GPIO=m -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=m -CONFIG_MOUSE_PS2_ALPS=y -CONFIG_MOUSE_PS2_LOGIPS2PP=y -CONFIG_MOUSE_PS2_SYNAPTICS=y -CONFIG_MOUSE_PS2_LIFEBOOK=y -CONFIG_MOUSE_PS2_TRACKPOINT=y -# CONFIG_MOUSE_PS2_ELANTECH is not set -# CONFIG_MOUSE_PS2_TOUCHKIT is not set -CONFIG_MOUSE_SERIAL=m -CONFIG_MOUSE_APPLETOUCH=m -CONFIG_MOUSE_BCM5974=m -CONFIG_MOUSE_INPORT=m -# CONFIG_MOUSE_ATIXL is not set -CONFIG_MOUSE_LOGIBM=m -CONFIG_MOUSE_PC110PAD=m -CONFIG_MOUSE_VSXXXAA=m -CONFIG_MOUSE_GPIO=m -CONFIG_INPUT_JOYSTICK=y -CONFIG_JOYSTICK_ANALOG=m -CONFIG_JOYSTICK_A3D=m -CONFIG_JOYSTICK_ADI=m -CONFIG_JOYSTICK_COBRA=m -CONFIG_JOYSTICK_GF2K=m -CONFIG_JOYSTICK_GRIP=m -CONFIG_JOYSTICK_GRIP_MP=m -CONFIG_JOYSTICK_GUILLEMOT=m -CONFIG_JOYSTICK_INTERACT=m -CONFIG_JOYSTICK_SIDEWINDER=m -CONFIG_JOYSTICK_TMDC=m -CONFIG_JOYSTICK_IFORCE=m -CONFIG_JOYSTICK_IFORCE_USB=y -CONFIG_JOYSTICK_IFORCE_232=y -CONFIG_JOYSTICK_WARRIOR=m -CONFIG_JOYSTICK_MAGELLAN=m -CONFIG_JOYSTICK_SPACEORB=m -CONFIG_JOYSTICK_SPACEBALL=m -CONFIG_JOYSTICK_STINGER=m -CONFIG_JOYSTICK_TWIDJOY=m -CONFIG_JOYSTICK_ZHENHUA=m -CONFIG_JOYSTICK_DB9=m -CONFIG_JOYSTICK_GAMECON=m -CONFIG_JOYSTICK_TURBOGRAFX=m -CONFIG_JOYSTICK_JOYDUMP=m -CONFIG_JOYSTICK_XPAD=m -# CONFIG_JOYSTICK_XPAD_FF is not set -# CONFIG_JOYSTICK_XPAD_LEDS is not set -CONFIG_JOYSTICK_WALKERA0701=m -CONFIG_INPUT_TABLET=y -CONFIG_TABLET_USB_ACECAD=m -CONFIG_TABLET_USB_AIPTEK=m -CONFIG_TABLET_USB_GTCO=m -CONFIG_TABLET_USB_KBTAB=m -CONFIG_TABLET_USB_WACOM=m -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ADS7846=m -CONFIG_TOUCHSCREEN_AD7877=m -CONFIG_TOUCHSCREEN_AD7879_I2C=m -CONFIG_TOUCHSCREEN_AD7879=m -CONFIG_TOUCHSCREEN_FUJITSU=m -CONFIG_TOUCHSCREEN_GUNZE=m -CONFIG_TOUCHSCREEN_ELO=m -CONFIG_TOUCHSCREEN_WACOM_W8001=m -CONFIG_TOUCHSCREEN_MTOUCH=m -CONFIG_TOUCHSCREEN_INEXIO=m -CONFIG_TOUCHSCREEN_MK712=m -CONFIG_TOUCHSCREEN_HTCPEN=m -CONFIG_TOUCHSCREEN_PENMOUNT=m -CONFIG_TOUCHSCREEN_TOUCHRIGHT=m -CONFIG_TOUCHSCREEN_TOUCHWIN=m -CONFIG_TOUCHSCREEN_UCB1400=m -CONFIG_TOUCHSCREEN_WM97XX=m -CONFIG_TOUCHSCREEN_WM9705=y -CONFIG_TOUCHSCREEN_WM9712=y -CONFIG_TOUCHSCREEN_WM9713=y -CONFIG_TOUCHSCREEN_USB_COMPOSITE=m -CONFIG_TOUCHSCREEN_USB_EGALAX=y -CONFIG_TOUCHSCREEN_USB_PANJIT=y -CONFIG_TOUCHSCREEN_USB_3M=y -CONFIG_TOUCHSCREEN_USB_ITM=y -CONFIG_TOUCHSCREEN_USB_ETURBO=y -CONFIG_TOUCHSCREEN_USB_GUNZE=y -CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y -CONFIG_TOUCHSCREEN_USB_IRTOUCH=y -CONFIG_TOUCHSCREEN_USB_IDEALTEK=y -CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y -CONFIG_TOUCHSCREEN_USB_GOTOP=y -CONFIG_TOUCHSCREEN_TOUCHIT213=m -CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_INPUT_MISC=y -CONFIG_INPUT_PCSPKR=m -CONFIG_INPUT_APANEL=m -CONFIG_INPUT_WISTRON_BTNS=m -CONFIG_INPUT_ATLAS_BTNS=m -CONFIG_INPUT_ATI_REMOTE=m -CONFIG_INPUT_ATI_REMOTE2=m -CONFIG_INPUT_KEYSPAN_REMOTE=m -CONFIG_INPUT_POWERMATE=m -CONFIG_INPUT_YEALINK=m -CONFIG_INPUT_CM109=m -CONFIG_INPUT_UINPUT=m -CONFIG_INPUT_PCF50633_PMU=m -CONFIG_INPUT_GPIO_ROTARY_ENCODER=m - -# -# Hardware I/O ports -# -CONFIG_SERIO=y -CONFIG_SERIO_I8042=y -CONFIG_SERIO_SERPORT=m -CONFIG_SERIO_CT82C710=m -CONFIG_SERIO_PARKBD=m -CONFIG_SERIO_PCIPS2=m -CONFIG_SERIO_LIBPS2=y -CONFIG_SERIO_RAW=m -CONFIG_GAMEPORT=m -CONFIG_GAMEPORT_NS558=m -CONFIG_GAMEPORT_L4=m -CONFIG_GAMEPORT_EMU10K1=m -CONFIG_GAMEPORT_FM801=m - -# -# Character devices -# -CONFIG_VT=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_VT_CONSOLE=y -CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set -# CONFIG_DEVKMEM is not set -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_COMPUTONE=m -CONFIG_ROCKETPORT=m -CONFIG_CYCLADES=m -# CONFIG_CYZ_INTR is not set -CONFIG_DIGIEPCA=m -CONFIG_MOXA_INTELLIO=m -CONFIG_MOXA_SMARTIO=m -CONFIG_ISI=m -CONFIG_SYNCLINK=m -CONFIG_SYNCLINKMP=m -CONFIG_SYNCLINK_GT=m -CONFIG_N_HDLC=m -CONFIG_RISCOM8=m -CONFIG_SPECIALIX=m -CONFIG_SX=m -CONFIG_RIO=m -CONFIG_RIO_OLDPCI=y -CONFIG_STALDRV=y -CONFIG_STALLION=m -CONFIG_ISTALLION=m -CONFIG_NOZOMI=m - -# -# Serial drivers -# -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_PNP=y -CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_8250_NR_UARTS=16 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -CONFIG_SERIAL_8250_EXTENDED=y -CONFIG_SERIAL_8250_MANY_PORTS=y -CONFIG_SERIAL_8250_FOURPORT=m -CONFIG_SERIAL_8250_ACCENT=m -CONFIG_SERIAL_8250_BOCA=m -CONFIG_SERIAL_8250_EXAR_ST16C554=m -CONFIG_SERIAL_8250_HUB6=m -CONFIG_SERIAL_8250_SHARE_IRQ=y -# CONFIG_SERIAL_8250_DETECT_IRQ is not set -CONFIG_SERIAL_8250_RSA=y - -# -# Non-8250 serial port support -# -CONFIG_SERIAL_MAX3100=m -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_JSM=m -CONFIG_UNIX98_PTYS=y -# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_LEGACY_PTYS is not set -CONFIG_PRINTER=m -# CONFIG_LP_CONSOLE is not set -CONFIG_PPDEV=m -CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=m -CONFIG_IPMI_HANDLER=m -# CONFIG_IPMI_PANIC_EVENT is not set -CONFIG_IPMI_DEVICE_INTERFACE=m -CONFIG_IPMI_SI=m -CONFIG_IPMI_WATCHDOG=m -CONFIG_IPMI_POWEROFF=m -CONFIG_HW_RANDOM=m -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_AMD=m -CONFIG_HW_RANDOM_GEODE=m -CONFIG_HW_RANDOM_VIA=m -CONFIG_HW_RANDOM_VIRTIO=m -CONFIG_NVRAM=m -CONFIG_DTLK=m -CONFIG_R3964=m -CONFIG_APPLICOM=m -CONFIG_SONYPI=m - -# -# PCMCIA character devices -# -CONFIG_SYNCLINK_CS=m -CONFIG_CARDMAN_4000=m -CONFIG_CARDMAN_4040=m -CONFIG_IPWIRELESS=m -CONFIG_MWAVE=m -CONFIG_SCx200_GPIO=m -CONFIG_PC8736x_GPIO=m -CONFIG_NSC_GPIO=m -CONFIG_CS5535_GPIO=m -CONFIG_RAW_DRIVER=m -CONFIG_MAX_RAW_DEVS=256 -CONFIG_HPET=y -CONFIG_HPET_MMAP=y -CONFIG_HANGCHECK_TIMER=m -CONFIG_TCG_TPM=m -CONFIG_TCG_TIS=m -CONFIG_TCG_NSC=m -CONFIG_TCG_ATMEL=m -CONFIG_TCG_INFINEON=m -CONFIG_TELCLOCK=m -CONFIG_DEVPORT=y -CONFIG_I2C=m -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=m -CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=m -CONFIG_I2C_ALGOPCA=m - -# -# I2C Hardware Bus support -# - -# -# PC SMBus host controller drivers -# -CONFIG_I2C_ALI1535=m -CONFIG_I2C_ALI1563=m -CONFIG_I2C_ALI15X3=m -CONFIG_I2C_AMD756=m -CONFIG_I2C_AMD756_S4882=m -CONFIG_I2C_AMD8111=m -CONFIG_I2C_I801=m -CONFIG_I2C_ISCH=m -CONFIG_I2C_PIIX4=m -CONFIG_I2C_NFORCE2=m -CONFIG_I2C_NFORCE2_S4985=m -CONFIG_I2C_SIS5595=m -CONFIG_I2C_SIS630=m -CONFIG_I2C_SIS96X=m -CONFIG_I2C_VIA=m -CONFIG_I2C_VIAPRO=m - -# -# I2C system bus drivers (mostly embedded / system-on-chip) -# -CONFIG_I2C_GPIO=m -CONFIG_I2C_OCORES=m -CONFIG_I2C_SIMTEC=m - -# -# External I2C/SMBus adapter drivers -# -CONFIG_I2C_PARPORT=m -CONFIG_I2C_PARPORT_LIGHT=m -CONFIG_I2C_TAOS_EVM=m -CONFIG_I2C_TINY_USB=m - -# -# Graphics adapter I2C/DDC channel drivers -# -CONFIG_I2C_VOODOO3=m - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_PCA_ISA=m -CONFIG_I2C_PCA_PLATFORM=m -CONFIG_I2C_STUB=m -CONFIG_SCx200_I2C=m -CONFIG_SCx200_I2C_SCL=12 -CONFIG_SCx200_I2C_SDA=13 -CONFIG_SCx200_ACB=m - -# -# Miscellaneous I2C Chip support -# -CONFIG_DS1682=m -CONFIG_SENSORS_MAX6875=m -CONFIG_SENSORS_TSL2550=m -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set -CONFIG_SPI=y -CONFIG_SPI_MASTER=y - -# -# SPI Master Controller Drivers -# -CONFIG_SPI_BITBANG=m -CONFIG_SPI_BUTTERFLY=m -CONFIG_SPI_GPIO=m -CONFIG_SPI_LM70_LLP=m - -# -# SPI Protocol Masters -# -CONFIG_SPI_SPIDEV=m -CONFIG_SPI_TLE62X0=m -CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y -CONFIG_GPIOLIB=y -# CONFIG_GPIO_SYSFS is not set - -# -# Memory mapped GPIO expanders: -# - -# -# I2C GPIO expanders: -# -CONFIG_GPIO_MAX732X=m -CONFIG_GPIO_PCA953X=m -CONFIG_GPIO_PCF857X=m - -# -# PCI GPIO expanders: -# - -# -# SPI GPIO expanders: -# -CONFIG_GPIO_MAX7301=m -CONFIG_GPIO_MCP23S08=m -CONFIG_W1=m -CONFIG_W1_CON=y - -# -# 1-wire Bus Masters -# -CONFIG_W1_MASTER_MATROX=m -CONFIG_W1_MASTER_DS2490=m -CONFIG_W1_MASTER_DS2482=m -CONFIG_W1_MASTER_GPIO=m - -# -# 1-wire Slaves -# -CONFIG_W1_SLAVE_THERM=m -CONFIG_W1_SLAVE_SMEM=m -CONFIG_W1_SLAVE_DS2431=m -CONFIG_W1_SLAVE_DS2433=m -# CONFIG_W1_SLAVE_DS2433_CRC is not set -CONFIG_W1_SLAVE_DS2760=m -CONFIG_W1_SLAVE_BQ27000=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -CONFIG_PDA_POWER=m -CONFIG_WM8350_POWER=m -CONFIG_BATTERY_DS2760=m -CONFIG_BATTERY_BQ27x00=m -CONFIG_CHARGER_PCF50633=m -CONFIG_HWMON=m -CONFIG_HWMON_VID=m -CONFIG_SENSORS_ABITUGURU=m -CONFIG_SENSORS_ABITUGURU3=m -CONFIG_SENSORS_AD7414=m -CONFIG_SENSORS_AD7418=m -CONFIG_SENSORS_ADCXX=m -CONFIG_SENSORS_ADM1021=m -CONFIG_SENSORS_ADM1025=m -CONFIG_SENSORS_ADM1026=m -CONFIG_SENSORS_ADM1029=m -CONFIG_SENSORS_ADM1031=m -CONFIG_SENSORS_ADM9240=m -CONFIG_SENSORS_ADT7462=m -CONFIG_SENSORS_ADT7470=m -CONFIG_SENSORS_ADT7473=m -CONFIG_SENSORS_ADT7475=m -CONFIG_SENSORS_K8TEMP=m -CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATK0110=m -CONFIG_SENSORS_ATXP1=m -CONFIG_SENSORS_DS1621=m -CONFIG_SENSORS_I5K_AMB=m -CONFIG_SENSORS_F71805F=m -CONFIG_SENSORS_F71882FG=m -CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m -CONFIG_SENSORS_FSCHMD=m -CONFIG_SENSORS_G760A=m -CONFIG_SENSORS_GL518SM=m -CONFIG_SENSORS_GL520SM=m -CONFIG_SENSORS_CORETEMP=m -CONFIG_SENSORS_IBMAEM=m -CONFIG_SENSORS_IBMPEX=m -CONFIG_SENSORS_IT87=m -CONFIG_SENSORS_LM63=m -CONFIG_SENSORS_LM70=m -CONFIG_SENSORS_LM75=m -CONFIG_SENSORS_LM77=m -CONFIG_SENSORS_LM78=m -CONFIG_SENSORS_LM80=m -CONFIG_SENSORS_LM83=m -CONFIG_SENSORS_LM85=m -CONFIG_SENSORS_LM87=m -CONFIG_SENSORS_LM90=m -CONFIG_SENSORS_LM92=m -CONFIG_SENSORS_LM93=m -CONFIG_SENSORS_LTC4215=m -CONFIG_SENSORS_LTC4245=m -CONFIG_SENSORS_LM95241=m -CONFIG_SENSORS_MAX1111=m -CONFIG_SENSORS_MAX1619=m -CONFIG_SENSORS_MAX6650=m -CONFIG_SENSORS_PC87360=m -CONFIG_SENSORS_PC87427=m -CONFIG_SENSORS_PCF8591=m -CONFIG_SENSORS_SHT15=m -CONFIG_SENSORS_SIS5595=m -CONFIG_SENSORS_DME1737=m -CONFIG_SENSORS_SMSC47M1=m -CONFIG_SENSORS_SMSC47M192=m -CONFIG_SENSORS_SMSC47B397=m -CONFIG_SENSORS_ADS7828=m -CONFIG_SENSORS_THMC50=m -CONFIG_SENSORS_VIA686A=m -CONFIG_SENSORS_VT1211=m -CONFIG_SENSORS_VT8231=m -CONFIG_SENSORS_W83781D=m -CONFIG_SENSORS_W83791D=m -CONFIG_SENSORS_W83792D=m -CONFIG_SENSORS_W83793=m -CONFIG_SENSORS_W83L785TS=m -CONFIG_SENSORS_W83L786NG=m -CONFIG_SENSORS_W83627HF=m -CONFIG_SENSORS_W83627EHF=m -CONFIG_SENSORS_HDAPS=m -CONFIG_SENSORS_LIS3LV02D=m -CONFIG_SENSORS_APPLESMC=m -# CONFIG_HWMON_DEBUG_CHIP is not set -CONFIG_THERMAL=y -CONFIG_WATCHDOG=y -# CONFIG_WATCHDOG_NOWAYOUT is not set - -# -# Watchdog Device Drivers -# -CONFIG_SOFT_WATCHDOG=m -CONFIG_WM8350_WATCHDOG=m -CONFIG_ACQUIRE_WDT=m -CONFIG_ADVANTECH_WDT=m -CONFIG_ALIM1535_WDT=m -CONFIG_ALIM7101_WDT=m -CONFIG_SC520_WDT=m -CONFIG_EUROTECH_WDT=m -CONFIG_IB700_WDT=m -CONFIG_IBMASR=m -CONFIG_WAFER_WDT=m -CONFIG_I6300ESB_WDT=m -CONFIG_ITCO_WDT=m -CONFIG_ITCO_VENDOR_SUPPORT=y -CONFIG_IT8712F_WDT=m -CONFIG_IT87_WDT=m -CONFIG_HP_WATCHDOG=m -CONFIG_SC1200_WDT=m -CONFIG_SCx200_WDT=m -CONFIG_PC87413_WDT=m -CONFIG_60XX_WDT=m -CONFIG_SBC8360_WDT=m -CONFIG_SBC7240_WDT=m -CONFIG_CPU5_WDT=m -CONFIG_SMSC_SCH311X_WDT=m -CONFIG_SMSC37B787_WDT=m -CONFIG_W83627HF_WDT=m -CONFIG_W83697HF_WDT=m -CONFIG_W83697UG_WDT=m -CONFIG_W83877F_WDT=m -CONFIG_W83977F_WDT=m -CONFIG_MACHZ_WDT=m -CONFIG_SBC_EPX_C3_WATCHDOG=m - -# -# ISA-based Watchdog Cards -# -CONFIG_PCWATCHDOG=m -CONFIG_MIXCOMWD=m -CONFIG_WDT=m - -# -# PCI-based Watchdog Cards -# -CONFIG_PCIPCWATCHDOG=m -CONFIG_WDTPCI=m -CONFIG_WDT_501_PCI=y - -# -# USB-based Watchdog Cards -# -CONFIG_USBPCWATCHDOG=m -CONFIG_SSB_POSSIBLE=y - -# -# Sonics Silicon Backplane -# -CONFIG_SSB=m -CONFIG_SSB_SPROM=y -CONFIG_SSB_BLOCKIO=y -CONFIG_SSB_PCIHOST_POSSIBLE=y -CONFIG_SSB_PCIHOST=y -CONFIG_SSB_B43_PCI_BRIDGE=y -CONFIG_SSB_PCMCIAHOST_POSSIBLE=y -CONFIG_SSB_PCMCIAHOST=y -# CONFIG_SSB_SILENT is not set -# CONFIG_SSB_DEBUG is not set -CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y -CONFIG_SSB_DRIVER_PCICORE=y - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=m -CONFIG_MFD_SM501=m -# CONFIG_MFD_SM501_GPIO is not set -CONFIG_HTC_PASIC3=m -CONFIG_UCB1400_CORE=m -CONFIG_TPS65010=m -# CONFIG_MFD_TMIO is not set -CONFIG_MFD_WM8400=m -CONFIG_MFD_WM8350=m -CONFIG_MFD_WM8350_I2C=m -CONFIG_MFD_PCF50633=m -CONFIG_PCF50633_ADC=m -CONFIG_PCF50633_GPIO=m -CONFIG_REGULATOR=y -# CONFIG_REGULATOR_DEBUG is not set -# CONFIG_REGULATOR_FIXED_VOLTAGE is not set -CONFIG_REGULATOR_VIRTUAL_CONSUMER=m -CONFIG_REGULATOR_BQ24022=m -CONFIG_REGULATOR_WM8350=m -CONFIG_REGULATOR_WM8400=m -CONFIG_REGULATOR_PCF50633=m - -# -# Multimedia devices -# - -# -# Multimedia core support -# -CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2_COMMON=m -CONFIG_VIDEO_ALLOW_V4L1=y -CONFIG_VIDEO_V4L1_COMPAT=y -CONFIG_DVB_CORE=m -CONFIG_VIDEO_MEDIA=m - -# -# Multimedia drivers -# -CONFIG_VIDEO_SAA7146=m -CONFIG_VIDEO_SAA7146_VV=m -# CONFIG_MEDIA_ATTACH is not set -CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMISE is not set -CONFIG_MEDIA_TUNER_SIMPLE=m -CONFIG_MEDIA_TUNER_TDA8290=m -CONFIG_MEDIA_TUNER_TDA827X=m -CONFIG_MEDIA_TUNER_TDA18271=m -CONFIG_MEDIA_TUNER_TDA9887=m -CONFIG_MEDIA_TUNER_TEA5761=m -CONFIG_MEDIA_TUNER_TEA5767=m -CONFIG_MEDIA_TUNER_MT20XX=m -CONFIG_MEDIA_TUNER_MT2060=m -CONFIG_MEDIA_TUNER_MT2266=m -CONFIG_MEDIA_TUNER_MT2131=m -CONFIG_MEDIA_TUNER_QT1010=m -CONFIG_MEDIA_TUNER_XC2028=m -CONFIG_MEDIA_TUNER_XC5000=m -CONFIG_MEDIA_TUNER_MXL5005S=m -CONFIG_MEDIA_TUNER_MXL5007T=m -CONFIG_MEDIA_TUNER_MC44S803=m -CONFIG_VIDEO_V4L2=m -CONFIG_VIDEO_V4L1=m -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_VMALLOC=m -CONFIG_VIDEOBUF_DVB=m -CONFIG_VIDEO_BTCX=m -CONFIG_VIDEO_IR=m -CONFIG_VIDEO_TVEEPROM=m -CONFIG_VIDEO_TUNER=m -CONFIG_VIDEO_CAPTURE_DRIVERS=y -# CONFIG_VIDEO_ADV_DEBUG is not set -# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -CONFIG_VIDEO_IR_I2C=m - -# -# Encoders/decoders and other helper chips -# - -# -# Audio decoders -# -CONFIG_VIDEO_TVAUDIO=m -CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TDA9875=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m -CONFIG_VIDEO_MSP3400=m -CONFIG_VIDEO_CS5345=m -CONFIG_VIDEO_CS53L32A=m -CONFIG_VIDEO_M52790=m -CONFIG_VIDEO_TLV320AIC23B=m -CONFIG_VIDEO_WM8775=m -CONFIG_VIDEO_WM8739=m -CONFIG_VIDEO_VP27SMPX=m - -# -# RDS decoders -# -CONFIG_VIDEO_SAA6588=m - -# -# Video decoders -# -CONFIG_VIDEO_BT819=m -CONFIG_VIDEO_BT856=m -CONFIG_VIDEO_BT866=m -CONFIG_VIDEO_KS0127=m -CONFIG_VIDEO_OV7670=m -CONFIG_VIDEO_TCM825X=m -CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA711X=m -CONFIG_VIDEO_SAA717X=m -CONFIG_VIDEO_SAA7191=m -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m -CONFIG_VIDEO_VPX3220=m - -# -# Video and audio decoders -# -CONFIG_VIDEO_CX25840=m - -# -# MPEG video encoders -# -CONFIG_VIDEO_CX2341X=m - -# -# Video encoders -# -CONFIG_VIDEO_SAA7127=m -CONFIG_VIDEO_SAA7185=m -CONFIG_VIDEO_ADV7170=m -CONFIG_VIDEO_ADV7175=m - -# -# Video improvement chips -# -CONFIG_VIDEO_UPD64031A=m -CONFIG_VIDEO_UPD64083=m -CONFIG_VIDEO_VIVI=m -CONFIG_VIDEO_BT848=m -CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_PMS=m -CONFIG_VIDEO_BWQCAM=m -CONFIG_VIDEO_CQCAM=m -CONFIG_VIDEO_CPIA=m -CONFIG_VIDEO_CPIA_USB=m -CONFIG_VIDEO_CPIA2=m -CONFIG_VIDEO_SAA5246A=m -CONFIG_VIDEO_SAA5249=m -CONFIG_VIDEO_STRADIS=m -CONFIG_VIDEO_ZORAN=m -CONFIG_VIDEO_ZORAN_DC30=m -CONFIG_VIDEO_ZORAN_ZR36060=m -CONFIG_VIDEO_ZORAN_BUZ=m -CONFIG_VIDEO_ZORAN_DC10=m -CONFIG_VIDEO_ZORAN_LML33=m -CONFIG_VIDEO_ZORAN_LML33R10=m -CONFIG_VIDEO_ZORAN_AVS6EYES=m -CONFIG_VIDEO_MEYE=m -CONFIG_VIDEO_SAA7134=m -CONFIG_VIDEO_SAA7134_ALSA=m -CONFIG_VIDEO_SAA7134_DVB=m -CONFIG_VIDEO_MXB=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_CX88=m -CONFIG_VIDEO_CX88_ALSA=m -CONFIG_VIDEO_CX88_BLACKBIRD=m -CONFIG_VIDEO_CX88_DVB=m -CONFIG_VIDEO_CX88_MPEG=m -CONFIG_VIDEO_CX88_VP3054=m -CONFIG_VIDEO_CX23885=m -CONFIG_VIDEO_AU0828=m -CONFIG_VIDEO_IVTV=m -CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_CX18=m -CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_SOC_CAMERA=m -CONFIG_SOC_CAMERA_MT9M001=m -CONFIG_SOC_CAMERA_MT9M111=m -CONFIG_SOC_CAMERA_MT9T031=m -CONFIG_SOC_CAMERA_MT9V022=m -CONFIG_SOC_CAMERA_TW9910=m -CONFIG_SOC_CAMERA_PLATFORM=m -CONFIG_SOC_CAMERA_OV772X=m -CONFIG_V4L_USB_DRIVERS=y -CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y -CONFIG_USB_GSPCA=m -CONFIG_USB_M5602=m -CONFIG_USB_STV06XX=m -CONFIG_USB_GSPCA_CONEX=m -CONFIG_USB_GSPCA_ETOMS=m -CONFIG_USB_GSPCA_FINEPIX=m -CONFIG_USB_GSPCA_MARS=m -CONFIG_USB_GSPCA_MR97310A=m -CONFIG_USB_GSPCA_OV519=m -CONFIG_USB_GSPCA_OV534=m -CONFIG_USB_GSPCA_PAC207=m -CONFIG_USB_GSPCA_PAC7311=m -CONFIG_USB_GSPCA_SONIXB=m -CONFIG_USB_GSPCA_SONIXJ=m -CONFIG_USB_GSPCA_SPCA500=m -CONFIG_USB_GSPCA_SPCA501=m -CONFIG_USB_GSPCA_SPCA505=m -CONFIG_USB_GSPCA_SPCA506=m -CONFIG_USB_GSPCA_SPCA508=m -CONFIG_USB_GSPCA_SPCA561=m -CONFIG_USB_GSPCA_SQ905=m -CONFIG_USB_GSPCA_SQ905C=m -CONFIG_USB_GSPCA_STK014=m -CONFIG_USB_GSPCA_SUNPLUS=m -CONFIG_USB_GSPCA_T613=m -CONFIG_USB_GSPCA_TV8532=m -CONFIG_USB_GSPCA_VC032X=m -CONFIG_USB_GSPCA_ZC3XX=m -CONFIG_VIDEO_PVRUSB2=m -CONFIG_VIDEO_PVRUSB2_SYSFS=y -CONFIG_VIDEO_PVRUSB2_DVB=y -# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set -CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_EM28XX=m -CONFIG_VIDEO_EM28XX_ALSA=m -CONFIG_VIDEO_EM28XX_DVB=m -CONFIG_VIDEO_CX231XX=m -CONFIG_VIDEO_CX231XX_ALSA=m -CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_USBVIDEO=m -CONFIG_USB_VICAM=m -CONFIG_USB_IBMCAM=m -CONFIG_USB_KONICAWC=m -CONFIG_USB_QUICKCAM_MESSENGER=m -CONFIG_USB_ET61X251=m -CONFIG_VIDEO_OVCAMCHIP=m -CONFIG_USB_W9968CF=m -CONFIG_USB_OV511=m -CONFIG_USB_SE401=m -CONFIG_USB_SN9C102=m -CONFIG_USB_STV680=m -CONFIG_USB_ZC0301=m -CONFIG_USB_PWC=m -# CONFIG_USB_PWC_DEBUG is not set -CONFIG_USB_PWC_INPUT_EVDEV=y -CONFIG_USB_ZR364XX=m -CONFIG_USB_STKWEBCAM=m -CONFIG_USB_S2255=m -CONFIG_RADIO_ADAPTERS=y -CONFIG_RADIO_CADET=m -CONFIG_RADIO_RTRACK=m -CONFIG_RADIO_RTRACK2=m -CONFIG_RADIO_AZTECH=m -CONFIG_RADIO_GEMTEK=m -CONFIG_RADIO_GEMTEK_PCI=m -CONFIG_RADIO_MAXIRADIO=m -CONFIG_RADIO_MAESTRO=m -CONFIG_RADIO_SF16FMI=m -CONFIG_RADIO_SF16FMR2=m -CONFIG_RADIO_TERRATEC=m -CONFIG_RADIO_TRUST=m -CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_TYPHOON_PROC_FS=y -CONFIG_RADIO_ZOLTRIX=m -CONFIG_USB_DSBR=m -CONFIG_USB_SI470X=m -CONFIG_USB_MR800=m -CONFIG_RADIO_TEA5764=m -# CONFIG_DVB_DYNAMIC_MINORS is not set -CONFIG_DVB_CAPTURE_DRIVERS=y - -# -# Supported SAA7146 based PCI Adapters -# -CONFIG_TTPCI_EEPROM=m -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - -# -# Supported USB Adapters -# -CONFIG_DVB_USB=m -# CONFIG_DVB_USB_DEBUG is not set -CONFIG_DVB_USB_A800=m -CONFIG_DVB_USB_DIBUSB_MB=m -# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set -CONFIG_DVB_USB_DIBUSB_MC=m -CONFIG_DVB_USB_DIB0700=m -CONFIG_DVB_USB_UMT_010=m -CONFIG_DVB_USB_CXUSB=m -CONFIG_DVB_USB_M920X=m -CONFIG_DVB_USB_GL861=m -CONFIG_DVB_USB_AU6610=m -CONFIG_DVB_USB_DIGITV=m -CONFIG_DVB_USB_VP7045=m -CONFIG_DVB_USB_VP702X=m -CONFIG_DVB_USB_GP8PSK=m -CONFIG_DVB_USB_NOVA_T_USB2=m -CONFIG_DVB_USB_TTUSB2=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_OPERA1=m -CONFIG_DVB_USB_AF9005=m -CONFIG_DVB_USB_AF9005_REMOTE=m -CONFIG_DVB_USB_DW2102=m -CONFIG_DVB_USB_CINERGY_T2=m -CONFIG_DVB_USB_ANYSEE=m -CONFIG_DVB_USB_DTV5100=m -CONFIG_DVB_USB_AF9015=m -CONFIG_DVB_USB_CE6230=m -CONFIG_DVB_TTUSB_BUDGET=m -CONFIG_DVB_TTUSB_DEC=m -CONFIG_DVB_SIANO_SMS1XXX=m -CONFIG_DVB_SIANO_SMS1XXX_SMS_IDS=y - -# -# Supported FlexCopII (B2C2) Adapters -# -CONFIG_DVB_B2C2_FLEXCOP=m -CONFIG_DVB_B2C2_FLEXCOP_PCI=m -CONFIG_DVB_B2C2_FLEXCOP_USB=m -# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set - -# -# Supported BT878 Adapters -# -CONFIG_DVB_BT8XX=m - -# -# Supported Pluto2 Adapters -# -CONFIG_DVB_PLUTO2=m - -# -# Supported SDMC DM1105 Adapters -# -CONFIG_DVB_DM1105=m - -# -# Supported FireWire (IEEE 1394) Adapters -# -CONFIG_DVB_FIREDTV=m -CONFIG_DVB_FIREDTV_IEEE1394=y -CONFIG_DVB_FIREDTV_INPUT=y - -# -# Supported DVB Frontends -# -# CONFIG_DVB_FE_CUSTOMISE is not set -CONFIG_DVB_STB0899=m -CONFIG_DVB_STB6100=m -CONFIG_DVB_CX24110=m -CONFIG_DVB_CX24123=m -CONFIG_DVB_MT312=m -CONFIG_DVB_ZL10036=m -CONFIG_DVB_S5H1420=m -CONFIG_DVB_STV0288=m -CONFIG_DVB_STB6000=m -CONFIG_DVB_STV0299=m -CONFIG_DVB_STV6110=m -CONFIG_DVB_STV0900=m -CONFIG_DVB_TDA8083=m -CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m -CONFIG_DVB_TUNER_ITD1000=m -CONFIG_DVB_TUNER_CX24113=m -CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m -CONFIG_DVB_CX24116=m -CONFIG_DVB_SI21XX=m -CONFIG_DVB_SP8870=m -CONFIG_DVB_SP887X=m -CONFIG_DVB_CX22700=m -CONFIG_DVB_CX22702=m -CONFIG_DVB_L64781=m -CONFIG_DVB_TDA1004X=m -CONFIG_DVB_NXT6000=m -CONFIG_DVB_MT352=m -CONFIG_DVB_ZL10353=m -CONFIG_DVB_DIB3000MB=m -CONFIG_DVB_DIB3000MC=m -CONFIG_DVB_DIB7000M=m -CONFIG_DVB_DIB7000P=m -CONFIG_DVB_TDA10048=m -CONFIG_DVB_AF9013=m -CONFIG_DVB_VES1820=m -CONFIG_DVB_TDA10021=m -CONFIG_DVB_TDA10023=m -CONFIG_DVB_STV0297=m -CONFIG_DVB_NXT200X=m -CONFIG_DVB_OR51211=m -CONFIG_DVB_OR51132=m -CONFIG_DVB_BCM3510=m -CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3305=m -CONFIG_DVB_S5H1409=m -CONFIG_DVB_AU8522=m -CONFIG_DVB_S5H1411=m -CONFIG_DVB_PLL=m -CONFIG_DVB_TUNER_DIB0070=m -CONFIG_DVB_LNBP21=m -CONFIG_DVB_ISL6405=m -CONFIG_DVB_ISL6421=m -CONFIG_DVB_LGS8GL5=m -CONFIG_DAB=y -CONFIG_USB_DABUSB=m - -# -# Graphics support -# -CONFIG_AGP=m -CONFIG_AGP_ALI=m -CONFIG_AGP_ATI=m -CONFIG_AGP_AMD=m -CONFIG_AGP_AMD64=m -CONFIG_AGP_INTEL=m -CONFIG_AGP_NVIDIA=m -CONFIG_AGP_SIS=m -CONFIG_AGP_SWORKS=m -CONFIG_AGP_VIA=m -CONFIG_AGP_EFFICEON=m -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_I810=m -CONFIG_DRM_I830=m -CONFIG_DRM_I915=m -# CONFIG_DRM_I915_KMS is not set -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_DRM_VIA=m -CONFIG_DRM_SAVAGE=m -CONFIG_VGASTATE=m -CONFIG_VIDEO_OUTPUT_CONTROL=m -CONFIG_FB=m -# CONFIG_FIRMWARE_EDID is not set -CONFIG_FB_DDC=m -CONFIG_FB_BOOT_VESA_SUPPORT=y -CONFIG_FB_CFB_FILLRECT=m -CONFIG_FB_CFB_COPYAREA=m -CONFIG_FB_CFB_IMAGEBLIT=m -# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set -CONFIG_FB_SYS_FILLRECT=m -CONFIG_FB_SYS_COPYAREA=m -CONFIG_FB_SYS_IMAGEBLIT=m -# CONFIG_FB_FOREIGN_ENDIAN is not set -CONFIG_FB_SYS_FOPS=m -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_HECUBA=m -CONFIG_FB_SVGALIB=m -# CONFIG_FB_MACMODES is not set -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_FB_TILEBLITTING=y - -# -# Frame buffer hardware drivers -# -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_ARC=m -CONFIG_FB_VGA16=m -CONFIG_FB_UVESA=m -CONFIG_FB_N411=m -CONFIG_FB_HGA=m -# CONFIG_FB_HGA_ACCEL is not set -CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_I810=m -CONFIG_FB_I810_GTF=y -CONFIG_FB_I810_I2C=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m -CONFIG_FB_INTEL=m -# CONFIG_FB_INTEL_DEBUG is not set -CONFIG_FB_INTEL_I2C=y -CONFIG_FB_MATROX=m -CONFIG_FB_MATROX_MILLENIUM=y -CONFIG_FB_MATROX_MYSTIQUE=y -CONFIG_FB_MATROX_G=y -CONFIG_FB_MATROX_I2C=m -CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_MATROX_MULTIHEAD=y -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y -CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m -CONFIG_FB_ARK=m -CONFIG_FB_PM3=m -CONFIG_FB_CARMINE=m -CONFIG_FB_CARMINE_DRAM_EVAL=y -# CONFIG_CARMINE_DRAM_CUSTOM is not set -CONFIG_FB_GEODE=y -CONFIG_FB_GEODE_LX=m -CONFIG_FB_GEODE_GX=m -CONFIG_FB_GEODE_GX1=m -CONFIG_FB_TMIO=m -CONFIG_FB_TMIO_ACCELL=y -CONFIG_FB_SM501=m -# CONFIG_FB_VIRTUAL is not set -CONFIG_FB_METRONOME=m -CONFIG_FB_MB862XX=m -# CONFIG_FB_MB862XX_PCI_GDC is not set -CONFIG_FB_BROADSHEET=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_LTV350QV=m -CONFIG_LCD_ILI9320=m -CONFIG_LCD_TDO24M=m -CONFIG_LCD_VGG2432A4=m -CONFIG_LCD_PLATFORM=m -CONFIG_BACKLIGHT_CLASS_DEVICE=m -CONFIG_BACKLIGHT_GENERIC=m -CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m -CONFIG_BACKLIGHT_MBP_NVIDIA=m -CONFIG_BACKLIGHT_SAHARA=m - -# -# Display device support -# -CONFIG_DISPLAY_SUPPORT=m - -# -# Display hardware drivers -# - -# -# Console display driver support -# -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set -CONFIG_MDA_CONSOLE=m -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=m -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -# CONFIG_FONTS is not set -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y -# CONFIG_LOGO is not set -CONFIG_SOUND=m -CONFIG_SOUND_OSS_CORE=y -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_JACK=y -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m -CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m -CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_HRTIMER=m -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -CONFIG_SND_DYNAMIC_MINORS=y -# CONFIG_SND_SUPPORT_OLD_API is not set -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_VMASTER=y -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_OPL4_LIB=m -CONFIG_SND_VX_LIB=m -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_DRIVERS=y -CONFIG_SND_PCSP=m -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_MTS64=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m -CONFIG_SND_PORTMAN2X4=m -CONFIG_SND_AC97_POWER_SAVE=y -CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0 -CONFIG_SND_WSS_LIB=m -CONFIG_SND_SB_COMMON=m -CONFIG_SND_SB8_DSP=m -CONFIG_SND_SB16_DSP=m -CONFIG_SND_ISA=y -CONFIG_SND_ADLIB=m -CONFIG_SND_AD1816A=m -CONFIG_SND_AD1848=m -CONFIG_SND_ALS100=m -CONFIG_SND_AZT2320=m -CONFIG_SND_CMI8330=m -CONFIG_SND_CS4231=m -CONFIG_SND_CS4236=m -CONFIG_SND_DT019X=m -CONFIG_SND_ES968=m -CONFIG_SND_ES1688=m -CONFIG_SND_ES18XX=m -CONFIG_SND_SC6000=m -CONFIG_SND_GUSCLASSIC=m -CONFIG_SND_GUSEXTREME=m -CONFIG_SND_GUSMAX=m -CONFIG_SND_INTERWAVE=m -CONFIG_SND_INTERWAVE_STB=m -CONFIG_SND_OPL3SA2=m -CONFIG_SND_OPTI92X_AD1848=m -CONFIG_SND_OPTI92X_CS4231=m -CONFIG_SND_OPTI93X=m -CONFIG_SND_MIRO=m -CONFIG_SND_SB8=m -CONFIG_SND_SB16=m -CONFIG_SND_SBAWE=m -CONFIG_SND_SB16_CSP=y -CONFIG_SND_SGALAXY=m -CONFIG_SND_SSCAPE=m -CONFIG_SND_WAVEFRONT=m -CONFIG_SND_MSND_PINNACLE=m -CONFIG_SND_MSND_CLASSIC=m -CONFIG_SND_PCI=y -CONFIG_SND_AD1889=m -CONFIG_SND_ALS300=m -CONFIG_SND_ALS4000=m -CONFIG_SND_ALI5451=m -CONFIG_SND_ATIIXP=m -CONFIG_SND_ATIIXP_MODEM=m -CONFIG_SND_AU8810=m -CONFIG_SND_AU8820=m -CONFIG_SND_AU8830=m -CONFIG_SND_AW2=m -CONFIG_SND_AZT3328=m -CONFIG_SND_BT87X=m -# CONFIG_SND_BT87X_OVERCLOCK is not set -CONFIG_SND_CA0106=m -CONFIG_SND_CMIPCI=m -CONFIG_SND_OXYGEN_LIB=m -CONFIG_SND_OXYGEN=m -CONFIG_SND_CS4281=m -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS5530=m -CONFIG_SND_CS5535AUDIO=m -CONFIG_SND_DARLA20=m -CONFIG_SND_GINA20=m -CONFIG_SND_LAYLA20=m -CONFIG_SND_DARLA24=m -CONFIG_SND_GINA24=m -CONFIG_SND_LAYLA24=m -CONFIG_SND_MONA=m -CONFIG_SND_MIA=m -CONFIG_SND_ECHO3G=m -CONFIG_SND_INDIGO=m -CONFIG_SND_INDIGOIO=m -CONFIG_SND_INDIGODJ=m -CONFIG_SND_INDIGOIOX=m -CONFIG_SND_INDIGODJX=m -CONFIG_SND_EMU10K1=m -CONFIG_SND_EMU10K1X=m -CONFIG_SND_ENS1370=m -CONFIG_SND_ENS1371=m -CONFIG_SND_ES1938=m -CONFIG_SND_ES1968=m -CONFIG_SND_FM801=m -# CONFIG_SND_FM801_TEA575X_BOOL is not set -CONFIG_SND_HDA_INTEL=m -CONFIG_SND_HDA_HWDEP=y -# CONFIG_SND_HDA_RECONFIG is not set -CONFIG_SND_HDA_INPUT_BEEP=y -CONFIG_SND_HDA_CODEC_REALTEK=y -CONFIG_SND_HDA_CODEC_ANALOG=y -CONFIG_SND_HDA_CODEC_SIGMATEL=y -CONFIG_SND_HDA_CODEC_VIA=y -CONFIG_SND_HDA_CODEC_ATIHDMI=y -CONFIG_SND_HDA_CODEC_NVHDMI=y -CONFIG_SND_HDA_CODEC_INTELHDMI=y -CONFIG_SND_HDA_ELD=y -CONFIG_SND_HDA_CODEC_CONEXANT=y -CONFIG_SND_HDA_CODEC_CMEDIA=y -CONFIG_SND_HDA_CODEC_SI3054=y -CONFIG_SND_HDA_GENERIC=y -# CONFIG_SND_HDA_POWER_SAVE is not set -CONFIG_SND_HDSP=m -CONFIG_SND_HDSPM=m -CONFIG_SND_HIFIER=m -CONFIG_SND_ICE1712=m -CONFIG_SND_ICE1724=m -CONFIG_SND_INTEL8X0=m -CONFIG_SND_INTEL8X0M=m -CONFIG_SND_KORG1212=m -CONFIG_SND_MAESTRO3=m -CONFIG_SND_MIXART=m -CONFIG_SND_NM256=m -CONFIG_SND_PCXHR=m -CONFIG_SND_RIPTIDE=m -CONFIG_SND_RME32=m -CONFIG_SND_RME96=m -CONFIG_SND_RME9652=m -CONFIG_SND_SIS7019=m -CONFIG_SND_SONICVIBES=m -CONFIG_SND_TRIDENT=m -CONFIG_SND_VIA82XX=m -CONFIG_SND_VIA82XX_MODEM=m -CONFIG_SND_VIRTUOSO=m -CONFIG_SND_VX222=m -CONFIG_SND_YMFPCI=m -CONFIG_SND_SPI=y -CONFIG_SND_USB=y -CONFIG_SND_USB_AUDIO=m -CONFIG_SND_USB_USX2Y=m -CONFIG_SND_USB_CAIAQ=m -# CONFIG_SND_USB_CAIAQ_INPUT is not set -CONFIG_SND_USB_US122L=m -CONFIG_SND_PCMCIA=y -CONFIG_SND_VXPOCKET=m -CONFIG_SND_PDAUDIOCF=m -CONFIG_SND_SOC=m -CONFIG_SND_SOC_I2C_AND_SPI=m -CONFIG_SND_SOC_ALL_CODECS=m -CONFIG_SND_SOC_AD73311=m -CONFIG_SND_SOC_AK4104=m -CONFIG_SND_SOC_AK4535=m -CONFIG_SND_SOC_CS4270=m -CONFIG_SND_SOC_L3=m -CONFIG_SND_SOC_PCM3008=m -CONFIG_SND_SOC_SSM2602=m -CONFIG_SND_SOC_TLV320AIC23=m -CONFIG_SND_SOC_TLV320AIC26=m -CONFIG_SND_SOC_TLV320AIC3X=m -CONFIG_SND_SOC_UDA134X=m -CONFIG_SND_SOC_UDA1380=m -CONFIG_SND_SOC_WM8350=m -CONFIG_SND_SOC_WM8400=m -CONFIG_SND_SOC_WM8510=m -CONFIG_SND_SOC_WM8580=m -CONFIG_SND_SOC_WM8728=m -CONFIG_SND_SOC_WM8731=m -CONFIG_SND_SOC_WM8750=m -CONFIG_SND_SOC_WM8753=m -CONFIG_SND_SOC_WM8900=m -CONFIG_SND_SOC_WM8903=m -CONFIG_SND_SOC_WM8971=m -CONFIG_SND_SOC_WM8990=m -# CONFIG_SOUND_PRIME is not set -CONFIG_AC97_BUS=m -CONFIG_HID_SUPPORT=y -CONFIG_HID=m -# CONFIG_HID_DEBUG is not set -CONFIG_HIDRAW=y - -# -# USB Input Devices -# -CONFIG_USB_HID=m -# CONFIG_HID_PID is not set -# CONFIG_USB_HIDDEV is not set - -# -# USB HID Boot Protocol drivers -# -CONFIG_USB_KBD=m -CONFIG_USB_MOUSE=m - -# -# Special HID drivers -# -CONFIG_HID_A4TECH=m -CONFIG_HID_APPLE=m -CONFIG_HID_BELKIN=m -CONFIG_HID_CHERRY=m -CONFIG_HID_CHICONY=m -CONFIG_HID_CYPRESS=m -CONFIG_DRAGONRISE_FF=m -CONFIG_HID_EZKEY=m -CONFIG_HID_KYE=m -CONFIG_HID_GYRATION=m -CONFIG_HID_KENSINGTON=m -CONFIG_HID_LOGITECH=m -# CONFIG_LOGITECH_FF is not set -# CONFIG_LOGIRUMBLEPAD2_FF is not set -CONFIG_HID_MICROSOFT=m -CONFIG_HID_MONTEREY=m -CONFIG_HID_NTRIG=m -CONFIG_HID_PANTHERLORD=m -# CONFIG_PANTHERLORD_FF is not set -CONFIG_HID_PETALYNX=m -CONFIG_HID_SAMSUNG=m -CONFIG_HID_SONY=m -CONFIG_HID_SUNPLUS=m -CONFIG_GREENASIA_FF=m -CONFIG_HID_TOPSEED=m -CONFIG_THRUSTMASTER_FF=m -CONFIG_ZEROPLUS_FF=m -CONFIG_USB_SUPPORT=y -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB_ARCH_HAS_EHCI=y -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEVICEFS=y -CONFIG_USB_DEVICE_CLASS=y -# CONFIG_USB_DYNAMIC_MINORS is not set -# CONFIG_USB_SUSPEND is not set -# CONFIG_USB_OTG is not set -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -CONFIG_USB_MON=m -CONFIG_USB_WUSB=m -CONFIG_USB_WUSB_CBAF=m -# CONFIG_USB_WUSB_CBAF_DEBUG is not set - -# -# USB Host Controller Drivers -# -CONFIG_USB_C67X00_HCD=m -CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -# CONFIG_USB_EHCI_TT_NEWSCHED is not set -CONFIG_USB_OXU210HP_HCD=m -CONFIG_USB_ISP116X_HCD=m -CONFIG_USB_ISP1760_HCD=m -CONFIG_USB_OHCI_HCD=m -CONFIG_USB_OHCI_HCD_SSB=y -# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m -CONFIG_USB_U132_HCD=m -CONFIG_USB_SL811_HCD=m -CONFIG_USB_SL811_CS=m -CONFIG_USB_R8A66597_HCD=m -CONFIG_USB_WHCI_HCD=m -CONFIG_USB_HWA_HCD=m - -# -# Enable Host or Gadget support to see Inventra options -# - -# -# USB Device Class drivers -# -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -CONFIG_USB_WDM=m -CONFIG_USB_TMC=m - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=m -CONFIG_USB_STORAGE_FREECOM=m -CONFIG_USB_STORAGE_ISD200=m -CONFIG_USB_STORAGE_USBAT=m -CONFIG_USB_STORAGE_SDDR09=m -CONFIG_USB_STORAGE_SDDR55=m -CONFIG_USB_STORAGE_JUMPSHOT=m -CONFIG_USB_STORAGE_ALAUDA=m -CONFIG_USB_STORAGE_ONETOUCH=m -CONFIG_USB_STORAGE_KARMA=m -CONFIG_USB_STORAGE_CYPRESS_ATACB=m -CONFIG_USB_LIBUSUAL=y - -# -# USB Imaging devices -# -CONFIG_USB_MDC800=m -CONFIG_USB_MICROTEK=m - -# -# USB port drivers -# -CONFIG_USB_USS720=m -CONFIG_USB_SERIAL=m -CONFIG_USB_EZUSB=y -CONFIG_USB_SERIAL_GENERIC=y -CONFIG_USB_SERIAL_AIRCABLE=m -CONFIG_USB_SERIAL_ARK3116=m -CONFIG_USB_SERIAL_BELKIN=m -CONFIG_USB_SERIAL_CH341=m -CONFIG_USB_SERIAL_WHITEHEAT=m -CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP210X=m -CONFIG_USB_SERIAL_CYPRESS_M8=m -CONFIG_USB_SERIAL_EMPEG=m -CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m -CONFIG_USB_SERIAL_VISOR=m -CONFIG_USB_SERIAL_IPAQ=m -CONFIG_USB_SERIAL_IR=m -CONFIG_USB_SERIAL_EDGEPORT=m -CONFIG_USB_SERIAL_EDGEPORT_TI=m -CONFIG_USB_SERIAL_GARMIN=m -CONFIG_USB_SERIAL_IPW=m -CONFIG_USB_SERIAL_IUU=m -CONFIG_USB_SERIAL_KEYSPAN_PDA=m -CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KLSI=m -CONFIG_USB_SERIAL_KOBIL_SCT=m -CONFIG_USB_SERIAL_MCT_U232=m -CONFIG_USB_SERIAL_MOS7720=m -CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=m -CONFIG_USB_SERIAL_NAVMAN=m -CONFIG_USB_SERIAL_PL2303=m -CONFIG_USB_SERIAL_OTI6858=m -CONFIG_USB_SERIAL_QUALCOMM=m -CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_HP4X=m -CONFIG_USB_SERIAL_SAFE=m -CONFIG_USB_SERIAL_SAFE_PADDED=y -CONFIG_USB_SERIAL_SIEMENS_MPI=m -CONFIG_USB_SERIAL_SIERRAWIRELESS=m -CONFIG_USB_SERIAL_SYMBOL=m -CONFIG_USB_SERIAL_TI=m -CONFIG_USB_SERIAL_CYBERJACK=m -CONFIG_USB_SERIAL_XIRCOM=m -CONFIG_USB_SERIAL_OPTION=m -CONFIG_USB_SERIAL_OMNINET=m -CONFIG_USB_SERIAL_OPTICON=m -CONFIG_USB_SERIAL_DEBUG=m - -# -# USB Miscellaneous drivers -# -CONFIG_USB_EMI62=m -CONFIG_USB_EMI26=m -CONFIG_USB_ADUTUX=m -CONFIG_USB_SEVSEG=m -CONFIG_USB_RIO500=m -CONFIG_USB_LEGOTOWER=m -CONFIG_USB_LCD=m -CONFIG_USB_BERRY_CHARGE=m -CONFIG_USB_LED=m -CONFIG_USB_CYPRESS_CY7C63=m -CONFIG_USB_CYTHERM=m -CONFIG_USB_IDMOUSE=m -CONFIG_USB_FTDI_ELAN=m -CONFIG_USB_APPLEDISPLAY=m -CONFIG_USB_SISUSBVGA=m -CONFIG_USB_SISUSBVGA_CON=y -CONFIG_USB_LD=m -CONFIG_USB_TRANCEVIBRATOR=m -CONFIG_USB_IOWARRIOR=m -CONFIG_USB_TEST=m -CONFIG_USB_ISIGHTFW=m -CONFIG_USB_VST=m -CONFIG_USB_ATM=m -CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_CXACRU=m -CONFIG_USB_UEAGLEATM=m -CONFIG_USB_XUSBATM=m -# CONFIG_USB_GADGET is not set - -# -# OTG and related infrastructure -# -CONFIG_USB_OTG_UTILS=y -CONFIG_USB_GPIO_VBUS=m -CONFIG_NOP_USB_XCEIV=m -CONFIG_UWB=m -CONFIG_UWB_HWA=m -CONFIG_UWB_WHCI=m -CONFIG_UWB_WLP=m -CONFIG_UWB_I1480U=m -CONFIG_UWB_I1480U_WLP=m -CONFIG_MMC=m -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set - -# -# MMC/SD/SDIO Card Drivers -# -CONFIG_MMC_BLOCK=m -CONFIG_MMC_BLOCK_BOUNCE=y -CONFIG_SDIO_UART=m -CONFIG_MMC_TEST=m - -# -# MMC/SD/SDIO Host Controller Drivers -# -CONFIG_MMC_SDHCI=m -CONFIG_MMC_SDHCI_PCI=m -CONFIG_MMC_RICOH_MMC=m -CONFIG_MMC_WBSD=m -CONFIG_MMC_TIFM_SD=m -CONFIG_MMC_SDRICOH_CS=m -CONFIG_MEMSTICK=m -# CONFIG_MEMSTICK_DEBUG is not set - -# -# MemoryStick drivers -# -# CONFIG_MEMSTICK_UNSAFE_RESUME is not set -CONFIG_MSPRO_BLOCK=m - -# -# MemoryStick Host Controller Drivers -# -CONFIG_MEMSTICK_TIFM_MS=m -CONFIG_MEMSTICK_JMICRON_38X=m -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=m - -# -# LED drivers -# -CONFIG_LEDS_NET48XX=m -CONFIG_LEDS_WRAP=m -CONFIG_LEDS_ALIX2=m -CONFIG_LEDS_PCA9532=m -CONFIG_LEDS_GPIO=m -CONFIG_LEDS_GPIO_PLATFORM=y -CONFIG_LEDS_LP5521=m -CONFIG_LEDS_CLEVO_MAIL=m -CONFIG_LEDS_PCA955X=m -CONFIG_LEDS_WM8350=m -CONFIG_LEDS_DAC124S085=m -CONFIG_LEDS_BD2802=m - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -CONFIG_LEDS_TRIGGER_TIMER=m -CONFIG_LEDS_TRIGGER_HEARTBEAT=m -CONFIG_LEDS_TRIGGER_BACKLIGHT=m -CONFIG_LEDS_TRIGGER_GPIO=m -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m - -# -# iptables trigger is under Netfilter config (LED target) -# -CONFIG_ACCESSIBILITY=y -# CONFIG_A11Y_BRAILLE_CONSOLE is not set -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_USER_MAD=m -CONFIG_INFINIBAND_USER_ACCESS=m -CONFIG_INFINIBAND_USER_MEM=y -CONFIG_INFINIBAND_ADDR_TRANS=y -CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set -CONFIG_INFINIBAND_AMSO1100=m -# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set -CONFIG_INFINIBAND_CXGB3=m -# CONFIG_INFINIBAND_CXGB3_DEBUG is not set -CONFIG_MLX4_INFINIBAND=m -CONFIG_INFINIBAND_NES=m -# CONFIG_INFINIBAND_NES_DEBUG is not set -CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_CM is not set -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set -CONFIG_INFINIBAND_SRP=m -CONFIG_INFINIBAND_ISER=m -# CONFIG_EDAC is not set -CONFIG_RTC_LIB=m -CONFIG_RTC_CLASS=m - -# -# RTC interfaces -# -CONFIG_RTC_INTF_SYSFS=y -CONFIG_RTC_INTF_PROC=y -CONFIG_RTC_INTF_DEV=y -CONFIG_RTC_INTF_DEV_UIE_EMUL=y -CONFIG_RTC_DRV_TEST=m - -# -# I2C RTC drivers -# -CONFIG_RTC_DRV_DS1307=m -CONFIG_RTC_DRV_DS1374=m -CONFIG_RTC_DRV_DS1672=m -CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RS5C372=m -CONFIG_RTC_DRV_ISL1208=m -CONFIG_RTC_DRV_X1205=m -CONFIG_RTC_DRV_PCF8563=m -CONFIG_RTC_DRV_PCF8583=m -CONFIG_RTC_DRV_M41T80=m -CONFIG_RTC_DRV_M41T80_WDT=y -CONFIG_RTC_DRV_S35390A=m -CONFIG_RTC_DRV_FM3130=m -CONFIG_RTC_DRV_RX8581=m - -# -# SPI RTC drivers -# -CONFIG_RTC_DRV_M41T94=m -CONFIG_RTC_DRV_DS1305=m -CONFIG_RTC_DRV_DS1390=m -CONFIG_RTC_DRV_MAX6902=m -CONFIG_RTC_DRV_R9701=m -CONFIG_RTC_DRV_RS5C348=m -CONFIG_RTC_DRV_DS3234=m - -# -# Platform RTC drivers -# -CONFIG_RTC_DRV_CMOS=m -CONFIG_RTC_DRV_DS1286=m -CONFIG_RTC_DRV_DS1511=m -CONFIG_RTC_DRV_DS1553=m -CONFIG_RTC_DRV_DS1742=m -CONFIG_RTC_DRV_STK17TA8=m -CONFIG_RTC_DRV_M48T86=m -CONFIG_RTC_DRV_M48T35=m -CONFIG_RTC_DRV_M48T59=m -CONFIG_RTC_DRV_BQ4802=m -CONFIG_RTC_DRV_V3020=m -CONFIG_RTC_DRV_WM8350=m -CONFIG_RTC_DRV_PCF50633=m - -# -# on-CPU RTC drivers -# -# CONFIG_DMADEVICES is not set -CONFIG_AUXDISPLAY=y -CONFIG_KS0108=m -CONFIG_KS0108_PORT=0x378 -CONFIG_KS0108_DELAY=2 -# CONFIG_CFAG12864B is not set -CONFIG_UIO=m -CONFIG_UIO_CIF=m -CONFIG_UIO_PDRV=m -CONFIG_UIO_PDRV_GENIRQ=m -CONFIG_UIO_SMX=m -CONFIG_UIO_AEC=m -CONFIG_UIO_SERCOS3=m -# CONFIG_STAGING is not set -CONFIG_X86_PLATFORM_DEVICES=y -CONFIG_ACER_WMI=m -CONFIG_ASUS_LAPTOP=m -CONFIG_DELL_WMI=m -CONFIG_FUJITSU_LAPTOP=m -# CONFIG_FUJITSU_LAPTOP_DEBUG is not set -CONFIG_TC1100_WMI=m -CONFIG_HP_WMI=m -CONFIG_MSI_LAPTOP=m -CONFIG_PANASONIC_LAPTOP=m -CONFIG_COMPAL_LAPTOP=m -CONFIG_SONY_LAPTOP=m -# CONFIG_SONYPI_COMPAT is not set -CONFIG_THINKPAD_ACPI=m -# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set -# CONFIG_THINKPAD_ACPI_DEBUG is not set -# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set -CONFIG_THINKPAD_ACPI_VIDEO=y -CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y -CONFIG_INTEL_MENLOW=m -CONFIG_EEEPC_LAPTOP=m -CONFIG_ACPI_WMI=m -CONFIG_ACPI_ASUS=m -CONFIG_ACPI_TOSHIBA=m - -# -# Firmware Drivers -# -CONFIG_EDD=m -# CONFIG_EDD_OFF is not set -CONFIG_FIRMWARE_MEMMAP=y -CONFIG_DELL_RBU=m -CONFIG_DCDBAS=m -CONFIG_DMIID=y -# CONFIG_ISCSI_IBFT_FIND is not set - -# -# File systems -# -CONFIG_EXT2_FS=m -CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT2_FS_XIP=y -CONFIG_EXT3_FS=m -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set -CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS=m -# CONFIG_EXT4DEV_COMPAT is not set -CONFIG_EXT4_FS_XATTR=y -CONFIG_EXT4_FS_POSIX_ACL=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_FS_XIP=y -CONFIG_JBD=m -# CONFIG_JBD_DEBUG is not set -CONFIG_JBD2=m -# CONFIG_JBD2_DEBUG is not set -CONFIG_FS_MBCACHE=m -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_PROC_INFO=y -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -# CONFIG_REISERFS_FS_SECURITY is not set -CONFIG_JFS_FS=m -CONFIG_JFS_POSIX_ACL=y -CONFIG_JFS_SECURITY=y -# CONFIG_JFS_DEBUG is not set -CONFIG_JFS_STATISTICS=y -CONFIG_FS_POSIX_ACL=y -CONFIG_XFS_FS=m -CONFIG_XFS_QUOTA=y -CONFIG_XFS_POSIX_ACL=y -CONFIG_XFS_RT=y -# CONFIG_XFS_DEBUG is not set -CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=y -CONFIG_OCFS2_FS=m -CONFIG_OCFS2_FS_O2CB=m -CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m -CONFIG_OCFS2_FS_STATS=y -CONFIG_OCFS2_DEBUG_MASKLOG=y -# CONFIG_OCFS2_DEBUG_FS is not set -CONFIG_OCFS2_FS_POSIX_ACL=y -CONFIG_BTRFS_FS=m -CONFIG_BTRFS_FS_POSIX_ACL=y -CONFIG_FILE_LOCKING=y -# CONFIG_DNOTIFY is not set -CONFIG_INOTIFY=y -CONFIG_INOTIFY_USER=y -CONFIG_QUOTA=y -CONFIG_QUOTA_NETLINK_INTERFACE=y -# CONFIG_PRINT_QUOTA_WARNING is not set -CONFIG_QUOTA_TREE=m -CONFIG_QFMT_V1=m -CONFIG_QFMT_V2=m -CONFIG_QUOTACTL=y -CONFIG_AUTOFS_FS=m -CONFIG_AUTOFS4_FS=m -CONFIG_FUSE_FS=m - -# -# Caches -# -CONFIG_FSCACHE=m -CONFIG_FSCACHE_STATS=y -CONFIG_FSCACHE_HISTOGRAM=y -# CONFIG_FSCACHE_DEBUG is not set -CONFIG_CACHEFILES=m -# CONFIG_CACHEFILES_DEBUG is not set -# CONFIG_CACHEFILES_HISTOGRAM is not set - -# -# CD-ROM/DVD Filesystems -# -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_UDF_NLS=y - -# -# DOS/FAT/NT Filesystems -# -CONFIG_FAT_FS=m -CONFIG_MSDOS_FS=m -CONFIG_VFAT_FS=m -CONFIG_FAT_DEFAULT_CODEPAGE=437 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y - -# -# Pseudo filesystems -# -CONFIG_PROC_FS=y -CONFIG_PROC_SYSCTL=y -CONFIG_SYSFS=y -CONFIG_TMPFS=y -# CONFIG_TMPFS_POSIX_ACL is not set -# CONFIG_HUGETLBFS is not set -# CONFIG_HUGETLB_PAGE is not set -CONFIG_CONFIGFS_FS=m -CONFIG_MISC_FILESYSTEMS=y -CONFIG_ADFS_FS=m -# CONFIG_ADFS_FS_RW is not set -CONFIG_AFFS_FS=m -CONFIG_ECRYPT_FS=m -CONFIG_HFS_FS=m -CONFIG_HFSPLUS_FS=m -CONFIG_BEFS_FS=m -# CONFIG_BEFS_DEBUG is not set -CONFIG_BFS_FS=m -CONFIG_EFS_FS=m -CONFIG_JFFS2_FS=m -CONFIG_JFFS2_FS_DEBUG=0 -CONFIG_JFFS2_FS_WRITEBUFFER=y -# CONFIG_JFFS2_FS_WBUF_VERIFY is not set -CONFIG_JFFS2_SUMMARY=y -CONFIG_JFFS2_FS_XATTR=y -CONFIG_JFFS2_FS_POSIX_ACL=y -CONFIG_JFFS2_FS_SECURITY=y -CONFIG_JFFS2_COMPRESSION_OPTIONS=y -CONFIG_JFFS2_ZLIB=y -CONFIG_JFFS2_LZO=y -CONFIG_JFFS2_RTIME=y -CONFIG_JFFS2_RUBIN=y -# CONFIG_JFFS2_CMODE_NONE is not set -CONFIG_JFFS2_CMODE_PRIORITY=y -# CONFIG_JFFS2_CMODE_SIZE is not set -# CONFIG_JFFS2_CMODE_FAVOURLZO is not set -CONFIG_UBIFS_FS=m -# CONFIG_UBIFS_FS_XATTR is not set -# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -# CONFIG_UBIFS_FS_DEBUG is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m -# CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_VXFS_FS=m -CONFIG_MINIX_FS=m -CONFIG_OMFS_FS=m -CONFIG_HPFS_FS=m -CONFIG_QNX4FS_FS=m -CONFIG_ROMFS_FS=m -CONFIG_ROMFS_BACKED_BY_BLOCK=y -# CONFIG_ROMFS_BACKED_BY_MTD is not set -# CONFIG_ROMFS_BACKED_BY_BOTH is not set -CONFIG_ROMFS_ON_BLOCK=y -CONFIG_SYSV_FS=m -CONFIG_UFS_FS=m -# CONFIG_UFS_FS_WRITE is not set -# CONFIG_UFS_DEBUG is not set -CONFIG_EXOFS_FS=m -# CONFIG_EXOFS_DEBUG is not set -CONFIG_NILFS2_FS=m -CONFIG_NETWORK_FILESYSTEMS=y -CONFIG_NFS_FS=m -CONFIG_NFS_V3=y -# CONFIG_NFS_V3_ACL is not set -CONFIG_NFS_V4=y -# CONFIG_NFS_FSCACHE is not set -CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set -CONFIG_NFSD_V4=y -CONFIG_LOCKD=m -CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_NFS_COMMON=y -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_SUNRPC_XPRT_RDMA=m -CONFIG_RPCSEC_GSS_KRB5=m -CONFIG_RPCSEC_GSS_SPKM3=m -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_UPCALL is not set -CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y -# CONFIG_CIFS_DEBUG2 is not set -# CONFIG_CIFS_DFS_UPCALL is not set -CONFIG_CIFS_EXPERIMENTAL=y -CONFIG_NCP_FS=m -# CONFIG_NCPFS_PACKET_SIGNING is not set -# CONFIG_NCPFS_IOCTL_LOCKING is not set -# CONFIG_NCPFS_STRONG is not set -# CONFIG_NCPFS_NFS_NS is not set -# CONFIG_NCPFS_OS2_NS is not set -# CONFIG_NCPFS_SMALLDOS is not set -# CONFIG_NCPFS_NLS is not set -# CONFIG_NCPFS_EXTRAS is not set -CONFIG_CODA_FS=m -CONFIG_AFS_FS=m -# CONFIG_AFS_DEBUG is not set -# CONFIG_AFS_FSCACHE is not set -CONFIG_9P_FS=m - -# -# Partition Types -# -# CONFIG_PARTITION_ADVANCED is not set -CONFIG_MSDOS_PARTITION=y -CONFIG_NLS=m -CONFIG_NLS_DEFAULT="iso8859-1" -CONFIG_NLS_CODEPAGE_437=m -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m -CONFIG_NLS_ASCII=m -CONFIG_NLS_ISO8859_1=m -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m -CONFIG_DLM=m -# CONFIG_DLM_DEBUG is not set - -# -# Kernel hacking -# -CONFIG_TRACE_IRQFLAGS_SUPPORT=y -# CONFIG_PRINTK_TIME is not set -CONFIG_ENABLE_WARN_DEPRECATED=y -# CONFIG_ENABLE_MUST_CHECK is not set -CONFIG_FRAME_WARN=1024 -# CONFIG_MAGIC_SYSRQ is not set -# CONFIG_UNUSED_SYMBOLS is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_CHECK is not set -# CONFIG_DEBUG_KERNEL is not set -CONFIG_STACKTRACE=y -# CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -CONFIG_ARCH_WANT_FRAME_POINTERS=y -CONFIG_FRAME_POINTER=y -# CONFIG_RCU_CPU_STALL_DETECTOR is not set -# CONFIG_LATENCYTOP is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y -CONFIG_USER_STACKTRACE_SUPPORT=y -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FTRACE_SYSCALLS=y -CONFIG_RING_BUFFER=y -CONFIG_TRACING=y -CONFIG_TRACING_SUPPORT=y - -# -# Tracers -# -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_CONTEXT_SWITCH_TRACER is not set -# CONFIG_EVENT_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set -# CONFIG_TRACE_BRANCH_PROFILING is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_MMIOTRACE is not set -# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set -# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_DEBUG is not set -# CONFIG_DMA_API_DEBUG is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_STRICT_DEVMEM=y -# CONFIG_X86_VERBOSE_BOOTUP is not set -# CONFIG_EARLY_PRINTK is not set -# CONFIG_4KSTACKS is not set -# CONFIG_DOUBLEFAULT is not set -CONFIG_HAVE_MMIOTRACE_SUPPORT=y -CONFIG_IO_DELAY_TYPE_0X80=0 -CONFIG_IO_DELAY_TYPE_0XED=1 -CONFIG_IO_DELAY_TYPE_UDELAY=2 -CONFIG_IO_DELAY_TYPE_NONE=3 -CONFIG_IO_DELAY_0X80=y -# CONFIG_IO_DELAY_0XED is not set -# CONFIG_IO_DELAY_UDELAY is not set -# CONFIG_IO_DELAY_NONE is not set -CONFIG_DEFAULT_IO_DELAY_TYPE=0 -# CONFIG_OPTIMIZE_INLINING is not set - -# -# Security options -# - -# -# Grsecurity -# -CONFIG_GRKERNSEC=y -# CONFIG_GRKERNSEC_LOW is not set -# CONFIG_GRKERNSEC_MEDIUM is not set -# CONFIG_GRKERNSEC_HIGH is not set -CONFIG_GRKERNSEC_CUSTOM=y - -# -# Address Space Protection -# -CONFIG_GRKERNSEC_KMEM=y -# CONFIG_GRKERNSEC_IO is not set -CONFIG_GRKERNSEC_PROC_MEMMAP=y -# CONFIG_GRKERNSEC_BRUTE is not set -# CONFIG_GRKERNSEC_MODSTOP is not set -# CONFIG_GRKERNSEC_MODHARDEN is not set -# CONFIG_GRKERNSEC_HIDESYM is not set - -# -# Role Based Access Control Options -# -# CONFIG_GRKERNSEC_NO_RBAC is not set -CONFIG_GRKERNSEC_ACL_HIDEKERN=y -CONFIG_GRKERNSEC_ACL_MAXTRIES=3 -CONFIG_GRKERNSEC_ACL_TIMEOUT=30 - -# -# Filesystem Protections -# -CONFIG_GRKERNSEC_PROC=y -CONFIG_GRKERNSEC_PROC_USER=y -CONFIG_GRKERNSEC_PROC_ADD=y -CONFIG_GRKERNSEC_LINK=y -CONFIG_GRKERNSEC_FIFO=y -CONFIG_GRKERNSEC_CHROOT=y -CONFIG_GRKERNSEC_CHROOT_MOUNT=y -CONFIG_GRKERNSEC_CHROOT_DOUBLE=y -CONFIG_GRKERNSEC_CHROOT_PIVOT=y -CONFIG_GRKERNSEC_CHROOT_CHDIR=y -CONFIG_GRKERNSEC_CHROOT_CHMOD=y -CONFIG_GRKERNSEC_CHROOT_FCHDIR=y -CONFIG_GRKERNSEC_CHROOT_MKNOD=y -CONFIG_GRKERNSEC_CHROOT_SHMAT=y -CONFIG_GRKERNSEC_CHROOT_UNIX=y -CONFIG_GRKERNSEC_CHROOT_FINDTASK=y -CONFIG_GRKERNSEC_CHROOT_NICE=y -CONFIG_GRKERNSEC_CHROOT_SYSCTL=y -CONFIG_GRKERNSEC_CHROOT_CAPS=y - -# -# Kernel Auditing -# -# CONFIG_GRKERNSEC_AUDIT_GROUP is not set -# CONFIG_GRKERNSEC_EXECLOG is not set -CONFIG_GRKERNSEC_RESLOG=y -# CONFIG_GRKERNSEC_CHROOT_EXECLOG is not set -# CONFIG_GRKERNSEC_AUDIT_CHDIR is not set -# CONFIG_GRKERNSEC_AUDIT_MOUNT is not set -CONFIG_GRKERNSEC_AUDIT_IPC=y -CONFIG_GRKERNSEC_SIGNAL=y -CONFIG_GRKERNSEC_FORKFAIL=y -CONFIG_GRKERNSEC_TIME=y -CONFIG_GRKERNSEC_PROC_IPADDR=y -# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set - -# -# Executable Protections -# -CONFIG_GRKERNSEC_EXECVE=y -# CONFIG_GRKERNSEC_DMESG is not set -# CONFIG_GRKERNSEC_TPE is not set - -# -# Network Protections -# -CONFIG_GRKERNSEC_RANDNET=y -# CONFIG_GRKERNSEC_BLACKHOLE is not set -# CONFIG_GRKERNSEC_SOCKET is not set - -# -# Sysctl support -# -CONFIG_GRKERNSEC_SYSCTL=y -CONFIG_GRKERNSEC_SYSCTL_ON=y - -# -# Logging Options -# -CONFIG_GRKERNSEC_FLOODTIME=10 -CONFIG_GRKERNSEC_FLOODBURST=4 - -# -# PaX -# -CONFIG_PAX=y - -# -# PaX Control -# -CONFIG_PAX_SOFTMODE=y -CONFIG_PAX_EI_PAX=y -CONFIG_PAX_PT_PAX_FLAGS=y -# CONFIG_PAX_NO_ACL_FLAGS is not set -CONFIG_PAX_HAVE_ACL_FLAGS=y -# CONFIG_PAX_HOOK_ACL_FLAGS is not set - -# -# Non-executable pages -# -CONFIG_PAX_NOEXEC=y -# CONFIG_PAX_PAGEEXEC is not set -CONFIG_PAX_SEGMEXEC=y -# CONFIG_PAX_EMUTRAMP is not set -CONFIG_PAX_MPROTECT=y -CONFIG_PAX_NOELFRELOCS=y -CONFIG_PAX_KERNEXEC=y - -# -# Address Space Layout Randomization -# -CONFIG_PAX_ASLR=y -CONFIG_PAX_RANDUSTACK=y -CONFIG_PAX_RANDMMAP=y - -# -# Miscellaneous hardening features -# -# CONFIG_PAX_MEMORY_SANITIZE is not set -CONFIG_PAX_MEMORY_UDEREF=y -CONFIG_PAX_REFCOUNT=y -# CONFIG_PAX_USERCOPY is not set -CONFIG_KEYS=y -# CONFIG_KEYS_DEBUG_PROC_KEYS is not set -CONFIG_SECURITY=y -CONFIG_SECURITYFS=y -# CONFIG_SECURITY_NETWORK is not set -# CONFIG_SECURITY_PATH is not set -CONFIG_SECURITY_FILE_CAPABILITIES=y -# CONFIG_SECURITY_TOMOYO is not set -# CONFIG_IMA is not set -CONFIG_XOR_BLOCKS=m -CONFIG_ASYNC_CORE=m -CONFIG_ASYNC_MEMCPY=m -CONFIG_ASYNC_XOR=m -CONFIG_CRYPTO=y - -# -# Crypto core or helper -# -CONFIG_CRYPTO_FIPS=y -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_AEAD=m -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_BLKCIPHER=m -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=m -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_PCOMP=y -CONFIG_CRYPTO_MANAGER=m -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_GF128MUL=m -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_CRYPTO_CRYPTD=m -CONFIG_CRYPTO_AUTHENC=m -CONFIG_CRYPTO_TEST=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m -CONFIG_CRYPTO_SEQIV=m - -# -# Block modes -# -CONFIG_CRYPTO_CBC=m -CONFIG_CRYPTO_CTR=m -CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=m -CONFIG_CRYPTO_LRW=m -CONFIG_CRYPTO_PCBC=m -CONFIG_CRYPTO_XTS=m - -# -# Hash modes -# -CONFIG_CRYPTO_HMAC=m -CONFIG_CRYPTO_XCBC=m - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=m -CONFIG_CRYPTO_CRC32C_INTEL=m -CONFIG_CRYPTO_MD4=m -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m -CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_SHA512=m -CONFIG_CRYPTO_TGR192=m -CONFIG_CRYPTO_WP512=m - -# -# Ciphers -# -CONFIG_CRYPTO_AES=m -CONFIG_CRYPTO_AES_586=m -CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m -CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m -CONFIG_CRYPTO_CAST5=m -CONFIG_CRYPTO_CAST6=m -CONFIG_CRYPTO_DES=m -CONFIG_CRYPTO_FCRYPT=m -CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m -CONFIG_CRYPTO_SALSA20_586=m -CONFIG_CRYPTO_SEED=m -CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_TWOFISH_COMMON=m -CONFIG_CRYPTO_TWOFISH_586=m - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=m -CONFIG_CRYPTO_ZLIB=m -CONFIG_CRYPTO_LZO=m - -# -# Random Number Generation -# -CONFIG_CRYPTO_ANSI_CPRNG=m -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_PADLOCK=m -CONFIG_CRYPTO_DEV_PADLOCK_AES=m -CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -CONFIG_CRYPTO_DEV_GEODE=m -CONFIG_CRYPTO_DEV_HIFN_795X=m -CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y -CONFIG_HAVE_KVM=y -CONFIG_HAVE_KVM_IRQCHIP=y -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=m -CONFIG_KVM_INTEL=m -CONFIG_KVM_AMD=m -# CONFIG_KVM_TRACE is not set -CONFIG_LGUEST=m -CONFIG_VIRTIO=m -CONFIG_VIRTIO_RING=m -CONFIG_VIRTIO_PCI=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_BINARY_PRINTF=y - -# -# Library routines -# -CONFIG_BITREVERSE=m -CONFIG_GENERIC_FIND_FIRST_BIT=y -CONFIG_GENERIC_FIND_NEXT_BIT=y -CONFIG_GENERIC_FIND_LAST_BIT=y -CONFIG_CRC_CCITT=m -CONFIG_CRC16=m -CONFIG_CRC_T10DIF=m -CONFIG_CRC_ITU_T=m -CONFIG_CRC32=m -CONFIG_CRC7=m -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=y -CONFIG_ZLIB_DEFLATE=m -CONFIG_LZO_COMPRESS=m -CONFIG_LZO_DECOMPRESS=m -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_REED_SOLOMON=m -CONFIG_REED_SOLOMON_DEC16=y -CONFIG_TEXTSEARCH=y -CONFIG_TEXTSEARCH_KMP=m -CONFIG_TEXTSEARCH_BM=m -CONFIG_TEXTSEARCH_FSM=m -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT=y -CONFIG_HAS_DMA=y -CONFIG_CHECK_SIGNATURE=y -CONFIG_NLATTR=y diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86 index 023fb73da..8e89a2853 100644 --- a/main/linux-grsec/kernelconfig.x86 +++ b/main/linux-grsec/kernelconfig.x86 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31.6 -# Wed Nov 18 15:14:39 2009 +# Linux kernel version: 2.6.32 +# Sat Dec 12 18:09:46 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -17,7 +17,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y CONFIG_LOCKDEP_SUPPORT=y CONFIG_STACKTRACE_SUPPORT=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_FAST_CMPXCHG_LOCAL=y CONFIG_MMU=y CONFIG_ZONE_DMA=y CONFIG_GENERIC_ISA_DMA=y @@ -35,7 +34,8 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y -CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y +CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y @@ -83,11 +83,12 @@ CONFIG_BSD_PROCESS_ACCT_V3=y # # RCU Subsystem # -CONFIG_CLASSIC_RCU=y -# CONFIG_TREE_RCU is not set -# CONFIG_PREEMPT_RCU is not set +CONFIG_TREE_RCU=y +# CONFIG_TREE_PREEMPT_RCU is not set +# CONFIG_RCU_TRACE is not set +CONFIG_RCU_FANOUT=32 +# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_TREE_RCU_TRACE is not set -# CONFIG_PREEMPT_RCU_TRACE is not set CONFIG_IKCONFIG=m CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=14 @@ -126,26 +127,26 @@ CONFIG_TIMERFD=y CONFIG_EVENTFD=y CONFIG_SHMEM=y CONFIG_AIO=y -CONFIG_HAVE_PERF_COUNTERS=y +CONFIG_HAVE_PERF_EVENTS=y # -# Performance Counters +# Kernel Performance Events And Counters # -CONFIG_PERF_COUNTERS=y +CONFIG_PERF_EVENTS=y # CONFIG_EVENT_PROFILE is not set +CONFIG_PERF_COUNTERS=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_PCI_QUIRKS=y # CONFIG_SLUB_DEBUG is not set -# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB is not set CONFIG_SLUB=y # CONFIG_SLOB is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y -CONFIG_MARKERS=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_IBS is not set +# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y @@ -160,6 +161,7 @@ CONFIG_HAVE_DMA_API_DEBUG=y # # CONFIG_GCOV_KERNEL is not set CONFIG_SLOW_WORK=y +# CONFIG_SLOW_WORK_DEBUG is not set CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 @@ -203,6 +205,7 @@ CONFIG_X86_MPPARSE=y # CONFIG_X86_BIGSMP is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_ELAN is not set +# CONFIG_X86_MRST is not set # CONFIG_X86_RDC321X is not set # CONFIG_X86_32_NON_STANDARD is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y @@ -239,6 +242,7 @@ CONFIG_M586=y # CONFIG_MVIAC7 is not set # CONFIG_MPSC is not set # CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y @@ -254,7 +258,8 @@ CONFIG_X86_BSWAP=y CONFIG_X86_POPAD_OK=y CONFIG_X86_ALIGNMENT_16=y CONFIG_X86_INTEL_USERCOPY=y -CONFIG_X86_MINIMUM_CPU_FAMILY=4 +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_MINIMUM_CPU_FAMILY=5 # CONFIG_PROCESSOR_SELECT is not set CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_CYRIX_32=y @@ -277,7 +282,6 @@ CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y # CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set # CONFIG_X86_MCE is not set -# CONFIG_X86_ANCIENT_MCE is not set CONFIG_VM86=y CONFIG_TOSHIBA=m CONFIG_I8K=m @@ -319,6 +323,7 @@ CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_MMU_NOTIFIER=y +# CONFIG_KSM is not set CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_HIGHPTE is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set @@ -329,6 +334,7 @@ CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 CONFIG_X86_PAT=y +CONFIG_ARCH_USES_PG_UNCACHED=y # CONFIG_SECCOMP is not set # CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set @@ -356,10 +362,12 @@ CONFIG_PM_SLEEP=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y # CONFIG_HIBERNATION is not set +# CONFIG_PM_RUNTIME is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_PROCFS=y CONFIG_ACPI_PROCFS_POWER=y +# CONFIG_ACPI_POWER_METER is not set CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_PROC_EVENT=y CONFIG_ACPI_AC=m @@ -370,6 +378,7 @@ CONFIG_ACPI_FAN=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y +# CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set CONFIG_ACPI_THERMAL=m # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=2000 @@ -378,6 +387,7 @@ CONFIG_ACPI_PCI_SLOT=m CONFIG_X86_PM_TIMER=y CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_SBS=m +# CONFIG_SFI is not set # CONFIG_APM is not set # @@ -821,6 +831,8 @@ CONFIG_IP_SCTP=m CONFIG_SCTP_HMAC_SHA1=y # CONFIG_SCTP_HMAC_MD5 is not set CONFIG_RDS=m +# CONFIG_RDS_RDMA is not set +# CONFIG_RDS_TCP is not set # CONFIG_RDS_DEBUG is not set CONFIG_TIPC=m # CONFIG_TIPC_ADVANCED is not set @@ -934,9 +946,15 @@ CONFIG_CAN_VCAN=m CONFIG_CAN_DEV=m # CONFIG_CAN_CALC_BITTIMING is not set CONFIG_CAN_SJA1000=m +# CONFIG_CAN_SJA1000_ISA is not set CONFIG_CAN_SJA1000_PLATFORM=m CONFIG_CAN_EMS_PCI=m CONFIG_CAN_KVASER_PCI=m + +# +# CAN USB interfaces +# +# CONFIG_CAN_EMS_USB is not set # CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_IRDA=m @@ -1023,13 +1041,18 @@ CONFIG_BT_HCIBT3C=m CONFIG_BT_HCIBLUECARD=m CONFIG_BT_HCIBTUART=m CONFIG_BT_HCIVHCI=m +# CONFIG_BT_MRVL is not set CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_CFG80211=m +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set # CONFIG_CFG80211_REG_DEBUG is not set +CONFIG_CFG80211_DEFAULT_PS=y +CONFIG_CFG80211_DEFAULT_PS_VALUE=1 # CONFIG_CFG80211_DEBUGFS is not set CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y @@ -1040,17 +1063,12 @@ CONFIG_LIB80211_CRYPT_CCMP=m CONFIG_LIB80211_CRYPT_TKIP=m # CONFIG_LIB80211_DEBUG is not set CONFIG_MAC80211=m -CONFIG_MAC80211_DEFAULT_PS=y -CONFIG_MAC80211_DEFAULT_PS_VALUE=1 - -# -# Rate control algorithm selection -# CONFIG_MAC80211_RC_PID=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT_PID=y # CONFIG_MAC80211_RC_DEFAULT_MINSTREL is not set CONFIG_MAC80211_RC_DEFAULT="pid" +# CONFIG_MAC80211_MESH is not set CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set @@ -1072,6 +1090,7 @@ CONFIG_NET_9P_RDMA=m # Generic Driver Options # CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_DEVTMPFS is not set CONFIG_STANDALONE=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set CONFIG_FW_LOADER=m @@ -1081,9 +1100,9 @@ CONFIG_EXTRA_FIRMWARE="" CONFIG_CONNECTOR=m CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set +CONFIG_MTD_TESTS=m CONFIG_MTD_CONCAT=m CONFIG_MTD_PARTITIONS=y -CONFIG_MTD_TESTS=m CONFIG_MTD_REDBOOT_PARTS=m CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set @@ -1150,6 +1169,7 @@ CONFIG_MTD_SCB2_FLASH=m CONFIG_MTD_NETtel=m CONFIG_MTD_L440GX=m CONFIG_MTD_PCI=m +# CONFIG_MTD_GPIO_ADDR is not set CONFIG_MTD_INTEL_VR_NOR=m CONFIG_MTD_PLATRAM=m @@ -1164,6 +1184,7 @@ CONFIG_MTD_DATAFLASH=m # CONFIG_MTD_DATAFLASH_OTP is not set CONFIG_MTD_M25P80=m CONFIG_M25PXX_USE_FAST_READ=y +# CONFIG_MTD_SST25L is not set CONFIG_MTD_SLRAM=m CONFIG_MTD_PHRAM=m CONFIG_MTD_MTDRAM=m @@ -1199,6 +1220,7 @@ CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_ALAUDA=m CONFIG_MTD_ONENAND=m # CONFIG_MTD_ONENAND_VERIFY_WRITE is not set +# CONFIG_MTD_ONENAND_GENERIC is not set CONFIG_MTD_ONENAND_OTP=y CONFIG_MTD_ONENAND_2X_PROGRAM=y CONFIG_MTD_ONENAND_SIM=m @@ -1340,6 +1362,7 @@ CONFIG_SCSI_LOWLEVEL=y CONFIG_ISCSI_TCP=m CONFIG_SCSI_CXGB3_ISCSI=m CONFIG_SCSI_BNX2_ISCSI=m +# CONFIG_BE2ISCSI is not set CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m CONFIG_SCSI_7000FASST=m @@ -1431,7 +1454,9 @@ CONFIG_SCSI_U14_34F_MAX_TAGS=8 CONFIG_SCSI_ULTRASTOR=m CONFIG_SCSI_NSP32=m CONFIG_SCSI_DEBUG=m +# CONFIG_SCSI_PMCRAID is not set CONFIG_SCSI_SRP=m +# CONFIG_SCSI_BFA_FC is not set CONFIG_SCSI_LOWLEVEL_PCMCIA=y CONFIG_PCMCIA_AHA152X=m CONFIG_PCMCIA_FDOMAIN=m @@ -1449,6 +1474,7 @@ CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set +CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_ACPI=y CONFIG_SATA_PMP=y CONFIG_SATA_AHCI=m @@ -1472,6 +1498,7 @@ CONFIG_PATA_ACPI=m CONFIG_PATA_ALI=m CONFIG_PATA_AMD=m CONFIG_PATA_ARTOP=m +CONFIG_PATA_ATP867X=m CONFIG_PATA_ATIIXP=m CONFIG_PATA_CMD640_PCI=m CONFIG_PATA_CMD64X=m @@ -1506,6 +1533,7 @@ CONFIG_PATA_PCMCIA=m CONFIG_PATA_PDC_OLD=m CONFIG_PATA_QDI=m CONFIG_PATA_RADISYS=m +CONFIG_PATA_RDC=m CONFIG_PATA_RZ1000=m CONFIG_PATA_SC1200=m CONFIG_PATA_SERVERWORKS=m @@ -1525,7 +1553,9 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m +# CONFIG_MULTICORE_RAID456 is not set CONFIG_MD_RAID6_PQ=m +# CONFIG_ASYNC_RAID6_TEST is not set CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1717,6 +1747,7 @@ CONFIG_SUNDANCE=m CONFIG_TLAN=m CONFIG_KS8842=m CONFIG_KS8851=m +CONFIG_KS8851_MLL=m CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set CONFIG_SC92031=m @@ -1781,10 +1812,7 @@ CONFIG_SFC=m CONFIG_SFC_MTD=y CONFIG_BE2NET=m # CONFIG_TR is not set - -# -# Wireless LAN -# +CONFIG_WLAN=y CONFIG_WLAN_PRE80211=y CONFIG_STRIP=m CONFIG_ARLAN=m @@ -1859,7 +1887,9 @@ CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y CONFIG_B43_PIO=y +CONFIG_B43_PHY_LP=y CONFIG_B43_LEDS=y CONFIG_B43_HWRNG=y # CONFIG_B43_DEBUG is not set @@ -1889,7 +1919,6 @@ CONFIG_RT2X00_LIB=m CONFIG_RT2X00_LIB_HT=y CONFIG_RT2X00_LIB_FIRMWARE=y CONFIG_RT2X00_LIB_CRYPTO=y -CONFIG_RT2X00_LIB_RFKILL=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set CONFIG_HERMES=m @@ -1901,6 +1930,10 @@ CONFIG_PCI_HERMES=m CONFIG_PCMCIA_HERMES=m CONFIG_PCMCIA_SPECTRUM=m CONFIG_WL12XX=m +CONFIG_WL1251=m +CONFIG_WL1251_SPI=m +CONFIG_WL1251_SDIO=m +CONFIG_WL1271=m CONFIG_IWM=m # CONFIG_IWM_DEBUG is not set @@ -2046,7 +2079,9 @@ CONFIG_NETPOLL=y # CONFIG_NETPOLL_TRAP is not set CONFIG_NET_POLL_CONTROLLER=y CONFIG_VIRTIO_NET=m +CONFIG_VMXNET3=m CONFIG_ISDN=y +# CONFIG_ISDN_I4L is not set CONFIG_MISDN=m CONFIG_MISDN_DSP=m CONFIG_MISDN_L1OIP=m @@ -2057,7 +2092,12 @@ CONFIG_MISDN_L1OIP=m CONFIG_MISDN_HFCPCI=m CONFIG_MISDN_HFCMULTI=m CONFIG_MISDN_HFCUSB=m -# CONFIG_ISDN_I4L is not set +CONFIG_MISDN_AVMFRITZ=m +# CONFIG_MISDN_SPEEDFAX is not set +# CONFIG_MISDN_INFINEON is not set +# CONFIG_MISDN_W6692 is not set +# CONFIG_MISDN_NETJET is not set +CONFIG_MISDN_IPAC=m CONFIG_ISDN_CAPI=m # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set # CONFIG_CAPI_TRACE is not set @@ -2109,12 +2149,16 @@ CONFIG_INPUT_EVBUG=m # Input Device Drivers # CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set CONFIG_KEYBOARD_ATKBD=y +CONFIG_QT2160=m CONFIG_KEYBOARD_LKKBD=m CONFIG_KEYBOARD_GPIO=m CONFIG_KEYBOARD_MATRIX=m CONFIG_KEYBOARD_LM8323=m +# CONFIG_KEYBOARD_MAX7359 is not set CONFIG_KEYBOARD_NEWTON=m +# CONFIG_KEYBOARD_OPENCORES is not set CONFIG_KEYBOARD_STOWAWAY=m CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_XTKBD=m @@ -2126,6 +2170,7 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_LIFEBOOK=y CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_PS2_ELANTECH is not set +# CONFIG_MOUSE_PS2_SENTELIC is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_APPLETOUCH=m @@ -2149,6 +2194,7 @@ CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m CONFIG_TOUCHSCREEN_WACOM_W8001=m +# CONFIG_TOUCHSCREEN_MCS5000 is not set CONFIG_TOUCHSCREEN_MTOUCH=m CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_MK712=m @@ -2173,9 +2219,10 @@ CONFIG_TOUCHSCREEN_USB_IRTOUCH=y CONFIG_TOUCHSCREEN_USB_IDEALTEK=y CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y CONFIG_TOUCHSCREEN_USB_GOTOP=y +CONFIG_TOUCHSCREEN_USB_JASTEC=y +CONFIG_TOUCHSCREEN_USB_E2I=y CONFIG_TOUCHSCREEN_TOUCHIT213=m CONFIG_TOUCHSCREEN_TSC2007=m -CONFIG_TOUCHSCREEN_W90X900=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PCSPKR=m CONFIG_INPUT_APANEL=m @@ -2188,6 +2235,7 @@ CONFIG_INPUT_POWERMATE=m CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_WINBOND_CIR=m CONFIG_INPUT_PCF50633_PMU=m CONFIG_INPUT_GPIO_ROTARY_ENCODER=m @@ -2315,6 +2363,7 @@ CONFIG_TELCLOCK=m CONFIG_DEVPORT=y CONFIG_I2C=m CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_ALGOBIT=m @@ -2345,6 +2394,11 @@ CONFIG_I2C_VIA=m CONFIG_I2C_VIAPRO=m # +# ACPI drivers +# +CONFIG_I2C_SCMI=m + +# # I2C system bus drivers (mostly embedded / system-on-chip) # CONFIG_I2C_GPIO=m @@ -2423,12 +2477,19 @@ CONFIG_GPIO_PCF857X=m # # PCI GPIO expanders: # +# CONFIG_GPIO_LANGWELL is not set # # SPI GPIO expanders: # CONFIG_GPIO_MAX7301=m CONFIG_GPIO_MCP23S08=m +# CONFIG_GPIO_MC33880 is not set + +# +# AC97 GPIO expanders: +# +# CONFIG_GPIO_UCB1400 is not set CONFIG_W1=m CONFIG_W1_CON=y @@ -2461,6 +2522,11 @@ CONFIG_BATTERY_MAX17040=m CONFIG_CHARGER_PCF50633=m CONFIG_HWMON=m CONFIG_HWMON_VID=m +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# CONFIG_SENSORS_ABITUGURU=m CONFIG_SENSORS_ABITUGURU3=m CONFIG_SENSORS_AD7414=m @@ -2478,15 +2544,12 @@ CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ADT7475=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m -CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_I5K_AMB=m CONFIG_SENSORS_F71805F=m CONFIG_SENSORS_F71882FG=m CONFIG_SENSORS_F75375S=m -CONFIG_SENSORS_FSCHER=m -CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_FSCHMD=m CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m @@ -2525,6 +2588,7 @@ CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_THMC50=m CONFIG_SENSORS_TMP401=m +CONFIG_SENSORS_TMP421=m CONFIG_SENSORS_VIA686A=m CONFIG_SENSORS_VT1211=m CONFIG_SENSORS_VT8231=m @@ -2536,10 +2600,15 @@ CONFIG_SENSORS_W83L785TS=m CONFIG_SENSORS_W83L786NG=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83627EHF=m +# CONFIG_SENSORS_WM8350 is not set CONFIG_SENSORS_HDAPS=m -CONFIG_SENSORS_LIS3LV02D=m CONFIG_SENSORS_APPLESMC=m -# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# ACPI drivers +# +CONFIG_SENSORS_ATK0110=m +CONFIG_SENSORS_LIS3LV02D=m CONFIG_THERMAL=y CONFIG_WATCHDOG=y # CONFIG_WATCHDOG_NOWAYOUT is not set @@ -2554,6 +2623,7 @@ CONFIG_ADVANTECH_WDT=m CONFIG_ALIM1535_WDT=m CONFIG_ALIM7101_WDT=m CONFIG_SC520_WDT=m +# CONFIG_SBC_FITPC2_WATCHDOG is not set CONFIG_EUROTECH_WDT=m CONFIG_IB700_WDT=m CONFIG_IBMASR=m @@ -2611,6 +2681,8 @@ CONFIG_SSB_PCIHOST=y CONFIG_SSB_B43_PCI_BRIDGE=y CONFIG_SSB_PCMCIAHOST_POSSIBLE=y CONFIG_SSB_PCMCIAHOST=y +CONFIG_SSB_SDIOHOST_POSSIBLE=y +CONFIG_SSB_SDIOHOST=y # CONFIG_SSB_SILENT is not set # CONFIG_SSB_DEBUG is not set CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y @@ -2627,12 +2699,15 @@ CONFIG_UCB1400_CORE=m CONFIG_TPS65010=m # CONFIG_MFD_TMIO is not set CONFIG_MFD_WM8400=m +# CONFIG_MFD_WM831X is not set CONFIG_MFD_WM8350=m CONFIG_MFD_WM8350_I2C=m CONFIG_MFD_PCF50633=m +# CONFIG_MFD_MC13783 is not set CONFIG_PCF50633_ADC=m CONFIG_PCF50633_GPIO=m CONFIG_AB3100_CORE=m +CONFIG_AB3100_OTP=m # CONFIG_EZX_PCAP is not set CONFIG_REGULATOR=y # CONFIG_REGULATOR_DEBUG is not set @@ -2645,6 +2720,9 @@ CONFIG_REGULATOR_WM8350=m CONFIG_REGULATOR_WM8400=m CONFIG_REGULATOR_PCF50633=m CONFIG_REGULATOR_LP3971=m +CONFIG_REGULATOR_AB3100=m +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set CONFIG_MEDIA_SUPPORT=m # @@ -2727,6 +2805,7 @@ CONFIG_VIDEO_SAA6588=m # # Video decoders # +# CONFIG_VIDEO_ADV7180 is not set CONFIG_VIDEO_BT819=m CONFIG_VIDEO_BT856=m CONFIG_VIDEO_BT866=m @@ -2795,6 +2874,7 @@ CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_FB_IVTV=m CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_MT9M001=m @@ -2810,9 +2890,11 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y CONFIG_USB_GSPCA=m CONFIG_USB_M5602=m CONFIG_USB_STV06XX=m +CONFIG_USB_GL860=m CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m +CONFIG_USB_GSPCA_JEILINJ=m CONFIG_USB_GSPCA_MARS=m CONFIG_USB_GSPCA_MR97310A=m CONFIG_USB_GSPCA_OV519=m @@ -2870,12 +2952,14 @@ CONFIG_RADIO_SF16FMR2=m CONFIG_RADIO_TERRATEC=m CONFIG_RADIO_TRUST=m CONFIG_RADIO_TYPHOON=m -CONFIG_RADIO_TYPHOON_PROC_FS=y CONFIG_RADIO_ZOLTRIX=m +# CONFIG_I2C_SI4713 is not set +# CONFIG_RADIO_SI4713 is not set CONFIG_USB_DSBR=m -CONFIG_USB_SI470X=m +# CONFIG_RADIO_SI470X is not set CONFIG_USB_MR800=m CONFIG_RADIO_TEA5764=m +CONFIG_DVB_MAX_ADAPTERS=8 # CONFIG_DVB_DYNAMIC_MINORS is not set CONFIG_DVB_CAPTURE_DRIVERS=y @@ -2922,6 +3006,7 @@ CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_DTV5100=m CONFIG_DVB_USB_AF9015=m CONFIG_DVB_USB_CE6230=m +# CONFIG_DVB_USB_FRIIO is not set CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_SMS_SIANO_MDTV=m @@ -2963,6 +3048,11 @@ CONFIG_DVB_FIREDTV_IEEE1394=y CONFIG_DVB_FIREDTV_INPUT=y # +# Supported Earthsoft PT1 Adapters +# +# CONFIG_DVB_PT1 is not set + +# # Supported DVB Frontends # # CONFIG_DVB_FE_CUSTOMISE is not set @@ -2972,6 +3062,7 @@ CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m CONFIG_DVB_ZL10036=m +CONFIG_DVB_ZL10039=m CONFIG_DVB_S5H1420=m CONFIG_DVB_STV0288=m CONFIG_DVB_STB6000=m @@ -3016,6 +3107,7 @@ CONFIG_DVB_LGDT3305=m CONFIG_DVB_S5H1409=m CONFIG_DVB_AU8522=m CONFIG_DVB_S5H1411=m +CONFIG_DVB_DIB8000=m CONFIG_DVB_PLL=m CONFIG_DVB_TUNER_DIB0070=m CONFIG_DVB_LNBP21=m @@ -3039,7 +3131,10 @@ CONFIG_AGP_SIS=m CONFIG_AGP_SWORKS=m CONFIG_AGP_VIA=m CONFIG_AGP_EFFICEON=m +# CONFIG_VGA_ARB is not set CONFIG_DRM=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m @@ -3110,7 +3205,6 @@ CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_MATROX_MULTIHEAD=y CONFIG_FB_RADEON=m CONFIG_FB_RADEON_I2C=y CONFIG_FB_RADEON_BACKLIGHT=y @@ -3157,6 +3251,7 @@ CONFIG_FB_MB862XX=m CONFIG_FB_BROADSHEET=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m +CONFIG_LCD_LMS283GF05=m CONFIG_LCD_LTV350QV=m CONFIG_LCD_ILI9320=m CONFIG_LCD_TDO24M=m @@ -3194,6 +3289,7 @@ CONFIG_FONT_8x16=y # CONFIG_LOGO is not set CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE=y +CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m @@ -3215,6 +3311,7 @@ CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set CONFIG_SND_VMASTER=y +CONFIG_SND_DMA_SGBUF=y CONFIG_SND_RAWMIDI_SEQ=m CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_OPL4_LIB_SEQ=m @@ -3324,6 +3421,7 @@ CONFIG_SND_HDA_HWDEP=y # CONFIG_SND_HDA_RECONFIG is not set CONFIG_SND_HDA_INPUT_BEEP=y CONFIG_SND_HDA_INPUT_JACK=y +# CONFIG_SND_HDA_PATCH_LOADER is not set CONFIG_SND_HDA_CODEC_REALTEK=y CONFIG_SND_HDA_CODEC_ANALOG=y CONFIG_SND_HDA_CODEC_SIGMATEL=y @@ -3332,6 +3430,7 @@ CONFIG_SND_HDA_CODEC_ATIHDMI=y CONFIG_SND_HDA_CODEC_NVHDMI=y CONFIG_SND_HDA_CODEC_INTELHDMI=y CONFIG_SND_HDA_ELD=y +CONFIG_SND_HDA_CODEC_CIRRUS=y CONFIG_SND_HDA_CODEC_CONEXANT=y CONFIG_SND_HDA_CODEC_CA0110=y CONFIG_SND_HDA_CODEC_CMEDIA=y @@ -3376,9 +3475,13 @@ CONFIG_SND_PDAUDIOCF=m CONFIG_SND_SOC=m CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_SOC_ALL_CODECS=m +CONFIG_SND_SOC_WM_HUBS=m +CONFIG_SND_SOC_AD1836=m +CONFIG_SND_SOC_AD1938=m CONFIG_SND_SOC_AD73311=m CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4535=m +CONFIG_SND_SOC_AK4642=m CONFIG_SND_SOC_CS4270=m CONFIG_SND_SOC_L3=m CONFIG_SND_SOC_PCM3008=m @@ -3392,24 +3495,29 @@ CONFIG_SND_SOC_UDA1380=m CONFIG_SND_SOC_WM8350=m CONFIG_SND_SOC_WM8400=m CONFIG_SND_SOC_WM8510=m +CONFIG_SND_SOC_WM8523=m CONFIG_SND_SOC_WM8580=m CONFIG_SND_SOC_WM8728=m CONFIG_SND_SOC_WM8731=m CONFIG_SND_SOC_WM8750=m CONFIG_SND_SOC_WM8753=m +CONFIG_SND_SOC_WM8776=m CONFIG_SND_SOC_WM8900=m CONFIG_SND_SOC_WM8903=m CONFIG_SND_SOC_WM8940=m CONFIG_SND_SOC_WM8960=m +CONFIG_SND_SOC_WM8961=m CONFIG_SND_SOC_WM8971=m +CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8988=m CONFIG_SND_SOC_WM8990=m +CONFIG_SND_SOC_WM8993=m CONFIG_SND_SOC_WM9081=m +CONFIG_SND_SOC_MAX9877=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m CONFIG_HID_SUPPORT=y CONFIG_HID=m -# CONFIG_HID_DEBUG is not set CONFIG_HIDRAW=y # @@ -3438,6 +3546,7 @@ CONFIG_USB_MOUSE=m # CONFIG_HID_EZKEY is not set # CONFIG_HID_KYE is not set # CONFIG_HID_GYRATION is not set +# CONFIG_HID_TWINHAN is not set # CONFIG_HID_KENSINGTON is not set # CONFIG_HID_LOGITECH is not set # CONFIG_HID_MICROSOFT is not set @@ -3489,6 +3598,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1362_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set @@ -3659,6 +3769,8 @@ CONFIG_MMC_SDHCI_PCI=m CONFIG_MMC_RICOH_MMC=m CONFIG_MMC_SDHCI_PLTFM=m CONFIG_MMC_WBSD=m +# CONFIG_MMC_AT91 is not set +# CONFIG_MMC_ATMELMCI is not set CONFIG_MMC_TIFM_SD=m CONFIG_MMC_SDRICOH_CS=m CONFIG_MMC_CB710=m @@ -3772,6 +3884,7 @@ CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_R9701=m CONFIG_RTC_DRV_RS5C348=m CONFIG_RTC_DRV_DS3234=m +CONFIG_RTC_DRV_PCF2123=m # # Platform RTC drivers @@ -3789,6 +3902,7 @@ CONFIG_RTC_DRV_BQ4802=m CONFIG_RTC_DRV_V3020=m CONFIG_RTC_DRV_WM8350=m CONFIG_RTC_DRV_PCF50633=m +CONFIG_RTC_DRV_AB3100=m # # on-CPU RTC drivers @@ -3798,6 +3912,7 @@ CONFIG_DMADEVICES=y # # DMA Devices # +CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y CONFIG_INTEL_IOATDMA=m CONFIG_DMA_ENGINE=y @@ -3821,6 +3936,7 @@ CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SMX=m CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m +# CONFIG_UIO_PCI_GENERIC is not set # # TI VLYNQ @@ -3849,6 +3965,7 @@ CONFIG_INTEL_MENLOW=m CONFIG_EEEPC_LAPTOP=m CONFIG_ACPI_WMI=m CONFIG_ACPI_ASUS=m +# CONFIG_TOPSTAR_LAPTOP is not set CONFIG_ACPI_TOSHIBA=m # @@ -3876,10 +3993,10 @@ CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y CONFIG_EXT4_FS=m -# CONFIG_EXT4DEV_COMPAT is not set CONFIG_EXT4_FS_XATTR=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y +# CONFIG_EXT4_DEBUG is not set CONFIG_FS_XIP=y CONFIG_JBD=m # CONFIG_JBD_DEBUG is not set @@ -3914,6 +4031,7 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_NILFS2_FS=m CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y # CONFIG_DNOTIFY is not set @@ -3929,7 +4047,7 @@ CONFIG_QUOTACTL=y CONFIG_AUTOFS_FS=m CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m -CONFIG_CUSE=m +# CONFIG_CUSE is not set # # Caches @@ -3938,6 +4056,7 @@ CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y CONFIG_FSCACHE_HISTOGRAM=y # CONFIG_FSCACHE_DEBUG is not set +# CONFIG_FSCACHE_OBJECT_LIST is not set CONFIG_CACHEFILES=m # CONFIG_CACHEFILES_DEBUG is not set # CONFIG_CACHEFILES_HISTOGRAM is not set @@ -4026,7 +4145,6 @@ CONFIG_UFS_FS=m # CONFIG_UFS_DEBUG is not set CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set -CONFIG_NILFS2_FS=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y @@ -4119,6 +4237,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_STRIP_ASM_SYMS is not set # CONFIG_UNUSED_SYMBOLS is not set CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set @@ -4139,10 +4258,11 @@ CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_RING_BUFFER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y +CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y CONFIG_TRACING_SUPPORT=y # CONFIG_FTRACE is not set @@ -4322,6 +4442,10 @@ CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m CONFIG_ASYNC_XOR=m +CONFIG_ASYNC_PQ=m +CONFIG_ASYNC_RAID6_RECOV=m +CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y +CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y CONFIG_CRYPTO=y # @@ -4371,12 +4495,14 @@ CONFIG_CRYPTO_XTS=m # CONFIG_CRYPTO_HMAC=m CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_VMAC=m # # Digest # CONFIG_CRYPTO_CRC32C=m CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m @@ -4433,11 +4559,12 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y CONFIG_HAVE_KVM=y CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_APIC_ARCHITECTURE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m -# CONFIG_KVM_TRACE is not set CONFIG_LGUEST=m CONFIG_VIRTIO=y CONFIG_VIRTIO_RING=y |