From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QwCJl-0008UF-Ee for garchives@archives.gentoo.org; Wed, 24 Aug 2011 12:17:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B95621C0E3; Wed, 24 Aug 2011 12:12:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C2CB921C0E3 for ; Wed, 24 Aug 2011 12:12:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 94D1964ACA for ; Wed, 24 Aug 2011 12:12:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7BC5380037 for ; Wed, 24 Aug 2011 12:12:02 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <7788a8430cc853411cd1d047930a1b3d6f0837c2.blueness@gentoo> Subject: [gentoo-commits] proj/hardened-patchset:master commit in: 3.0.3/, 2.6.32/ X-VCS-Repository: proj/hardened-patchset X-VCS-Files: 2.6.32/grsecurity-2.2.2-2.6.32.45-201108232250.patch 3.0.3/0000_README 3.0.3/4420_grsecurity-2.2.2-3.0.3-201108232250.patch 3.0.3/4421_grsec-remove-localversion-grsec.patch 3.0.3/4422_grsec-mute-warnings.patch 3.0.3/4423_grsec-remove-protected-paths.patch 3.0.3/4425_grsec-pax-without-grsec.patch 3.0.3/4430_grsec-kconfig-default-gids.patch 3.0.3/4435_grsec-kconfig-gentoo.patch 3.0.3/4437-grsec-kconfig-proc-user.patch 3.0.3/4440_selinux-avc_audit-log-curr_ip.patch 3.0.3/4445_disable-compat_vdso.patch X-VCS-Directories: 3.0.3/ 2.6.32/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7788a8430cc853411cd1d047930a1b3d6f0837c2 Date: Wed, 24 Aug 2011 12:12:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4410e5c00a85ae871c2bf6b80895f28a commit: 7788a8430cc853411cd1d047930a1b3d6f0837c2 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Aug 24 12:11:45 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Wed Aug 24 12:11:45 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-patc= hset.git;a=3Dcommit;h=3D7788a843 Staging 3.0.3 with patchset 20110823 --- .../grsecurity-2.2.2-2.6.32.45-201108232250.patch |76666 ++++++++++++++= ++++++ 3.0.3/0000_README | 48 + .../4420_grsecurity-2.2.2-3.0.3-201108232250.patch |69964 ++++++++++++++= ++++ 3.0.3/4421_grsec-remove-localversion-grsec.patch | 9 + 3.0.3/4422_grsec-mute-warnings.patch | 42 + 3.0.3/4423_grsec-remove-protected-paths.patch | 20 + 3.0.3/4425_grsec-pax-without-grsec.patch | 88 + 3.0.3/4430_grsec-kconfig-default-gids.patch | 77 + 3.0.3/4435_grsec-kconfig-gentoo.patch | 316 + 3.0.3/4437-grsec-kconfig-proc-user.patch | 26 + 3.0.3/4440_selinux-avc_audit-log-curr_ip.patch | 73 + 3.0.3/4445_disable-compat_vdso.patch | 46 + 12 files changed, 147375 insertions(+), 0 deletions(-) diff --git a/2.6.32/grsecurity-2.2.2-2.6.32.45-201108232250.patch b/2.6.3= 2/grsecurity-2.2.2-2.6.32.45-201108232250.patch new file mode 100644 index 0000000..39b00d8 --- /dev/null +++ b/2.6.32/grsecurity-2.2.2-2.6.32.45-201108232250.patch @@ -0,0 +1,76666 @@ +diff -urNp linux-2.6.32.45/arch/alpha/include/asm/elf.h linux-2.6.32.45/= arch/alpha/include/asm/elf.h +--- linux-2.6.32.45/arch/alpha/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/alpha/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 +@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N +=20 + #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? = 0x10000 : 0x120000000UL) ++ ++#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 1= 4 : 28) ++#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? = 14 : 19) ++#endif ++ + /* $0 is set by ld.so to a pointer to a function which might be=20 + registered using atexit. This provides a mean for the dynamic + linker to call DT_FINI functions for shared libraries that have +diff -urNp linux-2.6.32.45/arch/alpha/include/asm/pgtable.h linux-2.6.32= .45/arch/alpha/include/asm/pgtable.h +--- linux-2.6.32.45/arch/alpha/include/asm/pgtable.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/alpha/include/asm/pgtable.h 2011-04-17 15:56:45= .000000000 -0400 +@@ -101,6 +101,17 @@ struct vm_area_struct; + #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) + #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) + #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAG= E_FOE) ++# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_= FOW | _PAGE_FOE) ++# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _P= AGE_FOW | _PAGE_FOE) ++#else ++# define PAGE_SHARED_NOEXEC PAGE_SHARED ++# define PAGE_COPY_NOEXEC PAGE_COPY ++# define PAGE_READONLY_NOEXEC PAGE_READONLY ++#endif ++ + #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAG= E_KWE) +=20 + #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) +diff -urNp linux-2.6.32.45/arch/alpha/kernel/module.c linux-2.6.32.45/ar= ch/alpha/kernel/module.c +--- linux-2.6.32.45/arch/alpha/kernel/module.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/alpha/kernel/module.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,=20 +=20 + /* The small sections were sorted to the end of the segment. + The following should definitely cover them. */ +- gp =3D (u64)me->module_core + me->core_size - 0x8000; ++ gp =3D (u64)me->module_core_rw + me->core_size_rw - 0x8000; + got =3D sechdrs[me->arch.gotsecindex].sh_addr; +=20 + for (i =3D 0; i < n; i++) { +diff -urNp linux-2.6.32.45/arch/alpha/kernel/osf_sys.c linux-2.6.32.45/a= rch/alpha/kernel/osf_sys.c +--- linux-2.6.32.45/arch/alpha/kernel/osf_sys.c 2011-08-09 18:35:28.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/alpha/kernel/osf_sys.c 2011-06-13 17:19:47.0000= 00000 -0400 +@@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long a + /* At this point: (!vma || addr < vma->vm_end). */ + if (limit - len < addr) + return -ENOMEM; +- if (!vma || addr + len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + return addr; + addr =3D vma->vm_end; + vma =3D vma->vm_next; +@@ -1208,6 +1208,10 @@ arch_get_unmapped_area(struct file *filp + merely specific addresses, but regions of memory -- perhaps + this feature should be incorporated into all ports? */ +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + if (addr) { + addr =3D arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit); + if (addr !=3D (unsigned long) -ENOMEM) +@@ -1215,8 +1219,8 @@ arch_get_unmapped_area(struct file *filp + } +=20 + /* Next, try allocating at TASK_UNMAPPED_BASE. */ +- addr =3D arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE), +- len, limit); ++ addr =3D arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base),= len, limit); ++ + if (addr !=3D (unsigned long) -ENOMEM) + return addr; +=20 +diff -urNp linux-2.6.32.45/arch/alpha/mm/fault.c linux-2.6.32.45/arch/al= pha/mm/fault.c +--- linux-2.6.32.45/arch/alpha/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/alpha/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 +@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * + __reload_thread(pcb); + } +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++/* ++ * PaX: decide what to do with offenders (regs->pc =3D fault address) ++ * ++ * returns 1 when task should be killed ++ * 2 when patched PLT trampoline was detected ++ * 3 when unpatched PLT trampoline was detected ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ ++#ifdef CONFIG_PAX_EMUPLT ++ int err; ++ ++ do { /* PaX: patched PLT emulation #1 */ ++ unsigned int ldah, ldq, jmp; ++ ++ err =3D get_user(ldah, (unsigned int *)regs->pc); ++ err |=3D get_user(ldq, (unsigned int *)(regs->pc+4)); ++ err |=3D get_user(jmp, (unsigned int *)(regs->pc+8)); ++ ++ if (err) ++ break; ++ ++ if ((ldah & 0xFFFF0000U) =3D=3D 0x277B0000U && ++ (ldq & 0xFFFF0000U) =3D=3D 0xA77B0000U && ++ jmp =3D=3D 0x6BFB0000U) ++ { ++ unsigned long r27, addr; ++ unsigned long addrh =3D (ldah | 0xFFFFFFFFFFFF0000UL) << 16; ++ unsigned long addrl =3D ldq | 0xFFFFFFFFFFFF0000UL; ++ ++ addr =3D regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((add= rl ^ 0x8000UL) + 0x8000UL); ++ err =3D get_user(r27, (unsigned long *)addr); ++ if (err) ++ break; ++ ++ regs->r27 =3D r27; ++ regs->pc =3D r27; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: patched PLT emulation #2 */ ++ unsigned int ldah, lda, br; ++ ++ err =3D get_user(ldah, (unsigned int *)regs->pc); ++ err |=3D get_user(lda, (unsigned int *)(regs->pc+4)); ++ err |=3D get_user(br, (unsigned int *)(regs->pc+8)); ++ ++ if (err) ++ break; ++ ++ if ((ldah & 0xFFFF0000U) =3D=3D 0x277B0000U && ++ (lda & 0xFFFF0000U) =3D=3D 0xA77B0000U && ++ (br & 0xFFE00000U) =3D=3D 0xC3E00000U) ++ { ++ unsigned long addr =3D br | 0xFFFFFFFFFFE00000UL; ++ unsigned long addrh =3D (ldah | 0xFFFFFFFFFFFF0000UL) << 16; ++ unsigned long addrl =3D lda | 0xFFFFFFFFFFFF0000UL; ++ ++ regs->r27 +=3D ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0= x8000UL) + 0x8000UL); ++ regs->pc +=3D 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2); ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: unpatched PLT emulation */ ++ unsigned int br; ++ ++ err =3D get_user(br, (unsigned int *)regs->pc); ++ ++ if (!err && (br & 0xFFE00000U) =3D=3D 0xC3800000U) { ++ unsigned int br2, ldq, nop, jmp; ++ unsigned long addr =3D br | 0xFFFFFFFFFFE00000UL, resolver; ++ ++ addr =3D regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2= ); ++ err =3D get_user(br2, (unsigned int *)addr); ++ err |=3D get_user(ldq, (unsigned int *)(addr+4)); ++ err |=3D get_user(nop, (unsigned int *)(addr+8)); ++ err |=3D get_user(jmp, (unsigned int *)(addr+12)); ++ err |=3D get_user(resolver, (unsigned long *)(addr+16)); ++ ++ if (err) ++ break; ++ ++ if (br2 =3D=3D 0xC3600000U && ++ ldq =3D=3D 0xA77B000CU && ++ nop =3D=3D 0x47FF041FU && ++ jmp =3D=3D 0x6B7B0000U) ++ { ++ regs->r28 =3D regs->pc+4; ++ regs->r27 =3D addr+16; ++ regs->pc =3D resolver; ++ return 3; ++ } ++ } ++ } while (0); ++#endif ++ ++ return 1; ++} ++ ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 5; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif +=20 + /* + * This routine handles page faults. It determines the address, +@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, uns + good_area: + si_code =3D SEGV_ACCERR; + if (cause < 0) { +- if (!(vma->vm_flags & VM_EXEC)) ++ if (!(vma->vm_flags & VM_EXEC)) { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address !=3D regs->pc) ++ goto bad_area; ++ ++ up_read(&mm->mmap_sem); ++ switch (pax_handle_fetch_fault(regs)) { ++ ++#ifdef CONFIG_PAX_EMUPLT ++ case 2: ++ case 3: ++ return; ++#endif ++ ++ } ++ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp()); ++ do_group_exit(SIGKILL); ++#else + goto bad_area; ++#endif ++ ++ } + } else if (!cause) { + /* Allow reads even for write-only mappings */ + if (!(vma->vm_flags & (VM_READ | VM_WRITE))) +diff -urNp linux-2.6.32.45/arch/arm/include/asm/elf.h linux-2.6.32.45/ar= ch/arm/include/asm/elf.h +--- linux-2.6.32.45/arch/arm/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/arm/include/asm/elf.h 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t + the loader. We need to make sure that it is out of the way of the p= rogram + that it will "exec", and that there is sufficient room for the brk. = */ +=20 +-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) ++#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) ++ ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE 0x00008000UL ++ ++#define PAX_DELTA_MMAP_LEN ((current->personality =3D=3D PER_LINUX_32BI= T) ? 16 : 10) ++#define PAX_DELTA_STACK_LEN ((current->personality =3D=3D PER_LINUX_32B= IT) ? 16 : 10) ++#endif +=20 + /* When the program starts, a1 contains a pointer to a function to be=20 + registered with atexit, as per the SVR4 ABI. A value of 0 means we=20 +diff -urNp linux-2.6.32.45/arch/arm/include/asm/kmap_types.h linux-2.6.3= 2.45/arch/arm/include/asm/kmap_types.h +--- linux-2.6.32.45/arch/arm/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/arm/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -19,6 +19,7 @@ enum km_type { + KM_SOFTIRQ0, + KM_SOFTIRQ1, + KM_L2_CACHE, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; +=20 +diff -urNp linux-2.6.32.45/arch/arm/include/asm/uaccess.h linux-2.6.32.4= 5/arch/arm/include/asm/uaccess.h +--- linux-2.6.32.45/arch/arm/include/asm/uaccess.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/arm/include/asm/uaccess.h 2011-06-29 21:02:24.0= 00000000 -0400 +@@ -22,6 +22,8 @@ + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 +=20 ++extern void check_object_size(const void *ptr, unsigned long n, bool to= ); ++ + /* + * The exception table consists of pairs of addresses: the first is the + * address of an instruction that is allowed to fault, and the second i= s +@@ -387,8 +389,23 @@ do { \ +=20 +=20 + #ifdef CONFIG_MMU +-extern unsigned long __must_check __copy_from_user(void *to, const void= __user *from, unsigned long n); +-extern unsigned long __must_check __copy_to_user(void __user *to, const= void *from, unsigned long n); ++extern unsigned long __must_check ___copy_from_user(void *to, const voi= d __user *from, unsigned long n); ++extern unsigned long __must_check ___copy_to_user(void __user *to, cons= t void *from, unsigned long n); ++ ++static inline unsigned long __must_check __copy_from_user(void *to, con= st void __user *from, unsigned long n) ++{ ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); ++ return ___copy_from_user(to, from, n); ++} ++ ++static inline unsigned long __must_check __copy_to_user(void __user *to= , const void *from, unsigned long n) ++{ ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); ++ return ___copy_to_user(to, from, n); ++} ++ + extern unsigned long __must_check __copy_to_user_std(void __user *to, c= onst void *from, unsigned long n); + extern unsigned long __must_check __clear_user(void __user *addr, unsig= ned long n); + extern unsigned long __must_check __clear_user_std(void __user *addr, u= nsigned long n); +@@ -403,6 +420,9 @@ extern unsigned long __must_check __strn +=20 + static inline unsigned long __must_check copy_from_user(void *to, const= void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_READ, from, n)) + n =3D __copy_from_user(to, from, n); + else /* security hole - plug it */ +@@ -412,6 +432,9 @@ static inline unsigned long __must_check +=20 + static inline unsigned long __must_check copy_to_user(void __user *to, = const void *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_WRITE, to, n)) + n =3D __copy_to_user(to, from, n); + return n; +diff -urNp linux-2.6.32.45/arch/arm/kernel/armksyms.c linux-2.6.32.45/ar= ch/arm/kernel/armksyms.c +--- linux-2.6.32.45/arch/arm/kernel/armksyms.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/arm/kernel/armksyms.c 2011-07-06 19:51:50.00000= 0000 -0400 +@@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user); + #ifdef CONFIG_MMU + EXPORT_SYMBOL(copy_page); +=20 +-EXPORT_SYMBOL(__copy_from_user); +-EXPORT_SYMBOL(__copy_to_user); ++EXPORT_SYMBOL(___copy_from_user); ++EXPORT_SYMBOL(___copy_to_user); + EXPORT_SYMBOL(__clear_user); +=20 + EXPORT_SYMBOL(__get_user_1); +diff -urNp linux-2.6.32.45/arch/arm/kernel/kgdb.c linux-2.6.32.45/arch/a= rm/kernel/kgdb.c +--- linux-2.6.32.45/arch/arm/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/arm/kernel/kgdb.c 2011-04-17 15:56:45.000000000= -0400 +@@ -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 =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + #ifndef __ARMEB__ + .gdb_bpt_instr =3D {0xfe, 0xde, 0xff, 0xe7} + #else /* ! __ARMEB__ */ +diff -urNp linux-2.6.32.45/arch/arm/kernel/traps.c linux-2.6.32.45/arch/= arm/kernel/traps.c +--- linux-2.6.32.45/arch/arm/kernel/traps.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/arm/kernel/traps.c 2011-06-13 21:31:18.00000000= 0 -0400 +@@ -247,6 +247,8 @@ static void __die(const char *str, int e +=20 + DEFINE_SPINLOCK(die_lock); +=20 ++extern void gr_handle_kernel_exploit(void); ++ + /* + * This function is protected against re-entrancy. + */ +@@ -271,6 +273,8 @@ NORET_TYPE void die(const char *str, str + if (panic_on_oops) + panic("Fatal exception"); +=20 ++ gr_handle_kernel_exploit(); ++ + do_exit(SIGSEGV); + } +=20 +diff -urNp linux-2.6.32.45/arch/arm/lib/copy_from_user.S linux-2.6.32.45= /arch/arm/lib/copy_from_user.S +--- linux-2.6.32.45/arch/arm/lib/copy_from_user.S 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/arm/lib/copy_from_user.S 2011-06-29 20:48:38.00= 0000000 -0400 +@@ -16,7 +16,7 @@ + /* + * Prototype: + * +- * size_t __copy_from_user(void *to, const void *from, size_t n) ++ * size_t ___copy_from_user(void *to, const void *from, size_t n) + * + * Purpose: + * +@@ -84,11 +84,11 @@ +=20 + .text +=20 +-ENTRY(__copy_from_user) ++ENTRY(___copy_from_user) +=20 + #include "copy_template.S" +=20 +-ENDPROC(__copy_from_user) ++ENDPROC(___copy_from_user) +=20 + .section .fixup,"ax" + .align 0 +diff -urNp linux-2.6.32.45/arch/arm/lib/copy_to_user.S linux-2.6.32.45/a= rch/arm/lib/copy_to_user.S +--- linux-2.6.32.45/arch/arm/lib/copy_to_user.S 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/arm/lib/copy_to_user.S 2011-06-29 20:46:49.0000= 00000 -0400 +@@ -16,7 +16,7 @@ + /* + * Prototype: + * +- * size_t __copy_to_user(void *to, const void *from, size_t n) ++ * size_t ___copy_to_user(void *to, const void *from, size_t n) + * + * Purpose: + * +@@ -88,11 +88,11 @@ + .text +=20 + ENTRY(__copy_to_user_std) +-WEAK(__copy_to_user) ++WEAK(___copy_to_user) +=20 + #include "copy_template.S" +=20 +-ENDPROC(__copy_to_user) ++ENDPROC(___copy_to_user) +=20 + .section .fixup,"ax" + .align 0 +diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess.S linux-2.6.32.45/arch/a= rm/lib/uaccess.S +--- linux-2.6.32.45/arch/arm/lib/uaccess.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/arm/lib/uaccess.S 2011-06-29 20:48:53.000000000= -0400 +@@ -19,7 +19,7 @@ +=20 + #define PAGE_SHIFT 12 +=20 +-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n) ++/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n) + * Purpose : copy a block to user memory from kernel memory + * Params : to - user memory + * : from - kernel memory +@@ -39,7 +39,7 @@ USER( strgtbt r3, [r0], #1) @ May fau + sub r2, r2, ip + b .Lc2u_dest_aligned +=20 +-ENTRY(__copy_to_user) ++ENTRY(___copy_to_user) + stmfd sp!, {r2, r4 - r7, lr} + cmp r2, #4 + blt .Lc2u_not_enough +@@ -277,14 +277,14 @@ USER( strgebt r3, [r0], #1) @ May fau + ldrgtb r3, [r1], #0 + USER( strgtbt r3, [r0], #1) @ May fault + b .Lc2u_finished +-ENDPROC(__copy_to_user) ++ENDPROC(___copy_to_user) +=20 + .section .fixup,"ax" + .align 0 + 9001: ldmfd sp!, {r0, r4 - r7, pc} + .previous +=20 +-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,= unsigned long n); ++/* Prototype: unsigned long ___copy_from_user(void *to,const void *from= ,unsigned long n); + * Purpose : copy a block from user memory to kernel memory + * Params : to - kernel memory + * : from - user memory +@@ -303,7 +303,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fau + sub r2, r2, ip + b .Lcfu_dest_aligned +=20 +-ENTRY(__copy_from_user) ++ENTRY(___copy_from_user) + stmfd sp!, {r0, r2, r4 - r7, lr} + cmp r2, #4 + blt .Lcfu_not_enough +@@ -543,7 +543,7 @@ USER( ldrgebt r3, [r1], #1) @ May fau + USER( ldrgtbt r3, [r1], #1) @ May fault + strgtb r3, [r0], #1 + b .Lcfu_finished +-ENDPROC(__copy_from_user) ++ENDPROC(___copy_from_user) +=20 + .section .fixup,"ax" + .align 0 +diff -urNp linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c linux-2.6.= 32.45/arch/arm/lib/uaccess_with_memcpy.c +--- linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/arm/lib/uaccess_with_memcpy.c 2011-06-29 20:44:= 35.000000000 -0400 +@@ -97,7 +97,7 @@ out: + } +=20 + unsigned long +-__copy_to_user(void __user *to, const void *from, unsigned long n) ++___copy_to_user(void __user *to, const void *from, unsigned long n) + { + /* + * This test is stubbed out of the main function above to keep +diff -urNp linux-2.6.32.45/arch/arm/mach-at91/pm.c linux-2.6.32.45/arch/= arm/mach-at91/pm.c +--- linux-2.6.32.45/arch/arm/mach-at91/pm.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/arm/mach-at91/pm.c 2011-04-17 15:56:45.00000000= 0 -0400 +@@ -348,7 +348,7 @@ static void at91_pm_end(void) + } +=20 +=20 +-static struct platform_suspend_ops at91_pm_ops =3D{ ++static const struct platform_suspend_ops at91_pm_ops =3D{ + .valid =3D at91_pm_valid_state, + .begin =3D at91_pm_begin, + .enter =3D at91_pm_enter, +diff -urNp linux-2.6.32.45/arch/arm/mach-omap1/pm.c linux-2.6.32.45/arch= /arm/mach-omap1/pm.c +--- linux-2.6.32.45/arch/arm/mach-omap1/pm.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/arm/mach-omap1/pm.c 2011-04-17 15:56:45.0000000= 00 -0400 +@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq=20 +=20 +=20 +=20 +-static struct platform_suspend_ops omap_pm_ops =3D{ ++static const struct platform_suspend_ops omap_pm_ops =3D{ + .prepare =3D omap_pm_prepare, + .enter =3D omap_pm_enter, + .finish =3D omap_pm_finish, +diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.45/= arch/arm/mach-omap2/pm24xx.c +--- linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/arm/mach-omap2/pm24xx.c 2011-04-17 15:56:45.000= 000000 -0400 +@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) + enable_hlt(); + } +=20 +-static struct platform_suspend_ops omap_pm_ops =3D { ++static const struct platform_suspend_ops omap_pm_ops =3D { + .prepare =3D omap2_pm_prepare, + .enter =3D omap2_pm_enter, + .finish =3D omap2_pm_finish, +diff -urNp linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.45/= arch/arm/mach-omap2/pm34xx.c +--- linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/arm/mach-omap2/pm34xx.c 2011-04-17 15:56:45.000= 000000 -0400 +@@ -401,7 +401,7 @@ static void omap3_pm_end(void) + return; + } +=20 +-static struct platform_suspend_ops omap_pm_ops =3D { ++static const struct platform_suspend_ops omap_pm_ops =3D { + .begin =3D omap3_pm_begin, + .end =3D omap3_pm_end, + .prepare =3D omap3_pm_prepare, +diff -urNp linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c linux-2.6.32.45/ar= ch/arm/mach-pnx4008/pm.c +--- linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/arm/mach-pnx4008/pm.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat + (state =3D=3D PM_SUSPEND_MEM); + } +=20 +-static struct platform_suspend_ops pnx4008_pm_ops =3D { ++static const struct platform_suspend_ops pnx4008_pm_ops =3D { + .enter =3D pnx4008_pm_enter, + .valid =3D pnx4008_pm_valid, + }; +diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/pm.c linux-2.6.32.45/arch/a= rm/mach-pxa/pm.c +--- linux-2.6.32.45/arch/arm/mach-pxa/pm.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/arm/mach-pxa/pm.c 2011-04-17 15:56:45.000000000= -0400 +@@ -95,7 +95,7 @@ void pxa_pm_finish(void) + pxa_cpu_pm_fns->finish(); + } +=20 +-static struct platform_suspend_ops pxa_pm_ops =3D { ++static const struct platform_suspend_ops pxa_pm_ops =3D { + .valid =3D pxa_pm_valid, + .enter =3D pxa_pm_enter, + .prepare =3D pxa_pm_prepare, +diff -urNp linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c linux-2.6.32.4= 5/arch/arm/mach-pxa/sharpsl_pm.c +--- linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/arm/mach-pxa/sharpsl_pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status + } +=20 + #ifdef CONFIG_PM +-static struct platform_suspend_ops sharpsl_pm_ops =3D { ++static const struct platform_suspend_ops sharpsl_pm_ops =3D { + .prepare =3D pxa_pm_prepare, + .finish =3D pxa_pm_finish, + .enter =3D corgi_pxa_pm_enter, +diff -urNp linux-2.6.32.45/arch/arm/mach-sa1100/pm.c linux-2.6.32.45/arc= h/arm/mach-sa1100/pm.c +--- linux-2.6.32.45/arch/arm/mach-sa1100/pm.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/arm/mach-sa1100/pm.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) + return virt_to_phys(sp); + } +=20 +-static struct platform_suspend_ops sa11x0_pm_ops =3D { ++static const struct platform_suspend_ops sa11x0_pm_ops =3D { + .enter =3D sa11x0_pm_enter, + .valid =3D suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32.45/arch/arm/mm/fault.c linux-2.6.32.45/arch/arm/= mm/fault.c +--- linux-2.6.32.45/arch/arm/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/arm/mm/fault.c 2011-04-17 15:56:45.000000000 -0= 400 +@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, + } + #endif +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (fsr & FSR_LNX_PF) { ++ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + tsk->thread.address =3D addr; + tsk->thread.error_code =3D fsr; + tsk->thread.trap_no =3D 14; +@@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsign + } + #endif /* CONFIG_MMU */ +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++void pax_report_insns(void *pc, void *sp) ++{ ++ long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 20; i++) { ++ unsigned char c; ++ if (get_user(c, (__force unsigned char __user *)pc+i)) ++ printk(KERN_CONT "?? "); ++ else ++ printk(KERN_CONT "%02x ", c); ++ } ++ printk("\n"); ++ ++ printk(KERN_ERR "PAX: bytes at SP-4: "); ++ for (i =3D -1; i < 20; i++) { ++ unsigned long c; ++ if (get_user(c, (__force unsigned long __user *)sp+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08lx ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + /* + * First Level Translation Fault Handler + * +diff -urNp linux-2.6.32.45/arch/arm/mm/mmap.c linux-2.6.32.45/arch/arm/m= m/mmap.c +--- linux-2.6.32.45/arch/arm/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/arm/mm/mmap.c 2011-04-17 15:56:45.000000000 -04= 00 +@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp + if (len > TASK_SIZE) + return -ENOMEM; +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + if (addr) { + if (do_align) + addr =3D COLOUR_ALIGN(addr, pgoff); +@@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp + addr =3D PAGE_ALIGN(addr); +=20 + vma =3D find_vma(mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (TASK_SIZE - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } + if (len > mm->cached_hole_size) { +- start_addr =3D addr =3D mm->free_area_cache; ++ start_addr =3D addr =3D mm->free_area_cache; + } else { +- start_addr =3D addr =3D TASK_UNMAPPED_BASE; +- mm->cached_hole_size =3D 0; ++ start_addr =3D addr =3D mm->mmap_base; ++ mm->cached_hole_size =3D 0; + } +=20 + full_search: +@@ -94,14 +97,14 @@ full_search: + * Start a new search - just in case we missed + * some holes. + */ +- if (start_addr !=3D TASK_UNMAPPED_BASE) { +- start_addr =3D addr =3D TASK_UNMAPPED_BASE; ++ if (start_addr !=3D mm->mmap_base) { ++ start_addr =3D addr =3D mm->mmap_base; + mm->cached_hole_size =3D 0; + goto full_search; + } + return -ENOMEM; + } +- if (!vma || addr + len <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* + * Remember the place where we stopped the search: + */ +diff -urNp linux-2.6.32.45/arch/arm/plat-s3c/pm.c linux-2.6.32.45/arch/a= rm/plat-s3c/pm.c +--- linux-2.6.32.45/arch/arm/plat-s3c/pm.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/arm/plat-s3c/pm.c 2011-04-17 15:56:45.000000000= -0400 +@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) + s3c_pm_check_cleanup(); + } +=20 +-static struct platform_suspend_ops s3c_pm_ops =3D { ++static const struct platform_suspend_ops s3c_pm_ops =3D { + .enter =3D s3c_pm_enter, + .prepare =3D s3c_pm_prepare, + .finish =3D s3c_pm_finish, +diff -urNp linux-2.6.32.45/arch/avr32/include/asm/elf.h linux-2.6.32.45/= arch/avr32/include/asm/elf.h +--- linux-2.6.32.45/arch/avr32/include/asm/elf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/avr32/include/asm/elf.h 2011-04-17 15:56:45.000= 000000 -0400 +@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg + the loader. We need to make sure that it is out of the way of the p= rogram + that it will "exec", and that there is sufficient room for the brk. = */ +=20 +-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3) ++#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE 0x00001000UL ++ ++#define PAX_DELTA_MMAP_LEN 15 ++#define PAX_DELTA_STACK_LEN 15 ++#endif +=20 + /* This yields a mask that user programs can use to figure out what + instruction set this CPU supports. This could be done in user space= , +diff -urNp linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h linux-2.6= .32.45/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/avr32/include/asm/kmap_types.h 2011-04-17 15:56= :45.000000000 -0400 +@@ -22,7 +22,8 @@ D(10) KM_IRQ0, + D(11) KM_IRQ1, + D(12) KM_SOFTIRQ0, + D(13) KM_SOFTIRQ1, +-D(14) KM_TYPE_NR ++D(14) KM_CLEARPAGE, ++D(15) KM_TYPE_NR + }; +=20 + #undef D +diff -urNp linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c linux-2.6.32.45/a= rch/avr32/mach-at32ap/pm.c +--- linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/avr32/mach-at32ap/pm.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -176,7 +176,7 @@ out: + return 0; + } +=20 +-static struct platform_suspend_ops avr32_pm_ops =3D { ++static const struct platform_suspend_ops avr32_pm_ops =3D { + .valid =3D avr32_pm_valid_state, + .enter =3D avr32_pm_enter, + }; +diff -urNp linux-2.6.32.45/arch/avr32/mm/fault.c linux-2.6.32.45/arch/av= r32/mm/fault.c +--- linux-2.6.32.45/arch/avr32/mm/fault.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/avr32/mm/fault.c 2011-04-17 15:56:45.000000000 = -0400 +@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru +=20 + int exception_trace =3D 1; +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 20; i++) { ++ unsigned char c; ++ if (get_user(c, (unsigned char *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%02x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + /* + * This routine handles page faults. It determines the address and the + * problem, and then passes it off to one of the appropriate routines. +@@ -157,6 +174,16 @@ bad_area: + up_read(&mm->mmap_sem); +=20 + if (user_mode(regs)) { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (mm->pax_flags & MF_PAX_PAGEEXEC) { ++ if (ecr =3D=3D ECR_PROTECTION_X || ecr =3D=3D ECR_TLB_MISS_X) { ++ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++ } ++#endif ++ + if (exception_trace && printk_ratelimit()) + printk("%s%s[%d]: segfault at %08lx pc %08lx " + "sp %08lx ecr %lu\n", +diff -urNp linux-2.6.32.45/arch/blackfin/kernel/kgdb.c linux-2.6.32.45/a= rch/blackfin/kernel/kgdb.c +--- linux-2.6.32.45/arch/blackfin/kernel/kgdb.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/blackfin/kernel/kgdb.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto + return -1; /* this means that we do not want to exit from the handler= */ + } +=20 +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + .gdb_bpt_instr =3D {0xa1}, + #ifdef CONFIG_SMP + .flags =3D KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, +diff -urNp linux-2.6.32.45/arch/blackfin/mach-common/pm.c linux-2.6.32.4= 5/arch/blackfin/mach-common/pm.c +--- linux-2.6.32.45/arch/blackfin/mach-common/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/blackfin/mach-common/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t + return 0; + } +=20 +-struct platform_suspend_ops bfin_pm_ops =3D { ++const struct platform_suspend_ops bfin_pm_ops =3D { + .enter =3D bfin_pm_enter, + .valid =3D bfin_pm_valid, + }; +diff -urNp linux-2.6.32.45/arch/frv/include/asm/kmap_types.h linux-2.6.3= 2.45/arch/frv/include/asm/kmap_types.h +--- linux-2.6.32.45/arch/frv/include/asm/kmap_types.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/frv/include/asm/kmap_types.h 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -23,6 +23,7 @@ enum km_type { + KM_IRQ1, + KM_SOFTIRQ0, + KM_SOFTIRQ1, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; +=20 +diff -urNp linux-2.6.32.45/arch/frv/mm/elf-fdpic.c linux-2.6.32.45/arch/= frv/mm/elf-fdpic.c +--- linux-2.6.32.45/arch/frv/mm/elf-fdpic.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/frv/mm/elf-fdpic.c 2011-04-17 15:56:45.00000000= 0 -0400 +@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str + if (addr) { + addr =3D PAGE_ALIGN(addr); + vma =3D find_vma(current->mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (TASK_SIZE - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + goto success; + } +=20 +@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(str + for (; vma; vma =3D vma->vm_next) { + if (addr > limit) + break; +- if (addr + len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + goto success; + addr =3D vma->vm_end; + } +@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(str + for (; vma; vma =3D vma->vm_next) { + if (addr > limit) + break; +- if (addr + len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + goto success; + addr =3D vma->vm_end; + } +diff -urNp linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c linux-2.6.32= .45/arch/ia64/hp/common/hwsw_iommu.c +--- linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/hp/common/hwsw_iommu.c 2011-04-17 15:56:45= .000000000 -0400 +@@ -17,7 +17,7 @@ + #include + #include +=20 +-extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; ++extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops; +=20 + /* 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); + } +=20 +-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.45/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.= 45/arch/ia64/hp/common/sba_iommu.c +--- linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/hp/common/sba_iommu.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_d + }, + }; +=20 +-extern struct dma_map_ops swiotlb_dma_ops; ++extern const struct dma_map_ops swiotlb_dma_ops; +=20 + static int __init + sba_init(void) +@@ -2211,7 +2211,7 @@ sba_page_override(char *str) +=20 + __setup("sbapagesize=3D",sba_page_override); +=20 +-struct dma_map_ops sba_dma_ops =3D { ++const struct dma_map_ops sba_dma_ops =3D { + .alloc_coherent =3D sba_alloc_coherent, + .free_coherent =3D sba_free_coherent, + .map_page =3D sba_map_page, +diff -urNp linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.45= /arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/ia64/ia32/binfmt_elf32.c 2011-04-17 15:56:45.00= 0000000 -0400 +@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ +=20 + #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_sta= ck)) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (current->personality =3D=3D PER_LINUX32 ? = 0x08048000UL : 0x4000000000000000UL) ++ ++#define PAX_DELTA_MMAP_LEN (current->personality =3D=3D PER_LINUX32 ? 1= 6 : 3*PAGE_SHIFT - 13) ++#define PAX_DELTA_STACK_LEN (current->personality =3D=3D PER_LINUX32 ? = 16 : 3*PAGE_SHIFT - 13) ++#endif ++ + /* Ugly but avoids duplication */ + #include "../../../fs/binfmt_elf.c" +=20 +diff -urNp linux-2.6.32.45/arch/ia64/ia32/ia32priv.h linux-2.6.32.45/arc= h/ia64/ia32/ia32priv.h +--- linux-2.6.32.45/arch/ia64/ia32/ia32priv.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/ia64/ia32/ia32priv.h 2011-04-17 15:56:45.000000= 000 -0400 +@@ -296,7 +296,14 @@ typedef struct compat_siginfo { + #define ELF_DATA ELFDATA2LSB + #define ELF_ARCH EM_386 +=20 +-#define IA32_STACK_TOP IA32_PAGE_OFFSET ++#ifdef CONFIG_PAX_RANDUSTACK ++#define __IA32_DELTA_STACK (current->mm->delta_stack) ++#else ++#define __IA32_DELTA_STACK 0UL ++#endif ++ ++#define IA32_STACK_TOP (IA32_PAGE_OFFSET - __IA32_DELTA_STACK) ++ + #define IA32_GATE_OFFSET IA32_PAGE_OFFSET + #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE +=20 +diff -urNp linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h linux-2.6= .32.45/arch/ia64/include/asm/dma-mapping.h +--- linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/dma-mapping.h 2011-04-17 15:56= :45.000000000 -0400 +@@ -12,7 +12,7 @@ +=20 + #define ARCH_HAS_DMA_GET_REQUIRED_MASK +=20 +-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); +=20 +@@ -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 =3D platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops =3D platform_dma_get_ops(dev); + void *caddr; +=20 + caddr =3D 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 =3D platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops =3D 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 +=20 + static inline int dma_mapping_error(struct device *dev, dma_addr_t dadd= r) + { +- struct dma_map_ops *ops =3D platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops =3D platform_dma_get_ops(dev); + return ops->mapping_error(dev, daddr); + } +=20 + static inline int dma_supported(struct device *dev, u64 mask) + { +- struct dma_map_ops *ops =3D platform_dma_get_ops(dev); ++ const struct dma_map_ops *ops =3D platform_dma_get_ops(dev); + return ops->dma_supported(dev, mask); + } +=20 +diff -urNp linux-2.6.32.45/arch/ia64/include/asm/elf.h linux-2.6.32.45/a= rch/ia64/include/asm/elf.h +--- linux-2.6.32.45/arch/ia64/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -43,6 +43,13 @@ + */ + #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (current->personality =3D=3D PER_LINUX32 ? = 0x08048000UL : 0x4000000000000000UL) ++ ++#define PAX_DELTA_MMAP_LEN (current->personality =3D=3D PER_LINUX32 ? 1= 6 : 3*PAGE_SHIFT - 13) ++#define PAX_DELTA_STACK_LEN (current->personality =3D=3D PER_LINUX32 ? = 16 : 3*PAGE_SHIFT - 13) ++#endif ++ + #define PT_IA_64_UNWIND 0x70000001 +=20 + /* IA-64 relocations: */ +diff -urNp linux-2.6.32.45/arch/ia64/include/asm/machvec.h linux-2.6.32.= 45/arch/ia64/include/asm/machvec.h +--- linux-2.6.32.45/arch/ia64/include/asm/machvec.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/machvec.h 2011-04-17 15:56:45.= 000000000 -0400 +@@ -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 *); +=20 + /* + * 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 */ +=20 + 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 *); +=20 + /* + * Define default versions so we can extend machvec for new platforms w= ithout having +diff -urNp linux-2.6.32.45/arch/ia64/include/asm/pgtable.h linux-2.6.32.= 45/arch/ia64/include/asm/pgtable.h +--- linux-2.6.32.45/arch/ia64/include/asm/pgtable.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/pgtable.h 2011-04-17 15:56:45.= 000000000 -0400 +@@ -12,7 +12,7 @@ + * David Mosberger-Tang + */ +=20 +- ++#include + #include + #include + #include +@@ -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) + #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R= X) ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE= _AR_RW) ++# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PA= GE_AR_R) ++# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_A= R_R) ++#else ++# define PAGE_SHARED_NOEXEC PAGE_SHARED ++# define PAGE_READONLY_NOEXEC PAGE_READONLY ++# define PAGE_COPY_NOEXEC PAGE_COPY ++#endif ++ + #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.32.45/arch/ia64/include/asm/spinlock.h linux-2.6.32= .45/arch/ia64/include/asm/spinlock.h +--- linux-2.6.32.45/arch/ia64/include/asm/spinlock.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/spinlock.h 2011-04-17 15:56:45= .000000000 -0400 +@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi + unsigned short *p =3D (unsigned short *)&lock->lock + 1, tmp; +=20 + asm volatile ("ld2.bias %0=3D[%1]" : "=3Dr"(tmp) : "r"(p)); +- ACCESS_ONCE(*p) =3D (tmp + 2) & ~1; ++ ACCESS_ONCE_RW(*p) =3D (tmp + 2) & ~1; + } +=20 + static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *l= ock) +diff -urNp linux-2.6.32.45/arch/ia64/include/asm/uaccess.h linux-2.6.32.= 45/arch/ia64/include/asm/uaccess.h +--- linux-2.6.32.45/arch/ia64/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/ia64/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 +@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ + const void *__cu_from =3D (from); \ + long __cu_len =3D (n); \ + \ +- if (__access_ok(__cu_to, __cu_len, get_fs())) \ ++ if (__cu_len > 0 && __cu_len <=3D INT_MAX && __access_ok(__cu_to, __c= u_len, get_fs())) \ + __cu_len =3D __copy_user(__cu_to, (__force void __user *) __cu_from, = __cu_len); \ + __cu_len; \ + }) +@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void _ + long __cu_len =3D (n); \ + \ + __chk_user_ptr(__cu_from); \ +- if (__access_ok(__cu_from, __cu_len, get_fs())) \ ++ if (__cu_len > 0 && __cu_len <=3D INT_MAX && __access_ok(__cu_from, _= _cu_len, get_fs())) \ + __cu_len =3D __copy_user((__force void __user *) __cu_to, __cu_from, = __cu_len); \ + __cu_len; \ + }) +diff -urNp linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c linux-2.6.32.4= 5/arch/ia64/kernel/dma-mapping.c +--- linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/dma-mapping.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -3,7 +3,7 @@ + /* Set this to 1 if there is a HW IOMMU in the system */ + int iommu_detected __read_mostly; +=20 +-struct dma_map_ops *dma_ops; ++const struct dma_map_ops *dma_ops; + EXPORT_SYMBOL(dma_ops); +=20 + #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16) +@@ -16,7 +16,7 @@ static int __init dma_init(void) + } + fs_initcall(dma_init); +=20 +-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.45/arch/ia64/kernel/module.c linux-2.6.32.45/arc= h/ia64/kernel/module.c +--- linux-2.6.32.45/arch/ia64/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -315,8 +315,7 @@ module_alloc (unsigned long size) + void + module_free (struct module *mod, void *module_region) + { +- if (mod && mod->arch.init_unw_table && +- module_region =3D=3D mod->module_init) { ++ if (mod && mod->arch.init_unw_table && module_region =3D=3D mod->modul= e_init_rx) { + unw_remove_unwind_table(mod->arch.init_unw_table); + mod->arch.init_unw_table =3D NULL; + } +@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd + } +=20 + static inline int ++in_init_rx (const struct module *mod, uint64_t addr) ++{ ++ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx; ++} ++ ++static inline int ++in_init_rw (const struct module *mod, uint64_t addr) ++{ ++ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw; ++} ++ ++static inline int + in_init (const struct module *mod, uint64_t addr) + { +- return addr - (uint64_t) mod->module_init < mod->init_size; ++ return in_init_rx(mod, addr) || in_init_rw(mod, addr); ++} ++ ++static inline int ++in_core_rx (const struct module *mod, uint64_t addr) ++{ ++ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx; ++} ++ ++static inline int ++in_core_rw (const struct module *mod, uint64_t addr) ++{ ++ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw; + } +=20 + static inline int + in_core (const struct module *mod, uint64_t addr) + { +- return addr - (uint64_t) mod->module_core < mod->core_size; ++ return in_core_rx(mod, addr) || in_core_rw(mod, addr); + } +=20 + static inline int +@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_ + break; +=20 + case RV_BDREL: +- val -=3D (uint64_t) (in_init(mod, val) ? mod->module_init : mod->modu= le_core); ++ if (in_init_rx(mod, val)) ++ val -=3D (uint64_t) mod->module_init_rx; ++ else if (in_init_rw(mod, val)) ++ val -=3D (uint64_t) mod->module_init_rw; ++ else if (in_core_rx(mod, val)) ++ val -=3D (uint64_t) mod->module_core_rx; ++ else if (in_core_rw(mod, val)) ++ val -=3D (uint64_t) mod->module_core_rw; + break; +=20 + case RV_LTV: +@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, + * addresses have been selected... + */ + uint64_t gp; +- if (mod->core_size > MAX_LTOFF) ++ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF) + /* + * This takes advantage of fact that SHF_ARCH_SMALL gets allocated + * at the end of the module. + */ +- gp =3D mod->core_size - MAX_LTOFF / 2; ++ gp =3D mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2; + else +- gp =3D mod->core_size / 2; +- gp =3D (uint64_t) mod->module_core + ((gp + 7) & -8); ++ gp =3D (mod->core_size_rx + mod->core_size_rw) / 2; ++ gp =3D (uint64_t) mod->module_core_rx + ((gp + 7) & -8); + mod->arch.gp =3D gp; + DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); + } +diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-dma.c linux-2.6.32.45/ar= ch/ia64/kernel/pci-dma.c +--- linux-2.6.32.45/arch/ia64/kernel/pci-dma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/pci-dma.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -43,7 +43,7 @@ struct device fallback_dev =3D { + .dma_mask =3D &fallback_dev.coherent_dma_mask, + }; +=20 +-extern struct dma_map_ops intel_dma_ops; ++extern const struct dma_map_ops intel_dma_ops; +=20 + static int __init pci_iommu_init(void) + { +@@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *d + } + EXPORT_SYMBOL(iommu_dma_supported); +=20 ++extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dm= a_addr_t *dma_handle, gfp_t flags); ++extern void intel_free_coherent(struct device *hwdev, size_t size, void= *vaddr, dma_addr_t dma_handle); ++extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglis= t, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); ++extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sg= list, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs); ++extern dma_addr_t intel_map_page(struct device *dev, struct page *page,= unsigned long offset, size_t size, enum dma_data_direction dir, struct d= ma_attrs *attrs); ++extern void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, s= ize_t size, enum dma_data_direction dir, struct dma_attrs *attrs); ++extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)= ; ++ ++static const struct dma_map_ops intel_iommu_dma_ops =3D { ++ /* from drivers/pci/intel-iommu.c:intel_dma_ops */ ++ .alloc_coherent =3D intel_alloc_coherent, ++ .free_coherent =3D intel_free_coherent, ++ .map_sg =3D intel_map_sg, ++ .unmap_sg =3D intel_unmap_sg, ++ .map_page =3D intel_map_page, ++ .unmap_page =3D intel_unmap_page, ++ .mapping_error =3D intel_mapping_error, ++ ++ .sync_single_for_cpu =3D machvec_dma_sync_single, ++ .sync_sg_for_cpu =3D machvec_dma_sync_sg, ++ .sync_single_for_device =3D machvec_dma_sync_single, ++ .sync_sg_for_device =3D machvec_dma_sync_sg, ++ .dma_supported =3D iommu_dma_supported, ++}; ++ + void __init pci_iommu_alloc(void) + { +- dma_ops =3D &intel_dma_ops; +- +- dma_ops->sync_single_for_cpu =3D machvec_dma_sync_single; +- dma_ops->sync_sg_for_cpu =3D machvec_dma_sync_sg; +- dma_ops->sync_single_for_device =3D machvec_dma_sync_single; +- dma_ops->sync_sg_for_device =3D machvec_dma_sync_sg; +- dma_ops->dma_supported =3D iommu_dma_supported; ++ dma_ops =3D &intel_iommu_dma_ops; +=20 + /* + * The order of these functions is important for +diff -urNp linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.4= 5/arch/ia64/kernel/pci-swiotlb.c +--- linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/pci-swiotlb.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent + return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); + } +=20 +-struct dma_map_ops swiotlb_dma_ops =3D { ++const struct dma_map_ops swiotlb_dma_ops =3D { + .alloc_coherent =3D ia64_swiotlb_alloc_coherent, + .free_coherent =3D swiotlb_free_coherent, + .map_page =3D swiotlb_map_page, +diff -urNp linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c linux-2.6.32.45/a= rch/ia64/kernel/sys_ia64.c +--- linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/sys_ia64.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil + if (REGION_NUMBER(addr) =3D=3D RGN_HPAGE) + addr =3D 0; + #endif ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ addr =3D mm->free_area_cache; ++ else ++#endif ++ + if (!addr) + addr =3D mm->free_area_cache; +=20 +@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *fil + for (vma =3D find_vma(mm, addr); ; vma =3D vma->vm_next) { + /* At this point: (!vma || addr < vma->vm_end). */ + if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(add= r)) { +- if (start_addr !=3D TASK_UNMAPPED_BASE) { ++ if (start_addr !=3D mm->mmap_base) { + /* Start a new search --- just in case we missed some holes. */ +- addr =3D TASK_UNMAPPED_BASE; ++ addr =3D mm->mmap_base; + goto full_search; + } + return -ENOMEM; + } +- if (!vma || addr + len <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* Remember the address where we stopped this search: */ + mm->free_area_cache =3D addr + len; + return addr; +diff -urNp linux-2.6.32.45/arch/ia64/kernel/topology.c linux-2.6.32.45/a= rch/ia64/kernel/topology.c +--- linux-2.6.32.45/arch/ia64/kernel/topology.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/topology.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject + return ret; + } +=20 +-static struct sysfs_ops cache_sysfs_ops =3D { ++static const struct sysfs_ops cache_sysfs_ops =3D { + .show =3D cache_show + }; +=20 +diff -urNp linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.4= 5/arch/ia64/kernel/vmlinux.lds.S +--- linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/ia64/kernel/vmlinux.lds.S 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -190,7 +190,7 @@ SECTIONS + /* Per-cpu data: */ + . =3D ALIGN(PERCPU_PAGE_SIZE); + PERCPU_VADDR(PERCPU_ADDR, :percpu) +- __phys_per_cpu_start =3D __per_cpu_load; ++ __phys_per_cpu_start =3D per_cpu_load; + . =3D __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data = fits + * into percpu page size + */ +diff -urNp linux-2.6.32.45/arch/ia64/mm/fault.c linux-2.6.32.45/arch/ia6= 4/mm/fault.c +--- linux-2.6.32.45/arch/ia64/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/ia64/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 +@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned=20 + return pte_present(pte); + } +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 8; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + void __kprobes + ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt= _regs *regs) + { +@@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long addres + mask =3D ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT) + | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT)); +=20 +- if ((vma->vm_flags & mask) !=3D mask) ++ if ((vma->vm_flags & mask) !=3D mask) { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) { ++ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address !=3D regs->cr_iip) ++ goto bad_area; ++ ++ up_read(&mm->mmap_sem); ++ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + goto bad_area; +=20 ++ } ++ + survive: + /* + * If for any reason at all we couldn't handle the fault, make +diff -urNp linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c linux-2.6.32.45/ar= ch/ia64/mm/hugetlbpage.c +--- linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/ia64/mm/hugetlbpage.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area( + /* At this point: (!vmm || addr < vmm->vm_end). */ + if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT) + return -ENOMEM; +- if (!vmm || (addr + len) <=3D vmm->vm_start) ++ if (check_heap_stack_gap(vmm, addr, len)) + return addr; + addr =3D ALIGN(vmm->vm_end, HPAGE_SIZE); + } +diff -urNp linux-2.6.32.45/arch/ia64/mm/init.c linux-2.6.32.45/arch/ia64= /mm/init.c +--- linux-2.6.32.45/arch/ia64/mm/init.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/ia64/mm/init.c 2011-04-17 15:56:45.000000000 -0= 400 +@@ -122,6 +122,19 @@ ia64_init_addr_space (void) + vma->vm_start =3D current->thread.rbs_bot & PAGE_MASK; + vma->vm_end =3D vma->vm_start + PAGE_SIZE; + vma->vm_flags =3D VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT; ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) { ++ vma->vm_flags &=3D ~VM_EXEC; ++ ++#ifdef CONFIG_PAX_MPROTECT ++ if (current->mm->pax_flags & MF_PAX_MPROTECT) ++ vma->vm_flags &=3D ~VM_MAYEXEC; ++#endif ++ ++ } ++#endif ++ + vma->vm_page_prot =3D 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.32.45/arch/ia64/sn/pci/pci_dma.c linux-2.6.32.45/ar= ch/ia64/sn/pci/pci_dma.c +--- linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/ia64/sn/pci/pci_dma.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * + return ret; + } +=20 +-static struct dma_map_ops sn_dma_ops =3D { ++static const struct dma_map_ops sn_dma_ops =3D { + .alloc_coherent =3D sn_dma_alloc_coherent, + .free_coherent =3D sn_dma_free_coherent, + .map_page =3D sn_dma_map_page, +diff -urNp linux-2.6.32.45/arch/m32r/lib/usercopy.c linux-2.6.32.45/arch= /m32r/lib/usercopy.c +--- linux-2.6.32.45/arch/m32r/lib/usercopy.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/m32r/lib/usercopy.c 2011-04-17 15:56:45.0000000= 00 -0400 +@@ -14,6 +14,9 @@ + unsigned long + __generic_copy_to_user(void __user *to, const void *from, unsigned long= n) + { ++ if ((long)n < 0) ++ return n; ++ + prefetch(from); + if (access_ok(VERIFY_WRITE, to, n)) + __copy_user(to,from,n); +@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to,=20 + unsigned long + __generic_copy_from_user(void *to, const void __user *from, unsigned lo= ng n) + { ++ if ((long)n < 0) ++ return n; ++ + prefetchw(to); + if (access_ok(VERIFY_READ, from, n)) + __copy_user_zeroing(to,from,n); +diff -urNp linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c linux-2.6.32= .45/arch/mips/alchemy/devboards/pm.c +--- linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/mips/alchemy/devboards/pm.c 2011-04-17 15:56:45= .000000000 -0400 +@@ -78,7 +78,7 @@ static void db1x_pm_end(void) +=20 + } +=20 +-static struct platform_suspend_ops db1x_pm_ops =3D { ++static const struct platform_suspend_ops db1x_pm_ops =3D { + .valid =3D suspend_valid_only_mem, + .begin =3D db1x_pm_begin, + .enter =3D db1x_pm_enter, +diff -urNp linux-2.6.32.45/arch/mips/include/asm/elf.h linux-2.6.32.45/a= rch/mips/include/asm/elf.h +--- linux-2.6.32.45/arch/mips/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/mips/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str + #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) + #endif +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400= 000UL : 0x00400000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_= SHIFT : 36-PAGE_SHIFT) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE= _SHIFT : 36-PAGE_SHIFT) ++#endif ++ + #endif /* _ASM_ELF_H */ +diff -urNp linux-2.6.32.45/arch/mips/include/asm/page.h linux-2.6.32.45/= arch/mips/include/asm/page.h +--- linux-2.6.32.45/arch/mips/include/asm/page.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/mips/include/asm/page.h 2011-04-17 15:56:45.000= 000000 -0400 +@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa + #ifdef CONFIG_CPU_MIPS32 + typedef struct { unsigned long pte_low, pte_high; } pte_t; + #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_h= igh << 32)) +- #define __pte(x) ({ pte_t __pte =3D {(x), ((unsigned long long= )(x)) >> 32}; __pte; }) ++ #define __pte(x) ({ pte_t __pte =3D {(x), (x) >> 32}; __pte; }= ) + #else + typedef struct { unsigned long long pte; } pte_t; + #define pte_val(x) ((x).pte) +diff -urNp linux-2.6.32.45/arch/mips/include/asm/reboot.h linux-2.6.32.4= 5/arch/mips/include/asm/reboot.h +--- linux-2.6.32.45/arch/mips/include/asm/reboot.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/mips/include/asm/reboot.h 2011-08-21 17:35:02.0= 00000000 -0400 +@@ -9,7 +9,7 @@ + #ifndef _ASM_REBOOT_H + #define _ASM_REBOOT_H +=20 +-extern void (*_machine_restart)(char *command); +-extern void (*_machine_halt)(void); ++extern void (*__noreturn _machine_restart)(char *command); ++extern void (*__noreturn _machine_halt)(void); +=20 + #endif /* _ASM_REBOOT_H */ +diff -urNp linux-2.6.32.45/arch/mips/include/asm/system.h linux-2.6.32.4= 5/arch/mips/include/asm/system.h +--- linux-2.6.32.45/arch/mips/include/asm/system.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/mips/include/asm/system.h 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); + */ + #define __ARCH_WANT_UNLOCKED_CTXSW +=20 +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) ((x) & ~0xfUL) +=20 + #endif /* _ASM_SYSTEM_H */ +diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32= .45/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/binfmt_elfn32.c 2011-04-17 15:56:45= .000000000 -0400 +@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N + #undef ELF_ET_DYN_BASE + #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400= 000UL : 0x00400000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_= SHIFT : 36-PAGE_SHIFT) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE= _SHIFT : 36-PAGE_SHIFT) ++#endif ++ + #include + #include + #include +diff -urNp linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32= .45/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/binfmt_elfo32.c 2011-04-17 15:56:45= .000000000 -0400 +@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N + #undef ELF_ET_DYN_BASE + #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400= 000UL : 0x00400000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_= SHIFT : 36-PAGE_SHIFT) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE= _SHIFT : 36-PAGE_SHIFT) ++#endif ++ + #include +=20 + /* +diff -urNp linux-2.6.32.45/arch/mips/kernel/kgdb.c linux-2.6.32.45/arch/= mips/kernel/kgdb.c +--- linux-2.6.32.45/arch/mips/kernel/kgdb.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/kgdb.c 2011-04-17 15:56:45.00000000= 0 -0400 +@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto + return -1; + } +=20 ++/* cannot be const */ + struct kgdb_arch arch_kgdb_ops; +=20 + /* +diff -urNp linux-2.6.32.45/arch/mips/kernel/process.c linux-2.6.32.45/ar= ch/mips/kernel/process.c +--- linux-2.6.32.45/arch/mips/kernel/process.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/process.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru + out: + return pc; + } +- +-/* +- * Don't forget that the stack pointer must be aligned on a 8 bytes +- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI. +- */ +-unsigned long arch_align_stack(unsigned long sp) +-{ +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -=3D get_random_int() & ~PAGE_MASK; +- +- return sp & ALMASK; +-} +diff -urNp linux-2.6.32.45/arch/mips/kernel/reset.c linux-2.6.32.45/arch= /mips/kernel/reset.c +--- linux-2.6.32.45/arch/mips/kernel/reset.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/reset.c 2011-08-21 17:35:26.0000000= 00 -0400 +@@ -19,8 +19,8 @@ + * So handle all using function pointers to machine specific + * functions. + */ +-void (*_machine_restart)(char *command); +-void (*_machine_halt)(void); ++void (*__noreturn _machine_restart)(char *command); ++void (*__noreturn _machine_halt)(void); + void (*pm_power_off)(void); +=20 + EXPORT_SYMBOL(pm_power_off); +@@ -29,16 +29,19 @@ void machine_restart(char *command) + { + if (_machine_restart) + _machine_restart(command); ++ BUG(); + } +=20 + void machine_halt(void) + { + if (_machine_halt) + _machine_halt(); ++ BUG(); + } +=20 + void machine_power_off(void) + { + if (pm_power_off) + pm_power_off(); ++ BUG(); + } +diff -urNp linux-2.6.32.45/arch/mips/kernel/syscall.c linux-2.6.32.45/ar= ch/mips/kernel/syscall.c +--- linux-2.6.32.45/arch/mips/kernel/syscall.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/mips/kernel/syscall.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(str + do_color_align =3D 0; + if (filp || (flags & MAP_SHARED)) + do_color_align =3D 1; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + if (addr) { + if (do_color_align) + addr =3D COLOUR_ALIGN(addr, pgoff); + else + addr =3D PAGE_ALIGN(addr); + vmm =3D find_vma(current->mm, addr); +- if (task_size - len >=3D addr && +- (!vmm || addr + len <=3D vmm->vm_start)) ++ if (task_size - len >=3D addr && check_heap_stack_gap(vmm, addr, len)= ) + return addr; + } +- addr =3D TASK_UNMAPPED_BASE; ++ addr =3D current->mm->mmap_base; + if (do_color_align) + addr =3D COLOUR_ALIGN(addr, pgoff); + else +@@ -122,7 +126,7 @@ unsigned long arch_get_unmapped_area(str + /* At this point: (!vmm || addr < vmm->vm_end). */ + if (task_size - len < addr) + return -ENOMEM; +- if (!vmm || addr + len <=3D vmm->vm_start) ++ if (check_heap_stack_gap(vmm, addr, len)) + return addr; + addr =3D vmm->vm_end; + if (do_color_align) +diff -urNp linux-2.6.32.45/arch/mips/Makefile linux-2.6.32.45/arch/mips/= Makefile +--- linux-2.6.32.45/arch/mips/Makefile 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/mips/Makefile 2011-08-21 19:26:52.000000000 -04= 00 +@@ -51,6 +51,8 @@ endif + cflags-y :=3D -ffunction-sections + cflags-y +=3D $(call cc-option, -mno-check-zero-division) +=20 ++cflags-y +=3D -Wno-sign-compare -Wno-extra ++ + ifdef CONFIG_32BIT + ld-emul =3D $(32bit-emul) + vmlinux-32 =3D vmlinux +diff -urNp linux-2.6.32.45/arch/mips/mm/fault.c linux-2.6.32.45/arch/mip= s/mm/fault.c +--- linux-2.6.32.45/arch/mips/mm/fault.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/mips/mm/fault.c 2011-04-17 15:56:45.000000000 -= 0400 +@@ -26,6 +26,23 @@ + #include + #include /* For VMALLOC_END */ +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 5; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + /* + * This routine handles page faults. It determines the address, + * and the problem, and then passes it off to one of the appropriate +diff -urNp linux-2.6.32.45/arch/parisc/include/asm/elf.h linux-2.6.32.45= /arch/parisc/include/asm/elf.h +--- linux-2.6.32.45/arch/parisc/include/asm/elf.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/parisc/include/asm/elf.h 2011-04-17 15:56:45.00= 0000000 -0400 +@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. +=20 + #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE 0x10000UL ++ ++#define PAX_DELTA_MMAP_LEN 16 ++#define PAX_DELTA_STACK_LEN 16 ++#endif ++ + /* 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.32.45/arch/parisc/include/asm/pgtable.h linux-2.6.3= 2.45/arch/parisc/include/asm/pgtable.h +--- linux-2.6.32.45/arch/parisc/include/asm/pgtable.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/parisc/include/asm/pgtable.h 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -207,6 +207,17 @@ + #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_REA= D | _PAGE_EXEC |_PAGE_ACCESSED) + #define PAGE_COPY PAGE_EXECREAD + #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_REA= D | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED) ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE= _READ | _PAGE_WRITE | _PAGE_ACCESSED) ++# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_R= EAD | _PAGE_ACCESSED) ++# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PA= GE_READ | _PAGE_ACCESSED) ++#else ++# define PAGE_SHARED_NOEXEC PAGE_SHARED ++# define PAGE_COPY_NOEXEC PAGE_COPY ++# define PAGE_READONLY_NOEXEC PAGE_READONLY ++#endif ++ + #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.32.45/arch/parisc/kernel/module.c linux-2.6.32.45/a= rch/parisc/kernel/module.c +--- linux-2.6.32.45/arch/parisc/kernel/module.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/parisc/kernel/module.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -95,16 +95,38 @@ +=20 + /* three functions to determine where in the module core + * or init pieces the location is */ ++static inline int in_init_rx(struct module *me, void *loc) ++{ ++ return (loc >=3D me->module_init_rx && ++ loc < (me->module_init_rx + me->init_size_rx)); ++} ++ ++static inline int in_init_rw(struct module *me, void *loc) ++{ ++ return (loc >=3D me->module_init_rw && ++ loc < (me->module_init_rw + me->init_size_rw)); ++} ++ + static inline int in_init(struct module *me, void *loc) + { +- return (loc >=3D me->module_init && +- loc <=3D (me->module_init + me->init_size)); ++ return in_init_rx(me, loc) || in_init_rw(me, loc); ++} ++ ++static inline int in_core_rx(struct module *me, void *loc) ++{ ++ return (loc >=3D me->module_core_rx && ++ loc < (me->module_core_rx + me->core_size_rx)); ++} ++ ++static inline int in_core_rw(struct module *me, void *loc) ++{ ++ return (loc >=3D me->module_core_rw && ++ loc < (me->module_core_rw + me->core_size_rw)); + } +=20 + static inline int in_core(struct module *me, void *loc) + { +- return (loc >=3D me->module_core && +- loc <=3D (me->module_core + me->core_size)); ++ return in_core_rx(me, loc) || in_core_rw(me, loc); + } +=20 + static inline int in_local(struct module *me, void *loc) +@@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_ + } +=20 + /* align things a bit */ +- me->core_size =3D ALIGN(me->core_size, 16); +- me->arch.got_offset =3D me->core_size; +- me->core_size +=3D gots * sizeof(struct got_entry); +- +- me->core_size =3D ALIGN(me->core_size, 16); +- me->arch.fdesc_offset =3D me->core_size; +- me->core_size +=3D fdescs * sizeof(Elf_Fdesc); ++ me->core_size_rw =3D ALIGN(me->core_size_rw, 16); ++ me->arch.got_offset =3D me->core_size_rw; ++ me->core_size_rw +=3D gots * sizeof(struct got_entry); ++ ++ me->core_size_rw =3D ALIGN(me->core_size_rw, 16); ++ me->arch.fdesc_offset =3D me->core_size_rw; ++ me->core_size_rw +=3D fdescs * sizeof(Elf_Fdesc); +=20 + me->arch.got_max =3D gots; + me->arch.fdesc_max =3D fdescs; +@@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module=20 +=20 + BUG_ON(value =3D=3D 0); +=20 +- got =3D me->module_core + me->arch.got_offset; ++ got =3D me->module_core_rw + me->arch.got_offset; + for (i =3D 0; got[i].addr; i++) + if (got[i].addr =3D=3D value) + goto out; +@@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module=20 + #ifdef CONFIG_64BIT + static Elf_Addr get_fdesc(struct module *me, unsigned long value) + { +- Elf_Fdesc *fdesc =3D me->module_core + me->arch.fdesc_offset; ++ Elf_Fdesc *fdesc =3D me->module_core_rw + me->arch.fdesc_offset; +=20 + if (!value) { + printk(KERN_ERR "%s: zero OPD requested!\n", me->name); +@@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module=20 +=20 + /* Create new one */ + fdesc->addr =3D value; +- fdesc->gp =3D (Elf_Addr)me->module_core + me->arch.got_offset; ++ fdesc->gp =3D (Elf_Addr)me->module_core_rw + me->arch.got_offset; + return (Elf_Addr)fdesc; + } + #endif /* CONFIG_64BIT */ +@@ -848,7 +870,7 @@ register_unwind_table(struct module *me, +=20 + table =3D (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr; + end =3D table + sechdrs[me->arch.unwind_section].sh_size; +- gp =3D (Elf_Addr)me->module_core + me->arch.got_offset; ++ gp =3D (Elf_Addr)me->module_core_rw + me->arch.got_offset; +=20 + DEBUGP("register_unwind_table(), sect =3D %d at 0x%p - 0x%p (gp=3D0x%l= x)\n", + me->arch.unwind_section, table, end, gp); +diff -urNp linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c linux-2.6.32.= 45/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/parisc/kernel/sys_parisc.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u + /* At this point: (!vma || addr < vma->vm_end). */ + if (TASK_SIZE - len < addr) + return -ENOMEM; +- if (!vma || addr + len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + return addr; + addr =3D vma->vm_end; + } +@@ -79,7 +79,7 @@ static unsigned long get_shared_area(str + /* At this point: (!vma || addr < vma->vm_end). */ + if (TASK_SIZE - len < addr) + return -ENOMEM; +- if (!vma || addr + len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + return addr; + addr =3D DCACHE_ALIGN(vma->vm_end - offset) + offset; + if (addr < vma->vm_end) /* handle wraparound */ +@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str + if (flags & MAP_FIXED) + return addr; + if (!addr) +- addr =3D TASK_UNMAPPED_BASE; ++ addr =3D current->mm->mmap_base; +=20 + if (filp) { + addr =3D get_shared_area(filp->f_mapping, addr, len, pgoff); +diff -urNp linux-2.6.32.45/arch/parisc/kernel/traps.c linux-2.6.32.45/ar= ch/parisc/kernel/traps.c +--- linux-2.6.32.45/arch/parisc/kernel/traps.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/parisc/kernel/traps.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod +=20 + down_read(¤t->mm->mmap_sem); + vma =3D find_vma(current->mm,regs->iaoq[0]); +- if (vma && (regs->iaoq[0] >=3D vma->vm_start) +- && (vma->vm_flags & VM_EXEC)) { +- ++ if (vma && (regs->iaoq[0] >=3D vma->vm_start)) { + fault_address =3D regs->iaoq[0]; + fault_space =3D regs->iasq[0]; +=20 +diff -urNp linux-2.6.32.45/arch/parisc/mm/fault.c linux-2.6.32.45/arch/p= arisc/mm/fault.c +--- linux-2.6.32.45/arch/parisc/mm/fault.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/parisc/mm/fault.c 2011-04-17 15:56:45.000000000= -0400 +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include +=20 + #include + #include +@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex + static unsigned long + parisc_acctyp(unsigned long code, unsigned int inst) + { +- if (code =3D=3D 6 || code =3D=3D 16) ++ if (code =3D=3D 6 || code =3D=3D 7 || code =3D=3D 16) + return VM_EXEC; +=20 + switch (inst & 0xf0000000) { +@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsign + } + #endif +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++/* ++ * PaX: decide what to do with offenders (instruction_pointer(regs) =3D= fault address) ++ * ++ * returns 1 when task should be killed ++ * 2 when rt_sigreturn trampoline was detected ++ * 3 when unpatched PLT trampoline was detected ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ ++#ifdef CONFIG_PAX_EMUPLT ++ int err; ++ ++ do { /* PaX: unpatched PLT emulation */ ++ unsigned int bl, depwi; ++ ++ err =3D get_user(bl, (unsigned int *)instruction_pointer(regs)); ++ err |=3D get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4= )); ++ ++ if (err) ++ break; ++ ++ if (bl =3D=3D 0xEA9F1FDDU && depwi =3D=3D 0xD6801C1EU) { ++ unsigned int ldw, bv, ldw2, addr =3D instruction_pointer(regs)-12; ++ ++ err =3D get_user(ldw, (unsigned int *)addr); ++ err |=3D get_user(bv, (unsigned int *)(addr+4)); ++ err |=3D get_user(ldw2, (unsigned int *)(addr+8)); ++ ++ if (err) ++ break; ++ ++ if (ldw =3D=3D 0x0E801096U && ++ bv =3D=3D 0xEAC0C000U && ++ ldw2 =3D=3D 0x0E881095U) ++ { ++ unsigned int resolver, map; ++ ++ err =3D get_user(resolver, (unsigned int *)(instruction_pointer(reg= s)+8)); ++ err |=3D get_user(map, (unsigned int *)(instruction_pointer(regs)+1= 2)); ++ if (err) ++ break; ++ ++ regs->gr[20] =3D instruction_pointer(regs)+8; ++ regs->gr[21] =3D map; ++ regs->gr[22] =3D resolver; ++ regs->iaoq[0] =3D resolver | 3UL; ++ regs->iaoq[1] =3D regs->iaoq[0] + 4; ++ return 3; ++ } ++ } ++ } while (0); ++#endif ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ ++#ifndef CONFIG_PAX_EMUSIGRT ++ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP)) ++ return 1; ++#endif ++ ++ do { /* PaX: rt_sigreturn emulation */ ++ unsigned int ldi1, ldi2, bel, nop; ++ ++ err =3D get_user(ldi1, (unsigned int *)instruction_pointer(regs)); ++ err |=3D get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4)= ); ++ err |=3D get_user(bel, (unsigned int *)(instruction_pointer(regs)+8))= ; ++ err |=3D get_user(nop, (unsigned int *)(instruction_pointer(regs)+12)= ); ++ ++ if (err) ++ break; ++ ++ if ((ldi1 =3D=3D 0x34190000U || ldi1 =3D=3D 0x34190002U) && ++ ldi2 =3D=3D 0x3414015AU && ++ bel =3D=3D 0xE4008200U && ++ nop =3D=3D 0x08000240U) ++ { ++ regs->gr[25] =3D (ldi1 & 2) >> 1; ++ regs->gr[20] =3D __NR_rt_sigreturn; ++ regs->gr[31] =3D regs->iaoq[1] + 16; ++ regs->sr[0] =3D regs->iasq[1]; ++ regs->iaoq[0] =3D 0x100UL; ++ regs->iaoq[1] =3D regs->iaoq[0] + 4; ++ regs->iasq[0] =3D regs->sr[2]; ++ regs->iasq[1] =3D regs->sr[2]; ++ return 2; ++ } ++ } while (0); ++#endif ++ ++ return 1; ++} ++ ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 5; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + int fixup_exception(struct pt_regs *regs) + { + const struct exception_table_entry *fix; +@@ -192,8 +303,33 @@ good_area: +=20 + acc_type =3D parisc_acctyp(code,regs->iir); +=20 +- if ((vma->vm_flags & acc_type) !=3D acc_type) ++ if ((vma->vm_flags & acc_type) !=3D acc_type) { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) && ++ (address & ~3UL) =3D=3D instruction_pointer(regs)) ++ { ++ up_read(&mm->mmap_sem); ++ switch (pax_handle_fetch_fault(regs)) { ++ ++#ifdef CONFIG_PAX_EMUPLT ++ case 3: ++ return; ++#endif ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ case 2: ++ return; ++#endif ++ ++ } ++ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)re= gs->gr[30]); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + goto bad_area; ++ } +=20 + /* + * If for any reason at all we couldn't handle the fault, make +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/device.h linux-2.6.3= 2.45/arch/powerpc/include/asm/device.h +--- linux-2.6.32.45/arch/powerpc/include/asm/device.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/device.h 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -14,7 +14,7 @@ struct dev_archdata { + struct device_node *of_node; +=20 + /* DMA operations on that device */ +- struct dma_map_ops *dma_ops; ++ const struct dma_map_ops *dma_ops; +=20 + /* + * When an iommu is in use, dma_data is used as a ptr to the base of t= he +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h linux-= 2.6.32.45/arch/powerpc/include/asm/dma-mapping.h +--- linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/dma-mapping.h 2011-04-17 15= :56:45.000000000 -0400 +@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma + #ifdef CONFIG_PPC64 + extern 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; +=20 +-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; + } +=20 +-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 =3D ops; + } +@@ -118,7 +118,7 @@ static inline void set_dma_offset(struct +=20 + static inline int dma_supported(struct device *dev, u64 mask) + { +- struct dma_map_ops *dma_ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops =3D get_dma_ops(dev); +=20 + if (unlikely(dma_ops =3D=3D NULL)) + return 0; +@@ -132,7 +132,7 @@ static inline int dma_supported(struct d +=20 + static inline int dma_set_mask(struct device *dev, u64 dma_mask) + { +- struct dma_map_ops *dma_ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops =3D get_dma_ops(dev); +=20 + if (unlikely(dma_ops =3D=3D 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 =3D get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops =3D get_dma_ops(dev); + void *cpu_addr; +=20 + 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 =3D get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops =3D get_dma_ops(dev); +=20 + BUG_ON(!dma_ops); +=20 +@@ -173,7 +173,7 @@ static inline void dma_free_coherent(str +=20 + static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_= addr) + { +- struct dma_map_ops *dma_ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *dma_ops =3D get_dma_ops(dev); +=20 + if (dma_ops->mapping_error) + return dma_ops->mapping_error(dev, dma_addr); +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/elf.h linux-2.6.32.4= 5/arch/powerpc/include/asm/elf.h +--- linux-2.6.32.45/arch/powerpc/include/asm/elf.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/elf.h 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E + the loader. We need to make sure that it is out of the way of the p= rogram + that it will "exec", and that there is sufficient room for the brk. = */ +=20 +-extern unsigned long randomize_et_dyn(unsigned long base); +-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000)) ++#define ELF_ET_DYN_BASE (0x20000000) ++ ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (0x10000000UL) ++ ++#ifdef __powerpc64__ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28) ++#else ++#define PAX_DELTA_MMAP_LEN 15 ++#define PAX_DELTA_STACK_LEN 15 ++#endif ++#endif +=20 + /* + * Our registers are always unsigned longs, whether we're a 32 bit +@@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(s + (0x7ff >> (PAGE_SHIFT - 12)) : \ + (0x3ffff >> (PAGE_SHIFT - 12))) +=20 +-extern unsigned long arch_randomize_brk(struct mm_struct *mm); +-#define arch_randomize_brk arch_randomize_brk +- + #endif /* __KERNEL__ */ +=20 + /* +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/iommu.h linux-2.6.32= .45/arch/powerpc/include/asm/iommu.h +--- linux-2.6.32.45/arch/powerpc/include/asm/iommu.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/iommu.h 2011-04-17 15:56:45= .000000000 -0400 +@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi + extern void iommu_init_early_dart(void); + extern void iommu_init_early_pasemi(void); +=20 ++/* dma-iommu.c */ ++extern int dma_iommu_dma_supported(struct device *dev, u64 mask); ++ + #ifdef CONFIG_PCI + extern void pci_iommu_init(void); + extern void pci_direct_iommu_init(void); +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h linux-2= .6.32.45/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/kmap_types.h 2011-04-17 15:= 56:45.000000000 -0400 +@@ -26,6 +26,7 @@ enum km_type { + KM_SOFTIRQ1, + KM_PPC_SYNC_PAGE, + KM_PPC_SYNC_ICACHE, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page_64.h linux-2.6.= 32.45/arch/powerpc/include/asm/page_64.h +--- linux-2.6.32.45/arch/powerpc/include/asm/page_64.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/page_64.h 2011-04-17 15:56:= 45.000000000 -0400 +@@ -180,15 +180,18 @@ do { \ + * stack by default, so in the absense of a PT_GNU_STACK program header + * we turn execute permission off. + */ +-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \ +- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) ++#define VM_STACK_DEFAULT_FLAGS32 \ ++ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \ ++ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +=20 + #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +=20 ++#ifndef CONFIG_PAX_PAGEEXEC + #define VM_STACK_DEFAULT_FLAGS \ + (test_thread_flag(TIF_32BIT) ? \ + VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64) ++#endif +=20 + #include +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/page.h linux-2.6.32.= 45/arch/powerpc/include/asm/page.h +--- linux-2.6.32.45/arch/powerpc/include/asm/page.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/page.h 2011-08-21 16:07:39.= 000000000 -0400 +@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; + * and needs to be executable. This means the whole heap ends + * up being executable. + */ +-#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) +=20 + #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ + VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +@@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr; + #define is_kernel_addr(x) ((x) >=3D PAGE_OFFSET) + #endif +=20 ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) ++ + #ifndef __ASSEMBLY__ +=20 + #undef STRICT_MM_TYPECHECKS +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pci.h linux-2.6.32.4= 5/arch/powerpc/include/asm/pci.h +--- linux-2.6.32.45/arch/powerpc/include/asm/pci.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/pci.h 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq + } +=20 + #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.45/arch/powerpc/include/asm/pgtable.h linux-2.6.= 32.45/arch/powerpc/include/asm/pgtable.h +--- linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/pgtable.h 2011-04-17 15:56:= 45.000000000 -0400 +@@ -2,6 +2,7 @@ + #define _ASM_POWERPC_PGTABLE_H + #ifdef __KERNEL__ +=20 ++#include + #ifndef __ASSEMBLY__ + #include /* For TASK_SIZE */ + #include +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h linux-2= .6.32.45/arch/powerpc/include/asm/pte-hash32.h +--- linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/pte-hash32.h 2011-04-17 15:= 56:45.000000000 -0400 +@@ -21,6 +21,7 @@ + #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ + #define _PAGE_USER 0x004 /* usermode access allowed */ + #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */ ++#define _PAGE_EXEC _PAGE_GUARDED + #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP system= s) */ + #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ + #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h linux-2.6.3= 2.45/arch/powerpc/include/asm/ptrace.h +--- linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/ptrace.h 2011-08-21 15:53:5= 8.000000000 -0400 +@@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct p + } while(0) +=20 + struct task_struct; +-extern unsigned long ptrace_get_reg(struct task_struct *task, int regno= ); ++extern unsigned long ptrace_get_reg(struct task_struct *task, unsigned = int regno); + extern int ptrace_put_reg(struct task_struct *task, int regno, + unsigned long data); +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/reg.h linux-2.6.32.4= 5/arch/powerpc/include/asm/reg.h +--- linux-2.6.32.45/arch/powerpc/include/asm/reg.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/reg.h 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -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 */ ++#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */ + #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.32.45/arch/powerpc/include/asm/swiotlb.h linux-2.6.= 32.45/arch/powerpc/include/asm/swiotlb.h +--- linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/swiotlb.h 2011-04-17 15:56:= 45.000000000 -0400 +@@ -13,7 +13,7 @@ +=20 + #include +=20 +-extern struct dma_map_ops swiotlb_dma_ops; ++extern const struct dma_map_ops swiotlb_dma_ops; +=20 + static inline void dma_mark_clean(void *addr, size_t size) {} +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/system.h linux-2.6.3= 2.45/arch/powerpc/include/asm/system.h +--- linux-2.6.32.45/arch/powerpc/include/asm/system.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/system.h 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi + #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o)= , (n)) + #endif +=20 +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) ((x) & ~0xfUL) +=20 + /* Used in very early kernel initialization. */ + extern unsigned long reloc_offset(void); +diff -urNp linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h linux-2.6.= 32.45/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/include/asm/uaccess.h 2011-04-17 15:56:= 45.000000000 -0400 +@@ -13,6 +13,8 @@ + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 +=20 ++extern void check_object_size(const void *ptr, unsigned long n, bool to= ); ++ + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() =3D=3D USER_DS, checking is performed= , with +@@ -327,52 +329,6 @@ do { \ + extern unsigned long __copy_tofrom_user(void __user *to, + const void __user *from, unsigned long size); +=20 +-#ifndef __powerpc64__ +- +-static inline unsigned long copy_from_user(void *to, +- const void __user *from, unsigned long n) +-{ +- unsigned long over; +- +- if (access_ok(VERIFY_READ, from, n)) +- return __copy_tofrom_user((__force void __user *)to, from, n); +- if ((unsigned long)from < TASK_SIZE) { +- over =3D (unsigned long)from + n - TASK_SIZE; +- return __copy_tofrom_user((__force void __user *)to, from, +- n - over) + over; +- } +- return n; +-} +- +-static inline unsigned long copy_to_user(void __user *to, +- const void *from, unsigned long n) +-{ +- unsigned long over; +- +- if (access_ok(VERIFY_WRITE, to, n)) +- return __copy_tofrom_user(to, (__force void __user *)from, n); +- if ((unsigned long)to < TASK_SIZE) { +- over =3D (unsigned long)to + n - TASK_SIZE; +- return __copy_tofrom_user(to, (__force void __user *)from, +- n - over) + over; +- } +- return n; +-} +- +-#else /* __powerpc64__ */ +- +-#define __copy_in_user(to, from, size) \ +- __copy_tofrom_user((to), (from), (size)) +- +-extern unsigned long copy_from_user(void *to, const void __user *from, +- unsigned long n); +-extern unsigned long copy_to_user(void __user *to, const void *from, +- unsigned long n); +-extern unsigned long copy_in_user(void __user *to, const void __user *f= rom, +- unsigned long n); +- +-#endif /* __powerpc64__ */ +- + static inline unsigned long __copy_from_user_inatomic(void *to, + const void __user *from, unsigned long n) + { +@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_ + if (ret =3D=3D 0) + return 0; + } ++ ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); ++ + return __copy_tofrom_user((__force void __user *)to, from, n); + } +=20 +@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us + if (ret =3D=3D 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); + } +=20 +@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us + return __copy_to_user_inatomic(to, from, size); + } +=20 ++#ifndef __powerpc64__ ++ ++static inline unsigned long __must_check copy_from_user(void *to, ++ const void __user *from, unsigned long n) ++{ ++ unsigned long over; ++ ++ 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) { ++ over =3D (unsigned long)from + n - TASK_SIZE; ++ if (!__builtin_constant_p(n - over)) ++ check_object_size(to, n - over, false); ++ return __copy_tofrom_user((__force void __user *)to, from, ++ n - over) + over; ++ } ++ return n; ++} ++ ++static inline unsigned long __must_check copy_to_user(void __user *to, ++ const void *from, unsigned long n) ++{ ++ unsigned long over; ++ ++ if ((long)n < 0) ++ return n; ++ ++ if (access_ok(VERIFY_WRITE, to, n)) { ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); ++ return __copy_tofrom_user(to, (__force void __user *)from, n); ++ } ++ if ((unsigned long)to < TASK_SIZE) { ++ over =3D (unsigned long)to + n - TASK_SIZE; ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n - over, true); ++ return __copy_tofrom_user(to, (__force void __user *)from, ++ n - over) + over; ++ } ++ return n; ++} ++ ++#else /* __powerpc64__ */ ++ ++#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) ++{ ++ if ((long)n < 0 || n > INT_MAX) ++ return n; ++ ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); ++ ++ if (likely(access_ok(VERIFY_READ, from, n))) ++ n =3D __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) ++{ ++ if ((long)n < 0 || n > INT_MAX) ++ return n; ++ ++ if (likely(access_ok(VERIFY_WRITE, to, n))) { ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); ++ n =3D __copy_to_user(to, from, n); ++ } ++ return n; ++} ++ ++extern unsigned long copy_in_user(void __user *to, const void __user *f= rom, ++ unsigned long n); ++ ++#endif /* __powerpc64__ */ ++ + extern unsigned long __clear_user(void __user *addr, unsigned long size= ); +=20 + static inline unsigned long clear_user(void __user *addr, unsigned long= size) +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.= 45/arch/powerpc/kernel/cacheinfo.c +--- linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/cacheinfo.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde + &cache_assoc_attr, + }; +=20 +-static struct sysfs_ops cache_index_ops =3D { ++static const struct sysfs_ops cache_index_ops =3D { + .show =3D cache_index_show, + }; +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma.c linux-2.6.32.45/arc= h/powerpc/kernel/dma.c +--- linux-2.6.32.45/arch/powerpc/kernel/dma.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/dma.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl + } + #endif +=20 +-struct dma_map_ops dma_direct_ops =3D { ++const struct dma_map_ops dma_direct_ops =3D { + .alloc_coherent =3D dma_direct_alloc_coherent, + .free_coherent =3D dma_direct_free_coherent, + .map_sg =3D dma_direct_map_sg, +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.= 45/arch/powerpc/kernel/dma-iommu.c +--- linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/dma-iommu.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de + } +=20 + /* We support DMA to/from any memory page via the iommu */ +-static int dma_iommu_dma_supported(struct device *dev, u64 mask) ++int dma_iommu_dma_supported(struct device *dev, u64 mask) + { + struct iommu_table *tbl =3D get_iommu_table_base(dev); +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.3= 2.45/arch/powerpc/kernel/dma-swiotlb.c +--- linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/dma-swiotlb.c 2011-04-17 15:56:4= 5.000000000 -0400 +@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; + * map_page, and unmap_page on highmem, use normal dma_ops + * for everything else. + */ +-struct dma_map_ops swiotlb_dma_ops =3D { ++const struct dma_map_ops swiotlb_dma_ops =3D { + .alloc_coherent =3D dma_direct_alloc_coherent, + .free_coherent =3D dma_direct_free_coherent, + .map_sg =3D swiotlb_map_sg_attrs, +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S linux-2.= 6.32.45/arch/powerpc/kernel/exceptions-64e.S +--- linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/exceptions-64e.S 2011-04-17 15:5= 6:45.000000000 -0400 +@@ -455,6 +455,7 @@ storage_fault_common: + std r14,_DAR(r1) + std r15,_DSISR(r1) + addi r3,r1,STACK_FRAME_OVERHEAD ++ bl .save_nvgprs + mr r4,r14 + mr r5,r15 + ld r14,PACA_EXGEN+EX_R14(r13) +@@ -464,8 +465,7 @@ storage_fault_common: + cmpdi r3,0 + bne- 1f + b .ret_from_except_lite +-1: bl .save_nvgprs +- mr r5,r3 ++1: mr r5,r3 + addi r3,r1,STACK_FRAME_OVERHEAD + ld r4,_DAR(r1) + bl .bad_page_fault +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S linux-2.= 6.32.45/arch/powerpc/kernel/exceptions-64s.S +--- linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/exceptions-64s.S 2011-04-17 15:5= 6:45.000000000 -0400 +@@ -818,10 +818,10 @@ handle_page_fault: + 11: ld r4,_DAR(r1) + ld r5,_DSISR(r1) + addi r3,r1,STACK_FRAME_OVERHEAD ++ bl .save_nvgprs + bl .do_page_fault + cmpdi r3,0 + beq+ 13f +- bl .save_nvgprs + mr r5,r3 + addi r3,r1,STACK_FRAME_OVERHEAD + lwz r4,_DAR(r1) +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c linux-2.6.32.45= /arch/powerpc/kernel/ibmebus.c +--- linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/ibmebus.c 2011-04-17 15:56:45.00= 0000000 -0400 +@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct=20 + return 1; + } +=20 +-static struct dma_map_ops ibmebus_dma_ops =3D { ++static const struct dma_map_ops ibmebus_dma_ops =3D { + .alloc_coherent =3D ibmebus_alloc_coherent, + .free_coherent =3D ibmebus_free_coherent, + .map_sg =3D ibmebus_map_sg, +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/kgdb.c linux-2.6.32.45/ar= ch/powerpc/kernel/kgdb.c +--- linux-2.6.32.45/arch/powerpc/kernel/kgdb.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/kgdb.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct + if (kgdb_handle_exception(0, SIGTRAP, 0, regs) !=3D 0) + return 0; +=20 +- if (*(u32 *) (regs->nip) =3D=3D *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr= )) ++ if (*(u32 *) (regs->nip) =3D=3D *(const u32 *) (&arch_kgdb_ops.gdb_bpt= _instr)) + regs->nip +=3D 4; +=20 + return 1; +@@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vecto + /* + * Global data + */ +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + .gdb_bpt_instr =3D {0x7d, 0x82, 0x10, 0x08}, + }; +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module_32.c linux-2.6.32.= 45/arch/powerpc/kernel/module_32.c +--- linux-2.6.32.45/arch/powerpc/kernel/module_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/module_32.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr + me->arch.core_plt_section =3D i; + } + if (!me->arch.core_plt_section || !me->arch.init_plt_section) { +- printk("Module doesn't contain .plt or .init.plt sections.\n"); ++ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me-= >name); + return -ENOEXEC; + } +=20 +@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati +=20 + DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)loca= tion); + /* Init, or core PLT? */ +- if (location >=3D mod->module_core +- && location < mod->module_core + mod->core_size) ++ if ((location >=3D mod->module_core_rx && location < mod->module_core_= rx + mod->core_size_rx) || ++ (location >=3D mod->module_core_rw && location < mod->module_core_= rw + mod->core_size_rw)) + entry =3D (void *)sechdrs[mod->arch.core_plt_section].sh_addr; +- else ++ else if ((location >=3D mod->module_init_rx && location < mod->module_= init_rx + mod->init_size_rx) || ++ (location >=3D mod->module_init_rw && location < mod->module_init_rw= + mod->init_size_rw)) + entry =3D (void *)sechdrs[mod->arch.init_plt_section].sh_addr; ++ else { ++ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name); ++ return ~0UL; ++ } +=20 + /* Find this entry, or if that fails, the next avail. entry */ + while (entry->jump[0]) { +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/module.c linux-2.6.32.45/= arch/powerpc/kernel/module.c +--- linux-2.6.32.45/arch/powerpc/kernel/module.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/module.c 2011-04-17 15:56:45.000= 000000 -0400 +@@ -31,11 +31,24 @@ +=20 + LIST_HEAD(module_bug_list); +=20 ++#ifdef CONFIG_PAX_KERNEXEC + void *module_alloc(unsigned long size) + { + if (size =3D=3D 0) + return NULL; +=20 ++ return vmalloc(size); ++} ++ ++void *module_alloc_exec(unsigned long size) ++#else ++void *module_alloc(unsigned long size) ++#endif ++ ++{ ++ if (size =3D=3D 0) ++ return NULL; ++ + return vmalloc_exec(size); + } +=20 +@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi + vfree(module_region); + } +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++void module_free_exec(struct module *mod, void *module_region) ++{ ++ module_free(mod, module_region); ++} ++#endif ++ + static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, + const Elf_Shdr *sechdrs, + const char *name) +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/pci-common.c linux-2.6.32= .45/arch/powerpc/kernel/pci-common.c +--- linux-2.6.32.45/arch/powerpc/kernel/pci-common.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/pci-common.c 2011-04-17 15:56:45= .000000000 -0400 +@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; + unsigned int ppc_pci_flags =3D 0; +=20 +=20 +-static struct dma_map_ops *pci_dma_ops =3D &dma_direct_ops; ++static const struct dma_map_ops *pci_dma_ops =3D &dma_direct_ops; +=20 +-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 =3D dma_ops; + } +=20 +-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.45/arch/powerpc/kernel/process.c linux-2.6.32.45= /arch/powerpc/kernel/process.c +--- linux-2.6.32.45/arch/powerpc/kernel/process.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/process.c 2011-04-17 15:56:45.00= 0000000 -0400 +@@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs) + * Lookup NIP late so we have the best change of getting the + * above info out without failing + */ +- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip); +- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link); ++ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip); ++ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link); + #endif + show_stack(current, (unsigned long *) regs->gpr[1]); + if (!user_mode(regs)) +@@ -1034,10 +1034,10 @@ void show_stack(struct task_struct *tsk, + newsp =3D stack[0]; + ip =3D stack[STACK_FRAME_LR_SAVE]; + if (!firstframe || ip !=3D lr) { +- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip); ++ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip); + #ifdef CONFIG_FUNCTION_GRAPH_TRACER + if ((ip =3D=3D rth || ip =3D=3D mrth) && curr_frame >=3D 0) { +- printk(" (%pS)", ++ printk(" (%pA)", + (void *)current->ret_stack[curr_frame].ret); + curr_frame--; + } +@@ -1057,7 +1057,7 @@ void show_stack(struct task_struct *tsk, + struct pt_regs *regs =3D (struct pt_regs *) + (sp + STACK_FRAME_OVERHEAD); + lr =3D regs->link; +- printk("--- Exception: %lx at %pS\n LR =3D %pS\n", ++ printk("--- Exception: %lx at %pA\n LR =3D %pA\n", + regs->trap, (void *)regs->nip, (void *)lr); + firstframe =3D 1; + } +@@ -1134,58 +1134,3 @@ void thread_info_cache_init(void) + } +=20 + #endif /* THREAD_SHIFT < PAGE_SHIFT */ +- +-unsigned long arch_align_stack(unsigned long sp) +-{ +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -=3D get_random_int() & ~PAGE_MASK; +- return sp & ~0xf; +-} +- +-static inline unsigned long brk_rnd(void) +-{ +- unsigned long rnd =3D 0; +- +- /* 8MB for 32bit, 1GB for 64bit */ +- if (is_32bit_task()) +- rnd =3D (long)(get_random_int() % (1<<(23-PAGE_SHIFT))); +- else +- rnd =3D (long)(get_random_int() % (1<<(30-PAGE_SHIFT))); +- +- return rnd << PAGE_SHIFT; +-} +- +-unsigned long arch_randomize_brk(struct mm_struct *mm) +-{ +- unsigned long base =3D 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 =3D=3D MMU_SEGSIZE_1T)) +- base =3D max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T); +-#endif +- +- ret =3D PAGE_ALIGN(base + brk_rnd()); +- +- if (ret < mm->brk) +- return mm->brk; +- +- return ret; +-} +- +-unsigned long randomize_et_dyn(unsigned long base) +-{ +- unsigned long ret =3D PAGE_ALIGN(base + brk_rnd()); +- +- if (ret < base) +- return base; +- +- return ret; +-} +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/ptrace.c linux-2.6.32.45/= arch/powerpc/kernel/ptrace.c +--- linux-2.6.32.45/arch/powerpc/kernel/ptrace.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/ptrace.c 2011-08-21 15:53:39.000= 000000 -0400 +@@ -86,7 +86,7 @@ static int set_user_trap(struct task_str + /* + * Get contents of register REGNO in task TASK. + */ +-unsigned long ptrace_get_reg(struct task_struct *task, int regno) ++unsigned long ptrace_get_reg(struct task_struct *task, unsigned int reg= no) + { + if (task->thread.regs =3D=3D NULL) + return -EIO; +@@ -894,7 +894,7 @@ long arch_ptrace(struct task_struct *chi +=20 + CHECK_FULL_REGS(child->thread.regs); + if (index < PT_FPR0) { +- tmp =3D ptrace_get_reg(child, (int) index); ++ tmp =3D ptrace_get_reg(child, index); + } else { + flush_fp_to_thread(child); + tmp =3D ((unsigned long *)child->thread.fpr) +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_32.c linux-2.6.32.= 45/arch/powerpc/kernel/signal_32.c +--- linux-2.6.32.45/arch/powerpc/kernel/signal_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/signal_32.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig + /* Save user registers on the stack */ + frame =3D &rt_sf->uc.uc_mcontext; + addr =3D frame; +- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) { ++ if (vdso32_rt_sigtramp && current->mm->context.vdso_base !=3D ~0UL) { + if (save_user_regs(regs, frame, 0, 1)) + goto badframe; + regs->link =3D current->mm->context.vdso_base + vdso32_rt_sigtramp; +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/signal_64.c linux-2.6.32.= 45/arch/powerpc/kernel/signal_64.c +--- linux-2.6.32.45/arch/powerpc/kernel/signal_64.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/signal_64.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct + current->thread.fpscr.val =3D 0; +=20 + /* Set up to return from userspace. */ +- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) { ++ if (vdso64_rt_sigtramp && current->mm->context.vdso_base !=3D ~0UL) { + regs->link =3D current->mm->context.vdso_base + vdso64_rt_sigtramp; + } else { + err |=3D setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.= 45/arch/powerpc/kernel/sys_ppc32.c +--- linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/sys_ppc32.c 2011-04-17 15:56:45.= 000000000 -0400 +@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct + if (oldlenp) { + if (!error) { + if (get_user(oldlen, oldlenp) || +- put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)= )) ++ put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)= ) || ++ copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused))= ) + error =3D -EFAULT; + } +- copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)); + } + return error; + } +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/traps.c linux-2.6.32.45/a= rch/powerpc/kernel/traps.c +--- linux-2.6.32.45/arch/powerpc/kernel/traps.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/traps.c 2011-06-13 21:33:37.0000= 00000 -0400 +@@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void) + static inline void pmac_backlight_unblank(void) { } + #endif +=20 ++extern void gr_handle_kernel_exploit(void); ++ + int die(const char *str, struct pt_regs *regs, long err) + { + static struct { +@@ -168,6 +170,8 @@ int die(const char *str, struct pt_regs=20 + if (panic_on_oops) + panic("Fatal exception"); +=20 ++ gr_handle_kernel_exploit(); ++ + oops_exit(); + do_exit(err); +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vdso.c linux-2.6.32.45/ar= ch/powerpc/kernel/vdso.c +--- linux-2.6.32.45/arch/powerpc/kernel/vdso.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/vdso.c 2011-04-17 15:56:45.00000= 0000 -0400 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include +=20 + #include "setup.h" +=20 +@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l + vdso_base =3D VDSO32_MBASE; + #endif +=20 +- current->mm->context.vdso_base =3D 0; ++ current->mm->context.vdso_base =3D ~0UL; +=20 + /* vDSO has a problem and was disabled, just don't "enable" it for the + * process +@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l + vdso_base =3D get_unmapped_area(NULL, vdso_base, + (vdso_pages << PAGE_SHIFT) + + ((VDSO_ALIGNMENT - 1) & PAGE_MASK), +- 0, 0); ++ 0, MAP_PRIVATE | MAP_EXECUTABLE); + if (IS_ERR_VALUE(vdso_base)) { + rc =3D vdso_base; + goto fail_mmapsem; +diff -urNp linux-2.6.32.45/arch/powerpc/kernel/vio.c linux-2.6.32.45/arc= h/powerpc/kernel/vio.c +--- linux-2.6.32.45/arch/powerpc/kernel/vio.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/powerpc/kernel/vio.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc + vio_cmo_dealloc(viodev, alloc_size); + } +=20 +-struct dma_map_ops vio_dma_mapping_ops =3D { ++static const struct dma_map_ops vio_dma_mapping_ops =3D { + .alloc_coherent =3D vio_dma_iommu_alloc_coherent, + .free_coherent =3D vio_dma_iommu_free_coherent, + .map_sg =3D vio_dma_iommu_map_sg, + .unmap_sg =3D vio_dma_iommu_unmap_sg, ++ .dma_supported =3D dma_iommu_dma_supported, + .map_page =3D vio_dma_iommu_map_page, + .unmap_page =3D vio_dma_iommu_unmap_page, +=20 +@@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vi +=20 + static void vio_cmo_set_dma_ops(struct vio_dev *viodev) + { +- vio_dma_mapping_ops.dma_supported =3D dma_iommu_ops.dma_supported; + viodev->dev.archdata.dma_ops =3D &vio_dma_mapping_ops; + } +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c linux-2.6.32.4= 5/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/lib/usercopy_64.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -9,22 +9,6 @@ + #include + #include +=20 +-unsigned long copy_from_user(void *to, const void __user *from, unsigne= d long n) +-{ +- if (likely(access_ok(VERIFY_READ, from, n))) +- n =3D __copy_from_user(to, from, n); +- else +- memset(to, 0, n); +- return n; +-} +- +-unsigned long copy_to_user(void __user *to, const void *from, unsigned = long n) +-{ +- if (likely(access_ok(VERIFY_WRITE, to, n))) +- n =3D __copy_to_user(to, from, n); +- return n; +-} +- + unsigned long copy_in_user(void __user *to, const void __user *from, + unsigned long n) + { +@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user * + return n; + } +=20 +-EXPORT_SYMBOL(copy_from_user); +-EXPORT_SYMBOL(copy_to_user); + EXPORT_SYMBOL(copy_in_user); +=20 +diff -urNp linux-2.6.32.45/arch/powerpc/Makefile linux-2.6.32.45/arch/po= werpc/Makefile +--- linux-2.6.32.45/arch/powerpc/Makefile 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/powerpc/Makefile 2011-08-21 19:27:08.000000000 = -0400 +@@ -74,6 +74,8 @@ KBUILD_AFLAGS +=3D -Iarch/$(ARCH) + KBUILD_CFLAGS +=3D -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y) + CPP =3D $(CC) -E $(KBUILD_CFLAGS) +=20 ++cflags-y +=3D -Wno-sign-compare -Wno-extra ++ + CHECKFLAGS +=3D -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG= _WORD_SIZE)__ +=20 + ifeq ($(CONFIG_PPC64),y) +diff -urNp linux-2.6.32.45/arch/powerpc/mm/fault.c linux-2.6.32.45/arch/= powerpc/mm/fault.c +--- linux-2.6.32.45/arch/powerpc/mm/fault.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/powerpc/mm/fault.c 2011-04-17 15:56:45.00000000= 0 -0400 +@@ -30,6 +30,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include +=20 + #include + #include +@@ -40,6 +44,7 @@ + #include + #include + #include ++#include +=20 +=20 + #ifdef CONFIG_KPROBES +@@ -64,6 +69,33 @@ static inline int notify_page_fault(stru + } + #endif +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++/* ++ * PaX: decide what to do with offenders (regs->nip =3D fault address) ++ * ++ * returns 1 when task should be killed ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ return 1; ++} ++ ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 5; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int __user *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + /* + * Check whether the instruction at regs->nip is a store using + * an update addressing form which will update r1. +@@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_re + * indicate errors in DSISR but can validly be set in SRR1. + */ + if (trap =3D=3D 0x400) +- error_code &=3D 0x48200000; ++ error_code &=3D 0x58200000; + else + is_write =3D error_code & DSISR_ISSTORE; + #else +@@ -250,7 +282,7 @@ good_area: + * "undefined". Of those that can be set, this is the only + * one which seems bad. + */ +- if (error_code & 0x10000000) ++ if (error_code & DSISR_GUARDED) + /* Guarded storage error. */ + goto bad_area; + #endif /* CONFIG_8xx */ +@@ -265,7 +297,7 @@ good_area: + * processors use the same I/D cache coherency mechanism + * as embedded. + */ +- if (error_code & DSISR_PROTFAULT) ++ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED)) + goto bad_area; + #endif /* CONFIG_PPC_STD_MMU */ +=20 +@@ -335,6 +367,23 @@ bad_area: + bad_area_nosemaphore: + /* User mode accesses cause a SIGSEGV */ + if (user_mode(regs)) { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (mm->pax_flags & MF_PAX_PAGEEXEC) { ++#ifdef CONFIG_PPC_STD_MMU ++ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) { ++#else ++ if (is_exec && regs->nip =3D=3D address) { ++#endif ++ switch (pax_handle_fetch_fault(regs)) { ++ } ++ ++ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1])= ; ++ do_group_exit(SIGKILL); ++ } ++ } ++#endif ++ + _exception(SIGSEGV, regs, code, address); + return 0; + } +diff -urNp linux-2.6.32.45/arch/powerpc/mm/mem.c linux-2.6.32.45/arch/po= werpc/mm/mem.c +--- linux-2.6.32.45/arch/powerpc/mm/mem.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/powerpc/mm/mem.c 2011-08-21 15:50:39.000000000 = -0400 +@@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(voi + { + unsigned long lmb_next_region_start_pfn, + lmb_region_max_pfn; +- int i; ++ unsigned int i; +=20 + for (i =3D 0; i < lmb.memory.cnt - 1; i++) { + lmb_region_max_pfn =3D +diff -urNp linux-2.6.32.45/arch/powerpc/mm/mmap_64.c linux-2.6.32.45/arc= h/powerpc/mm/mmap_64.c +--- linux-2.6.32.45/arch/powerpc/mm/mmap_64.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/powerpc/mm/mmap_64.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str + */ + if (mmap_is_legacy()) { + mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area; + mm->unmap_area =3D arch_unmap_area; + } else { + mm->mmap_base =3D mmap_base(); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -=3D mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; + mm->unmap_area =3D arch_unmap_area_topdown; + } +diff -urNp linux-2.6.32.45/arch/powerpc/mm/slice.c linux-2.6.32.45/arch/= powerpc/mm/slice.c +--- linux-2.6.32.45/arch/powerpc/mm/slice.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/powerpc/mm/slice.c 2011-04-17 15:56:45.00000000= 0 -0400 +@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_ + if ((mm->task_size - len) < addr) + return 0; + vma =3D find_vma(mm, addr); +- return (!vma || (addr + len) <=3D vma->vm_start); ++ return check_heap_stack_gap(vma, addr, len); + } +=20 + static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice) +@@ -256,7 +256,7 @@ full_search: + addr =3D _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT); + continue; + } +- if (!vma || addr + len <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* + * Remember the place where we stopped the search: + */ +@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top + } + } +=20 +- addr =3D mm->mmap_base; +- while (addr > len) { ++ if (mm->mmap_base < len) ++ addr =3D -ENOMEM; ++ else ++ addr =3D mm->mmap_base - len; ++ ++ while (!IS_ERR_VALUE(addr)) { + /* Go down by chunk size */ +- addr =3D _ALIGN_DOWN(addr - len, 1ul << pshift); ++ addr =3D _ALIGN_DOWN(addr, 1ul << pshift); +=20 + /* Check for hit with different page size */ + mask =3D slice_range_to_mask(addr, len); +@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top + * return with success: + */ + vma =3D find_vma(mm, addr); +- if (!vma || (addr + len) <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* remember the address as a hint for next time */ + if (use_cache) + mm->free_area_cache =3D addr; +@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top + mm->cached_hole_size =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D vma->vm_start; ++ addr =3D skip_heap_stack_gap(vma, len); + } +=20 + /* +@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un + if (fixed && addr > (mm->task_size - len)) + return -EINVAL; +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP)) ++ addr =3D 0; ++#endif ++ + /* If hint, make sure it matches our alignment restrictions */ + if (!fixed && addr) { + addr =3D _ALIGN_UP(addr, 1ul << pshift); +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c lin= ux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c +--- linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/52xx/lite5200_pm.c 2011-04-17= 15:56:45.000000000 -0400 +@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) + lite5200_pm_target_state =3D PM_SUSPEND_ON; + } +=20 +-static struct platform_suspend_ops lite5200_pm_ops =3D { ++static const struct platform_suspend_ops lite5200_pm_ops =3D { + .valid =3D lite5200_pm_valid, + .begin =3D lite5200_pm_begin, + .prepare =3D lite5200_pm_prepare, +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c linu= x-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c +--- linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2011-04-17 = 15:56:45.000000000 -0400 +@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) + iounmap(mbar); + } +=20 +-static struct platform_suspend_ops mpc52xx_pm_ops =3D { ++static const struct platform_suspend_ops mpc52xx_pm_ops =3D { + .valid =3D mpc52xx_pm_valid, + .prepare =3D mpc52xx_pm_prepare, + .enter =3D mpc52xx_pm_enter, +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c linux-2= .6.32.45/arch/powerpc/platforms/83xx/suspend.c +--- linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/83xx/suspend.c 2011-04-17 15:= 56:45.000000000 -0400 +@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) + return ret; + } +=20 +-static struct platform_suspend_ops mpc83xx_suspend_ops =3D { ++static const struct platform_suspend_ops mpc83xx_suspend_ops =3D { + .valid =3D mpc83xx_suspend_valid, + .begin =3D mpc83xx_suspend_begin, + .enter =3D mpc83xx_suspend_enter, +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c linux-2.6= .32.45/arch/powerpc/platforms/cell/iommu.c +--- linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/cell/iommu.c 2011-04-17 15:56= :45.000000000 -0400 +@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc +=20 + static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); +=20 +-struct dma_map_ops dma_iommu_fixed_ops =3D { ++const struct dma_map_ops dma_iommu_fixed_ops =3D { + .alloc_coherent =3D dma_fixed_alloc_coherent, + .free_coherent =3D dma_fixed_free_coherent, + .map_sg =3D dma_fixed_map_sg, +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c linux= -2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c +--- linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/ps3/system-bus.c 2011-04-17 1= 5:56:45.000000000 -0400 +@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi + return mask >=3D DMA_BIT_MASK(32); + } +=20 +-static struct dma_map_ops ps3_sb_dma_ops =3D { ++static const struct dma_map_ops ps3_sb_dma_ops =3D { + .alloc_coherent =3D ps3_alloc_coherent, + .free_coherent =3D ps3_free_coherent, + .map_sg =3D ps3_sb_map_sg, +@@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops + .unmap_page =3D ps3_unmap_page, + }; +=20 +-static struct dma_map_ops ps3_ioc0_dma_ops =3D { ++static const struct dma_map_ops ps3_ioc0_dma_ops =3D { + .alloc_coherent =3D ps3_alloc_coherent, + .free_coherent =3D ps3_free_coherent, + .map_sg =3D ps3_ioc0_map_sg, +diff -urNp linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig linux-= 2.6.32.45/arch/powerpc/platforms/pseries/Kconfig +--- linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/powerpc/platforms/pseries/Kconfig 2011-04-17 15= :56:45.000000000 -0400 +@@ -2,6 +2,8 @@ config PPC_PSERIES + depends on PPC64 && PPC_BOOK3S + bool "IBM pSeries & new (POWER5-based) iSeries" + select MPIC ++ select PCI_MSI ++ select XICS + select PPC_I8259 + select PPC_RTAS + select RTAS_ERROR_LOGGING +diff -urNp linux-2.6.32.45/arch/s390/include/asm/elf.h linux-2.6.32.45/a= rch/s390/include/asm/elf.h +--- linux-2.6.32.45/arch/s390/include/asm/elf.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/s390/include/asm/elf.h 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; + that it will "exec", and that there is sufficient room for the brk. = */ + #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : = 0x80000000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 ) ++#endif ++ + /* This yields a mask that user programs can use to figure out what + instruction set this CPU supports. */ +=20 +diff -urNp linux-2.6.32.45/arch/s390/include/asm/setup.h linux-2.6.32.45= /arch/s390/include/asm/setup.h +--- linux-2.6.32.45/arch/s390/include/asm/setup.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/s390/include/asm/setup.h 2011-04-17 15:56:45.00= 0000000 -0400 +@@ -50,13 +50,13 @@ extern unsigned long memory_end; + void detect_memory_layout(struct mem_chunk chunk[]); +=20 + #ifdef CONFIG_S390_SWITCH_AMODE +-extern unsigned int switch_amode; ++#define switch_amode (1) + #else + #define switch_amode (0) + #endif +=20 + #ifdef CONFIG_S390_EXEC_PROTECT +-extern unsigned int s390_noexec; ++#define s390_noexec (1) + #else + #define s390_noexec (0) + #endif +diff -urNp linux-2.6.32.45/arch/s390/include/asm/uaccess.h linux-2.6.32.= 45/arch/s390/include/asm/uaccess.h +--- linux-2.6.32.45/arch/s390/include/asm/uaccess.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/s390/include/asm/uaccess.h 2011-04-17 15:56:45.= 000000000 -0400 +@@ -232,6 +232,10 @@ static inline unsigned long __must_check + copy_to_user(void __user *to, const void *from, unsigned long n) + { + might_fault(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_WRITE, to, n)) + n =3D __copy_to_user(to, from, n); + return n; +@@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void + static inline unsigned long __must_check + __copy_from_user(void *to, const void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n) && (n <=3D 256)) + return uaccess.copy_from_user_small(n, from, to); + else +@@ -283,6 +290,10 @@ static inline unsigned long __must_check + copy_from_user(void *to, const void __user *from, unsigned long n) + { + might_fault(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_READ, from, n)) + n =3D __copy_from_user(to, from, n); + else +diff -urNp linux-2.6.32.45/arch/s390/Kconfig linux-2.6.32.45/arch/s390/K= config +--- linux-2.6.32.45/arch/s390/Kconfig 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/s390/Kconfig 2011-04-17 15:56:45.000000000 -040= 0 +@@ -194,28 +194,26 @@ config AUDIT_ARCH +=20 + config S390_SWITCH_AMODE + bool "Switch kernel/user addressing modes" ++ default y + help + This option allows to switch the addressing modes of kernel and user +- space. The kernel parameter switch_amode=3Don will enable this featu= re, +- default is disabled. Enabling this (via kernel parameter) on machine= s +- earlier than IBM System z9-109 EC/BC will reduce system performance. ++ space. Enabling this on machines earlier than IBM System z9-109 EC/= BC ++ will reduce system performance. +=20 + Note that this option will also be selected by selecting the execute +- protection option below. Enabling the execute protection via the +- noexec kernel parameter will also switch the addressing modes, +- independent of the switch_amode kernel parameter. ++ protection option below. Enabling the execute protection will also ++ switch the addressing modes, independent of this option. +=20 +=20 + config S390_EXEC_PROTECT + bool "Data execute protection" ++ default y + select S390_SWITCH_AMODE + help + This option allows to enable a buffer overflow protection for user + space programs and it also selects the addressing mode option above. +- The kernel parameter noexec=3Don will enable this feature and also +- switch the addressing modes, default is disabled. Enabling this (via +- kernel parameter) on machines earlier than IBM System z9-109 EC/BC +- will reduce system performance. ++ Enabling this on machines earlier than IBM System z9-109 EC/BC will ++ reduce system performance. +=20 + comment "Code generation options" +=20 +diff -urNp linux-2.6.32.45/arch/s390/kernel/module.c linux-2.6.32.45/arc= h/s390/kernel/module.c +--- linux-2.6.32.45/arch/s390/kernel/module.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/s390/kernel/module.c 2011-04-17 15:56:45.000000= 000 -0400 +@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, +=20 + /* Increase core size by size of got & plt and set start + offsets for got and plt. */ +- me->core_size =3D ALIGN(me->core_size, 4); +- me->arch.got_offset =3D me->core_size; +- me->core_size +=3D me->arch.got_size; +- me->arch.plt_offset =3D me->core_size; +- me->core_size +=3D me->arch.plt_size; ++ me->core_size_rw =3D ALIGN(me->core_size_rw, 4); ++ me->arch.got_offset =3D me->core_size_rw; ++ me->core_size_rw +=3D me->arch.got_size; ++ me->arch.plt_offset =3D me->core_size_rx; ++ me->core_size_rx +=3D me->arch.plt_size; + return 0; + } +=20 +@@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base + if (info->got_initialized =3D=3D 0) { + Elf_Addr *gotent; +=20 +- gotent =3D me->module_core + me->arch.got_offset + ++ gotent =3D me->module_core_rw + me->arch.got_offset + + info->got_offset; + *gotent =3D val; + info->got_initialized =3D 1; +@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base + else if (r_type =3D=3D R_390_GOTENT || + r_type =3D=3D R_390_GOTPLTENT) + *(unsigned int *) loc =3D +- (val + (Elf_Addr) me->module_core - loc) >> 1; ++ (val + (Elf_Addr) me->module_core_rw - loc) >> 1; + else if (r_type =3D=3D R_390_GOT64 || + r_type =3D=3D R_390_GOTPLT64) + *(unsigned long *) loc =3D val; +@@ -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 =3D=3D 0) { + unsigned int *ip; +- ip =3D me->module_core + me->arch.plt_offset + ++ ip =3D me->module_core_rx + me->arch.plt_offset + + info->plt_offset; + #ifndef CONFIG_64BIT + ip[0] =3D 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ +@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base + val - loc + 0xffffUL < 0x1ffffeUL) || + (r_type =3D=3D R_390_PLT32DBL && + val - loc + 0xffffffffULL < 0x1fffffffeULL))) +- val =3D (Elf_Addr) me->module_core + ++ val =3D (Elf_Addr) me->module_core_rx + + me->arch.plt_offset + + info->plt_offset; + val +=3D rela->r_addend - loc; +@@ -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 =3D val + rela->r_addend - +- ((Elf_Addr) me->module_core + me->arch.got_offset); ++ ((Elf_Addr) me->module_core_rw + me->arch.got_offset); + if (r_type =3D=3D R_390_GOTOFF16) + *(unsigned short *) loc =3D val; + else if (r_type =3D=3D R_390_GOTOFF32) +@@ -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. */ +- val =3D (Elf_Addr) me->module_core + me->arch.got_offset + ++ val =3D (Elf_Addr) me->module_core_rw + me->arch.got_offset + + rela->r_addend - loc; + if (r_type =3D=3D R_390_GOTPC) + *(unsigned int *) loc =3D val; +diff -urNp linux-2.6.32.45/arch/s390/kernel/setup.c linux-2.6.32.45/arch= /s390/kernel/setup.c +--- linux-2.6.32.45/arch/s390/kernel/setup.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/s390/kernel/setup.c 2011-04-17 15:56:45.0000000= 00 -0400 +@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * + early_param("mem", early_parse_mem); +=20 + #ifdef CONFIG_S390_SWITCH_AMODE +-unsigned int switch_amode =3D 0; +-EXPORT_SYMBOL_GPL(switch_amode); +- + static int set_amode_and_uaccess(unsigned long user_amode, + unsigned long user32_amode) + { +@@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigne + return 0; + } + } +- +-/* +- * Switch kernel/user addressing modes? +- */ +-static int __init early_parse_switch_amode(char *p) +-{ +- switch_amode =3D 1; +- return 0; +-} +-early_param("switch_amode", early_parse_switch_amode); +- + #else /* CONFIG_S390_SWITCH_AMODE */ + static inline int set_amode_and_uaccess(unsigned long user_amode, + unsigned long user32_amode) +@@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess( + } + #endif /* CONFIG_S390_SWITCH_AMODE */ +=20 +-#ifdef CONFIG_S390_EXEC_PROTECT +-unsigned int s390_noexec =3D 0; +-EXPORT_SYMBOL_GPL(s390_noexec); +- +-/* +- * Enable execute protection? +- */ +-static int __init early_parse_noexec(char *p) +-{ +- if (!strncmp(p, "off", 3)) +- return 0; +- switch_amode =3D 1; +- s390_noexec =3D 1; +- return 0; +-} +-early_param("noexec", early_parse_noexec); +-#endif /* CONFIG_S390_EXEC_PROTECT */ +- + static void setup_addressing_mode(void) + { + if (s390_noexec) { +diff -urNp linux-2.6.32.45/arch/s390/mm/mmap.c linux-2.6.32.45/arch/s390= /mm/mmap.c +--- linux-2.6.32.45/arch/s390/mm/mmap.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/s390/mm/mmap.c 2011-04-17 15:56:45.000000000 -0= 400 +@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str + */ + if (mmap_is_legacy()) { + mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area; + mm->unmap_area =3D arch_unmap_area; + } else { + mm->mmap_base =3D mmap_base(); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -=3D mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; + mm->unmap_area =3D arch_unmap_area_topdown; + } +@@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_str + */ + if (mmap_is_legacy()) { + mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area =3D s390_get_unmapped_area; + mm->unmap_area =3D arch_unmap_area; + } else { + mm->mmap_base =3D mmap_base(); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -=3D mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area =3D s390_get_unmapped_area_topdown; + mm->unmap_area =3D arch_unmap_area_topdown; + } +diff -urNp linux-2.6.32.45/arch/score/include/asm/system.h linux-2.6.32.= 45/arch/score/include/asm/system.h +--- linux-2.6.32.45/arch/score/include/asm/system.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/score/include/asm/system.h 2011-04-17 15:56:45.= 000000000 -0400 +@@ -17,7 +17,7 @@ do { \ + #define finish_arch_switch(prev) do {} while (0) +=20 + typedef void (*vi_handler_t)(void); +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) (x) +=20 + #define mb() barrier() + #define rmb() barrier() +diff -urNp linux-2.6.32.45/arch/score/kernel/process.c linux-2.6.32.45/a= rch/score/kernel/process.c +--- linux-2.6.32.45/arch/score/kernel/process.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/score/kernel/process.c 2011-04-17 15:56:45.0000= 00000 -0400 +@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru +=20 + return task_pt_regs(task)->cp0_epc; + } +- +-unsigned long arch_align_stack(unsigned long sp) +-{ +- return sp; +-} +diff -urNp linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c linux-2.6.32.4= 5/arch/sh/boards/mach-hp6xx/pm.c +--- linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/sh/boards/mach-hp6xx/pm.c 2011-04-17 15:56:45.0= 00000000 -0400 +@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ + return 0; + } +=20 +-static struct platform_suspend_ops hp6x0_pm_ops =3D { ++static const struct platform_suspend_ops hp6x0_pm_ops =3D { + .enter =3D hp6x0_pm_enter, + .valid =3D suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.32.45/a= rch/sh/kernel/cpu/sh4/sq.c +--- linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/sh/kernel/cpu/sh4/sq.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ + NULL, + }; +=20 +-static struct sysfs_ops sq_sysfs_ops =3D { ++static const struct sysfs_ops sq_sysfs_ops =3D { + .show =3D sq_sysfs_show, + .store =3D sq_sysfs_store, + }; +diff -urNp linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32= .45/arch/sh/kernel/cpu/shmobile/pm.c +--- linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/sh/kernel/cpu/shmobile/pm.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s + return 0; + } +=20 +-static struct platform_suspend_ops sh_pm_ops =3D { ++static const struct platform_suspend_ops sh_pm_ops =3D { + .enter =3D sh_pm_enter, + .valid =3D suspend_valid_only_mem, + }; +diff -urNp linux-2.6.32.45/arch/sh/kernel/kgdb.c linux-2.6.32.45/arch/sh= /kernel/kgdb.c +--- linux-2.6.32.45/arch/sh/kernel/kgdb.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/sh/kernel/kgdb.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) + { + } +=20 +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + /* Breakpoint instruction: trapa #0x3c */ + #ifdef CONFIG_CPU_LITTLE_ENDIAN + .gdb_bpt_instr =3D { 0x3c, 0xc3 }, +diff -urNp linux-2.6.32.45/arch/sh/mm/mmap.c linux-2.6.32.45/arch/sh/mm/= mmap.c +--- linux-2.6.32.45/arch/sh/mm/mmap.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/sh/mm/mmap.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str + addr =3D PAGE_ALIGN(addr); +=20 + vma =3D find_vma(mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (TASK_SIZE - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } +=20 +@@ -106,7 +105,7 @@ full_search: + } + return -ENOMEM; + } +- if (likely(!vma || addr + len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* + * Remember the place where we stopped the search: + */ +@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi + addr =3D PAGE_ALIGN(addr); +=20 + vma =3D find_vma(mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (TASK_SIZE - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } +=20 +@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct fi + /* make sure it can fit in the remaining address space */ + if (likely(addr > len)) { + vma =3D find_vma(mm, addr-len); +- if (!vma || addr <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr - len, len)) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr-len); + } +@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi + if (unlikely(mm->mmap_base < len)) + goto bottomup; +=20 +- addr =3D mm->mmap_base-len; +- if (do_colour_align) +- addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); ++ addr =3D mm->mmap_base - len; +=20 + do { ++ if (do_colour_align) ++ addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); + /* + * Lookup failure means no vma is above this address, + * else if new region fits below vma->vm_start, + * return with success: + */ + vma =3D find_vma(mm, addr); +- if (likely(!vma || addr+len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr); + } +@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi + mm->cached_hole_size =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D vma->vm_start-len; +- if (do_colour_align) +- addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); +- } while (likely(len < vma->vm_start)); ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); +=20 + bottomup: + /* +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h linux-2.6.= 32.45/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/atomic_64.h 2011-08-18 23:11:= 34.000000000 -0400 +@@ -14,18 +14,40 @@ + #define ATOMIC64_INIT(i) { (i) } +=20 + #define atomic_read(v) ((v)->counter) ++static inline int atomic_read_unchecked(const atomic_unchecked_t *v) ++{ ++ return v->counter; ++} + #define atomic64_read(v) ((v)->counter) ++static inline long atomic64_read_unchecked(const atomic64_unchecked_t *= v) ++{ ++ return v->counter; ++} +=20 + #define atomic_set(v, i) (((v)->counter) =3D i) ++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) ++{ ++ v->counter =3D i; ++} + #define atomic64_set(v, i) (((v)->counter) =3D i) ++static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long= i) ++{ ++ v->counter =3D i; ++} +=20 + extern void atomic_add(int, atomic_t *); ++extern void atomic_add_unchecked(int, atomic_unchecked_t *); + extern void atomic64_add(long, atomic64_t *); ++extern void atomic64_add_unchecked(long, atomic64_unchecked_t *); + extern void atomic_sub(int, atomic_t *); ++extern void atomic_sub_unchecked(int, atomic_unchecked_t *); + extern void atomic64_sub(long, atomic64_t *); ++extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *); +=20 + extern int atomic_add_ret(int, atomic_t *); ++extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *); + extern long atomic64_add_ret(long, atomic64_t *); ++extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *); + extern int atomic_sub_ret(int, atomic_t *); + extern long atomic64_sub_ret(long, atomic64_t *); +=20 +@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomi + #define atomic64_dec_return(v) atomic64_sub_ret(1, v) +=20 + #define atomic_inc_return(v) atomic_add_ret(1, v) ++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) ++{ ++ return atomic_add_ret_unchecked(1, v); ++} + #define atomic64_inc_return(v) atomic64_add_ret(1, v) ++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *= v) ++{ ++ return atomic64_add_ret_unchecked(1, v); ++} +=20 + #define atomic_sub_return(i, v) atomic_sub_ret(i, v) + #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v) +=20 + #define atomic_add_return(i, v) atomic_add_ret(i, v) ++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t= *v) ++{ ++ return atomic_add_ret_unchecked(i, v); ++} + #define atomic64_add_return(i, v) atomic64_add_ret(i, v) ++static inline long atomic64_add_return_unchecked(long i, atomic64_unche= cked_t *v) ++{ ++ return atomic64_add_ret_unchecked(i, v); ++} +=20 + /* + * atomic_inc_and_test - increment and test +@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomi + * other cases. + */ + #define atomic_inc_and_test(v) (atomic_inc_return(v) =3D=3D 0) ++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) ++{ ++ return atomic_inc_return_unchecked(v) =3D=3D 0; ++} + #define atomic64_inc_and_test(v) (atomic64_inc_return(v) =3D=3D 0) +=20 + #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) =3D=3D 0) +@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomi + #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) =3D=3D 0) +=20 + #define atomic_inc(v) atomic_add(1, v) ++static inline void atomic_inc_unchecked(atomic_unchecked_t *v) ++{ ++ atomic_add_unchecked(1, v); ++} + #define atomic64_inc(v) atomic64_add(1, v) ++static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v) ++{ ++ atomic64_add_unchecked(1, v); ++} +=20 + #define atomic_dec(v) atomic_sub(1, v) ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ atomic_sub_unchecked(1, v); ++} + #define atomic64_dec(v) atomic64_sub(1, v) ++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) ++{ ++ atomic64_sub_unchecked(1, v); ++} +=20 + #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0) + #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0) +=20 + #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n))) ++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int o= ld, int new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} + #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) ++{ ++ return xchg(&v->counter, new); ++} +=20 + static inline int atomic_add_unless(atomic_t *v, int a, int u) + { +- int c, old; ++ int c, old, new; + c =3D atomic_read(v); + for (;;) { +- if (unlikely(c =3D=3D (u))) ++ if (unlikely(c =3D=3D u)) + break; +- old =3D atomic_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addcc %2, %0, %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "tvs %%icc, 6\n" ++#endif ++ ++ : "=3Dr" (new) ++ : "0" (c), "ir" (a) ++ : "cc"); ++ ++ old =3D atomic_cmpxchg(v, c, new); + if (likely(old =3D=3D c)) + break; + c =3D old; + } +- return c !=3D (u); ++ return c !=3D u; + } +=20 + #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +@@ -90,20 +167,35 @@ static inline int atomic_add_unless(atom + #define atomic64_cmpxchg(v, o, n) \ + ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n))) + #define atomic64_xchg(v, new) (xchg(&((v)->counter), new)) ++static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, lon= g new) ++{ ++ return xchg(&v->counter, new); ++} +=20 + static inline long atomic64_add_unless(atomic64_t *v, long a, long u) + { +- long c, old; ++ long c, old, new; + c =3D atomic64_read(v); + for (;;) { +- if (unlikely(c =3D=3D (u))) ++ if (unlikely(c =3D=3D u)) + break; +- old =3D atomic64_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addcc %2, %0, %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "tvs %%xcc, 6\n" ++#endif ++ ++ : "=3Dr" (new) ++ : "0" (c), "ir" (a) ++ : "cc"); ++ ++ old =3D atomic64_cmpxchg(v, c, new); + if (likely(old =3D=3D c)) + break; + c =3D old; + } +- return c !=3D (u); ++ return c !=3D u; + } +=20 + #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/cache.h linux-2.6.32.4= 5/arch/sparc/include/asm/cache.h +--- linux-2.6.32.45/arch/sparc/include/asm/cache.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/cache.h 2011-07-06 19:53:33.0= 00000000 -0400 +@@ -8,7 +8,7 @@ + #define _SPARC_CACHE_H +=20 + #define L1_CACHE_SHIFT 5 +-#define L1_CACHE_BYTES 32 ++#define L1_CACHE_BYTES 32UL + #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1= ))) +=20 + #ifdef CONFIG_SPARC32 +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h linux-2.= 6.32.45/arch/sparc/include/asm/dma-mapping.h +--- linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/dma-mapping.h 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d + #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) + #define dma_is_consistent(d, h) (1) +=20 +-extern struct dma_map_ops *dma_ops, pci32_dma_ops; ++extern const struct dma_map_ops *dma_ops, pci32_dma_ops; + extern struct bus_type pci_bus_type; +=20 +-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 =3D=3D &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 =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); + void *cpu_addr; +=20 + cpu_addr =3D 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 =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); +=20 + 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.45/arch/sparc/include/asm/elf_32.h linux-2.6.32.= 45/arch/sparc/include/asm/elf_32.h +--- linux-2.6.32.45/arch/sparc/include/asm/elf_32.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/elf_32.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -116,6 +116,13 @@ typedef struct { +=20 + #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE 0x10000UL ++ ++#define PAX_DELTA_MMAP_LEN 16 ++#define PAX_DELTA_STACK_LEN 16 ++#endif ++ + /* This yields a mask that user programs can use to figure out what + instruction set this cpu supports. This can NOT be done in userspac= e + on Sparc. */ +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/elf_64.h linux-2.6.32.= 45/arch/sparc/include/asm/elf_64.h +--- linux-2.6.32.45/arch/sparc/include/asm/elf_64.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/elf_64.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -163,6 +163,12 @@ typedef struct { + #define ELF_ET_DYN_BASE 0x0000010000000000UL + #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL +=20 ++#ifdef CONFIG_PAX_ASLR ++#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : = 0x100000UL) ++ ++#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28) ++#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29) ++#endif +=20 + /* This yields a mask that user programs can use to figure out what + instruction set this cpu supports. */ +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h linux-2.6= .32.45/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/pgtable_32.h 2011-04-17 15:56= :46.000000000 -0400 +@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) + BTFIXUPDEF_INT(page_none) + BTFIXUPDEF_INT(page_copy) + BTFIXUPDEF_INT(page_readonly) ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++BTFIXUPDEF_INT(page_shared_noexec) ++BTFIXUPDEF_INT(page_copy_noexec) ++BTFIXUPDEF_INT(page_readonly_noexec) ++#endif ++ + BTFIXUPDEF_INT(page_kernel) +=20 + #define PMD_SHIFT SUN4C_PMD_SHIFT +@@ -64,6 +71,16 @@ extern pgprot_t PAGE_SHARED; + #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy)) + #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly)) +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++extern pgprot_t PAGE_SHARED_NOEXEC; ++# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec)) ++# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec= )) ++#else ++# define PAGE_SHARED_NOEXEC PAGE_SHARED ++# define PAGE_COPY_NOEXEC PAGE_COPY ++# define PAGE_READONLY_NOEXEC PAGE_READONLY ++#endif ++ + extern unsigned long page_kernel; +=20 + #ifdef MODULE +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.3= 2.45/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/pgtsrmmu.h 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -115,6 +115,13 @@ + SRMMU_EXEC | SRMMU_REF) + #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ + SRMMU_EXEC | SRMMU_REF) ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | S= RMMU_WRITE | SRMMU_REF) ++#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRM= MU_REF) ++#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | S= RMMU_REF) ++#endif ++ + #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_P= RIV | \ + SRMMU_DIRTY | SRMMU_REF) +=20 +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h linux-2.= 6.32.45/arch/sparc/include/asm/spinlock_64.h +--- linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/spinlock_64.h 2011-08-18 23:1= 9:30.000000000 -0400 +@@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags +=20 + /* Multi-reader locks, these are much saner than the 32-bit Sparc ones.= .. */ +=20 +-static void inline arch_read_lock(raw_rwlock_t *lock) ++static inline void arch_read_lock(raw_rwlock_t *lock) + { + unsigned long tmp1, tmp2; +=20 + __asm__ __volatile__ ( + "1: ldsw [%2], %0\n" + " brlz,pn %0, 2f\n" +-"4: add %0, 1, %1\n" ++"4: addcc %0, 1, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++" tvs %%icc, 6\n" ++#endif ++ + " cas [%2], %0, %1\n" + " cmp %0, %1\n" + " bne,pn %%icc, 1b\n" +@@ -112,10 +117,10 @@ static void inline arch_read_lock(raw_rw + " .previous" + : "=3D&r" (tmp1), "=3D&r" (tmp2) + : "r" (lock) +- : "memory"); ++ : "memory", "cc"); + } +=20 +-static int inline arch_read_trylock(raw_rwlock_t *lock) ++static inline int arch_read_trylock(raw_rwlock_t *lock) + { + int tmp1, tmp2; +=20 +@@ -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" +-" add %0, 1, %1\n" ++" addcc %0, 1, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++" tvs %%icc, 6\n" ++#endif ++ + " cas [%2], %0, %1\n" + " cmp %0, %1\n" + " bne,pn %%icc, 1b\n" +@@ -136,13 +146,18 @@ static int inline arch_read_trylock(raw_ + return tmp1; + } +=20 +-static void inline arch_read_unlock(raw_rwlock_t *lock) ++static inline void arch_read_unlock(raw_rwlock_t *lock) + { + unsigned long tmp1, tmp2; +=20 + __asm__ __volatile__( + "1: lduw [%2], %0\n" +-" sub %0, 1, %1\n" ++" subcc %0, 1, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++" tvs %%icc, 6\n" ++#endif ++ + " cas [%2], %0, %1\n" + " cmp %0, %1\n" + " bne,pn %%xcc, 1b\n" +@@ -152,7 +167,7 @@ static void inline arch_read_unlock(raw_ + : "memory"); + } +=20 +-static void inline arch_write_lock(raw_rwlock_t *lock) ++static inline void arch_write_lock(raw_rwlock_t *lock) + { + unsigned long mask, tmp1, tmp2; +=20 +@@ -177,7 +192,7 @@ static void inline arch_write_lock(raw_r + : "memory"); + } +=20 +-static void inline arch_write_unlock(raw_rwlock_t *lock) ++static inline void arch_write_unlock(raw_rwlock_t *lock) + { + __asm__ __volatile__( + " stw %%g0, [%0]" +@@ -186,7 +201,7 @@ static void inline arch_write_unlock(raw + : "memory"); + } +=20 +-static int inline arch_write_trylock(raw_rwlock_t *lock) ++static inline int arch_write_trylock(raw_rwlock_t *lock) + { + unsigned long mask, tmp1, tmp2, result; +=20 +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h linux= -2.6.32.45/arch/sparc/include/asm/thread_info_32.h +--- linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/thread_info_32.h 2011-06-04 2= 0:46:01.000000000 -0400 +@@ -50,6 +50,8 @@ struct thread_info { + unsigned long w_saved; +=20 + struct restart_block restart_block; ++ ++ unsigned long lowest_stack; + }; +=20 + /* +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h linux= -2.6.32.45/arch/sparc/include/asm/thread_info_64.h +--- linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/thread_info_64.h 2011-06-04 2= 0:46:21.000000000 -0400 +@@ -68,6 +68,8 @@ struct thread_info { + struct pt_regs *kern_una_regs; + unsigned int kern_una_insn; +=20 ++ unsigned long lowest_stack; ++ + unsigned long fpregs[0] __attribute__ ((aligned(64))); + }; +=20 +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h linux-2.6= .32.45/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/uaccess_32.h 2011-04-17 15:56= :46.000000000 -0400 +@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ +=20 + static inline unsigned long copy_to_user(void __user *to, const void *f= rom, unsigned long n) + { +- if (n && __access_ok((unsigned long) to, n)) ++ if ((long)n < 0) ++ return n; ++ ++ if (n && __access_ok((unsigned long) to, n)) { ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); + return __copy_user(to, (__force void __user *) from, n); +- else ++ } else + return n; + } +=20 + static inline unsigned long __copy_to_user(void __user *to, const void = *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); ++ + return __copy_user(to, (__force void __user *) from, n); + } +=20 + static inline unsigned long copy_from_user(void *to, const void __user = *from, unsigned long n) + { +- if (n && __access_ok((unsigned long) from, n)) ++ if ((long)n < 0) ++ return n; ++ ++ if (n && __access_ok((unsigned long) from, n)) { ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); + return __copy_user((__force void __user *) to, from, n); +- else ++ } else + return n; + } +=20 + static inline unsigned long __copy_from_user(void *to, const void __use= r *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + return __copy_user((__force void __user *) to, from, n); + } +=20 +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h linux-2.6= .32.45/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/uaccess_64.h 2011-04-17 15:56= :46.000000000 -0400 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -212,8 +213,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 =3D ___copy_from_user(to, from, size); ++ unsigned long ret; +=20 ++ if ((long)size < 0 || size > INT_MAX) ++ return size; ++ ++ if (!__builtin_constant_p(size)) ++ check_object_size(to, size, false); ++ ++ ret =3D ___copy_from_user(to, from, size); + if (unlikely(ret)) + ret =3D copy_from_user_fixup(to, from, size); + return ret; +@@ -228,8 +236,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 =3D ___copy_to_user(to, from, size); ++ unsigned long ret; ++ ++ if ((long)size < 0 || size > INT_MAX) ++ return size; ++ ++ if (!__builtin_constant_p(size)) ++ check_object_size(from, size, true); +=20 ++ ret =3D ___copy_to_user(to, from, size); + if (unlikely(ret)) + ret =3D copy_to_user_fixup(to, from, size); + return ret; +diff -urNp linux-2.6.32.45/arch/sparc/include/asm/uaccess.h linux-2.6.32= .45/arch/sparc/include/asm/uaccess.h +--- linux-2.6.32.45/arch/sparc/include/asm/uaccess.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/include/asm/uaccess.h 2011-04-17 15:56:46= .000000000 -0400 +@@ -1,5 +1,13 @@ + #ifndef ___ASM_SPARC_UACCESS_H + #define ___ASM_SPARC_UACCESS_H ++ ++#ifdef __KERNEL__ ++#ifndef __ASSEMBLY__ ++#include ++extern void check_object_size(const void *ptr, unsigned long n, bool to= ); ++#endif ++#endif ++ + #if defined(__sparc__) && defined(__arch64__) + #include + #else +diff -urNp linux-2.6.32.45/arch/sparc/kernel/iommu.c linux-2.6.32.45/arc= h/sparc/kernel/iommu.c +--- linux-2.6.32.45/arch/sparc/kernel/iommu.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/iommu.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc + spin_unlock_irqrestore(&iommu->lock, flags); + } +=20 +-static struct dma_map_ops sun4u_dma_ops =3D { ++static const struct dma_map_ops sun4u_dma_ops =3D { + .alloc_coherent =3D dma_4u_alloc_coherent, + .free_coherent =3D dma_4u_free_coherent, + .map_page =3D dma_4u_map_page, +@@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops=20 + .sync_sg_for_cpu =3D dma_4u_sync_sg_for_cpu, + }; +=20 +-struct dma_map_ops *dma_ops =3D &sun4u_dma_ops; ++const struct dma_map_ops *dma_ops =3D &sun4u_dma_ops; + EXPORT_SYMBOL(dma_ops); +=20 + extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); +diff -urNp linux-2.6.32.45/arch/sparc/kernel/ioport.c linux-2.6.32.45/ar= ch/sparc/kernel/ioport.c +--- linux-2.6.32.45/arch/sparc/kernel/ioport.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/ioport.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru + BUG(); + } +=20 +-struct dma_map_ops sbus_dma_ops =3D { ++const struct dma_map_ops sbus_dma_ops =3D { + .alloc_coherent =3D sbus_alloc_coherent, + .free_coherent =3D sbus_free_coherent, + .map_page =3D sbus_map_page, +@@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops =3D { + .sync_sg_for_device =3D sbus_sync_sg_for_device, + }; +=20 +-struct dma_map_ops *dma_ops =3D &sbus_dma_ops; ++const struct dma_map_ops *dma_ops =3D &sbus_dma_ops; + EXPORT_SYMBOL(dma_ops); +=20 + static int __init sparc_register_ioport(void) +@@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(str + } + } +=20 +-struct dma_map_ops pci32_dma_ops =3D { ++const struct dma_map_ops pci32_dma_ops =3D { + .alloc_coherent =3D pci32_alloc_coherent, + .free_coherent =3D pci32_free_coherent, + .map_page =3D pci32_map_page, +diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c linux-2.6.32.45/a= rch/sparc/kernel/kgdb_32.c +--- linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/kgdb_32.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) + { + } +=20 +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + /* Breakpoint instruction: ta 0x7d */ + .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x7d }, + }; +diff -urNp linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c linux-2.6.32.45/a= rch/sparc/kernel/kgdb_64.c +--- linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/kgdb_64.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) + { + } +=20 +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + /* Breakpoint instruction: ta 0x72 */ + .gdb_bpt_instr =3D { 0x91, 0xd0, 0x20, 0x72 }, + }; +diff -urNp linux-2.6.32.45/arch/sparc/kernel/Makefile linux-2.6.32.45/ar= ch/sparc/kernel/Makefile +--- linux-2.6.32.45/arch/sparc/kernel/Makefile 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/Makefile 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -3,7 +3,7 @@ + # +=20 + asflags-y :=3D -ansi +-ccflags-y :=3D -Werror ++#ccflags-y :=3D -Werror +=20 + extra-y :=3D head_$(BITS).o + extra-y +=3D init_task.o +diff -urNp linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.45= /arch/sparc/kernel/pci_sun4v.c +--- linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/pci_sun4v.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic + spin_unlock_irqrestore(&iommu->lock, flags); + } +=20 +-static struct dma_map_ops sun4v_dma_ops =3D { ++static const struct dma_map_ops sun4v_dma_ops =3D { + .alloc_coherent =3D dma_4v_alloc_coherent, + .free_coherent =3D dma_4v_free_coherent, + .map_page =3D dma_4v_map_page, +diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_32.c linux-2.6.32.4= 5/arch/sparc/kernel/process_32.c +--- linux-2.6.32.45/arch/sparc/kernel/process_32.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/process_32.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp) + rw->ins[4], rw->ins[5], + rw->ins[6], + rw->ins[7]); +- printk("%pS\n", (void *) rw->ins[7]); ++ printk("%pA\n", (void *) rw->ins[7]); + rw =3D (struct reg_window32 *) rw->ins[6]; + } + spin_unlock_irqrestore(&sparc_backtrace_lock, flags); +@@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r) +=20 + printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n", + r->psr, r->pc, r->npc, r->y, print_tainted()); +- printk("PC: <%pS>\n", (void *) r->pc); ++ printk("PC: <%pA>\n", (void *) r->pc); + printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3], + r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]); + printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11], + r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]); +- printk("RPC: <%pS>\n", (void *) r->u_regs[15]); ++ printk("RPC: <%pA>\n", (void *) r->u_regs[15]); +=20 + printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n", + rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3], +@@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk, + rw =3D (struct reg_window32 *) fp; + pc =3D rw->ins[7]; + printk("[%08lx : ", pc); +- printk("%pS ] ", (void *) pc); ++ printk("%pA ] ", (void *) pc); + fp =3D rw->ins[6]; + } while (++count < 16); + printk("\n"); +diff -urNp linux-2.6.32.45/arch/sparc/kernel/process_64.c linux-2.6.32.4= 5/arch/sparc/kernel/process_64.c +--- linux-2.6.32.45/arch/sparc/kernel/process_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/process_64.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg + printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n", + rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]); + if (regs->tstate & TSTATE_PRIV) +- printk("I7: <%pS>\n", (void *) rwk->ins[7]); ++ printk("I7: <%pA>\n", (void *) rwk->ins[7]); + } +=20 + void show_regs(struct pt_regs *regs) + { + printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs= ->tstate, + regs->tpc, regs->tnpc, regs->y, print_tainted()); +- printk("TPC: <%pS>\n", (void *) regs->tpc); ++ printk("TPC: <%pA>\n", (void *) regs->tpc); + printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n", + regs->u_regs[0], regs->u_regs[1], regs->u_regs[2], + regs->u_regs[3]); +@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs) + printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n", + regs->u_regs[12], regs->u_regs[13], regs->u_regs[14], + regs->u_regs[15]); +- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]); ++ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]); + show_regwindow(regs); + } +=20 +@@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void + ((tp && tp->task) ? tp->task->pid : -1)); +=20 + if (gp->tstate & TSTATE_PRIV) { +- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n", ++ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n", + (void *) gp->tpc, + (void *) gp->o7, + (void *) gp->i7, +diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c linux-2.6.32= .45/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/sys_sparc_32.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str + if (ARCH_SUN4C && len > 0x20000000) + return -ENOMEM; + if (!addr) +- addr =3D TASK_UNMAPPED_BASE; ++ addr =3D current->mm->mmap_base; +=20 + if (flags & MAP_SHARED) + addr =3D COLOUR_ALIGN(addr); +@@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(str + } + if (TASK_SIZE - PAGE_SIZE - len < addr) + return -ENOMEM; +- if (!vmm || addr + len <=3D vmm->vm_start) ++ if (check_heap_stack_gap(vmm, addr, len)) + return addr; + addr =3D vmm->vm_end; + if (flags & MAP_SHARED) +diff -urNp linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c linux-2.6.32= .45/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/sys_sparc_64.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str + /* We do not accept a shared mapping if it would violate + * cache aliasing constraints. + */ +- if ((flags & MAP_SHARED) && ++ if ((filp || (flags & MAP_SHARED)) && + ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) + return -EINVAL; + return addr; +@@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(str + if (filp || (flags & MAP_SHARED)) + do_color_align =3D 1; +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + if (addr) { + if (do_color_align) + addr =3D COLOUR_ALIGN(addr, pgoff); +@@ -147,15 +151,14 @@ unsigned long arch_get_unmapped_area(str + addr =3D PAGE_ALIGN(addr); +=20 + vma =3D find_vma(mm, addr); +- if (task_size - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (task_size - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } +=20 + if (len > mm->cached_hole_size) { +- start_addr =3D addr =3D mm->free_area_cache; ++ start_addr =3D addr =3D mm->free_area_cache; + } else { +- start_addr =3D addr =3D TASK_UNMAPPED_BASE; ++ start_addr =3D addr =3D mm->mmap_base; + mm->cached_hole_size =3D 0; + } +=20 +@@ -175,14 +178,14 @@ full_search: + vma =3D find_vma(mm, VA_EXCLUDE_END); + } + if (unlikely(task_size < addr)) { +- if (start_addr !=3D TASK_UNMAPPED_BASE) { +- start_addr =3D addr =3D TASK_UNMAPPED_BASE; ++ if (start_addr !=3D mm->mmap_base) { ++ start_addr =3D addr =3D mm->mmap_base; + mm->cached_hole_size =3D 0; + goto full_search; + } + return -ENOMEM; + } +- if (likely(!vma || addr + len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* + * Remember the place where we stopped the search: + */ +@@ -216,7 +219,7 @@ arch_get_unmapped_area_topdown(struct fi + /* We do not accept a shared mapping if it would violate + * cache aliasing constraints. + */ +- if ((flags & MAP_SHARED) && ++ if ((filp || (flags & MAP_SHARED)) && + ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) + return -EINVAL; + return addr; +@@ -237,8 +240,7 @@ arch_get_unmapped_area_topdown(struct fi + addr =3D PAGE_ALIGN(addr); +=20 + vma =3D find_vma(mm, addr); +- if (task_size - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (task_size - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } +=20 +@@ -259,7 +261,7 @@ arch_get_unmapped_area_topdown(struct fi + /* make sure it can fit in the remaining address space */ + if (likely(addr > len)) { + vma =3D find_vma(mm, addr-len); +- if (!vma || addr <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr - len, len)) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr-len); + } +@@ -268,18 +270,18 @@ arch_get_unmapped_area_topdown(struct fi + if (unlikely(mm->mmap_base < len)) + goto bottomup; +=20 +- addr =3D mm->mmap_base-len; +- if (do_color_align) +- addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); ++ addr =3D mm->mmap_base - len; +=20 + do { ++ if (do_color_align) ++ addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); + /* + * Lookup failure means no vma is above this address, + * else if new region fits below vma->vm_start, + * return with success: + */ + vma =3D find_vma(mm, addr); +- if (likely(!vma || addr+len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr); + } +@@ -289,10 +291,8 @@ arch_get_unmapped_area_topdown(struct fi + mm->cached_hole_size =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D vma->vm_start-len; +- if (do_color_align) +- addr =3D COLOUR_ALIGN_DOWN(addr, pgoff); +- } while (likely(len < vma->vm_start)); ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); +=20 + bottomup: + /* +@@ -384,6 +384,12 @@ void arch_pick_mmap_layout(struct mm_str + current->signal->rlim[RLIMIT_STACK].rlim_cur =3D=3D RLIM_INFINITY = || + sysctl_legacy_va_layout) { + mm->mmap_base =3D TASK_UNMAPPED_BASE + random_factor; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area; + mm->unmap_area =3D arch_unmap_area; + } else { +@@ -398,6 +404,12 @@ void arch_pick_mmap_layout(struct mm_str + gap =3D (task_size / 6 * 5); +=20 + mm->mmap_base =3D PAGE_ALIGN(task_size - gap - random_factor); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -=3D mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; + mm->unmap_area =3D arch_unmap_area_topdown; + } +diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_32.c linux-2.6.32.45/= arch/sparc/kernel/traps_32.c +--- linux-2.6.32.45/arch/sparc/kernel/traps_32.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/traps_32.c 2011-06-13 21:25:39.000= 000000 -0400 +@@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo + #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t") + #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t") +=20 ++extern void gr_handle_kernel_exploit(void); ++ + void die_if_kernel(char *str, struct pt_regs *regs) + { + static int die_counter; +@@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_ + count++ < 30 && + (((unsigned long) rw) >=3D PAGE_OFFSET) && + !(((unsigned long) rw) & 0x7)) { +- printk("Caller[%08lx]: %pS\n", rw->ins[7], ++ printk("Caller[%08lx]: %pA\n", rw->ins[7], + (void *) rw->ins[7]); + rw =3D (struct reg_window32 *)rw->ins[6]; + } + } + printk("Instruction DUMP:"); + instruction_dump ((unsigned long *) regs->pc); +- if(regs->psr & PSR_PS) ++ if(regs->psr & PSR_PS) { ++ gr_handle_kernel_exploit(); + do_exit(SIGKILL); ++ } + do_exit(SIGSEGV); + } +=20 +diff -urNp linux-2.6.32.45/arch/sparc/kernel/traps_64.c linux-2.6.32.45/= arch/sparc/kernel/traps_64.c +--- linux-2.6.32.45/arch/sparc/kernel/traps_64.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/traps_64.c 2011-06-13 21:24:11.000= 000000 -0400 +@@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_ + i + 1, + p->trapstack[i].tstate, p->trapstack[i].tpc, + p->trapstack[i].tnpc, p->trapstack[i].tt); +- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc); ++ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc); + } + } +=20 +@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long +=20 + lvl -=3D 0x100; + if (regs->tstate & TSTATE_PRIV) { ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ if (lvl =3D=3D 6) ++ pax_report_refcount_overflow(regs); ++#endif ++ + sprintf(buffer, "Kernel bad sw trap %lx", lvl); + die_if_kernel(buffer, regs); + } +@@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long + void bad_trap_tl1(struct pt_regs *regs, long lvl) + { + char buffer[32]; +-=09 ++ + if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs, + 0, lvl, SIGTRAP) =3D=3D NOTIFY_STOP) + return; +=20 ++#ifdef CONFIG_PAX_REFCOUNT ++ if (lvl =3D=3D 6) ++ pax_report_refcount_overflow(regs); ++#endif ++ + dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); +=20 + sprintf (buffer, "Bad trap %lx at tl>0", lvl); +@@ -1139,7 +1150,7 @@ static void cheetah_log_errors(struct pt + regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate); + printk("%s" "ERROR(%d): ", + (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id()); +- printk("TPC<%pS>\n", (void *) regs->tpc); ++ printk("TPC<%pA>\n", (void *) regs->tpc); + printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n", + (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(), + (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT, +@@ -1746,7 +1757,7 @@ void cheetah_plus_parity_error(int type, + smp_processor_id(), + (type & 0x1) ? 'I' : 'D', + regs->tpc); +- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc); ++ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc); + panic("Irrecoverable Cheetah+ parity error."); + } +=20 +@@ -1754,7 +1765,7 @@ void cheetah_plus_parity_error(int type, + smp_processor_id(), + (type & 0x1) ? 'I' : 'D', + regs->tpc); +- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc); ++ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc); + } +=20 + struct sun4v_error_entry { +@@ -1961,9 +1972,9 @@ void sun4v_itlb_error_report(struct pt_r +=20 + printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n", + regs->tpc, tl); +- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc); ++ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc); + printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]); +- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n", ++ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n", + (void *) regs->u_regs[UREG_I7]); + printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] " + "pte[%lx] error[%lx]\n", +@@ -1985,9 +1996,9 @@ void sun4v_dtlb_error_report(struct pt_r +=20 + printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n", + regs->tpc, tl); +- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc); ++ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc); + printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]); +- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n", ++ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n", + (void *) regs->u_regs[UREG_I7]); + printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] " + "pte[%lx] error[%lx]\n", +@@ -2191,7 +2202,7 @@ void show_stack(struct task_struct *tsk, + fp =3D (unsigned long)sf->fp + STACK_BIAS; + } +=20 +- printk(" [%016lx] %pS\n", pc, (void *) pc); ++ printk(" [%016lx] %pA\n", pc, (void *) pc); + } while (++count < 16); + } +=20 +@@ -2233,6 +2244,8 @@ static inline struct reg_window *kernel_ + return (struct reg_window *) (fp + STACK_BIAS); + } +=20 ++extern void gr_handle_kernel_exploit(void); ++ + void die_if_kernel(char *str, struct pt_regs *regs) + { + static int die_counter; +@@ -2260,7 +2273,7 @@ void die_if_kernel(char *str, struct pt_ + while (rw && + count++ < 30&& + is_kernel_stack(current, rw)) { +- printk("Caller[%016lx]: %pS\n", rw->ins[7], ++ printk("Caller[%016lx]: %pA\n", rw->ins[7], + (void *) rw->ins[7]); +=20 + rw =3D kernel_stack_up(rw); +@@ -2273,8 +2286,11 @@ void die_if_kernel(char *str, struct pt_ + } + user_instruction_dump ((unsigned int __user *) regs->tpc); + } +- if (regs->tstate & TSTATE_PRIV) ++ if (regs->tstate & TSTATE_PRIV) { ++ gr_handle_kernel_exploit(); =09 + do_exit(SIGKILL); ++ } ++ + do_exit(SIGSEGV); + } + EXPORT_SYMBOL(die_if_kernel); +diff -urNp linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S linux-2.6.32.4= 5/arch/sparc/kernel/una_asm_64.S +--- linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/una_asm_64.S 2011-07-13 22:20:05.0= 00000000 -0400 +@@ -127,7 +127,7 @@ do_int_load: + wr %o5, 0x0, %asi + retl + mov 0, %o0 +- .size __do_int_load, .-__do_int_load ++ .size do_int_load, .-do_int_load +=20 + .section __ex_table,"a" + .word 4b, __retl_efault +diff -urNp linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c linux-2.6.32= .45/arch/sparc/kernel/unaligned_64.c +--- linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/sparc/kernel/unaligned_64.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs + if (count < 5) { + last_time =3D jiffies; + count++; +- printk("Kernel unaligned access at TPC[%lx] %pS\n", ++ printk("Kernel unaligned access at TPC[%lx] %pA\n", + regs->tpc, (void *) regs->tpc); + } + } +diff -urNp linux-2.6.32.45/arch/sparc/lib/atomic_64.S linux-2.6.32.45/ar= ch/sparc/lib/atomic_64.S +--- linux-2.6.32.45/arch/sparc/lib/atomic_64.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/sparc/lib/atomic_64.S 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -18,7 +18,12 @@ + atomic_add: /* %o0 =3D increment, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: lduw [%o1], %g1 +- add %g1, %o0, %g7 ++ addcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f +@@ -28,12 +33,32 @@ atomic_add: /* %o0 =3D increment, %o1 =3D at + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_add, .-atomic_add +=20 ++ .globl atomic_add_unchecked ++ .type atomic_add_unchecked,#function ++atomic_add_unchecked: /* %o0 =3D increment, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: lduw [%o1], %g1 ++ add %g1, %o0, %g7 ++ cas [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %icc, 2f ++ nop ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic_add_unchecked, .-atomic_add_unchecked ++ + .globl atomic_sub + .type atomic_sub,#function + atomic_sub: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: lduw [%o1], %g1 +- sub %g1, %o0, %g7 ++ subcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f +@@ -43,12 +68,32 @@ atomic_sub: /* %o0 =3D decrement, %o1 =3D at + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_sub, .-atomic_sub +=20 ++ .globl atomic_sub_unchecked ++ .type atomic_sub_unchecked,#function ++atomic_sub_unchecked: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: lduw [%o1], %g1 ++ sub %g1, %o0, %g7 ++ cas [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %icc, 2f ++ nop ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic_sub_unchecked, .-atomic_sub_unchecked ++ + .globl atomic_add_ret + .type atomic_add_ret,#function + atomic_add_ret: /* %o0 =3D increment, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: lduw [%o1], %g1 +- add %g1, %o0, %g7 ++ addcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f +@@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 =3D increment, %o1=20 + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic_add_ret, .-atomic_add_ret +=20 ++ .globl atomic_add_ret_unchecked ++ .type atomic_add_ret_unchecked,#function ++atomic_add_ret_unchecked: /* %o0 =3D increment, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: lduw [%o1], %g1 ++ addcc %g1, %o0, %g7 ++ cas [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %icc, 2f ++ add %g7, %o0, %g7 ++ sra %g7, 0, %o0 ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked ++ + .globl atomic_sub_ret + .type atomic_sub_ret,#function + atomic_sub_ret: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: lduw [%o1], %g1 +- sub %g1, %o0, %g7 ++ subcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 2f +@@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 =3D decrement, %o1=20 + atomic64_add: /* %o0 =3D increment, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: ldx [%o1], %g1 +- add %g1, %o0, %g7 ++ addcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %xcc, 6 ++#endif ++ + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f +@@ -90,12 +161,32 @@ atomic64_add: /* %o0 =3D increment, %o1 =3D=20 + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_add, .-atomic64_add +=20 ++ .globl atomic64_add_unchecked ++ .type atomic64_add_unchecked,#function ++atomic64_add_unchecked: /* %o0 =3D increment, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: ldx [%o1], %g1 ++ addcc %g1, %o0, %g7 ++ casx [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %xcc, 2f ++ nop ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic64_add_unchecked, .-atomic64_add_unchecked ++ + .globl atomic64_sub + .type atomic64_sub,#function + atomic64_sub: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: ldx [%o1], %g1 +- sub %g1, %o0, %g7 ++ subcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %xcc, 6 ++#endif ++ + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f +@@ -105,12 +196,32 @@ atomic64_sub: /* %o0 =3D decrement, %o1 =3D=20 + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_sub, .-atomic64_sub +=20 ++ .globl atomic64_sub_unchecked ++ .type atomic64_sub_unchecked,#function ++atomic64_sub_unchecked: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: ldx [%o1], %g1 ++ subcc %g1, %o0, %g7 ++ casx [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %xcc, 2f ++ nop ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked ++ + .globl atomic64_add_ret + .type atomic64_add_ret,#function + atomic64_add_ret: /* %o0 =3D increment, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: ldx [%o1], %g1 +- add %g1, %o0, %g7 ++ addcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %xcc, 6 ++#endif ++ + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f +@@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 =3D increment, %o + 2: BACKOFF_SPIN(%o2, %o3, 1b) + .size atomic64_add_ret, .-atomic64_add_ret +=20 ++ .globl atomic64_add_ret_unchecked ++ .type atomic64_add_ret_unchecked,#function ++atomic64_add_ret_unchecked: /* %o0 =3D increment, %o1 =3D atomic_ptr */ ++ BACKOFF_SETUP(%o2) ++1: ldx [%o1], %g1 ++ addcc %g1, %o0, %g7 ++ casx [%o1], %g1, %g7 ++ cmp %g1, %g7 ++ bne,pn %xcc, 2f ++ add %g7, %o0, %g7 ++ mov %g7, %o0 ++ retl ++ nop ++2: BACKOFF_SPIN(%o2, %o3, 1b) ++ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked ++ + .globl atomic64_sub_ret + .type atomic64_sub_ret,#function + atomic64_sub_ret: /* %o0 =3D decrement, %o1 =3D atomic_ptr */ + BACKOFF_SETUP(%o2) + 1: ldx [%o1], %g1 +- sub %g1, %o0, %g7 ++ subcc %g1, %o0, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %xcc, 6 ++#endif ++ + casx [%o1], %g1, %g7 + cmp %g1, %g7 + bne,pn %xcc, 2f +diff -urNp linux-2.6.32.45/arch/sparc/lib/ksyms.c linux-2.6.32.45/arch/s= parc/lib/ksyms.c +--- linux-2.6.32.45/arch/sparc/lib/ksyms.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/sparc/lib/ksyms.c 2011-08-19 23:05:14.000000000= -0400 +@@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write); +=20 + /* Atomic counter implementation. */ + EXPORT_SYMBOL(atomic_add); ++EXPORT_SYMBOL(atomic_add_unchecked); + EXPORT_SYMBOL(atomic_add_ret); ++EXPORT_SYMBOL(atomic_add_ret_unchecked); + EXPORT_SYMBOL(atomic_sub); ++EXPORT_SYMBOL(atomic_sub_unchecked); + EXPORT_SYMBOL(atomic_sub_ret); + EXPORT_SYMBOL(atomic64_add); ++EXPORT_SYMBOL(atomic64_add_unchecked); + EXPORT_SYMBOL(atomic64_add_ret); ++EXPORT_SYMBOL(atomic64_add_ret_unchecked); + EXPORT_SYMBOL(atomic64_sub); ++EXPORT_SYMBOL(atomic64_sub_unchecked); + EXPORT_SYMBOL(atomic64_sub_ret); +=20 + /* Atomic bit operations. */ +diff -urNp linux-2.6.32.45/arch/sparc/lib/Makefile linux-2.6.32.45/arch/= sparc/lib/Makefile +--- linux-2.6.32.45/arch/sparc/lib/Makefile 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/sparc/lib/Makefile 2011-05-17 19:26:34.00000000= 0 -0400 +@@ -2,7 +2,7 @@ + # +=20 + asflags-y :=3D -ansi -DST_DIV0=3D0x02 +-ccflags-y :=3D -Werror ++#ccflags-y :=3D -Werror +=20 + lib-$(CONFIG_SPARC32) +=3D mul.o rem.o sdiv.o udiv.o umul.o urem.o ashr= di3.o + lib-$(CONFIG_SPARC32) +=3D memcpy.o memset.o +diff -urNp linux-2.6.32.45/arch/sparc/lib/rwsem_64.S linux-2.6.32.45/arc= h/sparc/lib/rwsem_64.S +--- linux-2.6.32.45/arch/sparc/lib/rwsem_64.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/sparc/lib/rwsem_64.S 2011-04-17 15:56:46.000000= 000 -0400 +@@ -11,7 +11,12 @@ + .globl __down_read + __down_read: + 1: lduw [%o0], %g1 +- add %g1, 1, %g7 ++ addcc %g1, 1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 1b +@@ -33,7 +38,12 @@ __down_read: + .globl __down_read_trylock + __down_read_trylock: + 1: lduw [%o0], %g1 +- add %g1, 1, %g7 ++ addcc %g1, 1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cmp %g7, 0 + bl,pn %icc, 2f + mov 0, %o1 +@@ -51,7 +61,12 @@ __down_write: + or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1 + 1: + lduw [%o0], %g3 +- add %g3, %g1, %g7 ++ addcc %g3, %g1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g3, %g7 + cmp %g3, %g7 + bne,pn %icc, 1b +@@ -77,7 +92,12 @@ __down_write_trylock: + cmp %g3, 0 + bne,pn %icc, 2f + mov 0, %o1 +- add %g3, %g1, %g7 ++ addcc %g3, %g1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g3, %g7 + cmp %g3, %g7 + bne,pn %icc, 1b +@@ -90,7 +110,12 @@ __down_write_trylock: + __up_read: + 1: + lduw [%o0], %g1 +- sub %g1, 1, %g7 ++ subcc %g1, 1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g1, %g7 + cmp %g1, %g7 + bne,pn %icc, 1b +@@ -118,7 +143,12 @@ __up_write: + or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1 + 1: + lduw [%o0], %g3 +- sub %g3, %g1, %g7 ++ subcc %g3, %g1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g3, %g7 + cmp %g3, %g7 + bne,pn %icc, 1b +@@ -143,7 +173,12 @@ __downgrade_write: + or %g1, %lo(RWSEM_WAITING_BIAS), %g1 + 1: + lduw [%o0], %g3 +- sub %g3, %g1, %g7 ++ subcc %g3, %g1, %g7 ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ tvs %icc, 6 ++#endif ++ + cas [%o0], %g3, %g7 + cmp %g3, %g7 + bne,pn %icc, 1b +diff -urNp linux-2.6.32.45/arch/sparc/Makefile linux-2.6.32.45/arch/spar= c/Makefile +--- linux-2.6.32.45/arch/sparc/Makefile 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/sparc/Makefile 2011-04-17 15:56:46.000000000 -0= 400 +@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) +=3D arch/sparc + # Export what is needed by arch/sparc/boot/Makefile + export VMLINUX_INIT VMLINUX_MAIN + VMLINUX_INIT :=3D $(head-y) $(init-y) +-VMLINUX_MAIN :=3D $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ bloc= k/ ++VMLINUX_MAIN :=3D $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ bloc= k/ grsecurity/ + VMLINUX_MAIN +=3D $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) + VMLINUX_MAIN +=3D $(drivers-y) $(net-y) +=20 +diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_32.c linux-2.6.32.45/arch= /sparc/mm/fault_32.c +--- linux-2.6.32.45/arch/sparc/mm/fault_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/sparc/mm/fault_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -21,6 +21,9 @@ + #include + #include + #include ++#include ++#include ++#include +=20 + #include + #include +@@ -167,6 +170,267 @@ static unsigned long compute_si_addr(str + return safe_compute_effective_address(regs, insn); + } +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++#ifdef CONFIG_PAX_DLRESOLVE ++static void pax_emuplt_close(struct vm_area_struct *vma) ++{ ++ vma->vm_mm->call_dl_resolve =3D 0UL; ++} ++ ++static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault= *vmf) ++{ ++ unsigned int *kaddr; ++ ++ vmf->page =3D alloc_page(GFP_HIGHUSER); ++ if (!vmf->page) ++ return VM_FAULT_OOM; ++ ++ kaddr =3D kmap(vmf->page); ++ memset(kaddr, 0, PAGE_SIZE); ++ kaddr[0] =3D 0x9DE3BFA8U; /* save */ ++ flush_dcache_page(vmf->page); ++ kunmap(vmf->page); ++ return VM_FAULT_MAJOR; ++} ++ ++static const struct vm_operations_struct pax_vm_ops =3D { ++ .close =3D pax_emuplt_close, ++ .fault =3D pax_emuplt_fault ++}; ++ ++static int pax_insert_vma(struct vm_area_struct *vma, unsigned long add= r) ++{ ++ int ret; ++ ++ vma->vm_mm =3D current->mm; ++ vma->vm_start =3D addr; ++ vma->vm_end =3D addr + PAGE_SIZE; ++ vma->vm_flags =3D VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC; ++ vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); ++ vma->vm_ops =3D &pax_vm_ops; ++ ++ ret =3D insert_vm_struct(current->mm, vma); ++ if (ret) ++ return ret; ++ ++ ++current->mm->total_vm; ++ return 0; ++} ++#endif ++ ++/* ++ * PaX: decide what to do with offenders (regs->pc =3D fault address) ++ * ++ * returns 1 when task should be killed ++ * 2 when patched PLT trampoline was detected ++ * 3 when unpatched PLT trampoline was detected ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ ++#ifdef CONFIG_PAX_EMUPLT ++ int err; ++ ++ do { /* PaX: patched PLT emulation #1 */ ++ unsigned int sethi1, sethi2, jmpl; ++ ++ err =3D get_user(sethi1, (unsigned int *)regs->pc); ++ err |=3D get_user(sethi2, (unsigned int *)(regs->pc+4)); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->pc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi1 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi2 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (jmpl & 0xFFFFE000U) =3D=3D 0x81C06000U) ++ { ++ unsigned int addr; ++ ++ regs->u_regs[UREG_G1] =3D (sethi2 & 0x003FFFFFU) << 10; ++ addr =3D regs->u_regs[UREG_G1]; ++ addr +=3D (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); ++ regs->pc =3D addr; ++ regs->npc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ { /* PaX: patched PLT emulation #2 */ ++ unsigned int ba; ++ ++ err =3D get_user(ba, (unsigned int *)regs->pc); ++ ++ if (!err && (ba & 0xFFC00000U) =3D=3D 0x30800000U) { ++ unsigned int addr; ++ ++ addr =3D regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x0020000= 0U) << 2); ++ regs->pc =3D addr; ++ regs->npc =3D addr+4; ++ return 2; ++ } ++ } ++ ++ do { /* PaX: patched PLT emulation #3 */ ++ unsigned int sethi, jmpl, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->pc); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->pc+4)); ++ err |=3D get_user(nop, (unsigned int *)(regs->pc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ (jmpl & 0xFFFFE000U) =3D=3D 0x81C06000U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned int addr; ++ ++ addr =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G1] =3D addr; ++ addr +=3D (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); ++ regs->pc =3D addr; ++ regs->npc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: unpatched PLT emulation step 1 */ ++ unsigned int sethi, ba, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->pc); ++ err |=3D get_user(ba, (unsigned int *)(regs->pc+4)); ++ err |=3D get_user(nop, (unsigned int *)(regs->pc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ ((ba & 0xFFC00000U) =3D=3D 0x30800000U || (ba & 0xFFF80000U) =3D=3D= 0x30680000U) && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned int addr, save, call; ++ ++ if ((ba & 0xFFC00000U) =3D=3D 0x30800000U) ++ addr =3D regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00= 200000U) << 2); ++ else ++ addr =3D regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00= 040000U) << 2); ++ ++ err =3D get_user(save, (unsigned int *)addr); ++ err |=3D get_user(call, (unsigned int *)(addr+4)); ++ err |=3D get_user(nop, (unsigned int *)(addr+8)); ++ if (err) ++ break; ++ ++#ifdef CONFIG_PAX_DLRESOLVE ++ if (save =3D=3D 0x9DE3BFA8U && ++ (call & 0xC0000000U) =3D=3D 0x40000000U && ++ nop =3D=3D 0x01000000U) ++ { ++ struct vm_area_struct *vma; ++ unsigned long call_dl_resolve; ++ ++ down_read(¤t->mm->mmap_sem); ++ call_dl_resolve =3D current->mm->call_dl_resolve; ++ up_read(¤t->mm->mmap_sem); ++ if (likely(call_dl_resolve)) ++ goto emulate; ++ ++ vma =3D kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); ++ ++ down_write(¤t->mm->mmap_sem); ++ if (current->mm->call_dl_resolve) { ++ call_dl_resolve =3D current->mm->call_dl_resolve; ++ up_write(¤t->mm->mmap_sem); ++ if (vma) ++ kmem_cache_free(vm_area_cachep, vma); ++ goto emulate; ++ } ++ ++ call_dl_resolve =3D get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MA= P_PRIVATE); ++ if (!vma || (call_dl_resolve & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ if (vma) ++ kmem_cache_free(vm_area_cachep, vma); ++ return 1; ++ } ++ ++ if (pax_insert_vma(vma, call_dl_resolve)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return 1; ++ } ++ ++ current->mm->call_dl_resolve =3D call_dl_resolve; ++ up_write(¤t->mm->mmap_sem); ++ ++emulate: ++ regs->u_regs[UREG_G1] =3D (sethi & 0x003FFFFFU) << 10; ++ regs->pc =3D call_dl_resolve; ++ regs->npc =3D addr+4; ++ return 3; ++ } ++#endif ++ ++ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */ ++ if ((save & 0xFFC00000U) =3D=3D 0x05000000U && ++ (call & 0xFFFFE000U) =3D=3D 0x85C0A000U && ++ nop =3D=3D 0x01000000U) ++ { ++ regs->u_regs[UREG_G1] =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G2] =3D addr + 4; ++ addr =3D (save & 0x003FFFFFU) << 10; ++ addr +=3D (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); ++ regs->pc =3D addr; ++ regs->npc =3D addr+4; ++ return 3; ++ } ++ } ++ } while (0); ++ ++ do { /* PaX: unpatched PLT emulation step 2 */ ++ unsigned int save, call, nop; ++ ++ err =3D get_user(save, (unsigned int *)(regs->pc-4)); ++ err |=3D get_user(call, (unsigned int *)regs->pc); ++ err |=3D get_user(nop, (unsigned int *)(regs->pc+4)); ++ if (err) ++ break; ++ ++ if (save =3D=3D 0x9DE3BFA8U && ++ (call & 0xC0000000U) =3D=3D 0x40000000U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned int dl_resolve =3D regs->pc + ((((call | 0xC0000000U) ^ 0x2= 0000000U) + 0x20000000U) << 2); ++ ++ regs->u_regs[UREG_RETPC] =3D regs->pc; ++ regs->pc =3D dl_resolve; ++ regs->npc =3D dl_resolve+4; ++ return 3; ++ } ++ } while (0); ++#endif ++ ++ return 1; ++} ++ ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 8; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, in= t write, + unsigned long address) + { +@@ -231,6 +495,24 @@ good_area: + if(!(vma->vm_flags & VM_WRITE)) + goto bad_area; + } else { ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flag= s & VM_EXEC)) { ++ up_read(&mm->mmap_sem); ++ switch (pax_handle_fetch_fault(regs)) { ++ ++#ifdef CONFIG_PAX_EMUPLT ++ case 2: ++ case 3: ++ return; ++#endif ++ ++ } ++ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_F= P]); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + /* Allow reads even for write-only mappings */ + if(!(vma->vm_flags & (VM_READ | VM_EXEC))) + goto bad_area; +diff -urNp linux-2.6.32.45/arch/sparc/mm/fault_64.c linux-2.6.32.45/arch= /sparc/mm/fault_64.c +--- linux-2.6.32.45/arch/sparc/mm/fault_64.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/sparc/mm/fault_64.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -20,6 +20,9 @@ + #include + #include + #include ++#include ++#include ++#include +=20 + #include + #include +@@ -78,7 +81,7 @@ static void bad_kernel_pc(struct pt_regs + printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", + regs->tpc); + printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]); +- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]); ++ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]); + printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr); + dump_stack(); + unhandled_fault(regs->tpc, current, regs); +@@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_a + show_regs(regs); + } +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++#ifdef CONFIG_PAX_DLRESOLVE ++static void pax_emuplt_close(struct vm_area_struct *vma) ++{ ++ vma->vm_mm->call_dl_resolve =3D 0UL; ++} ++ ++static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault= *vmf) ++{ ++ unsigned int *kaddr; ++ ++ vmf->page =3D alloc_page(GFP_HIGHUSER); ++ if (!vmf->page) ++ return VM_FAULT_OOM; ++ ++ kaddr =3D kmap(vmf->page); ++ memset(kaddr, 0, PAGE_SIZE); ++ kaddr[0] =3D 0x9DE3BFA8U; /* save */ ++ flush_dcache_page(vmf->page); ++ kunmap(vmf->page); ++ return VM_FAULT_MAJOR; ++} ++ ++static const struct vm_operations_struct pax_vm_ops =3D { ++ .close =3D pax_emuplt_close, ++ .fault =3D pax_emuplt_fault ++}; ++ ++static int pax_insert_vma(struct vm_area_struct *vma, unsigned long add= r) ++{ ++ int ret; ++ ++ vma->vm_mm =3D current->mm; ++ vma->vm_start =3D addr; ++ vma->vm_end =3D addr + PAGE_SIZE; ++ vma->vm_flags =3D VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC; ++ vma->vm_page_prot =3D vm_get_page_prot(vma->vm_flags); ++ vma->vm_ops =3D &pax_vm_ops; ++ ++ ret =3D insert_vm_struct(current->mm, vma); ++ if (ret) ++ return ret; ++ ++ ++current->mm->total_vm; ++ return 0; ++} ++#endif ++ ++/* ++ * PaX: decide what to do with offenders (regs->tpc =3D fault address) ++ * ++ * returns 1 when task should be killed ++ * 2 when patched PLT trampoline was detected ++ * 3 when unpatched PLT trampoline was detected ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ ++#ifdef CONFIG_PAX_EMUPLT ++ int err; ++ ++ do { /* PaX: patched PLT emulation #1 */ ++ unsigned int sethi1, sethi2, jmpl; ++ ++ err =3D get_user(sethi1, (unsigned int *)regs->tpc); ++ err |=3D get_user(sethi2, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->tpc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi1 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi2 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (jmpl & 0xFFFFE000U) =3D=3D 0x81C06000U) ++ { ++ unsigned long addr; ++ ++ regs->u_regs[UREG_G1] =3D (sethi2 & 0x003FFFFFU) << 10; ++ addr =3D regs->u_regs[UREG_G1]; ++ addr +=3D (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x000010= 00UL); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ { /* PaX: patched PLT emulation #2 */ ++ unsigned int ba; ++ ++ err =3D get_user(ba, (unsigned int *)regs->tpc); ++ ++ if (!err && (ba & 0xFFC00000U) =3D=3D 0x30800000U) { ++ unsigned long addr; ++ ++ addr =3D regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) = + 0x00200000UL) << 2); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } ++ ++ do { /* PaX: patched PLT emulation #3 */ ++ unsigned int sethi, jmpl, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ (jmpl & 0xFFFFE000U) =3D=3D 0x81C06000U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long addr; ++ ++ addr =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G1] =3D addr; ++ addr +=3D (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x000010= 00UL); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: patched PLT emulation #4 */ ++ unsigned int sethi, mov1, call, mov2; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(mov1, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(call, (unsigned int *)(regs->tpc+8)); ++ err |=3D get_user(mov2, (unsigned int *)(regs->tpc+12)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ mov1 =3D=3D 0x8210000FU && ++ (call & 0xC0000000U) =3D=3D 0x40000000U && ++ mov2 =3D=3D 0x9E100001U) ++ { ++ unsigned long addr; ++ ++ regs->u_regs[UREG_G1] =3D regs->u_regs[UREG_RETPC]; ++ addr =3D regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x200000= 00UL) + 0x20000000UL) << 2); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: patched PLT emulation #5 */ ++ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(sethi1, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(sethi2, (unsigned int *)(regs->tpc+8)); ++ err |=3D get_user(or1, (unsigned int *)(regs->tpc+12)); ++ err |=3D get_user(or2, (unsigned int *)(regs->tpc+16)); ++ err |=3D get_user(sllx, (unsigned int *)(regs->tpc+20)); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->tpc+24)); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+28)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi1 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi2 & 0xFFC00000U) =3D=3D 0x0B000000U && ++ (or1 & 0xFFFFE000U) =3D=3D 0x82106000U && ++ (or2 & 0xFFFFE000U) =3D=3D 0x8A116000U && ++ sllx =3D=3D 0x83287020U && ++ jmpl =3D=3D 0x81C04005U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long addr; ++ ++ regs->u_regs[UREG_G1] =3D ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x= 000003FFU); ++ regs->u_regs[UREG_G1] <<=3D 32; ++ regs->u_regs[UREG_G5] =3D ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x= 000003FFU); ++ addr =3D regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5]; ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: patched PLT emulation #6 */ ++ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(sethi1, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(sethi2, (unsigned int *)(regs->tpc+8)); ++ err |=3D get_user(sllx, (unsigned int *)(regs->tpc+12)); ++ err |=3D get_user(or, (unsigned int *)(regs->tpc+16)); ++ err |=3D get_user(jmpl, (unsigned int *)(regs->tpc+20)); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+24)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi1 & 0xFFC00000U) =3D=3D 0x03000000U && ++ (sethi2 & 0xFFC00000U) =3D=3D 0x0B000000U && ++ sllx =3D=3D 0x83287020U && ++ (or & 0xFFFFE000U) =3D=3D 0x8A116000U && ++ jmpl =3D=3D 0x81C04005U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long addr; ++ ++ regs->u_regs[UREG_G1] =3D (sethi1 & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G1] <<=3D 32; ++ regs->u_regs[UREG_G5] =3D ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3= FFU); ++ addr =3D regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5]; ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: unpatched PLT emulation step 1 */ ++ unsigned int sethi, ba, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(ba, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ ((ba & 0xFFC00000U) =3D=3D 0x30800000U || (ba & 0xFFF80000U) =3D=3D= 0x30680000U) && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long addr; ++ unsigned int save, call; ++ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl; ++ ++ if ((ba & 0xFFC00000U) =3D=3D 0x30800000U) ++ addr =3D regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x0020000= 0UL) + 0x00200000UL) << 2); ++ else ++ addr =3D regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x0004000= 0UL) + 0x00040000UL) << 2); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ err =3D get_user(save, (unsigned int *)addr); ++ err |=3D get_user(call, (unsigned int *)(addr+4)); ++ err |=3D get_user(nop, (unsigned int *)(addr+8)); ++ if (err) ++ break; ++ ++#ifdef CONFIG_PAX_DLRESOLVE ++ if (save =3D=3D 0x9DE3BFA8U && ++ (call & 0xC0000000U) =3D=3D 0x40000000U && ++ nop =3D=3D 0x01000000U) ++ { ++ struct vm_area_struct *vma; ++ unsigned long call_dl_resolve; ++ ++ down_read(¤t->mm->mmap_sem); ++ call_dl_resolve =3D current->mm->call_dl_resolve; ++ up_read(¤t->mm->mmap_sem); ++ if (likely(call_dl_resolve)) ++ goto emulate; ++ ++ vma =3D kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); ++ ++ down_write(¤t->mm->mmap_sem); ++ if (current->mm->call_dl_resolve) { ++ call_dl_resolve =3D current->mm->call_dl_resolve; ++ up_write(¤t->mm->mmap_sem); ++ if (vma) ++ kmem_cache_free(vm_area_cachep, vma); ++ goto emulate; ++ } ++ ++ call_dl_resolve =3D get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MA= P_PRIVATE); ++ if (!vma || (call_dl_resolve & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ if (vma) ++ kmem_cache_free(vm_area_cachep, vma); ++ return 1; ++ } ++ ++ if (pax_insert_vma(vma, call_dl_resolve)) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, vma); ++ return 1; ++ } ++ ++ current->mm->call_dl_resolve =3D call_dl_resolve; ++ up_write(¤t->mm->mmap_sem); ++ ++emulate: ++ regs->u_regs[UREG_G1] =3D (sethi & 0x003FFFFFU) << 10; ++ regs->tpc =3D call_dl_resolve; ++ regs->tnpc =3D addr+4; ++ return 3; ++ } ++#endif ++ ++ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */ ++ if ((save & 0xFFC00000U) =3D=3D 0x05000000U && ++ (call & 0xFFFFE000U) =3D=3D 0x85C0A000U && ++ nop =3D=3D 0x01000000U) ++ { ++ regs->u_regs[UREG_G1] =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G2] =3D addr + 4; ++ addr =3D (save & 0x003FFFFFU) << 10; ++ addr +=3D (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001= 000UL); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 3; ++ } ++ ++ /* PaX: 64-bit PLT stub */ ++ err =3D get_user(sethi1, (unsigned int *)addr); ++ err |=3D get_user(sethi2, (unsigned int *)(addr+4)); ++ err |=3D get_user(or1, (unsigned int *)(addr+8)); ++ err |=3D get_user(or2, (unsigned int *)(addr+12)); ++ err |=3D get_user(sllx, (unsigned int *)(addr+16)); ++ err |=3D get_user(add, (unsigned int *)(addr+20)); ++ err |=3D get_user(jmpl, (unsigned int *)(addr+24)); ++ err |=3D get_user(nop, (unsigned int *)(addr+28)); ++ if (err) ++ break; ++ ++ if ((sethi1 & 0xFFC00000U) =3D=3D 0x09000000U && ++ (sethi2 & 0xFFC00000U) =3D=3D 0x0B000000U && ++ (or1 & 0xFFFFE000U) =3D=3D 0x88112000U && ++ (or2 & 0xFFFFE000U) =3D=3D 0x8A116000U && ++ sllx =3D=3D 0x89293020U && ++ add =3D=3D 0x8A010005U && ++ jmpl =3D=3D 0x89C14000U && ++ nop =3D=3D 0x01000000U) ++ { ++ regs->u_regs[UREG_G1] =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G4] =3D ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0= x000003FFU); ++ regs->u_regs[UREG_G4] <<=3D 32; ++ regs->u_regs[UREG_G5] =3D ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0= x000003FFU); ++ regs->u_regs[UREG_G5] +=3D regs->u_regs[UREG_G4]; ++ regs->u_regs[UREG_G4] =3D addr + 24; ++ addr =3D regs->u_regs[UREG_G5]; ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 3; ++ } ++ } ++ } while (0); ++ ++#ifdef CONFIG_PAX_DLRESOLVE ++ do { /* PaX: unpatched PLT emulation step 2 */ ++ unsigned int save, call, nop; ++ ++ err =3D get_user(save, (unsigned int *)(regs->tpc-4)); ++ err |=3D get_user(call, (unsigned int *)regs->tpc); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+4)); ++ if (err) ++ break; ++ ++ if (save =3D=3D 0x9DE3BFA8U && ++ (call & 0xC0000000U) =3D=3D 0x40000000U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long dl_resolve =3D regs->tpc + ((((call | 0xFFFFFFFFC00000= 00UL) ^ 0x20000000UL) + 0x20000000UL) << 2); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ dl_resolve &=3D 0xFFFFFFFFUL; ++ ++ regs->u_regs[UREG_RETPC] =3D regs->tpc; ++ regs->tpc =3D dl_resolve; ++ regs->tnpc =3D dl_resolve+4; ++ return 3; ++ } ++ } while (0); ++#endif ++ ++ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT= emulation */ ++ unsigned int sethi, ba, nop; ++ ++ err =3D get_user(sethi, (unsigned int *)regs->tpc); ++ err |=3D get_user(ba, (unsigned int *)(regs->tpc+4)); ++ err |=3D get_user(nop, (unsigned int *)(regs->tpc+8)); ++ ++ if (err) ++ break; ++ ++ if ((sethi & 0xFFC00000U) =3D=3D 0x03000000U && ++ (ba & 0xFFF00000U) =3D=3D 0x30600000U && ++ nop =3D=3D 0x01000000U) ++ { ++ unsigned long addr; ++ ++ addr =3D (sethi & 0x003FFFFFU) << 10; ++ regs->u_regs[UREG_G1] =3D addr; ++ addr =3D regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) = + 0x00040000UL) << 2); ++ ++ if (test_thread_flag(TIF_32BIT)) ++ addr &=3D 0xFFFFFFFFUL; ++ ++ regs->tpc =3D addr; ++ regs->tnpc =3D addr+4; ++ return 2; ++ } ++ } while (0); ++ ++#endif ++ ++ return 1; ++} ++ ++void pax_report_insns(void *pc, void *sp) ++{ ++ unsigned long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 8; i++) { ++ unsigned int c; ++ if (get_user(c, (unsigned int *)pc+i)) ++ printk(KERN_CONT "???????? "); ++ else ++ printk(KERN_CONT "%08x ", c); ++ } ++ printk("\n"); ++} ++#endif ++ + asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) + { + struct mm_struct *mm =3D current->mm; +@@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fau + if (!vma) + goto bad_area; +=20 ++#ifdef CONFIG_PAX_PAGEEXEC ++ /* PaX: detect ITLB misses on non-exec pages */ ++ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <=3D address && ++ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB)) ++ { ++ if (address !=3D regs->tpc) ++ goto good_area; ++ ++ up_read(&mm->mmap_sem); ++ switch (pax_handle_fetch_fault(regs)) { ++ ++#ifdef CONFIG_PAX_EMUPLT ++ case 2: ++ case 3: ++ return; ++#endif ++ ++ } ++ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_= FP] + STACK_BIAS)); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ + /* 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.32.45/arch/sparc/mm/hugetlbpage.c linux-2.6.32.45/a= rch/sparc/mm/hugetlbpage.c +--- linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/sparc/mm/hugetlbpage.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -69,7 +69,7 @@ full_search: + } + return -ENOMEM; + } +- if (likely(!vma || addr + len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* + * Remember the place where we stopped the search: + */ +@@ -108,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct + /* make sure it can fit in the remaining address space */ + if (likely(addr > len)) { + vma =3D find_vma(mm, addr-len); +- if (!vma || addr <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr - len, len)) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr-len); + } +@@ -117,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct + if (unlikely(mm->mmap_base < len)) + goto bottomup; +=20 +- addr =3D (mm->mmap_base-len) & HPAGE_MASK; ++ addr =3D mm->mmap_base - len; +=20 + do { ++ addr &=3D HPAGE_MASK; + /* + * Lookup failure means no vma is above this address, + * else if new region fits below vma->vm_start, + * return with success: + */ + vma =3D find_vma(mm, addr); +- if (likely(!vma || addr+len <=3D vma->vm_start)) { ++ if (likely(check_heap_stack_gap(vma, addr, len))) { + /* remember the address as a hint for next time */ + return (mm->free_area_cache =3D addr); + } +@@ -136,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct + mm->cached_hole_size =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D (vma->vm_start-len) & HPAGE_MASK; +- } while (likely(len < vma->vm_start)); ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); +=20 + bottomup: + /* +@@ -183,8 +184,7 @@ hugetlb_get_unmapped_area(struct file *f + if (addr) { + addr =3D ALIGN(addr, HPAGE_SIZE); + vma =3D find_vma(mm, addr); +- if (task_size - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (task_size - len >=3D addr && check_heap_stack_gap(vma, addr, len)= ) + return addr; + } + if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) +diff -urNp linux-2.6.32.45/arch/sparc/mm/init_32.c linux-2.6.32.45/arch/= sparc/mm/init_32.c +--- linux-2.6.32.45/arch/sparc/mm/init_32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/sparc/mm/init_32.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -317,6 +317,9 @@ extern void device_scan(void); + pgprot_t PAGE_SHARED __read_mostly; + EXPORT_SYMBOL(PAGE_SHARED); +=20 ++pgprot_t PAGE_SHARED_NOEXEC __read_mostly; ++EXPORT_SYMBOL(PAGE_SHARED_NOEXEC); ++ + void __init paging_init(void) + { + switch(sparc_cpu_model) { +@@ -345,17 +348,17 @@ void __init paging_init(void) +=20 + /* Initialize the protection map with non-constant, MMU dependent valu= es. */ + protection_map[0] =3D PAGE_NONE; +- protection_map[1] =3D PAGE_READONLY; +- protection_map[2] =3D PAGE_COPY; +- protection_map[3] =3D PAGE_COPY; ++ protection_map[1] =3D PAGE_READONLY_NOEXEC; ++ protection_map[2] =3D PAGE_COPY_NOEXEC; ++ protection_map[3] =3D PAGE_COPY_NOEXEC; + protection_map[4] =3D PAGE_READONLY; + protection_map[5] =3D PAGE_READONLY; + protection_map[6] =3D PAGE_COPY; + protection_map[7] =3D PAGE_COPY; + protection_map[8] =3D PAGE_NONE; +- protection_map[9] =3D PAGE_READONLY; +- protection_map[10] =3D PAGE_SHARED; +- protection_map[11] =3D PAGE_SHARED; ++ protection_map[9] =3D PAGE_READONLY_NOEXEC; ++ protection_map[10] =3D PAGE_SHARED_NOEXEC; ++ protection_map[11] =3D PAGE_SHARED_NOEXEC; + protection_map[12] =3D PAGE_READONLY; + protection_map[13] =3D PAGE_READONLY; + protection_map[14] =3D PAGE_SHARED; +diff -urNp linux-2.6.32.45/arch/sparc/mm/Makefile linux-2.6.32.45/arch/s= parc/mm/Makefile +--- linux-2.6.32.45/arch/sparc/mm/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/sparc/mm/Makefile 2011-04-17 15:56:46.000000000= -0400 +@@ -2,7 +2,7 @@ + # +=20 + asflags-y :=3D -ansi +-ccflags-y :=3D -Werror ++#ccflags-y :=3D -Werror +=20 + obj-$(CONFIG_SPARC64) +=3D ultra.o tlb.o tsb.o + obj-y +=3D fault_$(BITS).o +diff -urNp linux-2.6.32.45/arch/sparc/mm/srmmu.c linux-2.6.32.45/arch/sp= arc/mm/srmmu.c +--- linux-2.6.32.45/arch/sparc/mm/srmmu.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/sparc/mm/srmmu.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) + PAGE_SHARED =3D pgprot_val(SRMMU_PAGE_SHARED); + BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); + BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY)); ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ PAGE_SHARED_NOEXEC =3D pgprot_val(SRMMU_PAGE_SHARED_NOEXEC); ++ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC)); ++ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEX= EC)); ++#endif ++ + BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); + page_kernel =3D pgprot_val(SRMMU_PAGE_KERNEL); +=20 +diff -urNp linux-2.6.32.45/arch/um/include/asm/kmap_types.h linux-2.6.32= .45/arch/um/include/asm/kmap_types.h +--- linux-2.6.32.45/arch/um/include/asm/kmap_types.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/um/include/asm/kmap_types.h 2011-04-17 15:56:46= .000000000 -0400 +@@ -23,6 +23,7 @@ enum km_type { + KM_IRQ1, + KM_SOFTIRQ0, + KM_SOFTIRQ1, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; +=20 +diff -urNp linux-2.6.32.45/arch/um/include/asm/page.h linux-2.6.32.45/ar= ch/um/include/asm/page.h +--- linux-2.6.32.45/arch/um/include/asm/page.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/um/include/asm/page.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -14,6 +14,9 @@ + #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) + #define PAGE_MASK (~(PAGE_SIZE-1)) +=20 ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) ++ + #ifndef __ASSEMBLY__ +=20 + struct page; +diff -urNp linux-2.6.32.45/arch/um/kernel/process.c linux-2.6.32.45/arch= /um/kernel/process.c +--- linux-2.6.32.45/arch/um/kernel/process.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/um/kernel/process.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -393,22 +393,6 @@ int singlestepping(void * t) + return 2; + } +=20 +-/* +- * Only x86 and x86_64 have an arch_align_stack(). +- * All other arches have "#define arch_align_stack(x) (x)" +- * in their asm/system.h +- * As this is included in UML from asm-um/system-generic.h, +- * we can use it to behave as the subarch does. +- */ +-#ifndef arch_align_stack +-unsigned long arch_align_stack(unsigned long sp) +-{ +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -=3D get_random_int() % 8192; +- return sp & ~0xf; +-} +-#endif +- + unsigned long get_wchan(struct task_struct *p) + { + unsigned long stack_page, sp, ip; +diff -urNp linux-2.6.32.45/arch/um/sys-i386/syscalls.c linux-2.6.32.45/a= rch/um/sys-i386/syscalls.c +--- linux-2.6.32.45/arch/um/sys-i386/syscalls.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/um/sys-i386/syscalls.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -11,6 +11,21 @@ + #include "asm/uaccess.h" + #include "asm/unistd.h" +=20 ++int i386_mmap_check(unsigned long addr, unsigned long len, unsigned lon= g flags) ++{ ++ unsigned long pax_task_size =3D TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ if (len > pax_task_size || addr > pax_task_size - len) ++ return -EINVAL; ++ ++ return 0; ++} ++ + /* + * Perform the select(nd, in, out, ex, tv) and mmap() system + * calls. Linux/i386 didn't use to be able to handle more than +diff -urNp linux-2.6.32.45/arch/x86/boot/bitops.h linux-2.6.32.45/arch/x= 86/boot/bitops.h +--- linux-2.6.32.45/arch/x86/boot/bitops.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/boot/bitops.h 2011-04-17 15:56:46.000000000= -0400 +@@ -26,7 +26,7 @@ static inline int variable_test_bit(int=20 + u8 v; + const u32 *p =3D (const u32 *)addr; +=20 +- asm("btl %2,%1; setc %0" : "=3Dqm" (v) : "m" (*p), "Ir" (nr)); ++ asm volatile("btl %2,%1; setc %0" : "=3Dqm" (v) : "m" (*p), "Ir" (nr))= ; + return v; + } +=20 +@@ -37,7 +37,7 @@ static inline int variable_test_bit(int=20 +=20 + static inline void set_bit(int nr, void *addr) + { +- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); ++ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr)); + } +=20 + #endif /* BOOT_BITOPS_H */ +diff -urNp linux-2.6.32.45/arch/x86/boot/boot.h linux-2.6.32.45/arch/x86= /boot/boot.h +--- linux-2.6.32.45/arch/x86/boot/boot.h 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/x86/boot/boot.h 2011-04-17 15:56:46.000000000 -= 0400 +@@ -82,7 +82,7 @@ static inline void io_delay(void) + static inline u16 ds(void) + { + u16 seg; +- asm("movw %%ds,%0" : "=3Drm" (seg)); ++ asm volatile("movw %%ds,%0" : "=3Drm" (seg)); + return seg; + } +=20 +@@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t=20 + static inline int memcmp(const void *s1, const void *s2, size_t len) + { + u8 diff; +- asm("repe; cmpsb; setnz %0" ++ asm volatile("repe; cmpsb; setnz %0" + : "=3Dqm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); + return diff; + } +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_32.S linux-2.6.= 32.45/arch/x86/boot/compressed/head_32.S +--- linux-2.6.32.45/arch/x86/boot/compressed/head_32.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/head_32.S 2011-04-17 15:56:= 46.000000000 -0400 +@@ -76,7 +76,7 @@ ENTRY(startup_32) + notl %eax + andl %eax, %ebx + #else +- movl $LOAD_PHYSICAL_ADDR, %ebx ++ movl $____LOAD_PHYSICAL_ADDR, %ebx + #endif +=20 + /* Target address to relocate to for decompression */ +@@ -149,7 +149,7 @@ relocated: + * and where it was actually loaded. + */ + movl %ebp, %ebx +- subl $LOAD_PHYSICAL_ADDR, %ebx ++ subl $____LOAD_PHYSICAL_ADDR, %ebx + jz 2f /* Nothing to be done if loaded at compiled addr. */ + /* + * Process relocations. +@@ -157,8 +157,7 @@ relocated: +=20 + 1: subl $4, %edi + movl (%edi), %ecx +- testl %ecx, %ecx +- jz 2f ++ jecxz 2f + addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) + jmp 1b + 2: +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/head_64.S linux-2.6.= 32.45/arch/x86/boot/compressed/head_64.S +--- linux-2.6.32.45/arch/x86/boot/compressed/head_64.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/head_64.S 2011-07-01 18:53:= 00.000000000 -0400 +@@ -91,7 +91,7 @@ ENTRY(startup_32) + notl %eax + andl %eax, %ebx + #else +- movl $LOAD_PHYSICAL_ADDR, %ebx ++ movl $____LOAD_PHYSICAL_ADDR, %ebx + #endif +=20 + /* Target address to relocate to for decompression */ +@@ -183,7 +183,7 @@ no_longmode: + hlt + jmp 1b +=20 +-#include "../../kernel/verify_cpu_64.S" ++#include "../../kernel/verify_cpu.S" +=20 + /* + * Be careful here startup_64 needs to be at a predictable +@@ -234,7 +234,7 @@ ENTRY(startup_64) + notq %rax + andq %rax, %rbp + #else +- movq $LOAD_PHYSICAL_ADDR, %rbp ++ movq $____LOAD_PHYSICAL_ADDR, %rbp + #endif +=20 + /* Target address to relocate to for decompression */ +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/Makefile linux-2.6.3= 2.45/arch/x86/boot/compressed/Makefile +--- linux-2.6.32.45/arch/x86/boot/compressed/Makefile 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/Makefile 2011-08-07 14:38:3= 4.000000000 -0400 +@@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) :=3D -mcmodel=3Dsmal + KBUILD_CFLAGS +=3D $(cflags-y) + KBUILD_CFLAGS +=3D $(call cc-option,-ffreestanding) + KBUILD_CFLAGS +=3D $(call cc-option,-fno-stack-protector) ++ifdef CONSTIFY_PLUGIN ++KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-c= onstify ++endif +=20 + KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE :=3D n +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/misc.c linux-2.6.32.= 45/arch/x86/boot/compressed/misc.c +--- linux-2.6.32.45/arch/x86/boot/compressed/misc.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/misc.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -288,7 +288,7 @@ static void parse_elf(void *output) + case PT_LOAD: + #ifdef CONFIG_RELOCATABLE + dest =3D output; +- dest +=3D (phdr->p_paddr - LOAD_PHYSICAL_ADDR); ++ dest +=3D (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR); + #else + dest =3D (void *)(phdr->p_paddr); + #endif +@@ -335,7 +335,7 @@ asmlinkage void decompress_kernel(void * + error("Destination address too large"); + #endif + #ifndef CONFIG_RELOCATABLE +- if ((unsigned long)output !=3D LOAD_PHYSICAL_ADDR) ++ if ((unsigned long)output !=3D ____LOAD_PHYSICAL_ADDR) + error("Wrong destination address"); + #endif +=20 +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c linux-2.6.= 32.45/arch/x86/boot/compressed/mkpiggy.c +--- linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/mkpiggy.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) +=20 + offs =3D (olen > ilen) ? olen - ilen : 0; + offs +=3D olen >> 12; /* Add 8 bytes for each 32K block */ +- offs +=3D 32*1024 + 18; /* Add 32K + 18 bytes slack */ ++ offs +=3D 64*1024; /* Add 64K bytes slack */ + offs =3D (offs+4095) & ~4095; /* Round to a 4K boundary */ +=20 + printf(".section \".rodata.compressed\",\"a\",@progbits\n"); +diff -urNp linux-2.6.32.45/arch/x86/boot/compressed/relocs.c linux-2.6.3= 2.45/arch/x86/boot/compressed/relocs.c +--- linux-2.6.32.45/arch/x86/boot/compressed/relocs.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/compressed/relocs.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -10,8 +10,11 @@ + #define USE_BSD + #include +=20 ++#include "../../../../include/linux/autoconf.h" ++ + #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + static Elf32_Ehdr ehdr; ++static Elf32_Phdr *phdr; + static unsigned long reloc_count, reloc_idx; + static unsigned long *relocs; +=20 +@@ -37,7 +40,7 @@ static const char* safe_abs_relocs[] =3D { +=20 + static int is_safe_abs_reloc(const char* sym_name) + { +- int i; ++ unsigned int i; +=20 + for (i =3D 0; i < ARRAY_SIZE(safe_abs_relocs); i++) { + if (!strcmp(sym_name, safe_abs_relocs[i])) +@@ -245,9 +248,39 @@ static void read_ehdr(FILE *fp) + } + } +=20 ++static void read_phdrs(FILE *fp) ++{ ++ unsigned int i; ++ ++ phdr =3D calloc(ehdr.e_phnum, sizeof(Elf32_Phdr)); ++ if (!phdr) { ++ die("Unable to allocate %d program headers\n", ++ ehdr.e_phnum); ++ } ++ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) { ++ die("Seek to %d failed: %s\n", ++ ehdr.e_phoff, strerror(errno)); ++ } ++ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) !=3D ehdr.e_phnum) { ++ die("Cannot read ELF program headers: %s\n", ++ strerror(errno)); ++ } ++ for(i =3D 0; i < ehdr.e_phnum; i++) { ++ phdr[i].p_type =3D elf32_to_cpu(phdr[i].p_type); ++ phdr[i].p_offset =3D elf32_to_cpu(phdr[i].p_offset); ++ phdr[i].p_vaddr =3D elf32_to_cpu(phdr[i].p_vaddr); ++ phdr[i].p_paddr =3D elf32_to_cpu(phdr[i].p_paddr); ++ phdr[i].p_filesz =3D elf32_to_cpu(phdr[i].p_filesz); ++ phdr[i].p_memsz =3D elf32_to_cpu(phdr[i].p_memsz); ++ phdr[i].p_flags =3D elf32_to_cpu(phdr[i].p_flags); ++ phdr[i].p_align =3D elf32_to_cpu(phdr[i].p_align); ++ } ++ ++} ++ + static void read_shdrs(FILE *fp) + { +- int i; ++ unsigned int i; + Elf32_Shdr shdr; +=20 + secs =3D calloc(ehdr.e_shnum, sizeof(struct section)); +@@ -282,7 +315,7 @@ static void read_shdrs(FILE *fp) +=20 + static void read_strtabs(FILE *fp) + { +- int i; ++ unsigned int i; + for (i =3D 0; i < ehdr.e_shnum; i++) { + struct section *sec =3D &secs[i]; + if (sec->shdr.sh_type !=3D SHT_STRTAB) { +@@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp) +=20 + static void read_symtabs(FILE *fp) + { +- int i,j; ++ unsigned int i,j; + for (i =3D 0; i < ehdr.e_shnum; i++) { + struct section *sec =3D &secs[i]; + if (sec->shdr.sh_type !=3D SHT_SYMTAB) { +@@ -340,7 +373,9 @@ static void read_symtabs(FILE *fp) +=20 + static void read_relocs(FILE *fp) + { +- int i,j; ++ unsigned int i,j; ++ uint32_t base; ++ + for (i =3D 0; i < ehdr.e_shnum; i++) { + struct section *sec =3D &secs[i]; + if (sec->shdr.sh_type !=3D SHT_REL) { +@@ -360,9 +395,18 @@ static void read_relocs(FILE *fp) + die("Cannot read symbol table: %s\n", + strerror(errno)); + } ++ base =3D 0; ++ for (j =3D 0; j < ehdr.e_phnum; j++) { ++ if (phdr[j].p_type !=3D PT_LOAD ) ++ continue; ++ if (secs[sec->shdr.sh_info].shdr.sh_offset < phdr[j].p_offset || sec= s[sec->shdr.sh_info].shdr.sh_offset >=3D phdr[j].p_offset + phdr[j].p_fil= esz) ++ continue; ++ base =3D CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr; ++ break; ++ } + for (j =3D 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) { + Elf32_Rel *rel =3D &sec->reltab[j]; +- rel->r_offset =3D elf32_to_cpu(rel->r_offset); ++ rel->r_offset =3D elf32_to_cpu(rel->r_offset) + base; + rel->r_info =3D elf32_to_cpu(rel->r_info); + } + } +@@ -371,14 +415,14 @@ static void read_relocs(FILE *fp) +=20 + static void print_absolute_symbols(void) + { +- int i; ++ unsigned int i; + printf("Absolute symbols\n"); + printf(" Num: Value Size Type Bind Visibility Name\n= "); + for (i =3D 0; i < ehdr.e_shnum; i++) { + struct section *sec =3D &secs[i]; + char *sym_strtab; + Elf32_Sym *sh_symtab; +- int j; ++ unsigned int j; +=20 + if (sec->shdr.sh_type !=3D SHT_SYMTAB) { + continue; +@@ -406,14 +450,14 @@ static void print_absolute_symbols(void) +=20 + static void print_absolute_relocs(void) + { +- int i, printed =3D 0; ++ unsigned int i, printed =3D 0; +=20 + for (i =3D 0; i < ehdr.e_shnum; i++) { + struct section *sec =3D &secs[i]; + struct section *sec_applies, *sec_symtab; + char *sym_strtab; + Elf32_Sym *sh_symtab; +- int j; ++ unsigned int j; + if (sec->shdr.sh_type !=3D SHT_REL) { + continue; + } +@@ -474,13 +518,13 @@ static void print_absolute_relocs(void) +=20 + static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym)) + { +- int i; ++ unsigned int i; + /* Walk through the relocations */ + for (i =3D 0; i < ehdr.e_shnum; i++) { + char *sym_strtab; + Elf32_Sym *sh_symtab; + struct section *sec_applies, *sec_symtab; +- int j; ++ unsigned int j; + struct section *sec =3D &secs[i]; +=20 + if (sec->shdr.sh_type !=3D SHT_REL) { +@@ -504,6 +548,21 @@ static void walk_relocs(void (*visit)(El + if (sym->st_shndx =3D=3D SHN_ABS) { + continue; + } ++ /* Don't relocate actual per-cpu variables, they are absolute indice= s, not addresses */ ++ if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_n= ame(sym_strtab, sym), "__per_cpu_load")) ++ continue; ++ ++#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) ++ /* Don't relocate actual code, they are relocated implicitly by the = base address of KERNEL_CS */ ++ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_= name(sym_strtab, sym), "_etext")) ++ continue; ++ if (!strcmp(sec_name(sym->st_shndx), ".init.text")) ++ continue; ++ if (!strcmp(sec_name(sym->st_shndx), ".exit.text")) ++ continue; ++ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym= _strtab, sym), "__LOAD_PHYSICAL_ADDR")) ++ continue; ++#endif + if (r_type =3D=3D R_386_NONE || r_type =3D=3D R_386_PC32) { + /* + * NONE can be ignored and and PC relative +@@ -541,7 +600,7 @@ static int cmp_relocs(const void *va, co +=20 + static void emit_relocs(int as_text) + { +- int i; ++ unsigned int i; + /* Count how many relocations I have and allocate space for them. */ + reloc_count =3D 0; + walk_relocs(count_reloc); +@@ -634,6 +693,7 @@ int main(int argc, char **argv) + fname, strerror(errno)); + } + read_ehdr(fp); ++ read_phdrs(fp); + read_shdrs(fp); + read_strtabs(fp); + read_symtabs(fp); +diff -urNp linux-2.6.32.45/arch/x86/boot/cpucheck.c linux-2.6.32.45/arch= /x86/boot/cpucheck.c +--- linux-2.6.32.45/arch/x86/boot/cpucheck.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/boot/cpucheck.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -74,7 +74,7 @@ static int has_fpu(void) + u16 fcw =3D -1, fsw =3D -1; + u32 cr0; +=20 +- asm("movl %%cr0,%0" : "=3Dr" (cr0)); ++ asm volatile("movl %%cr0,%0" : "=3Dr" (cr0)); + if (cr0 & (X86_CR0_EM|X86_CR0_TS)) { + cr0 &=3D ~(X86_CR0_EM|X86_CR0_TS); + asm volatile("movl %0,%%cr0" : : "r" (cr0)); +@@ -90,7 +90,7 @@ static int has_eflag(u32 mask) + { + u32 f0, f1; +=20 +- asm("pushfl ; " ++ asm volatile("pushfl ; " + "pushfl ; " + "popl %0 ; " + "movl %0,%1 ; " +@@ -115,7 +115,7 @@ static void get_flags(void) + set_bit(X86_FEATURE_FPU, cpu.flags); +=20 + if (has_eflag(X86_EFLAGS_ID)) { +- asm("cpuid" ++ asm volatile("cpuid" + : "=3Da" (max_intel_level), + "=3Db" (cpu_vendor[0]), + "=3Dd" (cpu_vendor[1]), +@@ -124,7 +124,7 @@ static void get_flags(void) +=20 + if (max_intel_level >=3D 0x00000001 && + max_intel_level <=3D 0x0000ffff) { +- asm("cpuid" ++ asm volatile("cpuid" + : "=3Da" (tfms), + "=3Dc" (cpu.flags[4]), + "=3Dd" (cpu.flags[0]) +@@ -136,7 +136,7 @@ static void get_flags(void) + cpu.model +=3D ((tfms >> 16) & 0xf) << 4; + } +=20 +- asm("cpuid" ++ asm volatile("cpuid" + : "=3Da" (max_amd_level) + : "a" (0x80000000) + : "ebx", "ecx", "edx"); +@@ -144,7 +144,7 @@ static void get_flags(void) + if (max_amd_level >=3D 0x80000001 && + max_amd_level <=3D 0x8000ffff) { + u32 eax =3D 0x80000001; +- asm("cpuid" ++ asm volatile("cpuid" + : "+a" (eax), + "=3Dc" (cpu.flags[6]), + "=3Dd" (cpu.flags[1]) +@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *r + u32 ecx =3D MSR_K7_HWCR; + u32 eax, edx; +=20 +- asm("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); ++ asm volatile("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); + eax &=3D ~(1 << 15); +- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); ++ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); +=20 + get_flags(); /* Make sure it really did something */ + err =3D check_flags(); +@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *r + u32 ecx =3D MSR_VIA_FCR; + u32 eax, edx; +=20 +- asm("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); ++ asm volatile("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); + eax |=3D (1<<1)|(1<<7); +- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); ++ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); +=20 + set_bit(X86_FEATURE_CX8, cpu.flags); + err =3D check_flags(); +@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *r + u32 eax, edx; + u32 level =3D 1; +=20 +- asm("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); +- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx)); +- asm("cpuid" ++ asm volatile("rdmsr" : "=3Da" (eax), "=3Dd" (edx) : "c" (ecx)); ++ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx)); ++ asm volatile("cpuid" + : "+a" (level), "=3Dd" (cpu.flags[0]) + : : "ecx", "ebx"); +- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); ++ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx)); +=20 + err =3D check_flags(); + } +diff -urNp linux-2.6.32.45/arch/x86/boot/header.S linux-2.6.32.45/arch/x= 86/boot/header.S +--- linux-2.6.32.45/arch/x86/boot/header.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/boot/header.S 2011-04-17 15:56:46.000000000= -0400 +@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical + # single linked list of + # struct setup_data +=20 +-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr ++pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr +=20 + #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) + #define VO_INIT_SIZE (VO__end - VO__text) +diff -urNp linux-2.6.32.45/arch/x86/boot/Makefile linux-2.6.32.45/arch/x= 86/boot/Makefile +--- linux-2.6.32.45/arch/x86/boot/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/boot/Makefile 2011-08-07 14:38:13.000000000= -0400 +@@ -69,6 +69,9 @@ KBUILD_CFLAGS :=3D $(LINUXINCLUDE) -g -Os=20 + $(call cc-option, -fno-stack-protector) \ + $(call cc-option, -mpreferred-stack-boundary=3D2) + KBUILD_CFLAGS +=3D $(call cc-option, -m32) ++ifdef CONSTIFY_PLUGIN ++KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-c= onstify ++endif + KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE :=3D n +=20 +diff -urNp linux-2.6.32.45/arch/x86/boot/memory.c linux-2.6.32.45/arch/x= 86/boot/memory.c +--- linux-2.6.32.45/arch/x86/boot/memory.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/boot/memory.c 2011-04-17 15:56:46.000000000= -0400 +@@ -19,7 +19,7 @@ +=20 + static int detect_memory_e820(void) + { +- int count =3D 0; ++ unsigned int count =3D 0; + struct biosregs ireg, oreg; + struct e820entry *desc =3D boot_params.e820_map; + static struct e820entry buf; /* static so it is zeroed */ +diff -urNp linux-2.6.32.45/arch/x86/boot/video.c linux-2.6.32.45/arch/x8= 6/boot/video.c +--- linux-2.6.32.45/arch/x86/boot/video.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/boot/video.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -90,7 +90,7 @@ static void store_mode_params(void) + static unsigned int get_entry(void) + { + char entry_buf[4]; +- int i, len =3D 0; ++ unsigned int i, len =3D 0; + int key; + unsigned int v; +=20 +diff -urNp linux-2.6.32.45/arch/x86/boot/video-vesa.c linux-2.6.32.45/ar= ch/x86/boot/video-vesa.c +--- linux-2.6.32.45/arch/x86/boot/video-vesa.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/boot/video-vesa.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) +=20 + boot_params.screen_info.vesapm_seg =3D oreg.es; + boot_params.screen_info.vesapm_off =3D oreg.di; ++ boot_params.screen_info.vesapm_size =3D oreg.cx; + } +=20 + /* +diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_aout.c linux-2.6.32.45/arc= h/x86/ia32/ia32_aout.c +--- linux-2.6.32.45/arch/x86/ia32/ia32_aout.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/ia32/ia32_aout.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -169,6 +169,8 @@ static int aout_core_dump(long signr, st + unsigned long dump_start, dump_size; + struct user32 dump; +=20 ++ memset(&dump, 0, sizeof(dump)); ++ + fs =3D get_fs(); + set_fs(KERNEL_DS); + has_dumped =3D 1; +@@ -218,12 +220,6 @@ static int aout_core_dump(long signr, st + dump_size =3D dump.u_ssize << PAGE_SHIFT; + DUMP_WRITE(dump_start, dump_size); + } +- /* +- * Finally dump the task struct. Not be used by gdb, but +- * could be useful +- */ +- set_fs(KERNEL_DS); +- DUMP_WRITE(current, sizeof(*current)); + end_coredump: + set_fs(fs); + return has_dumped; +diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32entry.S linux-2.6.32.45/arc= h/x86/ia32/ia32entry.S +--- linux-2.6.32.45/arch/x86/ia32/ia32entry.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/ia32/ia32entry.S 2011-06-04 20:29:52.000000= 000 -0400 +@@ -13,6 +13,7 @@ + #include =09 + #include + #include ++#include + #include +=20 + /* Avoid __ASSEMBLER__'ifying just for this. */ +@@ -93,6 +94,30 @@ ENTRY(native_irq_enable_sysexit) + ENDPROC(native_irq_enable_sysexit) + #endif +=20 ++ .macro pax_enter_kernel_user ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_enter_kernel_user ++#endif ++ .endm ++ ++ .macro pax_exit_kernel_user ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_exit_kernel_user ++#endif ++#ifdef CONFIG_PAX_RANDKSTACK ++ pushq %rax ++ call pax_randomize_kstack ++ popq %rax ++#endif ++ pax_erase_kstack ++ .endm ++ ++.macro pax_erase_kstack ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++ call pax_erase_kstack ++#endif ++.endm ++ + /* + * 32bit SYSENTER instruction entry. + * +@@ -119,7 +144,7 @@ ENTRY(ia32_sysenter_target) + CFI_REGISTER rsp,rbp + SWAPGS_UNSAFE_STACK + movq PER_CPU_VAR(kernel_stack), %rsp +- addq $(KERNEL_STACK_OFFSET),%rsp ++ pax_enter_kernel_user + /* + * No need to follow this irqs on/off section: the syscall + * disabled irqs, here we enable it straight after entry: +@@ -135,7 +160,8 @@ ENTRY(ia32_sysenter_target) + pushfq + CFI_ADJUST_CFA_OFFSET 8 + /*CFI_REL_OFFSET rflags,0*/ +- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d ++ GET_THREAD_INFO(%r10) ++ movl TI_sysenter_return(%r10), %r10d + CFI_REGISTER rip,r10 + pushq $__USER32_CS + CFI_ADJUST_CFA_OFFSET 8 +@@ -150,6 +176,12 @@ ENTRY(ia32_sysenter_target) + SAVE_ARGS 0,0,1 + /* no need to do an access_ok check here because rbp has been + 32bit zero extended */=20 ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ mov $PAX_USER_SHADOW_BASE,%r10 ++ add %r10,%rbp ++#endif ++ + 1: movl (%rbp),%ebp + .section __ex_table,"a" + .quad 1b,ia32_badarg +@@ -172,6 +204,7 @@ sysenter_dispatch: + testl $_TIF_ALLWORK_MASK,TI_flags(%r10) + jnz sysexit_audit + sysexit_from_sys_call: ++ pax_exit_kernel_user + andl $~TS_COMPAT,TI_status(%r10) + /* clear IF, that popfq doesn't enable interrupts early */ + andl $~0x200,EFLAGS-R11(%rsp)=20 +@@ -200,6 +233,9 @@ sysexit_from_sys_call: + movl %eax,%esi /* 2nd arg: syscall number */ + movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */ + call audit_syscall_entry ++ ++ pax_erase_kstack ++ + movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */ + cmpq $(IA32_NR_syscalls-1),%rax + ja ia32_badsys +@@ -252,6 +288,9 @@ sysenter_tracesys: + movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */ + movq %rsp,%rdi /* &pt_regs -> arg1 */ + call syscall_trace_enter ++ ++ pax_erase_kstack ++ + LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace change= d it */ + RESTORE_REST + cmpq $(IA32_NR_syscalls-1),%rax +@@ -283,19 +322,24 @@ ENDPROC(ia32_sysenter_target) + ENTRY(ia32_cstar_target) + CFI_STARTPROC32 simple + CFI_SIGNAL_FRAME +- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET ++ CFI_DEF_CFA rsp,0 + CFI_REGISTER rip,rcx + /*CFI_REGISTER rflags,r11*/ + SWAPGS_UNSAFE_STACK + movl %esp,%r8d + CFI_REGISTER rsp,r8 + movq PER_CPU_VAR(kernel_stack),%rsp ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pax_enter_kernel_user ++#endif ++ + /* + * No need to follow this irqs on/off section: the syscall + * disabled irqs and here we enable it straight after entry: + */ + ENABLE_INTERRUPTS(CLBR_NONE) +- SAVE_ARGS 8,1,1 ++ SAVE_ARGS 8*6,1,1 + movl %eax,%eax /* zero extension */ + movq %rax,ORIG_RAX-ARGOFFSET(%rsp) + movq %rcx,RIP-ARGOFFSET(%rsp) +@@ -311,6 +355,12 @@ ENTRY(ia32_cstar_target) + /* no need to do an access_ok check here because r8 has been + 32bit zero extended */=20 + /* hardware stack frame is complete now */=09 ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ mov $PAX_USER_SHADOW_BASE,%r10 ++ add %r10,%r8 ++#endif ++ + 1: movl (%r8),%r9d + .section __ex_table,"a" + .quad 1b,ia32_badarg +@@ -333,6 +383,7 @@ cstar_dispatch: + testl $_TIF_ALLWORK_MASK,TI_flags(%r10) + jnz sysretl_audit + sysretl_from_sys_call: ++ pax_exit_kernel_user + andl $~TS_COMPAT,TI_status(%r10) + RESTORE_ARGS 1,-ARG_SKIP,1,1,1 + movl RIP-ARGOFFSET(%rsp),%ecx +@@ -370,6 +421,9 @@ cstar_tracesys: + movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ + movq %rsp,%rdi /* &pt_regs -> arg1 */ + call syscall_trace_enter ++ ++ pax_erase_kstack ++ + LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace cha= nged it */ + RESTORE_REST + xchgl %ebp,%r9d +@@ -415,6 +469,7 @@ ENTRY(ia32_syscall) + CFI_REL_OFFSET rip,RIP-RIP + PARAVIRT_ADJUST_EXCEPTION_FRAME + SWAPGS ++ pax_enter_kernel_user + /* + * No need to follow this irqs on/off section: the syscall + * disabled irqs and here we enable it straight after entry: +@@ -448,6 +503,9 @@ ia32_tracesys: =20 + movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */ + movq %rsp,%rdi /* &pt_regs -> arg1 */ + call syscall_trace_enter ++ ++ pax_erase_kstack ++ + LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace change= d it */ + RESTORE_REST + cmpq $(IA32_NR_syscalls-1),%rax +diff -urNp linux-2.6.32.45/arch/x86/ia32/ia32_signal.c linux-2.6.32.45/a= rch/x86/ia32/ia32_signal.c +--- linux-2.6.32.45/arch/x86/ia32/ia32_signal.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/ia32/ia32_signal.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct=20 + sp -=3D frame_size; + /* Align the stack pointer according to the i386 ABI, + * i.e. so that on function entry ((sp + 4) & 15) =3D=3D 0. */ +- sp =3D ((sp + 4) & -16ul) - 4; ++ sp =3D ((sp - 12) & -16ul) - 4; + return (void __user *) sp; + } +=20 +@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_s + * These are actually not used anymore, but left because some + * gdb versions depend on them as a marker. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); + } put_user_catch(err); +=20 + if (err) +@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct=20 + 0xb8, + __NR_ia32_rt_sigreturn, + 0x80cd, +- 0, ++ 0 + }; +=20 + frame =3D get_sigframe(ka, regs, sizeof(*frame), &fpstate); +@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct=20 +=20 + if (ka->sa.sa_flags & SA_RESTORER) + restorer =3D ka->sa.sa_restorer; ++ else if (current->mm->context.vdso) ++ /* Return stub is in 32bit vsyscall page */ ++ restorer =3D VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + else +- restorer =3D VDSO32_SYMBOL(current->mm->context.vdso, +- rt_sigreturn); ++ restorer =3D &frame->retcode; + put_user_ex(ptr_to_compat(restorer), &frame->pretcode); +=20 + /* + * Not actually used anymore, but left because some gdb + * versions need it. + */ +- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); ++ put_user_ex(*((const u64 *)&code), (u64 *)frame->retcode); + } put_user_catch(err); +=20 + if (err) +diff -urNp linux-2.6.32.45/arch/x86/include/asm/alternative.h linux-2.6.= 32.45/arch/x86/include/asm/alternative.h +--- linux-2.6.32.45/arch/x86/include/asm/alternative.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/alternative.h 2011-04-17 15:56:= 46.000000000 -0400 +@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit + " .byte 662b-661b\n" /* sourcelen */ \ + " .byte 664f-663f\n" /* replacementlen */ \ + ".previous\n" \ +- ".section .altinstr_replacement, \"ax\"\n" \ ++ ".section .altinstr_replacement, \"a\"\n" \ + "663:\n\t" newinstr "\n664:\n" /* replacement */ \ + ".previous" +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/apic.h linux-2.6.32.45/a= rch/x86/include/asm/apic.h +--- linux-2.6.32.45/arch/x86/include/asm/apic.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/apic.h 2011-08-17 20:01:15.0000= 00000 -0400 +@@ -46,7 +46,7 @@ static inline void generic_apic_probe(vo +=20 + #ifdef CONFIG_X86_LOCAL_APIC +=20 +-extern unsigned int apic_verbosity; ++extern int apic_verbosity; + extern int local_apic_timer_c2_ok; +=20 + extern int disable_apic; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/apm.h linux-2.6.32.45/ar= ch/x86/include/asm/apm.h +--- linux-2.6.32.45/arch/x86/include/asm/apm.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/apm.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 + __asm__ __volatile__(APM_DO_ZERO_SEGS + "pushl %%edi\n\t" + "pushl %%ebp\n\t" +- "lcall *%%cs:apm_bios_entry\n\t" ++ "lcall *%%ss:apm_bios_entry\n\t" + "setc %%al\n\t" + "popl %%ebp\n\t" + "popl %%edi\n\t" +@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as + __asm__ __volatile__(APM_DO_ZERO_SEGS + "pushl %%edi\n\t" + "pushl %%ebp\n\t" +- "lcall *%%cs:apm_bios_entry\n\t" ++ "lcall *%%ss:apm_bios_entry\n\t" + "setc %%bl\n\t" + "popl %%ebp\n\t" + "popl %%edi\n\t" +diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_32.h linux-2.6.32= .45/arch/x86/include/asm/atomic_32.h +--- linux-2.6.32.45/arch/x86/include/asm/atomic_32.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/atomic_32.h 2011-05-04 17:56:20= .000000000 -0400 +@@ -25,6 +25,17 @@ static inline int atomic_read(const atom + } +=20 + /** ++ * atomic_read_unchecked - read atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically reads the value of @v. ++ */ ++static inline int atomic_read_unchecked(const atomic_unchecked_t *v) ++{ ++ return v->counter; ++} ++ ++/** + * atomic_set - set atomic variable + * @v: pointer of type atomic_t + * @i: required value +@@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t * + } +=20 + /** ++ * atomic_set_unchecked - set atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * @i: required value ++ * ++ * Atomically sets the value of @v to @i. ++ */ ++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) ++{ ++ v->counter =3D i; ++} ++ ++/** + * atomic_add - add integer to atomic variable + * @i: integer value to add + * @v: pointer of type atomic_t +@@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t * + */ + static inline void atomic_add(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "addl %1,%0" ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter) ++ : "ir" (i)); ++} ++ ++/** ++ * atomic_add_unchecked - add integer to atomic variable ++ * @i: integer value to add ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically adds @i to @v. ++ */ ++static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" + : "+m" (v->counter) + : "ir" (i)); + } +@@ -59,7 +104,29 @@ static inline void atomic_add(int i, ato + */ + static inline void atomic_sub(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "subl %1,%0" ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter) ++ : "ir" (i)); ++} ++ ++/** ++ * atomic_sub_unchecked - subtract integer from atomic variable ++ * @i: integer value to subtract ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically subtracts @i from @v. ++ */ ++static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" + : "+m" (v->counter) + : "ir" (i)); + } +@@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(in + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1" ++ asm volatile(LOCK_PREFIX "subl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (v->counter), "=3Dqm" (c) + : "ir" (i) : "memory"); + return c; +@@ -91,7 +167,27 @@ static inline int atomic_sub_and_test(in + */ + static inline void atomic_inc(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "incl %0" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_inc_unchecked - increment atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1. ++ */ ++static inline void atomic_inc_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "incl %0\n" + : "+m" (v->counter)); + } +=20 +@@ -103,7 +199,27 @@ static inline void atomic_inc(atomic_t * + */ + static inline void atomic_dec(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "decl %0" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decl %0\n" + : "+m" (v->counter)); + } +=20 +@@ -119,7 +235,16 @@ static inline int atomic_dec_and_test(at + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "decl %0; sete %1" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (v->counter), "=3Dqm" (c) + : : "memory"); + return c !=3D 0; +@@ -137,7 +262,35 @@ static inline int atomic_inc_and_test(at + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "incl %0; sete %1" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "into\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" ++ : "+m" (v->counter), "=3Dqm" (c) ++ : : "memory"); ++ return c !=3D 0; ++} ++ ++/** ++ * atomic_inc_and_test_unchecked - increment and test ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1 ++ * and returns true if the result is zero, or false for all ++ * other cases. ++ */ ++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) ++{ ++ unsigned char c; ++ ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ "sete %1\n" + : "+m" (v->counter), "=3Dqm" (c) + : : "memory"); + return c !=3D 0; +@@ -156,7 +309,16 @@ static inline int atomic_add_negative(in + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1" ++ asm volatile(LOCK_PREFIX "addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "+m" (v->counter), "=3Dqm" (c) + : "ir" (i) : "memory"); + return c; +@@ -179,6 +341,46 @@ static inline int atomic_add_return(int=20 + #endif + /* Modern 486+ processor */ + __i =3D i; ++ asm volatile(LOCK_PREFIX "xaddl %0, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "movl %0, %1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+r" (i), "+m" (v->counter) ++ : : "memory"); ++ return i + __i; ++ ++#ifdef CONFIG_M386 ++no_xadd: /* Legacy 386 processor */ ++ local_irq_save(flags); ++ __i =3D atomic_read(v); ++ atomic_set(v, i + __i); ++ local_irq_restore(flags); ++ return i + __i; ++#endif ++} ++ ++/** ++ * atomic_add_return_unchecked - add integer and return ++ * @v: pointer of type atomic_unchecked_t ++ * @i: integer value to add ++ * ++ * Atomically adds @i to @v and returns @i + @v ++ */ ++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t= *v) ++{ ++ int __i; ++#ifdef CONFIG_M386 ++ unsigned long flags; ++ if (unlikely(boot_cpu_data.x86 <=3D 3)) ++ goto no_xadd; ++#endif ++ /* Modern 486+ processor */ ++ __i =3D i; + asm volatile(LOCK_PREFIX "xaddl %0, %1" + : "+r" (i), "+m" (v->counter) + : : "memory"); +@@ -211,11 +413,21 @@ static inline int atomic_cmpxchg(atomic_ + return cmpxchg(&v->counter, old, new); + } +=20 ++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int o= ld, int new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} ++ + static inline int atomic_xchg(atomic_t *v, int new) + { + return xchg(&v->counter, new); + } +=20 ++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new) ++{ ++ return xchg(&v->counter, new); ++} ++ + /** + * atomic_add_unless - add unless the number is already a given value + * @v: pointer of type atomic_t +@@ -227,22 +439,39 @@ static inline int atomic_xchg(atomic_t * + */ + static inline int atomic_add_unless(atomic_t *v, int a, int u) + { +- int c, old; ++ int c, old, new; + c =3D atomic_read(v); + for (;;) { +- if (unlikely(c =3D=3D (u))) ++ if (unlikely(c =3D=3D u)) + break; +- old =3D atomic_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dr" (new) ++ : "0" (c), "ir" (a)); ++ ++ old =3D atomic_cmpxchg(v, c, new); + if (likely(old =3D=3D c)) + break; + c =3D old; + } +- return c !=3D (u); ++ return c !=3D u; + } +=20 + #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +=20 + #define atomic_inc_return(v) (atomic_add_return(1, v)) ++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) ++{ ++ return atomic_add_return_unchecked(1, v); ++} + #define atomic_dec_return(v) (atomic_sub_return(1, v)) +=20 + /* These are x86-specific, used by some header files */ +@@ -266,9 +495,18 @@ typedef struct { + u64 __aligned(8) counter; + } atomic64_t; +=20 ++#ifdef CONFIG_PAX_REFCOUNT ++typedef struct { ++ u64 __aligned(8) counter; ++} atomic64_unchecked_t; ++#else ++typedef atomic64_t atomic64_unchecked_t; ++#endif ++ + #define ATOMIC64_INIT(val) { (val) } +=20 + extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); ++extern u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 ol= d_val, u64 new_val); +=20 + /** + * atomic64_xchg - xchg atomic64 variable +@@ -279,6 +517,7 @@ extern u64 atomic64_cmpxchg(atomic64_t * + * the old value. + */ + extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val); ++extern u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_v= al); +=20 + /** + * atomic64_set - set atomic64 variable +@@ -290,6 +529,15 @@ extern u64 atomic64_xchg(atomic64_t *ptr + extern void atomic64_set(atomic64_t *ptr, u64 new_val); +=20 + /** ++ * atomic64_unchecked_set - set atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * @new_val: value to assign ++ * ++ * Atomically sets the value of @ptr to @new_val. ++ */ ++extern void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_v= al); ++ ++/** + * atomic64_read - read atomic64 variable + * @ptr: pointer to type atomic64_t + * +@@ -317,7 +565,33 @@ static inline u64 atomic64_read(atomic64 + return res; + } +=20 +-extern u64 atomic64_read(atomic64_t *ptr); ++/** ++ * atomic64_read_unchecked - read atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically reads the value of @ptr and returns it. ++ */ ++static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *ptr) ++{ ++ u64 res; ++ ++ /* ++ * Note, we inline this atomic64_unchecked_t primitive because ++ * it only clobbers EAX/EDX and leaves the others ++ * untouched. We also (somewhat subtly) rely on the ++ * fact that cmpxchg8b returns the current 64-bit value ++ * of the memory location we are touching: ++ */ ++ asm volatile( ++ "mov %%ebx, %%eax\n\t" ++ "mov %%ecx, %%edx\n\t" ++ LOCK_PREFIX "cmpxchg8b %1\n" ++ : "=3D&A" (res) ++ : "m" (*ptr) ++ ); ++ ++ return res; ++} +=20 + /** + * atomic64_add_return - add and return +@@ -332,8 +606,11 @@ extern u64 atomic64_add_return(u64 delta + * Other variants with different arithmetic operators: + */ + extern u64 atomic64_sub_return(u64 delta, atomic64_t *ptr); ++extern u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_= t *ptr); + extern u64 atomic64_inc_return(atomic64_t *ptr); ++extern u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr); + extern u64 atomic64_dec_return(atomic64_t *ptr); ++extern u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr); +=20 + /** + * atomic64_add - add integer to atomic64 variable +@@ -345,6 +622,15 @@ extern u64 atomic64_dec_return(atomic64_ + extern void atomic64_add(u64 delta, atomic64_t *ptr); +=20 + /** ++ * atomic64_add_unchecked - add integer to atomic64 variable ++ * @delta: integer value to add ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically adds @delta to @ptr. ++ */ ++extern void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr= ); ++ ++/** + * atomic64_sub - subtract the atomic64 variable + * @delta: integer value to subtract + * @ptr: pointer to type atomic64_t +@@ -354,6 +640,15 @@ extern void atomic64_add(u64 delta, atom + extern void atomic64_sub(u64 delta, atomic64_t *ptr); +=20 + /** ++ * atomic64_sub_unchecked - subtract the atomic64 variable ++ * @delta: integer value to subtract ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically subtracts @delta from @ptr. ++ */ ++extern void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr= ); ++ ++/** + * atomic64_sub_and_test - subtract value from variable and test result + * @delta: integer value to subtract + * @ptr: pointer to type atomic64_t +@@ -373,6 +668,14 @@ extern int atomic64_sub_and_test(u64 del + extern void atomic64_inc(atomic64_t *ptr); +=20 + /** ++ * atomic64_inc_unchecked - increment atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically increments @ptr by 1. ++ */ ++extern void atomic64_inc_unchecked(atomic64_unchecked_t *ptr); ++ ++/** + * atomic64_dec - decrement atomic64 variable + * @ptr: pointer to type atomic64_t + * +@@ -381,6 +684,14 @@ extern void atomic64_inc(atomic64_t *ptr + extern void atomic64_dec(atomic64_t *ptr); +=20 + /** ++ * atomic64_dec_unchecked - decrement atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically decrements @ptr by 1. ++ */ ++extern void atomic64_dec_unchecked(atomic64_unchecked_t *ptr); ++ ++/** + * atomic64_dec_and_test - decrement and test + * @ptr: pointer to type atomic64_t + * +diff -urNp linux-2.6.32.45/arch/x86/include/asm/atomic_64.h linux-2.6.32= .45/arch/x86/include/asm/atomic_64.h +--- linux-2.6.32.45/arch/x86/include/asm/atomic_64.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/atomic_64.h 2011-05-04 18:35:31= .000000000 -0400 +@@ -24,6 +24,17 @@ static inline int atomic_read(const atom + } +=20 + /** ++ * atomic_read_unchecked - read atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically reads the value of @v. ++ */ ++static inline int atomic_read_unchecked(const atomic_unchecked_t *v) ++{ ++ return v->counter; ++} ++ ++/** + * atomic_set - set atomic variable + * @v: pointer of type atomic_t + * @i: required value +@@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t * + } +=20 + /** ++ * atomic_set_unchecked - set atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * @i: required value ++ * ++ * Atomically sets the value of @v to @i. ++ */ ++static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i) ++{ ++ v->counter =3D i; ++} ++ ++/** + * atomic_add - add integer to atomic variable + * @i: integer value to add + * @v: pointer of type atomic_t +@@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t * + */ + static inline void atomic_add(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "addl %1,%0" ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "ir" (i), "m" (v->counter)); ++} ++ ++/** ++ * atomic_add_unchecked - add integer to atomic variable ++ * @i: integer value to add ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically adds @i to @v. ++ */ ++static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "addl %1,%0\n" + : "=3Dm" (v->counter) + : "ir" (i), "m" (v->counter)); + } +@@ -58,7 +103,29 @@ static inline void atomic_add(int i, ato + */ + static inline void atomic_sub(int i, atomic_t *v) + { +- asm volatile(LOCK_PREFIX "subl %1,%0" ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "ir" (i), "m" (v->counter)); ++} ++ ++/** ++ * atomic_sub_unchecked - subtract the atomic variable ++ * @i: integer value to subtract ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically subtracts @i from @v. ++ */ ++static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "subl %1,%0\n" + : "=3Dm" (v->counter) + : "ir" (i), "m" (v->counter)); + } +@@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(in + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1" ++ asm volatile(LOCK_PREFIX "subl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "ir" (i), "m" (v->counter) : "memory"); + return c; +@@ -90,7 +166,28 @@ static inline int atomic_sub_and_test(in + */ + static inline void atomic_inc(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "incl %0" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic_inc_unchecked - increment atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1. ++ */ ++static inline void atomic_inc_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "incl %0\n" + : "=3Dm" (v->counter) + : "m" (v->counter)); + } +@@ -103,7 +200,28 @@ static inline void atomic_inc(atomic_t * + */ + static inline void atomic_dec(atomic_t *v) + { +- asm volatile(LOCK_PREFIX "decl %0" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic_dec_unchecked - decrement atomic variable ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic_dec_unchecked(atomic_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decl %0\n" + : "=3Dm" (v->counter) + : "m" (v->counter)); + } +@@ -120,7 +238,16 @@ static inline int atomic_dec_and_test(at + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "decl %0; sete %1" ++ asm volatile(LOCK_PREFIX "decl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "m" (v->counter) : "memory"); + return c !=3D 0; +@@ -138,7 +265,35 @@ static inline int atomic_inc_and_test(at + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "incl %0; sete %1" ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" ++ : "=3Dm" (v->counter), "=3Dqm" (c) ++ : "m" (v->counter) : "memory"); ++ return c !=3D 0; ++} ++ ++/** ++ * atomic_inc_and_test_unchecked - increment and test ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically increments @v by 1 ++ * and returns true if the result is zero, or false for all ++ * other cases. ++ */ ++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v) ++{ ++ unsigned char c; ++ ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "m" (v->counter) : "memory"); + return c !=3D 0; +@@ -157,7 +312,16 @@ static inline int atomic_add_negative(in + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1" ++ asm volatile(LOCK_PREFIX "addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "ir" (i), "m" (v->counter) : "memory"); + return c; +@@ -173,7 +337,31 @@ static inline int atomic_add_negative(in + static inline int atomic_add_return(int i, atomic_t *v) + { + int __i =3D i; +- asm volatile(LOCK_PREFIX "xaddl %0, %1" ++ asm volatile(LOCK_PREFIX "xaddl %0, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "movl %0, %1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+r" (i), "+m" (v->counter) ++ : : "memory"); ++ return i + __i; ++} ++ ++/** ++ * atomic_add_return_unchecked - add and return ++ * @i: integer value to add ++ * @v: pointer of type atomic_unchecked_t ++ * ++ * Atomically adds @i to @v and returns @i + @v ++ */ ++static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t= *v) ++{ ++ int __i =3D i; ++ asm volatile(LOCK_PREFIX "xaddl %0, %1\n" + : "+r" (i), "+m" (v->counter) + : : "memory"); + return i + __i; +@@ -185,6 +373,10 @@ static inline int atomic_sub_return(int=20 + } +=20 + #define atomic_inc_return(v) (atomic_add_return(1, v)) ++static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v) ++{ ++ return atomic_add_return_unchecked(1, v); ++} + #define atomic_dec_return(v) (atomic_sub_return(1, v)) +=20 + /* The 64-bit atomic type */ +@@ -204,6 +396,18 @@ static inline long atomic64_read(const a + } +=20 + /** ++ * atomic64_read_unchecked - read atomic64 variable ++ * @v: pointer of type atomic64_unchecked_t ++ * ++ * Atomically reads the value of @v. ++ * Doesn't imply a read memory barrier. ++ */ ++static inline long atomic64_read_unchecked(const atomic64_unchecked_t *= v) ++{ ++ return v->counter; ++} ++ ++/** + * atomic64_set - set atomic64 variable + * @v: pointer to type atomic64_t + * @i: required value +@@ -216,6 +420,18 @@ static inline void atomic64_set(atomic64 + } +=20 + /** ++ * atomic64_set_unchecked - set atomic64 variable ++ * @v: pointer to type atomic64_unchecked_t ++ * @i: required value ++ * ++ * Atomically sets the value of @v to @i. ++ */ ++static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long= i) ++{ ++ v->counter =3D i; ++} ++ ++/** + * atomic64_add - add integer to atomic64 variable + * @i: integer value to add + * @v: pointer to type atomic64_t +@@ -224,6 +440,28 @@ static inline void atomic64_set(atomic64 + */ + static inline void atomic64_add(long i, atomic64_t *v) + { ++ asm volatile(LOCK_PREFIX "addq %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subq %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "er" (i), "m" (v->counter)); ++} ++ ++/** ++ * atomic64_add_unchecked - add integer to atomic64 variable ++ * @i: integer value to add ++ * @v: pointer to type atomic64_unchecked_t ++ * ++ * Atomically adds @i to @v. ++ */ ++static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t = *v) ++{ + asm volatile(LOCK_PREFIX "addq %1,%0" + : "=3Dm" (v->counter) + : "er" (i), "m" (v->counter)); +@@ -238,7 +476,15 @@ static inline void atomic64_add(long i,=20 + */ + static inline void atomic64_sub(long i, atomic64_t *v) + { +- asm volatile(LOCK_PREFIX "subq %1,%0" ++ asm volatile(LOCK_PREFIX "subq %1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addq %1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "=3Dm" (v->counter) + : "er" (i), "m" (v->counter)); + } +@@ -256,7 +502,16 @@ static inline int atomic64_sub_and_test( + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1" ++ asm volatile(LOCK_PREFIX "subq %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "addq %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "er" (i), "m" (v->counter) : "memory"); + return c; +@@ -270,6 +525,27 @@ static inline int atomic64_sub_and_test( + */ + static inline void atomic64_inc(atomic64_t *v) + { ++ asm volatile(LOCK_PREFIX "incq %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decq %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic64_inc_unchecked - increment atomic64 variable ++ * @v: pointer to type atomic64_unchecked_t ++ * ++ * Atomically increments @v by 1. ++ */ ++static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v) ++{ + asm volatile(LOCK_PREFIX "incq %0" + : "=3Dm" (v->counter) + : "m" (v->counter)); +@@ -283,7 +559,28 @@ static inline void atomic64_inc(atomic64 + */ + static inline void atomic64_dec(atomic64_t *v) + { +- asm volatile(LOCK_PREFIX "decq %0" ++ asm volatile(LOCK_PREFIX "decq %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incq %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dm" (v->counter) ++ : "m" (v->counter)); ++} ++ ++/** ++ * atomic64_dec_unchecked - decrement atomic64 variable ++ * @v: pointer to type atomic64_t ++ * ++ * Atomically decrements @v by 1. ++ */ ++static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v) ++{ ++ asm volatile(LOCK_PREFIX "decq %0\n" + : "=3Dm" (v->counter) + : "m" (v->counter)); + } +@@ -300,7 +597,16 @@ static inline int atomic64_dec_and_test( + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "decq %0; sete %1" ++ asm volatile(LOCK_PREFIX "decq %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "incq %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "m" (v->counter) : "memory"); + return c !=3D 0; +@@ -318,7 +624,16 @@ static inline int atomic64_inc_and_test( + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "incq %0; sete %1" ++ asm volatile(LOCK_PREFIX "incq %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decq %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "m" (v->counter) : "memory"); + return c !=3D 0; +@@ -337,7 +652,16 @@ static inline int atomic64_add_negative( + { + unsigned char c; +=20 +- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1" ++ asm volatile(LOCK_PREFIX "addq %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subq %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "=3Dm" (v->counter), "=3Dqm" (c) + : "er" (i), "m" (v->counter) : "memory"); + return c; +@@ -353,7 +677,31 @@ static inline int atomic64_add_negative( + static inline long atomic64_add_return(long i, atomic64_t *v) + { + long __i =3D i; +- asm volatile(LOCK_PREFIX "xaddq %0, %1;" ++ asm volatile(LOCK_PREFIX "xaddq %0, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "movq %0, %1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "+r" (i), "+m" (v->counter) ++ : : "memory"); ++ return i + __i; ++} ++ ++/** ++ * atomic64_add_return_unchecked - add and return ++ * @i: integer value to add ++ * @v: pointer to type atomic64_unchecked_t ++ * ++ * Atomically adds @i to @v and returns @i + @v ++ */ ++static inline long atomic64_add_return_unchecked(long i, atomic64_unche= cked_t *v) ++{ ++ long __i =3D i; ++ asm volatile(LOCK_PREFIX "xaddq %0, %1" + : "+r" (i), "+m" (v->counter) + : : "memory"); + return i + __i; +@@ -365,6 +713,10 @@ static inline long atomic64_sub_return(l + } +=20 + #define atomic64_inc_return(v) (atomic64_add_return(1, (v))) ++static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *= v) ++{ ++ return atomic64_add_return_unchecked(1, v); ++} + #define atomic64_dec_return(v) (atomic64_sub_return(1, (v))) +=20 + static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new) +@@ -372,21 +724,41 @@ static inline long atomic64_cmpxchg(atom + return cmpxchg(&v->counter, old, new); + } +=20 ++static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, = long old, long new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} ++ + static inline long atomic64_xchg(atomic64_t *v, long new) + { + return xchg(&v->counter, new); + } +=20 ++static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, lon= g new) ++{ ++ return xchg(&v->counter, new); ++} ++ + static inline long atomic_cmpxchg(atomic_t *v, int old, int new) + { + return cmpxchg(&v->counter, old, new); + } +=20 ++static inline long atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int = old, int new) ++{ ++ return cmpxchg(&v->counter, old, new); ++} ++ + static inline long atomic_xchg(atomic_t *v, int new) + { + return xchg(&v->counter, new); + } +=20 ++static inline long atomic_xchg_unchecked(atomic_unchecked_t *v, int new= ) ++{ ++ return xchg(&v->counter, new); ++} ++ + /** + * atomic_add_unless - add unless the number is a given value + * @v: pointer of type atomic_t +@@ -398,17 +770,30 @@ static inline long atomic_xchg(atomic_t=20 + */ + static inline int atomic_add_unless(atomic_t *v, int a, int u) + { +- int c, old; ++ int c, old, new; + c =3D atomic_read(v); + for (;;) { +- if (unlikely(c =3D=3D (u))) ++ if (unlikely(c =3D=3D u)) + break; +- old =3D atomic_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addl %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "subl %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dr" (new) ++ : "0" (c), "ir" (a)); ++ ++ old =3D atomic_cmpxchg(v, c, new); + if (likely(old =3D=3D c)) + break; + c =3D old; + } +- return c !=3D (u); ++ return c !=3D u; + } +=20 + #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) +@@ -424,17 +809,30 @@ static inline int atomic_add_unless(atom + */ + static inline int atomic64_add_unless(atomic64_t *v, long a, long u) + { +- long c, old; ++ long c, old, new; + c =3D atomic64_read(v); + for (;;) { +- if (unlikely(c =3D=3D (u))) ++ if (unlikely(c =3D=3D u)) + break; +- old =3D atomic64_cmpxchg((v), c, c + (a)); ++ ++ asm volatile("addq %2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "subq %2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ : "=3Dr" (new) ++ : "0" (c), "er" (a)); ++ ++ old =3D atomic64_cmpxchg(v, c, new); + if (likely(old =3D=3D c)) + break; + c =3D old; + } +- return c !=3D (u); ++ return c !=3D u; + } +=20 + /** +diff -urNp linux-2.6.32.45/arch/x86/include/asm/bitops.h linux-2.6.32.45= /arch/x86/include/asm/bitops.h +--- linux-2.6.32.45/arch/x86/include/asm/bitops.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/bitops.h 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -38,7 +38,7 @@ + * a mask operation on a byte. + */ + #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr)) +-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3)= ) ++#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + = ((nr)>>3)) + #define CONST_MASK(nr) (1 << ((nr) & 7)) +=20 + /** +diff -urNp linux-2.6.32.45/arch/x86/include/asm/boot.h linux-2.6.32.45/a= rch/x86/include/asm/boot.h +--- linux-2.6.32.45/arch/x86/include/asm/boot.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/boot.h 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -11,10 +11,15 @@ + #include +=20 + /* Physical address where kernel should be loaded. */ +-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ ++#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ + + (CONFIG_PHYSICAL_ALIGN - 1)) \ + & ~(CONFIG_PHYSICAL_ALIGN - 1)) +=20 ++#ifndef __ASSEMBLY__ ++extern unsigned char __LOAD_PHYSICAL_ADDR[]; ++#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR) ++#endif ++ + /* Minimum kernel alignment, as a power of two */ + #ifdef CONFIG_X86_64 + #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT +diff -urNp linux-2.6.32.45/arch/x86/include/asm/cacheflush.h linux-2.6.3= 2.45/arch/x86/include/asm/cacheflush.h +--- linux-2.6.32.45/arch/x86/include/asm/cacheflush.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/cacheflush.h 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC) + static inline unsigned long get_page_memtype(struct page *pg) + { + if (!PageUncached(pg) && !PageWC(pg)) +- return -1; ++ return ~0UL; + else if (!PageUncached(pg) && PageWC(pg)) + return _PAGE_CACHE_WC; + else if (PageUncached(pg) && !PageWC(pg)) +@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru + SetPageWC(pg); + break; + default: +- case -1: ++ case ~0UL: + ClearPageUncached(pg); + ClearPageWC(pg); + break; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/cache.h linux-2.6.32.45/= arch/x86/include/asm/cache.h +--- linux-2.6.32.45/arch/x86/include/asm/cache.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/cache.h 2011-07-06 19:53:33.000= 000000 -0400 +@@ -5,9 +5,10 @@ +=20 + /* L1 cache line size */ + #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT) +-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) ++#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) +=20 + #define __read_mostly __attribute__((__section__(".data.read_mostly"))) ++#define __read_only __attribute__((__section__(".data.read_only"))) +=20 + #ifdef CONFIG_X86_VSMP + /* vSMP Internode cacheline shift */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/checksum_32.h linux-2.6.= 32.45/arch/x86/include/asm/checksum_32.h +--- linux-2.6.32.45/arch/x86/include/asm/checksum_32.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/checksum_32.h 2011-04-17 15:56:= 46.000000000 -0400 +@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene + int len, __wsum sum, + int *src_err_ptr, int *dst_err_ptr); +=20 ++asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, vo= id *dst, ++ int len, __wsum sum, ++ int *src_err_ptr, int *dst_err_ptr); ++ ++asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, = void *dst, ++ int len, __wsum sum, ++ int *src_err_ptr, int *dst_err_ptr); ++ + /* + * Note: when you get a NULL pointer exception here this means someone + * passed in an incorrect kernel address to one of these functions. +@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f + int *err_ptr) + { + might_sleep(); +- return csum_partial_copy_generic((__force void *)src, dst, ++ return csum_partial_copy_generic_from_user((__force void *)src, dst, + len, sum, err_ptr, NULL); + } +=20 +@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us + { + might_sleep(); + if (access_ok(VERIFY_WRITE, dst, len)) +- return csum_partial_copy_generic(src, (__force void *)dst, ++ return csum_partial_copy_generic_to_user(src, (__force void *)dst, + len, sum, NULL, err_ptr); +=20 + if (len) +diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc_defs.h linux-2.6.32= .45/arch/x86/include/asm/desc_defs.h +--- linux-2.6.32.45/arch/x86/include/asm/desc_defs.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/desc_defs.h 2011-04-17 15:56:46= .000000000 -0400 +@@ -31,6 +31,12 @@ struct desc_struct { + unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1; + unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8; + }; ++ struct { ++ u16 offset_low; ++ u16 seg; ++ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1; ++ unsigned offset_high: 16; ++ } gate; + }; + } __attribute__((packed)); +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/desc.h linux-2.6.32.45/a= rch/x86/include/asm/desc.h +--- linux-2.6.32.45/arch/x86/include/asm/desc.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/desc.h 2011-04-23 12:56:10.0000= 00000 -0400 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include +=20 + static inline void fill_ldt(struct desc_struct *desc, +@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_ + desc->base1 =3D (info->base_addr & 0x00ff0000) >> 16; + desc->type =3D (info->read_exec_only ^ 1) << 1; + desc->type |=3D info->contents << 2; ++ desc->type |=3D info->seg_not_present ^ 1; + desc->s =3D 1; + desc->dpl =3D 0x3; + desc->p =3D info->seg_not_present ^ 1; +@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_ + } +=20 + extern struct desc_ptr idt_descr; +-extern gate_desc idt_table[]; +- +-struct gdt_page { +- struct desc_struct gdt[GDT_ENTRIES]; +-} __attribute__((aligned(PAGE_SIZE))); +-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); ++extern gate_desc idt_table[256]; +=20 ++extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(str= uct desc_struct)]; + static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) + { +- return per_cpu(gdt_page, cpu).gdt; ++ return cpu_gdt_table[cpu]; + } +=20 + #ifdef CONFIG_X86_64 +@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc * + unsigned long base, unsigned dpl, unsigned flags, + unsigned short seg) + { +- gate->a =3D (seg << 16) | (base & 0xffff); +- gate->b =3D (base & 0xffff0000) | +- (((0x80 | type | (dpl << 5)) & 0xff) << 8); ++ gate->gate.offset_low =3D base; ++ gate->gate.seg =3D seg; ++ gate->gate.reserved =3D 0; ++ gate->gate.type =3D type; ++ gate->gate.s =3D 0; ++ gate->gate.dpl =3D dpl; ++ gate->gate.p =3D 1; ++ gate->gate.offset_high =3D base >> 16; + } +=20 + #endif +@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(str + static inline void native_write_idt_entry(gate_desc *idt, int entry, + const gate_desc *gate) + { ++ pax_open_kernel(); + memcpy(&idt[entry], gate, sizeof(*gate)); ++ pax_close_kernel(); + } +=20 + static inline void native_write_ldt_entry(struct desc_struct *ldt, int = entry, + const void *desc) + { ++ pax_open_kernel(); + memcpy(&ldt[entry], desc, 8); ++ pax_close_kernel(); + } +=20 + static inline void native_write_gdt_entry(struct desc_struct *gdt, int = entry, +@@ -139,7 +146,10 @@ static inline void native_write_gdt_entr + size =3D sizeof(struct desc_struct); + break; + } ++ ++ pax_open_kernel(); + memcpy(&gdt[entry], desc, size); ++ pax_close_kernel(); + } +=20 + static inline void pack_descriptor(struct desc_struct *desc, unsigned l= ong base, +@@ -211,7 +221,9 @@ static inline void native_set_ldt(const=20 +=20 + static inline void native_load_tr_desc(void) + { ++ pax_open_kernel(); + asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8)); ++ pax_close_kernel(); + } +=20 + static inline void native_load_gdt(const struct desc_ptr *dtr) +@@ -246,8 +258,10 @@ static inline void native_load_tls(struc + unsigned int i; + struct desc_struct *gdt =3D get_cpu_gdt_table(cpu); +=20 ++ pax_open_kernel(); + for (i =3D 0; i < GDT_ENTRY_TLS_ENTRIES; i++) + gdt[GDT_ENTRY_TLS_MIN + i] =3D t->tls_array[i]; ++ pax_close_kernel(); + } +=20 + #define _LDT_empty(info) \ +@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct + desc->limit =3D (limit >> 16) & 0xf; + } +=20 +-static inline void _set_gate(int gate, unsigned type, void *addr, ++static inline void _set_gate(int gate, unsigned type, const void *addr, + unsigned dpl, unsigned ist, unsigned seg) + { + gate_desc s; +@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, u + * Pentium F0 0F bugfix can have resulted in the mapped + * IDT being write-protected. + */ +-static inline void set_intr_gate(unsigned int n, void *addr) ++static inline void set_intr_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS); +@@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsig + /* + * This routine sets up an interrupt gate at directory privilege level = 3. + */ +-static inline void set_system_intr_gate(unsigned int n, void *addr) ++static inline void set_system_intr_gate(unsigned int n, const void *add= r) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS); + } +=20 +-static inline void set_system_trap_gate(unsigned int n, void *addr) ++static inline void set_system_trap_gate(unsigned int n, const void *add= r) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS); + } +=20 +-static inline void set_trap_gate(unsigned int n, void *addr) ++static inline void set_trap_gate(unsigned int n, const void *addr) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS); +@@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigne + static inline void set_task_gate(unsigned int n, unsigned int gdt_entry= ) + { + BUG_ON((unsigned)n > 0xFF); +- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3)); ++ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3)); + } +=20 +-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist) ++static inline void set_intr_gate_ist(int n, const void *addr, unsigned = ist) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS); + } +=20 +-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned= ist) ++static inline void set_system_intr_gate_ist(int n, const void *addr, un= signed ist) + { + BUG_ON((unsigned)n > 0xFF); + _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); + } +=20 ++#ifdef CONFIG_X86_32 ++static inline void set_user_cs(unsigned long base, unsigned long limit,= int cpu) ++{ ++ struct desc_struct d; ++ ++ if (likely(limit)) ++ limit =3D (limit - 1UL) >> PAGE_SHIFT; ++ pack_descriptor(&d, base, limit, 0xFB, 0xC); ++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d,= DESCTYPE_S); ++} ++#endif ++ + #endif /* _ASM_X86_DESC_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/device.h linux-2.6.32.45= /arch/x86/include/asm/device.h +--- linux-2.6.32.45/arch/x86/include/asm/device.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/device.h 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -6,7 +6,7 @@ struct dev_archdata { + void *acpi_handle; + #endif + #ifdef CONFIG_X86_64 +-struct dma_map_ops *dma_ops; ++ const struct dma_map_ops *dma_ops; + #endif + #ifdef CONFIG_DMAR + void *iommu; /* hook for IOMMU specific extension */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h linux-2.6.= 32.45/arch/x86/include/asm/dma-mapping.h +--- linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/dma-mapping.h 2011-04-17 15:56:= 46.000000000 -0400 +@@ -25,9 +25,9 @@ extern int iommu_merge; + extern struct device x86_dma_fallback_dev; + extern int panic_on_overflow; +=20 +-extern struct dma_map_ops *dma_ops; ++extern const struct dma_map_ops *dma_ops; +=20 +-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) + { + #ifdef CONFIG_X86_32 + return dma_ops; +@@ -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) + { +- struct dma_map_ops *ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); + if (ops->mapping_error) + return ops->mapping_error(dev, dma_addr); +=20 +@@ -122,7 +122,7 @@ static inline void * + dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_han= dle, + gfp_t gfp) + { +- struct dma_map_ops *ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); + void *memory; +=20 + gfp &=3D ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); +@@ -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) + { +- struct dma_map_ops *ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); +=20 + WARN_ON(irqs_disabled()); /* for portability */ +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/e820.h linux-2.6.32.45/a= rch/x86/include/asm/e820.h +--- linux-2.6.32.45/arch/x86/include/asm/e820.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/e820.h 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -133,7 +133,7 @@ extern char *default_machine_specific_me + #define ISA_END_ADDRESS 0x100000 + #define is_ISA_range(s, e) ((s) >=3D ISA_START_ADDRESS && (e) < ISA_END= _ADDRESS) +=20 +-#define BIOS_BEGIN 0x000a0000 ++#define BIOS_BEGIN 0x000c0000 + #define BIOS_END 0x00100000 +=20 + #ifdef __KERNEL__ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/elf.h linux-2.6.32.45/ar= ch/x86/include/asm/elf.h +--- linux-2.6.32.45/arch/x86/include/asm/elf.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/elf.h 2011-08-23 20:24:19.00000= 0000 -0400 +@@ -257,7 +257,25 @@ extern int force_personality32; + the loader. We need to make sure that it is out of the way of the p= rogram + that it will "exec", and that there is sufficient room for the brk. = */ +=20 ++#ifdef CONFIG_PAX_SEGMEXEC ++#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? = SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2) ++#else + #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) ++#endif ++ ++#ifdef CONFIG_PAX_ASLR ++#ifdef CONFIG_X86_32 ++#define PAX_ELF_ET_DYN_BASE 0x10000000UL ++ ++#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? = 15 : 16) ++#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ?= 15 : 16) ++#else ++#define PAX_ELF_ET_DYN_BASE 0x400000UL ++ ++#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SI= ZE_MAX_SHIFT - PAGE_SHIFT - 3) ++#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_S= IZE_MAX_SHIFT - PAGE_SHIFT - 3) ++#endif ++#endif +=20 + /* 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= , +@@ -310,9 +328,7 @@ do { \ +=20 + #define ARCH_DLINFO \ + do { \ +- if (vdso_enabled) \ +- NEW_AUX_ENT(AT_SYSINFO_EHDR, \ +- (unsigned long)current->mm->context.vdso); \ ++ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \ + } while (0) +=20 + #define AT_SYSINFO 32 +@@ -323,7 +339,7 @@ do { \ +=20 + #endif /* !CONFIG_X86_32 */ +=20 +-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso) ++#define VDSO_CURRENT_BASE (current->mm->context.vdso) +=20 + #define VDSO_ENTRY \ + ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) +@@ -337,7 +353,4 @@ extern int arch_setup_additional_pages(s + extern int syscall32_setup_pages(struct linux_binprm *, int exstack); + #define compat_arch_setup_additional_pages syscall32_setup_pages +=20 +-extern unsigned long arch_randomize_brk(struct mm_struct *mm); +-#define arch_randomize_brk arch_randomize_brk +- + #endif /* _ASM_X86_ELF_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h linu= x-2.6.32.45/arch/x86/include/asm/emergency-restart.h +--- linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/emergency-restart.h 2011-05-22 = 23:02:06.000000000 -0400 +@@ -15,6 +15,6 @@ enum reboot_type { +=20 + extern enum reboot_type reboot_type; +=20 +-extern void machine_emergency_restart(void); ++extern void machine_emergency_restart(void) __noreturn; +=20 + #endif /* _ASM_X86_EMERGENCY_RESTART_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/futex.h linux-2.6.32.45/= arch/x86/include/asm/futex.h +--- linux-2.6.32.45/arch/x86/include/asm/futex.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/futex.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -12,16 +12,18 @@ + #include +=20 + #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \ ++ typecheck(u32 *, uaddr); \ + asm volatile("1:\t" insn "\n" \ + "2:\t.section .fixup,\"ax\"\n" \ + "3:\tmov\t%3, %1\n" \ + "\tjmp\t2b\n" \ + "\t.previous\n" \ + _ASM_EXTABLE(1b, 3b) \ +- : "=3Dr" (oldval), "=3Dr" (ret), "+m" (*uaddr) \ ++ : "=3Dr" (oldval), "=3Dr" (ret), "+m" (*(u32 *)____m(uaddr))\ + : "i" (-EFAULT), "0" (oparg), "1" (0)) +=20 + #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \ ++ typecheck(u32 *, uaddr); \ + asm volatile("1:\tmovl %2, %0\n" \ + "\tmovl\t%0, %3\n" \ + "\t" insn "\n" \ +@@ -34,10 +36,10 @@ + _ASM_EXTABLE(1b, 4b) \ + _ASM_EXTABLE(2b, 4b) \ + : "=3D&a" (oldval), "=3D&r" (ret), \ +- "+m" (*uaddr), "=3D&r" (tem) \ ++ "+m" (*(u32 *)____m(uaddr)), "=3D&r" (tem) \ + : "r" (oparg), "i" (-EFAULT), "1" (0)) +=20 +-static inline int futex_atomic_op_inuser(int encoded_op, int __user *ua= ddr) ++static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *ua= ddr) + { + int op =3D (encoded_op >> 28) & 7; + int cmp =3D (encoded_op >> 24) & 15; +@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser +=20 + switch (op) { + case FUTEX_OP_SET: +- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg); ++ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, = oparg); + break; + case FUTEX_OP_ADD: +- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval, ++ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, old= val, + uaddr, oparg); + break; + case FUTEX_OP_OR: +@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser + return ret; + } +=20 +-static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int = oldval, ++static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int = oldval, + int newval) + { +=20 +@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_i + return -ENOSYS; + #endif +=20 +- if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int))) ++ if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32))) + return -EFAULT; +=20 +- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n" ++ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n" + "2:\t.section .fixup, \"ax\"\n" + "3:\tmov %2, %0\n" + "\tjmp 2b\n" + "\t.previous\n" + _ASM_EXTABLE(1b, 3b) +- : "=3Da" (oldval), "+m" (*uaddr) ++ : "=3Da" (oldval), "+m" (*(u32 *)____m(uaddr)) + : "i" (-EFAULT), "r" (newval), "0" (oldval) + : "memory" + ); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/hw_irq.h linux-2.6.32.45= /arch/x86/include/asm/hw_irq.h +--- linux-2.6.32.45/arch/x86/include/asm/hw_irq.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/hw_irq.h 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void); + extern void enable_IO_APIC(void); +=20 + /* Statistics */ +-extern atomic_t irq_err_count; +-extern atomic_t irq_mis_count; ++extern atomic_unchecked_t irq_err_count; ++extern atomic_unchecked_t irq_mis_count; +=20 + /* EISA */ + extern void eisa_set_level_irq(unsigned int irq); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/i387.h linux-2.6.32.45/a= rch/x86/include/asm/i387.h +--- linux-2.6.32.45/arch/x86/include/asm/i387.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/i387.h 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc + { + int err; +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ if ((unsigned long)fx < PAX_USER_SHADOW_BASE) ++ fx =3D (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BAS= E); ++#endif ++ + asm volatile("1: rex64/fxrstor (%[fx])\n\t" + "2:\n" + ".section .fixup,\"ax\"\n" +@@ -105,6 +110,11 @@ static inline int fxsave_user(struct i38 + { + int err; +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ if ((unsigned long)fx < PAX_USER_SHADOW_BASE) ++ fx =3D (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_U= SER_SHADOW_BASE); ++#endif ++ + asm volatile("1: rex64/fxsave (%[fx])\n\t" + "2:\n" + ".section .fixup,\"ax\"\n" +@@ -195,13 +205,8 @@ static inline int fxrstor_checking(struc + } +=20 + /* We need a safe address that is cheap to find and that is already +- in L1 during context switch. The best choices are unfortunately +- different for UP and SMP */ +-#ifdef CONFIG_SMP +-#define safe_address (__per_cpu_offset[0]) +-#else +-#define safe_address (kstat_cpu(0).cpustat.user) +-#endif ++ in L1 during context switch. */ ++#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0) +=20 + /* + * These must be called with preempt disabled +@@ -291,7 +296,7 @@ static inline void kernel_fpu_begin(void + struct thread_info *me =3D current_thread_info(); + preempt_disable(); + if (me->status & TS_USEDFPU) +- __save_init_fpu(me->task); ++ __save_init_fpu(current); + else + clts(); + } +diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_32.h linux-2.6.32.45/= arch/x86/include/asm/io_32.h +--- linux-2.6.32.45/arch/x86/include/asm/io_32.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/io_32.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -3,6 +3,7 @@ +=20 + #include + #include ++#include +=20 + /* + * This file contains the definitions for the x86 IO instructions +@@ -42,6 +43,17 @@ +=20 + #ifdef __KERNEL__ +=20 ++#define ARCH_HAS_VALID_PHYS_ADDR_RANGE ++static inline int valid_phys_addr_range(unsigned long addr, size_t coun= t) ++{ ++ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot= _cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ ++static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t = count) ++{ ++ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phy= s_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ + #include +=20 + #include +diff -urNp linux-2.6.32.45/arch/x86/include/asm/io_64.h linux-2.6.32.45/= arch/x86/include/asm/io_64.h +--- linux-2.6.32.45/arch/x86/include/asm/io_64.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/io_64.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -140,6 +140,17 @@ __OUTS(l) +=20 + #include +=20 ++#define ARCH_HAS_VALID_PHYS_ADDR_RANGE ++static inline int valid_phys_addr_range(unsigned long addr, size_t coun= t) ++{ ++ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot= _cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ ++static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t = count) ++{ ++ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phy= s_bits - PAGE_SHIFT)) ? 1 : 0; ++} ++ + #include +=20 + void __memcpy_fromio(void *, unsigned long, unsigned); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/iommu.h linux-2.6.32.45/= arch/x86/include/asm/iommu.h +--- linux-2.6.32.45/arch/x86/include/asm/iommu.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/iommu.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -3,7 +3,7 @@ +=20 + extern void pci_iommu_shutdown(void); + extern void no_iommu_init(void); +-extern struct dma_map_ops nommu_dma_ops; ++extern const struct dma_map_ops nommu_dma_ops; + extern int force_iommu, no_iommu; + extern int iommu_detected; + extern int iommu_pass_through; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/irqflags.h linux-2.6.32.= 45/arch/x86/include/asm/irqflags.h +--- linux-2.6.32.45/arch/x86/include/asm/irqflags.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/irqflags.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ + sti; \ + sysexit +=20 ++#define GET_CR0_INTO_RDI mov %cr0, %rdi ++#define SET_RDI_INTO_CR0 mov %rdi, %cr0 ++#define GET_CR3_INTO_RDI mov %cr3, %rdi ++#define SET_RDI_INTO_CR3 mov %rdi, %cr3 ++ + #else + #define INTERRUPT_RETURN iret + #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit +diff -urNp linux-2.6.32.45/arch/x86/include/asm/kprobes.h linux-2.6.32.4= 5/arch/x86/include/asm/kprobes.h +--- linux-2.6.32.45/arch/x86/include/asm/kprobes.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/kprobes.h 2011-04-23 12:56:12.0= 00000000 -0400 +@@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t; + #define BREAKPOINT_INSTRUCTION 0xcc + #define RELATIVEJUMP_INSTRUCTION 0xe9 + #define MAX_INSN_SIZE 16 +-#define MAX_STACK_SIZE 64 +-#define MIN_STACK_SIZE(ADDR) \ +- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) \ +- ? (MAX_STACK_SIZE) \ +- : (((unsigned long)current_thread_info()) + \ +- THREAD_SIZE - (unsigned long)(ADDR))) ++#define MAX_STACK_SIZE 64UL ++#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - = (unsigned long)(ADDR)) +=20 + #define flush_insn_slot(p) do { } while (0) +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/kvm_host.h linux-2.6.32.= 45/arch/x86/include/asm/kvm_host.h +--- linux-2.6.32.45/arch/x86/include/asm/kvm_host.h 2011-05-10 22:12:01.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/kvm_host.h 2011-05-10 22:12:26.= 000000000 -0400 +@@ -536,7 +536,7 @@ struct kvm_x86_ops { + const struct trace_print_flags *exit_reasons_str; + }; +=20 +-extern struct kvm_x86_ops *kvm_x86_ops; ++extern const struct kvm_x86_ops *kvm_x86_ops; +=20 + int kvm_mmu_module_init(void); + void kvm_mmu_module_exit(void); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/local.h linux-2.6.32.45/= arch/x86/include/asm/local.h +--- linux-2.6.32.45/arch/x86/include/asm/local.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/local.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -18,26 +18,58 @@ typedef struct { +=20 + static inline void local_inc(local_t *l) + { +- asm volatile(_ASM_INC "%0" ++ asm volatile(_ASM_INC "%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_DEC "%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (l->a.counter)); + } +=20 + static inline void local_dec(local_t *l) + { +- asm volatile(_ASM_DEC "%0" ++ asm volatile(_ASM_DEC "%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_INC "%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (l->a.counter)); + } +=20 + static inline void local_add(long i, local_t *l) + { +- asm volatile(_ASM_ADD "%1,%0" ++ asm volatile(_ASM_ADD "%1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_SUB "%1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (l->a.counter) + : "ir" (i)); + } +=20 + static inline void local_sub(long i, local_t *l) + { +- asm volatile(_ASM_SUB "%1,%0" ++ asm volatile(_ASM_SUB "%1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_ADD "%1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (l->a.counter) + : "ir" (i)); + } +@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon + { + unsigned char c; +=20 +- asm volatile(_ASM_SUB "%2,%0; sete %1" ++ asm volatile(_ASM_SUB "%2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_ADD "%2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (l->a.counter), "=3Dqm" (c) + : "ir" (i) : "memory"); + return c; +@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc + { + unsigned char c; +=20 +- asm volatile(_ASM_DEC "%0; sete %1" ++ asm volatile(_ASM_DEC "%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_INC "%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (l->a.counter), "=3Dqm" (c) + : : "memory"); + return c !=3D 0; +@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc + { + unsigned char c; +=20 +- asm volatile(_ASM_INC "%0; sete %1" ++ asm volatile(_ASM_INC "%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_DEC "%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sete %1\n" + : "+m" (l->a.counter), "=3Dqm" (c) + : : "memory"); + return c !=3D 0; +@@ -110,7 +169,16 @@ static inline int local_add_negative(lon + { + unsigned char c; +=20 +- asm volatile(_ASM_ADD "%2,%0; sets %1" ++ asm volatile(_ASM_ADD "%2,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_SUB "%2,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ "sets %1\n" + : "+m" (l->a.counter), "=3Dqm" (c) + : "ir" (i) : "memory"); + return c; +@@ -133,7 +201,15 @@ static inline long local_add_return(long + #endif + /* Modern 486+ processor */ + __i =3D i; +- asm volatile(_ASM_XADD "%0, %1;" ++ asm volatile(_ASM_XADD "%0, %1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ _ASM_MOV "%0,%1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+r" (i), "+m" (l->a.counter) + : : "memory"); + return i + __i; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/microcode.h linux-2.6.32= .45/arch/x86/include/asm/microcode.h +--- linux-2.6.32.45/arch/x86/include/asm/microcode.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/microcode.h 2011-04-17 15:56:46= .000000000 -0400 +@@ -12,13 +12,13 @@ struct device; + enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; +=20 + 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); +=20 +- enum ucode_state (*request_microcode_fw) (int cpu, ++ enum ucode_state (* const request_microcode_fw) (int cpu, + struct device *device); +=20 +- void (*microcode_fini_cpu) (int cpu); ++ void (* const microcode_fini_cpu) (int cpu); +=20 + /* + * The generic 'microcode_core' part guarantees that +@@ -38,18 +38,18 @@ struct ucode_cpu_info { + extern struct ucode_cpu_info ucode_cpu_info[]; +=20 + #ifdef CONFIG_MICROCODE_INTEL +-extern struct microcode_ops * __init init_intel_microcode(void); ++extern const struct microcode_ops * __init init_intel_microcode(void); + #else +-static inline struct microcode_ops * __init init_intel_microcode(void) ++static inline const struct microcode_ops * __init init_intel_microcode(= void) + { + return NULL; + } + #endif /* CONFIG_MICROCODE_INTEL */ +=20 + #ifdef CONFIG_MICROCODE_AMD +-extern struct microcode_ops * __init init_amd_microcode(void); ++extern const struct microcode_ops * __init init_amd_microcode(void); + #else +-static inline struct microcode_ops * __init init_amd_microcode(void) ++static inline const struct microcode_ops * __init init_amd_microcode(vo= id) + { + return NULL; + } +diff -urNp linux-2.6.32.45/arch/x86/include/asm/mman.h linux-2.6.32.45/a= rch/x86/include/asm/mman.h +--- linux-2.6.32.45/arch/x86/include/asm/mman.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/mman.h 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -5,4 +5,14 @@ +=20 + #include +=20 ++#ifdef __KERNEL__ ++#ifndef __ASSEMBLY__ ++#ifdef CONFIG_X86_32 ++#define arch_mmap_check i386_mmap_check ++int i386_mmap_check(unsigned long addr, unsigned long len, ++ unsigned long flags); ++#endif ++#endif ++#endif ++ + #endif /* _ASM_X86_MMAN_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu_context.h linux-2.6.= 32.45/arch/x86/include/asm/mmu_context.h +--- linux-2.6.32.45/arch/x86/include/asm/mmu_context.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/mmu_context.h 2011-08-23 20:24:= 19.000000000 -0400 +@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m +=20 + static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_str= uct *tsk) + { ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ unsigned int i; ++ pgd_t *pgd; ++ ++ pax_open_kernel(); ++ pgd =3D get_cpu_pgd(smp_processor_id()); ++ for (i =3D USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i) ++ set_pgd_batched(pgd+i, native_make_pgd(0)); ++ pax_close_kernel(); ++#endif ++ + #ifdef CONFIG_SMP + if (percpu_read(cpu_tlbstate.state) =3D=3D TLBSTATE_OK) + percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); +@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_s + struct task_struct *tsk) + { + unsigned cpu =3D smp_processor_id(); ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(= CONFIG_PAX_SEGMEXEC)) && defined(CONFIG_SMP) ++ int tlbstate =3D TLBSTATE_OK; ++#endif +=20 + if (likely(prev !=3D next)) { + #ifdef CONFIG_SMP ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(= CONFIG_PAX_SEGMEXEC)) ++ tlbstate =3D percpu_read(cpu_tlbstate.state); ++#endif + percpu_write(cpu_tlbstate.state, TLBSTATE_OK); + percpu_write(cpu_tlbstate.active_mm, next); + #endif + cpumask_set_cpu(cpu, mm_cpumask(next)); +=20 + /* Re-load page tables */ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ pax_open_kernel(); ++ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); ++ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_= PGD_PTRS); ++ pax_close_kernel(); ++ load_cr3(get_cpu_pgd(cpu)); ++#else + load_cr3(next->pgd); ++#endif +=20 + /* stop flush ipis for the previous mm */ + cpumask_clear_cpu(cpu, mm_cpumask(prev)); +@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_s + */ + if (unlikely(prev->context.ldt !=3D next->context.ldt)) + load_LDT_nolock(&next->context); +- } ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(C= ONFIG_SMP) ++ if (!nx_enabled) { ++ smp_mb__before_clear_bit(); ++ cpu_clear(cpu, prev->context.cpu_user_cs_mask); ++ smp_mb__after_clear_bit(); ++ cpu_set(cpu, next->context.cpu_user_cs_mask); ++ } ++#endif ++ ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(= CONFIG_PAX_SEGMEXEC)) ++ if (unlikely(prev->context.user_cs_base !=3D next->context.user_cs_ba= se || ++ prev->context.user_cs_limit !=3D next->context.user_cs_limit)) ++ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit,= cpu); + #ifdef CONFIG_SMP ++ else if (unlikely(tlbstate !=3D TLBSTATE_OK)) ++ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit,= cpu); ++#endif ++#endif ++ ++ } + else { ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ pax_open_kernel(); ++ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); ++ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_= PGD_PTRS); ++ pax_close_kernel(); ++ load_cr3(get_cpu_pgd(cpu)); ++#endif ++ ++#ifdef CONFIG_SMP + percpu_write(cpu_tlbstate.state, TLBSTATE_OK); + BUG_ON(percpu_read(cpu_tlbstate.active_mm) !=3D next); +=20 +@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_s + * tlb flush IPI delivery. We must reload CR3 + * to make sure to use no freed page tables. + */ ++ ++#ifndef CONFIG_PAX_PER_CPU_PGD + load_cr3(next->pgd); ++#endif ++ + load_LDT_nolock(&next->context); ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++ if (!nx_enabled) ++ cpu_set(cpu, next->context.cpu_user_cs_mask); ++#endif ++ ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(= CONFIG_PAX_SEGMEXEC)) ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled)) ++#endif ++ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit= , cpu); ++#endif ++ + } +- } + #endif ++ } + } +=20 + #define activate_mm(prev, next) \ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/mmu.h linux-2.6.32.45/ar= ch/x86/include/asm/mmu.h +--- linux-2.6.32.45/arch/x86/include/asm/mmu.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/mmu.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -9,10 +9,23 @@ + * we put the segment information here. + */ + typedef struct { +- void *ldt; ++ struct desc_struct *ldt; + int size; + struct mutex lock; +- void *vdso; ++ unsigned long vdso; ++ ++#ifdef CONFIG_X86_32 ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ unsigned long user_cs_base; ++ unsigned long user_cs_limit; ++ ++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) ++ cpumask_t cpu_user_cs_mask; ++#endif ++ ++#endif ++#endif ++ + } mm_context_t; +=20 + #ifdef CONFIG_SMP +diff -urNp linux-2.6.32.45/arch/x86/include/asm/module.h linux-2.6.32.45= /arch/x86/include/asm/module.h +--- linux-2.6.32.45/arch/x86/include/asm/module.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/module.h 2011-04-23 13:18:57.00= 0000000 -0400 +@@ -5,6 +5,7 @@ +=20 + #ifdef CONFIG_X86_64 + /* X86_64 does not define MODULE_PROC_FAMILY */ ++#define MODULE_PROC_FAMILY "" + #elif defined CONFIG_M386 + #define MODULE_PROC_FAMILY "386 " + #elif defined CONFIG_M486 +@@ -59,13 +60,36 @@ + #error unknown processor family + #endif +=20 +-#ifdef CONFIG_X86_32 +-# ifdef CONFIG_4KSTACKS +-# define MODULE_STACKSIZE "4KSTACKS " +-# else +-# define MODULE_STACKSIZE "" +-# endif +-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++#define MODULE_PAX_UDEREF "UDEREF " ++#else ++#define MODULE_PAX_UDEREF "" ++#endif ++ ++#ifdef CONFIG_PAX_KERNEXEC ++#define MODULE_PAX_KERNEXEC "KERNEXEC " ++#else ++#define MODULE_PAX_KERNEXEC "" ++#endif ++ ++#ifdef CONFIG_PAX_REFCOUNT ++#define MODULE_PAX_REFCOUNT "REFCOUNT " ++#else ++#define MODULE_PAX_REFCOUNT "" + #endif +=20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS) ++#define MODULE_STACKSIZE "4KSTACKS " ++#else ++#define MODULE_STACKSIZE "" ++#endif ++ ++#ifdef CONFIG_GRKERNSEC ++#define MODULE_GRSEC "GRSECURITY " ++#else ++#define MODULE_GRSEC "" ++#endif ++ ++#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE= _GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT ++ + #endif /* _ASM_X86_MODULE_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/page_64_types.h linux-2.= 6.32.45/arch/x86/include/asm/page_64_types.h +--- linux-2.6.32.45/arch/x86/include/asm/page_64_types.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/page_64_types.h 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -56,7 +56,7 @@ void copy_page(void *to, void *from); +=20 + /* duplicated to the one in bootmem.h */ + extern unsigned long max_pfn; +-extern unsigned long phys_base; ++extern const unsigned long phys_base; +=20 + extern unsigned long __phys_addr(unsigned long); + #define __phys_reloc_hide(x) (x) +diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt.h linux-2.6.32.= 45/arch/x86/include/asm/paravirt.h +--- linux-2.6.32.45/arch/x86/include/asm/paravirt.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/paravirt.h 2011-08-23 21:36:48.= 000000000 -0400 +@@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp,=20 + val); + } +=20 ++static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd) ++{ ++ pgdval_t val =3D native_pgd_val(pgd); ++ ++ if (sizeof(pgdval_t) > sizeof(long)) ++ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp, ++ val, (u64)val >> 32); ++ else ++ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp, ++ val); ++} ++ + static inline void pgd_clear(pgd_t *pgdp) + { + set_pgd(pgdp, __pgd(0)); +@@ -729,6 +741,21 @@ static inline void __set_fixmap(unsigned + pv_mmu_ops.set_fixmap(idx, phys, flags); + } +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++static inline unsigned long pax_open_kernel(void) ++{ ++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel); ++} ++ ++static inline unsigned long pax_close_kernel(void) ++{ ++ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel); ++} ++#else ++static inline unsigned long pax_open_kernel(void) { return 0; } ++static inline unsigned long pax_close_kernel(void) { return 0; } ++#endif ++ + #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS) +=20 + static inline int __raw_spin_is_locked(struct raw_spinlock *lock) +@@ -945,7 +972,7 @@ extern void default_banner(void); +=20 + #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off= )) / 4) + #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .= long, 4) +-#define PARA_INDIRECT(addr) *%cs:addr ++#define PARA_INDIRECT(addr) *%ss:addr + #endif +=20 + #define INTERRUPT_RETURN \ +@@ -1022,6 +1049,21 @@ extern void default_banner(void); + PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \ + CLBR_NONE, \ + jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit)) ++ ++#define GET_CR0_INTO_RDI \ ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \ ++ mov %rax,%rdi ++ ++#define SET_RDI_INTO_CR0 \ ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0) ++ ++#define GET_CR3_INTO_RDI \ ++ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \ ++ mov %rax,%rdi ++ ++#define SET_RDI_INTO_CR3 \ ++ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3) ++ + #endif /* CONFIG_X86_32 */ +=20 + #endif /* __ASSEMBLY__ */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h linux-2= .6.32.45/arch/x86/include/asm/paravirt_types.h +--- linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/paravirt_types.h 2011-08-23 20:= 24:19.000000000 -0400 +@@ -78,19 +78,19 @@ struct pv_init_ops { + */ + unsigned (*patch)(u8 type, u16 clobber, void *insnbuf, + unsigned long addr, unsigned len); +-}; ++} __no_const; +=20 +=20 + struct pv_lazy_ops { + /* Set deferred update mode, used for batching operations. */ + void (*enter)(void); + void (*leave)(void); +-}; ++} __no_const; +=20 + struct pv_time_ops { + unsigned long long (*sched_clock)(void); + unsigned long (*get_tsc_khz)(void); +-}; ++} __no_const; +=20 + struct pv_cpu_ops { + /* hooks for various privileged instructions */ +@@ -186,7 +186,7 @@ struct pv_cpu_ops { +=20 + void (*start_context_switch)(struct task_struct *prev); + void (*end_context_switch)(struct task_struct *next); +-}; ++} __no_const; +=20 + struct pv_irq_ops { + /* +@@ -217,7 +217,7 @@ struct pv_apic_ops { + unsigned long start_eip, + unsigned long start_esp); + #endif +-}; ++} __no_const; +=20 + struct pv_mmu_ops { + unsigned long (*read_cr2)(void); +@@ -301,6 +301,7 @@ struct pv_mmu_ops { + struct paravirt_callee_save make_pud; +=20 + void (*set_pgd)(pgd_t *pudp, pgd_t pgdval); ++ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval); + #endif /* PAGETABLE_LEVELS =3D=3D 4 */ + #endif /* PAGETABLE_LEVELS >=3D 3 */ +=20 +@@ -316,6 +317,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 ++ + }; +=20 + struct raw_spinlock; +@@ -326,7 +333,7 @@ struct pv_lock_ops { + void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags= ); + int (*spin_trylock)(struct raw_spinlock *lock); + void (*spin_unlock)(struct raw_spinlock *lock); +-}; ++} __no_const; +=20 + /* This contains all the paravirt structures: we get a convenient + * number for each function using the offset which we use to indicate +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pci_x86.h linux-2.6.32.4= 5/arch/x86/include/asm/pci_x86.h +--- linux-2.6.32.45/arch/x86/include/asm/pci_x86.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pci_x86.h 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct=20 + extern void (*pcibios_disable_irq)(struct pci_dev *dev); +=20 + 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 in= t devfn, + int reg, int len, u32 val); + }; +=20 +-extern struct pci_raw_ops *raw_pci_ops; +-extern struct pci_raw_ops *raw_pci_ext_ops; ++extern const struct pci_raw_ops *raw_pci_ops; ++extern const struct pci_raw_ops *raw_pci_ext_ops; +=20 +-extern struct pci_raw_ops pci_direct_conf1; ++extern const struct pci_raw_ops pci_direct_conf1; + extern bool port_cf9_safe; +=20 + /* arch_initcall level */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/percpu.h linux-2.6.32.45= /arch/x86/include/asm/percpu.h +--- linux-2.6.32.45/arch/x86/include/asm/percpu.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/percpu.h 2011-08-17 19:33:59.00= 0000000 -0400 +@@ -78,6 +78,7 @@ do { \ + if (0) { \ + T__ tmp__; \ + tmp__ =3D (val); \ ++ (void)tmp__; \ + } \ + switch (sizeof(var)) { \ + case 1: \ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgalloc.h linux-2.6.32.4= 5/arch/x86/include/asm/pgalloc.h +--- linux-2.6.32.45/arch/x86/include/asm/pgalloc.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgalloc.h 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s + pmd_t *pmd, pte_t *pte) + { + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); ++ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE)); ++} ++ ++static inline void pmd_populate_user(struct mm_struct *mm, ++ pmd_t *pmd, pte_t *pte) ++{ ++ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT); + set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); + } +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h linux-2= .6.32.45/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable-2level.h 2011-04-17 15:= 56:46.000000000 -0400 +@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t=20 +=20 + static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) + { ++ pax_open_kernel(); + *pmdp =3D pmd; ++ pax_close_kernel(); + } +=20 + static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h linux-2.6.3= 2.45/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable_32.h 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -26,9 +26,6 @@ + struct mm_struct; + struct vm_area_struct; +=20 +-extern pgd_t swapper_pg_dir[1024]; +-extern pgd_t trampoline_pg_dir[1024]; +- + static inline void pgtable_cache_init(void) { } + static inline void check_pgt_cache(void) { } + void paging_init(void); +@@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, u + # include + #endif +=20 ++extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; ++extern pgd_t trampoline_pg_dir[PTRS_PER_PGD]; ++#ifdef CONFIG_X86_PAE ++extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD]; ++#endif ++ + #if defined(CONFIG_HIGHPTE) + #define __KM_PTE \ + (in_nmi() ? KM_NMI_PTE : \ +@@ -73,7 +76,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) +=20 +@@ -85,6 +90,9 @@ do { \ +=20 + #endif /* !__ASSEMBLY__ */ +=20 ++#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.45/arch/x86/include/asm/pgtable_32_types.h linux= -2.6.32.45/arch/x86/include/asm/pgtable_32_types.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable_32_types.h 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -8,7 +8,7 @@ + */ + #ifdef CONFIG_X86_PAE + # include +-# define PMD_SIZE (1UL << PMD_SHIFT) ++# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) + # define PMD_MASK (~(PMD_SIZE - 1)) + #else + # include +@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set=20 + # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) + #endif +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++#ifndef __ASSEMBLY__ ++extern unsigned char MODULES_EXEC_VADDR[]; ++extern unsigned char MODULES_EXEC_END[]; ++#endif ++#include ++#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.45/arch/x86/include/asm/pgtable-3level.h linux-2= .6.32.45/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable-3level.h 2011-04-17 15:= 56:46.000000000 -0400 +@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic +=20 + static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) + { ++ pax_open_kernel(); + set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd)); ++ pax_close_kernel(); + } +=20 + static inline void native_set_pud(pud_t *pudp, pud_t pud) + { ++ pax_open_kernel(); + set_64bit((unsigned long long *)(pudp), native_pud_val(pud)); ++ pax_close_kernel(); + } +=20 + /* +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h linux-2.6.3= 2.45/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable_64.h 2011-08-23 20:24:1= 9.000000000 -0400 +@@ -16,10 +16,13 @@ +=20 + extern pud_t level3_kernel_pgt[512]; + extern pud_t level3_ident_pgt[512]; ++extern pud_t level3_vmalloc_pgt[512]; ++extern pud_t level3_vmemmap_pgt[512]; ++extern pud_t level2_vmemmap_pgt[512]; + extern pmd_t level2_kernel_pgt[512]; + extern pmd_t level2_fixmap_pgt[512]; +-extern pmd_t level2_ident_pgt[512]; +-extern pgd_t init_level4_pgt[]; ++extern pmd_t level2_ident_pgt[512*2]; ++extern pgd_t init_level4_pgt[512]; +=20 + #define swapper_pg_dir init_level4_pgt +=20 +@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_ +=20 + static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) + { ++ pax_open_kernel(); + *pmdp =3D pmd; ++ pax_close_kernel(); + } +=20 + static inline void native_pmd_clear(pmd_t *pmd) +@@ -94,6 +99,13 @@ static inline void native_pud_clear(pud_ +=20 + static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd) + { ++ pax_open_kernel(); ++ *pgdp =3D pgd; ++ pax_close_kernel(); ++} ++ ++static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd) ++{ + *pgdp =3D pgd; + } +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h linux= -2.6.32.45/arch/x86/include/asm/pgtable_64_types.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable_64_types.h 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t; + #define MODULES_VADDR _AC(0xffffffffa0000000, UL) + #define MODULES_END _AC(0xffffffffff000000, UL) + #define MODULES_LEN (MODULES_END - MODULES_VADDR) ++#define MODULES_EXEC_VADDR MODULES_VADDR ++#define MODULES_EXEC_END MODULES_END ++ ++#define ktla_ktva(addr) (addr) ++#define ktva_ktla(addr) (addr) +=20 + #endif /* _ASM_X86_PGTABLE_64_DEFS_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable.h linux-2.6.32.4= 5/arch/x86/include/asm/pgtable.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable.h 2011-08-23 20:24:19.0= 00000000 -0400 +@@ -39,6 +39,7 @@ extern struct list_head pgd_list; +=20 + #ifndef __PAGETABLE_PUD_FOLDED + #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd) ++#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd) + #define pgd_clear(pgd) native_pgd_clear(pgd) + #endif +=20 +@@ -74,12 +75,51 @@ extern struct list_head pgd_list; +=20 + #define arch_end_context_switch(prev) do {} while(0) +=20 ++#define pax_open_kernel() native_pax_open_kernel() ++#define pax_close_kernel() native_pax_close_kernel() + #endif /* CONFIG_PARAVIRT */ +=20 ++#define __HAVE_ARCH_PAX_OPEN_KERNEL ++#define __HAVE_ARCH_PAX_CLOSE_KERNEL ++ ++#ifdef CONFIG_PAX_KERNEXEC ++static inline unsigned long native_pax_open_kernel(void) ++{ ++ unsigned long cr0; ++ ++ preempt_disable(); ++ barrier(); ++ cr0 =3D read_cr0() ^ X86_CR0_WP; ++ BUG_ON(unlikely(cr0 & X86_CR0_WP)); ++ write_cr0(cr0); ++ return cr0 ^ X86_CR0_WP; ++} ++ ++static inline unsigned long native_pax_close_kernel(void) ++{ ++ unsigned long cr0; ++ ++ cr0 =3D read_cr0() ^ X86_CR0_WP; ++ BUG_ON(unlikely(!(cr0 & X86_CR0_WP))); ++ write_cr0(cr0); ++ barrier(); ++ preempt_enable_no_resched(); ++ return cr0 ^ X86_CR0_WP; ++} ++#else ++static inline unsigned long native_pax_open_kernel(void) { return 0; } ++static inline unsigned long native_pax_close_kernel(void) { return 0; } ++#endif ++ + /* + * The following only work if pte_present() is true. + * Undefined behaviour if not.. + */ ++static inline int pte_user(pte_t pte) ++{ ++ return pte_val(pte) & _PAGE_USER; ++} ++ + static inline int pte_dirty(pte_t pte) + { + return pte_flags(pte) & _PAGE_DIRTY; +@@ -167,9 +207,29 @@ static inline pte_t pte_wrprotect(pte_t=20 + return pte_clear_flags(pte, _PAGE_RW); + } +=20 ++static inline pte_t pte_mkread(pte_t pte) ++{ ++ return __pte(pte_val(pte) | _PAGE_USER); ++} ++ + static inline pte_t pte_mkexec(pte_t pte) + { +- return pte_clear_flags(pte, _PAGE_NX); ++#ifdef CONFIG_X86_PAE ++ if (__supported_pte_mask & _PAGE_NX) ++ return pte_clear_flags(pte, _PAGE_NX); ++ else ++#endif ++ return pte_set_flags(pte, _PAGE_USER); ++} ++ ++static inline pte_t pte_exprotect(pte_t pte) ++{ ++#ifdef CONFIG_X86_PAE ++ if (__supported_pte_mask & _PAGE_NX) ++ return pte_set_flags(pte, _PAGE_NX); ++ else ++#endif ++ return pte_clear_flags(pte, _PAGE_USER); + } +=20 + static inline pte_t pte_mkdirty(pte_t pte) +@@ -302,6 +362,15 @@ pte_t *populate_extra_pte(unsigned long=20 + #endif +=20 + #ifndef __ASSEMBLY__ ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD]; ++static inline pgd_t *get_cpu_pgd(unsigned int cpu) ++{ ++ return cpu_pgd[cpu]; ++} ++#endif ++ + #include +=20 + static inline int pte_none(pte_t pte) +@@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *p +=20 + static inline int pgd_bad(pgd_t pgd) + { +- return (pgd_flags(pgd) & ~_PAGE_USER) !=3D _KERNPG_TABLE; ++ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) !=3D _KERNPG_TABLE; + } +=20 + static inline int pgd_none(pgd_t pgd) +@@ -495,7 +564,12 @@ static inline int pgd_none(pgd_t pgd) + * pgd_offset() returns a (pgd_t *) + * pgd_index() is used get the offset into the pgd page's array of pgd_= t's; + */ +-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address))) ++#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address)) ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(addr= ess)) ++#endif ++ + /* + * a shortcut which implies the use of the kernel's pgd, instead + * of a process's +@@ -506,6 +580,20 @@ static inline int pgd_none(pgd_t pgd) + #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET) + #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY) +=20 ++#ifdef CONFIG_X86_32 ++#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY ++#else ++#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT ++#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT= )) ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT) ++#else ++#define PAX_USER_SHADOW_BASE (_AC(0,UL)) ++#endif ++ ++#endif ++ + #ifndef __ASSEMBLY__ +=20 + extern int direct_gbpages; +@@ -611,11 +699,23 @@ static inline void ptep_set_wrprotect(st + * dst and src can be on the same page, but the range must not overlap, + * and must not cross a page boundary. + */ +-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) ++static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int co= unt) + { +- memcpy(dst, src, count * sizeof(pgd_t)); ++ pax_open_kernel(); ++ while (count--) ++ *dst++ =3D *src++; ++ pax_close_kernel(); + } +=20 ++#ifdef CONFIG_PAX_PER_CPU_PGD ++extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count); ++#endif ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)= ; ++#else ++static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int= count) {} ++#endif +=20 + #include + #endif /* __ASSEMBLY__ */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h linux-2.= 6.32.45/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/pgtable_types.h 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -16,12 +16,11 @@ + #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ + #define _PAGE_BIT_PAT 7 /* on 4KB pages */ + #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */ +-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */ ++#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct p= age */ + #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */ + #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */ + #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */ +-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1 +-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1 ++#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL + #define _PAGE_BIT_NX 63 /* No execute: only valid after= cpuid check */ +=20 + /* If _PAGE_BIT_PRESENT is clear, we use these: */ +@@ -39,7 +38,6 @@ + #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY) + #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE) + #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL) +-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1) + #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP) + #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) + #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE) +@@ -55,8 +53,10 @@ +=20 + #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) + #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) +-#else ++#elif defined(CONFIG_KMEMCHECK) + #define _PAGE_NX (_AT(pteval_t, 0)) ++#else ++#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN) + #endif +=20 + #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE) +@@ -93,6 +93,9 @@ + #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \ + _PAGE_ACCESSED) +=20 ++#define PAGE_READONLY_NOEXEC PAGE_READONLY ++#define PAGE_SHARED_NOEXEC PAGE_SHARED ++ + #define __PAGE_KERNEL_EXEC \ + (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBA= L) + #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) +@@ -103,8 +106,8 @@ + #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC) + #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) + #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) +-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER) +-#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_= PCD | _PAGE_PWT) ++#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER) ++#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | = _PAGE_PWT | _PAGE_USER) + #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) + #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _= PAGE_PSE) + #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE) +@@ -163,8 +166,8 @@ + * bits are combined, this will alow user to access the high address ma= pped + * VDSO in the presence of CONFIG_COMPAT_VDSO + */ +-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */ +-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */ ++#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */ ++#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */ + #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ + #endif +=20 +@@ -202,7 +205,17 @@ static inline pgdval_t pgd_flags(pgd_t p + { + return native_pgd_val(pgd) & PTE_FLAGS_MASK; + } ++#endif +=20 ++#if PAGETABLE_LEVELS =3D=3D 3 ++#include ++#endif ++ ++#if PAGETABLE_LEVELS =3D=3D 2 ++#include ++#endif ++ ++#ifndef __ASSEMBLY__ + #if PAGETABLE_LEVELS > 3 + typedef struct { pudval_t pud; } pud_t; +=20 +@@ -216,8 +229,6 @@ static inline pudval_t native_pud_val(pu + return pud.pud; + } + #else +-#include +- + static inline pudval_t native_pud_val(pud_t pud) + { + return native_pgd_val(pud.pgd); +@@ -237,8 +248,6 @@ static inline pmdval_t native_pmd_val(pm + return pmd.pmd; + } + #else +-#include +- + static inline pmdval_t native_pmd_val(pmd_t pmd) + { + return native_pgd_val(pmd.pud.pgd); +@@ -278,7 +287,16 @@ typedef struct page *pgtable_t; +=20 + extern pteval_t __supported_pte_mask; + extern void set_nx(void); ++ ++#ifdef CONFIG_X86_32 ++#ifdef CONFIG_X86_PAE + extern int nx_enabled; ++#else ++#define nx_enabled (0) ++#endif ++#else ++#define nx_enabled (1) ++#endif +=20 + #define pgprot_writecombine pgprot_writecombine + extern pgprot_t pgprot_writecombine(pgprot_t prot); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/processor.h linux-2.6.32= .45/arch/x86/include/asm/processor.h +--- linux-2.6.32.45/arch/x86/include/asm/processor.h 2011-04-22 19:16:29= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/processor.h 2011-05-11 18:25:15= .000000000 -0400 +@@ -272,7 +272,7 @@ struct tss_struct { +=20 + } ____cacheline_aligned; +=20 +-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss); ++extern struct tss_struct init_tss[NR_CPUS]; +=20 + /* + * Save the original ist values for checking stack pointers during debu= gging +@@ -888,11 +888,18 @@ static inline void spin_lock_prefetch(co + */ + #define TASK_SIZE PAGE_OFFSET + #define TASK_SIZE_MAX TASK_SIZE ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2) ++#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC= _TASK_SIZE:TASK_SIZE) ++#else + #define STACK_TOP TASK_SIZE +-#define STACK_TOP_MAX STACK_TOP ++#endif ++ ++#define STACK_TOP_MAX TASK_SIZE +=20 + #define INIT_THREAD { \ +- .sp0 =3D sizeof(init_stack) + (long)&init_stack, \ ++ .sp0 =3D sizeof(init_stack) + (long)&init_stack - 8, \ + .vm86_info =3D NULL, \ + .sysenter_cs =3D __KERNEL_CS, \ + .io_bitmap_ptr =3D NULL, \ +@@ -906,7 +913,7 @@ static inline void spin_lock_prefetch(co + */ + #define INIT_TSS { \ + .x86_tss =3D { \ +- .sp0 =3D sizeof(init_stack) + (long)&init_stack, \ ++ .sp0 =3D sizeof(init_stack) + (long)&init_stack - 8, \ + .ss0 =3D __KERNEL_DS, \ + .ss1 =3D __KERNEL_CS, \ + .io_bitmap_base =3D INVALID_IO_BITMAP_OFFSET, \ +@@ -917,11 +924,7 @@ static inline void spin_lock_prefetch(co + extern unsigned long thread_saved_pc(struct task_struct *tsk); +=20 + #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) +-#define KSTK_TOP(info) = \ +-({ = \ +- unsigned long *__ptr =3D (unsigned long *)(info); = \ +- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); = \ +-}) ++#define KSTK_TOP(info) ((container_of(info, struct task_struct,= tinfo))->thread.sp0) +=20 + /* + * The below -8 is to reserve 8 bytes on top of the ring0 stack. +@@ -936,7 +939,7 @@ extern unsigned long thread_saved_pc(str + #define task_pt_regs(task) = \ + ({ = \ + struct pt_regs *__regs__; = \ +- __regs__ =3D (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-= 8); \ ++ __regs__ =3D (struct pt_regs *)((task)->thread.sp0); = \ + __regs__ - 1; = \ + }) +=20 +@@ -946,13 +949,13 @@ extern unsigned long thread_saved_pc(str + /* + * User space process size. 47bits minus one guard page. + */ +-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE) ++#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE) +=20 + /* This decides where the kernel will search for a free chunk of vm + * space during mmap's. + */ + #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ +- 0xc0000000 : 0xFFFFe000) ++ 0xc0000000 : 0xFFFFf000) +=20 + #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ + IA32_PAGE_OFFSET : TASK_SIZE_MAX) +@@ -963,11 +966,11 @@ extern unsigned long thread_saved_pc(str + #define STACK_TOP_MAX TASK_SIZE_MAX +=20 + #define INIT_THREAD { \ +- .sp0 =3D (unsigned long)&init_stack + sizeof(init_stack) \ ++ .sp0 =3D (unsigned long)&init_stack + sizeof(init_stack) - 16 \ + } +=20 + #define INIT_TSS { \ +- .x86_tss.sp0 =3D (unsigned long)&init_stack + sizeof(init_stack) \ ++ .x86_tss.sp0 =3D (unsigned long)&init_stack + sizeof(init_stack) - 16 = \ + } +=20 + /* +@@ -989,6 +992,10 @@ extern void start_thread(struct pt_regs=20 + */ + #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) +=20 ++#ifdef CONFIG_PAX_SEGMEXEC ++#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3)= ) ++#endif ++ + #define KSTK_EIP(task) (task_pt_regs(task)->ip) +=20 + /* Get/set a process' ability to use the timestamp counter instruction = */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/ptrace.h linux-2.6.32.45= /arch/x86/include/asm/ptrace.h +--- linux-2.6.32.45/arch/x86/include/asm/ptrace.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/ptrace.h 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ + } +=20 + /* +- * user_mode_vm(regs) determines whether a register set came from user = mode. ++ * user_mode(regs) determines whether a register set came from user mod= e. + * This is true if V8086 mode was enabled OR if the register set was fr= om + * protected mode with RPL-3 CS value. This tricky test checks that wi= th + * one comparison. Many places in the kernel can bypass this full chec= k +- * if they have already ruled out V8086 mode, so user_mode(regs) can be= used. ++ * if they have already ruled out V8086 mode, so user_mode_novm(regs) c= an ++ * be used. + */ +-static inline int user_mode(struct pt_regs *regs) ++static inline int user_mode_novm(struct pt_regs *regs) + { + #ifdef CONFIG_X86_32 + return (regs->cs & SEGMENT_RPL_MASK) =3D=3D USER_RPL; + #else +- return !!(regs->cs & 3); ++ return !!(regs->cs & SEGMENT_RPL_MASK); + #endif + } +=20 +-static inline int user_mode_vm(struct pt_regs *regs) ++static inline int user_mode(struct pt_regs *regs) + { + #ifdef CONFIG_X86_32 + return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >= =3D + USER_RPL; + #else +- return user_mode(regs); ++ return user_mode_novm(regs); + #endif + } +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/reboot.h linux-2.6.32.45= /arch/x86/include/asm/reboot.h +--- linux-2.6.32.45/arch/x86/include/asm/reboot.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/reboot.h 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -6,19 +6,19 @@ + struct pt_regs; +=20 + struct machine_ops { +- void (*restart)(char *cmd); +- void (*halt)(void); +- void (*power_off)(void); ++ void (* __noreturn restart)(char *cmd); ++ void (* __noreturn halt)(void); ++ void (* __noreturn power_off)(void); + void (*shutdown)(void); + void (*crash_shutdown)(struct pt_regs *); +- void (*emergency_restart)(void); +-}; ++ void (* __noreturn emergency_restart)(void); ++} __no_const; +=20 + extern struct machine_ops machine_ops; +=20 + void native_machine_crash_shutdown(struct pt_regs *regs); + void native_machine_shutdown(void); +-void machine_real_restart(const unsigned char *code, int length); ++void machine_real_restart(const unsigned char *code, unsigned int lengt= h) __noreturn; +=20 + typedef void (*nmi_shootdown_cb)(int, struct die_args*); + void nmi_shootdown_cpus(nmi_shootdown_cb callback); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/rwsem.h linux-2.6.32.45/= arch/x86/include/asm/rwsem.h +--- linux-2.6.32.45/arch/x86/include/asm/rwsem.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/rwsem.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -118,6 +118,14 @@ static inline void __down_read(struct rw + { + asm volatile("# beginning down_read\n\t" + LOCK_PREFIX _ASM_INC "(%1)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX _ASM_DEC "(%1)\n\t" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + /* adds 0x00000001, returns the old value */ + " jns 1f\n" + " call call_rwsem_down_read_failed\n" +@@ -139,6 +147,14 @@ static inline int __down_read_trylock(st + "1:\n\t" + " mov %1,%2\n\t" + " add %3,%2\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "sub %3,%2\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + " jle 2f\n\t" + LOCK_PREFIX " cmpxchg %2,%0\n\t" + " jnz 1b\n\t" +@@ -160,6 +176,14 @@ static inline void __down_write_nested(s + tmp =3D RWSEM_ACTIVE_WRITE_BIAS; + asm volatile("# beginning down_write\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "mov %1,(%2)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + /* subtract 0x0000ffff, returns the old value */ + " test %1,%1\n\t" + /* was the count 0 before? */ +@@ -198,6 +222,14 @@ static inline void __up_read(struct rw_s + rwsem_count_t tmp =3D -RWSEM_ACTIVE_READ_BIAS; + asm volatile("# beginning __up_read\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "mov %1,(%2)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + /* subtracts 1, returns the old value */ + " jns 1f\n\t" + " call call_rwsem_wake\n" +@@ -216,6 +248,14 @@ static inline void __up_write(struct rw_ + rwsem_count_t tmp; + asm volatile("# beginning __up_write\n\t" + LOCK_PREFIX " xadd %1,(%2)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "mov %1,(%2)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + /* tries to transition + 0xffff0001 -> 0x00000000 */ + " jz 1f\n" +@@ -234,6 +274,14 @@ static inline void __downgrade_write(str + { + asm volatile("# beginning __downgrade_write\n\t" + LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX _ASM_SUB "%2,(%1)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + /* + * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386) + * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64) +@@ -253,7 +301,15 @@ static inline void __downgrade_write(str + static inline void rwsem_atomic_add(rwsem_count_t delta, + struct rw_semaphore *sem) + { +- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0" ++ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX _ASM_SUB "%1,%0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (sem->count) + : "er" (delta)); + } +@@ -266,7 +322,15 @@ static inline rwsem_count_t rwsem_atomic + { + rwsem_count_t tmp =3D delta; +=20 +- asm volatile(LOCK_PREFIX "xadd %0,%1" ++ asm volatile(LOCK_PREFIX "xadd %0,%1\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ "mov %0,%1\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+r" (tmp), "+m" (sem->count) + : : "memory"); +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/segment.h linux-2.6.32.4= 5/arch/x86/include/asm/segment.h +--- linux-2.6.32.45/arch/x86/include/asm/segment.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/segment.h 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -62,8 +62,8 @@ + * 26 - ESPFIX small SS + * 27 - per-cpu [ offset to per-cpu data area ] + * 28 - stack_canary-20 [ for stack protector ] +- * 29 - unused +- * 30 - unused ++ * 29 - PCI BIOS CS ++ * 30 - PCI BIOS DS + * 31 - TSS for double fault handler + */ + #define GDT_ENTRY_TLS_MIN 6 +@@ -77,6 +77,8 @@ +=20 + #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0) +=20 ++#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4) ++ + #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1) +=20 + #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4) +@@ -88,7 +90,7 @@ + #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) + #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) +=20 +-#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15) ++#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15) + #ifdef CONFIG_SMP + #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8) + #else +@@ -102,6 +104,12 @@ + #define __KERNEL_STACK_CANARY 0 + #endif +=20 ++#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 17) ++#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8) ++ ++#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 18) ++#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8) ++ + #define GDT_ENTRY_DOUBLEFAULT_TSS 31 +=20 + /* +@@ -139,7 +147,7 @@ + */ +=20 + /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */ +-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) =3D=3D GDT_ENTRY_PNPBIOS= _BASE * 8) ++#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) =3D=3D PNP_CS32 || ((= x) & 0xFFFCU) =3D=3D PNP_CS16) +=20 +=20 + #else +@@ -163,6 +171,8 @@ + #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3) + #define __USER32_DS __USER_DS +=20 ++#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7 ++ + #define GDT_ENTRY_TSS 8 /* needs two entries */ + #define GDT_ENTRY_LDT 10 /* needs two entries */ + #define GDT_ENTRY_TLS_MIN 12 +@@ -183,6 +193,7 @@ + #endif +=20 + #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8) ++#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8) + #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) + #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) + #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) +diff -urNp linux-2.6.32.45/arch/x86/include/asm/smp.h linux-2.6.32.45/ar= ch/x86/include/asm/smp.h +--- linux-2.6.32.45/arch/x86/include/asm/smp.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/smp.h 2011-08-05 20:33:55.00000= 0000 -0400 +@@ -24,7 +24,7 @@ extern unsigned int num_processors; + DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map); + DECLARE_PER_CPU(cpumask_var_t, cpu_core_map); + DECLARE_PER_CPU(u16, cpu_llc_id); +-DECLARE_PER_CPU(int, cpu_number); ++DECLARE_PER_CPU(unsigned int, cpu_number); +=20 + static inline struct cpumask *cpu_sibling_mask(int cpu) + { +@@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_ap + DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid); +=20 + /* Static state in head.S used to set up a CPU */ +-extern struct { +- void *sp; +- unsigned short ss; +-} stack_start; ++extern unsigned long stack_start; /* Initial stack pointer address */ +=20 + struct smp_ops { + void (*smp_prepare_boot_cpu)(void); +@@ -60,7 +57,7 @@ struct smp_ops { +=20 + void (*send_call_func_ipi)(const struct cpumask *mask); + void (*send_call_func_single_ipi)(int cpu); +-}; ++} __no_const; +=20 + /* Globals due to paravirt */ + extern void set_cpu_sibling_map(int cpu); +@@ -175,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitd + extern int safe_smp_processor_id(void); +=20 + #elif defined(CONFIG_X86_64_SMP) +-#define raw_smp_processor_id() (percpu_read(cpu_number)) +- +-#define stack_smp_processor_id() \ +-({ \ +- struct thread_info *ti; \ +- __asm__("andq %%rsp,%0; ":"=3Dr" (ti) : "0" (CURRENT_MASK)); \ +- ti->cpu; \ +-}) ++#define raw_smp_processor_id() (percpu_read(cpu_number)) ++#define stack_smp_processor_id() raw_smp_processor_id() + #define safe_smp_processor_id() smp_processor_id() +=20 + #endif +diff -urNp linux-2.6.32.45/arch/x86/include/asm/spinlock.h linux-2.6.32.= 45/arch/x86/include/asm/spinlock.h +--- linux-2.6.32.45/arch/x86/include/asm/spinlock.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/spinlock.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(r + static inline void __raw_read_lock(raw_rwlock_t *rw) + { + asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX " addl $1,(%0)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + "jns 1f\n" + "call __read_lock_failed\n\t" + "1:\n" +@@ -258,6 +266,14 @@ static inline void __raw_read_lock(raw_r + static inline void __raw_write_lock(raw_rwlock_t *rw) + { + asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX " addl %1,(%0)\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + "jz 1f\n" + "call __write_lock_failed\n\t" + "1:\n" +@@ -286,12 +302,29 @@ static inline int __raw_write_trylock(ra +=20 + static inline void __raw_read_unlock(raw_rwlock_t *rw) + { +- asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory"); ++ asm volatile(LOCK_PREFIX "incl %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "decl %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ ++ :"+m" (rw->lock) : : "memory"); + } +=20 + static inline void __raw_write_unlock(raw_rwlock_t *rw) + { +- asm volatile(LOCK_PREFIX "addl %1, %0" ++ asm volatile(LOCK_PREFIX "addl %1, %0\n" ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ "jno 0f\n" ++ LOCK_PREFIX "subl %1, %0\n" ++ "int $4\n0:\n" ++ _ASM_EXTABLE(0b, 0b) ++#endif ++ + : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); + } +=20 +diff -urNp linux-2.6.32.45/arch/x86/include/asm/stackprotector.h linux-2= .6.32.45/arch/x86/include/asm/stackprotector.h +--- linux-2.6.32.45/arch/x86/include/asm/stackprotector.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/stackprotector.h 2011-07-06 19:= 53:33.000000000 -0400 +@@ -48,7 +48,7 @@ + * head_32 for boot CPU and setup_per_cpu_areas() for others. + */ + #define GDT_STACK_CANARY_INIT \ +- [GDT_ENTRY_STACK_CANARY] =3D GDT_ENTRY_INIT(0x4090, 0, 0x18), ++ [GDT_ENTRY_STACK_CANARY] =3D GDT_ENTRY_INIT(0x4090, 0, 0x17), +=20 + /* + * Initialize the stackprotector canary value. +@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se +=20 + static inline void load_stack_canary_segment(void) + { +-#ifdef CONFIG_X86_32 ++#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF) + asm volatile ("mov %0, %%gs" : : "r" (0)); + #endif + } +diff -urNp linux-2.6.32.45/arch/x86/include/asm/system.h linux-2.6.32.45= /arch/x86/include/asm/system.h +--- linux-2.6.32.45/arch/x86/include/asm/system.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/system.h 2011-05-22 23:02:03.00= 0000000 -0400 +@@ -132,7 +132,7 @@ do { \ + "thread_return:\n\t" \ + "movq "__percpu_arg([current_task])",%%rsi\n\t" \ + __switch_canary \ +- "movq %P[thread_info](%%rsi),%%r8\n\t" \ ++ "movq "__percpu_arg([thread_info])",%%r8\n\t" \ + "movq %%rax,%%rdi\n\t" \ + "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \ + "jnz ret_from_fork\n\t" \ +@@ -143,7 +143,7 @@ do { \ + [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \ + [ti_flags] "i" (offsetof(struct thread_info, flags)), \ + [_tif_fork] "i" (_TIF_FORK), \ +- [thread_info] "i" (offsetof(struct task_struct, stack)), \ ++ [thread_info] "m" (per_cpu_var(current_tinfo)), \ + [current_task] "m" (per_cpu_var(current_task)) \ + __switch_canary_iparam \ + : "memory", "cc" __EXTRA_CLOBBER) +@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un + { + unsigned long __limit; + asm("lsll %1,%0" : "=3Dr" (__limit) : "r" (segment)); +- return __limit + 1; ++ return __limit; + } +=20 + static inline void native_clts(void) +@@ -340,12 +340,12 @@ void enable_hlt(void); +=20 + void cpu_idle_wait(void); +=20 +-extern unsigned long arch_align_stack(unsigned long sp); ++#define arch_align_stack(x) ((x) & ~0xfUL) + extern void free_init_pages(char *what, unsigned long begin, unsigned l= ong end); +=20 + void default_idle(void); +=20 +-void stop_this_cpu(void *dummy); ++void stop_this_cpu(void *dummy) __noreturn; +=20 + /* + * Force strict CPU ordering. +diff -urNp linux-2.6.32.45/arch/x86/include/asm/thread_info.h linux-2.6.= 32.45/arch/x86/include/asm/thread_info.h +--- linux-2.6.32.45/arch/x86/include/asm/thread_info.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/thread_info.h 2011-05-17 19:26:= 34.000000000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include +=20 + /* + * low level task data that entry.S needs immediate access to +@@ -24,7 +25,6 @@ struct exec_domain; + #include +=20 + struct thread_info { +- struct task_struct *task; /* main task structure */ + struct exec_domain *exec_domain; /* execution domain */ + __u32 flags; /* low level flags */ + __u32 status; /* thread synchronous flags */ +@@ -34,18 +34,12 @@ struct thread_info { + mm_segment_t addr_limit; + struct restart_block restart_block; + void __user *sysenter_return; +-#ifdef CONFIG_X86_32 +- unsigned long previous_esp; /* ESP of the previous stack i= n +- case of nested (IRQ) stacks +- */ +- __u8 supervisor_stack[0]; +-#endif ++ unsigned long lowest_stack; + int uaccess_err; + }; +=20 +-#define INIT_THREAD_INFO(tsk) \ ++#define INIT_THREAD_INFO \ + { \ +- .task =3D &tsk, \ + .exec_domain =3D &default_exec_domain, \ + .flags =3D 0, \ + .cpu =3D 0, \ +@@ -56,7 +50,7 @@ struct thread_info { + }, \ + } +=20 +-#define init_thread_info (init_thread_union.thread_info) ++#define init_thread_info (init_thread_union.stack) + #define init_stack (init_thread_union.stack) +=20 + #else /* !__ASSEMBLY__ */ +@@ -163,6 +157,23 @@ struct thread_info { + #define alloc_thread_info(tsk) \ + ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER)) +=20 ++#ifdef __ASSEMBLY__ ++/* how to get the thread information struct from ASM */ ++#define GET_THREAD_INFO(reg) \ ++ mov PER_CPU_VAR(current_tinfo), reg ++ ++/* use this one if reg already contains %esp */ ++#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg) ++#else ++/* how to get the thread information struct from C */ ++DECLARE_PER_CPU(struct thread_info *, current_tinfo); ++ ++static __always_inline struct thread_info *current_thread_info(void) ++{ ++ return percpu_read_stable(current_tinfo); ++} ++#endif ++ + #ifdef CONFIG_X86_32 +=20 + #define STACK_WARN (THREAD_SIZE/8) +@@ -173,35 +184,13 @@ struct thread_info { + */ + #ifndef __ASSEMBLY__ +=20 +- + /* how to get the current stack pointer from C */ + register unsigned long current_stack_pointer asm("esp") __used; +=20 +-/* how to get the thread information struct from C */ +-static inline struct thread_info *current_thread_info(void) +-{ +- return (struct thread_info *) +- (current_stack_pointer & ~(THREAD_SIZE - 1)); +-} +- +-#else /* !__ASSEMBLY__ */ +- +-/* how to get the thread information struct from ASM */ +-#define GET_THREAD_INFO(reg) \ +- movl $-THREAD_SIZE, reg; \ +- andl %esp, reg +- +-/* use this one if reg already contains %esp */ +-#define GET_THREAD_INFO_WITH_ESP(reg) \ +- andl $-THREAD_SIZE, reg +- + #endif +=20 + #else /* X86_32 */ +=20 +-#include +-#define KERNEL_STACK_OFFSET (5*8) +- + /* + * macros/functions for gaining access to the thread information struct= ure + * preempt_count needs to be 1 initially, until the scheduler is functi= onal. +@@ -209,21 +198,8 @@ static inline struct thread_info *curren + #ifndef __ASSEMBLY__ + DECLARE_PER_CPU(unsigned long, kernel_stack); +=20 +-static inline struct thread_info *current_thread_info(void) +-{ +- struct thread_info *ti; +- ti =3D (void *)(percpu_read_stable(kernel_stack) + +- KERNEL_STACK_OFFSET - THREAD_SIZE); +- return ti; +-} +- +-#else /* !__ASSEMBLY__ */ +- +-/* how to get the thread information struct from ASM */ +-#define GET_THREAD_INFO(reg) \ +- movq PER_CPU_VAR(kernel_stack),reg ; \ +- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg +- ++/* how to get the current stack pointer from C */ ++register unsigned long current_stack_pointer asm("rsp") __used; + #endif +=20 + #endif /* !X86_32 */ +@@ -260,5 +236,16 @@ extern void arch_task_cache_init(void); + extern void free_thread_info(struct thread_info *ti); + extern int arch_dup_task_struct(struct task_struct *dst, struct task_st= ruct *src); + #define arch_task_cache_init arch_task_cache_init ++ ++#define __HAVE_THREAD_FUNCTIONS ++#define task_thread_info(task) (&(task)->tinfo) ++#define task_stack_page(task) ((task)->stack) ++#define setup_thread_stack(p, org) do {} while (0) ++#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1) ++ ++#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR ++extern struct task_struct *alloc_task_struct(void); ++extern void free_task_struct(struct task_struct *); ++ + #endif + #endif /* _ASM_X86_THREAD_INFO_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h linux-2.6.3= 2.45/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/uaccess_32.h 2011-05-16 21:46:5= 7.000000000 -0400 +@@ -44,6 +44,11 @@ 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 lon= g n) + { ++ pax_track_stack(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; +=20 +@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, + return ret; + } + } ++ if (!__builtin_constant_p(n)) ++ check_object_size(from, n, true); + return __copy_to_user_ll(to, from, n); + } +=20 +@@ -83,12 +90,16 @@ static __always_inline unsigned long __m + __copy_to_user(void __user *to, const void *from, unsigned long n) + { + might_fault(); ++ + return __copy_to_user_inatomic(to, from, n); + } +=20 + static __always_inline unsigned long + __copy_from_user_inatomic(void *to, const void __user *from, unsigned l= ong n) + { ++ if ((long)n < 0) ++ return n; ++ + /* Avoid zeroing the tail if the copy fails.. + * If 'n' is constant and 1, 2, or 4, we do still zero on a failure, + * but as the zeroing behaviour is only significant when n is not +@@ -138,6 +149,12 @@ static __always_inline unsigned long + __copy_from_user(void *to, const void __user *from, unsigned long n) + { + might_fault(); ++ ++ pax_track_stack(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; +=20 +@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __ + return ret; + } + } ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); + return __copy_from_user_ll(to, from, n); + } +=20 +@@ -160,6 +179,10 @@ static __always_inline unsigned long __c + const void __user *from, unsigned long n) + { + might_fault(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; +=20 +@@ -182,14 +205,62 @@ static __always_inline unsigned long + __copy_from_user_inatomic_nocache(void *to, const void __user *from, + unsigned long n) + { +- return __copy_from_user_ll_nocache_nozero(to, from, n); ++ if ((long)n < 0) ++ return n; ++ ++ return __copy_from_user_ll_nocache_nozero(to, from, n); ++} ++ ++/** ++ * copy_to_user: - Copy a block of data into user space. ++ * @to: Destination address, in user space. ++ * @from: Source address, in kernel space. ++ * @n: Number of bytes to copy. ++ * ++ * Context: User context only. This function may sleep. ++ * ++ * Copy data from kernel space to user space. ++ * ++ * Returns number of bytes that could not be copied. ++ * On success, this will be zero. ++ */ ++static __always_inline unsigned long __must_check ++copy_to_user(void __user *to, const void *from, unsigned long n) ++{ ++ if (access_ok(VERIFY_WRITE, to, n)) ++ n =3D __copy_to_user(to, from, n); ++ return n; ++} ++ ++/** ++ * copy_from_user: - Copy a block of data from user space. ++ * @to: Destination address, in kernel space. ++ * @from: Source address, in user space. ++ * @n: Number of bytes to copy. ++ * ++ * Context: User context only. This function may sleep. ++ * ++ * Copy data from user space to kernel space. ++ * ++ * Returns number of bytes that could not be copied. ++ * On success, this will be zero. ++ * ++ * If some data could not be copied, this function will pad the copied ++ * data to the requested size using zero bytes. ++ */ ++static __always_inline unsigned long __must_check ++copy_from_user(void *to, const void __user *from, unsigned long n) ++{ ++ if (access_ok(VERIFY_READ, from, n)) ++ n =3D __copy_from_user(to, from, n); ++ else if ((long)n > 0) { ++ if (!__builtin_constant_p(n)) ++ check_object_size(to, n, false); ++ memset(to, 0, n); ++ } ++ return n; + } +=20 +-unsigned long __must_check copy_to_user(void __user *to, +- const void *from, unsigned long n); +-unsigned long __must_check copy_from_user(void *to, +- const void __user *from, +- unsigned long n); + 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.32.45/arch/x86/include/asm/uaccess_64.h linux-2.6.3= 2.45/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/uaccess_64.h 2011-05-16 21:46:5= 7.000000000 -0400 +@@ -9,6 +9,9 @@ + #include + #include + #include ++#include ++ ++#define set_fs(x) (current_thread_info()->addr_limit =3D (x)) +=20 + /* + * Copy To/From Userspace +@@ -19,113 +22,203 @@ __must_check unsigned long + copy_user_generic(void *to, const void *from, unsigned len); +=20 + __must_check unsigned long +-copy_to_user(void __user *to, const void *from, unsigned len); +-__must_check unsigned long +-copy_from_user(void *to, const void __user *from, unsigned len); +-__must_check unsigned long + copy_in_user(void __user *to, const void __user *from, unsigned len); +=20 + static __always_inline __must_check +-int __copy_from_user(void *dst, const void __user *src, unsigned size) ++unsigned long __copy_from_user(void *dst, const void __user *src, unsig= ned size) + { +- int ret =3D 0; ++ unsigned ret =3D 0; +=20 + might_fault(); +- if (!__builtin_constant_p(size)) +- return copy_user_generic(dst, (__force void *)src, size); ++ ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_READ, src, size)) ++ return size; ++#endif ++ ++ if (!__builtin_constant_p(size)) { ++ check_object_size(dst, size, false); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++#endif ++ ++ return copy_user_generic(dst, (__force const void *)src, size); ++ } + switch (size) { +- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src, ++ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src, + ret, "b", "b", "=3Dq", 1); + return ret; +- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src, ++ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src, + ret, "w", "w", "=3Dr", 2); + return ret; +- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src, ++ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src, + ret, "l", "k", "=3Dr", 4); + return ret; +- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src, ++ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src, + ret, "q", "", "=3Dr", 8); + return ret; + case 10: +- __get_user_asm(*(u64 *)dst, (u64 __user *)src, ++ __get_user_asm(*(u64 *)dst, (const u64 __user *)src, + ret, "q", "", "=3Dr", 10); + if (unlikely(ret)) + return ret; + __get_user_asm(*(u16 *)(8 + (char *)dst), +- (u16 __user *)(8 + (char __user *)src), ++ (const u16 __user *)(8 + (const char __user *)src), + ret, "w", "w", "=3Dr", 2); + return ret; + case 16: +- __get_user_asm(*(u64 *)dst, (u64 __user *)src, ++ __get_user_asm(*(u64 *)dst, (const u64 __user *)src, + ret, "q", "", "=3Dr", 16); + if (unlikely(ret)) + return ret; + __get_user_asm(*(u64 *)(8 + (char *)dst), +- (u64 __user *)(8 + (char __user *)src), ++ (const u64 __user *)(8 + (const char __user *)src), + ret, "q", "", "=3Dr", 8); + return ret; + default: +- return copy_user_generic(dst, (__force void *)src, size); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++#endif ++ ++ return copy_user_generic(dst, (__force const void *)src, size); + } + } +=20 + static __always_inline __must_check +-int __copy_to_user(void __user *dst, const void *src, unsigned size) ++unsigned long __copy_to_user(void __user *dst, const void *src, unsigne= d size) + { +- int ret =3D 0; ++ unsigned ret =3D 0; +=20 + might_fault(); +- if (!__builtin_constant_p(size)) ++ ++ pax_track_stack(); ++ ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_WRITE, dst, size)) ++ return size; ++#endif ++ ++ if (!__builtin_constant_p(size)) { ++ check_object_size(src, size, true); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)dst, src, size); ++ } + switch (size) { +- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst, ++ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst, + ret, "b", "b", "iq", 1); + return ret; +- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst, ++ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst, + ret, "w", "w", "ir", 2); + return ret; +- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst, ++ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst, + ret, "l", "k", "ir", 4); + return ret; +- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst, ++ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst, + ret, "q", "", "er", 8); + return ret; + case 10: +- __put_user_asm(*(u64 *)src, (u64 __user *)dst, ++ __put_user_asm(*(const u64 *)src, (u64 __user *)dst, + ret, "q", "", "er", 10); + if (unlikely(ret)) + return ret; + asm("":::"memory"); +- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst, ++ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst, + ret, "w", "w", "ir", 2); + return ret; + case 16: +- __put_user_asm(*(u64 *)src, (u64 __user *)dst, ++ __put_user_asm(*(const u64 *)src, (u64 __user *)dst, + ret, "q", "", "er", 16); + if (unlikely(ret)) + return ret; + asm("":::"memory"); +- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst, ++ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst, + ret, "q", "", "er", 8); + return ret; + default: ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)dst, src, size); + } + } +=20 + static __always_inline __must_check +-int __copy_in_user(void __user *dst, const void __user *src, unsigned s= ize) ++unsigned long copy_to_user(void __user *to, const void *from, unsigned = len) ++{ ++ if (access_ok(VERIFY_WRITE, to, len)) ++ len =3D __copy_to_user(to, from, len); ++ return len; ++} ++ ++static __always_inline __must_check ++unsigned long copy_from_user(void *to, const void __user *from, unsigne= d len) ++{ ++ if ((int)len < 0) ++ return len; ++ ++ if (access_ok(VERIFY_READ, from, len)) ++ len =3D __copy_from_user(to, from, len); ++ else if ((int)len > 0) { ++ if (!__builtin_constant_p(len)) ++ check_object_size(to, len, false); ++ memset(to, 0, len); ++ } ++ return len; ++} ++ ++static __always_inline __must_check ++unsigned long __copy_in_user(void __user *dst, const void __user *src, = unsigned size) + { +- int ret =3D 0; ++ unsigned ret =3D 0; +=20 + might_fault(); +- if (!__builtin_constant_p(size)) ++ ++ pax_track_stack(); ++ ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_READ, src, size)) ++ return size; ++ if (!__access_ok(VERIFY_WRITE, dst, size)) ++ return size; ++#endif ++ ++ if (!__builtin_constant_p(size)) { ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)dst, +- (__force void *)src, size); ++ (__force const void *)src, size); ++ } + switch (size) { + case 1: { + u8 tmp; +- __get_user_asm(tmp, (u8 __user *)src, ++ __get_user_asm(tmp, (const u8 __user *)src, + ret, "b", "b", "=3Dq", 1); + if (likely(!ret)) + __put_user_asm(tmp, (u8 __user *)dst, +@@ -134,7 +227,7 @@ int __copy_in_user(void __user *dst, con + } + case 2: { + u16 tmp; +- __get_user_asm(tmp, (u16 __user *)src, ++ __get_user_asm(tmp, (const u16 __user *)src, + ret, "w", "w", "=3Dr", 2); + if (likely(!ret)) + __put_user_asm(tmp, (u16 __user *)dst, +@@ -144,7 +237,7 @@ int __copy_in_user(void __user *dst, con +=20 + case 4: { + u32 tmp; +- __get_user_asm(tmp, (u32 __user *)src, ++ __get_user_asm(tmp, (const u32 __user *)src, + ret, "l", "k", "=3Dr", 4); + if (likely(!ret)) + __put_user_asm(tmp, (u32 __user *)dst, +@@ -153,7 +246,7 @@ int __copy_in_user(void __user *dst, con + } + case 8: { + u64 tmp; +- __get_user_asm(tmp, (u64 __user *)src, ++ __get_user_asm(tmp, (const u64 __user *)src, + ret, "q", "", "=3Dr", 8); + if (likely(!ret)) + __put_user_asm(tmp, (u64 __user *)dst, +@@ -161,8 +254,16 @@ int __copy_in_user(void __user *dst, con + return ret; + } + default: ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)dst, +- (__force void *)src, size); ++ (__force const void *)src, size); + } + } +=20 +@@ -176,33 +277,75 @@ __must_check long strlen_user(const char + __must_check unsigned long clear_user(void __user *mem, unsigned long l= en); + __must_check unsigned long __clear_user(void __user *mem, unsigned long= len); +=20 +-__must_check long __copy_from_user_inatomic(void *dst, const void __use= r *src, +- unsigned size); ++static __must_check __always_inline unsigned long ++__copy_from_user_inatomic(void *dst, const void __user *src, unsigned s= ize) ++{ ++ pax_track_stack(); ++ ++ if ((int)size < 0) ++ return size; +=20 +-static __must_check __always_inline int ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_READ, src, size)) ++ return size; ++ ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++#endif ++ ++ return copy_user_generic(dst, (__force const void *)src, size); ++} ++ ++static __must_check __always_inline unsigned long + __copy_to_user_inatomic(void __user *dst, const void *src, unsigned siz= e) + { ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_WRITE, dst, size)) ++ return size; ++ ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)dst, src, size); + } +=20 +-extern long __copy_user_nocache(void *dst, const void __user *src, ++extern unsigned long __copy_user_nocache(void *dst, const void __user *= src, + unsigned size, int zerorest); +=20 +-static inline int +-__copy_from_user_nocache(void *dst, const void __user *src, unsigned si= ze) ++static inline unsigned long __copy_from_user_nocache(void *dst, const v= oid __user *src, unsigned size) + { + might_sleep(); ++ ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_READ, src, size)) ++ return size; ++#endif ++ + return __copy_user_nocache(dst, src, size, 1); + } +=20 +-static inline int +-__copy_from_user_inatomic_nocache(void *dst, const void __user *src, ++static inline unsigned long __copy_from_user_inatomic_nocache(void *dst= , const void __user *src, + unsigned size) + { ++ if ((int)size < 0) ++ return size; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if (!__access_ok(VERIFY_READ, src, size)) ++ return size; ++#endif ++ + return __copy_user_nocache(dst, src, size, 0); + } +=20 +-unsigned long ++extern unsigned long + copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zero= rest); +=20 + #endif /* _ASM_X86_UACCESS_64_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/uaccess.h linux-2.6.32.4= 5/arch/x86/include/asm/uaccess.h +--- linux-2.6.32.45/arch/x86/include/asm/uaccess.h 2011-06-25 12:55:34.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/uaccess.h 2011-06-25 12:56:37.0= 00000000 -0400 +@@ -8,12 +8,15 @@ + #include + #include + #include ++#include + #include + #include +=20 + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 +=20 ++extern void check_object_size(const void *ptr, unsigned long n, bool to= ); ++ + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() =3D=3D USER_DS, checking is performed= , with +@@ -29,7 +32,12 @@ +=20 + #define get_ds() (KERNEL_DS) + #define get_fs() (current_thread_info()->addr_limit) ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++void __set_fs(mm_segment_t x); ++void set_fs(mm_segment_t x); ++#else + #define set_fs(x) (current_thread_info()->addr_limit =3D (x)) ++#endif +=20 + #define segment_eq(a, b) ((a).seg =3D=3D (b).seg) +=20 +@@ -77,7 +85,33 @@ + * checks that the pointer is in the user space range - after calling + * this function, memory access functions may still return -EFAULT. + */ +-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) = =3D=3D 0)) ++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size= ) =3D=3D 0)) ++#define access_ok(type, addr, size) \ ++({ \ ++ long __size =3D size; \ ++ unsigned long __addr =3D (unsigned long)addr; \ ++ unsigned long __addr_ao =3D __addr & PAGE_MASK; \ ++ unsigned long __end_ao =3D __addr + __size - 1; \ ++ bool __ret_ao =3D __range_not_ok(__addr, __size) =3D=3D 0; \ ++ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \ ++ while(__addr_ao <=3D __end_ao) { \ ++ char __c_ao; \ ++ __addr_ao +=3D PAGE_SIZE; \ ++ if (__size > PAGE_SIZE) \ ++ cond_resched(); \ ++ if (__get_user(__c_ao, (char __user *)__addr)) \ ++ break; \ ++ if (type !=3D VERIFY_WRITE) { \ ++ __addr =3D __addr_ao; \ ++ continue; \ ++ } \ ++ if (__put_user(__c_ao, (char __user *)__addr)) \ ++ break; \ ++ __addr =3D __addr_ao; \ ++ } \ ++ } \ ++ __ret_ao; \ ++}) +=20 + /* + * The exception table consists of pairs of addresses: the first is the +@@ -183,12 +217,20 @@ extern int __get_user_bad(void); + asm volatile("call __put_user_" #size : "=3Da" (__ret_pu) \ + : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") +=20 +- ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __copyuser_seg "gs;" ++#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n" ++#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n" ++#else ++#define __copyuser_seg ++#define __COPYUSER_SET_ES ++#define __COPYUSER_RESTORE_ES ++#endif +=20 + #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("1: "__copyuser_seg"movl %%eax,0(%2)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \ + "3:\n" \ + ".section .fixup,\"ax\"\n" \ + "4: movl %3,%0\n" \ +@@ -200,8 +242,8 @@ extern int __get_user_bad(void); + : "A" (x), "r" (addr), "i" (errret), "0" (err)) +=20 + #define __put_user_asm_ex_u64(x, addr) \ +- asm volatile("1: movl %%eax,0(%1)\n" \ +- "2: movl %%edx,4(%1)\n" \ ++ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \ ++ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \ + "3:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + _ASM_EXTABLE(2b, 3b - 2b) \ +@@ -374,7 +416,7 @@ do { \ + } while (0) +=20 + #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ +- asm volatile("1: mov"itype" %2,%"rtype"1\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -382,7 +424,7 @@ do { \ + " jmp 2b\n" \ + ".previous\n" \ + _ASM_EXTABLE(1b, 3b) \ +- : "=3Dr" (err), ltype(x) \ ++ : "=3Dr" (err), ltype (x) \ + : "m" (__m(addr)), "i" (errret), "0" (err)) +=20 + #define __get_user_size_ex(x, ptr, size) \ +@@ -407,7 +449,7 @@ do { \ + } while (0) +=20 + #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %1,%"rtype"0\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : ltype(x) : "m" (__m(addr))) +@@ -424,13 +466,24 @@ do { \ + int __gu_err; \ + unsigned long __gu_val; \ + __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ +- (x) =3D (__force __typeof__(*(ptr)))__gu_val; \ ++ (x) =3D (__typeof__(*(ptr)))__gu_val; \ + __gu_err; \ + }) +=20 + /* FIXME: this hack is definitely wrong -AK */ + struct __large_struct { unsigned long buf[100]; }; +-#define __m(x) (*(struct __large_struct __user *)(x)) ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define ____m(x) \ ++({ \ ++ unsigned long ____x =3D (unsigned long)(x); \ ++ if (____x < PAX_USER_SHADOW_BASE) \ ++ ____x +=3D PAX_USER_SHADOW_BASE; \ ++ (void __user *)____x; \ ++}) ++#else ++#define ____m(x) (x) ++#endif ++#define __m(x) (*(struct __large_struct __user *)____m(x)) +=20 + /* + * Tell gcc we read from memory instead of writing: this is because +@@ -438,7 +491,7 @@ 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("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "3: mov %3,%0\n" \ +@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu + ".previous\n" \ + _ASM_EXTABLE(1b, 3b) \ + : "=3Dr"(err) \ +- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) ++ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err)) +=20 + #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ +- asm volatile("1: mov"itype" %"rtype"0,%1\n" \ ++ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : : ltype(x), "m" (__m(addr))) +@@ -488,8 +541,12 @@ struct __large_struct { unsigned long bu + * On error, the variable @x is set to zero. + */ +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __get_user(x, ptr) get_user((x), (ptr)) ++#else + #define __get_user(x, ptr) \ + __get_user_nocheck((x), (ptr), sizeof(*(ptr))) ++#endif +=20 + /** + * __put_user: - Write a simple value into user space, with less checki= ng. +@@ -511,8 +568,12 @@ struct __large_struct { unsigned long bu + * Returns zero on success, or -EFAULT on error. + */ +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __put_user(x, ptr) put_user((x), (ptr)) ++#else + #define __put_user(x, ptr) \ + __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) ++#endif +=20 + #define __get_user_unaligned __get_user + #define __put_user_unaligned __put_user +@@ -530,7 +591,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) =3D (__force __typeof__(*(ptr)))__gue_val; \ ++ (x) =3D (__typeof__(*(ptr)))__gue_val; \ + } while (0) +=20 + #ifdef CONFIG_X86_WP_WORKS_OK +@@ -567,6 +628,7 @@ extern struct movsl_mask { +=20 + #define ARCH_HAS_NOCACHE_UACCESS 1 +=20 ++#define ARCH_HAS_SORT_EXTABLE + #ifdef CONFIG_X86_32 + # include "uaccess_32.h" + #else +diff -urNp linux-2.6.32.45/arch/x86/include/asm/vgtod.h linux-2.6.32.45/= arch/x86/include/asm/vgtod.h +--- linux-2.6.32.45/arch/x86/include/asm/vgtod.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/vgtod.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { + int sysctl_enabled; + struct timezone sys_tz; + struct { /* extract of a clocksource struct */ ++ char name[8]; + cycle_t (*vread)(void); + cycle_t cycle_last; + cycle_t mask; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi.h linux-2.6.32.45/ar= ch/x86/include/asm/vmi.h +--- linux-2.6.32.45/arch/x86/include/asm/vmi.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/vmi.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -191,6 +191,7 @@ struct vrom_header { + u8 reserved[96]; /* Reserved for headers */ + char vmi_init[8]; /* VMI_Init jump point */ + char get_reloc[8]; /* VMI_GetRelocationInfo jump point */ ++ char rom_data[8048]; /* rest of the option ROM */ + } __attribute__((packed)); +=20 + struct pnp_header { +diff -urNp linux-2.6.32.45/arch/x86/include/asm/vmi_time.h linux-2.6.32.= 45/arch/x86/include/asm/vmi_time.h +--- linux-2.6.32.45/arch/x86/include/asm/vmi_time.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/vmi_time.h 2011-08-05 20:33:55.= 000000000 -0400 +@@ -43,7 +43,7 @@ extern struct vmi_timer_ops { + int (*wallclock_updated)(void); + void (*set_alarm)(u32 flags, u64 expiry, u64 period); + void (*cancel_alarm)(u32 flags); +-} vmi_timer_ops; ++} __no_const vmi_timer_ops; +=20 + /* Prototypes */ + extern void __init vmi_time_init(void); +diff -urNp linux-2.6.32.45/arch/x86/include/asm/vsyscall.h linux-2.6.32.= 45/arch/x86/include/asm/vsyscall.h +--- linux-2.6.32.45/arch/x86/include/asm/vsyscall.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/vsyscall.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -15,9 +15,10 @@ enum vsyscall_num { +=20 + #ifdef __KERNEL__ + #include ++#include ++#include +=20 + #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".v= getcpu_mode"), aligned(16))) +-#define __section_jiffies __attribute__ ((unused, __section__ (".jiffie= s"), aligned(16))) +=20 + /* Definitions for CONFIG_GENERIC_TIME definitions */ + #define __section_vsyscall_gtod_data __attribute__ \ +@@ -31,7 +32,6 @@ enum vsyscall_num { + #define VGETCPU_LSL 2 +=20 + extern int __vgetcpu_mode; +-extern volatile unsigned long __jiffies; +=20 + /* kernel space (writeable) */ + extern int vgetcpu_mode; +@@ -39,6 +39,9 @@ extern struct timezone sys_tz; +=20 + extern void map_vsyscall(void); +=20 ++extern int vgettimeofday(struct timeval * tv, struct timezone * tz); ++extern time_t vtime(time_t *t); ++extern long vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache = *tcache); + #endif /* __KERNEL__ */ +=20 + #endif /* _ASM_X86_VSYSCALL_H */ +diff -urNp linux-2.6.32.45/arch/x86/include/asm/x86_init.h linux-2.6.32.= 45/arch/x86/include/asm/x86_init.h +--- linux-2.6.32.45/arch/x86/include/asm/x86_init.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/x86_init.h 2011-08-05 20:33:55.= 000000000 -0400 +@@ -28,7 +28,7 @@ struct x86_init_mpparse { + void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); + void (*find_smp_config)(unsigned int reserve); + void (*get_smp_config)(unsigned int early); +-}; ++} __no_const; +=20 + /** + * struct x86_init_resources - platform specific resource related ops +@@ -42,7 +42,7 @@ struct x86_init_resources { + void (*probe_roms)(void); + void (*reserve_resources)(void); + char *(*memory_setup)(void); +-}; ++} __no_const; +=20 + /** + * struct x86_init_irqs - platform specific interrupt setup +@@ -55,7 +55,7 @@ struct x86_init_irqs { + void (*pre_vector_init)(void); + void (*intr_init)(void); + void (*trap_init)(void); +-}; ++} __no_const; +=20 + /** + * struct x86_init_oem - oem platform specific customizing functions +@@ -65,7 +65,7 @@ struct x86_init_irqs { + struct x86_init_oem { + void (*arch_setup)(void); + void (*banner)(void); +-}; ++} __no_const; +=20 + /** + * struct x86_init_paging - platform specific paging functions +@@ -75,7 +75,7 @@ struct x86_init_oem { + struct x86_init_paging { + void (*pagetable_setup_start)(pgd_t *base); + void (*pagetable_setup_done)(pgd_t *base); +-}; ++} __no_const; +=20 + /** + * struct x86_init_timers - platform specific timer setup +@@ -88,7 +88,7 @@ struct x86_init_timers { + void (*setup_percpu_clockev)(void); + void (*tsc_pre_init)(void); + void (*timer_init)(void); +-}; ++} __no_const; +=20 + /** + * struct x86_init_ops - functions for platform specific setup +@@ -101,7 +101,7 @@ struct x86_init_ops { + struct x86_init_oem oem; + struct x86_init_paging paging; + struct x86_init_timers timers; +-}; ++} __no_const; +=20 + /** + * struct x86_cpuinit_ops - platform specific cpu hotplug setups +@@ -109,7 +109,7 @@ struct x86_init_ops { + */ + struct x86_cpuinit_ops { + void (*setup_percpu_clockev)(void); +-}; ++} __no_const; +=20 + /** + * struct x86_platform_ops - platform specific runtime functions +@@ -121,7 +121,7 @@ struct x86_platform_ops { + unsigned long (*calibrate_tsc)(void); + unsigned long (*get_wallclock)(void); + int (*set_wallclock)(unsigned long nowtime); +-}; ++} __no_const; +=20 + extern struct x86_init_ops x86_init; + extern struct x86_cpuinit_ops x86_cpuinit; +diff -urNp linux-2.6.32.45/arch/x86/include/asm/xsave.h linux-2.6.32.45/= arch/x86/include/asm/xsave.h +--- linux-2.6.32.45/arch/x86/include/asm/xsave.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/include/asm/xsave.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct + static inline int xsave_user(struct xsave_struct __user *buf) + { + int err; ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ if ((unsigned long)buf < PAX_USER_SHADOW_BASE) ++ buf =3D (struct xsave_struct __user *)((void __user*)buf + PAX_USER_S= HADOW_BASE); ++#endif ++ + __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n" + "2:\n" + ".section .fixup,\"ax\"\n" +@@ -82,6 +88,11 @@ static inline int xrestore_user(struct x + u32 lmask =3D mask; + u32 hmask =3D mask >> 32; +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE) ++ xstate =3D (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_B= ASE); ++#endif ++ + __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" + "2:\n" + ".section .fixup,\"ax\"\n" +diff -urNp linux-2.6.32.45/arch/x86/Kconfig linux-2.6.32.45/arch/x86/Kco= nfig +--- linux-2.6.32.45/arch/x86/Kconfig 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/Kconfig 2011-04-17 15:56:46.000000000 -0400 +@@ -223,7 +223,7 @@ config X86_TRAMPOLINE +=20 + config X86_32_LAZY_GS + def_bool y +- depends on X86_32 && !CC_STACKPROTECTOR ++ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF +=20 + config KTIME_SCALAR + def_bool X86_32 +@@ -1008,7 +1008,7 @@ choice +=20 + config NOHIGHMEM + bool "off" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Linux can use up to 64 Gigabytes of physical memory on x86 systems. + However, the address space of 32-bit x86 processors is only 4 +@@ -1045,7 +1045,7 @@ config NOHIGHMEM +=20 + config HIGHMEM4G + bool "4GB" +- depends on !X86_NUMAQ ++ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE) + ---help--- + Select this if you have a 32-bit processor and between 1 and 4 + gigabytes of physical RAM. +@@ -1099,7 +1099,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 +@@ -1430,7 +1430,7 @@ config ARCH_USES_PG_UNCACHED +=20 + 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). +@@ -1460,6 +1460,7 @@ config SECCOMP +=20 + config CC_STACKPROTECTOR + bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL= )" ++ depends on X86_64 || !PAX_MEMORY_UDEREF + ---help--- + This option turns on the -fstack-protector GCC feature. This + feature puts, at the beginning of functions, a canary value on +@@ -1517,6 +1518,7 @@ config KEXEC_JUMP + config PHYSICAL_START + hex "Physical address where the kernel is loaded" if (EMBEDDED || CRAS= H_DUMP) + default "0x1000000" ++ range 0x400000 0x40000000 + ---help--- + This gives the physical address where the kernel is loaded. +=20 +@@ -1581,6 +1583,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 +@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU + Say N if you want to disable CPU hotplug. +=20 + 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.45/arch/x86/Kconfig.cpu linux-2.6.32.45/arch/x86= /Kconfig.cpu +--- linux-2.6.32.45/arch/x86/Kconfig.cpu 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/x86/Kconfig.cpu 2011-04-17 15:56:46.000000000 -= 0400 +@@ -340,7 +340,7 @@ config X86_PPRO_FENCE +=20 + config X86_F00F_BUG + def_bool y +- depends on M586MMX || M586TSC || M586 || M486 || M386 ++ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEX= EC +=20 + config X86_WP_WORKS_OK + def_bool y +@@ -360,7 +360,7 @@ config X86_POPAD_OK +=20 + 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 +=20 + 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 || MPENTIUM= III || 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 || MEF= FICEON || X86_64 || MATOM) +=20 + config X86_MINIMUM_CPU_FAMILY + int +diff -urNp linux-2.6.32.45/arch/x86/Kconfig.debug linux-2.6.32.45/arch/x= 86/Kconfig.debug +--- linux-2.6.32.45/arch/x86/Kconfig.debug 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/Kconfig.debug 2011-04-17 15:56:46.000000000= -0400 +@@ -99,7 +99,7 @@ config X86_PTDUMP + config DEBUG_RODATA + bool "Write protect kernel read-only data structures" + default y +- depends on DEBUG_KERNEL ++ depends on DEBUG_KERNEL && BROKEN + ---help--- + Mark the kernel read-only data as write-protected in the pagetables, + in order to catch accidental (and incorrect) writes to such const +diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile linux-= 2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile +--- linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/acpi/realmode/Makefile 2011-08-07 14= :38:58.000000000 -0400 +@@ -41,6 +41,9 @@ KBUILD_CFLAGS :=3D $(LINUXINCLUDE) -g -Os=20 + $(call cc-option, -fno-stack-protector) \ + $(call cc-option, -mpreferred-stack-boundary=3D2) + KBUILD_CFLAGS +=3D $(call cc-option, -m32) ++ifdef CONSTIFY_PLUGIN ++KBUILD_CFLAGS +=3D $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-c= onstify ++endif + KBUILD_AFLAGS :=3D $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE :=3D n +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S linux-= 2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-01 18= :53:40.000000000 -0400 +@@ -91,6 +91,9 @@ _start: + /* Do any other stuff... */ +=20 + #ifndef CONFIG_64BIT ++ /* Recheck NX bit overrides (64bit path does this in trampoline) */ ++ call verify_cpu ++ + /* This could also be done in C code... */ + movl pmode_cr3, %eax + movl %eax, %cr3 +@@ -104,7 +107,7 @@ _start: + movl %eax, %ecx + orl %edx, %ecx + jz 1f +- movl $0xc0000080, %ecx ++ mov $MSR_EFER, %ecx + wrmsr + 1: +=20 +@@ -114,6 +117,7 @@ _start: + movl pmode_cr0, %eax + movl %eax, %cr0 + jmp pmode_return ++# include "../../verify_cpu.S" + #else + pushw $0 + pushw trampoline_segment +diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c linux-2.6.32.45/= arch/x86/kernel/acpi/sleep.c +--- linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/acpi/sleep.c 2011-07-01 19:01:34.000= 000000 -0400 +@@ -11,11 +11,12 @@ + #include + #include + #include ++#include +=20 + #include "realmode/wakeup.h" + #include "sleep.h" +=20 +-unsigned long acpi_wakeup_address; ++unsigned long acpi_wakeup_address =3D 0x2000; + unsigned long acpi_realmode_flags; +=20 + /* address in low memory of the wakeup routine. */ +@@ -98,9 +99,13 @@ int acpi_save_state_mem(void) + #else /* CONFIG_64BIT */ + header->trampoline_segment =3D setup_trampoline() >> 4; + #ifdef CONFIG_SMP +- stack_start.sp =3D temp_stack + sizeof(temp_stack); ++ stack_start =3D (unsigned long)temp_stack + sizeof(temp_stack); ++ ++ pax_open_kernel(); + early_gdt_descr.address =3D + (unsigned long)get_cpu_gdt_table(smp_processor_id()); ++ pax_close_kernel(); ++ + initial_gs =3D per_cpu_offset(smp_processor_id()); + #endif + initial_code =3D (unsigned long)wakeup_long64; +@@ -134,14 +139,8 @@ void __init acpi_reserve_bootmem(void) + return; + } +=20 +- acpi_realmode =3D (unsigned long)alloc_bootmem_low(WAKEUP_SIZE); +- +- if (!acpi_realmode) { +- printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n"); +- return; +- } +- +- acpi_wakeup_address =3D virt_to_phys((void *)acpi_realmode); ++ reserve_early(acpi_wakeup_address, acpi_wakeup_address + WAKEUP_SIZE, = "ACPI Wakeup Code"); ++ acpi_realmode =3D (unsigned long)__va(acpi_wakeup_address);; + } +=20 +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.32= .45/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/acpi/wakeup_32.S 2011-04-17 15:56:46= .000000000 -0400 +@@ -30,13 +30,11 @@ wakeup_pmode_return: + # and restore the stack ... but you need gdt for this to work + movl saved_context_esp, %esp +=20 +- movl %cs:saved_magic, %eax +- cmpl $0x12345678, %eax ++ cmpl $0x12345678, saved_magic + jne bogus_magic +=20 + # jump to place where we left off +- movl saved_eip, %eax +- jmp *%eax ++ jmp *(saved_eip) +=20 + bogus_magic: + jmp bogus_magic +diff -urNp linux-2.6.32.45/arch/x86/kernel/alternative.c linux-2.6.32.45= /arch/x86/kernel/alternative.c +--- linux-2.6.32.45/arch/x86/kernel/alternative.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/alternative.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str +=20 + BUG_ON(p->len > MAX_PATCH_LEN); + /* prep the buffer with the original instructions */ +- memcpy(insnbuf, p->instr, p->len); ++ memcpy(insnbuf, ktla_ktva(p->instr), p->len); + used =3D pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, + (unsigned long)p->instr, p->len); +=20 +@@ -475,7 +475,7 @@ void __init alternative_instructions(voi + if (smp_alt_once) + free_init_pages("SMP alternatives", + (unsigned long)__smp_locks, +- (unsigned long)__smp_locks_end); ++ PAGE_ALIGN((unsigned long)__smp_locks_end)); +=20 + restart_nmi(); + } +@@ -492,13 +492,17 @@ void __init alternative_instructions(voi + * instructions. And on the local CPU you need to be protected again NM= I or MCE + * handlers seeing an inconsistent instruction while you patch. + */ +-static void *__init_or_module text_poke_early(void *addr, const void *o= pcode, ++static void *__kprobes text_poke_early(void *addr, const void *opcode, + size_t len) + { + unsigned long flags; + local_irq_save(flags); +- memcpy(addr, opcode, len); ++ ++ pax_open_kernel(); ++ memcpy(ktla_ktva(addr), opcode, len); + sync_core(); ++ pax_close_kernel(); ++ + local_irq_restore(flags); + /* Could also do a CLFLUSH here to speed up CPU recovery; but + that causes hangs on some VIA CPUs. */ +@@ -520,35 +524,21 @@ static void *__init_or_module text_poke_ + */ + void *__kprobes text_poke(void *addr, const void *opcode, size_t len) + { +- unsigned long flags; +- char *vaddr; ++ unsigned char *vaddr =3D ktla_ktva(addr); + struct page *pages[2]; +- int i; ++ size_t i; +=20 + if (!core_kernel_text((unsigned long)addr)) { +- pages[0] =3D vmalloc_to_page(addr); +- pages[1] =3D vmalloc_to_page(addr + PAGE_SIZE); ++ pages[0] =3D vmalloc_to_page(vaddr); ++ pages[1] =3D vmalloc_to_page(vaddr + PAGE_SIZE); + } else { +- pages[0] =3D virt_to_page(addr); ++ pages[0] =3D virt_to_page(vaddr); + WARN_ON(!PageReserved(pages[0])); +- pages[1] =3D virt_to_page(addr + PAGE_SIZE); ++ pages[1] =3D virt_to_page(vaddr + PAGE_SIZE); + } + BUG_ON(!pages[0]); +- local_irq_save(flags); +- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0])); +- if (pages[1]) +- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1])); +- vaddr =3D (char *)fix_to_virt(FIX_TEXT_POKE0); +- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len); +- clear_fixmap(FIX_TEXT_POKE0); +- if (pages[1]) +- clear_fixmap(FIX_TEXT_POKE1); +- local_flush_tlb(); +- sync_core(); +- /* Could also do a CLFLUSH here to speed up CPU recovery; but +- that causes hangs on some VIA CPUs. */ ++ text_poke_early(addr, opcode, len); + for (i =3D 0; i < len; i++) +- BUG_ON(((char *)addr)[i] !=3D ((char *)opcode)[i]); +- local_irq_restore(flags); ++ BUG_ON((vaddr)[i] !=3D ((const unsigned char *)opcode)[i]); + return addr; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/amd_iommu.c linux-2.6.32.45/a= rch/x86/kernel/amd_iommu.c +--- linux-2.6.32.45/arch/x86/kernel/amd_iommu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/amd_iommu.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -2076,7 +2076,7 @@ static void prealloc_protection_domains( + } + } +=20 +-static struct dma_map_ops amd_iommu_dma_ops =3D { ++static const struct dma_map_ops amd_iommu_dma_ops =3D { + .alloc_coherent =3D alloc_coherent, + .free_coherent =3D free_coherent, + .map_page =3D map_page, +diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/apic.c linux-2.6.32.45/a= rch/x86/kernel/apic/apic.c +--- linux-2.6.32.45/arch/x86/kernel/apic/apic.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/apic/apic.c 2011-08-17 20:00:16.0000= 00000 -0400 +@@ -170,7 +170,7 @@ int first_system_vector =3D 0xfe; + /* + * Debug level, exported for io_apic.c + */ +-unsigned int apic_verbosity; ++int apic_verbosity; +=20 + int pic_mode; +=20 +@@ -1794,7 +1794,7 @@ void smp_error_interrupt(struct pt_regs=20 + apic_write(APIC_ESR, 0); + v1 =3D apic_read(APIC_ESR); + ack_APIC_irq(); +- atomic_inc(&irq_err_count); ++ atomic_inc_unchecked(&irq_err_count); +=20 + /* + * Here is what the APIC error bits mean: +@@ -2184,6 +2184,8 @@ static int __cpuinit apic_cluster_num(vo + u16 *bios_cpu_apicid; + DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS); +=20 ++ pax_track_stack(); ++ + bios_cpu_apicid =3D early_per_cpu_ptr(x86_bios_cpu_apicid); + bitmap_zero(clustermap, NUM_APIC_CLUSTERS); +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c linux-2.6.32.4= 5/arch/x86/kernel/apic/io_apic.c +--- linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/apic/io_apic.c 2011-05-04 17:56:20.0= 00000000 -0400 +@@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapi + ioapic_entries =3D kzalloc(sizeof(*ioapic_entries) * nr_ioapics, + GFP_ATOMIC); + if (!ioapic_entries) +- return 0; ++ return NULL; +=20 + for (apic =3D 0; apic < nr_ioapics; apic++) { + ioapic_entries[apic] =3D +@@ -733,7 +733,7 @@ nomem: + kfree(ioapic_entries[apic]); + kfree(ioapic_entries); +=20 +- return 0; ++ return NULL; + } +=20 + /* +@@ -1150,7 +1150,7 @@ int IO_APIC_get_PCI_irq_vector(int bus,=20 + } + EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector); +=20 +-void lock_vector_lock(void) ++void lock_vector_lock(void) __acquires(vector_lock) + { + /* Used to the online set of cpus does not change + * during assign_irq_vector. +@@ -1158,7 +1158,7 @@ void lock_vector_lock(void) + spin_lock(&vector_lock); + } +=20 +-void unlock_vector_lock(void) ++void unlock_vector_lock(void) __releases(vector_lock) + { + spin_unlock(&vector_lock); + } +@@ -2542,7 +2542,7 @@ static void ack_apic_edge(unsigned int i + ack_APIC_irq(); + } +=20 +-atomic_t irq_mis_count; ++atomic_unchecked_t irq_mis_count; +=20 + static void ack_apic_level(unsigned int irq) + { +@@ -2626,7 +2626,7 @@ static void ack_apic_level(unsigned int=20 +=20 + /* Tail end of version 0x11 I/O APIC bug workaround */ + if (!(v & (1 << (i & 0x1f)))) { +- atomic_inc(&irq_mis_count); ++ atomic_inc_unchecked(&irq_mis_count); + spin_lock(&ioapic_lock); + __mask_and_edge_IO_APIC_irq(cfg); + __unmask_and_level_IO_APIC_irq(cfg); +diff -urNp linux-2.6.32.45/arch/x86/kernel/apm_32.c linux-2.6.32.45/arch= /x86/kernel/apm_32.c +--- linux-2.6.32.45/arch/x86/kernel/apm_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/apm_32.c 2011-04-23 12:56:10.0000000= 00 -0400 +@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); + * This is for buggy BIOS's that refer to (real mode) segment 0x40 + * even though they are called in protected mode. + */ +-static struct desc_struct bad_bios_desc =3D GDT_ENTRY_INIT(0x4092, ++static const struct desc_struct bad_bios_desc =3D GDT_ENTRY_INIT(0x4093= , + (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); +=20 + static const char driver_version[] =3D "1.16ac"; /* no spaces */ +@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call) + BUG_ON(cpu !=3D 0); + gdt =3D get_cpu_gdt_table(cpu); + save_desc_40 =3D gdt[0x40 / 8]; ++ ++ pax_open_kernel(); + gdt[0x40 / 8] =3D bad_bios_desc; ++ pax_close_kernel(); +=20 + apm_irq_save(flags); + APM_DO_SAVE_SEGS; +@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call) + &call->esi); + APM_DO_RESTORE_SEGS; + apm_irq_restore(flags); ++ ++ pax_open_kernel(); + gdt[0x40 / 8] =3D save_desc_40; ++ pax_close_kernel(); ++ + put_cpu(); +=20 + return call->eax & 0xff; +@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void=20 + BUG_ON(cpu !=3D 0); + gdt =3D get_cpu_gdt_table(cpu); + save_desc_40 =3D gdt[0x40 / 8]; ++ ++ pax_open_kernel(); + gdt[0x40 / 8] =3D bad_bios_desc; ++ pax_close_kernel(); +=20 + apm_irq_save(flags); + APM_DO_SAVE_SEGS; +@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void=20 + &call->eax); + APM_DO_RESTORE_SEGS; + apm_irq_restore(flags); ++ ++ pax_open_kernel(); + gdt[0x40 / 8] =3D save_desc_40; ++ pax_close_kernel(); ++ + put_cpu(); + return error; + } +@@ -975,7 +989,7 @@ recalc: +=20 + static void apm_power_off(void) + { +- unsigned char po_bios_call[] =3D { ++ const unsigned char po_bios_call[] =3D { + 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ + 0x8e, 0xd0, /* movw ax,ss */ + 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ +@@ -2357,12 +2371,15 @@ static int __init apm_init(void) + * code to that CPU. + */ + gdt =3D get_cpu_gdt_table(0); ++ ++ pax_open_kernel(); + 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(); +=20 + proc_create("apm", 0, NULL, &apm_file_ops); +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c linux-2.6.32= .45/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/asm-offsets_32.c 2011-05-16 21:46:57= .000000000 -0400 +@@ -51,7 +51,6 @@ void foo(void) + OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id); + BLANK(); +=20 +- OFFSET(TI_task, thread_info, task); + OFFSET(TI_exec_domain, thread_info, exec_domain); + OFFSET(TI_flags, thread_info, flags); + OFFSET(TI_status, thread_info, status); +@@ -60,6 +59,8 @@ void foo(void) + OFFSET(TI_restart_block, thread_info, restart_block); + OFFSET(TI_sysenter_return, thread_info, sysenter_return); + OFFSET(TI_cpu, thread_info, cpu); ++ OFFSET(TI_lowest_stack, thread_info, lowest_stack); ++ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - = offsetof(struct task_struct, tinfo)); + BLANK(); +=20 + OFFSET(GDS_size, desc_ptr, size); +@@ -99,6 +100,7 @@ void foo(void) +=20 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT); ++ DEFINE(THREAD_SIZE_asm, THREAD_SIZE); + DEFINE(PTRS_PER_PTE, PTRS_PER_PTE); + DEFINE(PTRS_PER_PMD, PTRS_PER_PMD); + DEFINE(PTRS_PER_PGD, PTRS_PER_PGD); +@@ -115,6 +117,11 @@ void foo(void) + OFFSET(PV_CPU_iret, pv_cpu_ops, iret); + OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); + OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0); ++#endif ++ + #endif +=20 + #ifdef CONFIG_XEN +diff -urNp linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c linux-2.6.32= .45/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/asm-offsets_64.c 2011-08-23 20:24:19= .000000000 -0400 +@@ -44,6 +44,8 @@ int main(void) + ENTRY(addr_limit); + ENTRY(preempt_count); + ENTRY(status); ++ ENTRY(lowest_stack); ++ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - = offsetof(struct task_struct, tinfo)); + #ifdef CONFIG_IA32_EMULATION + ENTRY(sysenter_return); + #endif +@@ -63,6 +65,18 @@ int main(void) + OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); + OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); + OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); ++ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0); ++#endif ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3); ++ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3); ++ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched); ++#endif ++ + #endif +=20 +=20 +@@ -115,6 +129,7 @@ int main(void) + ENTRY(cr8); + BLANK(); + #undef ENTRY ++ DEFINE(TSS_size, sizeof(struct tss_struct)); + DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); + BLANK(); + DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); +@@ -130,6 +145,7 @@ int main(void) +=20 + BLANK(); + DEFINE(PAGE_SIZE_asm, PAGE_SIZE); ++ DEFINE(THREAD_SIZE_asm, THREAD_SIZE); + #ifdef CONFIG_XEN + BLANK(); + OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask); +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/amd.c linux-2.6.32.45/arc= h/x86/kernel/cpu/amd.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/amd.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/amd.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_c + unsigned int size) + { + /* AMD errata T13 (order #21922) */ +- if ((c->x86 =3D=3D 6)) { ++ if (c->x86 =3D=3D 6) { + /* Duron Rev A0 */ + if (c->x86_model =3D=3D 3 && c->x86_mask =3D=3D 0) + size =3D 64; +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/common.c linux-2.6.32.45/= arch/x86/kernel/cpu/common.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/common.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/common.c 2011-05-11 18:25:15.000= 000000 -0400 +@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon +=20 + static const struct cpu_dev *this_cpu __cpuinitdata =3D &default_cpu; +=20 +-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) =3D { .gdt =3D { +-#ifdef CONFIG_X86_64 +- /* +- * We need valid kernel segments for data and code in long mode too +- * IRET will check the segment types kkeil 2000/10/28 +- * Also sysret mandates a special GDT layout +- * +- * TLS descriptors are currently at a different place compared to i386= . +- * Hopefully nobody expects them at a fixed place (Wine?) +- */ +- [GDT_ENTRY_KERNEL32_CS] =3D GDT_ENTRY_INIT(0xc09b, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_CS] =3D GDT_ENTRY_INIT(0xa09b, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_DS] =3D GDT_ENTRY_INIT(0xc093, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER32_CS] =3D GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_DS] =3D GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_CS] =3D GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff), +-#else +- [GDT_ENTRY_KERNEL_CS] =3D GDT_ENTRY_INIT(0xc09a, 0, 0xfffff), +- [GDT_ENTRY_KERNEL_DS] =3D GDT_ENTRY_INIT(0xc092, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_CS] =3D GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff), +- [GDT_ENTRY_DEFAULT_USER_DS] =3D 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] =3D GDT_ENTRY_INIT(0x409a, 0, 0xffff), +- /* 16-bit code */ +- [GDT_ENTRY_PNPBIOS_CS16] =3D GDT_ENTRY_INIT(0x009a, 0, 0xffff), +- /* 16-bit data */ +- [GDT_ENTRY_PNPBIOS_DS] =3D GDT_ENTRY_INIT(0x0092, 0, 0xffff), +- /* 16-bit data */ +- [GDT_ENTRY_PNPBIOS_TS1] =3D GDT_ENTRY_INIT(0x0092, 0, 0), +- /* 16-bit data */ +- [GDT_ENTRY_PNPBIOS_TS2] =3D 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] =3D GDT_ENTRY_INIT(0x409a, 0, 0xffff), +- /* 16-bit code */ +- [GDT_ENTRY_APMBIOS_BASE+1] =3D GDT_ENTRY_INIT(0x009a, 0, 0xffff), +- /* data */ +- [GDT_ENTRY_APMBIOS_BASE+2] =3D GDT_ENTRY_INIT(0x4092, 0, 0xffff), +- +- [GDT_ENTRY_ESPFIX_SS] =3D GDT_ENTRY_INIT(0xc092, 0, 0xfffff), +- [GDT_ENTRY_PERCPU] =3D GDT_ENTRY_INIT(0xc092, 0, 0xfffff), +- GDT_STACK_CANARY_INIT +-#endif +-} }; +-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); +- + static int __init x86_xsave_setup(char *s) + { + setup_clear_cpu_cap(X86_FEATURE_XSAVE); +@@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu) + { + struct desc_ptr gdt_descr; +=20 +- gdt_descr.address =3D (long)get_cpu_gdt_table(cpu); ++ gdt_descr.address =3D (unsigned long)get_cpu_gdt_table(cpu); + gdt_descr.size =3D GDT_SIZE - 1; + load_gdt(&gdt_descr); + /* Reload the per-cpu base */ +@@ -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); +=20 ++#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || (de= fined(CONFIG_PAX_MEMORY_UDEREF) && defined(CONFIG_X86_32)) ++ setup_clear_cpu_cap(X86_FEATURE_SEP); ++#endif ++ + /* If the model name is still unset, do table lookup. */ + if (!c->x86_model_id[0]) { + const char *p; +@@ -980,6 +930,9 @@ static __init int setup_disablecpuid(cha + } + __setup("clearcpuid=3D", setup_disablecpuid); +=20 ++DEFINE_PER_CPU(struct thread_info *, current_tinfo) =3D &init_task.tinf= o; ++EXPORT_PER_CPU_SYMBOL(current_tinfo); ++ + #ifdef CONFIG_X86_64 + struct desc_ptr idt_descr =3D { NR_VECTORS * 16 - 1, (unsigned long) id= t_table }; +=20 +@@ -995,7 +948,7 @@ DEFINE_PER_CPU(struct task_struct *, cur + EXPORT_PER_CPU_SYMBOL(current_task); +=20 + DEFINE_PER_CPU(unsigned long, kernel_stack) =3D +- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE; ++ (unsigned long)&init_thread_union - 16 + THREAD_SIZE; + EXPORT_PER_CPU_SYMBOL(kernel_stack); +=20 + DEFINE_PER_CPU(char *, irq_stack_ptr) =3D +@@ -1060,7 +1013,7 @@ struct pt_regs * __cpuinit idle_regs(str + { + memset(regs, 0, sizeof(struct pt_regs)); + regs->fs =3D __KERNEL_PERCPU; +- regs->gs =3D __KERNEL_STACK_CANARY; ++ savesegment(gs, regs->gs); +=20 + return regs; + } +@@ -1101,7 +1054,7 @@ void __cpuinit cpu_init(void) + int i; +=20 + cpu =3D stack_smp_processor_id(); +- t =3D &per_cpu(init_tss, cpu); ++ t =3D init_tss + cpu; + orig_ist =3D &per_cpu(orig_ist, cpu); +=20 + #ifdef CONFIG_NUMA +@@ -1127,7 +1080,7 @@ void __cpuinit cpu_init(void) + switch_to_new_gdt(cpu); + loadsegment(fs, 0); +=20 +- load_idt((const struct desc_ptr *)&idt_descr); ++ load_idt(&idt_descr); +=20 + memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); + syscall_init(); +@@ -1136,7 +1089,6 @@ void __cpuinit cpu_init(void) + wrmsrl(MSR_KERNEL_GS_BASE, 0); + barrier(); +=20 +- check_efer(); + if (cpu !=3D 0) + enable_x2apic(); +=20 +@@ -1199,7 +1151,7 @@ void __cpuinit cpu_init(void) + { + int cpu =3D smp_processor_id(); + struct task_struct *curr =3D current; +- struct tss_struct *t =3D &per_cpu(init_tss, cpu); ++ struct tss_struct *t =3D init_tss + cpu; + struct thread_struct *thread =3D &curr->thread; +=20 + if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel.c linux-2.6.32.45/a= rch/x86/kernel/cpu/intel.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/intel.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/intel.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -162,7 +162,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. + */ +- idt_descr.address =3D fix_to_virt(FIX_F00F_IDT); ++ idt_descr.address =3D (struct desc_struct *)fix_to_virt(FIX_F00F_IDT); + load_idt(&idt_descr); + } + #endif +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2= .6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/intel_cacheinfo.c 2011-04-17 15:= 56:46.000000000 -0400 +@@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kob + return ret; + } +=20 +-static struct sysfs_ops sysfs_ops =3D { ++static const struct sysfs_ops sysfs_ops =3D { + .show =3D show, + .store =3D store, + }; +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/Makefile linux-2.6.32.45/= arch/x86/kernel/cpu/Makefile +--- linux-2.6.32.45/arch/x86/kernel/cpu/Makefile 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/Makefile 2011-04-17 15:56:46.000= 000000 -0400 +@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER + CFLAGS_REMOVE_common.o =3D -pg + endif +=20 +-# Make sure load_percpu_segment has no stackprotector +-nostackp :=3D $(call cc-option, -fno-stack-protector) +-CFLAGS_common.o :=3D $(nostackp) +- + obj-y :=3D intel_cacheinfo.o addon_cpuid_features.o + obj-y +=3D proc.o capflags.o powerflags.o common.o + obj-y +=3D vmware.o hypervisor.o sched.o +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.= 6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:5= 6:59.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce_amd.c 2011-05-23 16:5= 7:13.000000000 -0400 +@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob + return ret; + } +=20 +-static struct sysfs_ops threshold_ops =3D { ++static const struct sysfs_ops threshold_ops =3D { + .show =3D show, + .store =3D store, + }; +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32= .45/arch/x86/kernel/cpu/mcheck/mce.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce.c 2011-05-04 17:56:20= .000000000 -0400 +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include +=20 + #include "mce-internal.h" +=20 +@@ -187,7 +188,7 @@ static void print_mce(struct mce *m) + !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", + m->cs, m->ip); +=20 +- if (m->cs =3D=3D __KERNEL_CS) ++ if (m->cs =3D=3D __KERNEL_CS || m->cs =3D=3D __KERNEXEC_KERNEL_CS) + print_symbol("{%s}", m->ip); + pr_cont("\n"); + } +@@ -221,10 +222,10 @@ static void print_mce_tail(void) +=20 + #define PANIC_TIMEOUT 5 /* 5 seconds */ +=20 +-static atomic_t mce_paniced; ++static atomic_unchecked_t mce_paniced; +=20 + static int fake_panic; +-static atomic_t mce_fake_paniced; ++static atomic_unchecked_t mce_fake_paniced; +=20 + /* Panic in progress. Enable interrupts and wait for final IPI */ + static void wait_for_panic(void) +@@ -248,7 +249,7 @@ static void mce_panic(char *msg, struct=20 + /* + * Make sure only one CPU runs in machine check panic + */ +- if (atomic_inc_return(&mce_paniced) > 1) ++ if (atomic_inc_return_unchecked(&mce_paniced) > 1) + wait_for_panic(); + barrier(); +=20 +@@ -256,7 +257,7 @@ static void mce_panic(char *msg, struct=20 + console_verbose(); + } else { + /* Don't log too much for fake panic */ +- if (atomic_inc_return(&mce_fake_paniced) > 1) ++ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1) + return; + } + print_mce_head(); +@@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t) + * might have been modified by someone else. + */ + rmb(); +- if (atomic_read(&mce_paniced)) ++ if (atomic_read_unchecked(&mce_paniced)) + wait_for_panic(); + if (!monarch_timeout) + goto out; +@@ -1429,14 +1430,14 @@ void __cpuinit mcheck_init(struct cpuinf + */ +=20 + static DEFINE_SPINLOCK(mce_state_lock); +-static int open_count; /* #times opened */ ++static local_t open_count; /* #times opened */ + static int open_exclu; /* already open exclusive? */ +=20 + static int mce_open(struct inode *inode, struct file *file) + { + spin_lock(&mce_state_lock); +=20 +- if (open_exclu || (open_count && (file->f_flags & O_EXCL))) { ++ if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL)= )) { + spin_unlock(&mce_state_lock); +=20 + return -EBUSY; +@@ -1444,7 +1445,7 @@ static int mce_open(struct inode *inode, +=20 + if (file->f_flags & O_EXCL) + open_exclu =3D 1; +- open_count++; ++ local_inc(&open_count); +=20 + spin_unlock(&mce_state_lock); +=20 +@@ -1455,7 +1456,7 @@ static int mce_release(struct inode *ino + { + spin_lock(&mce_state_lock); +=20 +- open_count--; ++ local_dec(&open_count); + open_exclu =3D 0; +=20 + spin_unlock(&mce_state_lock); +@@ -2082,7 +2083,7 @@ struct dentry *mce_get_debugfs_dir(void) + static void mce_reset(void) + { + cpu_missing =3D 0; +- atomic_set(&mce_fake_paniced, 0); ++ atomic_set_unchecked(&mce_fake_paniced, 0); + atomic_set(&mce_executing, 0); + atomic_set(&mce_callin, 0); + atomic_set(&global_nwo, 0); +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c linux= -2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mcheck/mce-inject.c 2011-08-05 2= 0:33:55.000000000 -0400 +@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi + static int inject_init(void) + { + printk(KERN_INFO "Machine check injector initialized\n"); +- mce_chrdev_ops.write =3D mce_write; ++ pax_open_kernel(); ++ *(void **)&mce_chrdev_ops.write =3D mce_write; ++ pax_close_kernel(); + register_die_notifier(&mce_raise_nb); + return 0; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.4= 5/arch/x86/kernel/cpu/mtrr/amd.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/amd.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base + return 0; + } +=20 +-static struct mtrr_ops amd_mtrr_ops =3D { ++static const struct mtrr_ops amd_mtrr_ops =3D { + .vendor =3D X86_VENDOR_AMD, + .set =3D amd_set_mtrr, + .get =3D amd_get_mtrr, +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.= 32.45/arch/x86/kernel/cpu/mtrr/centaur.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/centaur.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long=20 + return 0; + } +=20 +-static struct mtrr_ops centaur_mtrr_ops =3D { ++static const struct mtrr_ops centaur_mtrr_ops =3D { + .vendor =3D X86_VENDOR_CENTAUR, + .set =3D centaur_set_mcr, + .get =3D centaur_get_mcr, +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32= .45/arch/x86/kernel/cpu/mtrr/cyrix.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/cyrix.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -265,7 +265,7 @@ static void cyrix_set_all(void) + post_set(); + } +=20 +-static struct mtrr_ops cyrix_mtrr_ops =3D { ++static const struct mtrr_ops cyrix_mtrr_ops =3D { + .vendor =3D X86_VENDOR_CYRIX, + .set_all =3D cyrix_set_all, + .set =3D cyrix_set_arr, +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.= 32.45/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/generic.c 2011-04-23 12:56:= 10.000000000 -0400 +@@ -752,7 +752,7 @@ int positive_have_wrcomb(void) + /* + * Generic structure... + */ +-struct mtrr_ops generic_mtrr_ops =3D { ++const struct mtrr_ops generic_mtrr_ops =3D { + .use_intel_if =3D 1, + .set_all =3D generic_set_all, + .get =3D generic_get_mtrr, +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c linux-2.6.32.= 45/arch/x86/kernel/cpu/mtrr/main.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/main.c 2011-04-17 17:03:05.= 000000000 -0400 +@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); + u64 size_or_mask, size_and_mask; + static bool mtrr_aps_delayed_init; +=20 +-static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM]; ++static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only; +=20 +-struct mtrr_ops *mtrr_if; ++const struct mtrr_ops *mtrr_if; +=20 + static void set_mtrr(unsigned int reg, unsigned long base, + unsigned long size, mtrr_type type); +=20 +-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] =3D ops; +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.= 45/arch/x86/kernel/cpu/mtrr/mtrr.h +--- linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/mtrr/mtrr.h 2011-04-17 15:56:46.= 000000000 -0400 +@@ -12,19 +12,19 @@ + extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; +=20 + 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); +=20 +- 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); + }; +=20 + extern int generic_get_free_region(unsigned long base, unsigned long si= ze, +@@ -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); +=20 +-extern struct mtrr_ops generic_mtrr_ops; ++extern const struct mtrr_ops generic_mtrr_ops; +=20 + extern int positive_have_wrcomb(void); +=20 +@@ -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); +=20 +-extern void set_mtrr_ops(struct mtrr_ops *ops); ++extern void set_mtrr_ops(const struct mtrr_ops *ops); +=20 + extern u64 size_or_mask, size_and_mask; +-extern struct mtrr_ops *mtrr_if; ++extern const struct mtrr_ops *mtrr_if; +=20 + #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor =3D=3D X86_VENDOR_##vnd= ) + #define use_intel() (mtrr_if && mtrr_if->use_intel_if =3D=3D 1) +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c linux-= 2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/perfctr-watchdog.c 2011-04-17 15= :56:46.000000000 -0400 +@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { +=20 + /* Interface defining a CPU specific perfctr watchdog */ + struct wd_ops { +- int (*reserve)(void); +- void (*unreserve)(void); +- int (*setup)(unsigned nmi_hz); +- void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz); +- void (*stop)(void); ++ int (* const reserve)(void); ++ void (* const unreserve)(void); ++ int (* const setup)(unsigned nmi_hz); ++ void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz); ++ void (* const stop)(void); + unsigned perfctr; + unsigned evntsel; + u64 checkbit; +@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops =3D { + #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SE= L + #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_= UMASK +=20 ++/* cannot be const */ + static struct wd_ops intel_arch_wd_ops; +=20 + static int setup_intel_arch_watchdog(unsigned nmi_hz) +@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns + return 1; + } +=20 ++/* cannot be const */ + static struct wd_ops intel_arch_wd_ops __read_mostly =3D { + .reserve =3D single_msr_reserve, + .unreserve =3D single_msr_unreserve, +diff -urNp linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c linux-2.6.32= .45/arch/x86/kernel/cpu/perf_event.c +--- linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/cpu/perf_event.c 2011-05-04 17:56:20= .000000000 -0400 +@@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event=20 + * count to the generic event atomically: + */ + again: +- prev_raw_count =3D atomic64_read(&hwc->prev_count); ++ prev_raw_count =3D atomic64_read_unchecked(&hwc->prev_count); + rdmsrl(hwc->event_base + idx, new_raw_count); +=20 +- if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count, ++ if (atomic64_cmpxchg_unchecked(&hwc->prev_count, prev_raw_count, + new_raw_count) !=3D prev_raw_count) + goto again; +=20 +@@ -741,7 +741,7 @@ again: + delta =3D (new_raw_count << shift) - (prev_raw_count << shift); + delta >>=3D shift; +=20 +- atomic64_add(delta, &event->count); ++ atomic64_add_unchecked(delta, &event->count); + atomic64_sub(delta, &hwc->period_left); +=20 + return new_raw_count; +@@ -1353,7 +1353,7 @@ x86_perf_event_set_period(struct perf_ev + * The hw event starts counting from this event offset, + * mark it to be able to extra future deltas: + */ +- atomic64_set(&hwc->prev_count, (u64)-left); ++ atomic64_set_unchecked(&hwc->prev_count, (u64)-left); +=20 + err =3D checking_wrmsrl(hwc->event_base + idx, + (u64)(-left) & x86_pmu.event_mask); +@@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs + break; +=20 + callchain_store(entry, frame.return_address); +- fp =3D frame.next_frame; ++ fp =3D (__force const void __user *)frame.next_frame; + } + } +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/crash.c linux-2.6.32.45/arch/= x86/kernel/crash.c +--- linux-2.6.32.45/arch/x86/kernel/crash.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/crash.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,=20 + regs =3D args->regs; +=20 + #ifdef CONFIG_X86_32 +- if (!user_mode_vm(regs)) { ++ if (!user_mode(regs)) { + crash_fixup_ss_esp(&fixed_regs, regs); + regs =3D &fixed_regs; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/doublefault_32.c linux-2.6.32= .45/arch/x86/kernel/doublefault_32.c +--- linux-2.6.32.45/arch/x86/kernel/doublefault_32.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/doublefault_32.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -11,7 +11,7 @@ +=20 + #define DOUBLEFAULT_STACKSIZE (1024) + static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE]; +-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACK= SIZE) ++#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACK= SIZE-2) +=20 + #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM) +=20 +@@ -21,7 +21,7 @@ static void doublefault_fn(void) + unsigned long gdt, tss; +=20 + store_gdt(&gdt_desc); +- gdt =3D gdt_desc.address; ++ gdt =3D (unsigned long)gdt_desc.address; +=20 + printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gd= t, gdt_desc.size); +=20 +@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach + /* 0x2 bit is always set */ + .flags =3D X86_EFLAGS_SF | 0x2, + .sp =3D STACK_START, +- .es =3D __USER_DS, ++ .es =3D __KERNEL_DS, + .cs =3D __KERNEL_CS, + .ss =3D __KERNEL_DS, +- .ds =3D __USER_DS, ++ .ds =3D __KERNEL_DS, + .fs =3D __KERNEL_PERCPU, +=20 + .__cr3 =3D __pa_nodebug(swapper_pg_dir), +diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c linux-2.6.32.4= 5/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/dumpstack_32.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task + #endif +=20 + for (;;) { +- struct thread_info *context; ++ void *stack_start =3D (void *)((unsigned long)stack & ~(THREAD_SIZE-1= )); ++ bp =3D print_context_stack(task, stack_start, stack, bp, ops, data, N= ULL, &graph); +=20 +- context =3D (struct thread_info *) +- ((unsigned long)stack & (~(THREAD_SIZE - 1))); +- bp =3D print_context_stack(context, stack, bp, ops, +- data, NULL, &graph); +- +- stack =3D (unsigned long *)context->previous_esp; +- if (!stack) ++ if (stack_start =3D=3D task_stack_page(task)) + break; ++ stack =3D *(unsigned long **)stack_start; + if (ops->stack(data, "IRQ") < 0) + break; + touch_nmi_watchdog(); +@@ -112,11 +108,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.. + */ +- if (!user_mode_vm(regs)) { ++ if (!user_mode(regs)) { + unsigned int code_prologue =3D code_bytes * 43 / 64; + unsigned int code_len =3D code_bytes; + unsigned char c; + u8 *ip; ++ unsigned long cs_base =3D get_desc_base(&get_cpu_gdt_table(smp_proces= sor_id())[(0xffff & regs->cs) >> 3]); +=20 + printk(KERN_EMERG "Stack:\n"); + show_stack_log_lvl(NULL, regs, ®s->sp, +@@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs +=20 + printk(KERN_EMERG "Code: "); +=20 +- ip =3D (u8 *)regs->ip - code_prologue; ++ ip =3D (u8 *)regs->ip - code_prologue + cs_base; + if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) { + /* try starting at IP */ +- ip =3D (u8 *)regs->ip; ++ ip =3D (u8 *)regs->ip + cs_base; + code_len =3D code_len - code_prologue + 1; + } + for (i =3D 0; i < code_len; i++, ip++) { +@@ -136,7 +133,7 @@ void show_registers(struct pt_regs *regs + printk(" Bad EIP value."); + break; + } +- if (ip =3D=3D (u8 *)regs->ip) ++ if (ip =3D=3D (u8 *)regs->ip + cs_base) + printk("<%02x> ", c); + else + printk("%02x ", c); +@@ -149,6 +146,7 @@ int is_valid_bugaddr(unsigned long ip) + { + unsigned short ud2; +=20 ++ ip =3D ktla_ktva(ip); + if (ip < PAGE_OFFSET) + return 0; + if (probe_kernel_address((unsigned short *)ip, ud2)) +diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c linux-2.6.32.4= 5/arch/x86/kernel/dumpstack_64.c +--- linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/dumpstack_64.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task + unsigned long *irq_stack_end =3D + (unsigned long *)per_cpu(irq_stack_ptr, cpu); + unsigned used =3D 0; +- struct thread_info *tinfo; + int graph =3D 0; ++ void *stack_start; +=20 + if (!task) + task =3D current; +@@ -146,10 +146,10 @@ void dump_trace(struct task_struct *task + * current stack address. If the stacks consist of nested + * exceptions + */ +- tinfo =3D task_thread_info(task); + for (;;) { + char *id; + unsigned long *estack_end; ++ + estack_end =3D in_exception_stack(cpu, (unsigned long)stack, + &used, &id); +=20 +@@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task + if (ops->stack(data, id) < 0) + break; +=20 +- bp =3D print_context_stack(tinfo, stack, bp, ops, ++ bp =3D print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack= , bp, ops, + data, estack_end, &graph); + ops->stack(data, ""); + /* +@@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task + if (stack >=3D irq_stack && stack < irq_stack_end) { + if (ops->stack(data, "IRQ") < 0) + break; +- bp =3D print_context_stack(tinfo, stack, bp, ++ bp =3D print_context_stack(task, irq_stack, stack, bp, + ops, data, irq_stack_end, &graph); + /* + * We link to the next stack (which would be +@@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task + /* + * This handles the process stack: + */ +- bp =3D print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph); ++ stack_start =3D (void *)((unsigned long)stack & ~(THREAD_SIZE-1)); ++ bp =3D print_context_stack(task, stack_start, stack, bp, ops, data, NU= LL, &graph); + put_cpu(); + } + EXPORT_SYMBOL(dump_trace); +diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.c linux-2.6.32.45/a= rch/x86/kernel/dumpstack.c +--- linux-2.6.32.45/arch/x86/kernel/dumpstack.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/dumpstack.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -2,6 +2,9 @@ + * Copyright (C) 1991, 1992 Linus Torvalds + * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs + */ ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++#define __INCLUDED_BY_HIDESYM 1 ++#endif + #include + #include + #include +@@ -28,7 +31,7 @@ static int die_counter; +=20 + void printk_address(unsigned long address, int reliable) + { +- printk(" [<%p>] %s%pS\n", (void *) address, ++ printk(" [<%p>] %s%pA\n", (void *) address, + reliable ? "" : "? ", (void *) address); + } +=20 +@@ -36,9 +39,8 @@ void printk_address(unsigned long addres + static void + print_ftrace_graph_addr(unsigned long addr, void *data, + const struct stacktrace_ops *ops, +- struct thread_info *tinfo, int *graph) ++ struct task_struct *task, int *graph) + { +- struct task_struct *task =3D tinfo->task; + unsigned long ret_addr; + int index =3D task->curr_ret_stack; +=20 +@@ -59,7 +61,7 @@ print_ftrace_graph_addr(unsigned long ad + static inline void + print_ftrace_graph_addr(unsigned long addr, void *data, + const struct stacktrace_ops *ops, +- struct thread_info *tinfo, int *graph) ++ struct task_struct *task, int *graph) + { } + #endif +=20 +@@ -70,10 +72,8 @@ print_ftrace_graph_addr(unsigned long ad + * severe exception (double fault, nmi, stack fault, debug, mce) hardwa= re stack + */ +=20 +-static inline int valid_stack_ptr(struct thread_info *tinfo, +- void *p, unsigned int size, void *end) ++static inline int valid_stack_ptr(void *t, void *p, unsigned int size, = void *end) + { +- void *t =3D tinfo; + if (end) { + if (p < end && p >=3D (end-THREAD_SIZE)) + return 1; +@@ -84,14 +84,14 @@ static inline int valid_stack_ptr(struct + } +=20 + unsigned long +-print_context_stack(struct thread_info *tinfo, ++print_context_stack(struct task_struct *task, void *stack_start, + unsigned long *stack, unsigned long bp, + const struct stacktrace_ops *ops, void *data, + unsigned long *end, int *graph) + { + struct stack_frame *frame =3D (struct stack_frame *)bp; +=20 +- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) { ++ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) { + unsigned long addr; +=20 + addr =3D *stack; +@@ -103,7 +103,7 @@ print_context_stack(struct thread_info * + } else { + ops->address(data, addr, 0); + } +- print_ftrace_graph_addr(addr, data, ops, tinfo, graph); ++ print_ftrace_graph_addr(addr, data, ops, task, graph); + } + stack++; + } +@@ -180,7 +180,7 @@ void dump_stack(void) + #endif +=20 + 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); +@@ -220,6 +220,8 @@ unsigned __kprobes long oops_begin(void) + return flags; + } +=20 ++extern void gr_handle_kernel_exploit(void); ++ + void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int = signr) + { + if (regs && kexec_should_crash(current)) +@@ -241,7 +243,10 @@ void __kprobes oops_end(unsigned long fl + panic("Fatal exception in interrupt"); + if (panic_on_oops) + panic("Fatal exception"); +- do_exit(signr); ++ ++ gr_handle_kernel_exploit(); ++ ++ do_group_exit(signr); + } +=20 + int __kprobes __die(const char *str, struct pt_regs *regs, long err) +@@ -295,7 +300,7 @@ void die(const char *str, struct pt_regs + unsigned long flags =3D oops_begin(); + int sig =3D SIGSEGV; +=20 +- if (!user_mode_vm(regs)) ++ if (!user_mode(regs)) + report_bug(regs->ip, regs); +=20 + if (__die(str, regs, err)) +diff -urNp linux-2.6.32.45/arch/x86/kernel/dumpstack.h linux-2.6.32.45/a= rch/x86/kernel/dumpstack.h +--- linux-2.6.32.45/arch/x86/kernel/dumpstack.h 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/dumpstack.h 2011-04-23 13:25:26.0000= 00000 -0400 +@@ -15,7 +15,7 @@ + #endif +=20 + extern unsigned long +-print_context_stack(struct thread_info *tinfo, ++print_context_stack(struct task_struct *task, void *stack_start, + unsigned long *stack, unsigned long bp, + const struct stacktrace_ops *ops, void *data, + unsigned long *end, int *graph); +diff -urNp linux-2.6.32.45/arch/x86/kernel/e820.c linux-2.6.32.45/arch/x= 86/kernel/e820.c +--- linux-2.6.32.45/arch/x86/kernel/e820.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/kernel/e820.c 2011-04-17 15:56:46.000000000= -0400 +@@ -733,7 +733,7 @@ struct early_res { + }; + static struct early_res early_res[MAX_EARLY_RES] __initdata =3D { + { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */ +- {} ++ { 0, 0, {0}, 0 } + }; +=20 + static int __init find_overlapped_early(u64 start, u64 end) +diff -urNp linux-2.6.32.45/arch/x86/kernel/early_printk.c linux-2.6.32.4= 5/arch/x86/kernel/early_printk.c +--- linux-2.6.32.45/arch/x86/kernel/early_printk.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/early_printk.c 2011-05-16 21:46:57.0= 00000000 -0400 +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -170,6 +171,8 @@ asmlinkage void early_printk(const char=20 + int n; + va_list ap; +=20 ++ pax_track_stack(); ++ + va_start(ap, fmt); + n =3D vscnprintf(buf, sizeof(buf), fmt, ap); + early_console->write(early_console, buf, n); +diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_32.c linux-2.6.32.45/arch= /x86/kernel/efi_32.c +--- linux-2.6.32.45/arch/x86/kernel/efi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/efi_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -38,70 +38,38 @@ + */ +=20 + static unsigned long efi_rt_eflags; +-static pgd_t efi_bak_pg_dir_pointer[2]; ++static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS]; +=20 +-void efi_call_phys_prelog(void) ++void __init efi_call_phys_prelog(void) + { +- unsigned long cr4; +- unsigned long temp; + struct desc_ptr gdt_descr; +=20 + local_irq_save(efi_rt_eflags); +=20 +- /* +- * If I don't have PAE, I should just duplicate two entries in page +- * directory. If I have PAE, I just need to duplicate one entry in +- * page directory. +- */ +- cr4 =3D read_cr4_safe(); +=20 +- if (cr4 & X86_CR4_PAE) { +- efi_bak_pg_dir_pointer[0].pgd =3D +- swapper_pg_dir[pgd_index(0)].pgd; +- swapper_pg_dir[0].pgd =3D +- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; +- } else { +- efi_bak_pg_dir_pointer[0].pgd =3D +- swapper_pg_dir[pgd_index(0)].pgd; +- efi_bak_pg_dir_pointer[1].pgd =3D +- swapper_pg_dir[pgd_index(0x400000)].pgd; +- swapper_pg_dir[pgd_index(0)].pgd =3D +- swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd; +- temp =3D PAGE_OFFSET + 0x400000; +- swapper_pg_dir[pgd_index(0x400000)].pgd =3D +- swapper_pg_dir[pgd_index(temp)].pgd; +- } ++ clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTR= S); ++ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, ++ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); +=20 + /* + * After the lock is released, the original page table is restored. + */ + __flush_tlb_all(); +=20 +- gdt_descr.address =3D __pa(get_cpu_gdt_table(0)); ++ gdt_descr.address =3D (struct desc_struct *)__pa(get_cpu_gdt_table(0))= ; + gdt_descr.size =3D GDT_SIZE - 1; + load_gdt(&gdt_descr); + } +=20 +-void efi_call_phys_epilog(void) ++void __init efi_call_phys_epilog(void) + { +- unsigned long cr4; + struct desc_ptr gdt_descr; +=20 +- gdt_descr.address =3D (unsigned long)get_cpu_gdt_table(0); ++ gdt_descr.address =3D get_cpu_gdt_table(0); + gdt_descr.size =3D GDT_SIZE - 1; + load_gdt(&gdt_descr); +=20 +- cr4 =3D read_cr4_safe(); +- +- if (cr4 & X86_CR4_PAE) { +- swapper_pg_dir[pgd_index(0)].pgd =3D +- efi_bak_pg_dir_pointer[0].pgd; +- } else { +- swapper_pg_dir[pgd_index(0)].pgd =3D +- efi_bak_pg_dir_pointer[0].pgd; +- swapper_pg_dir[pgd_index(0x400000)].pgd =3D +- efi_bak_pg_dir_pointer[1].pgd; +- } ++ clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTR= S); +=20 + /* + * After the lock is released, the original page table is restored. +diff -urNp linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S linux-2.6.32.45= /arch/x86/kernel/efi_stub_32.S +--- linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/efi_stub_32.S 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -6,6 +6,7 @@ + */ +=20 + #include ++#include + #include +=20 + /* +@@ -20,7 +21,7 @@ + * service functions will comply with gcc calling convention, too. + */ +=20 +-.text ++__INIT + ENTRY(efi_call_phys) + /* + * 0. The function can only be called in Linux kernel. So CS has been +@@ -36,9 +37,7 @@ ENTRY(efi_call_phys) + * The mapping of lower virtual memory has been created in prelog and + * epilog. + */ +- movl $1f, %edx +- subl $__PAGE_OFFSET, %edx +- jmp *%edx ++ jmp 1f-__PAGE_OFFSET + 1: +=20 + /* +@@ -47,14 +46,8 @@ ENTRY(efi_call_phys) + * parameter 2, ..., param n. To make things easy, we save the return + * address of efi_call_phys in a global variable. + */ +- popl %edx +- movl %edx, saved_return_addr +- /* get the function pointer into ECX*/ +- popl %ecx +- movl %ecx, efi_rt_function_ptr +- movl $2f, %edx +- subl $__PAGE_OFFSET, %edx +- pushl %edx ++ popl (saved_return_addr) ++ popl (efi_rt_function_ptr) +=20 + /* + * 3. Clear PG bit in %CR0. +@@ -73,9 +66,8 @@ ENTRY(efi_call_phys) + /* + * 5. Call the physical function. + */ +- jmp *%ecx ++ call *(efi_rt_function_ptr-__PAGE_OFFSET) +=20 +-2: + /* + * 6. After EFI runtime service returns, control will return to + * following instruction. We'd better readjust stack pointer first. +@@ -88,35 +80,28 @@ ENTRY(efi_call_phys) + movl %cr0, %edx + orl $0x80000000, %edx + movl %edx, %cr0 +- jmp 1f +-1: ++ + /* + * 8. Now restore the virtual mode from flat mode by + * adding EIP with PAGE_OFFSET. + */ +- movl $1f, %edx +- jmp *%edx ++ jmp 1f+__PAGE_OFFSET + 1: +=20 + /* + * 9. Balance the stack. And because EAX contain the return value, + * we'd better not clobber it. + */ +- leal efi_rt_function_ptr, %edx +- movl (%edx), %ecx +- pushl %ecx ++ pushl (efi_rt_function_ptr) +=20 + /* +- * 10. Push the saved return address onto the stack and return. ++ * 10. Return to the saved return address. + */ +- leal saved_return_addr, %edx +- movl (%edx), %ecx +- pushl %ecx +- ret ++ jmpl *(saved_return_addr) + ENDPROC(efi_call_phys) + .previous +=20 +-.data ++__INITDATA + saved_return_addr: + .long 0 + efi_rt_function_ptr: +diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_32.S linux-2.6.32.45/ar= ch/x86/kernel/entry_32.S +--- linux-2.6.32.45/arch/x86/kernel/entry_32.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/entry_32.S 2011-08-23 20:24:19.00000= 0000 -0400 +@@ -185,13 +185,146 @@ + /*CFI_REL_OFFSET gs, PT_GS*/ + .endm + .macro SET_KERNEL_GS reg ++ ++#ifdef CONFIG_CC_STACKPROTECTOR + movl $(__KERNEL_STACK_CANARY), \reg ++#elif defined(CONFIG_PAX_MEMORY_UDEREF) ++ movl $(__USER_DS), \reg ++#else ++ xorl \reg, \reg ++#endif ++ + movl \reg, %gs + .endm +=20 + #endif /* CONFIG_X86_32_LAZY_GS */ +=20 +-.macro SAVE_ALL ++.macro pax_enter_kernel ++#ifdef CONFIG_PAX_KERNEXEC ++ call pax_enter_kernel ++#endif ++.endm ++ ++.macro pax_exit_kernel ++#ifdef CONFIG_PAX_KERNEXEC ++ call pax_exit_kernel ++#endif ++.endm ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ENTRY(pax_enter_kernel) ++#ifdef CONFIG_PARAVIRT ++ pushl %eax ++ pushl %ecx ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0) ++ mov %eax, %esi ++#else ++ mov %cr0, %esi ++#endif ++ bts $16, %esi ++ jnc 1f ++ mov %cs, %esi ++ cmp $__KERNEL_CS, %esi ++ jz 3f ++ ljmp $__KERNEL_CS, $3f ++1: ljmp $__KERNEXEC_KERNEL_CS, $2f ++2: ++#ifdef CONFIG_PARAVIRT ++ mov %esi, %eax ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0) ++#else ++ mov %esi, %cr0 ++#endif ++3: ++#ifdef CONFIG_PARAVIRT ++ popl %ecx ++ popl %eax ++#endif ++ ret ++ENDPROC(pax_enter_kernel) ++ ++ENTRY(pax_exit_kernel) ++#ifdef CONFIG_PARAVIRT ++ pushl %eax ++ pushl %ecx ++#endif ++ mov %cs, %esi ++ cmp $__KERNEXEC_KERNEL_CS, %esi ++ jnz 2f ++#ifdef CONFIG_PARAVIRT ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); ++ mov %eax, %esi ++#else ++ mov %cr0, %esi ++#endif ++ btr $16, %esi ++ ljmp $__KERNEL_CS, $1f ++1: ++#ifdef CONFIG_PARAVIRT ++ mov %esi, %eax ++ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0); ++#else ++ mov %esi, %cr0 ++#endif ++2: ++#ifdef CONFIG_PARAVIRT ++ popl %ecx ++ popl %eax ++#endif ++ ret ++ENDPROC(pax_exit_kernel) ++#endif ++ ++.macro pax_erase_kstack ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++ call pax_erase_kstack ++#endif ++.endm ++ ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++/* ++ * ebp: thread_info ++ * ecx, edx: can be clobbered ++ */ ++ENTRY(pax_erase_kstack) ++ pushl %edi ++ pushl %eax ++ ++ mov TI_lowest_stack(%ebp), %edi ++ mov $-0xBEEF, %eax ++ std ++ ++1: mov %edi, %ecx ++ and $THREAD_SIZE_asm - 1, %ecx ++ shr $2, %ecx ++ repne scasl ++ jecxz 2f ++ ++ cmp $2*16, %ecx ++ jc 2f ++ ++ mov $2*16, %ecx ++ repe scasl ++ jecxz 2f ++ jne 1b ++ ++2: cld ++ mov %esp, %ecx ++ sub %edi, %ecx ++ shr $2, %ecx ++ rep stosl ++ ++ mov TI_task_thread_sp0(%ebp), %edi ++ sub $128, %edi ++ mov %edi, TI_lowest_stack(%ebp) ++ ++ popl %eax ++ popl %edi ++ ret ++ENDPROC(pax_erase_kstack) ++#endif ++ ++.macro __SAVE_ALL _DS + cld + PUSH_GS + pushl %fs +@@ -224,7 +357,7 @@ + pushl %ebx + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET ebx, 0 +- movl $(__USER_DS), %edx ++ movl $\_DS, %edx + movl %edx, %ds + movl %edx, %es + movl $(__KERNEL_PERCPU), %edx +@@ -232,6 +365,15 @@ + SET_KERNEL_GS %edx + .endm +=20 ++.macro SAVE_ALL ++#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || def= ined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF) ++ __SAVE_ALL __KERNEL_DS ++ pax_enter_kernel ++#else ++ __SAVE_ALL __USER_DS ++#endif ++.endm ++ + .macro RESTORE_INT_REGS + popl %ebx + CFI_ADJUST_CFA_OFFSET -4 +@@ -352,7 +494,15 @@ check_userspace: + movb PT_CS(%esp), %al + andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax + cmpl $USER_RPL, %eax ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ jae resume_userspace ++ ++ PAX_EXIT_KERNEL ++ jmp resume_kernel ++#else + jb resume_kernel # not returning to v8086 or userspace ++#endif +=20 + ENTRY(resume_userspace) + LOCKDEP_SYS_EXIT +@@ -364,7 +514,7 @@ ENTRY(resume_userspace) + andl $_TIF_WORK_MASK, %ecx # is there any work to be done on + # int/exception return? + jne work_pending +- jmp restore_all ++ jmp restore_all_pax + END(ret_from_exception) +=20 + #ifdef CONFIG_PREEMPT +@@ -414,25 +564,36 @@ sysenter_past_esp: + /*CFI_REL_OFFSET cs, 0*/ + /* + * Push current_thread_info()->sysenter_return to the stack. +- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words +- * pushed above; +8 corresponds to copy_thread's esp0 setting. + */ +- pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp) ++ pushl $0 + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET eip, 0 +=20 + pushl %eax + CFI_ADJUST_CFA_OFFSET 4 + SAVE_ALL ++ GET_THREAD_INFO(%ebp) ++ movl TI_sysenter_return(%ebp),%ebp ++ movl %ebp,PT_EIP(%esp) + ENABLE_INTERRUPTS(CLBR_NONE) +=20 + /* + * Load the potential sixth argument from user stack. + * Careful about security. + */ ++ movl PT_OLDESP(%esp),%ebp ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ mov PT_OLDSS(%esp),%ds ++1: movl %ds:(%ebp),%ebp ++ push %ss ++ pop %ds ++#else + cmpl $__PAGE_OFFSET-3,%ebp + jae syscall_fault + 1: movl (%ebp),%ebp ++#endif ++ + movl %ebp,PT_EBP(%esp) + .section __ex_table,"a" + .align 4 +@@ -455,12 +616,23 @@ sysenter_do_call: + testl $_TIF_ALLWORK_MASK, %ecx + jne sysexit_audit + sysenter_exit: ++ ++#ifdef CONFIG_PAX_RANDKSTACK ++ pushl_cfi %eax ++ call pax_randomize_kstack ++ popl_cfi %eax ++#endif ++ ++ pax_erase_kstack ++ + /* if something modifies registers it must also disable sysexit */ + movl PT_EIP(%esp), %edx + movl PT_OLDESP(%esp), %ecx + xorl %ebp,%ebp + TRACE_IRQS_ON + 1: mov PT_FS(%esp), %fs ++2: mov PT_DS(%esp), %ds ++3: mov PT_ES(%esp), %es + PTGS_TO_GS + ENABLE_INTERRUPTS_SYSEXIT +=20 +@@ -477,6 +649,9 @@ sysenter_audit: + movl %eax,%edx /* 2nd arg: syscall number */ + movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */ + call audit_syscall_entry ++ ++ pax_erase_kstack ++ + pushl %ebx + CFI_ADJUST_CFA_OFFSET 4 + movl PT_EAX(%esp),%eax /* reload syscall number */ +@@ -504,11 +679,17 @@ sysexit_audit: +=20 + CFI_ENDPROC + .pushsection .fixup,"ax" +-2: movl $0,PT_FS(%esp) ++4: movl $0,PT_FS(%esp) ++ jmp 1b ++5: movl $0,PT_DS(%esp) ++ jmp 1b ++6: movl $0,PT_ES(%esp) + jmp 1b + .section __ex_table,"a" + .align 4 +- .long 1b,2b ++ .long 1b,4b ++ .long 2b,5b ++ .long 3b,6b + .popsection + PTGS_TO_GS_EX + ENDPROC(ia32_sysenter_target) +@@ -538,6 +719,14 @@ syscall_exit: + testl $_TIF_ALLWORK_MASK, %ecx # current->work + jne syscall_exit_work +=20 ++restore_all_pax: ++ ++#ifdef CONFIG_PAX_RANDKSTACK ++ call pax_randomize_kstack ++#endif ++ ++ pax_erase_kstack ++ + restore_all: + TRACE_IRQS_IRET + restore_all_notrace: +@@ -602,10 +791,29 @@ ldt_ss: + mov PT_OLDESP(%esp), %eax /* load userspace esp */ + mov %dx, %ax /* eax: new kernel esp */ + sub %eax, %edx /* offset (low word is 0) */ +- PER_CPU(gdt_page, %ebx) ++#ifdef CONFIG_SMP ++ movl PER_CPU_VAR(cpu_number), %ebx ++ shll $PAGE_SHIFT_asm, %ebx ++ addl $cpu_gdt_table, %ebx ++#else ++ movl $cpu_gdt_table, %ebx ++#endif + shr $16, %edx ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ mov %cr0, %esi ++ btr $16, %esi ++ mov %esi, %cr0 ++#endif ++ + mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */ + mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ bts $16, %esi ++ mov %esi, %cr0 ++#endif ++ + pushl $__ESPFIX_SS + CFI_ADJUST_CFA_OFFSET 4 + push %eax /* new kernel esp */ +@@ -636,31 +844,25 @@ work_resched: + movl TI_flags(%ebp), %ecx + andl $_TIF_WORK_MASK, %ecx # is there any work to be done other + # than syscall tracing? +- jz restore_all ++ jz restore_all_pax + testb $_TIF_NEED_RESCHED, %cl + jnz work_resched +=20 + work_notifysig: # deal with pending signals and + # notify-resume requests ++ movl %esp, %eax + #ifdef CONFIG_VM86 + testl $X86_EFLAGS_VM, PT_EFLAGS(%esp) +- movl %esp, %eax +- jne work_notifysig_v86 # returning to kernel-space or ++ jz 1f # returning to kernel-space or + # vm86-space +- xorl %edx, %edx +- call do_notify_resume +- jmp resume_userspace_sig +=20 +- ALIGN +-work_notifysig_v86: + pushl %ecx # save ti_flags for do_notify_resume + CFI_ADJUST_CFA_OFFSET 4 + call save_v86_state # %eax contains pt_regs pointer + popl %ecx + CFI_ADJUST_CFA_OFFSET -4 + movl %eax, %esp +-#else +- movl %esp, %eax ++1: + #endif + xorl %edx, %edx + call do_notify_resume +@@ -673,6 +875,9 @@ syscall_trace_entry: + movl $-ENOSYS,PT_EAX(%esp) + movl %esp, %eax + call syscall_trace_enter ++ ++ pax_erase_kstack ++ + /* What it returned is what we'll actually use. */ + cmpl $(nr_syscalls), %eax + jnae syscall_call +@@ -695,6 +900,10 @@ END(syscall_exit_work) +=20 + RING0_INT_FRAME # can't unwind into user space anyway + syscall_fault: ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ push %ss ++ pop %ds ++#endif + GET_THREAD_INFO(%ebp) + movl $-EFAULT,PT_EAX(%esp) + jmp resume_userspace +@@ -726,6 +935,33 @@ PTREGSCALL(rt_sigreturn) + PTREGSCALL(vm86) + PTREGSCALL(vm86old) +=20 ++ ALIGN; ++ENTRY(kernel_execve) ++ push %ebp ++ sub $PT_OLDSS+4,%esp ++ push %edi ++ push %ecx ++ push %eax ++ lea 3*4(%esp),%edi ++ mov $PT_OLDSS/4+1,%ecx ++ xorl %eax,%eax ++ rep stosl ++ pop %eax ++ pop %ecx ++ pop %edi ++ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp) ++ mov %eax,PT_EBX(%esp) ++ mov %edx,PT_ECX(%esp) ++ mov %ecx,PT_EDX(%esp) ++ mov %esp,%eax ++ call sys_execve ++ GET_THREAD_INFO(%ebp) ++ test %eax,%eax ++ jz syscall_exit ++ add $PT_OLDSS+4,%esp ++ pop %ebp ++ ret ++ + .macro FIXUP_ESPFIX_STACK + /* + * Switch back for ESPFIX stack to the normal zerobased stack +@@ -735,7 +971,13 @@ PTREGSCALL(vm86old) + * normal stack and adjusts ESP with the matching offset. + */ + /* fixup the stack */ +- PER_CPU(gdt_page, %ebx) ++#ifdef CONFIG_SMP ++ movl PER_CPU_VAR(cpu_number), %ebx ++ shll $PAGE_SHIFT_asm, %ebx ++ addl $cpu_gdt_table, %ebx ++#else ++ movl $cpu_gdt_table, %ebx ++#endif + mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */ + mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */ + shl $16, %eax +@@ -1198,7 +1440,6 @@ return_to_handler: + ret + #endif +=20 +-.section .rodata,"a" + #include "syscall_table_32.S" +=20 + syscall_table_size=3D(.-sys_call_table) +@@ -1255,9 +1496,12 @@ error_code: + movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart + REG_TO_PTGS %ecx + SET_KERNEL_GS %ecx +- movl $(__USER_DS), %ecx ++ movl $(__KERNEL_DS), %ecx + movl %ecx, %ds + movl %ecx, %es ++ ++ pax_enter_kernel ++ + TRACE_IRQS_OFF + movl %esp,%eax # pt_regs pointer + call *%edi +@@ -1351,6 +1595,9 @@ nmi_stack_correct: + xorl %edx,%edx # zero error code + movl %esp,%eax # pt_regs pointer + call do_nmi ++ ++ pax_exit_kernel ++ + jmp restore_all_notrace + CFI_ENDPROC +=20 +@@ -1391,6 +1638,9 @@ nmi_espfix_stack: + FIXUP_ESPFIX_STACK # %eax =3D=3D %esp + xorl %edx,%edx # zero error code + call do_nmi ++ ++ pax_exit_kernel ++ + RESTORE_REGS + lss 12+4(%esp), %esp # back to espfix stack + CFI_ADJUST_CFA_OFFSET -24 +diff -urNp linux-2.6.32.45/arch/x86/kernel/entry_64.S linux-2.6.32.45/ar= ch/x86/kernel/entry_64.S +--- linux-2.6.32.45/arch/x86/kernel/entry_64.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/entry_64.S 2011-08-23 20:24:19.00000= 0000 -0400 +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include +=20 + /* Avoid __ASSEMBLER__'ifying just for this. */ + #include +@@ -174,6 +175,257 @@ ENTRY(native_usergs_sysret64) + ENDPROC(native_usergs_sysret64) + #endif /* CONFIG_PARAVIRT */ +=20 ++ .macro ljmpq sel, off ++#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_M= ATOM) ++ .byte 0x48; ljmp *1234f(%rip) ++ .pushsection .rodata ++ .align 16 ++ 1234: .quad \off; .word \sel ++ .popsection ++#else ++ pushq $\sel ++ pushq $\off ++ lretq ++#endif ++ .endm ++ ++ .macro pax_enter_kernel ++#ifdef CONFIG_PAX_KERNEXEC ++ call pax_enter_kernel ++#endif ++ .endm ++ ++ .macro pax_exit_kernel ++#ifdef CONFIG_PAX_KERNEXEC ++ call pax_exit_kernel ++#endif ++ .endm ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ENTRY(pax_enter_kernel) ++ pushq %rdi ++ ++#ifdef CONFIG_PARAVIRT ++ PV_SAVE_REGS(CLBR_RDI) ++#endif ++ ++ GET_CR0_INTO_RDI ++ bts $16,%rdi ++ jnc 1f ++ mov %cs,%edi ++ cmp $__KERNEL_CS,%edi ++ jz 3f ++ ljmpq __KERNEL_CS,3f ++1: ljmpq __KERNEXEC_KERNEL_CS,2f ++2: SET_RDI_INTO_CR0 ++3: ++ ++#ifdef CONFIG_PARAVIRT ++ PV_RESTORE_REGS(CLBR_RDI) ++#endif ++ ++ popq %rdi ++ retq ++ENDPROC(pax_enter_kernel) ++ ++ENTRY(pax_exit_kernel) ++ pushq %rdi ++ ++#ifdef CONFIG_PARAVIRT ++ PV_SAVE_REGS(CLBR_RDI) ++#endif ++ ++ mov %cs,%rdi ++ cmp $__KERNEXEC_KERNEL_CS,%edi ++ jnz 2f ++ GET_CR0_INTO_RDI ++ btr $16,%rdi ++ ljmpq __KERNEL_CS,1f ++1: SET_RDI_INTO_CR0 ++2: ++ ++#ifdef CONFIG_PARAVIRT ++ PV_RESTORE_REGS(CLBR_RDI); ++#endif ++ ++ popq %rdi ++ retq ++ENDPROC(pax_exit_kernel) ++#endif ++ ++ .macro pax_enter_kernel_user ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_enter_kernel_user ++#endif ++ .endm ++ ++ .macro pax_exit_kernel_user ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ call pax_exit_kernel_user ++#endif ++#ifdef CONFIG_PAX_RANDKSTACK ++ push %rax ++ call pax_randomize_kstack ++ pop %rax ++#endif ++ pax_erase_kstack ++ .endm ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ENTRY(pax_enter_kernel_user) ++ pushq %rdi ++ pushq %rbx ++ ++#ifdef CONFIG_PARAVIRT ++ PV_SAVE_REGS(CLBR_RDI) ++#endif ++ ++ GET_CR3_INTO_RDI ++ mov %rdi,%rbx ++ add $__START_KERNEL_map,%rbx ++ sub phys_base(%rip),%rbx ++ ++#ifdef CONFIG_PARAVIRT ++ pushq %rdi ++ cmpl $0, pv_info+PARAVIRT_enabled ++ jz 1f ++ i =3D 0 ++ .rept USER_PGD_PTRS ++ mov i*8(%rbx),%rsi ++ mov $0,%sil ++ lea i*8(%rbx),%rdi ++ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched) ++ i =3D i + 1 ++ .endr ++ jmp 2f ++1: ++#endif ++ ++ i =3D 0 ++ .rept USER_PGD_PTRS ++ movb $0,i*8(%rbx) ++ i =3D i + 1 ++ .endr ++ ++#ifdef CONFIG_PARAVIRT ++2: popq %rdi ++#endif ++ SET_RDI_INTO_CR3 ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ GET_CR0_INTO_RDI ++ bts $16,%rdi ++ SET_RDI_INTO_CR0 ++#endif ++ ++#ifdef CONFIG_PARAVIRT ++ PV_RESTORE_REGS(CLBR_RDI) ++#endif ++ ++ popq %rbx ++ popq %rdi ++ retq ++ENDPROC(pax_enter_kernel_user) ++ ++ENTRY(pax_exit_kernel_user) ++ push %rdi ++ ++#ifdef CONFIG_PARAVIRT ++ pushq %rbx ++ PV_SAVE_REGS(CLBR_RDI) ++#endif ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ GET_CR0_INTO_RDI ++ btr $16,%rdi ++ SET_RDI_INTO_CR0 ++#endif ++ ++ GET_CR3_INTO_RDI ++ add $__START_KERNEL_map,%rdi ++ sub phys_base(%rip),%rdi ++ ++#ifdef CONFIG_PARAVIRT ++ cmpl $0, pv_info+PARAVIRT_enabled ++ jz 1f ++ mov %rdi,%rbx ++ i =3D 0 ++ .rept USER_PGD_PTRS ++ mov i*8(%rbx),%rsi ++ mov $0x67,%sil ++ lea i*8(%rbx),%rdi ++ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched) ++ i =3D i + 1 ++ .endr ++ jmp 2f ++1: ++#endif ++ ++ i =3D 0 ++ .rept USER_PGD_PTRS ++ movb $0x67,i*8(%rdi) ++ i =3D i + 1 ++ .endr ++ ++#ifdef CONFIG_PARAVIRT ++2: PV_RESTORE_REGS(CLBR_RDI) ++ popq %rbx ++#endif ++ ++ popq %rdi ++ retq ++ENDPROC(pax_exit_kernel_user) ++#endif ++ ++.macro pax_erase_kstack ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++ call pax_erase_kstack ++#endif ++.endm ++ ++#ifdef CONFIG_PAX_MEMORY_STACKLEAK ++/* ++ * r10: thread_info ++ * rcx, rdx: can be clobbered ++ */ ++ENTRY(pax_erase_kstack) ++ pushq %rdi ++ pushq %rax ++ ++ GET_THREAD_INFO(%r10) ++ mov TI_lowest_stack(%r10), %rdi ++ mov $-0xBEEF, %rax ++ std ++ ++1: mov %edi, %ecx ++ and $THREAD_SIZE_asm - 1, %ecx ++ shr $3, %ecx ++ repne scasq ++ jecxz 2f ++ ++ cmp $2*8, %ecx ++ jc 2f ++ ++ mov $2*8, %ecx ++ repe scasq ++ jecxz 2f ++ jne 1b ++ ++2: cld ++ mov %esp, %ecx ++ sub %edi, %ecx ++ shr $3, %ecx ++ rep stosq ++ ++ mov TI_task_thread_sp0(%r10), %rdi ++ sub $256, %rdi ++ mov %rdi, TI_lowest_stack(%r10) ++ ++ popq %rax ++ popq %rdi ++ ret ++ENDPROC(pax_erase_kstack) ++#endif +=20 + .macro TRACE_IRQS_IRETQ offset=3DARGOFFSET + #ifdef CONFIG_TRACE_IRQFLAGS +@@ -317,7 +569,7 @@ ENTRY(save_args) + leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */ + movq_cfi rbp, 8 /* push %rbp */ + leaq 8(%rsp), %rbp /* mov %rsp, %ebp */ +- testl $3, CS(%rdi) ++ testb $3, CS(%rdi) + je 1f + SWAPGS + /* +@@ -409,7 +661,7 @@ ENTRY(ret_from_fork) +=20 + RESTORE_REST +=20 +- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? ++ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread? + je int_ret_from_sys_call +=20 + testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET +@@ -455,7 +707,7 @@ END(ret_from_fork) + ENTRY(system_call) + CFI_STARTPROC simple + CFI_SIGNAL_FRAME +- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET ++ CFI_DEF_CFA rsp,0 + CFI_REGISTER rip,rcx + /*CFI_REGISTER rflags,r11*/ + SWAPGS_UNSAFE_STACK +@@ -468,12 +720,13 @@ ENTRY(system_call_after_swapgs) +=20 + movq %rsp,PER_CPU_VAR(old_rsp) + movq PER_CPU_VAR(kernel_stack),%rsp ++ pax_enter_kernel_user + /* + * No need to follow this irqs off/on section - it's straight + * and short: + */ + ENABLE_INTERRUPTS(CLBR_NONE) +- SAVE_ARGS 8,1 ++ SAVE_ARGS 8*6,1 + movq %rax,ORIG_RAX-ARGOFFSET(%rsp) + movq %rcx,RIP-ARGOFFSET(%rsp) + CFI_REL_OFFSET rip,RIP-ARGOFFSET +@@ -502,6 +755,7 @@ sysret_check: + andl %edi,%edx + jnz sysret_careful + CFI_REMEMBER_STATE ++ pax_exit_kernel_user + /* + * sysretq will re-enable interrupts: + */ +@@ -562,6 +816,9 @@ auditsys: + movq %rax,%rsi /* 2nd arg: syscall number */ + movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */ + call audit_syscall_entry ++ ++ pax_erase_kstack ++ + LOAD_ARGS 0 /* reload call-clobbered registers */ + jmp system_call_fastpath +=20 +@@ -592,6 +849,9 @@ tracesys: + FIXUP_TOP_OF_STACK %rdi + movq %rsp,%rdi + call syscall_trace_enter ++ ++ pax_erase_kstack ++ + /* + * Reload arg registers from stack in case ptrace changed them. + * We don't reload %rax because syscall_trace_enter() returned +@@ -613,7 +873,7 @@ tracesys: + GLOBAL(int_ret_from_sys_call) + DISABLE_INTERRUPTS(CLBR_NONE) + TRACE_IRQS_OFF +- testl $3,CS-ARGOFFSET(%rsp) ++ testb $3,CS-ARGOFFSET(%rsp) + je retint_restore_args + movl $_TIF_ALLWORK_MASK,%edi + /* edi: mask to check */ +@@ -800,6 +1060,16 @@ END(interrupt) + CFI_ADJUST_CFA_OFFSET 10*8 + call save_args + PARTIAL_FRAME 0 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rdi) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + call \func + .endm +=20 +@@ -822,7 +1092,7 @@ ret_from_intr: + CFI_ADJUST_CFA_OFFSET -8 + exit_intr: + GET_THREAD_INFO(%rcx) +- testl $3,CS-ARGOFFSET(%rsp) ++ testb $3,CS-ARGOFFSET(%rsp) + je retint_kernel +=20 + /* Interrupt came from user space */ +@@ -844,12 +1114,14 @@ retint_swapgs: /* return to user-space=20 + * The iretq could re-enable interrupts: + */ + DISABLE_INTERRUPTS(CLBR_ANY) ++ pax_exit_kernel_user + TRACE_IRQS_IRETQ + SWAPGS + jmp restore_args +=20 + retint_restore_args: /* return to kernel space */ + DISABLE_INTERRUPTS(CLBR_ANY) ++ pax_exit_kernel + /* + * The iretq could re-enable interrupts: + */ +@@ -1032,6 +1304,16 @@ ENTRY(\sym) + CFI_ADJUST_CFA_OFFSET 15*8 + call error_entry + DEFAULT_FRAME 0 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + movq %rsp,%rdi /* pt_regs pointer */ + xorl %esi,%esi /* no error code */ + call \do_sym +@@ -1049,6 +1331,16 @@ ENTRY(\sym) + subq $15*8, %rsp + call save_paranoid + TRACE_IRQS_OFF ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + movq %rsp,%rdi /* pt_regs pointer */ + xorl %esi,%esi /* no error code */ + call \do_sym +@@ -1066,9 +1358,24 @@ ENTRY(\sym) + subq $15*8, %rsp + call save_paranoid + TRACE_IRQS_OFF ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + movq %rsp,%rdi /* pt_regs pointer */ + xorl %esi,%esi /* no error code */ +- PER_CPU(init_tss, %rbp) ++#ifdef CONFIG_SMP ++ imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp ++ lea init_tss(%rbp), %rbp ++#else ++ lea init_tss(%rip), %rbp ++#endif + subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) + call \do_sym + addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) +@@ -1085,6 +1392,16 @@ ENTRY(\sym) + CFI_ADJUST_CFA_OFFSET 15*8 + call error_entry + DEFAULT_FRAME 0 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + movq %rsp,%rdi /* pt_regs pointer */ + movq ORIG_RAX(%rsp),%rsi /* get error code */ + movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ +@@ -1104,6 +1421,16 @@ ENTRY(\sym) + call save_paranoid + DEFAULT_FRAME 0 + TRACE_IRQS_OFF ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + movq %rsp,%rdi /* pt_regs pointer */ + movq ORIG_RAX(%rsp),%rsi /* get error code */ + movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */ +@@ -1405,14 +1732,27 @@ ENTRY(paranoid_exit) + TRACE_IRQS_OFF + testl %ebx,%ebx /* swapgs needed? */ + jnz paranoid_restore +- testl $3,CS(%rsp) ++ testb $3,CS(%rsp) + jnz paranoid_userspace ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pax_exit_kernel ++ TRACE_IRQS_IRETQ 0 ++ SWAPGS_UNSAFE_STACK ++ RESTORE_ALL 8 ++ jmp irq_return ++#endif + paranoid_swapgs: ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pax_exit_kernel_user ++#else ++ pax_exit_kernel ++#endif + TRACE_IRQS_IRETQ 0 + SWAPGS_UNSAFE_STACK + RESTORE_ALL 8 + jmp irq_return + paranoid_restore: ++ pax_exit_kernel + TRACE_IRQS_IRETQ 0 + RESTORE_ALL 8 + jmp irq_return +@@ -1470,7 +1810,7 @@ ENTRY(error_entry) + movq_cfi r14, R14+8 + movq_cfi r15, R15+8 + xorl %ebx,%ebx +- testl $3,CS+8(%rsp) ++ testb $3,CS+8(%rsp) + je error_kernelspace + error_swapgs: + SWAPGS +@@ -1529,6 +1869,16 @@ ENTRY(nmi) + CFI_ADJUST_CFA_OFFSET 15*8 + call save_paranoid + DEFAULT_FRAME 0 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ testb $3, CS(%rsp) ++ jnz 1f ++ pax_enter_kernel ++ jmp 2f ++1: pax_enter_kernel_user ++2: ++#else ++ pax_enter_kernel ++#endif + /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ + movq %rsp,%rdi + movq $-1,%rsi +@@ -1539,11 +1889,25 @@ ENTRY(nmi) + DISABLE_INTERRUPTS(CLBR_NONE) + testl %ebx,%ebx /* swapgs needed? */ + jnz nmi_restore +- testl $3,CS(%rsp) ++ testb $3,CS(%rsp) + jnz nmi_userspace ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pax_exit_kernel ++ SWAPGS_UNSAFE_STACK ++ RESTORE_ALL 8 ++ jmp irq_return ++#endif + nmi_swapgs: ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pax_exit_kernel_user ++#else ++ pax_exit_kernel ++#endif + SWAPGS_UNSAFE_STACK ++ RESTORE_ALL 8 ++ jmp irq_return + nmi_restore: ++ pax_exit_kernel + RESTORE_ALL 8 + jmp irq_return + nmi_userspace: +diff -urNp linux-2.6.32.45/arch/x86/kernel/ftrace.c linux-2.6.32.45/arch= /x86/kernel/ftrace.c +--- linux-2.6.32.45/arch/x86/kernel/ftrace.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/ftrace.c 2011-05-04 17:56:20.0000000= 00 -0400 +@@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the=20 + static void *mod_code_newcode; /* holds the text to write to the IP */ +=20 + static unsigned nmi_wait_count; +-static atomic_t nmi_update_count =3D ATOMIC_INIT(0); ++static atomic_unchecked_t nmi_update_count =3D ATOMIC_INIT(0); +=20 + int ftrace_arch_read_dyn_info(char *buf, int size) + { +@@ -111,7 +111,7 @@ int ftrace_arch_read_dyn_info(char *buf, +=20 + r =3D snprintf(buf, size, "%u %u", + nmi_wait_count, +- atomic_read(&nmi_update_count)); ++ atomic_read_unchecked(&nmi_update_count)); + return r; + } +=20 +@@ -149,8 +149,10 @@ void ftrace_nmi_enter(void) + { + if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { + smp_rmb(); ++ pax_open_kernel(); + ftrace_mod_code(); +- atomic_inc(&nmi_update_count); ++ pax_close_kernel(); ++ atomic_inc_unchecked(&nmi_update_count); + } + /* Must have previous changes seen before executions */ + smp_mb(); +@@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, voi +=20 +=20 +=20 +-static unsigned char ftrace_nop[MCOUNT_INSN_SIZE]; ++static unsigned char ftrace_nop[MCOUNT_INSN_SIZE] __read_only; +=20 + static unsigned char *ftrace_nop_replace(void) + { +@@ -228,6 +230,8 @@ ftrace_modify_code(unsigned long ip, uns + { + unsigned char replaced[MCOUNT_INSN_SIZE]; +=20 ++ ip =3D ktla_ktva(ip); ++ + /* + * Note: Due to modules and __init, code can + * disappear and change, we need to protect against faulting +@@ -284,7 +288,7 @@ int ftrace_update_ftrace_func(ftrace_fun + unsigned char old[MCOUNT_INSN_SIZE], *new; + int ret; +=20 +- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE); ++ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN= _SIZE); + new =3D ftrace_call_replace(ip, (unsigned long)func); + ret =3D ftrace_modify_code(ip, old, new); +=20 +@@ -337,15 +341,15 @@ int __init ftrace_dyn_arch_init(void *da + switch (faulted) { + case 0: + pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n"); +- memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE); ++ memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE); + break; + case 1: + pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n"); +- memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE); ++ memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE); + break; + case 2: + pr_info("ftrace: converting mcount calls to jmp . + 5\n"); +- memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE); ++ memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE); + break; + } +=20 +@@ -366,6 +370,8 @@ static int ftrace_mod_jmp(unsigned long=20 + { + unsigned char code[MCOUNT_INSN_SIZE]; +=20 ++ ip =3D ktla_ktva(ip); ++ + if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) + return -EFAULT; +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/head32.c linux-2.6.32.45/arch= /x86/kernel/head32.c +--- linux-2.6.32.45/arch/x86/kernel/head32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/head32.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include +=20 + static void __init i386_default_early_setup(void) + { +@@ -31,7 +32,7 @@ void __init i386_start_kernel(void) + { + reserve_trampoline_memory(); +=20 +- reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DAT= A BSS"); ++ reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA= BSS"); +=20 + #ifdef CONFIG_BLK_DEV_INITRD + /* Reserve INITRD */ +diff -urNp linux-2.6.32.45/arch/x86/kernel/head_32.S linux-2.6.32.45/arc= h/x86/kernel/head_32.S +--- linux-2.6.32.45/arch/x86/kernel/head_32.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/head_32.S 2011-07-06 19:53:33.000000= 000 -0400 +@@ -19,10 +19,17 @@ + #include + #include + #include ++#include +=20 + /* Physical address */ + #define pa(X) ((X) - __PAGE_OFFSET) +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++#define ta(X) (X) ++#else ++#define ta(X) ((X) - __PAGE_OFFSET) ++#endif ++ + /* + * References to members of the new_cpu_data structure. + */ +@@ -52,11 +59,7 @@ + * and small than max_low_pfn, otherwise will waste some page table ent= ries + */ +=20 +-#if PTRS_PER_PMD > 1 +-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD= ) +-#else +-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD) +-#endif ++#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE) +=20 + /* Enough space to fit pagetables for the low memory linear map */ + MAPPING_BEYOND_END =3D \ +@@ -73,6 +76,12 @@ INIT_MAP_SIZE =3D PAGE_TABLE_SIZE(KERNEL_P + RESERVE_BRK(pagetables, INIT_MAP_SIZE) +=20 + /* ++ * Real beginning of normal "text" segment ++ */ ++ENTRY(stext) ++ENTRY(_stext) ++ ++/* + * 32-bit kernel entrypoint; only used by the boot CPU. On entry, + * %esi points to the real-mode code as a 32-bit pointer. + * CS and DS must be 4 GB flat segments, but we don't depend on +@@ -80,7 +89,16 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) + * can. + */ + __HEAD ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ jmp startup_32 ++/* PaX: fill first page in .text with int3 to catch NULL derefs in kern= el mode */ ++.fill PAGE_SIZE-5,1,0xcc ++#endif ++ + ENTRY(startup_32) ++ movl pa(stack_start),%ecx ++ + /* test KEEP_SEGMENTS flag to see if the bootloader is asking + us to not reload segments */ + testb $(1<<6), BP_loadflags(%esi) +@@ -95,7 +113,60 @@ ENTRY(startup_32) + movl %eax,%es + movl %eax,%fs + movl %eax,%gs ++ movl %eax,%ss + 2: ++ leal -__PAGE_OFFSET(%ecx),%esp ++ ++#ifdef CONFIG_SMP ++ movl $pa(cpu_gdt_table),%edi ++ movl $__per_cpu_load,%eax ++ movw %ax,__KERNEL_PERCPU + 2(%edi) ++ rorl $16,%eax ++ movb %al,__KERNEL_PERCPU + 4(%edi) ++ movb %ah,__KERNEL_PERCPU + 7(%edi) ++ movl $__per_cpu_end - 1,%eax ++ subl $__per_cpu_start,%eax ++ movw %ax,__KERNEL_PERCPU + 0(%edi) ++#endif ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ movl $NR_CPUS,%ecx ++ movl $pa(cpu_gdt_table),%edi ++1: ++ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTR= Y_KERNEL_DS * 8 + 4(%edi) ++ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTR= Y_DEFAULT_USER_CS * 8 + 4(%edi) ++ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTR= Y_DEFAULT_USER_DS * 8 + 4(%edi) ++ addl $PAGE_SIZE_asm,%edi ++ loop 1b ++#endif ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ movl $pa(boot_gdt),%edi ++ movl $__LOAD_PHYSICAL_ADDR,%eax ++ movw %ax,__BOOT_CS + 2(%edi) ++ rorl $16,%eax ++ movb %al,__BOOT_CS + 4(%edi) ++ movb %ah,__BOOT_CS + 7(%edi) ++ rorl $16,%eax ++ ++ ljmp $(__BOOT_CS),$1f ++1: ++ ++ movl $NR_CPUS,%ecx ++ movl $pa(cpu_gdt_table),%edi ++ addl $__PAGE_OFFSET,%eax ++1: ++ movw %ax,__KERNEL_CS + 2(%edi) ++ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi) ++ rorl $16,%eax ++ movb %al,__KERNEL_CS + 4(%edi) ++ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi) ++ movb %ah,__KERNEL_CS + 7(%edi) ++ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi) ++ rorl $16,%eax ++ addl $PAGE_SIZE_asm,%edi ++ loop 1b ++#endif +=20 + /* + * Clear BSS first so that there are no surprises... +@@ -140,9 +211,7 @@ ENTRY(startup_32) + cmpl $num_subarch_entries, %eax + jae bad_subarch +=20 +- movl pa(subarch_entries)(,%eax,4), %eax +- subl $__PAGE_OFFSET, %eax +- jmp *%eax ++ jmp *pa(subarch_entries)(,%eax,4) +=20 + bad_subarch: + WEAK(lguest_entry) +@@ -154,10 +223,10 @@ WEAK(xen_entry) + __INITDATA +=20 + 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 =3D (. - subarch_entries) / 4 + .previous + #endif /* CONFIG_PARAVIRT */ +@@ -218,8 +287,11 @@ default_entry: + movl %eax, pa(max_pfn_mapped) +=20 + /* Do early initialization of the fixmap area */ +- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax +- movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8) ++#ifdef CONFIG_COMPAT_VDSO ++ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pm= d+0x1000*KPMDS-8) ++#else ++ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KP= MDS-8) ++#endif + #else /* Not PAE */ +=20 + page_pde_offset =3D (__PAGE_OFFSET >> 20); +@@ -249,8 +321,11 @@ page_pde_offset =3D (__PAGE_OFFSET >> 20); + movl %eax, pa(max_pfn_mapped) +=20 + /* Do early initialization of the fixmap area */ +- movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax +- movl %eax,pa(swapper_pg_dir+0xffc) ++#ifdef CONFIG_COMPAT_VDSO ++ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_di= r+0xffc) ++#else ++ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc) ++#endif + #endif + jmp 3f + /* +@@ -272,6 +347,9 @@ ENTRY(startup_32_smp) + movl %eax,%es + movl %eax,%fs + movl %eax,%gs ++ movl pa(stack_start),%ecx ++ movl %eax,%ss ++ leal -__PAGE_OFFSET(%ecx),%esp + #endif /* CONFIG_SMP */ + 3: +=20 +@@ -297,6 +375,7 @@ ENTRY(startup_32_smp) + orl %edx,%eax + movl %eax,%cr4 +=20 ++#ifdef CONFIG_X86_PAE + btl $5, %eax # check if PAE is enabled + jnc 6f +=20 +@@ -305,6 +384,10 @@ ENTRY(startup_32_smp) + cpuid + cmpl $0x80000000, %eax + jbe 6f ++ ++ /* Clear bogus XD_DISABLE bits */ ++ call verify_cpu ++ + mov $0x80000001, %eax + cpuid + /* Execute Disable bit supported? */ +@@ -312,13 +395,17 @@ ENTRY(startup_32_smp) + jnc 6f +=20 + /* Setup EFER (Extended Feature Enable Register) */ +- movl $0xc0000080, %ecx ++ movl $MSR_EFER, %ecx + rdmsr +=20 + btsl $11, %eax + /* Make changes effective */ + wrmsr +=20 ++ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4) ++ movl $1,pa(nx_enabled) ++#endif ++ + 6: +=20 + /* +@@ -331,8 +418,8 @@ ENTRY(startup_32_smp) + movl %eax,%cr0 /* ..and set paging (PG) bit */ + ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */ + 1: +- /* Set up the stack pointer */ +- lss stack_start,%esp ++ /* Shift the stack pointer to a virtual address */ ++ addl $__PAGE_OFFSET, %esp +=20 + /* + * Initialize eflags. Some BIOS's leave bits like NT set. This would +@@ -344,9 +431,7 @@ ENTRY(startup_32_smp) +=20 + #ifdef CONFIG_SMP + cmpb $0, ready +- jz 1f /* Initial CPU cleans BSS */ +- jmp checkCPUtype +-1: ++ jnz checkCPUtype + #endif /* CONFIG_SMP */ +=20 + /* +@@ -424,7 +509,7 @@ is386: movl $2,%ecx # set MP + 1: movl $(__KERNEL_DS),%eax # reload all the segment registers + movl %eax,%ss # after changing gdt. +=20 +- movl $(__USER_DS),%eax # DS/ES contains default USER segment ++# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment + movl %eax,%ds + movl %eax,%es +=20 +@@ -438,15 +523,22 @@ is386: movl $2,%ecx # set MP + */ + cmpb $0,ready + jne 1f +- movl $per_cpu__gdt_page,%eax ++ movl $cpu_gdt_table,%eax + movl $per_cpu__stack_canary,%ecx ++#ifdef CONFIG_SMP ++ addl $__per_cpu_load,%ecx ++#endif + movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) + shrl $16, %ecx + movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) + movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax) + 1: +-#endif + movl $(__KERNEL_STACK_CANARY),%eax ++#elif defined(CONFIG_PAX_MEMORY_UDEREF) ++ movl $(__USER_DS),%eax ++#else ++ xorl %eax,%eax ++#endif + movl %eax,%gs +=20 + xorl %eax,%eax # Clear LDT +@@ -454,14 +546,7 @@ is386: movl $2,%ecx # set MP +=20 + cld # gcc2 wants the direction flag cleared at all times + pushl $0 # fake return address for unwinder +-#ifdef CONFIG_SMP +- movb ready, %cl + movb $1, ready +- cmpb $0,%cl # the first CPU calls start_kernel +- je 1f +- movl (stack_start), %esp +-1: +-#endif /* CONFIG_SMP */ + jmp *(initial_code) +=20 + /* +@@ -546,22 +631,22 @@ early_page_fault: + jmp early_fault +=20 + early_fault: +- cld + #ifdef CONFIG_PRINTK ++ cmpl $1,%ss:early_recursion_flag ++ je hlt_loop ++ incl %ss:early_recursion_flag ++ cld + pusha + movl $(__KERNEL_DS),%eax + movl %eax,%ds + movl %eax,%es +- cmpl $2,early_recursion_flag +- je hlt_loop +- incl early_recursion_flag + movl %cr2,%eax + pushl %eax + pushl %edx /* trapno */ + pushl $fault_msg + call printk ++; call dump_stack + #endif +- call dump_stack + hlt_loop: + hlt + jmp hlt_loop +@@ -569,8 +654,11 @@ hlt_loop: + /* This is the default interrupt "handler" :-) */ + ALIGN + ignore_int: +- cld + #ifdef CONFIG_PRINTK ++ cmpl $2,%ss:early_recursion_flag ++ je hlt_loop ++ incl %ss:early_recursion_flag ++ cld + pushl %eax + pushl %ecx + pushl %edx +@@ -579,9 +667,6 @@ ignore_int: + movl $(__KERNEL_DS),%eax + movl %eax,%ds + movl %eax,%es +- cmpl $2,early_recursion_flag +- je hlt_loop +- incl early_recursion_flag + pushl 16(%esp) + pushl 24(%esp) + pushl 32(%esp) +@@ -600,6 +685,8 @@ ignore_int: + #endif + iret +=20 ++#include "verify_cpu.S" ++ + __REFDATA + .align 4 + ENTRY(initial_code) +@@ -610,31 +697,47 @@ ENTRY(initial_page_table) + /* + * BSS section + */ +-__PAGE_ALIGNED_BSS +- .align PAGE_SIZE_asm + #ifdef CONFIG_X86_PAE ++.section .swapper_pg_pmd,"a",@progbits + swapper_pg_pmd: + .fill 1024*KPMDS,4,0 + #else ++.section .swapper_pg_dir,"a",@progbits + ENTRY(swapper_pg_dir) + .fill 1024,4,0 + #endif ++.section .swapper_pg_fixmap,"a",@progbits + swapper_pg_fixmap: + .fill 1024,4,0 + #ifdef CONFIG_X86_TRAMPOLINE ++.section .trampoline_pg_dir,"a",@progbits + ENTRY(trampoline_pg_dir) ++#ifdef CONFIG_X86_PAE ++ .fill 4,8,0 ++#else + .fill 1024,4,0 + #endif ++#endif ++ ++.section .empty_zero_page,"a",@progbits + ENTRY(empty_zero_page) + .fill 4096,1,0 +=20 + /* ++ * The IDT has to be page-aligned to simplify the Pentium ++ * F0 0F bug workaround.. We have a special link segment ++ * for this. ++ */ ++.section .idt,"a",@progbits ++ENTRY(idt_table) ++ .fill 256,8,0 ++ ++/* + * This starts the data section. + */ + #ifdef CONFIG_X86_PAE +-__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 =3D=3D 3 +@@ -653,15 +756,24 @@ ENTRY(swapper_pg_dir) + # error "Kernel PMDs should be 1, 2 or 3" + # endif + .align PAGE_SIZE_asm /* needs to be page-sized too */ ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ENTRY(cpu_pgd) ++ .rept NR_CPUS ++ .fill 4,8,0 ++ .endr ++#endif ++ + #endif +=20 + .data ++.balign 4 + ENTRY(stack_start) +- .long init_thread_union+THREAD_SIZE +- .long __BOOT_DS ++ .long init_thread_union+THREAD_SIZE-8 +=20 + ready: .byte 0 +=20 ++.section .rodata,"a",@progbits + early_recursion_flag: + .long 0 +=20 +@@ -697,7 +809,7 @@ fault_msg: + .word 0 # 32 bit align gdt_desc.address + boot_gdt_descr: + .word __BOOT_DS+7 +- .long boot_gdt - __PAGE_OFFSET ++ .long pa(boot_gdt) +=20 + .word 0 # 32-bit align idt_desc.address + idt_descr: +@@ -708,7 +820,7 @@ idt_descr: + .word 0 # 32 bit align gdt_desc.address + ENTRY(early_gdt_descr) + .word GDT_ENTRIES*8-1 +- .long per_cpu__gdt_page /* Overwritten for secondary CPUs */ ++ .long cpu_gdt_table /* Overwritten for secondary CPUs */ +=20 + /* + * The boot_gdt must mirror the equivalent in setup.S and is +@@ -717,5 +829,65 @@ ENTRY(early_gdt_descr) + .align L1_CACHE_BYTES + ENTRY(boot_gdt) + .fill GDT_ENTRY_BOOT_CS,8,0 +- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */ +- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */ ++ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */ ++ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */ ++ ++ .align PAGE_SIZE_asm ++ENTRY(cpu_gdt_table) ++ .rept NR_CPUS ++ .quad 0x0000000000000000 /* NULL descriptor */ ++ .quad 0x0000000000000000 /* 0x0b reserved */ ++ .quad 0x0000000000000000 /* 0x13 reserved */ ++ .quad 0x0000000000000000 /* 0x1b reserved */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x000000= 00 */ ++#else ++ .quad 0x0000000000000000 /* 0x20 unused */ ++#endif ++ ++ .quad 0x0000000000000000 /* 0x28 unused */ ++ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */ ++ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */ ++ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */ ++ .quad 0x0000000000000000 /* 0x4b reserved */ ++ .quad 0x0000000000000000 /* 0x53 reserved */ ++ .quad 0x0000000000000000 /* 0x5b reserved */ ++ ++ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */ ++ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */ ++ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */ ++ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */ ++ ++ .quad 0x0000000000000000 /* 0x80 TSS descriptor */ ++ .quad 0x0000000000000000 /* 0x88 LDT descriptor */ ++ ++ /* ++ * Segments used for calling PnP BIOS have byte granularity. ++ * The code segments and data segments have fixed 64k limits, ++ * the transfer segment sizes are set at run time. ++ */ ++ .quad 0x00409b000000ffff /* 0x90 32-bit code */ ++ .quad 0x00009b000000ffff /* 0x98 16-bit code */ ++ .quad 0x000093000000ffff /* 0xa0 16-bit data */ ++ .quad 0x0000930000000000 /* 0xa8 16-bit data */ ++ .quad 0x0000930000000000 /* 0xb0 16-bit data */ ++ ++ /* ++ * The APM segments have byte granularity and their bases ++ * are set at run time. All have 64k limits. ++ */ ++ .quad 0x00409b000000ffff /* 0xb8 APM CS code */ ++ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */ ++ .quad 0x004093000000ffff /* 0xc8 APM DS data */ ++ ++ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */ ++ .quad 0x0040930000000000 /* 0xd8 - PERCPU */ ++ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */ ++ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */ ++ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */ ++ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ ++ ++ /* 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.32.45/arch/x86/kernel/head_64.S linux-2.6.32.45/arc= h/x86/kernel/head_64.S +--- linux-2.6.32.45/arch/x86/kernel/head_64.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/head_64.S 2011-04-17 15:56:46.000000= 000 -0400 +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include +=20 + #ifdef CONFIG_PARAVIRT + #include +@@ -38,6 +39,10 @@ L4_PAGE_OFFSET =3D pgd_index(__PAGE_OFFSET + L3_PAGE_OFFSET =3D pud_index(__PAGE_OFFSET) + L4_START_KERNEL =3D pgd_index(__START_KERNEL_map) + L3_START_KERNEL =3D pud_index(__START_KERNEL_map) ++L4_VMALLOC_START =3D pgd_index(VMALLOC_START) ++L3_VMALLOC_START =3D pud_index(VMALLOC_START) ++L4_VMEMMAP_START =3D pgd_index(VMEMMAP_START) ++L3_VMEMMAP_START =3D pud_index(VMEMMAP_START) +=20 + .text + __HEAD +@@ -85,35 +90,22 @@ startup_64: + */ + addq %rbp, init_level4_pgt + 0(%rip) + addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip) ++ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip) ++ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip) + addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip) +=20 + addq %rbp, level3_ident_pgt + 0(%rip) ++#ifndef CONFIG_XEN ++ addq %rbp, level3_ident_pgt + 8(%rip) ++#endif +=20 +- addq %rbp, level3_kernel_pgt + (510*8)(%rip) +- addq %rbp, level3_kernel_pgt + (511*8)(%rip) ++ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip) +=20 +- addq %rbp, level2_fixmap_pgt + (506*8)(%rip) ++ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip) ++ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip) +=20 +- /* Add an Identity mapping if I am above 1G */ +- leaq _text(%rip), %rdi +- andq $PMD_PAGE_MASK, %rdi +- +- movq %rdi, %rax +- shrq $PUD_SHIFT, %rax +- andq $(PTRS_PER_PUD - 1), %rax +- jz ident_complete +- +- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %r= dx +- leaq level3_ident_pgt(%rip), %rbx +- movq %rdx, 0(%rbx, %rax, 8) +- +- movq %rdi, %rax +- shrq $PMD_SHIFT, %rax +- andq $(PTRS_PER_PMD - 1), %rax +- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx +- leaq level2_spare_pgt(%rip), %rbx +- movq %rdx, 0(%rbx, %rax, 8) +-ident_complete: ++ addq %rbp, level2_fixmap_pgt + (506*8)(%rip) ++ addq %rbp, level2_fixmap_pgt + (507*8)(%rip) +=20 + /* + * Fixup the kernel text+data virtual addresses. Note that +@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64) + * after the boot processor executes this code. + */ +=20 +- /* Enable PAE mode and PGE */ +- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax ++ /* Enable PAE mode and PSE/PGE */ ++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax + movq %rax, %cr4 +=20 + /* Setup early boot stage 4 level pagetables. */ +@@ -184,9 +176,13 @@ ENTRY(secondary_startup_64) + movl $MSR_EFER, %ecx + rdmsr + btsl $_EFER_SCE, %eax /* Enable System Call */ +- btl $20,%edi /* No Execute supported? */ ++ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */ + jnc 1f + btsl $_EFER_NX, %eax ++ leaq init_level4_pgt(%rip), %rdi ++ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi) ++ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi) ++ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi) + 1: wrmsr /* Make changes effective */ +=20 + /* Setup cr0 */ +@@ -262,16 +258,16 @@ ENTRY(secondary_startup_64) + .quad x86_64_start_kernel + ENTRY(initial_gs) + .quad INIT_PER_CPU_VAR(irq_stack_union) +- __FINITDATA +=20 + ENTRY(stack_start) + .quad init_thread_union+THREAD_SIZE-8 + .word 0 ++ __FINITDATA +=20 + bad_address: + jmp bad_address +=20 +- .section ".init.text","ax" ++ __INIT + #ifdef CONFIG_EARLY_PRINTK + .globl early_idt_handlers + early_idt_handlers: +@@ -316,18 +312,23 @@ ENTRY(early_idt_handler) + #endif /* EARLY_PRINTK */ + 1: hlt + jmp 1b ++ .previous +=20 + #ifdef CONFIG_EARLY_PRINTK ++ __INITDATA + early_recursion_flag: + .long 0 ++ .previous +=20 ++ .section .rodata,"a",@progbits + early_idt_msg: + .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n" + early_idt_ripmsg: + .asciz "RIP %s\n" +-#endif /* CONFIG_EARLY_PRINTK */ + .previous ++#endif /* CONFIG_EARLY_PRINTK */ +=20 ++ .section .rodata,"a",@progbits + #define NEXT_PAGE(name) \ + .balign PAGE_SIZE; \ + ENTRY(name) +@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt) + .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE + .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 + .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE ++ .org init_level4_pgt + L4_VMALLOC_START*8, 0 ++ .quad level3_vmalloc_pgt - __START_KERNEL_map + _KERNPG_TABLE ++ .org init_level4_pgt + L4_VMEMMAP_START*8, 0 ++ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE + .org init_level4_pgt + L4_START_KERNEL*8, 0 + /* (2^48-(2*1024*1024*1024))/(2^39) =3D 511 */ + .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE +=20 ++#ifdef CONFIG_PAX_PER_CPU_PGD ++NEXT_PAGE(cpu_pgd) ++ .rept NR_CPUS ++ .fill 512,8,0 ++ .endr ++#endif ++ + NEXT_PAGE(level3_ident_pgt) + .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE ++#ifdef CONFIG_XEN + .fill 511,8,0 ++#else ++ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABL= E ++ .fill 510,8,0 ++#endif ++ ++NEXT_PAGE(level3_vmalloc_pgt) ++ .fill 512,8,0 ++ ++NEXT_PAGE(level3_vmemmap_pgt) ++ .fill L3_VMEMMAP_START,8,0 ++ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE +=20 + NEXT_PAGE(level3_kernel_pgt) + .fill L3_START_KERNEL,8,0 +@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt) + .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE + .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE +=20 ++NEXT_PAGE(level2_vmemmap_pgt) ++ .fill 512,8,0 ++ + NEXT_PAGE(level2_fixmap_pgt) +- .fill 506,8,0 +- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE +- /* 8MB reserved for vsyscalls + a 2MB hole =3D 4 + 1 entries */ +- .fill 5,8,0 ++ .fill 507,8,0 ++ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE ++ /* 6MB reserved for vsyscalls + a 2MB hole =3D 3 + 1 entries */ ++ .fill 4,8,0 +=20 +-NEXT_PAGE(level1_fixmap_pgt) ++NEXT_PAGE(level1_vsyscall_pgt) + .fill 512,8,0 +=20 +-NEXT_PAGE(level2_ident_pgt) +- /* Since I easily can, map the first 1G. ++ /* Since I easily can, map the first 2G. + * Don't set NX because code runs from these pages. + */ +- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD) ++NEXT_PAGE(level2_ident_pgt) ++ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD) +=20 + NEXT_PAGE(level2_kernel_pgt) + /* +@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt) + * If you want to increase this then increase MODULES_VADDR + * too.) + */ +- PMDS(0, __PAGE_KERNEL_LARGE_EXEC, +- KERNEL_IMAGE_SIZE/PMD_SIZE) +- +-NEXT_PAGE(level2_spare_pgt) +- .fill 512, 8, 0 ++ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE) +=20 + #undef PMDS + #undef NEXT_PAGE +=20 +- .data ++ .align PAGE_SIZE ++ENTRY(cpu_gdt_table) ++ .rept NR_CPUS ++ .quad 0x0000000000000000 /* NULL descriptor */ ++ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */ ++ .quad 0x00af9b000000ffff /* __KERNEL_CS */ ++ .quad 0x00cf93000000ffff /* __KERNEL_DS */ ++ .quad 0x00cffb000000ffff /* __USER32_CS */ ++ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */ ++ .quad 0x00affb000000ffff /* __USER_CS */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */ ++#else ++ .quad 0x0 /* unused */ ++#endif ++ ++ .quad 0,0 /* TSS */ ++ .quad 0,0 /* LDT */ ++ .quad 0,0,0 /* three TLS descriptors */ ++ .quad 0x0000f40000000000 /* node/CPU stored in limit */ ++ /* asm/segment.h:GDT_ENTRIES must match this */ ++ ++ /* zero the remaining page */ ++ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0 ++ .endr ++ + .align 16 + .globl early_gdt_descr + early_gdt_descr: + .word GDT_ENTRIES*8-1 + early_gdt_descr_base: +- .quad INIT_PER_CPU_VAR(gdt_page) ++ .quad cpu_gdt_table +=20 + ENTRY(phys_base) + /* This must match the first entry in level2_kernel_pgt */ + .quad 0x0000000000000000 +=20 + #include "../../x86/xen/xen-head.S" +-=09 +- .section .bss, "aw", @nobits ++ ++ .section .rodata,"a",@progbits + .align L1_CACHE_BYTES + ENTRY(idt_table) +- .skip IDT_ENTRIES * 16 ++ .fill 512,8,0 +=20 + __PAGE_ALIGNED_BSS + .align PAGE_SIZE +diff -urNp linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c linux-2.6.32.= 45/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/i386_ksyms_32.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); + EXPORT_SYMBOL(cmpxchg8b_emu); + #endif +=20 ++EXPORT_SYMBOL_GPL(cpu_gdt_table); ++ + /* Networking helper routines. */ + EXPORT_SYMBOL(csum_partial_copy_generic); ++EXPORT_SYMBOL(csum_partial_copy_generic_to_user); ++EXPORT_SYMBOL(csum_partial_copy_generic_from_user); +=20 + EXPORT_SYMBOL(__get_user_1); + EXPORT_SYMBOL(__get_user_2); +@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr); +=20 + EXPORT_SYMBOL(csum_partial); + EXPORT_SYMBOL(empty_zero_page); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); ++#endif +diff -urNp linux-2.6.32.45/arch/x86/kernel/i8259.c linux-2.6.32.45/arch/= x86/kernel/i8259.c +--- linux-2.6.32.45/arch/x86/kernel/i8259.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/i8259.c 2011-05-04 17:56:28.00000000= 0 -0400 +@@ -208,7 +208,7 @@ spurious_8259A_irq: + "spurious 8259A interrupt: IRQ%d.\n", irq); + spurious_irq_mask |=3D irqmask; + } +- atomic_inc(&irq_err_count); ++ atomic_inc_unchecked(&irq_err_count); + /* + * Theoretically we do not have to handle this IRQ, + * but in Linux this does not cause problems and is +diff -urNp linux-2.6.32.45/arch/x86/kernel/init_task.c linux-2.6.32.45/a= rch/x86/kernel/init_task.c +--- linux-2.6.32.45/arch/x86/kernel/init_task.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/init_task.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -20,8 +20,7 @@ static struct sighand_struct init_sighan + * way process stacks are handled. This is done by having a special + * "init_task" linker map entry.. + */ +-union thread_union init_thread_union __init_task_data =3D +- { INIT_THREAD_INFO(init_task) }; ++union thread_union init_thread_union __init_task_data; +=20 + /* + * Initial task structure. +@@ -38,5 +37,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. + */ +-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) =3D INIT_TSS= ; +- ++struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_s= mp =3D { [0 ... NR_CPUS-1] =3D INIT_TSS }; ++EXPORT_SYMBOL(init_tss); +diff -urNp linux-2.6.32.45/arch/x86/kernel/ioport.c linux-2.6.32.45/arch= /x86/kernel/ioport.c +--- linux-2.6.32.45/arch/x86/kernel/ioport.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/ioport.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long +=20 + if ((from + num <=3D from) || (from + num > IO_BITMAP_BITS)) + return -EINVAL; ++#ifdef CONFIG_GRKERNSEC_IO ++ if (turn_on && grsec_disable_privio) { ++ gr_handle_ioperm(); ++ return -EPERM; ++ } ++#endif + if (turn_on && !capable(CAP_SYS_RAWIO)) + return -EPERM; +=20 +@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long + * because the ->io_bitmap_max value must match the bitmap + * contents: + */ +- tss =3D &per_cpu(init_tss, get_cpu()); ++ tss =3D init_tss + get_cpu(); +=20 + set_bitmap(t->io_bitmap_ptr, from, num, !turn_on); +=20 +@@ -111,6 +118,12 @@ static int do_iopl(unsigned int level, s + return -EINVAL; + /* Trying to gain more privileges? */ + if (level > old) { ++#ifdef CONFIG_GRKERNSEC_IO ++ if (grsec_disable_privio) { ++ gr_handle_iopl(); ++ return -EPERM; ++ } ++#endif + if (!capable(CAP_SYS_RAWIO)) + return -EPERM; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/irq_32.c linux-2.6.32.45/arch= /x86/kernel/irq_32.c +--- linux-2.6.32.45/arch/x86/kernel/irq_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/irq_32.c 2011-07-06 19:53:33.0000000= 00 -0400 +@@ -35,7 +35,7 @@ static int check_stack_overflow(void) + __asm__ __volatile__("andl %%esp,%0" : + "=3Dr" (sp) : "0" (THREAD_SIZE - 1)); +=20 +- return sp < (sizeof(struct thread_info) + STACK_WARN); ++ return sp < STACK_WARN; + } +=20 + static void print_stack_overflow(void) +@@ -54,9 +54,9 @@ static inline void print_stack_overflow( + * per-CPU IRQ handling contexts (thread information and stack) + */ + union irq_ctx { +- struct thread_info tinfo; +- u32 stack[THREAD_SIZE/sizeof(u32)]; +-} __attribute__((aligned(PAGE_SIZE))); ++ unsigned long previous_esp; ++ u32 stack[THREAD_SIZE/sizeof(u32)]; ++} __attribute__((aligned(THREAD_SIZE))); +=20 + static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx); + static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx); +@@ -78,10 +78,9 @@ static void call_on_stack(void *func, vo + static inline int + execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) + { +- union irq_ctx *curctx, *irqctx; ++ union irq_ctx *irqctx; + u32 *isp, arg1, arg2; +=20 +- curctx =3D (union irq_ctx *) current_thread_info(); + irqctx =3D __get_cpu_var(hardirq_ctx); +=20 + /* +@@ -90,21 +89,16 @@ execute_on_irq_stack(int overflow, struc + * handler) we can't do that and just have to keep using the + * current stack (which is the irq stack already after all) + */ +- if (unlikely(curctx =3D=3D irqctx)) ++ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_S= IZE)) + return 0; +=20 + /* build the stack frame on the IRQ stack */ +- isp =3D (u32 *) ((char *)irqctx + sizeof(*irqctx)); +- irqctx->tinfo.task =3D curctx->tinfo.task; +- irqctx->tinfo.previous_esp =3D current_stack_pointer; ++ isp =3D (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8); ++ irqctx->previous_esp =3D current_stack_pointer; +=20 +- /* +- * Copy the softirq bits in preempt_count so that the +- * softirq checks work in the hardirq context. +- */ +- irqctx->tinfo.preempt_count =3D +- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) | +- (curctx->tinfo.preempt_count & SOFTIRQ_MASK); ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ __set_fs(MAKE_MM_SEG(0)); ++#endif +=20 + if (unlikely(overflow)) + call_on_stack(print_stack_overflow, isp); +@@ -116,6 +110,11 @@ execute_on_irq_stack(int overflow, struc + : "0" (irq), "1" (desc), "2" (isp), + "D" (desc->handle_irq) + : "memory", "cc", "ecx"); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ __set_fs(current_thread_info()->addr_limit); ++#endif ++ + return 1; + } +=20 +@@ -124,28 +123,11 @@ execute_on_irq_stack(int overflow, struc + */ + void __cpuinit irq_ctx_init(int cpu) + { +- union irq_ctx *irqctx; +- + if (per_cpu(hardirq_ctx, cpu)) + return; +=20 +- irqctx =3D &per_cpu(hardirq_stack, cpu); +- irqctx->tinfo.task =3D NULL; +- irqctx->tinfo.exec_domain =3D NULL; +- irqctx->tinfo.cpu =3D cpu; +- irqctx->tinfo.preempt_count =3D HARDIRQ_OFFSET; +- irqctx->tinfo.addr_limit =3D MAKE_MM_SEG(0); +- +- per_cpu(hardirq_ctx, cpu) =3D irqctx; +- +- irqctx =3D &per_cpu(softirq_stack, cpu); +- irqctx->tinfo.task =3D NULL; +- irqctx->tinfo.exec_domain =3D NULL; +- irqctx->tinfo.cpu =3D cpu; +- irqctx->tinfo.preempt_count =3D 0; +- irqctx->tinfo.addr_limit =3D MAKE_MM_SEG(0); +- +- per_cpu(softirq_ctx, cpu) =3D irqctx; ++ per_cpu(hardirq_ctx, cpu) =3D &per_cpu(hardirq_stack, cpu); ++ per_cpu(softirq_ctx, cpu) =3D &per_cpu(softirq_stack, cpu); +=20 + printk(KERN_DEBUG "CPU %u irqstacks, hard=3D%p soft=3D%p\n", + cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu)); +@@ -159,7 +141,6 @@ void irq_ctx_exit(int cpu) + asmlinkage void do_softirq(void) + { + unsigned long flags; +- struct thread_info *curctx; + union irq_ctx *irqctx; + u32 *isp; +=20 +@@ -169,15 +150,22 @@ asmlinkage void do_softirq(void) + local_irq_save(flags); +=20 + if (local_softirq_pending()) { +- curctx =3D current_thread_info(); + irqctx =3D __get_cpu_var(softirq_ctx); +- irqctx->tinfo.task =3D curctx->task; +- irqctx->tinfo.previous_esp =3D current_stack_pointer; ++ irqctx->previous_esp =3D current_stack_pointer; +=20 + /* build the stack frame on the softirq stack */ +- isp =3D (u32 *) ((char *)irqctx + sizeof(*irqctx)); ++ isp =3D (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ __set_fs(MAKE_MM_SEG(0)); ++#endif +=20 + call_on_stack(__do_softirq, isp); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ __set_fs(current_thread_info()->addr_limit); ++#endif ++ + /* + * Shouldnt happen, we returned above if in_interrupt(): + */ +diff -urNp linux-2.6.32.45/arch/x86/kernel/irq.c linux-2.6.32.45/arch/x8= 6/kernel/irq.c +--- linux-2.6.32.45/arch/x86/kernel/irq.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/kernel/irq.c 2011-05-04 17:56:28.000000000 = -0400 +@@ -15,7 +15,7 @@ + #include + #include +=20 +-atomic_t irq_err_count; ++atomic_unchecked_t irq_err_count; +=20 + /* Function pointer for generic interrupt vector handling */ + void (*generic_interrupt_extension)(void) =3D NULL; +@@ -114,9 +114,9 @@ static int show_other_interrupts(struct=20 + seq_printf(p, "%10u ", per_cpu(mce_poll_count, j)); + seq_printf(p, " Machine check polls\n"); + #endif +- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count))= ; ++ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_e= rr_count)); + #if defined(CONFIG_X86_IO_APIC) +- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count))= ; ++ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_m= is_count)); + #endif + return 0; + } +@@ -209,10 +209,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu) +=20 + u64 arch_irq_stat(void) + { +- u64 sum =3D atomic_read(&irq_err_count); ++ u64 sum =3D atomic_read_unchecked(&irq_err_count); +=20 + #ifdef CONFIG_X86_IO_APIC +- sum +=3D atomic_read(&irq_mis_count); ++ sum +=3D atomic_read_unchecked(&irq_mis_count); + #endif + return sum; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/kgdb.c linux-2.6.32.45/arch/x= 86/kernel/kgdb.c +--- linux-2.6.32.45/arch/x86/kernel/kgdb.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/kernel/kgdb.c 2011-05-04 17:56:20.000000000= -0400 +@@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vec +=20 + /* clear the trace bit */ + linux_regs->flags &=3D ~X86_EFLAGS_TF; +- atomic_set(&kgdb_cpu_doing_single_step, -1); ++ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1); +=20 + /* set the trace bit if we're stepping */ + if (remcomInBuffer[0] =3D=3D 's') { + linux_regs->flags |=3D X86_EFLAGS_TF; + kgdb_single_step =3D 1; +- atomic_set(&kgdb_cpu_doing_single_step, ++ atomic_set_unchecked(&kgdb_cpu_doing_single_step, + raw_smp_processor_id()); + } +=20 +@@ -476,7 +476,7 @@ static int __kgdb_notify(struct die_args + break; +=20 + case DIE_DEBUG: +- if (atomic_read(&kgdb_cpu_doing_single_step) =3D=3D ++ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) =3D=3D + raw_smp_processor_id()) { + if (user_mode(regs)) + return single_step_cont(regs, args); +@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception + return instruction_pointer(regs); + } +=20 +-struct kgdb_arch arch_kgdb_ops =3D { ++const struct kgdb_arch arch_kgdb_ops =3D { + /* Breakpoint instruction: */ + .gdb_bpt_instr =3D { 0xcc }, + .flags =3D KGDB_HW_BREAKPOINT, +diff -urNp linux-2.6.32.45/arch/x86/kernel/kprobes.c linux-2.6.32.45/arc= h/x86/kernel/kprobes.c +--- linux-2.6.32.45/arch/x86/kernel/kprobes.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/kprobes.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f + char op; + s32 raddr; + } __attribute__((packed)) * jop; +- jop =3D (struct __arch_jmp_op *)from; ++ ++ jop =3D (struct __arch_jmp_op *)(ktla_ktva(from)); ++ ++ pax_open_kernel(); + jop->raddr =3D (s32)((long)(to) - ((long)(from) + 5)); + jop->op =3D RELATIVEJUMP_INSTRUCTION; ++ pax_close_kernel(); + } +=20 + /* +@@ -193,7 +197,7 @@ static int __kprobes can_boost(kprobe_op + kprobe_opcode_t opcode; + kprobe_opcode_t *orig_opcodes =3D opcodes; +=20 +- if (search_exception_tables((unsigned long)opcodes)) ++ if (search_exception_tables(ktva_ktla((unsigned long)opcodes))) + return 0; /* Page fault may occur on this address. */ +=20 + retry: +@@ -337,7 +341,9 @@ static void __kprobes fix_riprel(struct=20 + disp =3D (u8 *) p->addr + *((s32 *) insn) - + (u8 *) p->ainsn.insn; + BUG_ON((s64) (s32) disp !=3D disp); /* Sanity check. */ ++ pax_open_kernel(); + *(s32 *)insn =3D (s32) disp; ++ pax_close_kernel(); + } + } + #endif +@@ -345,16 +351,18 @@ static void __kprobes fix_riprel(struct=20 +=20 + static void __kprobes arch_copy_kprobe(struct kprobe *p) + { +- memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t)= ); ++ pax_open_kernel(); ++ memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprob= e_opcode_t)); ++ pax_close_kernel(); +=20 + fix_riprel(p); +=20 +- if (can_boost(p->addr)) ++ if (can_boost(ktla_ktva(p->addr))) + p->ainsn.boostable =3D 0; + else + p->ainsn.boostable =3D -1; +=20 +- p->opcode =3D *p->addr; ++ p->opcode =3D *(ktla_ktva(p->addr)); + } +=20 + int __kprobes arch_prepare_kprobe(struct kprobe *p) +@@ -432,7 +440,7 @@ static void __kprobes prepare_singlestep + if (p->opcode =3D=3D BREAKPOINT_INSTRUCTION) + regs->ip =3D (unsigned long)p->addr; + else +- regs->ip =3D (unsigned long)p->ainsn.insn; ++ regs->ip =3D ktva_ktla((unsigned long)p->ainsn.insn); + } +=20 + void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, +@@ -453,7 +461,7 @@ static void __kprobes setup_singlestep(s + if (p->ainsn.boostable =3D=3D 1 && !p->post_handler) { + /* Boost up -- we can execute copied instructions directly */ + reset_current_kprobe(); +- regs->ip =3D (unsigned long)p->ainsn.insn; ++ regs->ip =3D ktva_ktla((unsigned long)p->ainsn.insn); + preempt_enable_no_resched(); + return; + } +@@ -523,7 +531,7 @@ static int __kprobes kprobe_handler(stru + struct kprobe_ctlblk *kcb; +=20 + addr =3D (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t)); +- if (*addr !=3D BREAKPOINT_INSTRUCTION) { ++ if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) !=3D BREAKPOINT= _INSTRUCTION) { + /* + * The breakpoint instruction was removed right + * after we hit it. Another cpu has removed +@@ -775,7 +783,7 @@ static void __kprobes resume_execution(s + struct pt_regs *regs, struct kprobe_ctlblk *kcb) + { + unsigned long *tos =3D stack_addr(regs); +- unsigned long copy_ip =3D (unsigned long)p->ainsn.insn; ++ unsigned long copy_ip =3D ktva_ktla((unsigned long)p->ainsn.insn); + unsigned long orig_ip =3D (unsigned long)p->addr; + kprobe_opcode_t *insn =3D p->ainsn.insn; +=20 +@@ -958,7 +966,7 @@ int __kprobes kprobe_exceptions_notify(s + struct die_args *args =3D data; + int ret =3D NOTIFY_DONE; +=20 +- if (args->regs && user_mode_vm(args->regs)) ++ if (args->regs && user_mode(args->regs)) + return ret; +=20 + switch (val) { +diff -urNp linux-2.6.32.45/arch/x86/kernel/ldt.c linux-2.6.32.45/arch/x8= 6/kernel/ldt.c +--- linux-2.6.32.45/arch/x86/kernel/ldt.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/kernel/ldt.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -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 (!cpumask_equal(mm_cpumask(current->mm), + cpumask_of(smp_processor_id()))) + smp_call_function(flush_ldt, current->mm, 1); + preempt_enable(); + #else +- load_LDT(pc); ++ load_LDT_nolock(pc); + #endif + } + if (oldsize) { +@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t=20 + return err; +=20 + for (i =3D 0; i < old->size; i++) +- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE); ++ write_ldt_entry(new->ldt, i, old->ldt + i); + return 0; + } +=20 +@@ -115,6 +115,24 @@ int init_new_context(struct task_struct=20 + retval =3D copy_ldt(&mm->context, &old_mm->context); + mutex_unlock(&old_mm->context.lock); + } ++ ++ if (tsk =3D=3D current) { ++ mm->context.vdso =3D 0; ++ ++#ifdef CONFIG_X86_32 ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ mm->context.user_cs_base =3D 0UL; ++ mm->context.user_cs_limit =3D ~0UL; ++ ++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) ++ cpus_clear(mm->context.cpu_user_cs_mask); ++#endif ++ ++#endif ++#endif ++ ++ } ++ + return retval; + } +=20 +@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, u + } + } +=20 ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_L= DT_CONTENTS_CODE)) { ++ error =3D -EINVAL; ++ goto out_unlock; ++ } ++#endif ++ + fill_ldt(&ldt, &ldt_info); + if (oldmode) + ldt.avl =3D 0; +diff -urNp linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c linux-2.6.= 32.45/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/machine_kexec_32.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include +=20 +-static void set_idt(void *newidt, __u16 limit) ++static void set_idt(struct desc_struct *newidt, __u16 limit) + { + struct desc_ptr curidt; +=20 +@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16=20 + } +=20 +=20 +-static void set_gdt(void *newgdt, __u16 limit) ++static void set_gdt(struct desc_struct *newgdt, __u16 limit) + { + struct desc_ptr curgdt; +=20 +@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image) + } +=20 + control_page =3D page_address(image->control_code_page); +- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE); ++ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel)= , KEXEC_CONTROL_CODE_MAX_SIZE); +=20 + relocate_kernel_ptr =3D control_page; + page_list[PA_CONTROL_PAGE] =3D __pa(control_page); +diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_amd.c linux-2.6.32.= 45/arch/x86/kernel/microcode_amd.c +--- linux-2.6.32.45/arch/x86/kernel/microcode_amd.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/microcode_amd.c 2011-04-17 17:03:05.= 000000000 -0400 +@@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int c + uci->mc =3D NULL; + } +=20 +-static struct microcode_ops microcode_amd_ops =3D { ++static const struct microcode_ops microcode_amd_ops =3D { + .request_microcode_user =3D request_microcode_user, + .request_microcode_fw =3D request_microcode_fw, + .collect_cpu_info =3D collect_cpu_info_amd, +@@ -372,7 +372,7 @@ static struct microcode_ops microcode_am + .microcode_fini_cpu =3D microcode_fini_cpu_amd, + }; +=20 +-struct microcode_ops * __init init_amd_microcode(void) ++const struct microcode_ops * __init init_amd_microcode(void) + { + return µcode_amd_ops; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_core.c linux-2.6.32= .45/arch/x86/kernel/microcode_core.c +--- linux-2.6.32.45/arch/x86/kernel/microcode_core.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/microcode_core.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); +=20 + #define MICROCODE_VERSION "2.00" +=20 +-static struct microcode_ops *microcode_ops; ++static const struct microcode_ops *microcode_ops; +=20 + /* + * Synchronization. +diff -urNp linux-2.6.32.45/arch/x86/kernel/microcode_intel.c linux-2.6.3= 2.45/arch/x86/kernel/microcode_intel.c +--- linux-2.6.32.45/arch/x86/kernel/microcode_intel.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/microcode_intel.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -443,13 +443,13 @@ static enum ucode_state request_microcod +=20 + static int get_ucode_user(void *to, const void *from, size_t n) + { +- return copy_from_user(to, from, n); ++ return copy_from_user(to, (__force const void __user *)from, n); + } +=20 + static enum ucode_state + request_microcode_user(int cpu, const void __user *buf, size_t size) + { +- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user)= ; ++ return generic_load_microcode(cpu, (__force void *)buf, size, &get_uco= de_user); + } +=20 + static void microcode_fini_cpu(int cpu) +@@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu) + uci->mc =3D NULL; + } +=20 +-static struct microcode_ops microcode_intel_ops =3D { ++static const struct microcode_ops microcode_intel_ops =3D { + .request_microcode_user =3D request_microcode_user, + .request_microcode_fw =3D request_microcode_fw, + .collect_cpu_info =3D collect_cpu_info, +@@ -468,7 +468,7 @@ static struct microcode_ops microcode_in + .microcode_fini_cpu =3D microcode_fini_cpu, + }; +=20 +-struct microcode_ops * __init init_intel_microcode(void) ++const struct microcode_ops * __init init_intel_microcode(void) + { + return µcode_intel_ops; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/module.c linux-2.6.32.45/arch= /x86/kernel/module.c +--- linux-2.6.32.45/arch/x86/kernel/module.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/module.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -34,7 +34,7 @@ + #define DEBUGP(fmt...) + #endif +=20 +-void *module_alloc(unsigned long size) ++static void *__module_alloc(unsigned long size, pgprot_t prot) + { + struct vm_struct *area; +=20 +@@ -48,8 +48,18 @@ void *module_alloc(unsigned long size) + if (!area) + return NULL; +=20 +- return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM, +- PAGE_KERNEL_EXEC); ++ return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, p= rot); ++} ++ ++void *module_alloc(unsigned long size) ++{ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ return __module_alloc(size, PAGE_KERNEL); ++#else ++ return __module_alloc(size, PAGE_KERNEL_EXEC); ++#endif ++ + } +=20 + /* Free memory returned from module_alloc */ +@@ -58,6 +68,40 @@ void module_free(struct module *mod, voi + vfree(module_region); + } +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++#ifdef CONFIG_X86_32 ++void *module_alloc_exec(unsigned long size) ++{ ++ struct vm_struct *area; ++ ++ if (size =3D=3D 0) ++ return NULL; ++ ++ area =3D __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VA= DDR, (unsigned long)&MODULES_EXEC_END); ++ return area ? area->addr : NULL; ++} ++EXPORT_SYMBOL(module_alloc_exec); ++ ++void module_free_exec(struct module *mod, void *module_region) ++{ ++ vunmap(module_region); ++} ++EXPORT_SYMBOL(module_free_exec); ++#else ++void module_free_exec(struct module *mod, void *module_region) ++{ ++ module_free(mod, module_region); ++} ++EXPORT_SYMBOL(module_free_exec); ++ ++void *module_alloc_exec(unsigned long size) ++{ ++ return __module_alloc(size, PAGE_KERNEL_RX); ++} ++EXPORT_SYMBOL(module_alloc_exec); ++#endif ++#endif ++ + /* We don't need anything special. */ + int module_frob_arch_sections(Elf_Ehdr *hdr, + Elf_Shdr *sechdrs, +@@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs, + unsigned int i; + Elf32_Rel *rel =3D (void *)sechdrs[relsec].sh_addr; + Elf32_Sym *sym; +- uint32_t *location; ++ uint32_t *plocation, location; +=20 + DEBUGP("Applying relocate section %u to %u\n", relsec, + sechdrs[relsec].sh_info); + for (i =3D 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) { + /* This is where to make the change */ +- location =3D (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr +- + rel[i].r_offset; ++ plocation =3D (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[= i].r_offset; ++ location =3D (uint32_t)plocation; ++ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR) ++ plocation =3D ktla_ktva((void *)plocation); + /* This is the symbol it is referring to. Note that all + undefined symbols have been resolved. */ + sym =3D (Elf32_Sym *)sechdrs[symindex].sh_addr +@@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs, + switch (ELF32_R_TYPE(rel[i].r_info)) { + case R_386_32: + /* We add the value into the location given */ +- *location +=3D sym->st_value; ++ pax_open_kernel(); ++ *plocation +=3D sym->st_value; ++ pax_close_kernel(); + break; + case R_386_PC32: + /* Add the value, subtract its postition */ +- *location +=3D sym->st_value - (uint32_t)location; ++ pax_open_kernel(); ++ *plocation +=3D sym->st_value - location; ++ pax_close_kernel(); + break; + default: + printk(KERN_ERR "module %s: Unknown relocation: %u\n", +@@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechd + case R_X86_64_NONE: + break; + case R_X86_64_64: ++ pax_open_kernel(); + *(u64 *)loc =3D val; ++ pax_close_kernel(); + break; + case R_X86_64_32: ++ pax_open_kernel(); + *(u32 *)loc =3D val; ++ pax_close_kernel(); + if (val !=3D *(u32 *)loc) + goto overflow; + break; + case R_X86_64_32S: ++ pax_open_kernel(); + *(s32 *)loc =3D val; ++ pax_close_kernel(); + if ((s64)val !=3D *(s32 *)loc) + goto overflow; + break; + case R_X86_64_PC32: + val -=3D (u64)loc; ++ pax_open_kernel(); + *(u32 *)loc =3D val; ++ pax_close_kernel(); ++ + #if 0 + if ((s64)val !=3D *(s32 *)loc) + goto overflow; +diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt.c linux-2.6.32.45/ar= ch/x86/kernel/paravirt.c +--- linux-2.6.32.45/arch/x86/kernel/paravirt.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/paravirt.c 2011-08-23 20:24:19.00000= 0000 -0400 +@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x) + { + return x; + } ++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) ++PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64); ++#endif +=20 + void __init default_banner(void) + { +@@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbu + * corresponding structure. */ + static void *get_call_destination(u8 type) + { +- struct paravirt_patch_template tmpl =3D { ++ const struct paravirt_patch_template tmpl =3D { + .pv_init_ops =3D pv_init_ops, + .pv_time_ops =3D pv_time_ops, + .pv_cpu_ops =3D pv_cpu_ops, +@@ -133,6 +136,8 @@ static void *get_call_destination(u8 typ + .pv_lock_ops =3D pv_lock_ops, + #endif + }; ++ ++ pax_track_stack(); + return *((void **)&tmpl + type); + } +=20 +@@ -145,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, + if (opfunc =3D=3D NULL) + /* If there's no function, patch it with a ud2a (BUG) */ + ret =3D paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); +- else if (opfunc =3D=3D _paravirt_nop) ++ else if (opfunc =3D=3D (void *)_paravirt_nop) + /* If the operation is a nop, then nop the callsite */ + ret =3D paravirt_patch_nop(); +=20 + /* identity functions just return their single argument */ +- else if (opfunc =3D=3D _paravirt_ident_32) ++ else if (opfunc =3D=3D (void *)_paravirt_ident_32) + ret =3D paravirt_patch_ident_32(insnbuf, len); +- else if (opfunc =3D=3D _paravirt_ident_64) ++ else if (opfunc =3D=3D (void *)_paravirt_ident_64) ++ ret =3D paravirt_patch_ident_64(insnbuf, len); ++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) ++ else if (opfunc =3D=3D (void *)__raw_callee_save__paravirt_ident_64) + ret =3D paravirt_patch_ident_64(insnbuf, len); ++#endif +=20 + else if (type =3D=3D PARAVIRT_PATCH(pv_cpu_ops.iret) || + type =3D=3D PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) || +@@ -178,7 +187,7 @@ unsigned paravirt_patch_insns(void *insn + if (insn_len > len || start =3D=3D NULL) + insn_len =3D len; + else +- memcpy(insnbuf, start, insn_len); ++ memcpy(insnbuf, ktla_ktva(start), insn_len); +=20 + return insn_len; + } +@@ -294,22 +303,22 @@ void arch_flush_lazy_mmu_mode(void) + preempt_enable(); + } +=20 +-struct pv_info pv_info =3D { ++struct pv_info pv_info __read_only =3D { + .name =3D "bare hardware", + .paravirt_enabled =3D 0, + .kernel_rpl =3D 0, + .shared_kernel_pmd =3D 1, /* Only used when CONFIG_X86_PAE is set */ + }; +=20 +-struct pv_init_ops pv_init_ops =3D { ++struct pv_init_ops pv_init_ops __read_only =3D { + .patch =3D native_patch, + }; +=20 +-struct pv_time_ops pv_time_ops =3D { ++struct pv_time_ops pv_time_ops __read_only =3D { + .sched_clock =3D native_sched_clock, + }; +=20 +-struct pv_irq_ops pv_irq_ops =3D { ++struct pv_irq_ops pv_irq_ops __read_only =3D { + .save_fl =3D __PV_IS_CALLEE_SAVE(native_save_fl), + .restore_fl =3D __PV_IS_CALLEE_SAVE(native_restore_fl), + .irq_disable =3D __PV_IS_CALLEE_SAVE(native_irq_disable), +@@ -321,7 +330,7 @@ struct pv_irq_ops pv_irq_ops =3D { + #endif + }; +=20 +-struct pv_cpu_ops pv_cpu_ops =3D { ++struct pv_cpu_ops pv_cpu_ops __read_only =3D { + .cpuid =3D native_cpuid, + .get_debugreg =3D native_get_debugreg, + .set_debugreg =3D native_set_debugreg, +@@ -382,21 +391,26 @@ struct pv_cpu_ops pv_cpu_ops =3D { + .end_context_switch =3D paravirt_nop, + }; +=20 +-struct pv_apic_ops pv_apic_ops =3D { ++struct pv_apic_ops pv_apic_ops __read_only =3D { + #ifdef CONFIG_X86_LOCAL_APIC + .startup_ipi_hook =3D paravirt_nop, + #endif + }; +=20 +-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE) ++#ifdef CONFIG_X86_32 ++#ifdef CONFIG_X86_PAE ++/* 64-bit pagetable entries */ ++#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64) ++#else + /* 32-bit pagetable entries */ + #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32) ++#endif + #else + /* 64-bit pagetable entries */ + #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64) + #endif +=20 +-struct pv_mmu_ops pv_mmu_ops =3D { ++struct pv_mmu_ops pv_mmu_ops __read_only =3D { +=20 + .read_cr2 =3D native_read_cr2, + .write_cr2 =3D native_write_cr2, +@@ -448,6 +462,7 @@ struct pv_mmu_ops pv_mmu_ops =3D { + .make_pud =3D PTE_IDENT, +=20 + .set_pgd =3D native_set_pgd, ++ .set_pgd_batched =3D native_set_pgd_batched, + #endif + #endif /* PAGETABLE_LEVELS >=3D 3 */ +=20 +@@ -467,6 +482,12 @@ struct pv_mmu_ops pv_mmu_ops =3D { + }, +=20 + .set_fixmap =3D native_set_fixmap, ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ .pax_open_kernel =3D native_pax_open_kernel, ++ .pax_close_kernel =3D native_pax_close_kernel, ++#endif ++ + }; +=20 + EXPORT_SYMBOL_GPL(pv_time_ops); +diff -urNp linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c linux-2.= 6.32.45/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/paravirt-spinlocks.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * + __raw_spin_lock(lock); + } +=20 +-struct pv_lock_ops pv_lock_ops =3D { ++struct pv_lock_ops pv_lock_ops __read_only =3D { + #ifdef CONFIG_SMP + .spin_is_locked =3D __ticket_spin_is_locked, + .spin_is_contended =3D __ticket_spin_is_contended, +diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c linux-2.6.32= .45/arch/x86/kernel/pci-calgary_64.c +--- linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/pci-calgary_64.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -477,7 +477,7 @@ static void calgary_free_coherent(struct + free_pages((unsigned long)vaddr, get_order(size)); + } +=20 +-static struct dma_map_ops calgary_dma_ops =3D { ++static const struct dma_map_ops calgary_dma_ops =3D { + .alloc_coherent =3D calgary_alloc_coherent, + .free_coherent =3D calgary_free_coherent, + .map_sg =3D calgary_map_sg, +diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-dma.c linux-2.6.32.45/arc= h/x86/kernel/pci-dma.c +--- linux-2.6.32.45/arch/x86/kernel/pci-dma.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/pci-dma.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -14,7 +14,7 @@ +=20 + static int forbid_dac __read_mostly; +=20 +-struct dma_map_ops *dma_ops; ++const struct dma_map_ops *dma_ops; + EXPORT_SYMBOL(dma_ops); +=20 + static int iommu_sac_force __read_mostly; +@@ -243,7 +243,7 @@ early_param("iommu", iommu_setup); +=20 + int dma_supported(struct device *dev, u64 mask) + { +- struct dma_map_ops *ops =3D get_dma_ops(dev); ++ const struct dma_map_ops *ops =3D get_dma_ops(dev); +=20 + #ifdef CONFIG_PCI + if (mask > 0xffffffff && forbid_dac > 0) { +diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c linux-2.6.32.45= /arch/x86/kernel/pci-gart_64.c +--- linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/pci-gart_64.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag + return -1; + } +=20 +-static struct dma_map_ops gart_dma_ops =3D { ++static const struct dma_map_ops gart_dma_ops =3D { + .map_sg =3D gart_map_sg, + .unmap_sg =3D gart_unmap_sg, + .map_page =3D gart_map_page, +diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-nommu.c linux-2.6.32.45/a= rch/x86/kernel/pci-nommu.c +--- linux-2.6.32.45/arch/x86/kernel/pci-nommu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/pci-nommu.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str + flush_write_buffers(); + } +=20 +-struct dma_map_ops nommu_dma_ops =3D { ++const struct dma_map_ops nommu_dma_ops =3D { + .alloc_coherent =3D dma_generic_alloc_coherent, + .free_coherent =3D nommu_free_coherent, + .map_sg =3D nommu_map_sg, +diff -urNp linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.45= /arch/x86/kernel/pci-swiotlb.c +--- linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/pci-swiotlb.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( + return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); + } +=20 +-static struct dma_map_ops swiotlb_dma_ops =3D { ++static const struct dma_map_ops swiotlb_dma_ops =3D { + .mapping_error =3D swiotlb_dma_mapping_error, + .alloc_coherent =3D x86_swiotlb_alloc_coherent, + .free_coherent =3D swiotlb_free_coherent, +diff -urNp linux-2.6.32.45/arch/x86/kernel/process_32.c linux-2.6.32.45/= arch/x86/kernel/process_32.c +--- linux-2.6.32.45/arch/x86/kernel/process_32.c 2011-06-25 12:55:34.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/process_32.c 2011-06-25 12:56:37.000= 000000 -0400 +@@ -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]; ++//XXX return tsk->thread.eip; + } +=20 + #ifndef CONFIG_SMP +@@ -129,15 +130,14 @@ void __show_regs(struct pt_regs *regs, i + unsigned short ss, gs; + const char *board; +=20 +- if (user_mode_vm(regs)) { ++ if (user_mode(regs)) { + sp =3D regs->sp; + ss =3D regs->ss & 0xffff; +- gs =3D get_user_gs(regs); + } else { + sp =3D (unsigned long) (®s->sp); + savesegment(ss, ss); +- savesegment(gs, gs); + } ++ gs =3D get_user_gs(regs); +=20 + printk("\n"); +=20 +@@ -210,10 +210,10 @@ int kernel_thread(int (*fn)(void *), voi + regs.bx =3D (unsigned long) fn; + regs.dx =3D (unsigned long) arg; +=20 +- regs.ds =3D __USER_DS; +- regs.es =3D __USER_DS; ++ regs.ds =3D __KERNEL_DS; ++ regs.es =3D __KERNEL_DS; + regs.fs =3D __KERNEL_PERCPU; +- regs.gs =3D __KERNEL_STACK_CANARY; ++ savesegment(gs, regs.gs); + regs.orig_ax =3D -1; + regs.ip =3D (unsigned long) kernel_thread_helper; + regs.cs =3D __KERNEL_CS | get_kernel_rpl(); +@@ -247,13 +247,14 @@ int copy_thread(unsigned long clone_flag + struct task_struct *tsk; + int err; +=20 +- childregs =3D task_pt_regs(p); ++ childregs =3D task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs= ) - 8; + *childregs =3D *regs; + childregs->ax =3D 0; + childregs->sp =3D sp; +=20 + p->thread.sp =3D (unsigned long) childregs; + p->thread.sp0 =3D (unsigned long) (childregs+1); ++ p->tinfo.lowest_stack =3D (unsigned long)task_stack_page(p); +=20 + p->thread.ip =3D (unsigned long) ret_from_fork; +=20 +@@ -345,7 +346,7 @@ __switch_to(struct task_struct *prev_p,=20 + struct thread_struct *prev =3D &prev_p->thread, + *next =3D &next_p->thread; + int cpu =3D smp_processor_id(); +- struct tss_struct *tss =3D &per_cpu(init_tss, cpu); ++ struct tss_struct *tss =3D init_tss + cpu; + bool preload_fpu; +=20 + /* never put a printk in __switch_to... printk() calls wake_up*() indi= rectly */ +@@ -380,6 +381,10 @@ __switch_to(struct task_struct *prev_p,=20 + */ + lazy_save_gs(prev->gs); +=20 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ __set_fs(task_thread_info(next_p)->addr_limit); ++#endif ++ + /* + * Load the per-thread Thread-Local Storage descriptor. + */ +@@ -415,6 +420,9 @@ __switch_to(struct task_struct *prev_p,=20 + */ + arch_end_context_switch(next_p); +=20 ++ percpu_write(current_task, next_p); ++ percpu_write(current_tinfo, &next_p->tinfo); ++ + if (preload_fpu) + __math_state_restore(); +=20 +@@ -424,8 +432,6 @@ __switch_to(struct task_struct *prev_p,=20 + if (prev->gs | next->gs) + lazy_load_gs(next->gs); +=20 +- percpu_write(current_task, next_p); +- + return prev_p; + } +=20 +@@ -495,4 +501,3 @@ unsigned long get_wchan(struct task_stru + } while (count++ < 16); + return 0; + } +- +diff -urNp linux-2.6.32.45/arch/x86/kernel/process_64.c linux-2.6.32.45/= arch/x86/kernel/process_64.c +--- linux-2.6.32.45/arch/x86/kernel/process_64.c 2011-06-25 12:55:34.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/process_64.c 2011-06-25 12:56:37.000= 000000 -0400 +@@ -91,7 +91,7 @@ static void __exit_idle(void) + void exit_idle(void) + { + /* idle loop has pid 0 */ +- if (current->pid) ++ if (task_pid_nr(current)) + return; + __exit_idle(); + } +@@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, i + if (!board) + board =3D ""; + printk(KERN_INFO "Pid: %d, comm: %.20s %s %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, board); +@@ -280,8 +280,7 @@ int copy_thread(unsigned long clone_flag + struct pt_regs *childregs; + struct task_struct *me =3D current; +=20 +- childregs =3D ((struct pt_regs *) +- (THREAD_SIZE + task_stack_page(p))) - 1; ++ childregs =3D task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs= ) - 16; + *childregs =3D *regs; +=20 + childregs->ax =3D 0; +@@ -292,6 +291,7 @@ int copy_thread(unsigned long clone_flag + p->thread.sp =3D (unsigned long) childregs; + p->thread.sp0 =3D (unsigned long) (childregs+1); + p->thread.usersp =3D me->thread.usersp; ++ p->tinfo.lowest_stack =3D (unsigned long)task_stack_page(p); +=20 + set_tsk_thread_flag(p, TIF_FORK); +=20 +@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p,=20 + struct thread_struct *prev =3D &prev_p->thread; + struct thread_struct *next =3D &next_p->thread; + int cpu =3D smp_processor_id(); +- struct tss_struct *tss =3D &per_cpu(init_tss, cpu); ++ struct tss_struct *tss =3D init_tss + cpu; + unsigned fsindex, gsindex; + bool preload_fpu; +=20 +@@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p,=20 + prev->usersp =3D percpu_read(old_rsp); + percpu_write(old_rsp, next->usersp); + percpu_write(current_task, next_p); ++ percpu_write(current_tinfo, &next_p->tinfo); +=20 +- percpu_write(kernel_stack, +- (unsigned long)task_stack_page(next_p) + +- THREAD_SIZE - KERNEL_STACK_OFFSET); ++ percpu_write(kernel_stack, next->sp0); +=20 + /* + * Now maybe reload the debug registers and handle I/O bitmaps +@@ -559,12 +558,11 @@ unsigned long get_wchan(struct task_stru + if (!p || p =3D=3D current || p->state =3D=3D TASK_RUNNING) + return 0; + stack =3D (unsigned long)task_stack_page(p); +- if (p->thread.sp < stack || p->thread.sp >=3D stack+THREAD_SIZE) ++ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof= (u64)) + return 0; + fp =3D *(u64 *)(p->thread.sp); + do { +- if (fp < (unsigned long)stack || +- fp >=3D (unsigned long)stack+THREAD_SIZE) ++ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64)) + return 0; + ip =3D *(u64 *)(fp+8); + if (!in_sched_functions(ip)) +diff -urNp linux-2.6.32.45/arch/x86/kernel/process.c linux-2.6.32.45/arc= h/x86/kernel/process.c +--- linux-2.6.32.45/arch/x86/kernel/process.c 2011-04-22 19:16:29.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/process.c 2011-05-22 23:02:03.000000= 000 -0400 +@@ -51,16 +51,33 @@ void free_thread_xstate(struct task_stru +=20 + void free_thread_info(struct thread_info *ti) + { +- free_thread_xstate(ti->task); + free_pages((unsigned long)ti, get_order(THREAD_SIZE)); + } +=20 ++static struct kmem_cache *task_struct_cachep; ++ + void arch_task_cache_init(void) + { +- task_xstate_cachep =3D +- kmem_cache_create("task_xstate", xstate_size, ++ /* create a slab on which task_structs can be allocated */ ++ task_struct_cachep =3D ++ kmem_cache_create("task_struct", sizeof(struct task_struct), ++ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); ++ ++ task_xstate_cachep =3D ++ kmem_cache_create("task_xstate", xstate_size, + __alignof__(union thread_xstate), +- SLAB_PANIC | SLAB_NOTRACK, NULL); ++ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL); ++} ++ ++struct task_struct *alloc_task_struct(void) ++{ ++ return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL); ++} ++ ++void free_task_struct(struct task_struct *task) ++{ ++ free_thread_xstate(task); ++ kmem_cache_free(task_struct_cachep, task); + } +=20 + /* +@@ -73,7 +90,7 @@ void exit_thread(void) + unsigned long *bp =3D t->io_bitmap_ptr; +=20 + if (bp) { +- struct tss_struct *tss =3D &per_cpu(init_tss, get_cpu()); ++ struct tss_struct *tss =3D init_tss + get_cpu(); +=20 + t->io_bitmap_ptr =3D NULL; + clear_thread_flag(TIF_IO_BITMAP); +@@ -93,6 +110,9 @@ void flush_thread(void) +=20 + clear_tsk_thread_flag(tsk, TIF_DEBUG); +=20 ++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !de= fined(CONFIG_PAX_MEMORY_UDEREF) ++ loadsegment(gs, 0); ++#endif + tsk->thread.debugreg0 =3D 0; + tsk->thread.debugreg1 =3D 0; + tsk->thread.debugreg2 =3D 0; +@@ -307,7 +327,7 @@ void default_idle(void) + EXPORT_SYMBOL(default_idle); + #endif +=20 +-void stop_this_cpu(void *dummy) ++__noreturn void stop_this_cpu(void *dummy) + { + local_irq_disable(); + /* +@@ -568,16 +588,35 @@ static int __init idle_setup(char *str) + } + early_param("idle", idle_setup); +=20 +-unsigned long arch_align_stack(unsigned long sp) ++#ifdef CONFIG_PAX_RANDKSTACK ++asmlinkage void pax_randomize_kstack(void) + { +- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) +- sp -=3D get_random_int() % 8192; +- return sp & ~0xf; +-} ++ struct thread_struct *thread =3D ¤t->thread; ++ unsigned long time; +=20 +-unsigned long arch_randomize_brk(struct mm_struct *mm) +-{ +- unsigned long range_end =3D mm->brk + 0x02000000; +- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; ++ if (!randomize_va_space) ++ return; ++ ++ rdtscl(time); ++ ++ /* P4 seems to return a 0 LSB, ignore it */ ++#ifdef CONFIG_MPENTIUM4 ++ time &=3D 0x3EUL; ++ time <<=3D 2; ++#elif defined(CONFIG_X86_64) ++ time &=3D 0xFUL; ++ time <<=3D 4; ++#else ++ time &=3D 0x1FUL; ++ time <<=3D 3; ++#endif ++ ++ thread->sp0 ^=3D time; ++ load_sp0(init_tss + smp_processor_id(), thread); ++ ++#ifdef CONFIG_X86_64 ++ percpu_write(kernel_stack, thread->sp0); ++#endif + } ++#endif +=20 +diff -urNp linux-2.6.32.45/arch/x86/kernel/ptrace.c linux-2.6.32.45/arch= /x86/kernel/ptrace.c +--- linux-2.6.32.45/arch/x86/kernel/ptrace.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/ptrace.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -925,7 +925,7 @@ static const struct user_regset_view use + long arch_ptrace(struct task_struct *child, long request, long addr, lo= ng data) + { + int ret; +- unsigned long __user *datap =3D (unsigned long __user *)data; ++ unsigned long __user *datap =3D (__force unsigned long __user *)data; +=20 + switch (request) { + /* read the word at location addr in the USER area. */ +@@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *chi + if (addr < 0) + return -EIO; + ret =3D do_get_thread_area(child, addr, +- (struct user_desc __user *) data); ++ (__force struct user_desc __user *) data); + break; +=20 + case PTRACE_SET_THREAD_AREA: + if (addr < 0) + return -EIO; + ret =3D do_set_thread_area(child, addr, +- (struct user_desc __user *) data, 0); ++ (__force struct user_desc __user *) data, 0); + break; + #endif +=20 +@@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *chi + #ifdef CONFIG_X86_PTRACE_BTS + case PTRACE_BTS_CONFIG: + ret =3D ptrace_bts_config +- (child, data, (struct ptrace_bts_config __user *)addr); ++ (child, data, (__force struct ptrace_bts_config __user *)addr); + break; +=20 + case PTRACE_BTS_STATUS: + ret =3D ptrace_bts_status +- (child, data, (struct ptrace_bts_config __user *)addr); ++ (child, data, (__force struct ptrace_bts_config __user *)addr); + break; +=20 + case PTRACE_BTS_SIZE: +@@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *chi +=20 + case PTRACE_BTS_GET: + ret =3D ptrace_bts_read_record +- (child, data, (struct bts_struct __user *) addr); ++ (child, data, (__force struct bts_struct __user *) addr); + break; +=20 + case PTRACE_BTS_CLEAR: +@@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *chi +=20 + case PTRACE_BTS_DRAIN: + ret =3D ptrace_bts_drain +- (child, data, (struct bts_struct __user *) addr); ++ (child, data, (__force struct bts_struct __user *) addr); + break; + #endif /* CONFIG_X86_PTRACE_BTS */ +=20 +@@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *ts + info.si_code =3D si_code; +=20 + /* User-mode ip? */ +- info.si_addr =3D user_mode_vm(regs) ? (void __user *) regs->ip : NULL; ++ info.si_addr =3D user_mode(regs) ? (__force void __user *) regs->ip : = NULL; +=20 + /* Send us the fake SIGTRAP */ + force_sig_info(SIGTRAP, &info, tsk); +@@ -1469,7 +1469,7 @@ void send_sigtrap(struct task_struct *ts + * We must return the syscall number to actually look up in the table. + * This can be -1L to skip running any syscall at all. + */ +-asmregparm long syscall_trace_enter(struct pt_regs *regs) ++long syscall_trace_enter(struct pt_regs *regs) + { + long ret =3D 0; +=20 +@@ -1514,7 +1514,7 @@ asmregparm long syscall_trace_enter(stru + return ret ?: regs->orig_ax; + } +=20 +-asmregparm void syscall_trace_leave(struct pt_regs *regs) ++void syscall_trace_leave(struct pt_regs *regs) + { + if (unlikely(current->audit_context)) + audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax); +diff -urNp linux-2.6.32.45/arch/x86/kernel/reboot.c linux-2.6.32.45/arch= /x86/kernel/reboot.c +--- linux-2.6.32.45/arch/x86/kernel/reboot.c 2011-08-09 18:35:28.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/reboot.c 2011-08-09 18:33:59.0000000= 00 -0400 +@@ -33,7 +33,7 @@ void (*pm_power_off)(void); + EXPORT_SYMBOL(pm_power_off); +=20 + static const struct desc_ptr no_idt =3D {}; +-static int reboot_mode; ++static unsigned short reboot_mode; + enum reboot_type reboot_type =3D BOOT_KBD; + int reboot_force; +=20 +@@ -292,12 +292,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. */ +-static const unsigned long long +-real_mode_gdt_entries [3] =3D ++static struct desc_struct ++real_mode_gdt_entries [3] __read_only =3D + { +- 0x0000000000000000ULL, /* Null descriptor */ +- 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */ +- 0x000093000100ffffULL /* 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 0x000= 00000 */ ++ GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x= 00000100 */ + }; +=20 + static const struct desc_ptr +@@ -346,7 +346,7 @@ static const unsigned char jump_to_bios=20 + * specified by the code and length parameters. + * We assume that length will aways be less that 100! + */ +-void machine_real_restart(const unsigned char *code, int length) ++__noreturn void machine_real_restart(const unsigned char *code, unsigne= d int length) + { + local_irq_disable(); +=20 +@@ -366,8 +366,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. */ +- memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, +- sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS); ++ clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, ++ min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY)); +=20 + /* + * Use `swapper_pg_dir' as our page directory. +@@ -379,16 +379,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. */ +- *((unsigned short *)0x472) =3D reboot_mode; ++ *(unsigned short *)(__va(0x472)) =3D reboot_mode; +=20 + /* For the switch to real mode, copy some code to low memory. It has + to be in the first 64k because it is running in 16-bit mode, and it + has to have the same physical and virtual address, because it turns + off paging. Copy it near the end of the first page, out of the way + of BIOS variables. */ +- memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100), +- real_mode_switch, sizeof (real_mode_switch)); +- memcpy((void *)(0x1000 - 100), code, length); ++ memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switc= h, sizeof (real_mode_switch)); ++ memcpy(__va(0x1000 - 100), code, length); +=20 + /* Set up the IDT for real mode. */ + load_idt(&real_mode_idt); +@@ -416,6 +415,7 @@ void machine_real_restart(const unsigned + __asm__ __volatile__ ("ljmp $0x0008,%0" + : + : "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100))); ++ do { } while (1); + } + #ifdef CONFIG_APM_MODULE + EXPORT_SYMBOL(machine_real_restart); +@@ -544,7 +544,7 @@ void __attribute__((weak)) mach_reboot_f + { + } +=20 +-static void native_machine_emergency_restart(void) ++__noreturn static void native_machine_emergency_restart(void) + { + int i; +=20 +@@ -659,13 +659,13 @@ void native_machine_shutdown(void) + #endif + } +=20 +-static void __machine_emergency_restart(int emergency) ++static __noreturn void __machine_emergency_restart(int emergency) + { + reboot_emergency =3D emergency; + machine_ops.emergency_restart(); + } +=20 +-static void native_machine_restart(char *__unused) ++static __noreturn void native_machine_restart(char *__unused) + { + printk("machine restart\n"); +=20 +@@ -674,7 +674,7 @@ static void native_machine_restart(char=20 + __machine_emergency_restart(0); + } +=20 +-static void native_machine_halt(void) ++static __noreturn void native_machine_halt(void) + { + /* stop other cpus and apics */ + machine_shutdown(); +@@ -685,7 +685,7 @@ static void native_machine_halt(void) + stop_this_cpu(NULL); + } +=20 +-static void native_machine_power_off(void) ++__noreturn static void native_machine_power_off(void) + { + if (pm_power_off) { + if (!reboot_force) +@@ -694,6 +694,7 @@ static void native_machine_power_off(voi + } + /* a fallback in case there is no PM info available */ + tboot_shutdown(TB_SHUTDOWN_HALT); ++ do { } while (1); + } +=20 + struct machine_ops machine_ops =3D { +diff -urNp linux-2.6.32.45/arch/x86/kernel/setup.c linux-2.6.32.45/arch/= x86/kernel/setup.c +--- linux-2.6.32.45/arch/x86/kernel/setup.c 2011-04-17 17:00:52.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/setup.c 2011-04-17 17:03:05.00000000= 0 -0400 +@@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p) +=20 + if (!boot_params.hdr.root_flags) + root_mountflags &=3D ~MS_RDONLY; +- init_mm.start_code =3D (unsigned long) _text; +- init_mm.end_code =3D (unsigned long) _etext; ++ init_mm.start_code =3D ktla_ktva((unsigned long) _text); ++ init_mm.end_code =3D ktla_ktva((unsigned long) _etext); + init_mm.end_data =3D (unsigned long) _edata; + init_mm.brk =3D _brk_end; +=20 +- code_resource.start =3D virt_to_phys(_text); +- code_resource.end =3D virt_to_phys(_etext)-1; +- data_resource.start =3D virt_to_phys(_etext); ++ code_resource.start =3D virt_to_phys(ktla_ktva(_text)); ++ code_resource.end =3D virt_to_phys(ktla_ktva(_etext))-1; ++ data_resource.start =3D virt_to_phys(_sdata); + data_resource.end =3D virt_to_phys(_edata)-1; + bss_resource.start =3D virt_to_phys(&__bss_start); + bss_resource.end =3D virt_to_phys(&__bss_stop)-1; +diff -urNp linux-2.6.32.45/arch/x86/kernel/setup_percpu.c linux-2.6.32.4= 5/arch/x86/kernel/setup_percpu.c +--- linux-2.6.32.45/arch/x86/kernel/setup_percpu.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/setup_percpu.c 2011-06-04 20:36:29.0= 00000000 -0400 +@@ -25,19 +25,17 @@ + # define DBG(x...) + #endif +=20 +-DEFINE_PER_CPU(int, cpu_number); ++#ifdef CONFIG_SMP ++DEFINE_PER_CPU(unsigned int, cpu_number); + EXPORT_PER_CPU_SYMBOL(cpu_number); ++#endif +=20 +-#ifdef CONFIG_X86_64 + #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load) +-#else +-#define BOOT_PERCPU_OFFSET 0 +-#endif +=20 + DEFINE_PER_CPU(unsigned long, this_cpu_off) =3D BOOT_PERCPU_OFFSET; + EXPORT_PER_CPU_SYMBOL(this_cpu_off); +=20 +-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly =3D { ++unsigned long __per_cpu_offset[NR_CPUS] __read_only =3D { + [0 ... NR_CPUS-1] =3D BOOT_PERCPU_OFFSET, + }; + EXPORT_SYMBOL(__per_cpu_offset); +@@ -159,10 +157,10 @@ static inline void setup_percpu_segment( + { + #ifdef CONFIG_X86_32 + struct desc_struct gdt; ++ unsigned long base =3D per_cpu_offset(cpu); +=20 +- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, +- 0x2 | DESCTYPE_S, 0x8); +- gdt.s =3D 1; ++ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT, ++ 0x83 | DESCTYPE_S, 0xC); + write_gdt_entry(get_cpu_gdt_table(cpu), + GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); + #endif +@@ -212,6 +210,11 @@ void __init setup_per_cpu_areas(void) + /* alrighty, percpu areas up and running */ + delta =3D (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_sta= rt; + for_each_possible_cpu(cpu) { ++#ifdef CONFIG_CC_STACKPROTECTOR ++#ifdef CONFIG_X86_32 ++ unsigned long canary =3D per_cpu(stack_canary.canary, cpu); ++#endif ++#endif + per_cpu_offset(cpu) =3D delta + pcpu_unit_offsets[cpu]; + per_cpu(this_cpu_off, cpu) =3D per_cpu_offset(cpu); + per_cpu(cpu_number, cpu) =3D cpu; +@@ -239,6 +242,12 @@ void __init setup_per_cpu_areas(void) + early_per_cpu_map(x86_cpu_to_node_map, cpu); + #endif + #endif ++#ifdef CONFIG_CC_STACKPROTECTOR ++#ifdef CONFIG_X86_32 ++ if (!cpu) ++ per_cpu(stack_canary.canary, cpu) =3D canary; ++#endif ++#endif + /* + * Up to this point, the boot CPU has been using .data.init + * area. Reload any changed state for the boot CPU. +diff -urNp linux-2.6.32.45/arch/x86/kernel/signal.c linux-2.6.32.45/arch= /x86/kernel/signal.c +--- linux-2.6.32.45/arch/x86/kernel/signal.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/signal.c 2011-05-22 23:02:03.0000000= 00 -0400 +@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi + * Align the stack pointer according to the i386 ABI, + * i.e. so that on function entry ((sp + 4) & 15) =3D=3D 0. + */ +- sp =3D ((sp + 4) & -16ul) - 4; ++ sp =3D ((sp - 12) & -16ul) - 4; + #else /* !CONFIG_X86_32 */ + sp =3D round_down(sp, 16) - 8; + #endif +@@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, str + * Return an always-bogus address instead so we will die with SIGSEGV. + */ + if (onsigstack && !likely(on_sig_stack(sp))) +- return (void __user *)-1L; ++ return (__force void __user *)-1L; +=20 + /* save i387 state */ + if (used_math() && save_i387_xstate(*fpstate) < 0) +- return (void __user *)-1L; ++ return (__force void __user *)-1L; +=20 + return (void __user *)sp; + } +@@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigactio + } +=20 + if (current->mm->context.vdso) +- restorer =3D VDSO32_SYMBOL(current->mm->context.vdso, sigreturn); ++ restorer =3D (__force void __user *)VDSO32_SYMBOL(current->mm->contex= t.vdso, sigreturn); + else +- restorer =3D &frame->retcode; ++ restorer =3D (void __user *)&frame->retcode; + if (ka->sa.sa_flags & SA_RESTORER) + restorer =3D ka->sa.sa_restorer; +=20 +@@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigactio + * reasons and because gdb uses it as a signature to notice + * signal handler stack frames. + */ +- err |=3D __put_user(*((u64 *)&retcode), (u64 *)frame->retcode); ++ err |=3D __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode); +=20 + if (err) + return -EFAULT; +@@ -377,7 +377,10 @@ static int __setup_rt_frame(int sig, str + err |=3D __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); +=20 + /* Set up to return from userspace. */ +- restorer =3D VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ if (current->mm->context.vdso) ++ restorer =3D (__force void __user *)VDSO32_SYMBOL(current->mm->conte= xt.vdso, rt_sigreturn); ++ else ++ restorer =3D (void __user *)&frame->retcode; + if (ka->sa.sa_flags & SA_RESTORER) + restorer =3D ka->sa.sa_restorer; + put_user_ex(restorer, &frame->pretcode); +@@ -389,7 +392,7 @@ static int __setup_rt_frame(int sig, str + * reasons and because gdb uses it as a signature to notice + * signal handler stack frames. + */ +- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode); ++ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode); + } put_user_catch(err); +=20 + if (err) +@@ -782,6 +785,8 @@ static void do_signal(struct pt_regs *re + int signr; + sigset_t *oldset; +=20 ++ pax_track_stack(); ++ + /* + * We want the common case to go fast, which is why we may in certain + * cases get here from kernel mode. Just return without doing anything +@@ -789,7 +794,7 @@ static void do_signal(struct pt_regs *re + * X86_32: vm86 regs switched out by assembly code before reaching + * here, so testing against kernel CS suffices. + */ +- if (!user_mode(regs)) ++ if (!user_mode_novm(regs)) + return; +=20 + if (current_thread_info()->status & TS_RESTORE_SIGMASK) +diff -urNp linux-2.6.32.45/arch/x86/kernel/smpboot.c linux-2.6.32.45/arc= h/x86/kernel/smpboot.c +--- linux-2.6.32.45/arch/x86/kernel/smpboot.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/smpboot.c 2011-07-01 19:10:03.000000= 000 -0400 +@@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct + */ + static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex); +=20 +-void cpu_hotplug_driver_lock() ++void cpu_hotplug_driver_lock(void) + { +- mutex_lock(&x86_cpu_hotplug_driver_mutex); ++ mutex_lock(&x86_cpu_hotplug_driver_mutex); + } +=20 +-void cpu_hotplug_driver_unlock() ++void cpu_hotplug_driver_unlock(void) + { +- mutex_unlock(&x86_cpu_hotplug_driver_mutex); ++ mutex_unlock(&x86_cpu_hotplug_driver_mutex); + } +=20 + ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; } +@@ -625,7 +625,7 @@ wakeup_secondary_cpu_via_init(int phys_a + * target processor state. + */ + startup_ipi_hook(phys_apicid, (unsigned long) start_secondary, +- (unsigned long)stack_start.sp); ++ stack_start); +=20 + /* + * Run STARTUP IPI loop. +@@ -743,6 +743,7 @@ static int __cpuinit do_boot_cpu(int api + set_idle_for_cpu(cpu, c_idle.idle); + do_rest: + per_cpu(current_task, cpu) =3D c_idle.idle; ++ per_cpu(current_tinfo, cpu) =3D &c_idle.idle->tinfo; + #ifdef CONFIG_X86_32 + /* Stack for startup_32 can be just as for start_secondary onwards */ + irq_ctx_init(cpu); +@@ -750,13 +751,15 @@ do_rest: + #else + clear_tsk_thread_flag(c_idle.idle, TIF_FORK); + initial_gs =3D per_cpu_offset(cpu); +- per_cpu(kernel_stack, cpu) =3D +- (unsigned long)task_stack_page(c_idle.idle) - +- KERNEL_STACK_OFFSET + THREAD_SIZE; ++ per_cpu(kernel_stack, cpu) =3D (unsigned long)task_stack_page(c_idle.i= dle) - 16 + THREAD_SIZE; + #endif ++ ++ pax_open_kernel(); + early_gdt_descr.address =3D (unsigned long)get_cpu_gdt_table(cpu); ++ pax_close_kernel(); ++ + initial_code =3D (unsigned long)start_secondary; +- stack_start.sp =3D (void *) c_idle.idle->thread.sp; ++ stack_start =3D c_idle.idle->thread.sp; +=20 + /* start_ip had better be page-aligned! */ + start_ip =3D setup_trampoline(); +@@ -891,6 +894,12 @@ int __cpuinit native_cpu_up(unsigned int +=20 + per_cpu(cpu_state, cpu) =3D CPU_UP_PREPARE; +=20 ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY, ++ swapper_pg_dir + KERNEL_PGD_BOUNDARY, ++ KERNEL_PGD_PTRS); ++#endif ++ + err =3D do_boot_cpu(apicid, cpu); +=20 + if (err) { +diff -urNp linux-2.6.32.45/arch/x86/kernel/step.c linux-2.6.32.45/arch/x= 86/kernel/step.c +--- linux-2.6.32.45/arch/x86/kernel/step.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/kernel/step.c 2011-04-17 15:56:46.000000000= -0400 +@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc + struct desc_struct *desc; + unsigned long base; +=20 +- seg &=3D ~7UL; ++ seg >>=3D 3; +=20 + mutex_lock(&child->mm->context.lock); +- if (unlikely((seg >> 3) >=3D child->mm->context.size)) ++ if (unlikely(seg >=3D child->mm->context.size)) + addr =3D -1L; /* bogus selector, access would fault */ + else { + desc =3D child->mm->context.ldt + seg; +@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc + addr +=3D base; + } + mutex_unlock(&child->mm->context.lock); +- } ++ } else if (seg =3D=3D __KERNEL_CS || seg =3D=3D __KERNEXEC_KERNEL_CS) ++ addr =3D ktla_ktva(addr); +=20 + return addr; + } +@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t + unsigned char opcode[15]; + unsigned long addr =3D convert_ip_to_linear(child, regs); +=20 ++ if (addr =3D=3D -EINVAL) ++ return 0; ++ + copied =3D access_process_vm(child, addr, opcode, sizeof(opcode), 0); + for (i =3D 0; i < copied; i++) { + switch (opcode[i]) { +@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t +=20 + #ifdef CONFIG_X86_64 + case 0x40 ... 0x4f: +- if (regs->cs !=3D __USER_CS) ++ if ((regs->cs & 0xffff) !=3D __USER_CS) + /* 32-bit mode: register increment */ + return 0; + /* 64-bit mode: REX prefix */ +diff -urNp linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S linux-2.6.= 32.45/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/syscall_table_32.S 2011-04-17 15:56:= 46.000000000 -0400 +@@ -1,3 +1,4 @@ ++.section .rodata,"a",@progbits + ENTRY(sys_call_table) + .long sys_restart_syscall /* 0 - old "setup()" system call, used for r= estarting */ + .long sys_exit +diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c linux-2.6.32.45= /arch/x86/kernel/sys_i386_32.c +--- linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/sys_i386_32.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -24,6 +24,21 @@ +=20 + #include +=20 ++int i386_mmap_check(unsigned long addr, unsigned long len, unsigned lon= g flags) ++{ ++ unsigned long pax_task_size =3D TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ if (len > pax_task_size || addr > pax_task_size - len) ++ return -EINVAL; ++ ++ return 0; ++} ++ + /* + * Perform the select(nd, in, out, ex, tv) and mmap() system + * calls. Linux/i386 didn't use to be able to handle more than +@@ -58,6 +73,212 @@ out: + return err; + } +=20 ++unsigned long ++arch_get_unmapped_area(struct file *filp, unsigned long addr, ++ unsigned long len, unsigned long pgoff, unsigned long flags) ++{ ++ struct mm_struct *mm =3D current->mm; ++ struct vm_area_struct *vma; ++ unsigned long start_addr, pax_task_size =3D TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ pax_task_size -=3D PAGE_SIZE; ++ ++ if (len > pax_task_size) ++ return -ENOMEM; ++ ++ if (flags & MAP_FIXED) ++ return addr; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ ++ if (addr) { ++ addr =3D PAGE_ALIGN(addr); ++ if (pax_task_size - len >=3D addr) { ++ vma =3D find_vma(mm, addr); ++ if (check_heap_stack_gap(vma, addr, len)) ++ return addr; ++ } ++ } ++ if (len > mm->cached_hole_size) { ++ start_addr =3D addr =3D mm->free_area_cache; ++ } else { ++ start_addr =3D addr =3D mm->mmap_base; ++ mm->cached_hole_size =3D 0; ++ } ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_E= XECUTABLE) && start_addr >=3D mm->mmap_base) { ++ start_addr =3D 0x00110000UL; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ start_addr +=3D mm->delta_mmap & 0x03FFF000UL; ++#endif ++ ++ if (mm->start_brk <=3D start_addr && start_addr < mm->mmap_base) ++ start_addr =3D addr =3D mm->mmap_base; ++ else ++ addr =3D start_addr; ++ } ++#endif ++ ++full_search: ++ for (vma =3D find_vma(mm, addr); ; vma =3D vma->vm_next) { ++ /* At this point: (!vma || addr < vma->vm_end). */ ++ if (pax_task_size - len < addr) { ++ /* ++ * Start a new search - just in case we missed ++ * some holes. ++ */ ++ if (start_addr !=3D mm->mmap_base) { ++ start_addr =3D addr =3D mm->mmap_base; ++ mm->cached_hole_size =3D 0; ++ goto full_search; ++ } ++ return -ENOMEM; ++ } ++ if (check_heap_stack_gap(vma, addr, len)) ++ break; ++ if (addr + mm->cached_hole_size < vma->vm_start) ++ mm->cached_hole_size =3D vma->vm_start - addr; ++ addr =3D vma->vm_end; ++ if (mm->start_brk <=3D addr && addr < mm->mmap_base) { ++ start_addr =3D addr =3D mm->mmap_base; ++ mm->cached_hole_size =3D 0; ++ goto full_search; ++ } ++ } ++ ++ /* ++ * Remember the place where we stopped the search: ++ */ ++ mm->free_area_cache =3D addr + len; ++ return addr; ++} ++ ++unsigned long ++arch_get_unmapped_area_topdown(struct file *filp, const unsigned long a= ddr0, ++ const unsigned long len, const unsigned long pgoff, ++ const unsigned long flags) ++{ ++ struct vm_area_struct *vma; ++ struct mm_struct *mm =3D current->mm; ++ unsigned long base =3D mm->mmap_base, addr =3D addr0, pax_task_size =3D= TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ pax_task_size -=3D PAGE_SIZE; ++ ++ /* requested length too big for entire address space */ ++ if (len > pax_task_size) ++ return -ENOMEM; ++ ++ if (flags & MAP_FIXED) ++ return addr; ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_E= XECUTABLE)) ++ goto bottomup; ++#endif ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ ++ /* requesting a specific address */ ++ if (addr) { ++ addr =3D PAGE_ALIGN(addr); ++ if (pax_task_size - len >=3D addr) { ++ vma =3D find_vma(mm, addr); ++ if (check_heap_stack_gap(vma, addr, len)) ++ return addr; ++ } ++ } ++ ++ /* check if free_area_cache is useful for us */ ++ if (len <=3D mm->cached_hole_size) { ++ mm->cached_hole_size =3D 0; ++ mm->free_area_cache =3D mm->mmap_base; ++ } ++ ++ /* either no address requested or can't fit in requested address hole = */ ++ addr =3D mm->free_area_cache; ++ ++ /* make sure it can fit in the remaining address space */ ++ if (addr > len) { ++ vma =3D find_vma(mm, addr-len); ++ if (check_heap_stack_gap(vma, addr - len, len)) ++ /* remember the address as a hint for next time */ ++ return (mm->free_area_cache =3D addr-len); ++ } ++ ++ if (mm->mmap_base < len) ++ goto bottomup; ++ ++ addr =3D mm->mmap_base-len; ++ ++ do { ++ /* ++ * Lookup failure means no vma is above this address, ++ * else if new region fits below vma->vm_start, ++ * return with success: ++ */ ++ vma =3D find_vma(mm, addr); ++ if (check_heap_stack_gap(vma, addr, len)) ++ /* remember the address as a hint for next time */ ++ return (mm->free_area_cache =3D addr); ++ ++ /* remember the largest hole we saw so far */ ++ if (addr + mm->cached_hole_size < vma->vm_start) ++ mm->cached_hole_size =3D vma->vm_start - addr; ++ ++ /* try just below the current vma->vm_start */ ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); ++ ++bottomup: ++ /* ++ * A failed mmap() very likely causes application failure, ++ * so fall back to the bottom-up function here. This scenario ++ * can happen with large stack limits and large mmap() ++ * allocations. ++ */ ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ mm->mmap_base =3D SEGMEXEC_TASK_UNMAPPED_BASE; ++ else ++#endif ++ ++ mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ ++ mm->free_area_cache =3D mm->mmap_base; ++ mm->cached_hole_size =3D ~0UL; ++ addr =3D arch_get_unmapped_area(filp, addr0, len, pgoff, flags); ++ /* ++ * Restore the topdown base: ++ */ ++ mm->mmap_base =3D base; ++ mm->free_area_cache =3D base; ++ mm->cached_hole_size =3D ~0UL; ++ ++ return addr; ++} +=20 + struct sel_arg_struct { + unsigned long n; +@@ -93,7 +314,7 @@ asmlinkage int sys_ipc(uint call, int fi + return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NUL= L); + case SEMTIMEDOP: + return sys_semtimedop(first, (struct sembuf __user *)ptr, second, +- (const struct timespec __user *)fifth); ++ (__force const struct timespec __user *)fifth); +=20 + case SEMGET: + return sys_semget(first, second, third); +@@ -140,7 +361,7 @@ asmlinkage int sys_ipc(uint call, int fi + ret =3D do_shmat(first, (char __user *) ptr, second, &raddr); + if (ret) + return ret; +- return put_user(raddr, (ulong __user *) third); ++ return put_user(raddr, (__force ulong __user *) third); + } + case 1: /* iBCS2 emulator entry point */ + if (!segment_eq(get_fs(), get_ds())) +@@ -207,17 +428,3 @@ asmlinkage int sys_olduname(struct oldol +=20 + return error; + } +- +- +-/* +- * Do a system call from kernel instead of calling sys_execve so we +- * end up with proper pt_regs. +- */ +-int kernel_execve(const char *filename, char *const argv[], char *const= envp[]) +-{ +- long __res; +- asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx" +- : "=3Da" (__res) +- : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory= "); +- return __res; +-} +diff -urNp linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c linux-2.6.32.45/= arch/x86/kernel/sys_x86_64.c +--- linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/sys_x86_64.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -32,8 +32,8 @@ out: + return error; + } +=20 +-static void find_start_end(unsigned long flags, unsigned long *begin, +- unsigned long *end) ++static void find_start_end(struct mm_struct *mm, unsigned long flags, ++ unsigned long *begin, unsigned long *end) + { + if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) { + unsigned long new_begin; +@@ -52,7 +52,7 @@ static void find_start_end(unsigned long + *begin =3D new_begin; + } + } else { +- *begin =3D TASK_UNMAPPED_BASE; ++ *begin =3D mm->mmap_base; + *end =3D TASK_SIZE; + } + } +@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp + if (flags & MAP_FIXED) + return addr; +=20 +- find_start_end(flags, &begin, &end); ++ find_start_end(mm, flags, &begin, &end); +=20 + if (len > end) + return -ENOMEM; +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + if (addr) { + addr =3D PAGE_ALIGN(addr); + vma =3D find_vma(mm, addr); +- if (end - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (end - len >=3D addr && check_heap_stack_gap(vma, addr, len)) + return addr; + } + if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32)) +@@ -106,7 +109,7 @@ full_search: + } + return -ENOMEM; + } +- if (!vma || addr + len <=3D vma->vm_start) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* + * Remember the place where we stopped the search: + */ +@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi + { + struct vm_area_struct *vma; + struct mm_struct *mm =3D current->mm; +- unsigned long addr =3D addr0; ++ unsigned long base =3D mm->mmap_base, addr =3D addr0; +=20 + /* requested length too big for entire address space */ + if (len > TASK_SIZE) +@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi + if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) + goto bottomup; +=20 ++#ifdef CONFIG_PAX_RANDMMAP ++ if (!(mm->pax_flags & MF_PAX_RANDMMAP)) ++#endif ++ + /* requesting a specific address */ + if (addr) { + addr =3D PAGE_ALIGN(addr); +- vma =3D find_vma(mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) +- return addr; ++ if (TASK_SIZE - len >=3D addr) { ++ vma =3D find_vma(mm, addr); ++ if (check_heap_stack_gap(vma, addr, len)) ++ return addr; ++ } + } +=20 + /* check if free_area_cache is useful for us */ +@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct fi + /* make sure it can fit in the remaining address space */ + if (addr > len) { + vma =3D find_vma(mm, addr-len); +- if (!vma || addr <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr - len, len)) + /* remember the address as a hint for next time */ + return mm->free_area_cache =3D addr-len; + } +@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi + * return with success: + */ + vma =3D find_vma(mm, addr); +- if (!vma || addr+len <=3D vma->vm_start) ++ if (check_heap_stack_gap(vma, addr, len)) + /* remember the address as a hint for next time */ + return mm->free_area_cache =3D addr; +=20 +@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi + mm->cached_hole_size =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D vma->vm_start-len; +- } while (len < vma->vm_start); ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); +=20 + bottomup: + /* +@@ -198,13 +206,21 @@ bottomup: + * can happen with large stack limits and large mmap() + * allocations. + */ ++ mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ ++ mm->free_area_cache =3D mm->mmap_base; + mm->cached_hole_size =3D ~0UL; +- mm->free_area_cache =3D TASK_UNMAPPED_BASE; + addr =3D arch_get_unmapped_area(filp, addr0, len, pgoff, flags); + /* + * Restore the topdown base: + */ +- mm->free_area_cache =3D mm->mmap_base; ++ mm->mmap_base =3D base; ++ mm->free_area_cache =3D base; + mm->cached_hole_size =3D ~0UL; +=20 + return addr; +diff -urNp linux-2.6.32.45/arch/x86/kernel/tboot.c linux-2.6.32.45/arch/= x86/kernel/tboot.c +--- linux-2.6.32.45/arch/x86/kernel/tboot.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/tboot.c 2011-05-22 23:02:03.00000000= 0 -0400 +@@ -216,7 +216,7 @@ static int tboot_setup_sleep(void) +=20 + void tboot_shutdown(u32 shutdown_type) + { +- void (*shutdown)(void); ++ void (* __noreturn shutdown)(void); +=20 + if (!tboot_enabled()) + return; +@@ -238,7 +238,7 @@ void tboot_shutdown(u32 shutdown_type) +=20 + switch_to_tboot_pt(); +=20 +- shutdown =3D (void(*)(void))(unsigned long)tboot->shutdown_entry; ++ shutdown =3D (void *)tboot->shutdown_entry; + shutdown(); +=20 + /* should not reach here */ +@@ -295,7 +295,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1 + tboot_shutdown(acpi_shutdown_map[sleep_state]); + } +=20 +-static atomic_t ap_wfs_count; ++static atomic_unchecked_t ap_wfs_count; +=20 + static int tboot_wait_for_aps(int num_aps) + { +@@ -319,9 +319,9 @@ static int __cpuinit tboot_cpu_callback( + { + switch (action) { + case CPU_DYING: +- atomic_inc(&ap_wfs_count); ++ atomic_inc_unchecked(&ap_wfs_count); + if (num_online_cpus() =3D=3D 1) +- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count))) ++ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count))) + return NOTIFY_BAD; + break; + } +@@ -340,7 +340,7 @@ static __init int tboot_late_init(void) +=20 + tboot_create_trampoline(); +=20 +- atomic_set(&ap_wfs_count, 0); ++ atomic_set_unchecked(&ap_wfs_count, 0); + register_hotcpu_notifier(&tboot_cpu_notifier); + return 0; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/time.c linux-2.6.32.45/arch/x= 86/kernel/time.c +--- linux-2.6.32.45/arch/x86/kernel/time.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/kernel/time.c 2011-04-17 15:56:46.000000000= -0400 +@@ -26,17 +26,13 @@ + int timer_ack; + #endif +=20 +-#ifdef CONFIG_X86_64 +-volatile unsigned long __jiffies __section_jiffies =3D INITIAL_JIFFIES; +-#endif +- + unsigned long profile_pc(struct pt_regs *regs) + { + unsigned long pc =3D instruction_pointer(regs); +=20 +- 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 =3D + (unsigned long *)kernel_stack_pointer(regs); +@@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs=20 + * or above a saved flags. Eflags has bits 22-31 zero, + * kernel addresses don't. + */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ return ktla_ktva(sp[0]); ++#else + if (sp[0] >> 22) + return sp[0]; + if (sp[1] >> 22) + return sp[1]; + #endif ++ ++#endif + } + return pc; + } +diff -urNp linux-2.6.32.45/arch/x86/kernel/tls.c linux-2.6.32.45/arch/x8= 6/kernel/tls.c +--- linux-2.6.32.45/arch/x86/kernel/tls.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/kernel/tls.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc + if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) + return -EINVAL; +=20 ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LD= T_CONTENTS_CODE)) ++ return -EINVAL; ++#endif ++ + set_tls_desc(p, idx, &info, 1); +=20 + return 0; +diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_32.S linux-2.6.32.= 45/arch/x86/kernel/trampoline_32.S +--- linux-2.6.32.45/arch/x86/kernel/trampoline_32.S 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/trampoline_32.S 2011-04-17 15:56:46.= 000000000 -0400 +@@ -32,6 +32,12 @@ + #include + #include +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++#define ta(X) (X) ++#else ++#define ta(X) ((X) - __PAGE_OFFSET) ++#endif ++ + /* We can free up trampoline after bootup if cpu hotplug is not support= ed. */ + __CPUINITRODATA + .code16 +@@ -60,7 +66,7 @@ r_base =3D . + 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 +- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET) ++ ljmpl $__BOOT_CS, $ta(startup_32_smp) +=20 + # These need to be in the same 64K segment as the above; + # hence we don't use the boot_gdt_descr defined in head.S +diff -urNp linux-2.6.32.45/arch/x86/kernel/trampoline_64.S linux-2.6.32.= 45/arch/x86/kernel/trampoline_64.S +--- linux-2.6.32.45/arch/x86/kernel/trampoline_64.S 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/trampoline_64.S 2011-07-01 18:53:26.= 000000000 -0400 +@@ -91,7 +91,7 @@ startup_32: + movl $__KERNEL_DS, %eax # Initialize the %ds segment register + movl %eax, %ds +=20 +- movl $X86_CR4_PAE, %eax ++ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax + movl %eax, %cr4 # Enable PAE mode +=20 + # Setup trampoline 4 level pagetables +@@ -127,7 +127,7 @@ startup_64: + no_longmode: + hlt + jmp no_longmode +-#include "verify_cpu_64.S" ++#include "verify_cpu.S" +=20 + # Careful these need to be in the same 64K segment as the above; + tidt: +@@ -138,7 +138,7 @@ tidt: + # so the kernel can live anywhere + .balign 4 + tgdt: +- .short tgdt_end - tgdt # gdt limit ++ .short tgdt_end - tgdt - 1 # gdt limit + .long tgdt - r_base + .short 0 + .quad 0x00cf9b000000ffff # __KERNEL32_CS +diff -urNp linux-2.6.32.45/arch/x86/kernel/traps.c linux-2.6.32.45/arch/= x86/kernel/traps.c +--- linux-2.6.32.45/arch/x86/kernel/traps.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/traps.c 2011-07-06 19:53:33.00000000= 0 -0400 +@@ -69,12 +69,6 @@ asmlinkage int system_call(void); +=20 + /* Do we ignore FPU interrupts ? */ + char ignore_fpu_irq; +- +-/* +- * The IDT has to be page-aligned to simplify the Pentium +- * F0 0F bug workaround. +- */ +-gate_desc idt_table[NR_VECTORS] __page_aligned_data =3D { { { { 0, 0 } = } }, }; + #endif +=20 + DECLARE_BITMAP(used_vectors, NR_VECTORS); +@@ -112,19 +106,19 @@ static inline void preempt_conditional_c + static inline void + die_if_kernel(const char *str, struct pt_regs *regs, long err) + { +- if (!user_mode_vm(regs)) ++ if (!user_mode(regs)) + die(str, regs, err); + } + #endif +=20 + static void __kprobes +-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs, ++do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs, + long error_code, siginfo_t *info) + { + struct task_struct *tsk =3D current; +=20 + #ifdef CONFIG_X86_32 +- if (regs->flags & X86_VM_MASK) { ++ if (v8086_mode(regs)) { + /* + * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. + * On nmi (interrupt 2), do_trap should not be called. +@@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str + } + #endif +=20 +- if (!user_mode(regs)) ++ if (!user_mode_novm(regs)) + goto kernel_trap; +=20 + #ifdef CONFIG_X86_32 +@@ -158,7 +152,7 @@ trap_signal: + printk_ratelimit()) { + printk(KERN_INFO + "%s[%d] trap %s ip:%lx sp:%lx error:%lx", +- tsk->comm, tsk->pid, str, ++ tsk->comm, task_pid_nr(tsk), str, + regs->ip, regs->sp, error_code); + print_vma_addr(" in ", regs->ip); + printk("\n"); +@@ -175,8 +169,20 @@ kernel_trap: + if (!fixup_exception(regs)) { + tsk->thread.error_code =3D error_code; + tsk->thread.trap_no =3D trapnr; ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if (trapnr =3D=3D 12 && ((regs->cs & 0xFFFF) =3D=3D __KERNEL_CS || (r= egs->cs & 0xFFFF) =3D=3D __KERNEXEC_KERNEL_CS)) ++ str =3D "PAX: suspicious stack segment fault"; ++#endif ++ + die(str, regs, error_code); + } ++ ++#ifdef CONFIG_PAX_REFCOUNT ++ if (trapnr =3D=3D 4) ++ pax_report_refcount_overflow(regs); ++#endif ++ + return; +=20 + #ifdef CONFIG_X86_32 +@@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *re + conditional_sti(regs); +=20 + #ifdef CONFIG_X86_32 +- if (regs->flags & X86_VM_MASK) ++ if (v8086_mode(regs)) + goto gp_in_vm86; + #endif +=20 + tsk =3D current; +- if (!user_mode(regs)) ++ if (!user_mode_novm(regs)) + goto gp_in_kernel; +=20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++ if (!nx_enabled && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) = { ++ struct mm_struct *mm =3D tsk->mm; ++ unsigned long limit; ++ ++ down_write(&mm->mmap_sem); ++ limit =3D mm->context.user_cs_limit; ++ if (limit < TASK_SIZE) { ++ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC); ++ up_write(&mm->mmap_sem); ++ return; ++ } ++ up_write(&mm->mmap_sem); ++ } ++#endif ++ + tsk->thread.error_code =3D error_code; + tsk->thread.trap_no =3D 13; +=20 +@@ -305,6 +327,13 @@ gp_in_kernel: + if (notify_die(DIE_GPF, "general protection fault", regs, + error_code, 13, SIGSEGV) =3D=3D NOTIFY_STOP) + return; ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if ((regs->cs & 0xFFFF) =3D=3D __KERNEL_CS || (regs->cs & 0xFFFF) =3D=3D= __KERNEXEC_KERNEL_CS) ++ die("PAX: suspicious general protection fault", regs, error_code); ++ else ++#endif ++ + die("general protection fault", regs, error_code); + } +=20 +@@ -435,6 +464,17 @@ static notrace __kprobes void default_do + dotraplinkage notrace __kprobes void + do_nmi(struct pt_regs *regs, long error_code) + { ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ if (!user_mode(regs)) { ++ unsigned long cs =3D regs->cs & 0xFFFF; ++ unsigned long ip =3D ktva_ktla(regs->ip); ++ ++ if ((cs =3D=3D __KERNEL_CS || cs =3D=3D __KERNEXEC_KERNEL_CS) && ip <= =3D (unsigned long)_etext) ++ regs->ip =3D ip; ++ } ++#endif ++ + nmi_enter(); +=20 + inc_irq_stat(__nmi_count); +@@ -558,7 +598,7 @@ dotraplinkage void __kprobes do_debug(st + } +=20 + #ifdef CONFIG_X86_32 +- if (regs->flags & X86_VM_MASK) ++ if (v8086_mode(regs)) + goto debug_vm86; + #endif +=20 +@@ -570,7 +610,7 @@ dotraplinkage void __kprobes do_debug(st + * kernel space (but re-enable TF when returning to user mode). + */ + if (condition & DR_STEP) { +- if (!user_mode(regs)) ++ if (!user_mode_novm(regs)) + goto clear_TF_reenable; + } +=20 +@@ -757,7 +797,7 @@ do_simd_coprocessor_error(struct pt_regs + * Handle strange cache flush from user space exception + * in all other cases. This is undocumented behaviour. + */ +- if (regs->flags & X86_VM_MASK) { ++ if (v8086_mode(regs)) { + handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); + return; + } +@@ -798,7 +838,7 @@ asmlinkage void __attribute__((weak)) sm + void __math_state_restore(void) + { + struct thread_info *thread =3D current_thread_info(); +- struct task_struct *tsk =3D thread->task; ++ struct task_struct *tsk =3D current; +=20 + /* + * Paranoid restore. send a SIGSEGV if we fail to restore the state. +@@ -825,8 +865,7 @@ void __math_state_restore(void) + */ + asmlinkage void math_state_restore(void) + { +- struct thread_info *thread =3D current_thread_info(); +- struct task_struct *tsk =3D thread->task; ++ struct task_struct *tsk =3D current; +=20 + if (!tsk_used_math(tsk)) { + local_irq_enable(); +diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.= 45/arch/x86/kernel/verify_cpu_64.S +--- linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/verify_cpu_64.S 1969-12-31 19:00:00.= 000000000 -0500 +@@ -1,105 +0,0 @@ +-/* +- * +- * verify_cpu.S - Code for cpu long mode and SSE verification. This +- * code has been borrowed from boot/setup.S and was introduced by +- * Andi Kleen. +- * +- * Copyright (c) 2007 Andi Kleen (ak@suse.de) +- * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com) +- * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com) +- * +- * This source code is licensed under the GNU General Public License, +- * Version 2. See the file COPYING for more details. +- * +- * This is a common code for verification whether CPU supports +- * long mode and SSE or not. It is not called directly instead this +- * file is included at various places and compiled in that context. +- * Following are the current usage. +- * +- * This file is included by both 16bit and 32bit code. +- * +- * arch/x86_64/boot/setup.S : Boot cpu verification (16bit) +- * arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit) +- * arch/x86_64/kernel/trampoline.S: secondary processor verfication (16= bit) +- * arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit) +- * +- * verify_cpu, returns the status of cpu check in register %eax. +- * 0: Success 1: Failure +- * +- * The caller needs to check for the error code and take the action +- * appropriately. Either display a message or halt. +- */ +- +-#include +- +-verify_cpu: +- pushfl # Save caller passed flags +- pushl $0 # Kill any dangerous flags +- popfl +- +- pushfl # standard way to check for cpuid +- popl %eax +- movl %eax,%ebx +- xorl $0x200000,%eax +- pushl %eax +- popfl +- pushfl +- popl %eax +- cmpl %eax,%ebx +- jz verify_cpu_no_longmode # cpu has no cpuid +- +- movl $0x0,%eax # See if cpuid 1 is implemented +- cpuid +- cmpl $0x1,%eax +- jb verify_cpu_no_longmode # no cpuid 1 +- +- xor %di,%di +- cmpl $0x68747541,%ebx # AuthenticAMD +- jnz verify_cpu_noamd +- cmpl $0x69746e65,%edx +- jnz verify_cpu_noamd +- cmpl $0x444d4163,%ecx +- jnz verify_cpu_noamd +- mov $1,%di # cpu is from AMD +- +-verify_cpu_noamd: +- movl $0x1,%eax # Does the cpu have what it takes +- cpuid +- andl $REQUIRED_MASK0,%edx +- xorl $REQUIRED_MASK0,%edx +- jnz verify_cpu_no_longmode +- +- movl $0x80000000,%eax # See if extended cpuid is implemented +- cpuid +- cmpl $0x80000001,%eax +- jb verify_cpu_no_longmode # no extended cpuid +- +- movl $0x80000001,%eax # Does the cpu have what it takes +- cpuid +- andl $REQUIRED_MASK1,%edx +- xorl $REQUIRED_MASK1,%edx +- jnz verify_cpu_no_longmode +- +-verify_cpu_sse_test: +- movl $1,%eax +- cpuid +- andl $SSE_MASK,%edx +- cmpl $SSE_MASK,%edx +- je verify_cpu_sse_ok +- test %di,%di +- jz verify_cpu_no_longmode # only try to force SSE on AMD +- movl $0xc0010015,%ecx # HWCR +- rdmsr +- btr $15,%eax # enable SSE +- wrmsr +- xor %di,%di # don't loop +- jmp verify_cpu_sse_test # try again +- +-verify_cpu_no_longmode: +- popfl # Restore caller passed flags +- movl $1,%eax +- ret +-verify_cpu_sse_ok: +- popfl # Restore caller passed flags +- xorl %eax, %eax +- ret +diff -urNp linux-2.6.32.45/arch/x86/kernel/verify_cpu.S linux-2.6.32.45/= arch/x86/kernel/verify_cpu.S +--- linux-2.6.32.45/arch/x86/kernel/verify_cpu.S 1969-12-31 19:00:00.000= 000000 -0500 ++++ linux-2.6.32.45/arch/x86/kernel/verify_cpu.S 2011-07-01 18:28:42.000= 000000 -0400 +@@ -0,0 +1,140 @@ ++/* ++ * ++ * verify_cpu.S - Code for cpu long mode and SSE verification. This ++ * code has been borrowed from boot/setup.S and was introduced by ++ * Andi Kleen. ++ * ++ * Copyright (c) 2007 Andi Kleen (ak@suse.de) ++ * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com) ++ * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com) ++ * Copyright (c) 2010 Kees Cook (kees.cook@canonical.com) ++ * ++ * This source code is licensed under the GNU General Public License, ++ * Version 2. See the file COPYING for more details. ++ * ++ * This is a common code for verification whether CPU supports ++ * long mode and SSE or not. It is not called directly instead this ++ * file is included at various places and compiled in that context. ++ * This file is expected to run in 32bit code. Currently: ++ * ++ * arch/x86/boot/compressed/head_64.S: Boot cpu verification ++ * arch/x86/kernel/trampoline_64.S: secondary processor verification ++ * arch/x86/kernel/head_32.S: processor startup ++ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume ++ * ++ * verify_cpu, returns the status of longmode and SSE in register %eax. ++ * 0: Success 1: Failure ++ * ++ * On Intel, the XD_DISABLE flag will be cleared as a side-effect. ++ * ++ * The caller needs to check for the error code and take the action ++ * appropriately. Either display a message or halt. ++ */ ++ ++#include ++#include ++ ++verify_cpu: ++ pushfl # Save caller passed flags ++ pushl $0 # Kill any dangerous flags ++ popfl ++ ++ pushfl # standard way to check for cpuid ++ popl %eax ++ movl %eax,%ebx ++ xorl $0x200000,%eax ++ pushl %eax ++ popfl ++ pushfl ++ popl %eax ++ cmpl %eax,%ebx ++ jz verify_cpu_no_longmode # cpu has no cpuid ++ ++ movl $0x0,%eax # See if cpuid 1 is implemented ++ cpuid ++ cmpl $0x1,%eax ++ jb verify_cpu_no_longmode # no cpuid 1 ++ ++ xor %di,%di ++ cmpl $0x68747541,%ebx # AuthenticAMD ++ jnz verify_cpu_noamd ++ cmpl $0x69746e65,%edx ++ jnz verify_cpu_noamd ++ cmpl $0x444d4163,%ecx ++ jnz verify_cpu_noamd ++ mov $1,%di # cpu is from AMD ++ jmp verify_cpu_check ++ ++verify_cpu_noamd: ++ cmpl $0x756e6547,%ebx # GenuineIntel? ++ jnz verify_cpu_check ++ cmpl $0x49656e69,%edx ++ jnz verify_cpu_check ++ cmpl $0x6c65746e,%ecx ++ jnz verify_cpu_check ++ ++ # only call IA32_MISC_ENABLE when: ++ # family > 6 || (family =3D=3D 6 && model >=3D 0xd) ++ movl $0x1, %eax # check CPU family and model ++ cpuid ++ movl %eax, %ecx ++ ++ andl $0x0ff00f00, %eax # mask family and extended family ++ shrl $8, %eax ++ cmpl $6, %eax ++ ja verify_cpu_clear_xd # family > 6, ok ++ jb verify_cpu_check # family < 6, skip ++ ++ andl $0x000f00f0, %ecx # mask model and extended model ++ shrl $4, %ecx ++ cmpl $0xd, %ecx ++ jb verify_cpu_check # family =3D=3D 6, model < 0xd, skip ++ ++verify_cpu_clear_xd: ++ movl $MSR_IA32_MISC_ENABLE, %ecx ++ rdmsr ++ btrl $2, %edx # clear MSR_IA32_MISC_ENABLE_XD_DISABLE ++ jnc verify_cpu_check # only write MSR if bit was changed ++ wrmsr ++ ++verify_cpu_check: ++ movl $0x1,%eax # Does the cpu have what it takes ++ cpuid ++ andl $REQUIRED_MASK0,%edx ++ xorl $REQUIRED_MASK0,%edx ++ jnz verify_cpu_no_longmode ++ ++ movl $0x80000000,%eax # See if extended cpuid is implemented ++ cpuid ++ cmpl $0x80000001,%eax ++ jb verify_cpu_no_longmode # no extended cpuid ++ ++ movl $0x80000001,%eax # Does the cpu have what it takes ++ cpuid ++ andl $REQUIRED_MASK1,%edx ++ xorl $REQUIRED_MASK1,%edx ++ jnz verify_cpu_no_longmode ++ ++verify_cpu_sse_test: ++ movl $1,%eax ++ cpuid ++ andl $SSE_MASK,%edx ++ cmpl $SSE_MASK,%edx ++ je verify_cpu_sse_ok ++ test %di,%di ++ jz verify_cpu_no_longmode # only try to force SSE on AMD ++ movl $MSR_K7_HWCR,%ecx ++ rdmsr ++ btr $15,%eax # enable SSE ++ wrmsr ++ xor %di,%di # don't loop ++ jmp verify_cpu_sse_test # try again ++ ++verify_cpu_no_longmode: ++ popfl # Restore caller passed flags ++ movl $1,%eax ++ ret ++verify_cpu_sse_ok: ++ popfl # Restore caller passed flags ++ xorl %eax, %eax ++ ret +diff -urNp linux-2.6.32.45/arch/x86/kernel/vm86_32.c linux-2.6.32.45/arc= h/x86/kernel/vm86_32.c +--- linux-2.6.32.45/arch/x86/kernel/vm86_32.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/vm86_32.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include +=20 + #include + #include +@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct ke + do_exit(SIGSEGV); + } +=20 +- tss =3D &per_cpu(init_tss, get_cpu()); ++ tss =3D init_tss + get_cpu(); + current->thread.sp0 =3D current->thread.saved_sp0; + current->thread.sysenter_cs =3D __KERNEL_CS; + load_sp0(tss, ¤t->thread); +@@ -208,6 +209,13 @@ int sys_vm86old(struct pt_regs *regs) + struct task_struct *tsk; + int tmp, ret =3D -EPERM; +=20 ++#ifdef CONFIG_GRKERNSEC_VM86 ++ if (!capable(CAP_SYS_RAWIO)) { ++ gr_handle_vm86(); ++ goto out; ++ } ++#endif ++ + tsk =3D current; + if (tsk->thread.saved_sp0) + goto out; +@@ -238,6 +246,14 @@ int sys_vm86(struct pt_regs *regs) + int tmp, ret; + struct vm86plus_struct __user *v86; +=20 ++#ifdef CONFIG_GRKERNSEC_VM86 ++ if (!capable(CAP_SYS_RAWIO)) { ++ gr_handle_vm86(); ++ ret =3D -EPERM; ++ goto out; ++ } ++#endif ++ + tsk =3D current; + switch (regs->bx) { + case VM86_REQUEST_IRQ: +@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm + tsk->thread.saved_fs =3D info->regs32->fs; + tsk->thread.saved_gs =3D get_user_gs(info->regs32); +=20 +- tss =3D &per_cpu(init_tss, get_cpu()); ++ tss =3D init_tss + get_cpu(); + tsk->thread.sp0 =3D (unsigned long) &info->VM86_TSS_ESP0; + if (cpu_has_sep) + tsk->thread.sysenter_cs =3D 0; +@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_re + goto cannot_handle; + if (i =3D=3D 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored)= ) + goto cannot_handle; +- intr_ptr =3D (unsigned long __user *) (i << 2); ++ intr_ptr =3D (__force unsigned long __user *) (i << 2); + if (get_user(segoffs, intr_ptr)) + goto cannot_handle; + if ((segoffs >> 16) =3D=3D BIOSSEG) +diff -urNp linux-2.6.32.45/arch/x86/kernel/vmi_32.c linux-2.6.32.45/arch= /x86/kernel/vmi_32.c +--- linux-2.6.32.45/arch/x86/kernel/vmi_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/vmi_32.c 2011-08-05 20:33:55.0000000= 00 -0400 +@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))=20 + typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); +=20 + #define call_vrom_func(rom,func) \ +- (((VROMFUNC *)(rom->func))()) ++ (((VROMFUNC *)(ktva_ktla(rom.func)))()) +=20 + #define call_vrom_long_func(rom,func,arg) \ +- (((VROMLONGFUNC *)(rom->func)) (arg)) ++({\ ++ u64 __reloc =3D ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\ ++ struct vmi_relocation_info *const __rel =3D (struct vmi_relocation_inf= o *)&__reloc;\ ++ __rel->eip =3D (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\ ++ __reloc;\ ++}) +=20 +-static struct vrom_header *vmi_rom; ++static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"),= __aligned__(PAGE_SIZE))); + static int disable_pge; + static int disable_pse; + static int disable_sep; +@@ -76,10 +81,10 @@ static struct { + void (*set_initial_ap_state)(int, int); + void (*halt)(void); + void (*set_lazy_mode)(int mode); +-} vmi_ops; ++} __no_const vmi_ops __read_only; +=20 + /* Cached VMI operations */ +-struct vmi_timer_ops vmi_timer_ops; ++struct vmi_timer_ops vmi_timer_ops __read_only; +=20 + /* + * VMI patching routines. +@@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops; + static inline void patch_offset(void *insnbuf, + unsigned long ip, unsigned long dest) + { +- *(unsigned long *)(insnbuf+1) =3D dest-ip-5; ++ *(unsigned long *)(insnbuf+1) =3D dest-ip-5; + } +=20 + static unsigned patch_internal(int call, unsigned len, void *insnbuf, +@@ -102,6 +107,7 @@ static unsigned patch_internal(int call, + { + u64 reloc; + struct vmi_relocation_info *const rel =3D (struct vmi_relocation_info = *)&reloc; ++ + reloc =3D call_vrom_long_func(vmi_rom, get_reloc, call); + switch(rel->type) { + case VMI_RELOCATION_CALL_REL: +@@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud +=20 + static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte= _t *ptep) + { +- const pte_t pte =3D { .pte =3D 0 }; ++ const pte_t pte =3D __pte(0ULL); + vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0)); + } +=20 + static void vmi_pmd_clear(pmd_t *pmd) + { +- const pte_t pte =3D { .pte =3D 0 }; ++ const pte_t pte =3D __pte(0ULL); + vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD); + } + #endif +@@ -438,10 +444,10 @@ vmi_startup_ipi_hook(int phys_apicid, un + ap.ss =3D __KERNEL_DS; + ap.esp =3D (unsigned long) start_esp; +=20 +- ap.ds =3D __USER_DS; +- ap.es =3D __USER_DS; ++ ap.ds =3D __KERNEL_DS; ++ ap.es =3D __KERNEL_DS; + ap.fs =3D __KERNEL_PERCPU; +- ap.gs =3D __KERNEL_STACK_CANARY; ++ savesegment(gs, ap.gs); +=20 + ap.eflags =3D 0; +=20 +@@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void) + paravirt_leave_lazy_mmu(); + } +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++static unsigned long vmi_pax_open_kernel(void) ++{ ++ return 0; ++} ++ ++static unsigned long vmi_pax_close_kernel(void) ++{ ++ return 0; ++} ++#endif ++ + static inline int __init check_vmi_rom(struct vrom_header *rom) + { + struct pci_header *pci; +@@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(s + return 0; + if (rom->vrom_signature !=3D VMI_SIGNATURE) + return 0; ++ if (rom->rom_length * 512 > sizeof(*rom)) { ++ printk(KERN_WARNING "PAX: VMI: ROM size too big: %x\n", rom->rom_leng= th * 512); ++ return 0; ++ } + if (rom->api_version_maj !=3D VMI_API_REV_MAJOR || + rom->api_version_min+1 < VMI_API_REV_MINOR+1) { + printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n", +@@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(v + struct vrom_header *romstart; + romstart =3D (struct vrom_header *)isa_bus_to_virt(base); + if (check_vmi_rom(romstart)) { +- vmi_rom =3D romstart; ++ vmi_rom =3D *romstart; + return 1; + } + } +@@ -836,6 +858,11 @@ static inline int __init activate_vmi(vo +=20 + para_fill(pv_irq_ops.safe_halt, Halt); +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++ pv_mmu_ops.pax_open_kernel =3D vmi_pax_open_kernel; ++ pv_mmu_ops.pax_close_kernel =3D vmi_pax_close_kernel; ++#endif ++ + /* + * Alternative instruction rewriting doesn't happen soon enough + * to convert VMI_IRET to a call instead of a jump; so we have +@@ -853,16 +880,16 @@ static inline int __init activate_vmi(vo +=20 + void __init vmi_init(void) + { +- if (!vmi_rom) ++ if (!vmi_rom.rom_signature) + probe_vmi_rom(); + else +- check_vmi_rom(vmi_rom); ++ check_vmi_rom(&vmi_rom); +=20 + /* In case probing for or validating the ROM failed, basil */ +- if (!vmi_rom) ++ if (!vmi_rom.rom_signature) + return; +=20 +- reserve_top_address(-vmi_rom->virtual_top); ++ reserve_top_address(-vmi_rom.virtual_top); +=20 + #ifdef CONFIG_X86_IO_APIC + /* This is virtual hardware; timer routing is wired correctly */ +@@ -874,7 +901,7 @@ void __init vmi_activate(void) + { + unsigned long flags; +=20 +- if (!vmi_rom) ++ if (!vmi_rom.rom_signature) + return; +=20 + local_irq_save(flags); +diff -urNp linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.45= /arch/x86/kernel/vmlinux.lds.S +--- linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/vmlinux.lds.S 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -26,6 +26,13 @@ + #include + #include + #include ++#include ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR) ++#else ++#define __KERNEL_TEXT_OFFSET 0 ++#endif +=20 + #undef i386 /* in case the preprocessor is a 32bit one */ +=20 +@@ -34,40 +41,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONF + #ifdef CONFIG_X86_32 + OUTPUT_ARCH(i386) + ENTRY(phys_startup_32) +-jiffies =3D jiffies_64; + #else + OUTPUT_ARCH(i386:x86-64) + ENTRY(phys_startup_64) +-jiffies_64 =3D jiffies; + #endif +=20 + PHDRS { + text PT_LOAD FLAGS(5); /* R_E */ +- data PT_LOAD FLAGS(7); /* RWE */ ++#ifdef CONFIG_X86_32 ++ module PT_LOAD FLAGS(5); /* R_E */ ++#endif ++#ifdef CONFIG_XEN ++ rodata PT_LOAD FLAGS(5); /* R_E */ ++#else ++ rodata PT_LOAD FLAGS(4); /* R__ */ ++#endif ++ data PT_LOAD FLAGS(6); /* RW_ */ + #ifdef CONFIG_X86_64 + user PT_LOAD FLAGS(5); /* R_E */ ++#endif ++ init.begin PT_LOAD FLAGS(6); /* RW_ */ + #ifdef CONFIG_SMP + percpu PT_LOAD FLAGS(6); /* RW_ */ + #endif ++ text.init PT_LOAD FLAGS(5); /* R_E */ ++ text.exit PT_LOAD FLAGS(5); /* R_E */ + init PT_LOAD FLAGS(7); /* RWE */ +-#endif + note PT_NOTE FLAGS(0); /* ___ */ + } +=20 + SECTIONS + { + #ifdef CONFIG_X86_32 +- . =3D LOAD_OFFSET + LOAD_PHYSICAL_ADDR; +- phys_startup_32 =3D startup_32 - LOAD_OFFSET; ++ . =3D LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR; + #else +- . =3D __START_KERNEL; +- phys_startup_64 =3D startup_64 - LOAD_OFFSET; ++ . =3D __START_KERNEL; + #endif +=20 + /* Text and read-only data */ +- .text : AT(ADDR(.text) - LOAD_OFFSET) { +- _text =3D .; ++ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KER= NEL_TEXT_OFFSET) { + /* bootstrapping code */ ++#ifdef CONFIG_X86_32 ++ phys_startup_32 =3D startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; ++#else ++ phys_startup_64 =3D startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; ++#endif ++ __LOAD_PHYSICAL_ADDR =3D . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET; ++ _text =3D .; + HEAD_TEXT + #ifdef CONFIG_X86_32 + . =3D ALIGN(PAGE_SIZE); +@@ -82,28 +102,71 @@ SECTIONS + IRQENTRY_TEXT + *(.fixup) + *(.gnu.warning) +- /* End of text section */ +- _etext =3D .; + } :text =3D 0x9090 +=20 +- NOTES :text :note ++ . +=3D __KERNEL_TEXT_OFFSET; ++ ++#ifdef CONFIG_X86_32 ++ . =3D ALIGN(PAGE_SIZE); ++ .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) { ++ *(.vmi.rom) ++ } :module ++ ++ . =3D ALIGN(PAGE_SIZE); ++ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) { ++ ++#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES) ++ MODULES_EXEC_VADDR =3D .; ++ BYTE(0) ++ . +=3D (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024); ++ . =3D ALIGN(HPAGE_SIZE); ++ MODULES_EXEC_END =3D . - 1; ++#endif ++ ++ } :module ++#endif +=20 +- EXCEPTION_TABLE(16) :text =3D 0x9090 ++ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) { ++ /* End of text section */ ++ _etext =3D . - __KERNEL_TEXT_OFFSET; ++ } ++ ++#ifdef CONFIG_X86_32 ++ . =3D ALIGN(PAGE_SIZE); ++ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) { ++ *(.idt) ++ . =3D ALIGN(PAGE_SIZE); ++ *(.empty_zero_page) ++ *(.swapper_pg_fixmap) ++ *(.swapper_pg_pmd) ++ *(.swapper_pg_dir) ++ *(.trampoline_pg_dir) ++ } :rodata ++#endif ++ ++ . =3D ALIGN(PAGE_SIZE); ++ NOTES :rodata :note ++ ++ EXCEPTION_TABLE(16) :rodata +=20 + RO_DATA(PAGE_SIZE) +=20 + /* Data */ + .data : AT(ADDR(.data) - LOAD_OFFSET) { ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ . =3D ALIGN(HPAGE_SIZE); ++#else ++ . =3D ALIGN(PAGE_SIZE); ++#endif ++ + /* Start of data section */ + _sdata =3D .; +=20 + /* init_task */ + INIT_TASK_DATA(THREAD_SIZE) +=20 +-#ifdef CONFIG_X86_32 +- /* 32 bit has nosave before _edata */ + NOSAVE_DATA +-#endif +=20 + PAGE_ALIGNED_DATA(PAGE_SIZE) +=20 +@@ -112,6 +175,8 @@ SECTIONS + DATA_DATA + CONSTRUCTORS +=20 ++ jiffies =3D jiffies_64; ++ + /* rarely changed data like cpu maps */ + READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES) +=20 +@@ -166,12 +231,6 @@ SECTIONS + } + vgetcpu_mode =3D VVIRT(.vgetcpu_mode); +=20 +- . =3D ALIGN(CONFIG_X86_L1_CACHE_BYTES); +- .jiffies : AT(VLOAD(.jiffies)) { +- *(.jiffies) +- } +- jiffies =3D VVIRT(.jiffies); +- + .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { + *(.vsyscall_3) + } +@@ -187,12 +246,19 @@ SECTIONS + #endif /* CONFIG_X86_64 */ +=20 + /* Init code and data - will be freed after init */ +- . =3D ALIGN(PAGE_SIZE); + .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) { ++ BYTE(0) ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ . =3D ALIGN(HPAGE_SIZE); ++#else ++ . =3D ALIGN(PAGE_SIZE); ++#endif ++ + __init_begin =3D .; /* paired with __init_end */ +- } ++ } :init.begin +=20 +-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP) ++#ifdef CONFIG_SMP + /* + * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the + * output PHDR, so the next output section - .init.text - should +@@ -201,12 +267,27 @@ SECTIONS + PERCPU_VADDR(0, :percpu) + #endif +=20 +- INIT_TEXT_SECTION(PAGE_SIZE) +-#ifdef CONFIG_X86_64 +- :init +-#endif ++ . =3D ALIGN(PAGE_SIZE); ++ init_begin =3D .; ++ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) { ++ VMLINUX_SYMBOL(_sinittext) =3D .; ++ INIT_TEXT ++ VMLINUX_SYMBOL(_einittext) =3D .; ++ . =3D ALIGN(PAGE_SIZE); ++ } :text.init +=20 +- INIT_DATA_SECTION(16) ++ /* ++ * .exit.text is discard at runtime, not link time, to deal with ++ * references from .altinstructions and .eh_frame ++ */ ++ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET)= { ++ EXIT_TEXT ++ . =3D ALIGN(16); ++ } :text.exit ++ . =3D init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text); ++ ++ . =3D ALIGN(PAGE_SIZE); ++ INIT_DATA_SECTION(16) :init +=20 + .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { + __x86_cpu_dev_start =3D .; +@@ -232,19 +313,11 @@ SECTIONS + *(.altinstr_replacement) + } +=20 +- /* +- * .exit.text is discard at runtime, not link time, to deal with +- * references from .altinstructions and .eh_frame +- */ +- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { +- EXIT_TEXT +- } +- + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + EXIT_DATA + } +=20 +-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP) ++#ifndef CONFIG_SMP + PERCPU(PAGE_SIZE) + #endif +=20 +@@ -267,12 +340,6 @@ SECTIONS + . =3D ALIGN(PAGE_SIZE); + } +=20 +-#ifdef CONFIG_X86_64 +- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { +- NOSAVE_DATA +- } +-#endif +- + /* BSS */ + . =3D ALIGN(PAGE_SIZE); + .bss : AT(ADDR(.bss) - LOAD_OFFSET) { +@@ -288,6 +355,7 @@ SECTIONS + __brk_base =3D .; + . +=3D 64 * 1024; /* 64k alignment slop space */ + *(.brk_reservation) /* areas brk users have reserved */ ++ . =3D ALIGN(HPAGE_SIZE); + __brk_limit =3D .; + } +=20 +@@ -316,13 +384,12 @@ SECTIONS + * for the boot processor. + */ + #define INIT_PER_CPU(x) init_per_cpu__##x =3D per_cpu__##x + __per_cpu_= load +-INIT_PER_CPU(gdt_page); + INIT_PER_CPU(irq_stack_union); +=20 + /* + * Build-time check on the image size: + */ +-. =3D ASSERT((_end - _text <=3D KERNEL_IMAGE_SIZE), ++. =3D ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <=3D KERNEL_IMAGE_SIZ= E), + "kernel image bigger than KERNEL_IMAGE_SIZE"); +=20 + #ifdef CONFIG_SMP +diff -urNp linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c linux-2.6.32.45= /arch/x86/kernel/vsyscall_64.c +--- linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/vsyscall_64.c 2011-04-23 12:56:10.00= 0000000 -0400 +@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wa +=20 + write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); + /* copy vsyscall data */ ++ strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gt= od_data.clock.name); + vsyscall_gtod_data.clock.vread =3D clock->vread; + vsyscall_gtod_data.clock.cycle_last =3D clock->cycle_last; + vsyscall_gtod_data.clock.mask =3D clock->mask; +@@ -203,7 +204,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. */ +- if (tcache && tcache->blob[0] =3D=3D (j =3D __jiffies)) { ++ if (tcache && tcache->blob[0] =3D=3D (j =3D jiffies)) { + p =3D tcache->blob[1]; + } else if (__vgetcpu_mode =3D=3D VGETCPU_RDTSCP) { + /* Load per CPU data from RDTSCP */ +diff -urNp linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.32= .45/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/x8664_ksyms_64.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); +=20 + EXPORT_SYMBOL(copy_user_generic); + EXPORT_SYMBOL(__copy_user_nocache); +-EXPORT_SYMBOL(copy_from_user); +-EXPORT_SYMBOL(copy_to_user); + EXPORT_SYMBOL(__copy_from_user_inatomic); +=20 + EXPORT_SYMBOL(copy_page); +diff -urNp linux-2.6.32.45/arch/x86/kernel/xsave.c linux-2.6.32.45/arch/= x86/kernel/xsave.c +--- linux-2.6.32.45/arch/x86/kernel/xsave.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/kernel/xsave.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ + fx_sw_user->xstate_size > fx_sw_user->extended_size) + return -1; +=20 +- err =3D __get_user(magic2, (__u32 *) (((void *)fpstate) + ++ err =3D __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) = + + fx_sw_user->extended_size - + FP_XSTATE_MAGIC2_SIZE)); + /* +@@ -196,7 +196,7 @@ fx_only: + * the other extended state. + */ + xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE); +- return fxrstor_checking((__force struct i387_fxsave_struct *)buf); ++ return fxrstor_checking((struct i387_fxsave_struct __user *)buf); + } +=20 + /* +@@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf + if (task_thread_info(tsk)->status & TS_XSAVE) + err =3D restore_user_xstate(buf); + else +- err =3D fxrstor_checking((__force struct i387_fxsave_struct *) ++ err =3D fxrstor_checking((struct i387_fxsave_struct __user *) + buf); + if (unlikely(err)) { + /* +diff -urNp linux-2.6.32.45/arch/x86/kvm/emulate.c linux-2.6.32.45/arch/x= 86/kvm/emulate.c +--- linux-2.6.32.45/arch/x86/kvm/emulate.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/kvm/emulate.c 2011-04-17 15:56:46.000000000= -0400 +@@ -81,8 +81,8 @@ + #define Src2CL (1<<29) + #define Src2ImmByte (2<<29) + #define Src2One (3<<29) +-#define Src2Imm16 (4<<29) +-#define Src2Mask (7<<29) ++#define Src2Imm16 (4U<<29) ++#define Src2Mask (7U<<29) +=20 + enum { + Group1_80, Group1_81, Group1_82, Group1_83, +@@ -411,6 +411,7 @@ static u32 group2_table[] =3D { +=20 + #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; " \ +@@ -424,8 +425,6 @@ static u32 group2_table[] =3D { + /* 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"); \ +@@ -441,7 +440,6 @@ static u32 group2_table[] =3D { +=20 + #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.45/arch/x86/kvm/lapic.c linux-2.6.32.45/arch/x86= /kvm/lapic.c +--- linux-2.6.32.45/arch/x86/kvm/lapic.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/x86/kvm/lapic.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -52,7 +52,7 @@ + #define APIC_BUS_CYCLE_NS 1 +=20 + /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */ +-#define apic_debug(fmt, arg...) ++#define apic_debug(fmt, arg...) do {} while (0) +=20 + #define APIC_LVT_NUM 6 + /* 14 is the version for Xeon and Pentium 8.4.8*/ +diff -urNp linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h linux-2.6.32.45/ar= ch/x86/kvm/paging_tmpl.h +--- linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/kvm/paging_tmpl.h 2011-05-16 21:46:57.00000= 0000 -0400 +@@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_ + int level =3D PT_PAGE_TABLE_LEVEL; + unsigned long mmu_seq; +=20 ++ pax_track_stack(); ++ + pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code); + kvm_mmu_audit(vcpu, "pre page fault"); +=20 +diff -urNp linux-2.6.32.45/arch/x86/kvm/svm.c linux-2.6.32.45/arch/x86/k= vm/svm.c +--- linux-2.6.32.45/arch/x86/kvm/svm.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/kvm/svm.c 2011-08-05 20:33:55.000000000 -04= 00 +@@ -2485,7 +2485,11 @@ static void reload_tss(struct kvm_vcpu * + int cpu =3D raw_smp_processor_id(); +=20 + struct svm_cpu_data *svm_data =3D per_cpu(svm_data, cpu); ++ ++ pax_open_kernel(); + svm_data->tss_desc->type =3D 9; /* available 32/64-bit TSS */ ++ pax_close_kernel(); ++ + load_TR_desc(); + } +=20 +@@ -2946,7 +2950,7 @@ static bool svm_gb_page_enable(void) + return true; + } +=20 +-static struct kvm_x86_ops svm_x86_ops =3D { ++static const struct kvm_x86_ops svm_x86_ops =3D { + .cpu_has_kvm_support =3D has_svm, + .disabled_by_bios =3D is_disabled, + .hardware_setup =3D svm_hardware_setup, +diff -urNp linux-2.6.32.45/arch/x86/kvm/vmx.c linux-2.6.32.45/arch/x86/k= vm/vmx.c +--- linux-2.6.32.45/arch/x86/kvm/vmx.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/kvm/vmx.c 2011-05-04 17:56:20.000000000 -04= 00 +@@ -570,7 +570,11 @@ static void reload_tss(void) +=20 + kvm_get_gdt(&gdt); + descs =3D (void *)gdt.base; ++ ++ pax_open_kernel(); + descs[GDT_ENTRY_TSS].type =3D 9; /* available TSS */ ++ pax_close_kernel(); ++ + load_TR_desc(); + } +=20 +@@ -1409,8 +1413,11 @@ static __init int hardware_setup(void) + if (!cpu_has_vmx_flexpriority()) + flexpriority_enabled =3D 0; +=20 +- if (!cpu_has_vmx_tpr_shadow()) +- kvm_x86_ops->update_cr8_intercept =3D NULL; ++ if (!cpu_has_vmx_tpr_shadow()) { ++ pax_open_kernel(); ++ *(void **)&kvm_x86_ops->update_cr8_intercept =3D NULL; ++ pax_close_kernel(); ++ } +=20 + if (enable_ept && !cpu_has_vmx_ept_2m_page()) + kvm_disable_largepages(); +@@ -2361,7 +2368,7 @@ static int vmx_vcpu_setup(struct vcpu_vm + vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ +=20 + asm("mov $.Lkvm_vmx_return, %0" : "=3Dr"(kvm_vmx_return)); +- vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */ ++ vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */ + vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); + vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); + vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); +@@ -3717,6 +3724,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: " ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ "ljmp %[cs],$.Lkvm_vmx_return2\n\t" ++ ".Lkvm_vmx_return2: " ++#endif ++ + /* Save guest registers, load host registers, keep flags */ + "xchg %0, (%%"R"sp) \n\t" + "mov %%"R"ax, %c[rax](%0) \n\t" +@@ -3763,8 +3776,13 @@ 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)) ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ ,[cs]"i"(__KERNEL_CS) ++#endif ++ + : "cc", "memory" +- , R"bx", R"di", R"si" ++ , R"ax", R"bx", R"di", R"si" + #ifdef CONFIG_X86_64 + , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15" + #endif +@@ -3781,7 +3799,16 @@ static void vmx_vcpu_run(struct kvm_vcpu + if (vmx->rmode.irq.pending) + fixup_rmode_irq(vmx); +=20 +- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS)); ++ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS)); ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC) ++ loadsegment(fs, __KERNEL_PERCPU); ++#endif ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ __set_fs(current_thread_info()->addr_limit); ++#endif ++ + vmx->launched =3D 1; +=20 + vmx_complete_interrupts(vmx); +@@ -3956,7 +3983,7 @@ static bool vmx_gb_page_enable(void) + return false; + } +=20 +-static struct kvm_x86_ops vmx_x86_ops =3D { ++static const struct kvm_x86_ops vmx_x86_ops =3D { + .cpu_has_kvm_support =3D cpu_has_kvm_support, + .disabled_by_bios =3D vmx_disabled_by_bios, + .hardware_setup =3D hardware_setup, +diff -urNp linux-2.6.32.45/arch/x86/kvm/x86.c linux-2.6.32.45/arch/x86/k= vm/x86.c +--- linux-2.6.32.45/arch/x86/kvm/x86.c 2011-05-10 22:12:01.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/kvm/x86.c 2011-05-10 22:12:26.000000000 -04= 00 +@@ -82,7 +82,7 @@ static void update_cr8_intercept(struct=20 + static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries); +=20 +-struct kvm_x86_ops *kvm_x86_ops; ++const struct kvm_x86_ops *kvm_x86_ops; + EXPORT_SYMBOL_GPL(kvm_x86_ops); +=20 + int ignore_msrs =3D 0; +@@ -1430,15 +1430,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + r =3D -E2BIG; + if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) + goto out; + r =3D -EFAULT; +- if (copy_from_user(&vcpu->arch.cpuid_entries, entries, +- cpuid->nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_c= puid_entry2))) + goto out; ++ for (i =3D 0; i < cpuid->nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry; ++ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry))) ++ goto out; ++ vcpu->arch.cpuid_entries[i] =3D cpuid_entry; ++ } + vcpu->arch.cpuid_nent =3D cpuid->nent; + kvm_apic_set_version(vcpu); + return 0; +@@ -1451,16 +1456,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(str + struct kvm_cpuid2 *cpuid, + struct kvm_cpuid_entry2 __user *entries) + { +- int r; ++ int r, i; +=20 + vcpu_load(vcpu); + r =3D -E2BIG; + if (cpuid->nent < vcpu->arch.cpuid_nent) + goto out; + r =3D -EFAULT; +- if (copy_to_user(entries, &vcpu->arch.cpuid_entries, +- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2))) ++ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(s= truct kvm_cpuid_entry2))) + goto out; ++ for (i =3D 0; i < vcpu->arch.cpuid_nent; ++i) { ++ struct kvm_cpuid_entry2 cpuid_entry =3D vcpu->arch.cpuid_entries[i]; ++ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry))) ++ goto out; ++ } + return 0; +=20 + out: +@@ -1678,7 +1687,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru + static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, + struct kvm_interrupt *irq) + { +- if (irq->irq < 0 || irq->irq >=3D 256) ++ if (irq->irq >=3D 256) + return -EINVAL; + if (irqchip_in_kernel(vcpu->kvm)) + return -ENXIO; +@@ -3260,10 +3269,10 @@ static struct notifier_block kvmclock_cp + .notifier_call =3D kvmclock_cpufreq_notifier + }; +=20 +-int kvm_arch_init(void *opaque) ++int kvm_arch_init(const void *opaque) + { + int r, cpu; +- struct kvm_x86_ops *ops =3D (struct kvm_x86_ops *)opaque; ++ const struct kvm_x86_ops *ops =3D (const struct kvm_x86_ops *)opaque; +=20 + if (kvm_x86_ops) { + printk(KERN_ERR "kvm: already loaded the other module\n"); +diff -urNp linux-2.6.32.45/arch/x86/lguest/boot.c linux-2.6.32.45/arch/x= 86/lguest/boot.c +--- linux-2.6.32.45/arch/x86/lguest/boot.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/lguest/boot.c 2011-08-05 20:33:55.000000000= -0400 +@@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vt + * Rebooting also tells the Host we're finished, but the RESTART flag t= ells the + * Launcher to reboot us. + */ +-static void lguest_restart(char *reason) ++static __noreturn void lguest_restart(char *reason) + { + kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART)= ; ++ BUG(); + } +=20 + /*G:050 +diff -urNp linux-2.6.32.45/arch/x86/lib/atomic64_32.c linux-2.6.32.45/ar= ch/x86/lib/atomic64_32.c +--- linux-2.6.32.45/arch/x86/lib/atomic64_32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/atomic64_32.c 2011-05-04 17:56:28.00000= 0000 -0400 +@@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u6 + } + EXPORT_SYMBOL(atomic64_cmpxchg); +=20 ++u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, = u64 new_val) ++{ ++ return cmpxchg8b(&ptr->counter, old_val, new_val); ++} ++EXPORT_SYMBOL(atomic64_cmpxchg_unchecked); ++ + /** + * atomic64_xchg - xchg atomic64 variable + * @ptr: pointer to type atomic64_t +@@ -56,6 +62,36 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 n + EXPORT_SYMBOL(atomic64_xchg); +=20 + /** ++ * atomic64_xchg_unchecked - xchg atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * @new_val: value to assign ++ * ++ * Atomically xchgs the value of @ptr to @new_val and returns ++ * the old value. ++ */ ++u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val) ++{ ++ /* ++ * Try first with a (possibly incorrect) assumption about ++ * what we have there. We'll do two loops most likely, ++ * but we'll get an ownership MESI transaction straight away ++ * instead of a read transaction followed by a ++ * flush-for-ownership transaction: ++ */ ++ u64 old_val, real_val =3D 0; ++ ++ do { ++ old_val =3D real_val; ++ ++ real_val =3D atomic64_cmpxchg_unchecked(ptr, old_val, new_val); ++ ++ } while (real_val !=3D old_val); ++ ++ return old_val; ++} ++EXPORT_SYMBOL(atomic64_xchg_unchecked); ++ ++/** + * atomic64_set - set atomic64 variable + * @ptr: pointer to type atomic64_t + * @new_val: value to assign +@@ -69,7 +105,19 @@ void atomic64_set(atomic64_t *ptr, u64 n + EXPORT_SYMBOL(atomic64_set); +=20 + /** +-EXPORT_SYMBOL(atomic64_read); ++ * atomic64_unchecked_set - set atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * @new_val: value to assign ++ * ++ * Atomically sets the value of @ptr to @new_val. ++ */ ++void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val) ++{ ++ atomic64_xchg_unchecked(ptr, new_val); ++} ++EXPORT_SYMBOL(atomic64_set_unchecked); ++ ++/** + * atomic64_add_return - add and return + * @delta: integer value to add + * @ptr: pointer to type atomic64_t +@@ -99,24 +147,72 @@ noinline u64 atomic64_add_return(u64 del + } + EXPORT_SYMBOL(atomic64_add_return); +=20 ++/** ++ * atomic64_add_return_unchecked - add and return ++ * @delta: integer value to add ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically adds @delta to @ptr and returns @delta + *@ptr ++ */ ++noinline u64 atomic64_add_return_unchecked(u64 delta, atomic64_unchecke= d_t *ptr) ++{ ++ /* ++ * Try first with a (possibly incorrect) assumption about ++ * what we have there. We'll do two loops most likely, ++ * but we'll get an ownership MESI transaction straight away ++ * instead of a read transaction followed by a ++ * flush-for-ownership transaction: ++ */ ++ u64 old_val, new_val, real_val =3D 0; ++ ++ do { ++ old_val =3D real_val; ++ new_val =3D old_val + delta; ++ ++ real_val =3D atomic64_cmpxchg_unchecked(ptr, old_val, new_val); ++ ++ } while (real_val !=3D old_val); ++ ++ return new_val; ++} ++EXPORT_SYMBOL(atomic64_add_return_unchecked); ++ + u64 atomic64_sub_return(u64 delta, atomic64_t *ptr) + { + return atomic64_add_return(-delta, ptr); + } + EXPORT_SYMBOL(atomic64_sub_return); +=20 ++u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr) ++{ ++ return atomic64_add_return_unchecked(-delta, ptr); ++} ++EXPORT_SYMBOL(atomic64_sub_return_unchecked); ++ + u64 atomic64_inc_return(atomic64_t *ptr) + { + return atomic64_add_return(1, ptr); + } + EXPORT_SYMBOL(atomic64_inc_return); +=20 ++u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr) ++{ ++ return atomic64_add_return_unchecked(1, ptr); ++} ++EXPORT_SYMBOL(atomic64_inc_return_unchecked); ++ + u64 atomic64_dec_return(atomic64_t *ptr) + { + return atomic64_sub_return(1, ptr); + } + EXPORT_SYMBOL(atomic64_dec_return); +=20 ++u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr) ++{ ++ return atomic64_sub_return_unchecked(1, ptr); ++} ++EXPORT_SYMBOL(atomic64_dec_return_unchecked); ++ + /** + * atomic64_add - add integer to atomic64 variable + * @delta: integer value to add +@@ -131,6 +227,19 @@ void atomic64_add(u64 delta, atomic64_t=20 + EXPORT_SYMBOL(atomic64_add); +=20 + /** ++ * atomic64_add_unchecked - add integer to atomic64 variable ++ * @delta: integer value to add ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically adds @delta to @ptr. ++ */ ++void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr) ++{ ++ atomic64_add_return_unchecked(delta, ptr); ++} ++EXPORT_SYMBOL(atomic64_add_unchecked); ++ ++/** + * atomic64_sub - subtract the atomic64 variable + * @delta: integer value to subtract + * @ptr: pointer to type atomic64_t +@@ -144,6 +253,19 @@ void atomic64_sub(u64 delta, atomic64_t=20 + EXPORT_SYMBOL(atomic64_sub); +=20 + /** ++ * atomic64_sub_unchecked - subtract the atomic64 variable ++ * @delta: integer value to subtract ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically subtracts @delta from @ptr. ++ */ ++void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr) ++{ ++ atomic64_add_unchecked(-delta, ptr); ++} ++EXPORT_SYMBOL(atomic64_sub_unchecked); ++ ++/** + * atomic64_sub_and_test - subtract value from variable and test result + * @delta: integer value to subtract + * @ptr: pointer to type atomic64_t +@@ -173,6 +295,18 @@ void atomic64_inc(atomic64_t *ptr) + EXPORT_SYMBOL(atomic64_inc); +=20 + /** ++ * atomic64_inc_unchecked - increment atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically increments @ptr by 1. ++ */ ++void atomic64_inc_unchecked(atomic64_unchecked_t *ptr) ++{ ++ atomic64_add_unchecked(1, ptr); ++} ++EXPORT_SYMBOL(atomic64_inc_unchecked); ++ ++/** + * atomic64_dec - decrement atomic64 variable + * @ptr: pointer to type atomic64_t + * +@@ -185,6 +319,18 @@ void atomic64_dec(atomic64_t *ptr) + EXPORT_SYMBOL(atomic64_dec); +=20 + /** ++ * atomic64_dec_unchecked - decrement atomic64 variable ++ * @ptr: pointer to type atomic64_unchecked_t ++ * ++ * Atomically decrements @ptr by 1. ++ */ ++void atomic64_dec_unchecked(atomic64_unchecked_t *ptr) ++{ ++ atomic64_sub_unchecked(1, ptr); ++} ++EXPORT_SYMBOL(atomic64_dec_unchecked); ++ ++/** + * atomic64_dec_and_test - decrement and test + * @ptr: pointer to type atomic64_t + * +diff -urNp linux-2.6.32.45/arch/x86/lib/checksum_32.S linux-2.6.32.45/ar= ch/x86/lib/checksum_32.S +--- linux-2.6.32.45/arch/x86/lib/checksum_32.S 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/checksum_32.S 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -28,7 +28,8 @@ + #include + #include + #include +- =09 ++#include ++ + /* + * computes a partial checksum, e.g. for TCP/UDP fragments + */ +@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic ( +=20 + #define ARGBASE 16 =09 + #define FP 12 +- =09 +-ENTRY(csum_partial_copy_generic) ++ ++ENTRY(csum_partial_copy_generic_to_user) + CFI_STARTPROC ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pushl %gs ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %es ++ CFI_ADJUST_CFA_OFFSET -4 ++ jmp csum_partial_copy_generic ++#endif ++ ++ENTRY(csum_partial_copy_generic_from_user) ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pushl %gs ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %ds ++ CFI_ADJUST_CFA_OFFSET -4 ++#endif ++ ++ENTRY(csum_partial_copy_generic) + subl $4,%esp=09 + CFI_ADJUST_CFA_OFFSET 4 + pushl %edi +@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic) + jmp 4f + SRC(1: movw (%esi), %bx ) + addl $2, %esi +-DST( movw %bx, (%edi) ) ++DST( movw %bx, %es:(%edi) ) + addl $2, %edi + addw %bx, %ax=09 + adcl $0, %eax +@@ -343,30 +363,30 @@ DST( movw %bx, (%edi) ) + SRC(1: movl (%esi), %ebx ) + SRC( movl 4(%esi), %edx ) + adcl %ebx, %eax +-DST( movl %ebx, (%edi) ) ++DST( movl %ebx, %es:(%edi) ) + adcl %edx, %eax +-DST( movl %edx, 4(%edi) ) ++DST( movl %edx, %es:4(%edi) ) +=20 + SRC( movl 8(%esi), %ebx ) + SRC( movl 12(%esi), %edx ) + adcl %ebx, %eax +-DST( movl %ebx, 8(%edi) ) ++DST( movl %ebx, %es:8(%edi) ) + adcl %edx, %eax +-DST( movl %edx, 12(%edi) ) ++DST( movl %edx, %es:12(%edi) ) +=20 + SRC( movl 16(%esi), %ebx ) + SRC( movl 20(%esi), %edx ) + adcl %ebx, %eax +-DST( movl %ebx, 16(%edi) ) ++DST( movl %ebx, %es:16(%edi) ) + adcl %edx, %eax +-DST( movl %edx, 20(%edi) ) ++DST( movl %edx, %es:20(%edi) ) +=20 + SRC( movl 24(%esi), %ebx ) + SRC( movl 28(%esi), %edx ) + adcl %ebx, %eax +-DST( movl %ebx, 24(%edi) ) ++DST( movl %ebx, %es:24(%edi) ) + adcl %edx, %eax +-DST( movl %edx, 28(%edi) ) ++DST( movl %edx, %es:28(%edi) ) +=20 + lea 32(%esi), %esi + lea 32(%edi), %edi +@@ -380,7 +400,7 @@ DST( movl %edx, 28(%edi) ) + shrl $2, %edx # This clears CF + SRC(3: movl (%esi), %ebx ) + adcl %ebx, %eax +-DST( movl %ebx, (%edi) ) ++DST( movl %ebx, %es:(%edi) ) + lea 4(%esi), %esi + lea 4(%edi), %edi + dec %edx +@@ -392,12 +412,12 @@ DST( movl %ebx, (%edi) ) + jb 5f + SRC( movw (%esi), %cx ) + leal 2(%esi), %esi +-DST( movw %cx, (%edi) ) ++DST( movw %cx, %es:(%edi) ) + leal 2(%edi), %edi + je 6f + shll $16,%ecx + SRC(5: movb (%esi), %cl ) +-DST( movb %cl, (%edi) ) ++DST( movb %cl, %es:(%edi) ) + 6: addl %ecx, %eax + adcl $0, %eax + 7: +@@ -408,7 +428,7 @@ DST( movb %cl, (%edi) ) +=20 + 6001: + movl ARGBASE+20(%esp), %ebx # src_err_ptr +- movl $-EFAULT, (%ebx) ++ movl $-EFAULT, %ss:(%ebx) +=20 + # zero the complete destination - computing the rest + # is too much work=20 +@@ -421,11 +441,19 @@ DST( movb %cl, (%edi) ) +=20 + 6002: + movl ARGBASE+24(%esp), %ebx # dst_err_ptr +- movl $-EFAULT,(%ebx) ++ movl $-EFAULT,%ss:(%ebx) + jmp 5000b +=20 + .previous +=20 ++ pushl %ss ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %ds ++ CFI_ADJUST_CFA_OFFSET -4 ++ pushl %ss ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %es ++ CFI_ADJUST_CFA_OFFSET -4 + popl %ebx + CFI_ADJUST_CFA_OFFSET -4 + CFI_RESTORE ebx +@@ -439,26 +467,47 @@ DST( movb %cl, (%edi) ) + CFI_ADJUST_CFA_OFFSET -4 + ret=09 + CFI_ENDPROC +-ENDPROC(csum_partial_copy_generic) ++ENDPROC(csum_partial_copy_generic_to_user) +=20 + #else +=20 + /* Version for PentiumII/PPro */ +=20 + #define ROUND1(x) \ ++ nop; nop; nop; \ + SRC(movl x(%esi), %ebx ) ; \ + addl %ebx, %eax ; \ +- DST(movl %ebx, x(%edi) ) ;=20 ++ DST(movl %ebx, %es:x(%edi)) ; +=20 + #define ROUND(x) \ ++ nop; nop; nop; \ + SRC(movl x(%esi), %ebx ) ; \ + adcl %ebx, %eax ; \ +- DST(movl %ebx, x(%edi) ) ; ++ DST(movl %ebx, %es:x(%edi)) ; +=20 + #define ARGBASE 12 +- =09 +-ENTRY(csum_partial_copy_generic) ++ ++ENTRY(csum_partial_copy_generic_to_user) + CFI_STARTPROC ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pushl %gs ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %es ++ CFI_ADJUST_CFA_OFFSET -4 ++ jmp csum_partial_copy_generic ++#endif ++ ++ENTRY(csum_partial_copy_generic_from_user) ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pushl %gs ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %ds ++ CFI_ADJUST_CFA_OFFSET -4 ++#endif ++ ++ENTRY(csum_partial_copy_generic) + pushl %ebx + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET ebx, 0 +@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic) + subl %ebx, %edi =20 + lea -1(%esi),%edx + andl $-32,%edx +- lea 3f(%ebx,%ebx), %ebx ++ lea 3f(%ebx,%ebx,2), %ebx + testl %esi, %esi=20 + jmp *%ebx + 1: addl $64,%esi +@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic) + jb 5f + SRC( movw (%esi), %dx ) + leal 2(%esi), %esi +-DST( movw %dx, (%edi) ) ++DST( movw %dx, %es:(%edi) ) + leal 2(%edi), %edi + je 6f + shll $16,%edx + 5: + SRC( movb (%esi), %dl ) +-DST( movb %dl, (%edi) ) ++DST( movb %dl, %es:(%edi) ) + 6: addl %edx, %eax + adcl $0, %eax + 7: + .section .fixup, "ax" + 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr=09 +- movl $-EFAULT, (%ebx) ++ movl $-EFAULT, %ss:(%ebx) + # zero the complete destination (computing the rest is too much work) + movl ARGBASE+8(%esp),%edi # dst + movl ARGBASE+12(%esp),%ecx # len +@@ -523,10 +572,21 @@ DST( movb %dl, (%edi) ) + rep; stosb + jmp 7b + 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr +- movl $-EFAULT, (%ebx) ++ movl $-EFAULT, %ss:(%ebx) + jmp 7b =09 + .previous =09 +=20 ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ pushl %ss ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %ds ++ CFI_ADJUST_CFA_OFFSET -4 ++ pushl %ss ++ CFI_ADJUST_CFA_OFFSET 4 ++ popl %es ++ CFI_ADJUST_CFA_OFFSET -4 ++#endif ++ + popl %esi + CFI_ADJUST_CFA_OFFSET -4 + CFI_RESTORE esi +@@ -538,7 +598,7 @@ DST( movb %dl, (%edi) ) + CFI_RESTORE ebx + ret + CFI_ENDPROC +-ENDPROC(csum_partial_copy_generic) ++ENDPROC(csum_partial_copy_generic_to_user) + =09 + #undef ROUND + #undef ROUND1 =09 +diff -urNp linux-2.6.32.45/arch/x86/lib/clear_page_64.S linux-2.6.32.45/= arch/x86/lib/clear_page_64.S +--- linux-2.6.32.45/arch/x86/lib/clear_page_64.S 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/clear_page_64.S 2011-04-17 15:56:46.000= 000000 -0400 +@@ -43,7 +43,7 @@ ENDPROC(clear_page) +=20 + #include +=20 +- .section .altinstr_replacement,"ax" ++ .section .altinstr_replacement,"a" + 1: .byte 0xeb /* jmp */ + .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ + 2: +diff -urNp linux-2.6.32.45/arch/x86/lib/copy_page_64.S linux-2.6.32.45/a= rch/x86/lib/copy_page_64.S +--- linux-2.6.32.45/arch/x86/lib/copy_page_64.S 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/copy_page_64.S 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -104,7 +104,7 @@ ENDPROC(copy_page) +=20 + #include +=20 +- .section .altinstr_replacement,"ax" ++ .section .altinstr_replacement,"a" + 1: .byte 0xeb /* jmp */ + .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ + 2: +diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_64.S linux-2.6.32.45/a= rch/x86/lib/copy_user_64.S +--- linux-2.6.32.45/arch/x86/lib/copy_user_64.S 2011-06-25 12:55:34.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/copy_user_64.S 2011-06-25 12:56:37.0000= 00000 -0400 +@@ -15,13 +15,14 @@ + #include + #include + #include ++#include +=20 + .macro ALTERNATIVE_JUMP feature,orig,alt + 0: + .byte 0xe9 /* 32bit jump */ + .long \orig-1f /* by default jump to orig */ + 1: +- .section .altinstr_replacement,"ax" ++ .section .altinstr_replacement,"a" + 2: .byte 0xe9 /* near jump with 32bit immediate */ + .long \alt-1b /* offset */ /* or alternatively to alt */ + .previous +@@ -64,49 +65,19 @@ + #endif + .endm +=20 +-/* Standard copy_to_user with segment limit checking */ +-ENTRY(copy_to_user) +- CFI_STARTPROC +- GET_THREAD_INFO(%rax) +- movq %rdi,%rcx +- addq %rdx,%rcx +- jc bad_to_user +- cmpq TI_addr_limit(%rax),%rcx +- ja bad_to_user +- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string +- CFI_ENDPROC +-ENDPROC(copy_to_user) +- +-/* Standard copy_from_user with segment limit checking */ +-ENTRY(copy_from_user) +- CFI_STARTPROC +- GET_THREAD_INFO(%rax) +- movq %rsi,%rcx +- addq %rdx,%rcx +- jc bad_from_user +- cmpq TI_addr_limit(%rax),%rcx +- ja bad_from_user +- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string +- CFI_ENDPROC +-ENDPROC(copy_from_user) +- + ENTRY(copy_user_generic) + CFI_STARTPROC + ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string + CFI_ENDPROC + ENDPROC(copy_user_generic) +=20 +-ENTRY(__copy_from_user_inatomic) +- CFI_STARTPROC +- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_= user_generic_string +- CFI_ENDPROC +-ENDPROC(__copy_from_user_inatomic) +- + .section .fixup,"ax" + /* must zero dest */ + ENTRY(bad_from_user) + bad_from_user: + CFI_STARTPROC ++ testl %edx,%edx ++ js bad_to_user + movl %edx,%ecx + xorl %eax,%eax + rep +diff -urNp linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S linux-2.6= .32.45/arch/x86/lib/copy_user_nocache_64.S +--- linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/copy_user_nocache_64.S 2011-04-17 15:56= :46.000000000 -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include +=20 + .macro ALIGN_DESTINATION + #ifdef FIX_ALIGNMENT +@@ -50,6 +51,15 @@ + */ + ENTRY(__copy_user_nocache) + CFI_STARTPROC ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ mov $PAX_USER_SHADOW_BASE,%rcx ++ cmp %rcx,%rsi ++ jae 1f ++ add %rcx,%rsi ++1: ++#endif ++ + cmpl $8,%edx + jb 20f /* less then 8 bytes, go to byte copy loop */ + ALIGN_DESTINATION +diff -urNp linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.= 45/arch/x86/lib/csum-wrappers_64.c +--- linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/csum-wrappers_64.c 2011-05-04 17:56:20.= 000000000 -0400 +@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _ + len -=3D 2; + } + } ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + isum =3D csum_partial_copy_generic((__force const void *)src, + dst, len, isum, errp, NULL); + if (unlikely(*errp)) +@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr + } +=20 + *errp =3D 0; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)dst < PAX_USER_SHADOW_BASE) ++ dst +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return csum_partial_copy_generic(src, (void __force *)dst, + len, isum, NULL, errp); + } +diff -urNp linux-2.6.32.45/arch/x86/lib/getuser.S linux-2.6.32.45/arch/x= 86/lib/getuser.S +--- linux-2.6.32.45/arch/x86/lib/getuser.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/lib/getuser.S 2011-04-17 15:56:46.000000000= -0400 +@@ -33,14 +33,35 @@ + #include + #include + #include ++#include ++#include ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __copyuser_seg gs; ++#else ++#define __copyuser_seg ++#endif +=20 + .text + ENTRY(__get_user_1) + CFI_STARTPROC ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + GET_THREAD_INFO(%_ASM_DX) + cmp TI_addr_limit(%_ASM_DX),%_ASM_AX + jae bad_get_user +-1: movzb (%_ASM_AX),%edx ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_DX ++ cmp %_ASM_DX,%_ASM_AX ++ jae 1234f ++ add %_ASM_DX,%_ASM_AX ++1234: ++#endif ++ ++#endif ++ ++1: __copyuser_seg movzb (%_ASM_AX),%edx + xor %eax,%eax + ret + CFI_ENDPROC +@@ -49,11 +70,24 @@ ENDPROC(__get_user_1) + ENTRY(__get_user_2) + CFI_STARTPROC + add $1,%_ASM_AX ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + jc bad_get_user + GET_THREAD_INFO(%_ASM_DX) + cmp TI_addr_limit(%_ASM_DX),%_ASM_AX + jae bad_get_user +-2: movzwl -1(%_ASM_AX),%edx ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_DX ++ cmp %_ASM_DX,%_ASM_AX ++ jae 1234f ++ add %_ASM_DX,%_ASM_AX ++1234: ++#endif ++ ++#endif ++ ++2: __copyuser_seg movzwl -1(%_ASM_AX),%edx + xor %eax,%eax + ret + CFI_ENDPROC +@@ -62,11 +96,24 @@ ENDPROC(__get_user_2) + ENTRY(__get_user_4) + CFI_STARTPROC + add $3,%_ASM_AX ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) + jc bad_get_user + GET_THREAD_INFO(%_ASM_DX) + cmp TI_addr_limit(%_ASM_DX),%_ASM_AX + jae bad_get_user +-3: mov -3(%_ASM_AX),%edx ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_DX ++ cmp %_ASM_DX,%_ASM_AX ++ jae 1234f ++ add %_ASM_DX,%_ASM_AX ++1234: ++#endif ++ ++#endif ++ ++3: __copyuser_seg mov -3(%_ASM_AX),%edx + xor %eax,%eax + ret + CFI_ENDPROC +@@ -80,6 +127,15 @@ ENTRY(__get_user_8) + GET_THREAD_INFO(%_ASM_DX) + cmp TI_addr_limit(%_ASM_DX),%_ASM_AX + jae bad_get_user ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ mov $PAX_USER_SHADOW_BASE,%_ASM_DX ++ cmp %_ASM_DX,%_ASM_AX ++ jae 1234f ++ add %_ASM_DX,%_ASM_AX ++1234: ++#endif ++ + 4: movq -7(%_ASM_AX),%_ASM_DX + xor %eax,%eax + ret +diff -urNp linux-2.6.32.45/arch/x86/lib/memcpy_64.S linux-2.6.32.45/arch= /x86/lib/memcpy_64.S +--- linux-2.6.32.45/arch/x86/lib/memcpy_64.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/lib/memcpy_64.S 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -128,7 +128,7 @@ ENDPROC(__memcpy) + * It is also a lot simpler. Use this when possible: + */ +=20 +- .section .altinstr_replacement, "ax" ++ .section .altinstr_replacement, "a" + 1: .byte 0xeb /* jmp */ + .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ + 2: +diff -urNp linux-2.6.32.45/arch/x86/lib/memset_64.S linux-2.6.32.45/arch= /x86/lib/memset_64.S +--- linux-2.6.32.45/arch/x86/lib/memset_64.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/lib/memset_64.S 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -118,7 +118,7 @@ ENDPROC(__memset) +=20 + #include +=20 +- .section .altinstr_replacement,"ax" ++ .section .altinstr_replacement,"a" + 1: .byte 0xeb /* jmp */ + .byte (memset_c - memset) - (2f - 1b) /* offset */ + 2: +diff -urNp linux-2.6.32.45/arch/x86/lib/mmx_32.c linux-2.6.32.45/arch/x8= 6/lib/mmx_32.c +--- linux-2.6.32.45/arch/x86/lib/mmx_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/lib/mmx_32.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * + { + void *p; + int i; ++ unsigned long cr0; +=20 + if (unlikely(in_interrupt())) + return __memcpy(to, from, len); +@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void * + kernel_fpu_begin(); +=20 + __asm__ __volatile__ ( +- "1: prefetch (%0)\n" /* This set is 28 bytes */ +- " prefetch 64(%0)\n" +- " prefetch 128(%0)\n" +- " prefetch 192(%0)\n" +- " prefetch 256(%0)\n" ++ "1: prefetch (%1)\n" /* This set is 28 bytes */ ++ " prefetch 64(%1)\n" ++ " prefetch 128(%1)\n" ++ " prefetch 192(%1)\n" ++ " prefetch 256(%1)\n" + "2: \n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ "3: \n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" + _ASM_EXTABLE(1b, 3b) +- : : "r" (from)); ++ : "=3D&r" (cr0) : "r" (from) : "ax"); +=20 + for ( ; i > 5; i--) { + __asm__ __volatile__ ( +- "1: prefetch 320(%0)\n" +- "2: movq (%0), %%mm0\n" +- " movq 8(%0), %%mm1\n" +- " movq 16(%0), %%mm2\n" +- " movq 24(%0), %%mm3\n" +- " movq %%mm0, (%1)\n" +- " movq %%mm1, 8(%1)\n" +- " movq %%mm2, 16(%1)\n" +- " movq %%mm3, 24(%1)\n" +- " movq 32(%0), %%mm0\n" +- " movq 40(%0), %%mm1\n" +- " movq 48(%0), %%mm2\n" +- " movq 56(%0), %%mm3\n" +- " movq %%mm0, 32(%1)\n" +- " movq %%mm1, 40(%1)\n" +- " movq %%mm2, 48(%1)\n" +- " movq %%mm3, 56(%1)\n" ++ "1: prefetch 320(%1)\n" ++ "2: movq (%1), %%mm0\n" ++ " movq 8(%1), %%mm1\n" ++ " movq 16(%1), %%mm2\n" ++ " movq 24(%1), %%mm3\n" ++ " movq %%mm0, (%2)\n" ++ " movq %%mm1, 8(%2)\n" ++ " movq %%mm2, 16(%2)\n" ++ " movq %%mm3, 24(%2)\n" ++ " movq 32(%1), %%mm0\n" ++ " movq 40(%1), %%mm1\n" ++ " movq 48(%1), %%mm2\n" ++ " movq 56(%1), %%mm3\n" ++ " movq %%mm0, 32(%2)\n" ++ " movq %%mm1, 40(%2)\n" ++ " movq %%mm2, 48(%2)\n" ++ " movq %%mm3, 56(%2)\n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ "3:\n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" + _ASM_EXTABLE(1b, 3b) +- : : "r" (from), "r" (to) : "memory"); ++ : "=3D&r" (cr0) : "r" (from), "r" (to) : "memory", "ax"); +=20 + from +=3D 64; + to +=3D 64; +@@ -158,6 +187,7 @@ static void fast_clear_page(void *page) + static void fast_copy_page(void *to, void *from) + { + int i; ++ unsigned long cr0; +=20 + kernel_fpu_begin(); +=20 +@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi + * but that is for later. -AV + */ + __asm__ __volatile__( +- "1: prefetch (%0)\n" +- " prefetch 64(%0)\n" +- " prefetch 128(%0)\n" +- " prefetch 192(%0)\n" +- " prefetch 256(%0)\n" ++ "1: prefetch (%1)\n" ++ " prefetch 64(%1)\n" ++ " prefetch 128(%1)\n" ++ " prefetch 192(%1)\n" ++ " prefetch 256(%1)\n" + "2: \n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ "3: \n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" +- _ASM_EXTABLE(1b, 3b) : : "r" (from)); ++ _ASM_EXTABLE(1b, 3b) : "=3D&r" (cr0) : "r" (from) : "ax"); +=20 + for (i =3D 0; i < (4096-320)/64; i++) { + __asm__ __volatile__ ( +- "1: prefetch 320(%0)\n" +- "2: movq (%0), %%mm0\n" +- " movntq %%mm0, (%1)\n" +- " movq 8(%0), %%mm1\n" +- " movntq %%mm1, 8(%1)\n" +- " movq 16(%0), %%mm2\n" +- " movntq %%mm2, 16(%1)\n" +- " movq 24(%0), %%mm3\n" +- " movntq %%mm3, 24(%1)\n" +- " movq 32(%0), %%mm4\n" +- " movntq %%mm4, 32(%1)\n" +- " movq 40(%0), %%mm5\n" +- " movntq %%mm5, 40(%1)\n" +- " movq 48(%0), %%mm6\n" +- " movntq %%mm6, 48(%1)\n" +- " movq 56(%0), %%mm7\n" +- " movntq %%mm7, 56(%1)\n" ++ "1: prefetch 320(%1)\n" ++ "2: movq (%1), %%mm0\n" ++ " movntq %%mm0, (%2)\n" ++ " movq 8(%1), %%mm1\n" ++ " movntq %%mm1, 8(%2)\n" ++ " movq 16(%1), %%mm2\n" ++ " movntq %%mm2, 16(%2)\n" ++ " movq 24(%1), %%mm3\n" ++ " movntq %%mm3, 24(%2)\n" ++ " movq 32(%1), %%mm4\n" ++ " movntq %%mm4, 32(%2)\n" ++ " movq 40(%1), %%mm5\n" ++ " movntq %%mm5, 40(%2)\n" ++ " movq 48(%1), %%mm6\n" ++ " movntq %%mm6, 48(%2)\n" ++ " movq 56(%1), %%mm7\n" ++ " movntq %%mm7, 56(%2)\n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ "3:\n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" +- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory"); ++ _ASM_EXTABLE(1b, 3b) : "=3D&r" (cr0) : "r" (from), "r" (to) : "memory= ", "ax"); +=20 + from +=3D 64; + to +=3D 64; +@@ -280,47 +338,76 @@ static void fast_clear_page(void *page) + static void fast_copy_page(void *to, void *from) + { + int i; ++ unsigned long cr0; +=20 + kernel_fpu_begin(); +=20 + __asm__ __volatile__ ( +- "1: prefetch (%0)\n" +- " prefetch 64(%0)\n" +- " prefetch 128(%0)\n" +- " prefetch 192(%0)\n" +- " prefetch 256(%0)\n" ++ "1: prefetch (%1)\n" ++ " prefetch 64(%1)\n" ++ " prefetch 128(%1)\n" ++ " prefetch 192(%1)\n" ++ " prefetch 256(%1)\n" + "2: \n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ "3: \n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" +- _ASM_EXTABLE(1b, 3b) : : "r" (from)); ++ _ASM_EXTABLE(1b, 3b) : "=3D&r" (cr0) : "r" (from) : "ax"); +=20 + for (i =3D 0; i < 4096/64; i++) { + __asm__ __volatile__ ( +- "1: prefetch 320(%0)\n" +- "2: movq (%0), %%mm0\n" +- " movq 8(%0), %%mm1\n" +- " movq 16(%0), %%mm2\n" +- " movq 24(%0), %%mm3\n" +- " movq %%mm0, (%1)\n" +- " movq %%mm1, 8(%1)\n" +- " movq %%mm2, 16(%1)\n" +- " movq %%mm3, 24(%1)\n" +- " movq 32(%0), %%mm0\n" +- " movq 40(%0), %%mm1\n" +- " movq 48(%0), %%mm2\n" +- " movq 56(%0), %%mm3\n" +- " movq %%mm0, 32(%1)\n" +- " movq %%mm1, 40(%1)\n" +- " movq %%mm2, 48(%1)\n" +- " movq %%mm3, 56(%1)\n" ++ "1: prefetch 320(%1)\n" ++ "2: movq (%1), %%mm0\n" ++ " movq 8(%1), %%mm1\n" ++ " movq 16(%1), %%mm2\n" ++ " movq 24(%1), %%mm3\n" ++ " movq %%mm0, (%2)\n" ++ " movq %%mm1, 8(%2)\n" ++ " movq %%mm2, 16(%2)\n" ++ " movq %%mm3, 24(%2)\n" ++ " movq 32(%1), %%mm0\n" ++ " movq 40(%1), %%mm1\n" ++ " movq 48(%1), %%mm2\n" ++ " movq 56(%1), %%mm3\n" ++ " movq %%mm0, 32(%2)\n" ++ " movq %%mm1, 40(%2)\n" ++ " movq %%mm2, 48(%2)\n" ++ " movq %%mm3, 56(%2)\n" + ".section .fixup, \"ax\"\n" +- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ "3:\n" ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %%cr0, %0\n" ++ " movl %0, %%eax\n" ++ " andl $0xFFFEFFFF, %%eax\n" ++ " movl %%eax, %%cr0\n" ++#endif ++ ++ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */ ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ " movl %0, %%cr0\n" ++#endif ++ + " jmp 2b\n" + ".previous\n" + _ASM_EXTABLE(1b, 3b) +- : : "r" (from), "r" (to) : "memory"); ++ : "=3D&r" (cr0) : "r" (from), "r" (to) : "memory", "ax"); +=20 + from +=3D 64; + to +=3D 64; +diff -urNp linux-2.6.32.45/arch/x86/lib/putuser.S linux-2.6.32.45/arch/x= 86/lib/putuser.S +--- linux-2.6.32.45/arch/x86/lib/putuser.S 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/lib/putuser.S 2011-04-17 15:56:46.000000000= -0400 +@@ -15,7 +15,8 @@ + #include + #include + #include +- ++#include ++#include +=20 + /* + * __put_user_X +@@ -29,52 +30,119 @@ + * as they get called from within inline assembly. + */ +=20 +-#define ENTER CFI_STARTPROC ; \ +- GET_THREAD_INFO(%_ASM_BX) ++#define ENTER CFI_STARTPROC + #define EXIT ret ; \ + CFI_ENDPROC +=20 ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define _DEST %_ASM_CX,%_ASM_BX ++#else ++#define _DEST %_ASM_CX ++#endif ++ ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#define __copyuser_seg gs; ++#else ++#define __copyuser_seg ++#endif ++ + .text + ENTRY(__put_user_1) + ENTER ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) ++ GET_THREAD_INFO(%_ASM_BX) + cmp TI_addr_limit(%_ASM_BX),%_ASM_CX + jae bad_put_user +-1: movb %al,(%_ASM_CX) ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_BX ++ cmp %_ASM_BX,%_ASM_CX ++ jb 1234f ++ xor %ebx,%ebx ++1234: ++#endif ++ ++#endif ++ ++1: __copyuser_seg movb %al,(_DEST) + xor %eax,%eax + EXIT + ENDPROC(__put_user_1) +=20 + ENTRY(__put_user_2) + ENTER ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) ++ GET_THREAD_INFO(%_ASM_BX) + mov TI_addr_limit(%_ASM_BX),%_ASM_BX + sub $1,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jae bad_put_user +-2: movw %ax,(%_ASM_CX) ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_BX ++ cmp %_ASM_BX,%_ASM_CX ++ jb 1234f ++ xor %ebx,%ebx ++1234: ++#endif ++ ++#endif ++ ++2: __copyuser_seg movw %ax,(_DEST) + xor %eax,%eax + EXIT + ENDPROC(__put_user_2) +=20 + ENTRY(__put_user_4) + ENTER ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) ++ GET_THREAD_INFO(%_ASM_BX) + mov TI_addr_limit(%_ASM_BX),%_ASM_BX + sub $3,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jae bad_put_user +-3: movl %eax,(%_ASM_CX) ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_BX ++ cmp %_ASM_BX,%_ASM_CX ++ jb 1234f ++ xor %ebx,%ebx ++1234: ++#endif ++ ++#endif ++ ++3: __copyuser_seg movl %eax,(_DEST) + xor %eax,%eax + EXIT + ENDPROC(__put_user_4) +=20 + ENTRY(__put_user_8) + ENTER ++ ++#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF) ++ GET_THREAD_INFO(%_ASM_BX) + mov TI_addr_limit(%_ASM_BX),%_ASM_BX + sub $7,%_ASM_BX + cmp %_ASM_BX,%_ASM_CX + jae bad_put_user +-4: mov %_ASM_AX,(%_ASM_CX) ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ mov $PAX_USER_SHADOW_BASE,%_ASM_BX ++ cmp %_ASM_BX,%_ASM_CX ++ jb 1234f ++ xor %ebx,%ebx ++1234: ++#endif ++ ++#endif ++ ++4: __copyuser_seg mov %_ASM_AX,(_DEST) + #ifdef CONFIG_X86_32 +-5: movl %edx,4(%_ASM_CX) ++5: __copyuser_seg movl %edx,4(_DEST) + #endif + xor %eax,%eax + EXIT +diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_32.c linux-2.6.32.45/ar= ch/x86/lib/usercopy_32.c +--- linux-2.6.32.45/arch/x86/lib/usercopy_32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/usercopy_32.c 2011-04-23 21:12:28.00000= 0000 -0400 +@@ -43,7 +43,7 @@ do { \ + __asm__ __volatile__( \ + " testl %1,%1\n" \ + " jz 2f\n" \ +- "0: lodsb\n" \ ++ "0: "__copyuser_seg"lodsb\n" \ + " stosb\n" \ + " testb %%al,%%al\n" \ + " jz 1f\n" \ +@@ -128,10 +128,12 @@ do { \ + int __d0; \ + might_fault(); \ + __asm__ __volatile__( \ ++ __COPYUSER_SET_ES \ + "0: rep; stosl\n" \ + " movl %2,%0\n" \ + "1: rep; stosb\n" \ + "2:\n" \ ++ __COPYUSER_RESTORE_ES \ + ".section .fixup,\"ax\"\n" \ + "3: lea 0(%2,%0,4),%0\n" \ + " jmp 2b\n" \ +@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s,=20 + might_fault(); +=20 + __asm__ __volatile__( ++ __COPYUSER_SET_ES + " testl %0, %0\n" + " jz 3f\n" + " andl %0,%%ecx\n" +@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s,=20 + " subl %%ecx,%0\n" + " addl %0,%%eax\n" + "1:\n" ++ __COPYUSER_RESTORE_ES + ".section .fixup,\"ax\"\n" + "2: xorl %%eax,%%eax\n" + " jmp 1b\n" +@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user); +=20 + #ifdef CONFIG_X86_INTEL_USERCOPY + static unsigned long +-__copy_user_intel(void __user *to, const void *from, unsigned long size= ) ++__generic_copy_to_user_intel(void __user *to, const void *from, unsigne= d long size) + { + int d0, d1; + __asm__ __volatile__( +@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const + " .align 2,0x90\n" + "3: movl 0(%4), %%eax\n" + "4: movl 4(%4), %%edx\n" +- "5: movl %%eax, 0(%3)\n" +- "6: movl %%edx, 4(%3)\n" ++ "5: "__copyuser_seg" movl %%eax, 0(%3)\n" ++ "6: "__copyuser_seg" movl %%edx, 4(%3)\n" + "7: movl 8(%4), %%eax\n" + "8: movl 12(%4),%%edx\n" +- "9: movl %%eax, 8(%3)\n" +- "10: movl %%edx, 12(%3)\n" ++ "9: "__copyuser_seg" movl %%eax, 8(%3)\n" ++ "10: "__copyuser_seg" movl %%edx, 12(%3)\n" + "11: movl 16(%4), %%eax\n" + "12: movl 20(%4), %%edx\n" +- "13: movl %%eax, 16(%3)\n" +- "14: movl %%edx, 20(%3)\n" ++ "13: "__copyuser_seg" movl %%eax, 16(%3)\n" ++ "14: "__copyuser_seg" movl %%edx, 20(%3)\n" + "15: movl 24(%4), %%eax\n" + "16: movl 28(%4), %%edx\n" +- "17: movl %%eax, 24(%3)\n" +- "18: movl %%edx, 28(%3)\n" ++ "17: "__copyuser_seg" movl %%eax, 24(%3)\n" ++ "18: "__copyuser_seg" movl %%edx, 28(%3)\n" + "19: movl 32(%4), %%eax\n" + "20: movl 36(%4), %%edx\n" +- "21: movl %%eax, 32(%3)\n" +- "22: movl %%edx, 36(%3)\n" ++ "21: "__copyuser_seg" movl %%eax, 32(%3)\n" ++ "22: "__copyuser_seg" movl %%edx, 36(%3)\n" + "23: movl 40(%4), %%eax\n" + "24: movl 44(%4), %%edx\n" +- "25: movl %%eax, 40(%3)\n" +- "26: movl %%edx, 44(%3)\n" ++ "25: "__copyuser_seg" movl %%eax, 40(%3)\n" ++ "26: "__copyuser_seg" movl %%edx, 44(%3)\n" + "27: movl 48(%4), %%eax\n" + "28: movl 52(%4), %%edx\n" +- "29: movl %%eax, 48(%3)\n" +- "30: movl %%edx, 52(%3)\n" ++ "29: "__copyuser_seg" movl %%eax, 48(%3)\n" ++ "30: "__copyuser_seg" movl %%edx, 52(%3)\n" + "31: movl 56(%4), %%eax\n" + "32: movl 60(%4), %%edx\n" +- "33: movl %%eax, 56(%3)\n" +- "34: movl %%edx, 60(%3)\n" ++ "33: "__copyuser_seg" movl %%eax, 56(%3)\n" ++ "34: "__copyuser_seg" movl %%edx, 60(%3)\n" + " addl $-64, %0\n" + " addl $64, %4\n" + " addl $64, %3\n" +@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const + " shrl $2, %0\n" + " andl $3, %%eax\n" + " cld\n" ++ __COPYUSER_SET_ES + "99: rep; movsl\n" + "36: movl %%eax, %0\n" + "37: rep; movsb\n" + "100:\n" ++ __COPYUSER_RESTORE_ES ++ ".section .fixup,\"ax\"\n" ++ "101: lea 0(%%eax,%0,4),%0\n" ++ " jmp 100b\n" ++ ".previous\n" ++ ".section __ex_table,\"a\"\n" ++ " .align 4\n" ++ " .long 1b,100b\n" ++ " .long 2b,100b\n" ++ " .long 3b,100b\n" ++ " .long 4b,100b\n" ++ " .long 5b,100b\n" ++ " .long 6b,100b\n" ++ " .long 7b,100b\n" ++ " .long 8b,100b\n" ++ " .long 9b,100b\n" ++ " .long 10b,100b\n" ++ " .long 11b,100b\n" ++ " .long 12b,100b\n" ++ " .long 13b,100b\n" ++ " .long 14b,100b\n" ++ " .long 15b,100b\n" ++ " .long 16b,100b\n" ++ " .long 17b,100b\n" ++ " .long 18b,100b\n" ++ " .long 19b,100b\n" ++ " .long 20b,100b\n" ++ " .long 21b,100b\n" ++ " .long 22b,100b\n" ++ " .long 23b,100b\n" ++ " .long 24b,100b\n" ++ " .long 25b,100b\n" ++ " .long 26b,100b\n" ++ " .long 27b,100b\n" ++ " .long 28b,100b\n" ++ " .long 29b,100b\n" ++ " .long 30b,100b\n" ++ " .long 31b,100b\n" ++ " .long 32b,100b\n" ++ " .long 33b,100b\n" ++ " .long 34b,100b\n" ++ " .long 35b,100b\n" ++ " .long 36b,100b\n" ++ " .long 37b,100b\n" ++ " .long 99b,101b\n" ++ ".previous" ++ : "=3D&c"(size), "=3D&D" (d0), "=3D&S" (d1) ++ : "1"(to), "2"(from), "0"(size) ++ : "eax", "edx", "memory"); ++ return size; ++} ++ ++static unsigned long ++__generic_copy_from_user_intel(void *to, const void __user *from, unsig= ned long size) ++{ ++ int d0, d1; ++ __asm__ __volatile__( ++ " .align 2,0x90\n" ++ "1: "__copyuser_seg" movl 32(%4), %%eax\n" ++ " cmpl $67, %0\n" ++ " jbe 3f\n" ++ "2: "__copyuser_seg" movl 64(%4), %%eax\n" ++ " .align 2,0x90\n" ++ "3: "__copyuser_seg" movl 0(%4), %%eax\n" ++ "4: "__copyuser_seg" movl 4(%4), %%edx\n" ++ "5: movl %%eax, 0(%3)\n" ++ "6: movl %%edx, 4(%3)\n" ++ "7: "__copyuser_seg" movl 8(%4), %%eax\n" ++ "8: "__copyuser_seg" movl 12(%4),%%edx\n" ++ "9: movl %%eax, 8(%3)\n" ++ "10: movl %%edx, 12(%3)\n" ++ "11: "__copyuser_seg" movl 16(%4), %%eax\n" ++ "12: "__copyuser_seg" movl 20(%4), %%edx\n" ++ "13: movl %%eax, 16(%3)\n" ++ "14: movl %%edx, 20(%3)\n" ++ "15: "__copyuser_seg" movl 24(%4), %%eax\n" ++ "16: "__copyuser_seg" movl 28(%4), %%edx\n" ++ "17: movl %%eax, 24(%3)\n" ++ "18: movl %%edx, 28(%3)\n" ++ "19: "__copyuser_seg" movl 32(%4), %%eax\n" ++ "20: "__copyuser_seg" movl 36(%4), %%edx\n" ++ "21: movl %%eax, 32(%3)\n" ++ "22: movl %%edx, 36(%3)\n" ++ "23: "__copyuser_seg" movl 40(%4), %%eax\n" ++ "24: "__copyuser_seg" movl 44(%4), %%edx\n" ++ "25: movl %%eax, 40(%3)\n" ++ "26: movl %%edx, 44(%3)\n" ++ "27: "__copyuser_seg" movl 48(%4), %%eax\n" ++ "28: "__copyuser_seg" movl 52(%4), %%edx\n" ++ "29: movl %%eax, 48(%3)\n" ++ "30: movl %%edx, 52(%3)\n" ++ "31: "__copyuser_seg" movl 56(%4), %%eax\n" ++ "32: "__copyuser_seg" movl 60(%4), %%edx\n" ++ "33: movl %%eax, 56(%3)\n" ++ "34: movl %%edx, 60(%3)\n" ++ " addl $-64, %0\n" ++ " addl $64, %4\n" ++ " addl $64, %3\n" ++ " cmpl $63, %0\n" ++ " ja 1b\n" ++ "35: movl %0, %%eax\n" ++ " shrl $2, %0\n" ++ " andl $3, %%eax\n" ++ " cld\n" ++ "99: rep; "__copyuser_seg" movsl\n" ++ "36: movl %%eax, %0\n" ++ "37: rep; "__copyuser_seg" movsb\n" ++ "100:\n" + ".section .fixup,\"ax\"\n" + "101: lea 0(%%eax,%0,4),%0\n" + " jmp 100b\n" +@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons + int d0, d1; + __asm__ __volatile__( + " .align 2,0x90\n" +- "0: movl 32(%4), %%eax\n" ++ "0: "__copyuser_seg" movl 32(%4), %%eax\n" + " cmpl $67, %0\n" + " jbe 2f\n" +- "1: movl 64(%4), %%eax\n" ++ "1: "__copyuser_seg" movl 64(%4), %%eax\n" + " .align 2,0x90\n" +- "2: movl 0(%4), %%eax\n" +- "21: movl 4(%4), %%edx\n" ++ "2: "__copyuser_seg" movl 0(%4), %%eax\n" ++ "21: "__copyuser_seg" movl 4(%4), %%edx\n" + " movl %%eax, 0(%3)\n" + " movl %%edx, 4(%3)\n" +- "3: movl 8(%4), %%eax\n" +- "31: movl 12(%4),%%edx\n" ++ "3: "__copyuser_seg" movl 8(%4), %%eax\n" ++ "31: "__copyuser_seg" movl 12(%4),%%edx\n" + " movl %%eax, 8(%3)\n" + " movl %%edx, 12(%3)\n" +- "4: movl 16(%4), %%eax\n" +- "41: movl 20(%4), %%edx\n" ++ "4: "__copyuser_seg" movl 16(%4), %%eax\n" ++ "41: "__copyuser_seg" movl 20(%4), %%edx\n" + " movl %%eax, 16(%3)\n" + " movl %%edx, 20(%3)\n" +- "10: movl 24(%4), %%eax\n" +- "51: movl 28(%4), %%edx\n" ++ "10: "__copyuser_seg" movl 24(%4), %%eax\n" ++ "51: "__copyuser_seg" movl 28(%4), %%edx\n" + " movl %%eax, 24(%3)\n" + " movl %%edx, 28(%3)\n" +- "11: movl 32(%4), %%eax\n" +- "61: movl 36(%4), %%edx\n" ++ "11: "__copyuser_seg" movl 32(%4), %%eax\n" ++ "61: "__copyuser_seg" movl 36(%4), %%edx\n" + " movl %%eax, 32(%3)\n" + " movl %%edx, 36(%3)\n" +- "12: movl 40(%4), %%eax\n" +- "71: movl 44(%4), %%edx\n" ++ "12: "__copyuser_seg" movl 40(%4), %%eax\n" ++ "71: "__copyuser_seg" movl 44(%4), %%edx\n" + " movl %%eax, 40(%3)\n" + " movl %%edx, 44(%3)\n" +- "13: movl 48(%4), %%eax\n" +- "81: movl 52(%4), %%edx\n" ++ "13: "__copyuser_seg" movl 48(%4), %%eax\n" ++ "81: "__copyuser_seg" movl 52(%4), %%edx\n" + " movl %%eax, 48(%3)\n" + " movl %%edx, 52(%3)\n" +- "14: movl 56(%4), %%eax\n" +- "91: movl 60(%4), %%edx\n" ++ "14: "__copyuser_seg" movl 56(%4), %%eax\n" ++ "91: "__copyuser_seg" movl 60(%4), %%edx\n" + " movl %%eax, 56(%3)\n" + " movl %%edx, 60(%3)\n" + " addl $-64, %0\n" +@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons + " shrl $2, %0\n" + " andl $3, %%eax\n" + " cld\n" +- "6: rep; movsl\n" ++ "6: rep; "__copyuser_seg" movsl\n" + " movl %%eax,%0\n" +- "7: rep; movsb\n" ++ "7: rep; "__copyuser_seg" movsb\n" + "8:\n" + ".section .fixup,\"ax\"\n" + "9: lea 0(%%eax,%0,4),%0\n" +@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing +=20 + __asm__ __volatile__( + " .align 2,0x90\n" +- "0: movl 32(%4), %%eax\n" ++ "0: "__copyuser_seg" movl 32(%4), %%eax\n" + " cmpl $67, %0\n" + " jbe 2f\n" +- "1: movl 64(%4), %%eax\n" ++ "1: "__copyuser_seg" movl 64(%4), %%eax\n" + " .align 2,0x90\n" +- "2: movl 0(%4), %%eax\n" +- "21: movl 4(%4), %%edx\n" ++ "2: "__copyuser_seg" movl 0(%4), %%eax\n" ++ "21: "__copyuser_seg" movl 4(%4), %%edx\n" + " movnti %%eax, 0(%3)\n" + " movnti %%edx, 4(%3)\n" +- "3: movl 8(%4), %%eax\n" +- "31: movl 12(%4),%%edx\n" ++ "3: "__copyuser_seg" movl 8(%4), %%eax\n" ++ "31: "__copyuser_seg" movl 12(%4),%%edx\n" + " movnti %%eax, 8(%3)\n" + " movnti %%edx, 12(%3)\n" +- "4: movl 16(%4), %%eax\n" +- "41: movl 20(%4), %%edx\n" ++ "4: "__copyuser_seg" movl 16(%4), %%eax\n" ++ "41: "__copyuser_seg" movl 20(%4), %%edx\n" + " movnti %%eax, 16(%3)\n" + " movnti %%edx, 20(%3)\n" +- "10: movl 24(%4), %%eax\n" +- "51: movl 28(%4), %%edx\n" ++ "10: "__copyuser_seg" movl 24(%4), %%eax\n" ++ "51: "__copyuser_seg" movl 28(%4), %%edx\n" + " movnti %%eax, 24(%3)\n" + " movnti %%edx, 28(%3)\n" +- "11: movl 32(%4), %%eax\n" +- "61: movl 36(%4), %%edx\n" ++ "11: "__copyuser_seg" movl 32(%4), %%eax\n" ++ "61: "__copyuser_seg" movl 36(%4), %%edx\n" + " movnti %%eax, 32(%3)\n" + " movnti %%edx, 36(%3)\n" +- "12: movl 40(%4), %%eax\n" +- "71: movl 44(%4), %%edx\n" ++ "12: "__copyuser_seg" movl 40(%4), %%eax\n" ++ "71: "__copyuser_seg" movl 44(%4), %%edx\n" + " movnti %%eax, 40(%3)\n" + " movnti %%edx, 44(%3)\n" +- "13: movl 48(%4), %%eax\n" +- "81: movl 52(%4), %%edx\n" ++ "13: "__copyuser_seg" movl 48(%4), %%eax\n" ++ "81: "__copyuser_seg" movl 52(%4), %%edx\n" + " movnti %%eax, 48(%3)\n" + " movnti %%edx, 52(%3)\n" +- "14: movl 56(%4), %%eax\n" +- "91: movl 60(%4), %%edx\n" ++ "14: "__copyuser_seg" movl 56(%4), %%eax\n" ++ "91: "__copyuser_seg" movl 60(%4), %%edx\n" + " movnti %%eax, 56(%3)\n" + " movnti %%edx, 60(%3)\n" + " addl $-64, %0\n" +@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing + " shrl $2, %0\n" + " andl $3, %%eax\n" + " cld\n" +- "6: rep; movsl\n" ++ "6: rep; "__copyuser_seg" movsl\n" + " movl %%eax,%0\n" +- "7: rep; movsb\n" ++ "7: rep; "__copyuser_seg" movsb\n" + "8:\n" + ".section .fixup,\"ax\"\n" + "9: lea 0(%%eax,%0,4),%0\n" +@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n +=20 + __asm__ __volatile__( + " .align 2,0x90\n" +- "0: movl 32(%4), %%eax\n" ++ "0: "__copyuser_seg" movl 32(%4), %%eax\n" + " cmpl $67, %0\n" + " jbe 2f\n" +- "1: movl 64(%4), %%eax\n" ++ "1: "__copyuser_seg" movl 64(%4), %%eax\n" + " .align 2,0x90\n" +- "2: movl 0(%4), %%eax\n" +- "21: movl 4(%4), %%edx\n" ++ "2: "__copyuser_seg" movl 0(%4), %%eax\n" ++ "21: "__copyuser_seg" movl 4(%4), %%edx\n" + " movnti %%eax, 0(%3)\n" + " movnti %%edx, 4(%3)\n" +- "3: movl 8(%4), %%eax\n" +- "31: movl 12(%4),%%edx\n" ++ "3: "__copyuser_seg" movl 8(%4), %%eax\n" ++ "31: "__copyuser_seg" movl 12(%4),%%edx\n" + " movnti %%eax, 8(%3)\n" + " movnti %%edx, 12(%3)\n" +- "4: movl 16(%4), %%eax\n" +- "41: movl 20(%4), %%edx\n" ++ "4: "__copyuser_seg" movl 16(%4), %%eax\n" ++ "41: "__copyuser_seg" movl 20(%4), %%edx\n" + " movnti %%eax, 16(%3)\n" + " movnti %%edx, 20(%3)\n" +- "10: movl 24(%4), %%eax\n" +- "51: movl 28(%4), %%edx\n" ++ "10: "__copyuser_seg" movl 24(%4), %%eax\n" ++ "51: "__copyuser_seg" movl 28(%4), %%edx\n" + " movnti %%eax, 24(%3)\n" + " movnti %%edx, 28(%3)\n" +- "11: movl 32(%4), %%eax\n" +- "61: movl 36(%4), %%edx\n" ++ "11: "__copyuser_seg" movl 32(%4), %%eax\n" ++ "61: "__copyuser_seg" movl 36(%4), %%edx\n" + " movnti %%eax, 32(%3)\n" + " movnti %%edx, 36(%3)\n" +- "12: movl 40(%4), %%eax\n" +- "71: movl 44(%4), %%edx\n" ++ "12: "__copyuser_seg" movl 40(%4), %%eax\n" ++ "71: "__copyuser_seg" movl 44(%4), %%edx\n" + " movnti %%eax, 40(%3)\n" + " movnti %%edx, 44(%3)\n" +- "13: movl 48(%4), %%eax\n" +- "81: movl 52(%4), %%edx\n" ++ "13: "__copyuser_seg" movl 48(%4), %%eax\n" ++ "81: "__copyuser_seg" movl 52(%4), %%edx\n" + " movnti %%eax, 48(%3)\n" + " movnti %%edx, 52(%3)\n" +- "14: movl 56(%4), %%eax\n" +- "91: movl 60(%4), %%edx\n" ++ "14: "__copyuser_seg" movl 56(%4), %%eax\n" ++ "91: "__copyuser_seg" movl 60(%4), %%edx\n" + " movnti %%eax, 56(%3)\n" + " movnti %%edx, 60(%3)\n" + " addl $-64, %0\n" +@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n + " shrl $2, %0\n" + " andl $3, %%eax\n" + " cld\n" +- "6: rep; movsl\n" ++ "6: rep; "__copyuser_seg" movsl\n" + " movl %%eax,%0\n" +- "7: rep; movsb\n" ++ "7: rep; "__copyuser_seg" movsb\n" + "8:\n" + ".section .fixup,\"ax\"\n" + "9: lea 0(%%eax,%0,4),%0\n" +@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n + */ + unsigned long __copy_user_zeroing_intel(void *to, const void __user *fr= om, + unsigned long size); +-unsigned long __copy_user_intel(void __user *to, const void *from, ++unsigned long __generic_copy_to_user_intel(void __user *to, const void = *from, ++ unsigned long size); ++unsigned long __generic_copy_from_user_intel(void *to, const void __use= r *from, + unsigned long size); + unsigned long __copy_user_zeroing_intel_nocache(void *to, + const void __user *from, unsigned long size); + #endif /* CONFIG_X86_INTEL_USERCOPY */ +=20 + /* Generic arbitrary sized copy. */ +-#define __copy_user(to, from, size) \ ++#define __copy_user(to, from, size, prefix, set, restore) \ + do { \ + int __d0, __d1, __d2; \ + __asm__ __volatile__( \ ++ set \ + " cmp $7,%0\n" \ + " jbe 1f\n" \ + " movl %1,%0\n" \ + " negl %0\n" \ + " andl $7,%0\n" \ + " subl %0,%3\n" \ +- "4: rep; movsb\n" \ ++ "4: rep; "prefix"movsb\n" \ + " movl %3,%0\n" \ + " shrl $2,%0\n" \ + " andl $3,%3\n" \ + " .align 2,0x90\n" \ +- "0: rep; movsl\n" \ ++ "0: rep; "prefix"movsl\n" \ + " movl %3,%0\n" \ +- "1: rep; movsb\n" \ ++ "1: rep; "prefix"movsb\n" \ + "2:\n" \ ++ restore \ + ".section .fixup,\"ax\"\n" \ + "5: addl %3,%0\n" \ + " jmp 2b\n" \ +@@ -682,14 +799,14 @@ do { \ + " negl %0\n" \ + " andl $7,%0\n" \ + " subl %0,%3\n" \ +- "4: rep; movsb\n" \ ++ "4: rep; "__copyuser_seg"movsb\n" \ + " movl %3,%0\n" \ + " shrl $2,%0\n" \ + " andl $3,%3\n" \ + " .align 2,0x90\n" \ +- "0: rep; movsl\n" \ ++ "0: rep; "__copyuser_seg"movsl\n" \ + " movl %3,%0\n" \ +- "1: rep; movsb\n" \ ++ "1: rep; "__copyuser_seg"movsb\n" \ + "2:\n" \ + ".section .fixup,\"ax\"\n" \ + "5: addl %3,%0\n" \ +@@ -775,9 +892,9 @@ survive: + } + #endif + if (movsl_is_ok(to, from, n)) +- __copy_user(to, from, n); ++ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES= ); + else +- n =3D __copy_user_intel(to, from, n); ++ n =3D __generic_copy_to_user_intel(to, from, n); + return n; + } + EXPORT_SYMBOL(__copy_to_user_ll); +@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero + unsigned long n) + { + if (movsl_is_ok(to, from, n)) +- __copy_user(to, from, n); ++ __copy_user(to, from, n, __copyuser_seg, "", ""); + else +- n =3D __copy_user_intel((void __user *)to, +- (const void *)from, n); ++ n =3D __generic_copy_from_user_intel(to, from, n); + return n; + } + EXPORT_SYMBOL(__copy_from_user_ll_nozero); +@@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocach + if (n > 64 && cpu_has_xmm2) + n =3D __copy_user_intel_nocache(to, from, n); + else +- __copy_user(to, from, n); ++ __copy_user(to, from, n, __copyuser_seg, "", ""); + #else +- __copy_user(to, from, n); ++ __copy_user(to, from, n, __copyuser_seg, "", ""); + #endif + return n; + } + EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero); +=20 +-/** +- * copy_to_user: - Copy a block of data into user space. +- * @to: Destination address, in user space. +- * @from: Source address, in kernel space. +- * @n: Number of bytes to copy. +- * +- * Context: User context only. This function may sleep. +- * +- * Copy data from kernel space to user space. +- * +- * Returns number of bytes that could not be copied. +- * On success, this will be zero. +- */ +-unsigned long +-copy_to_user(void __user *to, const void *from, unsigned long n) ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++void __set_fs(mm_segment_t x) + { +- if (access_ok(VERIFY_WRITE, to, n)) +- n =3D __copy_to_user(to, from, n); +- return n; ++ switch (x.seg) { ++ case 0: ++ loadsegment(gs, 0); ++ break; ++ case TASK_SIZE_MAX: ++ loadsegment(gs, __USER_DS); ++ break; ++ case -1UL: ++ loadsegment(gs, __KERNEL_DS); ++ break; ++ default: ++ BUG(); ++ } ++ return; + } +-EXPORT_SYMBOL(copy_to_user); ++EXPORT_SYMBOL(__set_fs); +=20 +-/** +- * copy_from_user: - Copy a block of data from user space. +- * @to: Destination address, in kernel space. +- * @from: Source address, in user space. +- * @n: Number of bytes to copy. +- * +- * Context: User context only. This function may sleep. +- * +- * Copy data from user space to kernel space. +- * +- * Returns number of bytes that could not be copied. +- * On success, this will be zero. +- * +- * If some data could not be copied, this function will pad the copied +- * data to the requested size using zero bytes. +- */ +-unsigned long +-copy_from_user(void *to, const void __user *from, unsigned long n) ++void set_fs(mm_segment_t x) + { +- if (access_ok(VERIFY_READ, from, n)) +- n =3D __copy_from_user(to, from, n); +- else +- memset(to, 0, n); +- return n; ++ current_thread_info()->addr_limit =3D x; ++ __set_fs(x); + } +-EXPORT_SYMBOL(copy_from_user); ++EXPORT_SYMBOL(set_fs); ++#endif +diff -urNp linux-2.6.32.45/arch/x86/lib/usercopy_64.c linux-2.6.32.45/ar= ch/x86/lib/usercopy_64.c +--- linux-2.6.32.45/arch/x86/lib/usercopy_64.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/lib/usercopy_64.c 2011-05-04 17:56:20.00000= 0000 -0400 +@@ -42,6 +42,12 @@ long + __strncpy_from_user(char *dst, const char __user *src, long count) + { + long res; ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)src < PAX_USER_SHADOW_BASE) ++ src +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + __do_strncpy_from_user(dst, src, count, res); + return res; + } +@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user * + { + long __d0; + might_fault(); ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)addr < PAX_USER_SHADOW_BASE) ++ addr +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + /* no memory constraint because it doesn't change any memory gcc knows + about */ + asm volatile( +@@ -151,10 +163,18 @@ EXPORT_SYMBOL(strlen_user); +=20 + unsigned long copy_in_user(void __user *to, const void __user *from, un= signed len) + { +- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, l= en)) {=20 ++ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, l= en)) { ++ ++#ifdef CONFIG_PAX_MEMORY_UDEREF ++ if ((unsigned long)to < PAX_USER_SHADOW_BASE) ++ to +=3D PAX_USER_SHADOW_BASE; ++ if ((unsigned long)from < PAX_USER_SHADOW_BASE) ++ from +=3D PAX_USER_SHADOW_BASE; ++#endif ++ + return copy_user_generic((__force void *)to, (__force void *)from, le= n); +- }=20 +- return len; =09 ++ } ++ return len; + } + EXPORT_SYMBOL(copy_in_user); +=20 +diff -urNp linux-2.6.32.45/arch/x86/Makefile linux-2.6.32.45/arch/x86/Ma= kefile +--- linux-2.6.32.45/arch/x86/Makefile 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/x86/Makefile 2011-07-19 18:16:02.000000000 -040= 0 +@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y) + else + BITS :=3D 64 + UTS_MACHINE :=3D x86_64 ++ biarch :=3D $(call cc-option,-m64) + CHECKFLAGS +=3D -D__x86_64__ -m64 +=20 + KBUILD_AFLAGS +=3D -m64 +@@ -189,3 +190,12 @@ define archhelp + echo ' FDARGS=3D"..." arguments for the booted ker= nel' + echo ' FDINITRD=3Dfile 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.45/arch/x86/mm/extable.c linux-2.6.32.45/arch/x8= 6/mm/extable.c +--- linux-2.6.32.45/arch/x86/mm/extable.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/extable.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -1,14 +1,71 @@ + #include + #include ++#include + #include ++#include +=20 ++/* ++ * The exception table needs to be sorted so that the binary ++ * search that we use to find entries in it works properly. ++ * This is used both for the kernel exception table and for ++ * the exception tables of modules that get loaded. ++ */ ++static int cmp_ex(const void *a, const void *b) ++{ ++ const struct exception_table_entry *x =3D a, *y =3D b; ++ ++ /* avoid overflow */ ++ if (x->insn > y->insn) ++ return 1; ++ if (x->insn < y->insn) ++ return -1; ++ return 0; ++} ++ ++static void swap_ex(void *a, void *b, int size) ++{ ++ struct exception_table_entry t, *x =3D a, *y =3D b; ++ ++ t =3D *x; ++ ++ pax_open_kernel(); ++ *x =3D *y; ++ *y =3D t; ++ pax_close_kernel(); ++} ++ ++void sort_extable(struct exception_table_entry *start, ++ struct exception_table_entry *finish) ++{ ++ sort(start, finish - start, sizeof(struct exception_table_entry), ++ cmp_ex, swap_ex); ++} ++ ++#ifdef CONFIG_MODULES ++/* ++ * If the exception table is sorted, any referring to the module init ++ * will be at the beginning or the end. ++ */ ++void trim_init_extable(struct module *m) ++{ ++ /*trim the beginning*/ ++ while (m->num_exentries && within_module_init(m->extable[0].insn, m)) = { ++ m->extable++; ++ m->num_exentries--; ++ } ++ /*trim the end*/ ++ while (m->num_exentries && ++ within_module_init(m->extable[m->num_exentries-1].insn, m)) ++ m->num_exentries--; ++} ++#endif /* CONFIG_MODULES */ +=20 + int fixup_exception(struct pt_regs *regs) + { + const struct exception_table_entry *fixup; +=20 + #ifdef CONFIG_PNPBIOS +- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) { ++ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) { + extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; + extern u32 pnp_bios_is_utter_crap; + pnp_bios_is_utter_crap =3D 1; +diff -urNp linux-2.6.32.45/arch/x86/mm/fault.c linux-2.6.32.45/arch/x86/= mm/fault.c +--- linux-2.6.32.45/arch/x86/mm/fault.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/x86/mm/fault.c 2011-08-17 20:06:44.000000000 -0= 400 +@@ -11,10 +11,19 @@ + #include /* __kprobes, ... */ + #include /* kmmio_handler, ... */ + #include /* perf_sw_event */ ++#include ++#include +=20 + #include /* dotraplinkage, ... */ + #include /* pgd_*(), ... */ + #include /* kmemcheck_*(), ... */ ++#include ++#include ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++#include ++#include "../kernel/dumpstack.h" ++#endif +=20 + /* + * Page fault error code bits: +@@ -51,7 +60,7 @@ static inline int notify_page_fault(stru + int ret =3D 0; +=20 + /* kprobe_running() needs smp_processor_id() */ +- if (kprobes_built_in() && !user_mode_vm(regs)) { ++ if (kprobes_built_in() && !user_mode(regs)) { + preempt_disable(); + if (kprobe_running() && kprobe_fault_handler(regs, 14)) + ret =3D 1; +@@ -112,7 +121,10 @@ check_prefetch_opcode(struct pt_regs *re + return !instr_lo || (instr_lo>>1) =3D=3D 1; + case 0x00: + /* Prefetch instruction is 0x0F0D or 0x0F18 */ +- if (probe_kernel_address(instr, opcode)) ++ if (user_mode(regs)) { ++ if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user= *)(instr), 1)) ++ return 0; ++ } else if (probe_kernel_address(instr, opcode)) + return 0; +=20 + *prefetch =3D (instr_lo =3D=3D 0xF) && +@@ -146,7 +158,10 @@ is_prefetch(struct pt_regs *regs, unsign + while (instr < max_instr) { + unsigned char opcode; +=20 +- if (probe_kernel_address(instr, opcode)) ++ if (user_mode(regs)) { ++ if (__copy_from_user_inatomic(&opcode, (__force unsigned char __user= *)(instr), 1)) ++ break; ++ } else if (probe_kernel_address(instr, opcode)) + break; +=20 + instr++; +@@ -172,6 +187,30 @@ force_sig_info_fault(int si_signo, int s + force_sig_info(si_signo, &info, tsk); + } +=20 ++#ifdef CONFIG_PAX_EMUTRAMP ++static int pax_handle_fetch_fault(struct pt_regs *regs); ++#endif ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long a= ddress) ++{ ++ pgd_t *pgd; ++ pud_t *pud; ++ pmd_t *pmd; ++ ++ pgd =3D pgd_offset(mm, address); ++ if (!pgd_present(*pgd)) ++ return NULL; ++ pud =3D pud_offset(pgd, address); ++ if (!pud_present(*pud)) ++ return NULL; ++ pmd =3D pmd_offset(pud, address); ++ if (!pmd_present(*pmd)) ++ return NULL; ++ return pmd; ++} ++#endif ++ + DEFINE_SPINLOCK(pgd_lock); + LIST_HEAD(pgd_list); +=20 +@@ -224,11 +263,24 @@ void vmalloc_sync_all(void) + address +=3D PMD_SIZE) { +=20 + unsigned long flags; ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ unsigned long cpu; ++#else + struct page *page; ++#endif +=20 + spin_lock_irqsave(&pgd_lock, flags); ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ for (cpu =3D 0; cpu < NR_CPUS; ++cpu) { ++ pgd_t *pgd =3D get_cpu_pgd(cpu); ++#else + list_for_each_entry(page, &pgd_list, lru) { +- if (!vmalloc_sync_one(page_address(page), address)) ++ pgd_t *pgd =3D page_address(page); ++#endif ++ ++ if (!vmalloc_sync_one(pgd, address)) + break; + } + spin_unlock_irqrestore(&pgd_lock, flags); +@@ -258,6 +310,11 @@ static noinline int vmalloc_fault(unsign + * an interrupt in the middle of a task switch.. + */ + pgd_paddr =3D read_cr3(); ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) !=3D (pgd_paddr & PHYSICA= L_PAGE_MASK)); ++#endif ++ + pmd_k =3D vmalloc_sync_one(__va(pgd_paddr), address); + if (!pmd_k) + return -1; +@@ -332,15 +389,27 @@ void vmalloc_sync_all(void) +=20 + const pgd_t *pgd_ref =3D pgd_offset_k(address); + unsigned long flags; ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ unsigned long cpu; ++#else + struct page *page; ++#endif +=20 + if (pgd_none(*pgd_ref)) + continue; +=20 + spin_lock_irqsave(&pgd_lock, flags); ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ for (cpu =3D 0; cpu < NR_CPUS; ++cpu) { ++ pgd_t *pgd =3D pgd_offset_cpu(cpu, address); ++#else + list_for_each_entry(page, &pgd_list, lru) { + pgd_t *pgd; + pgd =3D (pgd_t *)page_address(page) + pgd_index(address); ++#endif ++ + if (pgd_none(*pgd)) + set_pgd(pgd, *pgd_ref); + else +@@ -373,7 +442,14 @@ static noinline int vmalloc_fault(unsign + * happen within a race in page table update. In the later + * case just flush: + */ ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) !=3D (read_cr3() & PHYSIC= AL_PAGE_MASK)); ++ pgd =3D pgd_offset_cpu(smp_processor_id(), address); ++#else + pgd =3D pgd_offset(current->active_mm, address); ++#endif ++ + pgd_ref =3D pgd_offset_k(address); + if (pgd_none(*pgd_ref)) + return -1; +@@ -535,7 +611,7 @@ static int is_errata93(struct pt_regs *r + static int is_errata100(struct pt_regs *regs, unsigned long address) + { + #ifdef CONFIG_X86_64 +- if ((regs->cs =3D=3D __USER32_CS || (regs->cs & (1<<2))) && (address >= > 32)) ++ if ((regs->cs =3D=3D __USER32_CS || (regs->cs & SEGMENT_LDT)) && (addr= ess >> 32)) + return 1; + #endif + return 0; +@@ -562,7 +638,7 @@ static int is_f00f_bug(struct pt_regs *r + } +=20 + static const char nx_warning[] =3D KERN_CRIT +-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)= \n"; ++"kernel tried to execute NX-protected page - exploit attempt? (uid: %d,= task: %s, pid: %d)\n"; +=20 + static void + show_fault_oops(struct pt_regs *regs, unsigned long error_code, +@@ -571,15 +647,26 @@ show_fault_oops(struct pt_regs *regs, un + if (!oops_may_print()) + return; +=20 +- if (error_code & PF_INSTR) { ++ if (nx_enabled && (error_code & PF_INSTR)) { + unsigned int level; +=20 + pte_t *pte =3D lookup_address(address, &level); +=20 + if (pte && pte_present(*pte) && !pte_exec(*pte)) +- printk(nx_warning, current_uid()); ++ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current= )); + } +=20 ++#ifdef CONFIG_PAX_KERNEXEC ++ if (init_mm.start_code <=3D address && address < init_mm.end_code) { ++ if (current->signal->curr_ip) ++ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted t= o modify kernel code\n", ++ ¤t->signal->curr_ip, current->comm, task_pid_nr(current), c= urrent_uid(), current_euid()); ++ else ++ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify ke= rnel code\n", ++ current->comm, task_pid_nr(current), current_uid(), current_euid(= )); ++ } ++#endif ++ + printk(KERN_ALERT "BUG: unable to handle kernel "); + if (address < PAGE_SIZE) + printk(KERN_CONT "NULL pointer dereference"); +@@ -704,6 +791,70 @@ __bad_area_nosemaphore(struct pt_regs *r + unsigned long address, int si_code) + { + struct task_struct *tsk =3D current; ++#if defined(CONFIG_X86_64) || defined(CONFIG_PAX_PAGEEXEC) || defined(C= ONFIG_PAX_SEGMEXEC) ++ struct mm_struct *mm =3D tsk->mm; ++#endif ++ ++#ifdef CONFIG_X86_64 ++ if (mm && (error_code & PF_INSTR) && mm->context.vdso) { ++ if (regs->ip =3D=3D (unsigned long)vgettimeofday) { ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _gettimeofday); ++ return; ++ } else if (regs->ip =3D=3D (unsigned long)vtime) { ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback= _time); ++ return; ++ } else if (regs->ip =3D=3D (unsigned long)vgetcpu) { ++ regs->ip =3D (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); ++ return; ++ } ++ } ++#endif ++ ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ if (mm && (error_code & PF_USER)) { ++ unsigned long ip =3D regs->ip; ++ ++ if (v8086_mode(regs)) ++ ip =3D ((regs->cs & 0xffff) << 4) + (ip & 0xffff); ++ ++ /* ++ * It's possible to have interrupts off here: ++ */ ++ local_irq_enable(); ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && ++ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_P= ROT | PF_WRITE)) && ip =3D=3D address))) { ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ switch (pax_handle_fetch_fault(regs)) { ++ case 2: ++ return; ++ } ++#endif ++ ++ pax_report_fault(regs, (void *)ip, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF= _WRITE)) && (ip + SEGMEXEC_TASK_SIZE =3D=3D address)) { ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ switch (pax_handle_fetch_fault(regs)) { ++ case 2: ++ return; ++ } ++#endif ++ ++ pax_report_fault(regs, (void *)ip, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ ++ } ++#endif +=20 + /* User mode accesses just cause a SIGSEGV */ + if (error_code & PF_USER) { +@@ -857,6 +1008,99 @@ static int spurious_fault_check(unsigned + return 1; + } +=20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_st= ruct *mm, unsigned long address, unsigned long error_code) ++{ ++ pte_t *pte; ++ pmd_t *pmd; ++ spinlock_t *ptl; ++ unsigned char pte_mask; ++ ++ if (nx_enabled || (error_code & (PF_PROT|PF_USER)) !=3D (PF_PROT|PF_US= ER) || v8086_mode(regs) || ++ !(mm->pax_flags & MF_PAX_PAGEEXEC)) ++ return 0; ++ ++ /* PaX: it's our fault, let's handle it if we can */ ++ ++ /* PaX: take a look at read faults before acquiring any locks */ ++ if (unlikely(!(error_code & PF_WRITE) && (regs->ip =3D=3D address))) { ++ /* instruction fetch attempt from a protected page in user mode */ ++ up_read(&mm->mmap_sem); ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ switch (pax_handle_fetch_fault(regs)) { ++ case 2: ++ return 1; ++ } ++#endif ++ ++ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++ ++ pmd =3D pax_get_pmd(mm, address); ++ if (unlikely(!pmd)) ++ return 0; ++ ++ pte =3D pte_offset_map_lock(mm, pmd, address, &ptl); ++ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) { ++ pte_unmap_unlock(pte, ptl); ++ return 0; ++ } ++ ++ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) { ++ /* write attempt to a protected page in user mode */ ++ pte_unmap_unlock(pte, ptl); ++ return 0; ++ } ++ ++#ifdef CONFIG_SMP ++ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id= (), mm->context.cpu_user_cs_mask))) ++#else ++ if (likely(address > get_limit(regs->cs))) ++#endif ++ { ++ set_pte(pte, pte_mkread(*pte)); ++ __flush_tlb_one(address); ++ pte_unmap_unlock(pte, ptl); ++ up_read(&mm->mmap_sem); ++ return 1; ++ } ++ ++ pte_mask =3D _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) <<= (_PAGE_BIT_DIRTY-1)); ++ ++ /* ++ * PaX: fill DTLB with user rights and retry ++ */ ++ __asm__ __volatile__ ( ++ "orb %2,(%1)\n" ++#if defined(CONFIG_M586) || defined(CONFIG_M586TSC) ++/* ++ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Int= el's ++ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *a= ny* ++ * page fault when examined during a TLB load attempt. this is true not= only ++ * for PTEs holding a non-present entry but also present entries that w= ill ++ * raise a page fault (such as those set up by PaX, or the copy-on-writ= e ++ * mechanism). in effect it means that we do *not* need to flush the TL= Bs ++ * for our target pages since their PTEs are simply not in the TLBs at = all. ++ ++ * the best thing in omitting it is that we gain around 15-20% speed in= the ++ * fast path of the page fault handler and can get rid of tracing since= we ++ * can no longer flush unintended entries. ++ */ ++ "invlpg (%0)\n" ++#endif ++ __copyuser_seg"testb $0,(%0)\n" ++ "xorb %3,(%1)\n" ++ : ++ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER) ++ : "memory", "cc"); ++ pte_unmap_unlock(pte, ptl); ++ up_read(&mm->mmap_sem); ++ return 1; ++} ++#endif ++ + /* + * Handle a spurious fault caused by a stale TLB entry. + * +@@ -923,6 +1167,9 @@ int show_unhandled_signals =3D 1; + static inline int + access_error(unsigned long error_code, int write, struct vm_area_struct= *vma) + { ++ if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC= )) ++ return 1; ++ + if (write) { + /* write, present and write, not present: */ + if (unlikely(!(vma->vm_flags & VM_WRITE))) +@@ -956,17 +1203,31 @@ do_page_fault(struct pt_regs *regs, unsi + { + struct vm_area_struct *vma; + struct task_struct *tsk; +- unsigned long address; + struct mm_struct *mm; + int write; + int fault; +=20 ++ /* Get the faulting address: */ ++ unsigned long address =3D read_cr2(); ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) { ++ if (!search_exception_tables(regs->ip)) { ++ bad_area_nosemaphore(regs, error_code, address); ++ return; ++ } ++ if (address < PAX_USER_SHADOW_BASE) { ++ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n")= ; ++ printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip); ++ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR)= ; ++ } else ++ address -=3D PAX_USER_SHADOW_BASE; ++ } ++#endif ++ + tsk =3D current; + mm =3D tsk->mm; +=20 +- /* Get the faulting address: */ +- address =3D read_cr2(); +- + /* + * Detect and handle instructions that would cause a page fault for + * both a tracked kernel page and a userspace page. +@@ -1026,7 +1287,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: + */ +- if (user_mode_vm(regs)) { ++ if (user_mode(regs)) { + local_irq_enable(); + error_code |=3D PF_USER; + } else { +@@ -1080,6 +1341,11 @@ do_page_fault(struct pt_regs *regs, unsi + might_sleep(); + } +=20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++ if (pax_handle_pageexec_fault(regs, mm, address, error_code)) ++ return; ++#endif ++ + vma =3D find_vma(mm, address); + if (unlikely(!vma)) { + bad_area(regs, error_code, address); +@@ -1091,18 +1357,24 @@ do_page_fault(struct pt_regs *regs, unsi + bad_area(regs, error_code, address); + return; + } +- if (error_code & PF_USER) { +- /* +- * Accessing the stack below %sp is always a bug. +- * The large cushion allows instructions like enter +- * and pusha to work. ("enter $65535, $31" pushes +- * 32 pointers and then decrements %sp by 65535.) +- */ +- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)= ) { +- bad_area(regs, error_code, address); +- return; +- } ++ /* ++ * Accessing the stack below %sp is always a bug. ++ * The large cushion allows instructions like enter ++ * and pusha to work. ("enter $65535, $31" pushes ++ * 32 pointers and then decrements %sp by 65535.) ++ */ ++ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_re= gs(tsk)->sp)) { ++ bad_area(regs, error_code, address); ++ return; + } ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEX= EC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) { ++ bad_area(regs, error_code, address); ++ return; ++ } ++#endif ++ + if (unlikely(expand_stack(vma, address))) { + bad_area(regs, error_code, address); + return; +@@ -1146,3 +1418,199 @@ good_area: +=20 + up_read(&mm->mmap_sem); + } ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++static int pax_handle_fetch_fault_32(struct pt_regs *regs) ++{ ++ int err; ++ ++ do { /* PaX: gcc trampoline emulation #1 */ ++ unsigned char mov1, mov2; ++ unsigned short jmp; ++ unsigned int addr1, addr2; ++ ++#ifdef CONFIG_X86_64 ++ if ((regs->ip + 11) >> 32) ++ break; ++#endif ++ ++ err =3D get_user(mov1, (unsigned char __user *)regs->ip); ++ err |=3D get_user(addr1, (unsigned int __user *)(regs->ip + 1)); ++ err |=3D get_user(mov2, (unsigned char __user *)(regs->ip + 5)); ++ err |=3D get_user(addr2, (unsigned int __user *)(regs->ip + 6)); ++ err |=3D get_user(jmp, (unsigned short __user *)(regs->ip + 10)); ++ ++ if (err) ++ break; ++ ++ if (mov1 =3D=3D 0xB9 && mov2 =3D=3D 0xB8 && jmp =3D=3D 0xE0FF) { ++ regs->cx =3D addr1; ++ regs->ax =3D addr2; ++ regs->ip =3D addr2; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: gcc trampoline emulation #2 */ ++ unsigned char mov, jmp; ++ unsigned int addr1, addr2; ++ ++#ifdef CONFIG_X86_64 ++ if ((regs->ip + 9) >> 32) ++ break; ++#endif ++ ++ err =3D get_user(mov, (unsigned char __user *)regs->ip); ++ err |=3D get_user(addr1, (unsigned int __user *)(regs->ip + 1)); ++ err |=3D get_user(jmp, (unsigned char __user *)(regs->ip + 5)); ++ err |=3D get_user(addr2, (unsigned int __user *)(regs->ip + 6)); ++ ++ if (err) ++ break; ++ ++ if (mov =3D=3D 0xB9 && jmp =3D=3D 0xE9) { ++ regs->cx =3D addr1; ++ regs->ip =3D (unsigned int)(regs->ip + addr2 + 10); ++ return 2; ++ } ++ } while (0); ++ ++ return 1; /* PaX in action */ ++} ++ ++#ifdef CONFIG_X86_64 ++static int pax_handle_fetch_fault_64(struct pt_regs *regs) ++{ ++ int err; ++ ++ do { /* PaX: gcc trampoline emulation #1 */ ++ unsigned short mov1, mov2, jmp1; ++ unsigned char jmp2; ++ unsigned int addr1; ++ unsigned long addr2; ++ ++ err =3D get_user(mov1, (unsigned short __user *)regs->ip); ++ err |=3D get_user(addr1, (unsigned int __user *)(regs->ip + 2)); ++ err |=3D get_user(mov2, (unsigned short __user *)(regs->ip + 6)); ++ err |=3D get_user(addr2, (unsigned long __user *)(regs->ip + 8)); ++ err |=3D get_user(jmp1, (unsigned short __user *)(regs->ip + 16)); ++ err |=3D get_user(jmp2, (unsigned char __user *)(regs->ip + 18)); ++ ++ if (err) ++ break; ++ ++ if (mov1 =3D=3D 0xBB41 && mov2 =3D=3D 0xBA49 && jmp1 =3D=3D 0xFF49 &&= jmp2 =3D=3D 0xE3) { ++ regs->r11 =3D addr1; ++ regs->r10 =3D addr2; ++ regs->ip =3D addr1; ++ return 2; ++ } ++ } while (0); ++ ++ do { /* PaX: gcc trampoline emulation #2 */ ++ unsigned short mov1, mov2, jmp1; ++ unsigned char jmp2; ++ unsigned long addr1, addr2; ++ ++ err =3D get_user(mov1, (unsigned short __user *)regs->ip); ++ err |=3D get_user(addr1, (unsigned long __user *)(regs->ip + 2)); ++ err |=3D get_user(mov2, (unsigned short __user *)(regs->ip + 10)); ++ err |=3D get_user(addr2, (unsigned long __user *)(regs->ip + 12)); ++ err |=3D get_user(jmp1, (unsigned short __user *)(regs->ip + 20)); ++ err |=3D get_user(jmp2, (unsigned char __user *)(regs->ip + 22)); ++ ++ if (err) ++ break; ++ ++ if (mov1 =3D=3D 0xBB49 && mov2 =3D=3D 0xBA49 && jmp1 =3D=3D 0xFF49 &&= jmp2 =3D=3D 0xE3) { ++ regs->r11 =3D addr1; ++ regs->r10 =3D addr2; ++ regs->ip =3D addr1; ++ return 2; ++ } ++ } while (0); ++ ++ return 1; /* PaX in action */ ++} ++#endif ++ ++/* ++ * PaX: decide what to do with offenders (regs->ip =3D fault address) ++ * ++ * returns 1 when task should be killed ++ * 2 when gcc trampoline was detected ++ */ ++static int pax_handle_fetch_fault(struct pt_regs *regs) ++{ ++ if (v8086_mode(regs)) ++ return 1; ++ ++ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP)) ++ return 1; ++ ++#ifdef CONFIG_X86_32 ++ return pax_handle_fetch_fault_32(regs); ++#else ++ if (regs->cs =3D=3D __USER32_CS || (regs->cs & SEGMENT_LDT)) ++ return pax_handle_fetch_fault_32(regs); ++ else ++ return pax_handle_fetch_fault_64(regs); ++#endif ++} ++#endif ++ ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++void pax_report_insns(void *pc, void *sp) ++{ ++ long i; ++ ++ printk(KERN_ERR "PAX: bytes at PC: "); ++ for (i =3D 0; i < 20; i++) { ++ unsigned char c; ++ if (get_user(c, (__force unsigned char __user *)pc+i)) ++ printk(KERN_CONT "?? "); ++ else ++ printk(KERN_CONT "%02x ", c); ++ } ++ printk("\n"); ++ ++ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long))= ; ++ for (i =3D -1; i < 80 / (long)sizeof(long); i++) { ++ unsigned long c; ++ if (get_user(c, (__force unsigned long __user *)sp+i)) ++#ifdef CONFIG_X86_32 ++ printk(KERN_CONT "???????? "); ++#else ++ printk(KERN_CONT "???????????????? "); ++#endif ++ else ++ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c); ++ } ++ printk("\n"); ++} ++#endif ++ ++/** ++ * probe_kernel_write(): safely attempt to write to a location ++ * @dst: address to write to ++ * @src: pointer to the data that shall be written ++ * @size: size of the data chunk ++ * ++ * Safely write to address @dst from the buffer at @src. If a kernel f= ault ++ * happens, handle that and return -EFAULT. ++ */ ++long notrace probe_kernel_write(void *dst, const void *src, size_t size= ) ++{ ++ long ret; ++ mm_segment_t old_fs =3D get_fs(); ++ ++ set_fs(KERNEL_DS); ++ pagefault_disable(); ++ pax_open_kernel(); ++ ret =3D __copy_to_user_inatomic((__force void __user *)dst, src, size)= ; ++ pax_close_kernel(); ++ pagefault_enable(); ++ set_fs(old_fs); ++ ++ return ret ? -EFAULT : 0; ++} +diff -urNp linux-2.6.32.45/arch/x86/mm/gup.c linux-2.6.32.45/arch/x86/mm= /gup.c +--- linux-2.6.32.45/arch/x86/mm/gup.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/x86/mm/gup.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long=20 + addr =3D start; + len =3D (unsigned long) nr_pages << PAGE_SHIFT; + end =3D start + len; +- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ, ++ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ, + (void __user *)start, len))) + return 0; +=20 +diff -urNp linux-2.6.32.45/arch/x86/mm/highmem_32.c linux-2.6.32.45/arch= /x86/mm/highmem_32.c +--- linux-2.6.32.45/arch/x86/mm/highmem_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/mm/highmem_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page + idx =3D type + KM_TYPE_NR*smp_processor_id(); + vaddr =3D __fix_to_virt(FIX_KMAP_BEGIN + idx); + BUG_ON(!pte_none(*(kmap_pte-idx))); ++ ++ pax_open_kernel(); + set_pte(kmap_pte-idx, mk_pte(page, prot)); ++ pax_close_kernel(); +=20 + return (void *)vaddr; + } +diff -urNp linux-2.6.32.45/arch/x86/mm/hugetlbpage.c linux-2.6.32.45/arc= h/x86/mm/hugetlbpage.c +--- linux-2.6.32.45/arch/x86/mm/hugetlbpage.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/mm/hugetlbpage.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmappe + struct hstate *h =3D hstate_file(file); + struct mm_struct *mm =3D current->mm; + struct vm_area_struct *vma; +- unsigned long start_addr; ++ unsigned long start_addr, pax_task_size =3D TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ pax_task_size -=3D PAGE_SIZE; +=20 + if (len > mm->cached_hole_size) { +- start_addr =3D mm->free_area_cache; ++ start_addr =3D mm->free_area_cache; + } else { +- start_addr =3D TASK_UNMAPPED_BASE; +- mm->cached_hole_size =3D 0; ++ start_addr =3D mm->mmap_base; ++ mm->cached_hole_size =3D 0; + } +=20 + full_search: +@@ -281,26 +288,27 @@ full_search: +=20 + for (vma =3D find_vma(mm, addr); ; vma =3D vma->vm_next) { + /* At this point: (!vma || addr < vma->vm_end). */ +- if (TASK_SIZE - len < addr) { ++ if (pax_task_size - len < addr) { + /* + * Start a new search - just in case we missed + * some holes. + */ +- if (start_addr !=3D TASK_UNMAPPED_BASE) { +- start_addr =3D TASK_UNMAPPED_BASE; ++ if (start_addr !=3D mm->mmap_base) { ++ start_addr =3D mm->mmap_base; + mm->cached_hole_size =3D 0; + goto full_search; + } + return -ENOMEM; + } +- if (!vma || addr + len <=3D vma->vm_start) { +- mm->free_area_cache =3D addr + len; +- return addr; +- } ++ if (check_heap_stack_gap(vma, addr, len)) ++ break; + if (addr + mm->cached_hole_size < vma->vm_start) + mm->cached_hole_size =3D vma->vm_start - addr; + addr =3D ALIGN(vma->vm_end, huge_page_size(h)); + } ++ ++ mm->free_area_cache =3D addr + len; ++ return addr; + } +=20 + static unsigned long hugetlb_get_unmapped_area_topdown(struct file *fil= e, +@@ -309,10 +317,9 @@ static unsigned long hugetlb_get_unmappe + { + struct hstate *h =3D hstate_file(file); + struct mm_struct *mm =3D current->mm; +- struct vm_area_struct *vma, *prev_vma; +- unsigned long base =3D mm->mmap_base, addr =3D addr0; ++ struct vm_area_struct *vma; ++ unsigned long base =3D mm->mmap_base, addr; + unsigned long largest_hole =3D mm->cached_hole_size; +- int first_time =3D 1; +=20 + /* don't allow allocations above current base */ + if (mm->free_area_cache > base) +@@ -322,64 +329,63 @@ static unsigned long hugetlb_get_unmappe + largest_hole =3D 0; + mm->free_area_cache =3D base; + } +-try_again: ++ + /* make sure it can fit in the remaining address space */ + if (mm->free_area_cache < len) + goto fail; +=20 + /* either no address requested or cant fit in requested address hole *= / +- addr =3D (mm->free_area_cache - len) & huge_page_mask(h); ++ addr =3D (mm->free_area_cache - len); + do { ++ addr &=3D huge_page_mask(h); ++ vma =3D find_vma(mm, addr); + /* + * Lookup failure means no vma is above this address, + * i.e. return with success: +- */ +- if (!(vma =3D find_vma_prev(mm, addr, &prev_vma))) +- return addr; +- +- /* + * new region fits between prev_vma->vm_end and + * vma->vm_start, use it: + */ +- if (addr + len <=3D vma->vm_start && +- (!prev_vma || (addr >=3D prev_vma->vm_end))) { ++ if (check_heap_stack_gap(vma, addr, len)) { + /* remember the address as a hint for next time */ +- mm->cached_hole_size =3D largest_hole; +- return (mm->free_area_cache =3D addr); +- } else { +- /* pull free_area_cache down to the first hole */ +- if (mm->free_area_cache =3D=3D vma->vm_end) { +- mm->free_area_cache =3D vma->vm_start; +- mm->cached_hole_size =3D largest_hole; +- } ++ mm->cached_hole_size =3D largest_hole; ++ return (mm->free_area_cache =3D addr); ++ } ++ /* pull free_area_cache down to the first hole */ ++ if (mm->free_area_cache =3D=3D vma->vm_end) { ++ mm->free_area_cache =3D vma->vm_start; ++ mm->cached_hole_size =3D largest_hole; + } +=20 + /* remember the largest hole we saw so far */ + if (addr + largest_hole < vma->vm_start) +- largest_hole =3D vma->vm_start - addr; ++ largest_hole =3D vma->vm_start - addr; +=20 + /* try just below the current vma->vm_start */ +- addr =3D (vma->vm_start - len) & huge_page_mask(h); +- } while (len <=3D vma->vm_start); ++ addr =3D skip_heap_stack_gap(vma, len); ++ } while (!IS_ERR_VALUE(addr)); +=20 + fail: + /* +- * if hint left us with no space for the requested +- * mapping then try again: +- */ +- if (first_time) { +- mm->free_area_cache =3D base; +- largest_hole =3D 0; +- first_time =3D 0; +- goto try_again; +- } +- /* + * A failed mmap() very likely causes application failure, + * so fall back to the bottom-up function here. This scenario + * can happen with large stack limits and large mmap() + * allocations. + */ +- mm->free_area_cache =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ mm->mmap_base =3D SEGMEXEC_TASK_UNMAPPED_BASE; ++ else ++#endif ++ ++ mm->mmap_base =3D TASK_UNMAPPED_BASE; ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ ++ mm->free_area_cache =3D mm->mmap_base; + mm->cached_hole_size =3D ~0UL; + addr =3D hugetlb_get_unmapped_area_bottomup(file, addr0, + len, pgoff, flags); +@@ -387,6 +393,7 @@ fail: + /* + * Restore the topdown base: + */ ++ mm->mmap_base =3D base; + mm->free_area_cache =3D base; + mm->cached_hole_size =3D ~0UL; +=20 +@@ -400,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *f + struct hstate *h =3D hstate_file(file); + struct mm_struct *mm =3D current->mm; + struct vm_area_struct *vma; ++ unsigned long pax_task_size =3D TASK_SIZE; +=20 + if (len & ~huge_page_mask(h)) + return -EINVAL; +- if (len > TASK_SIZE) ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif ++ ++ pax_task_size -=3D PAGE_SIZE; ++ ++ if (len > pax_task_size) + return -ENOMEM; +=20 + if (flags & MAP_FIXED) { +@@ -415,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *f + if (addr) { + addr =3D ALIGN(addr, huge_page_size(h)); + vma =3D find_vma(mm, addr); +- if (TASK_SIZE - len >=3D addr && +- (!vma || addr + len <=3D vma->vm_start)) ++ if (pax_task_size - len >=3D addr && check_heap_stack_gap(vma, addr, = len)) + return addr; + } + if (mm->get_unmapped_area =3D=3D arch_get_unmapped_area) +diff -urNp linux-2.6.32.45/arch/x86/mm/init_32.c linux-2.6.32.45/arch/x8= 6/mm/init_32.c +--- linux-2.6.32.45/arch/x86/mm/init_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/init_32.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) + } +=20 + /* +- * Creates a middle page table and puts a pointer to it in the +- * given global directory entry. This only returns the gd entry +- * in non-PAE compilation mode, since the middle layer is folded. +- */ +-static pmd_t * __init one_md_table_init(pgd_t *pgd) +-{ +- pud_t *pud; +- pmd_t *pmd_table; +- +-#ifdef CONFIG_X86_PAE +- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) { +- if (after_bootmem) +- pmd_table =3D (pmd_t *)alloc_bootmem_pages(PAGE_SIZE); +- else +- pmd_table =3D (pmd_t *)alloc_low_page(); +- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT); +- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT)); +- pud =3D pud_offset(pgd, 0); +- BUG_ON(pmd_table !=3D pmd_offset(pud, 0)); +- +- return pmd_table; +- } +-#endif +- pud =3D pud_offset(pgd, 0); +- pmd_table =3D pmd_offset(pud, 0); +- +- return pmd_table; +-} +- +-/* + * Create a page table and place a pointer to it in a middle page + * directory entry: + */ +@@ -121,13 +91,28 @@ static pte_t * __init one_page_table_ini + page_table =3D (pte_t *)alloc_low_page(); +=20 + paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT); ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE)); ++#else + set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE)); ++#endif + BUG_ON(page_table !=3D pte_offset_kernel(pmd, 0)); + } +=20 + return pte_offset_kernel(pmd, 0); + } +=20 ++static pmd_t * __init one_md_table_init(pgd_t *pgd) ++{ ++ pud_t *pud; ++ pmd_t *pmd_table; ++ ++ pud =3D pud_offset(pgd, 0); ++ pmd_table =3D pmd_offset(pud, 0); ++ ++ return pmd_table; ++} ++ + pmd_t * __init populate_extra_pmd(unsigned long vaddr) + { + int pgd_idx =3D pgd_index(vaddr); +@@ -201,6 +186,7 @@ page_table_range_init(unsigned long star + int pgd_idx, pmd_idx; + unsigned long vaddr; + pgd_t *pgd; ++ pud_t *pud; + pmd_t *pmd; + pte_t *pte =3D NULL; +=20 +@@ -210,8 +196,13 @@ page_table_range_init(unsigned long star + pgd =3D pgd_base + pgd_idx; +=20 + for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr !=3D end); pgd++, pgd_idx++= ) { +- pmd =3D one_md_table_init(pgd); +- pmd =3D pmd + pmd_index(vaddr); ++ pud =3D pud_offset(pgd, vaddr); ++ pmd =3D pmd_offset(pud, vaddr); ++ ++#ifdef CONFIG_X86_PAE ++ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT); ++#endif ++ + for (; (pmd_idx < PTRS_PER_PMD) && (vaddr !=3D end); + pmd++, pmd_idx++) { + pte =3D page_table_kmap_check(one_page_table_init(pmd), +@@ -223,11 +214,20 @@ page_table_range_init(unsigned long star + } + } +=20 +-static inline int is_kernel_text(unsigned long addr) ++static inline int is_kernel_text(unsigned long start, unsigned long end= ) + { +- if (addr >=3D PAGE_OFFSET && addr <=3D (unsigned long)__init_end) +- return 1; +- return 0; ++ if ((start > ktla_ktva((unsigned long)_etext) || ++ end <=3D ktla_ktva((unsigned long)_stext)) && ++ (start > ktla_ktva((unsigned long)_einittext) || ++ end <=3D ktla_ktva((unsigned long)_sinittext)) && ++ ++#ifdef CONFIG_ACPI_SLEEP ++ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end = <=3D (unsigned long)__va(acpi_wakeup_address)) && ++#endif ++ ++ (start > (unsigned long)__va(0xfffff) || end <=3D (unsigned long)_= _va(0xc0000))) ++ return 0; ++ return 1; + } +=20 + /* +@@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned lo + int use_pse =3D page_size_mask =3D=3D (1<> PAGE_SHIFT); ++#endif +=20 + if (pfn >=3D end_pfn) + continue; +@@ -291,14 +297,13 @@ repeat: + #endif + for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn; + pmd++, pmd_idx++) { +- unsigned int addr =3D pfn * PAGE_SIZE + PAGE_OFFSET; ++ unsigned long address =3D pfn * PAGE_SIZE + PAGE_OFFSET; +=20 + /* + * Map with big pages if possible, otherwise + * create normal page tables: + */ + if (use_pse) { +- unsigned int addr2; + pgprot_t prot =3D PAGE_KERNEL_LARGE; + /* + * first pass will use the same initial +@@ -308,11 +313,7 @@ repeat: + __pgprot(PTE_IDENT_ATTR | + _PAGE_PSE); +=20 +- addr2 =3D (pfn + PTRS_PER_PTE-1) * PAGE_SIZE + +- PAGE_OFFSET + PAGE_SIZE-1; +- +- if (is_kernel_text(addr) || +- is_kernel_text(addr2)) ++ if (is_kernel_text(address, address + PMD_SIZE)) + prot =3D PAGE_KERNEL_LARGE_EXEC; +=20 + pages_2m++; +@@ -329,7 +330,7 @@ repeat: + pte_ofs =3D pte_index((pfn<> 10, +=20 +- (unsigned long)&_etext, (unsigned long)&_edata, +- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10, ++ (unsigned long)&_sdata, (unsigned long)&_edata, ++ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10, +=20 +- (unsigned long)&_text, (unsigned long)&_etext, ++ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext), + ((unsigned long)&_etext - (unsigned long)&_text) >> 10); +=20 + /* +@@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void) + if (!kernel_set_to_readonly) + return; +=20 ++ start =3D ktla_ktva(start); + pr_debug("Set kernel text: %lx - %lx for read write\n", + start, start+size); +=20 +@@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void) + if (!kernel_set_to_readonly) + return; +=20 ++ start =3D ktla_ktva(start); + pr_debug("Set kernel text: %lx - %lx for read only\n", + start, start+size); +=20 +@@ -1032,6 +1039,7 @@ void mark_rodata_ro(void) + unsigned long start =3D PFN_ALIGN(_text); + unsigned long size =3D PFN_ALIGN(_etext) - start; +=20 ++ start =3D ktla_ktva(start); + set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); + printk(KERN_INFO "Write protecting the kernel text: %luk\n", + size >> 10); +diff -urNp linux-2.6.32.45/arch/x86/mm/init_64.c linux-2.6.32.45/arch/x8= 6/mm/init_64.c +--- linux-2.6.32.45/arch/x86/mm/init_64.c 2011-04-17 17:00:52.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/init_64.c 2011-04-17 17:03:05.000000000 = -0400 +@@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,=20 + pmd =3D fill_pmd(pud, vaddr); + pte =3D fill_pte(pmd, vaddr); +=20 ++ pax_open_kernel(); + set_pte(pte, new_pte); ++ pax_close_kernel(); +=20 + /* + * It's enough to flush this one mapping. +@@ -223,14 +225,12 @@ static void __init __init_extra_mapping( + pgd =3D pgd_offset_k((unsigned long)__va(phys)); + if (pgd_none(*pgd)) { + pud =3D (pud_t *) spp_getpage(); +- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE | +- _PAGE_USER)); ++ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE)); + } + pud =3D pud_offset(pgd, (unsigned long)__va(phys)); + if (pud_none(*pud)) { + pmd =3D (pmd_t *) spp_getpage(); +- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE | +- _PAGE_USER)); ++ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE)); + } + pmd =3D pmd_offset(pud, phys); + BUG_ON(!pmd_none(*pmd)); +@@ -675,6 +675,12 @@ void __init mem_init(void) +=20 + pci_iommu_alloc(); +=20 ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY, ++ swapper_pg_dir + KERNEL_PGD_BOUNDARY, ++ KERNEL_PGD_PTRS); ++#endif ++ + /* clear_bss() already clear the empty_zero_page */ +=20 + reservedpages =3D 0; +@@ -861,8 +867,8 @@ int kern_addr_valid(unsigned long addr) + static struct vm_area_struct gate_vma =3D { + .vm_start =3D VSYSCALL_START, + .vm_end =3D VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), +- .vm_page_prot =3D PAGE_READONLY_EXEC, +- .vm_flags =3D VM_READ | VM_EXEC ++ .vm_page_prot =3D PAGE_READONLY, ++ .vm_flags =3D VM_READ + }; +=20 + struct vm_area_struct *get_gate_vma(struct task_struct *tsk) +@@ -896,7 +902,7 @@ int in_gate_area_no_task(unsigned long a +=20 + const char *arch_vma_name(struct vm_area_struct *vma) + { +- if (vma->vm_mm && vma->vm_start =3D=3D (long)vma->vm_mm->context.vdso) ++ if (vma->vm_mm && vma->vm_start =3D=3D vma->vm_mm->context.vdso) + return "[vdso]"; + if (vma =3D=3D &gate_vma) + return "[vsyscall]"; +diff -urNp linux-2.6.32.45/arch/x86/mm/init.c linux-2.6.32.45/arch/x86/m= m/init.c +--- linux-2.6.32.45/arch/x86/mm/init.c 2011-04-17 17:00:52.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/mm/init.c 2011-06-07 19:06:09.000000000 -04= 00 +@@ -69,11 +69,7 @@ static void __init find_early_table_spac + * cause a hotspot and fill up ZONE_DMA. The page tables + * need roughly 0.5KB per GB. + */ +-#ifdef CONFIG_X86_32 +- start =3D 0x7000; +-#else +- start =3D 0x8000; +-#endif ++ start =3D 0x100000; + e820_table_start =3D find_e820_area(start, max_pfn_mapped<> PAGE_SHIFT) =3D=3D pagenr) ++ return 1; ++ /* allow ISA/video mem */ ++ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <=3D pagenr && pagenr < (ISA_END= _ADDRESS >> PAGE_SHIFT)) ++ return 1; ++ /* throw out everything else below 1MB */ ++ if (pagenr <=3D 256) ++ return 0; ++#else + if (pagenr <=3D 256) + return 1; ++#endif ++ + if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) + return 0; + if (!page_is_ram(pagenr)) +@@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigne +=20 + void free_initmem(void) + { ++ ++#ifdef CONFIG_PAX_KERNEXEC ++#ifdef CONFIG_X86_32 ++ /* PaX: limit KERNEL_CS to actual size */ ++ unsigned long addr, limit; ++ struct desc_struct d; ++ int cpu; ++ ++ limit =3D paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)= &_etext; ++ limit =3D (limit - 1UL) >> PAGE_SHIFT; ++ ++ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_S= IZE); ++ for (cpu =3D 0; cpu < NR_CPUS; cpu++) { ++ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_K= ERNEL_CS]), limit, 0x9B, 0xC); ++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESC= TYPE_S); ++ } ++ ++ /* PaX: make KERNEL_CS read-only */ ++ addr =3D PFN_ALIGN(ktla_ktva((unsigned long)&_text)); ++ if (!paravirt_enabled()) ++ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT); ++/* ++ for (addr =3D ktla_ktva((unsigned long)&_text); addr < (unsigned long= )&_sdata; addr +=3D PMD_SIZE) { ++ pgd =3D pgd_offset_k(addr); ++ pud =3D pud_offset(pgd, addr); ++ pmd =3D 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_AL= IGN(__init_begin)) >> PAGE_SHIFT); ++/* ++ for (addr =3D (unsigned long)&__init_begin; addr < (unsigned long)&__i= nit_end; addr +=3D PMD_SIZE) { ++ pgd =3D pgd_offset_k(addr); ++ pud =3D pud_offset(pgd, addr); ++ pmd =3D 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 - M= ODULES_EXEC_VADDR) >> PAGE_SHIFT); ++#endif ++ ++#else ++ pgd_t *pgd; ++ pud_t *pud; ++ pmd_t *pmd; ++ unsigned long addr, end; ++ ++ /* PaX: make kernel code/rodata read-only, rest non-executable */ ++ for (addr =3D __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_I= MAGE_SIZE; addr +=3D PMD_SIZE) { ++ pgd =3D pgd_offset_k(addr); ++ pud =3D pud_offset(pgd, addr); ++ pmd =3D pmd_offset(pud, addr); ++ if (!pmd_present(*pmd)) ++ continue; ++ if ((unsigned long)_text <=3D 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 =3D (unsigned long)__va(__pa(__START_KERNEL_map)); ++ end =3D addr + KERNEL_IMAGE_SIZE; ++ for (; addr < end; addr +=3D PMD_SIZE) { ++ pgd =3D pgd_offset_k(addr); ++ pud =3D pud_offset(pgd, addr); ++ pmd =3D pmd_offset(pud, addr); ++ if (!pmd_present(*pmd)) ++ continue; ++ if ((unsigned long)__va(__pa(_text)) <=3D addr && addr < (unsigned lo= ng)__va(__pa(_sdata))) ++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); ++ } ++#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.45/arch/x86/mm/iomap_32.c linux-2.6.32.45/arch/x= 86/mm/iomap_32.c +--- linux-2.6.32.45/arch/x86/mm/iomap_32.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/mm/iomap_32.c 2011-04-17 15:56:46.000000000= -0400 +@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long + debug_kmap_atomic(type); + idx =3D type + KM_TYPE_NR * smp_processor_id(); + vaddr =3D __fix_to_virt(FIX_KMAP_BEGIN + idx); ++ ++ pax_open_kernel(); + set_pte(kmap_pte - idx, pfn_pte(pfn, prot)); ++ pax_close_kernel(); ++ + arch_flush_lazy_mmu_mode(); +=20 + return (void *)vaddr; +diff -urNp linux-2.6.32.45/arch/x86/mm/ioremap.c linux-2.6.32.45/arch/x8= 6/mm/ioremap.c +--- linux-2.6.32.45/arch/x86/mm/ioremap.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/ioremap.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) + * Second special case: Some BIOSen report the PC BIOS + * area (640->1Mb) as ram even though it is not. + */ +- if (pagenr >=3D (BIOS_BEGIN >> PAGE_SHIFT) && +- pagenr < (BIOS_END >> PAGE_SHIFT)) ++ if (pagenr >=3D (ISA_START_ADDRESS >> PAGE_SHIFT) && ++ pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) + return 0; +=20 + for (i =3D 0; i < e820.nr_map; i++) { +@@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(re + /* + * Don't allow anybody to remap normal RAM that we're using.. + */ +- for (pfn =3D phys_addr >> PAGE_SHIFT; +- (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); +- pfn++) { +- ++ for (pfn =3D phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SH= IFT) < (last_addr & PAGE_MASK); pfn++) { + int is_ram =3D page_is_ram(pfn); +=20 +- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) ++ if (is_ram && pfn_valid(pfn) && (pfn >=3D 0x100 || !PageReserved(pfn_= to_page(pfn)))) + return NULL; + WARN_ON_ONCE(is_ram); + } +@@ -407,7 +404,7 @@ static int __init early_ioremap_debug_se + early_param("early_ioremap_debug", early_ioremap_debug_setup); +=20 + static __initdata int after_paging_init; +-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss; ++static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE= _SIZE); +=20 + static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) + { +@@ -439,8 +436,7 @@ void __init early_ioremap_init(void) + slot_virt[i] =3D __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i); +=20 + pmd =3D early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); +- memset(bm_pte, 0, sizeof(bm_pte)); +- pmd_populate_kernel(&init_mm, pmd, bm_pte); ++ pmd_populate_user(&init_mm, pmd, bm_pte); +=20 + /* + * The boot-ioremap range spans multiple pmds, for which +diff -urNp linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.3= 2.45/arch/x86/mm/kmemcheck/kmemcheck.c +--- linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/arch/x86/mm/kmemcheck/kmemcheck.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg + * memory (e.g. tracked pages)? For now, we need this to avoid + * invoking kmemcheck for PnP BIOS calls. + */ +- if (regs->flags & X86_VM_MASK) ++ if (v8086_mode(regs)) + return false; +- if (regs->cs !=3D __KERNEL_CS) ++ if (regs->cs !=3D __KERNEL_CS && regs->cs !=3D __KERNEXEC_KERNEL_CS) + return false; +=20 + pte =3D kmemcheck_pte_lookup(address); +diff -urNp linux-2.6.32.45/arch/x86/mm/mmap.c linux-2.6.32.45/arch/x86/m= m/mmap.c +--- linux-2.6.32.45/arch/x86/mm/mmap.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/mm/mmap.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size + * Leave an at least ~128 MB hole with possible stack randomization. + */ + #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size()) +-#define MAX_GAP (TASK_SIZE/6*5) ++#define MAX_GAP (pax_task_size/6*5) +=20 + /* + * True on X86_32 or when emulating IA32 on X86_64 +@@ -94,27 +94,40 @@ static unsigned long mmap_rnd(void) + return rnd << PAGE_SHIFT; + } +=20 +-static unsigned long mmap_base(void) ++static unsigned long mmap_base(struct mm_struct *mm) + { + unsigned long gap =3D current->signal->rlim[RLIMIT_STACK].rlim_cur; ++ unsigned long pax_task_size =3D TASK_SIZE; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ pax_task_size =3D SEGMEXEC_TASK_SIZE; ++#endif +=20 + if (gap < MIN_GAP) + gap =3D MIN_GAP; + else if (gap > MAX_GAP) + gap =3D MAX_GAP; +=20 +- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd()); ++ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd()); + } +=20 + /* + * Bottom-up (legacy) layout on X86_32 did not support randomization, X= 86_64 + * does, but not when emulating X86_32 + */ +-static unsigned long mmap_legacy_base(void) ++static unsigned long mmap_legacy_base(struct mm_struct *mm) + { +- if (mmap_is_ia32()) ++ if (mmap_is_ia32()) { ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (mm->pax_flags & MF_PAX_SEGMEXEC) ++ return SEGMEXEC_TASK_UNMAPPED_BASE; ++ else ++#endif ++ + return TASK_UNMAPPED_BASE; +- else ++ } else + return TASK_UNMAPPED_BASE + mmap_rnd(); + } +=20 +@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(vo + void arch_pick_mmap_layout(struct mm_struct *mm) + { + if (mmap_is_legacy()) { +- mm->mmap_base =3D mmap_legacy_base(); ++ mm->mmap_base =3D mmap_legacy_base(mm); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base +=3D mm->delta_mmap; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area; + mm->unmap_area =3D arch_unmap_area; + } else { +- mm->mmap_base =3D mmap_base(); ++ mm->mmap_base =3D mmap_base(mm); ++ ++#ifdef CONFIG_PAX_RANDMMAP ++ if (mm->pax_flags & MF_PAX_RANDMMAP) ++ mm->mmap_base -=3D mm->delta_mmap + mm->delta_stack; ++#endif ++ + mm->get_unmapped_area =3D arch_get_unmapped_area_topdown; + mm->unmap_area =3D arch_unmap_area_topdown; + } +diff -urNp linux-2.6.32.45/arch/x86/mm/mmio-mod.c linux-2.6.32.45/arch/x= 86/mm/mmio-mod.c +--- linux-2.6.32.45/arch/x86/mm/mmio-mod.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/mm/mmio-mod.c 2011-07-06 19:53:33.000000000= -0400 +@@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, s + break; + default: + { +- unsigned char *ip =3D (unsigned char *)instptr; ++ unsigned char *ip =3D (unsigned char *)ktla_ktva(instptr); + my_trace->opcode =3D MMIO_UNKNOWN_OP; + my_trace->width =3D 0; + my_trace->value =3D (*ip) << 16 | *(ip + 1) << 8 | +@@ -233,7 +233,7 @@ static void post(struct kmmio_probe *p,=20 + static void ioremap_trace_core(resource_size_t offset, unsigned long si= ze, + void __iomem *addr) + { +- static atomic_t next_id; ++ static atomic_unchecked_t next_id; + struct remap_trace *trace =3D kmalloc(sizeof(*trace), GFP_KERNEL); + /* These are page-unaligned. */ + struct mmiotrace_map map =3D { +@@ -257,7 +257,7 @@ static void ioremap_trace_core(resource_ + .private =3D trace + }, + .phys =3D offset, +- .id =3D atomic_inc_return(&next_id) ++ .id =3D atomic_inc_return_unchecked(&next_id) + }; + map.map_id =3D trace->id; +=20 +diff -urNp linux-2.6.32.45/arch/x86/mm/numa_32.c linux-2.6.32.45/arch/x8= 6/mm/numa_32.c +--- linux-2.6.32.45/arch/x86/mm/numa_32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/numa_32.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int + } + #endif +=20 +-extern unsigned long find_max_low_pfn(void); + extern unsigned long highend_pfn, highstart_pfn; +=20 + #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) +diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr.c linux-2.6.32.45/arch/x= 86/mm/pageattr.c +--- linux-2.6.32.45/arch/x86/mm/pageattr.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/mm/pageattr.c 2011-04-17 15:56:46.000000000= -0400 +@@ -261,16 +261,17 @@ static inline pgprot_t static_protection + * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support. + */ + if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT)) +- pgprot_val(forbidden) |=3D _PAGE_NX; ++ pgprot_val(forbidden) |=3D _PAGE_NX & __supported_pte_mask; +=20 + /* + * The kernel text needs to be executable for obvious reasons + * Does not cover __inittext since that is gone later on. On + * 64bit we do not enforce !NX on the low mapping + */ +- if (within(address, (unsigned long)_text, (unsigned long)_etext)) +- pgprot_val(forbidden) |=3D _PAGE_NX; ++ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsign= ed long)_etext))) ++ pgprot_val(forbidden) |=3D _PAGE_NX & __supported_pte_mask; +=20 ++#ifdef CONFIG_DEBUG_RODATA + /* + * The .rodata section needs to be read-only. Using the pfn + * catches all aliases. +@@ -278,6 +279,14 @@ 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) |=3D _PAGE_RW; ++#endif ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sda= ta))) { ++ pgprot_val(forbidden) |=3D _PAGE_RW; ++ pgprot_val(forbidden) |=3D _PAGE_NX & __supported_pte_mask; ++ } ++#endif +=20 + prot =3D __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden)); +=20 +@@ -331,23 +340,37 @@ EXPORT_SYMBOL_GPL(lookup_address); + static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte= ) + { + /* change init_mm */ ++ pax_open_kernel(); + set_pte_atomic(kpte, pte); ++ + #ifdef CONFIG_X86_32 + if (!SHARED_KERNEL_PMD) { ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ unsigned long cpu; ++#else + struct page *page; ++#endif +=20 ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ for (cpu =3D 0; cpu < NR_CPUS; ++cpu) { ++ pgd_t *pgd =3D get_cpu_pgd(cpu); ++#else + list_for_each_entry(page, &pgd_list, lru) { +- pgd_t *pgd; ++ pgd_t *pgd =3D (pgd_t *)page_address(page); ++#endif ++ + pud_t *pud; + pmd_t *pmd; +=20 +- pgd =3D (pgd_t *)page_address(page) + pgd_index(address); ++ pgd +=3D pgd_index(address); + pud =3D pud_offset(pgd, address); + pmd =3D pmd_offset(pud, address); + set_pte_atomic((pte_t *)pmd, pte); + } + } + #endif ++ pax_close_kernel(); + } +=20 + static int +diff -urNp linux-2.6.32.45/arch/x86/mm/pageattr-test.c linux-2.6.32.45/a= rch/x86/mm/pageattr-test.c +--- linux-2.6.32.45/arch/x86/mm/pageattr-test.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/arch/x86/mm/pageattr-test.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -36,7 +36,7 @@ enum { +=20 + static int pte_testbit(pte_t pte) + { +- return pte_flags(pte) & _PAGE_UNUSED1; ++ return pte_flags(pte) & _PAGE_CPA_TEST; + } +=20 + struct split_state { +diff -urNp linux-2.6.32.45/arch/x86/mm/pat.c linux-2.6.32.45/arch/x86/mm= /pat.c +--- linux-2.6.32.45/arch/x86/mm/pat.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/x86/mm/pat.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct +=20 + conflict: + printk(KERN_INFO "%s:%d conflicting memory types " +- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start, ++ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), new->= start, + new->end, cattr_name(new->type), cattr_name(entry->type)); + return -EBUSY; + } +@@ -559,7 +559,7 @@ unlock_ret: +=20 + if (err) { + printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n", +- current->comm, current->pid, start, end); ++ current->comm, task_pid_nr(current), start, end); + } +=20 + dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); +@@ -689,8 +689,8 @@ static inline int range_is_allowed(unsig + while (cursor < to) { + if (!devmem_is_allowed(pfn)) { + printk(KERN_INFO +- "Program %s tried to access /dev/mem between %Lx->%Lx.\n", +- current->comm, from, to); ++ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n", ++ current->comm, from, to, cursor); + return 0; + } + cursor +=3D PAGE_SIZE; +@@ -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", +- current->comm, current->pid, ++ current->comm, task_pid_nr(current), + cattr_name(flags), + base, (unsigned long long)(base + size)); + return -EINVAL; +@@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr,=20 + free_memtype(paddr, paddr + size); + printk(KERN_ERR "%s:%d map pfn expected mapping type %s" + " for %Lx-%Lx, got %s\n", +- current->comm, current->pid, ++ current->comm, task_pid_nr(current), + cattr_name(want_flags), + (unsigned long long)paddr, + (unsigned long long)(paddr + size), +diff -urNp linux-2.6.32.45/arch/x86/mm/pf_in.c linux-2.6.32.45/arch/x86/= mm/pf_in.c +--- linux-2.6.32.45/arch/x86/mm/pf_in.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/x86/mm/pf_in.c 2011-07-06 19:53:33.000000000 -0= 400 +@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l + int i; + enum reason_type rv =3D OTHERS; +=20 +- p =3D (unsigned char *)ins_addr; ++ p =3D (unsigned char *)ktla_ktva(ins_addr); + p +=3D skip_prefix(p, &prf); + p +=3D get_opcode(p, &opcode); +=20 +@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(un + struct prefix_bits prf; + int i; +=20 +- p =3D (unsigned char *)ins_addr; ++ p =3D (unsigned char *)ktla_ktva(ins_addr); + p +=3D skip_prefix(p, &prf); + p +=3D get_opcode(p, &opcode); +=20 +@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned=20 + struct prefix_bits prf; + int i; +=20 +- p =3D (unsigned char *)ins_addr; ++ p =3D (unsigned char *)ktla_ktva(ins_addr); + p +=3D skip_prefix(p, &prf); + p +=3D get_opcode(p, &opcode); +=20 +@@ -417,7 +417,7 @@ unsigned long get_ins_reg_val(unsigned l + int i; + unsigned long rv; +=20 +- p =3D (unsigned char *)ins_addr; ++ p =3D (unsigned char *)ktla_ktva(ins_addr); + p +=3D skip_prefix(p, &prf); + p +=3D get_opcode(p, &opcode); + for (i =3D 0; i < ARRAY_SIZE(reg_rop); i++) +@@ -472,7 +472,7 @@ unsigned long get_ins_imm_val(unsigned l + int i; + unsigned long rv; +=20 +- p =3D (unsigned char *)ins_addr; ++ p =3D (unsigned char *)ktla_ktva(ins_addr); + p +=3D skip_prefix(p, &prf); + p +=3D get_opcode(p, &opcode); + for (i =3D 0; i < ARRAY_SIZE(imm_wop); i++) +diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable_32.c linux-2.6.32.45/arch= /x86/mm/pgtable_32.c +--- linux-2.6.32.45/arch/x86/mm/pgtable_32.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/mm/pgtable_32.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,=20 + return; + } + pte =3D pte_offset_kernel(pmd, vaddr); ++ ++ pax_open_kernel(); + if (pte_val(pteval)) + set_pte_at(&init_mm, vaddr, pte, pteval); + else + pte_clear(&init_mm, vaddr, pte); ++ pax_close_kernel(); +=20 + /* + * It's enough to flush this one mapping. +diff -urNp linux-2.6.32.45/arch/x86/mm/pgtable.c linux-2.6.32.45/arch/x8= 6/mm/pgtable.c +--- linux-2.6.32.45/arch/x86/mm/pgtable.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/mm/pgtable.c 2011-05-11 18:25:15.000000000 = -0400 +@@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *p + list_del(&page->lru); + } +=20 +-#define UNSHARED_PTRS_PER_PGD \ +- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD) ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++pgdval_t clone_pgd_mask __read_only =3D ~_PAGE_PRESENT; +=20 ++void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) ++{ ++ while (count--) ++ *dst++ =3D __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)= ) & ~_PAGE_USER); ++} ++#endif ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count) ++{ ++ while (count--) ++ ++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) ++ *dst++ =3D __pgd(pgd_val(*src++) & clone_pgd_mask); ++#else ++ *dst++ =3D *src++; ++#endif ++ ++} ++#endif ++ ++#ifdef CONFIG_X86_64 ++#define pxd_t pud_t ++#define pyd_t pgd_t ++#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn) ++#define pxd_free(mm, pud) pud_free((mm), (pud)) ++#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud)) ++#define pyd_offset(mm ,address) pgd_offset((mm), (address)) ++#define PYD_SIZE PGDIR_SIZE ++#else ++#define pxd_t pmd_t ++#define pyd_t pud_t ++#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn) ++#define pxd_free(mm, pud) pmd_free((mm), (pud)) ++#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud)) ++#define pyd_offset(mm ,address) pud_offset((mm), (address)) ++#define PYD_SIZE PUD_SIZE ++#endif ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++static inline void pgd_ctor(pgd_t *pgd) {} ++static inline void pgd_dtor(pgd_t *pgd) {} ++#else + static void pgd_ctor(pgd_t *pgd) + { + /* If the pgd points to a shared pagetable level (either the +@@ -119,6 +162,7 @@ static void pgd_dtor(pgd_t *pgd) + pgd_list_del(pgd); + spin_unlock_irqrestore(&pgd_lock, flags); + } ++#endif +=20 + /* + * List of all pgd's needed for non-PAE so it can invalidate entries +@@ -131,7 +175,7 @@ static void pgd_dtor(pgd_t *pgd) + * -- wli + */ +=20 +-#ifdef CONFIG_X86_PAE ++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) + /* + * In PAE mode, we need to do a cr3 reload (=3Dtlb flush) when + * updating the top-level pagetable entries to guarantee the +@@ -143,7 +187,7 @@ static void pgd_dtor(pgd_t *pgd) + * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate + * and initialize the kernel pmds here. + */ +-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD ++#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PT= RS_PER_PGD) +=20 + void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd) + { +@@ -161,36 +205,38 @@ void pud_populate(struct mm_struct *mm,=20 + */ + flush_tlb_mm(mm); + } ++#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD) ++#define PREALLOCATED_PXDS USER_PGD_PTRS + #else /* !CONFIG_X86_PAE */ +=20 + /* No need to prepopulate any pagetable entries in non-PAE modes. */ +-#define PREALLOCATED_PMDS 0 ++#define PREALLOCATED_PXDS 0 +=20 + #endif /* CONFIG_X86_PAE */ +=20 +-static void free_pmds(pmd_t *pmds[]) ++static void free_pxds(pxd_t *pxds[]) + { + int i; +=20 +- for(i =3D 0; i < PREALLOCATED_PMDS; i++) +- if (pmds[i]) +- free_page((unsigned long)pmds[i]); ++ for(i =3D 0; i < PREALLOCATED_PXDS; i++) ++ if (pxds[i]) ++ free_page((unsigned long)pxds[i]); + } +=20 +-static int preallocate_pmds(pmd_t *pmds[]) ++static int preallocate_pxds(pxd_t *pxds[]) + { + int i; + bool failed =3D false; +=20 +- for(i =3D 0; i < PREALLOCATED_PMDS; i++) { +- pmd_t *pmd =3D (pmd_t *)__get_free_page(PGALLOC_GFP); +- if (pmd =3D=3D NULL) ++ for(i =3D 0; i < PREALLOCATED_PXDS; i++) { ++ pxd_t *pxd =3D (pxd_t *)__get_free_page(PGALLOC_GFP); ++ if (pxd =3D=3D NULL) + failed =3D true; +- pmds[i] =3D pmd; ++ pxds[i] =3D pxd; + } +=20 + if (failed) { +- free_pmds(pmds); ++ free_pxds(pxds); + return -ENOMEM; + } +=20 +@@ -203,51 +249,56 @@ static int preallocate_pmds(pmd_t *pmds[ + * preallocate which never got a corresponding vma will need to be + * freed manually. + */ +-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp) ++static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp) + { + int i; +=20 +- for(i =3D 0; i < PREALLOCATED_PMDS; i++) { ++ for(i =3D 0; i < PREALLOCATED_PXDS; i++) { + pgd_t pgd =3D pgdp[i]; +=20 + if (pgd_val(pgd) !=3D 0) { +- pmd_t *pmd =3D (pmd_t *)pgd_page_vaddr(pgd); ++ pxd_t *pxd =3D (pxd_t *)pgd_page_vaddr(pgd); +=20 +- pgdp[i] =3D native_make_pgd(0); ++ set_pgd(pgdp + i, native_make_pgd(0)); +=20 +- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT); +- pmd_free(mm, pmd); ++ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT); ++ pxd_free(mm, pxd); + } + } + } +=20 +-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t= *pmds[]) ++static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t= *pxds[]) + { +- pud_t *pud; ++ pyd_t *pyd; + unsigned long addr; + int i; +=20 +- if (PREALLOCATED_PMDS =3D=3D 0) /* Work around gcc-3.4.x bug */ ++ if (PREALLOCATED_PXDS =3D=3D 0) /* Work around gcc-3.4.x bug */ + return; +=20 +- pud =3D pud_offset(pgd, 0); ++#ifdef CONFIG_X86_64 ++ pyd =3D pyd_offset(mm, 0L); ++#else ++ pyd =3D pyd_offset(pgd, 0L); ++#endif +=20 +- for (addr =3D i =3D 0; i < PREALLOCATED_PMDS; +- i++, pud++, addr +=3D PUD_SIZE) { +- pmd_t *pmd =3D pmds[i]; ++ for (addr =3D i =3D 0; i < PREALLOCATED_PXDS; ++ i++, pyd++, addr +=3D PYD_SIZE) { ++ pxd_t *pxd =3D pxds[i]; +=20 + if (i >=3D KERNEL_PGD_BOUNDARY) +- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]), +- sizeof(pmd_t) * PTRS_PER_PMD); ++ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]), ++ sizeof(pxd_t) * PTRS_PER_PMD); +=20 +- pud_populate(mm, pud, pmd); ++ pyd_populate(mm, pyd, pxd); + } + } +=20 + pgd_t *pgd_alloc(struct mm_struct *mm) + { + pgd_t *pgd; +- pmd_t *pmds[PREALLOCATED_PMDS]; ++ pxd_t *pxds[PREALLOCATED_PXDS]; ++ + unsigned long flags; +=20 + pgd =3D (pgd_t *)__get_free_page(PGALLOC_GFP); +@@ -257,11 +308,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm) +=20 + mm->pgd =3D pgd; +=20 +- if (preallocate_pmds(pmds) !=3D 0) ++ if (preallocate_pxds(pxds) !=3D 0) + goto out_free_pgd; +=20 + if (paravirt_pgd_alloc(mm) !=3D 0) +- goto out_free_pmds; ++ goto out_free_pxds; +=20 + /* + * Make sure that pre-populating the pmds is atomic with +@@ -271,14 +322,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm) + spin_lock_irqsave(&pgd_lock, flags); +=20 + pgd_ctor(pgd); +- pgd_prepopulate_pmd(mm, pgd, pmds); ++ pgd_prepopulate_pxd(mm, pgd, pxds); +=20 + spin_unlock_irqrestore(&pgd_lock, flags); +=20 + return pgd; +=20 +-out_free_pmds: +- free_pmds(pmds); ++out_free_pxds: ++ free_pxds(pxds); + out_free_pgd: + free_page((unsigned long)pgd); + out: +@@ -287,7 +338,7 @@ out: +=20 + void pgd_free(struct mm_struct *mm, pgd_t *pgd) + { +- pgd_mop_up_pmds(mm, pgd); ++ pgd_mop_up_pxds(mm, pgd); + pgd_dtor(pgd); + paravirt_pgd_free(mm, pgd); + free_page((unsigned long)pgd); +diff -urNp linux-2.6.32.45/arch/x86/mm/setup_nx.c linux-2.6.32.45/arch/x= 86/mm/setup_nx.c +--- linux-2.6.32.45/arch/x86/mm/setup_nx.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/mm/setup_nx.c 2011-04-17 15:56:46.000000000= -0400 +@@ -4,11 +4,10 @@ +=20 + #include +=20 ++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE) + int nx_enabled; +=20 +-#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) +-static int disable_nx __cpuinitdata; +- ++#ifndef CONFIG_PAX_PAGEEXEC + /* + * noexec =3D 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 |=3D _PAGE_NX; +- disable_nx =3D 0; ++ nx_enabled =3D 1; + } else if (!strncmp(str, "off", 3)) { +- disable_nx =3D 1; +- __supported_pte_mask &=3D ~_PAGE_NX; ++ nx_enabled =3D 0; + } + return 0; + } + early_param("noexec", noexec_setup); + #endif ++#endif +=20 + #ifdef CONFIG_X86_PAE + void __init set_nx(void) + { +- unsigned int v[4], l, h; ++ if (!nx_enabled && cpu_has_nx) { ++ unsigned l, h; +=20 +- 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 |=3D EFER_NX; +- wrmsr(MSR_EFER, l, h); +- nx_enabled =3D 1; +- __supported_pte_mask |=3D _PAGE_NX; +- } ++ __supported_pte_mask &=3D ~_PAGE_NX; ++ rdmsr(MSR_EFER, l, h); ++ l &=3D ~EFER_NX; ++ wrmsr(MSR_EFER, l, h); + } + } + #else +@@ -62,7 +55,7 @@ void __cpuinit check_efer(void) + unsigned long efer; +=20 + rdmsrl(MSR_EFER, efer); +- if (!(efer & EFER_NX) || disable_nx) ++ if (!(efer & EFER_NX) || !nx_enabled) + __supported_pte_mask &=3D ~_PAGE_NX; + } + #endif +diff -urNp linux-2.6.32.45/arch/x86/mm/tlb.c linux-2.6.32.45/arch/x86/mm= /tlb.c +--- linux-2.6.32.45/arch/x86/mm/tlb.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/arch/x86/mm/tlb.c 2011-04-23 12:56:10.000000000 -040= 0 +@@ -61,7 +61,11 @@ void leave_mm(int cpu) + BUG(); + cpumask_clear_cpu(cpu, + mm_cpumask(percpu_read(cpu_tlbstate.active_mm))); ++ ++#ifndef CONFIG_PAX_PER_CPU_PGD + load_cr3(swapper_pg_dir); ++#endif ++ + } + EXPORT_SYMBOL_GPL(leave_mm); +=20 +diff -urNp linux-2.6.32.45/arch/x86/oprofile/backtrace.c linux-2.6.32.45= /arch/x86/oprofile/backtrace.c +--- linux-2.6.32.45/arch/x86/oprofile/backtrace.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/arch/x86/oprofile/backtrace.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back + struct frame_head bufhead[2]; +=20 + /* Also check accessibility of one struct frame_head beyond */ +- if (!access_ok(VERIFY_READ, head, sizeof(bufhead))) ++ if (!__access_ok(VERIFY_READ, head, sizeof(bufhead))) + return NULL; + if (__copy_from_user_inatomic(bufhead, head, sizeof(bufhead))) + return NULL; +@@ -77,7 +77,7 @@ x86_backtrace(struct pt_regs * const reg + { + struct frame_head *head =3D (struct frame_head *)frame_pointer(regs); +=20 +- if (!user_mode_vm(regs)) { ++ if (!user_mode(regs)) { + unsigned long stack =3D kernel_stack_pointer(regs); + if (depth) + dump_trace(NULL, regs, (unsigned long *)stack, 0, +diff -urNp linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c linux-2.6.32.= 45/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/arch/x86/oprofile/op_model_p4.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo + #endif + } +=20 +-static int inline addr_increment(void) ++static inline int addr_increment(void) + { + #ifdef CONFIG_SMP + return smp_num_siblings =3D=3D 2 ? 2 : 1; +diff -urNp linux-2.6.32.45/arch/x86/pci/common.c linux-2.6.32.45/arch/x8= 6/pci/common.c +--- linux-2.6.32.45/arch/x86/pci/common.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/pci/common.c 2011-04-23 12:56:10.000000000 = -0400 +@@ -31,8 +31,8 @@ int noioapicreroute =3D 1; + int pcibios_last_bus =3D -1; + unsigned long pirq_table_addr; + struct pci_bus *pci_root_bus; +-struct pci_raw_ops *raw_pci_ops; +-struct pci_raw_ops *raw_pci_ext_ops; ++const struct pci_raw_ops *raw_pci_ops; ++const struct pci_raw_ops *raw_pci_ext_ops; +=20 + int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int de= vfn, + int reg, int len, u32 *val) +diff -urNp linux-2.6.32.45/arch/x86/pci/direct.c linux-2.6.32.45/arch/x8= 6/pci/direct.c +--- linux-2.6.32.45/arch/x86/pci/direct.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/pci/direct.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int=20 +=20 + #undef PCI_CONF1_ADDRESS +=20 +-struct pci_raw_ops pci_direct_conf1 =3D { ++const struct pci_raw_ops pci_direct_conf1 =3D { + .read =3D pci_conf1_read, + .write =3D pci_conf1_write, + }; +@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int=20 +=20 + #undef PCI_CONF2_ADDRESS +=20 +-struct pci_raw_ops pci_direct_conf2 =3D { ++const struct pci_raw_ops pci_direct_conf2 =3D { + .read =3D pci_conf2_read, + .write =3D pci_conf2_write, + }; +@@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 =3D { + * This should be close to trivial, but it isn't, because there are bug= gy + * chipsets (yes, you guessed it, by Intel and Compaq) that have no cla= ss ID. + */ +-static int __init pci_sanity_check(struct pci_raw_ops *o) ++static int __init pci_sanity_check(const struct pci_raw_ops *o) + { + u32 x =3D 0; + int year, devfn; +diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_32.c linux-2.6.32.45/ar= ch/x86/pci/mmconfig_32.c +--- linux-2.6.32.45/arch/x86/pci/mmconfig_32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/pci/mmconfig_32.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int=20 + return 0; + } +=20 +-static struct pci_raw_ops pci_mmcfg =3D { ++static const struct pci_raw_ops pci_mmcfg =3D { + .read =3D pci_mmcfg_read, + .write =3D pci_mmcfg_write, + }; +diff -urNp linux-2.6.32.45/arch/x86/pci/mmconfig_64.c linux-2.6.32.45/ar= ch/x86/pci/mmconfig_64.c +--- linux-2.6.32.45/arch/x86/pci/mmconfig_64.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/arch/x86/pci/mmconfig_64.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int=20 + return 0; + } +=20 +-static struct pci_raw_ops pci_mmcfg =3D { ++static const struct pci_raw_ops pci_mmcfg =3D { + .read =3D pci_mmcfg_read, + .write =3D pci_mmcfg_write, + }; +diff -urNp linux-2.6.32.45/arch/x86/pci/numaq_32.c linux-2.6.32.45/arch/= x86/pci/numaq_32.c +--- linux-2.6.32.45/arch/x86/pci/numaq_32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/pci/numaq_32.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i +=20 + #undef PCI_CONF1_MQ_ADDRESS +=20 +-static struct pci_raw_ops pci_direct_conf1_mq =3D { ++static const struct pci_raw_ops pci_direct_conf1_mq =3D { + .read =3D pci_conf1_mq_read, + .write =3D pci_conf1_mq_write + }; +diff -urNp linux-2.6.32.45/arch/x86/pci/olpc.c linux-2.6.32.45/arch/x86/= pci/olpc.c +--- linux-2.6.32.45/arch/x86/pci/olpc.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/x86/pci/olpc.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s + return 0; + } +=20 +-static struct pci_raw_ops pci_olpc_conf =3D { ++static const struct pci_raw_ops pci_olpc_conf =3D { + .read =3D pci_olpc_read, + .write =3D pci_olpc_write, + }; +diff -urNp linux-2.6.32.45/arch/x86/pci/pcbios.c linux-2.6.32.45/arch/x8= 6/pci/pcbios.c +--- linux-2.6.32.45/arch/x86/pci/pcbios.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/arch/x86/pci/pcbios.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -56,50 +56,93 @@ union bios32 { + static struct { + unsigned long address; + unsigned short segment; +-} bios32_indirect =3D { 0, __KERNEL_CS }; ++} bios32_indirect __read_only =3D { 0, __PCIBIOS_CS }; +=20 + /* + * Returns the entry point for the given service, NULL on error + */ +=20 +-static unsigned long bios32_service(unsigned long service) ++static unsigned long __devinit bios32_service(unsigned long service) + { + unsigned char return_code; /* %al */ + unsigned long address; /* %ebx */ + unsigned long length; /* %ecx */ + unsigned long entry; /* %edx */ + unsigned long flags; ++ struct desc_struct d, *gdt; +=20 + local_irq_save(flags); +- __asm__("lcall *(%%edi); cld" ++ ++ gdt =3D get_cpu_gdt_table(smp_processor_id()); ++ ++ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC); ++ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S); ++ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC); ++ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S); ++ ++ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld" + : "=3Da" (return_code), + "=3Db" (address), + "=3Dc" (length), + "=3Dd" (entry) + : "0" (service), + "1" (0), +- "D" (&bios32_indirect)); ++ "D" (&bios32_indirect), ++ "r"(__PCIBIOS_DS) ++ : "memory"); ++ ++ pax_open_kernel(); ++ gdt[GDT_ENTRY_PCIBIOS_CS].a =3D 0; ++ gdt[GDT_ENTRY_PCIBIOS_CS].b =3D 0; ++ gdt[GDT_ENTRY_PCIBIOS_DS].a =3D 0; ++ gdt[GDT_ENTRY_PCIBIOS_DS].b =3D 0; ++ pax_close_kernel(); ++ + local_irq_restore(flags); +=20 + switch (return_code) { +- case 0: +- return address + entry; +- case 0x80: /* Not present */ +- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service)= ; +- return 0; +- default: /* Shouldn't happen */ +- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bu= g!\n", +- service, return_code); ++ case 0: { ++ int cpu; ++ unsigned char flags; ++ ++ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx= \n", address, length, entry); ++ if (address >=3D 0xFFFF0 || length > 0x100000 - address || length <=3D= entry) { ++ printk(KERN_WARNING "bios32_service: not valid\n"); + return 0; ++ } ++ address =3D address + PAGE_OFFSET; ++ length +=3D 16UL; /* some BIOSs underreport this... */ ++ flags =3D 4; ++ if (length >=3D 64*1024*1024) { ++ length >>=3D PAGE_SHIFT; ++ flags |=3D 8; ++ } ++ ++ for (cpu =3D 0; cpu < NR_CPUS; cpu++) { ++ gdt =3D get_cpu_gdt_table(cpu); ++ pack_descriptor(&d, address, length, 0x9b, flags); ++ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S); ++ pack_descriptor(&d, address, length, 0x93, flags); ++ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S); ++ } ++ return entry; ++ } ++ case 0x80: /* Not present */ ++ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service); ++ return 0; ++ default: /* Shouldn't happen */ ++ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug= !\n", ++ service, return_code); ++ return 0; + } + } +=20 + static struct { + unsigned long address; + unsigned short segment; +-} pci_indirect =3D { 0, __KERNEL_CS }; ++} pci_indirect __read_only =3D { 0, __PCIBIOS_CS }; +=20 +-static int pci_bios_present; ++static int pci_bios_present __read_only; +=20 + static int __devinit check_pcibios(void) + { +@@ -108,11 +151,13 @@ static int __devinit check_pcibios(void) + unsigned long flags, pcibios_entry; +=20 + if ((pcibios_entry =3D bios32_service(PCI_SERVICE))) { +- pci_indirect.address =3D pcibios_entry + PAGE_OFFSET; ++ pci_indirect.address =3D pcibios_entry; +=20 + local_irq_save(flags); +- __asm__( +- "lcall *(%%edi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%edi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -121,7 +166,8 @@ static int __devinit check_pcibios(void) + "=3Db" (ebx), + "=3Dc" (ecx) + : "1" (PCIBIOS_PCI_BIOS_PRESENT), +- "D" (&pci_indirect) ++ "D" (&pci_indirect), ++ "r" (__PCIBIOS_DS) + : "memory"); + local_irq_restore(flags); +=20 +@@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int se +=20 + switch (len) { + case 1: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int se + : "1" (PCIBIOS_READ_CONFIG_BYTE), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + /* + * Zero-extend the result beyond 8 bits, do not trust the + * BIOS having done it: +@@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int se + *value &=3D 0xff; + break; + case 2: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int se + : "1" (PCIBIOS_READ_CONFIG_WORD), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + /* + * Zero-extend the result beyond 16 bits, do not trust the + * BIOS having done it: +@@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int se + *value &=3D 0xffff; + break; + case 4: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int se + : "1" (PCIBIOS_READ_CONFIG_DWORD), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + break; + } +=20 +@@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int s +=20 + switch (len) { + case 1: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int s + "c" (value), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + break; + case 2: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int s + "c" (value), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + break; + case 4: +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w6, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n\t" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int s + "c" (value), + "b" (bx), + "D" ((long)reg), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + break; + } +=20 +@@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int s + * Function table for BIOS32 access + */ +=20 +-static struct pci_raw_ops pci_bios_access =3D { ++static const struct pci_raw_ops pci_bios_access =3D { + .read =3D pci_bios_read, + .write =3D pci_bios_write + }; +@@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_acces + * Try to find PCI BIOS. + */ +=20 +-static struct pci_raw_ops * __devinit pci_find_bios(void) ++static const struct pci_raw_ops * __devinit pci_find_bios(void) + { + union bios32 *check; + unsigned char sum; +@@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_i +=20 + DBG("PCI: Fetching IRQ routing table... "); + __asm__("push %%es\n\t" ++ "movw %w8, %%ds\n\t" + "push %%ds\n\t" + "pop %%es\n\t" +- "lcall *(%%esi); cld\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" + "pop %%es\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_i + "1" (0), + "D" ((long) &opt), + "S" (&pci_indirect), +- "m" (opt) ++ "m" (opt), ++ "r" (__PCIBIOS_DS) + : "memory"); + DBG("OK ret=3D%d, size=3D%d, map=3D%x\n", ret, opt.size, map); + if (ret & 0xff00) +@@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_d + { + int ret; +=20 +- __asm__("lcall *(%%esi); cld\n\t" ++ __asm__("movw %w5, %%ds\n\t" ++ "lcall *%%ss:(%%esi); cld\n\t" ++ "push %%ss\n\t" ++ "pop %%ds\n" + "jc 1f\n\t" + "xor %%ah, %%ah\n" + "1:" +@@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_d + : "0" (PCIBIOS_SET_PCI_HW_INT), + "b" ((dev->bus->number << 8) | dev->devfn), + "c" ((irq << 8) | (pin + 10)), +- "S" (&pci_indirect)); ++ "S" (&pci_indirect), ++ "r" (__PCIBIOS_DS)); + return !(ret & 0xff00); + } + EXPORT_SYMBOL(pcibios_set_irq_routing); +diff -urNp linux-2.6.32.45/arch/x86/power/cpu.c linux-2.6.32.45/arch/x86= /power/cpu.c +--- linux-2.6.32.45/arch/x86/power/cpu.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/arch/x86/power/cpu.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -129,7 +129,7 @@ static void do_fpu_end(void) + static void fix_processor_context(void) + { + int cpu =3D smp_processor_id(); +- struct tss_struct *t =3D &per_cpu(init_tss, cpu); ++ struct tss_struct *t =3D init_tss + cpu; +=20 + set_tss_desc(cpu, t); /* + * This just modifies memory; should not be +@@ -139,7 +139,9 @@ static void fix_processor_context(void) + */ +=20 + #ifdef CONFIG_X86_64 ++ pax_open_kernel(); + get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type =3D 9; ++ pax_close_kernel(); +=20 + syscall_init(); /* This sets MSR_*STAR and related */ + #endif +diff -urNp linux-2.6.32.45/arch/x86/vdso/Makefile linux-2.6.32.45/arch/x= 86/vdso/Makefile +--- linux-2.6.32.45/arch/x86/vdso/Makefile 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/vdso/Makefile 2011-04-17 15:56:46.000000000= -0400 +@@ -122,7 +122,7 @@ quiet_cmd_vdso =3D VDSO $@ + $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ + -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) +=20 +-VDSO_LDFLAGS =3D -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-st= yle=3Dsysv) ++VDSO_LDFLAGS =3D -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -= Wl$(comma)--hash-style=3Dsysv) + GCOV_PROFILE :=3D n +=20 + # +diff -urNp linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c linux-2.6.32.4= 5/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/arch/x86/vdso/vclock_gettime.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -22,24 +22,48 @@ + #include + #include + #include ++#include + #include "vextern.h" +=20 + #define gtod vdso_vsyscall_gtod_data +=20 ++notrace noinline long __vdso_fallback_time(long *t) ++{ ++ long secs; ++ asm volatile("syscall" ++ : "=3Da" (secs) ++ : "0" (__NR_time),"D" (t) : "r11", "cx", "memory"); ++ return secs; ++} ++ + notrace static long vdso_fallback_gettime(long clock, struct timespec *= ts) + { + long ret; + asm("syscall" : "=3Da" (ret) : +- "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory"); ++ "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "mem= ory"); + return ret; + } +=20 ++notrace static inline cycle_t __vdso_vread_hpet(void) ++{ ++ return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0); ++} ++ ++notrace static inline cycle_t __vdso_vread_tsc(void) ++{ ++ cycle_t ret =3D (cycle_t)vget_cycles(); ++ ++ return ret >=3D gtod->clock.cycle_last ? ret : gtod->clock.cycle_last; ++} ++ + notrace static inline long vgetns(void) + { + long v; +- cycles_t (*vread)(void); +- vread =3D gtod->clock.vread; +- v =3D (vread() - gtod->clock.cycle_last) & gtod->clock.mask; ++ if (gtod->clock.name[0] =3D=3D 't' && gtod->clock.name[1] =3D=3D 's' &= & gtod->clock.name[2] =3D=3D 'c' && !gtod->clock.name[3]) ++ v =3D __vdso_vread_tsc(); ++ else ++ v =3D __vdso_vread_hpet(); ++ v =3D (v - gtod->clock.cycle_last) & gtod->clock.mask; + return (v * gtod->clock.mult) >> gtod->clock.shift; + } +=20 +@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic +=20 + notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) + { +- if (likely(gtod->sysctl_enabled)) ++ if (likely(gtod->sysctl_enabled && ++ ((gtod->clock.name[0] =3D=3D 'h' && gtod->clock.name[1] =3D=3D 'p'= && gtod->clock.name[2] =3D=3D 'e' && gtod->clock.name[3] =3D=3D 't' && != gtod->clock.name[4]) || ++ (gtod->clock.name[0] =3D=3D 't' && gtod->clock.name[1] =3D=3D 's'= && gtod->clock.name[2] =3D=3D 'c' && !gtod->clock.name[3])))) + switch (clock) { + case CLOCK_REALTIME: + 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"))); +=20 +-notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz= ) ++notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, s= truct timezone *tz) + { + long ret; +- if (likely(gtod->sysctl_enabled && gtod->clock.vread)) { ++ asm("syscall" : "=3Da" (ret) : ++ "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "r11", "cx", "memory= "); ++ return ret; ++} ++ ++notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz= ) ++{ ++ if (likely(gtod->sysctl_enabled && ++ ((gtod->clock.name[0] =3D=3D 'h' && gtod->clock.name[1] =3D=3D 'p'= && gtod->clock.name[2] =3D=3D 'e' && gtod->clock.name[3] =3D=3D 't' && != gtod->clock.name[4]) || ++ (gtod->clock.name[0] =3D=3D 't' && gtod->clock.name[1] =3D=3D 's'= && gtod->clock.name[2] =3D=3D 'c' && !gtod->clock.name[3])))) ++ { + if (likely(tv !=3D NULL)) { + BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=3D + offsetof(struct timespec, tv_nsec) || +@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct t + } + return 0; + } +- asm("syscall" : "=3Da" (ret) : +- "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory"); +- return ret; ++ return __vdso_fallback_gettimeofday(tv, tz); + } + int gettimeofday(struct timeval *, struct timezone *) + __attribute__((weak, alias("__vdso_gettimeofday"))); +diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c linux-2.6.32.45/= arch/x86/vdso/vdso32-setup.c +--- linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/arch/x86/vdso/vdso32-setup.c 2011-04-23 12:56:10.000= 000000 -0400 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include +=20 + enum { + VDSO_DISABLED =3D 0, +@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m + void enable_sep_cpu(void) + { + int cpu =3D get_cpu(); +- struct tss_struct *tss =3D &per_cpu(init_tss, cpu); ++ struct tss_struct *tss =3D init_tss + cpu; +=20 + if (!boot_cpu_has(X86_FEATURE_SEP)) { + put_cpu(); +@@ -249,7 +250,7 @@ static int __init gate_vma_init(void) + gate_vma.vm_start =3D FIXADDR_USER_START; + gate_vma.vm_end =3D FIXADDR_USER_END; + gate_vma.vm_flags =3D VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; +- gate_vma.vm_page_prot =3D __P101; ++ gate_vma.vm_page_prot =3D vm_get_page_prot(gate_vma.vm_flags); + /* + * Make sure the vDSO gets into every core dump. + * Dumping its contents makes post-mortem fully interpretable later +@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct l + if (compat) + addr =3D VDSO_HIGH_BASE; + else { +- addr =3D get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0); ++ addr =3D get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE); + if (IS_ERR_VALUE(addr)) { + ret =3D addr; + goto up_fail; + } + } +=20 +- current->mm->context.vdso =3D (void *)addr; ++ current->mm->context.vdso =3D addr; +=20 + if (compat_uses_vma || !compat) { + /* +@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l + } +=20 + current_thread_info()->sysenter_return =3D +- VDSO32_SYMBOL(addr, SYSENTER_RETURN); ++ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN); +=20 + up_fail: + if (ret) +- current->mm->context.vdso =3D NULL; ++ current->mm->context.vdso =3D 0; +=20 + up_write(&mm->mmap_sem); +=20 +@@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init); +=20 + const char *arch_vma_name(struct vm_area_struct *vma) + { +- if (vma->vm_mm && vma->vm_start =3D=3D (long)vma->vm_mm->context.vdso) ++ if (vma->vm_mm && vma->vm_start =3D=3D vma->vm_mm->context.vdso) + return "[vdso]"; ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start =3D=3D vm= a->vm_mm->context.vdso) ++ return "[vdso]"; ++#endif ++ + return NULL; + } +=20 +@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru + struct mm_struct *mm =3D tsk->mm; +=20 + /* Check to see if this task was created in compat vdso mode */ +- if (mm && mm->context.vdso =3D=3D (void *)VDSO_HIGH_BASE) ++ if (mm && mm->context.vdso =3D=3D VDSO_HIGH_BASE) + return &gate_vma; + return NULL; + } +diff -urNp linux-2.6.32.45/arch/x86/vdso/vdso.lds.S linux-2.6.32.45/arch= /x86/vdso/vdso.lds.S +--- linux-2.6.32.45/arch/x86/vdso/vdso.lds.S 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/vdso/vdso.lds.S 2011-06-06 17:35:35.0000000= 00 -0400 +@@ -35,3 +35,9 @@ VDSO64_PRELINK =3D VDSO_PRELINK; + #define VEXTERN(x) VDSO64_ ## x =3D vdso_ ## x; + #include "vextern.h" + #undef VEXTERN ++ ++#define VEXTERN(x) VDSO64_ ## x =3D __vdso_ ## x; ++VEXTERN(fallback_gettimeofday) ++VEXTERN(fallback_time) ++VEXTERN(getcpu) ++#undef VEXTERN +diff -urNp linux-2.6.32.45/arch/x86/vdso/vextern.h linux-2.6.32.45/arch/= x86/vdso/vextern.h +--- linux-2.6.32.45/arch/x86/vdso/vextern.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/vdso/vextern.h 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -11,6 +11,5 @@ + put into vextern.h and be referenced as a pointer with vdso prefix. + The main kernel later fills in the values. */ +=20 +-VEXTERN(jiffies) + VEXTERN(vgetcpu_mode) + VEXTERN(vsyscall_gtod_data) +diff -urNp linux-2.6.32.45/arch/x86/vdso/vma.c linux-2.6.32.45/arch/x86/= vdso/vma.c +--- linux-2.6.32.45/arch/x86/vdso/vma.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/arch/x86/vdso/vma.c 2011-08-23 20:24:19.000000000 -0= 400 +@@ -17,8 +17,6 @@ + #include "vextern.h" /* Just for VMAGIC. */ + #undef VEXTERN +=20 +-unsigned int __read_mostly vdso_enabled =3D 1; +- + extern char vdso_start[], vdso_end[]; + extern unsigned short vdso_sync_cpuid; +=20 +@@ -27,10 +25,8 @@ static unsigned vdso_size; +=20 + static inline void *var_ref(void *p, char *name) + { +- if (*(void **)p !=3D (void *)VMAGIC) { +- printk("VDSO: variable %s broken\n", name); +- vdso_enabled =3D 0; +- } ++ if (*(void **)p !=3D (void *)VMAGIC) ++ panic("VDSO: variable %s broken\n", name); + return p; + } +=20 +@@ -57,21 +53,18 @@ static int __init init_vdso_vars(void) + if (!vbase) + goto oom; +=20 +- if (memcmp(vbase, "\177ELF", 4)) { +- printk("VDSO: I'm broken; not ELF\n"); +- vdso_enabled =3D 0; +- } ++ if (memcmp(vbase, ELFMAG, SELFMAG)) ++ panic("VDSO: I'm broken; not ELF\n"); +=20 + #define VEXTERN(x) \ + *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) =3D &__ ## = x; + #include "vextern.h" + #undef VEXTERN ++ vunmap(vbase); + return 0; +=20 + oom: +- printk("Cannot allocate vdso\n"); +- vdso_enabled =3D 0; +- return -ENOMEM; ++ panic("Cannot allocate vdso\n"); + } + __initcall(init_vdso_vars); +=20 +@@ -105,9 +98,6 @@ int arch_setup_additional_pages(struct l + unsigned long addr; + int ret; +=20 +- if (!vdso_enabled) +- return 0; +- + down_write(&mm->mmap_sem); + addr =3D vdso_addr(mm->start_stack, vdso_size); + addr =3D get_unmapped_area(NULL, addr, vdso_size, 0, 0); +@@ -116,7 +106,7 @@ int arch_setup_additional_pages(struct l + goto up_fail; + } +=20 +- current->mm->context.vdso =3D (void *)addr; ++ current->mm->context.vdso =3D addr; +=20 + ret =3D install_special_mapping(mm, addr, vdso_size, + VM_READ|VM_EXEC| +@@ -124,7 +114,7 @@ int arch_setup_additional_pages(struct l + VM_ALWAYSDUMP, + vdso_pages); + if (ret) { +- current->mm->context.vdso =3D NULL; ++ current->mm->context.vdso =3D 0; + goto up_fail; + } +=20 +@@ -132,10 +122,3 @@ up_fail: + up_write(&mm->mmap_sem); + return ret; + } +- +-static __init int vdso_setup(char *s) +-{ +- vdso_enabled =3D simple_strtoul(s, NULL, 0); +- return 0; +-} +-__setup("vdso=3D", vdso_setup); +diff -urNp linux-2.6.32.45/arch/x86/xen/enlighten.c linux-2.6.32.45/arch= /x86/xen/enlighten.c +--- linux-2.6.32.45/arch/x86/xen/enlighten.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/arch/x86/xen/enlighten.c 2011-05-22 23:02:03.0000000= 00 -0400 +@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); +=20 + struct shared_info xen_dummy_shared_info; +=20 +-void *xen_initial_gdt; +- + /* + * Point at some empty memory to start with. We map the real shared_inf= o + * page as soon as fixmap is up and running. +@@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_des +=20 + preempt_disable(); +=20 +- start =3D __get_cpu_var(idt_desc).address; ++ start =3D (unsigned long)__get_cpu_var(idt_desc).address; + end =3D start + __get_cpu_var(idt_desc).size + 1; +=20 + xen_mc_flush(); +@@ -993,7 +991,7 @@ static const struct pv_apic_ops xen_apic + #endif + }; +=20 +-static void xen_reboot(int reason) ++static __noreturn void xen_reboot(int reason) + { + struct sched_shutdown r =3D { .reason =3D reason }; +=20 +@@ -1001,17 +999,17 @@ static void xen_reboot(int reason) + BUG(); + } +=20 +-static void xen_restart(char *msg) ++static __noreturn void xen_restart(char *msg) + { + xen_reboot(SHUTDOWN_reboot); + } +=20 +-static void xen_emergency_restart(void) ++static __noreturn void xen_emergency_restart(void) + { + xen_reboot(SHUTDOWN_reboot); + } +=20 +-static void xen_machine_halt(void) ++static __noreturn void xen_machine_halt(void) + { + xen_reboot(SHUTDOWN_poweroff); + } +@@ -1095,9 +1093,20 @@ asmlinkage void __init xen_start_kernel( + */ + __userpte_alloc_gfp &=3D ~__GFP_HIGHMEM; +=20 +-#ifdef CONFIG_X86_64 + /* Work out if we support NX */ +- check_efer(); ++#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) ++ if ((cpuid_eax(0x80000000) & 0xffff0000) =3D=3D 0x80000000 && ++ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) { ++ unsigned l, h; ++ ++#ifdef CONFIG_X86_PAE ++ nx_enabled =3D 1; ++#endif ++ __supported_pte_mask |=3D _PAGE_NX; ++ rdmsr(MSR_EFER, l, h); ++ l |=3D EFER_NX; ++ wrmsr(MSR_EFER, l, h); ++ } + #endif +=20 + xen_setup_features(); +@@ -1129,13 +1138,6 @@ asmlinkage void __init xen_start_kernel( +=20 + machine_ops =3D xen_machine_ops; +=20 +- /* +- * The only reliable way to retain the initial address of the +- * percpu gdt_page is to remember it here, so we can go and +- * mark it RW later, when the initial percpu area is freed. +- */ +- xen_initial_gdt =3D &per_cpu(gdt_page, 0); +- + xen_smp_init(); +=20 + pgd =3D (pgd_t *)xen_start_info->pt_base; +diff -urNp linux-2.6.32.45/arch/x86/xen/mmu.c linux-2.6.32.45/arch/x86/x= en/mmu.c +--- linux-2.6.32.45/arch/x86/xen/mmu.c 2011-07-13 17:23:04.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/xen/mmu.c 2011-07-13 17:23:18.000000000 -04= 00 +@@ -1719,6 +1719,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); ++ convert_pfn_mfn(level3_vmalloc_pgt); ++ convert_pfn_mfn(level3_vmemmap_pgt); +=20 + l3 =3D m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); + l2 =3D m2v(l3[pud_index(__START_KERNEL_map)].pud); +@@ -1737,7 +1739,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); ++ set_page_prot(level3_vmalloc_pgt, PAGE_KERNEL_RO); ++ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO); + set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); ++ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO); + set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); + set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); +=20 +diff -urNp linux-2.6.32.45/arch/x86/xen/smp.c linux-2.6.32.45/arch/x86/x= en/smp.c +--- linux-2.6.32.45/arch/x86/xen/smp.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/arch/x86/xen/smp.c 2011-05-11 18:25:15.000000000 -04= 00 +@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ + { + BUG_ON(smp_processor_id() !=3D 0); + native_smp_prepare_boot_cpu(); +- +- /* We've switched to the "real" per-cpu gdt, so make sure the +- old memory can be recycled */ +- make_lowmem_page_readwrite(xen_initial_gdt); +- + xen_setup_vcpu_info_placement(); + } +=20 +@@ -231,12 +226,12 @@ cpu_initialize_context(unsigned int cpu, + gdt =3D get_cpu_gdt_table(cpu); +=20 + ctxt->flags =3D VGCF_IN_KERNEL; +- ctxt->user_regs.ds =3D __USER_DS; +- ctxt->user_regs.es =3D __USER_DS; ++ ctxt->user_regs.ds =3D __KERNEL_DS; ++ ctxt->user_regs.es =3D __KERNEL_DS; + ctxt->user_regs.ss =3D __KERNEL_DS; + #ifdef CONFIG_X86_32 + ctxt->user_regs.fs =3D __KERNEL_PERCPU; +- ctxt->user_regs.gs =3D __KERNEL_STACK_CANARY; ++ savesegment(gs, ctxt->user_regs.gs); + #else + ctxt->gs_base_kernel =3D per_cpu_offset(cpu); + #endif +@@ -287,13 +282,12 @@ static int __cpuinit xen_cpu_up(unsigned + int rc; +=20 + per_cpu(current_task, cpu) =3D idle; ++ per_cpu(current_tinfo, cpu) =3D &idle->tinfo; + #ifdef CONFIG_X86_32 + irq_ctx_init(cpu); + #else + clear_tsk_thread_flag(idle, TIF_FORK); +- per_cpu(kernel_stack, cpu) =3D +- (unsigned long)task_stack_page(idle) - +- KERNEL_STACK_OFFSET + THREAD_SIZE; ++ per_cpu(kernel_stack, cpu) =3D (unsigned long)task_stack_page(idle) - = 16 + THREAD_SIZE; + #endif + xen_setup_runstate_info(cpu); + xen_setup_timer(cpu); +diff -urNp linux-2.6.32.45/arch/x86/xen/xen-asm_32.S linux-2.6.32.45/arc= h/x86/xen/xen-asm_32.S +--- linux-2.6.32.45/arch/x86/xen/xen-asm_32.S 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/arch/x86/xen/xen-asm_32.S 2011-04-22 19:13:13.000000= 000 -0400 +@@ -83,14 +83,14 @@ ENTRY(xen_iret) + ESP_OFFSET=3D4 # bytes pushed onto stack +=20 + /* +- * Store vcpu_info pointer for easy access. Do it this way to +- * avoid having to reload %fs ++ * Store vcpu_info pointer for easy access. + */ + #ifdef CONFIG_SMP +- GET_THREAD_INFO(%eax) +- movl TI_cpu(%eax), %eax +- movl __per_cpu_offset(,%eax,4), %eax +- mov per_cpu__xen_vcpu(%eax), %eax ++ push %fs ++ mov $(__KERNEL_PERCPU), %eax ++ mov %eax, %fs ++ mov PER_CPU_VAR(xen_vcpu), %eax ++ pop %fs + #else + movl per_cpu__xen_vcpu, %eax + #endif +diff -urNp linux-2.6.32.45/arch/x86/xen/xen-head.S linux-2.6.32.45/arch/= x86/xen/xen-head.S +--- linux-2.6.32.45/arch/x86/xen/xen-head.S 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/arch/x86/xen/xen-head.S 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -19,6 +19,17 @@ ENTRY(startup_xen) + #ifdef CONFIG_X86_32 + mov %esi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%esp ++#ifdef CONFIG_SMP ++ movl $cpu_gdt_table,%edi ++ movl $__per_cpu_load,%eax ++ movw %ax,__KERNEL_PERCPU + 2(%edi) ++ rorl $16,%eax ++ movb %al,__KERNEL_PERCPU + 4(%edi) ++ movb %ah,__KERNEL_PERCPU + 7(%edi) ++ movl $__per_cpu_end - 1,%eax ++ subl $__per_cpu_start,%eax ++ movw %ax,__KERNEL_PERCPU + 0(%edi) ++#endif + #else + mov %rsi,xen_start_info + mov $init_thread_union+THREAD_SIZE,%rsp +diff -urNp linux-2.6.32.45/arch/x86/xen/xen-ops.h linux-2.6.32.45/arch/x= 86/xen/xen-ops.h +--- linux-2.6.32.45/arch/x86/xen/xen-ops.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/arch/x86/xen/xen-ops.h 2011-04-17 15:56:46.000000000= -0400 +@@ -10,8 +10,6 @@ + extern const char xen_hypervisor_callback[]; + extern const char xen_failsafe_callback[]; +=20 +-extern void *xen_initial_gdt; +- + struct trap_info; + void xen_copy_trap_info(struct trap_info *traps); +=20 +diff -urNp linux-2.6.32.45/block/blk-integrity.c linux-2.6.32.45/block/b= lk-integrity.c +--- linux-2.6.32.45/block/blk-integrity.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/block/blk-integrity.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs + NULL, + }; +=20 +-static struct sysfs_ops integrity_ops =3D { ++static const struct sysfs_ops integrity_ops =3D { + .show =3D &integrity_attr_show, + .store =3D &integrity_attr_store, + }; +diff -urNp linux-2.6.32.45/block/blk-iopoll.c linux-2.6.32.45/block/blk-= iopoll.c +--- linux-2.6.32.45/block/blk-iopoll.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/block/blk-iopoll.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo + } + EXPORT_SYMBOL(blk_iopoll_complete); +=20 +-static void blk_iopoll_softirq(struct softirq_action *h) ++static void blk_iopoll_softirq(void) + { + struct list_head *list =3D &__get_cpu_var(blk_cpu_iopoll); + int rearm =3D 0, budget =3D blk_iopoll_budget; +diff -urNp linux-2.6.32.45/block/blk-map.c linux-2.6.32.45/block/blk-map= .c +--- linux-2.6.32.45/block/blk-map.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/block/blk-map.c 2011-04-18 16:57:33.000000000 -0400 +@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ + * direct dma. else, set up kernel bounce buffers + */ + uaddr =3D (unsigned long) ubuf; +- if (blk_rq_aligned(q, ubuf, len) && !map_data) ++ if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data) + bio =3D bio_map_user(q, NULL, uaddr, len, reading, gfp_mask); + else + bio =3D bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask); +@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_q + for (i =3D 0; i < iov_count; i++) { + unsigned long uaddr =3D (unsigned long)iov[i].iov_base; +=20 ++ if (!iov[i].iov_len) ++ return -EINVAL; ++ + if (uaddr & queue_dma_alignment(q)) { + unaligned =3D 1; + break; + } +- if (!iov[i].iov_len) +- return -EINVAL; + } +=20 + if (unaligned || (q->dma_pad_mask & len) || map_data) +@@ -299,7 +300,7 @@ int blk_rq_map_kern(struct request_queue + if (!len || !kbuf) + return -EINVAL; +=20 +- do_copy =3D !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf); ++ do_copy =3D !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kb= uf); + if (do_copy) + bio =3D bio_copy_kern(q, kbuf, len, gfp_mask, reading); + else +diff -urNp linux-2.6.32.45/block/blk-softirq.c linux-2.6.32.45/block/blk= -softirq.c +--- linux-2.6.32.45/block/blk-softirq.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/block/blk-softirq.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,=20 + * Softirq action handler - move entries to local list and loop over th= em + * while passing them to the queue registered handler. + */ +-static void blk_done_softirq(struct softirq_action *h) ++static void blk_done_softirq(void) + { + struct list_head *cpu_list, local_list; +=20 +diff -urNp linux-2.6.32.45/block/blk-sysfs.c linux-2.6.32.45/block/blk-s= ysfs.c +--- linux-2.6.32.45/block/blk-sysfs.c 2011-05-10 22:12:01.000000000 -040= 0 ++++ linux-2.6.32.45/block/blk-sysfs.c 2011-05-10 22:12:26.000000000 -040= 0 +@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob + kmem_cache_free(blk_requestq_cachep, q); + } +=20 +-static struct sysfs_ops queue_sysfs_ops =3D { ++static const struct sysfs_ops queue_sysfs_ops =3D { + .show =3D queue_attr_show, + .store =3D queue_attr_store, + }; +diff -urNp linux-2.6.32.45/block/bsg.c linux-2.6.32.45/block/bsg.c +--- linux-2.6.32.45/block/bsg.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/block/bsg.c 2011-04-17 15:56:46.000000000 -0400 +@@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct r + struct sg_io_v4 *hdr, struct bsg_device *bd, + fmode_t has_write_perm) + { ++ unsigned char tmpcmd[sizeof(rq->__cmd)]; ++ unsigned char *cmdptr; ++ + if (hdr->request_len > BLK_MAX_CDB) { + rq->cmd =3D kzalloc(hdr->request_len, GFP_KERNEL); + if (!rq->cmd) + return -ENOMEM; +- } ++ cmdptr =3D rq->cmd; ++ } else ++ cmdptr =3D tmpcmd; +=20 +- if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request, ++ if (copy_from_user(cmdptr, (void *)(unsigned long)hdr->request, + hdr->request_len)) + return -EFAULT; +=20 ++ if (cmdptr !=3D rq->cmd) ++ memcpy(rq->cmd, cmdptr, hdr->request_len); ++ + if (hdr->subprotocol =3D=3D BSG_SUB_PROTOCOL_SCSI_CMD) { + if (blk_verify_command(rq->cmd, has_write_perm)) + return -EPERM; +diff -urNp linux-2.6.32.45/block/elevator.c linux-2.6.32.45/block/elevat= or.c +--- linux-2.6.32.45/block/elevator.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/block/elevator.c 2011-04-17 15:56:46.000000000 -0400 +@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str + return error; + } +=20 +-static struct sysfs_ops elv_sysfs_ops =3D { ++static const struct sysfs_ops elv_sysfs_ops =3D { + .show =3D elv_attr_show, + .store =3D elv_attr_store, + }; +diff -urNp linux-2.6.32.45/block/scsi_ioctl.c linux-2.6.32.45/block/scsi= _ioctl.c +--- linux-2.6.32.45/block/scsi_ioctl.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/block/scsi_ioctl.c 2011-04-23 13:28:22.000000000 -04= 00 +@@ -220,8 +220,20 @@ EXPORT_SYMBOL(blk_verify_command); + static int blk_fill_sghdr_rq(struct request_queue *q, struct request *r= q, + struct sg_io_hdr *hdr, fmode_t mode) + { +- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len)) ++ unsigned char tmpcmd[sizeof(rq->__cmd)]; ++ unsigned char *cmdptr; ++ ++ if (rq->cmd !=3D rq->__cmd) ++ cmdptr =3D rq->cmd; ++ else ++ cmdptr =3D tmpcmd; ++ ++ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len)) + return -EFAULT; ++ ++ if (cmdptr !=3D rq->cmd) ++ memcpy(rq->cmd, cmdptr, hdr->cmd_len); ++ + if (blk_verify_command(rq->cmd, mode & FMODE_WRITE)) + return -EPERM; +=20 +@@ -430,6 +442,8 @@ int sg_scsi_ioctl(struct request_queue * + int err; + unsigned int in_len, out_len, bytes, opcode, cmdlen; + char *buffer =3D NULL, sense[SCSI_SENSE_BUFFERSIZE]; ++ unsigned char tmpcmd[sizeof(rq->__cmd)]; ++ unsigned char *cmdptr; +=20 + if (!sic) + return -EINVAL; +@@ -463,9 +477,18 @@ int sg_scsi_ioctl(struct request_queue * + */ + err =3D -EFAULT; + rq->cmd_len =3D cmdlen; +- if (copy_from_user(rq->cmd, sic->data, cmdlen)) ++ ++ if (rq->cmd !=3D rq->__cmd) ++ cmdptr =3D rq->cmd; ++ else ++ cmdptr =3D tmpcmd; ++ ++ if (copy_from_user(cmdptr, sic->data, cmdlen)) + goto error; +=20 ++ if (rq->cmd !=3D cmdptr) ++ memcpy(rq->cmd, cmdptr, cmdlen); ++ + if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len)) + goto error; +=20 +diff -urNp linux-2.6.32.45/crypto/cryptd.c linux-2.6.32.45/crypto/cryptd= .c +--- linux-2.6.32.45/crypto/cryptd.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/crypto/cryptd.c 2011-08-23 21:22:32.000000000 -0400 +@@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx { +=20 + struct cryptd_blkcipher_request_ctx { + crypto_completion_t complete; +-}; ++} __no_const; +=20 + struct cryptd_hash_ctx { + struct crypto_shash *child; +diff -urNp linux-2.6.32.45/crypto/gf128mul.c linux-2.6.32.45/crypto/gf12= 8mul.c +--- linux-2.6.32.45/crypto/gf128mul.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/crypto/gf128mul.c 2011-07-06 19:53:33.000000000 -040= 0 +@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128=20 + for (i =3D 0; i < 7; ++i) + gf128mul_x_lle(&p[i + 1], &p[i]); +=20 +- memset(r, 0, sizeof(r)); ++ memset(r, 0, sizeof(*r)); + for (i =3D 0;;) { + u8 ch =3D ((u8 *)b)[15 - i]; +=20 +@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128=20 + for (i =3D 0; i < 7; ++i) + gf128mul_x_bbe(&p[i + 1], &p[i]); +=20 +- memset(r, 0, sizeof(r)); ++ memset(r, 0, sizeof(*r)); + for (i =3D 0;;) { + u8 ch =3D ((u8 *)b)[i]; +=20 +diff -urNp linux-2.6.32.45/crypto/serpent.c linux-2.6.32.45/crypto/serpe= nt.c +--- linux-2.6.32.45/crypto/serpent.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/crypto/serpent.c 2011-08-18 23:59:56.000000000 -0400 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include +=20 + /* Key is padded to the maximum of 256 bits before round key generation= . + * Any key length <=3D 256 bits (32 bytes) is allowed by the algorithm. +@@ -224,6 +225,8 @@ static int serpent_setkey(struct crypto_ + u32 r0,r1,r2,r3,r4; + int i; +=20 ++ pax_track_stack(); ++ + /* Copy key, add padding */ +=20 + for (i =3D 0; i < keylen; ++i) +diff -urNp linux-2.6.32.45/Documentation/dontdiff linux-2.6.32.45/Docume= ntation/dontdiff +--- linux-2.6.32.45/Documentation/dontdiff 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/Documentation/dontdiff 2011-08-21 18:59:02.000000000= -0400 +@@ -1,13 +1,16 @@ + *.a + *.aux + *.bin ++*.cis + *.cpio + *.csp ++*.dbg + *.dsp + *.dvi + *.elf + *.eps + *.fw ++*.gcno + *.gen.S + *.gif + *.grep +@@ -38,8 +41,10 @@ + *.tab.h + *.tex + *.ver ++*.vim + *.xml + *_MODULES ++*_reg_safe.h + *_vga16.c + *~ + *.9 +@@ -49,11 +54,16 @@ + 53c700_d.h + CVS + ChangeSet ++GPATH ++GRTAGS ++GSYMS ++GTAGS + Image + Kerntypes + Module.markers + Module.symvers + PENDING ++PERF* + SCCS + System.map* + TAGS +@@ -76,7 +86,11 @@ btfixupprep + build + bvmlinux + bzImage* ++capability_names.h ++capflags.c + classlist.h* ++clut_vga16.c ++common-cmds.h + comp*.log + compile.h* + conf +@@ -97,19 +111,21 @@ elfconfig.h* + fixdep + fore200e_mkfirm + fore200e_pca_fw.c* ++gate.lds + gconf + gen-devlist + 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 +149,9 @@ mkboot + mkbugboot + mkcpustr + mkdep ++mkpiggy + mkprep ++mkregtable + mktables + mktree + modpost +@@ -149,6 +167,7 @@ patches* + pca200e.bin + pca200e_ecd.bin2 + piggy.gz ++piggy.S + piggyback + pnmtologo + ppc_defs.h* +@@ -157,12 +176,15 @@ qconf + raid6altivec*.c + raid6int*.c + raid6tables.c ++regdb.c + relocs ++rlim_names.h + series + setup + setup.bin + setup.elf + sImage ++slabinfo + sm_tbl* + split-include + syscalltab.h +@@ -186,14 +208,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.45/Documentation/kernel-parameters.txt linux-2.6= .32.45/Documentation/kernel-parameters.txt +--- linux-2.6.32.45/Documentation/kernel-parameters.txt 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/Documentation/kernel-parameters.txt 2011-04-17 15:56= :45.000000000 -0400 +@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters.=20 + the specified number of seconds. This is to be used if + your oopses keep scrolling off the screen. +=20 ++ pax_nouderef [X86] 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 or the frequent ++ page table updates on X86-64. ++ ++ pax_softmode=3D 0/1 to disable/enable PaX softmode on boot already. ++ + pcbit=3D [HW,ISDN] +=20 + pcd. [PARIDE] +diff -urNp linux-2.6.32.45/drivers/acpi/acpi_pad.c linux-2.6.32.45/drive= rs/acpi/acpi_pad.c +--- linux-2.6.32.45/drivers/acpi/acpi_pad.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/acpi/acpi_pad.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -30,7 +30,7 @@ + #include + #include +=20 +-#define ACPI_PROCESSOR_AGGREGATOR_CLASS "processor_aggregator" ++#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad" + #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator" + #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80 + static DEFINE_MUTEX(isolated_cpus_lock); +diff -urNp linux-2.6.32.45/drivers/acpi/battery.c linux-2.6.32.45/driver= s/acpi/battery.c +--- linux-2.6.32.45/drivers/acpi/battery.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/acpi/battery.c 2011-04-17 15:56:46.000000000= -0400 +@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); + } +=20 + static struct battery_file { +- struct file_operations ops; ++ const struct file_operations ops; + mode_t mode; + const char *name; + } acpi_battery_file[] =3D { +diff -urNp linux-2.6.32.45/drivers/acpi/dock.c linux-2.6.32.45/drivers/a= cpi/dock.c +--- linux-2.6.32.45/drivers/acpi/dock.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/acpi/dock.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -77,7 +77,7 @@ struct dock_dependent_device { + struct list_head list; + struct list_head hotplug_list; + acpi_handle handle; +- struct acpi_dock_ops *ops; ++ const struct acpi_dock_ops *ops; + void *context; + }; +=20 +@@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifi + * the dock driver after _DCK is executed. + */ + int +-register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *= ops, ++register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock= _ops *ops, + void *context) + { + struct dock_dependent_device *dd; +diff -urNp linux-2.6.32.45/drivers/acpi/osl.c linux-2.6.32.45/drivers/ac= pi/osl.c +--- linux-2.6.32.45/drivers/acpi/osl.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/acpi/osl.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres + void __iomem *virt_addr; +=20 + virt_addr =3D ioremap(phys_addr, width); ++ if (!virt_addr) ++ return AE_NO_MEMORY; + if (!value) + value =3D &dummy; +=20 +@@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_addre + void __iomem *virt_addr; +=20 + virt_addr =3D ioremap(phys_addr, width); ++ if (!virt_addr) ++ return AE_NO_MEMORY; +=20 + switch (width) { + case 8: +diff -urNp linux-2.6.32.45/drivers/acpi/power_meter.c linux-2.6.32.45/dr= ivers/acpi/power_meter.c +--- linux-2.6.32.45/drivers/acpi/power_meter.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/acpi/power_meter.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d + return res; +=20 + temp /=3D 1000; +- if (temp < 0) +- return -EINVAL; +=20 + mutex_lock(&resource->lock); + resource->trip[attr->index - 7] =3D temp; +diff -urNp linux-2.6.32.45/drivers/acpi/proc.c linux-2.6.32.45/drivers/a= cpi/proc.c +--- linux-2.6.32.45/drivers/acpi/proc.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/acpi/proc.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f + size_t count, loff_t * ppos) + { + struct list_head *node, *next; +- char strbuf[5]; +- char str[5] =3D ""; +- unsigned int len =3D count; ++ char strbuf[5] =3D {0}; + struct acpi_device *found_dev =3D NULL; +=20 +- if (len > 4) +- len =3D 4; +- if (len < 0) +- return -EFAULT; ++ if (count > 4) ++ count =3D 4; +=20 +- if (copy_from_user(strbuf, buffer, len)) ++ if (copy_from_user(strbuf, buffer, count)) + return -EFAULT; +- strbuf[len] =3D '\0'; +- sscanf(strbuf, "%s", str); ++ strbuf[count] =3D '\0'; +=20 + mutex_lock(&acpi_device_lock); + list_for_each_safe(node, next, &acpi_wakeup_device_list) { +@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f + if (!dev->wakeup.flags.valid) + continue; +=20 +- if (!strncmp(dev->pnp.bus_id, str, 4)) { ++ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) { + dev->wakeup.state.enabled =3D + dev->wakeup.state.enabled ? 0 : 1; + found_dev =3D dev; +diff -urNp linux-2.6.32.45/drivers/acpi/processor_core.c linux-2.6.32.45= /drivers/acpi/processor_core.c +--- linux-2.6.32.45/drivers/acpi/processor_core.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/acpi/processor_core.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add( + return 0; + } +=20 +- BUG_ON((pr->id >=3D nr_cpu_ids) || (pr->id < 0)); ++ BUG_ON(pr->id >=3D nr_cpu_ids); +=20 + /* + * Buggy BIOS check +diff -urNp linux-2.6.32.45/drivers/acpi/sbshc.c linux-2.6.32.45/drivers/= acpi/sbshc.c +--- linux-2.6.32.45/drivers/acpi/sbshc.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/acpi/sbshc.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -17,7 +17,7 @@ +=20 + #define PREFIX "ACPI: " +=20 +-#define ACPI_SMB_HC_CLASS "smbus_host_controller" ++#define ACPI_SMB_HC_CLASS "smbus_host_ctl" + #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC" +=20 + struct acpi_smb_hc { +diff -urNp linux-2.6.32.45/drivers/acpi/sleep.c linux-2.6.32.45/drivers/= acpi/sleep.c +--- linux-2.6.32.45/drivers/acpi/sleep.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/acpi/sleep.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(susp + } + } +=20 +-static struct platform_suspend_ops acpi_suspend_ops =3D { ++static const struct platform_suspend_ops acpi_suspend_ops =3D { + .valid =3D acpi_suspend_state_valid, + .begin =3D acpi_suspend_begin, + .prepare_late =3D acpi_pm_prepare, +@@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspen + * The following callbacks are used if the pre-ACPI 2.0 suspend orderin= g has + * been requested. + */ +-static struct platform_suspend_ops acpi_suspend_ops_old =3D { ++static const struct platform_suspend_ops acpi_suspend_ops_old =3D { + .valid =3D acpi_suspend_state_valid, + .begin =3D acpi_suspend_begin_old, + .prepare_late =3D acpi_pm_disable_gpes, +@@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void) + acpi_enable_all_runtime_gpes(); + } +=20 +-static struct platform_hibernation_ops acpi_hibernation_ops =3D { ++static const struct platform_hibernation_ops acpi_hibernation_ops =3D { + .begin =3D acpi_hibernation_begin, + .end =3D acpi_pm_end, + .pre_snapshot =3D acpi_hibernation_pre_snapshot, +@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot + * The following callbacks are used if the pre-ACPI 2.0 suspend orderin= g has + * been requested. + */ +-static struct platform_hibernation_ops acpi_hibernation_ops_old =3D { ++static const struct platform_hibernation_ops acpi_hibernation_ops_old =3D= { + .begin =3D acpi_hibernation_begin_old, + .end =3D acpi_pm_end, + .pre_snapshot =3D acpi_hibernation_pre_snapshot_old, +diff -urNp linux-2.6.32.45/drivers/acpi/video.c linux-2.6.32.45/drivers/= acpi/video.c +--- linux-2.6.32.45/drivers/acpi/video.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/acpi/video.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str + vd->brightness->levels[request_level]); + } +=20 +-static struct backlight_ops acpi_backlight_ops =3D { ++static const struct backlight_ops acpi_backlight_ops =3D { + .get_brightness =3D acpi_video_get_brightness, + .update_status =3D acpi_video_set_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/ata/ahci.c linux-2.6.32.45/drivers/at= a/ahci.c +--- linux-2.6.32.45/drivers/ata/ahci.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/ata/ahci.c 2011-04-23 12:56:10.000000000 -04= 00 +@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh + .sdev_attrs =3D ahci_sdev_attrs, + }; +=20 +-static struct ata_port_operations ahci_ops =3D { ++static const struct ata_port_operations ahci_ops =3D { + .inherits =3D &sata_pmp_port_ops, +=20 + .qc_defer =3D sata_pmp_qc_defer_cmd_switch, +@@ -424,17 +424,17 @@ static struct ata_port_operations ahci_o + .port_stop =3D ahci_port_stop, + }; +=20 +-static struct ata_port_operations ahci_vt8251_ops =3D { ++static const struct ata_port_operations ahci_vt8251_ops =3D { + .inherits =3D &ahci_ops, + .hardreset =3D ahci_vt8251_hardreset, + }; +=20 +-static struct ata_port_operations ahci_p5wdh_ops =3D { ++static const struct ata_port_operations ahci_p5wdh_ops =3D { + .inherits =3D &ahci_ops, + .hardreset =3D ahci_p5wdh_hardreset, + }; +=20 +-static struct ata_port_operations ahci_sb600_ops =3D { ++static const struct ata_port_operations ahci_sb600_ops =3D { + .inherits =3D &ahci_ops, + .softreset =3D ahci_sb600_softreset, + .pmp_softreset =3D ahci_sb600_softreset, +diff -urNp linux-2.6.32.45/drivers/ata/ata_generic.c linux-2.6.32.45/dri= vers/ata/ata_generic.c +--- linux-2.6.32.45/drivers/ata/ata_generic.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/ata_generic.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -104,7 +104,7 @@ static struct scsi_host_template generic + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations generic_port_ops =3D { ++static const struct ata_port_operations generic_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_unknown, + .set_mode =3D generic_set_mode, +diff -urNp linux-2.6.32.45/drivers/ata/ata_piix.c linux-2.6.32.45/driver= s/ata/ata_piix.c +--- linux-2.6.32.45/drivers/ata/ata_piix.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/ata_piix.c 2011-04-23 12:56:10.000000000= -0400 +@@ -318,7 +318,7 @@ static struct scsi_host_template piix_sh + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations piix_pata_ops =3D { ++static const struct ata_port_operations piix_pata_ops =3D { + .inherits =3D &ata_bmdma32_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D piix_set_piomode, +@@ -326,22 +326,22 @@ static struct ata_port_operations piix_p + .prereset =3D piix_pata_prereset, + }; +=20 +-static struct ata_port_operations piix_vmw_ops =3D { ++static const struct ata_port_operations piix_vmw_ops =3D { + .inherits =3D &piix_pata_ops, + .bmdma_status =3D piix_vmw_bmdma_status, + }; +=20 +-static struct ata_port_operations ich_pata_ops =3D { ++static const struct ata_port_operations ich_pata_ops =3D { + .inherits =3D &piix_pata_ops, + .cable_detect =3D ich_pata_cable_detect, + .set_dmamode =3D ich_set_dmamode, + }; +=20 +-static struct ata_port_operations piix_sata_ops =3D { ++static const struct ata_port_operations piix_sata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + }; +=20 +-static struct ata_port_operations piix_sidpr_sata_ops =3D { ++static const struct ata_port_operations piix_sidpr_sata_ops =3D { + .inherits =3D &piix_sata_ops, + .hardreset =3D sata_std_hardreset, + .scr_read =3D piix_sidpr_scr_read, +diff -urNp linux-2.6.32.45/drivers/ata/libata-acpi.c linux-2.6.32.45/dri= vers/ata/libata-acpi.c +--- linux-2.6.32.45/drivers/ata/libata-acpi.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/libata-acpi.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han + ata_acpi_uevent(dev->link->ap, dev, event); + } +=20 +-static struct acpi_dock_ops ata_acpi_dev_dock_ops =3D { ++static const struct acpi_dock_ops ata_acpi_dev_dock_ops =3D { + .handler =3D ata_acpi_dev_notify_dock, + .uevent =3D ata_acpi_dev_uevent, + }; +=20 +-static struct acpi_dock_ops ata_acpi_ap_dock_ops =3D { ++static const struct acpi_dock_ops ata_acpi_ap_dock_ops =3D { + .handler =3D ata_acpi_ap_notify_dock, + .uevent =3D ata_acpi_ap_uevent, + }; +diff -urNp linux-2.6.32.45/drivers/ata/libata-core.c linux-2.6.32.45/dri= vers/ata/libata-core.c +--- linux-2.6.32.45/drivers/ata/libata-core.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/libata-core.c 2011-08-05 20:33:55.000000= 000 -0400 +@@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd * + struct ata_port *ap; + unsigned int tag; +=20 +- WARN_ON_ONCE(qc =3D=3D NULL); /* ata_qc_from_tag _might_ return NULL *= / ++ BUG_ON(qc =3D=3D NULL); /* ata_qc_from_tag _might_ return NULL */ + ap =3D qc->ap; +=20 + qc->flags =3D 0; +@@ -4970,7 +4970,7 @@ void __ata_qc_complete(struct ata_queued + struct ata_port *ap; + struct ata_link *link; +=20 +- WARN_ON_ONCE(qc =3D=3D NULL); /* ata_qc_from_tag _might_ return NULL *= / ++ BUG_ON(qc =3D=3D NULL); /* ata_qc_from_tag _might_ return NULL */ + WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE)); + ap =3D qc->ap; + link =3D qc->dev->link; +@@ -5987,7 +5987,7 @@ static void ata_host_stop(struct device=20 + * LOCKING: + * None. + */ +-static void ata_finalize_port_ops(struct ata_port_operations *ops) ++static void ata_finalize_port_ops(const struct ata_port_operations *ops= ) + { + static DEFINE_SPINLOCK(lock); + const struct ata_port_operations *cur; +@@ -5999,6 +5999,7 @@ static void ata_finalize_port_ops(struct + return; +=20 + spin_lock(&lock); ++ pax_open_kernel(); +=20 + for (cur =3D ops->inherits; cur; cur =3D cur->inherits) { + void **inherit =3D (void **)cur; +@@ -6012,8 +6013,9 @@ static void ata_finalize_port_ops(struct + if (IS_ERR(*pp)) + *pp =3D NULL; +=20 +- ops->inherits =3D NULL; ++ *(struct ata_port_operations **)&ops->inherits =3D NULL; +=20 ++ pax_close_kernel(); + spin_unlock(&lock); + } +=20 +@@ -6110,7 +6112,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, +- unsigned long flags, struct ata_port_operations *ops) ++ unsigned long flags, const struct ata_port_operations *ops) + { + spin_lock_init(&host->lock); + host->dev =3D dev; +@@ -6773,7 +6775,7 @@ static void ata_dummy_error_handler(stru + /* truly dummy */ + } +=20 +-struct ata_port_operations ata_dummy_port_ops =3D { ++const struct ata_port_operations ata_dummy_port_ops =3D { + .qc_prep =3D ata_noop_qc_prep, + .qc_issue =3D ata_dummy_qc_issue, + .error_handler =3D ata_dummy_error_handler, +diff -urNp linux-2.6.32.45/drivers/ata/libata-eh.c linux-2.6.32.45/drive= rs/ata/libata-eh.c +--- linux-2.6.32.45/drivers/ata/libata-eh.c 2011-08-09 18:35:28.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/libata-eh.c 2011-08-09 18:33:59.00000000= 0 -0400 +@@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap) + { + struct ata_link *link; +=20 ++ pax_track_stack(); ++ + ata_for_each_link(link, ap, HOST_FIRST) + ata_eh_link_report(link); + } +@@ -3594,7 +3596,7 @@ void ata_do_eh(struct ata_port *ap, ata_ + */ + void ata_std_error_handler(struct ata_port *ap) + { +- struct ata_port_operations *ops =3D ap->ops; ++ const struct ata_port_operations *ops =3D ap->ops; + ata_reset_fn_t hardreset =3D ops->hardreset; +=20 + /* ignore built-in hardreset if SCR access is not available */ +diff -urNp linux-2.6.32.45/drivers/ata/libata-pmp.c linux-2.6.32.45/driv= ers/ata/libata-pmp.c +--- linux-2.6.32.45/drivers/ata/libata-pmp.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/libata-pmp.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str + */ + static int sata_pmp_eh_recover(struct ata_port *ap) + { +- struct ata_port_operations *ops =3D ap->ops; ++ const struct ata_port_operations *ops =3D ap->ops; + int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; + struct ata_link *pmp_link =3D &ap->link; + struct ata_device *pmp_dev =3D pmp_link->device; +diff -urNp linux-2.6.32.45/drivers/ata/pata_acpi.c linux-2.6.32.45/drive= rs/ata/pata_acpi.c +--- linux-2.6.32.45/drivers/ata/pata_acpi.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_acpi.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pacpi_ops =3D { ++static const struct ata_port_operations pacpi_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_issue =3D pacpi_qc_issue, + .cable_detect =3D pacpi_cable_detect, +diff -urNp linux-2.6.32.45/drivers/ata/pata_ali.c linux-2.6.32.45/driver= s/ata/pata_ali.c +--- linux-2.6.32.45/drivers/ata/pata_ali.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_ali.c 2011-04-17 15:56:46.000000000= -0400 +@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht + * Port operations for PIO only ALi + */ +=20 +-static struct ata_port_operations ali_early_port_ops =3D { ++static const struct ata_port_operations ali_early_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D ali_set_piomode, +@@ -382,7 +382,7 @@ static const struct ata_port_operations=20 + * Port operations for DMA capable ALi without cable + * detect + */ +-static struct ata_port_operations ali_20_port_ops =3D { ++static const struct ata_port_operations ali_20_port_ops =3D { + .inherits =3D &ali_dma_base_ops, + .cable_detect =3D ata_cable_40wire, + .mode_filter =3D ali_20_filter, +@@ -393,7 +393,7 @@ static struct ata_port_operations ali_20 + /* + * Port operations for DMA capable ALi with cable detect + */ +-static struct ata_port_operations ali_c2_port_ops =3D { ++static const struct ata_port_operations ali_c2_port_ops =3D { + .inherits =3D &ali_dma_base_ops, + .check_atapi_dma =3D ali_check_atapi_dma, + .cable_detect =3D ali_c2_cable_detect, +@@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2 + /* + * Port operations for DMA capable ALi with cable detect + */ +-static struct ata_port_operations ali_c4_port_ops =3D { ++static const struct ata_port_operations ali_c4_port_ops =3D { + .inherits =3D &ali_dma_base_ops, + .check_atapi_dma =3D ali_check_atapi_dma, + .cable_detect =3D ali_c2_cable_detect, +@@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4 + /* + * Port operations for DMA capable ALi with cable detect and LBA48 + */ +-static struct ata_port_operations ali_c5_port_ops =3D { ++static const struct ata_port_operations ali_c5_port_ops =3D { + .inherits =3D &ali_dma_base_ops, + .check_atapi_dma =3D ali_check_atapi_dma, + .dev_config =3D ali_warn_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/pata_amd.c linux-2.6.32.45/driver= s/ata/pata_amd.c +--- linux-2.6.32.45/drivers/ata/pata_amd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_amd.c 2011-04-17 15:56:46.000000000= -0400 +@@ -397,28 +397,28 @@ static const struct ata_port_operations=20 + .prereset =3D amd_pre_reset, + }; +=20 +-static struct ata_port_operations amd33_port_ops =3D { ++static const struct ata_port_operations amd33_port_ops =3D { + .inherits =3D &amd_base_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D amd33_set_piomode, + .set_dmamode =3D amd33_set_dmamode, + }; +=20 +-static struct ata_port_operations amd66_port_ops =3D { ++static const struct ata_port_operations amd66_port_ops =3D { + .inherits =3D &amd_base_port_ops, + .cable_detect =3D ata_cable_unknown, + .set_piomode =3D amd66_set_piomode, + .set_dmamode =3D amd66_set_dmamode, + }; +=20 +-static struct ata_port_operations amd100_port_ops =3D { ++static const struct ata_port_operations amd100_port_ops =3D { + .inherits =3D &amd_base_port_ops, + .cable_detect =3D ata_cable_unknown, + .set_piomode =3D amd100_set_piomode, + .set_dmamode =3D amd100_set_dmamode, + }; +=20 +-static struct ata_port_operations amd133_port_ops =3D { ++static const struct ata_port_operations amd133_port_ops =3D { + .inherits =3D &amd_base_port_ops, + .cable_detect =3D amd_cable_detect, + .set_piomode =3D amd133_set_piomode, +@@ -433,13 +433,13 @@ static const struct ata_port_operations=20 + .host_stop =3D nv_host_stop, + }; +=20 +-static struct ata_port_operations nv100_port_ops =3D { ++static const struct ata_port_operations nv100_port_ops =3D { + .inherits =3D &nv_base_port_ops, + .set_piomode =3D nv100_set_piomode, + .set_dmamode =3D nv100_set_dmamode, + }; +=20 +-static struct ata_port_operations nv133_port_ops =3D { ++static const struct ata_port_operations nv133_port_ops =3D { + .inherits =3D &nv_base_port_ops, + .set_piomode =3D nv133_set_piomode, + .set_dmamode =3D nv133_set_dmamode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_artop.c linux-2.6.32.45/driv= ers/ata/pata_artop.c +--- linux-2.6.32.45/drivers/ata/pata_artop.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_artop.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations artop6210_ops =3D { ++static const struct ata_port_operations artop6210_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D artop6210_set_piomode, +@@ -320,7 +320,7 @@ static struct ata_port_operations artop6 + .qc_defer =3D artop6210_qc_defer, + }; +=20 +-static struct ata_port_operations artop6260_ops =3D { ++static const struct ata_port_operations artop6260_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D artop6260_cable_detect, + .set_piomode =3D artop6260_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_at32.c linux-2.6.32.45/drive= rs/ata/pata_at32.c +--- linux-2.6.32.45/drivers/ata/pata_at32.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_at32.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations at32_port_ops =3D { ++static const struct ata_port_operations at32_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D pata_at32_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_at91.c linux-2.6.32.45/drive= rs/ata/pata_at91.c +--- linux-2.6.32.45/drivers/ata/pata_at91.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_at91.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pata_at91_port_ops =3D { ++static const struct ata_port_operations pata_at91_port_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .sff_data_xfer =3D pata_at91_data_xfer_noirq, +diff -urNp linux-2.6.32.45/drivers/ata/pata_atiixp.c linux-2.6.32.45/dri= vers/ata/pata_atiixp.c +--- linux-2.6.32.45/drivers/ata/pata_atiixp.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_atiixp.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ + .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, + }; +=20 +-static struct ata_port_operations atiixp_port_ops =3D { ++static const struct ata_port_operations atiixp_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .qc_prep =3D ata_sff_dumb_qc_prep, +diff -urNp linux-2.6.32.45/drivers/ata/pata_atp867x.c linux-2.6.32.45/dr= ivers/ata/pata_atp867x.c +--- linux-2.6.32.45/drivers/ata/pata_atp867x.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_atp867x.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations atp867x_ops =3D { ++static const struct ata_port_operations atp867x_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D atp867x_cable_detect, + .set_piomode =3D atp867x_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_bf54x.c linux-2.6.32.45/driv= ers/ata/pata_bf54x.c +--- linux-2.6.32.45/drivers/ata/pata_bf54x.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_bf54x.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh + .dma_boundary =3D ATA_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations bfin_pata_ops =3D { ++static const struct ata_port_operations bfin_pata_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .set_piomode =3D bfin_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd640.c linux-2.6.32.45/dri= vers/ata/pata_cmd640.c +--- linux-2.6.32.45/drivers/ata/pata_cmd640.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cmd640.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations cmd640_port_ops =3D { ++static const struct ata_port_operations cmd640_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + /* In theory xfer_noirq is not needed once we kill the prefetcher */ + .sff_data_xfer =3D ata_sff_data_xfer_noirq, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cmd64x.c linux-2.6.32.45/dri= vers/ata/pata_cmd64x.c +--- linux-2.6.32.45/drivers/ata/pata_cmd64x.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cmd64x.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -271,18 +271,18 @@ static const struct ata_port_operations=20 + .set_dmamode =3D cmd64x_set_dmamode, + }; +=20 +-static struct ata_port_operations cmd64x_port_ops =3D { ++static const struct ata_port_operations cmd64x_port_ops =3D { + .inherits =3D &cmd64x_base_ops, + .cable_detect =3D ata_cable_40wire, + }; +=20 +-static struct ata_port_operations cmd646r1_port_ops =3D { ++static const struct ata_port_operations cmd646r1_port_ops =3D { + .inherits =3D &cmd64x_base_ops, + .bmdma_stop =3D cmd646r1_bmdma_stop, + .cable_detect =3D ata_cable_40wire, + }; +=20 +-static struct ata_port_operations cmd648_port_ops =3D { ++static const struct ata_port_operations cmd648_port_ops =3D { + .inherits =3D &cmd64x_base_ops, + .bmdma_stop =3D cmd648_bmdma_stop, + .cable_detect =3D cmd648_cable_detect, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5520.c linux-2.6.32.45/dri= vers/ata/pata_cs5520.c +--- linux-2.6.32.45/drivers/ata/pata_cs5520.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cs5520.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ + .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, + }; +=20 +-static struct ata_port_operations cs5520_port_ops =3D { ++static const struct ata_port_operations cs5520_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_prep =3D ata_sff_dumb_qc_prep, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5530.c linux-2.6.32.45/dri= vers/ata/pata_cs5530.c +--- linux-2.6.32.45/drivers/ata/pata_cs5530.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cs5530.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ + .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, + }; +=20 +-static struct ata_port_operations cs5530_port_ops =3D { ++static const struct ata_port_operations cs5530_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .qc_prep =3D ata_sff_dumb_qc_prep, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5535.c linux-2.6.32.45/dri= vers/ata/pata_cs5535.c +--- linux-2.6.32.45/drivers/ata/pata_cs5535.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cs5535.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations cs5535_port_ops =3D { ++static const struct ata_port_operations cs5535_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D cs5535_cable_detect, + .set_piomode =3D cs5535_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cs5536.c linux-2.6.32.45/dri= vers/ata/pata_cs5536.c +--- linux-2.6.32.45/drivers/ata/pata_cs5536.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cs5536.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations cs5536_port_ops =3D { ++static const struct ata_port_operations cs5536_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D cs5536_cable_detect, + .set_piomode =3D cs5536_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_cypress.c linux-2.6.32.45/dr= ivers/ata/pata_cypress.c +--- linux-2.6.32.45/drivers/ata/pata_cypress.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_cypress.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations cy82c693_port_ops =3D { ++static const struct ata_port_operations cy82c693_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D cy82c693_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_efar.c linux-2.6.32.45/drive= rs/ata/pata_efar.c +--- linux-2.6.32.45/drivers/ata/pata_efar.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_efar.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations efar_ops =3D { ++static const struct ata_port_operations efar_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D efar_cable_detect, + .set_piomode =3D efar_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt366.c linux-2.6.32.45/dri= vers/ata/pata_hpt366.c +--- linux-2.6.32.45/drivers/ata/pata_hpt366.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_hpt366.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ + * Configuration for HPT366/68 + */ +=20 +-static struct ata_port_operations hpt366_port_ops =3D { ++static const struct ata_port_operations hpt366_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D hpt36x_cable_detect, + .mode_filter =3D hpt366_filter, +diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt37x.c linux-2.6.32.45/dri= vers/ata/pata_hpt37x.c +--- linux-2.6.32.45/drivers/ata/pata_hpt37x.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_hpt37x.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ + * Configuration for HPT370 + */ +=20 +-static struct ata_port_operations hpt370_port_ops =3D { ++static const struct ata_port_operations hpt370_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .bmdma_stop =3D hpt370_bmdma_stop, +@@ -591,7 +591,7 @@ static struct ata_port_operations hpt370 + * Configuration for HPT370A. Close to 370 but less filters + */ +=20 +-static struct ata_port_operations hpt370a_port_ops =3D { ++static const struct ata_port_operations hpt370a_port_ops =3D { + .inherits =3D &hpt370_port_ops, + .mode_filter =3D hpt370a_filter, + }; +@@ -601,7 +601,7 @@ static struct ata_port_operations hpt370 + * and DMA mode setting functionality. + */ +=20 +-static struct ata_port_operations hpt372_port_ops =3D { ++static const struct ata_port_operations hpt372_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .bmdma_stop =3D hpt37x_bmdma_stop, +@@ -616,7 +616,7 @@ static struct ata_port_operations hpt372 + * but we have a different cable detection procedure for function 1. + */ +=20 +-static struct ata_port_operations hpt374_fn1_port_ops =3D { ++static const struct ata_port_operations hpt374_fn1_port_ops =3D { + .inherits =3D &hpt372_port_ops, + .prereset =3D hpt374_fn1_pre_reset, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c linux-2.6.32.45/dr= ivers/ata/pata_hpt3x2n.c +--- linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:55:34.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_hpt3x2n.c 2011-06-25 12:56:37.00000= 0000 -0400 +@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n + * Configuration for HPT3x2n. + */ +=20 +-static struct ata_port_operations hpt3x2n_port_ops =3D { ++static const struct ata_port_operations hpt3x2n_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .bmdma_stop =3D hpt3x2n_bmdma_stop, +diff -urNp linux-2.6.32.45/drivers/ata/pata_hpt3x3.c linux-2.6.32.45/dri= vers/ata/pata_hpt3x3.c +--- linux-2.6.32.45/drivers/ata/pata_hpt3x3.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_hpt3x3.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations hpt3x3_port_ops =3D { ++static const struct ata_port_operations hpt3x3_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D hpt3x3_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_icside.c linux-2.6.32.45/dri= vers/ata/pata_icside.c +--- linux-2.6.32.45/drivers/ata/pata_icside.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_icside.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct + } + } +=20 +-static struct ata_port_operations pata_icside_port_ops =3D { ++static const struct ata_port_operations pata_icside_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + /* no need to build any PRD tables for DMA */ + .qc_prep =3D ata_noop_qc_prep, +diff -urNp linux-2.6.32.45/drivers/ata/pata_isapnp.c linux-2.6.32.45/dri= vers/ata/pata_isapnp.c +--- linux-2.6.32.45/drivers/ata/pata_isapnp.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_isapnp.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations isapnp_port_ops =3D { ++static const struct ata_port_operations isapnp_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + }; +=20 +-static struct ata_port_operations isapnp_noalt_port_ops =3D { ++static const struct ata_port_operations isapnp_noalt_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + /* No altstatus so we don't want to use the lost interrupt poll */ +diff -urNp linux-2.6.32.45/drivers/ata/pata_it8213.c linux-2.6.32.45/dri= vers/ata/pata_it8213.c +--- linux-2.6.32.45/drivers/ata/pata_it8213.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_it8213.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ + }; +=20 +=20 +-static struct ata_port_operations it8213_ops =3D { ++static const struct ata_port_operations it8213_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D it8213_cable_detect, + .set_piomode =3D it8213_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_it821x.c linux-2.6.32.45/dri= vers/ata/pata_it821x.c +--- linux-2.6.32.45/drivers/ata/pata_it821x.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_it821x.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations it821x_smart_port_ops =3D { ++static const struct ata_port_operations it821x_smart_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .check_atapi_dma=3D it821x_check_atapi_dma, +@@ -814,7 +814,7 @@ static struct ata_port_operations it821x + .port_start =3D it821x_port_start, + }; +=20 +-static struct ata_port_operations it821x_passthru_port_ops =3D { ++static const struct ata_port_operations it821x_passthru_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .check_atapi_dma=3D it821x_check_atapi_dma, +@@ -830,7 +830,7 @@ static struct ata_port_operations it821x + .port_start =3D it821x_port_start, + }; +=20 +-static struct ata_port_operations it821x_rdc_port_ops =3D { ++static const struct ata_port_operations it821x_rdc_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .check_atapi_dma=3D it821x_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.45/= drivers/ata/pata_ixp4xx_cf.c +--- linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_ixp4xx_cf.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations ixp4xx_port_ops =3D { ++static const struct ata_port_operations ixp4xx_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ixp4xx_mmio_data_xfer, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_jmicron.c linux-2.6.32.45/dr= ivers/ata/pata_jmicron.c +--- linux-2.6.32.45/drivers/ata/pata_jmicron.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_jmicron.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations jmicron_ops =3D { ++static const struct ata_port_operations jmicron_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .prereset =3D jmicron_pre_reset, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_legacy.c linux-2.6.32.45/dri= vers/ata/pata_legacy.c +--- linux-2.6.32.45/drivers/ata/pata_legacy.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_legacy.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -106,7 +106,7 @@ struct legacy_probe { +=20 + struct legacy_controller { + const char *name; +- struct ata_port_operations *ops; ++ const struct ata_port_operations *ops; + unsigned int pio_mask; + unsigned int flags; + unsigned int pflags; +@@ -223,12 +223,12 @@ static const struct ata_port_operations=20 + * pio_mask as well. + */ +=20 +-static struct ata_port_operations simple_port_ops =3D { ++static const struct ata_port_operations simple_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + }; +=20 +-static struct ata_port_operations legacy_port_ops =3D { ++static const struct ata_port_operations legacy_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + .set_mode =3D legacy_set_mode, +@@ -324,7 +324,7 @@ static unsigned int pdc_data_xfer_vlb(st + return buflen; + } +=20 +-static struct ata_port_operations pdc20230_port_ops =3D { ++static const struct ata_port_operations pdc20230_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D pdc20230_set_piomode, + .sff_data_xfer =3D pdc_data_xfer_vlb, +@@ -357,7 +357,7 @@ static void ht6560a_set_piomode(struct a + ioread8(ap->ioaddr.status_addr); + } +=20 +-static struct ata_port_operations ht6560a_port_ops =3D { ++static const struct ata_port_operations ht6560a_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D ht6560a_set_piomode, + }; +@@ -400,7 +400,7 @@ static void ht6560b_set_piomode(struct a + ioread8(ap->ioaddr.status_addr); + } +=20 +-static struct ata_port_operations ht6560b_port_ops =3D { ++static const struct ata_port_operations ht6560b_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D ht6560b_set_piomode, + }; +@@ -499,7 +499,7 @@ static void opti82c611a_set_piomode(stru + } +=20 +=20 +-static struct ata_port_operations opti82c611a_port_ops =3D { ++static const struct ata_port_operations opti82c611a_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D opti82c611a_set_piomode, + }; +@@ -609,7 +609,7 @@ static unsigned int opti82c46x_qc_issue( + return ata_sff_qc_issue(qc); + } +=20 +-static struct ata_port_operations opti82c46x_port_ops =3D { ++static const struct ata_port_operations opti82c46x_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D opti82c46x_set_piomode, + .qc_issue =3D opti82c46x_qc_issue, +@@ -771,20 +771,20 @@ static int qdi_port(struct platform_devi + return 0; + } +=20 +-static struct ata_port_operations qdi6500_port_ops =3D { ++static const struct ata_port_operations qdi6500_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D qdi6500_set_piomode, + .qc_issue =3D qdi_qc_issue, + .sff_data_xfer =3D vlb32_data_xfer, + }; +=20 +-static struct ata_port_operations qdi6580_port_ops =3D { ++static const struct ata_port_operations qdi6580_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D qdi6580_set_piomode, + .sff_data_xfer =3D vlb32_data_xfer, + }; +=20 +-static struct ata_port_operations qdi6580dp_port_ops =3D { ++static const struct ata_port_operations qdi6580dp_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D qdi6580dp_set_piomode, + .sff_data_xfer =3D vlb32_data_xfer, +@@ -855,7 +855,7 @@ static int winbond_port(struct platform_ + return 0; + } +=20 +-static struct ata_port_operations winbond_port_ops =3D { ++static const struct ata_port_operations winbond_port_ops =3D { + .inherits =3D &legacy_base_port_ops, + .set_piomode =3D winbond_set_piomode, + .sff_data_xfer =3D vlb32_data_xfer, +@@ -978,7 +978,7 @@ static __init int legacy_init_one(struct + int pio_modes =3D controller->pio_mask; + unsigned long io =3D probe->port; + u32 mask =3D (1 << probe->slot); +- struct ata_port_operations *ops =3D controller->ops; ++ const struct ata_port_operations *ops =3D controller->ops; + struct legacy_data *ld =3D &legacy_data[probe->slot]; + struct ata_host *host =3D NULL; + struct ata_port *ap; +diff -urNp linux-2.6.32.45/drivers/ata/pata_marvell.c linux-2.6.32.45/dr= ivers/ata/pata_marvell.c +--- linux-2.6.32.45/drivers/ata/pata_marvell.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_marvell.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -100,7 +100,7 @@ static struct scsi_host_template marvell + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations marvell_ops =3D { ++static const struct ata_port_operations marvell_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D marvell_cable_detect, + .prereset =3D marvell_pre_reset, +diff -urNp linux-2.6.32.45/drivers/ata/pata_mpc52xx.c linux-2.6.32.45/dr= ivers/ata/pata_mpc52xx.c +--- linux-2.6.32.45/drivers/ata/pata_mpc52xx.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_mpc52xx.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations mpc52xx_ata_port_ops =3D { ++static const struct ata_port_operations mpc52xx_ata_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .sff_dev_select =3D mpc52xx_ata_dev_select, + .set_piomode =3D mpc52xx_ata_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_mpiix.c linux-2.6.32.45/driv= ers/ata/pata_mpiix.c +--- linux-2.6.32.45/drivers/ata/pata_mpiix.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_mpiix.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations mpiix_port_ops =3D { ++static const struct ata_port_operations mpiix_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .qc_issue =3D mpiix_qc_issue, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_netcell.c linux-2.6.32.45/dr= ivers/ata/pata_netcell.c +--- linux-2.6.32.45/drivers/ata/pata_netcell.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_netcell.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -34,7 +34,7 @@ static struct scsi_host_template netcell + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations netcell_ops =3D { ++static const struct ata_port_operations netcell_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_80wire, + .read_id =3D netcell_read_id, +diff -urNp linux-2.6.32.45/drivers/ata/pata_ninja32.c linux-2.6.32.45/dr= ivers/ata/pata_ninja32.c +--- linux-2.6.32.45/drivers/ata/pata_ninja32.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_ninja32.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations ninja32_port_ops =3D { ++static const struct ata_port_operations ninja32_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .sff_dev_select =3D ninja32_dev_select, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87410.c linux-2.6.32.45/dr= ivers/ata/pata_ns87410.c +--- linux-2.6.32.45/drivers/ata/pata_ns87410.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_ns87410.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations ns87410_port_ops =3D { ++static const struct ata_port_operations ns87410_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .qc_issue =3D ns87410_qc_issue, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_ns87415.c linux-2.6.32.45/dr= ivers/ata/pata_ns87415.c +--- linux-2.6.32.45/drivers/ata/pata_ns87415.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_ns87415.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at + } + #endif /* 87560 SuperIO Support */ +=20 +-static struct ata_port_operations ns87415_pata_ops =3D { ++static const struct ata_port_operations ns87415_pata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .check_atapi_dma =3D ns87415_check_atapi_dma, +@@ -313,7 +313,7 @@ static struct ata_port_operations ns8741 + }; +=20 + #if defined(CONFIG_SUPERIO) +-static struct ata_port_operations ns87560_pata_ops =3D { ++static const struct ata_port_operations ns87560_pata_ops =3D { + .inherits =3D &ns87415_pata_ops, + .sff_tf_read =3D ns87560_tf_read, + .sff_check_status =3D ns87560_check_status, +diff -urNp linux-2.6.32.45/drivers/ata/pata_octeon_cf.c linux-2.6.32.45/= drivers/ata/pata_octeon_cf.c +--- linux-2.6.32.45/drivers/ata/pata_octeon_cf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_octeon_cf.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s + return 0; + } +=20 ++/* cannot be const */ + static struct ata_port_operations octeon_cf_ops =3D { + .inherits =3D &ata_sff_port_ops, + .check_atapi_dma =3D octeon_cf_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/pata_oldpiix.c linux-2.6.32.45/dr= ivers/ata/pata_oldpiix.c +--- linux-2.6.32.45/drivers/ata/pata_oldpiix.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_oldpiix.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations oldpiix_pata_ops =3D { ++static const struct ata_port_operations oldpiix_pata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_issue =3D oldpiix_qc_issue, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_opti.c linux-2.6.32.45/drive= rs/ata/pata_opti.c +--- linux-2.6.32.45/drivers/ata/pata_opti.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_opti.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations opti_port_ops =3D { ++static const struct ata_port_operations opti_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D opti_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_optidma.c linux-2.6.32.45/dr= ivers/ata/pata_optidma.c +--- linux-2.6.32.45/drivers/ata/pata_optidma.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_optidma.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -337,7 +337,7 @@ static struct scsi_host_template optidma + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations optidma_port_ops =3D { ++static const struct ata_port_operations optidma_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_piomode =3D optidma_set_pio_mode, +@@ -346,7 +346,7 @@ static struct ata_port_operations optidm + .prereset =3D optidma_pre_reset, + }; +=20 +-static struct ata_port_operations optiplus_port_ops =3D { ++static const struct ata_port_operations optiplus_port_ops =3D { + .inherits =3D &optidma_port_ops, + .set_piomode =3D optiplus_set_pio_mode, + .set_dmamode =3D optiplus_set_dma_mode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_palmld.c linux-2.6.32.45/dri= vers/ata/pata_palmld.c +--- linux-2.6.32.45/drivers/ata/pata_palmld.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_palmld.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations palmld_port_ops =3D { ++static const struct ata_port_operations palmld_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pata_pcmcia.c linux-2.6.32.45/dri= vers/ata/pata_pcmcia.c +--- linux-2.6.32.45/drivers/ata/pata_pcmcia.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_pcmcia.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pcmcia_port_ops =3D { ++static const struct ata_port_operations pcmcia_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + .cable_detect =3D ata_cable_40wire, + .set_mode =3D pcmcia_set_mode, + }; +=20 +-static struct ata_port_operations pcmcia_8bit_port_ops =3D { ++static const struct ata_port_operations pcmcia_8bit_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ata_data_xfer_8bit, + .cable_detect =3D ata_cable_40wire, +@@ -256,7 +256,7 @@ static int pcmcia_init_one(struct pcmcia + unsigned long io_base, ctl_base; + void __iomem *io_addr, *ctl_addr; + int n_ports =3D 1; +- struct ata_port_operations *ops =3D &pcmcia_port_ops; ++ const struct ata_port_operations *ops =3D &pcmcia_port_ops; +=20 + info =3D kzalloc(sizeof(*info), GFP_KERNEL); + if (info =3D=3D NULL) +diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc2027x.c linux-2.6.32.45/d= rivers/ata/pata_pdc2027x.c +--- linux-2.6.32.45/drivers/ata/pata_pdc2027x.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_pdc2027x.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pdc2027x_pata100_ops =3D { ++static const struct ata_port_operations pdc2027x_pata100_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .check_atapi_dma =3D pdc2027x_check_atapi_dma, + .cable_detect =3D pdc2027x_cable_detect, + .prereset =3D pdc2027x_prereset, + }; +=20 +-static struct ata_port_operations pdc2027x_pata133_ops =3D { ++static const struct ata_port_operations pdc2027x_pata133_ops =3D { + .inherits =3D &pdc2027x_pata100_ops, + .mode_filter =3D pdc2027x_mode_filter, + .set_piomode =3D pdc2027x_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.= 45/drivers/ata/pata_pdc202xx_old.c +--- linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_pdc202xx_old.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -274,7 +274,7 @@ static struct scsi_host_template pdc202x + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pdc2024x_port_ops =3D { ++static const struct ata_port_operations pdc2024x_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .cable_detect =3D ata_cable_40wire, +@@ -284,7 +284,7 @@ static struct ata_port_operations pdc202 + .sff_exec_command =3D pdc202xx_exec_command, + }; +=20 +-static struct ata_port_operations pdc2026x_port_ops =3D { ++static const struct ata_port_operations pdc2026x_port_ops =3D { + .inherits =3D &pdc2024x_port_ops, +=20 + .check_atapi_dma =3D pdc2026x_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/pata_platform.c linux-2.6.32.45/d= rivers/ata/pata_platform.c +--- linux-2.6.32.45/drivers/ata/pata_platform.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_platform.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations pata_platform_port_ops =3D { ++static const struct ata_port_operations pata_platform_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + .cable_detect =3D ata_cable_unknown, +diff -urNp linux-2.6.32.45/drivers/ata/pata_qdi.c linux-2.6.32.45/driver= s/ata/pata_qdi.c +--- linux-2.6.32.45/drivers/ata/pata_qdi.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_qdi.c 2011-04-17 15:56:46.000000000= -0400 +@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations qdi6500_port_ops =3D { ++static const struct ata_port_operations qdi6500_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .qc_issue =3D qdi_qc_issue, + .sff_data_xfer =3D qdi_data_xfer, +@@ -165,7 +165,7 @@ static struct ata_port_operations qdi650 + .set_piomode =3D qdi6500_set_piomode, + }; +=20 +-static struct ata_port_operations qdi6580_port_ops =3D { ++static const struct ata_port_operations qdi6580_port_ops =3D { + .inherits =3D &qdi6500_port_ops, + .set_piomode =3D qdi6580_set_piomode, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_radisys.c linux-2.6.32.45/dr= ivers/ata/pata_radisys.c +--- linux-2.6.32.45/drivers/ata/pata_radisys.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_radisys.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -187,7 +187,7 @@ static struct scsi_host_template radisys + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations radisys_pata_ops =3D { ++static const struct ata_port_operations radisys_pata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_issue =3D radisys_qc_issue, + .cable_detect =3D ata_cable_unknown, +diff -urNp linux-2.6.32.45/drivers/ata/pata_rb532_cf.c linux-2.6.32.45/d= rivers/ata/pata_rb532_cf.c +--- linux-2.6.32.45/drivers/ata/pata_rb532_cf.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_rb532_cf.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle + return IRQ_HANDLED; + } +=20 +-static struct ata_port_operations rb532_pata_port_ops =3D { ++static const struct ata_port_operations rb532_pata_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer32, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_rdc.c linux-2.6.32.45/driver= s/ata/pata_rdc.c +--- linux-2.6.32.45/drivers/ata/pata_rdc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_rdc.c 2011-04-17 15:56:46.000000000= -0400 +@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p + pci_write_config_byte(dev, 0x48, udma_enable); + } +=20 +-static struct ata_port_operations rdc_pata_ops =3D { ++static const struct ata_port_operations rdc_pata_ops =3D { + .inherits =3D &ata_bmdma32_port_ops, + .cable_detect =3D rdc_pata_cable_detect, + .set_piomode =3D rdc_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_rz1000.c linux-2.6.32.45/dri= vers/ata/pata_rz1000.c +--- linux-2.6.32.45/drivers/ata/pata_rz1000.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_rz1000.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations rz1000_port_ops =3D { ++static const struct ata_port_operations rz1000_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .cable_detect =3D ata_cable_40wire, + .set_mode =3D rz1000_set_mode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_sc1200.c linux-2.6.32.45/dri= vers/ata/pata_sc1200.c +--- linux-2.6.32.45/drivers/ata/pata_sc1200.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_sc1200.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ + .sg_tablesize =3D LIBATA_DUMB_MAX_PRD, + }; +=20 +-static struct ata_port_operations sc1200_port_ops =3D { ++static const struct ata_port_operations sc1200_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_prep =3D ata_sff_dumb_qc_prep, + .qc_issue =3D sc1200_qc_issue, +diff -urNp linux-2.6.32.45/drivers/ata/pata_scc.c linux-2.6.32.45/driver= s/ata/pata_scc.c +--- linux-2.6.32.45/drivers/ata/pata_scc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_scc.c 2011-04-17 15:56:46.000000000= -0400 +@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations scc_pata_ops =3D { ++static const struct ata_port_operations scc_pata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, +=20 + .set_piomode =3D scc_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_sch.c linux-2.6.32.45/driver= s/ata/pata_sch.c +--- linux-2.6.32.45/drivers/ata/pata_sch.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_sch.c 2011-04-17 15:56:46.000000000= -0400 +@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations sch_pata_ops =3D { ++static const struct ata_port_operations sch_pata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D ata_cable_unknown, + .set_piomode =3D sch_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_serverworks.c linux-2.6.32.4= 5/drivers/ata/pata_serverworks.c +--- linux-2.6.32.45/drivers/ata/pata_serverworks.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_serverworks.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -299,7 +299,7 @@ static struct scsi_host_template serverw + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations serverworks_osb4_port_ops =3D { ++static const struct ata_port_operations serverworks_osb4_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D serverworks_cable_detect, + .mode_filter =3D serverworks_osb4_filter, +@@ -307,7 +307,7 @@ static struct ata_port_operations server + .set_dmamode =3D serverworks_set_dmamode, + }; +=20 +-static struct ata_port_operations serverworks_csb_port_ops =3D { ++static const struct ata_port_operations serverworks_csb_port_ops =3D { + .inherits =3D &serverworks_osb4_port_ops, + .mode_filter =3D serverworks_csb_filter, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_sil680.c linux-2.6.32.45/dri= vers/ata/pata_sil680.c +--- linux-2.6.32.45/drivers/ata/pata_sil680.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_sil680.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations sil680_port_ops =3D { ++static const struct ata_port_operations sil680_port_ops =3D { + .inherits =3D &ata_bmdma32_port_ops, + .cable_detect =3D sil680_cable_detect, + .set_piomode =3D sil680_set_piomode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_sis.c linux-2.6.32.45/driver= s/ata/pata_sis.c +--- linux-2.6.32.45/drivers/ata/pata_sis.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_sis.c 2011-04-17 15:56:46.000000000= -0400 +@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations sis_133_for_sata_ops =3D { ++static const struct ata_port_operations sis_133_for_sata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .set_piomode =3D sis_133_set_piomode, + .set_dmamode =3D sis_133_set_dmamode, + .cable_detect =3D sis_133_cable_detect, + }; +=20 +-static struct ata_port_operations sis_base_ops =3D { ++static const struct ata_port_operations sis_base_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .prereset =3D sis_pre_reset, + }; +=20 +-static struct ata_port_operations sis_133_ops =3D { ++static const struct ata_port_operations sis_133_ops =3D { + .inherits =3D &sis_base_ops, + .set_piomode =3D sis_133_set_piomode, + .set_dmamode =3D sis_133_set_dmamode, + .cable_detect =3D sis_133_cable_detect, + }; +=20 +-static struct ata_port_operations sis_133_early_ops =3D { ++static const struct ata_port_operations sis_133_early_ops =3D { + .inherits =3D &sis_base_ops, + .set_piomode =3D sis_100_set_piomode, + .set_dmamode =3D sis_133_early_set_dmamode, + .cable_detect =3D sis_66_cable_detect, + }; +=20 +-static struct ata_port_operations sis_100_ops =3D { ++static const struct ata_port_operations sis_100_ops =3D { + .inherits =3D &sis_base_ops, + .set_piomode =3D sis_100_set_piomode, + .set_dmamode =3D sis_100_set_dmamode, + .cable_detect =3D sis_66_cable_detect, + }; +=20 +-static struct ata_port_operations sis_66_ops =3D { ++static const struct ata_port_operations sis_66_ops =3D { + .inherits =3D &sis_base_ops, + .set_piomode =3D sis_old_set_piomode, + .set_dmamode =3D sis_66_set_dmamode, + .cable_detect =3D sis_66_cable_detect, + }; +=20 +-static struct ata_port_operations sis_old_ops =3D { ++static const struct ata_port_operations sis_old_ops =3D { + .inherits =3D &sis_base_ops, + .set_piomode =3D sis_old_set_piomode, + .set_dmamode =3D sis_old_set_dmamode, +diff -urNp linux-2.6.32.45/drivers/ata/pata_sl82c105.c linux-2.6.32.45/d= rivers/ata/pata_sl82c105.c +--- linux-2.6.32.45/drivers/ata/pata_sl82c105.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_sl82c105.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations sl82c105_port_ops =3D { ++static const struct ata_port_operations sl82c105_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .qc_defer =3D sl82c105_qc_defer, + .bmdma_start =3D sl82c105_bmdma_start, +diff -urNp linux-2.6.32.45/drivers/ata/pata_triflex.c linux-2.6.32.45/dr= ivers/ata/pata_triflex.c +--- linux-2.6.32.45/drivers/ata/pata_triflex.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_triflex.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -178,7 +178,7 @@ static struct scsi_host_template triflex + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations triflex_port_ops =3D { ++static const struct ata_port_operations triflex_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .bmdma_start =3D triflex_bmdma_start, + .bmdma_stop =3D triflex_bmdma_stop, +diff -urNp linux-2.6.32.45/drivers/ata/pata_via.c linux-2.6.32.45/driver= s/ata/pata_via.c +--- linux-2.6.32.45/drivers/ata/pata_via.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pata_via.c 2011-04-17 15:56:46.000000000= -0400 +@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations via_port_ops =3D { ++static const struct ata_port_operations via_port_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .cable_detect =3D via_cable_detect, + .set_piomode =3D via_set_piomode, +@@ -429,7 +429,7 @@ static struct ata_port_operations via_po + .port_start =3D via_port_start, + }; +=20 +-static struct ata_port_operations via_port_ops_noirq =3D { ++static const struct ata_port_operations via_port_ops_noirq =3D { + .inherits =3D &via_port_ops, + .sff_data_xfer =3D ata_sff_data_xfer_noirq, + }; +diff -urNp linux-2.6.32.45/drivers/ata/pata_winbond.c linux-2.6.32.45/dr= ivers/ata/pata_winbond.c +--- linux-2.6.32.45/drivers/ata/pata_winbond.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/pata_winbond.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -125,7 +125,7 @@ static struct scsi_host_template winbond + ATA_PIO_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations winbond_port_ops =3D { ++static const struct ata_port_operations winbond_port_ops =3D { + .inherits =3D &ata_sff_port_ops, + .sff_data_xfer =3D winbond_data_xfer, + .cable_detect =3D ata_cable_40wire, +diff -urNp linux-2.6.32.45/drivers/ata/pdc_adma.c linux-2.6.32.45/driver= s/ata/pdc_adma.c +--- linux-2.6.32.45/drivers/ata/pdc_adma.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/pdc_adma.c 2011-04-17 15:56:46.000000000= -0400 +@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at + .dma_boundary =3D ADMA_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations adma_ata_ops =3D { ++static const struct ata_port_operations adma_ata_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .lost_interrupt =3D ATA_OP_NULL, +diff -urNp linux-2.6.32.45/drivers/ata/sata_fsl.c linux-2.6.32.45/driver= s/ata/sata_fsl.c +--- linux-2.6.32.45/drivers/ata/sata_fsl.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_fsl.c 2011-04-17 15:56:46.000000000= -0400 +@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs + .dma_boundary =3D ATA_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations sata_fsl_ops =3D { ++static const struct ata_port_operations sata_fsl_ops =3D { + .inherits =3D &sata_pmp_port_ops, +=20 + .qc_defer =3D ata_std_qc_defer, +diff -urNp linux-2.6.32.45/drivers/ata/sata_inic162x.c linux-2.6.32.45/d= rivers/ata/sata_inic162x.c +--- linux-2.6.32.45/drivers/ata/sata_inic162x.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ata/sata_inic162x.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po + return 0; + } +=20 +-static struct ata_port_operations inic_port_ops =3D { ++static const struct ata_port_operations inic_port_ops =3D { + .inherits =3D &sata_port_ops, +=20 + .check_atapi_dma =3D inic_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/sata_mv.c linux-2.6.32.45/drivers= /ata/sata_mv.c +--- linux-2.6.32.45/drivers/ata/sata_mv.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/ata/sata_mv.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht + .dma_boundary =3D MV_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations mv5_ops =3D { ++static const struct ata_port_operations mv5_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .lost_interrupt =3D ATA_OP_NULL, +@@ -678,7 +678,7 @@ static struct ata_port_operations mv5_op + .port_stop =3D mv_port_stop, + }; +=20 +-static struct ata_port_operations mv6_ops =3D { ++static const struct ata_port_operations mv6_ops =3D { + .inherits =3D &mv5_ops, + .dev_config =3D mv6_dev_config, + .scr_read =3D mv_scr_read, +@@ -698,7 +698,7 @@ static struct ata_port_operations mv6_op + .bmdma_status =3D mv_bmdma_status, + }; +=20 +-static struct ata_port_operations mv_iie_ops =3D { ++static const struct ata_port_operations mv_iie_ops =3D { + .inherits =3D &mv6_ops, + .dev_config =3D ATA_OP_NULL, + .qc_prep =3D mv_qc_prep_iie, +diff -urNp linux-2.6.32.45/drivers/ata/sata_nv.c linux-2.6.32.45/drivers= /ata/sata_nv.c +--- linux-2.6.32.45/drivers/ata/sata_nv.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/ata/sata_nv.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc + * cases. Define nv_hardreset() which only kicks in for post-boot + * probing and use it for all variants. + */ +-static struct ata_port_operations nv_generic_ops =3D { ++static const struct ata_port_operations nv_generic_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .lost_interrupt =3D ATA_OP_NULL, + .scr_read =3D nv_scr_read, +@@ -472,20 +472,20 @@ static struct ata_port_operations nv_gen + .hardreset =3D nv_hardreset, + }; +=20 +-static struct ata_port_operations nv_nf2_ops =3D { ++static const struct ata_port_operations nv_nf2_ops =3D { + .inherits =3D &nv_generic_ops, + .freeze =3D nv_nf2_freeze, + .thaw =3D nv_nf2_thaw, + }; +=20 +-static struct ata_port_operations nv_ck804_ops =3D { ++static const struct ata_port_operations nv_ck804_ops =3D { + .inherits =3D &nv_generic_ops, + .freeze =3D nv_ck804_freeze, + .thaw =3D nv_ck804_thaw, + .host_stop =3D nv_ck804_host_stop, + }; +=20 +-static struct ata_port_operations nv_adma_ops =3D { ++static const struct ata_port_operations nv_adma_ops =3D { + .inherits =3D &nv_ck804_ops, +=20 + .check_atapi_dma =3D nv_adma_check_atapi_dma, +@@ -509,7 +509,7 @@ static struct ata_port_operations nv_adm + .host_stop =3D nv_adma_host_stop, + }; +=20 +-static struct ata_port_operations nv_swncq_ops =3D { ++static const struct ata_port_operations nv_swncq_ops =3D { + .inherits =3D &nv_generic_ops, +=20 + .qc_defer =3D ata_std_qc_defer, +diff -urNp linux-2.6.32.45/drivers/ata/sata_promise.c linux-2.6.32.45/dr= ivers/ata/sata_promise.c +--- linux-2.6.32.45/drivers/ata/sata_promise.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/ata/sata_promise.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -195,7 +195,7 @@ static const struct ata_port_operations=20 + .error_handler =3D pdc_error_handler, + }; +=20 +-static struct ata_port_operations pdc_sata_ops =3D { ++static const struct ata_port_operations pdc_sata_ops =3D { + .inherits =3D &pdc_common_ops, + .cable_detect =3D pdc_sata_cable_detect, + .freeze =3D pdc_sata_freeze, +@@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sa +=20 + /* 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 =3D { ++static const struct ata_port_operations pdc_old_sata_ops =3D { + .inherits =3D &pdc_sata_ops, + .freeze =3D pdc_freeze, + .thaw =3D pdc_thaw, + .check_atapi_dma =3D pdc_old_sata_check_atapi_dma, + }; +=20 +-static struct ata_port_operations pdc_pata_ops =3D { ++static const struct ata_port_operations pdc_pata_ops =3D { + .inherits =3D &pdc_common_ops, + .cable_detect =3D pdc_pata_cable_detect, + .freeze =3D pdc_freeze, +diff -urNp linux-2.6.32.45/drivers/ata/sata_qstor.c linux-2.6.32.45/driv= ers/ata/sata_qstor.c +--- linux-2.6.32.45/drivers/ata/sata_qstor.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/sata_qstor.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ + .dma_boundary =3D QS_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations qs_ata_ops =3D { ++static const struct ata_port_operations qs_ata_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .check_atapi_dma =3D qs_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/sata_sil24.c linux-2.6.32.45/driv= ers/ata/sata_sil24.c +--- linux-2.6.32.45/drivers/ata/sata_sil24.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ata/sata_sil24.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s + .dma_boundary =3D ATA_DMA_BOUNDARY, + }; +=20 +-static struct ata_port_operations sil24_ops =3D { ++static const struct ata_port_operations sil24_ops =3D { + .inherits =3D &sata_pmp_port_ops, +=20 + .qc_defer =3D sil24_qc_defer, +diff -urNp linux-2.6.32.45/drivers/ata/sata_sil.c linux-2.6.32.45/driver= s/ata/sata_sil.c +--- linux-2.6.32.45/drivers/ata/sata_sil.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_sil.c 2011-04-17 15:56:46.000000000= -0400 +@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht + .sg_tablesize =3D ATA_MAX_PRD + }; +=20 +-static struct ata_port_operations sil_ops =3D { ++static const struct ata_port_operations sil_ops =3D { + .inherits =3D &ata_bmdma32_port_ops, + .dev_config =3D sil_dev_config, + .set_mode =3D sil_set_mode, +diff -urNp linux-2.6.32.45/drivers/ata/sata_sis.c linux-2.6.32.45/driver= s/ata/sata_sis.c +--- linux-2.6.32.45/drivers/ata/sata_sis.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_sis.c 2011-04-17 15:56:46.000000000= -0400 +@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations sis_ops =3D { ++static const struct ata_port_operations sis_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .scr_read =3D sis_scr_read, + .scr_write =3D sis_scr_write, +diff -urNp linux-2.6.32.45/drivers/ata/sata_svw.c linux-2.6.32.45/driver= s/ata/sata_svw.c +--- linux-2.6.32.45/drivers/ata/sata_svw.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_svw.c 2011-04-17 15:56:46.000000000= -0400 +@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata + }; +=20 +=20 +-static struct ata_port_operations k2_sata_ops =3D { ++static const struct ata_port_operations k2_sata_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .sff_tf_load =3D k2_sata_tf_load, + .sff_tf_read =3D k2_sata_tf_read, +diff -urNp linux-2.6.32.45/drivers/ata/sata_sx4.c linux-2.6.32.45/driver= s/ata/sata_sx4.c +--- linux-2.6.32.45/drivers/ata/sata_sx4.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_sx4.c 2011-04-17 15:56:46.000000000= -0400 +@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat + }; +=20 + /* TODO: inherit from base port_ops after converting to new EH */ +-static struct ata_port_operations pdc_20621_ops =3D { ++static const struct ata_port_operations pdc_20621_ops =3D { + .inherits =3D &ata_sff_port_ops, +=20 + .check_atapi_dma =3D pdc_check_atapi_dma, +diff -urNp linux-2.6.32.45/drivers/ata/sata_uli.c linux-2.6.32.45/driver= s/ata/sata_uli.c +--- linux-2.6.32.45/drivers/ata/sata_uli.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_uli.c 2011-04-17 15:56:46.000000000= -0400 +@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations uli_ops =3D { ++static const struct ata_port_operations uli_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .scr_read =3D uli_scr_read, + .scr_write =3D uli_scr_write, +diff -urNp linux-2.6.32.45/drivers/ata/sata_via.c linux-2.6.32.45/driver= s/ata/sata_via.c +--- linux-2.6.32.45/drivers/ata/sata_via.c 2011-05-10 22:12:01.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_via.c 2011-05-10 22:15:08.000000000= -0400 +@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sh + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations svia_base_ops =3D { ++static const struct ata_port_operations svia_base_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .sff_tf_load =3D svia_tf_load, + }; +=20 +-static struct ata_port_operations vt6420_sata_ops =3D { ++static const struct ata_port_operations vt6420_sata_ops =3D { + .inherits =3D &svia_base_ops, + .freeze =3D svia_noop_freeze, + .prereset =3D vt6420_prereset, + .bmdma_start =3D vt6420_bmdma_start, + }; +=20 +-static struct ata_port_operations vt6421_pata_ops =3D { ++static const struct ata_port_operations vt6421_pata_ops =3D { + .inherits =3D &svia_base_ops, + .cable_detect =3D vt6421_pata_cable_detect, + .set_piomode =3D vt6421_set_pio_mode, + .set_dmamode =3D vt6421_set_dma_mode, + }; +=20 +-static struct ata_port_operations vt6421_sata_ops =3D { ++static const struct ata_port_operations vt6421_sata_ops =3D { + .inherits =3D &svia_base_ops, + .scr_read =3D svia_scr_read, + .scr_write =3D svia_scr_write, + }; +=20 +-static struct ata_port_operations vt8251_ops =3D { ++static const struct ata_port_operations vt8251_ops =3D { + .inherits =3D &svia_base_ops, + .hardreset =3D sata_std_hardreset, + .scr_read =3D vt8251_scr_read, +diff -urNp linux-2.6.32.45/drivers/ata/sata_vsc.c linux-2.6.32.45/driver= s/ata/sata_vsc.c +--- linux-2.6.32.45/drivers/ata/sata_vsc.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/ata/sata_vsc.c 2011-04-17 15:56:46.000000000= -0400 +@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat + }; +=20 +=20 +-static struct ata_port_operations vsc_sata_ops =3D { ++static const struct ata_port_operations vsc_sata_ops =3D { + .inherits =3D &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.32.45/drivers/atm/adummy.c linux-2.6.32.45/drivers/= atm/adummy.c +--- linux-2.6.32.45/drivers/atm/adummy.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/atm/adummy.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct=20 + vcc->pop(vcc, skb); + else + dev_kfree_skb_any(skb); +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); +=20 + return 0; + } +diff -urNp linux-2.6.32.45/drivers/atm/ambassador.c linux-2.6.32.45/driv= ers/atm/ambassador.c +--- linux-2.6.32.45/drivers/atm/ambassador.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/atm/ambassador.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,=20 + PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); + =20 + // VC layer stats +- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); ++ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); + =20 + // free the descriptor + kfree (tx_descr); +@@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev,=20 + dump_skb ("<<<", vc, skb); + =20 + // VC layer stats +- atomic_inc(&atm_vcc->stats->rx); ++ atomic_inc_unchecked(&atm_vcc->stats->rx); + __net_timestamp(skb); + // end of our responsability + atm_vcc->push (atm_vcc, skb); +@@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev,=20 + } else { + PRINTK (KERN_INFO, "dropped over-size frame"); + // should we count this? +- atomic_inc(&atm_vcc->stats->rx_drop); ++ atomic_inc_unchecked(&atm_vcc->stats->rx_drop); + } + =20 + } else { +@@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * at + } + =20 + if (check_area (skb->data, skb->len)) { +- atomic_inc(&atm_vcc->stats->tx_err); ++ atomic_inc_unchecked(&atm_vcc->stats->tx_err); + return -ENOMEM; // ? + } + =20 +diff -urNp linux-2.6.32.45/drivers/atm/atmtcp.c linux-2.6.32.45/drivers/= atm/atmtcp.c +--- linux-2.6.32.45/drivers/atm/atmtcp.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/atm/atmtcp.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc=20 + if (vcc->pop) vcc->pop(vcc,skb); + else dev_kfree_skb(skb); + if (dev_data) return 0; +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + return -ENOLINK; + } + size =3D skb->len+sizeof(struct atmtcp_hdr); +@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc=20 + if (!new_skb) { + if (vcc->pop) vcc->pop(vcc,skb); + else dev_kfree_skb(skb); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + return -ENOBUFS; + } + hdr =3D (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr)); +@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc=20 + if (vcc->pop) vcc->pop(vcc,skb); + else dev_kfree_skb(skb); + out_vcc->push(out_vcc,new_skb); +- atomic_inc(&vcc->stats->tx); +- atomic_inc(&out_vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->tx); ++ atomic_inc_unchecked(&out_vcc->stats->rx); + return 0; + } +=20 +@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc=20 + out_vcc =3D find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci)); + read_unlock(&vcc_sklist_lock); + if (!out_vcc) { +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + goto done; + } + skb_pull(skb,sizeof(struct atmtcp_hdr)); +@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc=20 + __net_timestamp(new_skb); + skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len); + out_vcc->push(out_vcc,new_skb); +- atomic_inc(&vcc->stats->tx); +- atomic_inc(&out_vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->tx); ++ atomic_inc_unchecked(&out_vcc->stats->rx); + done: + if (vcc->pop) vcc->pop(vcc,skb); + else dev_kfree_skb(skb); +diff -urNp linux-2.6.32.45/drivers/atm/eni.c linux-2.6.32.45/drivers/atm= /eni.c +--- linux-2.6.32.45/drivers/atm/eni.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/atm/eni.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) + DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", + vcc->dev->number); + length =3D 0; +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + } + else { + length =3D ATM_CELL_SIZE-1; /* no HEC */ +@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc) + size); + } + eff =3D length =3D 0; +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + } + else { + size =3D (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2); +@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc) + "(VCI=3D%d,length=3D%ld,size=3D%ld (descr 0x%lx))\n", + vcc->dev->number,vcc->vci,length,size << 2,descr); + length =3D eff =3D 0; +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + } + } + skb =3D eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL; +@@ -770,7 +770,7 @@ rx_dequeued++; + vcc->push(vcc,skb); + pushed++; + } +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } + wake_up(&eni_dev->rx_wait); + } +@@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *d + PCI_DMA_TODEVICE); + if (vcc->pop) vcc->pop(vcc,skb); + else dev_kfree_skb_irq(skb); +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + wake_up(&eni_dev->tx_wait); + dma_complete++; + } +diff -urNp linux-2.6.32.45/drivers/atm/firestream.c linux-2.6.32.45/driv= ers/atm/firestream.c +--- linux-2.6.32.45/drivers/atm/firestream.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/atm/firestream.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -748,7 +748,7 @@ static void process_txdone_queue (struct + } + } +=20 +- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); ++ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); +=20 + fs_dprintk (FS_DEBUG_TXMEM, "i"); + fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb); +@@ -815,7 +815,7 @@ static void process_incoming (struct fs_ + #endif + skb_put (skb, qe->p1 & 0xffff);=20 + ATM_SKB(skb)->vcc =3D atm_vcc; +- atomic_inc(&atm_vcc->stats->rx); ++ atomic_inc_unchecked(&atm_vcc->stats->rx); + __net_timestamp(skb); + fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb); + atm_vcc->push (atm_vcc, skb); +@@ -836,12 +836,12 @@ static void process_incoming (struct fs_ + kfree (pe); + } + if (atm_vcc) +- atomic_inc(&atm_vcc->stats->rx_drop); ++ atomic_inc_unchecked(&atm_vcc->stats->rx_drop); + break; + case 0x1f: /* Reassembly abort: no buffers. */ + /* Silently increment error counter. */ + if (atm_vcc) +- atomic_inc(&atm_vcc->stats->rx_drop); ++ atomic_inc_unchecked(&atm_vcc->stats->rx_drop); + 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= ",=20 +diff -urNp linux-2.6.32.45/drivers/atm/fore200e.c linux-2.6.32.45/driver= s/atm/fore200e.c +--- linux-2.6.32.45/drivers/atm/fore200e.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/atm/fore200e.c 2011-04-17 15:56:46.000000000= -0400 +@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 + #endif + /* check error condition */ + if (*entry->status & STATUS_ERROR) +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + else +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + } + } +=20 +@@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore2 + if (skb =3D=3D NULL) { + DPRINTK(2, "unable to alloc new skb, rx PDU length =3D %d\n", pdu_len)= ; +=20 +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + return -ENOMEM; + }=20 +=20 +@@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore2 +=20 + dev_kfree_skb_any(skb); +=20 +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + return -ENOMEM; + } +=20 + ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >=3D 0); +=20 + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >=3D 0); +=20 +@@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200 + DPRINTK(2, "damaged PDU on %d.%d.%d\n", + fore200e->atm_dev->number, + entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + } + } +=20 +@@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struc + goto retry_here; + } +=20 +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); +=20 + fore200e->tx_sat++; + DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - hear= tbeat is %08x\n", +diff -urNp linux-2.6.32.45/drivers/atm/he.c linux-2.6.32.45/drivers/atm/= he.c +--- linux-2.6.32.45/drivers/atm/he.c 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/atm/he.c 2011-04-17 15:56:46.000000000 -0400 +@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i +=20 + if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { + hprintk("HBUF_ERR! (cid 0x%x)\n", cid); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + goto return_host_buffers; + } +=20 +@@ -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); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto return_host_buffers; + } +=20 +@@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, i + vcc->push(vcc, skb); + spin_lock(&he_dev->global_lock); +=20 +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + return_host_buffers: + ++pdus_assembled; +@@ -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); +- atomic_inc(&tpd->vcc->stats->tx_err); ++ atomic_inc_unchecked(&tpd->vcc->stats->tx_err); + } + pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status)); + return; +@@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_b + vcc->pop(vcc, skb); + else + dev_kfree_skb_any(skb); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + return -EINVAL; + } +=20 +@@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_b + vcc->pop(vcc, skb); + else + dev_kfree_skb_any(skb); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + return -EINVAL; + } + #endif +@@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_b + vcc->pop(vcc, skb); + else + dev_kfree_skb_any(skb); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + spin_unlock_irqrestore(&he_dev->global_lock, flags); + return -ENOMEM; + } +@@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_b + vcc->pop(vcc, skb); + else + dev_kfree_skb_any(skb); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + spin_unlock_irqrestore(&he_dev->global_lock, flags); + return -ENOMEM; + } +@@ -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); +=20 +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); +=20 + return 0; + } +diff -urNp linux-2.6.32.45/drivers/atm/horizon.c linux-2.6.32.45/drivers= /atm/horizon.c +--- linux-2.6.32.45/drivers/atm/horizon.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/atm/horizon.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,=20 + { + struct atm_vcc * vcc =3D ATM_SKB(skb)->vcc; + // VC layer stats +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + __net_timestamp(skb); + // end of our responsability + vcc->push (vcc, skb); +@@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const + dev->tx_iovec =3D NULL; + =09 + // VC layer stats +- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx); ++ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx); + =09 + // free the skb + hrz_kfree_skb (skb); +diff -urNp linux-2.6.32.45/drivers/atm/idt77252.c linux-2.6.32.45/driver= s/atm/idt77252.c +--- linux-2.6.32.45/drivers/atm/idt77252.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/atm/idt77252.c 2011-04-17 15:56:46.000000000= -0400 +@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str + else + dev_kfree_skb(skb); +=20 +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + } +=20 + atomic_dec(&scq->used); +@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, st + if ((sb =3D dev_alloc_skb(64)) =3D=3D NULL) { + printk("%s: Can't allocate buffers for aal0.\n", + card->name); +- atomic_add(i, &vcc->stats->rx_drop); ++ atomic_add_unchecked(i, &vcc->stats->rx_drop); + break; + } + if (!atm_charge(vcc, sb->truesize)) { + RXPRINTK("%s: atm_charge() dropped aal0 packets.\n", + card->name); +- atomic_add(i - 1, &vcc->stats->rx_drop); ++ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); + dev_kfree_skb(sb); + break; + } +@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, st + ATM_SKB(sb)->vcc =3D vcc; + __net_timestamp(sb); + vcc->push(vcc, sb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + cell +=3D ATM_CELL_PAYLOAD; + } +@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, st + "(CDC: %08x)\n", + card->name, len, rpp->len, readl(SAR_REG_CDC)); + recycle_rx_pool_skb(card, rpp); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + return; + } + if (stat & SAR_RSQE_CRC) { + RXPRINTK("%s: AAL5 CRC error.\n", card->name); + recycle_rx_pool_skb(card, rpp); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + return; + } + if (skb_queue_len(&rpp->queue) > 1) { +@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, st + RXPRINTK("%s: Can't alloc RX skb.\n", + card->name); + recycle_rx_pool_skb(card, rpp); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + return; + } + if (!atm_charge(vcc, skb->truesize)) { +@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, st + __net_timestamp(skb); +=20 + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + return; + } +@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, st + __net_timestamp(skb); +=20 + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + if (skb->truesize > SAR_FB_SIZE_3) + add_rx_skb(card, 3, SAR_FB_SIZE_3, 1); +@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *car + if (vcc->qos.aal !=3D ATM_AAL0) { + RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n", + card->name, vpi, vci); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + goto drop; + } + =09 + if ((sb =3D dev_alloc_skb(64)) =3D=3D NULL) { + printk("%s: Can't allocate buffers for AAL0.\n", + card->name); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto drop; + } +=20 +@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car + ATM_SKB(sb)->vcc =3D vcc; + __net_timestamp(sb); + vcc->push(vcc, sb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); +=20 + drop: + skb_pull(queue, 64); +@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s +=20 + if (vc =3D=3D NULL) { + printk("%s: NULL connection in send().\n", card->name); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb(skb); + return -EINVAL; + } + if (!test_bit(VCF_TX, &vc->flags)) { + printk("%s: Trying to transmit on a non-tx VC.\n", card->name); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb(skb); + return -EINVAL; + } +@@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, s + break; + default: + printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb(skb); + return -EINVAL; + } +=20 + if (skb_shinfo(skb)->nr_frags !=3D 0) { + printk("%s: No scatter-gather yet.\n", card->name); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb(skb); + return -EINVAL; + } +@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s +=20 + err =3D queue_skb(card, vc, skb, oam); + if (err) { +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb(skb); + return err; + } +@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v + skb =3D dev_alloc_skb(64); + if (!skb) { + printk("%s: Out of memory in send_oam().\n", card->name); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + return -ENOMEM; + } + atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); +diff -urNp linux-2.6.32.45/drivers/atm/iphase.c linux-2.6.32.45/drivers/= atm/iphase.c +--- linux-2.6.32.45/drivers/atm/iphase.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/atm/iphase.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) =20 + status =3D (u_short) (buf_desc_ptr->desc_mode); =20 + if (status & (RX_CER | RX_PTE | RX_OFL)) =20 + { =20 +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + IF_ERR(printk("IA: bad packet, dropping it");) =20 + if (status & RX_CER) {=20 + IF_ERR(printk(" cause: packet CRC error\n");) +@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev) =20 + len =3D dma_addr - buf_addr; =20 + if (len > iadev->rx_buf_sz) { + printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx= _buf_sz); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto out_free_desc; + } + =20 +@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev * + ia_vcc =3D INPH_IA_VCC(vcc); + if (ia_vcc =3D=3D NULL) + { +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + dev_kfree_skb_any(skb); + atm_return(vcc, atm_guess_pdu2truesize(len)); + goto INCR_DLE; +@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev * + if ((length > iadev->rx_buf_sz) || (length >=20 + (skb->len - sizeof(struct cpcs_trailer)))= ) + { +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len = %d)",=20 + length, skb= ->len);) + dev_kfree_skb_any(skb); +@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev * +=20 + IF_RX(printk("rx_dle_intr: skb push");) =20 + vcc->push(vcc,skb); =20 +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + iadev->rx_pkt_cnt++; + } =20 + INCR_DLE: +@@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev, + { + struct k_sonet_stats *stats; + stats =3D &PRIV(_ia_dev[board])->sonet_stats; +- printk("section_bip: %d\n", atomic_read(&stats->section_bi= p)); +- printk("line_bip : %d\n", atomic_read(&stats->line_bip))= ; +- printk("path_bip : %d\n", atomic_read(&stats->path_bip))= ; +- printk("line_febe : %d\n", atomic_read(&stats->line_febe)= ); +- printk("path_febe : %d\n", atomic_read(&stats->path_febe)= ); +- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs))= ; +- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs= )); +- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells))= ; +- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells))= ; ++ printk("section_bip: %d\n", atomic_read_unchecked(&stats->= section_bip)); ++ printk("line_bip : %d\n", atomic_read_unchecked(&stats->= line_bip)); ++ printk("path_bip : %d\n", atomic_read_unchecked(&stats->= path_bip)); ++ printk("line_febe : %d\n", atomic_read_unchecked(&stats->= line_febe)); ++ printk("path_febe : %d\n", atomic_read_unchecked(&stats->= path_febe)); ++ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->= corr_hcs)); ++ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->= uncorr_hcs)); ++ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->= tx_cells)); ++ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->= rx_cells)); + } + ia_cmds.status =3D 0; + break; +@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vc + if ((desc =3D=3D 0) || (desc > iadev->num_tx_desc)) =20 + { =20 + IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)=20 +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + if (vcc->pop) =20 + vcc->pop(vcc, skb); =20 + else =20 +@@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vc + ATM_DESC(skb) =3D vcc->vci; + skb_queue_tail(&iadev->tx_dma_q, skb); +=20 +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + iadev->tx_pkt_cnt++; + /* Increment transaction counter */ =20 + writel(2, iadev->dma+IPHASE5575_TX_COUNTER); =20 + =20 + #if 0 =20 + /* add flow control logic */=20 +- if (atomic_read(&vcc->stats->tx) % 20 =3D=3D 0) { ++ if (atomic_read_unchecked(&vcc->stats->tx) % 20 =3D=3D 0) { + if (iavcc->vc_desc_cnt > 10) { + vcc->tx_quota =3D vcc->tx_quota * 3 / 4; + printk("Tx1: vcc->tx_quota =3D %d \n", (u32)vcc->tx_quota = ); +diff -urNp linux-2.6.32.45/drivers/atm/lanai.c linux-2.6.32.45/drivers/a= tm/lanai.c +--- linux-2.6.32.45/drivers/atm/lanai.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/atm/lanai.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -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); + lanai_free_skb(lvcc->tx.atmvcc, skb); +- atomic_inc(&lvcc->tx.atmvcc->stats->tx); ++ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx); + } +=20 + /* Try to fill the buffer - don't call unless there is backlog */ +@@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc + ATM_SKB(skb)->vcc =3D lvcc->rx.atmvcc; + __net_timestamp(skb); + lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb); +- atomic_inc(&lvcc->rx.atmvcc->stats->rx); ++ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx); + out: + lvcc->rx.buf.ptr =3D end; + cardvcc_write(lvcc, endptr, vcc_rxreadptr); +@@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_d + DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 " + "vcc %d\n", lanai->number, (unsigned int) s, vci); + lanai->stats.service_rxnotaal5++; +- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); ++ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); + return 0; + } + if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) = { +@@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_d + int bytes; + read_unlock(&vcc_sklist_lock); + DPRINTK("got trashed rx pdu on vci %d\n", vci); +- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); ++ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); + lvcc->stats.x.aal5.service_trash++; + bytes =3D (SERVICE_GET_END(s) * 16) - + (((unsigned long) lvcc->rx.buf.ptr) - +@@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_d + } + if (s & SERVICE_STREAM) { + read_unlock(&vcc_sklist_lock); +- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); ++ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); + lvcc->stats.x.aal5.service_stream++; + printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream " + "PDU on VCI %d!\n", lanai->number, vci); +@@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_d + return 0; + } + DPRINTK("got rx crc error on vci %d\n", vci); +- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err); ++ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err); + lvcc->stats.x.aal5.service_rxcrc++; + lvcc->rx.buf.ptr =3D &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; + cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); +diff -urNp linux-2.6.32.45/drivers/atm/nicstar.c linux-2.6.32.45/drivers= /atm/nicstar.c +--- linux-2.6.32.45/drivers/atm/nicstar.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/atm/nicstar.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,=20 + if ((vc =3D (vc_map *) vcc->dev_data) =3D=3D NULL) + { + printk("nicstar%d: vcc->dev_data =3D=3D NULL on ns_send().\n", ca= rd->index); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb_any(skb); + return -EINVAL; + } +@@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc,=20 + if (!vc->tx) + { + printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->i= ndex); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb_any(skb); + return -EINVAL; + } +@@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc,=20 + if (vcc->qos.aal !=3D ATM_AAL5 && vcc->qos.aal !=3D ATM_AAL0) + { + printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->in= dex); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb_any(skb); + return -EINVAL; + } +@@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc,=20 + if (skb_shinfo(skb)->nr_frags !=3D 0) + { + printk("nicstar%d: No scatter-gather yet.\n", card->index); +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb_any(skb); + return -EINVAL; + } +@@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc,=20 +=20 + if (push_scqe(card, vc, scq, &scqe, skb) !=3D 0) + { +- atomic_inc(&vcc->stats->tx_err); ++ atomic_inc_unchecked(&vcc->stats->tx_err); + dev_kfree_skb_any(skb); + return -EIO; + } +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); +=20 + return 0; + } +@@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_ + { + printk("nicstar%d: Can't allocate buffers for aal0.\n", + card->index); +- atomic_add(i,&vcc->stats->rx_drop); ++ atomic_add_unchecked(i,&vcc->stats->rx_drop); + break; + } + if (!atm_charge(vcc, sb->truesize)) + { + RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n", + card->index); +- atomic_add(i-1,&vcc->stats->rx_drop); /* already increased = by 1 */ ++ atomic_add_unchecked(i-1,&vcc->stats->rx_drop); /* already = increased by 1 */ + dev_kfree_skb_any(sb); + break; + } +@@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_ + ATM_SKB(sb)->vcc =3D vcc; + __net_timestamp(sb); + vcc->push(vcc, sb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + cell +=3D ATM_CELL_PAYLOAD; + } +=20 +@@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_ + if (iovb =3D=3D NULL) + { + printk("nicstar%d: Out of iovec buffers.\n", card->index); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + recycle_rx_buf(card, skb); + return; + } +@@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_ + else if (NS_SKB(iovb)->iovcnt >=3D NS_MAX_IOVECS) + { + printk("nicstar%d: received too big AAL5 SDU.\n", card->index); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_I= OVECS); + NS_SKB(iovb)->iovcnt =3D 0; + iovb->len =3D 0; +@@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_ + printk("nicstar%d: Expected a small buffer, and this is not on= e.\n", + card->index); + which_list(card, skb); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + recycle_rx_buf(card, skb); + vc->rx_iov =3D NULL; + recycle_iov_buf(card, iovb); +@@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_ + printk("nicstar%d: Expected a large buffer, and this is not on= e.\n", + card->index); + which_list(card, skb); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, + NS_SKB(iovb)->iovcnt); + vc->rx_iov =3D NULL; +@@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_ + printk(" - PDU size mismatch.\n"); + else + printk(".\n"); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, + NS_SKB(iovb)->iovcnt); + vc->rx_iov =3D NULL; +@@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_ + if (!atm_charge(vcc, skb->truesize)) + { + push_rxbufs(card, skb); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + } + else + { +@@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_ + ATM_SKB(skb)->vcc =3D vcc; + __net_timestamp(skb); + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } + } + else if (NS_SKB(iovb)->iovcnt =3D=3D 2) /* One small plus one lar= ge buffer */ +@@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_ + if (!atm_charge(vcc, sb->truesize)) + { + push_rxbufs(card, sb); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + } + else + { +@@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_ + ATM_SKB(sb)->vcc =3D vcc; + __net_timestamp(sb); + vcc->push(vcc, sb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } +=20 + push_rxbufs(card, skb); +@@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_ + if (!atm_charge(vcc, skb->truesize)) + { + push_rxbufs(card, skb); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + } + else + { +@@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_ + ATM_SKB(skb)->vcc =3D vcc; + __net_timestamp(skb); + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } +=20 + push_rxbufs(card, sb); +@@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_ + if (hb =3D=3D NULL) + { + printk("nicstar%d: Out of huge buffers.\n", card->index)= ; +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, + NS_SKB(iovb)->iovcnt); + vc->rx_iov =3D NULL; +@@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_ + } + else + dev_kfree_skb_any(hb); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + } + else + { +@@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_ + #endif /* NS_USE_DESTRUCTORS */ + __net_timestamp(hb); + vcc->push(vcc, hb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } + } +=20 +diff -urNp linux-2.6.32.45/drivers/atm/solos-pci.c linux-2.6.32.45/drive= rs/atm/solos-pci.c +--- linux-2.6.32.45/drivers/atm/solos-pci.c 2011-04-17 17:00:52.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/atm/solos-pci.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) + } + atm_charge(vcc, skb->truesize); + vcc->push(vcc, skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + break; +=20 + case PKT_STATUS: +@@ -914,6 +914,8 @@ static int print_buffer(struct sk_buff * + char msg[500]; + char item[10]; +=20 ++ pax_track_stack(); ++ + len =3D buf->len; + for (i =3D 0; i < len; i++){ + if(i % 8 =3D=3D 0) +@@ -1023,7 +1025,7 @@ static uint32_t fpga_tx(struct solos_car + vcc =3D SKB_CB(oldskb)->vcc; +=20 + if (vcc) { +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + solos_pop(vcc, oldskb); + } else + dev_kfree_skb_irq(oldskb); +diff -urNp linux-2.6.32.45/drivers/atm/suni.c linux-2.6.32.45/drivers/at= m/suni.c +--- linux-2.6.32.45/drivers/atm/suni.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/atm/suni.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); +=20 +=20 + #define ADD_LIMITED(s,v) \ +- atomic_add((v),&stats->s); \ +- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX); ++ atomic_add_unchecked((v),&stats->s); \ ++ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&sta= ts->s,INT_MAX); +=20 +=20 + static void suni_hz(unsigned long from_timer) +diff -urNp linux-2.6.32.45/drivers/atm/uPD98402.c linux-2.6.32.45/driver= s/atm/uPD98402.c +--- linux-2.6.32.45/drivers/atm/uPD98402.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/atm/uPD98402.c 2011-04-17 15:56:46.000000000= -0400 +@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d + struct sonet_stats tmp; + int error =3D 0; +=20 +- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs); ++ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs); + sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp); + if (arg) error =3D copy_to_user(arg,&tmp,sizeof(tmp)); + if (zero && !error) { +@@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev +=20 +=20 + #define ADD_LIMITED(s,v) \ +- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \ +- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \ +- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); } ++ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \ ++ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \ ++ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); } +=20 +=20 + static void stat_event(struct atm_dev *dev) +@@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev=20 + if (reason & uPD98402_INT_PFM) stat_event(dev); + if (reason & uPD98402_INT_PCO) { + (void) GET(PCOCR); /* clear interrupt cause */ +- atomic_add(GET(HECCT), ++ atomic_add_unchecked(GET(HECCT), + &PRIV(dev)->sonet_stats.uncorr_hcs); + } + if ((reason & uPD98402_INT_RFO) &&=20 +@@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev + PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO | + uPD98402_INT_LOS),PIMR); /* enable them */ + (void) fetch_stats(dev,NULL,1); /* clear kernel counters */ +- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1); +- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1); +- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1); ++ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1); ++ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1); ++ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1); + return 0; + } +=20 +diff -urNp linux-2.6.32.45/drivers/atm/zatm.c linux-2.6.32.45/drivers/at= m/zatm.c +--- linux-2.6.32.45/drivers/atm/zatm.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/atm/zatm.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy + } + if (!size) { + dev_kfree_skb_irq(skb); +- if (vcc) atomic_inc(&vcc->stats->rx_err); ++ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err); + continue; + } + if (!atm_charge(vcc,skb->truesize)) { +@@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy + skb->len =3D size; + ATM_SKB(skb)->vcc =3D vcc; + vcc->push(vcc,skb); +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + } + zout(pos & 0xffff,MTA(mbx)); + #if 0 /* probably a stupid idea */ +@@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) !=3D (uPD98401_TXPD + skb_queue_head(&zatm_vcc->backlog,skb); + break; + } +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); + wake_up(&zatm_vcc->tx_wait); + } +=20 +diff -urNp linux-2.6.32.45/drivers/base/bus.c linux-2.6.32.45/drivers/ba= se/bus.c +--- linux-2.6.32.45/drivers/base/bus.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/base/bus.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob + return ret; + } +=20 +-static struct sysfs_ops driver_sysfs_ops =3D { ++static const struct sysfs_ops driver_sysfs_ops =3D { + .show =3D drv_attr_show, + .store =3D drv_attr_store, + }; +@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kob + return ret; + } +=20 +-static struct sysfs_ops bus_sysfs_ops =3D { ++static const struct sysfs_ops bus_sysfs_ops =3D { + .show =3D bus_attr_show, + .store =3D bus_attr_store, + }; +@@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset + return 0; + } +=20 +-static struct kset_uevent_ops bus_uevent_ops =3D { ++static const struct kset_uevent_ops bus_uevent_ops =3D { + .filter =3D bus_uevent_filter, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/base/class.c linux-2.6.32.45/drivers/= base/class.c +--- linux-2.6.32.45/drivers/base/class.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/base/class.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -63,7 +63,7 @@ static void class_release(struct kobject + kfree(cp); + } +=20 +-static struct sysfs_ops class_sysfs_ops =3D { ++static const struct sysfs_ops class_sysfs_ops =3D { + .show =3D class_attr_show, + .store =3D class_attr_store, + }; +diff -urNp linux-2.6.32.45/drivers/base/core.c linux-2.6.32.45/drivers/b= ase/core.c +--- linux-2.6.32.45/drivers/base/core.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/base/core.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob + return ret; + } +=20 +-static struct sysfs_ops dev_sysfs_ops =3D { ++static const struct sysfs_ops dev_sysfs_ops =3D { + .show =3D dev_attr_show, + .store =3D dev_attr_store, + }; +@@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset, + return retval; + } +=20 +-static struct kset_uevent_ops device_uevent_ops =3D { ++static const struct kset_uevent_ops device_uevent_ops =3D { + .filter =3D dev_uevent_filter, + .name =3D dev_uevent_name, + .uevent =3D dev_uevent, +diff -urNp linux-2.6.32.45/drivers/base/memory.c linux-2.6.32.45/drivers= /base/memory.c +--- linux-2.6.32.45/drivers/base/memory.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/base/memory.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks + return retval; + } +=20 +-static struct kset_uevent_ops memory_uevent_ops =3D { ++static const struct kset_uevent_ops memory_uevent_ops =3D { + .name =3D memory_uevent_name, + .uevent =3D memory_uevent, + }; +diff -urNp linux-2.6.32.45/drivers/base/sys.c linux-2.6.32.45/drivers/ba= se/sys.c +--- linux-2.6.32.45/drivers/base/sys.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/base/sys.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc + return -EIO; + } +=20 +-static struct sysfs_ops sysfs_ops =3D { ++static const struct sysfs_ops sysfs_ops =3D { + .show =3D sysdev_show, + .store =3D sysdev_store, + }; +@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct + return -EIO; + } +=20 +-static struct sysfs_ops sysfs_class_ops =3D { ++static const struct sysfs_ops sysfs_class_ops =3D { + .show =3D sysdev_class_show, + .store =3D sysdev_class_store, + }; +diff -urNp linux-2.6.32.45/drivers/block/cciss.c linux-2.6.32.45/drivers= /block/cciss.c +--- linux-2.6.32.45/drivers/block/cciss.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/block/cciss.c 2011-08-05 20:33:55.000000000 = -0400 +@@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct + int err; + u32 cp; +=20 ++ memset(&arg64, 0, sizeof(arg64)); ++ + err =3D 0; + err |=3D + copy_from_user(&arg64.LUN_info, &arg32->LUN_info, +@@ -2852,7 +2854,7 @@ static unsigned long pollcomplete(int ct + /* Wait (up to 20 seconds) for a command to complete */ +=20 + for (i =3D 20 * HZ; i > 0; i--) { +- done =3D hba[ctlr]->access.command_completed(hba[ctlr]); ++ done =3D hba[ctlr]->access->command_completed(hba[ctlr]); + if (done =3D=3D FIFO_EMPTY) + schedule_timeout_uninterruptible(1); + else +@@ -2876,7 +2878,7 @@ static int sendcmd_core(ctlr_info_t *h,=20 + resend_cmd1: +=20 + /* Disable interrupt on the board. */ +- h->access.set_intr_mask(h, CCISS_INTR_OFF); ++ h->access->set_intr_mask(h, CCISS_INTR_OFF); +=20 + /* Make sure there is room in the command FIFO */ + /* Actually it should be completely empty at this time */ +@@ -2884,13 +2886,13 @@ resend_cmd1: + /* tape side of the driver. */ + for (i =3D 200000; i > 0; i--) { + /* if fifo isn't full go */ +- if (!(h->access.fifo_full(h))) ++ if (!(h->access->fifo_full(h))) + break; + udelay(10); + printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full," + " waiting!\n", h->ctlr); + } +- h->access.submit_command(h, c); /* Send the cmd */ ++ h->access->submit_command(h, c); /* Send the cmd */ + do { + complete =3D pollcomplete(h->ctlr); +=20 +@@ -3023,7 +3025,7 @@ static void start_io(ctlr_info_t *h) + while (!hlist_empty(&h->reqQ)) { + c =3D hlist_entry(h->reqQ.first, CommandList_struct, list); + /* can't do anything if fifo is full */ +- if ((h->access.fifo_full(h))) { ++ if ((h->access->fifo_full(h))) { + printk(KERN_WARNING "cciss: fifo full\n"); + break; + } +@@ -3033,7 +3035,7 @@ static void start_io(ctlr_info_t *h) + h->Qdepth--; +=20 + /* Tell the controller execute command */ +- h->access.submit_command(h, c); ++ h->access->submit_command(h, c); +=20 + /* Put job onto the completed Q */ + addQ(&h->cmpQ, c); +@@ -3393,17 +3395,17 @@ startio: +=20 + static inline unsigned long get_next_completion(ctlr_info_t *h) + { +- return h->access.command_completed(h); ++ return h->access->command_completed(h); + } +=20 + static inline int interrupt_pending(ctlr_info_t *h) + { +- return h->access.intr_pending(h); ++ return h->access->intr_pending(h); + } +=20 + static inline long interrupt_not_for_us(ctlr_info_t *h) + { +- return (((h->access.intr_pending(h) =3D=3D 0) || ++ return (((h->access->intr_pending(h) =3D=3D 0) || + (h->interrupts_enabled =3D=3D 0))); + } +=20 +@@ -3892,7 +3894,7 @@ static int __devinit cciss_pci_init(ctlr + */ + c->max_commands =3D readl(&(c->cfgtable->CmdsOutMax)); + c->product_name =3D products[prod_index].product_name; +- c->access =3D *(products[prod_index].access); ++ c->access =3D products[prod_index].access; + c->nr_cmds =3D c->max_commands - 4; + if ((readb(&c->cfgtable->Signature[0]) !=3D 'C') || + (readb(&c->cfgtable->Signature[1]) !=3D 'I') || +@@ -4291,7 +4293,7 @@ static int __devinit cciss_init_one(stru + } +=20 + /* make sure the board interrupts are off */ +- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF); ++ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_OFF); + if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr, + IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) { + printk(KERN_ERR "cciss: Unable to get irq %d for %s\n", +@@ -4341,7 +4343,7 @@ static int __devinit cciss_init_one(stru + cciss_scsi_setup(i); +=20 + /* Turn the interrupts on so we can service requests */ +- hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON); ++ hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_ON); +=20 + /* Get the firmware version */ + inq_buff =3D kzalloc(sizeof(InquiryData_struct), GFP_KERNEL); +diff -urNp linux-2.6.32.45/drivers/block/cciss.h linux-2.6.32.45/drivers= /block/cciss.h +--- linux-2.6.32.45/drivers/block/cciss.h 2011-08-09 18:35:28.000000000 = -0400 ++++ linux-2.6.32.45/drivers/block/cciss.h 2011-08-09 18:33:59.000000000 = -0400 +@@ -90,7 +90,7 @@ struct ctlr_info=20 + // information about each logical volume + drive_info_struct *drv[CISS_MAX_LUN]; +=20 +- struct access_method access; ++ struct access_method *access; +=20 + /* queue and queue Info */=20 + struct hlist_head reqQ; +diff -urNp linux-2.6.32.45/drivers/block/cpqarray.c linux-2.6.32.45/driv= ers/block/cpqarray.c +--- linux-2.6.32.45/drivers/block/cpqarray.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/block/cpqarray.c 2011-08-05 20:33:55.0000000= 00 -0400 +@@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr + if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) { + goto Enomem4; + } +- hba[i]->access.set_intr_mask(hba[i], 0); ++ hba[i]->access->set_intr_mask(hba[i], 0); + if (request_irq(hba[i]->intr, do_ida_intr, + IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i])) + { +@@ -460,7 +460,7 @@ static int __init cpqarray_register_ctlr + add_timer(&hba[i]->timer); +=20 + /* Enable IRQ now that spinlock and rate limit timer are set up */ +- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY); ++ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY); +=20 + for(j=3D0; jproduct_name =3D products[i].product_name; +- c->access =3D *(products[i].access); ++ c->access =3D products[i].access; + break; + } + } +@@ -793,7 +793,7 @@ static int __init cpqarray_eisa_detect(v + hba[ctlr]->intr =3D intr; + sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr); + hba[ctlr]->product_name =3D products[j].product_name; +- hba[ctlr]->access =3D *(products[j].access); ++ hba[ctlr]->access =3D products[j].access; + hba[ctlr]->ctlr =3D ctlr; + hba[ctlr]->board_id =3D board_id; + hba[ctlr]->pci_dev =3D NULL; /* not PCI */ +@@ -896,6 +896,8 @@ static void do_ida_request(struct reques + struct scatterlist tmp_sg[SG_MAX]; + int i, dir, seg; +=20 ++ pax_track_stack(); ++ + if (blk_queue_plugged(q)) + goto startio; +=20 +@@ -968,7 +970,7 @@ static void start_io(ctlr_info_t *h) +=20 + while((c =3D h->reqQ) !=3D NULL) { + /* Can't do anything if we're busy */ +- if (h->access.fifo_full(h) =3D=3D 0) ++ if (h->access->fifo_full(h) =3D=3D 0) + return; +=20 + /* Get the first entry from the request Q */ +@@ -976,7 +978,7 @@ static void start_io(ctlr_info_t *h) + h->Qdepth--; + =09 + /* Tell the controller to do our bidding */ +- h->access.submit_command(h, c); ++ h->access->submit_command(h, c); +=20 + /* Get onto the completion Q */ + addQ(&h->cmpQ, c); +@@ -1038,7 +1040,7 @@ static irqreturn_t do_ida_intr(int irq,=20 + unsigned long flags; + __u32 a,a1; +=20 +- istat =3D h->access.intr_pending(h); ++ istat =3D h->access->intr_pending(h); + /* Is this interrupt for us? */ + if (istat =3D=3D 0) + return IRQ_NONE; +@@ -1049,7 +1051,7 @@ static irqreturn_t do_ida_intr(int irq,=20 + */ + spin_lock_irqsave(IDA_LOCK(h->ctlr), flags); + if (istat & FIFO_NOT_EMPTY) { +- while((a =3D h->access.command_completed(h))) { ++ while((a =3D h->access->command_completed(h))) { + a1 =3D a; a &=3D ~3; + if ((c =3D h->cmpQ) =3D=3D NULL) + { =20 +@@ -1434,11 +1436,11 @@ static int sendcmd( + /* + * Disable interrupt + */ +- info_p->access.set_intr_mask(info_p, 0); ++ info_p->access->set_intr_mask(info_p, 0); + /* Make sure there is room in the command FIFO */ + /* Actually it should be completely empty at this time. */ + for (i =3D 200000; i > 0; i--) { +- temp =3D info_p->access.fifo_full(info_p); ++ temp =3D info_p->access->fifo_full(info_p); + if (temp !=3D 0) { + break; + } +@@ -1451,7 +1453,7 @@ DBG( + /* + * Send the cmd + */ +- info_p->access.submit_command(info_p, c); ++ info_p->access->submit_command(info_p, c); + complete =3D pollcomplete(ctlr); + =09 + pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,=20 +@@ -1534,9 +1536,9 @@ static int revalidate_allvol(ctlr_info_t + * we check the new geometry. Then turn interrupts back on when + * we're done. + */ +- host->access.set_intr_mask(host, 0); ++ host->access->set_intr_mask(host, 0); + getgeometry(ctlr); +- host->access.set_intr_mask(host, FIFO_NOT_EMPTY); ++ host->access->set_intr_mask(host, FIFO_NOT_EMPTY); +=20 + for(i=3D0; i 0; i--) { +- done =3D hba[ctlr]->access.command_completed(hba[ctlr]); ++ done =3D hba[ctlr]->access->command_completed(hba[ctlr]); + if (done =3D=3D 0) { + udelay(10); /* a short fixed delay */ + } else +diff -urNp linux-2.6.32.45/drivers/block/cpqarray.h linux-2.6.32.45/driv= ers/block/cpqarray.h +--- linux-2.6.32.45/drivers/block/cpqarray.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/block/cpqarray.h 2011-08-05 20:33:55.0000000= 00 -0400 +@@ -99,7 +99,7 @@ struct ctlr_info { + drv_info_t drv[NWD]; + struct proc_dir_entry *proc; +=20 +- struct access_method access; ++ struct access_method *access; +=20 + cmdlist_t *reqQ; + cmdlist_t *cmpQ; +diff -urNp linux-2.6.32.45/drivers/block/DAC960.c linux-2.6.32.45/driver= s/block/DAC960.c +--- linux-2.6.32.45/drivers/block/DAC960.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/block/DAC960.c 2011-05-16 21:46:57.000000000= -0400 +@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur + unsigned long flags; + int Channel, TargetID; +=20 ++ pax_track_stack(); ++ + if (!init_dma_loaf(Controller->PCIDevice, &local_dma,=20 + DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) + + sizeof(DAC960_SCSI_Inquiry_T) + +diff -urNp linux-2.6.32.45/drivers/block/nbd.c linux-2.6.32.45/drivers/b= lock/nbd.c +--- linux-2.6.32.45/drivers/block/nbd.c 2011-06-25 12:55:34.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/block/nbd.c 2011-06-25 12:56:37.000000000 -0= 400 +@@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device * + struct kvec iov; + sigset_t blocked, oldset; +=20 ++ pax_track_stack(); ++ + if (unlikely(!sock)) { + printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n", + lo->disk->disk_name, (send ? "send" : "recv")); +@@ -569,6 +571,8 @@ static void do_nbd_request(struct reques + static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo= , + unsigned int cmd, unsigned long arg) + { ++ pax_track_stack(); ++ + switch (cmd) { + case NBD_DISCONNECT: { + struct request sreq; +diff -urNp linux-2.6.32.45/drivers/block/pktcdvd.c linux-2.6.32.45/drive= rs/block/pktcdvd.c +--- linux-2.6.32.45/drivers/block/pktcdvd.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/block/pktcdvd.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob + return len; + } +=20 +-static struct sysfs_ops kobj_pkt_ops =3D { ++static const struct sysfs_ops kobj_pkt_ops =3D { + .show =3D kobj_pkt_show, + .store =3D kobj_pkt_store + }; +diff -urNp linux-2.6.32.45/drivers/char/agp/frontend.c linux-2.6.32.45/d= rivers/char/agp/frontend.c +--- linux-2.6.32.45/drivers/char/agp/frontend.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/char/agp/frontend.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag + if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) + return -EFAULT; +=20 +- if ((unsigned) reserve.seg_count >=3D ~0U/sizeof(struct agp_segment)) ++ if ((unsigned) reserve.seg_count >=3D ~0U/sizeof(struct agp_segment_pr= iv)) + return -EFAULT; +=20 + client =3D agp_find_client_by_pid(reserve.pid); +diff -urNp linux-2.6.32.45/drivers/char/briq_panel.c linux-2.6.32.45/dri= vers/char/briq_panel.c +--- linux-2.6.32.45/drivers/char/briq_panel.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/char/briq_panel.c 2011-04-18 19:48:57.000000= 000 -0400 +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -36,6 +37,7 @@ static int vfd_is_open; + static unsigned char vfd[40]; + static int vfd_cursor; + static unsigned char ledpb, led; ++static DEFINE_MUTEX(vfd_mutex); +=20 + static void update_vfd(void) + { +@@ -142,12 +144,15 @@ static ssize_t briq_panel_write(struct f + if (!vfd_is_open) + return -EBUSY; +=20 ++ mutex_lock(&vfd_mutex); + for (;;) { + char c; + if (!indx) + break; +- if (get_user(c, buf)) ++ if (get_user(c, buf)) { ++ mutex_unlock(&vfd_mutex); + return -EFAULT; ++ } + if (esc) { + set_led(c); + esc =3D 0; +@@ -177,6 +182,7 @@ static ssize_t briq_panel_write(struct f + buf++; + } + update_vfd(); ++ mutex_unlock(&vfd_mutex); +=20 + return len; + } +diff -urNp linux-2.6.32.45/drivers/char/genrtc.c linux-2.6.32.45/drivers= /char/genrtc.c +--- linux-2.6.32.45/drivers/char/genrtc.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/char/genrtc.c 2011-04-18 19:45:42.000000000 = -0400 +@@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *i + switch (cmd) { +=20 + case RTC_PLL_GET: ++ memset(&pll, 0, sizeof(pll)); + if (get_rtc_pll(&pll)) + return -EINVAL; + else +diff -urNp linux-2.6.32.45/drivers/char/hpet.c linux-2.6.32.45/drivers/c= har/hpet.c +--- linux-2.6.32.45/drivers/char/hpet.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/char/hpet.c 2011-04-23 12:56:11.000000000 -0= 400 +@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in + return 0; + } +=20 +-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int= ); ++static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned = long, int); +=20 + static int + hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd, +@@ -565,7 +565,7 @@ static inline unsigned long hpet_time_di + } +=20 + static int +-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, in= t kernel) ++hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned lon= g arg, int kernel) + { + struct hpet_timer __iomem *timer; + struct hpet __iomem *hpet; +@@ -608,11 +608,11 @@ hpet_ioctl_common(struct hpet_dev *devp, + { + struct hpet_info info; +=20 ++ memset(&info, 0, sizeof(info)); ++ + if (devp->hd_ireqfreq) + info.hi_ireqfreq =3D + hpet_time_div(hpetp, devp->hd_ireqfreq); +- else +- info.hi_ireqfreq =3D 0; + info.hi_flags =3D + readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK; + info.hi_hpet =3D hpetp->hp_which; +diff -urNp linux-2.6.32.45/drivers/char/hvc_beat.c linux-2.6.32.45/drive= rs/char/hvc_beat.c +--- linux-2.6.32.45/drivers/char/hvc_beat.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_beat.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v + return cnt; + } +=20 +-static struct hv_ops hvc_beat_get_put_ops =3D { ++static const struct hv_ops hvc_beat_get_put_ops =3D { + .get_chars =3D hvc_beat_get_chars, + .put_chars =3D hvc_beat_put_chars, + }; +diff -urNp linux-2.6.32.45/drivers/char/hvc_console.c linux-2.6.32.45/dr= ivers/char/hvc_console.c +--- linux-2.6.32.45/drivers/char/hvc_console.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_console.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind + * console interfaces but can still be used as a tty device. This has = to be + * static because kmalloc will not work during early console init. + */ +-static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES]; ++static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES]; + static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =3D + {[0 ... MAX_NR_HVC_CONSOLES - 1] =3D -1}; +=20 +@@ -247,7 +247,7 @@ static void destroy_hvc_struct(struct kr + * vty adapters do NOT get an hvc_instantiate() callback since they + * appear after early console init. + */ +-int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops) ++int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *o= ps) + { + struct hvc_struct *hp; +=20 +@@ -756,7 +756,7 @@ static const struct tty_operations hvc_o + }; +=20 + struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data, +- struct hv_ops *ops, int outbuf_size) ++ const struct hv_ops *ops, int outbuf_size) + { + struct hvc_struct *hp; + int i; +diff -urNp linux-2.6.32.45/drivers/char/hvc_console.h linux-2.6.32.45/dr= ivers/char/hvc_console.h +--- linux-2.6.32.45/drivers/char/hvc_console.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_console.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -55,7 +55,7 @@ struct hvc_struct { + int outbuf_size; + int n_outbuf; + uint32_t vtermno; +- struct hv_ops *ops; ++ const struct hv_ops *ops; + int irq_requested; + int data; + struct winsize ws; +@@ -76,11 +76,11 @@ struct hv_ops { + }; +=20 + /* Register a vterm and a slot index for use as a console (console_init= ) */ +-extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *= ops); ++extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv= _ops *ops); +=20 + /* register a vterm for hvc tty operation (module_init or hotplug add) = */ + extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int da= ta, +- struct hv_ops *ops, int outbuf_size); ++ const struct hv_ops *ops, int outbuf_size); + /* remove a vterm from hvc tty operation (module_exit or hotplug remove= ) */ + extern int hvc_remove(struct hvc_struct *hp); +=20 +diff -urNp linux-2.6.32.45/drivers/char/hvc_iseries.c linux-2.6.32.45/dr= ivers/char/hvc_iseries.c +--- linux-2.6.32.45/drivers/char/hvc_iseries.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_iseries.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -197,7 +197,7 @@ done: + return sent; + } +=20 +-static struct hv_ops hvc_get_put_ops =3D { ++static const struct hv_ops hvc_get_put_ops =3D { + .get_chars =3D get_chars, + .put_chars =3D put_chars, + .notifier_add =3D notifier_add_irq, +diff -urNp linux-2.6.32.45/drivers/char/hvc_iucv.c linux-2.6.32.45/drive= rs/char/hvc_iucv.c +--- linux-2.6.32.45/drivers/char/hvc_iucv.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_iucv.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(stru +=20 +=20 + /* HVC operations */ +-static struct hv_ops hvc_iucv_ops =3D { ++static const struct hv_ops hvc_iucv_ops =3D { + .get_chars =3D hvc_iucv_get_chars, + .put_chars =3D hvc_iucv_put_chars, + .notifier_add =3D hvc_iucv_notifier_add, +diff -urNp linux-2.6.32.45/drivers/char/hvc_rtas.c linux-2.6.32.45/drive= rs/char/hvc_rtas.c +--- linux-2.6.32.45/drivers/char/hvc_rtas.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_rtas.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ + return i; + } +=20 +-static struct hv_ops hvc_rtas_get_put_ops =3D { ++static const struct hv_ops hvc_rtas_get_put_ops =3D { + .get_chars =3D hvc_rtas_read_console, + .put_chars =3D hvc_rtas_write_console, + }; +diff -urNp linux-2.6.32.45/drivers/char/hvcs.c linux-2.6.32.45/drivers/c= har/hvcs.c +--- linux-2.6.32.45/drivers/char/hvcs.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/char/hvcs.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -82,6 +82,7 @@ + #include + #include + #include ++#include +=20 + /* + * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,= 0x3F,00). +@@ -269,7 +270,7 @@ struct hvcs_struct { + unsigned int index; +=20 + struct tty_struct *tty; +- int open_count; ++ local_t open_count; +=20 + /* + * Used to tell the driver kernel_thread what operations need to take +@@ -419,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(st +=20 + spin_lock_irqsave(&hvcsd->lock, flags); +=20 +- if (hvcsd->open_count > 0) { ++ if (local_read(&hvcsd->open_count) > 0) { + spin_unlock_irqrestore(&hvcsd->lock, flags); + printk(KERN_INFO "HVCS: vterm state unchanged. " + "The hvcs device node is still in use.\n"); +@@ -1135,7 +1136,7 @@ static int hvcs_open(struct tty_struct * + if ((retval =3D hvcs_partner_connect(hvcsd))) + goto error_release; +=20 +- hvcsd->open_count =3D 1; ++ local_set(&hvcsd->open_count, 1); + hvcsd->tty =3D tty; + tty->driver_data =3D hvcsd; +=20 +@@ -1169,7 +1170,7 @@ fast_open: +=20 + spin_lock_irqsave(&hvcsd->lock, flags); + kref_get(&hvcsd->kref); +- hvcsd->open_count++; ++ local_inc(&hvcsd->open_count); + hvcsd->todo_mask |=3D HVCS_SCHED_READ; + spin_unlock_irqrestore(&hvcsd->lock, flags); +=20 +@@ -1213,7 +1214,7 @@ static void hvcs_close(struct tty_struct + hvcsd =3D tty->driver_data; +=20 + spin_lock_irqsave(&hvcsd->lock, flags); +- if (--hvcsd->open_count =3D=3D 0) { ++ if (local_dec_and_test(&hvcsd->open_count)) { +=20 + vio_disable_interrupts(hvcsd->vdev); +=20 +@@ -1239,10 +1240,10 @@ static void hvcs_close(struct tty_struct + free_irq(irq, hvcsd); + kref_put(&hvcsd->kref, destroy_hvcs_struct); + return; +- } else if (hvcsd->open_count < 0) { ++ } else if (local_read(&hvcsd->open_count) < 0) { + printk(KERN_ERR "HVCS: vty-server@%X open_count: %d" + " is missmanaged.\n", +- hvcsd->vdev->unit_address, hvcsd->open_count); ++ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count)); + } +=20 + spin_unlock_irqrestore(&hvcsd->lock, flags); +@@ -1258,7 +1259,7 @@ static void hvcs_hangup(struct tty_struc +=20 + spin_lock_irqsave(&hvcsd->lock, flags); + /* Preserve this so that we know how many kref refs to put */ +- temp_open_count =3D hvcsd->open_count; ++ temp_open_count =3D local_read(&hvcsd->open_count); +=20 + /* + * Don't kref put inside the spinlock because the destruction +@@ -1273,7 +1274,7 @@ static void hvcs_hangup(struct tty_struc + hvcsd->tty->driver_data =3D NULL; + hvcsd->tty =3D NULL; +=20 +- hvcsd->open_count =3D 0; ++ local_set(&hvcsd->open_count, 0); +=20 + /* This will drop any buffered data on the floor which is OK in a hang= up + * scenario. */ +@@ -1344,7 +1345,7 @@ static int hvcs_write(struct tty_struct=20 + * the middle of a write operation? This is a crummy place to do this + * but we want to keep it all in the spinlock. + */ +- if (hvcsd->open_count <=3D 0) { ++ if (local_read(&hvcsd->open_count) <=3D 0) { + spin_unlock_irqrestore(&hvcsd->lock, flags); + return -ENODEV; + } +@@ -1418,7 +1419,7 @@ static int hvcs_write_room(struct tty_st + { + struct hvcs_struct *hvcsd =3D tty->driver_data; +=20 +- if (!hvcsd || hvcsd->open_count <=3D 0) ++ if (!hvcsd || local_read(&hvcsd->open_count) <=3D 0) + return 0; +=20 + return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; +diff -urNp linux-2.6.32.45/drivers/char/hvc_udbg.c linux-2.6.32.45/drive= rs/char/hvc_udbg.c +--- linux-2.6.32.45/drivers/char/hvc_udbg.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/hvc_udbg.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno + return i; + } +=20 +-static struct hv_ops hvc_udbg_ops =3D { ++static const struct hv_ops hvc_udbg_ops =3D { + .get_chars =3D hvc_udbg_get, + .put_chars =3D hvc_udbg_put, + }; +diff -urNp linux-2.6.32.45/drivers/char/hvc_vio.c linux-2.6.32.45/driver= s/char/hvc_vio.c +--- linux-2.6.32.45/drivers/char/hvc_vio.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/char/hvc_vio.c 2011-04-17 15:56:46.000000000= -0400 +@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v + return got; + } +=20 +-static struct hv_ops hvc_get_put_ops =3D { ++static const struct hv_ops hvc_get_put_ops =3D { + .get_chars =3D filtered_get_chars, + .put_chars =3D hvc_put_chars, + .notifier_add =3D notifier_add_irq, +diff -urNp linux-2.6.32.45/drivers/char/hvc_xen.c linux-2.6.32.45/driver= s/char/hvc_xen.c +--- linux-2.6.32.45/drivers/char/hvc_xen.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/char/hvc_xen.c 2011-04-17 15:56:46.000000000= -0400 +@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno + return recv; + } +=20 +-static struct hv_ops hvc_ops =3D { ++static const struct hv_ops hvc_ops =3D { + .get_chars =3D read_console, + .put_chars =3D write_console, + .notifier_add =3D notifier_add_irq, +diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c linux-2.6= .32.45/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/char/ipmi/ipmi_msghandler.c 2011-05-16 21:46= :57.000000000 -0400 +@@ -414,7 +414,7 @@ struct ipmi_smi { + struct proc_dir_entry *proc_dir; + char proc_dir_name[10]; +=20 +- atomic_t stats[IPMI_NUM_STATS]; ++ atomic_unchecked_t stats[IPMI_NUM_STATS]; +=20 + /* + * run_to_completion duplicate of smb_info, smi_info +@@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex); +=20 +=20 + #define ipmi_inc_stat(intf, stat) \ +- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat]) ++ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]) + #define ipmi_get_stat(intf, stat) \ +- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat])) ++ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## sta= t])) +=20 + static int is_lan_addr(struct ipmi_addr *addr) + { +@@ -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 =3D 0; i < IPMI_NUM_STATS; i++) +- atomic_set(&intf->stats[i], 0); ++ atomic_set_unchecked(&intf->stats[i], 0); +=20 + intf->proc_dir =3D NULL; +=20 +@@ -4160,6 +4160,8 @@ static void send_panic_events(char *str) + struct ipmi_smi_msg smi_msg; + struct ipmi_recv_msg recv_msg; +=20 ++ pax_track_stack(); ++ + si =3D (struct ipmi_system_interface_addr *) &addr; + si->addr_type =3D IPMI_SYSTEM_INTERFACE_ADDR_TYPE; + si->channel =3D IPMI_BMC_CHANNEL; +diff -urNp linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32= .45/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/char/ipmi/ipmi_si_intf.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -277,7 +277,7 @@ struct smi_info { + unsigned char slave_addr; +=20 + /* Counters and things for the proc filesystem. */ +- atomic_t stats[SI_NUM_STATS]; ++ atomic_unchecked_t stats[SI_NUM_STATS]; +=20 + struct task_struct *thread; +=20 +@@ -285,9 +285,9 @@ struct smi_info { + }; +=20 + #define smi_inc_stat(smi, stat) \ +- atomic_inc(&(smi)->stats[SI_STAT_ ## stat]) ++ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat]) + #define smi_get_stat(smi, stat) \ +- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat])) ++ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat])= ) +=20 + #define SI_MAX_PARMS 4 +=20 +@@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info=20 + atomic_set(&new_smi->req_events, 0); + new_smi->run_to_completion =3D 0; + for (i =3D 0; i < SI_NUM_STATS; i++) +- atomic_set(&new_smi->stats[i], 0); ++ atomic_set_unchecked(&new_smi->stats[i], 0); +=20 + new_smi->interrupt_disabled =3D 0; + atomic_set(&new_smi->stop_operation, 0); +diff -urNp linux-2.6.32.45/drivers/char/istallion.c linux-2.6.32.45/driv= ers/char/istallion.c +--- linux-2.6.32.45/drivers/char/istallion.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/char/istallion.c 2011-05-16 21:46:57.0000000= 00 -0400 +@@ -187,7 +187,6 @@ static struct ktermios stli_deftermios=20 + * re-used for each stats call. + */ + static comstats_t stli_comstats; +-static combrd_t stli_brdstats; + static struct asystats stli_cdkstats; +=20 + /**********************************************************************= *******/ +@@ -4058,6 +4057,7 @@ static int stli_getbrdstats(combrd_t __u + { + struct stlibrd *brdp; + unsigned int i; ++ combrd_t stli_brdstats; +=20 + if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t))) + return -EFAULT; +@@ -4269,6 +4269,8 @@ static int stli_getportstruct(struct stl + struct stliport stli_dummyport; + struct stliport *portp; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport))) + return -EFAULT; + portp =3D stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr, +@@ -4291,6 +4293,8 @@ static int stli_getbrdstruct(struct stli + struct stlibrd stli_dummybrd; + struct stlibrd *brdp; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd))) + return -EFAULT; + if (stli_dummybrd.brdnr >=3D STL_MAXBRDS) +diff -urNp linux-2.6.32.45/drivers/char/Kconfig linux-2.6.32.45/drivers/= char/Kconfig +--- linux-2.6.32.45/drivers/char/Kconfig 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/char/Kconfig 2011-04-18 19:20:15.000000000 -= 0400 +@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING +=20 + config DEVKMEM + bool "/dev/kmem virtual device support" +- default y ++ default n ++ depends on !GRKERNSEC_KMEM + help + Say Y here if you want to support the /dev/kmem device. The + /dev/kmem device is rarely used, but can be used for certain +@@ -1114,6 +1115,7 @@ config DEVPORT + bool + depends on !M68K + depends on ISA || PCI ++ depends on !GRKERNSEC_KMEM + default y +=20 + source "drivers/s390/char/Kconfig" +diff -urNp linux-2.6.32.45/drivers/char/keyboard.c linux-2.6.32.45/drive= rs/char/keyboard.c +--- linux-2.6.32.45/drivers/char/keyboard.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/keyboard.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u + kbd->kbdmode =3D=3D VC_MEDIUMRAW) && + value !=3D KVAL(K_SAK)) + return; /* SAK is allowed even in raw mode */ ++ ++#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEM= MAP) ++ { ++ void *func =3D fn_handler[value]; ++ if (func =3D=3D fn_show_state || func =3D=3D fn_show_ptregs || ++ func =3D=3D fn_show_mem) ++ return; ++ } ++#endif ++ + fn_handler[value](vc); + } +=20 +@@ -1386,7 +1396,7 @@ static const struct input_device_id kbd_ + .evbit =3D { BIT_MASK(EV_SND) }, + }, +=20 +- { }, /* Terminating entry */ ++ { 0 }, /* Terminating entry */ + }; +=20 + MODULE_DEVICE_TABLE(input, kbd_ids); +diff -urNp linux-2.6.32.45/drivers/char/mem.c linux-2.6.32.45/drivers/ch= ar/mem.c +--- linux-2.6.32.45/drivers/char/mem.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/char/mem.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -35,6 +36,10 @@ + # include + #endif +=20 ++#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) ++extern struct file_operations grsec_fops; ++#endif ++ + static inline unsigned long size_inside_page(unsigned long start, + unsigned long size) + { +@@ -102,9 +107,13 @@ static inline int range_is_allowed(unsig +=20 + while (cursor < to) { + if (!devmem_is_allowed(pfn)) { ++#ifdef CONFIG_GRKERNSEC_KMEM ++ gr_handle_mem_readwrite(from, to); ++#else + printk(KERN_INFO + "Program %s tried to access /dev/mem between %Lx->%Lx.\n", + current->comm, from, to); ++#endif + return 0; + } + cursor +=3D PAGE_SIZE; +@@ -112,6 +121,11 @@ static inline int range_is_allowed(unsig + } + return 1; + } ++#elif defined(CONFIG_GRKERNSEC_KMEM) ++static inline int range_is_allowed(unsigned long pfn, unsigned long siz= e) ++{ ++ return 0; ++} + #else + static inline int range_is_allowed(unsigned long pfn, unsigned long siz= e) + { +@@ -155,6 +169,8 @@ static ssize_t read_mem(struct file * fi + #endif +=20 + while (count > 0) { ++ char *temp; ++ + /* + * Handle first page in case it's not aligned + */ +@@ -177,11 +193,31 @@ static ssize_t read_mem(struct file * fi + if (!ptr) + return -EFAULT; +=20 +- if (copy_to_user(buf, ptr, sz)) { ++#ifdef CONFIG_PAX_USERCOPY ++ temp =3D kmalloc(sz, GFP_KERNEL); ++ if (!temp) { ++ unxlate_dev_mem_ptr(p, ptr); ++ return -ENOMEM; ++ } ++ memcpy(temp, ptr, sz); ++#else ++ temp =3D ptr; ++#endif ++ ++ if (copy_to_user(buf, temp, sz)) { ++ ++#ifdef CONFIG_PAX_USERCOPY ++ kfree(temp); ++#endif ++ + unxlate_dev_mem_ptr(p, ptr); + return -EFAULT; + } +=20 ++#ifdef CONFIG_PAX_USERCOPY ++ kfree(temp); ++#endif ++ + unxlate_dev_mem_ptr(p, ptr); +=20 + buf +=3D sz; +@@ -419,9 +455,8 @@ static ssize_t read_kmem(struct file *fi + size_t count, loff_t *ppos) + { + unsigned long p =3D *ppos; +- ssize_t low_count, read, sz; ++ ssize_t low_count, read, sz, err =3D 0; + char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */ +- int err =3D 0; +=20 + read =3D 0; + if (p < (unsigned long) high_memory) { +@@ -444,6 +479,8 @@ static ssize_t read_kmem(struct file *fi + } + #endif + while (low_count > 0) { ++ char *temp; ++ + sz =3D size_inside_page(p, low_count); +=20 + /* +@@ -453,7 +490,22 @@ static ssize_t read_kmem(struct file *fi + */ + kbuf =3D xlate_dev_kmem_ptr((char *)p); +=20 +- if (copy_to_user(buf, kbuf, sz)) ++#ifdef CONFIG_PAX_USERCOPY ++ temp =3D kmalloc(sz, GFP_KERNEL); ++ if (!temp) ++ return -ENOMEM; ++ memcpy(temp, kbuf, sz); ++#else ++ temp =3D kbuf; ++#endif ++ ++ err =3D copy_to_user(buf, temp, sz); ++ ++#ifdef CONFIG_PAX_USERCOPY ++ kfree(temp); ++#endif ++ ++ if (err) + return -EFAULT; + buf +=3D sz; + p +=3D sz; +@@ -889,6 +941,9 @@ static const struct memdev { + #ifdef CONFIG_CRASH_DUMP + [12] =3D { "oldmem", 0, &oldmem_fops, NULL }, + #endif ++#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC) ++ [13] =3D { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL }, ++#endif + }; +=20 + static int memory_open(struct inode *inode, struct file *filp) +diff -urNp linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c linux-2.= 6.32.45/drivers/char/pcmcia/ipwireless/tty.c +--- linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/char/pcmcia/ipwireless/tty.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include +=20 + #include "tty.h" + #include "network.h" +@@ -51,7 +52,7 @@ struct ipw_tty { + int tty_type; + struct ipw_network *network; + struct tty_struct *linux_tty; +- int open_count; ++ local_t open_count; + unsigned int control_lines; + struct mutex ipw_tty_mutex; + int tx_bytes_queued; +@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *l + mutex_unlock(&tty->ipw_tty_mutex); + return -ENODEV; + } +- if (tty->open_count =3D=3D 0) ++ if (local_read(&tty->open_count) =3D=3D 0) + tty->tx_bytes_queued =3D 0; +=20 +- tty->open_count++; ++ local_inc(&tty->open_count); +=20 + tty->linux_tty =3D linux_tty; + linux_tty->driver_data =3D tty; +@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l +=20 + static void do_ipw_close(struct ipw_tty *tty) + { +- tty->open_count--; +- +- if (tty->open_count =3D=3D 0) { ++ if (local_dec_return(&tty->open_count) =3D=3D 0) { + struct tty_struct *linux_tty =3D tty->linux_tty; +=20 + if (linux_tty !=3D NULL) { +@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct + return; +=20 + mutex_lock(&tty->ipw_tty_mutex); +- if (tty->open_count =3D=3D 0) { ++ if (local_read(&tty->open_count) =3D=3D 0) { + mutex_unlock(&tty->ipw_tty_mutex); + return; + } +@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_ + return; + } +=20 +- if (!tty->open_count) { ++ if (!local_read(&tty->open_count)) { + mutex_unlock(&tty->ipw_tty_mutex); + return; + } +@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct * + return -ENODEV; +=20 + mutex_lock(&tty->ipw_tty_mutex); +- if (!tty->open_count) { ++ if (!local_read(&tty->open_count)) { + mutex_unlock(&tty->ipw_tty_mutex); + return -EINVAL; + } +@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_str + if (!tty) + return -ENODEV; +=20 +- if (!tty->open_count) ++ if (!local_read(&tty->open_count)) + return -EINVAL; +=20 + room =3D IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued; +@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt + if (!tty) + return 0; +=20 +- if (!tty->open_count) ++ if (!local_read(&tty->open_count)) + return 0; +=20 + return tty->tx_bytes_queued; +@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc + if (!tty) + return -ENODEV; +=20 +- if (!tty->open_count) ++ if (!local_read(&tty->open_count)) + return -EINVAL; +=20 + return get_control_lines(tty); +@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt + if (!tty) + return -ENODEV; +=20 +- if (!tty->open_count) ++ if (!local_read(&tty->open_count)) + return -EINVAL; +=20 + return set_control_lines(tty, set, clear); +@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct * + if (!tty) + return -ENODEV; +=20 +- if (!tty->open_count) ++ if (!local_read(&tty->open_count)) + return -EINVAL; +=20 + /* FIXME: Exactly how is the tty object locked here .. */ +@@ -591,7 +590,7 @@ void ipwireless_tty_free(struct ipw_tty=20 + against a parallel ioctl etc */ + mutex_lock(&ttyj->ipw_tty_mutex); + } +- while (ttyj->open_count) ++ while (local_read(&ttyj->open_count)) + do_ipw_close(ttyj); + ipwireless_disassociate_network_ttys(network, + ttyj->channel_idx); +diff -urNp linux-2.6.32.45/drivers/char/pty.c linux-2.6.32.45/drivers/ch= ar/pty.c +--- linux-2.6.32.45/drivers/char/pty.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/char/pty.c 2011-08-05 20:33:55.000000000 -04= 00 +@@ -736,8 +736,10 @@ static void __init unix98_pty_init(void) + register_sysctl_table(pty_root_table); +=20 + /* Now create the /dev/ptmx special device */ ++ pax_open_kernel(); + tty_default_fops(&ptmx_fops); +- ptmx_fops.open =3D ptmx_open; ++ *(void **)&ptmx_fops.open =3D ptmx_open; ++ pax_close_kernel(); +=20 + cdev_init(&ptmx_cdev, &ptmx_fops); + if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || +diff -urNp linux-2.6.32.45/drivers/char/random.c linux-2.6.32.45/drivers= /char/random.c +--- linux-2.6.32.45/drivers/char/random.c 2011-08-16 20:37:25.000000000 = -0400 ++++ linux-2.6.32.45/drivers/char/random.c 2011-08-16 20:43:23.000000000 = -0400 +@@ -254,8 +254,13 @@ + /* + * Configuration information + */ ++#ifdef CONFIG_GRKERNSEC_RANDNET ++#define INPUT_POOL_WORDS 512 ++#define OUTPUT_POOL_WORDS 128 ++#else + #define INPUT_POOL_WORDS 128 + #define OUTPUT_POOL_WORDS 32 ++#endif + #define SEC_XFER_SIZE 512 +=20 + /* +@@ -292,10 +297,17 @@ static struct poolinfo { + int poolwords; + int tap1, tap2, tap3, tap4, tap5; + } poolinfo_table[] =3D { ++#ifdef CONFIG_GRKERNSEC_RANDNET ++ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */ ++ { 512, 411, 308, 208, 104, 1 }, ++ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */ ++ { 128, 103, 76, 51, 25, 1 }, ++#else + /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */ + { 128, 103, 76, 51, 25, 1 }, + /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */ + { 32, 26, 20, 14, 7, 1 }, ++#endif + #if 0 + /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ + { 2048, 1638, 1231, 819, 411, 1 }, +@@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid); + #include +=20 + static int min_read_thresh =3D 8, min_write_thresh; +-static int max_read_thresh =3D INPUT_POOL_WORDS * 32; ++static int max_read_thresh =3D OUTPUT_POOL_WORDS * 32; + static int max_write_thresh =3D INPUT_POOL_WORDS * 32; + static char sysctl_bootid[16]; +=20 +diff -urNp linux-2.6.32.45/drivers/char/rocket.c linux-2.6.32.45/drivers= /char/rocket.c +--- linux-2.6.32.45/drivers/char/rocket.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/char/rocket.c 2011-05-16 21:46:57.000000000 = -0400 +@@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info + struct rocket_ports tmp; + int board; +=20 ++ pax_track_stack(); ++ + if (!retports) + return -EFAULT; + memset(&tmp, 0, sizeof (tmp)); +diff -urNp linux-2.6.32.45/drivers/char/sonypi.c linux-2.6.32.45/drivers= /char/sonypi.c +--- linux-2.6.32.45/drivers/char/sonypi.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/char/sonypi.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -55,6 +55,7 @@ + #include + #include + #include ++#include +=20 + #include +=20 +@@ -491,7 +492,7 @@ static struct sonypi_device { + spinlock_t fifo_lock; + wait_queue_head_t fifo_proc_list; + struct fasync_struct *fifo_async; +- int open_count; ++ local_t open_count; + int model; + struct input_dev *input_jog_dev; + struct input_dev *input_key_dev; +@@ -895,7 +896,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); +- sonypi_device.open_count--; ++ local_dec(&sonypi_device.open_count); + mutex_unlock(&sonypi_device.lock); + return 0; + } +@@ -905,9 +906,9 @@ static int sonypi_misc_open(struct inode + lock_kernel(); + mutex_lock(&sonypi_device.lock); + /* Flush input queue on first open */ +- if (!sonypi_device.open_count) ++ if (!local_read(&sonypi_device.open_count)) + kfifo_reset(sonypi_device.fifo); +- sonypi_device.open_count++; ++ local_inc(&sonypi_device.open_count); + mutex_unlock(&sonypi_device.lock); + unlock_kernel(); + return 0; +diff -urNp linux-2.6.32.45/drivers/char/stallion.c linux-2.6.32.45/drive= rs/char/stallion.c +--- linux-2.6.32.45/drivers/char/stallion.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/stallion.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlp + struct stlport stl_dummyport; + struct stlport *portp; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport))) + return -EFAULT; + portp =3D stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr, +diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm_bios.c linux-2.6.32.45/d= rivers/char/tpm/tpm_bios.c +--- linux-2.6.32.45/drivers/char/tpm/tpm_bios.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/char/tpm/tpm_bios.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start + event =3D addr; +=20 + if ((event->event_type =3D=3D 0 && event->event_size =3D=3D 0) || +- ((addr + sizeof(struct tcpa_event) + event->event_size) >=3D limit= )) ++ (event->event_size >=3D limit - addr - sizeof(struct tcpa_event))) + return NULL; +=20 + return addr; +@@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next( + return NULL; +=20 + if ((event->event_type =3D=3D 0 && event->event_size =3D=3D 0) || +- ((v + sizeof(struct tcpa_event) + event->event_size) >=3D limit)) ++ (event->event_size >=3D limit - v - sizeof(struct tcpa_event))) + return NULL; +=20 + (*pos)++; +@@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_ + int i; +=20 + for (i =3D 0; i < sizeof(struct tcpa_event) + event->event_size; i++) +- seq_putc(m, data[i]); ++ if (!seq_putc(m, data[i])) ++ return -EFAULT; +=20 + return 0; + } +@@ -409,6 +410,11 @@ static int read_log(struct tpm_bios_log=20 + log->bios_event_log_end =3D log->bios_event_log + len; +=20 + virt =3D acpi_os_map_memory(start, len); ++ if (!virt) { ++ kfree(log->bios_event_log); ++ log->bios_event_log =3D NULL; ++ return -EFAULT; ++ } +=20 + memcpy(log->bios_event_log, virt, len); +=20 +diff -urNp linux-2.6.32.45/drivers/char/tpm/tpm.c linux-2.6.32.45/driver= s/char/tpm/tpm.c +--- linux-2.6.32.45/drivers/char/tpm/tpm.c 2011-04-17 17:00:52.000000000= -0400 ++++ linux-2.6.32.45/drivers/char/tpm/tpm.c 2011-05-16 21:46:57.000000000= -0400 +@@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c + chip->vendor.req_complete_val) + goto out_recv; +=20 +- if ((status =3D=3D chip->vendor.req_canceled)) { ++ if (status =3D=3D chip->vendor.req_canceled) { + dev_err(chip->dev, "Operation Canceled\n"); + rc =3D -ECANCELED; + goto out; +@@ -821,6 +821,8 @@ ssize_t tpm_show_pubek(struct device *de +=20 + struct tpm_chip *chip =3D dev_get_drvdata(dev); +=20 ++ pax_track_stack(); ++ + tpm_cmd.header.in =3D tpm_readpubek_header; + err =3D transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE, + "attempting to read the PUBEK"); +diff -urNp linux-2.6.32.45/drivers/char/tty_io.c linux-2.6.32.45/drivers= /char/tty_io.c +--- linux-2.6.32.45/drivers/char/tty_io.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/char/tty_io.c 2011-08-05 20:33:55.000000000 = -0400 +@@ -2582,8 +2582,10 @@ long tty_ioctl(struct file *file, unsign + return retval; + } +=20 ++EXPORT_SYMBOL(tty_ioctl); ++ + #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 =3D file->f_dentry->d_inode; +@@ -2607,6 +2609,8 @@ static long tty_compat_ioctl(struct file +=20 + return retval; + } ++ ++EXPORT_SYMBOL(tty_compat_ioctl); + #endif +=20 + /* +@@ -3052,7 +3056,7 @@ EXPORT_SYMBOL_GPL(get_current_tty); +=20 + void tty_default_fops(struct file_operations *fops) + { +- *fops =3D tty_fops; ++ memcpy((void *)fops, &tty_fops, sizeof(tty_fops)); + } +=20 + /* +diff -urNp linux-2.6.32.45/drivers/char/tty_ldisc.c linux-2.6.32.45/driv= ers/char/tty_ldisc.c +--- linux-2.6.32.45/drivers/char/tty_ldisc.c 2011-07-13 17:23:04.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/char/tty_ldisc.c 2011-07-13 17:23:18.0000000= 00 -0400 +@@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc * + if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { + struct tty_ldisc_ops *ldo =3D ld->ops; +=20 +- ldo->refcount--; ++ atomic_dec(&ldo->refcount); + module_put(ldo->owner); + spin_unlock_irqrestore(&tty_ldisc_lock, flags); +=20 +@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct=20 + spin_lock_irqsave(&tty_ldisc_lock, flags); + tty_ldiscs[disc] =3D new_ldisc; + new_ldisc->num =3D disc; +- new_ldisc->refcount =3D 0; ++ atomic_set(&new_ldisc->refcount, 0); + spin_unlock_irqrestore(&tty_ldisc_lock, flags); +=20 + return ret; +@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc) + return -EINVAL; +=20 + spin_lock_irqsave(&tty_ldisc_lock, flags); +- if (tty_ldiscs[disc]->refcount) ++ if (atomic_read(&tty_ldiscs[disc]->refcount)) + ret =3D -EBUSY; + else + tty_ldiscs[disc] =3D NULL; +@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i + if (ldops) { + ret =3D ERR_PTR(-EAGAIN); + if (try_module_get(ldops->owner)) { +- ldops->refcount++; ++ atomic_inc(&ldops->refcount); + ret =3D ldops; + } + } +@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o + unsigned long flags; +=20 + 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.45/drivers/char/virtio_console.c linux-2.6.32.45= /drivers/char/virtio_console.c +--- linux-2.6.32.45/drivers/char/virtio_console.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/char/virtio_console.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char * + * virtqueue, so we let the drivers do some boutique early-output thing= . */ + int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, i= nt)) + { +- virtio_cons.put_chars =3D put_chars; ++ pax_open_kernel(); ++ *(void **)&virtio_cons.put_chars =3D put_chars; ++ pax_close_kernel(); + return hvc_instantiate(0, 0, &virtio_cons); + } +=20 +@@ -213,11 +215,13 @@ static int __devinit virtcons_probe(stru + out_vq =3D vqs[1]; +=20 + /* Start using the new console output. */ +- virtio_cons.get_chars =3D get_chars; +- virtio_cons.put_chars =3D put_chars; +- virtio_cons.notifier_add =3D notifier_add_vio; +- virtio_cons.notifier_del =3D notifier_del_vio; +- virtio_cons.notifier_hangup =3D notifier_del_vio; ++ pax_open_kernel(); ++ *(void **)&virtio_cons.get_chars =3D get_chars; ++ *(void **)&virtio_cons.put_chars =3D put_chars; ++ *(void **)&virtio_cons.notifier_add =3D notifier_add_vio; ++ *(void **)&virtio_cons.notifier_del =3D notifier_del_vio; ++ *(void **)&virtio_cons.notifier_hangup =3D notifier_del_vio; ++ pax_close_kernel(); +=20 + /* The first argument of hvc_alloc() is the virtual console number, so + * we use zero. The second argument is the parameter for the +diff -urNp linux-2.6.32.45/drivers/char/vt.c linux-2.6.32.45/drivers/cha= r/vt.c +--- linux-2.6.32.45/drivers/char/vt.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/char/vt.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier +=20 + static void notify_write(struct vc_data *vc, unsigned int unicode) + { +- struct vt_notifier_param param =3D { .vc =3D vc, unicode =3D unicode }= ; ++ struct vt_notifier_param param =3D { .vc =3D vc, .c =3D unicode }; + atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, ¶m); + } +=20 +diff -urNp linux-2.6.32.45/drivers/char/vt_ioctl.c linux-2.6.32.45/drive= rs/char/vt_ioctl.c +--- linux-2.6.32.45/drivers/char/vt_ioctl.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/char/vt_ioctl.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __ + if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry))) + return -EFAULT; +=20 +- if (!capable(CAP_SYS_TTY_CONFIG)) +- perm =3D 0; +- + switch (cmd) { + case KDGKBENT: + key_map =3D key_maps[s]; +@@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ + val =3D (i ? K_HOLE : K_NOSUCHMAP); + return put_user(val, &user_kbe->kb_value); + case KDSKBENT: ++ if (!capable(CAP_SYS_TTY_CONFIG)) ++ perm =3D 0; ++ + if (!perm) + return -EPERM; ++ + if (!i && v =3D=3D K_NOSUCHMAP) { + /* deallocate map */ + key_map =3D key_maps[s]; +@@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry=20 + int i, j, k; + int ret; +=20 +- if (!capable(CAP_SYS_TTY_CONFIG)) +- perm =3D 0; +- + kbs =3D kmalloc(sizeof(*kbs), GFP_KERNEL); + if (!kbs) { + ret =3D -ENOMEM; +@@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry=20 + kfree(kbs); + return ((p && *p) ? -EOVERFLOW : 0); + case KDSKBSENT: ++ if (!capable(CAP_SYS_TTY_CONFIG)) ++ perm =3D 0; ++ + if (!perm) { + ret =3D -EPERM; + goto reterr; +diff -urNp linux-2.6.32.45/drivers/cpufreq/cpufreq.c linux-2.6.32.45/dri= vers/cpufreq/cpufreq.c +--- linux-2.6.32.45/drivers/cpufreq/cpufreq.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/cpufreq/cpufreq.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct + complete(&policy->kobj_unregister); + } +=20 +-static struct sysfs_ops sysfs_ops =3D { ++static const struct sysfs_ops sysfs_ops =3D { + .show =3D show, + .store =3D store, + }; +diff -urNp linux-2.6.32.45/drivers/cpuidle/sysfs.c linux-2.6.32.45/drive= rs/cpuidle/sysfs.c +--- linux-2.6.32.45/drivers/cpuidle/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/cpuidle/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj + return ret; + } +=20 +-static struct sysfs_ops cpuidle_sysfs_ops =3D { ++static const struct sysfs_ops cpuidle_sysfs_ops =3D { + .show =3D cpuidle_show, + .store =3D cpuidle_store, + }; +@@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct + return ret; + } +=20 +-static struct sysfs_ops cpuidle_state_sysfs_ops =3D { ++static const struct sysfs_ops cpuidle_state_sysfs_ops =3D { + .show =3D cpuidle_state_show, + }; +=20 +@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui + .release =3D cpuidle_state_sysfs_release, + }; +=20 +-static void inline cpuidle_free_state_kobj(struct cpuidle_device *devic= e, int i) ++static inline void cpuidle_free_state_kobj(struct cpuidle_device *devic= e, int i) + { + kobject_put(&device->kobjs[i]->kobj); + wait_for_completion(&device->kobjs[i]->kobj_unregister); +diff -urNp linux-2.6.32.45/drivers/crypto/hifn_795x.c linux-2.6.32.45/dr= ivers/crypto/hifn_795x.c +--- linux-2.6.32.45/drivers/crypto/hifn_795x.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/crypto/hifn_795x.c 2011-05-16 21:46:57.00000= 0000 -0400 +@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device=20 + 0xCA, 0x34, 0x2B, 0x2E}; + struct scatterlist sg; +=20 ++ pax_track_stack(); ++ + memset(src, 0, sizeof(src)); + memset(ctx.key, 0, sizeof(ctx.key)); +=20 +diff -urNp linux-2.6.32.45/drivers/crypto/padlock-aes.c linux-2.6.32.45/= drivers/crypto/padlock-aes.c +--- linux-2.6.32.45/drivers/crypto/padlock-aes.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/crypto/padlock-aes.c 2011-05-16 21:46:57.000= 000000 -0400 +@@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm + struct crypto_aes_ctx gen_aes; + int cpu; +=20 ++ pax_track_stack(); ++ + if (key_len % 8) { + *flags |=3D CRYPTO_TFM_RES_BAD_KEY_LEN; + return -EINVAL; +diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.c linux-2.6.32.45/driver= s/dma/ioat/dma.c +--- linux-2.6.32.45/drivers/dma/ioat/dma.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/dma/ioat/dma.c 2011-04-17 15:56:46.000000000= -0400 +@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str + return entry->show(&chan->common, page); + } +=20 +-struct sysfs_ops ioat_sysfs_ops =3D { ++const struct sysfs_ops ioat_sysfs_ops =3D { + .show =3D ioat_attr_show, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/dma/ioat/dma.h linux-2.6.32.45/driver= s/dma/ioat/dma.h +--- linux-2.6.32.45/drivers/dma/ioat/dma.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/dma/ioat/dma.h 2011-04-17 15:56:46.000000000= -0400 +@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c + unsigned long *phys_complete); + void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *= type); + 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.45/drivers/edac/edac_device_sysfs.c linux-2.6.32= .45/drivers/edac/edac_device_sysfs.c +--- linux-2.6.32.45/drivers/edac/edac_device_sysfs.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/edac/edac_device_sysfs.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s + } +=20 + /* edac_dev file operations for an 'ctl_info' */ +-static struct sysfs_ops device_ctl_info_ops =3D { ++static const struct sysfs_ops device_ctl_info_ops =3D { + .show =3D edac_dev_ctl_info_show, + .store =3D edac_dev_ctl_info_store + }; +@@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(s + } +=20 + /* edac_dev file operations for an 'instance' */ +-static struct sysfs_ops device_instance_ops =3D { ++static const struct sysfs_ops device_instance_ops =3D { + .show =3D edac_dev_instance_show, + .store =3D edac_dev_instance_store + }; +@@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(stru + } +=20 + /* edac_dev file operations for a 'block' */ +-static struct sysfs_ops device_block_ops =3D { ++static const struct sysfs_ops device_block_ops =3D { + .show =3D edac_dev_block_show, + .store =3D edac_dev_block_store + }; +diff -urNp linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c linux-2.6.32.45/= drivers/edac/edac_mc_sysfs.c +--- linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/edac/edac_mc_sysfs.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob + return -EIO; + } +=20 +-static struct sysfs_ops csrowfs_ops =3D { ++static const struct sysfs_ops csrowfs_ops =3D { + .show =3D csrowdev_show, + .store =3D csrowdev_store + }; +@@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobje + } +=20 + /* Intermediate show/store table */ +-static struct sysfs_ops mci_ops =3D { ++static const struct sysfs_ops mci_ops =3D { + .show =3D mcidev_show, + .store =3D mcidev_store + }; +diff -urNp linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c linux-2.6.32.45= /drivers/edac/edac_pci_sysfs.c +--- linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/edac/edac_pci_sysfs.c 2011-05-04 17:56:20.00= 0000000 -0400 +@@ -25,8 +25,8 @@ static int edac_pci_log_pe =3D 1; /* log=20 + static int edac_pci_log_npe =3D 1; /* log PCI non-parity error errors *= / + static int edac_pci_poll_msec =3D 1000; /* one second workq period */ +=20 +-static atomic_t pci_parity_count =3D ATOMIC_INIT(0); +-static atomic_t pci_nonparity_count =3D ATOMIC_INIT(0); ++static atomic_unchecked_t pci_parity_count =3D ATOMIC_INIT(0); ++static atomic_unchecked_t pci_nonparity_count =3D ATOMIC_INIT(0); +=20 + static struct kobject *edac_pci_top_main_kobj; + static atomic_t edac_pci_sysfs_refcount =3D ATOMIC_INIT(0); +@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s + } +=20 + /* fs_ops table */ +-static struct sysfs_ops pci_instance_ops =3D { ++static const struct sysfs_ops pci_instance_ops =3D { + .show =3D edac_pci_instance_show, + .store =3D edac_pci_instance_store + }; +@@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct + return -EIO; + } +=20 +-static struct sysfs_ops edac_pci_sysfs_ops =3D { ++static const struct sysfs_ops edac_pci_sysfs_ops =3D { + .show =3D edac_pci_dev_show, + .store =3D edac_pci_dev_store + }; +@@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(str + edac_printk(KERN_CRIT, EDAC_PCI, + "Signaled System Error on %s\n", + pci_name(dev)); +- atomic_inc(&pci_nonparity_count); ++ atomic_inc_unchecked(&pci_nonparity_count); + } +=20 + if (status & (PCI_STATUS_PARITY)) { +@@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(str + "Master Data Parity Error on %s\n", + pci_name(dev)); +=20 +- atomic_inc(&pci_parity_count); ++ atomic_inc_unchecked(&pci_parity_count); + } +=20 + if (status & (PCI_STATUS_DETECTED_PARITY)) { +@@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(str + "Detected Parity Error on %s\n", + pci_name(dev)); +=20 +- atomic_inc(&pci_parity_count); ++ atomic_inc_unchecked(&pci_parity_count); + } + } +=20 +@@ -616,7 +616,7 @@ static void edac_pci_dev_parity_test(str + edac_printk(KERN_CRIT, EDAC_PCI, "Bridge " + "Signaled System Error on %s\n", + pci_name(dev)); +- atomic_inc(&pci_nonparity_count); ++ atomic_inc_unchecked(&pci_nonparity_count); + } +=20 + if (status & (PCI_STATUS_PARITY)) { +@@ -624,7 +624,7 @@ static void edac_pci_dev_parity_test(str + "Master Data Parity Error on " + "%s\n", pci_name(dev)); +=20 +- atomic_inc(&pci_parity_count); ++ atomic_inc_unchecked(&pci_parity_count); + } +=20 + if (status & (PCI_STATUS_DETECTED_PARITY)) { +@@ -632,7 +632,7 @@ static void edac_pci_dev_parity_test(str + "Detected Parity Error on %s\n", + pci_name(dev)); +=20 +- atomic_inc(&pci_parity_count); ++ atomic_inc_unchecked(&pci_parity_count); + } + } + } +@@ -674,7 +674,7 @@ void edac_pci_do_parity_check(void) + if (!check_pci_errors) + return; +=20 +- before_count =3D atomic_read(&pci_parity_count); ++ before_count =3D atomic_read_unchecked(&pci_parity_count); +=20 + /* scan all PCI devices looking for a Parity Error on devices and + * bridges. +@@ -686,7 +686,7 @@ void edac_pci_do_parity_check(void) + /* Only if operator has selected panic on PCI Error */ + if (edac_pci_get_panic_on_pe()) { + /* If the count is different 'after' from 'before' */ +- if (before_count !=3D atomic_read(&pci_parity_count)) ++ if (before_count !=3D atomic_read_unchecked(&pci_parity_count)) + panic("EDAC: PCI Parity Error"); + } + } +diff -urNp linux-2.6.32.45/drivers/firewire/core-card.c linux-2.6.32.45/= drivers/firewire/core-card.c +--- linux-2.6.32.45/drivers/firewire/core-card.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/firewire/core-card.c 2011-08-23 21:22:32.000= 000000 -0400 +@@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref) +=20 + void fw_core_remove_card(struct fw_card *card) + { +- struct fw_card_driver dummy_driver =3D dummy_driver_template; ++ fw_card_driver_no_const dummy_driver =3D dummy_driver_template; +=20 + card->driver->update_phy_reg(card, 4, + PHY_LINK_ACTIVE | PHY_CONTENDER, 0); +diff -urNp linux-2.6.32.45/drivers/firewire/core-cdev.c linux-2.6.32.45/= drivers/firewire/core-cdev.c +--- linux-2.6.32.45/drivers/firewire/core-cdev.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/firewire/core-cdev.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie + int ret; +=20 + if ((request->channels =3D=3D 0 && request->bandwidth =3D=3D 0) || +- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL || +- request->bandwidth < 0) ++ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL) + return -EINVAL; +=20 + r =3D kmalloc(sizeof(*r), GFP_KERNEL); +diff -urNp linux-2.6.32.45/drivers/firewire/core.h linux-2.6.32.45/drive= rs/firewire/core.h +--- linux-2.6.32.45/drivers/firewire/core.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/firewire/core.h 2011-08-23 20:24:26.00000000= 0 -0400 +@@ -86,6 +86,7 @@ struct fw_card_driver { +=20 + int (*stop_iso)(struct fw_iso_context *ctx); + }; ++typedef struct fw_card_driver __no_const fw_card_driver_no_const; +=20 + void fw_card_initialize(struct fw_card *card, + const struct fw_card_driver *driver, struct device *device); +diff -urNp linux-2.6.32.45/drivers/firewire/core-transaction.c linux-2.6= .32.45/drivers/firewire/core-transaction.c +--- linux-2.6.32.45/drivers/firewire/core-transaction.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/firewire/core-transaction.c 2011-05-16 21:46= :57.000000000 -0400 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include +=20 + #include +=20 +@@ -344,6 +345,8 @@ int fw_run_transaction(struct fw_card *c + struct transaction_callback_data d; + struct fw_transaction t; +=20 ++ pax_track_stack(); ++ + init_completion(&d.done); + d.payload =3D payload; + fw_send_request(card, &t, tcode, destination_id, generation, speed, +diff -urNp linux-2.6.32.45/drivers/firmware/dmi_scan.c linux-2.6.32.45/d= rivers/firmware/dmi_scan.c +--- linux-2.6.32.45/drivers/firmware/dmi_scan.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/firmware/dmi_scan.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) + } + } + else { +- /* +- * no iounmap() for that ioremap(); it would be a no-op, but +- * it's so early in setup that sucker gets confused into doing +- * what it shouldn't if we actually call it. +- */ + p =3D dmi_ioremap(0xF0000, 0x10000); + if (p =3D=3D NULL) + goto error; +diff -urNp linux-2.6.32.45/drivers/firmware/edd.c linux-2.6.32.45/driver= s/firmware/edd.c +--- linux-2.6.32.45/drivers/firmware/edd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/firmware/edd.c 2011-04-17 15:56:46.000000000= -0400 +@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str + return ret; + } +=20 +-static struct sysfs_ops edd_attr_ops =3D { ++static const struct sysfs_ops edd_attr_ops =3D { + .show =3D edd_attr_show, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/firmware/efivars.c linux-2.6.32.45/dr= ivers/firmware/efivars.c +--- linux-2.6.32.45/drivers/firmware/efivars.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/firmware/efivars.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct=20 + return ret; + } +=20 +-static struct sysfs_ops efivar_attr_ops =3D { ++static const struct sysfs_ops efivar_attr_ops =3D { + .show =3D efivar_attr_show, + .store =3D efivar_attr_store, + }; +diff -urNp linux-2.6.32.45/drivers/firmware/iscsi_ibft.c linux-2.6.32.45= /drivers/firmware/iscsi_ibft.c +--- linux-2.6.32.45/drivers/firmware/iscsi_ibft.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/firmware/iscsi_ibft.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc + return ret; + } +=20 +-static struct sysfs_ops ibft_attr_ops =3D { ++static const struct sysfs_ops ibft_attr_ops =3D { + .show =3D ibft_show_attribute, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/firmware/memmap.c linux-2.6.32.45/dri= vers/firmware/memmap.c +--- linux-2.6.32.45/drivers/firmware/memmap.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/firmware/memmap.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] =3D { + NULL + }; +=20 +-static struct sysfs_ops memmap_attr_ops =3D { ++static const struct sysfs_ops memmap_attr_ops =3D { + .show =3D memmap_attr_show, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/gpio/vr41xx_giu.c linux-2.6.32.45/dri= vers/gpio/vr41xx_giu.c +--- linux-2.6.32.45/drivers/gpio/vr41xx_giu.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/gpio/vr41xx_giu.c 2011-05-04 17:56:28.000000= 000 -0400 +@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq) + printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n", + maskl, pendl, maskh, pendh); +=20 +- atomic_inc(&irq_err_count); ++ atomic_inc_unchecked(&irq_err_count); +=20 + return -EINVAL; + } +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c linux-2.6.3= 2.45/drivers/gpu/drm/drm_crtc_helper.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_crtc_helper.c 2011-05-16 21:46:5= 7.000000000 -0400 +@@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct d + struct drm_crtc *tmp; + int crtc_mask =3D 1; +=20 +- WARN(!crtc, "checking null crtc?"); ++ BUG_ON(!crtc); +=20 + dev =3D crtc->dev; +=20 +@@ -642,6 +642,8 @@ bool drm_crtc_helper_set_mode(struct drm +=20 + adjusted_mode =3D drm_mode_duplicate(dev, mode); +=20 ++ pax_track_stack(); ++ + crtc->enabled =3D drm_helper_crtc_in_use(crtc); +=20 + if (!crtc->enabled) +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_drv.c linux-2.6.32.45/dri= vers/gpu/drm/drm_drv.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_drv.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_drv.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc + char *kdata =3D NULL; +=20 + atomic_inc(&dev->ioctl_count); +- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]); + ++file_priv->ioctl_count; +=20 + DRM_DEBUG("pid=3D%d, cmd=3D0x%02x, nr=3D0x%02x, dev 0x%lx, auth=3D%d\n= ", +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_fops.c linux-2.6.32.45/dr= ivers/gpu/drm/drm_fops.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_fops.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_fops.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * + } +=20 + for (i =3D 0; i < ARRAY_SIZE(dev->counts); i++) +- atomic_set(&dev->counts[i], 0); ++ atomic_set_unchecked(&dev->counts[i], 0); +=20 + dev->sigdata.lock =3D NULL; +=20 +@@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct +=20 + retcode =3D drm_open_helper(inode, filp, dev); + if (!retcode) { +- atomic_inc(&dev->counts[_DRM_STAT_OPENS]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]); + spin_lock(&dev->count_lock); +- if (!dev->open_count++) { ++ if (local_inc_return(&dev->open_count) =3D=3D 1) { + spin_unlock(&dev->count_lock); + retcode =3D drm_setup(dev); + goto out; +@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str +=20 + lock_kernel(); +=20 +- DRM_DEBUG("open_count =3D %d\n", dev->open_count); ++ DRM_DEBUG("open_count =3D %d\n", local_read(&dev->open_count)); +=20 + if (dev->driver->preclose) + dev->driver->preclose(dev, file_priv); +@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str + DRM_DEBUG("pid =3D %d, device =3D 0x%lx, open_count =3D %d\n", + task_pid_nr(current), + (long)old_encode_dev(file_priv->minor->device), +- dev->open_count); ++ local_read(&dev->open_count)); +=20 + /* if the master has gone away we can't do anything with the lock */ + if (file_priv->minor->master) +@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str + * End inline drm_release + */ +=20 +- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]); + spin_lock(&dev->count_lock); +- if (!--dev->open_count) { ++ if (local_dec_and_test(&dev->open_count)) { + if (atomic_read(&dev->ioctl_count)) { + DRM_ERROR("Device busy: %d\n", + atomic_read(&dev->ioctl_count)); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_gem.c linux-2.6.32.45/dri= vers/gpu/drm/drm_gem.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_gem.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_gem.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev) + spin_lock_init(&dev->object_name_lock); + idr_init(&dev->object_name_idr); + atomic_set(&dev->object_count, 0); +- atomic_set(&dev->object_memory, 0); ++ atomic_set_unchecked(&dev->object_memory, 0); + atomic_set(&dev->pin_count, 0); +- atomic_set(&dev->pin_memory, 0); ++ atomic_set_unchecked(&dev->pin_memory, 0); + atomic_set(&dev->gtt_count, 0); +- atomic_set(&dev->gtt_memory, 0); ++ atomic_set_unchecked(&dev->gtt_memory, 0); +=20 + mm =3D kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL); + if (!mm) { +@@ -150,7 +150,7 @@ drm_gem_object_alloc(struct drm_device * + goto fput; + } + atomic_inc(&dev->object_count); +- atomic_add(obj->size, &dev->object_memory); ++ atomic_add_unchecked(obj->size, &dev->object_memory); + return obj; + fput: + fput(obj->filp); +@@ -429,7 +429,7 @@ drm_gem_object_free(struct kref *kref) +=20 + fput(obj->filp); + atomic_dec(&dev->object_count); +- atomic_sub(obj->size, &dev->object_memory); ++ atomic_sub_unchecked(obj->size, &dev->object_memory); + kfree(obj); + } + EXPORT_SYMBOL(drm_gem_object_free); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_info.c linux-2.6.32.45/dr= ivers/gpu/drm/drm_info.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_info.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_info.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void + struct drm_local_map *map; + struct drm_map_list *r_list; +=20 +- /* Hardcoded from _DRM_FRAME_BUFFER, +- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and +- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */ +- const char *types[] =3D { "FB", "REG", "SHM", "AGP", "SG", "PCI" }; ++ static const char * const types[] =3D { ++ [_DRM_FRAME_BUFFER] =3D "FB", ++ [_DRM_REGISTERS] =3D "REG", ++ [_DRM_SHM] =3D "SHM", ++ [_DRM_AGP] =3D "AGP", ++ [_DRM_SCATTER_GATHER] =3D "SG", ++ [_DRM_CONSISTENT] =3D "PCI", ++ [_DRM_GEM] =3D "GEM" }; + const char *type; + int i; +=20 +@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void + map =3D r_list->map; + if (!map) + continue; +- if (map->type < 0 || map->type > 5) ++ if (map->type >=3D ARRAY_SIZE(types)) + type =3D "??"; + else + type =3D types[map->type]; +@@ -265,10 +269,10 @@ int drm_gem_object_info(struct seq_file=20 + struct drm_device *dev =3D node->minor->dev; +=20 + seq_printf(m, "%d objects\n", atomic_read(&dev->object_count)); +- seq_printf(m, "%d object bytes\n", atomic_read(&dev->object_memory)); ++ seq_printf(m, "%d object bytes\n", atomic_read_unchecked(&dev->object_= memory)); + seq_printf(m, "%d pinned\n", atomic_read(&dev->pin_count)); +- seq_printf(m, "%d pin bytes\n", atomic_read(&dev->pin_memory)); +- seq_printf(m, "%d gtt bytes\n", atomic_read(&dev->gtt_memory)); ++ seq_printf(m, "%d pin bytes\n", atomic_read_unchecked(&dev->pin_memory= )); ++ seq_printf(m, "%d gtt bytes\n", atomic_read_unchecked(&dev->gtt_memory= )); + seq_printf(m, "%d gtt total\n", dev->gtt_total); + return 0; + } +@@ -288,7 +292,11 @@ int drm_vma_info(struct seq_file *m, voi + mutex_lock(&dev->struct_mutex); + seq_printf(m, "vma use count: %d, high_memory =3D %p, 0x%08llx\n", + atomic_read(&dev->vma_count), ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++ NULL, 0); ++#else + high_memory, (u64)virt_to_phys(high_memory)); ++#endif +=20 + list_for_each_entry(pt, &dev->vmalist, head) { + vma =3D pt->vma; +@@ -296,14 +304,23 @@ int drm_vma_info(struct seq_file *m, voi + continue; + seq_printf(m, + "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000", +- pt->pid, vma->vm_start, vma->vm_end, ++ pt->pid, ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++ 0, 0, ++#else ++ vma->vm_start, vma->vm_end, ++#endif + vma->vm_flags & VM_READ ? 'r' : '-', + vma->vm_flags & VM_WRITE ? 'w' : '-', + vma->vm_flags & VM_EXEC ? 'x' : '-', + vma->vm_flags & VM_MAYSHARE ? 's' : 'p', + vma->vm_flags & VM_LOCKED ? 'l' : '-', + vma->vm_flags & VM_IO ? 'i' : '-', ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++ 0); ++#else + vma->vm_pgoff); ++#endif +=20 + #if defined(__i386__) + pgprot =3D pgprot_val(vma->vm_page_prot); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.45/d= rivers/gpu/drm/drm_ioctl.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_ioctl.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, + stats->data[i].value =3D + (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lo= ck->lock : 0); + else +- stats->data[i].value =3D atomic_read(&dev->counts[i]); ++ stats->data[i].value =3D atomic_read_unchecked(&dev->counts[i]); + stats->data[i].type =3D dev->types[i]; + } +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/drm_lock.c linux-2.6.32.45/dr= ivers/gpu/drm/drm_lock.c +--- linux-2.6.32.45/drivers/gpu/drm/drm_lock.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/drm_lock.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi + if (drm_lock_take(&master->lock, lock->context)) { + master->lock.file_priv =3D file_priv; + master->lock.lock_time =3D jiffies; +- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]); + break; /* Got lock */ + } +=20 +@@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, v + return -EINVAL; + } +=20 +- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]); +=20 + /* kernel_context_switch isn't used by any of the x86 drm + * modules but is required by the Sparc driver. +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c linux-2.6.32.= 45/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i810/i810_dma.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de + dma->buflist[vertex->idx], + vertex->discard, vertex->used); +=20 +- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]); +- atomic_inc(&dev->counts[_DRM_STAT_DMA]); ++ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]); + sarea_priv->last_enqueue =3D dev_priv->counter - 1; + sarea_priv->last_dispatch =3D (int)hw_status[5]; +=20 +@@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device + i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used, + mc->last_render); +=20 +- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]); +- atomic_inc(&dev->counts[_DRM_STAT_DMA]); ++ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]); ++ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]); + sarea_priv->last_enqueue =3D dev_priv->counter - 1; + sarea_priv->last_dispatch =3D (int)hw_status[5]; +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h linux-2.6.32.= 45/drivers/gpu/drm/i810/i810_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i810/i810_drv.h 2011-05-04 17:56:28.= 000000000 -0400 +@@ -108,8 +108,8 @@ typedef struct drm_i810_private { + int page_flipping; +=20 + wait_queue_head_t irq_queue; +- atomic_t irq_received; +- atomic_t irq_emitted; ++ atomic_unchecked_t irq_received; ++ atomic_unchecked_t irq_emitted; +=20 + int front_offset; + } drm_i810_private_t; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h linux-2.6.32.= 45/drivers/gpu/drm/i830/i830_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i830/i830_drv.h 2011-05-04 17:56:28.= 000000000 -0400 +@@ -115,8 +115,8 @@ typedef struct drm_i830_private { + int page_flipping; +=20 + wait_queue_head_t irq_queue; +- atomic_t irq_received; +- atomic_t irq_emitted; ++ atomic_unchecked_t irq_received; ++ atomic_unchecked_t irq_emitted; +=20 + int use_mi_batchbuffer_start; +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.= 45/drivers/gpu/drm/i830/i830_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i830/i830_irq.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_ +=20 + I830_WRITE16(I830REG_INT_IDENTITY_R, temp); +=20 +- atomic_inc(&dev_priv->irq_received); ++ atomic_inc_unchecked(&dev_priv->irq_received); + wake_up_interruptible(&dev_priv->irq_queue); +=20 + return IRQ_HANDLED; +@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_devi +=20 + DRM_DEBUG("%s\n", __func__); +=20 +- atomic_inc(&dev_priv->irq_emitted); ++ atomic_inc_unchecked(&dev_priv->irq_emitted); +=20 + BEGIN_LP_RING(2); + OUT_RING(0); + OUT_RING(GFX_OP_USER_INTERRUPT); + ADVANCE_LP_RING(); +=20 +- return atomic_read(&dev_priv->irq_emitted); ++ return atomic_read_unchecked(&dev_priv->irq_emitted); + } +=20 + static int i830_wait_irq(struct drm_device * dev, int irq_nr) +@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_devi +=20 + DRM_DEBUG("%s\n", __func__); +=20 +- if (atomic_read(&dev_priv->irq_received) >=3D irq_nr) ++ if (atomic_read_unchecked(&dev_priv->irq_received) >=3D irq_nr) + return 0; +=20 + dev_priv->sarea_priv->perf_boxes |=3D I830_BOX_WAIT; +@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_devi +=20 + for (;;) { + __set_current_state(TASK_INTERRUPTIBLE); +- if (atomic_read(&dev_priv->irq_received) >=3D irq_nr) ++ if (atomic_read_unchecked(&dev_priv->irq_received) >=3D irq_nr) + break; + if ((signed)(end - jiffies) <=3D 0) { + DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n", +@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct d + I830_WRITE16(I830REG_HWSTAM, 0xffff); + I830_WRITE16(I830REG_INT_MASK_R, 0x0); + I830_WRITE16(I830REG_INT_ENABLE_R, 0x0); +- atomic_set(&dev_priv->irq_received, 0); +- atomic_set(&dev_priv->irq_emitted, 0); ++ atomic_set_unchecked(&dev_priv->irq_received, 0); ++ atomic_set_unchecked(&dev_priv->irq_emitted, 0); + init_waitqueue_head(&dev_priv->irq_queue); + } +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.3= 2.45/drivers/gpu/drm/i915/dvo_ch7017.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7017.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ + } + } +=20 +-struct intel_dvo_dev_ops ch7017_ops =3D { ++const struct intel_dvo_dev_ops ch7017_ops =3D { + .init =3D ch7017_init, + .detect =3D ch7017_detect, + .mode_valid =3D ch7017_mode_valid, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.3= 2.45/drivers/gpu/drm/i915/dvo_ch7xxx.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ch7xxx.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ + } + } +=20 +-struct intel_dvo_dev_ops ch7xxx_ops =3D { ++const struct intel_dvo_dev_ops ch7xxx_ops =3D { + .init =3D ch7xxx_init, + .detect =3D ch7xxx_detect, + .mode_valid =3D ch7xxx_mode_valid, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h linux-2.6.32.45/dr= ivers/gpu/drm/i915/dvo.h +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { + * + * \return singly-linked list of modes or NULL if no modes found. + */ +- struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo); ++ struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *= dvo); +=20 + /** + * Clean up driver-specific bits of the output + */ +- void (*destroy) (struct intel_dvo_device *dvo); ++ void (* const destroy) (struct intel_dvo_device *dvo); +=20 + /** + * Debugging hook to dump device registers to log file + */ +- void (*dump_regs)(struct intel_dvo_device *dvo); ++ void (* const dump_regs)(struct intel_dvo_device *dvo); + }; +=20 +-extern struct intel_dvo_dev_ops sil164_ops; +-extern struct intel_dvo_dev_ops ch7xxx_ops; +-extern struct intel_dvo_dev_ops ivch_ops; +-extern struct intel_dvo_dev_ops tfp410_ops; +-extern struct intel_dvo_dev_ops ch7017_ops; ++extern const struct intel_dvo_dev_ops sil164_ops; ++extern const struct intel_dvo_dev_ops ch7xxx_ops; ++extern const struct intel_dvo_dev_ops ivch_ops; ++extern const struct intel_dvo_dev_ops tfp410_ops; ++extern const struct intel_dvo_dev_ops ch7017_ops; +=20 + #endif /* _INTEL_DVO_H */ +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.= 45/drivers/gpu/drm/i915/dvo_ivch.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_ivch.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv + } + } +=20 +-struct intel_dvo_dev_ops ivch_ops=3D { ++const struct intel_dvo_dev_ops ivch_ops=3D { + .init =3D ivch_init, + .dpms =3D ivch_dpms, + .save =3D ivch_save, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.3= 2.45/drivers/gpu/drm/i915/dvo_sil164.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_sil164.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ + } + } +=20 +-struct intel_dvo_dev_ops sil164_ops =3D { ++const struct intel_dvo_dev_ops sil164_ops =3D { + .init =3D sil164_init, + .detect =3D sil164_detect, + .mode_valid =3D sil164_mode_valid, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.3= 2.45/drivers/gpu/drm/i915/dvo_tfp410.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/dvo_tfp410.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ + } + } +=20 +-struct intel_dvo_dev_ops tfp410_ops =3D { ++const struct intel_dvo_dev_ops tfp410_ops =3D { + .init =3D tfp410_init, + .detect =3D tfp410_detect, + .mode_valid =3D tfp410_mode_valid, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c linux-2.6= .32.45/drivers/gpu/drm/i915/i915_debugfs.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_debugfs.c 2011-05-04 17:56= :28.000000000 -0400 +@@ -192,7 +192,7 @@ static int i915_interrupt_info(struct se + I915_READ(GTIMR)); + } + seq_printf(m, "Interrupts received: %d\n", +- atomic_read(&dev_priv->irq_received)); ++ atomic_read_unchecked(&dev_priv->irq_received)); + if (dev_priv->hw_status_page !=3D NULL) { + seq_printf(m, "Current sequence: %d\n", + i915_get_gem_seqno(dev)); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.= 45/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev) + return i915_resume(dev); + } +=20 +-static struct vm_operations_struct i915_gem_vm_ops =3D { ++static const struct vm_operations_struct i915_gem_vm_ops =3D { + .fault =3D i915_gem_fault, + .open =3D drm_gem_vm_open, + .close =3D drm_gem_vm_close, +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h linux-2.6.32.= 45/drivers/gpu/drm/i915/i915_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_drv.h 2011-08-05 20:33:55.= 000000000 -0400 +@@ -168,7 +168,7 @@ struct drm_i915_display_funcs { + /* display clock increase/decrease */ + /* pll clock increase/decrease */ + /* clock gating init */ +-}; ++} __no_const; +=20 + typedef struct drm_i915_private { + struct drm_device *dev; +@@ -197,7 +197,7 @@ typedef struct drm_i915_private { + int page_flipping; +=20 + wait_queue_head_t irq_queue; +- atomic_t irq_received; ++ atomic_unchecked_t irq_received; + /** Protects user_irq_refcount and irq_mask_reg */ + spinlock_t user_irq_lock; + /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */ +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c linux-2.6.32.= 45/drivers/gpu/drm/i915/i915_gem.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_gem.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_d +=20 + args->aper_size =3D dev->gtt_total; + args->aper_available_size =3D (args->aper_size - +- atomic_read(&dev->pin_memory)); ++ atomic_read_unchecked(&dev->pin_memory)); +=20 + return 0; + } +@@ -492,6 +492,11 @@ i915_gem_pread_ioctl(struct drm_device * + return -EINVAL; + } +=20 ++ if (!access_ok(VERIFY_WRITE, (char __user *) (uintptr_t)args->data_ptr= , args->size)) { ++ drm_gem_object_unreference(obj); ++ return -EFAULT; ++ } ++ + if (i915_gem_object_needs_bit17_swizzle(obj)) { + ret =3D i915_gem_shmem_pread_slow(dev, obj, args, file_priv); + } else { +@@ -965,6 +970,11 @@ i915_gem_pwrite_ioctl(struct drm_device=20 + return -EINVAL; + } +=20 ++ if (!access_ok(VERIFY_READ, (char __user *) (uintptr_t)args->data_ptr,= args->size)) { ++ drm_gem_object_unreference(obj); ++ return -EFAULT; ++ } ++ + /* We can only do the GTT pwrite on untiled buffers, as otherwise + * it would end up going through the fenced access, and we'll get + * different detiling behavior between reading and writing. +@@ -2054,7 +2064,7 @@ i915_gem_object_unbind(struct drm_gem_ob +=20 + if (obj_priv->gtt_space) { + atomic_dec(&dev->gtt_count); +- atomic_sub(obj->size, &dev->gtt_memory); ++ atomic_sub_unchecked(obj->size, &dev->gtt_memory); +=20 + drm_mm_put_block(obj_priv->gtt_space); + obj_priv->gtt_space =3D NULL; +@@ -2697,7 +2707,7 @@ i915_gem_object_bind_to_gtt(struct drm_g + goto search_free; + } + atomic_inc(&dev->gtt_count); +- atomic_add(obj->size, &dev->gtt_memory); ++ atomic_add_unchecked(obj->size, &dev->gtt_memory); +=20 + /* Assert that the object is not currently in any GPU domain. As it + * wasn't in the GTT, there shouldn't be any way it could have been in +@@ -3751,9 +3761,9 @@ i915_gem_execbuffer(struct drm_device *d + "%d/%d gtt bytes\n", + atomic_read(&dev->object_count), + atomic_read(&dev->pin_count), +- atomic_read(&dev->object_memory), +- atomic_read(&dev->pin_memory), +- atomic_read(&dev->gtt_memory), ++ atomic_read_unchecked(&dev->object_memory), ++ atomic_read_unchecked(&dev->pin_memory), ++ atomic_read_unchecked(&dev->gtt_memory), + dev->gtt_total); + } + goto err; +@@ -3985,7 +3995,7 @@ i915_gem_object_pin(struct drm_gem_objec + */ + if (obj_priv->pin_count =3D=3D 1) { + atomic_inc(&dev->pin_count); +- atomic_add(obj->size, &dev->pin_memory); ++ atomic_add_unchecked(obj->size, &dev->pin_memory); + if (!obj_priv->active && + (obj->write_domain & I915_GEM_GPU_DOMAINS) =3D=3D 0 && + !list_empty(&obj_priv->list)) +@@ -4018,7 +4028,7 @@ i915_gem_object_unpin(struct drm_gem_obj + list_move_tail(&obj_priv->list, + &dev_priv->mm.inactive_list); + atomic_dec(&dev->pin_count); +- atomic_sub(obj->size, &dev->pin_memory); ++ atomic_sub_unchecked(obj->size, &dev->pin_memory); + } + i915_verify_inactive(dev, __FILE__, __LINE__); + } +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c linux-2.6.32.= 45/drivers/gpu/drm/i915/i915_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/i915_irq.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_ + int irq_received; + int ret =3D IRQ_NONE; +=20 +- atomic_inc(&dev_priv->irq_received); ++ atomic_inc_unchecked(&dev_priv->irq_received); +=20 + if (IS_IGDNG(dev)) + return igdng_irq_handler(dev); +@@ -1021,7 +1021,7 @@ void i915_driver_irq_preinstall(struct d + { + drm_i915_private_t *dev_priv =3D (drm_i915_private_t *) dev->dev_priva= te; +=20 +- atomic_set(&dev_priv->irq_received, 0); ++ atomic_set_unchecked(&dev_priv->irq_received, 0); +=20 + INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func); + INIT_WORK(&dev_priv->error_work, i915_error_work_func); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c linux-2.6.3= 2.45/drivers/gpu/drm/i915/intel_sdvo.c +--- linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/i915/intel_sdvo.c 2011-08-05 20:33:5= 5.000000000 -0400 +@@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device * + sdvo_priv->slave_addr =3D intel_sdvo_get_slave_addr(dev, output_device= ); +=20 + /* Save the bit-banging i2c functionality for use by the DDC wrapper *= / +- intel_sdvo_i2c_bit_algo.functionality =3D intel_output->i2c_bus->algo-= >functionality; ++ pax_open_kernel(); ++ *(void **)&intel_sdvo_i2c_bit_algo.functionality =3D intel_output->i2c= _bus->algo->functionality; ++ pax_close_kernel(); +=20 + /* Read the regs to test if we can talk to the device */ + for (i =3D 0; i < 0x40; i++) { +diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h linux-2.6.32.45= /drivers/gpu/drm/mga/mga_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/mga/mga_drv.h 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -120,9 +120,9 @@ typedef struct drm_mga_private { + u32 clear_cmd; + u32 maccess; +=20 +- atomic_t vbl_received; /**< Number of vblanks received. */ ++ atomic_unchecked_t vbl_received; /**< Number of vblanks recei= ved. */ + wait_queue_head_t fence_queue; +- atomic_t last_fence_retired; ++ atomic_unchecked_t last_fence_retired; + u32 next_fence_to_post; +=20 + unsigned int fb_cpp; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c linux-2.6.32.45= /drivers/gpu/drm/mga/mga_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/mga/mga_irq.c 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de + if (crtc !=3D 0) + return 0; +=20 +- return atomic_read(&dev_priv->vbl_received); ++ return atomic_read_unchecked(&dev_priv->vbl_received); + } +=20 +=20 +@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I + /* VBLANK interrupt */ + if (status & MGA_VLINEPEN) { + MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR); +- atomic_inc(&dev_priv->vbl_received); ++ atomic_inc_unchecked(&dev_priv->vbl_received); + drm_handle_vblank(dev, 0); + handled =3D 1; + } +@@ -80,7 +80,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I + MGA_WRITE(MGA_PRIMEND, prim_end); + } +=20 +- atomic_inc(&dev_priv->last_fence_retired); ++ atomic_inc_unchecked(&dev_priv->last_fence_retired); + DRM_WAKEUP(&dev_priv->fence_queue); + handled =3D 1; + } +@@ -131,7 +131,7 @@ int mga_driver_fence_wait(struct drm_dev + * using fences. + */ + DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ, +- (((cur_fence =3D atomic_read(&dev_priv->last_fence_retired)) ++ (((cur_fence =3D atomic_read_unchecked(&dev_priv->last_fence_reti= red)) + - *sequence) <=3D (1 << 23))); +=20 + *sequence =3D cur_fence; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c linux-2.6.32.= 45/drivers/gpu/drm/r128/r128_cce.c +--- linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_cce.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d +=20 + /* GH: Simple idle check. + */ +- atomic_set(&dev_priv->idle_count, 0); ++ atomic_set_unchecked(&dev_priv->idle_count, 0); +=20 + /* We don't support anything other than bus-mastering ring mode, + * but the ring can be in either AGP or PCI space for the ring +diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h linux-2.6.32.= 45/drivers/gpu/drm/r128/r128_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_drv.h 2011-05-04 17:56:28.= 000000000 -0400 +@@ -90,14 +90,14 @@ typedef struct drm_r128_private { + int is_pci; + unsigned long cce_buffers_offset; +=20 +- atomic_t idle_count; ++ atomic_unchecked_t idle_count; +=20 + int page_flipping; + int current_page; + u32 crtc_offset; + u32 crtc_offset_cntl; +=20 +- atomic_t vbl_received; ++ atomic_unchecked_t vbl_received; +=20 + u32 color_fmt; + unsigned int front_offset; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c linux-2.6.32.= 45/drivers/gpu/drm/r128/r128_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_irq.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d + if (crtc !=3D 0) + return 0; +=20 +- return atomic_read(&dev_priv->vbl_received); ++ return atomic_read_unchecked(&dev_priv->vbl_received); + } +=20 + irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS) +@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_ + /* VBLANK interrupt */ + if (status & R128_CRTC_VBLANK_INT) { + R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK); +- atomic_inc(&dev_priv->vbl_received); ++ atomic_inc_unchecked(&dev_priv->vbl_received); + drm_handle_vblank(dev, 0); + return IRQ_HANDLED; + } +diff -urNp linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c linux-2.6.3= 2.45/drivers/gpu/drm/r128/r128_state.c +--- linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/r128/r128_state.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_priv +=20 + static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv) + { +- if (atomic_read(&dev_priv->idle_count) =3D=3D 0) { ++ if (atomic_read_unchecked(&dev_priv->idle_count) =3D=3D 0) { + r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0); + } else { +- atomic_set(&dev_priv->idle_count, 0); ++ atomic_set_unchecked(&dev_priv->idle_count, 0); + } + } +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c linux-2.6.32.45= /drivers/gpu/drm/radeon/atom.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c 2011-05-10 22:12:01.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/atom.c 2011-05-16 21:46:57.00= 0000000 -0400 +@@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct c + char name[512]; + int i; +=20 ++ pax_track_stack(); ++ + ctx->card =3D card; + ctx->bios =3D bios; +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c linux-2.6= .32.45/drivers/gpu/drm/radeon/mkregtable.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/mkregtable.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,=20 + regex_t mask_rex; + regmatch_t match[4]; + char buf[1024]; +- size_t end; ++ long end; + int len; + int done =3D 0; + int r; + unsigned o; + struct offset *offset; + char last_reg_s[10]; +- int last_reg; ++ unsigned long last_reg; +=20 + if (regcomp + (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c linu= x-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_atombios.c 2011-05-16 = 21:46:57.000000000 -0400 +@@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from + bool linkb; + struct radeon_i2c_bus_rec ddc_bus; +=20 ++ pax_track_stack(); ++ + atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); +=20 + if (data_offset =3D=3D 0) +@@ -520,13 +522,13 @@ static uint16_t atombios_get_connector_o + } + } +=20 +-struct bios_connector { ++static struct bios_connector { + bool valid; + uint16_t line_mux; + uint16_t devices; + int connector_type; + struct radeon_i2c_bus_rec ddc_bus; +-}; ++} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; +=20 + bool radeon_get_atom_connector_info_from_supported_devices_table(struct + drm_device +@@ -542,7 +544,6 @@ bool radeon_get_atom_connector_info_from + uint8_t dac; + union atom_supported_devices *supported_devices; + int i, j; +- struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; +=20 + atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c linux= -2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_display.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl +=20 + if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) { + error =3D freq - current_freq; +- error =3D error < 0 ? 0xffffffff : error; ++ error =3D (int32_t)error < 0 ? 0xffffffff : error; + } else + error =3D abs(current_freq - freq); + vco_diff =3D abs(vco - best_vco); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h linux-2.6= .32.45/drivers/gpu/drm/radeon/radeon_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_drv.h 2011-05-04 17:56= :28.000000000 -0400 +@@ -253,7 +253,7 @@ typedef struct drm_radeon_private { +=20 + /* SW interrupt */ + wait_queue_head_t swi_queue; +- atomic_t swi_emitted; ++ atomic_unchecked_t swi_emitted; + int vblank_crtc; + uint32_t irq_enable_reg; + uint32_t r500_disp_irq_reg; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c linux-2= .6.32.45/drivers/gpu/drm/radeon/radeon_fence.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_fence.c 2011-05-04 17:= 56:28.000000000 -0400 +@@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_devi + write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags); + return 0; + } +- fence->seq =3D atomic_add_return(1, &rdev->fence_drv.seq); ++ fence->seq =3D atomic_add_return_unchecked(1, &rdev->fence_drv.seq); + if (!rdev->cp.ready) { + /* FIXME: cp is not running assume everythings is done right + * away +@@ -364,7 +364,7 @@ int radeon_fence_driver_init(struct rade + return r; + } + WREG32(rdev->fence_drv.scratch_reg, 0); +- atomic_set(&rdev->fence_drv.seq, 0); ++ atomic_set_unchecked(&rdev->fence_drv.seq, 0); + INIT_LIST_HEAD(&rdev->fence_drv.created); + INIT_LIST_HEAD(&rdev->fence_drv.emited); + INIT_LIST_HEAD(&rdev->fence_drv.signaled); +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.= 45/drivers/gpu/drm/radeon/radeon.h +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon.h 2011-08-05 20:33:55.= 000000000 -0400 +@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device=20 + */ + struct radeon_fence_driver { + uint32_t scratch_reg; +- atomic_t seq; ++ atomic_unchecked_t seq; + uint32_t last_seq; + unsigned long count_timeout; + wait_queue_head_t queue; +@@ -640,7 +640,7 @@ struct radeon_asic { + uint32_t offset, uint32_t obj_size); + int (*clear_surface_reg)(struct radeon_device *rdev, int reg); + void (*bandwidth_update)(struct radeon_device *rdev); +-}; ++} __no_const; +=20 + /* + * Asic structures +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2= .6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ioc32.c 2011-04-23 13:= 57:24.000000000 -0400 +@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(str + request =3D compat_alloc_user_space(sizeof(*request)); + if (!access_ok(VERIFY_WRITE, request, sizeof(*request)) + || __put_user(req32.param, &request->param) +- || __put_user((void __user *)(unsigned long)req32.value, ++ || __put_user((unsigned long)req32.value, + &request->value)) + return -EFAULT; +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c linux-2.6= .32.45/drivers/gpu/drm/radeon/radeon_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_irq.c 2011-05-04 17:56= :28.000000000 -0400 +@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de + unsigned int ret; + RING_LOCALS; +=20 +- atomic_inc(&dev_priv->swi_emitted); +- ret =3D atomic_read(&dev_priv->swi_emitted); ++ atomic_inc_unchecked(&dev_priv->swi_emitted); ++ ret =3D atomic_read_unchecked(&dev_priv->swi_emitted); +=20 + BEGIN_RING(4); + OUT_RING_REG(RADEON_LAST_SWI_REG, ret); +@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct + drm_radeon_private_t *dev_priv =3D + (drm_radeon_private_t *) dev->dev_private; +=20 +- atomic_set(&dev_priv->swi_emitted, 0); ++ atomic_set_unchecked(&dev_priv->swi_emitted, 0); + DRM_INIT_WAITQUEUE(&dev_priv->swi_queue); +=20 + dev->max_vblank_count =3D 0x001fffff; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c linux-2= .6.32.45/drivers/gpu/drm/radeon/radeon_state.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_state.c 2011-04-17 15:= 56:46.000000000 -0400 +@@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm + { + drm_radeon_private_t *dev_priv =3D dev->dev_private; + drm_radeon_getparam_t *param =3D data; +- int value; ++ int value =3D 0; +=20 + DRM_DEBUG("pid=3D%d\n", DRM_CURRENTPID); +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6= .32.45/drivers/gpu/drm/radeon/radeon_ttm.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/radeon_ttm.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic + DRM_INFO("radeon: ttm finalized\n"); + } +=20 +-static struct vm_operations_struct radeon_ttm_vm_ops; +-static const struct vm_operations_struct *ttm_vm_ops =3D NULL; +- +-static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault= *vmf) +-{ +- struct ttm_buffer_object *bo; +- int r; +- +- bo =3D (struct ttm_buffer_object *)vma->vm_private_data; +- if (bo =3D=3D NULL) { +- return VM_FAULT_NOPAGE; +- } +- r =3D ttm_vm_ops->fault(vma, vmf); +- return r; +-} +- + int radeon_mmap(struct file *filp, struct vm_area_struct *vma) + { + struct drm_file *file_priv; + struct radeon_device *rdev; +- int r; +=20 + if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) { + return drm_mmap(filp, vma); +@@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struc +=20 + file_priv =3D (struct drm_file *)filp->private_data; + rdev =3D file_priv->minor->dev->dev_private; +- if (rdev =3D=3D NULL) { ++ if (!rdev) + return -EINVAL; +- } +- r =3D ttm_bo_mmap(filp, vma, &rdev->mman.bdev); +- if (unlikely(r !=3D 0)) { +- return r; +- } +- if (unlikely(ttm_vm_ops =3D=3D NULL)) { +- ttm_vm_ops =3D vma->vm_ops; +- radeon_ttm_vm_ops =3D *ttm_vm_ops; +- radeon_ttm_vm_ops.fault =3D &radeon_ttm_fault; +- } +- vma->vm_ops =3D &radeon_ttm_vm_ops; +- return 0; ++ return ttm_bo_mmap(filp, vma, &rdev->mman.bdev); + } +=20 +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c linux-2.6.32.4= 5/drivers/gpu/drm/radeon/rs690.c +--- linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/radeon/rs690.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct + if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full && + rdev->pm.sideport_bandwidth.full) + rdev->pm.max_bandwidth =3D rdev->pm.sideport_bandwidth; +- read_delay_latency.full =3D rfixed_const(370 * 800 * 1000); ++ read_delay_latency.full =3D rfixed_const(800 * 1000); + read_delay_latency.full =3D rfixed_div(read_delay_latency, + rdev->pm.igp_sideport_mclk); ++ a.full =3D rfixed_const(370); ++ read_delay_latency.full =3D rfixed_mul(read_delay_latency, a); + } else { + if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full && + rdev->pm.k8_bandwidth.full) +diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.45/= drivers/gpu/drm/ttm/ttm_bo.c +--- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo.c 2011-04-23 12:56:11.000= 000000 -0400 +@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a + NULL + }; +=20 +-static struct sysfs_ops ttm_bo_global_ops =3D { ++static const struct sysfs_ops ttm_bo_global_ops =3D { + .show =3D &ttm_bo_global_show + }; +=20 +diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c linux-2.6.32.= 45/drivers/gpu/drm/ttm/ttm_bo_vm.c +--- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_bo_vm.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are + { + struct ttm_buffer_object *bo =3D (struct ttm_buffer_object *) + vma->vm_private_data; +- struct ttm_bo_device *bdev =3D bo->bdev; ++ struct ttm_bo_device *bdev; + unsigned long bus_base; + unsigned long bus_offset; + unsigned long bus_size; +@@ -88,6 +88,10 @@ static int ttm_bo_vm_fault(struct vm_are + unsigned long address =3D (unsigned long)vmf->virtual_address; + int retval =3D VM_FAULT_NOPAGE; +=20 ++ if (!bo) ++ return VM_FAULT_NOPAGE; ++ bdev =3D bo->bdev; ++ + /* + * Work around locking order reversal in fault / nopfn + * between mmap_sem and bo_reserve: Perform a trylock operation +diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c linux-2.6.32= .45/drivers/gpu/drm/ttm/ttm_global.c +--- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_global.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -36,7 +36,7 @@ + struct ttm_global_item { + struct mutex mutex; + void *object; +- int refcount; ++ atomic_t refcount; + }; +=20 + static struct ttm_global_item glob[TTM_GLOBAL_NUM]; +@@ -49,7 +49,7 @@ void ttm_global_init(void) + struct ttm_global_item *item =3D &glob[i]; + mutex_init(&item->mutex); + item->object =3D NULL; +- item->refcount =3D 0; ++ atomic_set(&item->refcount, 0); + } + } +=20 +@@ -59,7 +59,7 @@ void ttm_global_release(void) + for (i =3D 0; i < TTM_GLOBAL_NUM; ++i) { + struct ttm_global_item *item =3D &glob[i]; + BUG_ON(item->object !=3D NULL); +- BUG_ON(item->refcount !=3D 0); ++ BUG_ON(atomic_read(&item->refcount) !=3D 0); + } + } +=20 +@@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_globa + void *object; +=20 + mutex_lock(&item->mutex); +- if (item->refcount =3D=3D 0) { ++ if (atomic_read(&item->refcount) =3D=3D 0) { + item->object =3D kzalloc(ref->size, GFP_KERNEL); + if (unlikely(item->object =3D=3D NULL)) { + ret =3D -ENOMEM; +@@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_globa + goto out_err; +=20 + } +- ++item->refcount; ++ atomic_inc(&item->refcount); + ref->object =3D item->object; + object =3D item->object; + mutex_unlock(&item->mutex); +@@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_gl + struct ttm_global_item *item =3D &glob[ref->global_type]; +=20 + mutex_lock(&item->mutex); +- BUG_ON(item->refcount =3D=3D 0); ++ BUG_ON(atomic_read(&item->refcount) =3D=3D 0); + BUG_ON(ref->object !=3D item->object); +- if (--item->refcount =3D=3D 0) { ++ if (atomic_dec_and_test(&item->refcount)) { + ref->release(ref); + item->object =3D NULL; + } +diff -urNp linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32= .45/drivers/gpu/drm/ttm/ttm_memory.c +--- linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/ttm/ttm_memory.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at + NULL + }; +=20 +-static struct sysfs_ops ttm_mem_zone_ops =3D { ++static const struct sysfs_ops ttm_mem_zone_ops =3D { + .show =3D &ttm_mem_zone_show, + .store =3D &ttm_mem_zone_store + }; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h linux-2.6.32.45= /drivers/gpu/drm/via/via_drv.h +--- linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/via/via_drv.h 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer { + typedef uint32_t maskarray_t[5]; +=20 + typedef struct drm_via_irq { +- atomic_t irq_received; ++ atomic_unchecked_t irq_received; + uint32_t pending_mask; + uint32_t enable_mask; + wait_queue_head_t irq_queue; +@@ -75,7 +75,7 @@ typedef struct drm_via_private { + struct timeval last_vblank; + int last_vblank_valid; + unsigned usec_per_vblank; +- atomic_t vbl_received; ++ atomic_unchecked_t vbl_received; + drm_via_state_t hc_state; + char pci_buf[VIA_PCI_BUF_SIZE]; + const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE]; +diff -urNp linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c linux-2.6.32.45= /drivers/gpu/drm/via/via_irq.c +--- linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/gpu/drm/via/via_irq.c 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de + if (crtc !=3D 0) + return 0; +=20 +- return atomic_read(&dev_priv->vbl_received); ++ return atomic_read_unchecked(&dev_priv->vbl_received); + } +=20 + irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS) +@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I +=20 + status =3D VIA_READ(VIA_REG_INTERRUPT); + if (status & VIA_IRQ_VBLANK_PENDING) { +- atomic_inc(&dev_priv->vbl_received); +- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) { ++ atomic_inc_unchecked(&dev_priv->vbl_received); ++ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) { + do_gettimeofday(&cur_vblank); + if (dev_priv->last_vblank_valid) { + dev_priv->usec_per_vblank =3D +@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I + dev_priv->last_vblank =3D cur_vblank; + dev_priv->last_vblank_valid =3D 1; + } +- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) { ++ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) { + DRM_DEBUG("US per vblank is: %u\n", + dev_priv->usec_per_vblank); + } +@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I +=20 + for (i =3D 0; i < dev_priv->num_irqs; ++i) { + if (status & cur_irq->pending_mask) { +- atomic_inc(&cur_irq->irq_received); ++ atomic_inc_unchecked(&cur_irq->irq_received); + DRM_WAKEUP(&cur_irq->irq_queue); + handled =3D 1; + if (dev_priv->irq_map[drm_via_irq_dma0_td] =3D=3D i) { +@@ -244,11 +244,11 @@ via_driver_irq_wait(struct drm_device *=20 + DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, + ((VIA_READ(masks[irq][2]) & masks[irq][3]) =3D=3D + masks[irq][4])); +- cur_irq_sequence =3D atomic_read(&cur_irq->irq_received); ++ cur_irq_sequence =3D atomic_read_unchecked(&cur_irq->irq_received); + } else { + DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ, + (((cur_irq_sequence =3D +- atomic_read(&cur_irq->irq_received)) - ++ atomic_read_unchecked(&cur_irq->irq_received)) - + *sequence) <=3D (1 << 23))); + } + *sequence =3D cur_irq_sequence; +@@ -286,7 +286,7 @@ void via_driver_irq_preinstall(struct dr + } +=20 + for (i =3D 0; i < dev_priv->num_irqs; ++i) { +- atomic_set(&cur_irq->irq_received, 0); ++ atomic_set_unchecked(&cur_irq->irq_received, 0); + cur_irq->enable_mask =3D dev_priv->irq_masks[i][0]; + cur_irq->pending_mask =3D dev_priv->irq_masks[i][1]; + DRM_INIT_WAITQUEUE(&cur_irq->irq_queue); +@@ -368,7 +368,7 @@ int via_wait_irq(struct drm_device *dev, + switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) { + case VIA_IRQ_RELATIVE: + irqwait->request.sequence +=3D +- atomic_read(&cur_irq->irq_received); ++ atomic_read_unchecked(&cur_irq->irq_received); + irqwait->request.type &=3D ~_DRM_VBLANK_RELATIVE; + case VIA_IRQ_ABSOLUTE: + break; +diff -urNp linux-2.6.32.45/drivers/hid/hid-core.c linux-2.6.32.45/driver= s/hid/hid-core.c +--- linux-2.6.32.45/drivers/hid/hid-core.c 2011-05-10 22:12:01.000000000= -0400 ++++ linux-2.6.32.45/drivers/hid/hid-core.c 2011-05-10 22:12:32.000000000= -0400 +@@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device +=20 + int hid_add_device(struct hid_device *hdev) + { +- static atomic_t id =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t id =3D ATOMIC_INIT(0); + int ret; +=20 + if (WARN_ON(hdev->status & HID_STAT_ADDED)) +@@ -1766,7 +1766,7 @@ int hid_add_device(struct hid_device *hd + /* XXX hack, any other cleaner solution after the driver core + * is converted to allow more than 20 bytes as the device name? */ + dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus, +- hdev->vendor, hdev->product, atomic_inc_return(&id)); ++ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id)); +=20 + ret =3D device_add(&hdev->dev); + if (!ret) +diff -urNp linux-2.6.32.45/drivers/hid/usbhid/hiddev.c linux-2.6.32.45/d= rivers/hid/usbhid/hiddev.c +--- linux-2.6.32.45/drivers/hid/usbhid/hiddev.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/hid/usbhid/hiddev.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi + return put_user(HID_VERSION, (int __user *)arg); +=20 + case HIDIOCAPPLICATION: +- if (arg < 0 || arg >=3D hid->maxapplication) ++ if (arg >=3D hid->maxapplication) + return -EINVAL; +=20 + for (i =3D 0; i < hid->maxcollection; i++) +diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.c linux-2.6.32.45/dri= vers/hwmon/lis3lv02d.c +--- linux-2.6.32.45/drivers/hwmon/lis3lv02d.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/hwmon/lis3lv02d.c 2011-05-04 17:56:28.000000= 000 -0400 +@@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(in + * the lid is closed. This leads to interrupts as soon as a little mov= e + * is done. + */ +- atomic_inc(&lis3_dev.count); ++ atomic_inc_unchecked(&lis3_dev.count); +=20 + wake_up_interruptible(&lis3_dev.misc_wait); + kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); +@@ -160,7 +160,7 @@ static int lis3lv02d_misc_open(struct in + if (test_and_set_bit(0, &lis3_dev.misc_opened)) + return -EBUSY; /* already open */ +=20 +- atomic_set(&lis3_dev.count, 0); ++ atomic_set_unchecked(&lis3_dev.count, 0); +=20 + /* + * The sensor can generate interrupts for free-fall and direction +@@ -206,7 +206,7 @@ static ssize_t lis3lv02d_misc_read(struc + add_wait_queue(&lis3_dev.misc_wait, &wait); + while (true) { + set_current_state(TASK_INTERRUPTIBLE); +- data =3D atomic_xchg(&lis3_dev.count, 0); ++ data =3D atomic_xchg_unchecked(&lis3_dev.count, 0); + if (data) + break; +=20 +@@ -244,7 +244,7 @@ out: + static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *= wait) + { + poll_wait(file, &lis3_dev.misc_wait, wait); +- if (atomic_read(&lis3_dev.count)) ++ if (atomic_read_unchecked(&lis3_dev.count)) + return POLLIN | POLLRDNORM; + return 0; + } +diff -urNp linux-2.6.32.45/drivers/hwmon/lis3lv02d.h linux-2.6.32.45/dri= vers/hwmon/lis3lv02d.h +--- linux-2.6.32.45/drivers/hwmon/lis3lv02d.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/hwmon/lis3lv02d.h 2011-05-04 17:56:28.000000= 000 -0400 +@@ -201,7 +201,7 @@ struct lis3lv02d { +=20 + struct input_polled_dev *idev; /* input device */ + struct platform_device *pdev; /* platform device */ +- atomic_t count; /* interrupt count after last read */ ++ atomic_unchecked_t count; /* interrupt count after last read */ + int xcalib; /* calibrated null value for x */ + int ycalib; /* calibrated null value for y */ + int zcalib; /* calibrated null value for z */ +diff -urNp linux-2.6.32.45/drivers/hwmon/sht15.c linux-2.6.32.45/drivers= /hwmon/sht15.c +--- linux-2.6.32.45/drivers/hwmon/sht15.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/hwmon/sht15.c 2011-05-04 17:56:28.000000000 = -0400 +@@ -112,7 +112,7 @@ struct sht15_data { + int supply_uV; + int supply_uV_valid; + struct work_struct update_supply_work; +- atomic_t interrupt_handled; ++ atomic_unchecked_t interrupt_handled; + }; +=20 + /** +@@ -245,13 +245,13 @@ static inline int sht15_update_single_va + return ret; +=20 + gpio_direction_input(data->pdata->gpio_data); +- atomic_set(&data->interrupt_handled, 0); ++ atomic_set_unchecked(&data->interrupt_handled, 0); +=20 + enable_irq(gpio_to_irq(data->pdata->gpio_data)); + if (gpio_get_value(data->pdata->gpio_data) =3D=3D 0) { + disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data)); + /* Only relevant if the interrupt hasn't occured. */ +- if (!atomic_read(&data->interrupt_handled)) ++ if (!atomic_read_unchecked(&data->interrupt_handled)) + schedule_work(&data->read_work); + } + ret =3D wait_event_timeout(data->wait_queue, +@@ -398,7 +398,7 @@ static irqreturn_t sht15_interrupt_fired + struct sht15_data *data =3D d; + /* First disable the interrupt */ + disable_irq_nosync(irq); +- atomic_inc(&data->interrupt_handled); ++ atomic_inc_unchecked(&data->interrupt_handled); + /* Then schedule a reading work struct */ + if (data->flag !=3D SHT15_READING_NOTHING) + schedule_work(&data->read_work); +@@ -449,11 +449,11 @@ static void sht15_bh_read_data(struct wo + here as could have gone low in meantime so verify + it hasn't! + */ +- atomic_set(&data->interrupt_handled, 0); ++ atomic_set_unchecked(&data->interrupt_handled, 0); + enable_irq(gpio_to_irq(data->pdata->gpio_data)); + /* If still not occured or another handler has been scheduled */ + if (gpio_get_value(data->pdata->gpio_data) +- || atomic_read(&data->interrupt_handled)) ++ || atomic_read_unchecked(&data->interrupt_handled)) + return; + } + /* Read the data back from the device */ +diff -urNp linux-2.6.32.45/drivers/hwmon/w83791d.c linux-2.6.32.45/drive= rs/hwmon/w83791d.c +--- linux-2.6.32.45/drivers/hwmon/w83791d.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/hwmon/w83791d.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli + struct i2c_board_info *info); + static int w83791d_remove(struct i2c_client *client); +=20 +-static int w83791d_read(struct i2c_client *client, u8 register); +-static int w83791d_write(struct i2c_client *client, u8 register, u8 val= ue); ++static int w83791d_read(struct i2c_client *client, u8 reg); ++static int w83791d_write(struct i2c_client *client, u8 reg, u8 value); + static struct w83791d_data *w83791d_update_device(struct device *dev); +=20 + #ifdef DEBUG +diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c linux-2= .6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c +--- linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/i2c/busses/i2c-amd756-s4882.c 2011-08-23 21:= 22:32.000000000 -0400 +@@ -43,7 +43,7 @@ + extern struct i2c_adapter amd756_smbus; +=20 + static struct i2c_adapter *s4882_adapter; +-static struct i2c_algorithm *s4882_algo; ++static i2c_algorithm_no_const *s4882_algo; +=20 + /* Wrapper access functions for multiplexed SMBus */ + static DEFINE_MUTEX(amd756_lock); +diff -urNp linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c linux-= 2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c +--- linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21= :22:32.000000000 -0400 +@@ -41,7 +41,7 @@ + extern struct i2c_adapter *nforce2_smbus; +=20 + static struct i2c_adapter *s4985_adapter; +-static struct i2c_algorithm *s4985_algo; ++static i2c_algorithm_no_const *s4985_algo; +=20 + /* Wrapper access functions for multiplexed SMBus */ + static DEFINE_MUTEX(nforce2_lock); +diff -urNp linux-2.6.32.45/drivers/ide/ide-cd.c linux-2.6.32.45/drivers/= ide/ide-cd.c +--- linux-2.6.32.45/drivers/ide/ide-cd.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/ide/ide-cd.c 2011-04-17 15:56:46.000000000 -= 0400 +@@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_ + alignment =3D 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 =3D 0; + } + } +diff -urNp linux-2.6.32.45/drivers/ide/ide-floppy.c linux-2.6.32.45/driv= ers/ide/ide-floppy.c +--- linux-2.6.32.45/drivers/ide/ide-floppy.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ide/ide-floppy.c 2011-05-16 21:46:57.0000000= 00 -0400 +@@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_d + u8 pc_buf[256], header_len, desc_cnt; + int i, rc =3D 1, blocks, length; +=20 ++ pax_track_stack(); ++ + ide_debug_log(IDE_DBG_FUNC, "enter"); +=20 + drive->bios_cyl =3D 0; +diff -urNp linux-2.6.32.45/drivers/ide/setup-pci.c linux-2.6.32.45/drive= rs/ide/setup-pci.c +--- linux-2.6.32.45/drivers/ide/setup-pci.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ide/setup-pci.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev + int ret, i, n_ports =3D dev2 ? 4 : 2; + struct ide_hw hw[4], *hws[] =3D { NULL, NULL, NULL, NULL }; +=20 ++ pax_track_stack(); ++ + for (i =3D 0; i < n_ports / 2; i++) { + ret =3D ide_setup_pci_controller(pdev[i], d, !i); + if (ret < 0) +diff -urNp linux-2.6.32.45/drivers/ieee1394/dv1394.c linux-2.6.32.45/dri= vers/ieee1394/dv1394.c +--- linux-2.6.32.45/drivers/ieee1394/dv1394.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/ieee1394/dv1394.c 2011-04-23 12:56:11.000000= 000 -0400 +@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c + based upon DIF section and sequence + */ +=20 +-static void inline ++static inline void + frame_put_packet (struct frame *f, struct packet *p) + { + int section_type =3D p->data[0] >> 5; /* section type is in = bits 5 - 7 */ +diff -urNp linux-2.6.32.45/drivers/ieee1394/hosts.c linux-2.6.32.45/driv= ers/ieee1394/hosts.c +--- linux-2.6.32.45/drivers/ieee1394/hosts.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/ieee1394/hosts.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso=20 + } +=20 + static struct hpsb_host_driver dummy_driver =3D { ++ .name =3D "dummy", + .transmit_packet =3D dummy_transmit_packet, + .devctl =3D dummy_devctl, + .isoctl =3D dummy_isoctl +diff -urNp linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c linux-2.= 6.32.45/drivers/ieee1394/init_ohci1394_dma.c +--- linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/ieee1394/init_ohci1394_dma.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_con + for (func =3D 0; func < 8; func++) { + u32 class =3D read_pci_config(num,slot,func, + PCI_CLASS_REVISION); +- if ((class =3D=3D 0xffffffff)) ++ if (class =3D=3D 0xffffffff) + continue; /* No device at this func */ +=20 + if (class>>8 !=3D PCI_CLASS_SERIAL_FIREWIRE_OHCI) +diff -urNp linux-2.6.32.45/drivers/ieee1394/ohci1394.c linux-2.6.32.45/d= rivers/ieee1394/ohci1394.c +--- linux-2.6.32.45/drivers/ieee1394/ohci1394.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/ieee1394/ohci1394.c 2011-04-23 12:56:11.0000= 00000 -0400 +@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ + printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->h= ost->id , ## args) +=20 + /* Module Parameters */ +-static int phys_dma =3D 1; ++static int phys_dma; + module_param(phys_dma, int, 0444); +-MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default =3D 1)."); ++MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default =3D 0)."); +=20 + static void dma_trm_tasklet(unsigned long data); + static void dma_trm_reset(struct dma_trm_ctx *d); +diff -urNp linux-2.6.32.45/drivers/ieee1394/sbp2.c linux-2.6.32.45/drive= rs/ieee1394/sbp2.c +--- linux-2.6.32.45/drivers/ieee1394/sbp2.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/ieee1394/sbp2.c 2011-04-23 12:56:11.00000000= 0 -0400 +@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot + MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); + MODULE_LICENSE("GPL"); +=20 +-static int sbp2_module_init(void) ++static int __init sbp2_module_init(void) + { + int ret; +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/core/cm.c linux-2.6.32.45/= drivers/infiniband/core/cm.c +--- linux-2.6.32.45/drivers/infiniband/core/cm.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/core/cm.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -112,7 +112,7 @@ static char const counter_group_names[CM +=20 + struct cm_counter_group { + struct kobject obj; +- atomic_long_t counter[CM_ATTR_COUNT]; ++ atomic_long_unchecked_t counter[CM_ATTR_COUNT]; + }; +=20 + struct cm_counter_attribute { +@@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm + struct ib_mad_send_buf *msg =3D NULL; + int ret; +=20 +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATE= S]. + counter[CM_REQ_COUNTER]); +=20 + /* Quick state check to discard duplicate REQs. */ +@@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm + if (!cm_id_priv) + return; +=20 +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATE= S]. + counter[CM_REP_COUNTER]); + ret =3D cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg); + if (ret) +@@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work + if (cm_id_priv->id.state !=3D IB_CM_REP_SENT && + cm_id_priv->id.state !=3D IB_CM_MRA_REP_RCVD) { + spin_unlock_irq(&cm_id_priv->lock); +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_RTU_COUNTER]); + goto out; + } +@@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_wor + cm_id_priv =3D cm_acquire_id(dreq_msg->remote_comm_id, + dreq_msg->local_comm_id); + if (!cm_id_priv) { +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_DREQ_COUNTER]); + cm_issue_drep(work->port, work->mad_recv_wc); + return -EINVAL; +@@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_wor + case IB_CM_MRA_REP_RCVD: + break; + case IB_CM_TIMEWAIT: +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_DREQ_COUNTER]); + if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) + goto unlock; +@@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_wor + cm_free_msg(msg); + goto deref; + case IB_CM_DREQ_RCVD: +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_DREQ_COUNTER]); + goto unlock; + default: +@@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work + ib_modify_mad(cm_id_priv->av.port->mad_agent, + cm_id_priv->msg, timeout)) { + if (cm_id_priv->id.lap_state =3D=3D IB_CM_MRA_LAP_RCVD) +- atomic_long_inc(&work->port-> ++ atomic_long_inc_unchecked(&work->port-> + counter_group[CM_RECV_DUPLICATES]. + counter[CM_MRA_COUNTER]); + goto out; +@@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work + break; + case IB_CM_MRA_REQ_RCVD: + case IB_CM_MRA_REP_RCVD: +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_MRA_COUNTER]); + /* fall through */ + default: +@@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work + case IB_CM_LAP_IDLE: + break; + case IB_CM_MRA_LAP_SENT: +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_LAP_COUNTER]); + if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg)) + goto unlock; +@@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work + cm_free_msg(msg); + goto deref; + case IB_CM_LAP_RCVD: +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_LAP_COUNTER]); + goto unlock; + default: +@@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm + cur_cm_id_priv =3D cm_insert_remote_sidr(cm_id_priv); + if (cur_cm_id_priv) { + spin_unlock_irq(&cm.lock); +- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES]. ++ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICAT= ES]. + counter[CM_SIDR_REQ_COUNTER]); + goto out; /* Duplicate message. */ + } +@@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_ma + if (!msg->context[0] && (attr_index !=3D CM_REJ_COUNTER)) + msg->retries =3D 1; +=20 +- atomic_long_add(1 + msg->retries, ++ atomic_long_add_unchecked(1 + msg->retries, + &port->counter_group[CM_XMIT].counter[attr_index]); + if (msg->retries) +- atomic_long_add(msg->retries, ++ atomic_long_add_unchecked(msg->retries, + &port->counter_group[CM_XMIT_RETRIES]. + counter[attr_index]); +=20 +@@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_ma + } +=20 + attr_id =3D be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id); +- atomic_long_inc(&port->counter_group[CM_RECV]. ++ atomic_long_inc_unchecked(&port->counter_group[CM_RECV]. + counter[attr_id - CM_ATTR_ID_OFFSET]); +=20 + work =3D kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths, +@@ -3595,10 +3595,10 @@ static ssize_t cm_show_counter(struct ko + cm_attr =3D container_of(attr, struct cm_counter_attribute, attr); +=20 + return sprintf(buf, "%ld\n", +- atomic_long_read(&group->counter[cm_attr->index])); ++ atomic_long_read_unchecked(&group->counter[cm_attr->index])); + } +=20 +-static struct sysfs_ops cm_counter_ops =3D { ++static const struct sysfs_ops cm_counter_ops =3D { + .show =3D cm_show_counter + }; +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c linux-2.6.= 32.45/drivers/infiniband/core/fmr_pool.c +--- linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/core/fmr_pool.c 2011-05-04 17:56:= 28.000000000 -0400 +@@ -97,8 +97,8 @@ struct ib_fmr_pool { +=20 + struct task_struct *thread; +=20 +- atomic_t req_ser; +- atomic_t flush_ser; ++ atomic_unchecked_t req_ser; ++ atomic_unchecked_t flush_ser; +=20 + wait_queue_head_t force_wait; + }; +@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p + struct ib_fmr_pool *pool =3D pool_ptr; +=20 + do { +- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) = { ++ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&= pool->req_ser) < 0) { + ib_fmr_batch_release(pool); +=20 +- atomic_inc(&pool->flush_ser); ++ atomic_inc_unchecked(&pool->flush_ser); + wake_up_interruptible(&pool->force_wait); +=20 + if (pool->flush_function) +@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p + } +=20 + set_current_state(TASK_INTERRUPTIBLE); +- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >=3D = 0 && ++ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&= pool->req_ser) >=3D 0 && + !kthread_should_stop()) + schedule(); + __set_current_state(TASK_RUNNING); +@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s + pool->dirty_watermark =3D params->dirty_watermark; + pool->dirty_len =3D 0; + spin_lock_init(&pool->pool_lock); +- atomic_set(&pool->req_ser, 0); +- atomic_set(&pool->flush_ser, 0); ++ atomic_set_unchecked(&pool->req_ser, 0); ++ atomic_set_unchecked(&pool->flush_ser, 0); + init_waitqueue_head(&pool->force_wait); +=20 + pool->thread =3D kthread_run(ib_fmr_cleanup_thread, +@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool + } + spin_unlock_irq(&pool->pool_lock); +=20 +- serial =3D atomic_inc_return(&pool->req_ser); ++ serial =3D atomic_inc_return_unchecked(&pool->req_ser); + wake_up_process(pool->thread); +=20 + if (wait_event_interruptible(pool->force_wait, +- atomic_read(&pool->flush_ser) - serial >=3D 0)) ++ atomic_read_unchecked(&pool->flush_ser) - serial >=3D 0)) + return -EINTR; +=20 + return 0; +@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr + } else { + list_add_tail(&fmr->list, &pool->dirty_list); + if (++pool->dirty_len >=3D pool->dirty_watermark) { +- atomic_inc(&pool->req_ser); ++ atomic_inc_unchecked(&pool->req_ser); + wake_up_process(pool->thread); + } + } +diff -urNp linux-2.6.32.45/drivers/infiniband/core/sysfs.c linux-2.6.32.= 45/drivers/infiniband/core/sysfs.c +--- linux-2.6.32.45/drivers/infiniband/core/sysfs.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/core/sysfs.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob + return port_attr->show(p, port_attr, buf); + } +=20 +-static struct sysfs_ops port_sysfs_ops =3D { ++static const struct sysfs_ops port_sysfs_ops =3D { + .show =3D port_attr_show + }; +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c lin= ux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c +--- linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/core/uverbs_marshall.c 2011-04-17= 15:56:46.000000000 -0400 +@@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_u + dst->grh.sgid_index =3D src->grh.sgid_index; + dst->grh.hop_limit =3D src->grh.hop_limit; + dst->grh.traffic_class =3D src->grh.traffic_class; ++ memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved)); + dst->dlid =3D src->dlid; + dst->sl =3D src->sl; + dst->src_path_bits =3D src->src_path_bits; + dst->static_rate =3D src->static_rate; + dst->is_global =3D src->ah_flags & IB_AH_GRH ? 1 : 0; + dst->port_num =3D src->port_num; ++ dst->reserved =3D 0; + } + EXPORT_SYMBOL(ib_copy_ah_attr_to_user); +=20 + void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst, + struct ib_qp_attr *src) + { ++ dst->qp_state =3D src->qp_state; + dst->cur_qp_state =3D src->cur_qp_state; + dst->path_mtu =3D src->path_mtu; + dst->path_mig_state =3D src->path_mig_state; +@@ -83,6 +86,7 @@ void ib_copy_qp_attr_to_user(struct ib_u + dst->rnr_retry =3D src->rnr_retry; + dst->alt_port_num =3D src->alt_port_num; + dst->alt_timeout =3D src->alt_timeout; ++ memset(dst->reserved, 0, sizeof(dst->reserved)); + } + EXPORT_SYMBOL(ib_copy_qp_attr_to_user); +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c linux-= 2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c +--- linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/ipath/ipath_fs.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(stru + struct infinipath_counters counters; + struct ipath_devdata *dd; +=20 ++ pax_track_stack(); ++ + dd =3D file->f_path.dentry->d_inode->i_private; + dd->ipath_f_read_counters(dd, &counters); +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c linux-2.6.32.= 45/drivers/infiniband/hw/nes/nes.c +--- linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi + LIST_HEAD(nes_adapter_list); + static LIST_HEAD(nes_dev_list); +=20 +-atomic_t qps_destroyed; ++atomic_unchecked_t qps_destroyed; +=20 + static unsigned int ee_flsh_adapter; + static unsigned int sysfs_nonidx_addr; +@@ -259,7 +259,7 @@ static void nes_cqp_rem_ref_callback(str + struct nes_adapter *nesadapter =3D nesdev->nesadapter; + u32 qp_id; +=20 +- atomic_inc(&qps_destroyed); ++ atomic_inc_unchecked(&qps_destroyed); +=20 + /* Free the control structures */ +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.= 32.45/drivers/infiniband/hw/nes/nes_cm.c +--- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_cm.c 2011-05-04 17:56:= 28.000000000 -0400 +@@ -69,11 +69,11 @@ u32 cm_packets_received; + u32 cm_listens_created; + u32 cm_listens_destroyed; + u32 cm_backlog_drops; +-atomic_t cm_loopbacks; +-atomic_t cm_nodes_created; +-atomic_t cm_nodes_destroyed; +-atomic_t cm_accel_dropped_pkts; +-atomic_t cm_resets_recvd; ++atomic_unchecked_t cm_loopbacks; ++atomic_unchecked_t cm_nodes_created; ++atomic_unchecked_t cm_nodes_destroyed; ++atomic_unchecked_t cm_accel_dropped_pkts; ++atomic_unchecked_t cm_resets_recvd; +=20 + static inline int mini_cm_accelerated(struct nes_cm_core *, + struct nes_cm_node *); +@@ -149,13 +149,13 @@ static struct nes_cm_ops nes_cm_api =3D { +=20 + static struct nes_cm_core *g_cm_core; +=20 +-atomic_t cm_connects; +-atomic_t cm_accepts; +-atomic_t cm_disconnects; +-atomic_t cm_closes; +-atomic_t cm_connecteds; +-atomic_t cm_connect_reqs; +-atomic_t cm_rejects; ++atomic_unchecked_t cm_connects; ++atomic_unchecked_t cm_accepts; ++atomic_unchecked_t cm_disconnects; ++atomic_unchecked_t cm_closes; ++atomic_unchecked_t cm_connecteds; ++atomic_unchecked_t cm_connect_reqs; ++atomic_unchecked_t cm_rejects; +=20 +=20 + /** +@@ -1195,7 +1195,7 @@ static struct nes_cm_node *make_cm_node( + cm_node->rem_mac); +=20 + add_hte_node(cm_core, cm_node); +- atomic_inc(&cm_nodes_created); ++ atomic_inc_unchecked(&cm_nodes_created); +=20 + return cm_node; + } +@@ -1253,7 +1253,7 @@ static int rem_ref_cm_node(struct nes_cm + } +=20 + atomic_dec(&cm_core->node_cnt); +- atomic_inc(&cm_nodes_destroyed); ++ atomic_inc_unchecked(&cm_nodes_destroyed); + nesqp =3D cm_node->nesqp; + if (nesqp) { + nesqp->cm_node =3D NULL; +@@ -1320,7 +1320,7 @@ static int process_options(struct nes_cm +=20 + static void drop_packet(struct sk_buff *skb) + { +- atomic_inc(&cm_accel_dropped_pkts); ++ atomic_inc_unchecked(&cm_accel_dropped_pkts); + dev_kfree_skb_any(skb); + } +=20 +@@ -1377,7 +1377,7 @@ static void handle_rst_pkt(struct nes_cm +=20 + int reset =3D 0; /* whether to send reset in case of err.. */ + int passive_state; +- atomic_inc(&cm_resets_recvd); ++ atomic_inc_unchecked(&cm_resets_recvd); + nes_debug(NES_DBG_CM, "Received Reset, cm_node =3D %p, state =3D %u." + " refcnt=3D%d\n", cm_node, cm_node->state, + atomic_read(&cm_node->ref_count)); +@@ -2000,7 +2000,7 @@ static struct nes_cm_node *mini_cm_conne + rem_ref_cm_node(cm_node->cm_core, cm_node); + return NULL; + } +- atomic_inc(&cm_loopbacks); ++ atomic_inc_unchecked(&cm_loopbacks); + loopbackremotenode->loopbackpartner =3D cm_node; + loopbackremotenode->tcp_cntxt.rcv_wscale =3D + NES_CM_DEFAULT_RCV_WND_SCALE; +@@ -2262,7 +2262,7 @@ static int mini_cm_recv_pkt(struct nes_c + add_ref_cm_node(cm_node); + } else if (cm_node->state =3D=3D NES_CM_STATE_TSA) { + rem_ref_cm_node(cm_core, cm_node); +- atomic_inc(&cm_accel_dropped_pkts); ++ atomic_inc_unchecked(&cm_accel_dropped_pkts); + dev_kfree_skb_any(skb); + break; + } +@@ -2568,7 +2568,7 @@ static int nes_cm_disconn_true(struct ne +=20 + if ((cm_id) && (cm_id->event_handler)) { + if (issue_disconn) { +- atomic_inc(&cm_disconnects); ++ atomic_inc_unchecked(&cm_disconnects); + cm_event.event =3D IW_CM_EVENT_DISCONNECT; + cm_event.status =3D disconn_status; + cm_event.local_addr =3D cm_id->local_addr; +@@ -2590,7 +2590,7 @@ static int nes_cm_disconn_true(struct ne + } +=20 + if (issue_close) { +- atomic_inc(&cm_closes); ++ atomic_inc_unchecked(&cm_closes); + nes_disconnect(nesqp, 1); +=20 + cm_id->provider_data =3D nesqp; +@@ -2710,7 +2710,7 @@ int nes_accept(struct iw_cm_id *cm_id, s +=20 + nes_debug(NES_DBG_CM, "QP%u, cm_node=3D%p, jiffies =3D %lu listener =3D= %p\n", + nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener); +- atomic_inc(&cm_accepts); ++ atomic_inc_unchecked(&cm_accepts); +=20 + nes_debug(NES_DBG_CM, "netdev refcnt =3D %u.\n", + atomic_read(&nesvnic->netdev->refcnt)); +@@ -2919,7 +2919,7 @@ int nes_reject(struct iw_cm_id *cm_id, c +=20 + struct nes_cm_core *cm_core; +=20 +- atomic_inc(&cm_rejects); ++ atomic_inc_unchecked(&cm_rejects); + cm_node =3D (struct nes_cm_node *) cm_id->provider_data; + loopback =3D cm_node->loopbackpartner; + cm_core =3D cm_node->cm_core; +@@ -2982,7 +2982,7 @@ int nes_connect(struct iw_cm_id *cm_id,=20 + ntohl(cm_id->local_addr.sin_addr.s_addr), + ntohs(cm_id->local_addr.sin_port)); +=20 +- atomic_inc(&cm_connects); ++ atomic_inc_unchecked(&cm_connects); + nesqp->active_conn =3D 1; +=20 + /* cache the cm_id in the qp */ +@@ -3195,7 +3195,7 @@ static void cm_event_connected(struct ne + if (nesqp->destroyed) { + return; + } +- atomic_inc(&cm_connecteds); ++ atomic_inc_unchecked(&cm_connecteds); + nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on= " + " local port 0x%04X. jiffies =3D %lu.\n", + nesqp->hwqp.qp_id, +@@ -3403,7 +3403,7 @@ static void cm_event_reset(struct nes_cm +=20 + ret =3D cm_id->event_handler(cm_id, &cm_event); + cm_id->add_ref(cm_id); +- atomic_inc(&cm_closes); ++ atomic_inc_unchecked(&cm_closes); + cm_event.event =3D IW_CM_EVENT_CLOSE; + cm_event.status =3D IW_CM_EVENT_STATUS_OK; + cm_event.provider_data =3D cm_id->provider_data; +@@ -3439,7 +3439,7 @@ static void cm_event_mpa_req(struct nes_ + return; + cm_id =3D cm_node->cm_id; +=20 +- atomic_inc(&cm_connect_reqs); ++ atomic_inc_unchecked(&cm_connect_reqs); + nes_debug(NES_DBG_CM, "cm_node =3D %p - cm_id =3D %p, jiffies =3D %lu\= n", + cm_node, cm_id, jiffies); +=20 +@@ -3477,7 +3477,7 @@ static void cm_event_mpa_reject(struct n + return; + cm_id =3D cm_node->cm_id; +=20 +- atomic_inc(&cm_connect_reqs); ++ atomic_inc_unchecked(&cm_connect_reqs); + nes_debug(NES_DBG_CM, "cm_node =3D %p - cm_id =3D %p, jiffies =3D %lu\= n", + cm_node, cm_id, jiffies); +=20 +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h linux-2.6.32.= 45/drivers/infiniband/hw/nes/nes.h +--- linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes.h 2011-05-04 17:56:28.= 000000000 -0400 +@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level; + extern unsigned int wqm_quanta; + extern struct list_head nes_adapter_list; +=20 +-extern atomic_t cm_connects; +-extern atomic_t cm_accepts; +-extern atomic_t cm_disconnects; +-extern atomic_t cm_closes; +-extern atomic_t cm_connecteds; +-extern atomic_t cm_connect_reqs; +-extern atomic_t cm_rejects; +-extern atomic_t mod_qp_timouts; +-extern atomic_t qps_created; +-extern atomic_t qps_destroyed; +-extern atomic_t sw_qps_destroyed; ++extern atomic_unchecked_t cm_connects; ++extern atomic_unchecked_t cm_accepts; ++extern atomic_unchecked_t cm_disconnects; ++extern atomic_unchecked_t cm_closes; ++extern atomic_unchecked_t cm_connecteds; ++extern atomic_unchecked_t cm_connect_reqs; ++extern atomic_unchecked_t cm_rejects; ++extern atomic_unchecked_t mod_qp_timouts; ++extern atomic_unchecked_t qps_created; ++extern atomic_unchecked_t qps_destroyed; ++extern atomic_unchecked_t sw_qps_destroyed; + extern u32 mh_detected; + extern u32 mh_pauses_sent; + extern u32 cm_packets_sent; +@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans; + extern u32 cm_listens_created; + extern u32 cm_listens_destroyed; + extern u32 cm_backlog_drops; +-extern atomic_t cm_loopbacks; +-extern atomic_t cm_nodes_created; +-extern atomic_t cm_nodes_destroyed; +-extern atomic_t cm_accel_dropped_pkts; +-extern atomic_t cm_resets_recvd; ++extern atomic_unchecked_t cm_loopbacks; ++extern atomic_unchecked_t cm_nodes_created; ++extern atomic_unchecked_t cm_nodes_destroyed; ++extern atomic_unchecked_t cm_accel_dropped_pkts; ++extern atomic_unchecked_t cm_resets_recvd; +=20 + extern u32 int_mod_timer_init; + extern u32 int_mod_cq_depth_256; +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c linux-2.6= .32.45/drivers/infiniband/hw/nes/nes_nic.c +--- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_nic.c 2011-05-04 17:56= :28.000000000 -0400 +@@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats + target_stat_values[++index] =3D mh_detected; + target_stat_values[++index] =3D mh_pauses_sent; + target_stat_values[++index] =3D nesvnic->endnode_ipv4_tcp_retransmits; +- target_stat_values[++index] =3D atomic_read(&cm_connects); +- target_stat_values[++index] =3D atomic_read(&cm_accepts); +- target_stat_values[++index] =3D atomic_read(&cm_disconnects); +- target_stat_values[++index] =3D atomic_read(&cm_connecteds); +- target_stat_values[++index] =3D atomic_read(&cm_connect_reqs); +- target_stat_values[++index] =3D atomic_read(&cm_rejects); +- target_stat_values[++index] =3D atomic_read(&mod_qp_timouts); +- target_stat_values[++index] =3D atomic_read(&qps_created); +- target_stat_values[++index] =3D atomic_read(&sw_qps_destroyed); +- target_stat_values[++index] =3D atomic_read(&qps_destroyed); +- target_stat_values[++index] =3D atomic_read(&cm_closes); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_connects); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_accepts); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_disconnects)= ; ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_connecteds); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_connect_reqs= ); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_rejects); ++ target_stat_values[++index] =3D atomic_read_unchecked(&mod_qp_timouts)= ; ++ target_stat_values[++index] =3D atomic_read_unchecked(&qps_created); ++ target_stat_values[++index] =3D atomic_read_unchecked(&sw_qps_destroye= d); ++ target_stat_values[++index] =3D atomic_read_unchecked(&qps_destroyed); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_closes); + target_stat_values[++index] =3D cm_packets_sent; + target_stat_values[++index] =3D cm_packets_bounced; + target_stat_values[++index] =3D cm_packets_created; +@@ -1230,11 +1230,11 @@ static void nes_netdev_get_ethtool_stats + target_stat_values[++index] =3D cm_listens_created; + target_stat_values[++index] =3D cm_listens_destroyed; + target_stat_values[++index] =3D cm_backlog_drops; +- target_stat_values[++index] =3D atomic_read(&cm_loopbacks); +- target_stat_values[++index] =3D atomic_read(&cm_nodes_created); +- target_stat_values[++index] =3D atomic_read(&cm_nodes_destroyed); +- target_stat_values[++index] =3D atomic_read(&cm_accel_dropped_pkts); +- target_stat_values[++index] =3D atomic_read(&cm_resets_recvd); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_loopbacks); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_nodes_create= d); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_nodes_destro= yed); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_accel_droppe= d_pkts); ++ target_stat_values[++index] =3D atomic_read_unchecked(&cm_resets_recvd= ); + target_stat_values[++index] =3D int_mod_timer_init; + target_stat_values[++index] =3D int_mod_cq_depth_1; + target_stat_values[++index] =3D int_mod_cq_depth_4; +diff -urNp linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c linux-2= .6.32.45/drivers/infiniband/hw/nes/nes_verbs.c +--- linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/infiniband/hw/nes/nes_verbs.c 2011-05-04 17:= 56:28.000000000 -0400 +@@ -45,9 +45,9 @@ +=20 + #include +=20 +-atomic_t mod_qp_timouts; +-atomic_t qps_created; +-atomic_t sw_qps_destroyed; ++atomic_unchecked_t mod_qp_timouts; ++atomic_unchecked_t qps_created; ++atomic_unchecked_t sw_qps_destroyed; +=20 + static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev); +=20 +@@ -1240,7 +1240,7 @@ static struct ib_qp *nes_create_qp(struc + if (init_attr->create_flags) + return ERR_PTR(-EINVAL); +=20 +- atomic_inc(&qps_created); ++ atomic_inc_unchecked(&qps_created); + switch (init_attr->qp_type) { + case IB_QPT_RC: + if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) { +@@ -1568,7 +1568,7 @@ static int nes_destroy_qp(struct ib_qp * + struct iw_cm_event cm_event; + int ret; +=20 +- atomic_inc(&sw_qps_destroyed); ++ atomic_inc_unchecked(&sw_qps_destroyed); + nesqp->destroyed =3D 1; +=20 + /* Blow away the connection if it exists. */ +diff -urNp linux-2.6.32.45/drivers/input/gameport/gameport.c linux-2.6.3= 2.45/drivers/input/gameport/gameport.c +--- linux-2.6.32.45/drivers/input/gameport/gameport.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/input/gameport/gameport.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys); + */ + static void gameport_init_port(struct gameport *gameport) + { +- static atomic_t gameport_no =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t gameport_no =3D ATOMIC_INIT(0); +=20 + __module_get(THIS_MODULE); +=20 + mutex_init(&gameport->drv_mutex); + device_initialize(&gameport->dev); +- dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_= return(&gameport_no) - 1); ++ dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_= return_unchecked(&gameport_no) - 1); + gameport->dev.bus =3D &gameport_bus; + gameport->dev.release =3D gameport_release_port; + if (gameport->parent) +diff -urNp linux-2.6.32.45/drivers/input/input.c linux-2.6.32.45/drivers= /input/input.c +--- linux-2.6.32.45/drivers/input/input.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/input/input.c 2011-05-04 17:56:28.000000000 = -0400 +@@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability); + */ + int input_register_device(struct input_dev *dev) + { +- static atomic_t input_no =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t input_no =3D ATOMIC_INIT(0); + struct input_handler *handler; + const char *path; + int error; +@@ -1585,7 +1585,7 @@ int input_register_device(struct input_d + dev->setkeycode =3D input_default_setkeycode; +=20 + dev_set_name(&dev->dev, "input%ld", +- (unsigned long) atomic_inc_return(&input_no) - 1); ++ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1); +=20 + error =3D device_add(&dev->dev); + if (error) +diff -urNp linux-2.6.32.45/drivers/input/joystick/sidewinder.c linux-2.6= .32.45/drivers/input/joystick/sidewinder.c +--- linux-2.6.32.45/drivers/input/joystick/sidewinder.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/input/joystick/sidewinder.c 2011-05-18 20:09= :36.000000000 -0400 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -428,6 +429,8 @@ static int sw_read(struct sw *sw) + unsigned char buf[SW_LENGTH]; + int i; +=20 ++ pax_track_stack(); ++ + i =3D sw_read_packet(sw->gameport, buf, sw->length, 0); +=20 + if (sw->type =3D=3D SW_ID_3DP && sw->length =3D=3D 66 && i !=3D 66) { = /* Broken packet, try to fix */ +diff -urNp linux-2.6.32.45/drivers/input/joystick/xpad.c linux-2.6.32.45= /drivers/input/joystick/xpad.c +--- linux-2.6.32.45/drivers/input/joystick/xpad.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/input/joystick/xpad.c 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -621,7 +621,7 @@ static void xpad_led_set(struct led_clas +=20 + static int xpad_led_probe(struct usb_xpad *xpad) + { +- static atomic_t led_seq =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t led_seq =3D ATOMIC_INIT(0); + long led_no; + struct xpad_led *led; + struct led_classdev *led_cdev; +@@ -634,7 +634,7 @@ static int xpad_led_probe(struct usb_xpa + if (!led) + return -ENOMEM; +=20 +- led_no =3D (long)atomic_inc_return(&led_seq) - 1; ++ led_no =3D (long)atomic_inc_return_unchecked(&led_seq) - 1; +=20 + snprintf(led->name, sizeof(led->name), "xpad%ld", led_no); + led->xpad =3D xpad; +diff -urNp linux-2.6.32.45/drivers/input/serio/serio.c linux-2.6.32.45/d= rivers/input/serio/serio.c +--- linux-2.6.32.45/drivers/input/serio/serio.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/input/serio/serio.c 2011-05-04 17:56:28.0000= 00000 -0400 +@@ -527,7 +527,7 @@ static void serio_release_port(struct de + */ + static void serio_init_port(struct serio *serio) + { +- static atomic_t serio_no =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t serio_no =3D ATOMIC_INIT(0); +=20 + __module_get(THIS_MODULE); +=20 +@@ -536,7 +536,7 @@ static void serio_init_port(struct serio + mutex_init(&serio->drv_mutex); + device_initialize(&serio->dev); + dev_set_name(&serio->dev, "serio%ld", +- (long)atomic_inc_return(&serio_no) - 1); ++ (long)atomic_inc_return_unchecked(&serio_no) - 1); + serio->dev.bus =3D &serio_bus; + serio->dev.release =3D serio_release_port; + if (serio->parent) { +diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/common.c linux-2.6.32.45= /drivers/isdn/gigaset/common.c +--- linux-2.6.32.45/drivers/isdn/gigaset/common.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/gigaset/common.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct=20 + cs->commands_pending =3D 0; + cs->cur_at_seq =3D 0; + cs->gotfwver =3D -1; +- cs->open_count =3D 0; ++ local_set(&cs->open_count, 0); + cs->dev =3D NULL; + cs->tty =3D NULL; + cs->tty_dev =3D NULL; +diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h linux-2.6.32.4= 5/drivers/isdn/gigaset/gigaset.h +--- linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/gigaset/gigaset.h 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include +=20 + #define GIG_VERSION {0,5,0,0} + #define GIG_COMPAT {0,4,0,0} +@@ -446,7 +447,7 @@ struct cardstate { + spinlock_t cmdlock; + unsigned curlen, cmdbytes; +=20 +- unsigned open_count; ++ local_t open_count; + struct tty_struct *tty; + struct tasklet_struct if_wake_tasklet; + unsigned control_state; +diff -urNp linux-2.6.32.45/drivers/isdn/gigaset/interface.c linux-2.6.32= .45/drivers/isdn/gigaset/interface.c +--- linux-2.6.32.45/drivers/isdn/gigaset/interface.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/gigaset/interface.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt + return -ERESTARTSYS; // FIXME -EINTR? + tty->driver_data =3D cs; +=20 +- ++cs->open_count; +- +- if (cs->open_count =3D=3D 1) { ++ if (local_inc_return(&cs->open_count) =3D=3D 1) { + spin_lock_irqsave(&cs->lock, flags); + cs->tty =3D tty; + spin_unlock_irqrestore(&cs->lock, flags); +@@ -195,10 +193,10 @@ static void if_close(struct tty_struct * +=20 + if (!cs->connected) + gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ +- else if (!cs->open_count) ++ else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else { +- if (!--cs->open_count) { ++ if (!local_dec_return(&cs->open_count)) { + spin_lock_irqsave(&cs->lock, flags); + cs->tty =3D NULL; + spin_unlock_irqrestore(&cs->lock, flags); +@@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *t + if (!cs->connected) { + gig_dbg(DEBUG_IF, "not connected"); + retval =3D -ENODEV; +- } else if (!cs->open_count) ++ } else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else { + retval =3D 0; +@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *t + if (!cs->connected) { + gig_dbg(DEBUG_IF, "not connected"); + retval =3D -ENODEV; +- } else if (!cs->open_count) ++ } else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else if (cs->mstate !=3D MS_LOCKED) { + dev_warn(cs->dev, "can't write to unlocked device\n"); +@@ -395,7 +393,7 @@ static int if_write_room(struct tty_stru + if (!cs->connected) { + gig_dbg(DEBUG_IF, "not connected"); + retval =3D -ENODEV; +- } else if (!cs->open_count) ++ } else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else if (cs->mstate !=3D MS_LOCKED) { + dev_warn(cs->dev, "can't write to unlocked device\n"); +@@ -425,7 +423,7 @@ static int if_chars_in_buffer(struct tty +=20 + if (!cs->connected) + gig_dbg(DEBUG_IF, "not connected"); +- else if (!cs->open_count) ++ else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else if (cs->mstate !=3D MS_LOCKED) + dev_warn(cs->dev, "can't write to unlocked device\n"); +@@ -453,7 +451,7 @@ static void if_throttle(struct tty_struc +=20 + if (!cs->connected) + gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ +- else if (!cs->open_count) ++ else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else { + //FIXME +@@ -478,7 +476,7 @@ static void if_unthrottle(struct tty_str +=20 + if (!cs->connected) + gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */ +- else if (!cs->open_count) ++ else if (!local_read(&cs->open_count)) + dev_warn(cs->dev, "%s: device not opened\n", __func__); + else { + //FIXME +@@ -510,7 +508,7 @@ static void if_set_termios(struct tty_st + goto out; + } +=20 +- if (!cs->open_count) { ++ if (!local_read(&cs->open_count)) { + dev_warn(cs->dev, "%s: device not opened\n", __func__); + goto out; + } +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c linux-2.6.32.4= 5/drivers/isdn/hardware/avm/b1.c +--- linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/avm/b1.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo + } + if (left) { + if (t4file->user) { +- if (copy_from_user(buf, dp, left)) ++ if (left > sizeof buf || copy_from_user(buf, dp, left)) + return -EFAULT; + } else { + memcpy(buf, dp, left); +@@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capilo + } + if (left) { + if (config->user) { +- if (copy_from_user(buf, dp, left)) ++ if (left > sizeof buf || copy_from_user(buf, dp, left)) + return -EFAULT; + } else { + memcpy(buf, dp, left); +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c linux-= 2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/capidtmf.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta + byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT]; + short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES]; +=20 ++ pax_track_stack(); +=20 + if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE) + { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c linux-= 2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/capifunc.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void) + IDI_SYNC_REQ req; + DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; +=20 ++ pax_track_stack(); ++ + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); +=20 + for (x =3D 0; x < MAX_DESCRIPTORS; x++) { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c linux-= 2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/diddfunc.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di + IDI_SYNC_REQ req; + DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; +=20 ++ pax_track_stack(); ++ + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); +=20 + for (x =3D 0; x < MAX_DESCRIPTORS; x++) { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c linux= -2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/divasfunc.c 2011-05-16 2= 1:46:57.000000000 -0400 +@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_di + IDI_SYNC_REQ req; + DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; +=20 ++ pax_track_stack(); ++ + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); +=20 + for (x =3D 0; x < MAX_DESCRIPTORS; x++) { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h linux-= 2.6.32.45/drivers/isdn/hardware/eicon/divasync.h +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/divasync.h 2011-08-05 20= :33:55.000000000 -0400 +@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter { + } diva_didd_add_adapter_t; + typedef struct _diva_didd_remove_adapter { + IDI_CALL p_request; +-} diva_didd_remove_adapter_t; ++} __no_const diva_didd_remove_adapter_t; + typedef struct _diva_didd_read_adapter_array { + void * buffer; + dword length; +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c linux-2= .6.32.45/drivers/isdn/hardware/eicon/idifunc.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/idifunc.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di + IDI_SYNC_REQ req; + DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; +=20 ++ pax_track_stack(); ++ + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); +=20 + for (x =3D 0; x < MAX_DESCRIPTORS; x++) { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c linux-2= .6.32.45/drivers/isdn/hardware/eicon/message.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/message.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci) + dword d; + word w; +=20 ++ pax_track_stack(); ++ + a =3D plci->adapter; + Id =3D ((word)plci->Id<<8)|a->Id; + PUT_WORD(&SS_Ind[4],0x0000); +@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE + word j, n, w; + dword d; +=20 ++ pax_track_stack(); ++ +=20 + for(i=3D0;i<8;i++) bp_parms[i].length =3D 0; + for(i=3D0;i<2;i++) global_config[i].length =3D 0; +@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARS + const byte llc3[] =3D {4,3,2,2,6,6,0}; + const byte header[] =3D {0,2,3,3,0,0,0}; +=20 ++ pax_track_stack(); ++ + for(i=3D0;i<8;i++) bp_parms[i].length =3D 0; + for(i=3D0;i<6;i++) b2_config_parms[i].length =3D 0; + for(i=3D0;i<5;i++) b3_config_parms[i].length =3D 0; +@@ -14761,6 +14767,8 @@ static void group_optimization(DIVA_CAPI + word appl_number_group_type[MAX_APPL]; + PLCI *auxplci; +=20 ++ pax_track_stack(); ++ + set_group_ind_mask (plci); /* all APPLs within this inc. call are all= owed to dial in */ +=20 + if(!a->group_optimization_enabled) +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c linux-2= .6.32.45/drivers/isdn/hardware/eicon/mntfunc.c +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/mntfunc.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di + IDI_SYNC_REQ req; + DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS]; +=20 ++ pax_track_stack(); ++ + DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table)); +=20 + for (x =3D 0; x < MAX_DESCRIPTORS; x++) { +diff -urNp linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h lin= ux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h +--- linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/hardware/eicon/xdi_adapter.h 2011-08-05= 20:33:55.000000000 -0400 +@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t { + typedef struct _diva_os_idi_adapter_interface { + diva_init_card_proc_t cleanup_adapter_proc; + diva_cmd_card_proc_t cmd_proc; +-} diva_os_idi_adapter_interface_t; ++} __no_const diva_os_idi_adapter_interface_t; +=20 + typedef struct _diva_os_xdi_adapter { + struct list_head link; +diff -urNp linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c linux-2.6.32.4= 5/drivers/isdn/i4l/isdn_common.c +--- linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/isdn/i4l/isdn_common.c 2011-05-16 21:46:57.0= 00000000 -0400 +@@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct f + } iocpar; + void __user *argp =3D (void __user *)arg; +=20 ++ pax_track_stack(); ++ + #define name iocpar.name + #define bname iocpar.bname + #define iocts iocpar.iocts +diff -urNp linux-2.6.32.45/drivers/isdn/icn/icn.c linux-2.6.32.45/driver= s/isdn/icn/icn.c +--- linux-2.6.32.45/drivers/isdn/icn/icn.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/isdn/icn/icn.c 2011-04-17 15:56:46.000000000= -0400 +@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len + if (count > len) + count =3D len; + if (user) { +- if (copy_from_user(msg, buf, count)) ++ if (count > sizeof msg || copy_from_user(msg, buf, count)) + return -EFAULT; + } else + memcpy(msg, buf, count); +diff -urNp linux-2.6.32.45/drivers/isdn/mISDN/socket.c linux-2.6.32.45/d= rivers/isdn/mISDN/socket.c +--- linux-2.6.32.45/drivers/isdn/mISDN/socket.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/isdn/mISDN/socket.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, uns + if (dev) { + struct mISDN_devinfo di; +=20 ++ memset(&di, 0, sizeof(di)); + di.id =3D dev->id; + di.Dprotocols =3D dev->Dprotocols; + di.Bprotocols =3D dev->Bprotocols | get_all_Bprotocols(); +@@ -671,6 +672,7 @@ base_sock_ioctl(struct socket *sock, uns + if (dev) { + struct mISDN_devinfo di; +=20 ++ memset(&di, 0, sizeof(di)); + di.id =3D dev->id; + di.Dprotocols =3D dev->Dprotocols; + di.Bprotocols =3D dev->Bprotocols | get_all_Bprotocols(); +diff -urNp linux-2.6.32.45/drivers/isdn/sc/interrupt.c linux-2.6.32.45/d= rivers/isdn/sc/interrupt.c +--- linux-2.6.32.45/drivers/isdn/sc/interrupt.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/isdn/sc/interrupt.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, + } + else if(callid>=3D0x0000 && callid<=3D0x7FFF) + { ++ int len; ++ + pr_debug("%s: Got Incoming Call\n", + sc_adapter[card]->devicename); +- strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4])); +- strcpy(setup.eazmsn, +- sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn); ++ len =3D strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]), ++ sizeof(setup.phone)); ++ if (len >=3D sizeof(setup.phone)) ++ continue; ++ len =3D strlcpy(setup.eazmsn, ++ sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn, ++ sizeof(setup.eazmsn)); ++ if (len >=3D sizeof(setup.eazmsn)) ++ continue; + setup.si1 =3D 7; + setup.si2 =3D 0; + setup.plan =3D 0; +@@ -176,7 +184,9 @@ irqreturn_t interrupt_handler(int dummy, + * Handle a GetMyNumber Rsp + */ + if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){ +- strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg= _data.byte_array); ++ strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn, ++ rcvmsg.msg_data.byte_array, ++ sizeof(rcvmsg.msg_data.byte_array)); + continue; + } + =09 +diff -urNp linux-2.6.32.45/drivers/lguest/core.c linux-2.6.32.45/drivers= /lguest/core.c +--- linux-2.6.32.45/drivers/lguest/core.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/lguest/core.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -91,9 +91,17 @@ static __init int map_switcher(void) + * it's worked so far. The end address needs +1 because __get_vm_area + * allocates an extra guard page, so we need space for that. + */ ++ ++#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG= _PAX_KERNEXEC) ++ switcher_vma =3D __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE, ++ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR ++ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE); ++#else + switcher_vma =3D __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE, + VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE); ++#endif ++ + if (!switcher_vma) { + err =3D -ENOMEM; + printk("lguest: could not map switcher pages high\n"); +@@ -118,7 +126,7 @@ static __init int map_switcher(void) + * Now the Switcher is mapped at the right address, we can't fail! + * Copy in the compiled-in Switcher code (from _switcher.S). + */ +- memcpy(switcher_vma->addr, start_switcher_text, ++ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text), + end_switcher_text - start_switcher_text); +=20 + printk(KERN_INFO "lguest: mapped switcher at %p\n", +diff -urNp linux-2.6.32.45/drivers/lguest/x86/core.c linux-2.6.32.45/dri= vers/lguest/x86/core.c +--- linux-2.6.32.45/drivers/lguest/x86/core.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/lguest/x86/core.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -59,7 +59,7 @@ static struct { + /* Offset from where switcher.S was compiled to where we've copied it *= / + static unsigned long switcher_offset(void) + { +- return SWITCHER_ADDR - (unsigned long)start_switcher_text; ++ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text); + } +=20 + /* This cpu's struct lguest_pages. */ +@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg + * These copies are pretty cheap, so we do them unconditionally: */ + /* Save the current Host top-level page directory. + */ ++ ++#ifdef CONFIG_PAX_PER_CPU_PGD ++ pages->state.host_cr3 =3D read_cr3(); ++#else + pages->state.host_cr3 =3D __pa(current->mm->pgd); ++#endif ++ + /* + * Set up the Guest's page tables to see this CPU's pages (and no + * other CPU's pages). +@@ -535,7 +541,7 @@ void __init lguest_arch_host_init(void) + * compiled-in switcher code and the high-mapped copy we just made. + */ + for (i =3D 0; i < IDT_ENTRIES; i++) +- default_idt_entries[i] +=3D switcher_offset(); ++ default_idt_entries[i] =3D ktla_ktva(default_idt_entries[i]) + switch= er_offset(); +=20 + /* + * Set up the Switcher's per-cpu areas. +@@ -618,7 +624,7 @@ void __init lguest_arch_host_init(void) + * it will be undisturbed when we switch. To change %cs and jump we + * need this structure to feed to Intel's "lcall" instruction. + */ +- lguest_entry.offset =3D (long)switch_to_guest + switcher_offset(); ++ lguest_entry.offset =3D (long)ktla_ktva(switch_to_guest) + switcher_of= fset(); + lguest_entry.segment =3D LGUEST_CS; +=20 + /* +diff -urNp linux-2.6.32.45/drivers/lguest/x86/switcher_32.S linux-2.6.32= .45/drivers/lguest/x86/switcher_32.S +--- linux-2.6.32.45/drivers/lguest/x86/switcher_32.S 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/lguest/x86/switcher_32.S 2011-04-17 15:56:46= .000000000 -0400 +@@ -87,6 +87,7 @@ + #include + #include + #include ++#include +=20 + // We mark the start of the code to copy + // It's placed in .text tho it's never run here +@@ -149,6 +150,13 @@ ENTRY(switch_to_guest) + // Changes type when we load it: damn Intel! + // For after we switch over our page tables + // That entry will be read-only: we'd crash. ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ mov %cr0, %edx ++ xor $X86_CR0_WP, %edx ++ mov %edx, %cr0 ++#endif ++ + movl $(GDT_ENTRY_TSS*8), %edx + ltr %dx +=20 +@@ -157,9 +165,15 @@ ENTRY(switch_to_guest) + // Let's clear it again for our return. + // The GDT descriptor of the Host + // Points to the table after two "size" bytes +- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx ++ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax + // Clear "used" from type field (byte 5, bit 2) +- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx) ++ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax) ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ mov %cr0, %eax ++ xor $X86_CR0_WP, %eax ++ mov %eax, %cr0 ++#endif +=20 + // Once our page table's switched, the Guest is live! + // The Host fades as we run this final step. +@@ -295,13 +309,12 @@ deliver_to_host: + // I consulted gcc, and it gave + // These instructions, which I gladly credit: + leal (%edx,%ebx,8), %eax +- movzwl (%eax),%edx +- movl 4(%eax), %eax +- xorw %ax, %ax +- orl %eax, %edx ++ movl 4(%eax), %edx ++ movw (%eax), %dx + // Now the address of the handler's in %edx + // We call it now: its "iret" drops us home. +- jmp *%edx ++ ljmp $__KERNEL_CS, $1f ++1: jmp *%edx +=20 + // Every interrupt can come to us here + // But we must truly tell each apart. +diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c linux-2= .6.32.45/drivers/macintosh/via-pmu-backlight.c +--- linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/macintosh/via-pmu-backlight.c 2011-04-17 15:= 56:46.000000000 -0400 +@@ -15,7 +15,7 @@ +=20 + #define MAX_PMU_LEVEL 0xFF +=20 +-static struct backlight_ops pmu_backlight_data; ++static const struct backlight_ops pmu_backlight_data; + static DEFINE_SPINLOCK(pmu_backlight_lock); + static int sleeping, uses_pmu_bl; + static u8 bl_curve[FB_BACKLIGHT_LEVELS]; +@@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness( + return bd->props.brightness; + } +=20 +-static struct backlight_ops pmu_backlight_data =3D { ++static const struct backlight_ops pmu_backlight_data =3D { + .get_brightness =3D pmu_backlight_get_brightness, + .update_status =3D pmu_backlight_update_status, +=20 +diff -urNp linux-2.6.32.45/drivers/macintosh/via-pmu.c linux-2.6.32.45/d= rivers/macintosh/via-pmu.c +--- linux-2.6.32.45/drivers/macintosh/via-pmu.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/macintosh/via-pmu.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state + && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >=3D 0); + } +=20 +-static struct platform_suspend_ops pmu_pm_ops =3D { ++static const struct platform_suspend_ops pmu_pm_ops =3D { + .enter =3D powerbook_sleep, + .valid =3D pmu_sleep_valid, + }; +diff -urNp linux-2.6.32.45/drivers/md/dm.c linux-2.6.32.45/drivers/md/dm= .c +--- linux-2.6.32.45/drivers/md/dm.c 2011-08-09 18:35:29.000000000 -0400 ++++ linux-2.6.32.45/drivers/md/dm.c 2011-08-09 18:33:59.000000000 -0400 +@@ -165,9 +165,9 @@ struct mapped_device { + /* + * Event handling. + */ +- atomic_t event_nr; ++ atomic_unchecked_t event_nr; + wait_queue_head_t eventq; +- atomic_t uevent_seq; ++ atomic_unchecked_t uevent_seq; + struct list_head uevent_list; + spinlock_t uevent_lock; /* Protect access to uevent_list */ +=20 +@@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(i + rwlock_init(&md->map_lock); + atomic_set(&md->holders, 1); + atomic_set(&md->open_count, 0); +- atomic_set(&md->event_nr, 0); +- atomic_set(&md->uevent_seq, 0); ++ atomic_set_unchecked(&md->event_nr, 0); ++ atomic_set_unchecked(&md->uevent_seq, 0); + INIT_LIST_HEAD(&md->uevent_list); + spin_lock_init(&md->uevent_lock); +=20 +@@ -1927,7 +1927,7 @@ static void event_callback(void *context +=20 + dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj); +=20 +- atomic_inc(&md->event_nr); ++ atomic_inc_unchecked(&md->event_nr); + wake_up(&md->eventq); + } +=20 +@@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_dev +=20 + uint32_t dm_next_uevent_seq(struct mapped_device *md) + { +- return atomic_add_return(1, &md->uevent_seq); ++ return atomic_add_return_unchecked(1, &md->uevent_seq); + } +=20 + uint32_t dm_get_event_nr(struct mapped_device *md) + { +- return atomic_read(&md->event_nr); ++ return atomic_read_unchecked(&md->event_nr); + } +=20 + int dm_wait_event(struct mapped_device *md, int event_nr) + { + return wait_event_interruptible(md->eventq, +- (event_nr !=3D atomic_read(&md->event_nr))); ++ (event_nr !=3D atomic_read_unchecked(&md->event_nr))); + } +=20 + void dm_uevent_add(struct mapped_device *md, struct list_head *elist) +diff -urNp linux-2.6.32.45/drivers/md/dm-ioctl.c linux-2.6.32.45/drivers= /md/dm-ioctl.c +--- linux-2.6.32.45/drivers/md/dm-ioctl.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/md/dm-ioctl.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, str + cmd =3D=3D DM_LIST_VERSIONS_CMD) + return 0; +=20 +- if ((cmd =3D=3D DM_DEV_CREATE_CMD)) { ++ if (cmd =3D=3D DM_DEV_CREATE_CMD) { + if (!*param->name) { + DMWARN("name not supplied when creating device"); + return -EINVAL; +diff -urNp linux-2.6.32.45/drivers/md/dm-raid1.c linux-2.6.32.45/drivers= /md/dm-raid1.c +--- linux-2.6.32.45/drivers/md/dm-raid1.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/md/dm-raid1.c 2011-05-04 17:56:28.000000000 = -0400 +@@ -41,7 +41,7 @@ enum dm_raid1_error { +=20 + struct mirror { + struct mirror_set *ms; +- atomic_t error_count; ++ atomic_unchecked_t error_count; + unsigned long error_type; + struct dm_dev *dev; + sector_t offset; +@@ -203,7 +203,7 @@ static void fail_mirror(struct mirror *m + * simple way to tell if a device has encountered + * errors. + */ +- atomic_inc(&m->error_count); ++ atomic_inc_unchecked(&m->error_count); +=20 + if (test_and_set_bit(error_type, &m->error_type)) + return; +@@ -225,7 +225,7 @@ static void fail_mirror(struct mirror *m + } +=20 + for (new =3D ms->mirror; new < ms->mirror + ms->nr_mirrors; new++) +- if (!atomic_read(&new->error_count)) { ++ if (!atomic_read_unchecked(&new->error_count)) { + set_default_mirror(new); + break; + } +@@ -363,7 +363,7 @@ static struct mirror *choose_mirror(stru + struct mirror *m =3D get_default_mirror(ms); +=20 + do { +- if (likely(!atomic_read(&m->error_count))) ++ if (likely(!atomic_read_unchecked(&m->error_count))) + return m; +=20 + if (m-- =3D=3D ms->mirror) +@@ -377,7 +377,7 @@ static int default_ok(struct mirror *m) + { + struct mirror *default_mirror =3D get_default_mirror(m->ms); +=20 +- return !atomic_read(&default_mirror->error_count); ++ return !atomic_read_unchecked(&default_mirror->error_count); + } +=20 + static int mirror_available(struct mirror_set *ms, struct bio *bio) +@@ -484,7 +484,7 @@ static void do_reads(struct mirror_set * + */ + if (likely(region_in_sync(ms, region, 1))) + m =3D choose_mirror(ms, bio->bi_sector); +- else if (m && atomic_read(&m->error_count)) ++ else if (m && atomic_read_unchecked(&m->error_count)) + m =3D NULL; +=20 + if (likely(m)) +@@ -855,7 +855,7 @@ static int get_mirror(struct mirror_set=20 + } +=20 + ms->mirror[mirror].ms =3D ms; +- atomic_set(&(ms->mirror[mirror].error_count), 0); ++ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0); + ms->mirror[mirror].error_type =3D 0; + ms->mirror[mirror].offset =3D offset; +=20 +@@ -1241,7 +1241,7 @@ static void mirror_resume(struct dm_targ + */ + static char device_status_char(struct mirror *m) + { +- if (!atomic_read(&(m->error_count))) ++ if (!atomic_read_unchecked(&(m->error_count))) + return 'A'; +=20 + return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' : +diff -urNp linux-2.6.32.45/drivers/md/dm-stripe.c linux-2.6.32.45/driver= s/md/dm-stripe.c +--- linux-2.6.32.45/drivers/md/dm-stripe.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/md/dm-stripe.c 2011-05-04 17:56:28.000000000= -0400 +@@ -20,7 +20,7 @@ struct stripe { + struct dm_dev *dev; + sector_t physical_start; +=20 +- atomic_t error_count; ++ atomic_unchecked_t error_count; + }; +=20 + struct stripe_c { +@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target * + kfree(sc); + return r; + } +- atomic_set(&(sc->stripe[i].error_count), 0); ++ atomic_set_unchecked(&(sc->stripe[i].error_count), 0); + } +=20 + ti->private =3D sc; +@@ -257,7 +257,7 @@ static int stripe_status(struct dm_targe + DMEMIT("%d ", sc->stripes); + for (i =3D 0; i < sc->stripes; i++) { + DMEMIT("%s ", sc->stripe[i].dev->name); +- buffer[i] =3D atomic_read(&(sc->stripe[i].error_count)) ? ++ buffer[i] =3D atomic_read_unchecked(&(sc->stripe[i].error_count)) ? + 'D' : 'A'; + } + buffer[i] =3D '\0'; +@@ -304,8 +304,8 @@ static int stripe_end_io(struct dm_targe + */ + for (i =3D 0; i < sc->stripes; i++) + if (!strcmp(sc->stripe[i].dev->name, major_minor)) { +- atomic_inc(&(sc->stripe[i].error_count)); +- if (atomic_read(&(sc->stripe[i].error_count)) < ++ atomic_inc_unchecked(&(sc->stripe[i].error_count)); ++ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) < + DM_IO_ERROR_THRESHOLD) + queue_work(kstriped, &sc->kstriped_ws); + } +diff -urNp linux-2.6.32.45/drivers/md/dm-sysfs.c linux-2.6.32.45/drivers= /md/dm-sysfs.c +--- linux-2.6.32.45/drivers/md/dm-sysfs.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/md/dm-sysfs.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] =3D { + NULL, + }; +=20 +-static struct sysfs_ops dm_sysfs_ops =3D { ++static const struct sysfs_ops dm_sysfs_ops =3D { + .show =3D dm_attr_show, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/md/dm-table.c linux-2.6.32.45/drivers= /md/dm-table.c +--- linux-2.6.32.45/drivers/md/dm-table.c 2011-06-25 12:55:34.000000000 = -0400 ++++ linux-2.6.32.45/drivers/md/dm-table.c 2011-06-25 12:56:37.000000000 = -0400 +@@ -376,7 +376,7 @@ static int device_area_is_invalid(struct + if (!dev_size) + return 0; +=20 +- if ((start >=3D dev_size) || (start + len > dev_size)) { ++ if ((start >=3D dev_size) || (len > dev_size - start)) { + DMWARN("%s: %s too small for target: " + "start=3D%llu, len=3D%llu, dev_size=3D%llu", + dm_device_name(ti->table->md), bdevname(bdev, b), +diff -urNp linux-2.6.32.45/drivers/md/md.c linux-2.6.32.45/drivers/md/md= .c +--- linux-2.6.32.45/drivers/md/md.c 2011-07-13 17:23:04.000000000 -0400 ++++ linux-2.6.32.45/drivers/md/md.c 2011-07-13 17:23:18.000000000 -0400 +@@ -153,10 +153,10 @@ static int start_readonly; + * start build, activate spare + */ + static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters); +-static atomic_t md_event_count; ++static atomic_unchecked_t md_event_count; + void md_new_event(mddev_t *mddev) + { +- atomic_inc(&md_event_count); ++ atomic_inc_unchecked(&md_event_count); + wake_up(&md_event_waiters); + } + EXPORT_SYMBOL_GPL(md_new_event); +@@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(md_new_event); + */ + static void md_new_event_inintr(mddev_t *mddev) + { +- atomic_inc(&md_event_count); ++ atomic_inc_unchecked(&md_event_count); + wake_up(&md_event_waiters); + } +=20 +@@ -1218,7 +1218,7 @@ static int super_1_load(mdk_rdev_t *rdev +=20 + rdev->preferred_minor =3D 0xffff; + rdev->data_offset =3D le64_to_cpu(sb->data_offset); +- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read= )); ++ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corr= ected_read)); +=20 + rdev->sb_size =3D le32_to_cpu(sb->max_dev) * 2 + 256; + bmask =3D queue_logical_block_size(rdev->bdev->bd_disk->queue)-1; +@@ -1392,7 +1392,7 @@ static void super_1_sync(mddev_t *mddev, + else + sb->resync_offset =3D cpu_to_le64(0); +=20 +- sb->cnt_corrected_read =3D cpu_to_le32(atomic_read(&rdev->corrected_er= rors)); ++ sb->cnt_corrected_read =3D cpu_to_le32(atomic_read_unchecked(&rdev->co= rrected_errors)); +=20 + sb->raid_disks =3D cpu_to_le32(mddev->raid_disks); + sb->size =3D cpu_to_le64(mddev->dev_sectors); +@@ -2214,7 +2214,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho + static ssize_t + errors_show(mdk_rdev_t *rdev, char *page) + { +- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors)); ++ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_er= rors)); + } +=20 + static ssize_t +@@ -2223,7 +2223,7 @@ errors_store(mdk_rdev_t *rdev, const cha + char *e; + unsigned long n =3D simple_strtoul(buf, &e, 10); + if (*buf && (*e =3D=3D 0 || *e =3D=3D '\n')) { +- atomic_set(&rdev->corrected_errors, n); ++ atomic_set_unchecked(&rdev->corrected_errors, n); + return len; + } + return -EINVAL; +@@ -2517,7 +2517,7 @@ static void rdev_free(struct kobject *ko + mdk_rdev_t *rdev =3D container_of(ko, mdk_rdev_t, kobj); + kfree(rdev); + } +-static struct sysfs_ops rdev_sysfs_ops =3D { ++static const struct sysfs_ops rdev_sysfs_ops =3D { + .show =3D rdev_attr_show, + .store =3D rdev_attr_store, + }; +@@ -2566,8 +2566,8 @@ static mdk_rdev_t *md_import_device(dev_ + rdev->data_offset =3D 0; + rdev->sb_events =3D 0; + atomic_set(&rdev->nr_pending, 0); +- atomic_set(&rdev->read_errors, 0); +- atomic_set(&rdev->corrected_errors, 0); ++ atomic_set_unchecked(&rdev->read_errors, 0); ++ atomic_set_unchecked(&rdev->corrected_errors, 0); +=20 + size =3D rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS; + if (!size) { +@@ -3887,7 +3887,7 @@ static void md_free(struct kobject *ko) + kfree(mddev); + } +=20 +-static struct sysfs_ops md_sysfs_ops =3D { ++static const struct sysfs_ops md_sysfs_ops =3D { + .show =3D md_attr_show, + .store =3D md_attr_store, + }; +@@ -4474,7 +4474,8 @@ out: + err =3D 0; + blk_integrity_unregister(disk); + md_new_event(mddev); +- sysfs_notify_dirent(mddev->sysfs_state); ++ if (mddev->sysfs_state) ++ sysfs_notify_dirent(mddev->sysfs_state); + return err; + } +=20 +@@ -5954,7 +5955,7 @@ static int md_seq_show(struct seq_file * +=20 + spin_unlock(&pers_lock); + seq_printf(seq, "\n"); +- mi->event =3D atomic_read(&md_event_count); ++ mi->event =3D atomic_read_unchecked(&md_event_count); + return 0; + } + if (v =3D=3D (void*)2) { +@@ -6043,7 +6044,7 @@ static int md_seq_show(struct seq_file * + chunk_kb ? "KB" : "B"); + if (bitmap->file) { + seq_printf(seq, ", file: "); +- seq_path(seq, &bitmap->file->f_path, " \t\n"); ++ seq_path(seq, &bitmap->file->f_path, " \t\n\\"); + } +=20 + seq_printf(seq, "\n"); +@@ -6077,7 +6078,7 @@ static int md_seq_open(struct inode *ino + else { + struct seq_file *p =3D file->private_data; + p->private =3D mi; +- mi->event =3D atomic_read(&md_event_count); ++ mi->event =3D atomic_read_unchecked(&md_event_count); + } + return error; + } +@@ -6093,7 +6094,7 @@ static unsigned int mdstat_poll(struct f + /* always allow read */ + mask =3D POLLIN | POLLRDNORM; +=20 +- if (mi->event !=3D atomic_read(&md_event_count)) ++ if (mi->event !=3D atomic_read_unchecked(&md_event_count)) + mask |=3D POLLERR | POLLPRI; + return mask; + } +@@ -6137,7 +6138,7 @@ static int is_mddev_idle(mddev_t *mddev, + struct gendisk *disk =3D rdev->bdev->bd_contains->bd_disk; + curr_events =3D (int)part_stat_read(&disk->part0, sectors[0]) + + (int)part_stat_read(&disk->part0, sectors[1]) - +- atomic_read(&disk->sync_io); ++ atomic_read_unchecked(&disk->sync_io); + /* 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.32.45/drivers/md/md.h linux-2.6.32.45/drivers/md/md= .h +--- linux-2.6.32.45/drivers/md/md.h 2011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/md/md.h 2011-05-04 17:56:20.000000000 -0400 +@@ -94,10 +94,10 @@ struct mdk_rdev_s + * only maintained for arrays that + * support hot removal + */ +- atomic_t read_errors; /* number of consecutive read errors that ++ atomic_unchecked_t read_errors; /* number of consecutive read errors t= hat + * we have tried to ignore. + */ +- atomic_t corrected_errors; /* number of corrected read errors, ++ atomic_unchecked_t corrected_errors; /* number of corrected read error= s, + * for reporting to userspace and storing + * in superblock. + */ +@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ +=20 + static inline void md_sync_acct(struct block_device *bdev, unsigned lon= g nr_sectors) + { +- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); ++ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io)= ; + } +=20 + struct mdk_personality +diff -urNp linux-2.6.32.45/drivers/md/raid10.c linux-2.6.32.45/drivers/m= d/raid10.c +--- linux-2.6.32.45/drivers/md/raid10.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/md/raid10.c 2011-05-04 17:56:28.000000000 -0= 400 +@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi + if (test_bit(BIO_UPTODATE, &bio->bi_flags)) + set_bit(R10BIO_Uptodate, &r10_bio->state); + else { +- atomic_add(r10_bio->sectors, ++ atomic_add_unchecked(r10_bio->sectors, + &conf->mirrors[d].rdev->corrected_errors); + if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery)) + md_error(r10_bio->mddev, +@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf, + test_bit(In_sync, &rdev->flags)) { + atomic_inc(&rdev->nr_pending); + rcu_read_unlock(); +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + if (sync_page_io(rdev->bdev, + r10_bio->devs[sl].addr + + sect + rdev->data_offset, +diff -urNp linux-2.6.32.45/drivers/md/raid1.c linux-2.6.32.45/drivers/md= /raid1.c +--- linux-2.6.32.45/drivers/md/raid1.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/md/raid1.c 2011-05-04 17:56:28.000000000 -04= 00 +@@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t * + if (r1_bio->bios[d]->bi_end_io !=3D end_sync_read) + continue; + rdev =3D conf->mirrors[d].rdev; +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + if (sync_page_io(rdev->bdev, + sect + rdev->data_offset, + s<<9, +@@ -1564,7 +1564,7 @@ static void fix_read_error(conf_t *conf, + /* Well, this device is dead */ + md_error(mddev, rdev); + else { +- atomic_add(s, &rdev->corrected_errors); ++ atomic_add_unchecked(s, &rdev->corrected_errors); + printk(KERN_INFO + "raid1:%s: read error corrected " + "(%d sectors at %llu on %s)\n", +diff -urNp linux-2.6.32.45/drivers/md/raid5.c linux-2.6.32.45/drivers/md= /raid5.c +--- linux-2.6.32.45/drivers/md/raid5.c 2011-06-25 12:55:34.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/md/raid5.c 2011-06-25 12:58:39.000000000 -04= 00 +@@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_hea + bi->bi_next =3D NULL; + if ((rw & WRITE) && + test_bit(R5_ReWrite, &sh->dev[i].flags)) +- atomic_add(STRIPE_SECTORS, ++ atomic_add_unchecked(STRIPE_SECTORS, + &rdev->corrected_errors); + generic_make_request(bi); + } else { +@@ -1517,15 +1517,15 @@ static void raid5_end_read_request(struc + clear_bit(R5_ReadError, &sh->dev[i].flags); + clear_bit(R5_ReWrite, &sh->dev[i].flags); + } +- if (atomic_read(&conf->disks[i].rdev->read_errors)) +- atomic_set(&conf->disks[i].rdev->read_errors, 0); ++ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors)) ++ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0); + } else { + const char *bdn =3D bdevname(conf->disks[i].rdev->bdev, b); + int retry =3D 0; + rdev =3D conf->disks[i].rdev; +=20 + clear_bit(R5_UPTODATE, &sh->dev[i].flags); +- atomic_inc(&rdev->read_errors); ++ atomic_inc_unchecked(&rdev->read_errors); + if (conf->mddev->degraded >=3D conf->max_degraded) + printk_rl(KERN_WARNING + "raid5:%s: read error not correctable " +@@ -1543,7 +1543,7 @@ static void raid5_end_read_request(struc + (unsigned long long)(sh->sector + + rdev->data_offset), + bdn); +- else if (atomic_read(&rdev->read_errors) ++ else if (atomic_read_unchecked(&rdev->read_errors) + > conf->max_nr_stripes) + printk(KERN_WARNING + "raid5:%s: Too many read errors, failing device %s.\n", +@@ -1870,6 +1870,7 @@ static sector_t compute_blocknr(struct s + sector_t r_sector; + struct stripe_head sh2; +=20 ++ pax_track_stack(); +=20 + chunk_offset =3D sector_div(new_sector, sectors_per_chunk); + stripe =3D new_sector; +diff -urNp linux-2.6.32.45/drivers/media/common/saa7146_hlp.c linux-2.6.= 32.45/drivers/media/common/saa7146_hlp.c +--- linux-2.6.32.45/drivers/media/common/saa7146_hlp.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/common/saa7146_hlp.c 2011-05-16 21:46:= 57.000000000 -0400 +@@ -353,6 +353,8 @@ static void calculate_clipping_registers +=20 + int x[32], y[32], w[32], h[32]; +=20 ++ pax_track_stack(); ++ + /* clear out memory */ + memset(&line_list[0], 0x00, sizeof(u32)*32); + memset(&pixel_list[0], 0x00, sizeof(u32)*32); +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c l= inux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +--- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-03-= 27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_ca_en50221.c 2011-05-= 16 21:46:57.000000000 -0400 +@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru + u8 buf[HOST_LINK_BUF_SIZE]; + int i; +=20 ++ pax_track_stack(); ++ + dprintk("%s\n", __func__); +=20 + /* check if we have space for a link buf in the rx_buffer */ +@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s + unsigned long timeout; + int written; +=20 ++ pax_track_stack(); ++ + dprintk("%s\n", __func__); +=20 + /* Incoming packet has a 2 byte header. hdr[0] =3D slot_id, hdr[1] =3D= connection_id */ +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h linux-= 2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h +--- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-05 20= :33:55.000000000 -0400 +@@ -71,7 +71,7 @@ struct dvb_demux_feed { + union { + dmx_ts_cb ts; + dmx_section_cb sec; +- } cb; ++ } __no_const cb; +=20 + struct dvb_demux *demux; + void *priv; +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6= .32.45/drivers/media/dvb/dvb-core/dvbdev.c +--- linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-core/dvbdev.c 2011-08-23 21:22= :32.000000000 -0400 +@@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapt + const struct dvb_device *template, void *priv, int type) + { + struct dvb_device *dvbdev; +- struct file_operations *dvbdevfops; ++ file_operations_no_const *dvbdevfops; + struct device *clsdev; + int minor; + int id; +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c linux-2.6.3= 2.45/drivers/media/dvb/dvb-usb/cxusb.c +--- linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/cxusb.c 2011-08-05 20:33:5= 5.000000000 -0400 +@@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_di + struct dib0700_adapter_state { + int (*set_param_save) (struct dvb_frontend *, + struct dvb_frontend_parameters *); +-}; ++} __no_const; +=20 + static int dib7070_set_param_override(struct dvb_frontend *fe, + struct dvb_frontend_parameters *fep) +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c linu= x-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c +--- linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_core.c 2011-05-16 = 21:46:57.000000000 -0400 +@@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb +=20 + u8 buf[260]; +=20 ++ pax_track_stack(); ++ + while ((ret =3D dvb_usb_get_hexline(fw, &hx, &pos)) > 0) { + deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.add= r, hx.len, hx.chk); +=20 +diff -urNp linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c l= inux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c +--- linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-05-= 10 22:12:01.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/dvb-usb/dib0700_devices.c 2011-08-= 05 20:33:55.000000000 -0400 +@@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, " +=20 + struct dib0700_adapter_state { + int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_para= meters *); +-}; ++} __no_const; +=20 + /* Hauppauge Nova-T 500 (aka Bristol) + * has a LNA on GPIO0 which is enabled by setting 1 */ +diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h linux-2= .6.32.45/drivers/media/dvb/frontends/dib3000.h +--- linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/frontends/dib3000.h 2011-08-05 20:= 33:55.000000000 -0400 +@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops + int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff); + int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff= ); + int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl= ); +-}; ++} __no_const; +=20 + #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODU= LE) && defined(MODULE)) + extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_confi= g* config, +diff -urNp linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c linux-2= .6.32.45/drivers/media/dvb/frontends/or51211.c +--- linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/dvb/frontends/or51211.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct + u8 tudata[585]; + int i; +=20 ++ pax_track_stack(); ++ + dprintk("Firmware is %zd bytes\n",fw->size); +=20 + /* Get eprom data */ +diff -urNp linux-2.6.32.45/drivers/media/radio/radio-cadet.c linux-2.6.3= 2.45/drivers/media/radio/radio-cadet.c +--- linux-2.6.32.45/drivers/media/radio/radio-cadet.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/radio/radio-cadet.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f + while (i < count && dev->rdsin !=3D dev->rdsout) + readbuf[i++] =3D dev->rdsbuf[dev->rdsout++]; +=20 +- if (copy_to_user(data, readbuf, i)) ++ if (i > sizeof readbuf || copy_to_user(data, readbuf, i)) + return -EFAULT; + return i; + } +diff -urNp linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c linux-= 2.6.32.45/drivers/media/video/cx18/cx18-driver.c +--- linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/cx18/cx18-driver.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl +=20 + MODULE_DEVICE_TABLE(pci, cx18_pci_tbl); +=20 +-static atomic_t cx18_instance =3D ATOMIC_INIT(0); ++static atomic_unchecked_t cx18_instance =3D ATOMIC_INIT(0); +=20 + /* Parameter declarations */ + static int cardtype[CX18_MAX_CARDS]; +@@ -288,6 +288,8 @@ void cx18_read_eeprom(struct cx18 *cx, s + struct i2c_client c; + u8 eedata[256]; +=20 ++ pax_track_stack(); ++ + memset(&c, 0, sizeof(c)); + strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name)); + c.adapter =3D &cx->i2c_adap[0]; +@@ -800,7 +802,7 @@ static int __devinit cx18_probe(struct p + struct cx18 *cx; +=20 + /* FIXME - module parameter arrays constrain max instances */ +- i =3D atomic_inc_return(&cx18_instance) - 1; ++ i =3D atomic_inc_return_unchecked(&cx18_instance) - 1; + if (i >=3D CX18_MAX_CARDS) { + printk(KERN_ERR "cx18: cannot manage card %d, driver has a " + "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1); +diff -urNp linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c linux-= 2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c +--- linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/ivtv/ivtv-driver.c 2011-05-04 17= :56:28.000000000 -0400 +@@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl + MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl); +=20 + /* ivtv instance counter */ +-static atomic_t ivtv_instance =3D ATOMIC_INIT(0); ++static atomic_unchecked_t ivtv_instance =3D ATOMIC_INIT(0); +=20 + /* Parameter declarations */ + static int cardtype[IVTV_MAX_CARDS]; +diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.c linux-2.6.3= 2.45/drivers/media/video/omap24xxcam.c +--- linux-2.6.32.45/drivers/media/video/omap24xxcam.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/omap24xxcam.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(str + spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags); +=20 + do_gettimeofday(&vb->ts); +- vb->field_count =3D atomic_add_return(2, &fh->field_count); ++ vb->field_count =3D atomic_add_return_unchecked(2, &fh->field_count); + if (csr & csr_error) { + vb->state =3D VIDEOBUF_ERROR; + if (!atomic_read(&fh->cam->in_reset)) { +diff -urNp linux-2.6.32.45/drivers/media/video/omap24xxcam.h linux-2.6.3= 2.45/drivers/media/video/omap24xxcam.h +--- linux-2.6.32.45/drivers/media/video/omap24xxcam.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/omap24xxcam.h 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -533,7 +533,7 @@ struct omap24xxcam_fh { + spinlock_t vbq_lock; /* spinlock for the videobuf queue */ + struct videobuf_queue vbq; + struct v4l2_pix_format pix; /* serialise pix by vbq->lock */ +- atomic_t field_count; /* field counter for videobuf_buffer */ ++ atomic_unchecked_t field_count; /* field counter for videobuf_buffer *= / + /* accessing cam here doesn't need serialisation: it's constant */ + struct omap24xxcam_device *cam; + }; +diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c = linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +--- linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-03= -27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-eeprom.c 2011-05= -16 21:46:57.000000000 -0400 +@@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw=20 + u8 *eeprom; + struct tveeprom tvdata; +=20 ++ pax_track_stack(); ++ + memset(&tvdata,0,sizeof(tvdata)); +=20 + eeprom =3D pvr2_eeprom_fetch(hdw); +diff -urNp linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-inter= nal.h linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h +--- linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2= 011-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h 2= 011-08-23 21:22:38.000000000 -0400 +@@ -195,7 +195,7 @@ struct pvr2_hdw { +=20 + /* I2C stuff */ + struct i2c_adapter i2c_adap; +- struct i2c_algorithm i2c_algo; ++ i2c_algorithm_no_const i2c_algo; + pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT]; + int i2c_cx25840_hack_state; + int i2c_linked; +diff -urNp linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c linux= -2.6.32.45/drivers/media/video/saa7134/saa6752hs.c +--- linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/saa7134/saa6752hs.c 2011-05-16 2= 1:46:57.000000000 -0400 +@@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_su + unsigned char localPAT[256]; + unsigned char localPMT[256]; +=20 ++ pax_track_stack(); ++ + /* Set video format - must be done first as it resets other settings *= / + set_reg8(client, 0x41, h->video_format); +=20 +diff -urNp linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c lin= ux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c +--- linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/saa7164/saa7164-cmd.c 2011-05-16= 21:46:57.000000000 -0400 +@@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_d + wait_queue_head_t *q =3D 0; + dprintk(DBGLVL_CMD, "%s()\n", __func__); +=20 ++ pax_track_stack(); ++ + /* While any outstand message on the bus exists... */ + do { +=20 +@@ -126,6 +128,8 @@ int saa7164_cmd_dequeue(struct saa7164_d + u8 tmp[512]; + dprintk(DBGLVL_CMD, "%s()\n", __func__); +=20 ++ pax_track_stack(); ++ + while (loop) { +=20 + tmComResInfo_t tRsp =3D { 0, 0, 0, 0, 0, 0 }; +diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c linux-2= .6.32.45/drivers/media/video/usbvideo/ibmcam.c +--- linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvideo/ibmcam.c 2011-08-05 20:= 33:55.000000000 -0400 +@@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] =3D + static int __init ibmcam_init(void) + { + struct usbvideo_cb cbTbl; +- memset(&cbTbl, 0, sizeof(cbTbl)); +- cbTbl.probe =3D ibmcam_probe; +- cbTbl.setupOnOpen =3D ibmcam_setup_on_open; +- cbTbl.videoStart =3D ibmcam_video_start; +- cbTbl.videoStop =3D ibmcam_video_stop; +- cbTbl.processData =3D ibmcam_ProcessIsocData; +- cbTbl.postProcess =3D usbvideo_DeinterlaceFrame; +- cbTbl.adjustPicture =3D ibmcam_adjust_picture; +- cbTbl.getFPS =3D ibmcam_calculate_fps; ++ memset((void *)&cbTbl, 0, sizeof(cbTbl)); ++ *(void **)&cbTbl.probe =3D ibmcam_probe; ++ *(void **)&cbTbl.setupOnOpen =3D ibmcam_setup_on_open; ++ *(void **)&cbTbl.videoStart =3D ibmcam_video_start; ++ *(void **)&cbTbl.videoStop =3D ibmcam_video_stop; ++ *(void **)&cbTbl.processData =3D ibmcam_ProcessIsocData; ++ *(void **)&cbTbl.postProcess =3D usbvideo_DeinterlaceFrame; ++ *(void **)&cbTbl.adjustPicture =3D ibmcam_adjust_picture; ++ *(void **)&cbTbl.getFPS =3D ibmcam_calculate_fps; + return usbvideo_register( + &cams, + MAX_IBMCAM, +diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c linux= -2.6.32.45/drivers/media/video/usbvideo/konicawc.c +--- linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvideo/konicawc.c 2011-08-05 2= 0:33:55.000000000 -0400 +@@ -225,7 +225,7 @@ static void konicawc_register_input(stru + int error; +=20 + usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); +- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname)); ++ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname)); +=20 + cam->input =3D input_dev =3D input_allocate_device(); + if (!input_dev) { +@@ -935,16 +935,16 @@ static int __init konicawc_init(void) + struct usbvideo_cb cbTbl; + printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":" + DRIVER_DESC "\n"); +- memset(&cbTbl, 0, sizeof(cbTbl)); +- cbTbl.probe =3D konicawc_probe; +- cbTbl.setupOnOpen =3D konicawc_setup_on_open; +- cbTbl.processData =3D konicawc_process_isoc; +- cbTbl.getFPS =3D konicawc_calculate_fps; +- cbTbl.setVideoMode =3D konicawc_set_video_mode; +- cbTbl.startDataPump =3D konicawc_start_data; +- cbTbl.stopDataPump =3D konicawc_stop_data; +- cbTbl.adjustPicture =3D konicawc_adjust_picture; +- cbTbl.userFree =3D konicawc_free_uvd; ++ memset((void * )&cbTbl, 0, sizeof(cbTbl)); ++ *(void **)&cbTbl.probe =3D konicawc_probe; ++ *(void **)&cbTbl.setupOnOpen =3D konicawc_setup_on_open; ++ *(void **)&cbTbl.processData =3D konicawc_process_isoc; ++ *(void **)&cbTbl.getFPS =3D konicawc_calculate_fps; ++ *(void **)&cbTbl.setVideoMode =3D konicawc_set_video_mode; ++ *(void **)&cbTbl.startDataPump =3D konicawc_start_data; ++ *(void **)&cbTbl.stopDataPump =3D konicawc_stop_data; ++ *(void **)&cbTbl.adjustPicture =3D konicawc_adjust_picture; ++ *(void **)&cbTbl.userFree =3D konicawc_free_uvd; + return usbvideo_register( + &cams, + MAX_CAMERAS, +diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messeng= er.c linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c +--- linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvideo/quickcam_messenger.c 20= 11-04-17 15:56:46.000000000 -0400 +@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc + int error; +=20 + usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname)); +- strncat(cam->input_physname, "/input0", sizeof(cam->input_physname)); ++ strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname)); +=20 + cam->input =3D input_dev =3D input_allocate_device(); + if (!input_dev) { +diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c linux= -2.6.32.45/drivers/media/video/usbvideo/ultracam.c +--- linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvideo/ultracam.c 2011-08-05 2= 0:33:55.000000000 -0400 +@@ -655,14 +655,14 @@ static int __init ultracam_init(void) + { + struct usbvideo_cb cbTbl; + memset(&cbTbl, 0, sizeof(cbTbl)); +- cbTbl.probe =3D ultracam_probe; +- cbTbl.setupOnOpen =3D ultracam_setup_on_open; +- cbTbl.videoStart =3D ultracam_video_start; +- cbTbl.videoStop =3D ultracam_video_stop; +- cbTbl.processData =3D ultracam_ProcessIsocData; +- cbTbl.postProcess =3D usbvideo_DeinterlaceFrame; +- cbTbl.adjustPicture =3D ultracam_adjust_picture; +- cbTbl.getFPS =3D ultracam_calculate_fps; ++ *(void **)&cbTbl.probe =3D ultracam_probe; ++ *(void **)&cbTbl.setupOnOpen =3D ultracam_setup_on_open; ++ *(void **)&cbTbl.videoStart =3D ultracam_video_start; ++ *(void **)&cbTbl.videoStop =3D ultracam_video_stop; ++ *(void **)&cbTbl.processData =3D ultracam_ProcessIsocData; ++ *(void **)&cbTbl.postProcess =3D usbvideo_DeinterlaceFrame; ++ *(void **)&cbTbl.adjustPicture =3D ultracam_adjust_picture; ++ *(void **)&cbTbl.getFPS =3D ultracam_calculate_fps; + return usbvideo_register( + &cams, + MAX_CAMERAS, +diff -urNp linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c linux= -2.6.32.45/drivers/media/video/usbvideo/usbvideo.c +--- linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvideo/usbvideo.c 2011-08-05 2= 0:33:55.000000000 -0400 +@@ -697,15 +697,15 @@ int usbvideo_register( + __func__, cams, base_size, num_cams); +=20 + /* Copy callbacks, apply defaults for those that are not set */ +- memmove(&cams->cb, cbTbl, sizeof(cams->cb)); ++ memmove((void *)&cams->cb, cbTbl, sizeof(cams->cb)); + if (cams->cb.getFrame =3D=3D NULL) +- cams->cb.getFrame =3D usbvideo_GetFrame; ++ *(void **)&cams->cb.getFrame =3D usbvideo_GetFrame; + if (cams->cb.disconnect =3D=3D NULL) +- cams->cb.disconnect =3D usbvideo_Disconnect; ++ *(void **)&cams->cb.disconnect =3D usbvideo_Disconnect; + if (cams->cb.startDataPump =3D=3D NULL) +- cams->cb.startDataPump =3D usbvideo_StartDataPump; ++ *(void **)&cams->cb.startDataPump =3D usbvideo_StartDataPump; + if (cams->cb.stopDataPump =3D=3D NULL) +- cams->cb.stopDataPump =3D usbvideo_StopDataPump; ++ *(void **)&cams->cb.stopDataPump =3D usbvideo_StopDataPump; +=20 + cams->num_cameras =3D num_cams; + cams->cam =3D (struct uvd *) &cams[1]; +diff -urNp linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.= c linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c +--- linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c 2011-= 03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/usbvision/usbvision-core.c 2011-= 05-16 21:46:57.000000000 -0400 +@@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_c + unsigned char rv, gv, bv; + static unsigned char *Y, *U, *V; +=20 ++ pax_track_stack(); ++ + frame =3D usbvision->curFrame; + imageSize =3D frame->frmwidth * frame->frmheight; + if ( (frame->v4l2_format.format =3D=3D V4L2_PIX_FMT_YUV422P) || +diff -urNp linux-2.6.32.45/drivers/media/video/v4l2-device.c linux-2.6.3= 2.45/drivers/media/video/v4l2-device.c +--- linux-2.6.32.45/drivers/media/video/v4l2-device.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/v4l2-device.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -50,9 +50,9 @@ int v4l2_device_register(struct device * + EXPORT_SYMBOL_GPL(v4l2_device_register); +=20 + int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *base= name, +- atomic_t *instance) ++ atomic_unchecked_t *instance) + { +- int num =3D atomic_inc_return(instance) - 1; ++ int num =3D atomic_inc_return_unchecked(instance) - 1; + int len =3D strlen(basename); +=20 + if (basename[len - 1] >=3D '0' && basename[len - 1] <=3D '9') +diff -urNp linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c linux-2= .6.32.45/drivers/media/video/videobuf-dma-sg.c +--- linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/media/video/videobuf-dma-sg.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size) + { + struct videobuf_queue q; +=20 ++ pax_track_stack(); ++ + /* Required to make generic handler to call __videobuf_alloc */ + q.int_ops =3D &sg_ops; +=20 +diff -urNp linux-2.6.32.45/drivers/message/fusion/mptbase.c linux-2.6.32= .45/drivers/message/fusion/mptbase.c +--- linux-2.6.32.45/drivers/message/fusion/mptbase.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/message/fusion/mptbase.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **s + len +=3D sprintf(buf+len, " MaxChainDepth =3D 0x%02x frames\n", ioc->= facts.MaxChainDepth); + len +=3D sprintf(buf+len, " MinBlockSize =3D 0x%02x bytes\n", 4*ioc->= facts.BlockSize); +=20 ++#ifdef CONFIG_GRKERNSEC_HIDESYM ++ len +=3D sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", ++ NULL, NULL); ++#else + len +=3D sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", + (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma); ++#endif ++ + /* + * Rounding UP to nearest 4-kB boundary here... + */ +diff -urNp linux-2.6.32.45/drivers/message/fusion/mptsas.c linux-2.6.32.= 45/drivers/message/fusion/mptsas.c +--- linux-2.6.32.45/drivers/message/fusion/mptsas.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/message/fusion/mptsas.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin + return 0; + } +=20 ++static inline void ++mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, stru= ct sas_rphy *rphy) ++{ ++ if (phy_info->port_details) { ++ phy_info->port_details->rphy =3D rphy; ++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=3D%p= \n", ++ ioc->name, rphy)); ++ } ++ ++ if (rphy) { ++ dsaswideprintk(ioc, dev_printk(KERN_DEBUG, ++ &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); ++ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=3D%p release=3D%p\= n", ++ ioc->name, rphy, rphy->dev.release)); ++ } ++} ++ + /* no mutex */ + static void + mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * p= ort_details) +@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p + return NULL; + } +=20 +-static inline void +-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, stru= ct sas_rphy *rphy) +-{ +- if (phy_info->port_details) { +- phy_info->port_details->rphy =3D rphy; +- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=3D%p= \n", +- ioc->name, rphy)); +- } +- +- if (rphy) { +- dsaswideprintk(ioc, dev_printk(KERN_DEBUG, +- &rphy->dev, MYIOC_s_FMT "add:", ioc->name)); +- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=3D%p release=3D%p\= n", +- ioc->name, rphy, rphy->dev.release)); +- } +-} +- + static inline struct sas_port * + mptsas_get_port(struct mptsas_phyinfo *phy_info) + { +diff -urNp linux-2.6.32.45/drivers/message/fusion/mptscsih.c linux-2.6.3= 2.45/drivers/message/fusion/mptscsih.c +--- linux-2.6.32.45/drivers/message/fusion/mptscsih.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/message/fusion/mptscsih.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost) +=20 + h =3D shost_priv(SChost); +=20 +- if (h) { +- if (h->info_kbuf =3D=3D NULL) +- if ((h->info_kbuf =3D kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) =3D=3D = NULL) +- return h->info_kbuf; +- h->info_kbuf[0] =3D '\0'; ++ if (!h) ++ return NULL; +=20 +- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); +- h->info_kbuf[size-1] =3D '\0'; +- } ++ if (h->info_kbuf =3D=3D NULL) ++ if ((h->info_kbuf =3D kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) =3D=3D N= ULL) ++ return h->info_kbuf; ++ h->info_kbuf[0] =3D '\0'; ++ ++ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0); ++ h->info_kbuf[size-1] =3D '\0'; +=20 + return h->info_kbuf; + } +diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_config.c linux-2.6.32= .45/drivers/message/i2o/i2o_config.c +--- linux-2.6.32.45/drivers/message/i2o/i2o_config.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/message/i2o/i2o_config.c 2011-05-16 21:46:57= .000000000 -0400 +@@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned lon + struct i2o_message *msg; + unsigned int iop; +=20 ++ pax_track_stack(); ++ + if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg)) + return -EFAULT; +=20 +diff -urNp linux-2.6.32.45/drivers/message/i2o/i2o_proc.c linux-2.6.32.4= 5/drivers/message/i2o/i2o_proc.c +--- linux-2.6.32.45/drivers/message/i2o/i2o_proc.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/message/i2o/i2o_proc.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -259,13 +259,6 @@ static char *scsi_devices[] =3D { + "Array Controller Device" + }; +=20 +-static char *chtostr(u8 * chars, int n) +-{ +- char tmp[256]; +- tmp[0] =3D 0; +- return strncat(tmp, (char *)chars, n); +-} +- + static int i2o_report_query_status(struct seq_file *seq, int block_stat= us, + char *group) + { +@@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct +=20 + seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id); + seq_printf(seq, "%-#8x", ddm_table.module_id); +- seq_printf(seq, "%-29s", +- chtostr(ddm_table.module_name_version, 28)); ++ seq_printf(seq, "%-.28s", ddm_table.module_name_version); + seq_printf(seq, "%9d ", ddm_table.data_size); + seq_printf(seq, "%8d", ddm_table.code_size); +=20 +@@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(s +=20 + seq_printf(seq, "%-#7x", dst->i2o_vendor_id); + seq_printf(seq, "%-#8x", dst->module_id); +- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28)); +- seq_printf(seq, "%-9s", chtostr(dst->date, 8)); ++ seq_printf(seq, "%-.28s", dst->module_name_version); ++ seq_printf(seq, "%-.8s", dst->date); + seq_printf(seq, "%8d ", dst->module_size); + seq_printf(seq, "%8d ", dst->mpb_size); + seq_printf(seq, "0x%04x", dst->module_flags); +@@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(str + seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]))= ; + seq_printf(seq, "Owner TID : %0#5x\n", work16[2]); + seq_printf(seq, "Parent TID : %0#5x\n", work16[3]); +- seq_printf(seq, "Vendor info : %s\n", +- chtostr((u8 *) (work32 + 2), 16)); +- seq_printf(seq, "Product info : %s\n", +- chtostr((u8 *) (work32 + 6), 16)); +- seq_printf(seq, "Description : %s\n", +- chtostr((u8 *) (work32 + 10), 16)); +- seq_printf(seq, "Product rev. : %s\n", +- chtostr((u8 *) (work32 + 14), 8)); ++ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2)); ++ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6)); ++ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10)); ++ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14)); +=20 + seq_printf(seq, "Serial number : "); + print_serial_number(seq, (u8 *) (work32 + 16), +@@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(str + } +=20 + seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid); +- seq_printf(seq, "Module name : %s\n", +- chtostr(result.module_name, 24)); +- seq_printf(seq, "Module revision : %s\n", +- chtostr(result.module_rev, 8)); ++ seq_printf(seq, "Module name : %.24s\n", result.module_name); ++ seq_printf(seq, "Module revision : %.8s\n", result.module_rev); +=20 + seq_printf(seq, "Serial number : "); + print_serial_number(seq, result.serial_number, sizeof(result) - 36); +@@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq + return 0; + } +=20 +- seq_printf(seq, "Device name : %s\n", +- chtostr(result.device_name, 64)); +- seq_printf(seq, "Service name : %s\n", +- chtostr(result.service_name, 64)); +- seq_printf(seq, "Physical name : %s\n", +- chtostr(result.physical_location, 64)); +- seq_printf(seq, "Instance number : %s\n", +- chtostr(result.instance_number, 4)); ++ seq_printf(seq, "Device name : %.64s\n", result.device_name); ++ seq_printf(seq, "Service name : %.64s\n", result.service_name); ++ seq_printf(seq, "Physical name : %.64s\n", result.physical_location)= ; ++ seq_printf(seq, "Instance number : %.4s\n", result.instance_number); +=20 + return 0; + } +diff -urNp linux-2.6.32.45/drivers/message/i2o/iop.c linux-2.6.32.45/dri= vers/message/i2o/iop.c +--- linux-2.6.32.45/drivers/message/i2o/iop.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/message/i2o/iop.c 2011-05-04 17:56:28.000000= 000 -0400 +@@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro +=20 + spin_lock_irqsave(&c->context_list_lock, flags); +=20 +- if (unlikely(atomic_inc_and_test(&c->context_list_counter))) +- atomic_inc(&c->context_list_counter); ++ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter))) ++ atomic_inc_unchecked(&c->context_list_counter); +=20 +- entry->context =3D atomic_read(&c->context_list_counter); ++ entry->context =3D atomic_read_unchecked(&c->context_list_counter); +=20 + list_add(&entry->list, &c->context_list); +=20 +@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(voi +=20 + #if BITS_PER_LONG =3D=3D 64 + spin_lock_init(&c->context_list_lock); +- atomic_set(&c->context_list_counter, 0); ++ atomic_set_unchecked(&c->context_list_counter, 0); + INIT_LIST_HEAD(&c->context_list); + #endif +=20 +diff -urNp linux-2.6.32.45/drivers/mfd/wm8350-i2c.c linux-2.6.32.45/driv= ers/mfd/wm8350-i2c.c +--- linux-2.6.32.45/drivers/mfd/wm8350-i2c.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/mfd/wm8350-i2c.c 2011-05-16 21:46:57.0000000= 00 -0400 +@@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struc + u8 msg[(WM8350_MAX_REGISTER << 1) + 1]; + int ret; +=20 ++ pax_track_stack(); ++ + if (bytes > ((WM8350_MAX_REGISTER << 1) + 1)) + return -EINVAL; +=20 +diff -urNp linux-2.6.32.45/drivers/misc/kgdbts.c linux-2.6.32.45/drivers= /misc/kgdbts.c +--- linux-2.6.32.45/drivers/misc/kgdbts.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/misc/kgdbts.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -118,7 +118,7 @@ + } while (0) + #define MAX_CONFIG_LEN 40 +=20 +-static struct kgdb_io kgdbts_io_ops; ++static const struct kgdb_io kgdbts_io_ops; + static char get_buf[BUFMAX]; + static int get_buf_cnt; + static char put_buf[BUFMAX]; +@@ -1102,7 +1102,7 @@ static void kgdbts_post_exp_handler(void + module_put(THIS_MODULE); + } +=20 +-static struct kgdb_io kgdbts_io_ops =3D { ++static const struct kgdb_io kgdbts_io_ops =3D { + .name =3D "kgdbts", + .read_char =3D kgdbts_get_char, + .write_char =3D kgdbts_put_char, +diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c linux-2.6.3= 2.45/drivers/misc/sgi-gru/gruhandles.c +--- linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-gru/gruhandles.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic +=20 + static void update_mcs_stats(enum mcs_op op, unsigned long clks) + { +- atomic_long_inc(&mcs_op_statistics[op].count); +- atomic_long_add(clks, &mcs_op_statistics[op].total); ++ atomic_long_inc_unchecked(&mcs_op_statistics[op].count); ++ atomic_long_add_unchecked(clks, &mcs_op_statistics[op].total); + if (mcs_op_statistics[op].max < clks) + mcs_op_statistics[op].max =3D clks; + } +diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32= .45/drivers/misc/sgi-gru/gruprocfs.c +--- linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-gru/gruprocfs.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -32,9 +32,9 @@ +=20 + #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) +=20 +-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *i= d) ++static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *= v, char *id) + { +- unsigned long val =3D atomic_long_read(v); ++ unsigned long val =3D atomic_long_read_unchecked(v); +=20 + if (val) + seq_printf(s, "%16lu %s\n", val, id); +@@ -136,8 +136,8 @@ static int mcs_statistics_show(struct se + "cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"}; +=20 + for (op =3D 0; op < mcsop_last; op++) { +- count =3D atomic_long_read(&mcs_op_statistics[op].count); +- total =3D atomic_long_read(&mcs_op_statistics[op].total); ++ count =3D atomic_long_read_unchecked(&mcs_op_statistics[op].count); ++ total =3D atomic_long_read_unchecked(&mcs_op_statistics[op].total); + max =3D mcs_op_statistics[op].max; + seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, + count ? total / count : 0, max); +diff -urNp linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h linux-2.6.32= .45/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-gru/grutables.h 2011-04-17 15:56:46= .000000000 -0400 +@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; + * GRU statistics. + */ + struct gru_stats_s { +- atomic_long_t vdata_alloc; +- atomic_long_t vdata_free; +- atomic_long_t gts_alloc; +- atomic_long_t gts_free; +- atomic_long_t vdata_double_alloc; +- atomic_long_t gts_double_allocate; +- atomic_long_t assign_context; +- atomic_long_t assign_context_failed; +- atomic_long_t free_context; +- atomic_long_t load_user_context; +- atomic_long_t load_kernel_context; +- atomic_long_t lock_kernel_context; +- atomic_long_t unlock_kernel_context; +- atomic_long_t steal_user_context; +- atomic_long_t steal_kernel_context; +- atomic_long_t steal_context_failed; +- atomic_long_t nopfn; +- atomic_long_t break_cow; +- atomic_long_t asid_new; +- atomic_long_t asid_next; +- atomic_long_t asid_wrap; +- atomic_long_t asid_reuse; +- atomic_long_t intr; +- atomic_long_t intr_mm_lock_failed; +- atomic_long_t call_os; +- atomic_long_t call_os_offnode_reference; +- atomic_long_t call_os_check_for_bug; +- atomic_long_t call_os_wait_queue; +- atomic_long_t user_flush_tlb; +- atomic_long_t user_unload_context; +- atomic_long_t user_exception; +- atomic_long_t set_context_option; +- atomic_long_t migrate_check; +- atomic_long_t migrated_retarget; +- atomic_long_t migrated_unload; +- atomic_long_t migrated_unload_delay; +- atomic_long_t migrated_nopfn_retarget; +- atomic_long_t migrated_nopfn_unload; +- atomic_long_t tlb_dropin; +- atomic_long_t tlb_dropin_fail_no_asid; +- atomic_long_t tlb_dropin_fail_upm; +- atomic_long_t tlb_dropin_fail_invalid; +- atomic_long_t tlb_dropin_fail_range_active; +- atomic_long_t tlb_dropin_fail_idle; +- atomic_long_t tlb_dropin_fail_fmm; +- atomic_long_t tlb_dropin_fail_no_exception; +- atomic_long_t tlb_dropin_fail_no_exception_war; +- atomic_long_t tfh_stale_on_fault; +- atomic_long_t mmu_invalidate_range; +- atomic_long_t mmu_invalidate_page; +- atomic_long_t mmu_clear_flush_young; +- atomic_long_t flush_tlb; +- atomic_long_t flush_tlb_gru; +- atomic_long_t flush_tlb_gru_tgh; +- atomic_long_t flush_tlb_gru_zero_asid; +- +- atomic_long_t copy_gpa; +- +- atomic_long_t mesq_receive; +- atomic_long_t mesq_receive_none; +- atomic_long_t mesq_send; +- atomic_long_t mesq_send_failed; +- atomic_long_t mesq_noop; +- atomic_long_t mesq_send_unexpected_error; +- atomic_long_t mesq_send_lb_overflow; +- atomic_long_t mesq_send_qlimit_reached; +- atomic_long_t mesq_send_amo_nacked; +- atomic_long_t mesq_send_put_nacked; +- atomic_long_t mesq_qf_not_full; +- atomic_long_t mesq_qf_locked; +- atomic_long_t mesq_qf_noop_not_full; +- atomic_long_t mesq_qf_switch_head_failed; +- atomic_long_t mesq_qf_unexpected_error; +- atomic_long_t mesq_noop_unexpected_error; +- atomic_long_t mesq_noop_lb_overflow; +- atomic_long_t mesq_noop_qlimit_reached; +- atomic_long_t mesq_noop_amo_nacked; +- atomic_long_t mesq_noop_put_nacked; ++ atomic_long_unchecked_t vdata_alloc; ++ atomic_long_unchecked_t vdata_free; ++ atomic_long_unchecked_t gts_alloc; ++ atomic_long_unchecked_t gts_free; ++ atomic_long_unchecked_t vdata_double_alloc; ++ atomic_long_unchecked_t gts_double_allocate; ++ atomic_long_unchecked_t assign_context; ++ atomic_long_unchecked_t assign_context_failed; ++ atomic_long_unchecked_t free_context; ++ atomic_long_unchecked_t load_user_context; ++ atomic_long_unchecked_t load_kernel_context; ++ atomic_long_unchecked_t lock_kernel_context; ++ atomic_long_unchecked_t unlock_kernel_context; ++ atomic_long_unchecked_t steal_user_context; ++ atomic_long_unchecked_t steal_kernel_context; ++ atomic_long_unchecked_t steal_context_failed; ++ atomic_long_unchecked_t nopfn; ++ atomic_long_unchecked_t break_cow; ++ atomic_long_unchecked_t asid_new; ++ atomic_long_unchecked_t asid_next; ++ atomic_long_unchecked_t asid_wrap; ++ atomic_long_unchecked_t asid_reuse; ++ atomic_long_unchecked_t intr; ++ atomic_long_unchecked_t intr_mm_lock_failed; ++ atomic_long_unchecked_t call_os; ++ atomic_long_unchecked_t call_os_offnode_reference; ++ atomic_long_unchecked_t call_os_check_for_bug; ++ atomic_long_unchecked_t call_os_wait_queue; ++ atomic_long_unchecked_t user_flush_tlb; ++ atomic_long_unchecked_t user_unload_context; ++ atomic_long_unchecked_t user_exception; ++ atomic_long_unchecked_t set_context_option; ++ atomic_long_unchecked_t migrate_check; ++ atomic_long_unchecked_t migrated_retarget; ++ atomic_long_unchecked_t migrated_unload; ++ atomic_long_unchecked_t migrated_unload_delay; ++ atomic_long_unchecked_t migrated_nopfn_retarget; ++ atomic_long_unchecked_t migrated_nopfn_unload; ++ atomic_long_unchecked_t tlb_dropin; ++ atomic_long_unchecked_t tlb_dropin_fail_no_asid; ++ atomic_long_unchecked_t tlb_dropin_fail_upm; ++ atomic_long_unchecked_t tlb_dropin_fail_invalid; ++ atomic_long_unchecked_t tlb_dropin_fail_range_active; ++ atomic_long_unchecked_t tlb_dropin_fail_idle; ++ atomic_long_unchecked_t tlb_dropin_fail_fmm; ++ atomic_long_unchecked_t tlb_dropin_fail_no_exception; ++ atomic_long_unchecked_t tlb_dropin_fail_no_exception_war; ++ atomic_long_unchecked_t tfh_stale_on_fault; ++ atomic_long_unchecked_t mmu_invalidate_range; ++ atomic_long_unchecked_t mmu_invalidate_page; ++ atomic_long_unchecked_t mmu_clear_flush_young; ++ atomic_long_unchecked_t flush_tlb; ++ atomic_long_unchecked_t flush_tlb_gru; ++ atomic_long_unchecked_t flush_tlb_gru_tgh; ++ atomic_long_unchecked_t flush_tlb_gru_zero_asid; ++ ++ atomic_long_unchecked_t copy_gpa; ++ ++ atomic_long_unchecked_t mesq_receive; ++ atomic_long_unchecked_t mesq_receive_none; ++ atomic_long_unchecked_t mesq_send; ++ atomic_long_unchecked_t mesq_send_failed; ++ atomic_long_unchecked_t mesq_noop; ++ atomic_long_unchecked_t mesq_send_unexpected_error; ++ atomic_long_unchecked_t mesq_send_lb_overflow; ++ atomic_long_unchecked_t mesq_send_qlimit_reached; ++ atomic_long_unchecked_t mesq_send_amo_nacked; ++ atomic_long_unchecked_t mesq_send_put_nacked; ++ atomic_long_unchecked_t mesq_qf_not_full; ++ atomic_long_unchecked_t mesq_qf_locked; ++ atomic_long_unchecked_t mesq_qf_noop_not_full; ++ atomic_long_unchecked_t mesq_qf_switch_head_failed; ++ atomic_long_unchecked_t mesq_qf_unexpected_error; ++ atomic_long_unchecked_t mesq_noop_unexpected_error; ++ atomic_long_unchecked_t mesq_noop_lb_overflow; ++ atomic_long_unchecked_t mesq_noop_qlimit_reached; ++ atomic_long_unchecked_t mesq_noop_amo_nacked; ++ atomic_long_unchecked_t mesq_noop_put_nacked; +=20 + }; +=20 +@@ -252,8 +252,8 @@ enum mcs_op {cchop_allocate, cchop_start + cchop_deallocate, tghop_invalidate, mcsop_last}; +=20 + struct mcs_op_statistic { +- atomic_long_t count; +- atomic_long_t total; ++ atomic_long_unchecked_t count; ++ atomic_long_unchecked_t total; + unsigned long max; + }; +=20 +@@ -276,7 +276,7 @@ extern struct mcs_op_statistic mcs_op_st +=20 + #define STAT(id) do { \ + if (gru_options & OPT_STATS) \ +- atomic_long_inc(&gru_stats.id); \ ++ atomic_long_inc_unchecked(&gru_stats.id); \ + } while (0) +=20 + #ifdef CONFIG_SGI_GRU_DEBUG +diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h linux-2.6.32.45/dri= vers/misc/sgi-xp/xpc.h +--- linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc.h 2011-08-05 20:33:55.000000= 000 -0400 +@@ -876,7 +876,7 @@ extern struct xpc_registration xpc_regis + /* found in xpc_main.c */ + extern struct device *xpc_part; + extern struct device *xpc_chan; +-extern struct xpc_arch_operations xpc_arch_ops; ++extern const struct xpc_arch_operations xpc_arch_ops; + extern int xpc_disengage_timelimit; + extern int xpc_disengage_timedout; + extern int xpc_activate_IRQ_rcvd; +diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c linux-2.6.32.4= 5/drivers/misc/sgi-xp/xpc_main.c +--- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_main.c 2011-08-05 20:33:55.0= 00000000 -0400 +@@ -169,7 +169,7 @@ static struct notifier_block xpc_die_not + .notifier_call =3D xpc_system_die, + }; +=20 +-struct xpc_arch_operations xpc_arch_ops; ++const struct xpc_arch_operations xpc_arch_ops; +=20 + /* + * Timer function to enforce the timelimit on the partition disengage. +diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c linux-2.6.32.45= /drivers/misc/sgi-xp/xpc_sn2.c +--- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_sn2.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_chan + xpc_acknowledge_msgs_sn2(ch, get, msg->flags); + } +=20 +-static struct xpc_arch_operations xpc_arch_ops_sn2 =3D { ++static const struct xpc_arch_operations xpc_arch_ops_sn2 =3D { + .setup_partitions =3D xpc_setup_partitions_sn2, + .teardown_partitions =3D xpc_teardown_partitions_sn2, + .process_activate_IRQ_rcvd =3D xpc_process_activate_IRQ_rcvd_sn2, +@@ -2413,7 +2413,9 @@ xpc_init_sn2(void) + int ret; + size_t buf_size; +=20 +- xpc_arch_ops =3D xpc_arch_ops_sn2; ++ pax_open_kernel(); ++ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_sn2, sizeof(xpc_arch_ops_s= n2)); ++ pax_close_kernel(); +=20 + if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) { + dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is " +diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.45/= drivers/misc/sgi-xp/xpc_uv.c +--- linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-xp/xpc_uv.c 2011-08-05 20:33:55.000= 000000 -0400 +@@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_chann + XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret); + } +=20 +-static struct xpc_arch_operations xpc_arch_ops_uv =3D { ++static const struct xpc_arch_operations xpc_arch_ops_uv =3D { + .setup_partitions =3D xpc_setup_partitions_uv, + .teardown_partitions =3D xpc_teardown_partitions_uv, + .process_activate_IRQ_rcvd =3D xpc_process_activate_IRQ_rcvd_uv, +@@ -1729,7 +1729,9 @@ static struct xpc_arch_operations xpc_ar + int + xpc_init_uv(void) + { +- xpc_arch_ops =3D xpc_arch_ops_uv; ++ pax_open_kernel(); ++ memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_uv, sizeof(xpc_arch_ops_uv= )); ++ pax_close_kernel(); +=20 + if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) { + dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n", +diff -urNp linux-2.6.32.45/drivers/misc/sgi-xp/xp.h linux-2.6.32.45/driv= ers/misc/sgi-xp/xp.h +--- linux-2.6.32.45/drivers/misc/sgi-xp/xp.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/misc/sgi-xp/xp.h 2011-08-05 20:33:55.0000000= 00 -0400 +@@ -289,7 +289,7 @@ struct xpc_interface { + xpc_notify_func, void *); + void (*received) (short, int, void *); + enum xp_retval (*partid_to_nasids) (short, void *); +-}; ++} __no_const; +=20 + extern struct xpc_interface xpc_interface; +=20 +diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6= .32.45/drivers/mtd/chips/cfi_cmdset_0001.c +--- linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0001.c 2011-05-16 21:46= :57.000000000 -0400 +@@ -743,6 +743,8 @@ static int chip_ready (struct map_info * + struct cfi_pri_intelext *cfip =3D cfi->cmdset_priv; + unsigned long timeo =3D jiffies + HZ; +=20 ++ pax_track_stack(); ++ + /* Prevent setting state FL_SYNCING for chip in suspended state. */ + if (mode =3D=3D FL_SYNCING && chip->oldstate !=3D FL_READY) + goto sleep; +@@ -1642,6 +1644,8 @@ static int __xipram do_write_buffer(stru + unsigned long initial_adr; + int initial_len =3D len; +=20 ++ pax_track_stack(); ++ + wbufsize =3D cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize; + adr +=3D chip->start; + initial_adr =3D adr; +@@ -1860,6 +1864,8 @@ static int __xipram do_erase_oneblock(st + int retries =3D 3; + int ret; +=20 ++ pax_track_stack(); ++ + adr +=3D chip->start; +=20 + retry: +diff -urNp linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c linux-2.6= .32.45/drivers/mtd/chips/cfi_cmdset_0020.c +--- linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/mtd/chips/cfi_cmdset_0020.c 2011-05-16 21:46= :57.000000000 -0400 +@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct + unsigned long cmd_addr; + struct cfi_private *cfi =3D map->fldrv_priv; +=20 ++ pax_track_stack(); ++ + adr +=3D chip->start; +=20 + /* Ensure cmd read/writes are aligned. */ +@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct + DECLARE_WAITQUEUE(wait, current); + int wbufsize, z; +=20 ++ pax_track_stack(); ++ + /* M58LW064A requires bus alignment for buffer wriets -- saw */ + if (adr & (map_bankwidth(map)-1)) + return -EINVAL; +@@ -742,6 +746,8 @@ static inline int do_erase_oneblock(stru + DECLARE_WAITQUEUE(wait, current); + int ret =3D 0; +=20 ++ pax_track_stack(); ++ + adr +=3D chip->start; +=20 + /* Let's determine this according to the interleave only once */ +@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struc + unsigned long timeo =3D jiffies + HZ; + DECLARE_WAITQUEUE(wait, current); +=20 ++ pax_track_stack(); ++ + adr +=3D chip->start; +=20 + /* Let's determine this according to the interleave only once */ +@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(str + unsigned long timeo =3D jiffies + HZ; + DECLARE_WAITQUEUE(wait, current); +=20 ++ pax_track_stack(); ++ + adr +=3D chip->start; +=20 + /* Let's determine this according to the interleave only once */ +diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2000.c linux-2.6.32.45= /drivers/mtd/devices/doc2000.c +--- linux-2.6.32.45/drivers/mtd/devices/doc2000.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/mtd/devices/doc2000.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt +=20 + /* The ECC will not be calculated correctly if less than 512 is writt= en */ + /* DBB- +- if (len !=3D 0x200 && eccbuf) ++ if (len !=3D 0x200) + printk(KERN_WARNING + "ECC needs a full sector write (adr: %lx size %lx)\n", + (long) to, (long) len); +diff -urNp linux-2.6.32.45/drivers/mtd/devices/doc2001.c linux-2.6.32.45= /drivers/mtd/devices/doc2001.c +--- linux-2.6.32.45/drivers/mtd/devices/doc2001.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/mtd/devices/doc2001.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt + struct Nand *mychip =3D &this->chips[from >> (this->chipshift)]; +=20 + /* Don't allow read past end of device */ +- if (from >=3D this->totlen) ++ if (from >=3D this->totlen || !len) + return -EINVAL; +=20 + /* Don't allow a single read to cross a 512-byte block boundary */ +diff -urNp linux-2.6.32.45/drivers/mtd/ftl.c linux-2.6.32.45/drivers/mtd= /ftl.c +--- linux-2.6.32.45/drivers/mtd/ftl.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/mtd/ftl.c 2011-05-16 21:46:57.000000000 -040= 0 +@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t * + loff_t offset; + uint16_t srcunitswap =3D cpu_to_le16(srcunit); +=20 ++ pax_track_stack(); ++ + eun =3D &part->EUNInfo[srcunit]; + xfer =3D &part->XferInfo[xferunit]; + DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n", +diff -urNp linux-2.6.32.45/drivers/mtd/inftlcore.c linux-2.6.32.45/drive= rs/mtd/inftlcore.c +--- linux-2.6.32.45/drivers/mtd/inftlcore.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/mtd/inftlcore.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLr + struct inftl_oob oob; + size_t retlen; +=20 ++ pax_track_stack(); ++ + DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=3D%p,thisVUC=3D%= d," + "pending=3D%d)\n", inftl, thisVUC, pendingblock); +=20 +diff -urNp linux-2.6.32.45/drivers/mtd/inftlmount.c linux-2.6.32.45/driv= ers/mtd/inftlmount.c +--- linux-2.6.32.45/drivers/mtd/inftlmount.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/mtd/inftlmount.c 2011-05-16 21:46:57.0000000= 00 -0400 +@@ -54,6 +54,8 @@ static int find_boot_record(struct INFTL + struct INFTLPartition *ip; + size_t retlen; +=20 ++ pax_track_stack(); ++ + DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=3D%p)\n", inftl= ); +=20 + /* +diff -urNp linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c linux-2.6.32.= 45/drivers/mtd/lpddr/qinfo_probe.c +--- linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/mtd/lpddr/qinfo_probe.c 2011-05-16 21:46:57.= 000000000 -0400 +@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map + { + map_word pfow_val[4]; +=20 ++ pax_track_stack(); ++ + /* Check identification string */ + pfow_val[0] =3D map_read(map, map->pfow_base + PFOW_QUERY_STRING_P); + pfow_val[1] =3D map_read(map, map->pfow_base + PFOW_QUERY_STRING_F); +diff -urNp linux-2.6.32.45/drivers/mtd/mtdchar.c linux-2.6.32.45/drivers= /mtd/mtdchar.c +--- linux-2.6.32.45/drivers/mtd/mtdchar.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/mtd/mtdchar.c 2011-05-16 21:46:57.000000000 = -0400 +@@ -460,6 +460,8 @@ static int mtd_ioctl(struct inode *inode + u_long size; + struct mtd_info_user info; +=20 ++ pax_track_stack(); ++ + DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n"); +=20 + size =3D (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT; +diff -urNp linux-2.6.32.45/drivers/mtd/nftlcore.c linux-2.6.32.45/driver= s/mtd/nftlcore.c +--- linux-2.6.32.45/drivers/mtd/nftlcore.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/mtd/nftlcore.c 2011-05-16 21:46:57.000000000= -0400 +@@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLre + int inplace =3D 1; + size_t retlen; +=20 ++ pax_track_stack(); ++ + memset(BlockMap, 0xff, sizeof(BlockMap)); + memset(BlockFreeFound, 0, sizeof(BlockFreeFound)); +=20 +diff -urNp linux-2.6.32.45/drivers/mtd/nftlmount.c linux-2.6.32.45/drive= rs/mtd/nftlmount.c +--- linux-2.6.32.45/drivers/mtd/nftlmount.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/mtd/nftlmount.c 2011-05-18 20:09:37.00000000= 0 -0400 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -44,6 +45,8 @@ static int find_boot_record(struct NFTLr + struct mtd_info *mtd =3D nftl->mbd.mtd; + unsigned int i; +=20 ++ pax_track_stack(); ++ + /* Assume logical EraseSize =3D=3D physical erasesize for start= ing the scan. + We'll sort it out later if we find a MediaHeader which says otherwi= se */ + /* Actually, we won't. The new DiskOnChip driver has already scanned +diff -urNp linux-2.6.32.45/drivers/mtd/ubi/build.c linux-2.6.32.45/drive= rs/mtd/ubi/build.c +--- linux-2.6.32.45/drivers/mtd/ubi/build.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/mtd/ubi/build.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -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 =3D 1; +=20 + result =3D simple_strtoul(str, &endp, 0); + if (str =3D=3D endp || result >=3D INT_MAX) { +@@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const +=20 + switch (*endp) { + case 'G': +- result *=3D 1024; ++ scale *=3D 1024; + case 'M': +- result *=3D 1024; ++ scale *=3D 1024; + case 'K': +- result *=3D 1024; ++ scale *=3D 1024; + if (endp[1] =3D=3D 'i' && endp[2] =3D=3D 'B') + endp +=3D 2; + case '\0': +@@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const + return -EINVAL; + } +=20 +- return result; ++ if ((intoverflow_t)result*scale >=3D INT_MAX) { ++ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", ++ str); ++ return -EINVAL; ++ } ++ ++ return result*scale; + } +=20 + /** +diff -urNp linux-2.6.32.45/drivers/net/bnx2.c linux-2.6.32.45/drivers/ne= t/bnx2.c +--- linux-2.6.32.45/drivers/net/bnx2.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/net/bnx2.c 2011-05-16 21:46:57.000000000 -04= 00 +@@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp) + int rc =3D 0; + u32 magic, csum; +=20 ++ pax_track_stack(); ++ + if ((rc =3D bnx2_nvram_read(bp, 0, data, 4)) !=3D 0) + goto test_nvram_done; +=20 +diff -urNp linux-2.6.32.45/drivers/net/cxgb3/l2t.h linux-2.6.32.45/drive= rs/net/cxgb3/l2t.h +--- linux-2.6.32.45/drivers/net/cxgb3/l2t.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/net/cxgb3/l2t.h 2011-08-05 20:33:55.00000000= 0 -0400 +@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func) + */ + struct l2t_skb_cb { + arp_failure_handler_func arp_failure_handler; +-}; ++} __no_const; +=20 + #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb) +=20 +diff -urNp linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c linux-2.6.32.45/dri= vers/net/cxgb3/t3_hw.c +--- linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/net/cxgb3/t3_hw.c 2011-05-16 21:46:57.000000= 000 -0400 +@@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter + int i, addr, ret; + struct t3_vpd vpd; +=20 ++ pax_track_stack(); ++ + /* + * Card information is normally at VPD_BASE but some early cards had + * it at 0. +diff -urNp linux-2.6.32.45/drivers/net/e1000e/82571.c linux-2.6.32.45/dr= ivers/net/e1000e/82571.c +--- linux-2.6.32.45/drivers/net/e1000e/82571.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/e1000e/82571.c 2011-08-23 21:22:32.00000= 0000 -0400 +@@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(s + { + struct e1000_hw *hw =3D &adapter->hw; + struct e1000_mac_info *mac =3D &hw->mac; +- struct e1000_mac_operations *func =3D &mac->ops; ++ e1000_mac_operations_no_const *func =3D &mac->ops; + u32 swsm =3D 0; + u32 swsm2 =3D 0; + bool force_clear_smbi =3D false; +@@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(s + temp =3D er32(ICRXDMTC); + } +=20 +-static struct e1000_mac_operations e82571_mac_ops =3D { ++static const struct e1000_mac_operations e82571_mac_ops =3D { + /* .check_mng_mode: mac type dependent */ + /* .check_for_link: media type dependent */ + .id_led_init =3D e1000e_id_led_init, +@@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e8257 + .setup_led =3D e1000e_setup_led_generic, + }; +=20 +-static struct e1000_phy_operations e82_phy_ops_igp =3D { ++static const struct e1000_phy_operations e82_phy_ops_igp =3D { + .acquire_phy =3D e1000_get_hw_semaphore_82571, + .check_reset_block =3D e1000e_check_reset_block_generic, + .commit_phy =3D NULL, +@@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up =3D NULL, + }; +=20 +-static struct e1000_phy_operations e82_phy_ops_m88 =3D { ++static const struct e1000_phy_operations e82_phy_ops_m88 =3D { + .acquire_phy =3D e1000_get_hw_semaphore_82571, + .check_reset_block =3D e1000e_check_reset_block_generic, + .commit_phy =3D e1000e_phy_sw_reset, +@@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up =3D NULL, + }; +=20 +-static struct e1000_phy_operations e82_phy_ops_bm =3D { ++static const struct e1000_phy_operations e82_phy_ops_bm =3D { + .acquire_phy =3D e1000_get_hw_semaphore_82571, + .check_reset_block =3D e1000e_check_reset_block_generic, + .commit_phy =3D e1000e_phy_sw_reset, +@@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_p + .cfg_on_link_up =3D NULL, + }; +=20 +-static struct e1000_nvm_operations e82571_nvm_ops =3D { ++static const struct e1000_nvm_operations e82571_nvm_ops =3D { + .acquire_nvm =3D e1000_acquire_nvm_82571, + .read_nvm =3D e1000e_read_nvm_eerd, + .release_nvm =3D e1000_release_nvm_82571, +diff -urNp linux-2.6.32.45/drivers/net/e1000e/e1000.h linux-2.6.32.45/dr= ivers/net/e1000e/e1000.h +--- linux-2.6.32.45/drivers/net/e1000e/e1000.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/e1000e/e1000.h 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -375,9 +375,9 @@ struct e1000_info { + u32 pba; + u32 max_hw_frame_size; + s32 (*get_variants)(struct e1000_adapter *); +- struct e1000_mac_operations *mac_ops; +- struct e1000_phy_operations *phy_ops; +- struct e1000_nvm_operations *nvm_ops; ++ const struct e1000_mac_operations *mac_ops; ++ const struct e1000_phy_operations *phy_ops; ++ const struct e1000_nvm_operations *nvm_ops; + }; +=20 + /* hardware capability, feature, and workaround flags */ +diff -urNp linux-2.6.32.45/drivers/net/e1000e/es2lan.c linux-2.6.32.45/d= rivers/net/e1000e/es2lan.c +--- linux-2.6.32.45/drivers/net/e1000e/es2lan.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/net/e1000e/es2lan.c 2011-08-23 21:22:32.0000= 00000 -0400 +@@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es + { + struct e1000_hw *hw =3D &adapter->hw; + struct e1000_mac_info *mac =3D &hw->mac; +- struct e1000_mac_operations *func =3D &mac->ops; ++ e1000_mac_operations_no_const *func =3D &mac->ops; +=20 + /* Set media type */ + switch (adapter->pdev->device) { +@@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es + temp =3D er32(ICRXDMTC); + } +=20 +-static struct e1000_mac_operations es2_mac_ops =3D { ++static const struct e1000_mac_operations es2_mac_ops =3D { + .id_led_init =3D e1000e_id_led_init, + .check_mng_mode =3D e1000e_check_mng_mode_generic, + /* check_for_link dependent on media type */ +@@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_m + .setup_led =3D e1000e_setup_led_generic, + }; +=20 +-static struct e1000_phy_operations es2_phy_ops =3D { ++static const struct e1000_phy_operations es2_phy_ops =3D { + .acquire_phy =3D e1000_acquire_phy_80003es2lan, + .check_reset_block =3D e1000e_check_reset_block_generic, + .commit_phy =3D e1000e_phy_sw_reset, +@@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_p + .cfg_on_link_up =3D e1000_cfg_on_link_up_80003es2lan, + }; +=20 +-static struct e1000_nvm_operations es2_nvm_ops =3D { ++static const struct e1000_nvm_operations es2_nvm_ops =3D { + .acquire_nvm =3D e1000_acquire_nvm_80003es2lan, + .read_nvm =3D e1000e_read_nvm_eerd, + .release_nvm =3D e1000_release_nvm_80003es2lan, +diff -urNp linux-2.6.32.45/drivers/net/e1000e/hw.h linux-2.6.32.45/drive= rs/net/e1000e/hw.h +--- linux-2.6.32.45/drivers/net/e1000e/hw.h 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/net/e1000e/hw.h 2011-08-23 21:27:38.00000000= 0 -0400 +@@ -753,6 +753,7 @@ struct e1000_mac_operations { + s32 (*setup_physical_interface)(struct e1000_hw *); + s32 (*setup_led)(struct e1000_hw *); + }; ++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_= const; +=20 + /* Function pointers for the PHY. */ + struct e1000_phy_operations { +@@ -774,6 +775,7 @@ struct e1000_phy_operations { + s32 (*write_phy_reg_locked)(struct e1000_hw *, u32, u16); + s32 (*cfg_on_link_up)(struct e1000_hw *); + }; ++typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_= const; +=20 + /* Function pointers for the NVM. */ + struct e1000_nvm_operations { +@@ -785,9 +787,10 @@ struct e1000_nvm_operations { + s32 (*validate_nvm)(struct e1000_hw *); + s32 (*write_nvm)(struct e1000_hw *, u16, u16, u16 *); + }; ++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_= const; +=20 + struct e1000_mac_info { +- struct e1000_mac_operations ops; ++ e1000_mac_operations_no_const ops; +=20 + u8 addr[6]; + u8 perm_addr[6]; +@@ -823,7 +826,7 @@ struct e1000_mac_info { + }; +=20 + struct e1000_phy_info { +- struct e1000_phy_operations ops; ++ e1000_phy_operations_no_const ops; +=20 + enum e1000_phy_type type; +=20 +@@ -857,7 +860,7 @@ struct e1000_phy_info { + }; +=20 + struct e1000_nvm_info { +- struct e1000_nvm_operations ops; ++ e1000_nvm_operations_no_const ops; +=20 + enum e1000_nvm_type type; + enum e1000_nvm_override override; +diff -urNp linux-2.6.32.45/drivers/net/e1000e/ich8lan.c linux-2.6.32.45/= drivers/net/e1000e/ich8lan.c +--- linux-2.6.32.45/drivers/net/e1000e/ich8lan.c 2011-05-10 22:12:01.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/net/e1000e/ich8lan.c 2011-08-23 21:22:32.000= 000000 -0400 +@@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan + } + } +=20 +-static struct e1000_mac_operations ich8_mac_ops =3D { ++static const struct e1000_mac_operations ich8_mac_ops =3D { + .id_led_init =3D e1000e_id_led_init, + .check_mng_mode =3D e1000_check_mng_mode_ich8lan, + .check_for_link =3D e1000_check_for_copper_link_ich8lan, +@@ -3481,7 +3481,7 @@ static struct e1000_mac_operations ich8_ + /* id_led_init dependent on mac type */ + }; +=20 +-static struct e1000_phy_operations ich8_phy_ops =3D { ++static const struct e1000_phy_operations ich8_phy_ops =3D { + .acquire_phy =3D e1000_acquire_swflag_ich8lan, + .check_reset_block =3D e1000_check_reset_block_ich8lan, + .commit_phy =3D NULL, +@@ -3497,7 +3497,7 @@ static struct e1000_phy_operations ich8_ + .write_phy_reg =3D e1000e_write_phy_reg_igp, + }; +=20 +-static struct e1000_nvm_operations ich8_nvm_ops =3D { ++static const struct e1000_nvm_operations ich8_nvm_ops =3D { + .acquire_nvm =3D e1000_acquire_nvm_ich8lan, + .read_nvm =3D e1000_read_nvm_ich8lan, + .release_nvm =3D e1000_release_nvm_ich8lan, +diff -urNp linux-2.6.32.45/drivers/net/hamradio/6pack.c linux-2.6.32.45/= drivers/net/hamradio/6pack.c +--- linux-2.6.32.45/drivers/net/hamradio/6pack.c 2011-07-13 17:23:04.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/net/hamradio/6pack.c 2011-07-13 17:23:18.000= 000000 -0400 +@@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct t + unsigned char buf[512]; + int count1; +=20 ++ pax_track_stack(); ++ + if (!count) + return; +=20 +diff -urNp linux-2.6.32.45/drivers/net/ibmveth.c linux-2.6.32.45/drivers= /net/ibmveth.c +--- linux-2.6.32.45/drivers/net/ibmveth.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/net/ibmveth.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr + NULL, + }; +=20 +-static struct sysfs_ops veth_pool_ops =3D { ++static const struct sysfs_ops veth_pool_ops =3D { + .show =3D veth_pool_show, + .store =3D veth_pool_store, + }; +diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_82575.c linux-2.6.32.45= /drivers/net/igb/e1000_82575.c +--- linux-2.6.32.45/drivers/net/igb/e1000_82575.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/net/igb/e1000_82575.c 2011-08-23 21:22:32.00= 0000000 -0400 +@@ -1410,7 +1410,7 @@ void igb_vmdq_set_replication_pf(struct=20 + wr32(E1000_VT_CTL, vt_ctl); + } +=20 +-static struct e1000_mac_operations e1000_mac_ops_82575 =3D { ++static const struct e1000_mac_operations e1000_mac_ops_82575 =3D { + .reset_hw =3D igb_reset_hw_82575, + .init_hw =3D igb_init_hw_82575, + .check_for_link =3D igb_check_for_link_82575, +@@ -1419,13 +1419,13 @@ static struct e1000_mac_operations e1000 + .get_speed_and_duplex =3D igb_get_speed_and_duplex_copper, + }; +=20 +-static struct e1000_phy_operations e1000_phy_ops_82575 =3D { ++static const struct e1000_phy_operations e1000_phy_ops_82575 =3D { + .acquire =3D igb_acquire_phy_82575, + .get_cfg_done =3D igb_get_cfg_done_82575, + .release =3D igb_release_phy_82575, + }; +=20 +-static struct e1000_nvm_operations e1000_nvm_ops_82575 =3D { ++static const struct e1000_nvm_operations e1000_nvm_ops_82575 =3D { + .acquire =3D igb_acquire_nvm_82575, + .read =3D igb_read_nvm_eerd, + .release =3D igb_release_nvm_82575, +diff -urNp linux-2.6.32.45/drivers/net/igb/e1000_hw.h linux-2.6.32.45/dr= ivers/net/igb/e1000_hw.h +--- linux-2.6.32.45/drivers/net/igb/e1000_hw.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/igb/e1000_hw.h 2011-08-23 21:28:01.00000= 0000 -0400 +@@ -288,6 +288,7 @@ struct e1000_mac_operations { + s32 (*read_mac_addr)(struct e1000_hw *); + s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *); + }; ++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_= const; +=20 + struct e1000_phy_operations { + s32 (*acquire)(struct e1000_hw *); +@@ -303,6 +304,7 @@ struct e1000_phy_operations { + s32 (*set_d3_lplu_state)(struct e1000_hw *, bool); + s32 (*write_reg)(struct e1000_hw *, u32, u16); + }; ++typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_= const; +=20 + struct e1000_nvm_operations { + s32 (*acquire)(struct e1000_hw *); +@@ -310,6 +312,7 @@ struct e1000_nvm_operations { + void (*release)(struct e1000_hw *); + s32 (*write)(struct e1000_hw *, u16, u16, u16 *); + }; ++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_= const; +=20 + struct e1000_info { + s32 (*get_invariants)(struct e1000_hw *); +@@ -321,7 +324,7 @@ struct e1000_info { + extern const struct e1000_info e1000_82575_info; +=20 + struct e1000_mac_info { +- struct e1000_mac_operations ops; ++ e1000_mac_operations_no_const ops; +=20 + u8 addr[6]; + u8 perm_addr[6]; +@@ -365,7 +368,7 @@ struct e1000_mac_info { + }; +=20 + struct e1000_phy_info { +- struct e1000_phy_operations ops; ++ e1000_phy_operations_no_const ops; +=20 + enum e1000_phy_type type; +=20 +@@ -400,7 +403,7 @@ struct e1000_phy_info { + }; +=20 + struct e1000_nvm_info { +- struct e1000_nvm_operations ops; ++ e1000_nvm_operations_no_const ops; +=20 + enum e1000_nvm_type type; + enum e1000_nvm_override override; +@@ -446,6 +449,7 @@ struct e1000_mbx_operations { + s32 (*check_for_ack)(struct e1000_hw *, u16); + s32 (*check_for_rst)(struct e1000_hw *, u16); + }; ++typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_= const; +=20 + struct e1000_mbx_stats { + u32 msgs_tx; +@@ -457,7 +461,7 @@ struct e1000_mbx_stats { + }; +=20 + struct e1000_mbx_info { +- struct e1000_mbx_operations ops; ++ e1000_mbx_operations_no_const ops; + struct e1000_mbx_stats stats; + u32 timeout; + u32 usec_delay; +diff -urNp linux-2.6.32.45/drivers/net/igbvf/vf.h linux-2.6.32.45/driver= s/net/igbvf/vf.h +--- linux-2.6.32.45/drivers/net/igbvf/vf.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/net/igbvf/vf.h 2011-08-23 21:22:38.000000000= -0400 +@@ -187,9 +187,10 @@ struct e1000_mac_operations { + s32 (*read_mac_addr)(struct e1000_hw *); + s32 (*set_vfta)(struct e1000_hw *, u16, bool); + }; ++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_= const; +=20 + struct e1000_mac_info { +- struct e1000_mac_operations ops; ++ e1000_mac_operations_no_const ops; + u8 addr[6]; + u8 perm_addr[6]; +=20 +@@ -211,6 +212,7 @@ struct e1000_mbx_operations { + s32 (*check_for_ack)(struct e1000_hw *); + s32 (*check_for_rst)(struct e1000_hw *); + }; ++typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_= const; +=20 + struct e1000_mbx_stats { + u32 msgs_tx; +@@ -222,7 +224,7 @@ struct e1000_mbx_stats { + }; +=20 + struct e1000_mbx_info { +- struct e1000_mbx_operations ops; ++ e1000_mbx_operations_no_const ops; + struct e1000_mbx_stats stats; + u32 timeout; + u32 usec_delay; +diff -urNp linux-2.6.32.45/drivers/net/iseries_veth.c linux-2.6.32.45/dr= ivers/net/iseries_veth.c +--- linux-2.6.32.45/drivers/net/iseries_veth.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/iseries_veth.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul + NULL + }; +=20 +-static struct sysfs_ops veth_cnx_sysfs_ops =3D { ++static const struct sysfs_ops veth_cnx_sysfs_ops =3D { + .show =3D veth_cnx_attribute_show + }; +=20 +@@ -441,7 +441,7 @@ static struct attribute *veth_port_defau + NULL + }; +=20 +-static struct sysfs_ops veth_port_sysfs_ops =3D { ++static const struct sysfs_ops veth_port_sysfs_ops =3D { + .show =3D veth_port_attribute_show + }; +=20 +diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c linux-2.6.32.45/= drivers/net/ixgb/ixgb_main.c +--- linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/net/ixgb/ixgb_main.c 2011-05-16 21:46:57.000= 000000 -0400 +@@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev + u32 rctl; + int i; +=20 ++ pax_track_stack(); ++ + /* Check for Promiscuous and All Multicast modes */ +=20 + rctl =3D IXGB_READ_REG(hw, RCTL); +diff -urNp linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c linux-2.6.32.45= /drivers/net/ixgb/ixgb_param.c +--- linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/net/ixgb/ixgb_param.c 2011-05-16 21:46:57.00= 0000000 -0400 +@@ -260,6 +260,9 @@ void __devinit + ixgb_check_options(struct ixgb_adapter *adapter) + { + int bd =3D adapter->bd_number; ++ ++ pax_track_stack(); ++ + if (bd >=3D IXGB_MAX_NIC) { + printk(KERN_NOTICE + "Warning: no configuration for board #%i\n", bd); +diff -urNp linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h linux-2.6.32.4= 5/drivers/net/ixgbe/ixgbe_type.h +--- linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:22:38.0= 00000000 -0400 +@@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations { + s32 (*validate_checksum)(struct ixgbe_hw *, u16 *); + s32 (*update_checksum)(struct ixgbe_hw *); + }; ++typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operatio= ns_no_const; +=20 + struct ixgbe_mac_operations { + s32 (*init_hw)(struct ixgbe_hw *); +@@ -2376,6 +2377,7 @@ struct ixgbe_mac_operations { + /* Flow Control */ + s32 (*fc_enable)(struct ixgbe_hw *, s32); + }; ++typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_= const; +=20 + struct ixgbe_phy_operations { + s32 (*identify)(struct ixgbe_hw *); +@@ -2394,9 +2396,10 @@ struct ixgbe_phy_operations { + s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *); + s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8); + }; ++typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_= const; +=20 + struct ixgbe_eeprom_info { +- struct ixgbe_eeprom_operations ops; ++ ixgbe_eeprom_operations_no_const ops; + enum ixgbe_eeprom_type type; + u32 semaphore_delay; + u16 word_size; +@@ -2404,7 +2407,7 @@ struct ixgbe_eeprom_info { + }; +=20 + struct ixgbe_mac_info { +- struct ixgbe_mac_operations ops; ++ ixgbe_mac_operations_no_const ops; + enum ixgbe_mac_type type; + u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS]; + u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS]= ; +@@ -2423,7 +2426,7 @@ struct ixgbe_mac_info { + }; +=20 + struct ixgbe_phy_info { +- struct ixgbe_phy_operations ops; ++ ixgbe_phy_operations_no_const ops; + struct mdio_if_info mdio; + enum ixgbe_phy_type type; + u32 id; +diff -urNp linux-2.6.32.45/drivers/net/mlx4/main.c linux-2.6.32.45/drive= rs/net/mlx4/main.c +--- linux-2.6.32.45/drivers/net/mlx4/main.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/net/mlx4/main.c 2011-05-18 20:09:37.00000000= 0 -0400 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include +=20 + #include + #include +@@ -730,6 +731,8 @@ static int mlx4_init_hca(struct mlx4_dev + u64 icm_size; + int err; +=20 ++ pax_track_stack(); ++ + err =3D mlx4_QUERY_FW(dev); + if (err) { + if (err =3D=3D -EACCES) +diff -urNp linux-2.6.32.45/drivers/net/niu.c linux-2.6.32.45/drivers/net= /niu.c +--- linux-2.6.32.45/drivers/net/niu.c 2011-05-10 22:12:01.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/net/niu.c 2011-05-16 21:46:57.000000000 -040= 0 +@@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struc + int i, num_irqs, err; + u8 first_ldg; +=20 ++ pax_track_stack(); ++ + first_ldg =3D (NIU_NUM_LDG / parent->num_ports) * np->port; + for (i =3D 0; i < (NIU_NUM_LDG / parent->num_ports); i++) + ldg_num_map[i] =3D first_ldg + i; +diff -urNp linux-2.6.32.45/drivers/net/pcnet32.c linux-2.6.32.45/drivers= /net/pcnet32.c +--- linux-2.6.32.45/drivers/net/pcnet32.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/net/pcnet32.c 2011-08-05 20:33:55.000000000 = -0400 +@@ -79,7 +79,7 @@ static int cards_found; + /* + * VLB I/O addresses + */ +-static unsigned int pcnet32_portlist[] __initdata =3D ++static unsigned int pcnet32_portlist[] __devinitdata =3D + { 0x300, 0x320, 0x340, 0x360, 0 }; +=20 + static int pcnet32_debug =3D 0; +@@ -267,7 +267,7 @@ struct pcnet32_private { + struct sk_buff **rx_skbuff; + dma_addr_t *tx_dma_addr; + dma_addr_t *rx_dma_addr; +- struct pcnet32_access a; ++ struct pcnet32_access *a; + spinlock_t lock; /* Guard lock */ + unsigned int cur_rx, cur_tx; /* The next free ring entry */ + unsigned int rx_ring_size; /* current rx ring size */ +@@ -457,9 +457,9 @@ static void pcnet32_netif_start(struct n + u16 val; +=20 + netif_wake_queue(dev); +- val =3D lp->a.read_csr(ioaddr, CSR3); ++ val =3D lp->a->read_csr(ioaddr, CSR3); + val &=3D 0x00ff; +- lp->a.write_csr(ioaddr, CSR3, val); ++ lp->a->write_csr(ioaddr, CSR3, val); + napi_enable(&lp->napi); + } +=20 +@@ -744,7 +744,7 @@ static u32 pcnet32_get_link(struct net_d + r =3D mii_link_ok(&lp->mii_if); + } else if (lp->chip_version >=3D PCNET32_79C970A) { + ulong ioaddr =3D dev->base_addr; /* card base I/O address */ +- r =3D (lp->a.read_bcr(ioaddr, 4) !=3D 0xc0); ++ r =3D (lp->a->read_bcr(ioaddr, 4) !=3D 0xc0); + } else { /* can not detect link on really old chips */ + r =3D 1; + } +@@ -806,7 +806,7 @@ static int pcnet32_set_ringparam(struct=20 + pcnet32_netif_stop(dev); +=20 + spin_lock_irqsave(&lp->lock, flags); +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */ +=20 + size =3D min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE); +=20 +@@ -886,7 +886,7 @@ static void pcnet32_ethtool_test(struct=20 + static int pcnet32_loopback_test(struct net_device *dev, uint64_t * dat= a1) + { + struct pcnet32_private *lp =3D netdev_priv(dev); +- struct pcnet32_access *a =3D &lp->a; /* access to registers */ ++ struct pcnet32_access *a =3D lp->a; /* access to registers */ + ulong ioaddr =3D dev->base_addr; /* card base I/O address */ + struct sk_buff *skb; /* sk buff */ + int x, i; /* counters */ +@@ -906,21 +906,21 @@ static int pcnet32_loopback_test(struct=20 + pcnet32_netif_stop(dev); +=20 + spin_lock_irqsave(&lp->lock, flags); +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */ +=20 + numbuffs =3D min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size= )); +=20 + /* Reset the PCNET32 */ +- lp->a.reset(ioaddr); +- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ ++ lp->a->reset(ioaddr); ++ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ +=20 + /* switch pcnet32 to 32bit mode */ +- lp->a.write_bcr(ioaddr, 20, 2); ++ lp->a->write_bcr(ioaddr, 20, 2); +=20 + /* purge & init rings but don't actually restart */ + pcnet32_restart(dev, 0x0000); +=20 +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */ +=20 + /* Initialize Transmit buffers. */ + size =3D data_len + 15; +@@ -966,10 +966,10 @@ static int pcnet32_loopback_test(struct=20 +=20 + /* set int loopback in CSR15 */ + x =3D a->read_csr(ioaddr, CSR15) & 0xfffc; +- lp->a.write_csr(ioaddr, CSR15, x | 0x0044); ++ lp->a->write_csr(ioaddr, CSR15, x | 0x0044); +=20 + teststatus =3D cpu_to_le16(0x8000); +- lp->a.write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */ +=20 + /* Check status of descriptors */ + for (x =3D 0; x < numbuffs; x++) { +@@ -990,7 +990,7 @@ static int pcnet32_loopback_test(struct=20 + } + } +=20 +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */ + wmb(); + if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) { + printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name); +@@ -1039,7 +1039,7 @@ static int pcnet32_loopback_test(struct=20 + pcnet32_restart(dev, CSR0_NORMAL); + } else { + pcnet32_purge_rx_ring(dev); +- lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */ ++ lp->a->write_bcr(ioaddr, 20, 4); /* return to 16bit mode */ + } + spin_unlock_irqrestore(&lp->lock, flags); +=20 +@@ -1049,7 +1049,7 @@ static int pcnet32_loopback_test(struct=20 + static void pcnet32_led_blink_callback(struct net_device *dev) + { + struct pcnet32_private *lp =3D netdev_priv(dev); +- struct pcnet32_access *a =3D &lp->a; ++ struct pcnet32_access *a =3D lp->a; + ulong ioaddr =3D dev->base_addr; + unsigned long flags; + int i; +@@ -1066,7 +1066,7 @@ static void pcnet32_led_blink_callback(s + static int pcnet32_phys_id(struct net_device *dev, u32 data) + { + struct pcnet32_private *lp =3D netdev_priv(dev); +- struct pcnet32_access *a =3D &lp->a; ++ struct pcnet32_access *a =3D lp->a; + ulong ioaddr =3D dev->base_addr; + unsigned long flags; + int i, regs[4]; +@@ -1112,7 +1112,7 @@ static int pcnet32_suspend(struct net_de + { + int csr5; + struct pcnet32_private *lp =3D netdev_priv(dev); +- struct pcnet32_access *a =3D &lp->a; ++ struct pcnet32_access *a =3D lp->a; + ulong ioaddr =3D dev->base_addr; + int ticks; +=20 +@@ -1388,8 +1388,8 @@ static int pcnet32_poll(struct napi_stru + spin_lock_irqsave(&lp->lock, flags); + if (pcnet32_tx(dev)) { + /* reset the chip to clear the error condition, then restart */ +- lp->a.reset(ioaddr); +- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ ++ lp->a->reset(ioaddr); ++ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ + pcnet32_restart(dev, CSR0_START); + netif_wake_queue(dev); + } +@@ -1401,12 +1401,12 @@ static int pcnet32_poll(struct napi_stru + __napi_complete(napi); +=20 + /* clear interrupt masks */ +- val =3D lp->a.read_csr(ioaddr, CSR3); ++ val =3D lp->a->read_csr(ioaddr, CSR3); + val &=3D 0x00ff; +- lp->a.write_csr(ioaddr, CSR3, val); ++ lp->a->write_csr(ioaddr, CSR3, val); +=20 + /* Set interrupt enable. */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN); +=20 + spin_unlock_irqrestore(&lp->lock, flags); + } +@@ -1429,7 +1429,7 @@ static void pcnet32_get_regs(struct net_ + int i, csr0; + u16 *buff =3D ptr; + struct pcnet32_private *lp =3D netdev_priv(dev); +- struct pcnet32_access *a =3D &lp->a; ++ struct pcnet32_access *a =3D lp->a; + ulong ioaddr =3D dev->base_addr; + unsigned long flags; +=20 +@@ -1466,9 +1466,9 @@ static void pcnet32_get_regs(struct net_ + for (j =3D 0; j < PCNET32_MAX_PHYS; j++) { + if (lp->phymask & (1 << j)) { + for (i =3D 0; i < PCNET32_REGS_PER_PHY; i++) { +- lp->a.write_bcr(ioaddr, 33, ++ lp->a->write_bcr(ioaddr, 33, + (j << 5) | i); +- *buff++ =3D lp->a.read_bcr(ioaddr, 34); ++ *buff++ =3D lp->a->read_bcr(ioaddr, 34); + } + } + } +@@ -1858,7 +1858,7 @@ pcnet32_probe1(unsigned long ioaddr, int + ((cards_found >=3D MAX_UNITS) || full_duplex[cards_found])) + lp->options |=3D PCNET32_PORT_FD; +=20 +- lp->a =3D *a; ++ lp->a =3D a; +=20 + /* prior to register_netdev, dev->name is not yet correct */ + if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) { +@@ -1917,7 +1917,7 @@ pcnet32_probe1(unsigned long ioaddr, int + if (lp->mii) { + /* lp->phycount and lp->phymask are set to 0 by memset above */ +=20 +- lp->mii_if.phy_id =3D ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f; ++ lp->mii_if.phy_id =3D ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f; + /* scan for PHYs */ + for (i =3D 0; i < PCNET32_MAX_PHYS; i++) { + unsigned short id1, id2; +@@ -1938,7 +1938,7 @@ pcnet32_probe1(unsigned long ioaddr, int + "Found PHY %04x:%04x at address %d.\n", + id1, id2, i); + } +- lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5); ++ lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5); + if (lp->phycount > 1) { + lp->options |=3D PCNET32_PORT_MII; + } +@@ -2109,10 +2109,10 @@ static int pcnet32_open(struct net_devic + } +=20 + /* Reset the PCNET32 */ +- lp->a.reset(ioaddr); ++ lp->a->reset(ioaddr); +=20 + /* switch pcnet32 to 32bit mode */ +- lp->a.write_bcr(ioaddr, 20, 2); ++ lp->a->write_bcr(ioaddr, 20, 2); +=20 + if (netif_msg_ifup(lp)) + printk(KERN_DEBUG +@@ -2122,14 +2122,14 @@ static int pcnet32_open(struct net_devic + (u32) (lp->init_dma_addr)); +=20 + /* set/reset autoselect bit */ +- val =3D lp->a.read_bcr(ioaddr, 2) & ~2; ++ val =3D lp->a->read_bcr(ioaddr, 2) & ~2; + if (lp->options & PCNET32_PORT_ASEL) + val |=3D 2; +- lp->a.write_bcr(ioaddr, 2, val); ++ lp->a->write_bcr(ioaddr, 2, val); +=20 + /* handle full duplex setting */ + if (lp->mii_if.full_duplex) { +- val =3D lp->a.read_bcr(ioaddr, 9) & ~3; ++ val =3D lp->a->read_bcr(ioaddr, 9) & ~3; + if (lp->options & PCNET32_PORT_FD) { + val |=3D 1; + if (lp->options =3D=3D (PCNET32_PORT_FD | PCNET32_PORT_AUI)) +@@ -2139,14 +2139,14 @@ static int pcnet32_open(struct net_devic + if (lp->chip_version =3D=3D 0x2627) + val |=3D 3; + } +- lp->a.write_bcr(ioaddr, 9, val); ++ lp->a->write_bcr(ioaddr, 9, val); + } +=20 + /* set/reset GPSI bit in test register */ +- val =3D lp->a.read_csr(ioaddr, 124) & ~0x10; ++ val =3D lp->a->read_csr(ioaddr, 124) & ~0x10; + if ((lp->options & PCNET32_PORT_PORTSEL) =3D=3D PCNET32_PORT_GPSI) + val |=3D 0x10; +- lp->a.write_csr(ioaddr, 124, val); ++ lp->a->write_csr(ioaddr, 124, val); +=20 + /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiat= e */ + if (pdev && pdev->subsystem_vendor =3D=3D PCI_VENDOR_ID_AT && +@@ -2167,24 +2167,24 @@ static int pcnet32_open(struct net_devic + * duplex, and/or enable auto negotiation, and clear DANAS + */ + if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) { +- lp->a.write_bcr(ioaddr, 32, +- lp->a.read_bcr(ioaddr, 32) | 0x0080); ++ lp->a->write_bcr(ioaddr, 32, ++ lp->a->read_bcr(ioaddr, 32) | 0x0080); + /* disable Auto Negotiation, set 10Mpbs, HD */ +- val =3D lp->a.read_bcr(ioaddr, 32) & ~0xb8; ++ val =3D lp->a->read_bcr(ioaddr, 32) & ~0xb8; + if (lp->options & PCNET32_PORT_FD) + val |=3D 0x10; + if (lp->options & PCNET32_PORT_100) + val |=3D 0x08; +- lp->a.write_bcr(ioaddr, 32, val); ++ lp->a->write_bcr(ioaddr, 32, val); + } else { + if (lp->options & PCNET32_PORT_ASEL) { +- lp->a.write_bcr(ioaddr, 32, +- lp->a.read_bcr(ioaddr, ++ lp->a->write_bcr(ioaddr, 32, ++ lp->a->read_bcr(ioaddr, + 32) | 0x0080); + /* enable auto negotiate, setup, disable fd */ +- val =3D lp->a.read_bcr(ioaddr, 32) & ~0x98; ++ val =3D lp->a->read_bcr(ioaddr, 32) & ~0x98; + val |=3D 0x20; +- lp->a.write_bcr(ioaddr, 32, val); ++ lp->a->write_bcr(ioaddr, 32, val); + } + } + } else { +@@ -2197,10 +2197,10 @@ static int pcnet32_open(struct net_devic + * There is really no good other way to handle multiple PHYs + * other than turning off all automatics + */ +- val =3D lp->a.read_bcr(ioaddr, 2); +- lp->a.write_bcr(ioaddr, 2, val & ~2); +- val =3D lp->a.read_bcr(ioaddr, 32); +- lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */ ++ val =3D lp->a->read_bcr(ioaddr, 2); ++ lp->a->write_bcr(ioaddr, 2, val & ~2); ++ val =3D lp->a->read_bcr(ioaddr, 32); ++ lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */ +=20 + if (!(lp->options & PCNET32_PORT_ASEL)) { + /* setup ecmd */ +@@ -2210,7 +2210,7 @@ static int pcnet32_open(struct net_devic + ecmd.speed =3D + lp-> + options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10; +- bcr9 =3D lp->a.read_bcr(ioaddr, 9); ++ bcr9 =3D lp->a->read_bcr(ioaddr, 9); +=20 + if (lp->options & PCNET32_PORT_FD) { + ecmd.duplex =3D DUPLEX_FULL; +@@ -2219,7 +2219,7 @@ static int pcnet32_open(struct net_devic + ecmd.duplex =3D DUPLEX_HALF; + bcr9 |=3D ~(1 << 0); + } +- lp->a.write_bcr(ioaddr, 9, bcr9); ++ lp->a->write_bcr(ioaddr, 9, bcr9); + } +=20 + for (i =3D 0; i < PCNET32_MAX_PHYS; i++) { +@@ -2252,9 +2252,9 @@ static int pcnet32_open(struct net_devic +=20 + #ifdef DO_DXSUFLO + if (lp->dxsuflo) { /* Disable transmit stop on underflow */ +- val =3D lp->a.read_csr(ioaddr, CSR3); ++ val =3D lp->a->read_csr(ioaddr, CSR3); + val |=3D 0x40; +- lp->a.write_csr(ioaddr, CSR3, val); ++ lp->a->write_csr(ioaddr, CSR3, val); + } + #endif +=20 +@@ -2270,11 +2270,11 @@ static int pcnet32_open(struct net_devic + napi_enable(&lp->napi); +=20 + /* Re-initialize the PCNET32, and start it when done. */ +- lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff)); +- lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16)); ++ lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff)); ++ lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16)); +=20 +- lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT); ++ lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */ ++ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT); +=20 + netif_start_queue(dev); +=20 +@@ -2286,20 +2286,20 @@ static int pcnet32_open(struct net_devic +=20 + i =3D 0; + while (i++ < 100) +- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON) ++ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON) + break; + /* + * We used to clear the InitDone bit, 0x0100, here but Mark Stockton + * reports that doing so triggers a bug in the '974. + */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL); +=20 + if (netif_msg_ifup(lp)) + printk(KERN_DEBUG + "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n= ", + dev->name, i, + (u32) (lp->init_dma_addr), +- lp->a.read_csr(ioaddr, CSR0)); ++ lp->a->read_csr(ioaddr, CSR0)); +=20 + spin_unlock_irqrestore(&lp->lock, flags); +=20 +@@ -2313,7 +2313,7 @@ static int pcnet32_open(struct net_devic + * Switch back to 16bit mode to avoid problems with dumb + * DOS packet driver after a warm reboot + */ +- lp->a.write_bcr(ioaddr, 20, 4); ++ lp->a->write_bcr(ioaddr, 20, 4); +=20 + err_free_irq: + spin_unlock_irqrestore(&lp->lock, flags); +@@ -2420,7 +2420,7 @@ static void pcnet32_restart(struct net_d +=20 + /* wait for stop */ + for (i =3D 0; i < 100; i++) +- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP) ++ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP) + break; +=20 + if (i >=3D 100 && netif_msg_drv(lp)) +@@ -2433,13 +2433,13 @@ static void pcnet32_restart(struct net_d + return; +=20 + /* ReInit Ring */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_INIT); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_INIT); + i =3D 0; + while (i++ < 1000) +- if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON) ++ if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON) + break; +=20 +- lp->a.write_csr(ioaddr, CSR0, csr0_bits); ++ lp->a->write_csr(ioaddr, CSR0, csr0_bits); + } +=20 + static void pcnet32_tx_timeout(struct net_device *dev) +@@ -2452,8 +2452,8 @@ static void pcnet32_tx_timeout(struct ne + if (pcnet32_debug & NETIF_MSG_DRV) + printk(KERN_ERR + "%s: transmit timed out, status %4.4x, resetting.\n", +- dev->name, lp->a.read_csr(ioaddr, CSR0)); +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); ++ dev->name, lp->a->read_csr(ioaddr, CSR0)); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); + dev->stats.tx_errors++; + if (netif_msg_tx_err(lp)) { + int i; +@@ -2497,7 +2497,7 @@ static netdev_tx_t pcnet32_start_xmit(st + if (netif_msg_tx_queued(lp)) { + printk(KERN_DEBUG + "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n", +- dev->name, lp->a.read_csr(ioaddr, CSR0)); ++ dev->name, lp->a->read_csr(ioaddr, CSR0)); + } +=20 + /* Default status -- will not enable Successful-TxDone +@@ -2528,7 +2528,7 @@ static netdev_tx_t pcnet32_start_xmit(st + dev->stats.tx_bytes +=3D skb->len; +=20 + /* Trigger an immediate send poll. */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL); +=20 + dev->trans_start =3D jiffies; +=20 +@@ -2555,18 +2555,18 @@ pcnet32_interrupt(int irq, void *dev_id) +=20 + spin_lock(&lp->lock); +=20 +- csr0 =3D lp->a.read_csr(ioaddr, CSR0); ++ csr0 =3D lp->a->read_csr(ioaddr, CSR0); + while ((csr0 & 0x8f00) && --boguscnt >=3D 0) { + if (csr0 =3D=3D 0xffff) { + break; /* PCMCIA remove happened */ + } + /* Acknowledge all of the current interrupt sources ASAP. */ +- lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f); ++ lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f); +=20 + if (netif_msg_intr(lp)) + printk(KERN_DEBUG + "%s: interrupt csr0=3D%#2.2x new csr=3D%#2.2x.\n", +- dev->name, csr0, lp->a.read_csr(ioaddr, CSR0)); ++ dev->name, csr0, lp->a->read_csr(ioaddr, CSR0)); +=20 + /* Log misc errors. */ + if (csr0 & 0x4000) +@@ -2595,19 +2595,19 @@ pcnet32_interrupt(int irq, void *dev_id) + if (napi_schedule_prep(&lp->napi)) { + u16 val; + /* set interrupt masks */ +- val =3D lp->a.read_csr(ioaddr, CSR3); ++ val =3D lp->a->read_csr(ioaddr, CSR3); + val |=3D 0x5f00; +- lp->a.write_csr(ioaddr, CSR3, val); ++ lp->a->write_csr(ioaddr, CSR3, val); +=20 + __napi_schedule(&lp->napi); + break; + } +- csr0 =3D lp->a.read_csr(ioaddr, CSR0); ++ csr0 =3D lp->a->read_csr(ioaddr, CSR0); + } +=20 + if (netif_msg_intr(lp)) + printk(KERN_DEBUG "%s: exiting interrupt, csr0=3D%#4.4x.\n", +- dev->name, lp->a.read_csr(ioaddr, CSR0)); ++ dev->name, lp->a->read_csr(ioaddr, CSR0)); +=20 + spin_unlock(&lp->lock); +=20 +@@ -2627,21 +2627,21 @@ static int pcnet32_close(struct net_devi +=20 + spin_lock_irqsave(&lp->lock, flags); +=20 +- dev->stats.rx_missed_errors =3D lp->a.read_csr(ioaddr, 112); ++ dev->stats.rx_missed_errors =3D lp->a->read_csr(ioaddr, 112); +=20 + if (netif_msg_ifdown(lp)) + printk(KERN_DEBUG + "%s: Shutting down ethercard, status was %2.2x.\n", +- dev->name, lp->a.read_csr(ioaddr, CSR0)); ++ dev->name, lp->a->read_csr(ioaddr, CSR0)); +=20 + /* We stop the PCNET32 here -- it occasionally polls memory if we don'= t. */ +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); +=20 + /* + * Switch back to 16bit mode to avoid problems with dumb + * DOS packet driver after a warm reboot + */ +- lp->a.write_bcr(ioaddr, 20, 4); ++ lp->a->write_bcr(ioaddr, 20, 4); +=20 + spin_unlock_irqrestore(&lp->lock, flags); +=20 +@@ -2664,7 +2664,7 @@ static struct net_device_stats *pcnet32_ + unsigned long flags; +=20 + spin_lock_irqsave(&lp->lock, flags); +- dev->stats.rx_missed_errors =3D lp->a.read_csr(ioaddr, 112); ++ dev->stats.rx_missed_errors =3D lp->a->read_csr(ioaddr, 112); + spin_unlock_irqrestore(&lp->lock, flags); +=20 + return &dev->stats; +@@ -2686,10 +2686,10 @@ static void pcnet32_load_multicast(struc + if (dev->flags & IFF_ALLMULTI) { + ib->filter[0] =3D cpu_to_le32(~0U); + ib->filter[1] =3D cpu_to_le32(~0U); +- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff); +- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff); +- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff); +- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff); ++ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff); ++ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff); ++ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff); ++ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff); + return; + } + /* clear the multicast filter */ +@@ -2710,7 +2710,7 @@ static void pcnet32_load_multicast(struc + mcast_table[crc >> 4] |=3D cpu_to_le16(1 << (crc & 0xf)); + } + for (i =3D 0; i < 4; i++) +- lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i, ++ lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i, + le16_to_cpu(mcast_table[i])); + return; + } +@@ -2726,7 +2726,7 @@ static void pcnet32_set_multicast_list(s +=20 + spin_lock_irqsave(&lp->lock, flags); + suspended =3D pcnet32_suspend(dev, &flags, 0); +- csr15 =3D lp->a.read_csr(ioaddr, CSR15); ++ csr15 =3D lp->a->read_csr(ioaddr, CSR15); + if (dev->flags & IFF_PROMISC) { + /* Log any net taps. */ + if (netif_msg_hw(lp)) +@@ -2735,21 +2735,21 @@ static void pcnet32_set_multicast_list(s + lp->init_block->mode =3D + cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) << + 7); +- lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000); ++ lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000); + } else { + lp->init_block->mode =3D + cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7); +- lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff); ++ lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff); + pcnet32_load_multicast(dev); + } +=20 + if (suspended) { + int csr5; + /* clear SUSPEND (SPND) - CSR5 bit 0 */ +- csr5 =3D lp->a.read_csr(ioaddr, CSR5); +- lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND)); ++ csr5 =3D lp->a->read_csr(ioaddr, CSR5); ++ lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND)); + } else { +- lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); ++ lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); + pcnet32_restart(dev, CSR0_NORMAL); + netif_wake_queue(dev); + } +@@ -2767,8 +2767,8 @@ static int mdio_read(struct net_device * + if (!lp->mii) + return 0; +=20 +- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f))= ; +- val_out =3D lp->a.read_bcr(ioaddr, 34); ++ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f)= ); ++ val_out =3D lp->a->read_bcr(ioaddr, 34); +=20 + return val_out; + } +@@ -2782,8 +2782,8 @@ static void mdio_write(struct net_device + if (!lp->mii) + return; +=20 +- lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f))= ; +- lp->a.write_bcr(ioaddr, 34, val); ++ lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f)= ); ++ lp->a->write_bcr(ioaddr, 34, val); + } +=20 + static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int = cmd) +@@ -2862,7 +2862,7 @@ static void pcnet32_check_media(struct n + curr_link =3D mii_link_ok(&lp->mii_if); + } else { + ulong ioaddr =3D dev->base_addr; /* card base I/O address */ +- curr_link =3D (lp->a.read_bcr(ioaddr, 4) !=3D 0xc0); ++ curr_link =3D (lp->a->read_bcr(ioaddr, 4) !=3D 0xc0); + } + if (!curr_link) { + if (prev_link || verbose) { +@@ -2887,13 +2887,13 @@ static void pcnet32_check_media(struct n + (ecmd.duplex =3D=3D + DUPLEX_FULL) ? "full" : "half"); + } +- bcr9 =3D lp->a.read_bcr(dev->base_addr, 9); ++ bcr9 =3D lp->a->read_bcr(dev->base_addr, 9); + if ((bcr9 & (1 << 0)) !=3D lp->mii_if.full_duplex) { + if (lp->mii_if.full_duplex) + bcr9 |=3D (1 << 0); + else + bcr9 &=3D ~(1 << 0); +- lp->a.write_bcr(dev->base_addr, 9, bcr9); ++ lp->a->write_bcr(dev->base_addr, 9, bcr9); + } + } else { + if (netif_msg_link(lp)) +diff -urNp linux-2.6.32.45/drivers/net/tg3.h linux-2.6.32.45/drivers/net= /tg3.h +--- linux-2.6.32.45/drivers/net/tg3.h 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/net/tg3.h 2011-04-17 15:56:46.000000000 -040= 0 +@@ -95,6 +95,7 @@ + #define CHIPREV_ID_5750_A0 0x4000 + #define CHIPREV_ID_5750_A1 0x4001 + #define CHIPREV_ID_5750_A3 0x4003 ++#define CHIPREV_ID_5750_C1 0x4201 + #define CHIPREV_ID_5750_C2 0x4202 + #define CHIPREV_ID_5752_A0_HW 0x5000 + #define CHIPREV_ID_5752_A0 0x6000 +diff -urNp linux-2.6.32.45/drivers/net/tokenring/abyss.c linux-2.6.32.45= /drivers/net/tokenring/abyss.c +--- linux-2.6.32.45/drivers/net/tokenring/abyss.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/net/tokenring/abyss.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver =3D=20 +=20 + static int __init abyss_init (void) + { +- abyss_netdev_ops =3D tms380tr_netdev_ops; ++ pax_open_kernel(); ++ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380t= r_netdev_ops)); +=20 +- abyss_netdev_ops.ndo_open =3D abyss_open; +- abyss_netdev_ops.ndo_stop =3D abyss_close; ++ *(void **)&abyss_netdev_ops.ndo_open =3D abyss_open; ++ *(void **)&abyss_netdev_ops.ndo_stop =3D abyss_close; ++ pax_close_kernel(); +=20 + return pci_register_driver(&abyss_driver); + } +diff -urNp linux-2.6.32.45/drivers/net/tokenring/madgemc.c linux-2.6.32.= 45/drivers/net/tokenring/madgemc.c +--- linux-2.6.32.45/drivers/net/tokenring/madgemc.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/net/tokenring/madgemc.c 2011-08-05 20:33:55.= 000000000 -0400 +@@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver=20 +=20 + static int __init madgemc_init (void) + { +- madgemc_netdev_ops =3D tms380tr_netdev_ops; +- madgemc_netdev_ops.ndo_open =3D madgemc_open; +- madgemc_netdev_ops.ndo_stop =3D madgemc_close; ++ pax_open_kernel(); ++ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms38= 0tr_netdev_ops)); ++ *(void **)&madgemc_netdev_ops.ndo_open =3D madgemc_open; ++ *(void **)&madgemc_netdev_ops.ndo_stop =3D madgemc_close; ++ pax_close_kernel(); +=20 + return mca_register_driver (&madgemc_driver); + } +diff -urNp linux-2.6.32.45/drivers/net/tokenring/proteon.c linux-2.6.32.= 45/drivers/net/tokenring/proteon.c +--- linux-2.6.32.45/drivers/net/tokenring/proteon.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/net/tokenring/proteon.c 2011-08-05 20:33:55.= 000000000 -0400 +@@ -353,9 +353,11 @@ static int __init proteon_init(void) + struct platform_device *pdev; + int i, num =3D 0, err =3D 0; +=20 +- proteon_netdev_ops =3D tms380tr_netdev_ops; +- proteon_netdev_ops.ndo_open =3D proteon_open; +- proteon_netdev_ops.ndo_stop =3D tms380tr_close; ++ pax_open_kernel(); ++ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms38= 0tr_netdev_ops)); ++ *(void **)&proteon_netdev_ops.ndo_open =3D proteon_open; ++ *(void **)&proteon_netdev_ops.ndo_stop =3D tms380tr_close; ++ pax_close_kernel(); +=20 + err =3D platform_driver_register(&proteon_driver); + if (err) +diff -urNp linux-2.6.32.45/drivers/net/tokenring/skisa.c linux-2.6.32.45= /drivers/net/tokenring/skisa.c +--- linux-2.6.32.45/drivers/net/tokenring/skisa.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/net/tokenring/skisa.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -363,9 +363,11 @@ static int __init sk_isa_init(void) + struct platform_device *pdev; + int i, num =3D 0, err =3D 0; +=20 +- sk_isa_netdev_ops =3D tms380tr_netdev_ops; +- sk_isa_netdev_ops.ndo_open =3D sk_isa_open; +- sk_isa_netdev_ops.ndo_stop =3D tms380tr_close; ++ pax_open_kernel(); ++ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380= tr_netdev_ops)); ++ *(void **)&sk_isa_netdev_ops.ndo_open =3D sk_isa_open; ++ *(void **)&sk_isa_netdev_ops.ndo_stop =3D tms380tr_close; ++ pax_close_kernel(); +=20 + err =3D platform_driver_register(&sk_isa_driver); + if (err) +diff -urNp linux-2.6.32.45/drivers/net/tulip/de2104x.c linux-2.6.32.45/d= rivers/net/tulip/de2104x.c +--- linux-2.6.32.45/drivers/net/tulip/de2104x.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/net/tulip/de2104x.c 2011-05-16 21:46:57.0000= 00000 -0400 +@@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_i + struct de_srom_info_leaf *il; + void *bufp; +=20 ++ pax_track_stack(); ++ + /* download entire eeprom */ + for (i =3D 0; i < DE_EEPROM_WORDS; i++) + ((__le16 *)ee_data)[i] =3D +diff -urNp linux-2.6.32.45/drivers/net/tulip/de4x5.c linux-2.6.32.45/dri= vers/net/tulip/de4x5.c +--- linux-2.6.32.45/drivers/net/tulip/de4x5.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/net/tulip/de4x5.c 2011-04-17 15:56:46.000000= 000 -0400 +@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru + for (i=3D0; idev_addr[i]; + } +- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT; ++ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, io= c->len)) return -EFAULT; + break; +=20 + case DE4X5_SET_HWADDR: /* Set the hardware address */ +@@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, stru + spin_lock_irqsave(&lp->lock, flags); + memcpy(&statbuf, &lp->pktStats, ioc->len); + spin_unlock_irqrestore(&lp->lock, flags); +- if (copy_to_user(ioc->data, &statbuf, ioc->len)) ++ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc= ->len)) + return -EFAULT; + break; + } +diff -urNp linux-2.6.32.45/drivers/net/usb/hso.c linux-2.6.32.45/drivers= /net/usb/hso.c +--- linux-2.6.32.45/drivers/net/usb/hso.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/net/usb/hso.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -71,7 +71,7 @@ + #include + #include + #include +- ++#include +=20 + #define DRIVER_VERSION "1.2" + #define MOD_AUTHOR "Option Wireless" +@@ -258,7 +258,7 @@ struct hso_serial { +=20 + /* from usb_serial_port */ + struct tty_struct *tty; +- int open_count; ++ local_t open_count; + spinlock_t serial_lock; +=20 + int (*write_data) (struct hso_serial *serial); +@@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ + struct urb *urb; +=20 + urb =3D serial->rx_urb[0]; +- if (serial->open_count > 0) { ++ if (local_read(&serial->open_count) > 0) { + count =3D put_rxbuf_data(urb, serial); + if (count =3D=3D -1) + return; +@@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_cal + DUMP1(urb->transfer_buffer, urb->actual_length); +=20 + /* Anyone listening? */ +- if (serial->open_count =3D=3D 0) ++ if (local_read(&serial->open_count) =3D=3D 0) + return; +=20 + if (status =3D=3D 0) { +@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st + spin_unlock_irq(&serial->serial_lock); +=20 + /* check for port already opened, if not set the termios */ +- serial->open_count++; +- if (serial->open_count =3D=3D 1) { ++ if (local_inc_return(&serial->open_count) =3D=3D 1) { + tty->low_latency =3D 1; + serial->rx_state =3D RX_IDLE; + /* Force default termio settings */ +@@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_st + result =3D hso_start_serial_device(serial->parent, GFP_KERNEL); + if (result) { + hso_stop_serial_device(serial->parent); +- serial->open_count--; ++ local_dec(&serial->open_count); + kref_put(&serial->parent->ref, hso_serial_ref_free); + } + } else { +@@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_ +=20 + /* reset the rts and dtr */ + /* do the actual close */ +- serial->open_count--; ++ local_dec(&serial->open_count); +=20 +- if (serial->open_count <=3D 0) { +- serial->open_count =3D 0; ++ if (local_read(&serial->open_count) <=3D 0) { ++ local_set(&serial->open_count, 0); + spin_lock_irq(&serial->serial_lock); + if (serial->tty =3D=3D tty) { + serial->tty->driver_data =3D NULL; +@@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struc +=20 + /* the actual setup */ + spin_lock_irqsave(&serial->serial_lock, flags); +- if (serial->open_count) ++ if (local_read(&serial->open_count)) + _hso_serial_set_termios(tty, old); + else + tty->termios =3D old; +@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interfa + /* Start all serial ports */ + for (i =3D 0; i < HSO_SERIAL_TTY_MINORS; i++) { + if (serial_table[i] && (serial_table[i]->interface =3D=3D iface)) { +- if (dev2ser(serial_table[i])->open_count) { ++ if (local_read(&dev2ser(serial_table[i])->open_count)) { + result =3D + hso_start_serial_device(serial_table[i], GFP_NOIO); + hso_kick_transmit(dev2ser(serial_table[i])); +diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-config.h linux-2.6.32.4= 5/drivers/net/vxge/vxge-config.h +--- linux-2.6.32.45/drivers/net/vxge/vxge-config.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/net/vxge/vxge-config.h 2011-08-05 20:33:55.0= 00000000 -0400 +@@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs { + void (*link_down)(struct __vxge_hw_device *devh); + void (*crit_err)(struct __vxge_hw_device *devh, + enum vxge_hw_event type, u64 ext_data); +-}; ++} __no_const; +=20 + /* + * struct __vxge_hw_blockpool_entry - Block private data structure +diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-main.c linux-2.6.32.45/= drivers/net/vxge/vxge-main.c +--- linux-2.6.32.45/drivers/net/vxge/vxge-main.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/net/vxge/vxge-main.c 2011-05-16 21:46:57.000= 000000 -0400 +@@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_T + struct sk_buff *completed[NR_SKB_COMPLETED]; + int more; +=20 ++ pax_track_stack(); ++ + do { + more =3D 0; + skb_ptr =3D completed; +@@ -1779,6 +1781,8 @@ static enum vxge_hw_status vxge_rth_conf + u8 mtable[256] =3D {0}; /* CPU to vpath mapping */ + int index; +=20 ++ pax_track_stack(); ++ + /* + * Filling + * - itable with bucket numbers +diff -urNp linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h linux-2.6.32.= 45/drivers/net/vxge/vxge-traffic.h +--- linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/net/vxge/vxge-traffic.h 2011-08-05 20:33:55.= 000000000 -0400 +@@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs { + struct vxge_hw_mempool_dma *dma_object, + u32 index, + u32 is_last); +-}; ++} __no_const; +=20 + void + __vxge_hw_mempool_destroy( +diff -urNp linux-2.6.32.45/drivers/net/wan/cycx_x25.c linux-2.6.32.45/dr= ivers/net/wan/cycx_x25.c +--- linux-2.6.32.45/drivers/net/wan/cycx_x25.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/wan/cycx_x25.c 2011-05-16 21:46:57.00000= 0000 -0400 +@@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned + unsigned char hex[1024], + * phex =3D hex; +=20 ++ pax_track_stack(); ++ + if (len >=3D (sizeof(hex) / 2)) + len =3D (sizeof(hex) / 2) - 1; +=20 +diff -urNp linux-2.6.32.45/drivers/net/wan/hdlc_x25.c linux-2.6.32.45/dr= ivers/net/wan/hdlc_x25.c +--- linux-2.6.32.45/drivers/net/wan/hdlc_x25.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/net/wan/hdlc_x25.c 2011-08-05 20:33:55.00000= 0000 -0400 +@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu +=20 + static int x25_open(struct net_device *dev) + { +- struct lapb_register_struct cb; ++ static struct lapb_register_struct cb =3D { ++ .connect_confirmation =3D x25_connected, ++ .connect_indication =3D x25_connected, ++ .disconnect_confirmation =3D x25_disconnected, ++ .disconnect_indication =3D x25_disconnected, ++ .data_indication =3D x25_data_indication, ++ .data_transmit =3D x25_data_transmit ++ }; + int result; +=20 +- cb.connect_confirmation =3D x25_connected; +- cb.connect_indication =3D x25_connected; +- cb.disconnect_confirmation =3D x25_disconnected; +- cb.disconnect_indication =3D x25_disconnected; +- cb.data_indication =3D x25_data_indication; +- cb.data_transmit =3D x25_data_transmit; +- + result =3D lapb_register(dev, &cb); + if (result !=3D LAPB_OK) + return result; +diff -urNp linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c linux-2.6.3= 2.45/drivers/net/wimax/i2400m/usb-fw.c +--- linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wimax/i2400m/usb-fw.c 2011-05-16 21:46:5= 7.000000000 -0400 +@@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru + int do_autopm =3D 1; + DECLARE_COMPLETION_ONSTACK(notif_completion); +=20 ++ pax_track_stack(); ++ + d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n", + i2400m, ack, ack_size); + BUG_ON(_ack =3D=3D i2400m->bm_ack_buf); +diff -urNp linux-2.6.32.45/drivers/net/wireless/airo.c linux-2.6.32.45/d= rivers/net/wireless/airo.c +--- linux-2.6.32.45/drivers/net/wireless/airo.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/airo.c 2011-05-16 21:46:57.0000= 00000 -0400 +@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s + BSSListElement * loop_net; + BSSListElement * tmp_net; +=20 ++ pax_track_stack(); ++ + /* Blow away current list of scan results */ + list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) = { + list_move_tail (&loop_net->list, &ai->network_free_list); +@@ -3783,6 +3785,8 @@ static u16 setup_card(struct airo_info * + WepKeyRid wkr; + int rc; +=20 ++ pax_track_stack(); ++ + memset( &mySsid, 0, sizeof( mySsid ) ); + kfree (ai->flash); + ai->flash =3D NULL; +@@ -4758,6 +4762,8 @@ static int proc_stats_rid_open( struct i + __le32 *vals =3D stats.vals; + int len; +=20 ++ pax_track_stack(); ++ + if ((file->private_data =3D kzalloc(sizeof(struct proc_data ), GFP_KER= NEL)) =3D=3D NULL) + return -ENOMEM; + data =3D (struct proc_data *)file->private_data; +@@ -5487,6 +5493,8 @@ static int proc_BSSList_open( struct ino + /* If doLoseSync is not 1, we won't do a Lose Sync */ + int doLoseSync =3D -1; +=20 ++ pax_track_stack(); ++ + if ((file->private_data =3D kzalloc(sizeof(struct proc_data ), GFP_KER= NEL)) =3D=3D NULL) + return -ENOMEM; + data =3D (struct proc_data *)file->private_data; +@@ -7193,6 +7201,8 @@ static int airo_get_aplist(struct net_de + int i; + int loseSync =3D capable(CAP_NET_ADMIN) ? 1: -1; +=20 ++ pax_track_stack(); ++ + qual =3D kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL); + if (!qual) + return -ENOMEM; +@@ -7753,6 +7763,8 @@ static void airo_read_wireless_stats(str + CapabilityRid cap_rid; + __le32 *vals =3D stats_rid.vals; +=20 ++ pax_track_stack(); ++ + /* Get stats out of the card */ + clear_bit(JOB_WSTATS, &local->jobs); + if (local->power.event) { +diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c linux-= 2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c +--- linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/ath/ath5k/debug.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct f + unsigned int v; + u64 tsf; +=20 ++ pax_track_stack(); ++ + v =3D ath5k_hw_reg_read(sc->ah, AR5K_BEACON); + len +=3D snprintf(buf+len, sizeof(buf)-len, + "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n", +@@ -318,6 +320,8 @@ static ssize_t read_file_debug(struct fi + unsigned int len =3D 0; + unsigned int i; +=20 ++ pax_track_stack(); ++ + len +=3D snprintf(buf+len, sizeof(buf)-len, + "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level); +=20 +diff -urNp linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c linux-= 2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c +--- linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/ath/ath9k/debug.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struc + char buf[512]; + unsigned int len =3D 0; +=20 ++ pax_track_stack(); ++ + len +=3D snprintf(buf + len, sizeof(buf) - len, + "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok); + len +=3D snprintf(buf + len, sizeof(buf) - len, +@@ -360,6 +362,8 @@ static ssize_t read_file_wiphy(struct fi + int i; + u8 addr[ETH_ALEN]; +=20 ++ pax_track_stack(); ++ + len +=3D snprintf(buf + len, sizeof(buf) - len, + "primary: %s (%s chan=3D%d ht=3D%d)\n", + wiphy_name(sc->pri_wiphy->hw->wiphy), +diff -urNp linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c linux-2.6.= 32.45/drivers/net/wireless/b43/debugfs.c +--- linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/b43/debugfs.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -43,7 +43,7 @@ static struct dentry *rootdir; + struct b43_debugfs_fops { + ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); + 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.45/drivers/net/wireless/b43legacy/debugfs.c linu= x-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c +--- linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/b43legacy/debugfs.c 2011-04-17 = 15:56:46.000000000 -0400 +@@ -44,7 +44,7 @@ static struct dentry *rootdir; + struct b43legacy_debugfs_fops { + ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize= ); + int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t coun= t); +- 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.45/drivers/net/wireless/ipw2x00/ipw2100.c linux-= 2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c +--- linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/ipw2x00/ipw2100.c 2011-05-16 21= :46:57.000000000 -0400 +@@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2 + int err; + DECLARE_SSID_BUF(ssid); +=20 ++ pax_track_stack(); ++ + IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len)); +=20 + if (ssid_len) +@@ -5380,6 +5382,8 @@ static int ipw2100_set_key(struct ipw210 + struct ipw2100_wep_key *wep_key =3D (void *)cmd.host_command_parameter= s; + int err; +=20 ++ pax_track_stack(); ++ + IPW_DEBUG_HC("WEP_KEY_INFO: index =3D %d, len =3D %d/%d\n", + idx, keylen, len); +=20 +diff -urNp linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c linu= x-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c +--- linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/ipw2x00/libipw_rx.c 2011-05-16 = 21:46:57.000000000 -0400 +@@ -1566,6 +1566,8 @@ static void libipw_process_probe_respons + unsigned long flags; + DECLARE_SSID_BUF(ssid); +=20 ++ pax_track_stack(); ++ + LIBIPW_DEBUG_SCAN("'%s' (%pM" + "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n", + print_ssid(ssid, info_element->data, info_element->len), +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c linux= -2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-1000.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =3D=20 + }, + }; +=20 +-static struct iwl_ops iwl1000_ops =3D { ++static const struct iwl_ops iwl1000_ops =3D { + .ucode =3D &iwl5000_ucode, + .lib =3D &iwl1000_lib, + .hcmd =3D &iwl5000_hcmd, +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c l= inux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-03-= 27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl3945-base.c 2011-08-= 05 20:33:55.000000000 -0400 +@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_ + */ + if (iwl3945_mod_params.disable_hw_scan) { + IWL_DEBUG_INFO(priv, "Disabling hw_scan\n"); +- iwl3945_hw_ops.hw_scan =3D NULL; ++ pax_open_kernel(); ++ *(void **)&iwl3945_hw_ops.hw_scan =3D NULL; ++ pax_close_kernel(); + } +=20 +=20 +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c linux= -2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-3945.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 + .build_addsta_hcmd =3D iwl3945_build_addsta_hcmd, + }; +=20 +-static struct iwl_ops iwl3945_ops =3D { ++static const struct iwl_ops iwl3945_ops =3D { + .ucode =3D &iwl3945_ucode, + .lib =3D &iwl3945_lib, + .hcmd =3D &iwl3945_hcmd, +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c linux= -2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-4965.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib =3D=20 + }, + }; +=20 +-static struct iwl_ops iwl4965_ops =3D { ++static const struct iwl_ops iwl4965_ops =3D { + .ucode =3D &iwl4965_ucode, + .lib =3D &iwl4965_lib, + .hcmd =3D &iwl4965_hcmd, +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c linux= -2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 1= 2:55:34.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-5000.c 2011-06-25 1= 2:56:37.000000000 -0400 +@@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib =3D=20 + }, + }; +=20 +-struct iwl_ops iwl5000_ops =3D { ++const struct iwl_ops iwl5000_ops =3D { + .ucode =3D &iwl5000_ucode, + .lib =3D &iwl5000_lib, + .hcmd =3D &iwl5000_hcmd, + .utils =3D &iwl5000_hcmd_utils, + }; +=20 +-static struct iwl_ops iwl5150_ops =3D { ++static const struct iwl_ops iwl5150_ops =3D { + .ucode =3D &iwl5000_ucode, + .lib =3D &iwl5150_lib, + .hcmd =3D &iwl5000_hcmd, +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c linux= -2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-6000.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 + .calc_rssi =3D iwl5000_calc_rssi, + }; +=20 +-static struct iwl_ops iwl6000_ops =3D { ++static const struct iwl_ops iwl6000_ops =3D { + .ucode =3D &iwl5000_ucode, + .lib =3D &iwl6000_lib, + .hcmd =3D &iwl5000_hcmd, +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c linux-= 2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn.c 2011-08-05 20= :33:55.000000000 -0400 +@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev=20 + if (iwl_debug_level & IWL_DL_INFO) + dev_printk(KERN_DEBUG, &(pdev->dev), + "Disabling hw_scan\n"); +- iwl_hw_ops.hw_scan =3D NULL; ++ pax_open_kernel(); ++ *(void **)&iwl_hw_ops.hw_scan =3D NULL; ++ pax_close_kernel(); + } +=20 + hw =3D iwl_alloc_all(cfg, &iwl_hw_ops); +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c lin= ux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-agn-rs.c 2011-05-16= 21:46:57.000000000 -0400 +@@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, s + u8 active_index =3D 0; + s32 tpt =3D 0; +=20 ++ pax_track_stack(); ++ + IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale = window\n"); +=20 + if (!ieee80211_is_data(hdr->frame_control) || +@@ -2722,6 +2724,8 @@ static void rs_fill_link_cmd(struct iwl_ + u8 valid_tx_ant =3D 0; + struct iwl_link_quality_cmd *lq_cmd =3D &lq_sta->lq; +=20 ++ pax_track_stack(); ++ + /* Override starting rate (index 0) if needed for debug purposes */ + rs_dbgfs_set_mcs(lq_sta, &new_rate, index); +=20 +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c li= nux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-03-2= 7 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debugfs.c 2011-05-1= 6 21:46:57.000000000 -0400 +@@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(str + int pos =3D 0; + const size_t bufsz =3D sizeof(buf); +=20 ++ pax_track_stack(); ++ + pos +=3D scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n= ", + test_bit(STATUS_HCMD_ACTIVE, &priv->status)); + pos +=3D scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_SYNC_ACTIVE: %= d\n", +@@ -658,6 +660,8 @@ static ssize_t iwl_dbgfs_qos_read(struct + const size_t bufsz =3D sizeof(buf); + ssize_t ret; +=20 ++ pax_track_stack(); ++ + for (i =3D 0; i < AC_NUM; i++) { + pos +=3D scnprintf(buf + pos, bufsz - pos, + "\tcw_min\tcw_max\taifsn\ttxop\n"); +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h linu= x-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-debug.h 2011-04-17 = 15:56:46.000000000 -0400 +@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri + #endif +=20 + #else +-#define IWL_DEBUG(__priv, level, fmt, args...) +-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) ++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0) ++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0) + static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level, + void *p, u32 len) + {} +diff -urNp linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h linux-= 2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h +--- linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwlwifi/iwl-dev.h 2011-04-17 15= :56:46.000000000 -0400 +@@ -68,7 +68,7 @@ struct iwl_tx_queue; +=20 + /* shared structures from iwl-5000.c */ + extern struct iwl_mod_params iwl50_mod_params; +-extern struct iwl_ops iwl5000_ops; ++extern const struct iwl_ops iwl5000_ops; + 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.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c l= inux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c +--- linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-03-= 27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/iwmc3200wifi/debugfs.c 2011-05-= 16 21:46:57.000000000 -0400 +@@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(s + int buf_len =3D 512; + size_t len =3D 0; +=20 ++ pax_track_stack(); ++ + if (*ppos !=3D 0) + return 0; + if (count < sizeof(buf)) +diff -urNp linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c linux= -2.6.32.45/drivers/net/wireless/libertas/debugfs.c +--- linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/libertas/debugfs.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -708,7 +708,7 @@ out_unlock: + struct lbs_debugfs_files { + const char *name; + int perm; +- struct file_operations fops; ++ const struct file_operations fops; + }; +=20 + static const struct lbs_debugfs_files debugfs_files[] =3D { +diff -urNp linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c linux-2.6.3= 2.45/drivers/net/wireless/rndis_wlan.c +--- linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/net/wireless/rndis_wlan.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn +=20 + devdbg(usbdev, "set_rts_threshold %i", rts_threshold); +=20 +- if (rts_threshold < 0 || rts_threshold > 2347) ++ if (rts_threshold > 2347) + rts_threshold =3D 2347; +=20 + tmp =3D cpu_to_le32(rts_threshold); +diff -urNp linux-2.6.32.45/drivers/oprofile/buffer_sync.c linux-2.6.32.4= 5/drivers/oprofile/buffer_sync.c +--- linux-2.6.32.45/drivers/oprofile/buffer_sync.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/oprofile/buffer_sync.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en + if (cookie =3D=3D NO_COOKIE) + offset =3D pc; + if (cookie =3D=3D INVALID_COOKIE) { +- atomic_inc(&oprofile_stats.sample_lost_no_mapping); ++ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping); + offset =3D pc; + } + if (cookie !=3D last_cookie) { +@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct=20 + /* add userspace sample */ +=20 + if (!mm) { +- atomic_inc(&oprofile_stats.sample_lost_no_mm); ++ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm); + return 0; + } +=20 + cookie =3D lookup_dcookie(mm, s->eip, &offset); +=20 + if (cookie =3D=3D INVALID_COOKIE) { +- atomic_inc(&oprofile_stats.sample_lost_no_mapping); ++ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping); + return 0; + } +=20 +@@ -561,7 +561,7 @@ void sync_buffer(int cpu) + /* ignore backtraces if failed to add a sample */ + if (state =3D=3D sb_bt_start) { + state =3D sb_bt_ignore; +- atomic_inc(&oprofile_stats.bt_lost_no_mapping); ++ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping); + } + } + release_mm(mm); +diff -urNp linux-2.6.32.45/drivers/oprofile/event_buffer.c linux-2.6.32.= 45/drivers/oprofile/event_buffer.c +--- linux-2.6.32.45/drivers/oprofile/event_buffer.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/oprofile/event_buffer.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value + } +=20 + if (buffer_pos =3D=3D buffer_size) { +- atomic_inc(&oprofile_stats.event_lost_overflow); ++ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow); + return; + } +=20 +diff -urNp linux-2.6.32.45/drivers/oprofile/oprof.c linux-2.6.32.45/driv= ers/oprofile/oprof.c +--- linux-2.6.32.45/drivers/oprofile/oprof.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/oprofile/oprof.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -110,7 +110,7 @@ static void switch_worker(struct work_st + if (oprofile_ops.switch_events()) + return; +=20 +- atomic_inc(&oprofile_stats.multiplex_counter); ++ atomic_inc_unchecked(&oprofile_stats.multiplex_counter); + start_switch_worker(); + } +=20 +diff -urNp linux-2.6.32.45/drivers/oprofile/oprofilefs.c linux-2.6.32.45= /drivers/oprofile/oprofilefs.c +--- linux-2.6.32.45/drivers/oprofile/oprofilefs.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/oprofile/oprofilefs.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -187,7 +187,7 @@ static const struct file_operations atom +=20 +=20 + 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 =3D __oprofilefs_create_file(sb, root, name, + &atomic_ro_fops, 0444); +diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.c linux-2.6.3= 2.45/drivers/oprofile/oprofile_stats.c +--- linux-2.6.32.45/drivers/oprofile/oprofile_stats.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/oprofile/oprofile_stats.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) + cpu_buf->sample_invalid_eip =3D 0; + } +=20 +- atomic_set(&oprofile_stats.sample_lost_no_mm, 0); +- 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); + } +=20 +=20 +diff -urNp linux-2.6.32.45/drivers/oprofile/oprofile_stats.h linux-2.6.3= 2.45/drivers/oprofile/oprofile_stats.h +--- linux-2.6.32.45/drivers/oprofile/oprofile_stats.h 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/oprofile/oprofile_stats.h 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -13,11 +13,11 @@ + #include +=20 + struct oprofile_stat_struct { +- atomic_t sample_lost_no_mm; +- 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; + }; +=20 + extern struct oprofile_stat_struct oprofile_stats; +diff -urNp linux-2.6.32.45/drivers/parisc/pdc_stable.c linux-2.6.32.45/d= rivers/parisc/pdc_stable.c +--- linux-2.6.32.45/drivers/parisc/pdc_stable.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/parisc/pdc_stable.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj + return ret; + } +=20 +-static struct sysfs_ops pdcspath_attr_ops =3D { ++static const struct sysfs_ops pdcspath_attr_ops =3D { + .show =3D pdcspath_attr_show, + .store =3D pdcspath_attr_store, + }; +diff -urNp linux-2.6.32.45/drivers/parport/procfs.c linux-2.6.32.45/driv= ers/parport/procfs.c +--- linux-2.6.32.45/drivers/parport/procfs.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/parport/procfs.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t +=20 + *ppos +=3D len; +=20 +- return copy_to_user(result, buffer, len) ? -EFAULT : 0; ++ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -E= FAULT : 0; + } +=20 + #ifdef CONFIG_PARPORT_1284 +@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table +=20 + *ppos +=3D len; +=20 +- return copy_to_user (result, buffer, len) ? -EFAULT : 0; ++ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -= EFAULT : 0; + } + #endif /* IEEE1284.3 support. */ +=20 +diff -urNp linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.= 32.45/drivers/pci/hotplug/acpiphp_glue.c +--- linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/pci/hotplug/acpiphp_glue.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif + } +=20 +=20 +-static struct acpi_dock_ops acpiphp_dock_ops =3D { ++static const struct acpi_dock_ops acpiphp_dock_ops =3D { + .handler =3D handle_hotplug_event_func, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h linux-2.6.= 32.45/drivers/pci/hotplug/cpci_hotplug.h +--- linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/pci/hotplug/cpci_hotplug.h 2011-08-05 20:33:= 55.000000000 -0400 +@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops { + int (*hardware_test) (struct slot* slot, u32 value); + u8 (*get_power) (struct slot* slot); + int (*set_power) (struct slot* slot, int value); +-}; ++} __no_const; +=20 + struct cpci_hp_controller { + unsigned int irq; +diff -urNp linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.= 32.45/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/pci/hotplug/cpqphp_nvram.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ +=20 + void compaq_nvram_init (void __iomem *rom_start) + { ++ ++#ifndef CONFIG_PAX_KERNEXEC + if (rom_start) { + compaq_int15_entry_point =3D (rom_start + ROM_INT15_PHY_ADDR - ROM_PH= Y_ADDR); + } ++#endif ++ + dbg("int15 entry =3D %p\n", compaq_int15_entry_point); +=20 + /* initialize our int15 lock */ +diff -urNp linux-2.6.32.45/drivers/pci/hotplug/fakephp.c linux-2.6.32.45= /drivers/pci/hotplug/fakephp.c +--- linux-2.6.32.45/drivers/pci/hotplug/fakephp.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/pci/hotplug/fakephp.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec + } +=20 + static struct kobj_type legacy_ktype =3D { +- .sysfs_ops =3D &(struct sysfs_ops){ ++ .sysfs_ops =3D &(const struct sysfs_ops){ + .store =3D legacy_store, .show =3D legacy_show + }, + .release =3D &legacy_release, +diff -urNp linux-2.6.32.45/drivers/pci/intel-iommu.c linux-2.6.32.45/dri= vers/pci/intel-iommu.c +--- linux-2.6.32.45/drivers/pci/intel-iommu.c 2011-05-10 22:12:01.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/pci/intel-iommu.c 2011-05-10 22:12:33.000000= 000 -0400 +@@ -2643,7 +2643,7 @@ error: + return 0; + } +=20 +-static dma_addr_t intel_map_page(struct device *dev, struct page *page, ++dma_addr_t intel_map_page(struct device *dev, struct page *page, + unsigned long offset, size_t size, + enum dma_data_direction dir, + struct dma_attrs *attrs) +@@ -2719,7 +2719,7 @@ static void add_unmap(struct dmar_domain + spin_unlock_irqrestore(&async_umap_flush_lock, flags); + } +=20 +-static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, ++void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, + size_t size, enum dma_data_direction dir, + struct dma_attrs *attrs) + { +@@ -2768,7 +2768,7 @@ static void intel_unmap_page(struct devi + } + } +=20 +-static void *intel_alloc_coherent(struct device *hwdev, size_t size, ++void *intel_alloc_coherent(struct device *hwdev, size_t size, + dma_addr_t *dma_handle, gfp_t flags) + { + void *vaddr; +@@ -2800,7 +2800,7 @@ static void *intel_alloc_coherent(struct + return NULL; + } +=20 +-static void intel_free_coherent(struct device *hwdev, size_t size, void= *vaddr, ++void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr= , + dma_addr_t dma_handle) + { + int order; +@@ -2812,7 +2812,7 @@ static void intel_free_coherent(struct d + free_pages((unsigned long)vaddr, order); + } +=20 +-static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sg= list, ++void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, + int nelems, enum dma_data_direction dir, + struct dma_attrs *attrs) + { +@@ -2872,7 +2872,7 @@ static int intel_nontranslate_map_sg(str + return nelems; + } +=20 +-static int intel_map_sg(struct device *hwdev, struct scatterlist *sglis= t, int nelems, ++int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int = nelems, + enum dma_data_direction dir, struct dma_attrs *attrs) + { + int i; +@@ -2941,12 +2941,12 @@ static int intel_map_sg(struct device *h + return nelems; + } +=20 +-static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) ++int intel_mapping_error(struct device *dev, dma_addr_t dma_addr) + { + return !dma_addr; + } +=20 +-struct dma_map_ops intel_dma_ops =3D { ++const struct dma_map_ops intel_dma_ops =3D { + .alloc_coherent =3D intel_alloc_coherent, + .free_coherent =3D intel_free_coherent, + .map_sg =3D intel_map_sg, +diff -urNp linux-2.6.32.45/drivers/pci/pcie/aspm.c linux-2.6.32.45/drive= rs/pci/pcie/aspm.c +--- linux-2.6.32.45/drivers/pci/pcie/aspm.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/pci/pcie/aspm.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -27,9 +27,9 @@ + #define MODULE_PARAM_PREFIX "pcie_aspm." +=20 + /* Note: those are not register definitions */ +-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */ +-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */ +-#define ASPM_STATE_L1 (4) /* L1 state */ ++#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */ ++#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */ ++#define ASPM_STATE_L1 (4U) /* L1 state */ + #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW) + #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1) +=20 +diff -urNp linux-2.6.32.45/drivers/pci/probe.c linux-2.6.32.45/drivers/p= ci/probe.c +--- linux-2.6.32.45/drivers/pci/probe.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/pci/probe.c 2011-04-17 15:56:46.000000000 -0= 400 +@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity( + return ret; + } +=20 +-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev, ++static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev, + struct device_attribute *attr, + char *buf) + { + return pci_bus_show_cpuaffinity(dev, 0, attr, buf); + } +=20 +-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev, ++static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev, + struct device_attribute *attr, + char *buf) + { +diff -urNp linux-2.6.32.45/drivers/pci/proc.c linux-2.6.32.45/drivers/pc= i/proc.c +--- linux-2.6.32.45/drivers/pci/proc.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/pci/proc.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -480,7 +480,16 @@ static const struct file_operations proc + static int __init pci_proc_init(void) + { + struct pci_dev *dev =3D NULL; ++ ++#ifdef CONFIG_GRKERNSEC_PROC_ADD ++#ifdef CONFIG_GRKERNSEC_PROC_USER ++ proc_bus_pci_dir =3D proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NUL= L); ++#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP) ++ proc_bus_pci_dir =3D proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_= IRGRP | S_IXGRP, NULL); ++#endif ++#else + proc_bus_pci_dir =3D proc_mkdir("bus/pci", NULL); ++#endif + proc_create("devices", 0, proc_bus_pci_dir, + &proc_bus_pci_dev_operations); + proc_initialized =3D 1; +diff -urNp linux-2.6.32.45/drivers/pci/slot.c linux-2.6.32.45/drivers/pc= i/slot.c +--- linux-2.6.32.45/drivers/pci/slot.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/pci/slot.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc + return attribute->store ? attribute->store(slot, buf, len) : -EIO; + } +=20 +-static struct sysfs_ops pci_slot_sysfs_ops =3D { ++static const struct sysfs_ops pci_slot_sysfs_ops =3D { + .show =3D pci_slot_attr_show, + .store =3D pci_slot_attr_store, + }; +diff -urNp linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c linux-2.6.32.45= /drivers/pcmcia/pcmcia_ioctl.c +--- linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/pcmcia/pcmcia_ioctl.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode + return -EFAULT; + } + } +- buf =3D kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL); ++ buf =3D kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL); + if (!buf) + return -ENOMEM; +=20 +diff -urNp linux-2.6.32.45/drivers/platform/x86/acer-wmi.c linux-2.6.32.= 45/drivers/platform/x86/acer-wmi.c +--- linux-2.6.32.45/drivers/platform/x86/acer-wmi.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/acer-wmi.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -918,7 +918,7 @@ static int update_bl_status(struct backl + return 0; + } +=20 +-static struct backlight_ops acer_bl_ops =3D { ++static const struct backlight_ops acer_bl_ops =3D { + .get_brightness =3D read_brightness, + .update_status =3D update_bl_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/asus_acpi.c linux-2.6.32= .45/drivers/platform/x86/asus_acpi.c +--- linux-2.6.32.45/drivers/platform/x86/asus_acpi.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/asus_acpi.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_ + return 0; + } +=20 +-static struct backlight_ops asus_backlight_data =3D { ++static const struct backlight_ops asus_backlight_data =3D { + .get_brightness =3D read_brightness, + .update_status =3D set_brightness_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/asus-laptop.c linux-2.6.= 32.45/drivers/platform/x86/asus-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/asus-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/asus-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -250,7 +250,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 =3D { ++static const struct backlight_ops asusbl_ops =3D { + .get_brightness =3D read_brightness, + .update_status =3D update_bl_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/compal-laptop.c linux-2.= 6.32.45/drivers/platform/x86/compal-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/compal-laptop.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/compal-laptop.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -163,7 +163,7 @@ static int bl_update_status(struct backl + return set_lcd_level(b->props.brightness); + } +=20 +-static struct backlight_ops compalbl_ops =3D { ++static const struct backlight_ops compalbl_ops =3D { + .get_brightness =3D bl_get_brightness, + .update_status =3D bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/dell-laptop.c linux-2.6.= 32.45/drivers/platform/x86/dell-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:= 01.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/dell-laptop.c 2011-05-10 22:12:= 33.000000000 -0400 +@@ -318,7 +318,7 @@ static int dell_get_intensity(struct bac + return buffer.output[1]; + } +=20 +-static struct backlight_ops dell_ops =3D { ++static const struct backlight_ops dell_ops =3D { + .get_brightness =3D dell_get_intensity, + .update_status =3D dell_send_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c linux-2.6= .32.45/drivers/platform/x86/eeepc-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/eeepc-laptop.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device + */ + static int read_brightness(struct backlight_device *bd); + static int update_bl_status(struct backlight_device *bd); +-static struct backlight_ops eeepcbl_ops =3D { ++static const struct backlight_ops eeepcbl_ops =3D { + .get_brightness =3D read_brightness, + .update_status =3D update_bl_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c linux-2= .6.32.45/drivers/platform/x86/fujitsu-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/fujitsu-laptop.c 2011-04-17 15:= 56:46.000000000 -0400 +@@ -436,7 +436,7 @@ static int bl_update_status(struct backl + return ret; + } +=20 +-static struct backlight_ops fujitsubl_ops =3D { ++static const struct backlight_ops fujitsubl_ops =3D { + .get_brightness =3D bl_get_brightness, + .update_status =3D bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/msi-laptop.c linux-2.6.3= 2.45/drivers/platform/x86/msi-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/msi-laptop.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/msi-laptop.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -161,7 +161,7 @@ static int bl_update_status(struct backl + return set_lcd_level(b->props.brightness); + } +=20 +-static struct backlight_ops msibl_ops =3D { ++static const struct backlight_ops msibl_ops =3D { + .get_brightness =3D bl_get_brightness, + .update_status =3D bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c linux= -2.6.32.45/drivers/platform/x86/panasonic-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/panasonic-laptop.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh + return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); + } +=20 +-static struct backlight_ops pcc_backlight_ops =3D { ++static const struct backlight_ops pcc_backlight_ops =3D { + .get_brightness =3D bl_get, + .update_status =3D bl_set_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/sony-laptop.c linux-2.6.= 32.45/drivers/platform/x86/sony-laptop.c +--- linux-2.6.32.45/drivers/platform/x86/sony-laptop.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/sony-laptop.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness + } +=20 + static struct backlight_device *sony_backlight_device; +-static struct backlight_ops sony_backlight_ops =3D { ++static const struct backlight_ops sony_backlight_ops =3D { + .update_status =3D sony_backlight_update_status, + .get_brightness =3D sony_backlight_get_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c linux-2.= 6.32.45/drivers/platform/x86/thinkpad_acpi.c +--- linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/thinkpad_acpi.c 2011-08-05 20:3= 3:55.000000000 -0400 +@@ -2137,7 +2137,7 @@ static int hotkey_mask_get(void) + return 0; + } +=20 +-void static hotkey_mask_warn_incomplete_mask(void) ++static void hotkey_mask_warn_incomplete_mask(void) + { + /* log only what the user can fix... */ + const u32 wantedmask =3D hotkey_driver_mask & +@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha + BACKLIGHT_UPDATE_HOTKEY); + } +=20 +-static struct backlight_ops ibm_backlight_data =3D { ++static const struct backlight_ops ibm_backlight_data =3D { + .get_brightness =3D brightness_get, + .update_status =3D brightness_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c linux-2.6= .32.45/drivers/platform/x86/toshiba_acpi.c +--- linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/platform/x86/toshiba_acpi.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -671,7 +671,7 @@ static acpi_status remove_device(void) + return AE_OK; + } +=20 +-static struct backlight_ops toshiba_backlight_data =3D { ++static const struct backlight_ops toshiba_backlight_data =3D { + .get_brightness =3D get_lcd, + .update_status =3D set_lcd_status, + }; +diff -urNp linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.= 45/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/pnp/pnpbios/bioscalls.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -60,7 +60,7 @@ do { \ + set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ + } while(0) +=20 +-static struct desc_struct bad_bios_desc =3D GDT_ENTRY_INIT(0x4092, ++static const struct desc_struct bad_bios_desc =3D GDT_ENTRY_INIT(0x4093= , + (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1); +=20 + /* +@@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func +=20 + cpu =3D get_cpu(); + save_desc_40 =3D get_cpu_gdt_table(cpu)[0x40 / 8]; ++ ++ pax_open_kernel(); + get_cpu_gdt_table(cpu)[0x40 / 8] =3D bad_bios_desc; ++ pax_close_kernel(); +=20 + /* On some boxes IRQ's during PnP BIOS calls are deadly. */ + spin_lock_irqsave(&pnp_bios_lock, flags); +@@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func + :"memory"); + spin_unlock_irqrestore(&pnp_bios_lock, flags); +=20 ++ pax_open_kernel(); + get_cpu_gdt_table(cpu)[0x40 / 8] =3D save_desc_40; ++ pax_close_kernel(); ++ + put_cpu(); +=20 + /* If we get here and this is set then the PnP BIOS faulted on us. */ +@@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 n + return status; + } +=20 +-void pnpbios_calls_init(union pnp_bios_install_struct *header) ++void __init pnpbios_calls_init(union pnp_bios_install_struct *header) + { + int i; +=20 +@@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_i + pnp_bios_callpoint.offset =3D header->fields.pm16offset; + pnp_bios_callpoint.segment =3D PNP_CS16; +=20 ++ pax_open_kernel(); ++ + for_each_possible_cpu(i) { + struct desc_struct *gdt =3D 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.32.45/drivers/pnp/resource.c linux-2.6.32.45/driver= s/pnp/resource.c +--- linux-2.6.32.45/drivers/pnp/resource.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/pnp/resource.c 2011-04-17 15:56:46.000000000= -0400 +@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s + return 1; +=20 + /* check if the resource is valid */ +- if (*irq < 0 || *irq > 15) ++ if (*irq > 15) + return 0; +=20 + /* check if the resource is reserved */ +@@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, s + return 1; +=20 + /* check if the resource is valid */ +- if (*dma < 0 || *dma =3D=3D 4 || *dma > 7) ++ if (*dma =3D=3D 4 || *dma > 7) + return 0; +=20 + /* check if the resource is reserved */ +diff -urNp linux-2.6.32.45/drivers/power/bq27x00_battery.c linux-2.6.32.= 45/drivers/power/bq27x00_battery.c +--- linux-2.6.32.45/drivers/power/bq27x00_battery.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/power/bq27x00_battery.c 2011-08-05 20:33:55.= 000000000 -0400 +@@ -44,7 +44,7 @@ struct bq27x00_device_info; + struct bq27x00_access_methods { + int (*read)(u8 reg, int *rt_value, int b_single, + struct bq27x00_device_info *di); +-}; ++} __no_const; +=20 + struct bq27x00_device_info { + struct device *dev; +diff -urNp linux-2.6.32.45/drivers/rtc/rtc-dev.c linux-2.6.32.45/drivers= /rtc/rtc-dev.c +--- linux-2.6.32.45/drivers/rtc/rtc-dev.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/rtc/rtc-dev.c 2011-04-17 15:56:46.000000000 = -0400 +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include "rtc-core.h" +=20 + static dev_t rtc_devt; +@@ -357,6 +358,8 @@ static long rtc_dev_ioctl(struct file *f + if (copy_from_user(&tm, uarg, sizeof(tm))) + return -EFAULT; +=20 ++ gr_log_timechange(); ++ + return rtc_set_time(rtc, &tm); +=20 + case RTC_PIE_ON: +diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.c linux-2.6.32.45/= drivers/s390/cio/qdio_perf.c +--- linux-2.6.32.45/drivers/s390/cio/qdio_perf.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/s390/cio/qdio_perf.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ + static int qdio_perf_proc_show(struct seq_file *m, void *v) + { + seq_printf(m, "Number of qdio interrupts\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.qdio_int)); ++ (long)atomic_long_read_unchecked(&perf_stats.qdio_int)); + seq_printf(m, "Number of PCI interrupts\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.pci_int)); ++ (long)atomic_long_read_unchecked(&perf_stats.pci_int)); + seq_printf(m, "Number of adapter interrupts\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.thin_int)); ++ (long)atomic_long_read_unchecked(&perf_stats.thin_int)); + seq_printf(m, "\n"); + seq_printf(m, "Inbound tasklet runs\t\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.tasklet_inbound)); ++ (long)atomic_long_read_unchecked(&perf_stats.tasklet_inbound)); + seq_printf(m, "Outbound tasklet runs\t\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.tasklet_outbound)); ++ (long)atomic_long_read_unchecked(&perf_stats.tasklet_outbound)); + seq_printf(m, "Adapter interrupt tasklet runs/loops\t\t: %li/%li\n", +- (long)atomic_long_read(&perf_stats.tasklet_thinint), +- (long)atomic_long_read(&perf_stats.tasklet_thinint_loop)); ++ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint), ++ (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint_loop)= ); + seq_printf(m, "Adapter interrupt inbound tasklet runs/loops\t: %li/%li= \n", +- (long)atomic_long_read(&perf_stats.thinint_inbound), +- (long)atomic_long_read(&perf_stats.thinint_inbound_loop)); ++ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound), ++ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop)= ); + seq_printf(m, "\n"); + seq_printf(m, "Number of SIGA In issued\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.siga_in)); ++ (long)atomic_long_read_unchecked(&perf_stats.siga_in)); + seq_printf(m, "Number of SIGA Out issued\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.siga_out)); ++ (long)atomic_long_read_unchecked(&perf_stats.siga_out)); + seq_printf(m, "Number of SIGA Sync issued\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.siga_sync)); ++ (long)atomic_long_read_unchecked(&perf_stats.siga_sync)); + seq_printf(m, "\n"); + seq_printf(m, "Number of inbound transfers\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.inbound_handler)); ++ (long)atomic_long_read_unchecked(&perf_stats.inbound_handler)); + seq_printf(m, "Number of outbound transfers\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.outbound_handler)); ++ (long)atomic_long_read_unchecked(&perf_stats.outbound_handler)); + seq_printf(m, "\n"); + seq_printf(m, "Number of fast requeues (outg. SBAL w/o SIGA)\t: %li\n"= , +- (long)atomic_long_read(&perf_stats.fast_requeue)); ++ (long)atomic_long_read_unchecked(&perf_stats.fast_requeue)); + seq_printf(m, "Number of outbound target full condition\t: %li\n", +- (long)atomic_long_read(&perf_stats.outbound_target_full)); ++ (long)atomic_long_read_unchecked(&perf_stats.outbound_target_full)= ); + seq_printf(m, "Number of outbound tasklet mod_timer calls\t: %li\n", +- (long)atomic_long_read(&perf_stats.debug_tl_out_timer)); ++ (long)atomic_long_read_unchecked(&perf_stats.debug_tl_out_timer)); + seq_printf(m, "Number of stop polling calls\t\t\t: %li\n", +- (long)atomic_long_read(&perf_stats.debug_stop_polling)); ++ (long)atomic_long_read_unchecked(&perf_stats.debug_stop_polling)); + seq_printf(m, "AI inbound tasklet loops after stop polling\t: %li\n", +- (long)atomic_long_read(&perf_stats.thinint_inbound_loop2)); ++ (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop2= )); + seq_printf(m, "QEBSM EQBS total/incomplete\t\t\t: %li/%li\n", +- (long)atomic_long_read(&perf_stats.debug_eqbs_all), +- (long)atomic_long_read(&perf_stats.debug_eqbs_incomplete)); ++ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_all), ++ (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_incomplete= )); + seq_printf(m, "QEBSM SQBS total/incomplete\t\t\t: %li/%li\n", +- (long)atomic_long_read(&perf_stats.debug_sqbs_all), +- (long)atomic_long_read(&perf_stats.debug_sqbs_incomplete)); ++ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_all), ++ (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_incomplete= )); + seq_printf(m, "\n"); + return 0; + } +diff -urNp linux-2.6.32.45/drivers/s390/cio/qdio_perf.h linux-2.6.32.45/= drivers/s390/cio/qdio_perf.h +--- linux-2.6.32.45/drivers/s390/cio/qdio_perf.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/s390/cio/qdio_perf.h 2011-04-17 15:56:46.000= 000000 -0400 +@@ -13,46 +13,46 @@ +=20 + struct qdio_perf_stats { + /* interrupt handler calls */ +- atomic_long_t qdio_int; +- atomic_long_t pci_int; +- atomic_long_t thin_int; ++ atomic_long_unchecked_t qdio_int; ++ atomic_long_unchecked_t pci_int; ++ atomic_long_unchecked_t thin_int; +=20 + /* tasklet runs */ +- atomic_long_t tasklet_inbound; +- atomic_long_t tasklet_outbound; +- atomic_long_t tasklet_thinint; +- atomic_long_t tasklet_thinint_loop; +- atomic_long_t thinint_inbound; +- atomic_long_t thinint_inbound_loop; +- atomic_long_t thinint_inbound_loop2; ++ atomic_long_unchecked_t tasklet_inbound; ++ atomic_long_unchecked_t tasklet_outbound; ++ atomic_long_unchecked_t tasklet_thinint; ++ atomic_long_unchecked_t tasklet_thinint_loop; ++ atomic_long_unchecked_t thinint_inbound; ++ atomic_long_unchecked_t thinint_inbound_loop; ++ atomic_long_unchecked_t thinint_inbound_loop2; +=20 + /* signal adapter calls */ +- atomic_long_t siga_out; +- atomic_long_t siga_in; +- atomic_long_t siga_sync; ++ atomic_long_unchecked_t siga_out; ++ atomic_long_unchecked_t siga_in; ++ atomic_long_unchecked_t siga_sync; +=20 + /* misc */ +- atomic_long_t inbound_handler; +- atomic_long_t outbound_handler; +- atomic_long_t fast_requeue; +- atomic_long_t outbound_target_full; ++ atomic_long_unchecked_t inbound_handler; ++ atomic_long_unchecked_t outbound_handler; ++ atomic_long_unchecked_t fast_requeue; ++ atomic_long_unchecked_t outbound_target_full; +=20 + /* for debugging */ +- atomic_long_t debug_tl_out_timer; +- atomic_long_t debug_stop_polling; +- atomic_long_t debug_eqbs_all; +- atomic_long_t debug_eqbs_incomplete; +- atomic_long_t debug_sqbs_all; +- atomic_long_t debug_sqbs_incomplete; ++ atomic_long_unchecked_t debug_tl_out_timer; ++ atomic_long_unchecked_t debug_stop_polling; ++ atomic_long_unchecked_t debug_eqbs_all; ++ atomic_long_unchecked_t debug_eqbs_incomplete; ++ atomic_long_unchecked_t debug_sqbs_all; ++ atomic_long_unchecked_t debug_sqbs_incomplete; + }; +=20 + extern struct qdio_perf_stats perf_stats; + extern int qdio_performance_stats; +=20 +-static inline void qdio_perf_stat_inc(atomic_long_t *count) ++static inline void qdio_perf_stat_inc(atomic_long_unchecked_t *count) + { + if (qdio_performance_stats) +- atomic_long_inc(count); ++ atomic_long_inc_unchecked(count); + } +=20 + int qdio_setup_perf_stats(void); +diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h linux-2.6.32.4= 5/drivers/scsi/aacraid/aacraid.h +--- linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/aacraid/aacraid.h 2011-08-05 20:33:55.0= 00000000 -0400 +@@ -471,7 +471,7 @@ struct adapter_ops + int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd); + /* Administrative operations */ + int (*adapter_comm)(struct aac_dev * dev, int comm); +-}; ++} __no_const; +=20 + /* + * Define which interrupt handler needs to be installed +diff -urNp linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c linux-2.6.32.= 45/drivers/scsi/aacraid/commctrl.c +--- linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/aacraid/commctrl.c 2011-05-16 21:46:57.= 000000000 -0400 +@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_d + u32 actual_fibsize64, actual_fibsize =3D 0; + int i; +=20 ++ pax_track_stack(); +=20 + if (dev->in_reset) { + dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n")); +diff -urNp linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6= .32.45/drivers/scsi/aic94xx/aic94xx_init.c +--- linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/aic94xx/aic94xx_init.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(stru + flash_error_table[i].reason); + } +=20 +-static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO, ++static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR, + asd_show_update_bios, asd_store_update_bios); +=20 + static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha) +diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.45/= drivers/scsi/bfa/bfa_iocfc.h +--- linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/bfa/bfa_iocfc.h 2011-08-05 20:33:55.000= 000000 -0400 +@@ -61,7 +61,7 @@ struct bfa_hwif_s { + void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix); + void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap, + u32 *nvecs, u32 *maxvec); +-}; ++} __no_const; + typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status); +=20 + struct bfa_iocfc_s { +diff -urNp linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.45/dr= ivers/scsi/bfa/bfa_ioc.h +--- linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/scsi/bfa/bfa_ioc.h 2011-08-05 20:33:55.00000= 0000 -0400 +@@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s { + bfa_ioc_disable_cbfn_t disable_cbfn; + bfa_ioc_hbfail_cbfn_t hbfail_cbfn; + bfa_ioc_reset_cbfn_t reset_cbfn; +-}; ++} __no_const; +=20 + /** + * Heartbeat failure notification queue element. +diff -urNp linux-2.6.32.45/drivers/scsi/BusLogic.c linux-2.6.32.45/drive= rs/scsi/BusLogic.c +--- linux-2.6.32.45/drivers/scsi/BusLogic.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/scsi/BusLogic.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla + static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_Hos= tAdapter + *PrototypeHostAdapter) + { ++ pax_track_stack(); ++ + /* + If a PCI BIOS is present, interrogate it for MultiMaster and FlashP= oint + Host Adapters; otherwise, default to the standard ISA MultiMaster p= robe. +diff -urNp linux-2.6.32.45/drivers/scsi/dpt_i2o.c linux-2.6.32.45/driver= s/scsi/dpt_i2o.c +--- linux-2.6.32.45/drivers/scsi/dpt_i2o.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/scsi/dpt_i2o.c 2011-05-16 21:46:57.000000000= -0400 +@@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* p + dma_addr_t addr; + ulong flags =3D 0; +=20 ++ pax_track_stack(); ++ + memset(&msg, 0, MAX_MESSAGE_SIZE*4); + // get user msg size in u32s=20 + if(get_user(size, &user_msg[0])){ +@@ -2297,6 +2299,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH + s32 rcode; + dma_addr_t addr; +=20 ++ pax_track_stack(); ++ + memset(msg, 0 , sizeof(msg)); + len =3D scsi_bufflen(cmd); + direction =3D 0x00000000;=09 +diff -urNp linux-2.6.32.45/drivers/scsi/eata.c linux-2.6.32.45/drivers/s= csi/eata.c +--- linux-2.6.32.45/drivers/scsi/eata.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/scsi/eata.c 2011-05-16 21:46:57.000000000 -0= 400 +@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por + struct hostdata *ha; + char name[16]; +=20 ++ pax_track_stack(); ++ + sprintf(name, "%s%d", driver_name, j); +=20 + if (!request_region(port_base, REGION_SIZE, driver_name)) { +diff -urNp linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c linux-2.6.32.45/d= rivers/scsi/fcoe/libfcoe.c +--- linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/scsi/fcoe/libfcoe.c 2011-05-16 21:46:57.0000= 00000 -0400 +@@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fc + size_t rlen; + size_t dlen; +=20 ++ pax_track_stack(); ++ + fiph =3D (struct fip_header *)skb->data; + sub =3D fiph->fip_subcode; + if (sub !=3D FIP_SC_REQ && sub !=3D FIP_SC_REP) +diff -urNp linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c linux-2.6.32.45= /drivers/scsi/fnic/fnic_main.c +--- linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/fnic/fnic_main.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct p + /* Start local port initiatialization */ +=20 + lp->link_up =3D 0; +- lp->tt =3D fnic_transport_template; ++ memcpy((void *)&lp->tt, &fnic_transport_template, sizeof(fnic_transpor= t_template)); +=20 + lp->max_retry_count =3D fnic->config.flogi_retries; + lp->max_rport_retry_count =3D fnic->config.plogi_retries; +diff -urNp linux-2.6.32.45/drivers/scsi/gdth.c linux-2.6.32.45/drivers/s= csi/gdth.c +--- linux-2.6.32.45/drivers/scsi/gdth.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/scsi/gdth.c 2011-05-16 21:46:57.000000000 -0= 400 +@@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg) + ulong flags; + gdth_ha_str *ha; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv))) + return -EFAULT; + ha =3D gdth_find_ha(ldrv.ionode); +@@ -4134,6 +4136,8 @@ static int ioc_resetdrv(void __user *arg + gdth_ha_str *ha; + int rval; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) || + res.number >=3D MAX_HDRIVES) + return -EFAULT; +@@ -4169,6 +4173,8 @@ static int ioc_general(void __user *arg, + gdth_ha_str *ha; + int rval; +=20 ++ pax_track_stack(); ++ + if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general))) + return -EFAULT; + ha =3D gdth_find_ha(gen.ionode); +@@ -4625,6 +4631,9 @@ static void gdth_flush(gdth_ha_str *ha) + int i; + gdth_cmd_str gdtcmd; + char cmnd[MAX_COMMAND_SIZE]; =20 ++ ++ pax_track_stack(); ++ + memset(cmnd, 0xff, MAX_COMMAND_SIZE); +=20 + TRACE2(("gdth_flush() hanum %d\n", ha->hanum)); +diff -urNp linux-2.6.32.45/drivers/scsi/gdth_proc.c linux-2.6.32.45/driv= ers/scsi/gdth_proc.c +--- linux-2.6.32.45/drivers/scsi/gdth_proc.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/scsi/gdth_proc.c 2011-05-16 21:46:57.0000000= 00 -0400 +@@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi + ulong64 paddr; +=20 + char cmnd[MAX_COMMAND_SIZE]; ++ ++ pax_track_stack(); ++ + memset(cmnd, 0xff, 12); + memset(&gdtcmd, 0, sizeof(gdth_cmd_str)); +=20 +@@ -174,6 +177,8 @@ static int gdth_get_info(char *buffer,ch + gdth_hget_str *phg; + char cmnd[MAX_COMMAND_SIZE]; +=20 ++ pax_track_stack(); ++ + gdtcmd =3D kmalloc(sizeof(*gdtcmd), GFP_KERNEL); + estr =3D kmalloc(sizeof(*estr), GFP_KERNEL); + if (!gdtcmd || !estr) +diff -urNp linux-2.6.32.45/drivers/scsi/hosts.c linux-2.6.32.45/drivers/= scsi/hosts.c +--- linux-2.6.32.45/drivers/scsi/hosts.c 2011-03-27 14:31:47.000000000 -= 0400 ++++ linux-2.6.32.45/drivers/scsi/hosts.c 2011-05-04 17:56:28.000000000 -= 0400 +@@ -40,7 +40,7 @@ + #include "scsi_logging.h" +=20 +=20 +-static atomic_t scsi_host_next_hn; /* host_no for next new host */ ++static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new ho= st */ +=20 +=20 + static void scsi_host_cls_release(struct device *dev) +@@ -344,7 +344,7 @@ struct Scsi_Host *scsi_host_alloc(struct + * subtract one because we increment first then return, but we need to + * know what the next host number was before increment + */ +- shost->host_no =3D atomic_inc_return(&scsi_host_next_hn) - 1; ++ shost->host_no =3D atomic_inc_return_unchecked(&scsi_host_next_hn) - 1= ; + shost->dma_channel =3D 0xff; +=20 + /* These three are default values which can be overridden */ +diff -urNp linux-2.6.32.45/drivers/scsi/ipr.c linux-2.6.32.45/drivers/sc= si/ipr.c +--- linux-2.6.32.45/drivers/scsi/ipr.c 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/scsi/ipr.c 2011-04-17 15:56:46.000000000 -04= 00 +@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q + return true; + } +=20 +-static struct ata_port_operations ipr_sata_ops =3D { ++static const struct ata_port_operations ipr_sata_ops =3D { + .phy_reset =3D ipr_ata_phy_reset, + .hardreset =3D ipr_sata_reset, + .post_internal_cmd =3D ipr_ata_post_internal, +diff -urNp linux-2.6.32.45/drivers/scsi/ips.h linux-2.6.32.45/drivers/sc= si/ips.h +--- linux-2.6.32.45/drivers/scsi/ips.h 2011-03-27 14:31:47.000000000 -04= 00 ++++ linux-2.6.32.45/drivers/scsi/ips.h 2011-08-05 20:33:55.000000000 -04= 00 +@@ -1027,7 +1027,7 @@ typedef struct { + int (*intr)(struct ips_ha *); + void (*enableint)(struct ips_ha *); + uint32_t (*statupd)(struct ips_ha *); +-} ips_hw_func_t; ++} __no_const ips_hw_func_t; +=20 + typedef struct ips_ha { + uint8_t ha_id[IPS_MAX_CHANNELS+1]; +diff -urNp linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c linux-2.6.32.45/= drivers/scsi/libfc/fc_exch.c +--- linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/libfc/fc_exch.c 2011-08-23 21:22:32.000= 000000 -0400 +@@ -86,12 +86,12 @@ struct fc_exch_mgr { + * all together if not used XXX + */ + struct { +- atomic_t no_free_exch; +- atomic_t no_free_exch_xid; +- atomic_t xid_not_found; +- atomic_t xid_busy; +- atomic_t seq_not_found; +- atomic_t non_bls_resp; ++ atomic_unchecked_t no_free_exch; ++ atomic_unchecked_t no_free_exch_xid; ++ atomic_unchecked_t xid_not_found; ++ atomic_unchecked_t xid_busy; ++ atomic_unchecked_t seq_not_found; ++ atomic_unchecked_t non_bls_resp; + } stats; + }; + #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 =3D mempool_alloc(mp->ep_pool, GFP_ATOMIC); + if (!ep) { +- atomic_inc(&mp->stats.no_free_exch); ++ atomic_inc_unchecked(&mp->stats.no_free_exch); + goto out; + } + memset(ep, 0, sizeof(*ep)); +@@ -557,7 +557,7 @@ out: + return ep; + err: + 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; + } +@@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_look + xid =3D ntohs(fh->fh_ox_id); /* we originated exch */ + ep =3D fc_exch_find(mp, xid); + if (!ep) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + reject =3D FC_RJT_OX_ID; + goto out; + } +@@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_look + ep =3D fc_exch_find(mp, xid); + if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) { + if (ep) { +- atomic_inc(&mp->stats.xid_busy); ++ atomic_inc_unchecked(&mp->stats.xid_busy); + reject =3D FC_RJT_RX_ID; + goto rel; + } +@@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_look + } + xid =3D ep->xid; /* get our XID */ + } else if (!ep) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + reject =3D FC_RJT_RX_ID; /* XID not found */ + goto out; + } +@@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_look + } else { + sp =3D &ep->seq; + if (sp->id !=3D fh->fh_seq_id) { +- atomic_inc(&mp->stats.seq_not_found); ++ atomic_inc_unchecked(&mp->stats.seq_not_found); + reject =3D FC_RJT_SEQ_ID; /* sequence/exch should exist */ + goto rel; + } +@@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct +=20 + ep =3D fc_exch_find(mp, ntohs(fh->fh_ox_id)); + if (!ep) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + goto out; + } + if (ep->esb_stat & ESB_ST_COMPLETE) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + goto out; + } + if (ep->rxid =3D=3D FC_XID_UNKNOWN) + ep->rxid =3D ntohs(fh->fh_rx_id); + if (ep->sid !=3D 0 && ep->sid !=3D ntoh24(fh->fh_d_id)) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + goto rel; + } + if (ep->did !=3D ntoh24(fh->fh_s_id) && + ep->did !=3D FC_FID_FLOGI) { +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + goto rel; + } + sof =3D fr_sof(fp); +@@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct + } else { + sp =3D &ep->seq; + if (sp->id !=3D fh->fh_seq_id) { +- atomic_inc(&mp->stats.seq_not_found); ++ atomic_inc_unchecked(&mp->stats.seq_not_found); + goto rel; + } + } +@@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_ + sp =3D fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */ +=20 + if (!sp) +- atomic_inc(&mp->stats.xid_not_found); ++ atomic_inc_unchecked(&mp->stats.xid_not_found); + else +- atomic_inc(&mp->stats.non_bls_resp); ++ atomic_inc_unchecked(&mp->stats.non_bls_resp); +=20 + fc_frame_free(fp); + } +diff -urNp linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c linux-2.6.32.45= /drivers/scsi/libsas/sas_ata.c +--- linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/libsas/sas_ata.c 2011-04-23 12:56:11.00= 0000000 -0400 +@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l + } + } +=20 +-static struct ata_port_operations sas_sata_ops =3D { ++static const struct ata_port_operations sas_sata_ops =3D { + .phy_reset =3D sas_ata_phy_reset, + .post_internal_cmd =3D sas_ata_post_internal, + .qc_defer =3D ata_std_qc_defer, +diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32= .45/drivers/scsi/lpfc/lpfc_debugfs.c +--- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_debugfs.c 2011-05-16 21:46:57= .000000000 -0400 +@@ -124,7 +124,7 @@ struct lpfc_debug { + int len; + }; +=20 +-static atomic_t lpfc_debugfs_seq_trc_cnt =3D ATOMIC_INIT(0); ++static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt =3D ATOMIC_INIT(0); + static unsigned long lpfc_debugfs_start_time =3D 0L; +=20 + /** +@@ -158,7 +158,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v + lpfc_debugfs_enable =3D 0; +=20 + len =3D 0; +- index =3D (atomic_read(&vport->disc_trc_cnt) + 1) & ++ index =3D (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) & + (lpfc_debugfs_max_disc_trc - 1); + for (i =3D index; i < lpfc_debugfs_max_disc_trc; i++) { + dtp =3D vport->disc_trc + i; +@@ -219,7 +219,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l + lpfc_debugfs_enable =3D 0; +=20 + len =3D 0; +- index =3D (atomic_read(&phba->slow_ring_trc_cnt) + 1) & ++ index =3D (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) & + (lpfc_debugfs_max_slow_ring_trc - 1); + for (i =3D index; i < lpfc_debugfs_max_slow_ring_trc; i++) { + dtp =3D phba->slow_ring_trc + i; +@@ -397,6 +397,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf + uint32_t *ptr; + char buffer[1024]; +=20 ++ pax_track_stack(); ++ + off =3D 0; + spin_lock_irq(&phba->hbalock); +=20 +@@ -634,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport=20 + !vport || !vport->disc_trc) + return; +=20 +- index =3D atomic_inc_return(&vport->disc_trc_cnt) & ++ index =3D atomic_inc_return_unchecked(&vport->disc_trc_cnt) & + (lpfc_debugfs_max_disc_trc - 1); + dtp =3D vport->disc_trc + index; + dtp->fmt =3D fmt; + dtp->data1 =3D data1; + dtp->data2 =3D data2; + dtp->data3 =3D data3; +- dtp->seq_cnt =3D atomic_inc_return(&lpfc_debugfs_seq_trc_cnt); ++ dtp->seq_cnt =3D atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt= ); + dtp->jif =3D jiffies; + #endif + return; +@@ -672,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h + !phba || !phba->slow_ring_trc) + return; +=20 +- index =3D atomic_inc_return(&phba->slow_ring_trc_cnt) & ++ index =3D atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) & + (lpfc_debugfs_max_slow_ring_trc - 1); + dtp =3D phba->slow_ring_trc + index; + dtp->fmt =3D fmt; + dtp->data1 =3D data1; + dtp->data2 =3D data2; + dtp->data3 =3D data3; +- dtp->seq_cnt =3D atomic_inc_return(&lpfc_debugfs_seq_trc_cnt); ++ dtp->seq_cnt =3D atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt= ); + dtp->jif =3D jiffies; + #endif + return; +@@ -1364,7 +1366,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor + "slow_ring buffer\n"); + goto debug_failed; + } +- atomic_set(&phba->slow_ring_trc_cnt, 0); ++ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0); + memset(phba->slow_ring_trc, 0, + (sizeof(struct lpfc_debugfs_trc) * + lpfc_debugfs_max_slow_ring_trc)); +@@ -1410,7 +1412,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor + "buffer\n"); + goto debug_failed; + } +- atomic_set(&vport->disc_trc_cnt, 0); ++ atomic_set_unchecked(&vport->disc_trc_cnt, 0); +=20 + snprintf(name, sizeof(name), "discovery_trace"); + vport->debug_disc_trc =3D +diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h linux-2.6.32.45/driv= ers/scsi/lpfc/lpfc.h +--- linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc.h 2011-05-04 17:56:28.0000000= 00 -0400 +@@ -400,7 +400,7 @@ struct lpfc_vport { + struct dentry *debug_nodelist; + struct dentry *vport_debugfs_root; + struct lpfc_debugfs_trc *disc_trc; +- atomic_t disc_trc_cnt; ++ atomic_unchecked_t disc_trc_cnt; + #endif + uint8_t stat_data_enabled; + uint8_t stat_data_blocked; +@@ -725,8 +725,8 @@ struct lpfc_hba { + struct timer_list fabric_block_timer; + unsigned long bit_flags; + #define FABRIC_COMANDS_BLOCKED 0 +- atomic_t num_rsrc_err; +- atomic_t num_cmd_success; ++ atomic_unchecked_t num_rsrc_err; ++ atomic_unchecked_t num_cmd_success; + unsigned long last_rsrc_error_time; + unsigned long last_ramp_down_time; + unsigned long last_ramp_up_time; +@@ -740,7 +740,7 @@ struct lpfc_hba { + struct dentry *debug_dumpDif; /* BlockGuard BPL*/ + struct dentry *debug_slow_ring_trc; + struct lpfc_debugfs_trc *slow_ring_trc; +- atomic_t slow_ring_trc_cnt; ++ atomic_unchecked_t slow_ring_trc_cnt; + #endif +=20 + /* Used for deferred freeing of ELS data buffers */ +diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.45= /drivers/scsi/lpfc/lpfc_init.c +--- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_init.c 2011-08-05 20:33:55.00= 0000000 -0400 +@@ -8021,8 +8021,10 @@ lpfc_init(void) + printk(LPFC_COPYRIGHT "\n"); +=20 + if (lpfc_enable_npiv) { +- lpfc_transport_functions.vport_create =3D lpfc_vport_create; +- lpfc_transport_functions.vport_delete =3D lpfc_vport_delete; ++ pax_open_kernel(); ++ *(void **)&lpfc_transport_functions.vport_create =3D lpfc_vport_creat= e; ++ *(void **)&lpfc_transport_functions.vport_delete =3D lpfc_vport_delet= e; ++ pax_close_kernel(); + } + lpfc_transport_template =3D + fc_attach_transport(&lpfc_transport_functions); +diff -urNp linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c linux-2.6.32.45= /drivers/scsi/lpfc/lpfc_scsi.c +--- linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/lpfc/lpfc_scsi.c 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb + uint32_t evt_posted; +=20 + spin_lock_irqsave(&phba->hbalock, flags); +- atomic_inc(&phba->num_rsrc_err); ++ atomic_inc_unchecked(&phba->num_rsrc_err); + phba->last_rsrc_error_time =3D jiffies; +=20 + if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) = { +@@ -300,7 +300,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor + unsigned long flags; + struct lpfc_hba *phba =3D vport->phba; + uint32_t evt_posted; +- atomic_inc(&phba->num_cmd_success); ++ atomic_inc_unchecked(&phba->num_cmd_success); +=20 + if (vport->cfg_lun_queue_depth <=3D queue_depth) + return; +@@ -343,8 +343,8 @@ lpfc_ramp_down_queue_handler(struct lpfc + int i; + struct lpfc_rport_data *rdata; +=20 +- num_rsrc_err =3D atomic_read(&phba->num_rsrc_err); +- num_cmd_success =3D atomic_read(&phba->num_cmd_success); ++ num_rsrc_err =3D atomic_read_unchecked(&phba->num_rsrc_err); ++ num_cmd_success =3D atomic_read_unchecked(&phba->num_cmd_success); +=20 + vports =3D lpfc_create_vport_work_array(phba); + if (vports !=3D NULL) +@@ -378,8 +378,8 @@ lpfc_ramp_down_queue_handler(struct lpfc + } + } + lpfc_destroy_vport_work_array(phba, vports); +- atomic_set(&phba->num_rsrc_err, 0); +- atomic_set(&phba->num_cmd_success, 0); ++ atomic_set_unchecked(&phba->num_rsrc_err, 0); ++ atomic_set_unchecked(&phba->num_cmd_success, 0); + } +=20 + /** +@@ -427,8 +427,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h + } + } + lpfc_destroy_vport_work_array(phba, vports); +- atomic_set(&phba->num_rsrc_err, 0); +- atomic_set(&phba->num_cmd_success, 0); ++ atomic_set_unchecked(&phba->num_rsrc_err, 0); ++ atomic_set_unchecked(&phba->num_cmd_success, 0); + } +=20 + /** +diff -urNp linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c linux-2= .6.32.45/drivers/scsi/megaraid/megaraid_mbox.c +--- linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/megaraid/megaraid_mbox.c 2011-05-16 21:= 46:57.000000000 -0400 +@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter + int rval; + int i; +=20 ++ pax_track_stack(); ++ + // Allocate memory for the base list of scb for management module. + adapter->uscb_list =3D kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_= KERNEL); +=20 +diff -urNp linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c linux-2.6.32= .45/drivers/scsi/osd/osd_initiator.c +--- linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/osd/osd_initiator.c 2011-05-16 21:46:57= .000000000 -0400 +@@ -94,6 +94,8 @@ static int _osd_print_system_info(struct + int nelem =3D ARRAY_SIZE(get_attrs), a =3D 0; + int ret; +=20 ++ pax_track_stack(); ++ + or =3D osd_start_request(od, GFP_KERNEL); + if (!or) + return -ENOMEM; +diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.c linux-2.6.32.45/driver= s/scsi/pmcraid.c +--- linux-2.6.32.45/drivers/scsi/pmcraid.c 2011-08-09 18:35:29.000000000= -0400 ++++ linux-2.6.32.45/drivers/scsi/pmcraid.c 2011-08-09 18:33:59.000000000= -0400 +@@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct sc + res->scsi_dev =3D scsi_dev; + scsi_dev->hostdata =3D res; + res->change_detected =3D 0; +- atomic_set(&res->read_failures, 0); +- atomic_set(&res->write_failures, 0); ++ atomic_set_unchecked(&res->read_failures, 0); ++ atomic_set_unchecked(&res->write_failures, 0); + rc =3D 0; + } + spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags); +@@ -2396,9 +2396,9 @@ static int pmcraid_error_handler(struct=20 +=20 + /* If this was a SCSI read/write command keep count of errors */ + if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) =3D=3D SCSI_READ_CMD) +- atomic_inc(&res->read_failures); ++ atomic_inc_unchecked(&res->read_failures); + else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) =3D=3D SCSI_WRITE_CMD) +- atomic_inc(&res->write_failures); ++ atomic_inc_unchecked(&res->write_failures); +=20 + if (!RES_IS_GSCSI(res->cfg_entry) && + masked_ioasc !=3D PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) { +@@ -4116,7 +4116,7 @@ static void pmcraid_worker_function(stru +=20 + pinstance =3D container_of(workp, struct pmcraid_instance, worker_q); + /* add resources only after host is added into system */ +- if (!atomic_read(&pinstance->expose_resources)) ++ if (!atomic_read_unchecked(&pinstance->expose_resources)) + return; +=20 + spin_lock_irqsave(&pinstance->resource_lock, lock_flags); +@@ -4850,7 +4850,7 @@ static int __devinit pmcraid_init_instan + init_waitqueue_head(&pinstance->reset_wait_q); +=20 + atomic_set(&pinstance->outstanding_cmds, 0); +- atomic_set(&pinstance->expose_resources, 0); ++ atomic_set_unchecked(&pinstance->expose_resources, 0); +=20 + INIT_LIST_HEAD(&pinstance->free_res_q); + INIT_LIST_HEAD(&pinstance->used_res_q); +@@ -5502,7 +5502,7 @@ static int __devinit pmcraid_probe( + /* Schedule worker thread to handle CCN and take care of adding and + * removing devices to OS + */ +- atomic_set(&pinstance->expose_resources, 1); ++ atomic_set_unchecked(&pinstance->expose_resources, 1); + schedule_work(&pinstance->worker_q); + return rc; +=20 +diff -urNp linux-2.6.32.45/drivers/scsi/pmcraid.h linux-2.6.32.45/driver= s/scsi/pmcraid.h +--- linux-2.6.32.45/drivers/scsi/pmcraid.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/scsi/pmcraid.h 2011-05-04 17:56:28.000000000= -0400 +@@ -690,7 +690,7 @@ struct pmcraid_instance { + atomic_t outstanding_cmds; +=20 + /* should add/delete resources to mid-layer now ?*/ +- atomic_t expose_resources; ++ atomic_unchecked_t expose_resources; +=20 + /* Tasklet to handle deferred processing */ + struct tasklet_struct isr_tasklet[PMCRAID_NUM_MSIX_VECTORS]; +@@ -727,8 +727,8 @@ struct pmcraid_resource_entry { + struct list_head queue; /* link to "to be exposed" resources */ + struct pmcraid_config_table_entry cfg_entry; + struct scsi_device *scsi_dev; /* Link scsi_device structure */ +- atomic_t read_failures; /* count of failed READ commands */ +- atomic_t write_failures; /* count of failed WRITE commands */ ++ atomic_unchecked_t read_failures; /* count of failed READ commands */ ++ atomic_unchecked_t write_failures; /* count of failed WRITE commands *= / +=20 + /* To indicate add/delete/modify during CCN */ + u8 change_detected; +diff -urNp linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h linux-2.6.32.4= 5/drivers/scsi/qla2xxx/qla_def.h +--- linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/qla2xxx/qla_def.h 2011-08-05 20:33:55.0= 00000000 -0400 +@@ -2089,7 +2089,7 @@ struct isp_operations { +=20 + int (*get_flash_version) (struct scsi_qla_host *, void *); + int (*start_scsi) (srb_t *); +-}; ++} __no_const; +=20 + /* MSI-X Support ******************************************************= *******/ +=20 +diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h linux-2.6.32.4= 5/drivers/scsi/qla4xxx/ql4_def.h +--- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_def.h 2011-05-04 17:56:28.0= 00000000 -0400 +@@ -240,7 +240,7 @@ struct ddb_entry { + atomic_t retry_relogin_timer; /* Min Time between relogins + * (4000 only) */ + atomic_t relogin_timer; /* Max Time to wait for relogin to complete */ +- atomic_t relogin_retry_count; /* Num of times relogin has been ++ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has be= en + * retried */ +=20 + uint16_t port; +diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c linux-2.6.32.= 45/drivers/scsi/qla4xxx/ql4_init.c +--- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_init.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_ + atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count); + atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY); + atomic_set(&ddb_entry->relogin_timer, 0); +- atomic_set(&ddb_entry->relogin_retry_count, 0); ++ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0); + atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); + list_add_tail(&ddb_entry->list, &ha->ddb_list); + ha->fw_ddb_index_map[fw_ddb_index] =3D ddb_entry; +@@ -1308,7 +1308,7 @@ int qla4xxx_process_ddb_changed(struct s + atomic_set(&ddb_entry->state, DDB_STATE_ONLINE); + atomic_set(&ddb_entry->port_down_timer, + ha->port_down_retry_count); +- atomic_set(&ddb_entry->relogin_retry_count, 0); ++ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0); + atomic_set(&ddb_entry->relogin_timer, 0); + clear_bit(DF_RELOGIN, &ddb_entry->flags); + clear_bit(DF_NO_RELOGIN, &ddb_entry->flags); +diff -urNp linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c linux-2.6.32.45= /drivers/scsi/qla4xxx/ql4_os.c +--- linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/qla4xxx/ql4_os.c 2011-05-04 17:56:28.00= 0000000 -0400 +@@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_ql + ddb_entry->fw_ddb_device_state =3D=3D + DDB_DS_SESSION_FAILED) { + /* Reset retry relogin timer */ +- atomic_inc(&ddb_entry->relogin_retry_count); ++ atomic_inc_unchecked(&ddb_entry->relogin_retry_count); + DEBUG2(printk("scsi%ld: index[%d] relogin" + " timed out-retrying" + " relogin (%d)\n", + ha->host_no, + ddb_entry->fw_ddb_index, +- atomic_read(&ddb_entry-> ++ atomic_read_unchecked(&ddb_entry-> + relogin_retry_count)) + ); + start_dpc++; +diff -urNp linux-2.6.32.45/drivers/scsi/scsi.c linux-2.6.32.45/drivers/s= csi/scsi.c +--- linux-2.6.32.45/drivers/scsi/scsi.c 2011-03-27 14:31:47.000000000 -0= 400 ++++ linux-2.6.32.45/drivers/scsi/scsi.c 2011-05-04 17:56:28.000000000 -0= 400 +@@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd * + unsigned long timeout; + int rtn =3D 0; +=20 +- atomic_inc(&cmd->device->iorequest_cnt); ++ atomic_inc_unchecked(&cmd->device->iorequest_cnt); +=20 + /* check if the device is still usable */ + if (unlikely(cmd->device->sdev_state =3D=3D SDEV_DEL)) { +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_debug.c linux-2.6.32.45/dri= vers/scsi/scsi_debug.c +--- linux-2.6.32.45/drivers/scsi/scsi_debug.c 2011-03-27 14:31:47.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_debug.c 2011-05-16 21:46:57.000000= 000 -0400 +@@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_ + unsigned char arr[SDEBUG_MAX_MSELECT_SZ]; + unsigned char *cmd =3D (unsigned char *)scp->cmnd; +=20 ++ pax_track_stack(); ++ + if ((errsts =3D check_readiness(scp, 1, devip))) + return errsts; + memset(arr, 0, sizeof(arr)); +@@ -1492,6 +1494,8 @@ static int resp_log_sense(struct scsi_cm + unsigned char arr[SDEBUG_MAX_LSENSE_SZ]; + unsigned char *cmd =3D (unsigned char *)scp->cmnd; +=20 ++ pax_track_stack(); ++ + if ((errsts =3D check_readiness(scp, 1, devip))) + return errsts; + memset(arr, 0, sizeof(arr)); +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_lib.c linux-2.6.32.45/drive= rs/scsi/scsi_lib.c +--- linux-2.6.32.45/drivers/scsi/scsi_lib.c 2011-05-10 22:12:01.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_lib.c 2011-05-10 22:12:33.00000000= 0 -0400 +@@ -1384,7 +1384,7 @@ static void scsi_kill_request(struct req +=20 + scsi_init_cmd_errh(cmd); + cmd->result =3D DID_NO_CONNECT << 16; +- atomic_inc(&cmd->device->iorequest_cnt); ++ atomic_inc_unchecked(&cmd->device->iorequest_cnt); +=20 + /* + * SCSI request completion path will do scsi_device_unbusy(), +@@ -1415,9 +1415,9 @@ static void scsi_softirq_done(struct req + */ + cmd->serial_number =3D 0; +=20 +- atomic_inc(&cmd->device->iodone_cnt); ++ atomic_inc_unchecked(&cmd->device->iodone_cnt); + if (cmd->result) +- atomic_inc(&cmd->device->ioerr_cnt); ++ atomic_inc_unchecked(&cmd->device->ioerr_cnt); +=20 + disposition =3D scsi_decide_disposition(cmd); + if (disposition !=3D SUCCESS && +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_sysfs.c linux-2.6.32.45/dri= vers/scsi/scsi_sysfs.c +--- linux-2.6.32.45/drivers/scsi/scsi_sysfs.c 2011-06-25 12:55:34.000000= 000 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_sysfs.c 2011-06-25 12:56:37.000000= 000 -0400 +@@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev,=20 + char *buf) \ + { \ + struct scsi_device *sdev =3D to_scsi_device(dev); \ +- unsigned long long count =3D atomic_read(&sdev->field); \ ++ unsigned long long count =3D atomic_read_unchecked(&sdev->field); \ + return snprintf(buf, 20, "0x%llx\n", count); \ + } \ + static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL) +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c linux-2.6.32= .45/drivers/scsi/scsi_transport_fc.c +--- linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_transport_fc.c 2011-05-04 17:56:28= .000000000 -0400 +@@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo, + * Netlink Infrastructure + */ +=20 +-static atomic_t fc_event_seq; ++static atomic_unchecked_t fc_event_seq; +=20 + /** + * fc_get_event_number - Obtain the next sequential FC event number +@@ -493,7 +493,7 @@ static atomic_t fc_event_seq; + u32 + fc_get_event_number(void) + { +- return atomic_add_return(1, &fc_event_seq); ++ return atomic_add_return_unchecked(1, &fc_event_seq); + } + EXPORT_SYMBOL(fc_get_event_number); +=20 +@@ -641,7 +641,7 @@ static __init int fc_transport_init(void + { + int error; +=20 +- atomic_set(&fc_event_seq, 0); ++ atomic_set_unchecked(&fc_event_seq, 0); +=20 + error =3D transport_class_register(&fc_host_class); + if (error) +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c linux-2.6= .32.45/drivers/scsi/scsi_transport_iscsi.c +--- linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_transport_iscsi.c 2011-05-04 17:56= :28.000000000 -0400 +@@ -81,7 +81,7 @@ struct iscsi_internal { + struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1]; + }; +=20 +-static atomic_t iscsi_session_nr; /* sysfs session id for next new sess= ion */ ++static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for nex= t new session */ + static struct workqueue_struct *iscsi_eh_timer_workq; +=20 + /* +@@ -728,7 +728,7 @@ int iscsi_add_session(struct iscsi_cls_s + int err; +=20 + ihost =3D shost->shost_data; +- session->sid =3D atomic_add_return(1, &iscsi_session_nr); ++ session->sid =3D atomic_add_return_unchecked(1, &iscsi_session_nr); +=20 + if (id =3D=3D ISCSI_MAX_TARGET) { + for (id =3D 0; id < ISCSI_MAX_TARGET; id++) { +@@ -2060,7 +2060,7 @@ static __init int iscsi_transport_init(v + printk(KERN_INFO "Loading iSCSI transport class v%s.\n", + ISCSI_TRANSPORT_VERSION); +=20 +- atomic_set(&iscsi_session_nr, 0); ++ atomic_set_unchecked(&iscsi_session_nr, 0); +=20 + err =3D class_register(&iscsi_transport_class); + if (err) +diff -urNp linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c linux-2.6.3= 2.45/drivers/scsi/scsi_transport_srp.c +--- linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/scsi_transport_srp.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -33,7 +33,7 @@ + #include "scsi_transport_srp_internal.h" +=20 + struct srp_host_attrs { +- atomic_t next_port_id; ++ atomic_unchecked_t next_port_id; + }; + #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost= _data) +=20 +@@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo + struct Scsi_Host *shost =3D dev_to_shost(dev); + struct srp_host_attrs *srp_host =3D to_srp_host_attrs(shost); +=20 +- atomic_set(&srp_host->next_port_id, 0); ++ atomic_set_unchecked(&srp_host->next_port_id, 0); + return 0; + } +=20 +@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct S + memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id)); + rport->roles =3D ids->roles; +=20 +- id =3D atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id); ++ id =3D atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_por= t_id); + dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id); +=20 + transport_setup_device(&rport->dev); +diff -urNp linux-2.6.32.45/drivers/scsi/sg.c linux-2.6.32.45/drivers/scs= i/sg.c +--- linux-2.6.32.45/drivers/scsi/sg.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/scsi/sg.c 2011-04-17 15:56:46.000000000 -040= 0 +@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { + const struct file_operations * fops; + }; +=20 +-static struct sg_proc_leaf sg_proc_leaf_arr[] =3D { ++static const struct sg_proc_leaf sg_proc_leaf_arr[] =3D { + {"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 =3D ARRAY_SIZE(sg_proc_leaf_arr); +- struct sg_proc_leaf * leaf; ++ const struct sg_proc_leaf * leaf; +=20 + sg_proc_sgp =3D proc_mkdir(sg_proc_sg_dirname, NULL); + if (!sg_proc_sgp) +diff -urNp linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c linux-2.6= .32.45/drivers/scsi/sym53c8xx_2/sym_glue.c +--- linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/scsi/sym53c8xx_2/sym_glue.c 2011-05-16 21:46= :57.000000000 -0400 +@@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct p + int do_iounmap =3D 0; + int do_disable_device =3D 1; +=20 ++ pax_track_stack(); ++ + memset(&sym_dev, 0, sizeof(sym_dev)); + memset(&nvram, 0, sizeof(nvram)); + sym_dev.pdev =3D pdev; +diff -urNp linux-2.6.32.45/drivers/serial/kgdboc.c linux-2.6.32.45/drive= rs/serial/kgdboc.c +--- linux-2.6.32.45/drivers/serial/kgdboc.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/serial/kgdboc.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -18,7 +18,7 @@ +=20 + #define MAX_CONFIG_LEN 40 +=20 +-static struct kgdb_io kgdboc_io_ops; ++static const struct kgdb_io kgdboc_io_ops; +=20 + /* -1 =3D init not run yet, 0 =3D unconfigured, 1 =3D configured. */ + static int configured =3D -1; +@@ -154,7 +154,7 @@ static void kgdboc_post_exp_handler(void + module_put(THIS_MODULE); + } +=20 +-static struct kgdb_io kgdboc_io_ops =3D { ++static const struct kgdb_io kgdboc_io_ops =3D { + .name =3D "kgdboc", + .read_char =3D kgdboc_get_char, + .write_char =3D kgdboc_put_char, +diff -urNp linux-2.6.32.45/drivers/spi/spi.c linux-2.6.32.45/drivers/spi= /spi.c +--- linux-2.6.32.45/drivers/spi/spi.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/spi/spi.c 2011-05-04 17:56:28.000000000 -040= 0 +@@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, str + EXPORT_SYMBOL_GPL(spi_sync); +=20 + /* portable code must never pass more than 32 bytes */ +-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES) ++#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES) +=20 + static u8 *buf; +=20 +diff -urNp linux-2.6.32.45/drivers/staging/android/binder.c linux-2.6.32= .45/drivers/staging/android/binder.c +--- linux-2.6.32.45/drivers/staging/android/binder.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/android/binder.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a + binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); + } +=20 +-static struct vm_operations_struct binder_vm_ops =3D { ++static const struct vm_operations_struct binder_vm_ops =3D { + .open =3D binder_vma_open, + .close =3D binder_vma_close, + }; +diff -urNp linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.45= /drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/staging/b3dfg/b3dfg.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are + return VM_FAULT_NOPAGE; + } +=20 +-static struct vm_operations_struct b3dfg_vm_ops =3D { ++static const struct vm_operations_struct b3dfg_vm_ops =3D { + .fault =3D b3dfg_vma_fault, + }; +=20 +@@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp, + return r; + } +=20 +-static struct file_operations b3dfg_fops =3D { ++static const struct file_operations b3dfg_fops =3D { + .owner =3D THIS_MODULE, + .open =3D b3dfg_open, + .release =3D b3dfg_release, +diff -urNp linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c linux-2.= 6.32.45/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:3= 5:29.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/comedi/comedi_fops.c 2011-08-09 18:3= 4:00.000000000 -0400 +@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct=20 + mutex_unlock(&dev->mutex); + } +=20 +-static struct vm_operations_struct comedi_vm_ops =3D { ++static const struct vm_operations_struct comedi_vm_ops =3D { + .close =3D comedi_unmap, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c lin= ux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/adsp_driver.c 2011-04-17= 15:56:46.000000000 -0400 +@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi + static dev_t adsp_devno; + static struct class *adsp_class; +=20 +-static struct file_operations adsp_fops =3D { ++static const struct file_operations adsp_fops =3D { + .owner =3D THIS_MODULE, + .open =3D adsp_open, + .unlocked_ioctl =3D adsp_ioctl, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c linux= -2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_aac.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -1022,7 +1022,7 @@ done: + return rc; + } +=20 +-static struct file_operations audio_aac_fops =3D { ++static const struct file_operations audio_aac_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audio_open, + .release =3D audio_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c lin= ux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_amrnb.c 2011-04-17= 15:56:46.000000000 -0400 +@@ -833,7 +833,7 @@ done: + return rc; + } +=20 +-static struct file_operations audio_amrnb_fops =3D { ++static const struct file_operations audio_amrnb_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audamrnb_open, + .release =3D audamrnb_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c linu= x-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c 2011-03-27 = 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_evrc.c 2011-04-17 = 15:56:46.000000000 -0400 +@@ -805,7 +805,7 @@ dma_fail: + return rc; + } +=20 +-static struct file_operations audio_evrc_fops =3D { ++static const struct file_operations audio_evrc_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audevrc_open, + .release =3D audevrc_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c linux-= 2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_in.c 2011-04-17 15= :56:46.000000000 -0400 +@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino + return 0; + } +=20 +-static struct file_operations audio_fops =3D { ++static const struct file_operations audio_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audio_in_open, + .release =3D audio_in_release, +@@ -922,7 +922,7 @@ static struct file_operations audio_fops + .unlocked_ioctl =3D audio_in_ioctl, + }; +=20 +-static struct file_operations audpre_fops =3D { ++static const struct file_operations audpre_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audpre_open, + .unlocked_ioctl =3D audpre_ioctl, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c linux= -2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_mp3.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -941,7 +941,7 @@ done: + return rc; + } +=20 +-static struct file_operations audio_mp3_fops =3D { ++static const struct file_operations audio_mp3_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audio_open, + .release =3D audio_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c linux= -2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_out.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod + return 0; + } +=20 +-static struct file_operations audio_fops =3D { ++static const struct file_operations audio_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audio_open, + .release =3D audio_release, +@@ -819,7 +819,7 @@ static struct file_operations audio_fops + .unlocked_ioctl =3D audio_ioctl, + }; +=20 +-static struct file_operations audpp_fops =3D { ++static const struct file_operations audpp_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audpp_open, + .unlocked_ioctl =3D audpp_ioctl, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c lin= ux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-03-27= 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/audio_qcelp.c 2011-04-17= 15:56:46.000000000 -0400 +@@ -816,7 +816,7 @@ err: + return rc; + } +=20 +-static struct file_operations audio_qcelp_fops =3D { ++static const struct file_operations audio_qcelp_fops =3D { + .owner =3D THIS_MODULE, + .open =3D audqcelp_open, + .release =3D audqcelp_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c linux-2.6.3= 2.45/drivers/staging/dream/qdsp5/snd.c +--- linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/qdsp5/snd.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -242,7 +242,7 @@ err: + return rc; + } +=20 +-static struct file_operations snd_fops =3D { ++static const struct file_operations snd_fops =3D { + .owner =3D THIS_MODULE, + .open =3D snd_open, + .release =3D snd_release, +diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c linux-2.6= .32.45/drivers/staging/dream/smd/smd_qmi.c +--- linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/smd/smd_qmi.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, + return 0; + } +=20 +-static struct file_operations qmi_fops =3D { ++static const struct file_operations qmi_fops =3D { + .owner =3D THIS_MODULE, + .read =3D qmi_read, + .write =3D qmi_write, +diff -urNp linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_devic= e.c linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c +--- linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-03-27 14:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/dream/smd/smd_rpcrouter_device.c 201= 1-04-17 15:56:46.000000000 -0400 +@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file=20 + return rc; + } +=20 +-static struct file_operations rpcrouter_server_fops =3D { ++static const struct file_operations rpcrouter_server_fops =3D { + .owner =3D THIS_MODULE, + .open =3D rpcrouter_open, + .release =3D rpcrouter_release, +@@ -224,7 +224,7 @@ static struct file_operations rpcrouter_ + .unlocked_ioctl =3D rpcrouter_ioctl, + }; +=20 +-static struct file_operations rpcrouter_router_fops =3D { ++static const struct file_operations rpcrouter_router_fops =3D { + .owner =3D THIS_MODULE, + .open =3D rpcrouter_open, + .release =3D rpcrouter_release, +diff -urNp linux-2.6.32.45/drivers/staging/dst/dcore.c linux-2.6.32.45/d= rivers/staging/dst/dcore.c +--- linux-2.6.32.45/drivers/staging/dst/dcore.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/staging/dst/dcore.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi + return 0; + } +=20 +-static struct block_device_operations dst_blk_ops =3D { ++static const struct block_device_operations dst_blk_ops =3D { + .open =3D dst_bdev_open, + .release =3D dst_bdev_release, + .owner =3D THIS_MODULE, +@@ -588,7 +588,7 @@ static struct dst_node *dst_alloc_node(s + n->size =3D ctl->size; +=20 + atomic_set(&n->refcnt, 1); +- atomic_long_set(&n->gen, 0); ++ atomic_long_set_unchecked(&n->gen, 0); + snprintf(n->name, sizeof(n->name), "%s", ctl->name); +=20 + err =3D dst_node_sysfs_init(n); +diff -urNp linux-2.6.32.45/drivers/staging/dst/trans.c linux-2.6.32.45/d= rivers/staging/dst/trans.c +--- linux-2.6.32.45/drivers/staging/dst/trans.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/staging/dst/trans.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,=20 + t->error =3D 0; + t->retries =3D 0; + atomic_set(&t->refcnt, 1); +- t->gen =3D atomic_long_inc_return(&n->gen); ++ t->gen =3D atomic_long_inc_return_unchecked(&n->gen); +=20 + t->enc =3D bio_data_dir(bio); + dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); +diff -urNp linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c linux-2.6.= 32.45/drivers/staging/et131x/et1310_tx.c +--- linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/et131x/et1310_tx.c 2011-05-04 17:56:= 28.000000000 -0400 +@@ -710,11 +710,11 @@ inline void et131x_free_send_packet(stru + struct net_device_stats *stats =3D &etdev->net_stats; +=20 + if (pMpTcb->Flags & fMP_DEST_BROAD) +- atomic_inc(&etdev->Stats.brdcstxmt); ++ atomic_inc_unchecked(&etdev->Stats.brdcstxmt); + else if (pMpTcb->Flags & fMP_DEST_MULTI) +- atomic_inc(&etdev->Stats.multixmt); ++ atomic_inc_unchecked(&etdev->Stats.multixmt); + else +- atomic_inc(&etdev->Stats.unixmt); ++ atomic_inc_unchecked(&etdev->Stats.unixmt); +=20 + if (pMpTcb->Packet) { + stats->tx_bytes +=3D pMpTcb->Packet->len; +diff -urNp linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h linux= -2.6.32.45/drivers/staging/et131x/et131x_adapter.h +--- linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/et131x/et131x_adapter.h 2011-05-04 1= 7:56:28.000000000 -0400 +@@ -145,11 +145,11 @@ typedef struct _ce_stats_t { + * operations + */ + u32 unircv; /* # multicast packets received */ +- atomic_t unixmt; /* # multicast packets for Tx */ ++ atomic_unchecked_t unixmt; /* # multicast packets for Tx */ + u32 multircv; /* # multicast packets received */ +- atomic_t multixmt; /* # multicast packets for Tx */ ++ atomic_unchecked_t multixmt; /* # multicast packets for Tx */ + u32 brdcstrcv; /* # broadcast packets received */ +- atomic_t brdcstxmt; /* # broadcast packets for Tx */ ++ atomic_unchecked_t brdcstxmt; /* # broadcast packets for Tx */ + u32 norcvbuf; /* # Rx packets discarded */ + u32 noxmtbuf; /* # Tx packets discarded */ +=20 +diff -urNp linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c linux-2.= 6.32.45/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/go7007/go7007-v4l2.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are + return 0; + } +=20 +-static struct vm_operations_struct go7007_vm_ops =3D { ++static const struct vm_operations_struct go7007_vm_ops =3D { + .open =3D go7007_vm_open, + .close =3D go7007_vm_close, + .fault =3D go7007_vm_fault, +diff -urNp linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.= 45/drivers/staging/hv/blkvsc_drv.c +--- linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/hv/blkvsc_drv.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size =3D BLKV + /* The one and only one */ + static struct blkvsc_driver_context g_blkvsc_drv; +=20 +-static struct block_device_operations block_ops =3D { ++static const struct block_device_operations block_ops =3D { + .owner =3D THIS_MODULE, + .open =3D blkvsc_open, + .release =3D blkvsc_release, +diff -urNp linux-2.6.32.45/drivers/staging/hv/Channel.c linux-2.6.32.45/= drivers/staging/hv/Channel.c +--- linux-2.6.32.45/drivers/staging/hv/Channel.c 2011-04-17 17:00:52.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/staging/hv/Channel.c 2011-05-04 17:56:28.000= 000000 -0400 +@@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vm +=20 + DPRINT_ENTER(VMBUS); +=20 +- nextGpadlHandle =3D atomic_read(&gVmbusConnection.NextGpadlHandle); +- atomic_inc(&gVmbusConnection.NextGpadlHandle); ++ nextGpadlHandle =3D atomic_read_unchecked(&gVmbusConnection.NextGpadlH= andle); ++ atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle); +=20 + VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount); + ASSERT(msgInfo !=3D NULL); +diff -urNp linux-2.6.32.45/drivers/staging/hv/Hv.c linux-2.6.32.45/drive= rs/staging/hv/Hv.c +--- linux-2.6.32.45/drivers/staging/hv/Hv.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/staging/hv/Hv.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, vo + u64 outputAddress =3D (Output) ? virt_to_phys(Output) : 0; + u32 outputAddressHi =3D outputAddress >> 32; + u32 outputAddressLo =3D outputAddress & 0xFFFFFFFF; +- volatile void *hypercallPage =3D gHvContext.HypercallPage; ++ volatile void *hypercallPage =3D ktva_ktla(gHvContext.HypercallPage); +=20 + DPRINT_DBG(VMBUS, "Hypercall ", + Control, Input, Output); +diff -urNp linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c linux-2.6.32.4= 5/drivers/staging/hv/vmbus_drv.c +--- linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/staging/hv/vmbus_drv.c 2011-05-04 17:56:28.0= 00000000 -0400 +@@ -532,7 +532,7 @@ static int vmbus_child_device_register(s + to_device_context(root_device_obj); + struct device_context *child_device_ctx =3D + to_device_context(child_device_obj); +- static atomic_t device_num =3D ATOMIC_INIT(0); ++ static atomic_unchecked_t device_num =3D ATOMIC_INIT(0); +=20 + DPRINT_ENTER(VMBUS_DRV); +=20 +@@ -541,7 +541,7 @@ static int vmbus_child_device_register(s +=20 + /* Set the device name. Otherwise, device_register() will fail. */ + dev_set_name(&child_device_ctx->device, "vmbus_0_%d", +- atomic_inc_return(&device_num)); ++ atomic_inc_return_unchecked(&device_num)); +=20 + /* The new device belongs to this bus */ + child_device_ctx->device.bus =3D &g_vmbus_drv.bus; /* device->dev.bus;= */ +diff -urNp linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h linux-2.6.3= 2.45/drivers/staging/hv/VmbusPrivate.h +--- linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h 2011-04-17 17:00:5= 2.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/hv/VmbusPrivate.h 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE { + struct VMBUS_CONNECTION { + enum VMBUS_CONNECT_STATE ConnectState; +=20 +- atomic_t NextGpadlHandle; ++ atomic_unchecked_t NextGpadlHandle; +=20 + /* + * Represents channel interrupts. Each bit position represents a +diff -urNp linux-2.6.32.45/drivers/staging/iio/ring_generic.h linux-2.6.= 32.45/drivers/staging/iio/ring_generic.h +--- linux-2.6.32.45/drivers/staging/iio/ring_generic.h 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/iio/ring_generic.h 2011-08-23 20:24:= 26.000000000 -0400 +@@ -87,7 +87,7 @@ struct iio_ring_access_funcs { +=20 + int (*is_enabled)(struct iio_ring_buffer *ring); + int (*enable)(struct iio_ring_buffer *ring); +-}; ++} __no_const; +=20 + /** + * struct iio_ring_buffer - general ring buffer structure +diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet.c linux-2.6.3= 2.45/drivers/staging/octeon/ethernet.c +--- linux-2.6.32.45/drivers/staging/octeon/ethernet.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/octeon/ethernet.c 2011-05-04 17:56:2= 8.000000000 -0400 +@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_ + * since the RX tasklet also increments it. + */ + #ifdef CONFIG_64BIT +- atomic64_add(rx_status.dropped_packets, +- (atomic64_t *)&priv->stats.rx_dropped); ++ atomic64_add_unchecked(rx_status.dropped_packets, ++ (atomic64_unchecked_t *)&priv->stats.rx_dropped); + #else +- atomic_add(rx_status.dropped_packets, +- (atomic_t *)&priv->stats.rx_dropped); ++ atomic_add_unchecked(rx_status.dropped_packets, ++ (atomic_unchecked_t *)&priv->stats.rx_dropped); + #endif + } +=20 +diff -urNp linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c linux-2.= 6.32.45/drivers/staging/octeon/ethernet-rx.c +--- linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/octeon/ethernet-rx.c 2011-05-04 17:5= 6:28.000000000 -0400 +@@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long un + /* Increment RX stats for virtual ports */ + if (work->ipprt >=3D CVMX_PIP_NUM_INPUT_PORTS) { + #ifdef CONFIG_64BIT +- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets); +- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes); ++ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_= packets); ++ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->st= ats.rx_bytes); + #else +- atomic_add(1, (atomic_t *)&priv->stats.rx_packets); +- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes); ++ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_pack= ets); ++ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.= rx_bytes); + #endif + } + netif_receive_skb(skb); +@@ -424,9 +424,9 @@ void cvm_oct_tasklet_rx(unsigned long un + dev->name); + */ + #ifdef CONFIG_64BIT +- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped); ++ atomic64_add_unchecked(1, (atomic64_t *)&priv->stats.rx_dropped); + #else +- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped); ++ atomic_add_unchecked(1, (atomic_t *)&priv->stats.rx_dropped); + #endif + dev_kfree_skb_irq(skb); + } +diff -urNp linux-2.6.32.45/drivers/staging/panel/panel.c linux-2.6.32.45= /drivers/staging/panel/panel.c +--- linux-2.6.32.45/drivers/staging/panel/panel.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/staging/panel/panel.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino + return 0; + } +=20 +-static struct file_operations lcd_fops =3D { ++static const struct file_operations lcd_fops =3D { + .write =3D lcd_write, + .open =3D lcd_open, + .release =3D lcd_release, +@@ -1565,7 +1565,7 @@ static int keypad_release(struct inode * + return 0; + } +=20 +-static struct file_operations keypad_fops =3D { ++static const struct file_operations keypad_fops =3D { + .read =3D keypad_read, /* read */ + .open =3D keypad_open, /* open */ + .release =3D keypad_release, /* close */ +diff -urNp linux-2.6.32.45/drivers/staging/phison/phison.c linux-2.6.32.= 45/drivers/staging/phison/phison.c +--- linux-2.6.32.45/drivers/staging/phison/phison.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/phison/phison.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ + ATA_BMDMA_SHT(DRV_NAME), + }; +=20 +-static struct ata_port_operations phison_ops =3D { ++static const struct ata_port_operations phison_ops =3D { + .inherits =3D &ata_bmdma_port_ops, + .prereset =3D phison_pre_reset, + }; +diff -urNp linux-2.6.32.45/drivers/staging/poch/poch.c linux-2.6.32.45/d= rivers/staging/poch/poch.c +--- linux-2.6.32.45/drivers/staging/poch/poch.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/staging/poch/poch.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod + return 0; + } +=20 +-static struct file_operations poch_fops =3D { ++static const struct file_operations poch_fops =3D { + .owner =3D THIS_MODULE, + .open =3D poch_open, + .release =3D poch_release, +diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/inode.c linux-2.6.32= .45/drivers/staging/pohmelfs/inode.c +--- linux-2.6.32.45/drivers/staging/pohmelfs/inode.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/pohmelfs/inode.c 2011-05-04 17:56:20= .000000000 -0400 +@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su + mutex_init(&psb->mcache_lock); + psb->mcache_root =3D RB_ROOT; + psb->mcache_timeout =3D msecs_to_jiffies(5000); +- atomic_long_set(&psb->mcache_gen, 0); ++ atomic_long_set_unchecked(&psb->mcache_gen, 0); +=20 + psb->trans_max_pages =3D 100; +=20 +@@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct su + INIT_LIST_HEAD(&psb->crypto_ready_list); + INIT_LIST_HEAD(&psb->crypto_active_list); +=20 +- atomic_set(&psb->trans_gen, 1); ++ atomic_set_unchecked(&psb->trans_gen, 1); + atomic_long_set(&psb->total_inodes, 0); +=20 + mutex_init(&psb->state_lock); +diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c linux-2.6.3= 2.45/drivers/staging/pohmelfs/mcache.c +--- linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/pohmelfs/mcache.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ + m->data =3D data; + m->start =3D start; + m->size =3D size; +- m->gen =3D atomic_long_inc_return(&psb->mcache_gen); ++ m->gen =3D atomic_long_inc_return_unchecked(&psb->mcache_gen); +=20 + mutex_lock(&psb->mcache_lock); + err =3D pohmelfs_mcache_insert(psb, m); +diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h linux-2.6.32= .45/drivers/staging/pohmelfs/netfs.h +--- linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/pohmelfs/netfs.h 2011-05-04 17:56:20= .000000000 -0400 +@@ -570,14 +570,14 @@ struct pohmelfs_config; + struct pohmelfs_sb { + struct rb_root mcache_root; + struct mutex mcache_lock; +- atomic_long_t mcache_gen; ++ atomic_long_unchecked_t mcache_gen; + unsigned long mcache_timeout; +=20 + unsigned int idx; +=20 + unsigned int trans_retries; +=20 +- atomic_t trans_gen; ++ atomic_unchecked_t trans_gen; +=20 + unsigned int crypto_attached_size; + unsigned int crypto_align_size; +diff -urNp linux-2.6.32.45/drivers/staging/pohmelfs/trans.c linux-2.6.32= .45/drivers/staging/pohmelfs/trans.c +--- linux-2.6.32.45/drivers/staging/pohmelfs/trans.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/pohmelfs/trans.c 2011-05-04 17:56:28= .000000000 -0400 +@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran + int err; + struct netfs_cmd *cmd =3D t->iovec.iov_base; +=20 +- t->gen =3D atomic_inc_return(&psb->trans_gen); ++ t->gen =3D atomic_inc_return_unchecked(&psb->trans_gen); +=20 + cmd->size =3D t->iovec.iov_len - sizeof(struct netfs_cmd) + + t->attached_size + t->attached_pages * sizeof(struct netfs_cmd); +diff -urNp linux-2.6.32.45/drivers/staging/sep/sep_driver.c linux-2.6.32= .45/drivers/staging/sep/sep_driver.c +--- linux-2.6.32.45/drivers/staging/sep/sep_driver.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/sep/sep_driver.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver=20 + static dev_t sep_devno; +=20 + /* the files operations structure of the driver */ +-static struct file_operations sep_file_operations =3D { ++static const struct file_operations sep_file_operations =3D { + .owner =3D THIS_MODULE, + .ioctl =3D sep_ioctl, + .poll =3D sep_poll, +diff -urNp linux-2.6.32.45/drivers/staging/usbip/usbip_common.h linux-2.= 6.32.45/drivers/staging/usbip/usbip_common.h +--- linux-2.6.32.45/drivers/staging/usbip/usbip_common.h 2011-04-17 17:0= 0:52.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/usbip/usbip_common.h 2011-08-23 20:2= 4:26.000000000 -0400 +@@ -374,7 +374,7 @@ struct usbip_device { + void (*shutdown)(struct usbip_device *); + void (*reset)(struct usbip_device *); + void (*unusable)(struct usbip_device *); +- } eh_ops; ++ } __no_const eh_ops; + }; +=20 +=20 +diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci.h linux-2.6.32.45/= drivers/staging/usbip/vhci.h +--- linux-2.6.32.45/drivers/staging/usbip/vhci.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/staging/usbip/vhci.h 2011-05-04 17:56:28.000= 000000 -0400 +@@ -92,7 +92,7 @@ struct vhci_hcd { + unsigned resuming:1; + unsigned long re_timeout; +=20 +- atomic_t seqnum; ++ atomic_unchecked_t seqnum; +=20 + /* + * NOTE: +diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c linux-2.6.32= .45/drivers/staging/usbip/vhci_hcd.c +--- linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:01= .000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/usbip/vhci_hcd.c 2011-05-10 22:12:33= .000000000 -0400 +@@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb) + return; + } +=20 +- priv->seqnum =3D atomic_inc_return(&the_controller->seqnum); ++ priv->seqnum =3D atomic_inc_return_unchecked(&the_controller->seqnum); + if (priv->seqnum =3D=3D 0xffff) + usbip_uinfo("seqnum max\n"); +=20 +@@ -793,7 +793,7 @@ static int vhci_urb_dequeue(struct usb_h + return -ENOMEM; + } +=20 +- unlink->seqnum =3D atomic_inc_return(&the_controller->seqnum); ++ unlink->seqnum =3D atomic_inc_return_unchecked(&the_controller->seqnu= m); + if (unlink->seqnum =3D=3D 0xffff) + usbip_uinfo("seqnum max\n"); +=20 +@@ -988,7 +988,7 @@ static int vhci_start(struct usb_hcd *hc + vdev->rhport =3D rhport; + } +=20 +- atomic_set(&vhci->seqnum, 0); ++ atomic_set_unchecked(&vhci->seqnum, 0); + spin_lock_init(&vhci->lock); +=20 +=20 +diff -urNp linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c linux-2.6.32.= 45/drivers/staging/usbip/vhci_rx.c +--- linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c 2011-04-17 17:00:52.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/usbip/vhci_rx.c 2011-05-04 17:56:28.= 000000000 -0400 +@@ -78,7 +78,7 @@ static void vhci_recv_ret_submit(struct=20 + usbip_uerr("cannot find a urb of seqnum %u\n", + pdu->base.seqnum); + usbip_uinfo("max seqnum %d\n", +- atomic_read(&the_controller->seqnum)); ++ atomic_read_unchecked(&the_controller->seqnum)); + usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); + return; + } +diff -urNp linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c linux-= 2.6.32.45/drivers/staging/vme/devices/vme_user.c +--- linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/vme/devices/vme_user.c 2011-04-17 15= :56:46.000000000 -0400 +@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * + static int __init vme_user_probe(struct device *, int, int); + static int __exit vme_user_remove(struct device *, int, int); +=20 +-static struct file_operations vme_user_fops =3D { ++static const struct file_operations vme_user_fops =3D { + .open =3D vme_user_open, + .release =3D vme_user_release, + .read =3D vme_user_read, +diff -urNp linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c linux-2= .6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c +--- linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c 2011-03-27 14:= 31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/staging/wlan-ng/hfa384x_usb.c 2011-08-23 20:= 24:26.000000000 -0400 +@@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hf +=20 + struct usbctlx_completor { + int (*complete) (struct usbctlx_completor *); +-}; ++} __no_const; + typedef struct usbctlx_completor usbctlx_completor_t; +=20 + static int +diff -urNp linux-2.6.32.45/drivers/telephony/ixj.c linux-2.6.32.45/drive= rs/telephony/ixj.c +--- linux-2.6.32.45/drivers/telephony/ixj.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/telephony/ixj.c 2011-05-16 21:46:57.00000000= 0 -0400 +@@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j) + bool mContinue; + char *pIn, *pOut; +=20 ++ pax_track_stack(); ++ + if (!SCI_Prepare(j)) + return 0; +=20 +diff -urNp linux-2.6.32.45/drivers/uio/uio.c linux-2.6.32.45/drivers/uio= /uio.c +--- linux-2.6.32.45/drivers/uio/uio.c 2011-03-27 14:31:47.000000000 -040= 0 ++++ linux-2.6.32.45/drivers/uio/uio.c 2011-05-04 17:56:20.000000000 -040= 0 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include +=20 + #define UIO_MAX_DEVICES 255 +=20 +@@ -30,10 +31,10 @@ struct uio_device { + struct module *owner; + struct device *dev; + int minor; +- atomic_t event; ++ atomic_unchecked_t event; + struct fasync_struct *async_queue; + wait_queue_head_t wait; +- int vma_count; ++ local_t vma_count; + struct uio_info *info; + struct kobject *map_dir; + struct kobject *portio_dir; +@@ -129,7 +130,7 @@ static ssize_t map_type_show(struct kobj + return entry->show(mem, buf); + } +=20 +-static struct sysfs_ops map_sysfs_ops =3D { ++static const struct sysfs_ops map_sysfs_ops =3D { + .show =3D map_type_show, + }; +=20 +@@ -217,7 +218,7 @@ static ssize_t portio_type_show(struct k + return entry->show(port, buf); + } +=20 +-static struct sysfs_ops portio_sysfs_ops =3D { ++static const struct sysfs_ops portio_sysfs_ops =3D { + .show =3D portio_type_show, + }; +=20 +@@ -255,7 +256,7 @@ static ssize_t show_event(struct device=20 + struct uio_device *idev =3D dev_get_drvdata(dev); + if (idev) + return sprintf(buf, "%u\n", +- (unsigned int)atomic_read(&idev->event)); ++ (unsigned int)atomic_read_unchecked(&idev->event)); + else + return -ENODEV; + } +@@ -424,7 +425,7 @@ void uio_event_notify(struct uio_info *i + { + struct uio_device *idev =3D info->uio_dev; +=20 +- atomic_inc(&idev->event); ++ atomic_inc_unchecked(&idev->event); + wake_up_interruptible(&idev->wait); + kill_fasync(&idev->async_queue, SIGIO, POLL_IN); + } +@@ -477,7 +478,7 @@ static int uio_open(struct inode *inode, + } +=20 + listener->dev =3D idev; +- listener->event_count =3D atomic_read(&idev->event); ++ listener->event_count =3D atomic_read_unchecked(&idev->event); + filep->private_data =3D listener; +=20 + if (idev->info->open) { +@@ -528,7 +529,7 @@ static unsigned int uio_poll(struct file + return -EIO; +=20 + poll_wait(filep, &idev->wait, wait); +- if (listener->event_count !=3D atomic_read(&idev->event)) ++ if (listener->event_count !=3D atomic_read_unchecked(&idev->event)) + return POLLIN | POLLRDNORM; + return 0; + } +@@ -553,7 +554,7 @@ static ssize_t uio_read(struct file *fil + do { + set_current_state(TASK_INTERRUPTIBLE); +=20 +- event_count =3D atomic_read(&idev->event); ++ event_count =3D atomic_read_unchecked(&idev->event); + if (event_count !=3D listener->event_count) { + if (copy_to_user(buf, &event_count, count)) + retval =3D -EFAULT; +@@ -624,13 +625,13 @@ static int uio_find_mem_index(struct vm_ + static void uio_vma_open(struct vm_area_struct *vma) + { + struct uio_device *idev =3D vma->vm_private_data; +- idev->vma_count++; ++ local_inc(&idev->vma_count); + } +=20 + static void uio_vma_close(struct vm_area_struct *vma) + { + struct uio_device *idev =3D vma->vm_private_data; +- idev->vma_count--; ++ local_dec(&idev->vma_count); + } +=20 + static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *v= mf) +@@ -840,7 +841,7 @@ int __uio_register_device(struct module=20 + idev->owner =3D owner; + idev->info =3D info; + init_waitqueue_head(&idev->wait); +- atomic_set(&idev->event, 0); ++ atomic_set_unchecked(&idev->event, 0); +=20 + ret =3D uio_get_minor(idev); + if (ret) +diff -urNp linux-2.6.32.45/drivers/usb/atm/usbatm.c linux-2.6.32.45/driv= ers/usb/atm/usbatm.c +--- linux-2.6.32.45/drivers/usb/atm/usbatm.c 2011-03-27 14:31:47.0000000= 00 -0400 ++++ linux-2.6.32.45/drivers/usb/atm/usbatm.c 2011-04-17 15:56:46.0000000= 00 -0400 +@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru + if (printk_ratelimit()) + atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", + __func__, vpi, vci); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + return; + } +=20 +@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(stru + if (length > ATM_MAX_AAL5_PDU) { + atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n", + __func__, length, vcc); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto out; + } +=20 +@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(stru + if (sarb->len < pdu_length) { + atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x= %p)!\n", + __func__, pdu_length, sarb->len, vcc); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto out; + } +=20 + if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) !=3D= 0xc704dd7b) { + atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n", + __func__, vcc); +- atomic_inc(&vcc->stats->rx_err); ++ atomic_inc_unchecked(&vcc->stats->rx_err); + goto out; + } +=20 +@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(stru + if (printk_ratelimit()) + atm_err(instance, "%s: no memory for skb (length: %u)!\n", + __func__, length); +- atomic_inc(&vcc->stats->rx_drop); ++ atomic_inc_unchecked(&vcc->stats->rx_drop); + goto out; + } +=20 +@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(stru +=20 + vcc->push(vcc, skb); +=20 +- atomic_inc(&vcc->stats->rx); ++ atomic_inc_unchecked(&vcc->stats->rx); + out: + skb_trim(sarb, 0); + } +@@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned l + struct atm_vcc *vcc =3D UDSL_SKB(skb)->atm.vcc; +=20 + usbatm_pop(vcc, skb); +- atomic_inc(&vcc->stats->tx); ++ atomic_inc_unchecked(&vcc->stats->tx); +=20 + skb =3D skb_dequeue(&instance->sndqueue); + } +@@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct a + if (!left--) + return sprintf(page, + "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n", +- atomic_read(&atm_dev->stats.aal5.tx), +- atomic_read(&atm_dev->stats.aal5.tx_err), +- atomic_read(&atm_dev->stats.aal5.rx), +- atomic_read(&atm_dev->stats.aal5.rx_err), +- atomic_read(&atm_dev->stats.aal5.rx_drop)); ++ atomic_read_unchecked(&atm_dev->stats.aal5.tx), ++ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err), ++ atomic_read_unchecked(&atm_dev->stats.aal5.rx), ++ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err), ++ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop)); +=20 + if (!left--) { + if (instance->disconnected) +diff -urNp linux-2.6.32.45/drivers/usb/class/cdc-wdm.c linux-2.6.32.45/d= rivers/usb/class/cdc-wdm.c +--- linux-2.6.32.45/drivers/usb/class/cdc-wdm.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/usb/class/cdc-wdm.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -314,7 +314,7 @@ static ssize_t wdm_write + if (r < 0) + goto outnp; +=20 +- if (!file->f_flags && O_NONBLOCK) ++ if (!(file->f_flags & O_NONBLOCK)) + r =3D wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE, + &desc->flags)); + else +diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.c linux-2.6.32.45/driver= s/usb/core/hcd.c +--- linux-2.6.32.45/drivers/usb/core/hcd.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/usb/core/hcd.c 2011-04-17 15:56:46.000000000= -0400 +@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd +=20 + #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) +=20 +-struct usb_mon_operations *mon_ops; ++const struct usb_mon_operations *mon_ops; +=20 + /* + * The registration is unlocked. +@@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops; + * symbols from usbcore, usbcore gets referenced and cannot be unloaded= first. + */ + =20 +-int usb_mon_register (struct usb_mon_operations *ops) ++int usb_mon_register (const struct usb_mon_operations *ops) + { +=20 + if (mon_ops) +diff -urNp linux-2.6.32.45/drivers/usb/core/hcd.h linux-2.6.32.45/driver= s/usb/core/hcd.h +--- linux-2.6.32.45/drivers/usb/core/hcd.h 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/usb/core/hcd.h 2011-04-17 15:56:46.000000000= -0400 +@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { + #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) +=20 + 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); */ + }; +=20 +-extern struct usb_mon_operations *mon_ops; ++extern const struct usb_mon_operations *mon_ops; +=20 + static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *u= rb) + { +@@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(s + (*mon_ops->urb_complete)(bus, urb, status); + } +=20 +-int usb_mon_register(struct usb_mon_operations *ops); ++int usb_mon_register(const struct usb_mon_operations *ops); + void usb_mon_deregister(void); +=20 + #else +diff -urNp linux-2.6.32.45/drivers/usb/core/message.c linux-2.6.32.45/dr= ivers/usb/core/message.c +--- linux-2.6.32.45/drivers/usb/core/message.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/usb/core/message.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device + buf =3D kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); + if (buf) { + len =3D usb_string(udev, index, buf, MAX_USB_STRING_SIZE); +- if (len > 0) { +- smallbuf =3D kmalloc(++len, GFP_NOIO); ++ if (len++ > 0) { ++ smallbuf =3D kmalloc(len, GFP_NOIO); + if (!smallbuf) + return buf; + memcpy(smallbuf, buf, len); +diff -urNp linux-2.6.32.45/drivers/usb/misc/appledisplay.c linux-2.6.32.= 45/drivers/usb/misc/appledisplay.c +--- linux-2.6.32.45/drivers/usb/misc/appledisplay.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/usb/misc/appledisplay.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes + return pdata->msgdata[1]; + } +=20 +-static struct backlight_ops appledisplay_bl_data =3D { ++static const struct backlight_ops appledisplay_bl_data =3D { + .get_brightness =3D appledisplay_bl_get_brightness, + .update_status =3D appledisplay_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/usb/mon/mon_main.c linux-2.6.32.45/dr= ivers/usb/mon/mon_main.c +--- linux-2.6.32.45/drivers/usb/mon/mon_main.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/usb/mon/mon_main.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -238,7 +238,7 @@ static struct notifier_block mon_nb =3D { + /* + * Ops + */ +-static struct usb_mon_operations mon_ops_0 =3D { ++static const struct usb_mon_operations mon_ops_0 =3D { + .urb_submit =3D mon_submit, + .urb_submit_error =3D mon_submit_error, + .urb_complete =3D mon_complete, +diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h linux-2.6.32.45/= drivers/usb/wusbcore/wa-hc.h +--- linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/usb/wusbcore/wa-hc.h 2011-05-04 17:56:28.000= 000000 -0400 +@@ -192,7 +192,7 @@ struct wahc { + struct list_head xfer_delayed_list; + spinlock_t xfer_list_lock; + struct work_struct xfer_work; +- atomic_t xfer_id_count; ++ atomic_unchecked_t xfer_id_count; + }; +=20 +=20 +@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc * + INIT_LIST_HEAD(&wa->xfer_delayed_list); + spin_lock_init(&wa->xfer_list_lock); + INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run); +- atomic_set(&wa->xfer_id_count, 1); ++ atomic_set_unchecked(&wa->xfer_id_count, 1); + } +=20 + /** +diff -urNp linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c linux-2.6.32.4= 5/drivers/usb/wusbcore/wa-xfer.c +--- linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/usb/wusbcore/wa-xfer.c 2011-05-04 17:56:28.0= 00000000 -0400 +@@ -293,7 +293,7 @@ out: + */ + static void wa_xfer_id_init(struct wa_xfer *xfer) + { +- xfer->id =3D atomic_add_return(1, &xfer->wa->xfer_id_count); ++ xfer->id =3D atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count); + } +=20 + /* +diff -urNp linux-2.6.32.45/drivers/uwb/wlp/messages.c linux-2.6.32.45/dr= ivers/uwb/wlp/messages.c +--- linux-2.6.32.45/drivers/uwb/wlp/messages.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/uwb/wlp/messages.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct + size_t len =3D skb->len; + size_t used; + ssize_t result; +- struct wlp_nonce enonce, rnonce; ++ struct wlp_nonce enonce =3D {{0}}, rnonce =3D {{0}}; + 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.32.45/drivers/uwb/wlp/sysfs.c linux-2.6.32.45/drive= rs/uwb/wlp/sysfs.c +--- linux-2.6.32.45/drivers/uwb/wlp/sysfs.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/uwb/wlp/sysfs.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec + return ret; + } +=20 +-static +-struct sysfs_ops wss_sysfs_ops =3D { ++static const struct sysfs_ops wss_sysfs_ops =3D { + .show =3D wlp_wss_attr_show, + .store =3D wlp_wss_attr_store, + }; +diff -urNp linux-2.6.32.45/drivers/video/atmel_lcdfb.c linux-2.6.32.45/d= rivers/video/atmel_lcdfb.c +--- linux-2.6.32.45/drivers/video/atmel_lcdfb.c 2011-03-27 14:31:47.0000= 00000 -0400 ++++ linux-2.6.32.45/drivers/video/atmel_lcdfb.c 2011-04-17 15:56:46.0000= 00000 -0400 +@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc + return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); + } +=20 +-static struct backlight_ops atmel_lcdc_bl_ops =3D { ++static const struct backlight_ops atmel_lcdc_bl_ops =3D { + .update_status =3D atmel_bl_update_status, + .get_brightness =3D atmel_bl_get_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/video/aty/aty128fb.c linux-2.6.32.45/= drivers/video/aty/aty128fb.c +--- linux-2.6.32.45/drivers/video/aty/aty128fb.c 2011-03-27 14:31:47.000= 000000 -0400 ++++ linux-2.6.32.45/drivers/video/aty/aty128fb.c 2011-04-17 15:56:46.000= 000000 -0400 +@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru + return bd->props.brightness; + } +=20 +-static struct backlight_ops aty128_bl_data =3D { ++static const struct backlight_ops aty128_bl_data =3D { + .get_brightness =3D aty128_bl_get_brightness, + .update_status =3D aty128_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/aty/atyfb_base.c linux-2.6.32.4= 5/drivers/video/aty/atyfb_base.c +--- linux-2.6.32.45/drivers/video/aty/atyfb_base.c 2011-03-27 14:31:47.0= 00000000 -0400 ++++ linux-2.6.32.45/drivers/video/aty/atyfb_base.c 2011-04-17 15:56:46.0= 00000000 -0400 +@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct=20 + return bd->props.brightness; + } +=20 +-static struct backlight_ops aty_bl_data =3D { ++static const struct backlight_ops aty_bl_data =3D { + .get_brightness =3D aty_bl_get_brightness, + .update_status =3D aty_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/aty/radeon_backlight.c linux-2.= 6.32.45/drivers/video/aty/radeon_backlight.c +--- linux-2.6.32.45/drivers/video/aty/radeon_backlight.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/aty/radeon_backlight.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru + return bd->props.brightness; + } +=20 +-static struct backlight_ops radeon_bl_data =3D { ++static const struct backlight_ops radeon_bl_data =3D { + .get_brightness =3D radeon_bl_get_brightness, + .update_status =3D radeon_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c linux-2.= 6.32.45/drivers/video/backlight/adp5520_bl.c +--- linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/adp5520_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str + return error ? data->current_brightness : reg_val; + } +=20 +-static struct backlight_ops adp5520_bl_ops =3D { ++static const struct backlight_ops adp5520_bl_ops =3D { + .update_status =3D adp5520_bl_update_status, + .get_brightness =3D adp5520_bl_get_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/adx_bl.c linux-2.6.32= .45/drivers/video/backlight/adx_bl.c +--- linux-2.6.32.45/drivers/video/backlight/adx_bl.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/adx_bl.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct + return 1; + } +=20 +-static struct backlight_ops adx_backlight_ops =3D { ++static const struct backlight_ops adx_backlight_ops =3D { + .options =3D 0, + .update_status =3D adx_backlight_update_status, + .get_brightness =3D adx_backlight_get_brightness, +diff -urNp linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c linux-= 2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c +--- linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c 2011-03-27 14= :31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/atmel-pwm-bl.c 2011-04-17 15= :56:46.000000000 -0400 +@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct=20 + return pwm_channel_enable(&pwmbl->pwmc); + } +=20 +-static struct backlight_ops atmel_pwm_bl_ops =3D { ++static const struct backlight_ops atmel_pwm_bl_ops =3D { + .get_brightness =3D atmel_pwm_bl_get_intensity, + .update_status =3D atmel_pwm_bl_set_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/backlight.c linux-2.6= .32.45/drivers/video/backlight/backlight.c +--- linux-2.6.32.45/drivers/video/backlight/backlight.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/backlight.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -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, +- struct device *parent, void *devdata, struct backlight_ops *ops) ++ struct device *parent, void *devdata, const struct backlight_ops *ops= ) + { + struct backlight_device *new_bd; + int rc; +diff -urNp linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c linux-2.6= .32.45/drivers/video/backlight/corgi_lcd.c +--- linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/corgi_lcd.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit + } + EXPORT_SYMBOL(corgi_lcd_limit_intensity); +=20 +-static struct backlight_ops corgi_bl_ops =3D { ++static const struct backlight_ops corgi_bl_ops =3D { + .get_brightness =3D corgi_bl_get_intensity, + .update_status =3D corgi_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c linux-2.6.= 32.45/drivers/video/backlight/cr_bllcd.c +--- linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/cr_bllcd.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st + return intensity; + } +=20 +-static struct backlight_ops cr_backlight_ops =3D { ++static const struct backlight_ops cr_backlight_ops =3D { + .get_brightness =3D cr_backlight_get_intensity, + .update_status =3D cr_backlight_set_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/da903x_bl.c linux-2.6= .32.45/drivers/video/backlight/da903x_bl.c +--- linux-2.6.32.45/drivers/video/backlight/da903x_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/da903x_bl.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne + return data->current_brightness; + } +=20 +-static struct backlight_ops da903x_backlight_ops =3D { ++static const struct backlight_ops da903x_backlight_ops =3D { + .update_status =3D da903x_backlight_update_status, + .get_brightness =3D da903x_backlight_get_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/generic_bl.c linux-2.= 6.32.45/drivers/video/backlight/generic_bl.c +--- linux-2.6.32.45/drivers/video/backlight/generic_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/generic_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) + } + EXPORT_SYMBOL(corgibl_limit_intensity); +=20 +-static struct backlight_ops genericbl_ops =3D { ++static const struct backlight_ops genericbl_ops =3D { + .options =3D BL_CORE_SUSPENDRESUME, + .get_brightness =3D genericbl_get_intensity, + .update_status =3D genericbl_send_intensity, +diff -urNp linux-2.6.32.45/drivers/video/backlight/hp680_bl.c linux-2.6.= 32.45/drivers/video/backlight/hp680_bl.c +--- linux-2.6.32.45/drivers/video/backlight/hp680_bl.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/hp680_bl.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct=20 + return current_intensity; + } +=20 +-static struct backlight_ops hp680bl_ops =3D { ++static const struct backlight_ops hp680bl_ops =3D { + .get_brightness =3D hp680bl_get_intensity, + .update_status =3D hp680bl_set_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c linux= -2.6.32.45/drivers/video/backlight/jornada720_bl.c +--- linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c 2011-03-27 1= 4:31:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/jornada720_bl.c 2011-04-17 1= 5:56:46.000000000 -0400 +@@ -93,7 +93,7 @@ out: + return ret; + } +=20 +-static struct backlight_ops jornada_bl_ops =3D { ++static const struct backlight_ops jornada_bl_ops =3D { + .get_brightness =3D jornada_bl_get_brightness, + .update_status =3D jornada_bl_update_status, + .options =3D BL_CORE_SUSPENDRESUME, +diff -urNp linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c linux-2.6= .32.45/drivers/video/backlight/kb3886_bl.c +--- linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/kb3886_bl.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct + return kb3886bl_intensity; + } +=20 +-static struct backlight_ops kb3886bl_ops =3D { ++static const struct backlight_ops kb3886bl_ops =3D { + .get_brightness =3D kb3886bl_get_intensity, + .update_status =3D kb3886bl_send_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/locomolcd.c linux-2.6= .32.45/drivers/video/backlight/locomolcd.c +--- linux-2.6.32.45/drivers/video/backlight/locomolcd.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/locomolcd.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc + return current_intensity; + } +=20 +-static struct backlight_ops locomobl_data =3D { ++static const struct backlight_ops locomobl_data =3D { + .get_brightness =3D locomolcd_get_intensity, + .update_status =3D locomolcd_set_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c linux= -2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c +--- linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 2= 2:12:01.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/mbp_nvidia_bl.c 2011-05-10 2= 2:12:33.000000000 -0400 +@@ -33,7 +33,7 @@ struct dmi_match_data { + unsigned long iostart; + unsigned long iolen; + /* Backlight operations structure. */ +- struct backlight_ops backlight_ops; ++ const struct backlight_ops backlight_ops; + }; +=20 + /* Module parameters. */ +diff -urNp linux-2.6.32.45/drivers/video/backlight/omap1_bl.c linux-2.6.= 32.45/drivers/video/backlight/omap1_bl.c +--- linux-2.6.32.45/drivers/video/backlight/omap1_bl.c 2011-03-27 14:31:= 47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/omap1_bl.c 2011-04-17 15:56:= 46.000000000 -0400 +@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b + return bl->current_intensity; + } +=20 +-static struct backlight_ops omapbl_ops =3D { ++static const struct backlight_ops omapbl_ops =3D { + .get_brightness =3D omapbl_get_intensity, + .update_status =3D omapbl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/progear_bl.c linux-2.= 6.32.45/drivers/video/backlight/progear_bl.c +--- linux-2.6.32.45/drivers/video/backlight/progear_bl.c 2011-03-27 14:3= 1:47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/progear_bl.c 2011-04-17 15:5= 6:46.000000000 -0400 +@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc + return intensity - HW_LEVEL_MIN; + } +=20 +-static struct backlight_ops progearbl_ops =3D { ++static const struct backlight_ops progearbl_ops =3D { + .get_brightness =3D progearbl_get_intensity, + .update_status =3D progearbl_set_intensity, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/pwm_bl.c linux-2.6.32= .45/drivers/video/backlight/pwm_bl.c +--- linux-2.6.32.45/drivers/video/backlight/pwm_bl.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/pwm_bl.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( + return bl->props.brightness; + } +=20 +-static struct backlight_ops pwm_backlight_ops =3D { ++static const struct backlight_ops pwm_backlight_ops =3D { + .update_status =3D pwm_backlight_update_status, + .get_brightness =3D pwm_backlight_get_brightness, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/tosa_bl.c linux-2.6.3= 2.45/drivers/video/backlight/tosa_bl.c +--- linux-2.6.32.45/drivers/video/backlight/tosa_bl.c 2011-03-27 14:31:4= 7.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/tosa_bl.c 2011-04-17 15:56:4= 6.000000000 -0400 +@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct + return props->brightness; + } +=20 +-static struct backlight_ops bl_ops =3D { ++static const struct backlight_ops bl_ops =3D { + .get_brightness =3D tosa_bl_get_brightness, + .update_status =3D tosa_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c linux-2.6= .32.45/drivers/video/backlight/wm831x_bl.c +--- linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/backlight/wm831x_bl.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne + return data->current_brightness; + } +=20 +-static struct backlight_ops wm831x_backlight_ops =3D { ++static const struct backlight_ops wm831x_backlight_ops =3D { + .options =3D BL_CORE_SUSPENDRESUME, + .update_status =3D wm831x_backlight_update_status, + .get_brightness =3D wm831x_backlight_get_brightness, +diff -urNp linux-2.6.32.45/drivers/video/bf54x-lq043fb.c linux-2.6.32.45= /drivers/video/bf54x-lq043fb.c +--- linux-2.6.32.45/drivers/video/bf54x-lq043fb.c 2011-03-27 14:31:47.00= 0000000 -0400 ++++ linux-2.6.32.45/drivers/video/bf54x-lq043fb.c 2011-04-17 15:56:46.00= 0000000 -0400 +@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back + return 0; + } +=20 +-static struct backlight_ops bfin_lq043fb_bl_ops =3D { ++static const struct backlight_ops bfin_lq043fb_bl_ops =3D { + .get_brightness =3D bl_get_brightness, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32= .45/drivers/video/bfin-t350mcqb-fb.c +--- linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c 2011-03-27 14:31:47= .000000000 -0400 ++++ linux-2.6.32.45/drivers/video/bfin-t350mcqb-fb.c 2011-04-17 15:56:46= .000000000 -0400 +@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back + return 0; + } +=20 +-static struct backlight_ops bfin_lq043fb_bl_ops =3D { ++static const struct backlight_ops bfin_lq043fb_bl_ops =3D { + .get_brightness =3D bl_get_brightness, + }; +=20 +diff -urNp linux-2.6.32.45/drivers/video/fbcmap.c linux-2.6.32.45/driver= s/video/fbcmap.c +--- linux-2.6.32.45/drivers/video/fbcmap.c 2011-03-27 14:31:47.000000000= -0400 ++++ linux-2.6.32.45/drivers/video/fbcmap.c 2011-04-17 15:56:46.000000000= -0400 +@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user + rc =3D -ENODEV; + goto out; + } +- if (cmap->start < 0 || (!info->fbops->fb_setcolreg && +- !info->fbops->fb_setcmap)) { ++ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) { + rc =3D -EINVAL; + goto out1; + } +diff -urNp linux-2.6.32.45/drivers/video/fbmem.c linux-2.6.32.45/drivers= /video/fbmem.c +--- linux-2.6.32.45/drivers/video/fbmem.c 2011-03-27 14:31:47.000000000 = -0400 ++++ linux-2.6.32.45/drivers/video/fbmem.c 2011-05-16 21:46:57.000000000 = -0400 +@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in + image->dx +=3D image->width + 8; + } + } else if (rotate =3D=3D FB_ROTATE_UD) { +- for (x =3D 0; x < num && image->dx >=3D 0; x++) { ++ for (x =3D 0; x < num && (__s32)image->dx >=3D 0; x++) { + info->fbops->fb_imageblit(info, image); + image->dx -=3D image->width + 8; + } +@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_in + image->dy +=3D image->height + 8; + } + } else if (rotate =3D=3D FB_ROTATE_CCW) { +- for (x =3D 0; x < num && image->dy >=3D 0; x++) { ++ for (x =3D 0; x < num && (__s32)image->dy >=3D 0; x++) { + info->fbops->fb_imageblit(info, image); + image->dy -=3D image->height + 8; + } +@@ -915,6 +915,8 @@ fb_set_var(struct fb_info *info, struct=20 + int flags =3D info->flags; + int ret =3D 0; +=20 ++ pax_track_stack(); ++ + if (var->activate & FB_ACTIVATE_INV_MODE) { + struct fb_videomode mode1, mode2; +=20 +@@ -1040,6 +1042,8 @@ static long do_fb_ioctl(struct fb_info * + void __user *argp =3D (void __user *)arg; + long ret =3D 0; +=20 ++ pax_track_stack(); ++ + switch (cmd) { + case FBIOGET_VSCREENINFO: + if (!lock_fb_info(info)) +@@ -1119,7 +1123,7 @@ static long do_fb_ioctl(struct fb_info * + return -EFAULT; + if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) + return -EINVAL; +- if (con2fb.framebuffer < 0 || con2fb.framebuffer >=3D FB_MAX) ++ if (con2fb.framebuffer >=3D FB_MAX) + return -EINVAL; + if (!registered_fb[con2fb.framebuffer]) + request_module("fb%d", con2fb.framebuffer); +diff -urNp linux-2.6.32.45/drivers/video/i810/i810_accel.c linux-2.6.32.= 45/drivers/video/i810/i810_accel.c +--- linux-2.6.32.45/drivers/video/i810/i810_accel.c 2011-03-27 14:31:47.= 000000000 -0400 ++++ linux-2.6.32.45/drivers/video/i810/i810_accel.c 2011-04-17 15:56:46.= 000000000 -0400 +@@ -73,6 +73,7 @@ static inline int wait_for_space(struct=20 + } + } + printk("ringbuffer lockup!!!\n"); ++ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->ir= ing.size, space); + i810_report_error(mmio);=20 + par->dev_flags |=3D LOCKUP; + info->pixmap.scan_align =3D 1; +diff -urNp linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c linux-2.6= .32.45/drivers/video/nvidia/nv_backlight.c +--- linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c 2011-03-27 14:31= :47.000000000 -0400 ++++ linux-2.6.32.45/drivers/video/nvidia/nv_backlight.c 2011-04-17 15:56= :46.000000000 -0400 +@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru + return bd->props.brightness; + } +=20 +-static struct backlight_ops nvidia_bl_ops =3D { ++static const struct backlight_ops nvidia_bl_ops =3D { + .get_brightness =3D nvidia_bl_get_brightness, + .update_status =3D nvidia_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/riva/fbdev.c linux-2.6.32.45/dr= ivers/video/riva/fbdev.c +--- linux-2.6.32.45/drivers/video/riva/fbdev.c 2011-03-27 14:31:47.00000= 0000 -0400 ++++ linux-2.6.32.45/drivers/video/riva/fbdev.c 2011-04-17 15:56:46.00000= 0000 -0400 +@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct + return bd->props.brightness; + } +=20 +-static struct backlight_ops riva_bl_ops =3D { ++static const struct backlight_ops riva_bl_ops =3D { + .get_brightness =3D riva_bl_get_brightness, + .update_status =3D riva_bl_update_status, + }; +diff -urNp linux-2.6.32.45/drivers/video/uvesafb.c linux-2.6.32.45/drive= rs/video/uvesafb.c +--- linux-2.6.32.45/drivers/video/uvesafb.c 2011-03-27 14:31:47.00000000= 0 -0400 ++++ linux-2.6.32.45/drivers/video/uvesafb.c 2011-04-17 15:56:46.00000000= 0 -0400 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + #include