main/linux-grsec: upgrade to grsecurity-2.2.2-3.0.3-201108241901

4 files changed, 17692 insertions, 19888 deletions

diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index 750aa0f379..ddd14ef2c6 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,9 +2,9 @@
 
 _flavor=grsec
 pkgname=linux-${_flavor}
-pkgver=2.6.38.8
-_kernver=2.6.38
-pkgrel=1
+pkgver=3.0.3
+_kernver=3.0
+pkgrel=0
 pkgdesc="Linux kernel with grsecurity"
 url=http://grsecurity.net
 depends="mkinitfs linux-firmware"
@@ -12,12 +12,11 @@ makedepends="perl installkernel bash"
 options="!strip"
 _config=${config:-kernelconfig.${CARCH}}
 install=
-source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
-	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	grsecurity-2.2.2-2.6.38.8-unofficial.patch
+source="ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_kernver.tar.bz2
+	ftp://ftp.kernel.org/pub/linux/kernel/v3.0/patch-$pkgver.bz2
+	grsecurity-2.2.2-3.0.3-201108241901.patch
 	
 	0004-arp-flush-arp-cache-on-device-change.patch
-	net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch
 
 	kernelconfig.x86
 	kernelconfig.x86_64
@@ -137,10 +136,9 @@ dev() {
 		"$subpkgdir"/lib/modules/${_abi_release}/build
 }
 
-md5sums="7d471477bfa67546f902da62227fa976  linux-2.6.38.tar.bz2
-c0f416f6a2e916633f697287cc7cb914  patch-2.6.38.8.bz2
-58e1f9194fa75df9afdf2746370fa3cb  grsecurity-2.2.2-2.6.38.8-unofficial.patch
+md5sums="398e95866794def22b12dfbc15ce89c0  linux-3.0.tar.bz2
+1757786b9a9ffbd48ad9642199ff5bd7  patch-3.0.3.bz2
+9709493d471fc64e342345c1bb5b082b  grsecurity-2.2.2-3.0.3-201108241901.patch
 776adeeb5272093574f8836c5037dd7d  0004-arp-flush-arp-cache-on-device-change.patch
-aa1b82da0cabfb41c5e6da5bddf60bab  net-gre-provide-multicast-mappings-for-ipv4-and-ipv6.patch
-991a83798618ad3318502116a8044d99  kernelconfig.x86
+406e62e430cee7ba3bb37be341d9ff3e  kernelconfig.x86
 0a73d8d896101de90f47dae32119e7ca  kernelconfig.x86_64"
diff --git a/main/linux-grsec/grsecurity-2.2.2-2.6.38.8-unofficial.patch b/main/linux-grsec/grsecurity-2.2.2-3.0.3-201108241901.patch
index 241010df84..a30bf0fd50 100644
--- a/main/linux-grsec/grsecurity-2.2.2-2.6.38.8-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.2.2-3.0.3-201108241901.patch
@@ -1,232 +1,7 @@
-diff --git a/Documentation/dontdiff b/Documentation/dontdiff
-index 470d3db..c5906b5 100644
---- a/Documentation/dontdiff
-+++ b/Documentation/dontdiff
-@@ -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
-@@ -80,8 +90,11 @@ btfixupprep
- build
- bvmlinux
- bzImage*
-+capability_names.h
- capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -106,16 +119,19 @@ fore200e_mkfirm
- fore200e_pca_fw.c*
- gconf
- gen-devlist
-+gen-kdb_cmds.c
- gen_crc32table
- gen_init_cpio
- generated
- genheaders
- genksyms
- *_gray256.c
-+hash
- ihex2fw
- ikconfig.h*
- inat-tables.c
- initramfs_data.cpio
-+initramfs_data.cpio.bz2
- initramfs_data.cpio.gz
- initramfs_list
- int16.c
-@@ -125,7 +141,6 @@ int32.c
- int4.c
- int8.c
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -149,7 +164,9 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
-+mkregtable
- mktables
- mktree
- modpost
-@@ -165,6 +182,7 @@ parse.h
- patches*
- pca200e.bin
- pca200e_ecd.bin2
-+perf-archive
- piggy.gz
- piggyback
- piggy.S
-@@ -180,7 +198,9 @@ r600_reg_safe.h
- raid6altivec*.c
- raid6int*.c
- raid6tables.c
-+regdb.c
- relocs
-+rlim_names.h
- rn50_reg_safe.h
- rs600_reg_safe.h
- rv515_reg_safe.h
-@@ -189,6 +209,7 @@ setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -213,13 +234,17 @@ 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
-diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
-index 5d1335fae..9f4434d 100644
---- a/Documentation/filesystems/sysfs.txt
-+++ b/Documentation/filesystems/sysfs.txt
-@@ -123,8 +123,8 @@ set of sysfs operations for forwarding read and write calls to the
- show and store methods of the attribute owners. 
- 
- struct sysfs_ops {
--        ssize_t (*show)(struct kobject *, struct attribute *, char *);
--        ssize_t (*store)(struct kobject *, struct attribute *, const char *, size_t);
-+        ssize_t (* const show)(struct kobject *, struct attribute *, char *);
-+        ssize_t (* const store)(struct kobject *, struct attribute *, const char *, size_t);
- };
- 
- [ Subsystems should have already defined a struct kobj_type as a
-diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index f4a04c0..a0fc4f4 100644
---- a/Documentation/kernel-parameters.txt
-+++ b/Documentation/kernel-parameters.txt
-@@ -1853,6 +1853,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
- 			the specified number of seconds.  This is to be used if
- 			your oopses keep scrolling off the screen.
- 
-+	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=	0/1 to disable/enable PaX softmode on boot already.
-+
- 	pcbit=		[HW,ISDN]
- 
- 	pcd.		[PARIDE]
-diff --git a/Makefile b/Makefile
-index 66b7e76..753c72d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -233,8 +233,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
--HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
-+HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
- 
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -352,6 +352,7 @@ LINUXINCLUDE    := -I$(srctree)/arch/$(hdr-arch)/include -Iinclude \
- KBUILD_CPPFLAGS := -D__KERNEL__
- 
- KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
-+		   -W -Wno-empty-body -Wno-unused-parameter -Wno-missing-field-initializers \
- 		   -fno-strict-aliasing -fno-common \
- 		   -Werror-implicit-function-declaration \
- 		   -Wno-format-security \
-@@ -681,7 +682,7 @@ export mod_strip_cmd
- 
- 
- ifeq ($(KBUILD_EXTMOD),)
--core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- 
- vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
- 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
-diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
-index 4567aca..1a7d7a9 100644
---- a/arch/alpha/include/asm/dma-mapping.h
-+++ b/arch/alpha/include/asm/dma-mapping.h
-@@ -3,9 +3,9 @@
- 
- #include <linux/dma-attrs.h>
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	return dma_ops;
- }
-diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
-index 9baae8a..8d8bc6b 100644
---- a/arch/alpha/include/asm/elf.h
-+++ b/arch/alpha/include/asm/elf.h
-@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+diff -urNp linux-3.0.3/arch/alpha/include/asm/elf.h linux-3.0.3/arch/alpha/include/asm/elf.h
+--- linux-3.0.3/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
  
@@ -240,10 +15,9 @@ index 9baae8a..8d8bc6b 100644
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
-index de98a73..bd4f1f8 100644
---- a/arch/alpha/include/asm/pgtable.h
-+++ b/arch/alpha/include/asm/pgtable.h
+diff -urNp linux-3.0.3/arch/alpha/include/asm/pgtable.h linux-3.0.3/arch/alpha/include/asm/pgtable.h
+--- linux-3.0.3/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.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)
@@ -262,11 +36,10 @@ index de98a73..bd4f1f8 100644
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
-index ebc3c89..20cfa63 100644
---- a/arch/alpha/kernel/module.c
-+++ b/arch/alpha/kernel/module.c
-@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
+diff -urNp linux-3.0.3/arch/alpha/kernel/module.c linux-3.0.3/arch/alpha/kernel/module.c
+--- linux-3.0.3/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
  	/* The small sections were sorted to the end of the segment.
  	   The following should definitely cover them.  */
@@ -275,11 +48,10 @@ index ebc3c89..20cfa63 100644
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
-index fe698b5..93b415a 100644
---- a/arch/alpha/kernel/osf_sys.c
-+++ b/arch/alpha/kernel/osf_sys.c
-@@ -1162,7 +1162,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
+diff -urNp linux-3.0.3/arch/alpha/kernel/osf_sys.c linux-3.0.3/arch/alpha/kernel/osf_sys.c
+--- linux-3.0.3/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (limit - len < addr)
  			return -ENOMEM;
@@ -288,7 +60,7 @@ index fe698b5..93b415a 100644
  			return addr;
  		addr = vma->vm_end;
  		vma = vma->vm_next;
-@@ -1198,6 +1198,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1181,6 +1181,10 @@ arch_get_unmapped_area(struct file *filp
  	   merely specific addresses, but regions of memory -- perhaps
  	   this feature should be incorporated into all ports?  */
  
@@ -299,7 +71,7 @@ index fe698b5..93b415a 100644
  	if (addr) {
  		addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
  		if (addr != (unsigned long) -ENOMEM)
-@@ -1205,8 +1209,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1188,8 +1192,8 @@ arch_get_unmapped_area(struct file *filp
  	}
  
  	/* Next, try allocating at TASK_UNMAPPED_BASE.  */
@@ -310,53 +82,10 @@ index fe698b5..93b415a 100644
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
-index 246100e..f05bd14 100644
---- a/arch/alpha/kernel/pci-noop.c
-+++ b/arch/alpha/kernel/pci-noop.c
-@@ -173,7 +173,7 @@ static int alpha_noop_set_mask(struct device *dev, u64 mask)
- 	return 0;
- }
- 
--struct dma_map_ops alpha_noop_ops = {
-+const struct dma_map_ops alpha_noop_ops = {
- 	.alloc_coherent		= alpha_noop_alloc_coherent,
- 	.free_coherent		= alpha_noop_free_coherent,
- 	.map_page		= alpha_noop_map_page,
-@@ -183,7 +183,7 @@ struct dma_map_ops alpha_noop_ops = {
- 	.set_dma_mask		= alpha_noop_set_mask,
- };
- 
--struct dma_map_ops *dma_ops = &alpha_noop_ops;
-+const struct dma_map_ops *dma_ops = &alpha_noop_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
-diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
-index 022c2748..943735c 100644
---- a/arch/alpha/kernel/pci_iommu.c
-+++ b/arch/alpha/kernel/pci_iommu.c
-@@ -950,7 +950,7 @@ static int alpha_pci_set_mask(struct device *dev, u64 mask)
- 	return 0;
- }
- 
--struct dma_map_ops alpha_pci_ops = {
-+const struct dma_map_ops alpha_pci_ops = {
- 	.alloc_coherent		= alpha_pci_alloc_coherent,
- 	.free_coherent		= alpha_pci_free_coherent,
- 	.map_page		= alpha_pci_map_page,
-@@ -962,5 +962,5 @@ struct dma_map_ops alpha_pci_ops = {
- 	.set_dma_mask		= alpha_pci_set_mask,
- };
- 
--struct dma_map_ops *dma_ops = &alpha_pci_ops;
-+const struct dma_map_ops *dma_ops = &alpha_pci_ops;
- EXPORT_SYMBOL(dma_ops);
-diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
-index fadd5f8..3168191 100644
---- a/arch/alpha/mm/fault.c
-+++ b/arch/alpha/mm/fault.c
-@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
+diff -urNp linux-3.0.3/arch/alpha/mm/fault.c linux-3.0.3/arch/alpha/mm/fault.c
+--- linux-3.0.3/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
  	__reload_thread(pcb);
  }
  
@@ -481,7 +210,7 @@ index fadd5f8..3168191 100644
  
  /*
   * This routine handles page faults.  It determines the address,
-@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
+@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, uns
   good_area:
  	si_code = SEGV_ACCERR;
  	if (cause < 0) {
@@ -512,11 +241,10 @@ index fadd5f8..3168191 100644
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
-index c3cd875..be2aa19 100644
---- a/arch/arm/include/asm/elf.h
-+++ b/arch/arm/include/asm/elf.h
-@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+diff -urNp linux-3.0.3/arch/arm/include/asm/elf.h linux-3.0.3/arch/arm/include/asm/elf.h
+--- linux-3.0.3/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
  
@@ -532,7 +260,7 @@ index c3cd875..be2aa19 100644
  
  /* When the program starts, a1 contains a pointer to a function to be 
     registered with atexit, as per the SVR4 ABI.  A value of 0 means we 
-@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
+@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t
  extern void elf_set_personality(const struct elf32_hdr *);
  #define SET_PERSONALITY(ex)	elf_set_personality(&(ex))
  
@@ -543,10 +271,9 @@ index c3cd875..be2aa19 100644
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
-index e51b1e8..32a3113 100644
---- a/arch/arm/include/asm/kmap_types.h
-+++ b/arch/arm/include/asm/kmap_types.h
+diff -urNp linux-3.0.3/arch/arm/include/asm/kmap_types.h linux-3.0.3/arch/arm/include/asm/kmap_types.h
+--- linux-3.0.3/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@ enum km_type {
  	KM_L1_CACHE,
  	KM_L2_CACHE,
@@ -555,11 +282,45 @@ index e51b1e8..32a3113 100644
  	KM_TYPE_NR
  };
  
-diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index b293616..5009ca1 100644
---- a/arch/arm/include/asm/uaccess.h
-+++ b/arch/arm/include/asm/uaccess.h
-@@ -403,6 +403,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
+diff -urNp linux-3.0.3/arch/arm/include/asm/uaccess.h linux-3.0.3/arch/arm/include/asm/uaccess.h
+--- linux-3.0.3/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+@@ -22,6 +22,8 @@
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
++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 is
+@@ -387,8 +389,23 @@ do {									\
+ 
+ 
+ #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 void __user *from, unsigned long n);
++extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
++
++static inline unsigned long __must_check __copy_from_user(void *to, const 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, const void *from, unsigned long n);
+ extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
+ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
+@@ -403,6 +420,9 @@ extern unsigned long __must_check __strn
  
  static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -569,7 +330,7 @@ index b293616..5009ca1 100644
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else /* security hole - plug it */
-@@ -412,6 +415,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
+@@ -412,6 +432,9 @@ static inline unsigned long __must_check
  
  static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -579,23 +340,23 @@ index b293616..5009ca1 100644
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c
-index 778c2f7..f0b9267 100644
---- a/arch/arm/kernel/kgdb.c
-+++ b/arch/arm/kernel/kgdb.c
-@@ -246,7 +246,7 @@ void kgdb_arch_exit(void)
-  * and we handle the normal undef case within the do_undefinstr
-  * handler.
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- #ifndef __ARMEB__
- 	.gdb_bpt_instr		= {0xfe, 0xde, 0xff, 0xe7}
- #else /* ! __ARMEB__ */
-diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
-index 94bbedb..9c43843 100644
---- a/arch/arm/kernel/process.c
-+++ b/arch/arm/kernel/process.c
+diff -urNp linux-3.0.3/arch/arm/kernel/armksyms.c linux-3.0.3/arch/arm/kernel/armksyms.c
+--- linux-3.0.3/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
+@@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
+ #ifdef CONFIG_MMU
+ EXPORT_SYMBOL(copy_page);
+ 
+-EXPORT_SYMBOL(__copy_from_user);
+-EXPORT_SYMBOL(__copy_to_user);
++EXPORT_SYMBOL(___copy_from_user);
++EXPORT_SYMBOL(___copy_to_user);
+ EXPORT_SYMBOL(__clear_user);
+ 
+ EXPORT_SYMBOL(__get_user_1);
+diff -urNp linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3/arch/arm/kernel/process.c
+--- linux-3.0.3/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -604,7 +365,7 @@ index 94bbedb..9c43843 100644
  #include <linux/hw_breakpoint.h>
  
  #include <asm/cacheflush.h>
-@@ -477,12 +476,6 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -479,12 +478,6 @@ unsigned long get_wchan(struct task_stru
  	return 0;
  }
  
@@ -617,24 +378,152 @@ index 94bbedb..9c43843 100644
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff --git a/arch/arm/mach-msm/last_radio_log.c b/arch/arm/mach-msm/last_radio_log.c
-index 1e243f4..07aba84 100644
---- a/arch/arm/mach-msm/last_radio_log.c
-+++ b/arch/arm/mach-msm/last_radio_log.c
-@@ -47,7 +47,7 @@ static ssize_t last_radio_log_read(struct file *file, char __user *buf,
- 	return count;
+diff -urNp linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3/arch/arm/kernel/traps.c
+--- linux-3.0.3/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+@@ -257,6 +257,8 @@ static int __die(const char *str, int er
+ 
+ static DEFINE_SPINLOCK(die_lock);
+ 
++extern void gr_handle_kernel_exploit(void);
++
+ /*
+  * This function is protected against re-entrancy.
+  */
+@@ -284,6 +286,9 @@ void die(const char *str, struct pt_regs
+ 		panic("Fatal exception in interrupt");
+ 	if (panic_on_oops)
+ 		panic("Fatal exception");
++
++	gr_handle_kernel_exploit();
++
+ 	if (ret != NOTIFY_STOP)
+ 		do_exit(SIGSEGV);
  }
+diff -urNp linux-3.0.3/arch/arm/lib/copy_from_user.S linux-3.0.3/arch/arm/lib/copy_from_user.S
+--- linux-3.0.3/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -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 @@
  
--static struct file_operations last_radio_log_fops = {
-+static struct file_operations last_radio_log_fops = {	/* cannot be const, see msm_init_last_radio_log */
- 	.read = last_radio_log_read,
- 	.llseek = default_llseek,
- };
-diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
-index cbf1571..402c00d 100644
---- a/arch/arm/mach-ux500/mbox-db5500.c
-+++ b/arch/arm/mach-ux500/mbox-db5500.c
-@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
+ 	.text
+ 
+-ENTRY(__copy_from_user)
++ENTRY(___copy_from_user)
+ 
+ #include "copy_template.S"
+ 
+-ENDPROC(__copy_from_user)
++ENDPROC(___copy_from_user)
+ 
+ 	.pushsection .fixup,"ax"
+ 	.align 0
+diff -urNp linux-3.0.3/arch/arm/lib/copy_to_user.S linux-3.0.3/arch/arm/lib/copy_to_user.S
+--- linux-3.0.3/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -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
+ 
+ ENTRY(__copy_to_user_std)
+-WEAK(__copy_to_user)
++WEAK(___copy_to_user)
+ 
+ #include "copy_template.S"
+ 
+-ENDPROC(__copy_to_user)
++ENDPROC(___copy_to_user)
+ ENDPROC(__copy_to_user_std)
+ 
+ 	.pushsection .fixup,"ax"
+diff -urNp linux-3.0.3/arch/arm/lib/uaccess.S linux-3.0.3/arch/arm/lib/uaccess.S
+--- linux-3.0.3/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
+@@ -20,7 +20,7 @@
+ 
+ #define PAGE_SHIFT 12
+ 
+-/* 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
+@@ -40,7 +40,7 @@ USER(		T(strgtb) r3, [r0], #1)			@ May f
+ 		sub	r2, r2, ip
+ 		b	.Lc2u_dest_aligned
+ 
+-ENTRY(__copy_to_user)
++ENTRY(___copy_to_user)
+ 		stmfd	sp!, {r2, r4 - r7, lr}
+ 		cmp	r2, #4
+ 		blt	.Lc2u_not_enough
+@@ -278,14 +278,14 @@ USER(		T(strgeb) r3, [r0], #1)			@ May f
+ 		ldrgtb	r3, [r1], #0
+ USER(		T(strgtb) r3, [r0], #1)			@ May fault
+ 		b	.Lc2u_finished
+-ENDPROC(__copy_to_user)
++ENDPROC(___copy_to_user)
+ 
+ 		.pushsection .fixup,"ax"
+ 		.align	0
+ 9001:		ldmfd	sp!, {r0, r4 - r7, pc}
+ 		.popsection
+ 
+-/* 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
+@@ -304,7 +304,7 @@ USER(		T(ldrgtb) r3, [r1], #1)			@ May f
+ 		sub	r2, r2, ip
+ 		b	.Lcfu_dest_aligned
+ 
+-ENTRY(__copy_from_user)
++ENTRY(___copy_from_user)
+ 		stmfd	sp!, {r0, r2, r4 - r7, lr}
+ 		cmp	r2, #4
+ 		blt	.Lcfu_not_enough
+@@ -544,7 +544,7 @@ USER(		T(ldrgeb) r3, [r1], #1)			@ May f
+ USER(		T(ldrgtb) r3, [r1], #1)			@ May fault
+ 		strgtb	r3, [r0], #1
+ 		b	.Lcfu_finished
+-ENDPROC(__copy_from_user)
++ENDPROC(___copy_from_user)
+ 
+ 		.pushsection .fixup,"ax"
+ 		.align	0
+diff -urNp linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
+@@ -103,7 +103,7 @@ out:
+ }
+ 
+ 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-3.0.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
+@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
  	return sprintf(buf, "0x%X\n", mbox_value);
  }
  
@@ -643,11 +532,10 @@ index cbf1571..402c00d 100644
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
-index f10f9ba..1ab528f 100644
---- a/arch/arm/mm/fault.c
-+++ b/arch/arm/mm/fault.c
-@@ -167,6 +167,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
+diff -urNp linux-3.0.3/arch/arm/mm/fault.c linux-3.0.3/arch/arm/mm/fault.c
+--- linux-3.0.3/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
  	}
  #endif
  
@@ -661,7 +549,7 @@ index f10f9ba..1ab528f 100644
  	tsk->thread.address = addr;
  	tsk->thread.error_code = fsr;
  	tsk->thread.trap_no = 14;
-@@ -364,6 +371,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+@@ -379,6 +386,33 @@ do_page_fault(unsigned long addr, unsign
  }
  #endif					/* CONFIG_MMU */
  
@@ -695,11 +583,10 @@ index f10f9ba..1ab528f 100644
  /*
   * First Level Translation Fault Handler
   *
-diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
-index b0a9830..9ce80c6 100644
---- a/arch/arm/mm/mmap.c
-+++ b/arch/arm/mm/mmap.c
-@@ -64,6 +64,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+diff -urNp linux-3.0.3/arch/arm/mm/mmap.c linux-3.0.3/arch/arm/mm/mmap.c
+--- linux-3.0.3/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
  	if (len > TASK_SIZE)
  		return -ENOMEM;
  
@@ -710,7 +597,7 @@ index b0a9830..9ce80c6 100644
  	if (addr) {
  		if (do_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
-@@ -71,15 +75,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -72,15 +76,14 @@ arch_get_unmapped_area(struct file *filp
  			addr = PAGE_ALIGN(addr);
  
  		vma = find_vma(mm, addr);
@@ -729,8 +616,8 @@ index b0a9830..9ce80c6 100644
 +		mm->cached_hole_size = 0;
  	}
  	/* 8 bits of randomness in 20 address space bits */
- 	if (current->flags & PF_RANDOMIZE)
-@@ -98,14 +101,14 @@ full_search:
+ 	if ((current->flags & PF_RANDOMIZE) &&
+@@ -100,14 +103,14 @@ full_search:
  			 * Start a new search - just in case we missed
  			 * some holes.
  			 */
@@ -748,11 +635,10 @@ index b0a9830..9ce80c6 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
-index 3b3159b..425ea94 100644
---- a/arch/avr32/include/asm/elf.h
-+++ b/arch/avr32/include/asm/elf.h
-@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
+diff -urNp linux-3.0.3/arch/avr32/include/asm/elf.h linux-3.0.3/arch/avr32/include/asm/elf.h
+--- linux-3.0.3/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
  
@@ -768,10 +654,9 @@ index 3b3159b..425ea94 100644
  
  /* 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 --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
-index b7f5c68..556135c 100644
---- a/arch/avr32/include/asm/kmap_types.h
-+++ b/arch/avr32/include/asm/kmap_types.h
+diff -urNp linux-3.0.3/arch/avr32/include/asm/kmap_types.h linux-3.0.3/arch/avr32/include/asm/kmap_types.h
+--- linux-3.0.3/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)	KM_IRQ0,
  D(11)	KM_IRQ1,
  D(12)	KM_SOFTIRQ0,
@@ -782,11 +667,10 @@ index b7f5c68..556135c 100644
  };
  
  #undef D
-diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
-index f7040a1..16169bf 100644
---- a/arch/avr32/mm/fault.c
-+++ b/arch/avr32/mm/fault.c
-@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
+diff -urNp linux-3.0.3/arch/avr32/mm/fault.c linux-3.0.3/arch/avr32/mm/fault.c
+--- linux-3.0.3/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
  
@@ -827,45 +711,9 @@ index f7040a1..16169bf 100644
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
-index eb92592..7cdfa12 100644
---- a/arch/blackfin/kernel/kgdb.c
-+++ b/arch/blackfin/kernel/kgdb.c
-@@ -420,7 +420,7 @@ int kgdb_arch_handle_exception(int vector, int signo,
- 	return -1;		/* this means that we do not want to exit from the handler */
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	.gdb_bpt_instr = {0xa1},
- #ifdef CONFIG_SMP
- 	.flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
-diff --git a/arch/blackfin/mm/maccess.c b/arch/blackfin/mm/maccess.c
-index b71cebc..e253211 100644
---- a/arch/blackfin/mm/maccess.c
-+++ b/arch/blackfin/mm/maccess.c
-@@ -16,7 +16,7 @@ static int validate_memory_access_address(unsigned long addr, int size)
- 	return bfin_mem_access_type(addr, size);
- }
- 
--long probe_kernel_read(void *dst, void *src, size_t size)
-+long probe_kernel_read(void *dst, const void *src, size_t size)
- {
- 	unsigned long lsrc = (unsigned long)src;
- 	int mem_type;
-@@ -55,7 +55,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
- 	return -EFAULT;
- }
- 
--long probe_kernel_write(void *dst, void *src, size_t size)
-+long probe_kernel_write(void *dst, const void *src, size_t size)
- {
- 	unsigned long ldst = (unsigned long)dst;
- 	int mem_type;
-diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
-index f8e16b2..c73ff79 100644
---- a/arch/frv/include/asm/kmap_types.h
-+++ b/arch/frv/include/asm/kmap_types.h
+diff -urNp linux-3.0.3/arch/frv/include/asm/kmap_types.h linux-3.0.3/arch/frv/include/asm/kmap_types.h
+--- linux-3.0.3/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/frv/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -874,11 +722,10 @@ index f8e16b2..c73ff79 100644
  	KM_TYPE_NR
  };
  
-diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
-index 385fd30..6c3d97e 100644
---- a/arch/frv/mm/elf-fdpic.c
-+++ b/arch/frv/mm/elf-fdpic.c
-@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+diff -urNp linux-3.0.3/arch/frv/mm/elf-fdpic.c linux-3.0.3/arch/frv/mm/elf-fdpic.c
+--- linux-3.0.3/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/frv/mm/elf-fdpic.c	2011-08-23 21:47:55.000000000 -0400
+@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
  	if (addr) {
  		addr = PAGE_ALIGN(addr);
  		vma = find_vma(current->mm, addr);
@@ -888,7 +735,7 @@ index 385fd30..6c3d97e 100644
  			goto success;
  	}
  
-@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(str
  			for (; vma; vma = vma->vm_next) {
  				if (addr > limit)
  					break;
@@ -897,7 +744,7 @@ index 385fd30..6c3d97e 100644
  					goto success;
  				addr = vma->vm_end;
  			}
-@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(str
  		for (; vma; vma = vma->vm_next) {
  			if (addr > limit)
  				break;
@@ -906,101 +753,9 @@ index 385fd30..6c3d97e 100644
  				goto success;
  			addr = vma->vm_end;
  		}
-diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
-index e4a80d8..11a7ea1 100644
---- a/arch/ia64/hp/common/hwsw_iommu.c
-+++ b/arch/ia64/hp/common/hwsw_iommu.c
-@@ -17,7 +17,7 @@
- #include <linux/swiotlb.h>
- #include <asm/machvec.h>
- 
--extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
-+extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
- 
- /* swiotlb declarations & definitions: */
- extern int swiotlb_late_init_with_default_size (size_t size);
-@@ -33,7 +33,7 @@ static inline int use_swiotlb(struct device *dev)
- 		!sba_dma_ops.dma_supported(dev, *dev->dma_mask);
- }
- 
--struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
-+const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
- {
- 	if (use_swiotlb(dev))
- 		return &swiotlb_dma_ops;
-diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
-index 4ce8d13..62d8118 100644
---- a/arch/ia64/hp/common/sba_iommu.c
-+++ b/arch/ia64/hp/common/sba_iommu.c
-@@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_driver = {
- 	},
- };
- 
--extern struct dma_map_ops swiotlb_dma_ops;
-+extern const struct dma_map_ops swiotlb_dma_ops;
- 
- static int __init
- sba_init(void)
-@@ -2211,7 +2211,7 @@ sba_page_override(char *str)
- 
- __setup("sbapagesize=",sba_page_override);
- 
--struct dma_map_ops sba_dma_ops = {
-+const struct dma_map_ops sba_dma_ops = {
- 	.alloc_coherent		= sba_alloc_coherent,
- 	.free_coherent		= sba_free_coherent,
- 	.map_page		= sba_map_page,
-diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
-index a2e7368..f1cbb57 100644
---- a/arch/ia64/include/asm/dma-mapping.h
-+++ b/arch/ia64/include/asm/dma-mapping.h
-@@ -12,7 +12,7 @@
- 
- #define ARCH_HAS_DMA_GET_REQUIRED_MASK
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- extern struct ia64_machine_vector ia64_mv;
- extern void set_iommu_machvec(void);
- 
-@@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *daddr, gfp_t gfp)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	void *caddr;
- 
- 	caddr = ops->alloc_coherent(dev, size, daddr, gfp);
-@@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *caddr, dma_addr_t daddr)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	debug_dma_free_coherent(dev, size, caddr, daddr);
- 	ops->free_coherent(dev, size, caddr, daddr);
- }
-@@ -49,13 +49,13 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	return ops->mapping_error(dev, daddr);
- }
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = platform_dma_get_ops(dev);
-+	const struct dma_map_ops *ops = platform_dma_get_ops(dev);
- 	return ops->dma_supported(dev, mask);
- }
- 
-diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
-index b5298eb..67c6e62 100644
---- a/arch/ia64/include/asm/elf.h
-+++ b/arch/ia64/include/asm/elf.h
+diff -urNp linux-3.0.3/arch/ia64/include/asm/elf.h linux-3.0.3/arch/ia64/include/asm/elf.h
+--- linux-3.0.3/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -1015,32 +770,9 @@ index b5298eb..67c6e62 100644
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
-index 367d299..9ad4279 100644
---- a/arch/ia64/include/asm/machvec.h
-+++ b/arch/ia64/include/asm/machvec.h
-@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void);
- /* DMA-mapping interface: */
- typedef void ia64_mv_dma_init (void);
- typedef u64 ia64_mv_dma_get_required_mask (struct device *);
--typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
-+typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
- 
- /*
-  * WARNING: The legacy I/O space is _architected_.  Platforms are
-@@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);
- # endif /* CONFIG_IA64_GENERIC */
- 
- extern void swiotlb_dma_init(void);
--extern struct dma_map_ops *dma_get_ops(struct device *);
-+extern const struct dma_map_ops *dma_get_ops(struct device *);
- 
- /*
-  * Define default versions so we can extend machvec for new platforms without having
-diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
-index 1a97af3..7529d31 100644
---- a/arch/ia64/include/asm/pgtable.h
-+++ b/arch/ia64/include/asm/pgtable.h
+diff -urNp linux-3.0.3/arch/ia64/include/asm/pgtable.h linux-3.0.3/arch/ia64/include/asm/pgtable.h
+--- linux-3.0.3/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,7 +12,7 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -1068,11 +800,10 @@ index 1a97af3..7529d31 100644
  #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 --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
-index 1a91c91..120e693 100644
---- a/arch/ia64/include/asm/spinlock.h
-+++ b/arch/ia64/include/asm/spinlock.h
-@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
+diff -urNp linux-3.0.3/arch/ia64/include/asm/spinlock.h linux-3.0.3/arch/ia64/include/asm/spinlock.h
+--- linux-3.0.3/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+@@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
  	unsigned short	*p = (unsigned short *)&lock->lock + 1, tmp;
  
  	asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
@@ -1081,11 +812,10 @@ index 1a91c91..120e693 100644
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
-index 449c8c0..432a3d2 100644
---- a/arch/ia64/include/asm/uaccess.h
-+++ b/arch/ia64/include/asm/uaccess.h
-@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+diff -urNp linux-3.0.3/arch/ia64/include/asm/uaccess.h linux-3.0.3/arch/ia64/include/asm/uaccess.h
+--- linux-3.0.3/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
  	const void *__cu_from = (from);							\
  	long __cu_len = (n);								\
  											\
@@ -1094,7 +824,7 @@ index 449c8c0..432a3d2 100644
  		__cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
+@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void _
  	long __cu_len = (n);								\
  											\
  	__chk_user_ptr(__cu_from);							\
@@ -1103,32 +833,9 @@ index 449c8c0..432a3d2 100644
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
-index f2c1600..969398a 100644
---- a/arch/ia64/kernel/dma-mapping.c
-+++ b/arch/ia64/kernel/dma-mapping.c
-@@ -3,7 +3,7 @@
- /* Set this to 1 if there is a HW IOMMU in the system */
- int iommu_detected __read_mostly;
- 
--struct dma_map_ops *dma_ops;
-+const struct dma_map_ops *dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-@@ -16,7 +16,7 @@ static int __init dma_init(void)
- }
- fs_initcall(dma_init);
- 
--struct dma_map_ops *dma_get_ops(struct device *dev)
-+const struct dma_map_ops *dma_get_ops(struct device *dev)
- {
- 	return dma_ops;
- }
-diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
-index 1481b0a..e7d38ff 100644
---- a/arch/ia64/kernel/module.c
-+++ b/arch/ia64/kernel/module.c
+diff -urNp linux-3.0.3/arch/ia64/kernel/module.c linux-3.0.3/arch/ia64/kernel/module.c
+--- linux-3.0.3/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -1139,7 +846,7 @@ index 1481b0a..e7d38ff 100644
  		unw_remove_unwind_table(mod->arch.init_unw_table);
  		mod->arch.init_unw_table = NULL;
  	}
-@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
+@@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd
  }
  
  static inline int
@@ -1181,7 +888,7 @@ index 1481b0a..e7d38ff 100644
  }
  
  static inline int
-@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
+@@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_
  		break;
  
  	      case RV_BDREL:
@@ -1197,7 +904,7 @@ index 1481b0a..e7d38ff 100644
  		break;
  
  	      case RV_LTV:
-@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
+@@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs,
  		 *     addresses have been selected...
  		 */
  		uint64_t gp;
@@ -1217,37 +924,10 @@ index 1481b0a..e7d38ff 100644
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
-index f6b1ff0..ccacc2f 100644
---- a/arch/ia64/kernel/pci-dma.c
-+++ b/arch/ia64/kernel/pci-dma.c
-@@ -43,7 +43,7 @@ struct device fallback_dev = {
- 	.dma_mask = &fallback_dev.coherent_dma_mask,
- };
- 
--extern struct dma_map_ops intel_dma_ops;
-+extern const struct dma_map_ops intel_dma_ops;
- 
- static int __init pci_iommu_init(void)
- {
-diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
-index d9485d9..e3deb12 100644
---- a/arch/ia64/kernel/pci-swiotlb.c
-+++ b/arch/ia64/kernel/pci-swiotlb.c
-@@ -22,7 +22,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
- 	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
- }
- 
--struct dma_map_ops swiotlb_dma_ops = {
-+const struct dma_map_ops swiotlb_dma_ops = {
- 	.alloc_coherent = ia64_swiotlb_alloc_coherent,
- 	.free_coherent = swiotlb_free_coherent,
- 	.map_page = swiotlb_map_page,
-diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
-index 609d500..7dde2a8 100644
---- a/arch/ia64/kernel/sys_ia64.c
-+++ b/arch/ia64/kernel/sys_ia64.c
-@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
+diff -urNp linux-3.0.3/arch/ia64/kernel/sys_ia64.c linux-3.0.3/arch/ia64/kernel/sys_ia64.c
+--- linux-3.0.3/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/kernel/sys_ia64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
  	if (REGION_NUMBER(addr) == RGN_HPAGE)
  		addr = 0;
  #endif
@@ -1261,7 +941,7 @@ index 609d500..7dde2a8 100644
  	if (!addr)
  		addr = mm->free_area_cache;
  
-@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
+@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *fil
  	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
  		/* At this point:  (!vma || addr < vma->vm_end). */
  		if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
@@ -1279,24 +959,22 @@ index 609d500..7dde2a8 100644
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
-index 5a4d044..19c2e6d 100644
---- a/arch/ia64/kernel/vmlinux.lds.S
-+++ b/arch/ia64/kernel/vmlinux.lds.S
+diff -urNp linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
 @@ -199,7 +199,7 @@ SECTIONS {
  	/* Per-cpu data: */
  	. = ALIGN(PERCPU_PAGE_SIZE);
- 	PERCPU_VADDR(PERCPU_ADDR, :percpu)
+ 	PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
 -	__phys_per_cpu_start = __per_cpu_load;
 +	__phys_per_cpu_start = per_cpu_load;
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
-index 0799fea..4879544 100644
---- a/arch/ia64/mm/fault.c
-+++ b/arch/ia64/mm/fault.c
-@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
+diff -urNp linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3/arch/ia64/mm/fault.c
+--- linux-3.0.3/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
  	return pte_present(pte);
  }
  
@@ -1320,7 +998,7 @@ index 0799fea..4879544 100644
  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 address, unsigned long isr, struct pt_regs *re
+@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long addres
  	mask = (  (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
  		| (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
  
@@ -1345,11 +1023,10 @@ index 0799fea..4879544 100644
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
  	 * sure we exit gracefully rather than endlessly redo the
-diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
-index 5ca674b..e0e1b70 100644
---- a/arch/ia64/mm/hugetlbpage.c
-+++ b/arch/ia64/mm/hugetlbpage.c
-@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
+diff -urNp linux-3.0.3/arch/ia64/mm/hugetlbpage.c linux-3.0.3/arch/ia64/mm/hugetlbpage.c
+--- linux-3.0.3/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+@@ -171,7 +171,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;
@@ -1358,11 +1035,10 @@ index 5ca674b..e0e1b70 100644
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
-index ed41759..fcaf88a 100644
---- a/arch/ia64/mm/init.c
-+++ b/arch/ia64/mm/init.c
-@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
+diff -urNp linux-3.0.3/arch/ia64/mm/init.c linux-3.0.3/arch/ia64/mm/init.c
+--- linux-3.0.3/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/ia64/mm/init.c	2011-08-23 21:47:55.000000000 -0400
+@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
  		vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
  		vma->vm_end = vma->vm_start + PAGE_SIZE;
  		vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
@@ -1382,23 +1058,9 @@ index ed41759..fcaf88a 100644
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
-index a9d310d..447c7cc 100644
---- a/arch/ia64/sn/pci/pci_dma.c
-+++ b/arch/ia64/sn/pci/pci_dma.c
-@@ -465,7 +465,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
- 	return ret;
- }
- 
--static struct dma_map_ops sn_dma_ops = {
-+static const struct dma_map_ops sn_dma_ops = {
- 	.alloc_coherent		= sn_dma_alloc_coherent,
- 	.free_coherent		= sn_dma_free_coherent,
- 	.map_page		= sn_dma_map_page,
-diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
-index 82abd15..d95ae5d 100644
---- a/arch/m32r/lib/usercopy.c
-+++ b/arch/m32r/lib/usercopy.c
+diff -urNp linux-3.0.3/arch/m32r/lib/usercopy.c linux-3.0.3/arch/m32r/lib/usercopy.c
+--- linux-3.0.3/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/m32r/lib/usercopy.c	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1409,7 +1071,7 @@ index 82abd15..d95ae5d 100644
  	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, const void *from, unsigned long n)
+@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, 
  unsigned long
  __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
  {
@@ -1419,250 +1081,9 @@ index 82abd15..d95ae5d 100644
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h
-index 123b2fe..f8926eb 100644
---- a/arch/microblaze/include/asm/device.h
-+++ b/arch/microblaze/include/asm/device.h
-@@ -13,7 +13,7 @@ struct device_node;
- 
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops	*dma_ops;
-+	const struct dma_map_ops	*dma_ops;
- 	void                    *dma_data;
- };
- 
-diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
-index 8fbb0ec..c727dc4 100644
---- a/arch/microblaze/include/asm/dma-mapping.h
-+++ b/arch/microblaze/include/asm/dma-mapping.h
-@@ -43,14 +43,14 @@ static inline unsigned long device_to_mask(struct device *dev)
- 	return 0xfffffffful;
- }
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
- /*
-  * Available generic sets of operations
-  */
--extern struct dma_map_ops dma_direct_ops;
-+extern const struct dma_map_ops dma_direct_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	/* We don't handle the NULL dev case for ISA for now. We could
- 	 * do it via an out of line call but it is not needed for now. The
-@@ -63,14 +63,14 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
- 	return dev->archdata.dma_ops;
- }
- 
--static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
-+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
- {
- 	dev->archdata.dma_ops = ops;
- }
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (unlikely(!ops))
- 		return 0;
-@@ -81,7 +81,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
- 
- static inline int dma_set_mask(struct device *dev, u64 dma_mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (unlikely(ops == NULL))
- 		return -EIO;
-@@ -97,7 +97,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
- 
-@@ -110,7 +110,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 					dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	BUG_ON(!ops);
-@@ -124,7 +124,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!ops);
- 	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
-index 2232ff94..733e788 100644
---- a/arch/microblaze/include/asm/pci.h
-+++ b/arch/microblaze/include/asm/pci.h
-@@ -54,8 +54,8 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
- }
- 
- #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 --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c
-index 79c7465..95a4dbe 100644
---- a/arch/microblaze/kernel/dma.c
-+++ b/arch/microblaze/kernel/dma.c
-@@ -133,7 +133,7 @@ static inline void dma_direct_unmap_page(struct device *dev,
- 	__dma_sync_page(dma_address, 0 , size, direction);
- }
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
-diff --git a/arch/microblaze/kernel/kgdb.c b/arch/microblaze/kernel/kgdb.c
-index 09a5e82..b5dd424 100644
---- a/arch/microblaze/kernel/kgdb.c
-+++ b/arch/microblaze/kernel/kgdb.c
-@@ -141,10 +141,11 @@ void kgdb_arch_exit(void)
- /*
-  * Global data
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- #ifdef __MICROBLAZEEL__
- 	.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
- #else
-+>>>>>>> master
- 	.gdb_bpt_instr = {0xba, 0x0c, 0x00, 0x18}, /* brki r16, 0x18 */
- #endif
- };
-diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
-index e363615..a959ed4 100644
---- a/arch/microblaze/pci/pci-common.c
-+++ b/arch/microblaze/pci/pci-common.c
-@@ -47,14 +47,14 @@ resource_size_t isa_mem_base;
- /* Default PCI flags is 0 on ppc32, modified at boot on ppc64 */
- unsigned int pci_flags;
- 
--static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
-+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
- 
--void set_pci_dma_ops(struct dma_map_ops *dma_ops)
-+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
- {
- 	pci_dma_ops = dma_ops;
- }
- 
--struct dma_map_ops *get_pci_dma_ops(void)
-+const struct dma_map_ops *get_pci_dma_ops(void)
- {
- 	return pci_dma_ops;
- }
-diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
-index 1abb66c..4554dbb 100644
---- a/arch/mips/cavium-octeon/dma-octeon.c
-+++ b/arch/mips/cavium-octeon/dma-octeon.c
-@@ -202,7 +202,7 @@ static phys_addr_t octeon_unity_dma_to_phys(struct device *dev, dma_addr_t daddr
- }
- 
- struct octeon_dma_map_ops {
--	struct dma_map_ops dma_map_ops;
-+	const struct dma_map_ops dma_map_ops;
- 	dma_addr_t (*phys_to_dma)(struct device *dev, phys_addr_t paddr);
- 	phys_addr_t (*dma_to_phys)(struct device *dev, dma_addr_t daddr);
- };
-@@ -324,7 +324,7 @@ static struct octeon_dma_map_ops _octeon_pci_dma_map_ops = {
- 	},
- };
- 
--struct dma_map_ops *octeon_pci_dma_map_ops;
-+const struct dma_map_ops *octeon_pci_dma_map_ops;
- 
- void __init octeon_pci_dma_init(void)
- {
-diff --git a/arch/mips/include/asm/device.h b/arch/mips/include/asm/device.h
-index c94fafb..3c1964a 100644
---- a/arch/mips/include/asm/device.h
-+++ b/arch/mips/include/asm/device.h
-@@ -10,7 +10,7 @@ struct dma_map_ops;
- 
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops *dma_ops;
-+	const struct dma_map_ops *dma_ops;
- };
- 
- struct pdev_archdata {
-diff --git a/arch/mips/include/asm/dma-mapping.h b/arch/mips/include/asm/dma-mapping.h
-index 655f849..4a4737f 100644
---- a/arch/mips/include/asm/dma-mapping.h
-+++ b/arch/mips/include/asm/dma-mapping.h
-@@ -7,9 +7,9 @@
- 
- #include <dma-coherence.h>
- 
--extern struct dma_map_ops *mips_dma_map_ops;
-+extern const struct dma_map_ops *mips_dma_map_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	if (dev && dev->archdata.dma_ops)
- 		return dev->archdata.dma_ops;
-@@ -31,13 +31,13 @@ static inline void dma_mark_clean(void *addr, size_t size) {}
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	return ops->dma_supported(dev, mask);
- }
- 
- static inline int dma_mapping_error(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	return ops->mapping_error(dev, mask);
- }
- 
-@@ -59,7 +59,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t gfp)
- {
- 	void *ret;
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	ret = ops->alloc_coherent(dev, size, dma_handle, gfp);
- 
-@@ -71,7 +71,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	ops->free_coherent(dev, size, vaddr, dma_handle);
- 
-diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
-index 455c0ac..ad65fbe 100644
---- a/arch/mips/include/asm/elf.h
-+++ b/arch/mips/include/asm/elf.h
+diff -urNp linux-3.0.3/arch/mips/include/asm/elf.h linux-3.0.3/arch/mips/include/asm/elf.h
+--- linux-3.0.3/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1684,24 +1105,10 @@ index 455c0ac..ad65fbe 100644
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
-index be8fb42..e7ae1b6 100644
---- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
-+++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h
-@@ -66,7 +66,7 @@ dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);
- phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr);
- 
- struct dma_map_ops;
--extern struct dma_map_ops *octeon_pci_dma_map_ops;
-+extern const struct dma_map_ops *octeon_pci_dma_map_ops;
- extern char *octeon_swiotlb;
- 
- #endif /* __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H */
-diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
-index e59cd1a..8e329d6 100644
---- a/arch/mips/include/asm/page.h
-+++ b/arch/mips/include/asm/page.h
-@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
+diff -urNp linux-3.0.3/arch/mips/include/asm/page.h linux-3.0.3/arch/mips/include/asm/page.h
+--- linux-3.0.3/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
      #define pte_val(x)    ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
@@ -1710,10 +1117,9 @@ index e59cd1a..8e329d6 100644
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
-index 6018c80..7c37203 100644
---- a/arch/mips/include/asm/system.h
-+++ b/arch/mips/include/asm/system.h
+diff -urNp linux-3.0.3/arch/mips/include/asm/system.h linux-3.0.3/arch/mips/include/asm/system.h
+--- linux-3.0.3/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1722,11 +1128,10 @@ index 6018c80..7c37203 100644
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
-index 9fdd8bc..4bd7f1a 100644
---- a/arch/mips/kernel/binfmt_elfn32.c
-+++ b/arch/mips/kernel/binfmt_elfn32.c
-@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c	2011-08-23 21:47:55.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)
  
@@ -1740,11 +1145,10 @@ index 9fdd8bc..4bd7f1a 100644
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
-index ff44823..97f8906 100644
---- a/arch/mips/kernel/binfmt_elfo32.c
-+++ b/arch/mips/kernel/binfmt_elfo32.c
-@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c	2011-08-23 21:47:55.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)
  
@@ -1758,24 +1162,10 @@ index ff44823..97f8906 100644
  #include <asm/processor.h>
  
  /*
-diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
-index f4546e9..f13b233 100644
---- a/arch/mips/kernel/kgdb.c
-+++ b/arch/mips/kernel/kgdb.c
-@@ -351,7 +351,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
- 	return -1;
- }
- 
--struct kgdb_arch arch_kgdb_ops;
-+struct kgdb_arch arch_kgdb_ops;	/* cannot be const, see kgdb_arch_init */
- 
- /*
-  * We use kgdb_early_setup so that functions we need to call now don't
-diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
-index ae167df..15dd7bd 100644
---- a/arch/mips/kernel/process.c
-+++ b/arch/mips/kernel/process.c
-@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_struct *task)
+diff -urNp linux-3.0.3/arch/mips/kernel/process.c linux-3.0.3/arch/mips/kernel/process.c
+--- linux-3.0.3/arch/mips/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+@@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
  	return pc;
  }
@@ -1791,11 +1181,37 @@ index ae167df..15dd7bd 100644
 -
 -	return sp & ALMASK;
 -}
-diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
-index 58beabf..ae38811 100644
---- a/arch/mips/kernel/syscall.c
-+++ b/arch/mips/kernel/syscall.c
-@@ -108,14 +108,18 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+diff -urNp linux-3.0.3/arch/mips/mm/fault.c linux-3.0.3/arch/mips/mm/fault.c
+--- linux-3.0.3/arch/mips/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -28,6 +28,23 @@
+ #include <asm/highmem.h>		/* For VMALLOC_END */
+ #include <linux/kdebug.h>
+ 
++#ifdef CONFIG_PAX_PAGEEXEC
++void pax_report_insns(void *pc, void *sp)
++{
++	unsigned long i;
++
++	printk(KERN_ERR "PAX: bytes at PC: ");
++	for (i = 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-3.0.3/arch/mips/mm/mmap.c linux-3.0.3/arch/mips/mm/mmap.c
+--- linux-3.0.3/arch/mips/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/mips/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
  	do_color_align = 0;
  	if (filp || (flags & MAP_SHARED))
  		do_color_align = 1;
@@ -1810,25 +1226,26 @@ index 58beabf..ae38811 100644
  		else
  			addr = PAGE_ALIGN(addr);
  		vmm = find_vma(current->mm, addr);
--		if (task_size - len >= addr &&
+-		if (TASK_SIZE - len >= addr &&
 -		    (!vmm || addr + len <= vmm->vm_start))
-+		if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
++		if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
  			return addr;
  	}
  	addr = current->mm->mmap_base;
-@@ -128,7 +132,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -68,7 +72,7 @@ unsigned long arch_get_unmapped_area(str
  		/* At this point:  (!vmm || addr < vmm->vm_end). */
- 		if (task_size - len < addr)
+ 		if (TASK_SIZE - len < addr)
  			return -ENOMEM;
 -		if (!vmm || addr + len <= vmm->vm_start)
 +		if (check_heap_stack_gap(vmm, addr, len))
  			return addr;
  		addr = vmm->vm_end;
  		if (do_color_align)
-@@ -154,33 +158,6 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -93,30 +97,3 @@ void arch_pick_mmap_layout(struct mm_str
+ 	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
- 
+-
 -static inline unsigned long brk_rnd(void)
 -{
 -	unsigned long rnd = get_random_int();
@@ -1855,65 +1272,10 @@ index 58beabf..ae38811 100644
 -
 -	return ret;
 -}
--
- SYSCALL_DEFINE6(mips_mmap, unsigned long, addr, unsigned long, len,
- 	unsigned long, prot, unsigned long, flags, unsigned long,
- 	fd, off_t, offset)
-diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
-index 21ea14e..5265671 100644
---- a/arch/mips/mm/dma-default.c
-+++ b/arch/mips/mm/dma-default.c
-@@ -300,7 +300,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
- 
- EXPORT_SYMBOL(dma_cache_sync);
- 
--static struct dma_map_ops mips_default_dma_map_ops = {
-+static const struct dma_map_ops mips_default_dma_map_ops = {
- 	.alloc_coherent = mips_dma_alloc_coherent,
- 	.free_coherent = mips_dma_free_coherent,
- 	.map_page = mips_dma_map_page,
-@@ -315,7 +315,7 @@ static struct dma_map_ops mips_default_dma_map_ops = {
- 	.dma_supported = mips_dma_supported
- };
- 
--struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
-+const struct dma_map_ops *mips_dma_map_ops = &mips_default_dma_map_ops;
- EXPORT_SYMBOL(mips_dma_map_ops);
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
-diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
-index 137ee76..1bc42da 100644
---- a/arch/mips/mm/fault.c
-+++ b/arch/mips/mm/fault.c
-@@ -28,6 +28,23 @@
- #include <asm/highmem.h>		/* For VMALLOC_END */
- #include <linux/kdebug.h>
- 
-+#ifdef CONFIG_PAX_PAGEEXEC
-+void pax_report_insns(void *pc, void *sp)
-+{
-+	unsigned long i;
-+
-+	printk(KERN_ERR "PAX: bytes at PC: ");
-+	for (i = 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 --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
-index 19f6cb1..6c78cf2 100644
---- a/arch/parisc/include/asm/elf.h
-+++ b/arch/parisc/include/asm/elf.h
-@@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration... */
+diff -urNp linux-3.0.3/arch/parisc/include/asm/elf.h linux-3.0.3/arch/parisc/include/asm/elf.h
+--- linux-3.0.3/arch/parisc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -342,6 +342,13 @@ struct pt_regs;	/* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
  
@@ -1927,11 +1289,10 @@ index 19f6cb1..6c78cf2 100644
  /* 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 --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
-index 6f1f65d..50d5417 100644
---- a/arch/parisc/include/asm/pgtable.h
-+++ b/arch/parisc/include/asm/pgtable.h
-@@ -209,6 +209,17 @@ struct vm_area_struct;
+diff -urNp linux-3.0.3/arch/parisc/include/asm/pgtable.h linux-3.0.3/arch/parisc/include/asm/pgtable.h
+--- linux-3.0.3/arch/parisc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+@@ -210,6 +210,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
  #define PAGE_RWX        __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
@@ -1947,13 +1308,12 @@ index 6f1f65d..50d5417 100644
 +#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 --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
-index 6e81bb5..9c280d2 100644
---- a/arch/parisc/kernel/module.c
-+++ b/arch/parisc/kernel/module.c
-@@ -96,16 +96,38 @@
+ #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL_EXEC)
+ #define PAGE_KERNEL_RWX	__pgprot(_PAGE_KERNEL_RWX)
+diff -urNp linux-3.0.3/arch/parisc/kernel/module.c linux-3.0.3/arch/parisc/kernel/module.c
+--- linux-3.0.3/arch/parisc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+@@ -98,16 +98,38 @@
  
  /* three functions to determine where in the module core
   * or init pieces the location is */
@@ -1996,27 +1356,28 @@ index 6e81bb5..9c280d2 100644
  }
  
  static inline int in_local(struct module *me, void *loc)
-@@ -365,13 +387,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
+@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_
  	}
  
  	/* align things a bit */
 -	me->core_size = ALIGN(me->core_size, 16);
 -	me->arch.got_offset = me->core_size;
 -	me->core_size += gots * sizeof(struct got_entry);
-+	me->core_size_rw = ALIGN(me->core_size_rw, 16);
-+	me->arch.got_offset = me->core_size_rw;
-+	me->core_size_rw += gots * sizeof(struct got_entry);
- 
+-
 -	me->core_size = ALIGN(me->core_size, 16);
 -	me->arch.fdesc_offset = me->core_size;
 -	me->core_size += fdescs * sizeof(Elf_Fdesc);
 +	me->core_size_rw = ALIGN(me->core_size_rw, 16);
++	me->arch.got_offset = me->core_size_rw;
++	me->core_size_rw += gots * sizeof(struct got_entry);
++
++	me->core_size_rw = ALIGN(me->core_size_rw, 16);
 +	me->arch.fdesc_offset = me->core_size_rw;
 +	me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
  
  	me->arch.got_max = gots;
  	me->arch.fdesc_max = fdescs;
-@@ -389,7 +411,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
+@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module 
  
  	BUG_ON(value == 0);
  
@@ -2025,7 +1386,7 @@ index 6e81bb5..9c280d2 100644
  	for (i = 0; got[i].addr; i++)
  		if (got[i].addr == value)
  			goto out;
-@@ -407,7 +429,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
+@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module 
  #ifdef CONFIG_64BIT
  static Elf_Addr get_fdesc(struct module *me, unsigned long value)
  {
@@ -2034,7 +1395,7 @@ index 6e81bb5..9c280d2 100644
  
  	if (!value) {
  		printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
-@@ -425,7 +447,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
+@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module 
  
  	/* Create new one */
  	fdesc->addr = value;
@@ -2043,7 +1404,7 @@ index 6e81bb5..9c280d2 100644
  	return (Elf_Addr)fdesc;
  }
  #endif /* CONFIG_64BIT */
-@@ -849,7 +871,7 @@ register_unwind_table(struct module *me,
+@@ -857,7 +879,7 @@ register_unwind_table(struct module *me,
  
  	table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
  	end = table + sechdrs[me->arch.unwind_section].sh_size;
@@ -2052,11 +1413,10 @@ index 6e81bb5..9c280d2 100644
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
-index c9b9322..02d8940 100644
---- a/arch/parisc/kernel/sys_parisc.c
-+++ b/arch/parisc/kernel/sys_parisc.c
-@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
+diff -urNp linux-3.0.3/arch/parisc/kernel/sys_parisc.c linux-3.0.3/arch/parisc/kernel/sys_parisc.c
+--- linux-3.0.3/arch/parisc/kernel/sys_parisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/kernel/sys_parisc.c	2011-08-23 21:47:55.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;
@@ -2065,7 +1425,7 @@ index c9b9322..02d8940 100644
  			return addr;
  		addr = vma->vm_end;
  	}
-@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
+@@ -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;
@@ -2074,7 +1434,7 @@ index c9b9322..02d8940 100644
  			return addr;
  		addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
  		if (addr < vma->vm_end) /* handle wraparound */
-@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
  	if (flags & MAP_FIXED)
  		return addr;
  	if (!addr)
@@ -2083,11 +1443,10 @@ index c9b9322..02d8940 100644
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
-index 8b58bf0..7afff03 100644
---- a/arch/parisc/kernel/traps.c
-+++ b/arch/parisc/kernel/traps.c
-@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
+diff -urNp linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3/arch/parisc/kernel/traps.c
+--- linux-3.0.3/arch/parisc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
+@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
  			down_read(&current->mm->mmap_sem);
  			vma = find_vma(current->mm,regs->iaoq[0]);
@@ -2098,10 +1457,9 @@ index 8b58bf0..7afff03 100644
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
-index 18162ce..4d274ba 100644
---- a/arch/parisc/mm/fault.c
-+++ b/arch/parisc/mm/fault.c
+diff -urNp linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3/arch/parisc/mm/fault.c
+--- linux-3.0.3/arch/parisc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/parisc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -2110,7 +1468,7 @@ index 18162ce..4d274ba 100644
  
  #include <asm/uaccess.h>
  #include <asm/traps.h>
-@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
+@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, ex
  static unsigned long
  parisc_acctyp(unsigned long code, unsigned int inst)
  {
@@ -2119,7 +1477,7 @@ index 18162ce..4d274ba 100644
  	    return VM_EXEC;
  
  	switch (inst & 0xf0000000) {
-@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
+@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsign
  			}
  #endif
  
@@ -2271,90 +1629,10 @@ index 18162ce..4d274ba 100644
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
-index 16d25c0..0628dfd 100644
---- a/arch/powerpc/include/asm/device.h
-+++ b/arch/powerpc/include/asm/device.h
-@@ -17,7 +17,7 @@ struct device_node;
-  */
- struct dev_archdata {
- 	/* DMA operations on that device */
--	struct dma_map_ops	*dma_ops;
-+	const struct dma_map_ops	*dma_ops;
- 
- 	/*
- 	 * When an iommu is in use, dma_data is used as a ptr to the base of the
-diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
-index 6d2416a..ae0b752 100644
---- a/arch/powerpc/include/asm/dma-mapping.h
-+++ b/arch/powerpc/include/asm/dma-mapping.h
-@@ -66,12 +66,13 @@ static inline unsigned long device_to_mask(struct device *dev)
- /*
-  * Available generic sets of operations
-  */
-+/* cannot be const */
- #ifdef CONFIG_PPC64
--extern struct dma_map_ops dma_iommu_ops;
-+extern const struct dma_map_ops dma_iommu_ops;
- #endif
--extern struct dma_map_ops dma_direct_ops;
-+extern const struct dma_map_ops dma_direct_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- 	/* We don't handle the NULL dev case for ISA for now. We could
- 	 * do it via an out of line call but it is not needed for now. The
-@@ -84,7 +85,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
- 	return dev->archdata.dma_ops;
- }
- 
--static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
-+static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
- {
- 	dev->archdata.dma_ops = ops;
- }
-@@ -118,7 +119,7 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (unlikely(dma_ops == NULL))
- 		return 0;
-@@ -132,7 +133,7 @@ extern int dma_set_mask(struct device *dev, u64 dma_mask);
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 	void *cpu_addr;
- 
- 	BUG_ON(!dma_ops);
-@@ -147,7 +148,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	BUG_ON(!dma_ops);
- 
-@@ -158,7 +159,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (dma_ops->mapping_error)
- 		return dma_ops->mapping_error(dev, dma_addr);
-diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
-index 2b917c6..9859a0c 100644
---- a/arch/powerpc/include/asm/elf.h
-+++ b/arch/powerpc/include/asm/elf.h
-@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/elf.h linux-3.0.3/arch/powerpc/include/asm/elf.h
+--- linux-3.0.3/arch/powerpc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
  
@@ -2376,7 +1654,7 @@ index 2b917c6..9859a0c 100644
  
  /*
   * Our registers are always unsigned longs, whether we're a 32 bit
-@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(s
  	(0x7ff >> (PAGE_SHIFT - 12)) : \
  	(0x3ffff >> (PAGE_SHIFT - 12)))
  
@@ -2386,24 +1664,9 @@ index 2b917c6..9859a0c 100644
  #endif /* __KERNEL__ */
  
  /*
-diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
-index edfc980..1766f59 100644
---- a/arch/powerpc/include/asm/iommu.h
-+++ b/arch/powerpc/include/asm/iommu.h
-@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(void);
- extern void iommu_init_early_dart(void);
- extern void iommu_init_early_pasemi(void);
- 
-+/* 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 --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
-index bca8fdc..61e9580 100644
---- a/arch/powerpc/include/asm/kmap_types.h
-+++ b/arch/powerpc/include/asm/kmap_types.h
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/kmap_types.h linux-3.0.3/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.0.3/arch/powerpc/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -27,6 +27,7 @@ enum km_type {
  	KM_PPC_SYNC_PAGE,
  	KM_PPC_SYNC_ICACHE,
@@ -2412,10 +1675,45 @@ index bca8fdc..61e9580 100644
  	KM_TYPE_NR
  };
  
-diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
-index da4b200..3fc8701 100644
---- a/arch/powerpc/include/asm/page.h
-+++ b/arch/powerpc/include/asm/page.h
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/mman.h linux-3.0.3/arch/powerpc/include/asm/mman.h
+--- linux-3.0.3/arch/powerpc/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
+@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
+ }
+ #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
+ 
+-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
++static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
+ {
+ 	return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
+ }
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/page_64.h linux-3.0.3/arch/powerpc/include/asm/page_64.h
+--- linux-3.0.3/arch/powerpc/include/asm/page_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/page_64.h	2011-08-23 21:47:55.000000000 -0400
+@@ -155,15 +155,18 @@ do {						\
+  * stack by default, so in the absence of a PT_GNU_STACK program header
+  * we turn execute permission off.
+  */
+-#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
+-					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++#define VM_STACK_DEFAULT_FLAGS32 \
++	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
++	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
+ #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
+ 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
++#ifndef CONFIG_PAX_PAGEEXEC
+ #define VM_STACK_DEFAULT_FLAGS \
+ 	(is_32bit_task() ? \
+ 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
++#endif
+ 
+ #include <asm-generic/getorder.h>
+ 
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/page.h linux-3.0.3/arch/powerpc/include/asm/page.h
+--- linux-3.0.3/arch/powerpc/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -2438,50 +1736,9 @@ index da4b200..3fc8701 100644
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
-index 932f88d..f339eed 100644
---- a/arch/powerpc/include/asm/page_64.h
-+++ b/arch/powerpc/include/asm/page_64.h
-@@ -172,15 +172,18 @@ do {						\
-  * stack by default, so in the absense of a PT_GNU_STACK program header
-  * we turn execute permission off.
-  */
--#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
--					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+#define VM_STACK_DEFAULT_FLAGS32 \
-+	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-+	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
- #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
- 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
-+#ifndef CONFIG_PAX_PAGEEXEC
- #define VM_STACK_DEFAULT_FLAGS \
- 	(is_32bit_task() ? \
- 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
-+#endif
- 
- #include <asm-generic/getorder.h>
- 
-diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
-index a20a9ad..158bb9a 100644
---- a/arch/powerpc/include/asm/pci.h
-+++ b/arch/powerpc/include/asm/pci.h
-@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
- }
- 
- #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 --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
-index 89f1587..807df80 100644
---- a/arch/powerpc/include/asm/pgtable.h
-+++ b/arch/powerpc/include/asm/pgtable.h
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/pgtable.h linux-3.0.3/arch/powerpc/include/asm/pgtable.h
+--- linux-3.0.3/arch/powerpc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -2490,10 +1747,9 @@ index 89f1587..807df80 100644
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
-index 4aad413..85d86bf 100644
---- a/arch/powerpc/include/asm/pte-hash32.h
-+++ b/arch/powerpc/include/asm/pte-hash32.h
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE	0x004	/* when !present: nonlinear file mapping */
  #define _PAGE_USER	0x004	/* usermode access allowed */
@@ -2502,11 +1758,10 @@ index 4aad413..85d86bf 100644
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
-index 7626fa7..bc05be4 100644
---- a/arch/powerpc/include/asm/reg.h
-+++ b/arch/powerpc/include/asm/reg.h
-@@ -191,6 +191,7 @@
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/reg.h linux-3.0.3/arch/powerpc/include/asm/reg.h
+--- linux-3.0.3/arch/powerpc/include/asm/reg.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/reg.h	2011-08-23 21:47:55.000000000 -0400
+@@ -209,6 +209,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 */
@@ -2514,24 +1769,10 @@ index 7626fa7..bc05be4 100644
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
-index 8979d4c..d2fd0d3 100644
---- a/arch/powerpc/include/asm/swiotlb.h
-+++ b/arch/powerpc/include/asm/swiotlb.h
-@@ -13,7 +13,7 @@
- 
- #include <linux/swiotlb.h>
- 
--extern struct dma_map_ops swiotlb_dma_ops;
-+extern const struct dma_map_ops swiotlb_dma_ops;
- 
- static inline void dma_mark_clean(void *addr, size_t size) {}
- 
-diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
-index 5e474dd..a66d0a0 100644
---- a/arch/powerpc/include/asm/system.h
-+++ b/arch/powerpc/include/asm/system.h
-@@ -533,7 +533,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/system.h linux-3.0.3/arch/powerpc/include/asm/system.h
+--- linux-3.0.3/arch/powerpc/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/system.h	2011-08-23 21:47:55.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
  
@@ -2540,10 +1781,9 @@ index 5e474dd..a66d0a0 100644
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
-index bd0fb84..a42a14b 100644
---- a/arch/powerpc/include/asm/uaccess.h
-+++ b/arch/powerpc/include/asm/uaccess.h
+diff -urNp linux-3.0.3/arch/powerpc/include/asm/uaccess.h linux-3.0.3/arch/powerpc/include/asm/uaccess.h
+--- linux-3.0.3/arch/powerpc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ	0
  #define VERIFY_WRITE	1
@@ -2606,7 +1846,7 @@ index bd0fb84..a42a14b 100644
  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_user_inatomic(void *to,
+@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_
  		if (ret == 0)
  			return 0;
  	}
@@ -2617,7 +1857,7 @@ index bd0fb84..a42a14b 100644
  	return __copy_tofrom_user((__force void __user *)to, from, n);
  }
  
-@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
+@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_us
  		if (ret == 0)
  			return 0;
  	}
@@ -2628,7 +1868,7 @@ index bd0fb84..a42a14b 100644
  	return __copy_tofrom_user(to, (__force const void __user *)from, n);
  }
  
-@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
+@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_us
  	return __copy_to_user_inatomic(to, from, size);
  }
  
@@ -2721,68 +1961,10 @@ index bd0fb84..a42a14b 100644
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
-index e755415..a37c215 100644
---- a/arch/powerpc/kernel/dma-iommu.c
-+++ b/arch/powerpc/kernel/dma-iommu.c
-@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
- }
- 
- /* 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 = get_iommu_table_base(dev);
- 
-@@ -90,7 +90,7 @@ static int dma_iommu_dma_supported(struct device *dev, u64 mask)
- 		return 1;
- }
- 
--struct dma_map_ops dma_iommu_ops = {
-+struct dma_map_ops dma_iommu_ops = {	/* cannot be const, see arch/powerpc/platforms/cell/iommu.c */
- 	.alloc_coherent	= dma_iommu_alloc_coherent,
- 	.free_coherent	= dma_iommu_free_coherent,
- 	.map_sg		= dma_iommu_map_sg,
-diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
-index 4295e0b..019bad4 100644
---- a/arch/powerpc/kernel/dma-swiotlb.c
-+++ b/arch/powerpc/kernel/dma-swiotlb.c
-@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
-  * map_page, and unmap_page on highmem, use normal dma_ops
-  * for everything else.
-  */
--struct dma_map_ops swiotlb_dma_ops = {
-+const struct dma_map_ops swiotlb_dma_ops = {
- 	.alloc_coherent = dma_direct_alloc_coherent,
- 	.free_coherent = dma_direct_free_coherent,
- 	.map_sg = swiotlb_map_sg_attrs,
-diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
-index cf02cad..88bf1d0 100644
---- a/arch/powerpc/kernel/dma.c
-+++ b/arch/powerpc/kernel/dma.c
-@@ -136,7 +136,7 @@ static inline void dma_direct_sync_single(struct device *dev,
- }
- #endif
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
-@@ -157,7 +157,7 @@ EXPORT_SYMBOL(dma_direct_ops);
- 
- int dma_set_mask(struct device *dev, u64 dma_mask)
- {
--	struct dma_map_ops *dma_ops = get_dma_ops(dev);
-+	const struct dma_map_ops *dma_ops = get_dma_ops(dev);
- 
- 	if (ppc_md.dma_set_mask)
- 		return ppc_md.dma_set_mask(dev, dma_mask);
-diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
-index 5c43063..f368c46 100644
---- a/arch/powerpc/kernel/exceptions-64e.S
-+++ b/arch/powerpc/kernel/exceptions-64e.S
-@@ -495,6 +495,7 @@ storage_fault_common:
+diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S	2011-08-23 21:47:55.000000000 -0400
+@@ -567,6 +567,7 @@ storage_fault_common:
  	std	r14,_DAR(r1)
  	std	r15,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -2790,7 +1972,7 @@ index 5c43063..f368c46 100644
  	mr	r4,r14
  	mr	r5,r15
  	ld	r14,PACA_EXGEN+EX_R14(r13)
-@@ -504,8 +505,7 @@ storage_fault_common:
+@@ -576,8 +577,7 @@ storage_fault_common:
  	cmpdi	r3,0
  	bne-	1f
  	b	.ret_from_except_lite
@@ -2800,11 +1982,10 @@ index 5c43063..f368c46 100644
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
-index 8a81799..633215c 100644
---- a/arch/powerpc/kernel/exceptions-64s.S
-+++ b/arch/powerpc/kernel/exceptions-64s.S
-@@ -848,10 +848,10 @@ handle_page_fault:
+diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S	2011-08-23 21:47:55.000000000 -0400
+@@ -956,10 +956,10 @@ handle_page_fault:
  11:	ld	r4,_DAR(r1)
  	ld	r5,_DSISR(r1)
  	addi	r3,r1,STACK_FRAME_OVERHEAD
@@ -2816,36 +1997,41 @@ index 8a81799..633215c 100644
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
-index f62efdf..50c4a83 100644
---- a/arch/powerpc/kernel/ibmebus.c
-+++ b/arch/powerpc/kernel/ibmebus.c
-@@ -128,7 +128,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
- 	return 1;
- }
+diff -urNp linux-3.0.3/arch/powerpc/kernel/module_32.c linux-3.0.3/arch/powerpc/kernel/module_32.c
+--- linux-3.0.3/arch/powerpc/kernel/module_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/module_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
+ 			me->arch.core_plt_section = i;
+ 	}
+ 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
+-		printk("Module doesn't contain .plt or .init.plt sections.\n");
++		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+ 		return -ENOEXEC;
+ 	}
  
--static struct dma_map_ops ibmebus_dma_ops = {
-+static const struct dma_map_ops ibmebus_dma_ops = {
- 	.alloc_coherent = ibmebus_alloc_coherent,
- 	.free_coherent  = ibmebus_free_coherent,
- 	.map_sg         = ibmebus_map_sg,
-diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
-index 42850ee..2d17986 100644
---- a/arch/powerpc/kernel/kgdb.c
-+++ b/arch/powerpc/kernel/kgdb.c
-@@ -422,7 +422,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
- /*
-  * Global data
-  */
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
- };
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+ 
+ 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ 	/* Init, or core PLT? */
+-	if (location >= mod->module_core
+-	    && location < mod->module_core + mod->core_size)
++	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+-	else
++	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++	else {
++		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++		return ~0UL;
++	}
  
-diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
-index 49cee9d..e8be236 100644
---- a/arch/powerpc/kernel/module.c
-+++ b/arch/powerpc/kernel/module.c
+ 	/* Find this entry, or if that fails, the next avail. entry */
+ 	while (entry->jump[0]) {
+diff -urNp linux-3.0.3/arch/powerpc/kernel/module.c linux-3.0.3/arch/powerpc/kernel/module.c
+--- linux-3.0.3/arch/powerpc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2871,7 +2057,7 @@ index 49cee9d..e8be236 100644
  	return vmalloc_exec(size);
  }
  
-@@ -45,6 +58,13 @@ void module_free(struct module *mod, void *module_region)
+@@ -45,6 +58,13 @@ void module_free(struct module *mod, voi
  	vfree(module_region);
  }
  
@@ -2885,66 +2071,10 @@ index 49cee9d..e8be236 100644
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
-index f832773..0507238 100644
---- a/arch/powerpc/kernel/module_32.c
-+++ b/arch/powerpc/kernel/module_32.c
-@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
- 			me->arch.core_plt_section = i;
- 	}
- 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
--		printk("Module doesn't contain .plt or .init.plt sections.\n");
-+		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
- 		return -ENOEXEC;
- 	}
- 
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *location,
- 
- 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- 	/* Init, or core PLT? */
--	if (location >= mod->module_core
--	    && location < mod->module_core + mod->core_size)
-+	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
--	else
-+	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+	else {
-+		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+		return ~0UL;
-+	}
- 
- 	/* Find this entry, or if that fails, the next avail. entry */
- 	while (entry->jump[0]) {
-diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
-index 10a44e6..76b77a8 100644
---- a/arch/powerpc/kernel/pci-common.c
-+++ b/arch/powerpc/kernel/pci-common.c
-@@ -52,14 +52,14 @@ resource_size_t isa_mem_base;
- unsigned int ppc_pci_flags = 0;
- 
- 
--static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
-+static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
- 
--void set_pci_dma_ops(struct dma_map_ops *dma_ops)
-+void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
- {
- 	pci_dma_ops = dma_ops;
- }
- 
--struct dma_map_ops *get_pci_dma_ops(void)
-+const struct dma_map_ops *get_pci_dma_ops(void)
- {
- 	return pci_dma_ops;
- }
-diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
-index 8303a6c..4111701 100644
---- a/arch/powerpc/kernel/process.c
-+++ b/arch/powerpc/kernel/process.c
-@@ -655,8 +655,8 @@ void show_regs(struct pt_regs * regs)
+diff -urNp linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3/arch/powerpc/kernel/process.c
+--- linux-3.0.3/arch/powerpc/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/process.c	2011-08-23 21:48:14.000000000 -0400
+@@ -676,8 +676,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
  	 */
@@ -2955,7 +2085,7 @@ index 8303a6c..4111701 100644
  #endif
  	show_stack(current, (unsigned long *) regs->gpr[1]);
  	if (!user_mode(regs))
-@@ -1146,10 +1146,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1183,10 +1183,10 @@ void show_stack(struct task_struct *tsk,
  		newsp = stack[0];
  		ip = stack[STACK_FRAME_LR_SAVE];
  		if (!firstframe || ip != lr) {
@@ -2968,7 +2098,7 @@ index 8303a6c..4111701 100644
  				       (void *)current->ret_stack[curr_frame].ret);
  				curr_frame--;
  			}
-@@ -1169,7 +1169,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
+@@ -1206,7 +1206,7 @@ void show_stack(struct task_struct *tsk,
  			struct pt_regs *regs = (struct pt_regs *)
  				(sp + STACK_FRAME_OVERHEAD);
  			lr = regs->link;
@@ -2977,7 +2107,7 @@ index 8303a6c..4111701 100644
  			       regs->trap, (void *)regs->nip, (void *)lr);
  			firstframe = 1;
  		}
-@@ -1244,58 +1244,3 @@ void thread_info_cache_init(void)
+@@ -1281,58 +1281,3 @@ void thread_info_cache_init(void)
  }
  
  #endif /* THREAD_SHIFT < PAGE_SHIFT */
@@ -3036,11 +2166,10 @@ index 8303a6c..4111701 100644
 -
 -	return ret;
 -}
-diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
-index b96a3a0..f599bde 100644
---- a/arch/powerpc/kernel/signal_32.c
-+++ b/arch/powerpc/kernel/signal_32.c
-@@ -858,7 +858,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
+diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_32.c linux-3.0.3/arch/powerpc/kernel/signal_32.c
+--- linux-3.0.3/arch/powerpc/kernel/signal_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/signal_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
  	/* Save user registers on the stack */
  	frame = &rt_sf->uc.uc_mcontext;
  	addr = frame;
@@ -3049,11 +2178,10 @@ index b96a3a0..f599bde 100644
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
-index 27c4a45..1278a77 100644
---- a/arch/powerpc/kernel/signal_64.c
-+++ b/arch/powerpc/kernel/signal_64.c
-@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
+diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_64.c linux-3.0.3/arch/powerpc/kernel/signal_64.c
+--- linux-3.0.3/arch/powerpc/kernel/signal_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/signal_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
  	current->thread.fpscr.val = 0;
  
  	/* Set up to return from userspace. */
@@ -3062,10 +2190,30 @@ index 27c4a45..1278a77 100644
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
-index fd87287..e4ebb15 100644
---- a/arch/powerpc/kernel/vdso.c
-+++ b/arch/powerpc/kernel/vdso.c
+diff -urNp linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3/arch/powerpc/kernel/traps.c
+--- linux-3.0.3/arch/powerpc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
+ static inline void pmac_backlight_unblank(void) { }
+ #endif
+ 
++extern void gr_handle_kernel_exploit(void);
++
+ int die(const char *str, struct pt_regs *regs, long err)
+ {
+ 	static struct {
+@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs 
+ 	if (panic_on_oops)
+ 		panic("Fatal exception");
+ 
++	gr_handle_kernel_exploit();
++
+ 	oops_exit();
+ 	do_exit(err);
+ 
+diff -urNp linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3/arch/powerpc/kernel/vdso.c
+--- linux-3.0.3/arch/powerpc/kernel/vdso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/kernel/vdso.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -3074,7 +2222,7 @@ index fd87287..e4ebb15 100644
  
  #include "setup.h"
  
-@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+@@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct l
  	vdso_base = VDSO32_MBASE;
  #endif
  
@@ -3083,7 +2231,7 @@ index fd87287..e4ebb15 100644
  
  	/* 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 linux_binprm *bprm, int uses_interp)
+@@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct l
  	vdso_base = get_unmapped_area(NULL, vdso_base,
  				      (vdso_pages << PAGE_SHIFT) +
  				      ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
@@ -3092,28 +2240,9 @@ index fd87287..e4ebb15 100644
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
-index 1b695fd..6530b20 100644
---- a/arch/powerpc/kernel/vio.c
-+++ b/arch/powerpc/kernel/vio.c
-@@ -605,11 +605,12 @@ static int vio_dma_iommu_dma_supported(struct device *dev, u64 mask)
-         return dma_iommu_ops.dma_supported(dev, mask);
- }
- 
--struct dma_map_ops vio_dma_mapping_ops = {
-+const struct dma_map_ops vio_dma_mapping_ops = {
- 	.alloc_coherent = vio_dma_iommu_alloc_coherent,
- 	.free_coherent  = vio_dma_iommu_free_coherent,
- 	.map_sg         = vio_dma_iommu_map_sg,
- 	.unmap_sg       = vio_dma_iommu_unmap_sg,
-+	.dma_supported  = dma_iommu_dma_supported,
- 	.map_page       = vio_dma_iommu_map_page,
- 	.unmap_page     = vio_dma_iommu_unmap_page,
- 	.dma_supported  = vio_dma_iommu_dma_supported,
-diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
-index 5eea6f3..5d10396 100644
---- a/arch/powerpc/lib/usercopy_64.c
-+++ b/arch/powerpc/lib/usercopy_64.c
+diff -urNp linux-3.0.3/arch/powerpc/lib/usercopy_64.c linux-3.0.3/arch/powerpc/lib/usercopy_64.c
+--- linux-3.0.3/arch/powerpc/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -3137,7 +2266,7 @@ index 5eea6f3..5d10396 100644
  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 *to, const void __user *from,
+@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *
  	return n;
  }
  
@@ -3145,14 +2274,13 @@ index 5eea6f3..5d10396 100644
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
-index 54f4fb9..5d44d49 100644
---- a/arch/powerpc/mm/fault.c
-+++ b/arch/powerpc/mm/fault.c
-@@ -31,6 +31,10 @@
- #include <linux/kdebug.h>
+diff -urNp linux-3.0.3/arch/powerpc/mm/fault.c linux-3.0.3/arch/powerpc/mm/fault.c
+--- linux-3.0.3/arch/powerpc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+@@ -32,6 +32,10 @@
  #include <linux/perf_event.h>
  #include <linux/magic.h>
+ #include <linux/ratelimit.h>
 +#include <linux/slab.h>
 +#include <linux/pagemap.h>
 +#include <linux/compiler.h>
@@ -3160,7 +2288,7 @@ index 54f4fb9..5d44d49 100644
  
  #include <asm/firmware.h>
  #include <asm/page.h>
-@@ -42,6 +46,7 @@
+@@ -43,6 +47,7 @@
  #include <asm/tlbflush.h>
  #include <asm/siginfo.h>
  #include <mm/mmu_decl.h>
@@ -3168,7 +2296,7 @@ index 54f4fb9..5d44d49 100644
  
  #ifdef CONFIG_KPROBES
  static inline int notify_page_fault(struct pt_regs *regs)
-@@ -65,6 +70,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
+@@ -66,6 +71,33 @@ static inline int notify_page_fault(stru
  }
  #endif
  
@@ -3202,7 +2330,7 @@ index 54f4fb9..5d44d49 100644
  /*
   * Check whether the instruction at regs->nip is a store using
   * an update addressing form which will update r1.
-@@ -135,7 +167,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
+@@ -136,7 +168,7 @@ int __kprobes do_page_fault(struct pt_re
  	 * indicate errors in DSISR but can validly be set in SRR1.
  	 */
  	if (trap == 0x400)
@@ -3211,7 +2339,7 @@ index 54f4fb9..5d44d49 100644
  	else
  		is_write = error_code & DSISR_ISSTORE;
  #else
-@@ -258,7 +290,7 @@ good_area:
+@@ -259,7 +291,7 @@ good_area:
           * "undefined".  Of those that can be set, this is the only
           * one which seems bad.
           */
@@ -3220,7 +2348,7 @@ index 54f4fb9..5d44d49 100644
                  /* Guarded storage error. */
  		goto bad_area;
  #endif /* CONFIG_8xx */
-@@ -273,7 +305,7 @@ good_area:
+@@ -274,7 +306,7 @@ good_area:
  		 * processors use the same I/D cache coherency mechanism
  		 * as embedded.
  		 */
@@ -3229,7 +2357,7 @@ index 54f4fb9..5d44d49 100644
  			goto bad_area;
  #endif /* CONFIG_PPC_STD_MMU */
  
-@@ -342,6 +374,23 @@ bad_area:
+@@ -343,6 +375,23 @@ bad_area:
  bad_area_nosemaphore:
  	/* User mode accesses cause a SIGSEGV */
  	if (user_mode(regs)) {
@@ -3253,11 +2381,10 @@ index 54f4fb9..5d44d49 100644
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
-index 5a783d8..c23e14b 100644
---- a/arch/powerpc/mm/mmap_64.c
-+++ b/arch/powerpc/mm/mmap_64.c
-@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+diff -urNp linux-3.0.3/arch/powerpc/mm/mmap_64.c linux-3.0.3/arch/powerpc/mm/mmap_64.c
+--- linux-3.0.3/arch/powerpc/mm/mmap_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/mm/mmap_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -3280,11 +2407,10 @@ index 5a783d8..c23e14b 100644
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
-index ba51948..23009d9 100644
---- a/arch/powerpc/mm/slice.c
-+++ b/arch/powerpc/mm/slice.c
-@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
+diff -urNp linux-3.0.3/arch/powerpc/mm/slice.c linux-3.0.3/arch/powerpc/mm/slice.c
+--- linux-3.0.3/arch/powerpc/mm/slice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/powerpc/mm/slice.c	2011-08-23 21:47:55.000000000 -0400
+@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
  	if ((mm->task_size - len) < addr)
  		return 0;
  	vma = find_vma(mm, addr);
@@ -3302,7 +2428,7 @@ index ba51948..23009d9 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -313,10 +313,14 @@ static unsigned long slice_find_area_top
  		}
  	}
  
@@ -3320,7 +2446,7 @@ index ba51948..23009d9 100644
  
  		/* Check for hit with different page size */
  		mask = slice_range_to_mask(addr, len);
-@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -336,7 +340,7 @@ static unsigned long slice_find_area_top
  		 * return with success:
  		 */
  		vma = find_vma(mm, addr);
@@ -3329,7 +2455,7 @@ index ba51948..23009d9 100644
  			/* remember the address as a hint for next time */
  			if (use_cache)
  				mm->free_area_cache = addr;
-@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
+@@ -348,7 +352,7 @@ static unsigned long slice_find_area_top
  		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -3338,7 +2464,7 @@ index ba51948..23009d9 100644
  	}
  
  	/*
-@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
+@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(un
  	if (fixed && addr > (mm->task_size - len))
  		return -EINVAL;
  
@@ -3350,77 +2476,9 @@ index ba51948..23009d9 100644
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
-index 26a0671..c581d68 100644
---- a/arch/powerpc/platforms/cell/iommu.c
-+++ b/arch/powerpc/platforms/cell/iommu.c
-@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask)
- 
- static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
- 
--struct dma_map_ops dma_iommu_fixed_ops = {
-+const struct dma_map_ops dma_iommu_fixed_ops = {
- 	.alloc_coherent = dma_fixed_alloc_coherent,
- 	.free_coherent  = dma_fixed_free_coherent,
- 	.map_sg         = dma_fixed_map_sg,
-diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
-index 23083c3..ec00e40 100644
---- a/arch/powerpc/platforms/ps3/system-bus.c
-+++ b/arch/powerpc/platforms/ps3/system-bus.c
-@@ -695,7 +695,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
- 	return mask >= DMA_BIT_MASK(32);
- }
- 
--static struct dma_map_ops ps3_sb_dma_ops = {
-+static const struct dma_map_ops ps3_sb_dma_ops = {
- 	.alloc_coherent = ps3_alloc_coherent,
- 	.free_coherent = ps3_free_coherent,
- 	.map_sg = ps3_sb_map_sg,
-@@ -705,7 +705,7 @@ static struct dma_map_ops ps3_sb_dma_ops = {
- 	.unmap_page = ps3_unmap_page,
- };
- 
--static struct dma_map_ops ps3_ioc0_dma_ops = {
-+static const struct dma_map_ops ps3_ioc0_dma_ops = {
- 	.alloc_coherent = ps3_alloc_coherent,
- 	.free_coherent = ps3_free_coherent,
- 	.map_sg = ps3_ioc0_map_sg,
-diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c
-index 73b86cc..4c57946 100644
---- a/arch/powerpc/sysdev/ppc4xx_cpm.c
-+++ b/arch/powerpc/sysdev/ppc4xx_cpm.c
-@@ -240,7 +240,7 @@ static int cpm_suspend_enter(suspend_state_t state)
- 	return 0;
- }
- 
--static struct platform_suspend_ops cpm_suspend_ops = {
-+static const struct platform_suspend_ops cpm_suspend_ops = {
- 	.valid		= cpm_suspend_valid,
- 	.enter		= cpm_suspend_enter,
- };
-diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
-index 636bcb8..8410fa1 100644
---- a/arch/s390/Kconfig
-+++ b/arch/s390/Kconfig
-@@ -233,11 +233,9 @@ config S390_EXEC_PROTECT
- 	prompt "Data execute protection"
- 	help
- 	  This option allows to enable a buffer overflow protection for user
--	  space programs and it also selects the addressing mode option above.
--	  The kernel parameter noexec=on will enable this feature and also
--	  switch the addressing modes, default is disabled. Enabling this (via
--	  kernel parameter) on machines earlier than IBM System z9 this will
--	  reduce system performance.
-+	  space programs.
-+	  Enabling this (via kernel parameter) on machines earlier than IBM
-+	  System z9 this will reduce system performance.
- 
- comment "Code generation options"
- 
-diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
-index 10c029c..19a4f9b 100644
---- a/arch/s390/include/asm/elf.h
-+++ b/arch/s390/include/asm/elf.h
+diff -urNp linux-3.0.3/arch/s390/include/asm/elf.h linux-3.0.3/arch/s390/include/asm/elf.h
+--- linux-3.0.3/arch/s390/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -3438,7 +2496,7 @@ index 10c029c..19a4f9b 100644
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports. */
-@@ -222,7 +228,4 @@ struct linux_binprm;
+@@ -210,7 +216,4 @@ struct linux_binprm;
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
  int arch_setup_additional_pages(struct linux_binprm *, int);
  
@@ -3446,11 +2504,10 @@ index 10c029c..19a4f9b 100644
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
-index 8f8d759..80456a5 100644
---- a/arch/s390/include/asm/system.h
-+++ b/arch/s390/include/asm/system.h
-@@ -449,7 +449,7 @@ extern void (*_machine_restart)(char *command);
+diff -urNp linux-3.0.3/arch/s390/include/asm/system.h linux-3.0.3/arch/s390/include/asm/system.h
+--- linux-3.0.3/arch/s390/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+@@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
  
@@ -3459,11 +2516,10 @@ index 8f8d759..80456a5 100644
  
  static inline int tprot(unsigned long addr)
  {
-diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
-index d6b1ed0..071ffbd 100644
---- a/arch/s390/include/asm/uaccess.h
-+++ b/arch/s390/include/asm/uaccess.h
-@@ -234,6 +234,10 @@ static inline unsigned long __must_check
+diff -urNp linux-3.0.3/arch/s390/include/asm/uaccess.h linux-3.0.3/arch/s390/include/asm/uaccess.h
+--- linux-3.0.3/arch/s390/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+@@ -235,6 +235,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
  	might_fault();
@@ -3474,7 +2530,7 @@ index d6b1ed0..071ffbd 100644
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-@@ -259,6 +263,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
+@@ -260,6 +264,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)
  {
@@ -3484,7 +2540,7 @@ index d6b1ed0..071ffbd 100644
  	if (__builtin_constant_p(n) && (n <= 256))
  		return uaccess.copy_from_user_small(n, from, to);
  	else
-@@ -293,6 +300,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
+@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __us
  	unsigned int sz = __compiletime_object_size(to);
  
  	might_fault();
@@ -3495,11 +2551,10 @@ index d6b1ed0..071ffbd 100644
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
-index f7167ee..e22b6d5 100644
---- a/arch/s390/kernel/module.c
-+++ b/arch/s390/kernel/module.c
-@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
+diff -urNp linux-3.0.3/arch/s390/kernel/module.c linux-3.0.3/arch/s390/kernel/module.c
+--- linux-3.0.3/arch/s390/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+@@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
  	/* Increase core size by size of got & plt and set start
  	   offsets for got and plt. */
@@ -3516,7 +2571,7 @@ index f7167ee..e22b6d5 100644
  	return 0;
  }
  
-@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -258,7 +258,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  		if (info->got_initialized == 0) {
  			Elf_Addr *gotent;
  
@@ -3525,7 +2580,7 @@ index f7167ee..e22b6d5 100644
  				info->got_offset;
  			*gotent = val;
  			info->got_initialized = 1;
-@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -282,7 +282,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  		else if (r_type == R_390_GOTENT ||
  			 r_type == R_390_GOTPLTENT)
  			*(unsigned int *) loc =
@@ -3534,7 +2589,7 @@ index f7167ee..e22b6d5 100644
  		else if (r_type == R_390_GOT64 ||
  			 r_type == R_390_GOTPLT64)
  			*(unsigned long *) loc = val;
-@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -296,7 +296,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  	case R_390_PLTOFF64:	/* 16 bit offset from GOT to PLT. */
  		if (info->plt_initialized == 0) {
  			unsigned int *ip;
@@ -3543,7 +2598,7 @@ index f7167ee..e22b6d5 100644
  				info->plt_offset;
  #ifndef CONFIG_64BIT
  			ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
-@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -321,7 +321,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  			       val - loc + 0xffffUL < 0x1ffffeUL) ||
  			      (r_type == R_390_PLT32DBL &&
  			       val - loc + 0xffffffffULL < 0x1fffffffeULL)))
@@ -3552,7 +2607,7 @@ index f7167ee..e22b6d5 100644
  					me->arch.plt_offset +
  					info->plt_offset;
  			val += rela->r_addend - loc;
-@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -343,7 +343,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base
  	case R_390_GOTOFF32:	/* 32 bit offset to GOT.  */
  	case R_390_GOTOFF64:	/* 64 bit offset to GOT. */
  		val = val + rela->r_addend -
@@ -3561,7 +2616,7 @@ index f7167ee..e22b6d5 100644
  		if (r_type == R_390_GOTOFF16)
  			*(unsigned short *) loc = val;
  		else if (r_type == R_390_GOTOFF32)
-@@ -353,7 +353,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
+@@ -353,7 +353,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. */
@@ -3570,11 +2625,10 @@ index f7167ee..e22b6d5 100644
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
-index a895e69..5257f03 100644
---- a/arch/s390/kernel/process.c
-+++ b/arch/s390/kernel/process.c
-@@ -334,39 +334,3 @@ unsigned long get_wchan(struct task_struct *p)
+diff -urNp linux-3.0.3/arch/s390/kernel/process.c linux-3.0.3/arch/s390/kernel/process.c
+--- linux-3.0.3/arch/s390/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+@@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
  	}
  	return 0;
  }
@@ -3614,11 +2668,10 @@ index a895e69..5257f03 100644
 -		return base;
 -	return ret;
 -}
-diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 6f63508..d607c4a 100644
---- a/arch/s390/kernel/setup.c
-+++ b/arch/s390/kernel/setup.c
-@@ -281,7 +281,7 @@ static int __init early_parse_mem(char *p)
+diff -urNp linux-3.0.3/arch/s390/kernel/setup.c linux-3.0.3/arch/s390/kernel/setup.c
+--- linux-3.0.3/arch/s390/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
+@@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
  
@@ -3627,63 +2680,10 @@ index 6f63508..d607c4a 100644
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-@@ -310,17 +310,6 @@ static int set_amode_and_uaccess(unsigned long user_amode,
- 	}
- }
- 
--/*
-- * Switch kernel/user addressing modes?
-- */
--static int __init early_parse_switch_amode(char *p)
--{
--	if (user_mode != SECONDARY_SPACE_MODE)
--		user_mode = PRIMARY_SPACE_MODE;
--	return 0;
--}
--early_param("switch_amode", early_parse_switch_amode);
--
- static int __init early_parse_user_mode(char *p)
- {
- 	if (p && strcmp(p, "primary") == 0)
-@@ -337,20 +326,6 @@ static int __init early_parse_user_mode(char *p)
- }
- early_param("user_mode", early_parse_user_mode);
- 
--#ifdef CONFIG_S390_EXEC_PROTECT
--/*
-- * Enable execute protection?
-- */
--static int __init early_parse_noexec(char *p)
--{
--	if (!strncmp(p, "off", 3))
--		return 0;
--	user_mode = SECONDARY_SPACE_MODE;
--	return 0;
--}
--early_param("noexec", early_parse_noexec);
--#endif /* CONFIG_S390_EXEC_PROTECT */
--
- static void setup_addressing_mode(void)
- {
- 	if (user_mode == SECONDARY_SPACE_MODE) {
-diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
-index 71a4b0d..4c54d7f 100644
---- a/arch/s390/mm/maccess.c
-+++ b/arch/s390/mm/maccess.c
-@@ -45,7 +45,7 @@ static long probe_kernel_write_odd(void *dst, void *src, size_t size)
- 	return rc ? rc : count;
- }
- 
--long probe_kernel_write(void *dst, void *src, size_t size)
-+long probe_kernel_write(void *dst, const void *src, size_t size)
- {
- 	long copied = 0;
- 
-diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
-index c9a9f7f..60d0315 100644
---- a/arch/s390/mm/mmap.c
-+++ b/arch/s390/mm/mmap.c
-@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+diff -urNp linux-3.0.3/arch/s390/mm/mmap.c linux-3.0.3/arch/s390/mm/mmap.c
+--- linux-3.0.3/arch/s390/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/s390/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -3706,7 +2706,7 @@ index c9a9f7f..60d0315 100644
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-@@ -166,10 +178,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -166,10 +178,22 @@ void arch_pick_mmap_layout(struct mm_str
  	 */
  	if (mmap_is_legacy()) {
  		mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -3729,10 +2729,9 @@ index c9a9f7f..60d0315 100644
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
-index 589d5c7..669e274 100644
---- a/arch/score/include/asm/system.h
-+++ b/arch/score/include/asm/system.h
+diff -urNp linux-3.0.3/arch/score/include/asm/system.h linux-3.0.3/arch/score/include/asm/system.h
+--- linux-3.0.3/arch/score/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/score/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@ do {								\
  #define finish_arch_switch(prev)	do {} while (0)
  
@@ -3742,11 +2741,10 @@ index 589d5c7..669e274 100644
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
-index 25d0803..d6c8e36 100644
---- a/arch/score/kernel/process.c
-+++ b/arch/score/kernel/process.c
-@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
+diff -urNp linux-3.0.3/arch/score/kernel/process.c linux-3.0.3/arch/score/kernel/process.c
+--- linux-3.0.3/arch/score/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/score/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
  	return task_pt_regs(task)->cp0_epc;
  }
@@ -3755,112 +2753,10 @@ index 25d0803..d6c8e36 100644
 -{
 -	return sp;
 -}
-diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
-index 1a73c3e..e812698 100644
---- a/arch/sh/include/asm/dma-mapping.h
-+++ b/arch/sh/include/asm/dma-mapping.h
-@@ -1,10 +1,10 @@
- #ifndef __ASM_SH_DMA_MAPPING_H
- #define __ASM_SH_DMA_MAPPING_H
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- extern void no_iommu_init(void);
- 
--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)
- {
- 	return dma_ops;
- }
-@@ -14,7 +14,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
- 
- static inline int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (ops->dma_supported)
- 		return ops->dma_supported(dev, mask);
-@@ -24,7 +24,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
- 
- static inline int dma_set_mask(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (!dev->dma_mask || !dma_supported(dev, mask))
- 		return -EIO;
-@@ -44,7 +44,7 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
- 
- static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
-@@ -55,7 +55,7 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t gfp)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
-@@ -72,7 +72,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	if (dma_release_from_coherent(dev, get_order(size), vaddr))
- 		return;
-diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
-index 3c55b87..92ccab3 100644
---- a/arch/sh/kernel/dma-nommu.c
-+++ b/arch/sh/kernel/dma-nommu.c
-@@ -62,7 +62,7 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
- }
- #endif
- 
--struct dma_map_ops nommu_dma_ops = {
-+const struct dma_map_ops nommu_dma_ops = {
- 	.alloc_coherent		= dma_generic_alloc_coherent,
- 	.free_coherent		= dma_generic_free_coherent,
- 	.map_page		= nommu_map_page,
-diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c
-index efb6d39..49e7304 100644
---- a/arch/sh/kernel/kgdb.c
-+++ b/arch/sh/kernel/kgdb.c
-@@ -319,7 +319,7 @@ void kgdb_arch_exit(void)
- 	unregister_die_notifier(&kgdb_notifier);
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: trapa #0x3c */
- #ifdef CONFIG_CPU_LITTLE_ENDIAN
- 	.gdb_bpt_instr		= { 0x3c, 0xc3 },
-diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
-index 40733a9..8011a6a 100644
---- a/arch/sh/mm/consistent.c
-+++ b/arch/sh/mm/consistent.c
-@@ -22,7 +22,7 @@
- 
- #define PREALLOC_DMA_DEBUG_ENTRIES	4096
- 
--struct dma_map_ops *dma_ops;
-+const struct dma_map_ops *dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- static int __init dma_init(void)
-diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
-index afeb710..d1d1289 100644
---- a/arch/sh/mm/mmap.c
-+++ b/arch/sh/mm/mmap.c
-@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+diff -urNp linux-3.0.3/arch/sh/mm/mmap.c linux-3.0.3/arch/sh/mm/mmap.c
+--- linux-3.0.3/arch/sh/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sh/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
  		vma = find_vma(mm, addr);
@@ -3879,7 +2775,7 @@ index afeb710..d1d1289 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct fi
  			addr = PAGE_ALIGN(addr);
  
  		vma = find_vma(mm, addr);
@@ -3889,7 +2785,7 @@ index afeb710..d1d1289 100644
  			return addr;
  	}
  
-@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -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 = find_vma(mm, addr-len);
@@ -3898,7 +2794,7 @@ index afeb710..d1d1289 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr-len);
  		}
-@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct fi
  	if (unlikely(mm->mmap_base < len))
  		goto bottomup;
  
@@ -3921,7 +2817,7 @@ index afeb710..d1d1289 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr);
  		}
-@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct fi
  		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -3934,23 +2830,9 @@ index afeb710..d1d1289 100644
  
  bottomup:
  	/*
-diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
-index 113225b..7fd04e7 100644
---- a/arch/sparc/Makefile
-+++ b/arch/sparc/Makefile
-@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc/oprofile/
- # Export what is needed by arch/sparc/boot/Makefile
- export VMLINUX_INIT VMLINUX_MAIN
- VMLINUX_INIT := $(head-y) $(init-y)
--VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
- VMLINUX_MAIN += $(drivers-y) $(net-y)
- 
-diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
-index bdb2ff8..c00c51b 100644
---- a/arch/sparc/include/asm/atomic_64.h
-+++ b/arch/sparc/include/asm/atomic_64.h
+diff -urNp linux-3.0.3/arch/sparc/include/asm/atomic_64.h linux-3.0.3/arch/sparc/include/asm/atomic_64.h
+--- linux-3.0.3/arch/sparc/include/asm/atomic_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/atomic_64.h	2011-08-23 21:48:14.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3992,7 +2874,7 @@ index bdb2ff8..c00c51b 100644
  extern int atomic_sub_ret(int, atomic_t *);
  extern long atomic64_sub_ret(long, atomic64_t *);
  
-@@ -33,12 +55,24 @@ extern long atomic64_sub_ret(long, atomic64_t *);
+@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
  
  #define atomic_inc_return(v) atomic_add_ret(1, v)
@@ -4015,17 +2897,25 @@ index bdb2ff8..c00c51b 100644
 +	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_unchecked_t *v)
++{
++	return atomic64_add_ret_unchecked(i, v);
++}
  
  /*
-@@ -50,6 +84,7 @@ extern long atomic64_sub_ret(long, atomic64_t *);
+  * 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) == 0)
-+#define atomic_inc_and_test_unchecked(v) (atomic_inc_return_unchecked(v) == 0)
++static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
++{
++	return atomic_inc_return_unchecked(v) == 0;
++}
  #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
  
  #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
-@@ -59,30 +94,59 @@ extern long atomic64_sub_ret(long, atomic64_t *);
+@@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomi
  #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
  
  #define atomic_inc(v) atomic_add(1, v)
@@ -4054,9 +2944,15 @@ index bdb2ff8..c00c51b 100644
  #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
  
  #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
-+#define atomic_cmpxchg_unchecked(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
++{
++	return cmpxchg(&v->counter, old, new);
++}
  #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
-+#define atomic_xchg_unchecked(v, new) (xchg(&((v)->counter), new))
++static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
++{
++	return xchg(&v->counter, new);
++}
  
  static inline int atomic_add_unless(atomic_t *v, int a, int u)
  {
@@ -4089,7 +2985,14 @@ index bdb2ff8..c00c51b 100644
  }
  
  #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
-@@ -93,17 +157,28 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
+@@ -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, long new)
++{
++	return xchg(&v->counter, new);
++}
  
  static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -4122,58 +3025,21 @@ index bdb2ff8..c00c51b 100644
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
-index 69358b5..317982b 100644
---- a/arch/sparc/include/asm/cache.h
-+++ b/arch/sparc/include/asm/cache.h
+diff -urNp linux-3.0.3/arch/sparc/include/asm/cache.h linux-3.0.3/arch/sparc/include/asm/cache.h
+--- linux-3.0.3/arch/sparc/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN	__alignof__(unsigned long long)
  
  #define L1_CACHE_SHIFT 5
 -#define L1_CACHE_BYTES 32
-+#define L1_CACHE_BYTES 32U
++#define L1_CACHE_BYTES 32UL
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
-index 8c0e4f7..4975d68 100644
---- a/arch/sparc/include/asm/dma-mapping.h
-+++ b/arch/sparc/include/asm/dma-mapping.h
-@@ -12,10 +12,10 @@ extern int dma_supported(struct device *dev, u64 mask);
- #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
- #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
- 
--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;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
- 	if (dev->bus == &pci_bus_type)
-@@ -29,7 +29,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
- static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- 				       dma_addr_t *dma_handle, gfp_t flag)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *cpu_addr;
- 
- 	cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
-@@ -40,7 +40,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *cpu_addr, dma_addr_t dma_handle)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
- 	ops->free_coherent(dev, size, cpu_addr, dma_handle);
-diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
-index 4269ca6..e3da77f 100644
---- a/arch/sparc/include/asm/elf_32.h
-+++ b/arch/sparc/include/asm/elf_32.h
+diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_32.h linux-3.0.3/arch/sparc/include/asm/elf_32.h
+--- linux-3.0.3/arch/sparc/include/asm/elf_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/elf_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -4188,11 +3054,10 @@ index 4269ca6..e3da77f 100644
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
-index e678803..dfb3071 100644
---- a/arch/sparc/include/asm/elf_64.h
-+++ b/arch/sparc/include/asm/elf_64.h
-@@ -162,6 +162,12 @@ typedef struct {
+diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_64.h linux-3.0.3/arch/sparc/include/asm/elf_64.h
+--- linux-3.0.3/arch/sparc/include/asm/elf_64.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/elf_64.h	2011-08-23 21:47:55.000000000 -0400
+@@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE		0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE	0x0000000070000000UL
  
@@ -4202,14 +3067,14 @@ index e678803..dfb3071 100644
 +#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
++
+ extern unsigned long sparc64_elf_hwcap;
+ #define ELF_HWCAP	sparc64_elf_hwcap
  
- /* This yields a mask that user programs can use to figure out what
-    instruction set this cpu supports.  */
-diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
-index 303bd4d..341e34e 100644
---- a/arch/sparc/include/asm/pgtable_32.h
-+++ b/arch/sparc/include/asm/pgtable_32.h
-@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
+diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtable_32.h linux-3.0.3/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.0.3/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
+@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
  BTFIXUPDEF_INT(page_readonly)
@@ -4223,7 +3088,7 @@ index 303bd4d..341e34e 100644
  BTFIXUPDEF_INT(page_kernel)
  
  #define PMD_SHIFT		SUN4C_PMD_SHIFT
-@@ -64,6 +71,16 @@ extern pgprot_t PAGE_SHARED;
+@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
  #define PAGE_COPY      __pgprot(BTFIXUP_INT(page_copy))
  #define PAGE_READONLY  __pgprot(BTFIXUP_INT(page_readonly))
  
@@ -4240,10 +3105,9 @@ index 303bd4d..341e34e 100644
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
-index 1407c07..7e10231 100644
---- a/arch/sparc/include/asm/pgtsrmmu.h
-+++ b/arch/sparc/include/asm/pgtsrmmu.h
+diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h	2011-08-23 21:47:55.000000000 -0400
 @@ -115,6 +115,13 @@
  				    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -4258,11 +3122,10 @@ index 1407c07..7e10231 100644
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
-index 073936a..8f11ced 100644
---- a/arch/sparc/include/asm/spinlock_64.h
-+++ b/arch/sparc/include/asm/spinlock_64.h
-@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
+diff -urNp linux-3.0.3/arch/sparc/include/asm/spinlock_64.h linux-3.0.3/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.0.3/arch/sparc/include/asm/spinlock_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/spinlock_64.h	2011-08-23 21:47:55.000000000 -0400
+@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
  
@@ -4284,7 +3147,7 @@ index 073936a..8f11ced 100644
  "	cas		[%2], %0, %1\n"
  "	cmp		%0, %1\n"
  "	bne,pn		%%icc, 1b\n"
-@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
+@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_r
  "	.previous"
  	: "=&r" (tmp1), "=&r" (tmp2)
  	: "r" (lock)
@@ -4297,7 +3160,7 @@ index 073936a..8f11ced 100644
  {
  	int tmp1, tmp2;
  
-@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
+@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch
  "1:	ldsw		[%2], %0\n"
  "	brlz,a,pn	%0, 2f\n"
  "	 mov		0, %0\n"
@@ -4311,7 +3174,7 @@ index 073936a..8f11ced 100644
  "	cas		[%2], %0, %1\n"
  "	cmp		%0, %1\n"
  "	bne,pn		%%icc, 1b\n"
-@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
+@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch
  	return tmp1;
  }
  
@@ -4332,7 +3195,7 @@ index 073936a..8f11ced 100644
  "	cas	[%2], %0, %1\n"
  "	cmp	%0, %1\n"
  "	bne,pn	%%xcc, 1b\n"
-@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
+@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch
  	: "memory");
  }
  
@@ -4341,7 +3204,7 @@ index 073936a..8f11ced 100644
  {
  	unsigned long mask, tmp1, tmp2;
  
-@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
+@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_
  	: "memory");
  }
  
@@ -4350,7 +3213,7 @@ index 073936a..8f11ced 100644
  {
  	__asm__ __volatile__(
  "	stw		%%g0, [%0]"
-@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
+@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arc
  	: "memory");
  }
  
@@ -4359,29 +3222,34 @@ index 073936a..8f11ced 100644
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
-index e88fbe5..96b0ce5 100644
---- a/arch/sparc/include/asm/uaccess.h
-+++ b/arch/sparc/include/asm/uaccess.h
-@@ -1,5 +1,13 @@
- #ifndef ___ASM_SPARC_UACCESS_H
- #define ___ASM_SPARC_UACCESS_H
+diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_32.h linux-3.0.3/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.0.3/arch/sparc/include/asm/thread_info_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/thread_info_32.h	2011-08-23 21:47:55.000000000 -0400
+@@ -50,6 +50,8 @@ struct thread_info {
+ 	unsigned long		w_saved;
+ 
+ 	struct restart_block	restart_block;
 +
-+#ifdef __KERNEL__
-+#ifndef __ASSEMBLY__
-+#include <linux/types.h>
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+#endif
-+#endif
++	unsigned long		lowest_stack;
+ };
+ 
+ /*
+diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_64.h linux-3.0.3/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.0.3/arch/sparc/include/asm/thread_info_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/thread_info_64.h	2011-08-23 21:47:55.000000000 -0400
+@@ -63,6 +63,8 @@ struct thread_info {
+ 	struct pt_regs		*kern_una_regs;
+ 	unsigned int		kern_una_insn;
+ 
++	unsigned long		lowest_stack;
 +
- #if defined(__sparc__) && defined(__arch64__)
- #include <asm/uaccess_64.h>
- #else
-diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
-index 8303ac4..07f333d 100644
---- a/arch/sparc/include/asm/uaccess_32.h
-+++ b/arch/sparc/include/asm/uaccess_32.h
-@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
+ 	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
+ };
+ 
+diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_32.h linux-3.0.3/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.0.3/arch/sparc/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/uaccess_32.h	2011-08-23 21:47:55.000000000 -0400
+@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -4432,10 +3300,9 @@ index 8303ac4..07f333d 100644
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index 3e1449f..5293a0e 100644
---- a/arch/sparc/include/asm/uaccess_64.h
-+++ b/arch/sparc/include/asm/uaccess_64.h
+diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_64.h linux-3.0.3/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.0.3/arch/sparc/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/uaccess_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -4444,7 +3311,7 @@ index 3e1449f..5293a0e 100644
  #include <asm/asi.h>
  #include <asm/system.h>
  #include <asm/spitfire.h>
-@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
+@@ -213,8 +214,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)
  {
@@ -4461,7 +3328,7 @@ index 3e1449f..5293a0e 100644
  	if (unlikely(ret))
  		ret = copy_from_user_fixup(to, from, size);
  
-@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
+@@ -230,8 +238,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)
  {
@@ -4478,10 +3345,26 @@ index 3e1449f..5293a0e 100644
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
-index 599398f..76db0f4 100644
---- a/arch/sparc/kernel/Makefile
-+++ b/arch/sparc/kernel/Makefile
+diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess.h linux-3.0.3/arch/sparc/include/asm/uaccess.h
+--- linux-3.0.3/arch/sparc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+@@ -1,5 +1,13 @@
+ #ifndef ___ASM_SPARC_UACCESS_H
+ #define ___ASM_SPARC_UACCESS_H
++
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
++#include <linux/types.h>
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++#endif
++#endif
++
+ #if defined(__sparc__) && defined(__arch64__)
+ #include <asm/uaccess_64.h>
+ #else
+diff -urNp linux-3.0.3/arch/sparc/kernel/Makefile linux-3.0.3/arch/sparc/kernel/Makefile
+--- linux-3.0.3/arch/sparc/kernel/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -4491,103 +3374,10 @@ index 599398f..76db0f4 100644
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
-index 6f01e8c..13414a2 100644
---- a/arch/sparc/kernel/iommu.c
-+++ b/arch/sparc/kernel/iommu.c
-@@ -824,7 +824,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
- 	spin_unlock_irqrestore(&iommu->lock, flags);
- }
- 
--static struct dma_map_ops sun4u_dma_ops = {
-+static const struct dma_map_ops sun4u_dma_ops = {
- 	.alloc_coherent		= dma_4u_alloc_coherent,
- 	.free_coherent		= dma_4u_free_coherent,
- 	.map_page		= dma_4u_map_page,
-@@ -835,7 +835,7 @@ static struct dma_map_ops sun4u_dma_ops = {
- 	.sync_sg_for_cpu	= dma_4u_sync_sg_for_cpu,
- };
- 
--struct dma_map_ops *dma_ops = &sun4u_dma_ops;
-+const struct dma_map_ops *dma_ops = &sun4u_dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
-diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
-index 41f7e4e..95e7de3 100644
---- a/arch/sparc/kernel/ioport.c
-+++ b/arch/sparc/kernel/ioport.c
-@@ -397,7 +397,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
- 	BUG();
- }
- 
--struct dma_map_ops sbus_dma_ops = {
-+const struct dma_map_ops sbus_dma_ops = {
- 	.alloc_coherent		= sbus_alloc_coherent,
- 	.free_coherent		= sbus_free_coherent,
- 	.map_page		= sbus_map_page,
-@@ -408,7 +408,7 @@ struct dma_map_ops sbus_dma_ops = {
- 	.sync_sg_for_device	= sbus_sync_sg_for_device,
- };
- 
--struct dma_map_ops *dma_ops = &sbus_dma_ops;
-+const struct dma_map_ops *dma_ops = &sbus_dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- static int __init sparc_register_ioport(void)
-@@ -645,7 +645,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
- 	}
- }
- 
--struct dma_map_ops pci32_dma_ops = {
-+const struct dma_map_ops pci32_dma_ops = {
- 	.alloc_coherent		= pci32_alloc_coherent,
- 	.free_coherent		= pci32_free_coherent,
- 	.map_page		= pci32_map_page,
-diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
-index 539243b..d61227d 100644
---- a/arch/sparc/kernel/kgdb_32.c
-+++ b/arch/sparc/kernel/kgdb_32.c
-@@ -164,7 +164,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
- 	regs->npc = regs->pc + 4;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: ta 0x7d */
- 	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x7d },
- };
-diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
-index 768290a..d8a4286 100644
---- a/arch/sparc/kernel/kgdb_64.c
-+++ b/arch/sparc/kernel/kgdb_64.c
-@@ -187,7 +187,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
- 	regs->tnpc = regs->tpc + 4;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: ta 0x72 */
- 	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
- };
-diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
-index 859abfd..603dfe0 100644
---- a/arch/sparc/kernel/pci_sun4v.c
-+++ b/arch/sparc/kernel/pci_sun4v.c
-@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
- 	spin_unlock_irqrestore(&iommu->lock, flags);
- }
- 
--static struct dma_map_ops sun4v_dma_ops = {
-+static const struct dma_map_ops sun4v_dma_ops = {
- 	.alloc_coherent			= dma_4v_alloc_coherent,
- 	.free_coherent			= dma_4v_free_coherent,
- 	.map_page			= dma_4v_map_page,
-diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
-index 1752929..f4000bc 100644
---- a/arch/sparc/kernel/process_32.c
-+++ b/arch/sparc/kernel/process_32.c
-@@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
+diff -urNp linux-3.0.3/arch/sparc/kernel/process_32.c linux-3.0.3/arch/sparc/kernel/process_32.c
+--- linux-3.0.3/arch/sparc/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/process_32.c	2011-08-23 21:48:14.000000000 -0400
+@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
  		       rw->ins[4], rw->ins[5],
  		       rw->ins[6],
  		       rw->ins[7]);
@@ -4596,7 +3386,7 @@ index 1752929..f4000bc 100644
  		rw = (struct reg_window32 *) rw->ins[6];
  	}
  	spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
-@@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r)
+@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
  
          printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx    %s\n",
  	       r->psr, r->pc, r->npc, r->y, print_tainted());
@@ -4613,7 +3403,7 @@ index 1752929..f4000bc 100644
  
  	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, unsigned long *_ksp)
+@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk,
  		rw = (struct reg_window32 *) fp;
  		pc = rw->ins[7];
  		printk("[%08lx : ", pc);
@@ -4622,11 +3412,10 @@ index 1752929..f4000bc 100644
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
-index c158a95..f041966 100644
---- a/arch/sparc/kernel/process_64.c
-+++ b/arch/sparc/kernel/process_64.c
-@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
+diff -urNp linux-3.0.3/arch/sparc/kernel/process_64.c linux-3.0.3/arch/sparc/kernel/process_64.c
+--- linux-3.0.3/arch/sparc/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/process_64.c	2011-08-23 21:48:14.000000000 -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)
@@ -4652,7 +3441,7 @@ index c158a95..f041966 100644
  	show_regwindow(regs);
  	show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
  }
-@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
+@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void
  		       ((tp && tp->task) ? tp->task->pid : -1));
  
  		if (gp->tstate & TSTATE_PRIV) {
@@ -4661,11 +3450,10 @@ index c158a95..f041966 100644
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
-index 42b282f..28ce9f2 100644
---- a/arch/sparc/kernel/sys_sparc_32.c
-+++ b/arch/sparc/kernel/sys_sparc_32.c
-@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
  	if (ARCH_SUN4C && len > 0x20000000)
  		return -ENOMEM;
  	if (!addr)
@@ -4674,7 +3462,7 @@ index 42b282f..28ce9f2 100644
  
  	if (flags & MAP_SHARED)
  		addr = COLOUR_ALIGN(addr);
-@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(str
  		}
  		if (TASK_SIZE - PAGE_SIZE - len < addr)
  			return -ENOMEM;
@@ -4683,11 +3471,10 @@ index 42b282f..28ce9f2 100644
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
-index f836f4e..42d165e 100644
---- a/arch/sparc/kernel/sys_sparc_64.c
-+++ b/arch/sparc/kernel/sys_sparc_64.c
-@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
  		 */
@@ -4696,7 +3483,7 @@ index f836f4e..42d165e 100644
  		    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
  			return -EINVAL;
  		return addr;
-@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(str
  	if (filp || (flags & MAP_SHARED))
  		do_color_align = 1;
  
@@ -4707,7 +3494,7 @@ index f836f4e..42d165e 100644
  	if (addr) {
  		if (do_color_align)
  			addr = COLOUR_ALIGN(addr, pgoff);
-@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
+@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(str
  			addr = PAGE_ALIGN(addr);
  
  		vma = find_vma(mm, addr);
@@ -4744,7 +3531,7 @@ index f836f4e..42d165e 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct fi
  		/* We do not accept a shared mapping if it would violate
  		 * cache aliasing constraints.
  		 */
@@ -4753,7 +3540,7 @@ index f836f4e..42d165e 100644
  		    ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
  			return -EINVAL;
  		return addr;
-@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct fi
  			addr = PAGE_ALIGN(addr);
  
  		vma = find_vma(mm, addr);
@@ -4763,7 +3550,7 @@ index f836f4e..42d165e 100644
  			return addr;
  	}
  
-@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct fi
  	/* make sure it can fit in the remaining address space */
  	if (likely(addr > len)) {
  		vma = find_vma(mm, addr-len);
@@ -4772,7 +3559,7 @@ index f836f4e..42d165e 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr-len);
  		}
-@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct fi
  	if (unlikely(mm->mmap_base < len))
  		goto bottomup;
  
@@ -4795,7 +3582,7 @@ index f836f4e..42d165e 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr);
  		}
-@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct fi
   		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -4808,7 +3595,7 @@ index f836f4e..42d165e 100644
  
  bottomup:
  	/*
-@@ -385,6 +385,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_str
  	    gap == RLIM_INFINITY ||
  	    sysctl_legacy_va_layout) {
  		mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
@@ -4821,7 +3608,7 @@ index f836f4e..42d165e 100644
  		mm->get_unmapped_area = arch_get_unmapped_area;
  		mm->unmap_area = arch_unmap_area;
  	} else {
-@@ -397,6 +403,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
+@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_str
  			gap = (task_size / 6 * 5);
  
  		mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
@@ -4834,11 +3621,19 @@ index f836f4e..42d165e 100644
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
-index c0490c7..176085e 100644
---- a/arch/sparc/kernel/traps_32.c
-+++ b/arch/sparc/kernel/traps_32.c
-@@ -76,7 +76,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+diff -urNp linux-3.0.3/arch/sparc/kernel/traps_32.c linux-3.0.3/arch/sparc/kernel/traps_32.c
+--- linux-3.0.3/arch/sparc/kernel/traps_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/traps_32.c	2011-08-23 21:48:14.000000000 -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")
+ 
++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) >= PAGE_OFFSET)	&&
  		      !(((unsigned long) rw) & 0x7)) {
@@ -4847,11 +3642,21 @@ index c0490c7..176085e 100644
  			       (void *) rw->ins[7]);
  			rw = (struct reg_window32 *)rw->ins[6];
  		}
-diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
-index 1ed547b..7681cd5 100644
---- a/arch/sparc/kernel/traps_64.c
-+++ b/arch/sparc/kernel/traps_64.c
-@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
+ 	}
+ 	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);
+ }
+ 
+diff -urNp linux-3.0.3/arch/sparc/kernel/traps_64.c linux-3.0.3/arch/sparc/kernel/traps_64.c
+--- linux-3.0.3/arch/sparc/kernel/traps_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/traps_64.c	2011-08-23 21:48:14.000000000 -0400
+@@ -75,7 +75,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);
@@ -4860,7 +3665,7 @@ index 1ed547b..7681cd5 100644
  	}
  }
  
-@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long
  
  	lvl -= 0x100;
  	if (regs->tstate & TSTATE_PRIV) {
@@ -4873,7 +3678,7 @@ index 1ed547b..7681cd5 100644
  		sprintf(buffer, "Kernel bad sw trap %lx", lvl);
  		die_if_kernel(buffer, regs);
  	}
-@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
+@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long
  void bad_trap_tl1(struct pt_regs *regs, long lvl)
  {
  	char buffer[32];
@@ -4891,7 +3696,7 @@ index 1ed547b..7681cd5 100644
  	dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
  
  	sprintf (buffer, "Bad trap %lx at tl>0", lvl);
-@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
+@@ -1141,7 +1152,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());
@@ -4900,7 +3705,7 @@ index 1ed547b..7681cd5 100644
  	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,
-@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type,
  		       smp_processor_id(),
  		       (type & 0x1) ? 'I' : 'D',
  		       regs->tpc);
@@ -4909,7 +3714,7 @@ index 1ed547b..7681cd5 100644
  		panic("Irrecoverable Cheetah+ parity error.");
  	}
  
-@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
+@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type,
  	       smp_processor_id(),
  	       (type & 0x1) ? 'I' : 'D',
  	       regs->tpc);
@@ -4918,7 +3723,7 @@ index 1ed547b..7681cd5 100644
  }
  
  struct sun4v_error_entry {
-@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
+@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_r
  
  	printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
  	       regs->tpc, tl);
@@ -4930,7 +3735,7 @@ index 1ed547b..7681cd5 100644
  	       (void *) regs->u_regs[UREG_I7]);
  	printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
  	       "pte[%lx] error[%lx]\n",
-@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
+@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_r
  
  	printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
  	       regs->tpc, tl);
@@ -4942,7 +3747,7 @@ index 1ed547b..7681cd5 100644
  	       (void *) regs->u_regs[UREG_I7]);
  	printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
  	       "pte[%lx] error[%lx]\n",
-@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
+@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk,
  			fp = (unsigned long)sf->fp + STACK_BIAS;
  		}
  
@@ -4958,7 +3763,16 @@ index 1ed547b..7681cd5 100644
  				graph++;
  			}
  		}
-@@ -2254,7 +2265,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
+@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_
+ 	return (struct reg_window *) (fp + STACK_BIAS);
+ }
+ 
++extern void gr_handle_kernel_exploit(void);
++
+ void die_if_kernel(char *str, struct pt_regs *regs)
+ {
+ 	static int die_counter;
+@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_
  		while (rw &&
  		       count++ < 30 &&
  		       kstack_valid(tp, (unsigned long) rw)) {
@@ -4967,11 +3781,22 @@ index 1ed547b..7681cd5 100644
  			       (void *) rw->ins[7]);
  
  			rw = kernel_stack_up(rw);
-diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
-index c752c4c..0a6b0c7 100644
---- a/arch/sparc/kernel/unaligned_64.c
-+++ b/arch/sparc/kernel/unaligned_64.c
-@@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs *regs)
+@@ -2267,8 +2280,10 @@ 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();
+ 		do_exit(SIGKILL);
++	}
+ 	do_exit(SIGSEGV);
+ }
+ EXPORT_SYMBOL(die_if_kernel);
+diff -urNp linux-3.0.3/arch/sparc/kernel/unaligned_64.c linux-3.0.3/arch/sparc/kernel/unaligned_64.c
+--- linux-3.0.3/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:48:14.000000000 -0400
+@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
  	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
  	if (__ratelimit(&ratelimit)) {
@@ -4980,23 +3805,9 @@ index c752c4c..0a6b0c7 100644
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
-index 846d1c4..613b871 100644
---- a/arch/sparc/lib/Makefile
-+++ b/arch/sparc/lib/Makefile
-@@ -2,7 +2,7 @@
- #
- 
- asflags-y := -ansi -DST_DIV0=0x02
--ccflags-y := -Werror
-+#ccflags-y := -Werror
- 
- lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
- lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
-index 59186e0..f747d7a 100644
---- a/arch/sparc/lib/atomic_64.S
-+++ b/arch/sparc/lib/atomic_64.S
+diff -urNp linux-3.0.3/arch/sparc/lib/atomic_64.S linux-3.0.3/arch/sparc/lib/atomic_64.S
+--- linux-3.0.3/arch/sparc/lib/atomic_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/lib/atomic_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
@@ -5011,7 +3822,7 @@ index 59186e0..f747d7a 100644
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, BACKOFF_LABEL(2f, 1b)
-@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
+@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = at
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic_add, .-atomic_add
  
@@ -5045,7 +3856,7 @@ index 59186e0..f747d7a 100644
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, BACKOFF_LABEL(2f, 1b)
-@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
+@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = at
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic_sub, .-atomic_sub
  
@@ -5079,7 +3890,7 @@ index 59186e0..f747d7a 100644
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, BACKOFF_LABEL(2f, 1b)
-@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
+@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic_add_ret, .-atomic_add_ret
  
@@ -5114,7 +3925,7 @@ index 59186e0..f747d7a 100644
  	cas	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%icc, BACKOFF_LABEL(2f, 1b)
-@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
+@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 
  atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
  	BACKOFF_SETUP(%o2)
  1:	ldx	[%o1], %g1
@@ -5128,7 +3939,7 @@ index 59186e0..f747d7a 100644
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
+@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = 
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic64_add, .-atomic64_add
  
@@ -5162,7 +3973,7 @@ index 59186e0..f747d7a 100644
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
+@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = 
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic64_sub, .-atomic64_sub
  
@@ -5196,7 +4007,7 @@ index 59186e0..f747d7a 100644
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
+@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o
  2:	BACKOFF_SPIN(%o2, %o3, 1b)
  	.size	atomic64_add_ret, .-atomic64_add_ret
  
@@ -5231,16 +4042,16 @@ index 59186e0..f747d7a 100644
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
-index 1b30bb3..ab5bb67 100644
---- a/arch/sparc/lib/ksyms.c
-+++ b/arch/sparc/lib/ksyms.c
-@@ -142,12 +142,17 @@ EXPORT_SYMBOL(__downgrade_write);
+diff -urNp linux-3.0.3/arch/sparc/lib/ksyms.c linux-3.0.3/arch/sparc/lib/ksyms.c
+--- linux-3.0.3/arch/sparc/lib/ksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/lib/ksyms.c	2011-08-23 21:48:14.000000000 -0400
+@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* 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);
@@ -5253,23 +4064,33 @@ index 1b30bb3..ab5bb67 100644
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
-index 79836a7..62f47a2 100644
---- a/arch/sparc/mm/Makefile
-+++ b/arch/sparc/mm/Makefile
+diff -urNp linux-3.0.3/arch/sparc/lib/Makefile linux-3.0.3/arch/sparc/lib/Makefile
+--- linux-3.0.3/arch/sparc/lib/Makefile	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/sparc/lib/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
- asflags-y := -ansi
+ asflags-y := -ansi -DST_DIV0=0x02
 -ccflags-y := -Werror
 +#ccflags-y := -Werror
  
- obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
- obj-y                   += fault_$(BITS).o
-diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
-index b10ac4d..07c4cdc 100644
---- a/arch/sparc/mm/fault_32.c
-+++ b/arch/sparc/mm/fault_32.c
+ lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
+ lib-$(CONFIG_SPARC32) += memcpy.o memset.o
+diff -urNp linux-3.0.3/arch/sparc/Makefile linux-3.0.3/arch/sparc/Makefile
+--- linux-3.0.3/arch/sparc/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/Makefile	2011-08-23 21:48:14.000000000 -0400
+@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
+ # Export what is needed by arch/sparc/boot/Makefile
+ export VMLINUX_INIT VMLINUX_MAIN
+ VMLINUX_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+ 
+diff -urNp linux-3.0.3/arch/sparc/mm/fault_32.c linux-3.0.3/arch/sparc/mm/fault_32.c
+--- linux-3.0.3/arch/sparc/mm/fault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/fault_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -5280,7 +4101,7 @@ index b10ac4d..07c4cdc 100644
  
  #include <asm/system.h>
  #include <asm/page.h>
-@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
+@@ -209,6 +212,268 @@ static unsigned long compute_si_addr(str
  	return safe_compute_effective_address(regs, insn);
  }
  
@@ -5574,10 +4395,9 @@ index b10ac4d..07c4cdc 100644
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
-index f92ce56..869924b 100644
---- a/arch/sparc/mm/fault_64.c
-+++ b/arch/sparc/mm/fault_64.c
+diff -urNp linux-3.0.3/arch/sparc/mm/fault_64.c linux-3.0.3/arch/sparc/mm/fault_64.c
+--- linux-3.0.3/arch/sparc/mm/fault_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/fault_64.c	2011-08-23 21:48:14.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -5588,7 +4408,7 @@ index f92ce56..869924b 100644
  
  #include <asm/page.h>
  #include <asm/pgtable.h>
-@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
+@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(stru
  	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]);
@@ -5597,7 +4417,7 @@ index f92ce56..869924b 100644
  	printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
  	dump_stack();
  	unhandled_fault(regs->tpc, current, regs);
-@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
+@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32b
  	show_regs(regs);
  }
  
@@ -6055,7 +4875,7 @@ index f92ce56..869924b 100644
  asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
  {
  	struct mm_struct *mm = current->mm;
-@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
+@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fau
  	if (!vma)
  		goto bad_area;
  
@@ -6085,10 +4905,9 @@ index f92ce56..869924b 100644
  	/* 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 --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
-index f4e9764..5682724 100644
---- a/arch/sparc/mm/hugetlbpage.c
-+++ b/arch/sparc/mm/hugetlbpage.c
+diff -urNp linux-3.0.3/arch/sparc/mm/hugetlbpage.c linux-3.0.3/arch/sparc/mm/hugetlbpage.c
+--- linux-3.0.3/arch/sparc/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -6098,7 +4917,7 @@ index f4e9764..5682724 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-@@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -107,7 +107,7 @@ hugetlb_get_unmapped_area_topdown(struct
  	/* make sure it can fit in the remaining address space */
  	if (likely(addr > len)) {
  		vma = find_vma(mm, addr-len);
@@ -6107,7 +4926,7 @@ index f4e9764..5682724 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr-len);
  		}
-@@ -116,16 +116,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -116,16 +116,17 @@ hugetlb_get_unmapped_area_topdown(struct
  	if (unlikely(mm->mmap_base < len))
  		goto bottomup;
  
@@ -6127,7 +4946,7 @@ index f4e9764..5682724 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr);
  		}
-@@ -135,8 +136,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -135,8 +136,8 @@ hugetlb_get_unmapped_area_topdown(struct
   		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -6138,7 +4957,7 @@ index f4e9764..5682724 100644
  
  bottomup:
  	/*
-@@ -182,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -182,8 +183,7 @@ hugetlb_get_unmapped_area(struct file *f
  	if (addr) {
  		addr = ALIGN(addr, HPAGE_SIZE);
  		vma = find_vma(mm, addr);
@@ -6148,11 +4967,10 @@ index f4e9764..5682724 100644
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
-index 6d0e02c..c0b5fa7 100644
---- a/arch/sparc/mm/init_32.c
-+++ b/arch/sparc/mm/init_32.c
-@@ -318,6 +318,9 @@ extern void device_scan(void);
+diff -urNp linux-3.0.3/arch/sparc/mm/init_32.c linux-3.0.3/arch/sparc/mm/init_32.c
+--- linux-3.0.3/arch/sparc/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -316,6 +316,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
  
@@ -6162,7 +4980,7 @@ index 6d0e02c..c0b5fa7 100644
  void __init paging_init(void)
  {
  	switch(sparc_cpu_model) {
-@@ -346,17 +349,17 @@ void __init paging_init(void)
+@@ -344,17 +347,17 @@ void __init paging_init(void)
  
  	/* Initialize the protection map with non-constant, MMU dependent values. */
  	protection_map[0] = PAGE_NONE;
@@ -6186,10 +5004,21 @@ index 6d0e02c..c0b5fa7 100644
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
-index 92319aa..7022f70 100644
---- a/arch/sparc/mm/srmmu.c
-+++ b/arch/sparc/mm/srmmu.c
+diff -urNp linux-3.0.3/arch/sparc/mm/Makefile linux-3.0.3/arch/sparc/mm/Makefile
+--- linux-3.0.3/arch/sparc/mm/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ 
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+ 
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-y                   += fault_$(BITS).o
+diff -urNp linux-3.0.3/arch/sparc/mm/srmmu.c linux-3.0.3/arch/sparc/mm/srmmu.c
+--- linux-3.0.3/arch/sparc/mm/srmmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/sparc/mm/srmmu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
  	PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
  	BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -6204,10 +5033,9 @@ index 92319aa..7022f70 100644
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
-index 6c03acd..a5e0215 100644
---- a/arch/um/include/asm/kmap_types.h
-+++ b/arch/um/include/asm/kmap_types.h
+diff -urNp linux-3.0.3/arch/um/include/asm/kmap_types.h linux-3.0.3/arch/um/include/asm/kmap_types.h
+--- linux-3.0.3/arch/um/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/um/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
  	KM_IRQ1,
  	KM_SOFTIRQ0,
@@ -6216,10 +5044,9 @@ index 6c03acd..a5e0215 100644
  	KM_TYPE_NR
  };
  
-diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
-index 4cc9b6c..02e5029 100644
---- a/arch/um/include/asm/page.h
-+++ b/arch/um/include/asm/page.h
+diff -urNp linux-3.0.3/arch/um/include/asm/page.h linux-3.0.3/arch/um/include/asm/page.h
+--- linux-3.0.3/arch/um/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/um/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK	(~(PAGE_SIZE-1))
@@ -6230,10 +5057,9 @@ index 4cc9b6c..02e5029 100644
  #ifndef __ASSEMBLY__
  
  struct page;
-diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
-index fab4371..dfaf1a5 100644
---- a/arch/um/kernel/process.c
-+++ b/arch/um/kernel/process.c
+diff -urNp linux-3.0.3/arch/um/kernel/process.c linux-3.0.3/arch/um/kernel/process.c
+--- linux-3.0.3/arch/um/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/um/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -6257,10 +5083,9 @@ index fab4371..dfaf1a5 100644
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
-index 70ca357..728d1cc 100644
---- a/arch/um/sys-i386/syscalls.c
-+++ b/arch/um/sys-i386/syscalls.c
+diff -urNp linux-3.0.3/arch/um/sys-i386/syscalls.c linux-3.0.3/arch/um/sys-i386/syscalls.c
+--- linux-3.0.3/arch/um/sys-i386/syscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/um/sys-i386/syscalls.c	2011-08-23 21:47:55.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -6283,166 +5108,10 @@ index 70ca357..728d1cc 100644
  /*
   * The prototype on i386 is:
   *
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index d5ed94d..9779d57 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -223,7 +223,7 @@ config X86_TRAMPOLINE
- 
- config X86_32_LAZY_GS
- 	def_bool y
--	depends on X86_32 && !CC_STACKPROTECTOR
-+	depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
- 
- config ARCH_HWEIGHT_CFLAGS
- 	string
-@@ -1019,7 +1019,7 @@ choice
- 
- config NOHIGHMEM
- 	bool "off"
--	depends on !X86_NUMAQ
-+	depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
- 	---help---
- 	  Linux can use up to 64 Gigabytes of physical memory on x86 systems.
- 	  However, the address space of 32-bit x86 processors is only 4
-@@ -1056,7 +1056,7 @@ config NOHIGHMEM
- 
- config HIGHMEM4G
- 	bool "4GB"
--	depends on !X86_NUMAQ
-+	depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
- 	---help---
- 	  Select this if you have a 32-bit processor and between 1 and 4
- 	  gigabytes of physical RAM.
-@@ -1110,7 +1110,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
-@@ -1454,7 +1454,7 @@ config ARCH_USES_PG_UNCACHED
- 
- config EFI
- 	bool "EFI runtime service support"
--	depends on ACPI
-+	depends on ACPI && !PAX_KERNEXEC
- 	---help---
- 	  This enables the kernel to use EFI runtime services that are
- 	  available (such as the EFI variable services).
-@@ -1484,6 +1484,7 @@ config SECCOMP
- 
- 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
-@@ -1541,6 +1542,7 @@ config KEXEC_JUMP
- config PHYSICAL_START
- 	hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
- 	default "0x1000000"
-+	range 0x400000 0x40000000
- 	---help---
- 	  This gives the physical address where the kernel is loaded.
- 
-@@ -1604,6 +1606,7 @@ config X86_NEED_RELOCS
- config PHYSICAL_ALIGN
- 	hex "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
-@@ -1635,9 +1638,10 @@ config HOTPLUG_CPU
- 	  Say N if you want to disable CPU hotplug.
- 
- config COMPAT_VDSO
--	def_bool y
-+	def_bool n
- 	prompt "Compat VDSO support"
- 	depends on X86_32 || IA32_EMULATION
-+	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- 	---help---
- 	  Map the 32-bit VDSO to the predictable old-style address too.
- 
-diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
-index 283c5a6..8fc0772 100644
---- a/arch/x86/Kconfig.cpu
-+++ b/arch/x86/Kconfig.cpu
-@@ -339,7 +339,7 @@ config X86_PPRO_FENCE
- 
- config X86_F00F_BUG
- 	def_bool y
--	depends on M586MMX || M586TSC || M586 || M486 || M386
-+	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
- 
- config X86_INVD_BUG
- 	def_bool y
-@@ -363,7 +363,7 @@ config X86_POPAD_OK
- 
- config X86_ALIGNMENT_16
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
-@@ -409,7 +409,7 @@ config X86_CMPXCHG64
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
-+	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
-diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
-index 615e188..0d1fa9d 100644
---- a/arch/x86/Kconfig.debug
-+++ b/arch/x86/Kconfig.debug
-@@ -101,7 +101,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
-@@ -119,7 +119,7 @@ config DEBUG_RODATA_TEST
- 
- config DEBUG_SET_MODULE_RONX
- 	bool "Set loadable kernel module data as NX and text as RO"
--	depends on MODULES
-+	depends on MODULES && BROKEN
- 	---help---
- 	  This option helps catch unintended modifications to loadable
- 	  kernel module's text and read-only data. It also prevents execution
-diff --git a/arch/x86/Makefile b/arch/x86/Makefile
-index b02e509..25a1f43 100644
---- a/arch/x86/Makefile
-+++ b/arch/x86/Makefile
-@@ -195,3 +195,12 @@ define archhelp
-   echo  '                  FDARGS="..."  arguments for the booted kernel'
-   echo  '                  FDINITRD=file initrd for the booted kernel'
- endef
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
-index 878e4b9..20537ab 100644
---- a/arch/x86/boot/bitops.h
-+++ b/arch/x86/boot/bitops.h
-@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
+diff -urNp linux-3.0.3/arch/x86/boot/bitops.h linux-3.0.3/arch/x86/boot/bitops.h
+--- linux-3.0.3/arch/x86/boot/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/bitops.h	2011-08-23 21:47:55.000000000 -0400
+@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
  	u8 v;
  	const u32 *p = (const u32 *)addr;
  
@@ -6451,7 +5120,7 @@ index 878e4b9..20537ab 100644
  	return v;
  }
  
-@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
+@@ -37,7 +37,7 @@ static inline int variable_test_bit(int 
  
  static inline void set_bit(int nr, void *addr)
  {
@@ -6460,10 +5129,9 @@ index 878e4b9..20537ab 100644
  }
  
  #endif /* BOOT_BITOPS_H */
-diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
-index c7093bd..d4247ffe0 100644
---- a/arch/x86/boot/boot.h
-+++ b/arch/x86/boot/boot.h
+diff -urNp linux-3.0.3/arch/x86/boot/boot.h linux-3.0.3/arch/x86/boot/boot.h
+--- linux-3.0.3/arch/x86/boot/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/boot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -6473,7 +5141,7 @@ index c7093bd..d4247ffe0 100644
  	return seg;
  }
  
-@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
+@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t 
  static inline int memcmp(const void *s1, const void *s2, size_t len)
  {
  	u8 diff;
@@ -6482,10 +5150,9 @@ index c7093bd..d4247ffe0 100644
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
-index 67a655a..b924059 100644
---- a/arch/x86/boot/compressed/head_32.S
-+++ b/arch/x86/boot/compressed/head_32.S
+diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_32.S linux-3.0.3/arch/x86/boot/compressed/head_32.S
+--- linux-3.0.3/arch/x86/boot/compressed/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/compressed/head_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl    %eax, %ebx
@@ -6514,10 +5181,9 @@ index 67a655a..b924059 100644
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
-index 35af09d..99c9676 100644
---- a/arch/x86/boot/compressed/head_64.S
-+++ b/arch/x86/boot/compressed/head_64.S
+diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_64.S linux-3.0.3/arch/x86/boot/compressed/head_64.S
+--- linux-3.0.3/arch/x86/boot/compressed/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/compressed/head_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
  	notl	%eax
  	andl	%eax, %ebx
@@ -6536,10 +5202,22 @@ index 35af09d..99c9676 100644
  #endif
  
  	/* Target address to relocate to for decompression */
-diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
-index 3a19d04..7c1d55a 100644
---- a/arch/x86/boot/compressed/misc.c
-+++ b/arch/x86/boot/compressed/misc.c
+diff -urNp linux-3.0.3/arch/x86/boot/compressed/Makefile linux-3.0.3/arch/x86/boot/compressed/Makefile
+--- linux-3.0.3/arch/x86/boot/compressed/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/compressed/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
+ KBUILD_CFLAGS += $(cflags-y)
+ KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
+ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ 
+ KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+diff -urNp linux-3.0.3/arch/x86/boot/compressed/misc.c linux-3.0.3/arch/x86/boot/compressed/misc.c
+--- linux-3.0.3/arch/x86/boot/compressed/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/compressed/misc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
  		case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -6549,7 +5227,7 @@ index 3a19d04..7c1d55a 100644
  #else
  			dest = (void *)(phdr->p_paddr);
  #endif
-@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
+@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *
  		error("Destination address too large");
  #endif
  #ifndef CONFIG_RELOCATABLE
@@ -6558,10 +5236,9 @@ index 3a19d04..7c1d55a 100644
  		error("Wrong destination address");
  #endif
  
-diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
-index 89bbf4e..869908e 100644
---- a/arch/x86/boot/compressed/relocs.c
-+++ b/arch/x86/boot/compressed/relocs.c
+diff -urNp linux-3.0.3/arch/x86/boot/compressed/relocs.c linux-3.0.3/arch/x86/boot/compressed/relocs.c
+--- linux-3.0.3/arch/x86/boot/compressed/relocs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/compressed/relocs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -6714,7 +5391,7 @@ index 89bbf4e..869908e 100644
  		struct section *sec = &secs[i];
  
  		if (sec->shdr.sh_type != SHT_REL) {
-@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
+@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(El
  			    !is_rel_reloc(sym_name(sym_strtab, sym))) {
  				continue;
  			}
@@ -6737,7 +5414,7 @@ index 89bbf4e..869908e 100644
  			switch (r_type) {
  			case R_386_NONE:
  			case R_386_PC32:
-@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
+@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, co
  
  static void emit_relocs(int as_text)
  {
@@ -6754,10 +5431,9 @@ index 89bbf4e..869908e 100644
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
-index 4d3ff03..e4972ff 100644
---- a/arch/x86/boot/cpucheck.c
-+++ b/arch/x86/boot/cpucheck.c
+diff -urNp linux-3.0.3/arch/x86/boot/cpucheck.c linux-3.0.3/arch/x86/boot/cpucheck.c
+--- linux-3.0.3/arch/x86/boot/cpucheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/cpucheck.c	2011-08-23 21:47:55.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
  	u16 fcw = -1, fsw = -1;
  	u32 cr0;
@@ -6812,7 +5488,7 @@ index 4d3ff03..e4972ff 100644
  			    : "+a" (eax),
  			      "=c" (cpu.flags[6]),
  			      "=d" (cpu.flags[1])
-@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *r
  		u32 ecx = MSR_K7_HWCR;
  		u32 eax, edx;
  
@@ -6824,7 +5500,7 @@ index 4d3ff03..e4972ff 100644
  
  		get_flags();	/* Make sure it really did something */
  		err = check_flags();
-@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *r
  		u32 ecx = MSR_VIA_FCR;
  		u32 eax, edx;
  
@@ -6836,7 +5512,7 @@ index 4d3ff03..e4972ff 100644
  
  		set_bit(X86_FEATURE_CX8, cpu.flags);
  		err = check_flags();
-@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
+@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *r
  		u32 eax, edx;
  		u32 level = 1;
  
@@ -6853,11 +5529,10 @@ index 4d3ff03..e4972ff 100644
  
  		err = check_flags();
  	}
-diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
-index 93e689f..504ba09 100644
---- a/arch/x86/boot/header.S
-+++ b/arch/x86/boot/header.S
-@@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical pointer to
+diff -urNp linux-3.0.3/arch/x86/boot/header.S linux-3.0.3/arch/x86/boot/header.S
+--- linux-3.0.3/arch/x86/boot/header.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/header.S	2011-08-23 21:47:55.000000000 -0400
+@@ -224,7 +224,7 @@ setup_data:		.quad 0			# 64-bit physical
  						# single linked list of
  						# struct setup_data
  
@@ -6866,10 +5541,22 @@ index 93e689f..504ba09 100644
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
-index cae3feb..ff8ff2a 100644
---- a/arch/x86/boot/memory.c
-+++ b/arch/x86/boot/memory.c
+diff -urNp linux-3.0.3/arch/x86/boot/Makefile linux-3.0.3/arch/x86/boot/Makefile
+--- linux-3.0.3/arch/x86/boot/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -69,6 +69,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
+diff -urNp linux-3.0.3/arch/x86/boot/memory.c linux-3.0.3/arch/x86/boot/memory.c
+--- linux-3.0.3/arch/x86/boot/memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/memory.c	2011-08-23 21:47:55.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -6879,22 +5566,9 @@ index cae3feb..ff8ff2a 100644
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
-index 11e8c6e..fdbb1ed 100644
---- a/arch/x86/boot/video-vesa.c
-+++ b/arch/x86/boot/video-vesa.c
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
- 
- 	boot_params.screen_info.vesapm_seg = oreg.es;
- 	boot_params.screen_info.vesapm_off = oreg.di;
-+	boot_params.screen_info.vesapm_size = oreg.cx;
- }
- 
- /*
-diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
-index 43eda28..5ab5fdb 100644
---- a/arch/x86/boot/video.c
-+++ b/arch/x86/boot/video.c
+diff -urNp linux-3.0.3/arch/x86/boot/video.c linux-3.0.3/arch/x86/boot/video.c
+--- linux-3.0.3/arch/x86/boot/video.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/video.c	2011-08-23 21:47:55.000000000 -0400
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -6904,11 +5578,21 @@ index 43eda28..5ab5fdb 100644
  	int key;
  	unsigned int v;
  
-diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
-index 2d93bdb..16e4817 100644
---- a/arch/x86/ia32/ia32_aout.c
-+++ b/arch/x86/ia32/ia32_aout.c
-@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
+diff -urNp linux-3.0.3/arch/x86/boot/video-vesa.c linux-3.0.3/arch/x86/boot/video-vesa.c
+--- linux-3.0.3/arch/x86/boot/video-vesa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/boot/video-vesa.c	2011-08-23 21:47:55.000000000 -0400
+@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+ 
+ 	boot_params.screen_info.vesapm_seg = oreg.es;
+ 	boot_params.screen_info.vesapm_off = oreg.di;
++	boot_params.screen_info.vesapm_size = oreg.cx;
+ }
+ 
+ /*
+diff -urNp linux-3.0.3/arch/x86/ia32/ia32_aout.c linux-3.0.3/arch/x86/ia32/ia32_aout.c
+--- linux-3.0.3/arch/x86/ia32/ia32_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/ia32/ia32_aout.c	2011-08-23 21:48:14.000000000 -0400
+@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
  	unsigned long dump_start, dump_size;
  	struct user32 dump;
  
@@ -6917,63 +5601,9 @@ index 2d93bdb..16e4817 100644
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
-index 588a7aa..663dc7d 100644
---- a/arch/x86/ia32/ia32_signal.c
-+++ b/arch/x86/ia32/ia32_signal.c
-@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
- 	sp -= frame_size;
- 	/* Align the stack pointer according to the i386 ABI,
- 	 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
--	sp = ((sp + 4) & -16ul) - 4;
-+	sp = ((sp - 12) & -16ul) - 4;
- 	return (void __user *) sp;
- }
- 
-@@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
- 		 * 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);
- 
- 	if (err)
-@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- 		0xb8,
- 		__NR_ia32_rt_sigreturn,
- 		0x80cd,
--		0,
-+		0
- 	};
- 
- 	frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
-@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- 
- 		if (ka->sa.sa_flags & SA_RESTORER)
- 			restorer = ka->sa.sa_restorer;
-+		else if (current->mm->context.vdso)
-+			/* Return stub is in 32bit vsyscall page */
-+			restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
- 		else
--			restorer = VDSO32_SYMBOL(current->mm->context.vdso,
--						 rt_sigreturn);
-+			restorer = &frame->retcode;
- 		put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
- 
- 		/*
- 		 * 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);
- 
- 	if (err)
-diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
-index 518bb99..e0c51d5 100644
---- a/arch/x86/ia32/ia32entry.S
-+++ b/arch/x86/ia32/ia32entry.S
+diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32entry.S
+--- linux-3.0.3/arch/x86/ia32/ia32entry.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/ia32/ia32entry.S	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
@@ -6982,7 +5612,7 @@ index 518bb99..e0c51d5 100644
  #include <linux/linkage.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -93,6 +94,32 @@ ENTRY(native_irq_enable_sysexit)
+@@ -95,6 +96,32 @@ ENTRY(native_irq_enable_sysexit)
  ENDPROC(native_irq_enable_sysexit)
  #endif
  
@@ -7015,7 +5645,7 @@ index 518bb99..e0c51d5 100644
  /*
   * 32bit SYSENTER instruction entry.
   *
-@@ -119,7 +146,7 @@ ENTRY(ia32_sysenter_target)
+@@ -121,7 +148,7 @@ ENTRY(ia32_sysenter_target)
  	CFI_REGISTER	rsp,rbp
  	SWAPGS_UNSAFE_STACK
  	movq	PER_CPU_VAR(kernel_stack), %rsp
@@ -7024,17 +5654,17 @@ index 518bb99..e0c51d5 100644
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs, here we enable it straight after entry:
-@@ -135,7 +162,8 @@ ENTRY(ia32_sysenter_target)
- 	pushfq
- 	CFI_ADJUST_CFA_OFFSET 8
+@@ -134,7 +161,8 @@ ENTRY(ia32_sysenter_target)
+ 	CFI_REL_OFFSET rsp,0
+ 	pushfq_cfi
  	/*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 +178,12 @@ ENTRY(ia32_sysenter_target)
+ 	pushq_cfi $__USER32_CS
+ 	/*CFI_REL_OFFSET cs,0*/
+@@ -146,6 +174,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 */ 
@@ -7047,7 +5677,7 @@ index 518bb99..e0c51d5 100644
  1:	movl	(%rbp),%ebp
   	.section __ex_table,"a"
   	.quad 1b,ia32_badarg
-@@ -172,6 +206,7 @@ sysenter_dispatch:
+@@ -168,6 +202,7 @@ sysenter_dispatch:
  	testl	$_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz	sysexit_audit
  sysexit_from_sys_call:
@@ -7055,7 +5685,7 @@ index 518bb99..e0c51d5 100644
  	andl    $~TS_COMPAT,TI_status(%r10)
  	/* clear IF, that popfq doesn't enable interrupts early */
  	andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -200,6 +235,9 @@ sysexit_from_sys_call:
+@@ -194,6 +229,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
@@ -7065,7 +5695,7 @@ index 518bb99..e0c51d5 100644
  	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall number */
  	cmpq $(IA32_NR_syscalls-1),%rax
  	ja ia32_badsys
-@@ -252,6 +290,9 @@ sysenter_tracesys:
+@@ -246,6 +284,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
@@ -7075,7 +5705,7 @@ index 518bb99..e0c51d5 100644
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq	$(IA32_NR_syscalls-1),%rax
-@@ -283,19 +324,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -277,19 +318,24 @@ ENDPROC(ia32_sysenter_target)
  ENTRY(ia32_cstar_target)
  	CFI_STARTPROC32	simple
  	CFI_SIGNAL_FRAME
@@ -7102,7 +5732,7 @@ index 518bb99..e0c51d5 100644
  	movl 	%eax,%eax	/* zero extension */
  	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq	%rcx,RIP-ARGOFFSET(%rsp)
-@@ -311,6 +357,12 @@ ENTRY(ia32_cstar_target)
+@@ -305,6 +351,12 @@ ENTRY(ia32_cstar_target)
  	/* no need to do an access_ok check here because r8 has been
  	   32bit zero extended */ 
  	/* hardware stack frame is complete now */	
@@ -7115,7 +5745,7 @@ index 518bb99..e0c51d5 100644
  1:	movl	(%r8),%r9d
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
-@@ -333,6 +385,7 @@ cstar_dispatch:
+@@ -327,6 +379,7 @@ cstar_dispatch:
  	testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz sysretl_audit
  sysretl_from_sys_call:
@@ -7123,7 +5753,7 @@ index 518bb99..e0c51d5 100644
  	andl $~TS_COMPAT,TI_status(%r10)
  	RESTORE_ARGS 1,-ARG_SKIP,1,1,1
  	movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -370,6 +423,9 @@ cstar_tracesys:
+@@ -364,6 +417,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
@@ -7133,7 +5763,7 @@ index 518bb99..e0c51d5 100644
  	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	xchgl %ebp,%r9d
-@@ -415,6 +471,7 @@ ENTRY(ia32_syscall)
+@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
  	CFI_REL_OFFSET	rip,RIP-RIP
  	PARAVIRT_ADJUST_EXCEPTION_FRAME
  	SWAPGS
@@ -7141,7 +5771,7 @@ index 518bb99..e0c51d5 100644
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-@@ -448,6 +505,9 @@ ia32_tracesys:
+@@ -441,6 +498,9 @@ ia32_tracesys:			 
  	movq $-ENOSYS,RAX(%rsp)	/* ptrace can change this for a bad syscall */
  	movq %rsp,%rdi        /* &pt_regs -> arg1 */
  	call syscall_trace_enter
@@ -7151,11 +5781,62 @@ index 518bb99..e0c51d5 100644
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
-index 13009d1..0c84f92 100644
---- a/arch/x86/include/asm/alternative.h
-+++ b/arch/x86/include/asm/alternative.h
-@@ -94,7 +94,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
+diff -urNp linux-3.0.3/arch/x86/ia32/ia32_signal.c linux-3.0.3/arch/x86/ia32/ia32_signal.c
+--- linux-3.0.3/arch/x86/ia32/ia32_signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/ia32/ia32_signal.c	2011-08-23 21:47:55.000000000 -0400
+@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
+ 	sp -= frame_size;
+ 	/* Align the stack pointer according to the i386 ABI,
+ 	 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
+-	sp = ((sp + 4) & -16ul) - 4;
++	sp = ((sp - 12) & -16ul) - 4;
+ 	return (void __user *) sp;
+ }
+ 
+@@ -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);
+ 
+ 	if (err)
+@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 
+ 		0xb8,
+ 		__NR_ia32_rt_sigreturn,
+ 		0x80cd,
+-		0,
++		0
+ 	};
+ 
+ 	frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
+@@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct 
+ 
+ 		if (ka->sa.sa_flags & SA_RESTORER)
+ 			restorer = ka->sa.sa_restorer;
++		else if (current->mm->context.vdso)
++			/* Return stub is in 32bit vsyscall page */
++			restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
+ 		else
+-			restorer = VDSO32_SYMBOL(current->mm->context.vdso,
+-						 rt_sigreturn);
++			restorer = &frame->retcode;
+ 		put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
+ 
+ 		/*
+ 		 * 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);
+ 
+ 	if (err)
+diff -urNp linux-3.0.3/arch/x86/include/asm/alternative.h linux-3.0.3/arch/x86/include/asm/alternative.h
+--- linux-3.0.3/arch/x86/include/asm/alternative.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/alternative.h	2011-08-23 21:47:55.000000000 -0400
+@@ -93,7 +93,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"				\
        "	 .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */	\
        ".previous\n"							\
@@ -7164,11 +5845,22 @@ index 13009d1..0c84f92 100644
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
-index 20370c6..a2eb9b0 100644
---- a/arch/x86/include/asm/apm.h
-+++ b/arch/x86/include/asm/apm.h
-@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
+diff -urNp linux-3.0.3/arch/x86/include/asm/apic.h linux-3.0.3/arch/x86/include/asm/apic.h
+--- linux-3.0.3/arch/x86/include/asm/apic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/apic.h	2011-08-23 21:48:14.000000000 -0400
+@@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
+ 
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 
+-extern unsigned int apic_verbosity;
++extern int apic_verbosity;
+ extern int local_apic_timer_c2_ok;
+ 
+ extern int disable_apic;
+diff -urNp linux-3.0.3/arch/x86/include/asm/apm.h linux-3.0.3/arch/x86/include/asm/apm.h
+--- linux-3.0.3/arch/x86/include/asm/apm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/apm.h	2011-08-23 21:47:55.000000000 -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"
@@ -7177,7 +5869,7 @@ index 20370c6..a2eb9b0 100644
  		"setc %%al\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
+@@ -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"
@@ -7186,426 +5878,9 @@ index 20370c6..a2eb9b0 100644
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
-index 952a826..8a9371d 100644
---- a/arch/x86/include/asm/atomic.h
-+++ b/arch/x86/include/asm/atomic.h
-@@ -22,7 +22,18 @@
-  */
- static inline int atomic_read(const atomic_t *v)
- {
--	return (*(volatile int *)&(v)->counter);
-+	return (*(volatile const int *)&(v)->counter);
-+}
-+
-+/**
-+ * 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 (*(volatile const int *)&(v)->counter);
- }
- 
- /**
-@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
- }
- 
- /**
-+ * 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 = i;
-+}
-+
-+/**
-  * atomic_add - add integer to atomic variable
-  * @i: integer value to add
-  * @v: pointer of type atomic_t
-@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
-  */
- 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));
- }
-@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
-  */
- 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));
- }
-@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
- {
- 	unsigned char c;
- 
--	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), "=qm" (c)
- 		     : "ir" (i) : "memory");
- 	return c;
-@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
-  */
- 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));
- }
- 
-@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
-  */
- 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));
- }
- 
-@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
- {
- 	unsigned char c;
- 
--	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), "=qm" (c)
- 		     : : "memory");
- 	return c != 0;
-@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
- {
- 	unsigned char c;
- 
--	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"
-+		     : "+m" (v->counter), "=qm" (c)
-+		     : : "memory");
-+	return c != 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), "=qm" (c)
- 		     : : "memory");
- 	return c != 0;
-@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
- {
- 	unsigned char c;
- 
--	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), "=qm" (c)
- 		     : "ir" (i) : "memory");
- 	return c;
-@@ -180,6 +342,46 @@ static inline int atomic_add_return(int i, atomic_t *v)
- #endif
- 	/* Modern 486+ processor */
- 	__i = 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 = 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 <= 3))
-+		goto no_xadd;
-+#endif
-+	/* Modern 486+ processor */
-+	__i = i;
- 	asm volatile(LOCK_PREFIX "xaddl %0, %1"
- 		     : "+r" (i), "+m" (v->counter)
- 		     : : "memory");
-@@ -208,6 +410,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
- }
- 
- #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))
- 
- static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
-@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
- 	return cmpxchg(&v->counter, old, new);
- }
- 
-+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
-+{
-+	return cmpxchg(&v->counter, old, new);
-+}
-+
- static inline int atomic_xchg(atomic_t *v, int new)
- {
- 	return xchg(&v->counter, new);
- }
- 
-+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
-@@ -231,21 +447,77 @@ static inline int atomic_xchg(atomic_t *v, int new)
-  */
- static inline int atomic_add_unless(atomic_t *v, int a, int u)
- {
--	int c, old;
-+	int c, old, new;
- 	c = atomic_read(v);
- 	for (;;) {
--		if (unlikely(c == (u)))
-+		if (unlikely(c == u))
- 			break;
--		old = 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
-+
-+			     : "=r" (new)
-+			     : "0" (c), "ir" (a));
-+
-+		old = atomic_cmpxchg(v, c, new);
- 		if (likely(old == c))
- 			break;
- 		c = old;
- 	}
--	return c != (u);
-+	return c != u;
- }
- 
- #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
- 
-+/**
-+ * atomic_inc_not_zero_hint - increment if not null
-+ * @v: pointer of type atomic_t
-+ * @hint: probable value of the atomic before the increment
-+ *
-+ * This version of atomic_inc_not_zero() gives a hint of probable
-+ * value of the atomic. This helps processor to not read the memory
-+ * before doing the atomic read/modify/write cycle, lowering
-+ * number of bus transactions on some arches.
-+ *
-+ * Returns: 0 if increment was not done, 1 otherwise.
-+ */
-+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
-+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
-+{
-+	int val, c = hint, new;
-+
-+	/* sanity test, should be removed by compiler if hint is a constant */
-+	if (!hint)
-+		return atomic_inc_not_zero(v);
-+
-+	do {
-+		asm volatile("incl %0\n"
-+
-+#ifdef CONFIG_PAX_REFCOUNT
-+			     "jno 0f\n"
-+			     "decl %0\n"
-+			     "int $4\n0:\n"
-+			     _ASM_EXTABLE(0b, 0b)
-+#endif
-+
-+			     : "=r" (new)
-+			     : "0" (c));
-+
-+		val = atomic_cmpxchg(v, c, new);
-+		if (val == c)
-+			return 1;
-+		c = val;
-+	} while (c);
-+
-+	return 0;
-+}
-+
- /*
-  * atomic_dec_if_positive - decrement by 1 if old value positive
-  * @v: pointer of type atomic_t
-diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
-index 2a934aa..42d2411 100644
---- a/arch/x86/include/asm/atomic64_32.h
-+++ b/arch/x86/include/asm/atomic64_32.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_32.h linux-3.0.3/arch/x86/include/asm/atomic64_32.h
+--- linux-3.0.3/arch/x86/include/asm/atomic64_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/atomic64_32.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,6 +12,14 @@ typedef struct {
  	u64 __aligned(8) counter;
  } atomic64_t;
@@ -7621,7 +5896,7 @@ index 2a934aa..42d2411 100644
  #define ATOMIC64_INIT(val)	{ (val) }
  
  #ifdef CONFIG_X86_CMPXCHG64
-@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
+@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg
  }
  
  /**
@@ -7643,7 +5918,7 @@ index 2a934aa..42d2411 100644
   * atomic64_xchg - xchg atomic64 variable
   * @v: pointer to type atomic64_t
   * @n: value to assign
-@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
+@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64
  }
  
  /**
@@ -7668,7 +5943,7 @@ index 2a934aa..42d2411 100644
   * atomic64_read - read atomic64 variable
   * @v: pointer to type atomic64_t
   *
-@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
+@@ -93,6 +134,22 @@ static inline long long atomic64_read(at
   }
  
  /**
@@ -7691,7 +5966,7 @@ index 2a934aa..42d2411 100644
   * atomic64_add_return - add and return
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
+@@ -108,6 +165,22 @@ static inline long long atomic64_add_ret
  	return i;
  }
  
@@ -7714,7 +5989,7 @@ index 2a934aa..42d2411 100644
  /*
   * Other variants with different arithmetic operators:
   */
-@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
+@@ -131,6 +204,17 @@ static inline long long atomic64_inc_ret
  	return a;
  }
  
@@ -7732,7 +6007,7 @@ index 2a934aa..42d2411 100644
  static inline long long atomic64_dec_return(atomic64_t *v)
  {
  	long long a;
-@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
+@@ -159,6 +243,22 @@ static inline long long atomic64_add(lon
  }
  
  /**
@@ -7755,10 +6030,9 @@ index 2a934aa..42d2411 100644
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
-index 49fd1ea..8c58977 100644
---- a/arch/x86/include/asm/atomic64_64.h
-+++ b/arch/x86/include/asm/atomic64_64.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_64.h linux-3.0.3/arch/x86/include/asm/atomic64_64.h
+--- linux-3.0.3/arch/x86/include/asm/atomic64_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/atomic64_64.h	2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -7780,7 +6054,7 @@ index 49fd1ea..8c58977 100644
  }
  
  /**
-@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
+@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64
  }
  
  /**
@@ -7799,7 +6073,7 @@ index 49fd1ea..8c58977 100644
   * atomic64_add - add integer to atomic64 variable
   * @i: integer value to add
   * @v: pointer to type atomic64_t
-@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
+@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64
   */
  static inline void atomic64_add(long i, atomic64_t *v)
  {
@@ -7828,7 +6102,7 @@ index 49fd1ea..8c58977 100644
  	asm volatile(LOCK_PREFIX "addq %1,%0"
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
-@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
+@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, 
   */
  static inline void atomic64_sub(long i, atomic64_t *v)
  {
@@ -7859,7 +6133,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter)
  		     : "er" (i), "m" (v->counter));
  }
-@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
+@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(
  {
  	unsigned char c;
  
@@ -7877,7 +6151,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
+@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(
   */
  static inline void atomic64_inc(atomic64_t *v)
  {
@@ -7905,7 +6179,7 @@ index 49fd1ea..8c58977 100644
  	asm volatile(LOCK_PREFIX "incq %0"
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
-@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
+@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64
   */
  static inline void atomic64_dec(atomic64_t *v)
  {
@@ -7935,7 +6209,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter)
  		     : "m" (v->counter));
  }
-@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
+@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(
  {
  	unsigned char c;
  
@@ -7953,7 +6227,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
+@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(
  {
  	unsigned char c;
  
@@ -7971,7 +6245,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter), "=qm" (c)
  		     : "m" (v->counter) : "memory");
  	return c != 0;
-@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
+@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(
  {
  	unsigned char c;
  
@@ -7989,7 +6263,7 @@ index 49fd1ea..8c58977 100644
  		     : "=m" (v->counter), "=qm" (c)
  		     : "er" (i), "m" (v->counter) : "memory");
  	return c;
-@@ -171,7 +317,31 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
+@@ -171,7 +317,31 @@ static inline int atomic64_add_negative(
  static inline long atomic64_add_return(long i, atomic64_t *v)
  {
  	long __i = i;
@@ -8022,7 +6296,7 @@ index 49fd1ea..8c58977 100644
  		     : "+r" (i), "+m" (v->counter)
  		     : : "memory");
  	return i + __i;
-@@ -183,6 +353,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
+@@ -183,6 +353,10 @@ static inline long atomic64_sub_return(l
  }
  
  #define atomic64_inc_return(v)  (atomic64_add_return(1, (v)))
@@ -8033,7 +6307,7 @@ index 49fd1ea..8c58977 100644
  #define atomic64_dec_return(v)  (atomic64_sub_return(1, (v)))
  
  static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
-@@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
+@@ -190,6 +364,11 @@ static inline long atomic64_cmpxchg(atom
  	return cmpxchg(&v->counter, old, new);
  }
  
@@ -8045,7 +6319,7 @@ index 49fd1ea..8c58977 100644
  static inline long atomic64_xchg(atomic64_t *v, long new)
  {
  	return xchg(&v->counter, new);
-@@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
+@@ -206,17 +385,30 @@ static inline long atomic64_xchg(atomic6
   */
  static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
  {
@@ -8080,10 +6354,424 @@ index 49fd1ea..8c58977 100644
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
-index 903683b..bb219df 100644
---- a/arch/x86/include/asm/bitops.h
-+++ b/arch/x86/include/asm/bitops.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/atomic.h linux-3.0.3/arch/x86/include/asm/atomic.h
+--- linux-3.0.3/arch/x86/include/asm/atomic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/atomic.h	2011-08-23 21:47:55.000000000 -0400
+@@ -22,7 +22,18 @@
+  */
+ static inline int atomic_read(const atomic_t *v)
+ {
+-	return (*(volatile int *)&(v)->counter);
++	return (*(volatile const int *)&(v)->counter);
++}
++
++/**
++ * 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 (*(volatile const int *)&(v)->counter);
+ }
+ 
+ /**
+@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *
+ }
+ 
+ /**
++ * 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 = i;
++}
++
++/**
+  * atomic_add - add integer to atomic variable
+  * @i: integer value to add
+  * @v: pointer of type atomic_t
+@@ -46,7 +69,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));
+ }
+@@ -60,7 +105,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));
+ }
+@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(in
+ {
+ 	unsigned char c;
+ 
+-	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), "=qm" (c)
+ 		     : "ir" (i) : "memory");
+ 	return c;
+@@ -92,7 +168,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));
+ }
+ 
+@@ -104,7 +200,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));
+ }
+ 
+@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(at
+ {
+ 	unsigned char c;
+ 
+-	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), "=qm" (c)
+ 		     : : "memory");
+ 	return c != 0;
+@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(at
+ {
+ 	unsigned char c;
+ 
+-	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"
++		     : "+m" (v->counter), "=qm" (c)
++		     : : "memory");
++	return c != 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), "=qm" (c)
+ 		     : : "memory");
+ 	return c != 0;
+@@ -157,7 +310,16 @@ static inline int atomic_add_negative(in
+ {
+ 	unsigned char c;
+ 
+-	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), "=qm" (c)
+ 		     : "ir" (i) : "memory");
+ 	return c;
+@@ -180,6 +342,46 @@ static inline int atomic_add_return(int 
+ #endif
+ 	/* Modern 486+ processor */
+ 	__i = 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 = 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 <= 3))
++		goto no_xadd;
++#endif
++	/* Modern 486+ processor */
++	__i = i;
+ 	asm volatile(LOCK_PREFIX "xaddl %0, %1"
+ 		     : "+r" (i), "+m" (v->counter)
+ 		     : : "memory");
+@@ -208,6 +410,10 @@ static inline int atomic_sub_return(int 
+ }
+ 
+ #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))
+ 
+ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
+@@ -215,11 +421,21 @@ static inline int atomic_cmpxchg(atomic_
+ 	return cmpxchg(&v->counter, old, new);
+ }
+ 
++static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
++{
++	return cmpxchg(&v->counter, old, new);
++}
++
+ static inline int atomic_xchg(atomic_t *v, int new)
+ {
+ 	return xchg(&v->counter, new);
+ }
+ 
++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
+@@ -231,21 +447,77 @@ 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 = atomic_read(v);
+ 	for (;;) {
+-		if (unlikely(c == (u)))
++		if (unlikely(c == u))
+ 			break;
+-		old = 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
++
++			     : "=r" (new)
++			     : "0" (c), "ir" (a));
++
++		old = atomic_cmpxchg(v, c, new);
+ 		if (likely(old == c))
+ 			break;
+ 		c = old;
+ 	}
+-	return c != (u);
++	return c != u;
+ }
+ 
+ #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+ 
++/**
++ * atomic_inc_not_zero_hint - increment if not null
++ * @v: pointer of type atomic_t
++ * @hint: probable value of the atomic before the increment
++ *
++ * This version of atomic_inc_not_zero() gives a hint of probable
++ * value of the atomic. This helps processor to not read the memory
++ * before doing the atomic read/modify/write cycle, lowering
++ * number of bus transactions on some arches.
++ *
++ * Returns: 0 if increment was not done, 1 otherwise.
++ */
++#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
++static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
++{
++	int val, c = hint, new;
++
++	/* sanity test, should be removed by compiler if hint is a constant */
++	if (!hint)
++		return atomic_inc_not_zero(v);
++
++	do {
++		asm volatile("incl %0\n"
++
++#ifdef CONFIG_PAX_REFCOUNT
++			     "jno 0f\n"
++			     "decl %0\n"
++			     "int $4\n0:\n"
++			     _ASM_EXTABLE(0b, 0b)
++#endif
++
++			     : "=r" (new)
++			     : "0" (c));
++
++		val = atomic_cmpxchg(v, c, new);
++		if (val == c)
++			return 1;
++		c = val;
++	} while (c);
++
++	return 0;
++}
++
+ /*
+  * atomic_dec_if_positive - decrement by 1 if old value positive
+  * @v: pointer of type atomic_t
+diff -urNp linux-3.0.3/arch/x86/include/asm/bitops.h linux-3.0.3/arch/x86/include/asm/bitops.h
+--- linux-3.0.3/arch/x86/include/asm/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/bitops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -8093,10 +6781,9 @@ index 903683b..bb219df 100644
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
-index 5e1a2ee..c9f9533 100644
---- a/arch/x86/include/asm/boot.h
-+++ b/arch/x86/include/asm/boot.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/boot.h linux-3.0.3/arch/x86/include/asm/boot.h
+--- linux-3.0.3/arch/x86/include/asm/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/boot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -8114,44 +6801,41 @@ index 5e1a2ee..c9f9533 100644
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
-index 48f99f1..287b0eb 100644
---- a/arch/x86/include/asm/cache.h
-+++ b/arch/x86/include/asm/cache.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/cacheflush.h linux-3.0.3/arch/x86/include/asm/cacheflush.h
+--- linux-3.0.3/arch/x86/include/asm/cacheflush.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/cacheflush.h	2011-08-23 21:47:55.000000000 -0400
+@@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
+ 	unsigned long pg_flags = pg->flags & _PGMT_MASK;
+ 
+ 	if (pg_flags == _PGMT_DEFAULT)
+-		return -1;
++		return ~0UL;
+ 	else if (pg_flags == _PGMT_WC)
+ 		return _PAGE_CACHE_WC;
+ 	else if (pg_flags == _PGMT_UC_MINUS)
+diff -urNp linux-3.0.3/arch/x86/include/asm/cache.h linux-3.0.3/arch/x86/include/asm/cache.h
+--- linux-3.0.3/arch/x86/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* 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,U) << L1_CACHE_SHIFT)
++#define L1_CACHE_BYTES	(_AC(1,UL) << L1_CACHE_SHIFT)
  
  #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 +#define __read_only __attribute__((__section__(".data..read_only")))
  
  #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
-+#define INTERNODE_CACHE_BYTES (_AC(1,U) << INTERNODE_CACHE_SHIFT)
++#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
-index 62f0844..ef26ade 100644
---- a/arch/x86/include/asm/cacheflush.h
-+++ b/arch/x86/include/asm/cacheflush.h
-@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
- 	unsigned long pg_flags = pg->flags & _PGMT_MASK;
- 
- 	if (pg_flags == _PGMT_DEFAULT)
--		return -1;
-+		return ~0UL;
- 	else if (pg_flags == _PGMT_WC)
- 		return _PAGE_CACHE_WC;
- 	else if (pg_flags == _PGMT_UC_MINUS)
-diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
-index 46fc474..b02b0f9 100644
---- a/arch/x86/include/asm/checksum_32.h
-+++ b/arch/x86/include/asm/checksum_32.h
-@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
+diff -urNp linux-3.0.3/arch/x86/include/asm/checksum_32.h linux-3.0.3/arch/x86/include/asm/checksum_32.h
+--- linux-3.0.3/arch/x86/include/asm/checksum_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/checksum_32.h	2011-08-23 21:47:55.000000000 -0400
+@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
  					    int len, __wsum sum,
  					    int *src_err_ptr, int *dst_err_ptr);
  
@@ -8166,7 +6850,7 @@ index 46fc474..b02b0f9 100644
  /*
   *	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_from_user(const void __user *src,
+@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_f
  						 int *err_ptr)
  {
  	might_sleep();
@@ -8175,7 +6859,7 @@ index 46fc474..b02b0f9 100644
  					 len, sum, err_ptr, NULL);
  }
  
-@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
+@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_us
  {
  	might_sleep();
  	if (access_ok(VERIFY_WRITE, dst, len))
@@ -8184,11 +6868,10 @@ index 46fc474..b02b0f9 100644
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
-index 3b98f78..2bc9667 100644
---- a/arch/x86/include/asm/cpufeature.h
-+++ b/arch/x86/include/asm/cpufeature.h
-@@ -349,7 +349,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
+diff -urNp linux-3.0.3/arch/x86/include/asm/cpufeature.h linux-3.0.3/arch/x86/include/asm/cpufeature.h
+--- linux-3.0.3/arch/x86/include/asm/cpufeature.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/cpufeature.h	2011-08-23 21:47:55.000000000 -0400
+@@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
  			     ".section .discard,\"aw\",@progbits\n"
  			     " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
  			     ".previous\n"
@@ -8197,27 +6880,42 @@ index 3b98f78..2bc9667 100644
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
-index 617bd56..7b047a1 100644
---- a/arch/x86/include/asm/desc.h
-+++ b/arch/x86/include/asm/desc.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/desc_defs.h linux-3.0.3/arch/x86/include/asm/desc_defs.h
+--- linux-3.0.3/arch/x86/include/asm/desc_defs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/desc_defs.h	2011-08-23 21:47:55.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));
+ 
+diff -urNp linux-3.0.3/arch/x86/include/asm/desc.h linux-3.0.3/arch/x86/include/asm/desc.h
+--- linux-3.0.3/arch/x86/include/asm/desc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/desc.h	2011-08-23 21:47:55.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
  #include <asm/mmu.h>
 +#include <asm/pgtable.h>
+ 
  #include <linux/smp.h>
  
- static inline void fill_ldt(struct desc_struct *desc,
-@@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_struct *desc,
- 	desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
- 	desc->type = (info->read_exec_only ^ 1) << 1;
- 	desc->type |= info->contents << 2;
-+	desc->type |= info->seg_not_present ^ 1;
- 	desc->s = 1;
- 	desc->dpl = 0x3;
- 	desc->p = info->seg_not_present ^ 1;
-@@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_struct *desc,
+@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_
+ 
+ 	desc->type		= (info->read_exec_only ^ 1) << 1;
+ 	desc->type	       |= info->contents << 2;
++	desc->type	       |= info->seg_not_present ^ 1;
+ 
+ 	desc->s			= 1;
+ 	desc->dpl		= 0x3;
+@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_
  }
  
  extern struct desc_ptr idt_descr;
@@ -8226,6 +6924,7 @@ index 617bd56..7b047a1 100644
 -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];
  
@@ -8237,54 +6936,51 @@ index 617bd56..7b047a1 100644
  }
  
  #ifdef CONFIG_X86_64
-@@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
+@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *
  			     unsigned long base, unsigned dpl, unsigned flags,
  			     unsigned short seg)
  {
 -	gate->a = (seg << 16) | (base & 0xffff);
--	gate->b = (base & 0xffff0000) |
--		  (((0x80 | type | (dpl << 5)) & 0xff) << 8);
-+	gate->gate.offset_low = base;
-+	gate->gate.seg = seg;
-+	gate->gate.reserved = 0;
-+	gate->gate.type = type;
-+	gate->gate.s = 0;
-+	gate->gate.dpl = dpl;
-+	gate->gate.p = 1;
-+	gate->gate.offset_high = base >> 16;
+-	gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
++	gate->gate.offset_low	= base;
++	gate->gate.seg		= seg;
++	gate->gate.reserved	= 0;
++	gate->gate.type		= type;
++	gate->gate.s		= 0;
++	gate->gate.dpl		= dpl;
++	gate->gate.p		= 1;
++	gate->gate.offset_high	= base >> 16;
  }
  
  #endif
-@@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
- static inline void native_write_idt_entry(gate_desc *idt, int entry,
- 					  const gate_desc *gate)
+@@ -115,12 +118,16 @@ 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();
  }
  
- static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,
- 					  const void *desc)
+ 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();
  }
  
- static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
-@@ -139,7 +146,10 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
- 		size = sizeof(struct desc_struct);
- 		break;
+ static inline void
+@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struc
+ 	default:	size = sizeof(*gdt);		break;
  	}
-+
+ 
 +	pax_open_kernel();
  	memcpy(&gdt[entry], desc, size);
 +	pax_close_kernel();
  }
  
  static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
-@@ -211,7 +221,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
+@@ -207,7 +216,9 @@ static inline void native_set_ldt(const 
  
  static inline void native_load_tr_desc(void)
  {
@@ -8294,9 +6990,9 @@ index 617bd56..7b047a1 100644
  }
  
  static inline void native_load_gdt(const struct desc_ptr *dtr)
-@@ -246,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
- 	unsigned int i;
+@@ -244,8 +255,10 @@ static inline void native_load_tls(struc
  	struct desc_struct *gdt = get_cpu_gdt_table(cpu);
+ 	unsigned int i;
  
 +	pax_open_kernel();
  	for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
@@ -8305,7 +7001,7 @@ index 617bd56..7b047a1 100644
  }
  
  #define _LDT_empty(info)				\
-@@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
+@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct
  	desc->limit = (limit >> 16) & 0xf;
  }
  
@@ -8314,7 +7010,7 @@ index 617bd56..7b047a1 100644
  			     unsigned dpl, unsigned ist, unsigned seg)
  {
  	gate_desc s;
-@@ -327,7 +341,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
+@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, u
   * Pentium F0 0F bugfix can have resulted in the mapped
   * IDT being write-protected.
   */
@@ -8323,7 +7019,7 @@ index 617bd56..7b047a1 100644
  {
  	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(unsigned int n, void *addr)
+@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsig
  /*
   * This routine sets up an interrupt gate at directory privilege level 3.
   */
@@ -8346,7 +7042,7 @@ index 617bd56..7b047a1 100644
  {
  	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(unsigned int n, void *addr)
+@@ -377,19 +390,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);
@@ -8381,83 +7077,9 @@ index 617bd56..7b047a1 100644
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
-index 278441f..b95a174 100644
---- a/arch/x86/include/asm/desc_defs.h
-+++ b/arch/x86/include/asm/desc_defs.h
-@@ -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));
- 
-diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
-index 029f230..0b9b1b3 100644
---- a/arch/x86/include/asm/device.h
-+++ b/arch/x86/include/asm/device.h
-@@ -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
- #if defined(CONFIG_DMAR) || defined(CONFIG_AMD_IOMMU)
- 	void *iommu; /* hook for IOMMU specific extension */
-diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
-index d4c419f..0c186bd 100644
---- a/arch/x86/include/asm/dma-mapping.h
-+++ b/arch/x86/include/asm/dma-mapping.h
-@@ -26,9 +26,9 @@ extern int iommu_merge;
- extern struct device x86_dma_fallback_dev;
- extern int panic_on_overflow;
- 
--extern struct dma_map_ops *dma_ops;
-+extern const struct dma_map_ops *dma_ops;
- 
--static inline struct dma_map_ops *get_dma_ops(struct device *dev)
-+static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
- {
- #ifdef CONFIG_X86_32
- 	return dma_ops;
-@@ -45,7 +45,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
- /* 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 = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	if (ops->mapping_error)
- 		return ops->mapping_error(dev, dma_addr);
- 
-@@ -115,7 +115,7 @@ static inline void *
- dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- 		gfp_t gfp)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	void *memory;
- 
- 	gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
-@@ -142,7 +142,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- static inline void dma_free_coherent(struct device *dev, size_t size,
- 				     void *vaddr, dma_addr_t bus)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	WARN_ON(irqs_disabled());       /* for portability */
- 
-diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
-index e99d55d..a32833f 100644
---- a/arch/x86/include/asm/e820.h
-+++ b/arch/x86/include/asm/e820.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/e820.h linux-3.0.3/arch/x86/include/asm/e820.h
+--- linux-3.0.3/arch/x86/include/asm/e820.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/e820.h	2011-08-23 21:47:55.000000000 -0400
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS	0xa0000
  #define ISA_END_ADDRESS		0x100000
@@ -8467,10 +7089,9 @@ index e99d55d..a32833f 100644
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
-index f2ad216..569e1f7 100644
---- a/arch/x86/include/asm/elf.h
-+++ b/arch/x86/include/asm/elf.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/elf.h linux-3.0.3/arch/x86/include/asm/elf.h
+--- linux-3.0.3/arch/x86/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
 @@ -237,7 +237,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -8497,17 +7118,18 @@ index f2ad216..569e1f7 100644
  
  /* 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,
-@@ -291,8 +309,7 @@ do {									\
+@@ -290,9 +308,7 @@ do {									\
+ 
  #define ARCH_DLINFO							\
  do {									\
- 	if (vdso_enabled)						\
+-	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);\
++	NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso);	\
  } while (0)
  
  #define AT_SYSINFO		32
-@@ -303,7 +320,7 @@ do {									\
+@@ -303,7 +319,7 @@ do {									\
  
  #endif /* !CONFIG_X86_32 */
  
@@ -8516,7 +7138,7 @@ index f2ad216..569e1f7 100644
  
  #define VDSO_ENTRY							\
  	((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
-@@ -317,7 +334,4 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+@@ -317,7 +333,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
  
@@ -8524,10 +7146,9 @@ index f2ad216..569e1f7 100644
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
-index cc70c1c..d96d011 100644
---- a/arch/x86/include/asm/emergency-restart.h
-+++ b/arch/x86/include/asm/emergency-restart.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/emergency-restart.h linux-3.0.3/arch/x86/include/asm/emergency-restart.h
+--- linux-3.0.3/arch/x86/include/asm/emergency-restart.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/emergency-restart.h	2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -8536,10 +7157,9 @@ index cc70c1c..d96d011 100644
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
-index 1f11ce4..6f49a5a 100644
---- a/arch/x86/include/asm/futex.h
-+++ b/arch/x86/include/asm/futex.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/futex.h linux-3.0.3/arch/x86/include/asm/futex.h
+--- linux-3.0.3/arch/x86/include/asm/futex.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/futex.h	2011-08-23 21:47:55.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -8560,7 +7180,7 @@ index 1f11ce4..6f49a5a 100644
  	asm volatile("1:\tmovl	%2, %0\n"			\
  		     "\tmovl\t%0, %3\n"				\
  		     "\t" insn "\n"				\
-@@ -34,10 +36,10 @@
+@@ -34,7 +36,7 @@
  		     _ASM_EXTABLE(1b, 4b)			\
  		     _ASM_EXTABLE(2b, 4b)			\
  		     : "=&a" (oldval), "=&r" (ret),		\
@@ -8568,12 +7188,8 @@ index 1f11ce4..6f49a5a 100644
 +		       "+m" (*(u32 *)____m(uaddr)), "=&r" (tem)	\
  		     : "r" (oparg), "i" (-EFAULT), "1" (0))
  
--static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
-+static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
- {
- 	int op = (encoded_op >> 28) & 7;
- 	int cmp = (encoded_op >> 24) & 15;
-@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
+ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
+@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser
  
  	switch (op) {
  	case FUTEX_OP_SET:
@@ -8586,40 +7202,26 @@ index 1f11ce4..6f49a5a 100644
  				   uaddr, oparg);
  		break;
  	case FUTEX_OP_OR:
-@@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
- 	return ret;
- }
- 
--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)
- {
- 
-@@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
- 		return -ENOSYS;
- #endif
- 
--	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
-+	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
+@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_i
+ 	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
  		return -EFAULT;
  
--	asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
-+	asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
+-	asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
++	asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
  		     "2:\t.section .fixup, \"ax\"\n"
- 		     "3:\tmov     %2, %0\n"
+ 		     "3:\tmov     %3, %0\n"
  		     "\tjmp     2b\n"
  		     "\t.previous\n"
  		     _ASM_EXTABLE(1b, 3b)
--		     : "=a" (oldval), "+m" (*uaddr)
-+		     : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
- 		     : "i" (-EFAULT), "r" (newval), "0" (oldval)
+-		     : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
++		     : "+r" (ret), "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
+ 		     : "i" (-EFAULT), "r" (newval), "1" (oldval)
  		     : "memory"
  	);
-diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
-index 0274ec5..037eccb 100644
---- a/arch/x86/include/asm/hw_irq.h
-+++ b/arch/x86/include/asm/hw_irq.h
-@@ -113,8 +113,8 @@ extern void setup_ioapic_dest(void);
+diff -urNp linux-3.0.3/arch/x86/include/asm/hw_irq.h linux-3.0.3/arch/x86/include/asm/hw_irq.h
+--- linux-3.0.3/arch/x86/include/asm/hw_irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/hw_irq.h	2011-08-23 21:47:55.000000000 -0400
+@@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
  /* Statistics */
@@ -8630,11 +7232,10 @@ index 0274ec5..037eccb 100644
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
-index ef32890..ce9d520 100644
---- a/arch/x86/include/asm/i387.h
-+++ b/arch/x86/include/asm/i387.h
-@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
+diff -urNp linux-3.0.3/arch/x86/include/asm/i387.h linux-3.0.3/arch/x86/include/asm/i387.h
+--- linux-3.0.3/arch/x86/include/asm/i387.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/i387.h	2011-08-23 21:47:55.000000000 -0400
+@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
  
@@ -8646,7 +7247,7 @@ index ef32890..ce9d520 100644
  	/* See comment in fxsave() below. */
  #ifdef CONFIG_AS_FXSAVEQ
  	asm volatile("1:  fxrstorq %[fx]\n\t"
-@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
+@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i38
  {
  	int err;
  
@@ -8658,7 +7259,7 @@ index ef32890..ce9d520 100644
  	/*
  	 * Clear the bytes not touched by the fxsave and reserved
  	 * for the SW usage.
-@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu *fpu)
+@@ -213,13 +223,8 @@ static inline void fpu_fxsave(struct fpu
  #endif	/* CONFIG_X86_64 */
  
  /* We need a safe address that is cheap to find and that is already
@@ -8674,16 +7275,7 @@ index ef32890..ce9d520 100644
  
  /*
   * These must be called with preempt disabled
-@@ -237,7 +242,7 @@ static inline void fpu_save_init(struct fpu *fpu)
- 	} else if (use_fxsr()) {
- 		fpu_fxsave(fpu);
- 	} else {
--		asm volatile("fsave %[fx]; fwait"
-+		asm volatile("fnsave %[fx]; fwait"
- 			     : [fx] "=m" (fpu->state->fsave));
- 		return;
- 	}
-@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void)
+@@ -312,7 +317,7 @@ static inline void kernel_fpu_begin(void
  	struct thread_info *me = current_thread_info();
  	preempt_disable();
  	if (me->status & TS_USEDFPU)
@@ -8692,11 +7284,10 @@ index ef32890..ce9d520 100644
  	else
  		clts();
  }
-diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
-index 0722730..11502d1 100644
---- a/arch/x86/include/asm/io.h
-+++ b/arch/x86/include/asm/io.h
-@@ -216,6 +216,17 @@ extern void set_iounmap_nonlazy(void);
+diff -urNp linux-3.0.3/arch/x86/include/asm/io.h linux-3.0.3/arch/x86/include/asm/io.h
+--- linux-3.0.3/arch/x86/include/asm/io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/io.h	2011-08-23 21:47:55.000000000 -0400
+@@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
  
@@ -8714,24 +7305,10 @@ index 0722730..11502d1 100644
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
-index 345c99c..7938698 100644
---- a/arch/x86/include/asm/iommu.h
-+++ b/arch/x86/include/asm/iommu.h
-@@ -1,7 +1,7 @@
- #ifndef _ASM_X86_IOMMU_H
- #define _ASM_X86_IOMMU_H
- 
--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 --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
-index 5745ce8..949fb75 100644
---- a/arch/x86/include/asm/irqflags.h
-+++ b/arch/x86/include/asm/irqflags.h
-@@ -140,6 +140,11 @@ static inline unsigned long arch_local_irq_save(void)
+diff -urNp linux-3.0.3/arch/x86/include/asm/irqflags.h linux-3.0.3/arch/x86/include/asm/irqflags.h
+--- linux-3.0.3/arch/x86/include/asm/irqflags.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/irqflags.h	2011-08-23 21:47:55.000000000 -0400
+@@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
  	sti;					\
  	sysexit
  
@@ -8743,10 +7320,9 @@ index 5745ce8..949fb75 100644
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
-index 5478825..839e88c 100644
---- a/arch/x86/include/asm/kprobes.h
-+++ b/arch/x86/include/asm/kprobes.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/kprobes.h linux-3.0.3/arch/x86/include/asm/kprobes.h
+--- linux-3.0.3/arch/x86/include/asm/kprobes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/kprobes.h	2011-08-23 21:47:55.000000000 -0400
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -8763,11 +7339,10 @@ index 5478825..839e88c 100644
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index ffd7f8d..0567319 100644
---- a/arch/x86/include/asm/kvm_host.h
-+++ b/arch/x86/include/asm/kvm_host.h
-@@ -423,7 +423,7 @@ struct kvm_arch {
+diff -urNp linux-3.0.3/arch/x86/include/asm/kvm_host.h linux-3.0.3/arch/x86/include/asm/kvm_host.h
+--- linux-3.0.3/arch/x86/include/asm/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/kvm_host.h	2011-08-23 21:47:55.000000000 -0400
+@@ -441,7 +441,7 @@ struct kvm_arch {
  	unsigned int n_used_mmu_pages;
  	unsigned int n_requested_mmu_pages;
  	unsigned int n_max_mmu_pages;
@@ -8776,19 +7351,18 @@ index ffd7f8d..0567319 100644
  	struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
  	/*
  	 * Hash table of struct kvm_mmu_page.
-@@ -603,7 +603,7 @@ struct kvm_arch_async_pf {
- 	bool direct_map;
- };
+@@ -618,7 +618,7 @@ struct kvm_x86_ops {
+ 			       struct x86_instruction_info *info,
+ 			       enum x86_intercept_stage stage);
  
--extern struct kvm_x86_ops *kvm_x86_ops;
-+extern const struct kvm_x86_ops *kvm_x86_ops;
+-	const struct trace_print_flags *exit_reasons_str;
++	const struct trace_print_flags * const exit_reasons_str;
+ };
  
- int kvm_mmu_module_init(void);
- void kvm_mmu_module_exit(void);
-diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
-index 2e99724..e6110cc 100644
---- a/arch/x86/include/asm/local.h
-+++ b/arch/x86/include/asm/local.h
+ struct kvm_arch_async_pf {
+diff -urNp linux-3.0.3/arch/x86/include/asm/local.h linux-3.0.3/arch/x86/include/asm/local.h
+--- linux-3.0.3/arch/x86/include/asm/local.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/local.h	2011-08-23 21:47:55.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -8852,7 +7426,7 @@ index 2e99724..e6110cc 100644
  		     : "+m" (l->a.counter)
  		     : "ir" (i));
  }
-@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
+@@ -55,7 +87,16 @@ static inline int local_sub_and_test(lon
  {
  	unsigned char c;
  
@@ -8870,7 +7444,7 @@ index 2e99724..e6110cc 100644
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
+@@ -73,7 +114,16 @@ static inline int local_dec_and_test(loc
  {
  	unsigned char c;
  
@@ -8888,7 +7462,7 @@ index 2e99724..e6110cc 100644
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
+@@ -91,7 +141,16 @@ static inline int local_inc_and_test(loc
  {
  	unsigned char c;
  
@@ -8906,7 +7480,7 @@ index 2e99724..e6110cc 100644
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : : "memory");
  	return c != 0;
-@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
+@@ -110,7 +169,16 @@ static inline int local_add_negative(lon
  {
  	unsigned char c;
  
@@ -8924,7 +7498,7 @@ index 2e99724..e6110cc 100644
  		     : "+m" (l->a.counter), "=qm" (c)
  		     : "ir" (i) : "memory");
  	return c;
-@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
+@@ -133,7 +201,15 @@ static inline long local_add_return(long
  #endif
  	/* Modern 486+ processor */
  	__i = i;
@@ -8941,73 +7515,9 @@ index 2e99724..e6110cc 100644
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
-index eb16e94..f229648 100644
---- a/arch/x86/include/asm/mce.h
-+++ b/arch/x86/include/asm/mce.h
-@@ -198,7 +198,7 @@ int mce_notify_irq(void);
- void mce_notify_process(void);
- 
- DECLARE_PER_CPU(struct mce, injectm);
--extern struct file_operations mce_chrdev_ops;
-+extern struct file_operations mce_chrdev_ops;	/* cannot be const, see arch/x86/kernel/cpu/mcheck/mce. */
- 
- /*
-  * Exception handler
-diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
-index 2421507..d155f20 100644
---- a/arch/x86/include/asm/microcode.h
-+++ b/arch/x86/include/asm/microcode.h
-@@ -12,13 +12,13 @@ struct device;
- enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
- 
- struct microcode_ops {
--	enum ucode_state (*request_microcode_user) (int cpu,
-+	enum ucode_state (* const request_microcode_user) (int cpu,
- 				const void __user *buf, size_t size);
- 
--	enum ucode_state (*request_microcode_fw) (int cpu,
-+	enum ucode_state (* const request_microcode_fw) (int cpu,
- 				struct device *device);
- 
--	void (*microcode_fini_cpu) (int cpu);
-+	void (* const microcode_fini_cpu) (int cpu);
- 
- 	/*
- 	 * The generic 'microcode_core' part guarantees that
-@@ -38,16 +38,16 @@ struct ucode_cpu_info {
- extern struct ucode_cpu_info ucode_cpu_info[];
- 
- #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 */
- 
- #ifdef CONFIG_MICROCODE_AMD
--extern struct microcode_ops * __init init_amd_microcode(void);
-+extern const struct microcode_ops * __init init_amd_microcode(void);
- 
- static inline void get_ucode_data(void *to, const u8 *from, size_t n)
- {
-@@ -55,7 +55,7 @@ static inline void get_ucode_data(void *to, const u8 *from, size_t n)
- }
- 
- #else
--static inline struct microcode_ops * __init init_amd_microcode(void)
-+static inline const struct microcode_ops * __init init_amd_microcode(void)
- {
- 	return NULL;
- }
-diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
-index 593e51d..fa69c9a 100644
---- a/arch/x86/include/asm/mman.h
-+++ b/arch/x86/include/asm/mman.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/mman.h linux-3.0.3/arch/x86/include/asm/mman.h
+--- linux-3.0.3/arch/x86/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -9023,41 +7533,10 @@ index 593e51d..fa69c9a 100644
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
-index 80a1dee..239c67d 100644
---- a/arch/x86/include/asm/mmu.h
-+++ b/arch/x86/include/asm/mmu.h
-@@ -9,10 +9,23 @@
-  * we put the segment information here.
-  */
- typedef struct {
--	void *ldt;
-+	struct desc_struct *ldt;
- 	int size;
- 	struct mutex lock;
--	void *vdso;
-+	unsigned long vdso;
-+
-+#ifdef CONFIG_X86_32
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	unsigned long user_cs_base;
-+	unsigned long user_cs_limit;
-+
-+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+	cpumask_t cpu_user_cs_mask;
-+#endif
-+
-+#endif
-+#endif
-+
- } mm_context_t;
- 
- #ifdef CONFIG_SMP
-diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
-index 8b5393e..cc873d9 100644
---- a/arch/x86/include/asm/mmu_context.h
-+++ b/arch/x86/include/asm/mmu_context.h
-@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *mm);
+diff -urNp linux-3.0.3/arch/x86/include/asm/mmu_context.h linux-3.0.3/arch/x86/include/asm/mmu_context.h
+--- linux-3.0.3/arch/x86/include/asm/mmu_context.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/mmu_context.h	2011-08-23 21:48:14.000000000 -0400
+@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
  {
@@ -9069,27 +7548,24 @@ index 8b5393e..cc873d9 100644
 +	pax_open_kernel();
 +	pgd = get_cpu_pgd(smp_processor_id());
 +	for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
-+		if (paravirt_enabled())
-+			set_pgd(pgd+i, native_make_pgd(0));
-+		else
-+			pgd[i] = native_make_pgd(0);
++		set_pgd_batched(pgd+i, native_make_pgd(0));
 +	pax_close_kernel();
 +#endif
 +
  #ifdef CONFIG_SMP
  	if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
  		percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
-@@ -34,16 +49,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_s
  			     struct task_struct *tsk)
  {
  	unsigned cpu = smp_processor_id();
-+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP)
++#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
 +	int tlbstate = TLBSTATE_OK;
 +#endif
  
  	if (likely(prev != next)) {
  #ifdef CONFIG_SMP
-+#ifdef CONFIG_X86_32
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
 +		tlbstate = percpu_read(cpu_tlbstate.state);
 +#endif
  		percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
@@ -9110,7 +7586,7 @@ index 8b5393e..cc873d9 100644
  
  		/* stop flush ipis for the previous mm */
  		cpumask_clear_cpu(cpu, mm_cpumask(prev));
-@@ -53,9 +82,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_s
  		 */
  		if (unlikely(prev->context.ldt != next->context.ldt))
  			load_LDT_nolock(&next->context);
@@ -9150,7 +7626,7 @@ index 8b5393e..cc873d9 100644
  		percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
  		BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
  
-@@ -64,11 +122,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+@@ -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.
  			 */
@@ -9180,10 +7656,42 @@ index 8b5393e..cc873d9 100644
  }
  
  #define activate_mm(prev, next)			\
-diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
-index 67763c5..b80c028 100644
---- a/arch/x86/include/asm/module.h
-+++ b/arch/x86/include/asm/module.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/mmu.h linux-3.0.3/arch/x86/include/asm/mmu.h
+--- linux-3.0.3/arch/x86/include/asm/mmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/mmu.h	2011-08-23 21:47:55.000000000 -0400
+@@ -9,7 +9,7 @@
+  * we put the segment information here.
+  */
+ typedef struct {
+-	void *ldt;
++	struct desc_struct *ldt;
+ 	int size;
+ 
+ #ifdef CONFIG_X86_64
+@@ -18,7 +18,19 @@ typedef struct {
+ #endif
+ 
+ 	struct mutex lock;
+-	void *vdso;
++	unsigned long vdso;
++
++#ifdef CONFIG_X86_32
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++	unsigned long user_cs_base;
++	unsigned long user_cs_limit;
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
++	cpumask_t cpu_user_cs_mask;
++#endif
++
++#endif
++#endif
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
+diff -urNp linux-3.0.3/arch/x86/include/asm/module.h linux-3.0.3/arch/x86/include/asm/module.h
+--- linux-3.0.3/arch/x86/include/asm/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/module.h	2011-08-23 21:48:14.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -9225,10 +7733,9 @@ index 67763c5..b80c028 100644
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
-index 7639dbf..e08a58c 100644
---- a/arch/x86/include/asm/page_64_types.h
-+++ b/arch/x86/include/asm/page_64_types.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/page_64_types.h linux-3.0.3/arch/x86/include/asm/page_64_types.h
+--- linux-3.0.3/arch/x86/include/asm/page_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/page_64_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -9238,11 +7745,29 @@ index 7639dbf..e08a58c 100644
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
-index ebbc4d8..295929f1 100644
---- a/arch/x86/include/asm/paravirt.h
-+++ b/arch/x86/include/asm/paravirt.h
-@@ -739,6 +739,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
+diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt.h linux-3.0.3/arch/x86/include/asm/paravirt.h
+--- linux-3.0.3/arch/x86/include/asm/paravirt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/paravirt.h	2011-08-23 21:47:55.000000000 -0400
+@@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, 
+ 			    val);
+ }
+ 
++static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
++{
++	pgdval_t val = 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));
+@@ -739,6 +751,21 @@ static inline void __set_fixmap(unsigned
  	pv_mmu_ops.set_fixmap(idx, phys, flags);
  }
  
@@ -9264,7 +7789,7 @@ index ebbc4d8..295929f1 100644
  #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
  
  static inline int arch_spin_is_locked(struct arch_spinlock *lock)
-@@ -955,7 +970,7 @@ extern void default_banner(void);
+@@ -955,7 +982,7 @@ extern void default_banner(void);
  
  #define PARA_PATCH(struct, off)        ((PARAVIRT_PATCH_##struct + (off)) / 4)
  #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
@@ -9273,7 +7798,7 @@ index ebbc4d8..295929f1 100644
  #endif
  
  #define INTERRUPT_RETURN						\
-@@ -1032,6 +1047,21 @@ extern void default_banner(void);
+@@ -1032,6 +1059,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))
@@ -9295,11 +7820,59 @@ index ebbc4d8..295929f1 100644
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
-index 8288509..0a95063 100644
---- a/arch/x86/include/asm/paravirt_types.h
-+++ b/arch/x86/include/asm/paravirt_types.h
-@@ -317,6 +317,12 @@ struct pv_mmu_ops {
+diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt_types.h linux-3.0.3/arch/x86/include/asm/paravirt_types.h
+--- linux-3.0.3/arch/x86/include/asm/paravirt_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/paravirt_types.h	2011-08-23 21:47:55.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;
+ 
+ 
+ struct pv_lazy_ops {
+ 	/* Set deferred update mode, used for batching operations. */
+ 	void (*enter)(void);
+ 	void (*leave)(void);
+-};
++} __no_const;
+ 
+ struct pv_time_ops {
+ 	unsigned long long (*sched_clock)(void);
+ 	unsigned long (*get_tsc_khz)(void);
+-};
++} __no_const;
+ 
+ struct pv_cpu_ops {
+ 	/* hooks for various privileged instructions */
+@@ -186,7 +186,7 @@ struct pv_cpu_ops {
+ 
+ 	void (*start_context_switch)(struct task_struct *prev);
+ 	void (*end_context_switch)(struct task_struct *next);
+-};
++} __no_const;
+ 
+ struct pv_irq_ops {
+ 	/*
+@@ -217,7 +217,7 @@ struct pv_apic_ops {
+ 				 unsigned long start_eip,
+ 				 unsigned long start_esp);
+ #endif
+-};
++} __no_const;
+ 
+ struct pv_mmu_ops {
+ 	unsigned long (*read_cr2)(void);
+@@ -306,6 +306,7 @@ struct pv_mmu_ops {
+ 	struct paravirt_callee_save make_pud;
+ 
+ 	void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
++	void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
+ #endif	/* PAGETABLE_LEVELS == 4 */
+ #endif	/* PAGETABLE_LEVELS >= 3 */
+ 
+@@ -317,6 +318,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);
@@ -9312,37 +7885,19 @@ index 8288509..0a95063 100644
  };
  
  struct arch_spinlock;
-diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
-index 7045267..6d819a2 100644
---- a/arch/x86/include/asm/pci_x86.h
-+++ b/arch/x86/include/asm/pci_x86.h
-@@ -93,16 +93,16 @@ extern int (*pcibios_enable_irq)(struct pci_dev *dev);
- extern void (*pcibios_disable_irq)(struct pci_dev *dev);
- 
- struct pci_raw_ops {
--	int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
-+	int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 *val);
--	int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn,
-+	int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 val);
- };
- 
--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;
- 
--extern struct pci_raw_ops pci_direct_conf1;
-+extern const struct pci_raw_ops pci_direct_conf1;
- extern bool port_cf9_safe;
- 
- /* arch_initcall level */
-diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
-index b4389a4..b7ff22c 100644
---- a/arch/x86/include/asm/pgalloc.h
-+++ b/arch/x86/include/asm/pgalloc.h
-@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
+@@ -327,7 +334,7 @@ struct pv_lock_ops {
+ 	void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
+ 	int (*spin_trylock)(struct arch_spinlock *lock);
+ 	void (*spin_unlock)(struct arch_spinlock *lock);
+-};
++} __no_const;
+ 
+ /* 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-3.0.3/arch/x86/include/asm/pgalloc.h linux-3.0.3/arch/x86/include/asm/pgalloc.h
+--- linux-3.0.3/arch/x86/include/asm/pgalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgalloc.h	2011-08-23 21:47:55.000000000 -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);
@@ -9356,11 +7911,10 @@ index b4389a4..b7ff22c 100644
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
-index 98391db..8f6984e 100644
---- a/arch/x86/include/asm/pgtable-2level.h
-+++ b/arch/x86/include/asm/pgtable-2level.h
-@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-2level.h linux-3.0.3/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable-2level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable-2level.h	2011-08-23 21:47:55.000000000 -0400
+@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
  {
@@ -9370,11 +7924,88 @@ index 98391db..8f6984e 100644
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
-index effff47..f9e4035 100644
---- a/arch/x86/include/asm/pgtable-3level.h
-+++ b/arch/x86/include/asm/pgtable-3level.h
-@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32.h linux-3.0.3/arch/x86/include/asm/pgtable_32.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
+@@ -25,9 +25,6 @@
+ struct mm_struct;
+ struct vm_area_struct;
+ 
+-extern pgd_t swapper_pg_dir[1024];
+-extern pgd_t initial_page_table[1024];
+-
+ static inline void pgtable_cache_init(void) { }
+ static inline void check_pgt_cache(void) { }
+ void paging_init(void);
+@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, u
+ # include <asm/pgtable-2level.h>
+ #endif
+ 
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++extern pgd_t initial_page_table[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 pte_offset_map(dir, address)					\
+ 	((pte_t *)kmap_atomic(pmd_page(*(dir))) +		\
+@@ -62,7 +65,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)
+ 
+@@ -74,6 +79,9 @@ do {						\
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
++#define HAVE_ARCH_UNMAPPED_AREA
++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
++
+ /*
+  * kern_addr_valid() is (1) for FLATMEM and (0) for
+  * SPARSEMEM and DISCONTIGMEM
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h	2011-08-23 21:47:55.000000000 -0400
+@@ -8,7 +8,7 @@
+  */
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level_types.h>
+-# define PMD_SIZE	(1UL << PMD_SHIFT)
++# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
+ # define PMD_MASK	(~(PMD_SIZE - 1))
+ #else
+ # include <asm/pgtable-2level_types.h>
+@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set 
+ # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC
++#ifndef __ASSEMBLY__
++extern unsigned char MODULES_EXEC_VADDR[];
++extern unsigned char MODULES_EXEC_END[];
++#endif
++#include <asm/boot.h>
++#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
++#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
++#else
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
++#endif
++
+ #define MODULES_VADDR	VMALLOC_START
+ #define MODULES_END	VMALLOC_END
+ #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-3level.h linux-3.0.3/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable-3level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable-3level.h	2011-08-23 21:47:55.000000000 -0400
+@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
  {
@@ -9391,11 +8022,75 @@ index effff47..f9e4035 100644
  }
  
  /*
-diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
-index 18601c8..6790ac7 100644
---- a/arch/x86/include/asm/pgtable.h
-+++ b/arch/x86/include/asm/pgtable.h
-@@ -81,12 +81,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64.h linux-3.0.3/arch/x86/include/asm/pgtable_64.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable_64.h	2011-08-23 21:47:55.000000000 -0400
+@@ -16,10 +16,13 @@
+ 
+ extern pud_t level3_kernel_pgt[512];
+ extern pud_t level3_ident_pgt[512];
++extern pud_t level3_vmalloc_pgt[512];
++extern pud_t level3_vmemmap_pgt[512];
++extern pud_t level2_vmemmap_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pmd_t level2_fixmap_pgt[512];
+-extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
++extern pmd_t level2_ident_pgt[512*2];
++extern pgd_t init_level4_pgt[512];
+ 
+ #define swapper_pg_dir init_level4_pgt
+ 
+@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic
+ 
+ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
+ {
++	pax_open_kernel();
+ 	*pmdp = pmd;
++	pax_close_kernel();
+ }
+ 
+ static inline void native_pmd_clear(pmd_t *pmd)
+@@ -107,6 +112,13 @@ static inline void native_pud_clear(pud_
+ 
+ static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
+ {
++	pax_open_kernel();
++	*pgdp = pgd;
++	pax_close_kernel();
++}
++
++static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
++{
+ 	*pgdp = pgd;
+ }
+ 
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h	2011-08-23 21:47:55.000000000 -0400
+@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
+ #define MODULES_END      _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
++
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
+ 
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable.h linux-3.0.3/arch/x86/include/asm/pgtable.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
+ 
+ #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
+ 
+@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm
  
  #define arch_end_context_switch(prev)	do {} while(0)
  
@@ -9447,7 +8142,7 @@ index 18601c8..6790ac7 100644
  static inline int pte_dirty(pte_t pte)
  {
  	return pte_flags(pte) & _PAGE_DIRTY;
-@@ -196,9 +235,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
+@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t 
  	return pte_clear_flags(pte, _PAGE_RW);
  }
  
@@ -9478,7 +8173,7 @@ index 18601c8..6790ac7 100644
  }
  
  static inline pte_t pte_mkdirty(pte_t pte)
-@@ -390,6 +449,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
+@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long 
  #endif
  
  #ifndef __ASSEMBLY__
@@ -9494,7 +8189,7 @@ index 18601c8..6790ac7 100644
  #include <linux/mm_types.h>
  
  static inline int pte_none(pte_t pte)
-@@ -560,7 +628,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
+@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *p
  
  static inline int pgd_bad(pgd_t pgd)
  {
@@ -9503,7 +8198,7 @@ index 18601c8..6790ac7 100644
  }
  
  static inline int pgd_none(pgd_t pgd)
-@@ -583,7 +651,12 @@ static inline int pgd_none(pgd_t pgd)
+@@ -583,7 +652,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;
   */
@@ -9517,7 +8212,7 @@ index 18601c8..6790ac7 100644
  /*
   * a shortcut which implies the use of the kernel's pgd, instead
   * of a process's
-@@ -594,6 +667,20 @@ static inline int pgd_none(pgd_t pgd)
+@@ -594,6 +668,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)
  
@@ -9538,7 +8233,7 @@ index 18601c8..6790ac7 100644
  #ifndef __ASSEMBLY__
  
  extern int direct_gbpages;
-@@ -758,11 +845,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+@@ -758,11 +846,23 @@ static inline void pmdp_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.
   */
@@ -9564,145 +8259,9 @@ index 18601c8..6790ac7 100644
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
-index 0c92113..34a77c6 100644
---- a/arch/x86/include/asm/pgtable_32.h
-+++ b/arch/x86/include/asm/pgtable_32.h
-@@ -25,9 +25,6 @@
- struct mm_struct;
- struct vm_area_struct;
- 
--extern pgd_t swapper_pg_dir[1024];
--extern pgd_t initial_page_table[1024];
--
- static inline void pgtable_cache_init(void) { }
- static inline void check_pgt_cache(void) { }
- void paging_init(void);
-@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
- # include <asm/pgtable-2level.h>
- #endif
- 
-+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-+extern pgd_t initial_page_table[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 pte_offset_map(dir, address)					\
- 	((pte_t *)kmap_atomic(pmd_page(*(dir))) +		\
-@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
- /* 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)
- 
-@@ -74,6 +79,9 @@ do {						\
- 
- #endif /* !__ASSEMBLY__ */
- 
-+#define HAVE_ARCH_UNMAPPED_AREA
-+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-+
- /*
-  * kern_addr_valid() is (1) for FLATMEM and (0) for
-  * SPARSEMEM and DISCONTIGMEM
-diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
-index ed5903b..c7fe163 100644
---- a/arch/x86/include/asm/pgtable_32_types.h
-+++ b/arch/x86/include/asm/pgtable_32_types.h
-@@ -8,7 +8,7 @@
-  */
- #ifdef CONFIG_X86_PAE
- # include <asm/pgtable-3level_types.h>
--# define PMD_SIZE	(1UL << PMD_SHIFT)
-+# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
- # define PMD_MASK	(~(PMD_SIZE - 1))
- #else
- # include <asm/pgtable-2level_types.h>
-@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
- # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
- #endif
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifndef __ASSEMBLY__
-+extern unsigned char MODULES_EXEC_VADDR[];
-+extern unsigned char MODULES_EXEC_END[];
-+#endif
-+#include <asm/boot.h>
-+#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
-+#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
-+#else
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
-+#endif
-+
- #define MODULES_VADDR	VMALLOC_START
- #define MODULES_END	VMALLOC_END
- #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
-diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
-index 975f709..253efcb 100644
---- a/arch/x86/include/asm/pgtable_64.h
-+++ b/arch/x86/include/asm/pgtable_64.h
-@@ -16,10 +16,13 @@
- 
- extern pud_t level3_kernel_pgt[512];
- extern pud_t level3_ident_pgt[512];
-+extern pud_t level3_vmalloc_pgt[512];
-+extern pud_t level3_vmemmap_pgt[512];
-+extern pud_t level2_vmemmap_pgt[512];
- extern pmd_t level2_kernel_pgt[512];
- extern pmd_t level2_fixmap_pgt[512];
--extern pmd_t level2_ident_pgt[512];
--extern pgd_t init_level4_pgt[];
-+extern pmd_t level2_ident_pgt[512*2];
-+extern pgd_t init_level4_pgt[512];
- 
- #define swapper_pg_dir init_level4_pgt
- 
-@@ -61,7 +64,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
- 
- static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
- {
-+	pax_open_kernel();
- 	*pmdp = pmd;
-+	pax_close_kernel();
- }
- 
- static inline void native_pmd_clear(pmd_t *pmd)
-@@ -107,7 +112,9 @@ static inline void native_pud_clear(pud_t *pud)
- 
- static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
- {
-+	pax_open_kernel();
- 	*pgdp = pgd;
-+	pax_close_kernel();
- }
- 
- static inline void native_pgd_clear(pgd_t *pgd)
-diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
-index 766ea16..5b96cb3 100644
---- a/arch/x86/include/asm/pgtable_64_types.h
-+++ b/arch/x86/include/asm/pgtable_64_types.h
-@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
- #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
- #define MODULES_END      _AC(0xffffffffff000000, UL)
- #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
-+#define MODULES_EXEC_VADDR MODULES_VADDR
-+#define MODULES_EXEC_END MODULES_END
-+
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
- 
- #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
-index 7db7723..4678d89 100644
---- a/arch/x86/include/asm/pgtable_types.h
-+++ b/arch/x86/include/asm/pgtable_types.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_types.h linux-3.0.3/arch/x86/include/asm/pgtable_types.h
+--- linux-3.0.3/arch/x86/include/asm/pgtable_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/pgtable_types.h	2011-08-23 21:47:55.000000000 -0400
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE		7	/* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT		7	/* on 4KB pages */
@@ -9772,7 +8331,7 @@ index 7db7723..4678d89 100644
  #define PGD_IDENT_ATTR	 0x001		/* PRESENT (no other attributes) */
  #endif
  
-@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
+@@ -205,7 +208,17 @@ static inline pgdval_t pgd_flags(pgd_t p
  {
  	return native_pgd_val(pgd) & PTE_FLAGS_MASK;
  }
@@ -9790,7 +8349,7 @@ index 7db7723..4678d89 100644
  #if PAGETABLE_LEVELS > 3
  typedef struct { pudval_t pud; } pud_t;
  
-@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pud_t pud)
+@@ -219,8 +232,6 @@ static inline pudval_t native_pud_val(pu
  	return pud.pud;
  }
  #else
@@ -9799,7 +8358,7 @@ index 7db7723..4678d89 100644
  static inline pudval_t native_pud_val(pud_t pud)
  {
  	return native_pgd_val(pud.pgd);
-@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
+@@ -240,8 +251,6 @@ static inline pmdval_t native_pmd_val(pm
  	return pmd.pmd;
  }
  #else
@@ -9816,11 +8375,10 @@ index 7db7723..4678d89 100644
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
-index 45636ce..1f19db8 100644
---- a/arch/x86/include/asm/processor.h
-+++ b/arch/x86/include/asm/processor.h
-@@ -270,7 +270,7 @@ struct tss_struct {
+diff -urNp linux-3.0.3/arch/x86/include/asm/processor.h linux-3.0.3/arch/x86/include/asm/processor.h
+--- linux-3.0.3/arch/x86/include/asm/processor.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/processor.h	2011-08-23 21:47:55.000000000 -0400
+@@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
  
@@ -9829,7 +8387,7 @@ index 45636ce..1f19db8 100644
  
  /*
   * Save the original ist values for checking stack pointers during debugging
-@@ -864,11 +864,18 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -860,11 +860,18 @@ static inline void spin_lock_prefetch(co
   */
  #define TASK_SIZE		PAGE_OFFSET
  #define TASK_SIZE_MAX		TASK_SIZE
@@ -9850,7 +8408,7 @@ index 45636ce..1f19db8 100644
  	.vm86_info		= NULL,					  \
  	.sysenter_cs		= __KERNEL_CS,				  \
  	.io_bitmap_ptr		= NULL,					  \
-@@ -882,7 +889,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -878,7 +885,7 @@ static inline void spin_lock_prefetch(co
   */
  #define INIT_TSS  {							  \
  	.x86_tss = {							  \
@@ -9859,7 +8417,7 @@ index 45636ce..1f19db8 100644
  		.ss0		= __KERNEL_DS,				  \
  		.ss1		= __KERNEL_CS,				  \
  		.io_bitmap_base	= INVALID_IO_BITMAP_OFFSET,		  \
-@@ -893,11 +900,7 @@ static inline void spin_lock_prefetch(const void *x)
+@@ -889,11 +896,7 @@ static inline void spin_lock_prefetch(co
  extern unsigned long thread_saved_pc(struct task_struct *tsk);
  
  #define THREAD_SIZE_LONGS      (THREAD_SIZE/sizeof(unsigned long))
@@ -9872,7 +8430,7 @@ index 45636ce..1f19db8 100644
  
  /*
   * The below -8 is to reserve 8 bytes on top of the ring0 stack.
-@@ -912,7 +915,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -908,7 +911,7 @@ extern unsigned long thread_saved_pc(str
  #define task_pt_regs(task)                                             \
  ({                                                                     \
         struct pt_regs *__regs__;                                       \
@@ -9881,7 +8439,7 @@ index 45636ce..1f19db8 100644
         __regs__ - 1;                                                   \
  })
  
-@@ -922,13 +925,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -918,13 +921,13 @@ extern unsigned long thread_saved_pc(str
  /*
   * User space process size. 47bits minus one guard page.
   */
@@ -9897,7 +8455,7 @@ index 45636ce..1f19db8 100644
  
  #define TASK_SIZE		(test_thread_flag(TIF_IA32) ? \
  					IA32_PAGE_OFFSET : TASK_SIZE_MAX)
-@@ -939,11 +942,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+@@ -935,11 +938,11 @@ extern unsigned long thread_saved_pc(str
  #define STACK_TOP_MAX		TASK_SIZE_MAX
  
  #define INIT_THREAD  { \
@@ -9911,7 +8469,7 @@ index 45636ce..1f19db8 100644
  }
  
  /*
-@@ -965,6 +968,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
+@@ -961,6 +964,10 @@ extern void start_thread(struct pt_regs 
   */
  #define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
  
@@ -9922,11 +8480,10 @@ index 45636ce..1f19db8 100644
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
-index 78cd1ea..37bd171 100644
---- a/arch/x86/include/asm/ptrace.h
-+++ b/arch/x86/include/asm/ptrace.h
-@@ -152,28 +152,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
+diff -urNp linux-3.0.3/arch/x86/include/asm/ptrace.h linux-3.0.3/arch/x86/include/asm/ptrace.h
+--- linux-3.0.3/arch/x86/include/asm/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/ptrace.h	2011-08-23 21:47:55.000000000 -0400
+@@ -153,28 +153,29 @@ static inline unsigned long regs_return_
  }
  
  /*
@@ -9962,10 +8519,9 @@ index 78cd1ea..37bd171 100644
  #endif
  }
  
-diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
-index 562d4fd..49e31e7 100644
---- a/arch/x86/include/asm/reboot.h
-+++ b/arch/x86/include/asm/reboot.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/reboot.h linux-3.0.3/arch/x86/include/asm/reboot.h
+--- linux-3.0.3/arch/x86/include/asm/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/reboot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -9979,23 +8535,23 @@ index 562d4fd..49e31e7 100644
  	void (*shutdown)(void);
  	void (*crash_shutdown)(struct pt_regs *);
 -	void (*emergency_restart)(void);
+-};
 +	void (* __noreturn emergency_restart)(void);
- };
++} __no_const;
  
  extern struct machine_ops machine_ops;
  
  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 length) __noreturn;
- 
- typedef void (*nmi_shootdown_cb)(int, struct die_args*);
- void nmi_shootdown_cpus(nmi_shootdown_cb callback);
-diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
-index d1e41b0..e6de248 100644
---- a/arch/x86/include/asm/rwsem.h
-+++ b/arch/x86/include/asm/rwsem.h
-@@ -118,6 +118,14 @@ static inline void __down_read(struct rw_semaphore *sem)
+-void machine_real_restart(unsigned int type);
++void machine_real_restart(unsigned int type) __noreturn;
+ /* These must match dispatch_table in reboot_32.S */
+ #define MRR_BIOS	0
+ #define MRR_APM		1
+diff -urNp linux-3.0.3/arch/x86/include/asm/rwsem.h linux-3.0.3/arch/x86/include/asm/rwsem.h
+--- linux-3.0.3/arch/x86/include/asm/rwsem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/rwsem.h	2011-08-23 21:47:55.000000000 -0400
+@@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
  	asm volatile("# beginning down_read\n\t"
  		     LOCK_PREFIX _ASM_INC "(%1)\n\t"
@@ -10010,7 +8566,7 @@ index d1e41b0..e6de248 100644
  		     /* adds 0x00000001 */
  		     "  jns        1f\n"
  		     "  call call_rwsem_down_read_failed\n"
-@@ -139,6 +147,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
+@@ -85,6 +93,14 @@ static inline int __down_read_trylock(st
  		     "1:\n\t"
  		     "  mov          %1,%2\n\t"
  		     "  add          %3,%2\n\t"
@@ -10025,8 +8581,8 @@ index d1e41b0..e6de248 100644
  		     "  jle	     2f\n\t"
  		     LOCK_PREFIX "  cmpxchg  %2,%0\n\t"
  		     "  jnz	     1b\n\t"
-@@ -158,6 +174,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
- 	rwsem_count_t tmp;
+@@ -104,6 +120,14 @@ static inline void __down_write_nested(s
+ 	long tmp;
  	asm volatile("# beginning down_write\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
@@ -10040,8 +8596,8 @@ index d1e41b0..e6de248 100644
  		     /* adds 0xffff0001, returns the old value */
  		     "  test      %1,%1\n\t"
  		     /* was the count 0 before? */
-@@ -196,6 +220,14 @@ static inline void __up_read(struct rw_semaphore *sem)
- 	rwsem_count_t tmp;
+@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_s
+ 	long tmp;
  	asm volatile("# beginning __up_read\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
@@ -10055,8 +8611,8 @@ index d1e41b0..e6de248 100644
  		     /* subtracts 1, returns the old value */
  		     "  jns        1f\n\t"
  		     "  call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -214,6 +246,14 @@ static inline void __up_write(struct rw_semaphore *sem)
- 	rwsem_count_t tmp;
+@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_
+ 	long tmp;
  	asm volatile("# beginning __up_write\n\t"
  		     LOCK_PREFIX "  xadd      %1,(%2)\n\t"
 +
@@ -10070,7 +8626,7 @@ index d1e41b0..e6de248 100644
  		     /* subtracts 0xffff0001, returns the old value */
  		     "  jns        1f\n\t"
  		     "  call call_rwsem_wake\n" /* expects old value in %edx */
-@@ -231,6 +271,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
+@@ -176,6 +216,14 @@ static inline void __downgrade_write(str
  {
  	asm volatile("# beginning __downgrade_write\n\t"
  		     LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
@@ -10085,9 +8641,9 @@ index d1e41b0..e6de248 100644
  		     /*
  		      * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
  		      *     0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
-@@ -250,7 +298,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
- static inline void rwsem_atomic_add(rwsem_count_t delta,
- 				    struct rw_semaphore *sem)
+@@ -194,7 +242,15 @@ static inline void __downgrade_write(str
+  */
+ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
  {
 -	asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
 +	asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
@@ -10102,9 +8658,9 @@ index d1e41b0..e6de248 100644
  		     : "+m" (sem->count)
  		     : "er" (delta));
  }
-@@ -263,7 +319,15 @@ static inline rwsem_count_t rwsem_atomic_update(rwsem_count_t delta,
+@@ -206,7 +262,15 @@ static inline long rwsem_atomic_update(l
  {
- 	rwsem_count_t tmp = delta;
+ 	long tmp = delta;
  
 -	asm volatile(LOCK_PREFIX "xadd %0,%1"
 +	asm volatile(LOCK_PREFIX "xadd %0,%1\n"
@@ -10119,11 +8675,10 @@ index d1e41b0..e6de248 100644
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
-index 231f1c1..538833a 100644
---- a/arch/x86/include/asm/segment.h
-+++ b/arch/x86/include/asm/segment.h
-@@ -62,8 +62,8 @@
+diff -urNp linux-3.0.3/arch/x86/include/asm/segment.h linux-3.0.3/arch/x86/include/asm/segment.h
+--- linux-3.0.3/arch/x86/include/asm/segment.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/segment.h	2011-08-23 21:47:55.000000000 -0400
+@@ -64,8 +64,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
   *  28 - stack_canary-20		[ for stack protector ]
@@ -10134,7 +8689,7 @@ index 231f1c1..538833a 100644
   *  31 - TSS for double fault handler
   */
  #define GDT_ENTRY_TLS_MIN	6
-@@ -77,6 +77,8 @@
+@@ -79,6 +79,8 @@
  
  #define GDT_ENTRY_KERNEL_CS		(GDT_ENTRY_KERNEL_BASE+0)
  
@@ -10143,7 +8698,7 @@ index 231f1c1..538833a 100644
  #define GDT_ENTRY_KERNEL_DS		(GDT_ENTRY_KERNEL_BASE+1)
  
  #define GDT_ENTRY_TSS			(GDT_ENTRY_KERNEL_BASE+4)
-@@ -102,6 +104,12 @@
+@@ -104,6 +106,12 @@
  #define __KERNEL_STACK_CANARY		0
  #endif
  
@@ -10156,7 +8711,7 @@ index 231f1c1..538833a 100644
  #define GDT_ENTRY_DOUBLEFAULT_TSS	31
  
  /*
-@@ -139,7 +147,7 @@
+@@ -141,7 +149,7 @@
   */
  
  /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
@@ -10165,7 +8720,7 @@ index 231f1c1..538833a 100644
  
  
  #else
-@@ -163,6 +171,8 @@
+@@ -165,6 +173,8 @@
  #define __USER32_CS   (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
  #define __USER32_DS	__USER_DS
  
@@ -10174,7 +8729,7 @@ index 231f1c1..538833a 100644
  #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 @@
+@@ -185,6 +195,7 @@
  #endif
  
  #define __KERNEL_CS	(GDT_ENTRY_KERNEL_CS*8)
@@ -10182,20 +8737,28 @@ index 231f1c1..538833a 100644
  #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 --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
-index 1f46951..57ac225 100644
---- a/arch/x86/include/asm/smp.h
-+++ b/arch/x86/include/asm/smp.h
-@@ -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);
+diff -urNp linux-3.0.3/arch/x86/include/asm/smp.h linux-3.0.3/arch/x86/include/asm/smp.h
+--- linux-3.0.3/arch/x86/include/asm/smp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/smp.h	2011-08-23 21:47:55.000000000 -0400
+@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
+ /* cpus sharing the last level cache: */
+ DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
  DECLARE_PER_CPU(u16, cpu_llc_id);
 -DECLARE_PER_CPU(int, cpu_number);
 +DECLARE_PER_CPU(unsigned int, cpu_number);
  
  static inline struct cpumask *cpu_sibling_mask(int cpu)
  {
-@@ -172,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitdata;
+@@ -77,7 +77,7 @@ struct smp_ops {
+ 
+ 	void (*send_call_func_ipi)(const struct cpumask *mask);
+ 	void (*send_call_func_single_ipi)(int cpu);
+-};
++} __no_const;
+ 
+ /* Globals due to paravirt */
+ extern void set_cpu_sibling_map(int cpu);
+@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitd
  extern int safe_smp_processor_id(void);
  
  #elif defined(CONFIG_X86_64_SMP)
@@ -10212,11 +8775,10 @@ index 1f46951..57ac225 100644
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
-index 3089f70..db20eed 100644
---- a/arch/x86/include/asm/spinlock.h
-+++ b/arch/x86/include/asm/spinlock.h
-@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
+diff -urNp linux-3.0.3/arch/x86/include/asm/spinlock.h linux-3.0.3/arch/x86/include/asm/spinlock.h
+--- linux-3.0.3/arch/x86/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+@@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
  	asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
@@ -10231,7 +8793,7 @@ index 3089f70..db20eed 100644
  		     "jns 1f\n"
  		     "call __read_lock_failed\n\t"
  		     "1:\n"
-@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
+@@ -258,6 +266,14 @@ static inline void arch_read_lock(arch_r
  static inline void arch_write_lock(arch_rwlock_t *rw)
  {
  	asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
@@ -10246,7 +8808,7 @@ index 3089f70..db20eed 100644
  		     "jz 1f\n"
  		     "call __write_lock_failed\n\t"
  		     "1:\n"
-@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
+@@ -286,12 +302,29 @@ static inline int arch_write_trylock(arc
  
  static inline void arch_read_unlock(arch_rwlock_t *rw)
  {
@@ -10278,11 +8840,19 @@ index 3089f70..db20eed 100644
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
-index 1575177..dbc9f36 100644
---- a/arch/x86/include/asm/stackprotector.h
-+++ b/arch/x86/include/asm/stackprotector.h
-@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
+diff -urNp linux-3.0.3/arch/x86/include/asm/stackprotector.h linux-3.0.3/arch/x86/include/asm/stackprotector.h
+--- linux-3.0.3/arch/x86/include/asm/stackprotector.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/stackprotector.h	2011-08-23 21:47:55.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] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
++	[GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
+ 
+ /*
+  * Initialize the stackprotector canary value.
+@@ -113,7 +113,7 @@ static inline void setup_stack_canary_se
  
  static inline void load_stack_canary_segment(void)
  {
@@ -10291,10 +8861,9 @@ index 1575177..dbc9f36 100644
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
-index 52b5c7e..92a8655 100644
---- a/arch/x86/include/asm/stacktrace.h
-+++ b/arch/x86/include/asm/stacktrace.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/stacktrace.h linux-3.0.3/arch/x86/include/asm/stacktrace.h
+--- linux-3.0.3/arch/x86/include/asm/stacktrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/stacktrace.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -10336,7 +8905,7 @@ index 52b5c7e..92a8655 100644
  
  /* Generic stack tracer with callbacks */
  
-@@ -43,7 +35,7 @@ struct stacktrace_ops {
+@@ -40,7 +32,7 @@ struct stacktrace_ops {
  	void (*address)(void *data, unsigned long address, int reliable);
  	/* On negative return stop dumping */
  	int (*stack)(void *data, char *name);
@@ -10345,11 +8914,10 @@ index 52b5c7e..92a8655 100644
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
-index 33ecc3e..e936220 100644
---- a/arch/x86/include/asm/system.h
-+++ b/arch/x86/include/asm/system.h
-@@ -131,7 +131,7 @@ do {									\
+diff -urNp linux-3.0.3/arch/x86/include/asm/system.h linux-3.0.3/arch/x86/include/asm/system.h
+--- linux-3.0.3/arch/x86/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+@@ -129,7 +129,7 @@ do {									\
  	     "call __switch_to\n\t"					  \
  	     "movq "__percpu_arg([current_task])",%%rsi\n\t"		  \
  	     __switch_canary						  \
@@ -10358,7 +8926,7 @@ index 33ecc3e..e936220 100644
  	     "movq %%rax,%%rdi\n\t" 					  \
  	     "testl  %[_tif_fork],%P[ti_flags](%%r8)\n\t"		  \
  	     "jnz   ret_from_fork\n\t"					  \
-@@ -142,7 +142,7 @@ do {									\
+@@ -140,7 +140,7 @@ do {									\
  	       [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
  	       [ti_flags] "i" (offsetof(struct thread_info, flags)),	  \
  	       [_tif_fork] "i" (_TIF_FORK),			  	  \
@@ -10367,7 +8935,7 @@ index 33ecc3e..e936220 100644
  	       [current_task] "m" (current_task)			  \
  	       __switch_canary_iparam					  \
  	     : "memory", "cc" __EXTRA_CLOBBER)
-@@ -202,7 +202,7 @@ static inline unsigned long get_limit(unsigned long segment)
+@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
  {
  	unsigned long __limit;
  	asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
@@ -10376,7 +8944,7 @@ index 33ecc3e..e936220 100644
  }
  
  static inline void native_clts(void)
-@@ -342,12 +342,12 @@ void enable_hlt(void);
+@@ -397,12 +397,12 @@ void enable_hlt(void);
  
  void cpu_idle_wait(void);
  
@@ -10391,10 +8959,9 @@ index 33ecc3e..e936220 100644
  
  /*
   * Force strict CPU ordering.
-diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index f0b6e5d..83cb269 100644
---- a/arch/x86/include/asm/thread_info.h
-+++ b/arch/x86/include/asm/thread_info.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/thread_info.h linux-3.0.3/arch/x86/include/asm/thread_info.h
+--- linux-3.0.3/arch/x86/include/asm/thread_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/thread_info.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -10441,9 +9008,9 @@ index f0b6e5d..83cb269 100644
  #define init_stack		(init_thread_union.stack)
  
  #else /* !__ASSEMBLY__ */
-@@ -164,6 +158,23 @@ struct thread_info {
- #define alloc_thread_info(tsk)						\
- 	((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))
+@@ -170,6 +164,23 @@ struct thread_info {
+ 	ret;								\
+ })
  
 +#ifdef __ASSEMBLY__
 +/* how to get the thread information struct from ASM */
@@ -10465,7 +9032,7 @@ index f0b6e5d..83cb269 100644
  #ifdef CONFIG_X86_32
  
  #define STACK_WARN	(THREAD_SIZE/8)
-@@ -174,35 +185,13 @@ struct thread_info {
+@@ -180,35 +191,13 @@ struct thread_info {
   */
  #ifndef __ASSEMBLY__
  
@@ -10501,7 +9068,7 @@ index f0b6e5d..83cb269 100644
  /*
   * macros/functions for gaining access to the thread information structure
   * preempt_count needs to be 1 initially, until the scheduler is functional.
-@@ -210,21 +199,8 @@ static inline struct thread_info *current_thread_info(void)
+@@ -216,21 +205,8 @@ static inline struct thread_info *curren
  #ifndef __ASSEMBLY__
  DECLARE_PER_CPU(unsigned long, kernel_stack);
  
@@ -10525,7 +9092,7 @@ index f0b6e5d..83cb269 100644
  #endif
  
  #endif /* !X86_32 */
-@@ -260,5 +236,16 @@ extern void arch_task_cache_init(void);
+@@ -266,5 +242,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_struct *src);
  #define arch_task_cache_init arch_task_cache_init
@@ -10537,238 +9104,15 @@ index f0b6e5d..83cb269 100644
 +#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 struct task_struct *alloc_task_struct_node(int node);
 +extern void free_task_struct(struct task_struct *);
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
-index 99f0ad7..a3b4be3 100644
---- a/arch/x86/include/asm/uaccess.h
-+++ b/arch/x86/include/asm/uaccess.h
-@@ -8,12 +8,15 @@
- #include <linux/thread_info.h>
- #include <linux/prefetch.h>
- #include <linux/string.h>
-+#include <linux/sched.h>
- #include <asm/asm.h>
- #include <asm/page.h>
- 
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
- 
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+
- /*
-  * The fs value determines whether argument validity checking should be
-  * performed or not.  If get_fs() == USER_DS, checking is performed, with
-@@ -29,7 +32,12 @@
- 
- #define get_ds()	(KERNEL_DS)
- #define get_fs()	(current_thread_info()->addr_limit)
-+#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 = (x))
-+#endif
- 
- #define segment_eq(a, b)	((a).seg == (b).seg)
- 
-@@ -77,7 +85,33 @@
-  * checks that the pointer is in the user space range - after calling
-  * this function, memory access functions may still return -EFAULT.
-  */
--#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
-+#define access_ok(type, addr, size)					\
-+({									\
-+	long __size = size;						\
-+	unsigned long __addr = (unsigned long)addr;			\
-+	unsigned long __addr_ao = __addr & PAGE_MASK;			\
-+	unsigned long __end_ao = __addr + __size - 1;			\
-+	bool __ret_ao = __range_not_ok(__addr, __size) == 0;		\
-+	if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) {	\
-+		while(__addr_ao <= __end_ao) {				\
-+			char __c_ao;					\
-+			__addr_ao += PAGE_SIZE;				\
-+			if (__size > PAGE_SIZE)				\
-+				cond_resched();				\
-+			if (__get_user(__c_ao, (char __user *)__addr))	\
-+				break;					\
-+			if (type != VERIFY_WRITE) {			\
-+				__addr = __addr_ao;			\
-+				continue;				\
-+			}						\
-+			if (__put_user(__c_ao, (char __user *)__addr))	\
-+				break;					\
-+			__addr = __addr_ao;				\
-+		}							\
-+	}								\
-+	__ret_ao;							\
-+})
- 
- /*
-  * The exception table consists of pairs of addresses: the first is the
-@@ -183,12 +217,20 @@ extern int __get_user_bad(void);
- 	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\
- 		     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
- 
--
-+#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
- 
- #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))
- 
- #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)
- 
- #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)				\
--		     : "=r" (err), ltype(x)				\
-+		     : "=r" (err), ltype (x)				\
- 		     : "m" (__m(addr)), "i" (errret), "0" (err))
- 
- #define __get_user_size_ex(x, ptr, size)				\
-@@ -407,7 +449,7 @@ do {									\
- } while (0)
- 
- #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) = (__force __typeof__(*(ptr)))__gu_val;			\
-+	(x) = (__typeof__(*(ptr)))__gu_val;				\
- 	__gu_err;							\
- })
- 
- /* FIXME: this hack is definitely wrong -AK */
- struct __large_struct { unsigned long buf[100]; };
--#define __m(x) (*(struct __large_struct __user *)(x))
-+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
-+#define ____m(x)					\
-+({							\
-+	unsigned long ____x = (unsigned long)(x);	\
-+	if (____x < PAX_USER_SHADOW_BASE)		\
-+		____x += PAX_USER_SHADOW_BASE;		\
-+	(void __user *)____x;				\
-+})
-+#else
-+#define ____m(x) (x)
-+#endif
-+#define __m(x) (*(struct __large_struct __user *)____m(x))
- 
- /*
-  * Tell gcc we read from memory instead of writing: this is because
-@@ -438,7 +491,7 @@ struct __large_struct { unsigned long buf[100]; };
-  * 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 buf[100]; };
- 		     ".previous\n"					\
- 		     _ASM_EXTABLE(1b, 3b)				\
- 		     : "=r"(err)					\
--		     : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
-+		     : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
- 
- #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 buf[100]; };
-  * On error, the variable @x is set to zero.
-  */
- 
-+#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
- 
- /**
-  * __put_user: - Write a simple value into user space, with less checking.
-@@ -511,8 +568,12 @@ struct __large_struct { unsigned long buf[100]; };
-  * Returns zero on success, or -EFAULT on error.
-  */
- 
-+#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
- 
- #define __get_user_unaligned __get_user
- #define __put_user_unaligned __put_user
-@@ -530,7 +591,7 @@ struct __large_struct { unsigned long buf[100]; };
- #define get_user_ex(x, ptr)	do {					\
- 	unsigned long __gue_val;					\
- 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
--	(x) = (__force __typeof__(*(ptr)))__gue_val;			\
-+	(x) = (__typeof__(*(ptr)))__gue_val;				\
- } while (0)
- 
- #ifdef CONFIG_X86_WP_WORKS_OK
-@@ -567,6 +628,7 @@ extern struct movsl_mask {
- 
- #define ARCH_HAS_NOCACHE_UACCESS 1
- 
-+#define ARCH_HAS_SORT_EXTABLE
- #ifdef CONFIG_X86_32
- # include "uaccess_32.h"
- #else
-diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
-index 088d09f..32f165f 100644
---- a/arch/x86/include/asm/uaccess_32.h
-+++ b/arch/x86/include/asm/uaccess_32.h
-@@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
+diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_32.h linux-3.0.3/arch/x86/include/asm/uaccess_32.h
+--- linux-3.0.3/arch/x86/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/uaccess_32.h	2011-08-23 21:48:14.000000000 -0400
+@@ -43,6 +43,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 long n)
  {
@@ -10780,7 +9124,7 @@ index 088d09f..32f165f 100644
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
+@@ -61,6 +66,8 @@ __copy_to_user_inatomic(void __user *to,
  			return ret;
  		}
  	}
@@ -10789,7 +9133,7 @@ index 088d09f..32f165f 100644
  	return __copy_to_user_ll(to, from, n);
  }
  
-@@ -83,12 +90,16 @@ static __always_inline unsigned long __must_check
+@@ -82,12 +89,16 @@ static __always_inline unsigned long __m
  __copy_to_user(void __user *to, const void *from, unsigned long n)
  {
  	might_fault();
@@ -10806,7 +9150,7 @@ index 088d09f..32f165f 100644
  	/* 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
+@@ -137,6 +148,12 @@ static __always_inline unsigned long
  __copy_from_user(void *to, const void __user *from, unsigned long n)
  {
  	might_fault();
@@ -10819,7 +9163,7 @@ index 088d09f..32f165f 100644
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
+@@ -152,6 +169,8 @@ __copy_from_user(void *to, const void __
  			return ret;
  		}
  	}
@@ -10828,7 +9172,7 @@ index 088d09f..32f165f 100644
  	return __copy_from_user_ll(to, from, n);
  }
  
-@@ -160,6 +179,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
+@@ -159,6 +178,10 @@ static __always_inline unsigned long __c
  				const void __user *from, unsigned long n)
  {
  	might_fault();
@@ -10839,7 +9183,7 @@ index 088d09f..32f165f 100644
  	if (__builtin_constant_p(n)) {
  		unsigned long ret;
  
-@@ -182,15 +205,19 @@ static __always_inline unsigned long
+@@ -181,15 +204,19 @@ static __always_inline unsigned long
  __copy_from_user_inatomic_nocache(void *to, const void __user *from,
  				  unsigned long n)
  {
@@ -10866,7 +9210,7 @@ index 088d09f..32f165f 100644
  
  extern void copy_from_user_overflow(void)
  #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
-@@ -200,17 +227,61 @@ extern void copy_from_user_overflow(void)
+@@ -199,17 +226,61 @@ extern void copy_from_user_overflow(void
  #endif
  ;
  
@@ -10935,11 +9279,10 @@ index 088d09f..32f165f 100644
  	return n;
  }
  
-diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
-index 316708d..4610991 100644
---- a/arch/x86/include/asm/uaccess_64.h
-+++ b/arch/x86/include/asm/uaccess_64.h
-@@ -11,6 +11,9 @@
+diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_64.h linux-3.0.3/arch/x86/include/asm/uaccess_64.h
+--- linux-3.0.3/arch/x86/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/uaccess_64.h	2011-08-23 21:48:14.000000000 -0400
+@@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
  #include <asm/page.h>
@@ -10949,7 +9292,7 @@ index 316708d..4610991 100644
  
  /*
   * Copy To/From Userspace
-@@ -37,26 +40,26 @@ copy_user_generic(void *to, const void *from, unsigned len)
+@@ -36,26 +39,26 @@ copy_user_generic(void *to, const void *
  	return ret;
  }
  
@@ -10989,7 +9332,7 @@ index 316708d..4610991 100644
  	return n;
  }
  
-@@ -65,110 +68,198 @@ int copy_to_user(void __user *dst, const void *src, unsigned size)
+@@ -64,110 +67,198 @@ int copy_to_user(void __user *dst, const
  {
  	might_fault();
  
@@ -11218,7 +9561,7 @@ index 316708d..4610991 100644
  			       ret, "b", "b", "=q", 1);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u8 __user *)dst,
-@@ -177,7 +268,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -176,7 +267,7 @@ int __copy_in_user(void __user *dst, con
  	}
  	case 2: {
  		u16 tmp;
@@ -11227,7 +9570,7 @@ index 316708d..4610991 100644
  			       ret, "w", "w", "=r", 2);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u16 __user *)dst,
-@@ -187,7 +278,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -186,7 +277,7 @@ int __copy_in_user(void __user *dst, con
  
  	case 4: {
  		u32 tmp;
@@ -11236,7 +9579,7 @@ index 316708d..4610991 100644
  			       ret, "l", "k", "=r", 4);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u32 __user *)dst,
-@@ -196,7 +287,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -195,7 +286,7 @@ int __copy_in_user(void __user *dst, con
  	}
  	case 8: {
  		u64 tmp;
@@ -11245,7 +9588,7 @@ index 316708d..4610991 100644
  			       ret, "q", "", "=r", 8);
  		if (likely(!ret))
  			__put_user_asm(tmp, (u64 __user *)dst,
-@@ -204,8 +295,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
+@@ -203,8 +294,16 @@ int __copy_in_user(void __user *dst, con
  		return ret;
  	}
  	default:
@@ -11263,7 +9606,7 @@ index 316708d..4610991 100644
  	}
  }
  
-@@ -222,33 +321,72 @@ __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
+@@ -221,33 +320,72 @@ __must_check unsigned long __clear_user(
  static __must_check __always_inline int
  __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
  {
@@ -11343,10 +9686,222 @@ index 316708d..4610991 100644
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
-index 3d61e20..9507180 100644
---- a/arch/x86/include/asm/vgtod.h
-+++ b/arch/x86/include/asm/vgtod.h
+diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess.h linux-3.0.3/arch/x86/include/asm/uaccess.h
+--- linux-3.0.3/arch/x86/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+@@ -7,12 +7,15 @@
+ #include <linux/compiler.h>
+ #include <linux/thread_info.h>
+ #include <linux/string.h>
++#include <linux/sched.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+ 
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+  * The fs value determines whether argument validity checking should be
+  * performed or not.  If get_fs() == USER_DS, checking is performed, with
+@@ -28,7 +31,12 @@
+ 
+ #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 = (x))
++#endif
+ 
+ #define segment_eq(a, b)	((a).seg == (b).seg)
+ 
+@@ -76,7 +84,33 @@
+  * checks that the pointer is in the user space range - after calling
+  * this function, memory access functions may still return -EFAULT.
+  */
+-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
++#define access_ok(type, addr, size)					\
++({									\
++	long __size = size;						\
++	unsigned long __addr = (unsigned long)addr;			\
++	unsigned long __addr_ao = __addr & PAGE_MASK;			\
++	unsigned long __end_ao = __addr + __size - 1;			\
++	bool __ret_ao = __range_not_ok(__addr, __size) == 0;		\
++	if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) {	\
++		while(__addr_ao <= __end_ao) {				\
++			char __c_ao;					\
++			__addr_ao += PAGE_SIZE;				\
++			if (__size > PAGE_SIZE)				\
++				cond_resched();				\
++			if (__get_user(__c_ao, (char __user *)__addr))	\
++				break;					\
++			if (type != VERIFY_WRITE) {			\
++				__addr = __addr_ao;			\
++				continue;				\
++			}						\
++			if (__put_user(__c_ao, (char __user *)__addr))	\
++				break;					\
++			__addr = __addr_ao;				\
++		}							\
++	}								\
++	__ret_ao;							\
++})
+ 
+ /*
+  * The exception table consists of pairs of addresses: the first is the
+@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
+ 	asm volatile("call __put_user_" #size : "=a" (__ret_pu)	\
+ 		     : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
+ 
+-
++#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
+ 
+ #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"				\
+@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
+ 		     : "A" (x), "r" (addr), "i" (errret), "0" (err))
+ 
+ #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)				\
+@@ -373,7 +415,7 @@ do {									\
+ } while (0)
+ 
+ #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
+-	asm volatile("1:	mov"itype" %2,%"rtype"1\n"		\
++	asm volatile("1:	"__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
+ 		     "2:\n"						\
+ 		     ".section .fixup,\"ax\"\n"				\
+ 		     "3:	mov %3,%0\n"				\
+@@ -381,7 +423,7 @@ do {									\
+ 		     "	jmp 2b\n"					\
+ 		     ".previous\n"					\
+ 		     _ASM_EXTABLE(1b, 3b)				\
+-		     : "=r" (err), ltype(x)				\
++		     : "=r" (err), ltype (x)				\
+ 		     : "m" (__m(addr)), "i" (errret), "0" (err))
+ 
+ #define __get_user_size_ex(x, ptr, size)				\
+@@ -406,7 +448,7 @@ do {									\
+ } while (0)
+ 
+ #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)))
+@@ -423,13 +465,24 @@ do {									\
+ 	int __gu_err;							\
+ 	unsigned long __gu_val;						\
+ 	__get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT);	\
+-	(x) = (__force __typeof__(*(ptr)))__gu_val;			\
++	(x) = (__typeof__(*(ptr)))__gu_val;				\
+ 	__gu_err;							\
+ })
+ 
+ /* FIXME: this hack is definitely wrong -AK */
+ struct __large_struct { unsigned long buf[100]; };
+-#define __m(x) (*(struct __large_struct __user *)(x))
++#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
++#define ____m(x)					\
++({							\
++	unsigned long ____x = (unsigned long)(x);	\
++	if (____x < PAX_USER_SHADOW_BASE)		\
++		____x += PAX_USER_SHADOW_BASE;		\
++	(void __user *)____x;				\
++})
++#else
++#define ____m(x) (x)
++#endif
++#define __m(x) (*(struct __large_struct __user *)____m(x))
+ 
+ /*
+  * Tell gcc we read from memory instead of writing: this is because
+@@ -437,7 +490,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"				\
+@@ -445,10 +498,10 @@ struct __large_struct { unsigned long bu
+ 		     ".previous\n"					\
+ 		     _ASM_EXTABLE(1b, 3b)				\
+ 		     : "=r"(err)					\
+-		     : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
++		     : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
+ 
+ #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)))
+@@ -487,8 +540,12 @@ struct __large_struct { unsigned long bu
+  * On error, the variable @x is set to zero.
+  */
+ 
++#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
+ 
+ /**
+  * __put_user: - Write a simple value into user space, with less checking.
+@@ -510,8 +567,12 @@ struct __large_struct { unsigned long bu
+  * Returns zero on success, or -EFAULT on error.
+  */
+ 
++#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
+ 
+ #define __get_user_unaligned __get_user
+ #define __put_user_unaligned __put_user
+@@ -529,7 +590,7 @@ struct __large_struct { unsigned long bu
+ #define get_user_ex(x, ptr)	do {					\
+ 	unsigned long __gue_val;					\
+ 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
+-	(x) = (__force __typeof__(*(ptr)))__gue_val;			\
++	(x) = (__typeof__(*(ptr)))__gue_val;				\
+ } while (0)
+ 
+ #ifdef CONFIG_X86_WP_WORKS_OK
+diff -urNp linux-3.0.3/arch/x86/include/asm/vgtod.h linux-3.0.3/arch/x86/include/asm/vgtod.h
+--- linux-3.0.3/arch/x86/include/asm/vgtod.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/vgtod.h	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
  	int		sysctl_enabled;
  	struct timezone sys_tz;
@@ -11355,45 +9910,130 @@ index 3d61e20..9507180 100644
  		cycle_t (*vread)(void);
  		cycle_t	cycle_last;
  		cycle_t	mask;
-diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
-index d0983d2..1f7c9e9 100644
---- a/arch/x86/include/asm/vsyscall.h
-+++ b/arch/x86/include/asm/vsyscall.h
-@@ -15,9 +15,10 @@ enum vsyscall_num {
+diff -urNp linux-3.0.3/arch/x86/include/asm/x86_init.h linux-3.0.3/arch/x86/include/asm/x86_init.h
+--- linux-3.0.3/arch/x86/include/asm/x86_init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/x86_init.h	2011-08-23 21:47: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)(void);
+ 	void (*get_smp_config)(unsigned int early);
+-};
++} __no_const;
  
- #ifdef __KERNEL__
- #include <linux/seqlock.h>
-+#include <linux/getcpu.h>
-+#include <linux/time.h>
+ /**
+  * 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;
  
- #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
--#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
+ /**
+  * 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;
  
- /* Definitions for CONFIG_GENERIC_TIME definitions */
- #define __section_vsyscall_gtod_data __attribute__ \
-@@ -31,7 +32,6 @@ enum vsyscall_num {
- #define VGETCPU_LSL	2
+ /**
+  * 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;
  
- extern int __vgetcpu_mode;
--extern volatile unsigned long __jiffies;
+ /**
+  * struct x86_init_mapping - platform specific initial kernel pagetable setup
+@@ -76,7 +76,7 @@ struct x86_init_oem {
+  */
+ struct x86_init_mapping {
+ 	void (*pagetable_reserve)(u64 start, u64 end);
+-};
++} __no_const;
  
- /* kernel space (writeable) */
- extern int vgetcpu_mode;
-@@ -39,6 +39,9 @@ extern struct timezone sys_tz;
+ /**
+  * struct x86_init_paging - platform specific paging functions
+@@ -86,7 +86,7 @@ struct x86_init_mapping {
+ struct x86_init_paging {
+ 	void (*pagetable_setup_start)(pgd_t *base);
+ 	void (*pagetable_setup_done)(pgd_t *base);
+-};
++} __no_const;
  
- extern void map_vsyscall(void);
+ /**
+  * struct x86_init_timers - platform specific timer setup
+@@ -101,7 +101,7 @@ struct x86_init_timers {
+ 	void (*tsc_pre_init)(void);
+ 	void (*timer_init)(void);
+ 	void (*wallclock_init)(void);
+-};
++} __no_const;
  
-+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__ */
+ /**
+  * struct x86_init_iommu - platform specific iommu setup
+@@ -109,7 +109,7 @@ struct x86_init_timers {
+  */
+ struct x86_init_iommu {
+ 	int (*iommu_init)(void);
+-};
++} __no_const;
  
- #endif /* _ASM_X86_VSYSCALL_H */
-diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
-index c6ce245..c053b0b 100644
---- a/arch/x86/include/asm/xsave.h
-+++ b/arch/x86/include/asm/xsave.h
-@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
+ /**
+  * struct x86_init_pci - platform specific pci init functions
+@@ -123,7 +123,7 @@ struct x86_init_pci {
+ 	int (*init)(void);
+ 	void (*init_irq)(void);
+ 	void (*fixup_irqs)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_init_ops - functions for platform specific setup
+@@ -139,7 +139,7 @@ struct x86_init_ops {
+ 	struct x86_init_timers		timers;
+ 	struct x86_init_iommu		iommu;
+ 	struct x86_init_pci		pci;
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_cpuinit_ops - platform specific cpu hotplug setups
+@@ -147,7 +147,7 @@ struct x86_init_ops {
+  */
+ struct x86_cpuinit_ops {
+ 	void (*setup_percpu_clockev)(void);
+-};
++} __no_const;
+ 
+ /**
+  * struct x86_platform_ops - platform specific runtime functions
+@@ -166,7 +166,7 @@ struct x86_platform_ops {
+ 	bool (*is_untracked_pat_range)(u64 start, u64 end);
+ 	void (*nmi_init)(void);
+ 	int (*i8042_detect)(void);
+-};
++} __no_const;
+ 
+ struct pci_dev;
+ 
+@@ -174,7 +174,7 @@ struct x86_msi_ops {
+ 	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
+ 	void (*teardown_msi_irq)(unsigned int irq);
+ 	void (*teardown_msi_irqs)(struct pci_dev *dev);
+-};
++} __no_const;
+ 
+ extern struct x86_init_ops x86_init;
+ extern struct x86_cpuinit_ops x86_cpuinit;
+diff -urNp linux-3.0.3/arch/x86/include/asm/xsave.h linux-3.0.3/arch/x86/include/asm/xsave.h
+--- linux-3.0.3/arch/x86/include/asm/xsave.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/include/asm/xsave.h	2011-08-23 21:47:55.000000000 -0400
+@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
  
@@ -11405,7 +10045,7 @@ index c6ce245..c053b0b 100644
  	/*
  	 * Clear the xsave header first, so that reserved fields are
  	 * initialized to zero.
-@@ -100,6 +105,11 @@ static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
+@@ -100,6 +105,11 @@ static inline int xrestore_user(struct x
  	u32 lmask = mask;
  	u32 hmask = mask >> 32;
  
@@ -11417,21 +10057,180 @@ index c6ce245..c053b0b 100644
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
-index 68d1537..83b0146 100644
---- a/arch/x86/kernel/acpi/sleep.c
-+++ b/arch/x86/kernel/acpi/sleep.c
-@@ -18,7 +18,7 @@
- #include "realmode/wakeup.h"
- #include "sleep.h"
+diff -urNp linux-3.0.3/arch/x86/Kconfig linux-3.0.3/arch/x86/Kconfig
+--- linux-3.0.3/arch/x86/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -229,7 +229,7 @@ config X86_HT
  
--unsigned long acpi_wakeup_address;
-+unsigned long acpi_wakeup_address = 0x2000;
- unsigned long acpi_realmode_flags;
+ config X86_32_LAZY_GS
+ 	def_bool y
+-	depends on X86_32 && !CC_STACKPROTECTOR
++	depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
+ 
+ config ARCH_HWEIGHT_CFLAGS
+ 	string
+@@ -1018,7 +1018,7 @@ choice
  
- /* address in low memory of the wakeup routine. */
-@@ -99,8 +99,12 @@ int acpi_save_state_mem(void)
- 	header->trampoline_segment = setup_trampoline() >> 4;
+ 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
+@@ -1055,7 +1055,7 @@ config NOHIGHMEM
+ 
+ config HIGHMEM4G
+ 	bool "4GB"
+-	depends on !X86_NUMAQ
++	depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
+ 	---help---
+ 	  Select this if you have a 32-bit processor and between 1 and 4
+ 	  gigabytes of physical RAM.
+@@ -1109,7 +1109,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
+@@ -1453,7 +1453,7 @@ config ARCH_USES_PG_UNCACHED
+ 
+ config EFI
+ 	bool "EFI runtime service support"
+-	depends on ACPI
++	depends on ACPI && !PAX_KERNEXEC
+ 	---help---
+ 	  This enables the kernel to use EFI runtime services that are
+ 	  available (such as the EFI variable services).
+@@ -1483,6 +1483,7 @@ config SECCOMP
+ 
+ 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
+@@ -1540,6 +1541,7 @@ config KEXEC_JUMP
+ config PHYSICAL_START
+ 	hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
+ 	default "0x1000000"
++	range 0x400000 0x40000000
+ 	---help---
+ 	  This gives the physical address where the kernel is loaded.
+ 
+@@ -1603,6 +1605,7 @@ config X86_NEED_RELOCS
+ config PHYSICAL_ALIGN
+ 	hex "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
+@@ -1634,9 +1637,10 @@ config HOTPLUG_CPU
+ 	  Say N if you want to disable CPU hotplug.
+ 
+ config COMPAT_VDSO
+-	def_bool y
++	def_bool n
+ 	prompt "Compat VDSO support"
+ 	depends on X86_32 || IA32_EMULATION
++	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+ 	---help---
+ 	  Map the 32-bit VDSO to the predictable old-style address too.
+ 
+diff -urNp linux-3.0.3/arch/x86/Kconfig.cpu linux-3.0.3/arch/x86/Kconfig.cpu
+--- linux-3.0.3/arch/x86/Kconfig.cpu	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/Kconfig.cpu	2011-08-23 21:47:55.000000000 -0400
+@@ -338,7 +338,7 @@ config X86_PPRO_FENCE
+ 
+ config X86_F00F_BUG
+ 	def_bool y
+-	depends on M586MMX || M586TSC || M586 || M486 || M386
++	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
+ 
+ config X86_INVD_BUG
+ 	def_bool y
+@@ -362,7 +362,7 @@ config X86_POPAD_OK
+ 
+ config X86_ALIGNMENT_16
+ 	def_bool y
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+ 
+ config X86_INTEL_USERCOPY
+ 	def_bool y
+@@ -408,7 +408,7 @@ config X86_CMPXCHG64
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
++	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+diff -urNp linux-3.0.3/arch/x86/Kconfig.debug linux-3.0.3/arch/x86/Kconfig.debug
+--- linux-3.0.3/arch/x86/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/Kconfig.debug	2011-08-23 21:47:55.000000000 -0400
+@@ -81,7 +81,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
+@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
+ 
+ config DEBUG_SET_MODULE_RONX
+ 	bool "Set loadable kernel module data as NX and text as RO"
+-	depends on MODULES
++	depends on MODULES && BROKEN
+ 	---help---
+ 	  This option helps catch unintended modifications to loadable
+ 	  kernel module's text and read-only data. It also prevents execution
+diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -41,6 +41,9 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os 
+ 		   $(call cc-option, -fno-stack-protector) \
+ 		   $(call cc-option, -mpreferred-stack-boundary=2)
+ KBUILD_CFLAGS	+= $(call cc-option, -m32)
++ifdef CONSTIFY_PLUGIN
++KBUILD_CFLAGS	+= $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
++endif
+ KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
+ GCOV_PROFILE := n
+ 
+diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S	2011-08-23 21:48:14.000000000 -0400
+@@ -108,6 +108,9 @@ wakeup_code:
+ 	/* Do any other stuff... */
+ 
+ #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
+@@ -131,6 +134,7 @@ wakeup_code:
+ 	movl	pmode_cr0, %eax
+ 	movl	%eax, %cr0
+ 	jmp	pmode_return
++# include "../../verify_cpu.S"
+ #else
+ 	pushw	$0
+ 	pushw	trampoline_segment
+diff -urNp linux-3.0.3/arch/x86/kernel/acpi/sleep.c linux-3.0.3/arch/x86/kernel/acpi/sleep.c
+--- linux-3.0.3/arch/x86/kernel/acpi/sleep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/acpi/sleep.c	2011-08-23 21:47:55.000000000 -0400
+@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
+ 	header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
  	stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
 +
@@ -11443,10 +10242,9 @@ index 68d1537..83b0146 100644
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
-index 13ab720..95d5442 100644
---- a/arch/x86/kernel/acpi/wakeup_32.S
-+++ b/arch/x86/kernel/acpi/wakeup_32.S
+diff -urNp linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S	2011-08-23 21:47:55.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
@@ -11463,11 +10261,10 @@ index 13ab720..95d5442 100644
  
  bogus_magic:
  	jmp	bogus_magic
-diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
-index 4db3554..c9ea243 100644
---- a/arch/x86/kernel/alternative.c
-+++ b/arch/x86/kernel/alternative.c
-@@ -248,7 +248,7 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
+diff -urNp linux-3.0.3/arch/x86/kernel/alternative.c linux-3.0.3/arch/x86/kernel/alternative.c
+--- linux-3.0.3/arch/x86/kernel/alternative.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/alternative.c	2011-08-23 21:47:55.000000000 -0400
+@@ -313,7 +313,7 @@ static void alternatives_smp_lock(const 
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
  		/* turn DS segment override prefix into lock prefix */
@@ -11476,7 +10273,7 @@ index 4db3554..c9ea243 100644
  			text_poke(ptr, ((unsigned char []){0xf0}), 1);
  	};
  	mutex_unlock(&text_mutex);
-@@ -269,7 +269,7 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
+@@ -334,7 +334,7 @@ static void alternatives_smp_unlock(cons
  		if (!*poff || ptr < text || ptr >= text_end)
  			continue;
  		/* turn lock prefix into DS segment override prefix */
@@ -11485,7 +10282,7 @@ index 4db3554..c9ea243 100644
  			text_poke(ptr, ((unsigned char []){0x3E}), 1);
  	};
  	mutex_unlock(&text_mutex);
-@@ -438,7 +438,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
+@@ -503,7 +503,7 @@ void __init_or_module apply_paravirt(str
  
  		BUG_ON(p->len > MAX_PATCH_LEN);
  		/* prep the buffer with the original instructions */
@@ -11494,7 +10291,7 @@ index 4db3554..c9ea243 100644
  		used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
  					 (unsigned long)p->instr, p->len);
  
-@@ -506,7 +506,7 @@ void __init alternative_instructions(void)
+@@ -571,7 +571,7 @@ void __init alternative_instructions(voi
  	if (smp_alt_once)
  		free_init_pages("SMP alternatives",
  				(unsigned long)__smp_locks,
@@ -11503,7 +10300,7 @@ index 4db3554..c9ea243 100644
  
  	restart_nmi();
  }
-@@ -523,13 +523,17 @@ void __init alternative_instructions(void)
+@@ -588,13 +588,17 @@ void __init alternative_instructions(voi
   * instructions. And on the local CPU you need to be protected again NMI or MCE
   * handlers seeing an inconsistent instruction while you patch.
   */
@@ -11523,7 +10320,7 @@ index 4db3554..c9ea243 100644
  	local_irq_restore(flags);
  	/* Could also do a CLFLUSH here to speed up CPU recovery; but
  	   that causes hangs on some VIA CPUs. */
-@@ -551,36 +555,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
+@@ -616,36 +620,22 @@ void *__init_or_module text_poke_early(v
   */
  void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
  {
@@ -11568,45 +10365,28 @@ index 4db3554..c9ea243 100644
  	return addr;
  }
  
-@@ -682,9 +672,9 @@ void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)
- #if defined(CONFIG_DYNAMIC_FTRACE) || defined(HAVE_JUMP_LABEL)
+diff -urNp linux-3.0.3/arch/x86/kernel/apic/apic.c linux-3.0.3/arch/x86/kernel/apic/apic.c
+--- linux-3.0.3/arch/x86/kernel/apic/apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/apic/apic.c	2011-08-23 21:48:14.000000000 -0400
+@@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
+ /*
+  * Debug level, exported for io_apic.c
+  */
+-unsigned int apic_verbosity;
++int apic_verbosity;
  
- #ifdef CONFIG_X86_64
--unsigned char ideal_nop5[5] = { 0x66, 0x66, 0x66, 0x66, 0x90 };
-+unsigned char ideal_nop5[5] __read_only = { 0x66, 0x66, 0x66, 0x66, 0x90 };
- #else
--unsigned char ideal_nop5[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
-+unsigned char ideal_nop5[5] __read_only = { 0x3e, 0x8d, 0x74, 0x26, 0x00 };
- #endif
+ int pic_mode;
  
- void __init arch_init_ideal_nop5(void)
-diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
-index 57ca777..c96fb4d 100644
---- a/arch/x86/kernel/amd_iommu.c
-+++ b/arch/x86/kernel/amd_iommu.c
-@@ -2286,7 +2286,7 @@ static void prealloc_protection_domains(void)
- 	}
- }
- 
--static struct dma_map_ops amd_iommu_dma_ops = {
-+static const struct dma_map_ops amd_iommu_dma_ops = {
- 	.alloc_coherent = alloc_coherent,
- 	.free_coherent = free_coherent,
- 	.map_page = map_page,
-diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
-index 76b96d7..38e29bd 100644
---- a/arch/x86/kernel/apic/apic.c
-+++ b/arch/x86/kernel/apic/apic.c
-@@ -1819,7 +1819,7 @@ void smp_error_interrupt(struct pt_regs *regs)
+@@ -1834,7 +1834,7 @@ void smp_error_interrupt(struct pt_regs 
  	apic_write(APIC_ESR, 0);
  	v1 = apic_read(APIC_ESR);
  	ack_APIC_irq();
 -	atomic_inc(&irq_err_count);
 +	atomic_inc_unchecked(&irq_err_count);
  
- 	/*
- 	 * Here is what the APIC error bits mean:
-@@ -2209,6 +2209,8 @@ static int __cpuinit apic_cluster_num(void)
+ 	apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
+ 		    smp_processor_id(), v0 , v1);
+@@ -2190,6 +2190,8 @@ static int __cpuinit apic_cluster_num(vo
  	u16 *bios_cpu_apicid;
  	DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
  
@@ -11615,29 +10395,10 @@ index 76b96d7..38e29bd 100644
  	bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
  	bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
-index e437778..12219e2 100644
---- a/arch/x86/kernel/apic/io_apic.c
-+++ b/arch/x86/kernel/apic/io_apic.c
-@@ -617,7 +617,7 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(void)
- 	ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
- 				GFP_ATOMIC);
- 	if (!ioapic_entries)
--		return 0;
-+		return NULL;
- 
- 	for (apic = 0; apic < nr_ioapics; apic++) {
- 		ioapic_entries[apic] =
-@@ -634,7 +634,7 @@ nomem:
- 		kfree(ioapic_entries[apic]);
- 	kfree(ioapic_entries);
- 
--	return 0;
-+	return NULL;
- }
- 
- /*
-@@ -1044,7 +1044,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
+diff -urNp linux-3.0.3/arch/x86/kernel/apic/io_apic.c linux-3.0.3/arch/x86/kernel/apic/io_apic.c
+--- linux-3.0.3/arch/x86/kernel/apic/io_apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/apic/io_apic.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
  
@@ -11646,7 +10407,7 @@ index e437778..12219e2 100644
  {
  	/* Used to the online set of cpus does not change
  	 * during assign_irq_vector.
-@@ -1052,7 +1052,7 @@ void lock_vector_lock(void)
+@@ -1036,7 +1036,7 @@ void lock_vector_lock(void)
  	raw_spin_lock(&vector_lock);
  }
  
@@ -11655,7 +10416,7 @@ index e437778..12219e2 100644
  {
  	raw_spin_unlock(&vector_lock);
  }
-@@ -2409,7 +2409,7 @@ static void ack_apic_edge(struct irq_data *data)
+@@ -2364,7 +2364,7 @@ static void ack_apic_edge(struct irq_dat
  	ack_APIC_irq();
  }
  
@@ -11664,7 +10425,7 @@ index e437778..12219e2 100644
  
  /*
   * IO-APIC versions below 0x20 don't support EOI register.
-@@ -2517,7 +2517,7 @@ static void ack_apic_level(struct irq_data *data)
+@@ -2472,7 +2472,7 @@ static void ack_apic_level(struct irq_da
  	 * at the cpu.
  	 */
  	if (!(v & (1 << (i & 0x1f)))) {
@@ -11673,11 +10434,10 @@ index e437778..12219e2 100644
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
-index 0e4f24c..5846003 100644
---- a/arch/x86/kernel/apm_32.c
-+++ b/arch/x86/kernel/apm_32.c
-@@ -410,7 +410,7 @@ static DEFINE_MUTEX(apm_mutex);
+diff -urNp linux-3.0.3/arch/x86/kernel/apm_32.c linux-3.0.3/arch/x86/kernel/apm_32.c
+--- linux-3.0.3/arch/x86/kernel/apm_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/apm_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
   */
@@ -11686,7 +10446,7 @@ index 0e4f24c..5846003 100644
  			(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
  
  static const char driver_version[] = "1.16ac";	/* no spaces */
-@@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
+@@ -591,7 +591,10 @@ static long __apm_bios_call(void *_call)
  	BUG_ON(cpu != 0);
  	gdt = get_cpu_gdt_table(cpu);
  	save_desc_40 = gdt[0x40 / 8];
@@ -11697,7 +10457,7 @@ index 0e4f24c..5846003 100644
  
  	apm_irq_save(flags);
  	APM_DO_SAVE_SEGS;
-@@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
+@@ -600,7 +603,11 @@ static long __apm_bios_call(void *_call)
  			  &call->esi);
  	APM_DO_RESTORE_SEGS;
  	apm_irq_restore(flags);
@@ -11709,7 +10469,7 @@ index 0e4f24c..5846003 100644
  	put_cpu();
  
  	return call->eax & 0xff;
-@@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call)
+@@ -667,7 +674,10 @@ static long __apm_bios_call_simple(void 
  	BUG_ON(cpu != 0);
  	gdt = get_cpu_gdt_table(cpu);
  	save_desc_40 = gdt[0x40 / 8];
@@ -11720,7 +10480,7 @@ index 0e4f24c..5846003 100644
  
  	apm_irq_save(flags);
  	APM_DO_SAVE_SEGS;
-@@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call)
+@@ -675,7 +685,11 @@ static long __apm_bios_call_simple(void 
  					 &call->eax);
  	APM_DO_RESTORE_SEGS;
  	apm_irq_restore(flags);
@@ -11732,16 +10492,7 @@ index 0e4f24c..5846003 100644
  	put_cpu();
  	return error;
  }
-@@ -975,7 +989,7 @@ recalc:
- 
- static void apm_power_off(void)
- {
--	unsigned char po_bios_call[] = {
-+	const unsigned char po_bios_call[] = {
- 		0xb8, 0x00, 0x10,	/* movw  $0x1000,ax  */
- 		0x8e, 0xd0,		/* movw  ax,ss       */
- 		0xbc, 0x00, 0xf0,	/* movw  $0xf000,sp  */
-@@ -2356,12 +2370,15 @@ static int __init apm_init(void)
+@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
  	 * code to that CPU.
  	 */
  	gdt = get_cpu_gdt_table(0);
@@ -11757,107 +10508,60 @@ index 0e4f24c..5846003 100644
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
-index 1a4088d..b602207 100644
---- a/arch/x86/kernel/asm-offsets_32.c
-+++ b/arch/x86/kernel/asm-offsets_32.c
-@@ -51,7 +51,6 @@ void foo(void)
- 	OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
+diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets_64.c linux-3.0.3/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.0.3/arch/x86/kernel/asm-offsets_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/asm-offsets_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -69,6 +69,7 @@ int main(void)
+ 	BLANK();
+ #undef ENTRY
+ 
++	DEFINE(TSS_size, sizeof(struct tss_struct));
+ 	OFFSET(TSS_ist, tss_struct, x86_tss.ist);
  	BLANK();
  
--	OFFSET(TI_task, thread_info, task);
- 	OFFSET(TI_exec_domain, thread_info, exec_domain);
- 	OFFSET(TI_flags, thread_info, flags);
+diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets.c linux-3.0.3/arch/x86/kernel/asm-offsets.c
+--- linux-3.0.3/arch/x86/kernel/asm-offsets.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/asm-offsets.c	2011-08-23 21:47:55.000000000 -0400
+@@ -33,6 +33,8 @@ void common(void) {
  	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_addr_limit, thread_info, addr_limit);
+ 	OFFSET(TI_preempt_count, thread_info, preempt_count);
 +	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();
  
- 	OFFSET(GDS_size, desc_ptr, size);
-@@ -113,6 +114,11 @@ void foo(void)
- 	OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
+ 	BLANK();
+ 	OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
+@@ -53,8 +55,26 @@ void common(void) {
  	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
- 
- #ifdef CONFIG_XEN
-diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
-index 4a6aeed..068406a 100644
---- a/arch/x86/kernel/asm-offsets_64.c
-+++ b/arch/x86/kernel/asm-offsets_64.c
-@@ -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, pv_mmu_ops, set_pgd);
++#ifdef CONFIG_X86_64
++	OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
 +#endif
-+
  #endif
  
- 
-@@ -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)
- 
- 	BLANK();
- 	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++#endif
++
++	BLANK();
++	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++	DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
 +	DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
++
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
-index 3f0ebe4..0701a65 100644
---- a/arch/x86/kernel/cpu/Makefile
-+++ b/arch/x86/kernel/cpu/Makefile
-@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
- CFLAGS_REMOVE_perf_event.o = -pg
- endif
- 
--# Make sure load_percpu_segment has no stackprotector
--nostackp := $(call cc-option, -fno-stack-protector)
--CFLAGS_common.o		:= $(nostackp)
--
- obj-y			:= intel_cacheinfo.o scattered.o topology.o
- obj-y			+= proc.o capflags.o powerflags.o common.o
- obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
-diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
-index e19776f..83efccf 100644
---- a/arch/x86/kernel/cpu/amd.c
-+++ b/arch/x86/kernel/cpu/amd.c
-@@ -630,7 +630,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/amd.c linux-3.0.3/arch/x86/kernel/cpu/amd.c
+--- linux-3.0.3/arch/x86/kernel/cpu/amd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/amd.c	2011-08-23 21:47:55.000000000 -0400
+@@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
  							unsigned int size)
  {
  	/* AMD errata T13 (order #21922) */
@@ -11866,11 +10570,10 @@ index e19776f..83efccf 100644
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index a9c7d7d..9778d2e 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/common.c linux-3.0.3/arch/x86/kernel/cpu/common.c
+--- linux-3.0.3/arch/x86/kernel/cpu/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/common.c	2011-08-23 21:47:55.000000000 -0400
+@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
  
@@ -11931,7 +10634,7 @@ index a9c7d7d..9778d2e 100644
  static int __init x86_xsave_setup(char *s)
  {
  	setup_clear_cpu_cap(X86_FEATURE_XSAVE);
-@@ -352,7 +298,7 @@ void switch_to_new_gdt(int cpu)
+@@ -371,7 +317,7 @@ void switch_to_new_gdt(int cpu)
  {
  	struct desc_ptr gdt_descr;
  
@@ -11940,7 +10643,7 @@ index a9c7d7d..9778d2e 100644
  	gdt_descr.size = GDT_SIZE - 1;
  	load_gdt(&gdt_descr);
  	/* Reload the per-cpu base */
-@@ -824,6 +770,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
+@@ -840,6 +786,10 @@ static void __cpuinit identify_cpu(struc
  	/* Filter out anything that depends on CPUID levels we don't have */
  	filter_cpuid_features(c, true);
  
@@ -11951,7 +10654,7 @@ index a9c7d7d..9778d2e 100644
  	/* If the model name is still unset, do table lookup. */
  	if (!c->x86_model_id[0]) {
  		const char *p;
-@@ -1003,6 +953,9 @@ static __init int setup_disablecpuid(char *arg)
+@@ -1019,6 +969,9 @@ static __init int setup_disablecpuid(cha
  }
  __setup("clearcpuid=", setup_disablecpuid);
  
@@ -11961,7 +10664,7 @@ index a9c7d7d..9778d2e 100644
  #ifdef CONFIG_X86_64
  struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
  
-@@ -1018,7 +971,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
+@@ -1034,7 +987,7 @@ DEFINE_PER_CPU(struct task_struct *, cur
  EXPORT_PER_CPU_SYMBOL(current_task);
  
  DEFINE_PER_CPU(unsigned long, kernel_stack) =
@@ -11970,7 +10673,7 @@ index a9c7d7d..9778d2e 100644
  EXPORT_PER_CPU_SYMBOL(kernel_stack);
  
  DEFINE_PER_CPU(char *, irq_stack_ptr) =
-@@ -1083,7 +1036,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
+@@ -1099,7 +1052,7 @@ struct pt_regs * __cpuinit idle_regs(str
  {
  	memset(regs, 0, sizeof(struct pt_regs));
  	regs->fs = __KERNEL_PERCPU;
@@ -11979,7 +10682,7 @@ index a9c7d7d..9778d2e 100644
  
  	return regs;
  }
-@@ -1138,7 +1091,7 @@ void __cpuinit cpu_init(void)
+@@ -1154,7 +1107,7 @@ void __cpuinit cpu_init(void)
  	int i;
  
  	cpu = stack_smp_processor_id();
@@ -11988,7 +10691,7 @@ index a9c7d7d..9778d2e 100644
  	oist = &per_cpu(orig_ist, cpu);
  
  #ifdef CONFIG_NUMA
-@@ -1164,7 +1117,7 @@ void __cpuinit cpu_init(void)
+@@ -1180,7 +1133,7 @@ void __cpuinit cpu_init(void)
  	switch_to_new_gdt(cpu);
  	loadsegment(fs, 0);
  
@@ -11997,7 +10700,7 @@ index a9c7d7d..9778d2e 100644
  
  	memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
  	syscall_init();
-@@ -1173,7 +1126,6 @@ void __cpuinit cpu_init(void)
+@@ -1189,7 +1142,6 @@ void __cpuinit cpu_init(void)
  	wrmsrl(MSR_KERNEL_GS_BASE, 0);
  	barrier();
  
@@ -12005,7 +10708,7 @@ index a9c7d7d..9778d2e 100644
  	if (cpu != 0)
  		enable_x2apic();
  
-@@ -1227,7 +1179,7 @@ void __cpuinit cpu_init(void)
+@@ -1243,7 +1195,7 @@ void __cpuinit cpu_init(void)
  {
  	int cpu = smp_processor_id();
  	struct task_struct *curr = current;
@@ -12014,11 +10717,10 @@ index a9c7d7d..9778d2e 100644
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
-index d16c2c5..0f6acb6 100644
---- a/arch/x86/kernel/cpu/intel.c
-+++ b/arch/x86/kernel/cpu/intel.c
-@@ -161,7 +161,7 @@ static void __cpuinit trap_init_f00f_bug(void)
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/intel.c linux-3.0.3/arch/x86/kernel/cpu/intel.c
+--- linux-3.0.3/arch/x86/kernel/cpu/intel.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/intel.c	2011-08-23 21:47:55.000000000 -0400
+@@ -172,7 +172,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.
  	 */
@@ -12027,11 +10729,24 @@ index d16c2c5..0f6acb6 100644
  	load_idt(&idt_descr);
  }
  #endif
-diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
-index d916183..12ce62c 100644
---- a/arch/x86/kernel/cpu/mcheck/mce.c
-+++ b/arch/x86/kernel/cpu/mcheck/mce.c
-@@ -45,6 +45,7 @@
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/Makefile linux-3.0.3/arch/x86/kernel/cpu/Makefile
+--- linux-3.0.3/arch/x86/kernel/cpu/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
+ CFLAGS_REMOVE_perf_event.o = -pg
+ endif
+ 
+-# Make sure load_percpu_segment has no stackprotector
+-nostackp := $(call cc-option, -fno-stack-protector)
+-CFLAGS_common.o		:= $(nostackp)
+-
+ obj-y			:= intel_cacheinfo.o scattered.o topology.o
+ obj-y			+= proc.o capflags.o powerflags.o common.o
+ obj-y			+= vmware.o hypervisor.o sched.o mshyperv.o
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c	2011-08-23 21:47:55.000000000 -0400
+@@ -46,6 +46,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
  #include <asm/msr.h>
@@ -12039,7 +10754,7 @@ index d916183..12ce62c 100644
  
  #include "mce-internal.h"
  
-@@ -219,7 +220,7 @@ static void print_mce(struct mce *m)
+@@ -208,7 +209,7 @@ static void print_mce(struct mce *m)
  			!(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
  				m->cs, m->ip);
  
@@ -12048,7 +10763,7 @@ index d916183..12ce62c 100644
  			print_symbol("{%s}", m->ip);
  		pr_cont("\n");
  	}
-@@ -243,10 +244,10 @@ static void print_mce(struct mce *m)
+@@ -236,10 +237,10 @@ static void print_mce(struct mce *m)
  
  #define PANIC_TIMEOUT 5 /* 5 seconds */
  
@@ -12061,7 +10776,7 @@ index d916183..12ce62c 100644
  
  /* Panic in progress. Enable interrupts and wait for final IPI */
  static void wait_for_panic(void)
-@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -263,7 +264,7 @@ static void mce_panic(char *msg, struct 
  		/*
  		 * Make sure only one CPU runs in machine check panic
  		 */
@@ -12070,7 +10785,7 @@ index d916183..12ce62c 100644
  			wait_for_panic();
  		barrier();
  
-@@ -278,7 +279,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
+@@ -271,7 +272,7 @@ static void mce_panic(char *msg, struct 
  		console_verbose();
  	} else {
  		/* Don't log too much for fake panic */
@@ -12079,7 +10794,7 @@ index d916183..12ce62c 100644
  			return;
  	}
  	/* First print corrected ones that are still unlogged */
-@@ -646,7 +647,7 @@ static int mce_timed_out(u64 *t)
+@@ -638,7 +639,7 @@ static int mce_timed_out(u64 *t)
  	 * might have been modified by someone else.
  	 */
  	rmb();
@@ -12088,7 +10803,7 @@ index d916183..12ce62c 100644
  		wait_for_panic();
  	if (!monarch_timeout)
  		goto out;
-@@ -1460,14 +1461,14 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
+@@ -1452,14 +1453,14 @@ void __cpuinit mcheck_cpu_init(struct cp
   */
  
  static DEFINE_SPINLOCK(mce_state_lock);
@@ -12105,7 +10820,7 @@ index d916183..12ce62c 100644
  		spin_unlock(&mce_state_lock);
  
  		return -EBUSY;
-@@ -1475,7 +1476,7 @@ static int mce_open(struct inode *inode, struct file *file)
+@@ -1467,7 +1468,7 @@ static int mce_open(struct inode *inode,
  
  	if (file->f_flags & O_EXCL)
  		open_exclu = 1;
@@ -12114,7 +10829,7 @@ index d916183..12ce62c 100644
  
  	spin_unlock(&mce_state_lock);
  
-@@ -1486,7 +1487,7 @@ static int mce_release(struct inode *inode, struct file *file)
+@@ -1478,7 +1479,7 @@ static int mce_release(struct inode *ino
  {
  	spin_lock(&mce_state_lock);
  
@@ -12123,17 +10838,7 @@ index d916183..12ce62c 100644
  	open_exclu = 0;
  
  	spin_unlock(&mce_state_lock);
-@@ -1658,8 +1659,7 @@ static long mce_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
- 	}
- }
- 
--/* Modified in mce-inject.c, so not static or const */
--struct file_operations mce_chrdev_ops = {
-+struct file_operations mce_chrdev_ops = {	/* Modified in mce-inject.c, so not static or const */
- 	.open			= mce_open,
- 	.release		= mce_release,
- 	.read			= mce_read,
-@@ -2171,7 +2171,7 @@ struct dentry *mce_get_debugfs_dir(void)
+@@ -2163,7 +2164,7 @@ struct dentry *mce_get_debugfs_dir(void)
  static void mce_reset(void)
  {
  	cpu_missing = 0;
@@ -12142,11 +10847,24 @@ index d916183..12ce62c 100644
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
-index 151787e..be026bb 100644
---- a/arch/x86/kernel/cpu/mtrr/main.c
-+++ b/arch/x86/kernel/cpu/mtrr/main.c
-@@ -61,7 +61,7 @@ static DEFINE_MUTEX(mtrr_mutex);
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-23 21:47:55.000000000 -0400
+@@ -215,7 +215,9 @@ static int inject_init(void)
+ 	if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
+ 		return -ENOMEM;
+ 	printk(KERN_INFO "Machine check injector initialized\n");
+-	mce_chrdev_ops.write = mce_write;
++	pax_open_kernel();
++	*(void **)&mce_chrdev_ops.write = mce_write;
++	pax_close_kernel();
+ 	register_die_notifier(&mce_raise_nb);
+ 	return 0;
+ }
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c	2011-08-23 21:47:55.000000000 -0400
+@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
  
@@ -12155,43 +10873,24 @@ index 151787e..be026bb 100644
  
  const struct mtrr_ops *mtrr_if;
  
-diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
-index df5e41f..d94607c 100644
---- a/arch/x86/kernel/cpu/mtrr/mtrr.h
-+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
-@@ -12,19 +12,19 @@
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-23 21:47:55.000000000 -0400
+@@ -12,8 +12,8 @@
  extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
  
  struct mtrr_ops {
 -	u32	vendor;
 -	u32	use_intel_if;
--	void	(*set)(unsigned int reg, unsigned long base,
 +	const u32	vendor;
 +	const u32	use_intel_if;
-+	void	(* const set)(unsigned int reg, unsigned long base,
+ 	void	(*set)(unsigned int reg, unsigned long base,
  		       unsigned long size, mtrr_type type);
--	void	(*set_all)(void);
-+	void	(* const set_all)(void);
- 
--	void	(*get)(unsigned int reg, unsigned long *base,
-+	void	(* const get)(unsigned int reg, unsigned long *base,
- 		       unsigned long *size, mtrr_type *type);
--	int	(*get_free_region)(unsigned long base, unsigned long size,
-+	int	(* const get_free_region)(unsigned long base, unsigned long size,
- 				   int replace_reg);
--	int	(*validate_add_page)(unsigned long base, unsigned long size,
-+	int	(* const validate_add_page)(unsigned long base, unsigned long size,
- 				     unsigned int type);
--	int	(*have_wrcomb)(void);
-+	int	(* const have_wrcomb)(void);
- };
- 
- extern int generic_get_free_region(unsigned long base, unsigned long size,
-diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
-index 9d977a2..4cb7dca 100644
---- a/arch/x86/kernel/cpu/perf_event.c
-+++ b/arch/x86/kernel/cpu/perf_event.c
-@@ -674,6 +674,8 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
+ 	void	(*set_all)(void);
+diff -urNp linux-3.0.3/arch/x86/kernel/cpu/perf_event.c linux-3.0.3/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.0.3/arch/x86/kernel/cpu/perf_event.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/cpu/perf_event.c	2011-08-23 21:48:14.000000000 -0400
+@@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
  	int i, j, w, wmax, num = 0;
  	struct hw_perf_event *hwc;
  
@@ -12200,7 +10899,7 @@ index 9d977a2..4cb7dca 100644
  	bitmap_zero(used_mask, X86_PMC_IDX_MAX);
  
  	for (i = 0; i < n; i++) {
-@@ -1781,7 +1783,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
+@@ -1872,7 +1874,7 @@ perf_callchain_user(struct perf_callchai
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -12209,11 +10908,10 @@ index 9d977a2..4cb7dca 100644
  	}
  }
  
-diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
-index 764c7c2..c5d9c7b 100644
---- a/arch/x86/kernel/crash.c
-+++ b/arch/x86/kernel/crash.c
-@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
+diff -urNp linux-3.0.3/arch/x86/kernel/crash.c linux-3.0.3/arch/x86/kernel/crash.c
+--- linux-3.0.3/arch/x86/kernel/crash.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/crash.c	2011-08-23 21:47:55.000000000 -0400
+@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
  	regs = args->regs;
  
  #ifdef CONFIG_X86_32
@@ -12222,10 +10920,9 @@ index 764c7c2..c5d9c7b 100644
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
-index 37250fe..bf2ec74 100644
---- a/arch/x86/kernel/doublefault_32.c
-+++ b/arch/x86/kernel/doublefault_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/doublefault_32.c linux-3.0.3/arch/x86/kernel/doublefault_32.c
+--- linux-3.0.3/arch/x86/kernel/doublefault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/doublefault_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -12244,7 +10941,7 @@ index 37250fe..bf2ec74 100644
  
  	printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
  
-@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
+@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cach
  		/* 0x2 bit is always set */
  		.flags		= X86_EFLAGS_SF | 0x2,
  		.sp		= STACK_START,
@@ -12257,10 +10954,129 @@ index 37250fe..bf2ec74 100644
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
-index df20723..79d1af9 100644
---- a/arch/x86/kernel/dumpstack.c
-+++ b/arch/x86/kernel/dumpstack.c
+diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_32.c linux-3.0.3/arch/x86/kernel/dumpstack_32.c
+--- linux-3.0.3/arch/x86/kernel/dumpstack_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/dumpstack_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
+ 		bp = stack_frame(task, regs);
+ 
+ 	for (;;) {
+-		struct thread_info *context;
++		void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
+ 
+-		context = (struct thread_info *)
+-			((unsigned long)stack & (~(THREAD_SIZE - 1)));
+-		bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
++		bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+ 
+-		stack = (unsigned long *)context->previous_esp;
+-		if (!stack)
++		if (stack_start == task_stack_page(task))
+ 			break;
++		stack = *(unsigned long **)stack_start;
+ 		if (ops->stack(data, "IRQ") < 0)
+ 			break;
+ 		touch_nmi_watchdog();
+@@ -96,21 +94,22 @@ 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 = code_bytes * 43 / 64;
+ 		unsigned int code_len = code_bytes;
+ 		unsigned char c;
+ 		u8 *ip;
++		unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
+ 
+ 		printk(KERN_EMERG "Stack:\n");
+ 		show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
+ 
+ 		printk(KERN_EMERG "Code: ");
+ 
+-		ip = (u8 *)regs->ip - code_prologue;
++		ip = (u8 *)regs->ip - code_prologue + cs_base;
+ 		if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
+ 			/* try starting at IP */
+-			ip = (u8 *)regs->ip;
++			ip = (u8 *)regs->ip + cs_base;
+ 			code_len = code_len - code_prologue + 1;
+ 		}
+ 		for (i = 0; i < code_len; i++, ip++) {
+@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs
+ 				printk(" Bad EIP value.");
+ 				break;
+ 			}
+-			if (ip == (u8 *)regs->ip)
++			if (ip == (u8 *)regs->ip + cs_base)
+ 				printk("<%02x> ", c);
+ 			else
+ 				printk("%02x ", c);
+@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
+ {
+ 	unsigned short ud2;
+ 
++	ip = ktla_ktva(ip);
+ 	if (ip < PAGE_OFFSET)
+ 		return 0;
+ 	if (probe_kernel_address((unsigned short *)ip, ud2))
+diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_64.c linux-3.0.3/arch/x86/kernel/dumpstack_64.c
+--- linux-3.0.3/arch/x86/kernel/dumpstack_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/dumpstack_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
+ 	unsigned long *irq_stack_end =
+ 		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
+ 	unsigned used = 0;
+-	struct thread_info *tinfo;
+ 	int graph = 0;
+ 	unsigned long dummy;
++	void *stack_start;
+ 
+ 	if (!task)
+ 		task = current;
+@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task
+ 	 * current stack address. If the stacks consist of nested
+ 	 * exceptions
+ 	 */
+-	tinfo = task_thread_info(task);
+ 	for (;;) {
+ 		char *id;
+ 		unsigned long *estack_end;
++
+ 		estack_end = in_exception_stack(cpu, (unsigned long)stack,
+ 						&used, &id);
+ 
+@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task
+ 			if (ops->stack(data, id) < 0)
+ 				break;
+ 
+-			bp = ops->walk_stack(tinfo, stack, bp, ops,
++			bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
+ 					     data, estack_end, &graph);
+ 			ops->stack(data, "<EOE>");
+ 			/*
+@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task
+ 			if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
+ 				if (ops->stack(data, "IRQ") < 0)
+ 					break;
+-				bp = ops->walk_stack(tinfo, stack, bp,
++				bp = ops->walk_stack(task, irq_stack, stack, bp,
+ 					ops, data, irq_stack_end, &graph);
+ 				/*
+ 				 * We link to the next stack (which would be
+@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task
+ 	/*
+ 	 * This handles the process stack:
+ 	 */
+-	bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
++	stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
++	bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+ 	put_cpu();
+ }
+ EXPORT_SYMBOL(dump_trace);
+diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack.c linux-3.0.3/arch/x86/kernel/dumpstack.c
+--- linux-3.0.3/arch/x86/kernel/dumpstack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/dumpstack.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -12271,16 +11087,7 @@ index df20723..79d1af9 100644
  #include <linux/kallsyms.h>
  #include <linux/kprobes.h>
  #include <linux/uaccess.h>
-@@ -27,7 +30,7 @@ static int die_counter;
- 
- 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);
- }
- 
-@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
+@@ -35,9 +38,8 @@ void printk_address(unsigned long addres
  static void
  print_ftrace_graph_addr(unsigned long addr, void *data,
  			const struct stacktrace_ops *ops,
@@ -12291,7 +11098,7 @@ index df20723..79d1af9 100644
  	unsigned long ret_addr;
  	int index = task->curr_ret_stack;
  
-@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
+@@ -58,7 +60,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,
@@ -12300,7 +11107,7 @@ index df20723..79d1af9 100644
  { }
  #endif
  
-@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
+@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long ad
   * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
   */
  
@@ -12312,7 +11119,7 @@ index df20723..79d1af9 100644
  	if (end) {
  		if (p < end && p >= (end-THREAD_SIZE))
  			return 1;
-@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
+@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct
  }
  
  unsigned long
@@ -12329,7 +11136,7 @@ index df20723..79d1af9 100644
  		unsigned long addr;
  
  		addr = *stack;
-@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
+@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *
  			} else {
  				ops->address(data, addr, 0);
  			}
@@ -12338,7 +11145,7 @@ index df20723..79d1af9 100644
  		}
  		stack++;
  	}
-@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
+@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *
  EXPORT_SYMBOL_GPL(print_context_stack);
  
  unsigned long
@@ -12347,7 +11154,7 @@ index df20723..79d1af9 100644
  		       unsigned long *stack, unsigned long bp,
  		       const struct stacktrace_ops *ops, void *data,
  		       unsigned long *end, int *graph)
-@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
+@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_inf
  	struct stack_frame *frame = (struct stack_frame *)bp;
  	unsigned long *ret_addr = &frame->return_address;
  
@@ -12356,7 +11163,7 @@ index df20723..79d1af9 100644
  		unsigned long addr = *ret_addr;
  
  		if (!__kernel_text_address(addr))
-@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
+@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_inf
  		ops->address(data, addr, 1);
  		frame = frame->next_frame;
  		ret_addr = &frame->return_address;
@@ -12365,16 +11172,16 @@ index df20723..79d1af9 100644
  	}
  
  	return (unsigned long)frame;
-@@ -200,7 +200,7 @@ void dump_stack(void)
- 	unsigned long stack;
+@@ -186,7 +186,7 @@ void dump_stack(void)
  
+ 	bp = stack_frame(current, NULL);
  	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);
-@@ -236,6 +236,8 @@ unsigned __kprobes long oops_begin(void)
+@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
  }
  EXPORT_SYMBOL_GPL(oops_begin);
  
@@ -12383,7 +11190,7 @@ index df20723..79d1af9 100644
  void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
  {
  	if (regs && kexec_should_crash(current))
-@@ -257,7 +259,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
+@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long fl
  		panic("Fatal exception in interrupt");
  	if (panic_on_oops)
  		panic("Fatal exception");
@@ -12395,7 +11202,7 @@ index df20723..79d1af9 100644
  }
  
  int __kprobes __die(const char *str, struct pt_regs *regs, long err)
-@@ -284,7 +289,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
+@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, str
  
  	show_registers(regs);
  #ifdef CONFIG_X86_32
@@ -12404,7 +11211,7 @@ index df20723..79d1af9 100644
  		sp = regs->sp;
  		ss = regs->ss & 0xffff;
  	} else {
-@@ -312,7 +317,7 @@ void die(const char *str, struct pt_regs *regs, long err)
+@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs
  	unsigned long flags = oops_begin();
  	int sig = SIGSEGV;
  
@@ -12413,133 +11220,9 @@ index df20723..79d1af9 100644
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
-index 74cc1ed..6579cca 100644
---- a/arch/x86/kernel/dumpstack_32.c
-+++ b/arch/x86/kernel/dumpstack_32.c
-@@ -37,15 +37,12 @@ void dump_trace(struct task_struct *task,
- 
- 	bp = stack_frame(task, regs);
- 	for (;;) {
--		struct thread_info *context;
-+		void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
-+		bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
- 
--		context = (struct thread_info *)
--			((unsigned long)stack & (~(THREAD_SIZE - 1)));
--		bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
--
--		stack = (unsigned long *)context->previous_esp;
--		if (!stack)
-+		if (stack_start == task_stack_page(task))
- 			break;
-+		stack = *(unsigned long **)stack_start;
- 		if (ops->stack(data, "IRQ") < 0)
- 			break;
- 		touch_nmi_watchdog();
-@@ -95,21 +92,22 @@ 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 = code_bytes * 43 / 64;
- 		unsigned int code_len = code_bytes;
- 		unsigned char c;
- 		u8 *ip;
-+		unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
- 
- 		printk(KERN_EMERG "Stack:\n");
- 		show_stack_log_lvl(NULL, regs, &regs->sp, KERN_EMERG);
- 
- 		printk(KERN_EMERG "Code: ");
- 
--		ip = (u8 *)regs->ip - code_prologue;
-+		ip = (u8 *)regs->ip - code_prologue + cs_base;
- 		if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
- 			/* try starting at IP */
--			ip = (u8 *)regs->ip;
-+			ip = (u8 *)regs->ip + cs_base;
- 			code_len = code_len - code_prologue + 1;
- 		}
- 		for (i = 0; i < code_len; i++, ip++) {
-@@ -118,7 +116,7 @@ void show_registers(struct pt_regs *regs)
- 				printk(" Bad EIP value.");
- 				break;
- 			}
--			if (ip == (u8 *)regs->ip)
-+			if (ip == (u8 *)regs->ip + cs_base)
- 				printk("<%02x> ", c);
- 			else
- 				printk("%02x ", c);
-@@ -131,6 +129,7 @@ int is_valid_bugaddr(unsigned long ip)
- {
- 	unsigned short ud2;
- 
-+	ip = ktla_ktva(ip);
- 	if (ip < PAGE_OFFSET)
- 		return 0;
- 	if (probe_kernel_address((unsigned short *)ip, ud2))
-diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
-index a6b6fcf..a0bceb8 100644
---- a/arch/x86/kernel/dumpstack_64.c
-+++ b/arch/x86/kernel/dumpstack_64.c
-@@ -147,10 +147,10 @@ void dump_trace(struct task_struct *task,
- 	unsigned long *irq_stack_end =
- 		(unsigned long *)per_cpu(irq_stack_ptr, cpu);
- 	unsigned used = 0;
--	struct thread_info *tinfo;
- 	int graph = 0;
- 	unsigned long dummy;
- 	unsigned long bp;
-+	void *stack_start;
- 
- 	if (!task)
- 		task = current;
-@@ -167,10 +167,10 @@ void dump_trace(struct task_struct *task,
- 	 * current stack address. If the stacks consist of nested
- 	 * exceptions
- 	 */
--	tinfo = task_thread_info(task);
- 	for (;;) {
- 		char *id;
- 		unsigned long *estack_end;
-+
- 		estack_end = in_exception_stack(cpu, (unsigned long)stack,
- 						&used, &id);
- 
-@@ -178,7 +178,7 @@ void dump_trace(struct task_struct *task,
- 			if (ops->stack(data, id) < 0)
- 				break;
- 
--			bp = ops->walk_stack(tinfo, stack, bp, ops,
-+			bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
- 					     data, estack_end, &graph);
- 			ops->stack(data, "<EOE>");
- 			/*
-@@ -197,7 +197,7 @@ void dump_trace(struct task_struct *task,
- 			if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
- 				if (ops->stack(data, "IRQ") < 0)
- 					break;
--				bp = ops->walk_stack(tinfo, stack, bp,
-+				bp = ops->walk_stack(task, irq_stack, stack, bp,
- 					ops, data, irq_stack_end, &graph);
- 				/*
- 				 * We link to the next stack (which would be
-@@ -218,7 +218,8 @@ void dump_trace(struct task_struct *task,
- 	/*
- 	 * This handles the process stack:
- 	 */
--	bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
-+	stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
-+	bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
- 	put_cpu();
- }
- EXPORT_SYMBOL(dump_trace);
-diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
-index cd28a35..2601699 100644
---- a/arch/x86/kernel/early_printk.c
-+++ b/arch/x86/kernel/early_printk.c
+diff -urNp linux-3.0.3/arch/x86/kernel/early_printk.c linux-3.0.3/arch/x86/kernel/early_printk.c
+--- linux-3.0.3/arch/x86/kernel/early_printk.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/early_printk.c	2011-08-23 21:48:14.000000000 -0400
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -12548,7 +11231,7 @@ index cd28a35..2601699 100644
  #include <asm/io.h>
  #include <asm/processor.h>
  #include <asm/fcntl.h>
-@@ -179,6 +180,8 @@ asmlinkage void early_printk(const char *fmt, ...)
+@@ -179,6 +180,8 @@ asmlinkage void early_printk(const char 
  	int n;
  	va_list ap;
  
@@ -12557,11 +11240,10 @@ index cd28a35..2601699 100644
  	va_start(ap, fmt);
  	n = vscnprintf(buf, sizeof(buf), fmt, ap);
  	early_console->write(early_console, buf, n);
-diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
-index 9ca3b0e..47ad5e1 100644
---- a/arch/x86/kernel/entry_32.S
-+++ b/arch/x86/kernel/entry_32.S
-@@ -183,13 +183,146 @@
+diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/entry_32.S
+--- linux-3.0.3/arch/x86/kernel/entry_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/entry_32.S	2011-08-23 21:48:14.000000000 -0400
+@@ -185,13 +185,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
  .macro SET_KERNEL_GS reg
@@ -12709,7 +11391,7 @@ index 9ca3b0e..47ad5e1 100644
  	cld
  	PUSH_GS
  	pushl_cfi %fs
-@@ -212,7 +345,7 @@
+@@ -214,7 +347,7 @@
  	CFI_REL_OFFSET ecx, 0
  	pushl_cfi %ebx
  	CFI_REL_OFFSET ebx, 0
@@ -12718,7 +11400,7 @@ index 9ca3b0e..47ad5e1 100644
  	movl %edx, %ds
  	movl %edx, %es
  	movl $(__KERNEL_PERCPU), %edx
-@@ -220,6 +353,15 @@
+@@ -222,6 +355,15 @@
  	SET_KERNEL_GS %edx
  .endm
  
@@ -12734,7 +11416,7 @@ index 9ca3b0e..47ad5e1 100644
  .macro RESTORE_INT_REGS
  	popl_cfi %ebx
  	CFI_RESTORE ebx
-@@ -330,7 +472,15 @@ check_userspace:
+@@ -332,7 +474,15 @@ check_userspace:
  	movb PT_CS(%esp), %al
  	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
  	cmpl $USER_RPL, %eax
@@ -12750,7 +11432,7 @@ index 9ca3b0e..47ad5e1 100644
  
  ENTRY(resume_userspace)
  	LOCKDEP_SYS_EXIT
-@@ -342,7 +492,7 @@ ENTRY(resume_userspace)
+@@ -344,7 +494,7 @@ ENTRY(resume_userspace)
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done on
  					# int/exception return?
  	jne work_pending
@@ -12759,14 +11441,14 @@ index 9ca3b0e..47ad5e1 100644
  END(ret_from_exception)
  
  #ifdef CONFIG_PREEMPT
-@@ -392,23 +542,34 @@ sysenter_past_esp:
+@@ -394,23 +544,34 @@ 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_cfi ((TI_sysenter_return)-THREAD_SIZE_asm+8+4*4)(%esp)
+-	pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
 +	pushl_cfi $0
  	CFI_REL_OFFSET eip, 0
  
@@ -12797,7 +11479,7 @@ index 9ca3b0e..47ad5e1 100644
  	movl %ebp,PT_EBP(%esp)
  .section __ex_table,"a"
  	.align 4
-@@ -431,12 +592,23 @@ sysenter_do_call:
+@@ -433,12 +594,23 @@ sysenter_do_call:
  	testl $_TIF_ALLWORK_MASK, %ecx
  	jne sysexit_audit
  sysenter_exit:
@@ -12821,7 +11503,7 @@ index 9ca3b0e..47ad5e1 100644
  	PTGS_TO_GS
  	ENABLE_INTERRUPTS_SYSEXIT
  
-@@ -453,6 +625,9 @@ sysenter_audit:
+@@ -455,6 +627,9 @@ sysenter_audit:
  	movl %eax,%edx			/* 2nd arg: syscall number */
  	movl $AUDIT_ARCH_I386,%eax	/* 1st arg: audit arch */
  	call audit_syscall_entry
@@ -12831,7 +11513,7 @@ index 9ca3b0e..47ad5e1 100644
  	pushl_cfi %ebx
  	movl PT_EAX(%esp),%eax		/* reload syscall number */
  	jmp sysenter_do_call
-@@ -479,11 +654,17 @@ sysexit_audit:
+@@ -481,11 +656,17 @@ sysexit_audit:
  
  	CFI_ENDPROC
  .pushsection .fixup,"ax"
@@ -12851,7 +11533,7 @@ index 9ca3b0e..47ad5e1 100644
  .popsection
  	PTGS_TO_GS_EX
  ENDPROC(ia32_sysenter_target)
-@@ -516,6 +697,14 @@ syscall_exit:
+@@ -518,6 +699,14 @@ syscall_exit:
  	testl $_TIF_ALLWORK_MASK, %ecx	# current->work
  	jne syscall_exit_work
  
@@ -12866,7 +11548,7 @@ index 9ca3b0e..47ad5e1 100644
  restore_all:
  	TRACE_IRQS_IRET
  restore_all_notrace:
-@@ -575,14 +764,21 @@ ldt_ss:
+@@ -577,14 +766,34 @@ ldt_ss:
   * compensating for the offset by changing to the ESPFIX segment with
   * a base address that matches for the difference.
   */
@@ -12886,12 +11568,25 @@ index 9ca3b0e..47ad5e1 100644
  	shr $16, %edx
 -	mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
 -	mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
++
++#ifdef CONFIG_PAX_KERNEXEC
++	mov %cr0, %esi
++	btr $16, %esi
++	mov %esi, %cr0
++#endif
++
 +	mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
 +	mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
++
++#ifdef CONFIG_PAX_KERNEXEC
++	bts $16, %esi
++	mov %esi, %cr0
++#endif
++
  	pushl_cfi $__ESPFIX_SS
  	pushl_cfi %eax			/* new kernel esp */
  	/* Disable interrupts, but do not irqtrace this section: we
-@@ -611,29 +807,23 @@ work_resched:
+@@ -613,29 +822,23 @@ work_resched:
  	movl TI_flags(%ebp), %ecx
  	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
  					# than syscall tracing?
@@ -12925,7 +11620,7 @@ index 9ca3b0e..47ad5e1 100644
  #endif
  	xorl %edx, %edx
  	call do_notify_resume
-@@ -646,6 +836,9 @@ syscall_trace_entry:
+@@ -648,6 +851,9 @@ syscall_trace_entry:
  	movl $-ENOSYS,PT_EAX(%esp)
  	movl %esp, %eax
  	call syscall_trace_enter
@@ -12935,7 +11630,7 @@ index 9ca3b0e..47ad5e1 100644
  	/* What it returned is what we'll actually use.  */
  	cmpl $(nr_syscalls), %eax
  	jnae syscall_call
-@@ -668,6 +861,10 @@ END(syscall_exit_work)
+@@ -670,6 +876,10 @@ END(syscall_exit_work)
  
  	RING0_INT_FRAME			# can't unwind into user space anyway
  syscall_fault:
@@ -12946,7 +11641,7 @@ index 9ca3b0e..47ad5e1 100644
  	GET_THREAD_INFO(%ebp)
  	movl $-EFAULT,PT_EAX(%esp)
  	jmp resume_userspace
-@@ -750,6 +947,36 @@ ptregs_clone:
+@@ -752,6 +962,36 @@ ptregs_clone:
  	CFI_ENDPROC
  ENDPROC(ptregs_clone)
  
@@ -12983,7 +11678,7 @@ index 9ca3b0e..47ad5e1 100644
  .macro FIXUP_ESPFIX_STACK
  /*
   * Switch back for ESPFIX stack to the normal zerobased stack
-@@ -759,8 +986,15 @@ ENDPROC(ptregs_clone)
+@@ -761,8 +1001,15 @@ ENDPROC(ptregs_clone)
   * normal stack and adjusts ESP with the matching offset.
   */
  	/* fixup the stack */
@@ -13001,7 +11696,7 @@ index 9ca3b0e..47ad5e1 100644
  	shl $16, %eax
  	addl %esp, %eax			/* the adjusted stack pointer */
  	pushl_cfi $__KERNEL_DS
-@@ -1211,7 +1445,6 @@ return_to_handler:
+@@ -1213,7 +1460,6 @@ return_to_handler:
  	jmp *%ecx
  #endif
  
@@ -13009,7 +11704,7 @@ index 9ca3b0e..47ad5e1 100644
  #include "syscall_table_32.S"
  
  syscall_table_size=(.-sys_call_table)
-@@ -1257,9 +1490,12 @@ error_code:
+@@ -1259,9 +1505,12 @@ error_code:
  	movl $-1, PT_ORIG_EAX(%esp)	# no syscall to restart
  	REG_TO_PTGS %ecx
  	SET_KERNEL_GS %ecx
@@ -13023,7 +11718,7 @@ index 9ca3b0e..47ad5e1 100644
  	TRACE_IRQS_OFF
  	movl %esp,%eax			# pt_regs pointer
  	call *%edi
-@@ -1344,6 +1580,9 @@ nmi_stack_correct:
+@@ -1346,6 +1595,9 @@ nmi_stack_correct:
  	xorl %edx,%edx		# zero error code
  	movl %esp,%eax		# pt_regs pointer
  	call do_nmi
@@ -13033,7 +11728,7 @@ index 9ca3b0e..47ad5e1 100644
  	jmp restore_all_notrace
  	CFI_ENDPROC
  
-@@ -1380,6 +1619,9 @@ nmi_espfix_stack:
+@@ -1382,6 +1634,9 @@ nmi_espfix_stack:
  	FIXUP_ESPFIX_STACK		# %eax == %esp
  	xorl %edx,%edx			# zero error code
  	call do_nmi
@@ -13043,10 +11738,9 @@ index 9ca3b0e..47ad5e1 100644
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
-index bbd5c80..207310a 100644
---- a/arch/x86/kernel/entry_64.S
-+++ b/arch/x86/kernel/entry_64.S
+diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/entry_64.S
+--- linux-3.0.3/arch/x86/kernel/entry_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/entry_64.S	2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -13055,7 +11749,7 @@ index bbd5c80..207310a 100644
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -174,6 +175,259 @@ ENTRY(native_usergs_sysret64)
+@@ -176,6 +177,259 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
@@ -13180,7 +11874,7 @@ index bbd5c80..207310a 100644
 +	mov i*8(%rbx),%rsi
 +	mov $0,%sil
 +	lea i*8(%rbx),%rdi
-+	call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd)
++	call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
 +	i = i + 1
 +	.endr
 +	jmp 2f
@@ -13240,7 +11934,7 @@ index bbd5c80..207310a 100644
 +	mov i*8(%rbx),%rsi
 +	mov $0x67,%sil
 +	lea i*8(%rbx),%rdi
-+	call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd)
++	call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
 +	i = i + 1
 +	.endr
 +	jmp 2f
@@ -13315,7 +12009,7 @@ index bbd5c80..207310a 100644
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -316,7 +570,7 @@ ENTRY(save_args)
+@@ -318,7 +572,7 @@ ENTRY(save_args)
  	leaq -RBP+8(%rsp),%rdi	/* arg1 for handler */
  	movq_cfi rbp, 8		/* push %rbp */
  	leaq 8(%rsp), %rbp		/* mov %rsp, %ebp */
@@ -13324,7 +12018,7 @@ index bbd5c80..207310a 100644
  	je 1f
  	SWAPGS
  	/*
-@@ -407,7 +661,7 @@ ENTRY(ret_from_fork)
+@@ -409,7 +663,7 @@ ENTRY(ret_from_fork)
  
  	RESTORE_REST
  
@@ -13333,7 +12027,7 @@ index bbd5c80..207310a 100644
  	je   int_ret_from_sys_call
  
  	testl $_TIF_IA32, TI_flags(%rcx)	# 32-bit compat task needs IRET
-@@ -453,7 +707,7 @@ END(ret_from_fork)
+@@ -455,7 +709,7 @@ END(ret_from_fork)
  ENTRY(system_call)
  	CFI_STARTPROC	simple
  	CFI_SIGNAL_FRAME
@@ -13342,7 +12036,7 @@ index bbd5c80..207310a 100644
  	CFI_REGISTER	rip,rcx
  	/*CFI_REGISTER	rflags,r11*/
  	SWAPGS_UNSAFE_STACK
-@@ -466,12 +720,13 @@ ENTRY(system_call_after_swapgs)
+@@ -468,12 +722,13 @@ ENTRY(system_call_after_swapgs)
  
  	movq	%rsp,PER_CPU_VAR(old_rsp)
  	movq	PER_CPU_VAR(kernel_stack),%rsp
@@ -13357,7 +12051,7 @@ index bbd5c80..207310a 100644
  	movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq  %rcx,RIP-ARGOFFSET(%rsp)
  	CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -500,6 +755,7 @@ sysret_check:
+@@ -502,6 +757,7 @@ sysret_check:
  	andl %edi,%edx
  	jnz  sysret_careful
  	CFI_REMEMBER_STATE
@@ -13365,7 +12059,7 @@ index bbd5c80..207310a 100644
  	/*
  	 * sysretq will re-enable interrupts:
  	 */
-@@ -558,6 +814,9 @@ auditsys:
+@@ -560,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
@@ -13375,7 +12069,7 @@ index bbd5c80..207310a 100644
  	LOAD_ARGS 0		/* reload call-clobbered registers */
  	jmp system_call_fastpath
  
-@@ -588,6 +847,9 @@ tracesys:
+@@ -590,6 +849,9 @@ tracesys:
  	FIXUP_TOP_OF_STACK %rdi
  	movq %rsp,%rdi
  	call syscall_trace_enter
@@ -13385,7 +12079,7 @@ index bbd5c80..207310a 100644
  	/*
  	 * Reload arg registers from stack in case ptrace changed them.
  	 * We don't reload %rax because syscall_trace_enter() returned
-@@ -609,7 +871,7 @@ tracesys:
+@@ -611,7 +873,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	TRACE_IRQS_OFF
@@ -13394,7 +12088,7 @@ index bbd5c80..207310a 100644
  	je retint_restore_args
  	movl $_TIF_ALLWORK_MASK,%edi
  	/* edi:	mask to check */
-@@ -791,6 +1053,16 @@ END(interrupt)
+@@ -793,6 +1055,16 @@ END(interrupt)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
  	call save_args
  	PARTIAL_FRAME 0
@@ -13411,7 +12105,7 @@ index bbd5c80..207310a 100644
  	call \func
  	.endm
  
-@@ -823,7 +1095,7 @@ ret_from_intr:
+@@ -825,7 +1097,7 @@ ret_from_intr:
  	CFI_ADJUST_CFA_OFFSET	-8
  exit_intr:
  	GET_THREAD_INFO(%rcx)
@@ -13420,7 +12114,7 @@ index bbd5c80..207310a 100644
  	je retint_kernel
  
  	/* Interrupt came from user space */
-@@ -845,12 +1117,14 @@ retint_swapgs:		/* return to user-space */
+@@ -847,12 +1119,14 @@ retint_swapgs:		/* return to user-space 
  	 * The iretq could re-enable interrupts:
  	 */
  	DISABLE_INTERRUPTS(CLBR_ANY)
@@ -13435,7 +12129,7 @@ index bbd5c80..207310a 100644
  	/*
  	 * The iretq could re-enable interrupts:
  	 */
-@@ -1022,6 +1296,16 @@ ENTRY(\sym)
+@@ -1027,6 +1301,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -13452,7 +12146,7 @@ index bbd5c80..207310a 100644
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1039,6 +1323,16 @@ ENTRY(\sym)
+@@ -1044,6 +1328,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -13469,7 +12163,7 @@ index bbd5c80..207310a 100644
  	movq %rsp,%rdi		/* pt_regs pointer */
  	xorl %esi,%esi		/* no error code */
  	call \do_sym
-@@ -1047,7 +1341,7 @@ ENTRY(\sym)
+@@ -1052,7 +1346,7 @@ ENTRY(\sym)
  END(\sym)
  .endm
  
@@ -13478,7 +12172,7 @@ index bbd5c80..207310a 100644
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
  	INTR_FRAME
-@@ -1057,8 +1351,24 @@ ENTRY(\sym)
+@@ -1062,8 +1356,24 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	TRACE_IRQS_OFF
@@ -13503,7 +12197,7 @@ index bbd5c80..207310a 100644
  	subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
  	call \do_sym
  	addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1075,6 +1385,16 @@ ENTRY(\sym)
+@@ -1080,6 +1390,16 @@ ENTRY(\sym)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call error_entry
  	DEFAULT_FRAME 0
@@ -13520,7 +12214,7 @@ index bbd5c80..207310a 100644
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1094,6 +1414,16 @@ ENTRY(\sym)
+@@ -1099,6 +1419,16 @@ ENTRY(\sym)
  	call save_paranoid
  	DEFAULT_FRAME 0
  	TRACE_IRQS_OFF
@@ -13537,7 +12231,7 @@ index bbd5c80..207310a 100644
  	movq %rsp,%rdi			/* pt_regs pointer */
  	movq ORIG_RAX(%rsp),%rsi	/* get error code */
  	movq $-1,ORIG_RAX(%rsp)		/* no syscall to restart */
-@@ -1356,14 +1686,27 @@ ENTRY(paranoid_exit)
+@@ -1361,14 +1691,27 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -13566,7 +12260,7 @@ index bbd5c80..207310a 100644
  	TRACE_IRQS_IRETQ 0
  	RESTORE_ALL 8
  	jmp irq_return
-@@ -1421,7 +1764,7 @@ ENTRY(error_entry)
+@@ -1426,7 +1769,7 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -13575,7 +12269,7 @@ index bbd5c80..207310a 100644
  	je error_kernelspace
  error_swapgs:
  	SWAPGS
-@@ -1485,6 +1828,16 @@ ENTRY(nmi)
+@@ -1490,6 +1833,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -13592,7 +12286,7 @@ index bbd5c80..207310a 100644
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1495,11 +1848,25 @@ ENTRY(nmi)
+@@ -1500,11 +1853,25 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -13619,12 +12313,11 @@ index bbd5c80..207310a 100644
  	RESTORE_ALL 8
  	jmp irq_return
  nmi_userspace:
-diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
-index 382eb29..a02273e 100644
---- a/arch/x86/kernel/ftrace.c
-+++ b/arch/x86/kernel/ftrace.c
-@@ -126,7 +126,7 @@ static void *mod_code_ip;		/* holds the IP to write to */
- static void *mod_code_newcode;		/* holds the text to write to the IP */
+diff -urNp linux-3.0.3/arch/x86/kernel/ftrace.c linux-3.0.3/arch/x86/kernel/ftrace.c
+--- linux-3.0.3/arch/x86/kernel/ftrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/ftrace.c	2011-08-23 21:47:55.000000000 -0400
+@@ -126,7 +126,7 @@ static void *mod_code_ip;		/* holds the 
+ static const void *mod_code_newcode;	/* holds the text to write to the IP */
  
  static unsigned nmi_wait_count;
 -static atomic_t nmi_update_count = ATOMIC_INIT(0);
@@ -13632,7 +12325,7 @@ index 382eb29..a02273e 100644
  
  int ftrace_arch_read_dyn_info(char *buf, int size)
  {
-@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
+@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf,
  
  	r = snprintf(buf, size, "%u %u",
  		     nmi_wait_count,
@@ -13653,7 +12346,7 @@ index 382eb29..a02273e 100644
  	}
  	/* Must have previous changes seen before executions */
  	smp_mb();
-@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
+@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, uns
  {
  	unsigned char replaced[MCOUNT_INSN_SIZE];
  
@@ -13662,7 +12355,7 @@ index 382eb29..a02273e 100644
  	/*
  	 * Note: Due to modules and __init, code can
  	 *  disappear and change, we need to protect against faulting
-@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
+@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_fun
  	unsigned char old[MCOUNT_INSN_SIZE], *new;
  	int ret;
  
@@ -13671,7 +12364,7 @@ index 382eb29..a02273e 100644
  	new = ftrace_call_replace(ip, (unsigned long)func);
  	ret = ftrace_modify_code(ip, old, new);
  
-@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
+@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long 
  {
  	unsigned char code[MCOUNT_INSN_SIZE];
  
@@ -13680,10 +12373,9 @@ index 382eb29..a02273e 100644
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
-index 7f138b3..014e4cd 100644
---- a/arch/x86/kernel/head32.c
-+++ b/arch/x86/kernel/head32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/head32.c linux-3.0.3/arch/x86/kernel/head32.c
+--- linux-3.0.3/arch/x86/kernel/head32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/head32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -13692,19 +12384,18 @@ index 7f138b3..014e4cd 100644
  
  static void __init i386_default_early_setup(void)
  {
-@@ -43,7 +44,7 @@ void __init i386_start_kernel(void)
- 	memblock_x86_reserve_range(PAGE_SIZE, PAGE_SIZE + PAGE_SIZE, "EX TRAMPOLINE");
- #endif
+@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
+ {
+ 	memblock_init();
  
 -	memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
 +	memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
-index 767d6c4..5237789 100644
---- a/arch/x86/kernel/head_32.S
-+++ b/arch/x86/kernel/head_32.S
+diff -urNp linux-3.0.3/arch/x86/kernel/head_32.S linux-3.0.3/arch/x86/kernel/head_32.S
+--- linux-3.0.3/arch/x86/kernel/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/head_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -13731,7 +12422,7 @@ index 767d6c4..5237789 100644
  
  /* Number of possible pages in the lowmem region */
  LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
-@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm
+@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P
  RESERVE_BRK(pagetables, INIT_MAP_SIZE)
  
  /*
@@ -13978,7 +12669,7 @@ index 767d6c4..5237789 100644
   * BSS section
   */
 -__PAGE_ALIGNED_BSS
--	.align PAGE_SIZE_asm
+-	.align PAGE_SIZE
  #ifdef CONFIG_X86_PAE
 +.section .initial_pg_pmd,"a",@progbits
  initial_pg_pmd:
@@ -14017,7 +12708,7 @@ index 767d6c4..5237789 100644
  #ifdef CONFIG_X86_PAE
 -__PAGE_ALIGNED_DATA
 -	/* Page-aligned for the benefit of paravirt? */
--	.align PAGE_SIZE_asm
+-	.align PAGE_SIZE
 +.section .initial_page_table,"a",@progbits
  ENTRY(initial_page_table)
  	.long	pa(initial_pg_pmd+PGD_IDENT_ATTR),0	/* low identity map */
@@ -14025,7 +12716,7 @@ index 767d6c4..5237789 100644
 @@ -663,18 +758,27 @@ ENTRY(initial_page_table)
  #  error "Kernel PMDs should be 1, 2 or 3"
  # endif
- 	.align PAGE_SIZE_asm		/* needs to be page-sized too */
+ 	.align PAGE_SIZE		/* needs to be page-sized too */
 +
 +#ifdef CONFIG_PAX_PER_CPU_PGD
 +ENTRY(cpu_pgd)
@@ -14131,7 +12822,7 @@ index 767d6c4..5237789 100644
 +
 +	.quad 0x00c0930000000000	/* 0xd0 - ESPFIX SS */
 +	.quad 0x0040930000000000	/* 0xd8 - PERCPU */
-+	.quad 0x0040910000000018	/* 0xe0 - STACK_CANARY */
++	.quad 0x0040910000000017	/* 0xe0 - STACK_CANARY */
 +	.quad 0x0000000000000000	/* 0xe8 - PCIBIOS_CS */
 +	.quad 0x0000000000000000	/* 0xf0 - PCIBIOS_DS */
 +	.quad 0x0000000000000000	/* 0xf8 - GDT entry 31: double-fault TSS */
@@ -14139,10 +12830,9 @@ index 767d6c4..5237789 100644
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
-index 239046b..db00965 100644
---- a/arch/x86/kernel/head_64.S
-+++ b/arch/x86/kernel/head_64.S
+diff -urNp linux-3.0.3/arch/x86/kernel/head_64.S linux-3.0.3/arch/x86/kernel/head_64.S
+--- linux-3.0.3/arch/x86/kernel/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/head_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -14151,7 +12841,7 @@ index 239046b..db00965 100644
  
  #ifdef CONFIG_PARAVIRT
  #include <asm/asm-offsets.h>
-@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
+@@ -38,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET
  L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
  L4_START_KERNEL = pgd_index(__START_KERNEL_map)
  L3_START_KERNEL = pud_index(__START_KERNEL_map)
@@ -14177,9 +12867,12 @@ index 239046b..db00965 100644
  
 -	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)
+ 
 -	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)
+ 
 -	/* Add an Identity mapping if I am above 1G */
 -	leaq	_text(%rip), %rdi
 -	andq	$PMD_PAGE_MASK, %rdi
@@ -14188,14 +12881,11 @@ index 239046b..db00965 100644
 -	shrq	$PUD_SHIFT, %rax
 -	andq	$(PTRS_PER_PUD - 1), %rax
 -	jz	ident_complete
-+	addq	%rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
- 
+-
 -	leaq	(level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
 -	leaq	level3_ident_pgt(%rip), %rbx
 -	movq	%rdx, 0(%rbx, %rax, 8)
-+	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
-+	addq	%rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
- 
+-
 -	movq	%rdi, %rax
 -	shrq	$PMD_SHIFT, %rax
 -	andq	$(PTRS_PER_PMD - 1), %rax
@@ -14208,7 +12898,7 @@ index 239046b..db00965 100644
  
  	/*
  	 * Fixup the kernel text+data virtual addresses. Note that
-@@ -161,8 +153,8 @@ ENTRY(secondary_startup_64)
+@@ -160,8 +152,8 @@ ENTRY(secondary_startup_64)
  	 * after the boot processor executes this code.
  	 */
  
@@ -14219,7 +12909,7 @@ index 239046b..db00965 100644
  	movq	%rax, %cr4
  
  	/* Setup early boot stage 4 level pagetables. */
-@@ -184,9 +176,14 @@ ENTRY(secondary_startup_64)
+@@ -183,9 +175,14 @@ ENTRY(secondary_startup_64)
  	movl	$MSR_EFER, %ecx
  	rdmsr
  	btsl	$_EFER_SCE, %eax	/* Enable System Call */
@@ -14235,7 +12925,7 @@ index 239046b..db00965 100644
  1:	wrmsr				/* Make changes effective */
  
  	/* Setup cr0 */
-@@ -270,7 +267,7 @@ ENTRY(secondary_startup_64)
+@@ -269,7 +266,7 @@ ENTRY(secondary_startup_64)
  bad_address:
  	jmp bad_address
  
@@ -14244,7 +12934,7 @@ index 239046b..db00965 100644
  #ifdef CONFIG_EARLY_PRINTK
  	.globl early_idt_handlers
  early_idt_handlers:
-@@ -315,18 +312,23 @@ ENTRY(early_idt_handler)
+@@ -314,18 +311,23 @@ ENTRY(early_idt_handler)
  #endif /* EARLY_PRINTK */
  1:	hlt
  	jmp 1b
@@ -14269,7 +12959,7 @@ index 239046b..db00965 100644
  #define NEXT_PAGE(name) \
  	.balign	PAGE_SIZE; \
  ENTRY(name)
-@@ -339,7 +341,6 @@ ENTRY(name)
+@@ -338,7 +340,6 @@ ENTRY(name)
  	i = i + 1 ;					\
  	.endr
  
@@ -14277,7 +12967,7 @@ index 239046b..db00965 100644
  	/*
  	 * This default setting generates an ident mapping at address 0x100000
  	 * and a mapping for the kernel that precisely maps virtual address
-@@ -350,13 +351,36 @@ NEXT_PAGE(init_level4_pgt)
+@@ -349,13 +350,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
@@ -14314,7 +13004,7 @@ index 239046b..db00965 100644
  
  NEXT_PAGE(level3_kernel_pgt)
  	.fill	L3_START_KERNEL,8,0
-@@ -364,20 +388,23 @@ NEXT_PAGE(level3_kernel_pgt)
+@@ -363,20 +387,23 @@ NEXT_PAGE(level3_kernel_pgt)
  	.quad	level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
  	.quad	level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
  
@@ -14346,7 +13036,7 @@ index 239046b..db00965 100644
  
  NEXT_PAGE(level2_kernel_pgt)
  	/*
-@@ -390,33 +417,55 @@ NEXT_PAGE(level2_kernel_pgt)
+@@ -389,33 +416,55 @@ NEXT_PAGE(level2_kernel_pgt)
  	 *  If you want to increase this then increase MODULES_VADDR
  	 *  too.)
  	 */
@@ -14412,10 +13102,9 @@ index 239046b..db00965 100644
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
-index 9c3bd4a..e1d9b35 100644
---- a/arch/x86/kernel/i386_ksyms_32.c
-+++ b/arch/x86/kernel/i386_ksyms_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -14437,10 +13126,9 @@ index 9c3bd4a..e1d9b35 100644
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
-index 20757cb..6e9f53c 100644
---- a/arch/x86/kernel/i8259.c
-+++ b/arch/x86/kernel/i8259.c
+diff -urNp linux-3.0.3/arch/x86/kernel/i8259.c linux-3.0.3/arch/x86/kernel/i8259.c
+--- linux-3.0.3/arch/x86/kernel/i8259.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/i8259.c	2011-08-23 21:47:55.000000000 -0400
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
  			       "spurious 8259A interrupt: IRQ%d.\n", irq);
  			spurious_irq_mask |= irqmask;
@@ -14450,11 +13138,10 @@ index 20757cb..6e9f53c 100644
  		/*
  		 * Theoretically we do not have to handle this IRQ,
  		 * but in Linux this does not cause problems and is
-diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
-index 43e9ccf..44ccf6f 100644
---- a/arch/x86/kernel/init_task.c
-+++ b/arch/x86/kernel/init_task.c
-@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+diff -urNp linux-3.0.3/arch/x86/kernel/init_task.c linux-3.0.3/arch/x86/kernel/init_task.c
+--- linux-3.0.3/arch/x86/kernel/init_task.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/init_task.c	2011-08-23 21:47:55.000000000 -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..
   */
@@ -14472,10 +13159,9 @@ index 43e9ccf..44ccf6f 100644
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
-index 8eec0ec..ef34e2d 100644
---- a/arch/x86/kernel/ioport.c
-+++ b/arch/x86/kernel/ioport.c
+diff -urNp linux-3.0.3/arch/x86/kernel/ioport.c linux-3.0.3/arch/x86/kernel/ioport.c
+--- linux-3.0.3/arch/x86/kernel/ioport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/ioport.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -14484,7 +13170,7 @@ index 8eec0ec..ef34e2d 100644
  #include <linux/errno.h>
  #include <linux/types.h>
  #include <linux/ioport.h>
-@@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
+@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long
  
  	if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
  		return -EINVAL;
@@ -14497,16 +13183,16 @@ index 8eec0ec..ef34e2d 100644
  	if (turn_on && !capable(CAP_SYS_RAWIO))
  		return -EPERM;
  
-@@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
+@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long
  	 * because the ->io_bitmap_max value must match the bitmap
  	 * contents:
  	 */
 -	tss = &per_cpu(init_tss, get_cpu());
 +	tss = init_tss + get_cpu();
  
- 	set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
- 
-@@ -112,6 +119,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
+ 	if (turn_on)
+ 		bitmap_clear(t->io_bitmap_ptr, from, num);
+@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct
  		return -EINVAL;
  	/* Trying to gain more privileges? */
  	if (level > old) {
@@ -14519,48 +13205,9 @@ index 8eec0ec..ef34e2d 100644
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
-index 387b6a0..35552e5 100644
---- a/arch/x86/kernel/irq.c
-+++ b/arch/x86/kernel/irq.c
-@@ -16,7 +16,7 @@
- #include <asm/mce.h>
- #include <asm/hw_irq.h>
- 
--atomic_t irq_err_count;
-+atomic_unchecked_t irq_err_count;
- 
- /* Function pointer for generic interrupt vector handling */
- void (*x86_platform_ipi_callback)(void) = NULL;
-@@ -115,9 +115,9 @@ static int show_other_interrupts(struct seq_file *p, int prec)
- 		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_err_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_mis_count));
- #endif
- 	return 0;
- }
-@@ -210,10 +210,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
- 
- u64 arch_irq_stat(void)
- {
--	u64 sum = atomic_read(&irq_err_count);
-+	u64 sum = atomic_read_unchecked(&irq_err_count);
- 
- #ifdef CONFIG_X86_IO_APIC
--	sum += atomic_read(&irq_mis_count);
-+	sum += atomic_read_unchecked(&irq_mis_count);
- #endif
- 	return sum;
- }
-diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
-index 9974d21..f67f840 100644
---- a/arch/x86/kernel/irq_32.c
-+++ b/arch/x86/kernel/irq_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/irq_32.c linux-3.0.3/arch/x86/kernel/irq_32.c
+--- linux-3.0.3/arch/x86/kernel/irq_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/irq_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
  	__asm__ __volatile__("andl %%esp,%0" :
  			     "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -14570,7 +13217,7 @@ index 9974d21..f67f840 100644
  }
  
  static void print_stack_overflow(void)
-@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
+@@ -54,8 +54,8 @@ static inline void print_stack_overflow(
   * per-CPU IRQ handling contexts (thread information and stack)
   */
  union irq_ctx {
@@ -14581,7 +13228,7 @@ index 9974d21..f67f840 100644
  } __attribute__((aligned(THREAD_SIZE)));
  
  static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
-@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
+@@ -75,10 +75,9 @@ static void call_on_stack(void *func, vo
  static inline int
  execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
  {
@@ -14593,7 +13240,7 @@ index 9974d21..f67f840 100644
  	irqctx = __this_cpu_read(hardirq_ctx);
  
  	/*
-@@ -87,21 +86,17 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -87,21 +86,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)
  	 */
@@ -14607,7 +13254,6 @@ index 9974d21..f67f840 100644
 -	irqctx->tinfo.previous_esp = current_stack_pointer;
 +	isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
 +	irqctx->previous_esp = current_stack_pointer;
-+	add_preempt_count(HARDIRQ_OFFSET);
  
 -	/*
 -	 * Copy the softirq bits in preempt_count so that the
@@ -14622,7 +13268,7 @@ index 9974d21..f67f840 100644
  
  	if (unlikely(overflow))
  		call_on_stack(print_stack_overflow, isp);
-@@ -113,6 +108,12 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struc
  		     :  "0" (irq),   "1" (desc),  "2" (isp),
  			"D" (desc->handle_irq)
  		     : "memory", "cc", "ecx");
@@ -14631,11 +13277,10 @@ index 9974d21..f67f840 100644
 +	__set_fs(current_thread_info()->addr_limit);
 +#endif
 +
-+	sub_preempt_count(HARDIRQ_OFFSET);
  	return 1;
  }
  
-@@ -121,29 +122,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
+@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struc
   */
  void __cpuinit irq_ctx_init(int cpu)
  {
@@ -14667,7 +13312,7 @@ index 9974d21..f67f840 100644
  
  	printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
  	       cpu, per_cpu(hardirq_ctx, cpu),  per_cpu(softirq_ctx, cpu));
-@@ -152,7 +135,6 @@ void __cpuinit irq_ctx_init(int cpu)
+@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
  asmlinkage void do_softirq(void)
  {
  	unsigned long flags;
@@ -14675,7 +13320,7 @@ index 9974d21..f67f840 100644
  	union irq_ctx *irqctx;
  	u32 *isp;
  
-@@ -162,15 +144,22 @@ asmlinkage void do_softirq(void)
+@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
  	local_irq_save(flags);
  
  	if (local_softirq_pending()) {
@@ -14700,15 +13345,51 @@ index 9974d21..f67f840 100644
 +#endif
 +
  		/*
- 		 * Shouldnt happen, we returned above if in_interrupt():
+ 		 * Shouldn't happen, we returned above if in_interrupt():
  		 */
-diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
-index a413000..9b4e79f 100644
---- a/arch/x86/kernel/kgdb.c
-+++ b/arch/x86/kernel/kgdb.c
-@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
- 	switch (regno) {
+diff -urNp linux-3.0.3/arch/x86/kernel/irq.c linux-3.0.3/arch/x86/kernel/irq.c
+--- linux-3.0.3/arch/x86/kernel/irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -17,7 +17,7 @@
+ #include <asm/mce.h>
+ #include <asm/hw_irq.h>
+ 
+-atomic_t irq_err_count;
++atomic_unchecked_t irq_err_count;
+ 
+ /* Function pointer for generic interrupt vector handling */
+ void (*x86_platform_ipi_callback)(void) = NULL;
+@@ -116,9 +116,9 @@ int arch_show_interrupts(struct seq_file
+ 		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_err_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_mis_count));
+ #endif
+ 	return 0;
+ }
+@@ -158,10 +158,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
+ 
+ u64 arch_irq_stat(void)
+ {
+-	u64 sum = atomic_read(&irq_err_count);
++	u64 sum = atomic_read_unchecked(&irq_err_count);
+ 
+ #ifdef CONFIG_X86_IO_APIC
+-	sum += atomic_read(&irq_mis_count);
++	sum += atomic_read_unchecked(&irq_mis_count);
+ #endif
+ 	return sum;
+ }
+diff -urNp linux-3.0.3/arch/x86/kernel/kgdb.c linux-3.0.3/arch/x86/kernel/kgdb.c
+--- linux-3.0.3/arch/x86/kernel/kgdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/kgdb.c	2011-08-23 21:47:55.000000000 -0400
+@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
+ 	switch (regno) {
  	case GDB_SS:
 -		if (!user_mode_vm(regs))
 +		if (!user_mode(regs))
@@ -14720,7 +13401,7 @@ index a413000..9b4e79f 100644
  			*(unsigned long *)mem = kernel_stack_pointer(regs);
  		break;
  	case GDB_GS:
-@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
+@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vec
  	case 'k':
  		/* clear the trace bit */
  		linux_regs->flags &= ~X86_EFLAGS_TF;
@@ -14735,8 +13416,8 @@ index a413000..9b4e79f 100644
  				   raw_smp_processor_id());
  		}
  
-@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
- 		break;
+@@ -534,7 +534,7 @@ static int __kgdb_notify(struct die_args
+ 		return NOTIFY_DONE;
  
  	case DIE_DEBUG:
 -		if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
@@ -14744,20 +13425,10 @@ index a413000..9b4e79f 100644
  			if (user_mode(regs))
  				return single_step_cont(regs, args);
  			break;
-@@ -719,7 +719,7 @@ void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long ip)
- 	regs->ip = ip;
- }
- 
--struct kgdb_arch arch_kgdb_ops = {
-+const struct kgdb_arch arch_kgdb_ops = {
- 	/* Breakpoint instruction: */
- 	.gdb_bpt_instr		= { 0xcc },
- 	.flags			= KGDB_HW_BREAKPOINT,
-diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
-index d91c477..dc6e873 100644
---- a/arch/x86/kernel/kprobes.c
-+++ b/arch/x86/kernel/kprobes.c
-@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
+diff -urNp linux-3.0.3/arch/x86/kernel/kprobes.c linux-3.0.3/arch/x86/kernel/kprobes.c
+--- linux-3.0.3/arch/x86/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/kprobes.c	2011-08-23 21:47:55.000000000 -0400
+@@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
  	insn = (struct __arch_relative_insn *)from;
@@ -14769,7 +13440,7 @@ index d91c477..dc6e873 100644
  }
  
  /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
-@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
+@@ -153,7 +156,7 @@ static int __kprobes can_boost(kprobe_op
  	kprobe_opcode_t opcode;
  	kprobe_opcode_t *orig_opcodes = opcodes;
  
@@ -14778,7 +13449,7 @@ index d91c477..dc6e873 100644
  		return 0;	/* Page fault may occur on this address. */
  
  retry:
-@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
+@@ -314,7 +317,9 @@ static int __kprobes __copy_instruction(
  		}
  	}
  	insn_get_length(&insn);
@@ -14788,7 +13459,7 @@ index d91c477..dc6e873 100644
  
  #ifdef CONFIG_X86_64
  	if (insn_rip_relative(&insn)) {
-@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
+@@ -338,7 +343,9 @@ static int __kprobes __copy_instruction(
  			  (u8 *) dest;
  		BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check.  */
  		disp = (u8 *) dest + insn_offset_displacement(&insn);
@@ -14798,7 +13469,7 @@ index d91c477..dc6e873 100644
  	}
  #endif
  	return insn.length;
-@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
+@@ -352,12 +359,12 @@ static void __kprobes arch_copy_kprobe(s
  	 */
  	__copy_instruction(p->ainsn.insn, p->addr, 0);
  
@@ -14813,7 +13484,7 @@ index d91c477..dc6e873 100644
  }
  
  int __kprobes arch_prepare_kprobe(struct kprobe *p)
-@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
+@@ -474,7 +481,7 @@ static void __kprobes setup_singlestep(s
  		 * nor set current_kprobe, because it doesn't use single
  		 * stepping.
  		 */
@@ -14822,7 +13493,7 @@ index d91c477..dc6e873 100644
  		preempt_enable_no_resched();
  		return;
  	}
-@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
+@@ -493,7 +500,7 @@ static void __kprobes setup_singlestep(s
  	if (p->opcode == BREAKPOINT_INSTRUCTION)
  		regs->ip = (unsigned long)p->addr;
  	else
@@ -14831,7 +13502,7 @@ index d91c477..dc6e873 100644
  }
  
  /*
-@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
+@@ -572,7 +579,7 @@ static int __kprobes kprobe_handler(stru
  				setup_singlestep(p, regs, kcb, 0);
  			return 1;
  		}
@@ -14840,7 +13511,7 @@ index d91c477..dc6e873 100644
  		/*
  		 * The breakpoint instruction was removed right
  		 * after we hit it.  Another cpu has removed
-@@ -817,7 +824,7 @@ static void __kprobes resume_execution(struct kprobe *p,
+@@ -817,7 +824,7 @@ static void __kprobes resume_execution(s
  		struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
  	unsigned long *tos = stack_addr(regs);
@@ -14849,7 +13520,7 @@ index d91c477..dc6e873 100644
  	unsigned long orig_ip = (unsigned long)p->addr;
  	kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(s
  	struct die_args *args = data;
  	int ret = NOTIFY_DONE;
  
@@ -14858,7 +13529,7 @@ index d91c477..dc6e873 100644
  		return ret;
  
  	switch (val) {
-@@ -1372,7 +1379,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -1381,7 +1388,7 @@ int __kprobes arch_prepare_optimized_kpr
  	 * Verify if the address gap is in 2GB range, because this uses
  	 * a relative jump.
  	 */
@@ -14867,7 +13538,7 @@ index d91c477..dc6e873 100644
  	if (abs(rel) > 0x7fffffff)
  		return -ERANGE;
  
-@@ -1393,11 +1400,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
+@@ -1402,11 +1409,11 @@ int __kprobes arch_prepare_optimized_kpr
  	synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
  
  	/* Set probe function call */
@@ -14881,7 +13552,7 @@ index d91c477..dc6e873 100644
  
  	flush_icache_range((unsigned long) buf,
  			   (unsigned long) buf + TMPL_END_IDX +
-@@ -1419,7 +1426,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
+@@ -1428,7 +1435,7 @@ static void __kprobes setup_optimize_kpr
  			((long)op->kp.addr + RELATIVEJUMP_SIZE));
  
  	/* Backup instructions which will be replaced by jump address */
@@ -14890,11 +13561,21 @@ index d91c477..dc6e873 100644
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
-index ea69726..604d066 100644
---- a/arch/x86/kernel/ldt.c
-+++ b/arch/x86/kernel/ldt.c
-@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
+diff -urNp linux-3.0.3/arch/x86/kernel/kvm.c linux-3.0.3/arch/x86/kernel/kvm.c
+--- linux-3.0.3/arch/x86/kernel/kvm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/kvm.c	2011-08-24 18:10:12.000000000 -0400
+@@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
+ 		pv_mmu_ops.set_pud = kvm_set_pud;
+ #if PAGETABLE_LEVELS == 4
+ 		pv_mmu_ops.set_pgd = kvm_set_pgd;
++		pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
+ #endif
+ #endif
+ 		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
+diff -urNp linux-3.0.3/arch/x86/kernel/ldt.c linux-3.0.3/arch/x86/kernel/ldt.c
+--- linux-3.0.3/arch/x86/kernel/ldt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/ldt.c	2011-08-23 21:47:55.000000000 -0400
+@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
  	if (reload) {
  #ifdef CONFIG_SMP
  		preempt_disable();
@@ -14910,7 +13591,7 @@ index ea69726..604d066 100644
  #endif
  	}
  	if (oldsize) {
-@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
+@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t 
  		return err;
  
  	for (i = 0; i < old->size; i++)
@@ -14919,7 +13600,7 @@ index ea69726..604d066 100644
  	return 0;
  }
  
-@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+@@ -116,6 +116,24 @@ int init_new_context(struct task_struct 
  		retval = copy_ldt(&mm->context, &old_mm->context);
  		mutex_unlock(&old_mm->context.lock);
  	}
@@ -14944,7 +13625,7 @@ index ea69726..604d066 100644
  	return retval;
  }
  
-@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
+@@ -230,6 +248,13 @@ static int write_ldt(void __user *ptr, u
  		}
  	}
  
@@ -14958,10 +13639,9 @@ index ea69726..604d066 100644
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
-index a3fa43b..8966f4c 100644
---- a/arch/x86/kernel/machine_kexec_32.c
-+++ b/arch/x86/kernel/machine_kexec_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/machine_kexec_32.c linux-3.0.3/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.0.3/arch/x86/kernel/machine_kexec_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/machine_kexec_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -14971,7 +13651,7 @@ index a3fa43b..8966f4c 100644
  {
  	struct desc_ptr curidt;
  
-@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
+@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 
  }
  
  
@@ -14989,46 +13669,10 @@ index a3fa43b..8966f4c 100644
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
-index 0fe6d1a..8911743 100644
---- a/arch/x86/kernel/microcode_amd.c
-+++ b/arch/x86/kernel/microcode_amd.c
-@@ -317,7 +317,7 @@ static void microcode_fini_cpu_amd(int cpu)
- 	uci->mc = NULL;
- }
- 
--static struct microcode_ops microcode_amd_ops = {
-+static const struct microcode_ops microcode_amd_ops = {
- 	.request_microcode_user           = request_microcode_user,
- 	.request_microcode_fw             = request_microcode_fw,
- 	.collect_cpu_info                 = collect_cpu_info_amd,
-@@ -325,7 +325,7 @@ static struct microcode_ops microcode_amd_ops = {
- 	.microcode_fini_cpu               = microcode_fini_cpu_amd,
- };
- 
--struct microcode_ops * __init init_amd_microcode(void)
-+const struct microcode_ops * __init init_amd_microcode(void)
- {
- 	return &microcode_amd_ops;
- }
-diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
-index 1cca374..3e6f80b 100644
---- a/arch/x86/kernel/microcode_core.c
-+++ b/arch/x86/kernel/microcode_core.c
-@@ -92,7 +92,7 @@ MODULE_LICENSE("GPL");
- 
- #define MICROCODE_VERSION	"2.00"
- 
--static struct microcode_ops	*microcode_ops;
-+static const struct microcode_ops	*microcode_ops;
- 
- /*
-  * Synchronization.
-diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
-index 1a1b606..2a84662 100644
---- a/arch/x86/kernel/microcode_intel.c
-+++ b/arch/x86/kernel/microcode_intel.c
-@@ -440,13 +440,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
+diff -urNp linux-3.0.3/arch/x86/kernel/microcode_intel.c linux-3.0.3/arch/x86/kernel/microcode_intel.c
+--- linux-3.0.3/arch/x86/kernel/microcode_intel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/microcode_intel.c	2011-08-23 21:47:55.000000000 -0400
+@@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
  {
@@ -15044,29 +13688,10 @@ index 1a1b606..2a84662 100644
  }
  
  static void microcode_fini_cpu(int cpu)
-@@ -457,7 +457,7 @@ static void microcode_fini_cpu(int cpu)
- 	uci->mc = NULL;
- }
- 
--static struct microcode_ops microcode_intel_ops = {
-+static const struct microcode_ops microcode_intel_ops = {
- 	.request_microcode_user		  = request_microcode_user,
- 	.request_microcode_fw             = request_microcode_fw,
- 	.collect_cpu_info                 = collect_cpu_info,
-@@ -465,7 +465,7 @@ static struct microcode_ops microcode_intel_ops = {
- 	.microcode_fini_cpu               = microcode_fini_cpu,
- };
- 
--struct microcode_ops * __init init_intel_microcode(void)
-+const struct microcode_ops * __init init_intel_microcode(void)
- {
- 	return &microcode_intel_ops;
- }
-diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
-index ab23f1a..fe9d241 100644
---- a/arch/x86/kernel/module.c
-+++ b/arch/x86/kernel/module.c
-@@ -35,21 +35,66 @@
+diff -urNp linux-3.0.3/arch/x86/kernel/module.c linux-3.0.3/arch/x86/kernel/module.c
+--- linux-3.0.3/arch/x86/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+@@ -36,21 +36,66 @@
  #define DEBUGP(fmt...)
  #endif
  
@@ -15135,7 +13760,7 @@ index ab23f1a..fe9d241 100644
  /* We don't need anything special. */
  int module_frob_arch_sections(Elf_Ehdr *hdr,
  			      Elf_Shdr *sechdrs,
-@@ -69,14 +114,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -70,14 +115,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
  	unsigned int i;
  	Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
  	Elf32_Sym *sym;
@@ -15155,7 +13780,7 @@ index ab23f1a..fe9d241 100644
  		/* This is the symbol it is referring to.  Note that all
  		   undefined symbols have been resolved.  */
  		sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
-@@ -85,11 +132,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
+@@ -86,11 +133,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 */
@@ -15173,7 +13798,7 @@ index ab23f1a..fe9d241 100644
  			break;
  		default:
  			printk(KERN_ERR "module %s: Unknown relocation: %u\n",
-@@ -145,21 +196,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+@@ -146,21 +197,30 @@ int apply_relocate_add(Elf64_Shdr *sechd
  		case R_X86_64_NONE:
  			break;
  		case R_X86_64_64:
@@ -15204,24 +13829,20 @@ index ab23f1a..fe9d241 100644
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
-index 676b8c7..870ba04 100644
---- a/arch/x86/kernel/paravirt-spinlocks.c
-+++ b/arch/x86/kernel/paravirt-spinlocks.c
-@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
- 	arch_spin_lock(lock);
+diff -urNp linux-3.0.3/arch/x86/kernel/paravirt.c linux-3.0.3/arch/x86/kernel/paravirt.c
+--- linux-3.0.3/arch/x86/kernel/paravirt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/paravirt.c	2011-08-23 21:48:14.000000000 -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
  
--struct pv_lock_ops pv_lock_ops = {
-+struct pv_lock_ops pv_lock_ops __read_only = {
- #ifdef CONFIG_SMP
- 	.spin_is_locked = __ticket_spin_is_locked,
- 	.spin_is_contended = __ticket_spin_is_contended,
-diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
-index 869e1ae..f70d759 100644
---- a/arch/x86/kernel/paravirt.c
-+++ b/arch/x86/kernel/paravirt.c
-@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
+ void __init default_banner(void)
+ {
+@@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbu
   * corresponding structure. */
  static void *get_call_destination(u8 type)
  {
@@ -15230,7 +13851,7 @@ index 869e1ae..f70d759 100644
  		.pv_init_ops = pv_init_ops,
  		.pv_time_ops = pv_time_ops,
  		.pv_cpu_ops = pv_cpu_ops,
-@@ -133,6 +133,9 @@ static void *get_call_destination(u8 type)
+@@ -133,6 +136,9 @@ static void *get_call_destination(u8 typ
  		.pv_lock_ops = pv_lock_ops,
  #endif
  	};
@@ -15240,7 +13861,7 @@ index 869e1ae..f70d759 100644
  	return *((void **)&tmpl + type);
  }
  
-@@ -145,14 +148,14 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
+@@ -145,15 +151,19 @@ unsigned paravirt_patch_default(u8 type,
  	if (opfunc == NULL)
  		/* If there's no function, patch it with a ud2a (BUG) */
  		ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
@@ -15256,9 +13877,14 @@ index 869e1ae..f70d759 100644
 -	else if (opfunc == _paravirt_ident_64)
 +	else if (opfunc == (void *)_paravirt_ident_64)
  		ret = paravirt_patch_ident_64(insnbuf, len);
++#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
++	else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
++		ret = paravirt_patch_ident_64(insnbuf, len);
++#endif
  
  	else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
-@@ -178,7 +181,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
+ 		 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
+@@ -178,7 +188,7 @@ unsigned paravirt_patch_insns(void *insn
  	if (insn_len > len || start == NULL)
  		insn_len = len;
  	else
@@ -15267,7 +13893,7 @@ index 869e1ae..f70d759 100644
  
  	return insn_len;
  }
-@@ -294,22 +297,22 @@ void arch_flush_lazy_mmu_mode(void)
+@@ -294,22 +304,22 @@ void arch_flush_lazy_mmu_mode(void)
  	preempt_enable();
  }
  
@@ -15294,7 +13920,7 @@ index 869e1ae..f70d759 100644
  	.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
  	.restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
  	.irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
-@@ -321,7 +324,7 @@ struct pv_irq_ops pv_irq_ops = {
+@@ -321,7 +331,7 @@ struct pv_irq_ops pv_irq_ops = {
  #endif
  };
  
@@ -15303,7 +13929,7 @@ index 869e1ae..f70d759 100644
  	.cpuid = native_cpuid,
  	.get_debugreg = native_get_debugreg,
  	.set_debugreg = native_set_debugreg,
-@@ -382,7 +385,7 @@ struct pv_cpu_ops pv_cpu_ops = {
+@@ -382,21 +392,26 @@ struct pv_cpu_ops pv_cpu_ops = {
  	.end_context_switch = paravirt_nop,
  };
  
@@ -15312,7 +13938,19 @@ index 869e1ae..f70d759 100644
  #ifdef CONFIG_X86_LOCAL_APIC
  	.startup_ipi_hook = paravirt_nop,
  #endif
-@@ -396,7 +399,7 @@ struct pv_apic_ops pv_apic_ops = {
+ };
+ 
+-#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
  
@@ -15321,7 +13959,15 @@ index 869e1ae..f70d759 100644
  
  	.read_cr2 = native_read_cr2,
  	.write_cr2 = native_write_cr2,
-@@ -465,6 +468,12 @@ struct pv_mmu_ops pv_mmu_ops = {
+@@ -446,6 +461,7 @@ struct pv_mmu_ops pv_mmu_ops = {
+ 	.make_pud = PTE_IDENT,
+ 
+ 	.set_pgd = native_set_pgd,
++	.set_pgd_batched = native_set_pgd_batched,
+ #endif
+ #endif /* PAGETABLE_LEVELS >= 3 */
+ 
+@@ -465,6 +481,12 @@ struct pv_mmu_ops pv_mmu_ops = {
  	},
  
  	.set_fixmap = native_set_fixmap,
@@ -15334,58 +13980,21 @@ index 869e1ae..f70d759 100644
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
-index f56a117..3b4e63d 100644
---- a/arch/x86/kernel/pci-calgary_64.c
-+++ b/arch/x86/kernel/pci-calgary_64.c
-@@ -476,7 +476,7 @@ static void calgary_free_coherent(struct device *dev, size_t size,
- 	free_pages((unsigned long)vaddr, get_order(size));
- }
- 
--static struct dma_map_ops calgary_dma_ops = {
-+static const struct dma_map_ops calgary_dma_ops = {
- 	.alloc_coherent = calgary_alloc_coherent,
- 	.free_coherent = calgary_free_coherent,
- 	.map_sg = calgary_map_sg,
-diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index 9ea999a..f8d2478 100644
---- a/arch/x86/kernel/pci-dma.c
-+++ b/arch/x86/kernel/pci-dma.c
-@@ -16,7 +16,7 @@
- 
- static int forbid_dac __read_mostly;
- 
--struct dma_map_ops *dma_ops = &nommu_dma_ops;
-+const struct dma_map_ops *dma_ops = &nommu_dma_ops;
- EXPORT_SYMBOL(dma_ops);
- 
- static int iommu_sac_force __read_mostly;
-@@ -250,7 +250,7 @@ early_param("iommu", iommu_setup);
- 
- int dma_supported(struct device *dev, u64 mask)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- #ifdef CONFIG_PCI
- 	if (mask > 0xffffffff && forbid_dac > 0) {
-diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
-index 197a46f..51f303d 100644
---- a/arch/x86/kernel/pci-gart_64.c
-+++ b/arch/x86/kernel/pci-gart_64.c
-@@ -713,7 +713,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info)
- 	return -1;
+diff -urNp linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c	2011-08-23 21:47:55.000000000 -0400
+@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
+ 	arch_spin_lock(lock);
  }
  
--static struct dma_map_ops gart_dma_ops = {
-+static const struct dma_map_ops gart_dma_ops = {
- 	.map_sg				= gart_map_sg,
- 	.unmap_sg			= gart_unmap_sg,
- 	.map_page			= gart_map_page,
-diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
-index 55d745e..83ab856 100644
---- a/arch/x86/kernel/pci-iommu_table.c
-+++ b/arch/x86/kernel/pci-iommu_table.c
+-struct pv_lock_ops pv_lock_ops = {
++struct pv_lock_ops pv_lock_ops __read_only = {
+ #ifdef CONFIG_SMP
+ 	.spin_is_locked = __ticket_spin_is_locked,
+ 	.spin_is_contended = __ticket_spin_is_contended,
+diff -urNp linux-3.0.3/arch/x86/kernel/pci-iommu_table.c linux-3.0.3/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.0.3/arch/x86/kernel/pci-iommu_table.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/pci-iommu_table.c	2011-08-23 21:48:14.000000000 -0400
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -15395,184 +14004,19 @@ index 55d745e..83ab856 100644
  
  #define DEBUG 1
  
-@@ -53,6 +53,8 @@ void __init check_iommu_entries(struct iommu_table_entry *start,
- 	char sym_p[KSYM_SYMBOL_LEN];
- 	char sym_q[KSYM_SYMBOL_LEN];
+@@ -51,6 +51,8 @@ void __init check_iommu_entries(struct i
+ {
+ 	struct iommu_table_entry *p, *q, *x;
  
 +	pax_track_stack();
 +
  	/* Simple cyclic dependency checker. */
  	for (p = start; p < finish; p++) {
  		q = find_dependents_of(start, finish, p);
-diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
-index 3af4af8..7950f48 100644
---- a/arch/x86/kernel/pci-nommu.c
-+++ b/arch/x86/kernel/pci-nommu.c
-@@ -95,7 +95,7 @@ static void nommu_sync_sg_for_device(struct device *dev,
- 	flush_write_buffers();
- }
- 
--struct dma_map_ops nommu_dma_ops = {
-+const struct dma_map_ops nommu_dma_ops = {
- 	.alloc_coherent		= dma_generic_alloc_coherent,
- 	.free_coherent		= nommu_free_coherent,
- 	.map_sg			= nommu_map_sg,
-diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
-index 8f972cb..f1ec69c 100644
---- a/arch/x86/kernel/pci-swiotlb.c
-+++ b/arch/x86/kernel/pci-swiotlb.c
-@@ -26,7 +26,7 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
- 	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
- }
- 
--static struct dma_map_ops swiotlb_dma_ops = {
-+static const struct dma_map_ops swiotlb_dma_ops = {
- 	.mapping_error = swiotlb_dma_mapping_error,
- 	.alloc_coherent = x86_swiotlb_alloc_coherent,
- 	.free_coherent = swiotlb_free_coherent,
-diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
-index ff45541..5bc728d 100644
---- a/arch/x86/kernel/process.c
-+++ b/arch/x86/kernel/process.c
-@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
- 
- void free_thread_info(struct thread_info *ti)
- {
--	free_thread_xstate(ti->task);
- 	free_pages((unsigned long)ti, get_order(THREAD_SIZE));
- }
- 
-+static struct kmem_cache *task_struct_cachep;
-+
- void arch_task_cache_init(void)
- {
--        task_xstate_cachep =
--        	kmem_cache_create("task_xstate", xstate_size,
-+	/* create a slab on which task_structs can be allocated */
-+	task_struct_cachep =
-+		kmem_cache_create("task_struct", sizeof(struct task_struct),
-+			ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
-+
-+	task_xstate_cachep =
-+		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);
- }
- 
- /*
-@@ -70,7 +87,7 @@ void exit_thread(void)
- 	unsigned long *bp = t->io_bitmap_ptr;
- 
- 	if (bp) {
--		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
-+		struct tss_struct *tss = init_tss + get_cpu();
- 
- 		t->io_bitmap_ptr = NULL;
- 		clear_thread_flag(TIF_IO_BITMAP);
-@@ -106,7 +123,7 @@ void show_regs_common(void)
- 
- 	printk(KERN_CONT "\n");
- 	printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
--		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);
-@@ -123,6 +140,9 @@ void flush_thread(void)
- {
- 	struct task_struct *tsk = current;
- 
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
-+	loadsegment(gs, 0);
-+#endif
- 	flush_ptrace_hw_breakpoint(tsk);
- 	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
- 	/*
-@@ -285,10 +305,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
- 	regs.di = (unsigned long) arg;
- 
- #ifdef CONFIG_X86_32
--	regs.ds = __USER_DS;
--	regs.es = __USER_DS;
-+	regs.ds = __KERNEL_DS;
-+	regs.es = __KERNEL_DS;
- 	regs.fs = __KERNEL_PERCPU;
--	regs.gs = __KERNEL_STACK_CANARY;
-+	savesegment(gs, regs.gs);
- #else
- 	regs.ss = __KERNEL_DS;
- #endif
-@@ -404,7 +424,7 @@ void default_idle(void)
- EXPORT_SYMBOL(default_idle);
- #endif
- 
--void stop_this_cpu(void *dummy)
-+__noreturn void stop_this_cpu(void *dummy)
- {
- 	local_irq_disable();
- 	/*
-@@ -668,16 +688,34 @@ static int __init idle_setup(char *str)
- }
- early_param("idle", idle_setup);
- 
--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 -= get_random_int() % 8192;
--	return sp & ~0xf;
--}
-+	struct thread_struct *thread = &current->thread;
-+	unsigned long time;
- 
--unsigned long arch_randomize_brk(struct mm_struct *mm)
--{
--	unsigned long range_end = mm->brk + 0x02000000;
--	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
--}
-+	if (!randomize_va_space)
-+		return;
-+
-+	rdtscl(time);
-+
-+	/* P4 seems to return a 0 LSB, ignore it */
-+#ifdef CONFIG_MPENTIUM4
-+	time &= 0x3EUL;
-+	time <<= 2;
-+#elif defined(CONFIG_X86_64)
-+	time &= 0xFUL;
-+	time <<= 4;
-+#else
-+	time &= 0x1FUL;
-+	time <<= 3;
-+#endif
-+
-+	thread->sp0 ^= time;
-+	load_sp0(init_tss + smp_processor_id(), thread);
- 
-+#ifdef CONFIG_X86_64
-+	percpu_write(kernel_stack, thread->sp0);
-+#endif
-+}
-+#endif
-diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
-index 8d12878..aed73f1 100644
---- a/arch/x86/kernel/process_32.c
-+++ b/arch/x86/kernel/process_32.c
-@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
+diff -urNp linux-3.0.3/arch/x86/kernel/process_32.c linux-3.0.3/arch/x86/kernel/process_32.c
+--- linux-3.0.3/arch/x86/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/process_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
  	return ((unsigned long *)tsk->thread.sp)[3];
@@ -15580,7 +14024,7 @@ index 8d12878..aed73f1 100644
  }
  
  #ifndef CONFIG_SMP
-@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, int all)
+@@ -126,15 +127,14 @@ void __show_regs(struct pt_regs *regs, i
  	unsigned long sp;
  	unsigned short ss, gs;
  
@@ -15598,7 +14042,7 @@ index 8d12878..aed73f1 100644
  
  	show_regs_common();
  
-@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -196,13 +196,14 @@ int copy_thread(unsigned long clone_flag
  	struct task_struct *tsk;
  	int err;
  
@@ -15614,7 +14058,7 @@ index 8d12878..aed73f1 100644
  
  	p->thread.ip = (unsigned long) ret_from_fork;
  
-@@ -293,7 +294,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -292,7 +293,7 @@ __switch_to(struct task_struct *prev_p, 
  	struct thread_struct *prev = &prev_p->thread,
  				 *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -15623,7 +14067,7 @@ index 8d12878..aed73f1 100644
  	bool preload_fpu;
  
  	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
-@@ -328,6 +329,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -327,6 +328,10 @@ __switch_to(struct task_struct *prev_p, 
  	 */
  	lazy_save_gs(prev->gs);
  
@@ -15634,7 +14078,7 @@ index 8d12878..aed73f1 100644
  	/*
  	 * Load the per-thread Thread-Local Storage descriptor.
  	 */
-@@ -363,6 +368,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -362,6 +367,9 @@ __switch_to(struct task_struct *prev_p, 
  	 */
  	arch_end_context_switch(next_p);
  
@@ -15644,7 +14088,7 @@ index 8d12878..aed73f1 100644
  	if (preload_fpu)
  		__math_state_restore();
  
-@@ -372,8 +380,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -371,8 +379,6 @@ __switch_to(struct task_struct *prev_p, 
  	if (prev->gs | next->gs)
  		lazy_load_gs(next->gs);
  
@@ -15653,15 +14097,14 @@ index 8d12878..aed73f1 100644
  	return prev_p;
  }
  
-@@ -403,4 +409,3 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -402,4 +408,3 @@ unsigned long get_wchan(struct task_stru
  	} while (count++ < 16);
  	return 0;
  }
 -
-diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
-index bd387e8..586c7c7 100644
---- a/arch/x86/kernel/process_64.c
-+++ b/arch/x86/kernel/process_64.c
+diff -urNp linux-3.0.3/arch/x86/kernel/process_64.c linux-3.0.3/arch/x86/kernel/process_64.c
+--- linux-3.0.3/arch/x86/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/process_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -15671,7 +14114,7 @@ index bd387e8..586c7c7 100644
  		return;
  	__exit_idle();
  }
-@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -260,8 +260,7 @@ int copy_thread(unsigned long clone_flag
  	struct pt_regs *childregs;
  	struct task_struct *me = current;
  
@@ -15681,7 +14124,7 @@ index bd387e8..586c7c7 100644
  	*childregs = *regs;
  
  	childregs->ax = 0;
-@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
+@@ -273,6 +272,7 @@ int copy_thread(unsigned long clone_flag
  	p->thread.sp = (unsigned long) childregs;
  	p->thread.sp0 = (unsigned long) (childregs+1);
  	p->thread.usersp = me->thread.usersp;
@@ -15689,7 +14132,7 @@ index bd387e8..586c7c7 100644
  
  	set_tsk_thread_flag(p, TIF_FORK);
  
-@@ -376,7 +376,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -375,7 +375,7 @@ __switch_to(struct task_struct *prev_p, 
  	struct thread_struct *prev = &prev_p->thread;
  	struct thread_struct *next = &next_p->thread;
  	int cpu = smp_processor_id();
@@ -15698,7 +14141,7 @@ index bd387e8..586c7c7 100644
  	unsigned fsindex, gsindex;
  	bool preload_fpu;
  
-@@ -472,10 +472,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
+@@ -471,10 +471,9 @@ __switch_to(struct task_struct *prev_p, 
  	prev->usersp = percpu_read(old_rsp);
  	percpu_write(old_rsp, next->usersp);
  	percpu_write(current_task, next_p);
@@ -15711,7 +14154,7 @@ index bd387e8..586c7c7 100644
  
  	/*
  	 * Now maybe reload the debug registers and handle I/O bitmaps
-@@ -529,12 +528,11 @@ unsigned long get_wchan(struct task_struct *p)
+@@ -536,12 +535,11 @@ unsigned long get_wchan(struct task_stru
  	if (!p || p == current || p->state == TASK_RUNNING)
  		return 0;
  	stack = (unsigned long)task_stack_page(p);
@@ -15726,11 +14169,147 @@ index bd387e8..586c7c7 100644
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
-index f65e5b5..6350c3e 100644
---- a/arch/x86/kernel/ptrace.c
-+++ b/arch/x86/kernel/ptrace.c
-@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *child, long request,
+diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/process.c
+--- linux-3.0.3/arch/x86/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
+ 
+ void free_thread_info(struct thread_info *ti)
+ {
+-	free_thread_xstate(ti->task);
+ 	free_pages((unsigned long)ti, get_order(THREAD_SIZE));
+ }
+ 
++static struct kmem_cache *task_struct_cachep;
++
+ void arch_task_cache_init(void)
+ {
+-        task_xstate_cachep =
+-        	kmem_cache_create("task_xstate", xstate_size,
++	/* create a slab on which task_structs can be allocated */
++	task_struct_cachep =
++		kmem_cache_create("task_struct", sizeof(struct task_struct),
++			ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
++
++	task_xstate_cachep =
++		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_node(int node)
++{
++	return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
++}
++
++void free_task_struct(struct task_struct *task)
++{
++	free_thread_xstate(task);
++	kmem_cache_free(task_struct_cachep, task);
+ }
+ 
+ /*
+@@ -70,7 +87,7 @@ void exit_thread(void)
+ 	unsigned long *bp = t->io_bitmap_ptr;
+ 
+ 	if (bp) {
+-		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
++		struct tss_struct *tss = init_tss + get_cpu();
+ 
+ 		t->io_bitmap_ptr = NULL;
+ 		clear_thread_flag(TIF_IO_BITMAP);
+@@ -106,7 +123,7 @@ void show_regs_common(void)
+ 
+ 	printk(KERN_CONT "\n");
+ 	printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
+-		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);
+@@ -120,6 +137,9 @@ void flush_thread(void)
+ {
+ 	struct task_struct *tsk = current;
+ 
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
++	loadsegment(gs, 0);
++#endif
+ 	flush_ptrace_hw_breakpoint(tsk);
+ 	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
+ 	/*
+@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), voi
+ 	regs.di = (unsigned long) arg;
+ 
+ #ifdef CONFIG_X86_32
+-	regs.ds = __USER_DS;
+-	regs.es = __USER_DS;
++	regs.ds = __KERNEL_DS;
++	regs.es = __KERNEL_DS;
+ 	regs.fs = __KERNEL_PERCPU;
+-	regs.gs = __KERNEL_STACK_CANARY;
++	savesegment(gs, regs.gs);
+ #else
+ 	regs.ss = __KERNEL_DS;
+ #endif
+@@ -403,7 +423,7 @@ void default_idle(void)
+ EXPORT_SYMBOL(default_idle);
+ #endif
+ 
+-void stop_this_cpu(void *dummy)
++__noreturn void stop_this_cpu(void *dummy)
+ {
+ 	local_irq_disable();
+ 	/*
+@@ -668,16 +688,34 @@ static int __init idle_setup(char *str)
+ }
+ early_param("idle", idle_setup);
+ 
+-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 -= get_random_int() % 8192;
+-	return sp & ~0xf;
+-}
++	struct thread_struct *thread = &current->thread;
++	unsigned long time;
+ 
+-unsigned long arch_randomize_brk(struct mm_struct *mm)
+-{
+-	unsigned long range_end = mm->brk + 0x02000000;
+-	return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+-}
++	if (!randomize_va_space)
++		return;
++
++	rdtscl(time);
++
++	/* P4 seems to return a 0 LSB, ignore it */
++#ifdef CONFIG_MPENTIUM4
++	time &= 0x3EUL;
++	time <<= 2;
++#elif defined(CONFIG_X86_64)
++	time &= 0xFUL;
++	time <<= 4;
++#else
++	time &= 0x1FUL;
++	time <<= 3;
++#endif
++
++	thread->sp0 ^= time;
++	load_sp0(init_tss + smp_processor_id(), thread);
+ 
++#ifdef CONFIG_X86_64
++	percpu_write(kernel_stack, thread->sp0);
++#endif
++}
++#endif
+diff -urNp linux-3.0.3/arch/x86/kernel/ptrace.c linux-3.0.3/arch/x86/kernel/ptrace.c
+--- linux-3.0.3/arch/x86/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/ptrace.c	2011-08-23 21:47:55.000000000 -0400
+@@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
  		 unsigned long addr, unsigned long data)
  {
  	int ret;
@@ -15739,7 +14318,7 @@ index f65e5b5..6350c3e 100644
  
  	switch (request) {
  	/* read the word at location addr in the USER area. */
-@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *child, long request,
+@@ -906,14 +906,14 @@ long arch_ptrace(struct task_struct *chi
  		if ((int) addr < 0)
  			return -EIO;
  		ret = do_get_thread_area(child, addr,
@@ -15756,7 +14335,7 @@ index f65e5b5..6350c3e 100644
  		break;
  #endif
  
-@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
+@@ -1330,7 +1330,7 @@ static void fill_sigtrap_info(struct tas
  	memset(info, 0, sizeof(*info));
  	info->si_signo = SIGTRAP;
  	info->si_code = si_code;
@@ -15765,29 +14344,10 @@ index f65e5b5..6350c3e 100644
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-@@ -1363,7 +1363,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
-  * 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 = 0;
- 
-@@ -1408,7 +1408,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
- 	return ret ?: regs->orig_ax;
- }
- 
--asmregparm void syscall_trace_leave(struct pt_regs *regs)
-+void syscall_trace_leave(struct pt_regs *regs)
- {
- 	bool step;
- 
-diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
-index 42eb330..139955c 100644
---- a/arch/x86/kernel/pvclock.c
-+++ b/arch/x86/kernel/pvclock.c
-@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
+diff -urNp linux-3.0.3/arch/x86/kernel/pvclock.c linux-3.0.3/arch/x86/kernel/pvclock.c
+--- linux-3.0.3/arch/x86/kernel/pvclock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/pvclock.c	2011-08-23 21:47:55.000000000 -0400
+@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
  	return pv_tsc_khz;
  }
  
@@ -15801,7 +14361,7 @@ index 42eb330..139955c 100644
  }
  
  cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
-@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
+@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct 
  	 * updating at the same time, and one of them could be slightly behind,
  	 * making the assumption that last_value always go forward fail to hold.
  	 */
@@ -15815,84 +14375,99 @@ index 42eb330..139955c 100644
  	} while (unlikely(last != ret));
  
  	return ret;
-diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
-index 715037c..0bdb632 100644
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -34,7 +34,7 @@ void (*pm_power_off)(void);
+diff -urNp linux-3.0.3/arch/x86/kernel/reboot.c linux-3.0.3/arch/x86/kernel/reboot.c
+--- linux-3.0.3/arch/x86/kernel/reboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/reboot.c	2011-08-23 21:47:55.000000000 -0400
+@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
  static const struct desc_ptr no_idt = {};
 -static int reboot_mode;
 +static unsigned short reboot_mode;
- enum reboot_type reboot_type = BOOT_KBD;
+ enum reboot_type reboot_type = BOOT_ACPI;
  int reboot_force;
  
-@@ -309,12 +309,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] =
-+static struct desc_struct
-+real_mode_gdt_entries [3] __read_only =
- {
--	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 0x00000000 */
-+	GDT_ENTRY_INIT(0x93, 0x100, 0xffff)	/* 16-bit real-mode 64k data at 0x00000100 */
- };
+@@ -315,13 +315,17 @@ core_initcall(reboot_init);
+ extern const unsigned char machine_real_restart_asm[];
+ extern const u64 machine_real_restart_gdt[3];
  
- static const struct desc_ptr
-@@ -363,7 +363,7 @@ static const unsigned char jump_to_bios [] =
-  * specified by the code and length parameters.
-  * We assume that length will aways be less that 100!
-  */
--void machine_real_restart(const unsigned char *code, int length)
-+__noreturn void machine_real_restart(const unsigned char *code, unsigned int length)
+-void machine_real_restart(unsigned int type)
++__noreturn void machine_real_restart(unsigned int type)
  {
+ 	void *restart_va;
+ 	unsigned long restart_pa;
+-	void (*restart_lowmem)(unsigned int);
++	void (* __noreturn restart_lowmem)(unsigned int);
+ 	u64 *lowmem_gdt;
+ 
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
++	struct desc_struct *gdt;
++#endif
++
  	local_irq_disable();
  
-@@ -390,16 +390,15 @@ void machine_real_restart(const unsigned char *code, int length)
+ 	/* Write zero to CMOS register number 0x0f, which the BIOS POST
+@@ -347,14 +351,14 @@ void machine_real_restart(unsigned int t
  	   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) = reboot_mode;
 +	*(unsigned short *)(__va(0x472)) = reboot_mode;
  
- 	/* 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_switch, sizeof (real_mode_switch));
-+	memcpy(__va(0x1000 - 100), code, length);
- 
- 	/* Set up the IDT for real mode. */
- 	load_idt(&real_mode_idt);
-@@ -427,6 +426,7 @@ void machine_real_restart(const unsigned char *code, int length)
- 	__asm__ __volatile__ ("ljmp $0x0008,%0"
- 				:
- 				: "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100)));
+ 	/* Patch the GDT in the low memory trampoline */
+ 	lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
+ 
+ 	restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
+ 	restart_pa = virt_to_phys(restart_va);
+-	restart_lowmem = (void (*)(unsigned int))restart_pa;
++	restart_lowmem = (void *)restart_pa;
+ 
+ 	/* GDT[0]: GDT self-pointer */
+ 	lowmem_gdt[0] =
+@@ -365,7 +369,33 @@ void machine_real_restart(unsigned int t
+ 		GDT_ENTRY(0x009b, restart_pa, 0xffff);
+ 
+ 	/* Jump to the identity-mapped low memory code */
++
++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
++	gdt = get_cpu_gdt_table(smp_processor_id());
++	pax_open_kernel();
++#ifdef CONFIG_PAX_MEMORY_UDEREF
++	gdt[GDT_ENTRY_KERNEL_DS].type = 3;
++	gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
++	asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
++#endif
++#ifdef CONFIG_PAX_KERNEXEC
++	gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
++	gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
++	gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
++	gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
++	gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
++	gdt[GDT_ENTRY_KERNEL_CS].g = 1;
++#endif
++	pax_close_kernel();
++#endif
++
++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
++	asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
 +	unreachable();
++#else
+ 	restart_lowmem(type);
++#endif
++
  }
  #ifdef CONFIG_APM_MODULE
  EXPORT_SYMBOL(machine_real_restart);
-@@ -547,7 +547,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
- {
- }
- 
+@@ -523,7 +553,7 @@ void __attribute__((weak)) mach_reboot_f
+  * try to force a triple fault and then cycle between hitting the keyboard
+  * controller and doing that
+  */
 -static void native_machine_emergency_restart(void)
 +__noreturn static void native_machine_emergency_restart(void)
  {
  	int i;
- 
-@@ -662,13 +662,13 @@ void native_machine_shutdown(void)
+ 	int attempt = 0;
+@@ -647,13 +677,13 @@ void native_machine_shutdown(void)
  #endif
  }
  
@@ -15908,7 +14483,7 @@ index 715037c..0bdb632 100644
  {
  	printk("machine restart\n");
  
-@@ -677,7 +677,7 @@ static void native_machine_restart(char *__unused)
+@@ -662,7 +692,7 @@ static void native_machine_restart(char 
  	__machine_emergency_restart(0);
  }
  
@@ -15917,7 +14492,7 @@ index 715037c..0bdb632 100644
  {
  	/* stop other cpus and apics */
  	machine_shutdown();
-@@ -688,7 +688,7 @@ static void native_machine_halt(void)
+@@ -673,7 +703,7 @@ static void native_machine_halt(void)
  	stop_this_cpu(NULL);
  }
  
@@ -15926,7 +14501,7 @@ index 715037c..0bdb632 100644
  {
  	if (pm_power_off) {
  		if (!reboot_force)
-@@ -697,6 +697,7 @@ static void native_machine_power_off(void)
+@@ -682,6 +712,7 @@ static void native_machine_power_off(voi
  	}
  	/* a fallback in case there is no PM info available */
  	tboot_shutdown(TB_SHUTDOWN_HALT);
@@ -15934,11 +14509,10 @@ index 715037c..0bdb632 100644
  }
  
  struct machine_ops machine_ops = {
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index d3cfe26..aeb75b1 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -654,7 +654,7 @@ static void __init trim_bios_range(void)
+diff -urNp linux-3.0.3/arch/x86/kernel/setup.c linux-3.0.3/arch/x86/kernel/setup.c
+--- linux-3.0.3/arch/x86/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
+@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
  	 * area (640->1Mb) as ram even though it is not.
  	 * take them out.
  	 */
@@ -15947,7 +14521,7 @@ index d3cfe26..aeb75b1 100644
  	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
  }
  
-@@ -790,14 +790,14 @@ void __init setup_arch(char **cmdline_p)
+@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
  
  	if (!boot_params.hdr.root_flags)
  		root_mountflags &= ~MS_RDONLY;
@@ -15967,10 +14541,9 @@ index d3cfe26..aeb75b1 100644
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
-index 002b796..14c9f6d 100644
---- a/arch/x86/kernel/setup_percpu.c
-+++ b/arch/x86/kernel/setup_percpu.c
+diff -urNp linux-3.0.3/arch/x86/kernel/setup_percpu.c linux-3.0.3/arch/x86/kernel/setup_percpu.c
+--- linux-3.0.3/arch/x86/kernel/setup_percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/setup_percpu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -15995,7 +14568,7 @@ index 002b796..14c9f6d 100644
  	[0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
  };
  EXPORT_SYMBOL(__per_cpu_offset);
-@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
+@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(
  {
  #ifdef CONFIG_X86_32
  	struct desc_struct gdt;
@@ -16014,31 +14587,30 @@ index 002b796..14c9f6d 100644
  	delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
  	for_each_possible_cpu(cpu) {
 +#ifdef CONFIG_CC_STACKPROTECTOR
-+#ifdef CONFIG_x86_32
-+		unsigned long canary = per_cpu(stack_canary, cpu);
++#ifdef CONFIG_X86_32
++		unsigned long canary = per_cpu(stack_canary.canary, cpu);
 +#endif
 +#endif
  		per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
  		per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
  		per_cpu(cpu_number, cpu) = cpu;
-@@ -243,6 +246,12 @@ void __init setup_per_cpu_areas(void)
+@@ -247,6 +250,12 @@ void __init setup_per_cpu_areas(void)
+ 		 */
  		set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
  #endif
- #endif
 +#ifdef CONFIG_CC_STACKPROTECTOR
-+#ifdef CONFIG_x86_32
-+		if (cpu == boot_cpu_id)
-+			per_cpu(stack_canary, cpu) = canary;
++#ifdef CONFIG_X86_32
++		if (!cpu)
++			per_cpu(stack_canary.canary, cpu) = canary;
 +#endif
 +#endif
  		/*
  		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
-diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
-index 4fd173c..66cc537 100644
---- a/arch/x86/kernel/signal.c
-+++ b/arch/x86/kernel/signal.c
-@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
+diff -urNp linux-3.0.3/arch/x86/kernel/signal.c linux-3.0.3/arch/x86/kernel/signal.c
+--- linux-3.0.3/arch/x86/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
  	 * Align the stack pointer according to the i386 ABI,
  	 * i.e. so that on function entry ((sp + 4) & 15) == 0.
  	 */
@@ -16047,7 +14619,7 @@ index 4fd173c..66cc537 100644
  #else /* !CONFIG_X86_32 */
  	sp = round_down(sp, 16) - 8;
  #endif
-@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
+@@ -249,11 +249,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)))
@@ -16061,7 +14633,7 @@ index 4fd173c..66cc537 100644
  
  	return (void __user *)sp;
  }
-@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
+@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigactio
  	}
  
  	if (current->mm->context.vdso)
@@ -16073,7 +14645,7 @@ index 4fd173c..66cc537 100644
  	if (ka->sa.sa_flags & SA_RESTORER)
  		restorer = ka->sa.sa_restorer;
  
-@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
+@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigactio
  	 * reasons and because gdb uses it as a signature to notice
  	 * signal handler stack frames.
  	 */
@@ -16082,7 +14654,7 @@ index 4fd173c..66cc537 100644
  
  	if (err)
  		return -EFAULT;
-@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, str
  		err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
  
  		/* Set up to return from userspace.  */
@@ -16094,7 +14666,7 @@ index 4fd173c..66cc537 100644
  		if (ka->sa.sa_flags & SA_RESTORER)
  			restorer = ka->sa.sa_restorer;
  		put_user_ex(restorer, &frame->pretcode);
-@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
+@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, str
  		 * reasons and because gdb uses it as a signature to notice
  		 * signal handler stack frames.
  		 */
@@ -16103,7 +14675,7 @@ index 4fd173c..66cc537 100644
  	} put_user_catch(err);
  
  	if (err)
-@@ -773,6 +776,8 @@ static void do_signal(struct pt_regs *regs)
+@@ -769,6 +772,8 @@ static void do_signal(struct pt_regs *re
  	int signr;
  	sigset_t *oldset;
  
@@ -16112,7 +14684,7 @@ index 4fd173c..66cc537 100644
  	/*
  	 * 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
-@@ -780,7 +785,7 @@ static void do_signal(struct pt_regs *regs)
+@@ -776,7 +781,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.
  	 */
@@ -16121,11 +14693,10 @@ index 4fd173c..66cc537 100644
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
-index 08776a9..ada4917 100644
---- a/arch/x86/kernel/smpboot.c
-+++ b/arch/x86/kernel/smpboot.c
-@@ -773,17 +773,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
+diff -urNp linux-3.0.3/arch/x86/kernel/smpboot.c linux-3.0.3/arch/x86/kernel/smpboot.c
+--- linux-3.0.3/arch/x86/kernel/smpboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/smpboot.c	2011-08-23 21:47:55.000000000 -0400
+@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
  	set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
  	per_cpu(current_task, cpu) = c_idle.idle;
@@ -16149,7 +14720,7 @@ index 08776a9..ada4917 100644
  	initial_code = (unsigned long)start_secondary;
  	stack_start  = c_idle.idle->thread.sp;
  
-@@ -923,6 +926,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
+@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int
  
  	per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
  
@@ -16162,11 +14733,10 @@ index 08776a9..ada4917 100644
  	err = do_boot_cpu(apicid, cpu);
  	if (err) {
  		pr_debug("do_boot_cpu failed %d\n", err);
-diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
-index 58de45e..4cd6b77 100644
---- a/arch/x86/kernel/step.c
-+++ b/arch/x86/kernel/step.c
-@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
+diff -urNp linux-3.0.3/arch/x86/kernel/step.c linux-3.0.3/arch/x86/kernel/step.c
+--- linux-3.0.3/arch/x86/kernel/step.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/step.c	2011-08-23 21:47:55.000000000 -0400
+@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
  		struct desc_struct *desc;
  		unsigned long base;
  
@@ -16179,7 +14749,7 @@ index 58de45e..4cd6b77 100644
  			addr = -1L; /* bogus selector, access would fault */
  		else {
  			desc = child->mm->context.ldt + seg;
-@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
+@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struc
  			addr += base;
  		}
  		mutex_unlock(&child->mm->context.lock);
@@ -16189,7 +14759,7 @@ index 58de45e..4cd6b77 100644
  
  	return addr;
  }
-@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
+@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct t
  	unsigned char opcode[15];
  	unsigned long addr = convert_ip_to_linear(child, regs);
  
@@ -16199,7 +14769,7 @@ index 58de45e..4cd6b77 100644
  	copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
  	for (i = 0; i < copied; i++) {
  		switch (opcode[i]) {
-@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
+@@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct t
  
  #ifdef CONFIG_X86_64
  		case 0x40 ... 0x4f:
@@ -16208,10 +14778,17 @@ index 58de45e..4cd6b77 100644
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
-index 0b0cb5f..db6b9ed 100644
---- a/arch/x86/kernel/sys_i386_32.c
-+++ b/arch/x86/kernel/sys_i386_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.3/arch/x86/kernel/syscall_table_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/syscall_table_32.S	2011-08-23 21:47:55.000000000 -0400
+@@ -1,3 +1,4 @@
++.section .rodata,"a",@progbits
+ ENTRY(sys_call_table)
+ 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
+ 	.long sys_exit
+diff -urNp linux-3.0.3/arch/x86/kernel/sys_i386_32.c linux-3.0.3/arch/x86/kernel/sys_i386_32.c
+--- linux-3.0.3/arch/x86/kernel/sys_i386_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/sys_i386_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -16224,7 +14801,12 @@ index 0b0cb5f..db6b9ed 100644
 -		  const char *const argv[],
 -		  const char *const envp[])
 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
-+{
+ {
+-	long __res;
+-	asm volatile ("int $0x80"
+-	: "=a" (__res)
+-	: "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
+-	return __res;
 +	unsigned long pax_task_size = TASK_SIZE;
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
@@ -16332,12 +14914,7 @@ index 0b0cb5f..db6b9ed 100644
 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
 +			  const unsigned long len, const unsigned long pgoff,
 +			  const unsigned long flags)
- {
--	long __res;
--	asm volatile ("int $0x80"
--	: "=a" (__res)
--	: "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
--	return __res;
++{
 +	struct vm_area_struct *vma;
 +	struct mm_struct *mm = current->mm;
 +	unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
@@ -16449,10 +15026,9 @@ index 0b0cb5f..db6b9ed 100644
 +
 +	return addr;
  }
-diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
-index ff14a50..35626c3 100644
---- a/arch/x86/kernel/sys_x86_64.c
-+++ b/arch/x86/kernel/sys_x86_64.c
+diff -urNp linux-3.0.3/arch/x86/kernel/sys_x86_64.c linux-3.0.3/arch/x86/kernel/sys_x86_64.c
+--- linux-3.0.3/arch/x86/kernel/sys_x86_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/sys_x86_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -16464,7 +15040,7 @@ index ff14a50..35626c3 100644
  {
  	if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
  		unsigned long new_begin;
-@@ -52,7 +52,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
+@@ -52,7 +52,7 @@ static void find_start_end(unsigned long
  				*begin = new_begin;
  		}
  	} else {
@@ -16473,7 +15049,7 @@ index ff14a50..35626c3 100644
  		*end = TASK_SIZE;
  	}
  }
-@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -16505,7 +15081,7 @@ index ff14a50..35626c3 100644
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
  	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
@@ -16514,7 +15090,7 @@ index ff14a50..35626c3 100644
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE)
-@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct fi
  	if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
  		goto bottomup;
  
@@ -16537,7 +15113,7 @@ index ff14a50..35626c3 100644
  	}
  
  	/* check if free_area_cache is useful for us */
-@@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -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 = find_vma(mm, addr-len);
@@ -16546,7 +15122,7 @@ index ff14a50..35626c3 100644
  			/* remember the address as a hint for next time */
  			return mm->free_area_cache = addr-len;
  	}
-@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct fi
  		 * return with success:
  		 */
  		vma = find_vma(mm, addr);
@@ -16555,7 +15131,7 @@ index ff14a50..35626c3 100644
  			/* remember the address as a hint for next time */
  			return mm->free_area_cache = addr;
  
-@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct fi
  			mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -16590,20 +15166,10 @@ index ff14a50..35626c3 100644
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
-index b35786d..c2c6928 100644
---- a/arch/x86/kernel/syscall_table_32.S
-+++ b/arch/x86/kernel/syscall_table_32.S
-@@ -1,3 +1,4 @@
-+.section .rodata,"a",@progbits
- ENTRY(sys_call_table)
- 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
- 	.long sys_exit
-diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
-index 998e972..e6e307d 100644
---- a/arch/x86/kernel/tboot.c
-+++ b/arch/x86/kernel/tboot.c
-@@ -218,7 +218,7 @@ static int tboot_setup_sleep(void)
+diff -urNp linux-3.0.3/arch/x86/kernel/tboot.c linux-3.0.3/arch/x86/kernel/tboot.c
+--- linux-3.0.3/arch/x86/kernel/tboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/tboot.c	2011-08-23 21:47:55.000000000 -0400
+@@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
  {
@@ -16612,7 +15178,7 @@ index 998e972..e6e307d 100644
  
  	if (!tboot_enabled())
  		return;
-@@ -240,7 +240,7 @@ void tboot_shutdown(u32 shutdown_type)
+@@ -239,7 +239,7 @@ void tboot_shutdown(u32 shutdown_type)
  
  	switch_to_tboot_pt();
  
@@ -16621,7 +15187,7 @@ index 998e972..e6e307d 100644
  	shutdown();
  
  	/* should not reach here */
-@@ -297,7 +297,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
+@@ -296,7 +296,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1
  	tboot_shutdown(acpi_shutdown_map[sleep_state]);
  }
  
@@ -16630,7 +15196,7 @@ index 998e972..e6e307d 100644
  
  static int tboot_wait_for_aps(int num_aps)
  {
-@@ -321,9 +321,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
+@@ -320,9 +320,9 @@ static int __cpuinit tboot_cpu_callback(
  {
  	switch (action) {
  	case CPU_DYING:
@@ -16642,7 +15208,7 @@ index 998e972..e6e307d 100644
  				return NOTIFY_BAD;
  		break;
  	}
-@@ -342,7 +342,7 @@ static __init int tboot_late_init(void)
+@@ -341,7 +341,7 @@ static __init int tboot_late_init(void)
  
  	tboot_create_trampoline();
  
@@ -16651,19 +15217,10 @@ index 998e972..e6e307d 100644
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
-index 25a28a2..e917271 100644
---- a/arch/x86/kernel/time.c
-+++ b/arch/x86/kernel/time.c
-@@ -22,17 +22,13 @@
- #include <asm/hpet.h>
- #include <asm/time.h>
- 
--#ifdef CONFIG_X86_64
--volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
--#endif
--
- unsigned long profile_pc(struct pt_regs *regs)
+diff -urNp linux-3.0.3/arch/x86/kernel/time.c linux-3.0.3/arch/x86/kernel/time.c
+--- linux-3.0.3/arch/x86/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/time.c	2011-08-23 21:47:55.000000000 -0400
+@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs 
  {
  	unsigned long pc = instruction_pointer(regs);
  
@@ -16675,7 +15232,7 @@ index 25a28a2..e917271 100644
  #else
  		unsigned long *sp =
  			(unsigned long *)kernel_stack_pointer(regs);
-@@ -41,11 +37,17 @@ unsigned long profile_pc(struct pt_regs *regs)
+@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs 
  		 * or above a saved flags. Eflags has bits 22-31 zero,
  		 * kernel addresses don't.
  		 */
@@ -16693,11 +15250,10 @@ index 25a28a2..e917271 100644
  	}
  	return pc;
  }
-diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
-index 6bb7b85..dd853e1 100644
---- a/arch/x86/kernel/tls.c
-+++ b/arch/x86/kernel/tls.c
-@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
+diff -urNp linux-3.0.3/arch/x86/kernel/tls.c linux-3.0.3/arch/x86/kernel/tls.c
+--- linux-3.0.3/arch/x86/kernel/tls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/tls.c	2011-08-23 21:47:55.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;
  
@@ -16709,10 +15265,9 @@ index 6bb7b85..dd853e1 100644
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
-index 8508237..229b664 100644
---- a/arch/x86/kernel/trampoline_32.S
-+++ b/arch/x86/kernel/trampoline_32.S
+diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_32.S linux-3.0.3/arch/x86/kernel/trampoline_32.S
+--- linux-3.0.3/arch/x86/kernel/trampoline_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/trampoline_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -16723,10 +15278,10 @@ index 8508237..229b664 100644
 +#define ta(X) ((X) - __PAGE_OFFSET)
 +#endif
 +
- /* We can free up trampoline after bootup if cpu hotplug is not supported. */
- __CPUINITRODATA
- .code16
-@@ -60,7 +66,7 @@ r_base = .
+ #ifdef CONFIG_SMP
+ 
+ 	.section ".x86_trampoline","a"
+@@ -62,7 +68,7 @@ r_base = .
  	inc	%ax		# protected mode (PE) bit
  	lmsw	%ax		# into protected mode
  	# flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
@@ -16735,11 +15290,10 @@ index 8508237..229b664 100644
  
  	# 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 --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
-index 075d130..ba8aa49 100644
---- a/arch/x86/kernel/trampoline_64.S
-+++ b/arch/x86/kernel/trampoline_64.S
-@@ -91,7 +91,7 @@ startup_32:
+diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_64.S linux-3.0.3/arch/x86/kernel/trampoline_64.S
+--- linux-3.0.3/arch/x86/kernel/trampoline_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/trampoline_64.S	2011-08-23 21:47:55.000000000 -0400
+@@ -90,7 +90,7 @@ startup_32:
  	movl	$__KERNEL_DS, %eax	# Initialize the %ds segment register
  	movl	%eax, %ds
  
@@ -16757,10 +15311,9 @@ index 075d130..ba8aa49 100644
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
-index b9b6716..4d3ff8a 100644
---- a/arch/x86/kernel/traps.c
-+++ b/arch/x86/kernel/traps.c
+diff -urNp linux-3.0.3/arch/x86/kernel/traps.c linux-3.0.3/arch/x86/kernel/traps.c
+--- linux-3.0.3/arch/x86/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -16774,7 +15327,7 @@ index b9b6716..4d3ff8a 100644
  #endif
  
  DECLARE_BITMAP(used_vectors, NR_VECTORS);
-@@ -117,13 +111,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
+@@ -117,13 +111,13 @@ static inline void preempt_conditional_c
  }
  
  static void __kprobes
@@ -16790,7 +15343,7 @@ index b9b6716..4d3ff8a 100644
  		/*
  		 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
  		 * On nmi (interrupt 2), do_trap should not be called.
-@@ -134,7 +128,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
+@@ -134,7 +128,7 @@ do_trap(int trapnr, int signr, char *str
  	}
  #endif
  
@@ -16829,7 +15382,7 @@ index b9b6716..4d3ff8a 100644
  	return;
  
  #ifdef CONFIG_X86_32
-@@ -264,14 +270,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
+@@ -264,14 +270,30 @@ do_general_protection(struct pt_regs *re
  	conditional_sti(regs);
  
  #ifdef CONFIG_X86_32
@@ -16876,7 +15429,25 @@ index b9b6716..4d3ff8a 100644
  	die("general protection fault", regs, error_code);
  }
  
-@@ -569,7 +598,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -433,6 +462,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 = regs->cs & 0xFFFF;
++		unsigned long ip = ktva_ktla(regs->ip);
++
++		if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
++			regs->ip = ip;
++	}
++#endif
++
+ 	nmi_enter();
+ 
+ 	inc_irq_stat(__nmi_count);
+@@ -569,7 +609,7 @@ dotraplinkage void __kprobes do_debug(st
  	/* It's safe to allow irq's after DR6 has been saved */
  	preempt_conditional_sti(regs);
  
@@ -16885,7 +15456,7 @@ index b9b6716..4d3ff8a 100644
  		handle_vm86_trap((struct kernel_vm86_regs *) regs,
  				error_code, 1);
  		preempt_conditional_cli(regs);
-@@ -583,7 +612,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
+@@ -583,7 +623,7 @@ dotraplinkage void __kprobes do_debug(st
  	 * We already checked v86 mode above, so we can check for kernel mode
  	 * by just checking the CPL of CS.
  	 */
@@ -16894,7 +15465,7 @@ index b9b6716..4d3ff8a 100644
  		tsk->thread.debugreg6 &= ~DR_STEP;
  		set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
  		regs->flags &= ~X86_EFLAGS_TF;
-@@ -612,7 +641,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
+@@ -612,7 +652,7 @@ void math_error(struct pt_regs *regs, in
  		return;
  	conditional_sti(regs);
  
@@ -16903,7 +15474,7 @@ index b9b6716..4d3ff8a 100644
  	{
  		if (!fixup_exception(regs)) {
  			task->thread.error_code = error_code;
-@@ -723,7 +752,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
+@@ -723,7 +763,7 @@ asmlinkage void __attribute__((weak)) sm
  void __math_state_restore(void)
  {
  	struct thread_info *thread = current_thread_info();
@@ -16912,7 +15483,7 @@ index b9b6716..4d3ff8a 100644
  
  	/*
  	 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
-@@ -750,8 +779,7 @@ void __math_state_restore(void)
+@@ -750,8 +790,7 @@ void __math_state_restore(void)
   */
  asmlinkage void math_state_restore(void)
  {
@@ -16922,10 +15493,20 @@ index b9b6716..4d3ff8a 100644
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
-index 863f875..4307295 100644
---- a/arch/x86/kernel/vm86_32.c
-+++ b/arch/x86/kernel/vm86_32.c
+diff -urNp linux-3.0.3/arch/x86/kernel/verify_cpu.S linux-3.0.3/arch/x86/kernel/verify_cpu.S
+--- linux-3.0.3/arch/x86/kernel/verify_cpu.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/verify_cpu.S	2011-08-23 21:48:14.000000000 -0400
+@@ -20,6 +20,7 @@
+  *	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
+diff -urNp linux-3.0.3/arch/x86/kernel/vm86_32.c linux-3.0.3/arch/x86/kernel/vm86_32.c
+--- linux-3.0.3/arch/x86/kernel/vm86_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/vm86_32.c	2011-08-23 21:48:14.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -16934,7 +15515,7 @@ index 863f875..4307295 100644
  
  #include <asm/uaccess.h>
  #include <asm/io.h>
-@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
+@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct ke
  		do_exit(SIGSEGV);
  	}
  
@@ -16943,7 +15524,7 @@ index 863f875..4307295 100644
  	current->thread.sp0 = current->thread.saved_sp0;
  	current->thread.sysenter_cs = __KERNEL_CS;
  	load_sp0(tss, &current->thread);
-@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
+@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __use
  	struct task_struct *tsk;
  	int tmp, ret = -EPERM;
  
@@ -16957,7 +15538,7 @@ index 863f875..4307295 100644
  	tsk = current;
  	if (tsk->thread.saved_sp0)
  		goto out;
-@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
+@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned
  	int tmp, ret;
  	struct vm86plus_struct __user *v86;
  
@@ -16972,7 +15553,7 @@ index 863f875..4307295 100644
  	tsk = current;
  	switch (cmd) {
  	case VM86_REQUEST_IRQ:
-@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
+@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm
  	tsk->thread.saved_fs = info->regs32->fs;
  	tsk->thread.saved_gs = get_user_gs(info->regs32);
  
@@ -16981,7 +15562,7 @@ index 863f875..4307295 100644
  	tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
  	if (cpu_has_sep)
  		tsk->thread.sysenter_cs = 0;
-@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
+@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_re
  		goto cannot_handle;
  	if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
  		goto cannot_handle;
@@ -16990,10 +15571,9 @@ index 863f875..4307295 100644
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
-index bf47007..adffe60 100644
---- a/arch/x86/kernel/vmlinux.lds.S
-+++ b/arch/x86/kernel/vmlinux.lds.S
+diff -urNp linux-3.0.3/arch/x86/kernel/vmlinux.lds.S linux-3.0.3/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.0.3/arch/x86/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -17008,19 +15588,7 @@ index bf47007..adffe60 100644
  
  #undef i386     /* in case the preprocessor is a 32bit one */
  
-@@ -34,11 +41,9 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
- #ifdef CONFIG_X86_32
- OUTPUT_ARCH(i386)
- ENTRY(phys_startup_32)
--jiffies = jiffies_64;
- #else
- OUTPUT_ARCH(i386:x86-64)
- ENTRY(phys_startup_64)
--jiffies_64 = jiffies;
- #endif
- 
- #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
-@@ -69,31 +74,46 @@ jiffies_64 = jiffies;
+@@ -69,31 +76,46 @@ jiffies_64 = jiffies;
  
  PHDRS {
  	text PT_LOAD FLAGS(5);          /* R_E */
@@ -17074,7 +15642,7 @@ index bf47007..adffe60 100644
  		HEAD_TEXT
  #ifdef CONFIG_X86_32
  		. = ALIGN(PAGE_SIZE);
-@@ -108,13 +128,47 @@ SECTIONS
+@@ -109,13 +131,47 @@ SECTIONS
  		IRQENTRY_TEXT
  		*(.fixup)
  		*(.gnu.warning)
@@ -17084,8 +15652,7 @@ index bf47007..adffe60 100644
  
 -	NOTES :text :note
 +	. += __KERNEL_TEXT_OFFSET;
- 
--	EXCEPTION_TABLE(16) :text = 0x9090
++
 +#ifdef CONFIG_X86_32
 +	. = ALIGN(PAGE_SIZE);
 +	.module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
@@ -17121,12 +15688,13 @@ index bf47007..adffe60 100644
 +
 +	. = ALIGN(PAGE_SIZE);
 +	NOTES :rodata :note
-+
+ 
+-	EXCEPTION_TABLE(16) :text = 0x9090
 +	EXCEPTION_TABLE(16) :rodata
  
  #if defined(CONFIG_DEBUG_RODATA)
  	/* .text should occupy whole number of pages */
-@@ -126,16 +180,20 @@ SECTIONS
+@@ -127,16 +183,20 @@ SECTIONS
  
  	/* Data */
  	.data : AT(ADDR(.data) - LOAD_OFFSET) {
@@ -17150,29 +15718,7 @@ index bf47007..adffe60 100644
  
  		PAGE_ALIGNED_DATA(PAGE_SIZE)
  
-@@ -144,6 +202,8 @@ SECTIONS
- 		DATA_DATA
- 		CONSTRUCTORS
- 
-+		jiffies = jiffies_64;
-+
- 		/* rarely changed data like cpu maps */
- 		READ_MOSTLY_DATA(INTERNODE_CACHE_BYTES)
- 
-@@ -198,12 +258,6 @@ SECTIONS
- 	}
- 	vgetcpu_mode = VVIRT(.vgetcpu_mode);
- 
--	. = ALIGN(L1_CACHE_BYTES);
--	.jiffies : AT(VLOAD(.jiffies)) {
--		*(.jiffies)
--	}
--	jiffies = VVIRT(.jiffies);
--
- 	.vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
- 		*(.vsyscall_3)
- 	}
-@@ -219,12 +273,19 @@ SECTIONS
+@@ -208,12 +268,19 @@ SECTIONS
  #endif /* CONFIG_X86_64 */
  
  	/* Init code and data - will be freed after init */
@@ -17195,8 +15741,8 @@ index bf47007..adffe60 100644
  	/*
  	 * percpu offsets are zero-based on SMP.  PERCPU_VADDR() changes the
  	 * output PHDR, so the next output section - .init.text - should
-@@ -233,12 +294,27 @@ SECTIONS
- 	PERCPU_VADDR(0, :percpu)
+@@ -222,12 +289,27 @@ SECTIONS
+ 	PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
  #endif
  
 -	INIT_TEXT_SECTION(PAGE_SIZE)
@@ -17226,11 +15772,11 @@ index bf47007..adffe60 100644
 +	. = ALIGN(PAGE_SIZE);
 +	INIT_DATA_SECTION(16) :init
  
- 	.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
- 		__x86_cpu_dev_start = .;
-@@ -292,19 +368,12 @@ SECTIONS
- 		__iommu_table_end = .;
+ 	/*
+ 	 * Code and data for a variety of lowlevel trampolines, to be
+@@ -301,19 +383,12 @@ SECTIONS
  	}
+ 
  	. = ALIGN(8);
 -	/*
 -	 * .exit.text is discard at runtime, not link time, to deal with
@@ -17246,10 +15792,10 @@ index bf47007..adffe60 100644
  
 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
 +#ifndef CONFIG_SMP
- 	PERCPU(THREAD_SIZE)
+ 	PERCPU_SECTION(INTERNODE_CACHE_BYTES)
  #endif
  
-@@ -323,16 +392,10 @@ SECTIONS
+@@ -332,16 +407,10 @@ SECTIONS
  	.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
  		__smp_locks = .;
  		*(.smp_locks)
@@ -17267,7 +15813,7 @@ index bf47007..adffe60 100644
  	/* BSS */
  	. = ALIGN(PAGE_SIZE);
  	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
-@@ -348,6 +411,7 @@ SECTIONS
+@@ -357,6 +426,7 @@ SECTIONS
  		__brk_base = .;
  		. += 64 * 1024;		/* 64k alignment slop space */
  		*(.brk_reservation)	/* areas brk users have reserved */
@@ -17275,7 +15821,7 @@ index bf47007..adffe60 100644
  		__brk_limit = .;
  	}
  
-@@ -374,13 +438,12 @@ SECTIONS
+@@ -383,13 +453,12 @@ SECTIONS
   * for the boot processor.
   */
  #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
@@ -17290,31 +15836,30 @@ index bf47007..adffe60 100644
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
-index dcbb28c..57d748e 100644
---- a/arch/x86/kernel/vsyscall_64.c
-+++ b/arch/x86/kernel/vsyscall_64.c
-@@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wall_time, struct timespec *wtm,
- 
- 	write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
- 	/* copy vsyscall data */
-+	strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gtod_data.clock.name);
- 	vsyscall_gtod_data.clock.vread = clock->vread;
- 	vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
- 	vsyscall_gtod_data.clock.mask = clock->mask;
-@@ -208,7 +209,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
- 	   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] == (j = __jiffies)) {
-+	if (tcache && tcache->blob[0] == (j = jiffies)) {
- 		p = tcache->blob[1];
- 	} else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
- 		/* Load per CPU data from RDTSCP */
-diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
-index 1b950d1..ca83b2a 100644
---- a/arch/x86/kernel/x8664_ksyms_64.c
-+++ b/arch/x86/kernel/x8664_ksyms_64.c
+diff -urNp linux-3.0.3/arch/x86/kernel/vsyscall_64.c linux-3.0.3/arch/x86/kernel/vsyscall_64.c
+--- linux-3.0.3/arch/x86/kernel/vsyscall_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/vsyscall_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
+ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
+ {
+ 	.lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
+-	.sysctl_enabled = 1,
++	.sysctl_enabled = 0,
+ };
+ 
+ void update_vsyscall_tz(void)
+@@ -231,7 +231,7 @@ static long __vsyscall(3) venosys_1(void
+ static ctl_table kernel_table2[] = {
+ 	{ .procname = "vsyscall64",
+ 	  .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int),
+-	  .mode = 0644,
++	  .mode = 0444,
+ 	  .proc_handler = proc_dointvec },
+ 	{}
+ };
+diff -urNp linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -17324,11 +15869,10 @@ index 1b950d1..ca83b2a 100644
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
-index 5471285..7aa08a9 100644
---- a/arch/x86/kernel/xsave.c
-+++ b/arch/x86/kernel/xsave.c
-@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
+diff -urNp linux-3.0.3/arch/x86/kernel/xsave.c linux-3.0.3/arch/x86/kernel/xsave.c
+--- linux-3.0.3/arch/x86/kernel/xsave.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kernel/xsave.c	2011-08-23 21:47:55.000000000 -0400
+@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
  	    fx_sw_user->xstate_size > fx_sw_user->extended_size)
  		return -EINVAL;
  
@@ -17346,7 +15890,7 @@ index 5471285..7aa08a9 100644
  }
  
  /*
-@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf)
+@@ -299,7 +299,7 @@ int restore_i387_xstate(void __user *buf
  	if (use_xsave())
  		err = restore_user_xstate(buf);
  	else
@@ -17355,11 +15899,10 @@ index 5471285..7aa08a9 100644
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index caf9667..e198c6d 100644
---- a/arch/x86/kvm/emulate.c
-+++ b/arch/x86/kvm/emulate.c
-@@ -88,7 +88,7 @@
+diff -urNp linux-3.0.3/arch/x86/kvm/emulate.c linux-3.0.3/arch/x86/kvm/emulate.c
+--- linux-3.0.3/arch/x86/kvm/emulate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/emulate.c	2011-08-23 21:47:55.000000000 -0400
+@@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
  #define Src2Imm     (4<<29)
@@ -17368,7 +15911,7 @@ index caf9667..e198c6d 100644
  
  #define X2(x...) x, x
  #define X3(x...) X2(x), x
-@@ -189,6 +189,7 @@ struct group_dual {
+@@ -207,6 +207,7 @@ struct gprefix {
  
  #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix, _dsttype) \
  	do {								\
@@ -17376,7 +15919,7 @@ index caf9667..e198c6d 100644
  		__asm__ __volatile__ (					\
  			_PRE_EFLAGS("0", "4", "2")			\
  			_op _suffix " %"_x"3,%1; "			\
-@@ -202,8 +203,6 @@ struct group_dual {
+@@ -220,8 +221,6 @@ struct gprefix {
  /* Raw emulation: instruction has two explicit operands. */
  #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
  	do {								\
@@ -17385,7 +15928,7 @@ index caf9667..e198c6d 100644
  		switch ((_dst).bytes) {					\
  		case 2:							\
  			____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w",u16);\
-@@ -219,7 +218,6 @@ struct group_dual {
+@@ -237,7 +236,6 @@ struct gprefix {
  
  #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
  	do {								     \
@@ -17393,10 +15936,9 @@ index caf9667..e198c6d 100644
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 93cf9d0..67dfa54 100644
---- a/arch/x86/kvm/lapic.c
-+++ b/arch/x86/kvm/lapic.c
+diff -urNp linux-3.0.3/arch/x86/kvm/lapic.c linux-3.0.3/arch/x86/kvm/lapic.c
+--- linux-3.0.3/arch/x86/kvm/lapic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/lapic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -17406,11 +15948,10 @@ index 93cf9d0..67dfa54 100644
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
-index f02b8ed..a533bb6 100644
---- a/arch/x86/kvm/mmu.c
-+++ b/arch/x86/kvm/mmu.c
-@@ -3271,7 +3271,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
+diff -urNp linux-3.0.3/arch/x86/kvm/mmu.c linux-3.0.3/arch/x86/kvm/mmu.c
+--- linux-3.0.3/arch/x86/kvm/mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/mmu.c	2011-08-23 21:47:55.000000000 -0400
+@@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
  	pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
  
@@ -17419,20 +15960,19 @@ index f02b8ed..a533bb6 100644
  
  	/*
  	 * Assume that the pte write on a page table of the same type
-@@ -3305,7 +3305,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
+@@ -3270,7 +3270,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
+ 	}
  
- 	mmu_guess_page_from_pte_write(vcpu, gpa, gentry);
  	spin_lock(&vcpu->kvm->mmu_lock);
 -	if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
 +	if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
  		gentry = 0;
- 	kvm_mmu_access_page(vcpu, gfn);
  	kvm_mmu_free_some_pages(vcpu);
-diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
-index 6bccc24..f0c6ca0 100644
---- a/arch/x86/kvm/paging_tmpl.h
-+++ b/arch/x86/kvm/paging_tmpl.h
-@@ -554,6 +554,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
+ 	++vcpu->kvm->stat.mmu_pte_write;
+diff -urNp linux-3.0.3/arch/x86/kvm/paging_tmpl.h linux-3.0.3/arch/x86/kvm/paging_tmpl.h
+--- linux-3.0.3/arch/x86/kvm/paging_tmpl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/paging_tmpl.h	2011-08-23 21:48:14.000000000 -0400
+@@ -583,6 +583,8 @@ static int FNAME(page_fault)(struct kvm_
  	unsigned long mmu_seq;
  	bool map_writable;
  
@@ -17441,7 +15981,7 @@ index 6bccc24..f0c6ca0 100644
  	pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
  
  	r = mmu_topup_memory_caches(vcpu);
-@@ -674,7 +676,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
+@@ -703,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcp
  	if (need_flush)
  		kvm_flush_remote_tlbs(vcpu->kvm);
  
@@ -17450,11 +15990,10 @@ index 6bccc24..f0c6ca0 100644
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
-index d8a15a1..d55a6f0 100644
---- a/arch/x86/kvm/svm.c
-+++ b/arch/x86/kvm/svm.c
-@@ -3276,7 +3276,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
+diff -urNp linux-3.0.3/arch/x86/kvm/svm.c linux-3.0.3/arch/x86/kvm/svm.c
+--- linux-3.0.3/arch/x86/kvm/svm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/svm.c	2011-08-23 21:47:55.000000000 -0400
+@@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
  	int cpu = raw_smp_processor_id();
  
  	struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
@@ -17466,8 +16005,8 @@ index d8a15a1..d55a6f0 100644
  	load_TR_desc();
  }
  
-@@ -3651,6 +3655,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
- 	loadsegment(fs, svm->host.fs);
+@@ -3755,6 +3759,10 @@ static void svm_vcpu_run(struct kvm_vcpu
+ #endif
  #endif
  
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
@@ -17477,20 +16016,10 @@ index d8a15a1..d55a6f0 100644
  	reload_tss(vcpu);
  
  	local_irq_disable();
-@@ -3858,7 +3866,7 @@ static void svm_fpu_deactivate(struct kvm_vcpu *vcpu)
- 	update_cr0_intercept(svm);
- }
- 
--static struct kvm_x86_ops svm_x86_ops = {
-+static const struct kvm_x86_ops svm_x86_ops = {
- 	.cpu_has_kvm_support = has_svm,
- 	.disabled_by_bios = is_disabled,
- 	.hardware_setup = svm_hardware_setup,
-diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index bf89ec2..b81c54d 100644
---- a/arch/x86/kvm/vmx.c
-+++ b/arch/x86/kvm/vmx.c
-@@ -725,7 +725,11 @@ static void reload_tss(void)
+diff -urNp linux-3.0.3/arch/x86/kvm/vmx.c linux-3.0.3/arch/x86/kvm/vmx.c
+--- linux-3.0.3/arch/x86/kvm/vmx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/vmx.c	2011-08-23 21:47:55.000000000 -0400
+@@ -797,7 +797,11 @@ static void reload_tss(void)
  	struct desc_struct *descs;
  
  	descs = (void *)gdt->address;
@@ -17502,7 +16031,7 @@ index bf89ec2..b81c54d 100644
  	load_TR_desc();
  }
  
-@@ -1642,8 +1646,11 @@ static __init int hardware_setup(void)
+@@ -1747,8 +1751,11 @@ static __init int hardware_setup(void)
  	if (!cpu_has_vmx_flexpriority())
  		flexpriority_enabled = 0;
  
@@ -17516,7 +16045,7 @@ index bf89ec2..b81c54d 100644
  
  	if (enable_ept && !cpu_has_vmx_ept_2m_page())
  		kvm_disable_largepages();
-@@ -2640,7 +2647,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
+@@ -2814,7 +2821,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
  	vmcs_writel(HOST_IDTR_BASE, dt.address);   /* 22.2.4 */
  
  	asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
@@ -17525,7 +16054,7 @@ index bf89ec2..b81c54d 100644
  	vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
  	vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
  	vmcs_write64(VM_EXIT_MSR_LOAD_ADDR, __pa(vmx->msr_autoload.host));
-@@ -4031,6 +4038,12 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -4211,6 +4218,12 @@ static void __noclone vmx_vcpu_run(struc
  		"jmp .Lkvm_vmx_return \n\t"
  		".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
  		".Lkvm_vmx_return: "
@@ -17536,12 +16065,12 @@ index bf89ec2..b81c54d 100644
 +#endif
 +
  		/* Save guest registers, load host registers, keep flags */
- 		"xchg %0,     (%%"R"sp) \n\t"
- 		"mov %%"R"ax, %c[rax](%0) \n\t"
-@@ -4077,6 +4090,11 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
- 		[r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
+ 		"mov %0, %c[wordsize](%%"R"sp) \n\t"
+ 		"pop %0 \n\t"
+@@ -4259,6 +4272,11 @@ static void __noclone vmx_vcpu_run(struc
  #endif
- 		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
+ 		[cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
+ 		[wordsize]"i"(sizeof(ulong))
 +
 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
 +		,[cs]"i"(__KERNEL_CS)
@@ -17550,7 +16079,7 @@ index bf89ec2..b81c54d 100644
  	      : "cc", "memory"
  		, R"ax", R"bx", R"di", R"si"
  #ifdef CONFIG_X86_64
-@@ -4091,7 +4109,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu)
+@@ -4276,7 +4294,16 @@ static void __noclone vmx_vcpu_run(struc
  
  	vmx->idt_vectoring_info = vmcs_read32(IDT_VECTORING_INFO_FIELD);
  
@@ -17568,29 +16097,10 @@ index bf89ec2..b81c54d 100644
  	vmx->launched = 1;
  
  	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-@@ -4326,7 +4353,7 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
- {
- }
- 
--static struct kvm_x86_ops vmx_x86_ops = {
-+static const struct kvm_x86_ops vmx_x86_ops = {
- 	.cpu_has_kvm_support = cpu_has_kvm_support,
- 	.disabled_by_bios = vmx_disabled_by_bios,
- 	.hardware_setup = hardware_setup,
-diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index bcc0efc..dccc222 100644
---- a/arch/x86/kvm/x86.c
-+++ b/arch/x86/kvm/x86.c
-@@ -93,7 +93,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu);
- static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
- 				    struct kvm_cpuid_entry2 __user *entries);
- 
--struct kvm_x86_ops *kvm_x86_ops;
-+const struct kvm_x86_ops *kvm_x86_ops;
- EXPORT_SYMBOL_GPL(kvm_x86_ops);
- 
- int ignore_msrs = 0;
-@@ -2023,6 +2023,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
+diff -urNp linux-3.0.3/arch/x86/kvm/x86.c linux-3.0.3/arch/x86/kvm/x86.c
+--- linux-3.0.3/arch/x86/kvm/x86.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/kvm/x86.c	2011-08-23 21:47:55.000000000 -0400
+@@ -2057,6 +2057,8 @@ long kvm_arch_dev_ioctl(struct file *fil
  		if (n < msr_list.nmsrs)
  			goto out;
  		r = -EFAULT;
@@ -17599,7 +16109,7 @@ index bcc0efc..dccc222 100644
  		if (copy_to_user(user_msr_list->indices, &msrs_to_save,
  				 num_msrs_to_save * sizeof(u32)))
  			goto out;
-@@ -2190,15 +2192,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
+@@ -2229,15 +2231,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -17623,7 +16133,7 @@ index bcc0efc..dccc222 100644
  	vcpu->arch.cpuid_nent = cpuid->nent;
  	kvm_apic_set_version(vcpu);
  	kvm_x86_ops->cpuid_update(vcpu);
-@@ -2213,15 +2220,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
+@@ -2252,15 +2259,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(str
  				     struct kvm_cpuid2 *cpuid,
  				     struct kvm_cpuid_entry2 __user *entries)
  {
@@ -17646,7 +16156,7 @@ index bcc0efc..dccc222 100644
  	return 0;
  
  out:
-@@ -2499,7 +2510,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
+@@ -2579,7 +2590,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
  static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
  				    struct kvm_interrupt *irq)
  {
@@ -17655,7 +16165,7 @@ index bcc0efc..dccc222 100644
  		return -EINVAL;
  	if (irqchip_in_kernel(vcpu->kvm))
  		return -ENXIO;
-@@ -4687,10 +4698,10 @@ void kvm_after_handle_nmi(struct kvm_vcpu *vcpu)
+@@ -4878,7 +4889,7 @@ void kvm_after_handle_nmi(struct kvm_vcp
  }
  EXPORT_SYMBOL_GPL(kvm_after_handle_nmi);
  
@@ -17663,15 +16173,25 @@ index bcc0efc..dccc222 100644
 +int kvm_arch_init(const void *opaque)
  {
  	int r;
--	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-+	const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
- 
- 	if (kvm_x86_ops) {
- 		printk(KERN_ERR "kvm: already loaded the other module\n");
-diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
-index 540179e..e9ff0ea 100644
---- a/arch/x86/lib/atomic64_32.c
-+++ b/arch/x86/lib/atomic64_32.c
+ 	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
+diff -urNp linux-3.0.3/arch/x86/lguest/boot.c linux-3.0.3/arch/x86/lguest/boot.c
+--- linux-3.0.3/arch/x86/lguest/boot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lguest/boot.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
+  * Rebooting also tells the Host we're finished, but the RESTART flag tells the
+  * Launcher to reboot us.
+  */
+-static void lguest_restart(char *reason)
++static __noreturn void lguest_restart(char *reason)
+ {
+ 	hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
++	BUG();
+ }
+ 
+ /*G:050
+diff -urNp linux-3.0.3/arch/x86/lib/atomic64_32.c linux-3.0.3/arch/x86/lib/atomic64_32.c
+--- linux-3.0.3/arch/x86/lib/atomic64_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/atomic64_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -17750,11 +16270,10 @@ index 540179e..e9ff0ea 100644
  long long atomic64_dec_if_positive_386(atomic64_t *v);
  EXPORT_SYMBOL(atomic64_dec_if_positive_386);
  int atomic64_inc_not_zero_386(atomic64_t *v);
-diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
-index 2cda60a..da60166 100644
---- a/arch/x86/lib/atomic64_386_32.S
-+++ b/arch/x86/lib/atomic64_386_32.S
-@@ -50,6 +50,10 @@ BEGIN(read)
+diff -urNp linux-3.0.3/arch/x86/lib/atomic64_386_32.S linux-3.0.3/arch/x86/lib/atomic64_386_32.S
+--- linux-3.0.3/arch/x86/lib/atomic64_386_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/atomic64_386_32.S	2011-08-23 21:47:55.000000000 -0400
+@@ -48,6 +48,10 @@ BEGIN(read)
  	movl  (v), %eax
  	movl 4(v), %edx
  RET_ENDP
@@ -17765,7 +16284,7 @@ index 2cda60a..da60166 100644
  #undef v
  
  #define v %esi
-@@ -57,6 +61,10 @@ BEGIN(set)
+@@ -55,6 +59,10 @@ BEGIN(set)
  	movl %ebx,  (v)
  	movl %ecx, 4(v)
  RET_ENDP
@@ -17776,7 +16295,7 @@ index 2cda60a..da60166 100644
  #undef v
  
  #define v  %esi
-@@ -72,6 +80,20 @@ RET_ENDP
+@@ -70,6 +78,20 @@ RET_ENDP
  BEGIN(add)
  	addl %eax,  (v)
  	adcl %edx, 4(v)
@@ -17797,7 +16316,7 @@ index 2cda60a..da60166 100644
  RET_ENDP
  #undef v
  
-@@ -79,6 +101,24 @@ RET_ENDP
+@@ -77,6 +99,24 @@ RET_ENDP
  BEGIN(add_return)
  	addl  (v), %eax
  	adcl 4(v), %edx
@@ -17822,7 +16341,7 @@ index 2cda60a..da60166 100644
  	movl %eax,  (v)
  	movl %edx, 4(v)
  RET_ENDP
-@@ -88,6 +128,20 @@ RET_ENDP
+@@ -86,6 +126,20 @@ RET_ENDP
  BEGIN(sub)
  	subl %eax,  (v)
  	sbbl %edx, 4(v)
@@ -17843,7 +16362,7 @@ index 2cda60a..da60166 100644
  RET_ENDP
  #undef v
  
-@@ -98,6 +152,27 @@ BEGIN(sub_return)
+@@ -96,6 +150,27 @@ BEGIN(sub_return)
  	sbbl $0, %edx
  	addl  (v), %eax
  	adcl 4(v), %edx
@@ -17871,7 +16390,7 @@ index 2cda60a..da60166 100644
  	movl %eax,  (v)
  	movl %edx, 4(v)
  RET_ENDP
-@@ -107,6 +182,20 @@ RET_ENDP
+@@ -105,6 +180,20 @@ RET_ENDP
  BEGIN(inc)
  	addl $1,  (v)
  	adcl $0, 4(v)
@@ -17892,7 +16411,7 @@ index 2cda60a..da60166 100644
  RET_ENDP
  #undef v
  
-@@ -116,6 +205,26 @@ BEGIN(inc_return)
+@@ -114,6 +203,26 @@ BEGIN(inc_return)
  	movl 4(v), %edx
  	addl $1, %eax
  	adcl $0, %edx
@@ -17919,7 +16438,7 @@ index 2cda60a..da60166 100644
  	movl %eax,  (v)
  	movl %edx, 4(v)
  RET_ENDP
-@@ -125,6 +234,20 @@ RET_ENDP
+@@ -123,6 +232,20 @@ RET_ENDP
  BEGIN(dec)
  	subl $1,  (v)
  	sbbl $0, 4(v)
@@ -17940,7 +16459,7 @@ index 2cda60a..da60166 100644
  RET_ENDP
  #undef v
  
-@@ -134,6 +257,26 @@ BEGIN(dec_return)
+@@ -132,6 +255,26 @@ BEGIN(dec_return)
  	movl 4(v), %edx
  	subl $1, %eax
  	sbbl $0, %edx
@@ -17967,7 +16486,7 @@ index 2cda60a..da60166 100644
  	movl %eax,  (v)
  	movl %edx, 4(v)
  RET_ENDP
-@@ -145,6 +288,13 @@ BEGIN(add_unless)
+@@ -143,6 +286,13 @@ BEGIN(add_unless)
  	adcl %edx, %edi
  	addl  (v), %eax
  	adcl 4(v), %edx
@@ -17981,7 +16500,7 @@ index 2cda60a..da60166 100644
  	cmpl %eax, %esi
  	je 3f
  1:
-@@ -170,6 +320,13 @@ BEGIN(inc_not_zero)
+@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
  1:
  	addl $1, %eax
  	adcl $0, %edx
@@ -17995,7 +16514,7 @@ index 2cda60a..da60166 100644
  	movl %eax,  (v)
  	movl %edx, 4(v)
  	movl $1, %eax
-@@ -188,6 +345,13 @@ BEGIN(dec_if_positive)
+@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
  	movl 4(v), %edx
  	subl $1, %eax
  	sbbl $0, %edx
@@ -18009,11 +16528,10 @@ index 2cda60a..da60166 100644
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
-index 71e080d..2ffa968 100644
---- a/arch/x86/lib/atomic64_cx8_32.S
-+++ b/arch/x86/lib/atomic64_cx8_32.S
-@@ -41,6 +41,14 @@ ENTRY(atomic64_read_cx8)
+diff -urNp linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S	2011-08-23 21:47:55.000000000 -0400
+@@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
  
@@ -18028,7 +16546,7 @@ index 71e080d..2ffa968 100644
  ENTRY(atomic64_set_cx8)
  	CFI_STARTPROC
  
-@@ -54,6 +62,19 @@ ENTRY(atomic64_set_cx8)
+@@ -52,6 +60,19 @@ ENTRY(atomic64_set_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_set_cx8)
  
@@ -18048,7 +16566,7 @@ index 71e080d..2ffa968 100644
  ENTRY(atomic64_xchg_cx8)
  	CFI_STARTPROC
  
-@@ -68,8 +89,8 @@ ENTRY(atomic64_xchg_cx8)
+@@ -66,8 +87,8 @@ ENTRY(atomic64_xchg_cx8)
  	CFI_ENDPROC
  ENDPROC(atomic64_xchg_cx8)
  
@@ -18059,7 +16577,7 @@ index 71e080d..2ffa968 100644
  	CFI_STARTPROC
  	SAVE ebp
  	SAVE ebx
-@@ -86,27 +107,43 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -84,27 +105,43 @@ ENTRY(atomic64_\func\()_return_cx8)
  	movl %edx, %ecx
  	\ins\()l %esi, %ebx
  	\insc\()l %edi, %ecx
@@ -18108,7 +16626,7 @@ index 71e080d..2ffa968 100644
  	CFI_STARTPROC
  	SAVE ebx
  
-@@ -116,21 +153,38 @@ ENTRY(atomic64_\func\()_return_cx8)
+@@ -114,21 +151,38 @@ ENTRY(atomic64_\func\()_return_cx8)
  	movl %edx, %ecx
  	\ins\()l $1, %ebx
  	\insc\()l $0, %ecx
@@ -18149,7 +16667,7 @@ index 71e080d..2ffa968 100644
  
  ENTRY(atomic64_dec_if_positive_cx8)
  	CFI_STARTPROC
-@@ -142,6 +196,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
+@@ -140,6 +194,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
  	movl %edx, %ecx
  	subl $1, %ebx
  	sbb $0, %ecx
@@ -18163,7 +16681,7 @@ index 71e080d..2ffa968 100644
  	js 2f
  	LOCK_PREFIX
  	cmpxchg8b (%esi)
-@@ -176,6 +237,13 @@ ENTRY(atomic64_add_unless_cx8)
+@@ -174,6 +235,13 @@ ENTRY(atomic64_add_unless_cx8)
  	movl %edx, %ecx
  	addl %esi, %ebx
  	adcl %edi, %ecx
@@ -18177,7 +16695,7 @@ index 71e080d..2ffa968 100644
  	LOCK_PREFIX
  	cmpxchg8b (%ebp)
  	jne 1b
-@@ -208,6 +276,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
+@@ -206,6 +274,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
  	movl %edx, %ecx
  	addl $1, %ebx
  	adcl $0, %ecx
@@ -18191,10 +16709,9 @@ index 71e080d..2ffa968 100644
  	LOCK_PREFIX
  	cmpxchg8b (%esi)
  	jne 1b
-diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
-index adbccd0..98f96c8 100644
---- a/arch/x86/lib/checksum_32.S
-+++ b/arch/x86/lib/checksum_32.S
+diff -urNp linux-3.0.3/arch/x86/lib/checksum_32.S linux-3.0.3/arch/x86/lib/checksum_32.S
+--- linux-3.0.3/arch/x86/lib/checksum_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/checksum_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -18205,7 +16722,7 @@ index adbccd0..98f96c8 100644
  /*
   * computes a partial checksum, e.g. for TCP/UDP fragments
   */
-@@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
+@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (
  
  #define ARGBASE 16		
  #define FP		12
@@ -18216,27 +16733,23 @@ index adbccd0..98f96c8 100644
  	CFI_STARTPROC
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
-+	pushl %gs
-+	CFI_ADJUST_CFA_OFFSET 4
-+	popl %es
-+	CFI_ADJUST_CFA_OFFSET -4
++	pushl_cfi %gs
++	popl_cfi %es
 +	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
++	pushl_cfi %gs
++	popl_cfi %ds
 +#endif
 +
 +ENTRY(csum_partial_copy_generic)
  	subl  $4,%esp	
  	CFI_ADJUST_CFA_OFFSET 4
- 	pushl %edi
-@@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
+ 	pushl_cfi %edi
+@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
  	jmp 4f
  SRC(1:	movw (%esi), %bx	)
  	addl $2, %esi
@@ -18245,7 +16758,7 @@ index adbccd0..98f96c8 100644
  	addl $2, %edi
  	addw %bx, %ax	
  	adcl $0, %eax
-@@ -343,30 +363,30 @@ DST(	movw %bx, (%edi)	)
+@@ -332,30 +348,30 @@ DST(	movw %bx, (%edi)	)
  SRC(1:	movl (%esi), %ebx	)
  SRC(	movl 4(%esi), %edx	)
  	adcl %ebx, %eax
@@ -18284,7 +16797,7 @@ index adbccd0..98f96c8 100644
  
  	lea 32(%esi), %esi
  	lea 32(%edi), %edi
-@@ -380,7 +400,7 @@ DST(	movl %edx, 28(%edi)	)
+@@ -369,7 +385,7 @@ DST(	movl %edx, 28(%edi)	)
  	shrl $2, %edx			# This clears CF
  SRC(3:	movl (%esi), %ebx	)
  	adcl %ebx, %eax
@@ -18293,7 +16806,7 @@ index adbccd0..98f96c8 100644
  	lea 4(%esi), %esi
  	lea 4(%edi), %edi
  	dec %edx
-@@ -392,12 +412,12 @@ DST(	movl %ebx, (%edi)	)
+@@ -381,12 +397,12 @@ DST(	movl %ebx, (%edi)	)
  	jb 5f
  SRC(	movw (%esi), %cx	)
  	leal 2(%esi), %esi
@@ -18308,7 +16821,7 @@ index adbccd0..98f96c8 100644
  6:	addl %ecx, %eax
  	adcl $0, %eax
  7:
-@@ -408,7 +428,7 @@ DST(	movb %cl, (%edi)	)
+@@ -397,7 +413,7 @@ DST(	movb %cl, (%edi)	)
  
  6001:
  	movl ARGBASE+20(%esp), %ebx	# src_err_ptr
@@ -18317,7 +16830,7 @@ index adbccd0..98f96c8 100644
  
  	# zero the complete destination - computing the rest
  	# is too much work 
-@@ -421,11 +441,19 @@ DST(	movb %cl, (%edi)	)
+@@ -410,11 +426,15 @@ DST(	movb %cl, (%edi)	)
  
  6002:
  	movl ARGBASE+24(%esp), %ebx	# dst_err_ptr
@@ -18327,19 +16840,15 @@ index adbccd0..98f96c8 100644
  
  .previous
  
-+	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
++	pushl_cfi %ss
++	popl_cfi %ds
++	pushl_cfi %ss
++	popl_cfi %es
+ 	popl_cfi %ebx
  	CFI_RESTORE ebx
-@@ -439,26 +467,47 @@ DST(	movb %cl, (%edi)	)
- 	CFI_ADJUST_CFA_OFFSET -4
+ 	popl_cfi %esi
+@@ -424,26 +444,43 @@ DST(	movb %cl, (%edi)	)
+ 	popl_cfi %ecx			# equivalent to addl $4,%esp
  	ret	
  	CFI_ENDPROC
 -ENDPROC(csum_partial_copy_generic)
@@ -18371,27 +16880,23 @@ index adbccd0..98f96c8 100644
  	CFI_STARTPROC
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
-+	pushl %gs
-+	CFI_ADJUST_CFA_OFFSET 4
-+	popl %es
-+	CFI_ADJUST_CFA_OFFSET -4
++	pushl_cfi %gs
++	popl_cfi %es
 +	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
++	pushl_cfi %gs
++	popl_cfi %ds
 +#endif
 +
 +ENTRY(csum_partial_copy_generic)
- 	pushl %ebx
- 	CFI_ADJUST_CFA_OFFSET 4
+ 	pushl_cfi %ebx
  	CFI_REL_OFFSET ebx, 0
-@@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
+ 	pushl_cfi %edi
+@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
  	subl %ebx, %edi  
  	lea  -1(%esi),%edx
  	andl $-32,%edx
@@ -18400,7 +16905,7 @@ index adbccd0..98f96c8 100644
  	testl %esi, %esi 
  	jmp *%ebx
  1:	addl $64,%esi
-@@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
+@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
  	jb 5f
  SRC(	movw (%esi), %dx         )
  	leal 2(%esi), %esi
@@ -18423,7 +16928,7 @@ index adbccd0..98f96c8 100644
  	# 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)         )
+@@ -505,10 +542,17 @@ DST(	movb %dl, (%edi)         )
  	rep; stosb
  	jmp 7b
  6002:	movl ARGBASE+24(%esp), %ebx	# dst_err_ptr
@@ -18433,20 +16938,16 @@ index adbccd0..98f96c8 100644
  .previous				
  
 +#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
++	pushl_cfi %ss
++	popl_cfi %ds
++	pushl_cfi %ss
++	popl_cfi %es
 +#endif
 +
- 	popl %esi
- 	CFI_ADJUST_CFA_OFFSET -4
+ 	popl_cfi %esi
  	CFI_RESTORE esi
-@@ -538,7 +598,7 @@ DST(	movb %dl, (%edi)         )
+ 	popl_cfi %edi
+@@ -517,7 +561,7 @@ DST(	movb %dl, (%edi)         )
  	CFI_RESTORE ebx
  	ret
  	CFI_ENDPROC
@@ -18455,11 +16956,10 @@ index adbccd0..98f96c8 100644
  				
  #undef ROUND
  #undef ROUND1		
-diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
-index aa4326b..a5e068e 100644
---- a/arch/x86/lib/clear_page_64.S
-+++ b/arch/x86/lib/clear_page_64.S
-@@ -43,7 +43,7 @@ ENDPROC(clear_page)
+diff -urNp linux-3.0.3/arch/x86/lib/clear_page_64.S linux-3.0.3/arch/x86/lib/clear_page_64.S
+--- linux-3.0.3/arch/x86/lib/clear_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/clear_page_64.S	2011-08-23 21:47:55.000000000 -0400
+@@ -58,7 +58,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
  
@@ -18467,11 +16967,10 @@ index aa4326b..a5e068e 100644
 +	.section .altinstr_replacement,"a"
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
- 2:
-diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
-index 6fec2d1..81e727c 100644
---- a/arch/x86/lib/copy_page_64.S
-+++ b/arch/x86/lib/copy_page_64.S
+ 2:	.byte 0xeb					/* jmp <disp8> */
+diff -urNp linux-3.0.3/arch/x86/lib/copy_page_64.S linux-3.0.3/arch/x86/lib/copy_page_64.S
+--- linux-3.0.3/arch/x86/lib/copy_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/copy_page_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -18481,27 +16980,27 @@ index 6fec2d1..81e727c 100644
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
-index cfd3ca4..e4c03d3 100644
---- a/arch/x86/lib/copy_user_64.S
-+++ b/arch/x86/lib/copy_user_64.S
-@@ -15,13 +15,14 @@
- #include <asm/asm-offsets.h>
+diff -urNp linux-3.0.3/arch/x86/lib/copy_user_64.S linux-3.0.3/arch/x86/lib/copy_user_64.S
+--- linux-3.0.3/arch/x86/lib/copy_user_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/copy_user_64.S	2011-08-23 21:47:55.000000000 -0400
+@@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
+ #include <asm/alternative-asm.h>
 +#include <asm/pgtable.h>
  
- 	.macro ALTERNATIVE_JUMP feature,orig,alt
- 0:
+ /*
+  * By placing feature2 after feature1 in altinstructions section, we logically
+@@ -29,7 +30,7 @@
  	.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,37 +65,13 @@
+ 	.long \alt1-1b /* offset */   /* or alternatively to alt1 */
+ 3:	.byte 0xe9			/* near jump with 32bit immediate */
+@@ -71,41 +72,13 @@
  #endif
  	.endm
  
@@ -18514,7 +17013,9 @@ index cfd3ca4..e4c03d3 100644
 -	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
+-	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS,	\
+-		copy_user_generic_unrolled,copy_user_generic_string,	\
+-		copy_user_enhanced_fast_string
 -	CFI_ENDPROC
 -ENDPROC(_copy_to_user)
 -
@@ -18527,7 +17028,9 @@ index cfd3ca4..e4c03d3 100644
 -	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
+-	ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS,	\
+-		copy_user_generic_unrolled,copy_user_generic_string,	\
+-		copy_user_enhanced_fast_string
 -	CFI_ENDPROC
 -ENDPROC(_copy_from_user)
 -
@@ -18541,10 +17044,9 @@ index cfd3ca4..e4c03d3 100644
  	movl %edx,%ecx
  	xorl %eax,%eax
  	rep
-diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
-index cb0c112..39e53b9 100644
---- a/arch/x86/lib/copy_user_nocache_64.S
-+++ b/arch/x86/lib/copy_user_nocache_64.S
+diff -urNp linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S	2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -18569,11 +17071,10 @@ index cb0c112..39e53b9 100644
  	cmpl $8,%edx
  	jb 20f		/* less then 8 bytes, go to byte copy loop */
  	ALIGN_DESTINATION
-diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
-index 459b58a..9bc8be7 100644
---- a/arch/x86/lib/csum-wrappers_64.c
-+++ b/arch/x86/lib/csum-wrappers_64.c
-@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
+diff -urNp linux-3.0.3/arch/x86/lib/csum-wrappers_64.c linux-3.0.3/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.0.3/arch/x86/lib/csum-wrappers_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/csum-wrappers_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
  	}
@@ -18586,7 +17087,7 @@ index 459b58a..9bc8be7 100644
  	isum = 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 *src, void __user *dst,
+@@ -105,6 +111,12 @@ csum_partial_copy_to_user(const void *sr
  	}
  
  	*errp = 0;
@@ -18599,10 +17100,9 @@ index 459b58a..9bc8be7 100644
  	return csum_partial_copy_generic(src, (void __force *)dst,
  					 len, isum, NULL, errp);
  }
-diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
-index 51f1504..1486a2c 100644
---- a/arch/x86/lib/getuser.S
-+++ b/arch/x86/lib/getuser.S
+diff -urNp linux-3.0.3/arch/x86/lib/getuser.S linux-3.0.3/arch/x86/lib/getuser.S
+--- linux-3.0.3/arch/x86/lib/getuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/getuser.S	2011-08-23 21:47:55.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -18708,10 +17208,9 @@ index 51f1504..1486a2c 100644
  4:	movq -7(%_ASM_AX),%_ASM_DX
  	xor %eax,%eax
  	ret
-diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
-index 9f33b98..dfc7678 100644
---- a/arch/x86/lib/insn.c
-+++ b/arch/x86/lib/insn.c
+diff -urNp linux-3.0.3/arch/x86/lib/insn.c linux-3.0.3/arch/x86/lib/insn.c
+--- linux-3.0.3/arch/x86/lib/insn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/insn.c	2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -18735,11 +17234,10 @@ index 9f33b98..dfc7678 100644
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
-index c9f2d9b..e7fd2c0 100644
---- a/arch/x86/lib/mmx_32.c
-+++ b/arch/x86/lib/mmx_32.c
-@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
+diff -urNp linux-3.0.3/arch/x86/lib/mmx_32.c linux-3.0.3/arch/x86/lib/mmx_32.c
+--- linux-3.0.3/arch/x86/lib/mmx_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/mmx_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
  	void *p;
  	int i;
@@ -18747,7 +17245,7 @@ index c9f2d9b..e7fd2c0 100644
  
  	if (unlikely(in_interrupt()))
  		return __memcpy(to, from, len);
-@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
+@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *
  	kernel_fpu_begin();
  
  	__asm__ __volatile__ (
@@ -18854,7 +17352,7 @@ index c9f2d9b..e7fd2c0 100644
  
  	kernel_fpu_begin();
  
-@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
+@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, voi
  	 * but that is for later. -AV
  	 */
  	__asm__ __volatile__(
@@ -19054,10 +17552,9 @@ index c9f2d9b..e7fd2c0 100644
  
  		from += 64;
  		to += 64;
-diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
-index 36b0d15..2b76fbd 100644
---- a/arch/x86/lib/putuser.S
-+++ b/arch/x86/lib/putuser.S
+diff -urNp linux-3.0.3/arch/x86/lib/putuser.S linux-3.0.3/arch/x86/lib/putuser.S
+--- linux-3.0.3/arch/x86/lib/putuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/putuser.S	2011-08-23 21:47:55.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -19195,10 +17692,9 @@ index 36b0d15..2b76fbd 100644
  #endif
  	xor %eax,%eax
  	EXIT
-diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
-index e218d5d..35679b4 100644
---- a/arch/x86/lib/usercopy_32.c
-+++ b/arch/x86/lib/usercopy_32.c
+diff -urNp linux-3.0.3/arch/x86/lib/usercopy_32.c linux-3.0.3/arch/x86/lib/usercopy_32.c
+--- linux-3.0.3/arch/x86/lib/usercopy_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/usercopy_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@ do {									   \
  	__asm__ __volatile__(						   \
  		"	testl %1,%1\n"					   \
@@ -19221,7 +17717,7 @@ index e218d5d..35679b4 100644
  		".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, long n)
+@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, 
  	might_fault();
  
  	__asm__ __volatile__(
@@ -19229,7 +17725,7 @@ index e218d5d..35679b4 100644
  		"	testl %0, %0\n"
  		"	jz 3f\n"
  		"	andl %0,%%ecx\n"
-@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
+@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, 
  		"	subl %%ecx,%0\n"
  		"	addl %0,%%eax\n"
  		"1:\n"
@@ -19246,7 +17742,7 @@ index e218d5d..35679b4 100644
  {
  	int d0, d1;
  	__asm__ __volatile__(
-@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -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"
@@ -19299,7 +17795,7 @@ index e218d5d..35679b4 100644
  		       "       addl $-64, %0\n"
  		       "       addl $64, %4\n"
  		       "       addl $64, %3\n"
-@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
+@@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const
  		       "       shrl  $2, %0\n"
  		       "       andl  $3, %%eax\n"
  		       "       cld\n"
@@ -19419,7 +17915,7 @@ index e218d5d..35679b4 100644
  		       ".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, const void __user *from, unsigned long size)
+@@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, cons
  	int d0, d1;
  	__asm__ __volatile__(
  		       "        .align 2,0x90\n"
@@ -19479,7 +17975,7 @@ index e218d5d..35679b4 100644
  		       "        movl %%eax, 56(%3)\n"
  		       "        movl %%edx, 60(%3)\n"
  		       "        addl $-64, %0\n"
-@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
+@@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, cons
  		       "        shrl  $2, %0\n"
  		       "        andl $3, %%eax\n"
  		       "        cld\n"
@@ -19491,7 +17987,7 @@ index e218d5d..35679b4 100644
  		       "8:\n"
  		       ".section .fixup,\"ax\"\n"
  		       "9:      lea 0(%%eax,%0,4),%0\n"
-@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing
  
  	__asm__ __volatile__(
  	       "        .align 2,0x90\n"
@@ -19551,7 +18047,7 @@ index e218d5d..35679b4 100644
  	       "        movnti %%eax, 56(%3)\n"
  	       "        movnti %%edx, 60(%3)\n"
  	       "        addl $-64, %0\n"
-@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
+@@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing
  	       "        shrl  $2, %0\n"
  	       "        andl $3, %%eax\n"
  	       "        cld\n"
@@ -19563,7 +18059,7 @@ index e218d5d..35679b4 100644
  	       "8:\n"
  	       ".section .fixup,\"ax\"\n"
  	       "9:      lea 0(%%eax,%0,4),%0\n"
-@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_n
  
  	__asm__ __volatile__(
  	       "        .align 2,0x90\n"
@@ -19623,7 +18119,7 @@ index e218d5d..35679b4 100644
  	       "        movnti %%eax, 56(%3)\n"
  	       "        movnti %%edx, 60(%3)\n"
  	       "        addl $-64, %0\n"
-@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_n
  	       "        shrl  $2, %0\n"
  	       "        andl $3, %%eax\n"
  	       "        cld\n"
@@ -19635,7 +18131,7 @@ index e218d5d..35679b4 100644
  	       "8:\n"
  	       ".section .fixup,\"ax\"\n"
  	       "9:      lea 0(%%eax,%0,4),%0\n"
-@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
+@@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_n
   */
  unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
  					unsigned long size);
@@ -19707,7 +18203,7 @@ index e218d5d..35679b4 100644
  	return n;
  }
  EXPORT_SYMBOL(__copy_to_user_ll);
-@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
+@@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero
  					 unsigned long n)
  {
  	if (movsl_is_ok(to, from, n))
@@ -19720,7 +18216,7 @@ index e218d5d..35679b4 100644
  	return n;
  }
  EXPORT_SYMBOL(__copy_from_user_ll_nozero);
-@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
+@@ -827,65 +943,50 @@ unsigned long __copy_from_user_ll_nocach
  	if (n > 64 && cpu_has_xmm2)
  		n = __copy_user_intel_nocache(to, from, n);
  	else
@@ -19819,10 +18315,9 @@ index e218d5d..35679b4 100644
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
-index b7c2849..8cab7a5 100644
---- a/arch/x86/lib/usercopy_64.c
-+++ b/arch/x86/lib/usercopy_64.c
+diff -urNp linux-3.0.3/arch/x86/lib/usercopy_64.c linux-3.0.3/arch/x86/lib/usercopy_64.c
+--- linux-3.0.3/arch/x86/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -19836,7 +18331,7 @@ index b7c2849..8cab7a5 100644
  	__do_strncpy_from_user(dst, src, count, res);
  	return res;
  }
-@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
+@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *
  {
  	long __d0;
  	might_fault();
@@ -19871,75 +18366,34 @@ index b7c2849..8cab7a5 100644
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
-index d0474ad..360f761 100644
---- a/arch/x86/mm/extable.c
-+++ b/arch/x86/mm/extable.c
-@@ -1,14 +1,71 @@
- #include <linux/module.h>
- #include <linux/spinlock.h>
-+#include <linux/sort.h>
- #include <asm/uaccess.h>
-+#include <asm/pgtable.h>
- 
-+/*
-+ * 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 = a, *y = 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 = a, *y = b;
-+
-+	t = *x;
+diff -urNp linux-3.0.3/arch/x86/Makefile linux-3.0.3/arch/x86/Makefile
+--- linux-3.0.3/arch/x86/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/Makefile	2011-08-23 21:48:14.000000000 -0400
+@@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
+ else
+         BITS := 64
+         UTS_MACHINE := x86_64
++        biarch := $(call cc-option,-m64)
+         CHECKFLAGS += -D__x86_64__ -m64
+ 
+         KBUILD_AFLAGS += -m64
+@@ -195,3 +196,12 @@ define archhelp
+   echo  '                  FDARGS="..."  arguments for the booted kernel'
+   echo  '                  FDINITRD=file initrd for the booted kernel'
+ endef
 +
-+	pax_open_kernel();
-+	*x = *y;
-+	*y = t;
-+	pax_close_kernel();
-+}
++define OLD_LD
 +
-+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);
-+}
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
 +
-+#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 */
- 
- int fixup_exception(struct pt_regs *regs)
- {
++archprepare:
++	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+diff -urNp linux-3.0.3/arch/x86/mm/extable.c linux-3.0.3/arch/x86/mm/extable.c
+--- linux-3.0.3/arch/x86/mm/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/extable.c	2011-08-23 21:47:55.000000000 -0400
+@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
  	const struct exception_table_entry *fixup;
  
  #ifdef CONFIG_PNPBIOS
@@ -19948,14 +18402,13 @@ index d0474ad..360f761 100644
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
-index 20e3f87..e200bb7 100644
---- a/arch/x86/mm/fault.c
-+++ b/arch/x86/mm/fault.c
-@@ -12,10 +12,18 @@
- #include <linux/mmiotrace.h>		/* kmmio_handler, ...		*/
+diff -urNp linux-3.0.3/arch/x86/mm/fault.c linux-3.0.3/arch/x86/mm/fault.c
+--- linux-3.0.3/arch/x86/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/fault.c	2011-08-23 21:48:14.000000000 -0400
+@@ -13,10 +13,18 @@
  #include <linux/perf_event.h>		/* perf_sw_event		*/
  #include <linux/hugetlb.h>		/* hstate_index_to_shift	*/
+ #include <linux/prefetch.h>		/* prefetchw			*/
 +#include <linux/unistd.h>
 +#include <linux/compiler.h>
  
@@ -19971,7 +18424,7 @@ index 20e3f87..e200bb7 100644
  
  /*
   * Page fault error code bits:
-@@ -53,7 +61,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
+@@ -54,7 +62,7 @@ static inline int __kprobes notify_page_
  	int ret = 0;
  
  	/* kprobe_running() needs smp_processor_id() */
@@ -19980,7 +18433,7 @@ index 20e3f87..e200bb7 100644
  		preempt_disable();
  		if (kprobe_running() && kprobe_fault_handler(regs, 14))
  			ret = 1;
-@@ -114,7 +122,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
+@@ -115,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *re
  		return !instr_lo || (instr_lo>>1) == 1;
  	case 0x00:
  		/* Prefetch instruction is 0x0F0D or 0x0F18 */
@@ -19992,7 +18445,7 @@ index 20e3f87..e200bb7 100644
  			return 0;
  
  		*prefetch = (instr_lo == 0xF) &&
-@@ -148,7 +159,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
+@@ -149,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsign
  	while (instr < max_instr) {
  		unsigned char opcode;
  
@@ -20004,7 +18457,7 @@ index 20e3f87..e200bb7 100644
  			break;
  
  		instr++;
-@@ -179,6 +193,30 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
+@@ -180,6 +194,30 @@ force_sig_info_fault(int si_signo, int s
  	force_sig_info(si_signo, &info, tsk);
  }
  
@@ -20035,7 +18488,7 @@ index 20e3f87..e200bb7 100644
  DEFINE_SPINLOCK(pgd_lock);
  LIST_HEAD(pgd_list);
  
-@@ -229,10 +267,22 @@ void vmalloc_sync_all(void)
+@@ -230,10 +268,22 @@ void vmalloc_sync_all(void)
  	for (address = VMALLOC_START & PMD_MASK;
  	     address >= TASK_SIZE && address < FIXADDR_TOP;
  	     address += PMD_SIZE) {
@@ -20058,7 +18511,7 @@ index 20e3f87..e200bb7 100644
  			spinlock_t *pgt_lock;
  			pmd_t *ret;
  
-@@ -240,8 +290,13 @@ void vmalloc_sync_all(void)
+@@ -241,8 +291,13 @@ void vmalloc_sync_all(void)
  			pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
  
  			spin_lock(pgt_lock);
@@ -20073,7 +18526,7 @@ index 20e3f87..e200bb7 100644
  
  			if (!ret)
  				break;
-@@ -275,6 +330,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -276,6 +331,11 @@ static noinline __kprobes int vmalloc_fa
  	 * an interrupt in the middle of a task switch..
  	 */
  	pgd_paddr = read_cr3();
@@ -20085,7 +18538,7 @@ index 20e3f87..e200bb7 100644
  	pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
  	if (!pmd_k)
  		return -1;
-@@ -370,7 +430,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
+@@ -371,7 +431,14 @@ static noinline __kprobes int vmalloc_fa
  	 * happen within a race in page table update. In the later
  	 * case just flush:
  	 */
@@ -20100,7 +18553,7 @@ index 20e3f87..e200bb7 100644
  	pgd_ref = pgd_offset_k(address);
  	if (pgd_none(*pgd_ref))
  		return -1;
-@@ -532,7 +599,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
+@@ -533,7 +600,7 @@ static int is_errata93(struct pt_regs *r
  static int is_errata100(struct pt_regs *regs, unsigned long address)
  {
  #ifdef CONFIG_X86_64
@@ -20109,7 +18562,7 @@ index 20e3f87..e200bb7 100644
  		return 1;
  #endif
  	return 0;
-@@ -559,7 +626,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
+@@ -560,7 +627,7 @@ static int is_f00f_bug(struct pt_regs *r
  }
  
  static const char nx_warning[] = KERN_CRIT
@@ -20118,7 +18571,7 @@ index 20e3f87..e200bb7 100644
  
  static void
  show_fault_oops(struct pt_regs *regs, unsigned long error_code,
-@@ -568,14 +635,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
+@@ -569,14 +636,25 @@ show_fault_oops(struct pt_regs *regs, un
  	if (!oops_may_print())
  		return;
  
@@ -20146,22 +18599,20 @@ index 20e3f87..e200bb7 100644
  
  	printk(KERN_ALERT "BUG: unable to handle kernel ");
  	if (address < PAGE_SIZE)
-@@ -701,6 +779,68 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
+@@ -702,6 +780,66 @@ __bad_area_nosemaphore(struct pt_regs *r
  		       unsigned long address, int si_code)
  {
  	struct task_struct *tsk = current;
++#if defined(CONFIG_X86_64) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
 +	struct mm_struct *mm = tsk->mm;
++#endif
 +
 +#ifdef CONFIG_X86_64
 +	if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
-+		if (regs->ip == (unsigned long)vgettimeofday) {
-+			regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
-+			return;
-+		} else if (regs->ip == (unsigned long)vtime) {
-+			regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time);
-+			return;
-+		} else if (regs->ip == (unsigned long)vgetcpu) {
-+			regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu);
++		if (regs->ip == VSYSCALL_ADDR(__NR_vgettimeofday) ||
++		    regs->ip == VSYSCALL_ADDR(__NR_vtime) ||
++		    regs->ip == VSYSCALL_ADDR(__NR_vgetcpu)) {
++			regs->ip += mm->context.vdso - PAGE_SIZE - VSYSCALL_START;
 +			return;
 +		}
 +	}
@@ -20215,7 +18666,7 @@ index 20e3f87..e200bb7 100644
  
  	/* User mode accesses just cause a SIGSEGV */
  	if (error_code & PF_USER) {
-@@ -855,6 +995,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
+@@ -871,6 +1009,99 @@ static int spurious_fault_check(unsigned
  	return 1;
  }
  
@@ -20315,7 +18766,7 @@ index 20e3f87..e200bb7 100644
  /*
   * Handle a spurious fault caused by a stale TLB entry.
   *
-@@ -927,6 +1160,9 @@ int show_unhandled_signals = 1;
+@@ -943,6 +1174,9 @@ int show_unhandled_signals = 1;
  static inline int
  access_error(unsigned long error_code, struct vm_area_struct *vma)
  {
@@ -20325,7 +18776,7 @@ index 20e3f87..e200bb7 100644
  	if (error_code & PF_WRITE) {
  		/* write, present and write, not present: */
  		if (unlikely(!(vma->vm_flags & VM_WRITE)))
-@@ -960,19 +1196,33 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -976,19 +1210,33 @@ do_page_fault(struct pt_regs *regs, unsi
  {
  	struct vm_area_struct *vma;
  	struct task_struct *tsk;
@@ -20333,7 +18784,7 @@ index 20e3f87..e200bb7 100644
  	struct mm_struct *mm;
  	int fault;
  	int write = error_code & PF_WRITE;
- 	unsigned int flags = FAULT_FLAG_ALLOW_RETRY |
+ 	unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
  					(write ? FAULT_FLAG_WRITE : 0);
  
 +	/* Get the faulting address: */
@@ -20348,7 +18799,7 @@ index 20e3f87..e200bb7 100644
 +		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, KERN_ERR);
++			show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
 +		} else
 +			address -= PAX_USER_SHADOW_BASE;
 +	}
@@ -20363,7 +18814,7 @@ index 20e3f87..e200bb7 100644
  	/*
  	 * Detect and handle instructions that would cause a page fault for
  	 * both a tracked kernel page and a userspace page.
-@@ -1032,7 +1282,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
+@@ -1048,7 +1296,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:
  	 */
@@ -20372,7 +18823,7 @@ index 20e3f87..e200bb7 100644
  		local_irq_enable();
  		error_code |= PF_USER;
  	} else {
-@@ -1087,6 +1337,11 @@ retry:
+@@ -1103,6 +1351,11 @@ retry:
  		might_sleep();
  	}
  
@@ -20384,7 +18835,7 @@ index 20e3f87..e200bb7 100644
  	vma = find_vma(mm, address);
  	if (unlikely(!vma)) {
  		bad_area(regs, error_code, address);
-@@ -1098,18 +1353,24 @@ retry:
+@@ -1114,18 +1367,24 @@ retry:
  		bad_area(regs, error_code, address);
  		return;
  	}
@@ -20420,7 +18871,7 @@ index 20e3f87..e200bb7 100644
  	if (unlikely(expand_stack(vma, address))) {
  		bad_area(regs, error_code, address);
  		return;
-@@ -1164,3 +1425,199 @@ good_area:
+@@ -1180,3 +1439,199 @@ good_area:
  
  	up_read(&mm->mmap_sem);
  }
@@ -20620,11 +19071,10 @@ index 20e3f87..e200bb7 100644
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
-index dbe34b9..127d310 100644
---- a/arch/x86/mm/gup.c
-+++ b/arch/x86/mm/gup.c
-@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
+diff -urNp linux-3.0.3/arch/x86/mm/gup.c linux-3.0.3/arch/x86/mm/gup.c
+--- linux-3.0.3/arch/x86/mm/gup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/gup.c	2011-08-23 21:47:55.000000000 -0400
+@@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
  	addr = start;
  	len = (unsigned long) nr_pages << PAGE_SHIFT;
  	end = start + len;
@@ -20633,11 +19083,10 @@ index dbe34b9..127d310 100644
  					(void __user *)start, len)))
  		return 0;
  
-diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
-index b499626..6fd1882 100644
---- a/arch/x86/mm/highmem_32.c
-+++ b/arch/x86/mm/highmem_32.c
-@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
+diff -urNp linux-3.0.3/arch/x86/mm/highmem_32.c linux-3.0.3/arch/x86/mm/highmem_32.c
+--- linux-3.0.3/arch/x86/mm/highmem_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/highmem_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
  	idx = type + KM_TYPE_NR*smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
  	BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -20648,11 +19097,10 @@ index b499626..6fd1882 100644
  
  	return (void *)vaddr;
  }
-diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
-index 069ce7c..9f18667 100644
---- a/arch/x86/mm/hugetlbpage.c
-+++ b/arch/x86/mm/hugetlbpage.c
-@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
+diff -urNp linux-3.0.3/arch/x86/mm/hugetlbpage.c linux-3.0.3/arch/x86/mm/hugetlbpage.c
+--- linux-3.0.3/arch/x86/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
@@ -20712,7 +19160,7 @@ index 069ce7c..9f18667 100644
  }
  
  static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
-@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmappe
  {
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
@@ -20725,7 +19173,7 @@ index 069ce7c..9f18667 100644
  
  	/* don't allow allocations above current base */
  	if (mm->free_area_cache > base)
-@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
+@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmappe
  	        largest_hole = 0;
  		mm->free_area_cache  = base;
  	}
@@ -20735,7 +19183,7 @@ index 069ce7c..9f18667 100644
  	if (mm->free_area_cache < len)
  		goto fail;
  
- 	/* either no address requested or cant fit in requested address hole */
+ 	/* either no address requested or can't fit in requested address hole */
 -	addr = (mm->free_area_cache - len) & huge_page_mask(h);
 +	addr = (mm->free_area_cache - len);
  	do {
@@ -20828,7 +19276,7 @@ index 069ce7c..9f18667 100644
  	mm->free_area_cache = base;
  	mm->cached_hole_size = ~0UL;
  
-@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *f
  	struct hstate *h = hstate_file(file);
  	struct mm_struct *mm = current->mm;
  	struct vm_area_struct *vma;
@@ -20849,7 +19297,7 @@ index 069ce7c..9f18667 100644
  		return -ENOMEM;
  
  	if (flags & MAP_FIXED) {
-@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
+@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *f
  	if (addr) {
  		addr = ALIGN(addr, huge_page_size(h));
  		vma = find_vma(mm, addr);
@@ -20859,132 +19307,9 @@ index 069ce7c..9f18667 100644
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
-index 947f42a..48384fb 100644
---- a/arch/x86/mm/init.c
-+++ b/arch/x86/mm/init.c
-@@ -72,11 +72,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
- 	 * cause a hotspot and fill up ZONE_DMA. The page tables
- 	 * need roughly 0.5KB per GB.
- 	 */
--#ifdef CONFIG_X86_32
--	start = 0x7000;
--#else
--	start = 0x8000;
--#endif
-+	start = 0x100000;
- 	base = memblock_find_in_range(start, max_pfn_mapped<<PAGE_SHIFT,
- 					tables, PAGE_SIZE);
- 	if (base == MEMBLOCK_ERROR)
-@@ -323,7 +319,16 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
-  */
- int devmem_is_allowed(unsigned long pagenr)
- {
--	if (pagenr <= 256)
-+#ifndef CONFIG_GRKERNSEC_KMEM
-+	if (!pagenr)
-+		return 1;
-+#ifdef CONFIG_VM86
-+	if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
-+		return 1;
-+#endif
-+#endif
-+
-+	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
- 		return 1;
- 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
- 		return 0;
-@@ -383,6 +388,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
- 
- void free_initmem(void)
- {
-+
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifdef CONFIG_X86_32
-+	/* PaX: limit KERNEL_CS to actual size */
-+	unsigned long addr, limit;
-+	struct desc_struct d;
-+	int cpu;
-+
-+	limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
-+	limit = (limit - 1UL) >> PAGE_SHIFT;
-+
-+	memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
-+	for (cpu = 0; cpu < NR_CPUS; cpu++) {
-+		pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
-+		write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
-+	}
-+
-+	/* PaX: make KERNEL_CS read-only */
-+	addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
-+	if (!paravirt_enabled())
-+		set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
-+/*
-+		for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
-+			pgd = pgd_offset_k(addr);
-+			pud = pud_offset(pgd, addr);
-+			pmd = pmd_offset(pud, addr);
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+		}
-+*/
-+#ifdef CONFIG_X86_PAE
-+	set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
-+/*
-+	for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+	}
-+*/
-+#endif
-+
-+#ifdef CONFIG_MODULES
-+	set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
-+#endif
-+
-+#else
-+	pgd_t *pgd;
-+	pud_t *pud;
-+	pmd_t *pmd;
-+	unsigned long addr, end;
-+
-+	/* PaX: make kernel code/rodata read-only, rest non-executable */
-+	for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		if (!pmd_present(*pmd))
-+			continue;
-+		if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+		else
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
-+	}
-+
-+	addr = (unsigned long)__va(__pa(__START_KERNEL_map));
-+	end = addr + KERNEL_IMAGE_SIZE;
-+	for (; addr < end; addr += PMD_SIZE) {
-+		pgd = pgd_offset_k(addr);
-+		pud = pud_offset(pgd, addr);
-+		pmd = pmd_offset(pud, addr);
-+		if (!pmd_present(*pmd))
-+			continue;
-+		if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
-+			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
-+	}
-+#endif
-+
-+	flush_tlb_all();
-+#endif
-+
- 	free_init_pages("unused kernel memory",
- 			(unsigned long)(&__init_begin),
- 			(unsigned long)(&__init_end));
-diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index c821074..2dbd8d3 100644
---- a/arch/x86/mm/init_32.c
-+++ b/arch/x86/mm/init_32.c
+diff -urNp linux-3.0.3/arch/x86/mm/init_32.c linux-3.0.3/arch/x86/mm/init_32.c
+--- linux-3.0.3/arch/x86/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -21022,7 +19347,7 @@ index c821074..2dbd8d3 100644
   * Create a page table and place a pointer to it in a middle page
   * directory entry:
   */
-@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
+@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_ini
  			page_table = (pte_t *)alloc_low_page();
  
  		paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
@@ -21051,7 +19376,7 @@ index c821074..2dbd8d3 100644
  pmd_t * __init populate_extra_pmd(unsigned long vaddr)
  {
  	int pgd_idx = pgd_index(vaddr);
-@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+@@ -203,6 +188,7 @@ page_table_range_init(unsigned long star
  	int pgd_idx, pmd_idx;
  	unsigned long vaddr;
  	pgd_t *pgd;
@@ -21059,7 +19384,7 @@ index c821074..2dbd8d3 100644
  	pmd_t *pmd;
  	pte_t *pte = NULL;
  
-@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+@@ -212,8 +198,13 @@ page_table_range_init(unsigned long star
  	pgd = pgd_base + pgd_idx;
  
  	for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
@@ -21075,7 +19400,7 @@ index c821074..2dbd8d3 100644
  		for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
  							pmd++, pmd_idx++) {
  			pte = page_table_kmap_check(one_page_table_init(pmd),
-@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
+@@ -225,11 +216,20 @@ page_table_range_init(unsigned long star
  	}
  }
  
@@ -21100,7 +19425,7 @@ index c821074..2dbd8d3 100644
  }
  
  /*
-@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
+@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned lo
  	unsigned long last_map_addr = end;
  	unsigned long start_pfn, end_pfn;
  	pgd_t *pgd_base = swapper_pg_dir;
@@ -21175,7 +19500,7 @@ index c821074..2dbd8d3 100644
  					prot = PAGE_KERNEL_EXEC;
  
  				pages_4k++;
-@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
+@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start
  
  		pud = pud_offset(pgd, va);
  		pmd = pmd_offset(pud, va);
@@ -21184,7 +19509,7 @@ index c821074..2dbd8d3 100644
  			break;
  
  		pte = pte_offset_kernel(pmd, va);
-@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
+@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_ran
  
  static void __init pagetable_init(void)
  {
@@ -21199,7 +19524,7 @@ index c821074..2dbd8d3 100644
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  /* user-defined highmem size */
-@@ -755,6 +754,12 @@ void __init mem_init(void)
+@@ -757,6 +756,12 @@ void __init mem_init(void)
  
  	pci_iommu_alloc();
  
@@ -21212,7 +19537,7 @@ index c821074..2dbd8d3 100644
  #ifdef CONFIG_FLATMEM
  	BUG_ON(!mem_map);
  #endif
-@@ -772,7 +777,7 @@ void __init mem_init(void)
+@@ -774,7 +779,7 @@ void __init mem_init(void)
  	set_highmem_pages_init();
  
  	codesize =  (unsigned long) &_etext - (unsigned long) &_text;
@@ -21221,7 +19546,7 @@ index c821074..2dbd8d3 100644
  	initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
  
  	printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
-@@ -813,10 +818,10 @@ void __init mem_init(void)
+@@ -815,10 +820,10 @@ void __init mem_init(void)
  		((unsigned long)&__init_end -
  		 (unsigned long)&__init_begin) >> 10,
  
@@ -21235,7 +19560,7 @@ index c821074..2dbd8d3 100644
  		((unsigned long)&_etext - (unsigned long)&_text) >> 10);
  
  	/*
-@@ -894,6 +899,7 @@ void set_kernel_text_rw(void)
+@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -21243,7 +19568,7 @@ index c821074..2dbd8d3 100644
  	pr_debug("Set kernel text: %lx - %lx for read write\n",
  		 start, start+size);
  
-@@ -908,6 +914,7 @@ void set_kernel_text_ro(void)
+@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
  	if (!kernel_set_to_readonly)
  		return;
  
@@ -21251,7 +19576,7 @@ index c821074..2dbd8d3 100644
  	pr_debug("Set kernel text: %lx - %lx for read only\n",
  		 start, start+size);
  
-@@ -936,6 +943,7 @@ void mark_rodata_ro(void)
+@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
  	unsigned long start = PFN_ALIGN(_text);
  	unsigned long size = PFN_ALIGN(_etext) - start;
  
@@ -21259,11 +19584,10 @@ index c821074..2dbd8d3 100644
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
-index c14a542..6467fb5 100644
---- a/arch/x86/mm/init_64.c
-+++ b/arch/x86/mm/init_64.c
-@@ -72,7 +72,7 @@ early_param("gbpages", parse_direct_gbpages_on);
+diff -urNp linux-3.0.3/arch/x86/mm/init_64.c linux-3.0.3/arch/x86/mm/init_64.c
+--- linux-3.0.3/arch/x86/mm/init_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/init_64.c	2011-08-23 21:47:55.000000000 -0400
+@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
  
@@ -21272,7 +19596,7 @@ index c14a542..6467fb5 100644
  EXPORT_SYMBOL_GPL(__supported_pte_mask);
  
  int force_personality32;
-@@ -105,12 +105,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long star
  
  	for (address = start; address <= end; address += PGDIR_SIZE) {
  		const pgd_t *pgd_ref = pgd_offset_k(address);
@@ -21295,7 +19619,7 @@ index c14a542..6467fb5 100644
  		list_for_each_entry(page, &pgd_list, lru) {
  			pgd_t *pgd;
  			spinlock_t *pgt_lock;
-@@ -119,6 +129,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long star
  			/* the pgt_lock only for Xen */
  			pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
  			spin_lock(pgt_lock);
@@ -21303,7 +19627,7 @@ index c14a542..6467fb5 100644
  
  			if (pgd_none(*pgd))
  				set_pgd(pgd, *pgd_ref);
-@@ -126,7 +137,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
+@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long star
  				BUG_ON(pgd_page_vaddr(*pgd)
  				       != pgd_page_vaddr(*pgd_ref));
  
@@ -21314,7 +19638,7 @@ index c14a542..6467fb5 100644
  		}
  		spin_unlock(&pgd_lock);
  	}
-@@ -200,7 +214,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
+@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 
  	pmd = fill_pmd(pud, vaddr);
  	pte = fill_pte(pmd, vaddr);
  
@@ -21324,7 +19648,7 @@ index c14a542..6467fb5 100644
  
  	/*
  	 * It's enough to flush this one mapping.
-@@ -259,14 +275,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
+@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(
  		pgd = pgd_offset_k((unsigned long)__va(phys));
  		if (pgd_none(*pgd)) {
  			pud = (pud_t *) spp_getpage();
@@ -21341,7 +19665,7 @@ index c14a542..6467fb5 100644
  		}
  		pmd = pmd_offset(pud, phys);
  		BUG_ON(!pmd_none(*pmd));
-@@ -706,6 +720,12 @@ void __init mem_init(void)
+@@ -693,6 +707,12 @@ void __init mem_init(void)
  
  	pci_iommu_alloc();
  
@@ -21354,7 +19678,7 @@ index c14a542..6467fb5 100644
  	/* clear_bss() already clear the empty_zero_page */
  
  	reservedpages = 0;
-@@ -866,8 +886,8 @@ int kern_addr_valid(unsigned long addr)
+@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
  static struct vm_area_struct gate_vma = {
  	.vm_start	= VSYSCALL_START,
  	.vm_end		= VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
@@ -21364,8 +19688,8 @@ index c14a542..6467fb5 100644
 +	.vm_flags	= VM_READ
  };
  
- struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
-@@ -901,7 +921,7 @@ int in_gate_area_no_task(unsigned long addr)
+ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long add
  
  const char *arch_vma_name(struct vm_area_struct *vma)
  {
@@ -21374,11 +19698,145 @@ index c14a542..6467fb5 100644
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
-index 7b179b4..6bd1777 100644
---- a/arch/x86/mm/iomap_32.c
-+++ b/arch/x86/mm/iomap_32.c
-@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
+diff -urNp linux-3.0.3/arch/x86/mm/init.c linux-3.0.3/arch/x86/mm/init.c
+--- linux-3.0.3/arch/x86/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/init.c	2011-08-23 21:48:14.000000000 -0400
+@@ -31,7 +31,7 @@ int direct_gbpages
+ static void __init find_early_table_space(unsigned long end, int use_pse,
+ 					  int use_gbpages)
+ {
+-	unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
++	unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
+ 	phys_addr_t base;
+ 
+ 	puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
+@@ -313,12 +313,34 @@ unsigned long __init_refok init_memory_m
+  */
+ int devmem_is_allowed(unsigned long pagenr)
+ {
+-	if (pagenr <= 256)
++#ifdef CONFIG_GRKERNSEC_KMEM
++	/* allow BDA */
++	if (!pagenr)
++		return 1;
++	/* allow EBDA */
++	if ((0x9f000 >> PAGE_SHIFT) == pagenr)
++		return 1;
++#else
++	if (!pagenr)
++		return 1;
++#ifdef CONFIG_VM86
++	if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
++		return 1;
++#endif
++#endif
++
++	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
+ 		return 1;
++#ifdef CONFIG_GRKERNSEC_KMEM
++	/* throw out everything else below 1MB */
++	if (pagenr <= 256)
++		return 0;
++#endif
+ 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+ 		return 0;
+ 	if (!page_is_ram(pagenr))
+ 		return 1;
++
+ 	return 0;
+ }
+ 
+@@ -373,6 +395,86 @@ void free_init_pages(char *what, unsigne
+ 
+ void free_initmem(void)
+ {
++
++#ifdef CONFIG_PAX_KERNEXEC
++#ifdef CONFIG_X86_32
++	/* PaX: limit KERNEL_CS to actual size */
++	unsigned long addr, limit;
++	struct desc_struct d;
++	int cpu;
++
++	limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
++	limit = (limit - 1UL) >> PAGE_SHIFT;
++
++	memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
++		write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
++	}
++
++	/* PaX: make KERNEL_CS read-only */
++	addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
++	if (!paravirt_enabled())
++		set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
++/*
++		for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
++			pgd = pgd_offset_k(addr);
++			pud = pud_offset(pgd, addr);
++			pmd = pmd_offset(pud, addr);
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++		}
++*/
++#ifdef CONFIG_X86_PAE
++	set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
++/*
++	for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++	}
++*/
++#endif
++
++#ifdef CONFIG_MODULES
++	set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
++#endif
++
++#else
++	pgd_t *pgd;
++	pud_t *pud;
++	pmd_t *pmd;
++	unsigned long addr, end;
++
++	/* PaX: make kernel code/rodata read-only, rest non-executable */
++	for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		if (!pmd_present(*pmd))
++			continue;
++		if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++		else
++			set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
++	}
++
++	addr = (unsigned long)__va(__pa(__START_KERNEL_map));
++	end = addr + KERNEL_IMAGE_SIZE;
++	for (; addr < end; addr += PMD_SIZE) {
++		pgd = pgd_offset_k(addr);
++		pud = pud_offset(pgd, addr);
++		pmd = pmd_offset(pud, addr);
++		if (!pmd_present(*pmd))
++			continue;
++		if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
++			set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
++	}
++#endif
++
++	flush_tlb_all();
++#endif
++
+ 	free_init_pages("unused kernel memory",
+ 			(unsigned long)(&__init_begin),
+ 			(unsigned long)(&__init_end));
+diff -urNp linux-3.0.3/arch/x86/mm/iomap_32.c linux-3.0.3/arch/x86/mm/iomap_32.c
+--- linux-3.0.3/arch/x86/mm/iomap_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/iomap_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
  	type = kmap_atomic_idx_push();
  	idx = type + KM_TYPE_NR * smp_processor_id();
  	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -21390,11 +19848,10 @@ index 7b179b4..6bd1777 100644
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
-index 0369843..9258b48 100644
---- a/arch/x86/mm/ioremap.c
-+++ b/arch/x86/mm/ioremap.c
-@@ -104,7 +104,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
+diff -urNp linux-3.0.3/arch/x86/mm/ioremap.c linux-3.0.3/arch/x86/mm/ioremap.c
+--- linux-3.0.3/arch/x86/mm/ioremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/ioremap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
  	for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
  		int is_ram = page_is_ram(pfn);
  
@@ -21403,7 +19860,7 @@ index 0369843..9258b48 100644
  			return NULL;
  		WARN_ON_ONCE(is_ram);
  	}
-@@ -344,7 +344,7 @@ static int __init early_ioremap_debug_setup(char *str)
+@@ -344,7 +344,7 @@ static int __init early_ioremap_debug_se
  early_param("early_ioremap_debug", early_ioremap_debug_setup);
  
  static __initdata int after_paging_init;
@@ -21422,11 +19879,10 @@ index 0369843..9258b48 100644
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
-index d87dd6d..bf3fa66 100644
---- a/arch/x86/mm/kmemcheck/kmemcheck.c
-+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
-@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
+diff -urNp linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c	2011-08-23 21:47:55.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.
  	 */
@@ -21438,11 +19894,10 @@ index d87dd6d..bf3fa66 100644
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
-index 1dab519..60a7e5f 100644
---- a/arch/x86/mm/mmap.c
-+++ b/arch/x86/mm/mmap.c
-@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size(void)
+diff -urNp linux-3.0.3/arch/x86/mm/mmap.c linux-3.0.3/arch/x86/mm/mmap.c
+--- linux-3.0.3/arch/x86/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+@@ -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())
@@ -21497,7 +19952,7 @@ index 1dab519..60a7e5f 100644
  		return TASK_UNMAPPED_BASE + mmap_rnd();
  }
  
-@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(void)
+@@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(vo
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
  	if (mmap_is_legacy()) {
@@ -21523,11 +19978,19 @@ index 1dab519..60a7e5f 100644
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
-index 3adff7d..aec0370 100644
---- a/arch/x86/mm/mmio-mod.c
-+++ b/arch/x86/mm/mmio-mod.c
-@@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
+diff -urNp linux-3.0.3/arch/x86/mm/mmio-mod.c linux-3.0.3/arch/x86/mm/mmio-mod.c
+--- linux-3.0.3/arch/x86/mm/mmio-mod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/mmio-mod.c	2011-08-23 21:47:55.000000000 -0400
+@@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
+ 		break;
+ 	default:
+ 		{
+-			unsigned char *ip = (unsigned char *)instptr;
++			unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
+ 			my_trace->opcode = MMIO_UNKNOWN_OP;
+ 			my_trace->width = 0;
+ 			my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
+@@ -235,7 +235,7 @@ static void post(struct kmmio_probe *p, 
  static void ioremap_trace_core(resource_size_t offset, unsigned long size,
  							void __iomem *addr)
  {
@@ -21536,7 +19999,7 @@ index 3adff7d..aec0370 100644
  	struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
  	/* These are page-unaligned. */
  	struct mmiotrace_map map = {
-@@ -259,7 +259,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
+@@ -259,7 +259,7 @@ static void ioremap_trace_core(resource_
  			.private = trace
  		},
  		.phys = offset,
@@ -21545,36 +20008,10 @@ index 3adff7d..aec0370 100644
  	};
  	map.map_id = trace->id;
  
-diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
-index 84a3e4c..d3147e0 100644
---- a/arch/x86/mm/numa_32.c
-+++ b/arch/x86/mm/numa_32.c
-@@ -99,7 +99,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
- }
- #endif
- 
--extern unsigned long find_max_low_pfn(void);
- extern unsigned long highend_pfn, highstart_pfn;
- 
- #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
-diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
-index e1d1069..2251ff3 100644
---- a/arch/x86/mm/pageattr-test.c
-+++ b/arch/x86/mm/pageattr-test.c
-@@ -36,7 +36,7 @@ enum {
- 
- static int pte_testbit(pte_t pte)
- {
--	return pte_flags(pte) & _PAGE_UNUSED1;
-+	return pte_flags(pte) & _PAGE_CPA_TEST;
- }
- 
- struct split_state {
-diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
-index 90825f2..56a75fd 100644
---- a/arch/x86/mm/pageattr.c
-+++ b/arch/x86/mm/pageattr.c
-@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+diff -urNp linux-3.0.3/arch/x86/mm/pageattr.c linux-3.0.3/arch/x86/mm/pageattr.c
+--- linux-3.0.3/arch/x86/mm/pageattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pageattr.c	2011-08-23 21:47:55.000000000 -0400
+@@ -261,7 +261,7 @@ static inline pgprot_t static_protection
  	 */
  #ifdef CONFIG_PCI_BIOS
  	if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
@@ -21583,7 +20020,7 @@ index 90825f2..56a75fd 100644
  #endif
  
  	/*
-@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+@@ -269,9 +269,10 @@ static inline pgprot_t static_protection
  	 * Does not cover __inittext since that is gone later on. On
  	 * 64bit we do not enforce !NX on the low mapping
  	 */
@@ -21596,7 +20033,7 @@ index 90825f2..56a75fd 100644
  	/*
  	 * The .rodata section needs to be read-only. Using the pfn
  	 * catches all aliases.
-@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+@@ -279,6 +280,7 @@ static inline pgprot_t static_protection
  	if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
  		   __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
  		pgprot_val(forbidden) |= _PAGE_RW;
@@ -21604,7 +20041,7 @@ index 90825f2..56a75fd 100644
  
  #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
  	/*
-@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
+@@ -317,6 +319,13 @@ static inline pgprot_t static_protection
  	}
  #endif
  
@@ -21658,10 +20095,21 @@ index 90825f2..56a75fd 100644
  }
  
  static int
-diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
-index f6ff57b..481690f 100644
---- a/arch/x86/mm/pat.c
-+++ b/arch/x86/mm/pat.c
+diff -urNp linux-3.0.3/arch/x86/mm/pageattr-test.c linux-3.0.3/arch/x86/mm/pageattr-test.c
+--- linux-3.0.3/arch/x86/mm/pageattr-test.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pageattr-test.c	2011-08-23 21:47:55.000000000 -0400
+@@ -36,7 +36,7 @@ enum {
+ 
+ static int pte_testbit(pte_t pte)
+ {
+-	return pte_flags(pte) & _PAGE_UNUSED1;
++	return pte_flags(pte) & _PAGE_CPA_TEST;
+ }
+ 
+ struct split_state {
+diff -urNp linux-3.0.3/arch/x86/mm/pat.c linux-3.0.3/arch/x86/mm/pat.c
+--- linux-3.0.3/arch/x86/mm/pat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pat.c	2011-08-23 21:47:55.000000000 -0400
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
  	if (!entry) {
@@ -21671,7 +20119,7 @@ index f6ff57b..481690f 100644
  		return -EINVAL;
  	}
  
-@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsig
  	while (cursor < to) {
  		if (!devmem_is_allowed(pfn)) {
  			printk(KERN_INFO
@@ -21682,7 +20130,7 @@ index f6ff57b..481690f 100644
  			return 0;
  		}
  		cursor += PAGE_SIZE;
-@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
+@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, un
  		printk(KERN_INFO
  			"%s:%d ioremap_change_attr failed %s "
  			"for %Lx-%Lx\n",
@@ -21691,7 +20139,7 @@ index f6ff57b..481690f 100644
  			cattr_name(flags),
  			base, (unsigned long long)(base + size));
  		return -EINVAL;
-@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, 
  		if (want_flags != flags) {
  			printk(KERN_WARNING
  			"%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
@@ -21700,7 +20148,7 @@ index f6ff57b..481690f 100644
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
+@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, 
  			free_memtype(paddr, paddr + size);
  			printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
  				" for %Lx-%Lx, got %s\n",
@@ -21709,11 +20157,75 @@ index f6ff57b..481690f 100644
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index 8573b83..6372501 100644
---- a/arch/x86/mm/pgtable.c
-+++ b/arch/x86/mm/pgtable.c
-@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
+diff -urNp linux-3.0.3/arch/x86/mm/pf_in.c linux-3.0.3/arch/x86/mm/pf_in.c
+--- linux-3.0.3/arch/x86/mm/pf_in.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pf_in.c	2011-08-23 21:47:55.000000000 -0400
+@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
+ 	int i;
+ 	enum reason_type rv = OTHERS;
+ 
+-	p = (unsigned char *)ins_addr;
++	p = (unsigned char *)ktla_ktva(ins_addr);
+ 	p += skip_prefix(p, &prf);
+ 	p += get_opcode(p, &opcode);
+ 
+@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(un
+ 	struct prefix_bits prf;
+ 	int i;
+ 
+-	p = (unsigned char *)ins_addr;
++	p = (unsigned char *)ktla_ktva(ins_addr);
+ 	p += skip_prefix(p, &prf);
+ 	p += get_opcode(p, &opcode);
+ 
+@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned 
+ 	struct prefix_bits prf;
+ 	int i;
+ 
+-	p = (unsigned char *)ins_addr;
++	p = (unsigned char *)ktla_ktva(ins_addr);
+ 	p += skip_prefix(p, &prf);
+ 	p += get_opcode(p, &opcode);
+ 
+@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned l
+ 	struct prefix_bits prf;
+ 	int i;
+ 
+-	p = (unsigned char *)ins_addr;
++	p = (unsigned char *)ktla_ktva(ins_addr);
+ 	p += skip_prefix(p, &prf);
+ 	p += get_opcode(p, &opcode);
+ 	for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
+@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned l
+ 	struct prefix_bits prf;
+ 	int i;
+ 
+-	p = (unsigned char *)ins_addr;
++	p = (unsigned char *)ktla_ktva(ins_addr);
+ 	p += skip_prefix(p, &prf);
+ 	p += get_opcode(p, &opcode);
+ 	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
+diff -urNp linux-3.0.3/arch/x86/mm/pgtable_32.c linux-3.0.3/arch/x86/mm/pgtable_32.c
+--- linux-3.0.3/arch/x86/mm/pgtable_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pgtable_32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
+ 		return;
+ 	}
+ 	pte = pte_offset_kernel(pmd, vaddr);
++
++	pax_open_kernel();
+ 	if (pte_val(pteval))
+ 		set_pte_at(&init_mm, vaddr, pte, pteval);
+ 	else
+ 		pte_clear(&init_mm, vaddr, pte);
++	pax_close_kernel();
+ 
+ 	/*
+ 	 * It's enough to flush this one mapping.
+diff -urNp linux-3.0.3/arch/x86/mm/pgtable.c linux-3.0.3/arch/x86/mm/pgtable.c
+--- linux-3.0.3/arch/x86/mm/pgtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/pgtable.c	2011-08-23 21:47:55.000000000 -0400
+@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
  	list_del(&page->lru);
  }
  
@@ -21739,7 +20251,7 @@ index 8573b83..6372501 100644
 +#else
 +		*dst++ = *src++;
 +#endif
-+
+ 
 +}
 +#endif
 +
@@ -21760,7 +20272,7 @@ index 8573b83..6372501 100644
 +#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(struct mm_struct *mm, pgd_t *pgd) {}
 +static inline void pgd_dtor(pgd_t *pgd) {}
@@ -21794,7 +20306,7 @@ index 8573b83..6372501 100644
  
  void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
  {
-@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
+@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, 
  	 */
  	flush_tlb_mm(mm);
  }
@@ -21844,7 +20356,7 @@ index 8573b83..6372501 100644
  		return -ENOMEM;
  	}
  
-@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
+@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[
   * preallocate which never got a corresponding vma will need to be
   * freed manually.
   */
@@ -21958,28 +20470,9 @@ index 8573b83..6372501 100644
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
-index cac7184..09a39fa 100644
---- a/arch/x86/mm/pgtable_32.c
-+++ b/arch/x86/mm/pgtable_32.c
-@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
- 		return;
- 	}
- 	pte = pte_offset_kernel(pmd, vaddr);
-+
-+	pax_open_kernel();
- 	if (pte_val(pteval))
- 		set_pte_at(&init_mm, vaddr, pte, pteval);
- 	else
- 		pte_clear(&init_mm, vaddr, pte);
-+	pax_close_kernel();
- 
- 	/*
- 	 * It's enough to flush this one mapping.
-diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
-index 410531d..0f16030 100644
---- a/arch/x86/mm/setup_nx.c
-+++ b/arch/x86/mm/setup_nx.c
+diff -urNp linux-3.0.3/arch/x86/mm/setup_nx.c linux-3.0.3/arch/x86/mm/setup_nx.c
+--- linux-3.0.3/arch/x86/mm/setup_nx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/setup_nx.c	2011-08-23 21:47:55.000000000 -0400
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -21991,7 +20484,7 @@ index 410531d..0f16030 100644
  /*
   * noexec = on|off
   *
-@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
+@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str
  	return 0;
  }
  early_param("noexec", noexec_setup);
@@ -22009,10 +20502,9 @@ index 410531d..0f16030 100644
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
-index 6acc724..f0896b7 100644
---- a/arch/x86/mm/tlb.c
-+++ b/arch/x86/mm/tlb.c
+diff -urNp linux-3.0.3/arch/x86/mm/tlb.c linux-3.0.3/arch/x86/mm/tlb.c
+--- linux-3.0.3/arch/x86/mm/tlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/mm/tlb.c	2011-08-23 21:47:55.000000000 -0400
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
  		BUG();
  	cpumask_clear_cpu(cpu,
@@ -22025,20 +20517,32 @@ index 6acc724..f0896b7 100644
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
-index 72cbec1..08f3b7b 100644
---- a/arch/x86/oprofile/backtrace.c
-+++ b/arch/x86/oprofile/backtrace.c
-@@ -57,7 +57,7 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
- 	struct stack_frame_ia32 *fp;
- 
- 	/* 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;
-@@ -123,7 +123,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
+diff -urNp linux-3.0.3/arch/x86/net/bpf_jit_comp.c linux-3.0.3/arch/x86/net/bpf_jit_comp.c
+--- linux-3.0.3/arch/x86/net/bpf_jit_comp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/net/bpf_jit_comp.c	2011-08-23 21:47:55.000000000 -0400
+@@ -589,7 +589,9 @@ cond_branch:			f_offset = addrs[i + filt
+ 					module_free(NULL, image);
+ 					return;
+ 				}
++				pax_open_kernel();
+ 				memcpy(image + proglen, temp, ilen);
++				pax_close_kernel();
+ 			}
+ 			proglen += ilen;
+ 			addrs[i] = proglen;
+@@ -609,7 +611,7 @@ cond_branch:			f_offset = addrs[i + filt
+ 			break;
+ 		}
+ 		if (proglen == oldproglen) {
+-			image = module_alloc(max_t(unsigned int,
++			image = module_alloc_exec(max_t(unsigned int,
+ 						   proglen,
+ 						   sizeof(struct work_struct)));
+ 			if (!image)
+diff -urNp linux-3.0.3/arch/x86/oprofile/backtrace.c linux-3.0.3/arch/x86/oprofile/backtrace.c
+--- linux-3.0.3/arch/x86/oprofile/backtrace.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/x86/oprofile/backtrace.c	2011-08-23 21:47:55.000000000 -0400
+@@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
  {
  	struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
  
@@ -22046,148 +20550,24 @@ index 72cbec1..08f3b7b 100644
 +	if (!user_mode(regs)) {
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
- 			dump_trace(NULL, regs, (unsigned long *)stack,
-diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
-index 9fadec0..98ab130 100644
---- a/arch/x86/oprofile/op_model_p4.c
-+++ b/arch/x86/oprofile/op_model_p4.c
-@@ -50,7 +50,7 @@ static inline void setup_num_counters(void)
- #endif
- }
- 
--static int inline addr_increment(void)
-+static inline int addr_increment(void)
- {
- #ifdef CONFIG_SMP
- 	return smp_num_siblings == 2 ? 2 : 1;
-diff --git a/arch/x86/pci/ce4100.c b/arch/x86/pci/ce4100.c
-index 9260b3e..6734ed5 100644
---- a/arch/x86/pci/ce4100.c
-+++ b/arch/x86/pci/ce4100.c
-@@ -302,7 +302,7 @@ static int ce4100_conf_write(unsigned int seg, unsigned int bus,
- 	return pci_direct_conf1.write(seg, bus, devfn, reg, len, value);
- }
- 
--struct pci_raw_ops ce4100_pci_conf = {
-+const struct pci_raw_ops ce4100_pci_conf = {
- 	.read =	ce4100_conf_read,
- 	.write = ce4100_conf_write,
- };
-diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
-index 5fe7502..b7c993f 100644
---- a/arch/x86/pci/common.c
-+++ b/arch/x86/pci/common.c
-@@ -33,8 +33,8 @@ int noioapicreroute = 1;
- int pcibios_last_bus = -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;
- 
- int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
- 						int reg, int len, u32 *val)
-diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
-index bd33620..f841b78 100644
---- a/arch/x86/pci/direct.c
-+++ b/arch/x86/pci/direct.c
-@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
- 
- #undef PCI_CONF1_ADDRESS
- 
--struct pci_raw_ops pci_direct_conf1 = {
-+const struct pci_raw_ops pci_direct_conf1 = {
- 	.read =		pci_conf1_read,
- 	.write =	pci_conf1_write,
- };
-@@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus,
- 
- #undef PCI_CONF2_ADDRESS
- 
--struct pci_raw_ops pci_direct_conf2 = {
-+const struct pci_raw_ops pci_direct_conf2 = {
- 	.read =		pci_conf2_read,
- 	.write =	pci_conf2_write,
- };
-@@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 = {
-  * This should be close to trivial, but it isn't, because there are buggy
-  * chipsets (yes, you guessed it, by Intel and Compaq) that have no class 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 = 0;
- 	int year, devfn;
-diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
-index 6dd8955..b30b640 100644
---- a/arch/x86/pci/fixup.c
-+++ b/arch/x86/pci/fixup.c
-@@ -435,7 +435,7 @@ static const struct dmi_system_id __devinitconst toshiba_ohci1394_dmi_table[] =
- 			DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
- 		},
- 	},
--	{ }
-+	{}
- };
- 
- static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
-diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
-index a3d9c54..5372e86 100644
---- a/arch/x86/pci/mmconfig_32.c
-+++ b/arch/x86/pci/mmconfig_32.c
-@@ -117,7 +117,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
- 	return 0;
- }
- 
--static struct pci_raw_ops pci_mmcfg = {
-+static const struct pci_raw_ops pci_mmcfg = {
- 	.read =		pci_mmcfg_read,
- 	.write =	pci_mmcfg_write,
- };
-diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
-index e783841..915a493 100644
---- a/arch/x86/pci/mmconfig_64.c
-+++ b/arch/x86/pci/mmconfig_64.c
-@@ -81,7 +81,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
- 	return 0;
- }
- 
--static struct pci_raw_ops pci_mmcfg = {
-+static const struct pci_raw_ops pci_mmcfg = {
- 	.read =		pci_mmcfg_read,
- 	.write =	pci_mmcfg_write,
- };
-diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
-index 5c9e245..d743b10 100644
---- a/arch/x86/pci/numaq_32.c
-+++ b/arch/x86/pci/numaq_32.c
-@@ -108,7 +108,7 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
- 
- #undef PCI_CONF1_MQ_ADDRESS
- 
--static struct pci_raw_ops pci_direct_conf1_mq = {
-+static const struct pci_raw_ops pci_direct_conf1_mq = {
- 	.read	= pci_conf1_mq_read,
- 	.write	= pci_conf1_mq_write
- };
-diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
-index 13700ec..0a03b7c 100644
---- a/arch/x86/pci/olpc.c
-+++ b/arch/x86/pci/olpc.c
-@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int seg, unsigned int bus,
- 	return 0;
+ 			dump_trace(NULL, regs, (unsigned long *)stack, 0,
+diff -urNp linux-3.0.3/arch/x86/pci/mrst.c linux-3.0.3/arch/x86/pci/mrst.c
+--- linux-3.0.3/arch/x86/pci/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/pci/mrst.c	2011-08-23 21:47:55.000000000 -0400
+@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
+ 	printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
+ 	pci_mmcfg_late_init();
+ 	pcibios_enable_irq = mrst_pci_irq_enable;
+-	pci_root_ops = pci_mrst_ops;
++	pax_open_kernel();
++	memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
++	pax_close_kernel();
+ 	/* Continue with standard init */
+ 	return 1;
  }
- 
--static struct pci_raw_ops pci_olpc_conf = {
-+static const struct pci_raw_ops pci_olpc_conf = {
- 	.read =	pci_olpc_read,
- 	.write = pci_olpc_write,
- };
-diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
-index a5f7d0d..64c1f42 100644
---- a/arch/x86/pci/pcbios.c
-+++ b/arch/x86/pci/pcbios.c
+diff -urNp linux-3.0.3/arch/x86/pci/pcbios.c linux-3.0.3/arch/x86/pci/pcbios.c
+--- linux-3.0.3/arch/x86/pci/pcbios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/pci/pcbios.c	2011-08-23 21:47:55.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -22323,7 +20703,7 @@ index a5f7d0d..64c1f42 100644
  			: "memory");
  		local_irq_restore(flags);
  
-@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -188,7 +234,10 @@ static int pci_bios_read(unsigned int se
  
  	switch (len) {
  	case 1:
@@ -22335,7 +20715,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -197,7 +246,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_BYTE),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22345,7 +20725,7 @@ index a5f7d0d..64c1f42 100644
  		/*
  		 * Zero-extend the result beyond 8 bits, do not trust the
  		 * BIOS having done it:
-@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -205,7 +255,10 @@ static int pci_bios_read(unsigned int se
  		*value &= 0xff;
  		break;
  	case 2:
@@ -22357,7 +20737,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -214,7 +267,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_WORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22367,7 +20747,7 @@ index a5f7d0d..64c1f42 100644
  		/*
  		 * Zero-extend the result beyond 16 bits, do not trust the
  		 * BIOS having done it:
-@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -222,7 +276,10 @@ static int pci_bios_read(unsigned int se
  		*value &= 0xffff;
  		break;
  	case 4:
@@ -22379,7 +20759,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
+@@ -231,7 +288,8 @@ static int pci_bios_read(unsigned int se
  			: "1" (PCIBIOS_READ_CONFIG_DWORD),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22389,7 +20769,7 @@ index a5f7d0d..64c1f42 100644
  		break;
  	}
  
-@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
+@@ -254,7 +312,10 @@ static int pci_bios_write(unsigned int s
  
  	switch (len) {
  	case 1:
@@ -22401,7 +20781,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
+@@ -263,10 +324,14 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22418,7 +20798,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
+@@ -275,10 +340,14 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22435,7 +20815,7 @@ index a5f7d0d..64c1f42 100644
  			"jc 1f\n\t"
  			"xor %%ah, %%ah\n"
  			"1:"
-@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
+@@ -287,7 +356,8 @@ static int pci_bios_write(unsigned int s
  			  "c" (value),
  			  "b" (bx),
  			  "D" ((long)reg),
@@ -22445,25 +20825,7 @@ index a5f7d0d..64c1f42 100644
  		break;
  	}
  
-@@ -301,7 +371,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
-  * Function table for BIOS32 access
-  */
- 
--static struct pci_raw_ops pci_bios_access = {
-+static const struct pci_raw_ops pci_bios_access = {
- 	.read =		pci_bios_read,
- 	.write =	pci_bios_write
- };
-@@ -310,7 +380,7 @@ static struct pci_raw_ops pci_bios_access = {
-  * Try to find PCI BIOS.
-  */
- 
--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;
-@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
+@@ -392,10 +462,13 @@ struct irq_routing_table * pcibios_get_i
  
  	DBG("PCI: Fetching IRQ routing table... ");
  	__asm__("push %%es\n\t"
@@ -22478,7 +20840,7 @@ index a5f7d0d..64c1f42 100644
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
+@@ -406,7 +479,8 @@ struct irq_routing_table * pcibios_get_i
  		  "1" (0),
  		  "D" ((long) &opt),
  		  "S" (&pci_indirect),
@@ -22488,7 +20850,7 @@ index a5f7d0d..64c1f42 100644
  		: "memory");
  	DBG("OK  ret=%d, size=%d, map=%x\n", ret, opt.size, map);
  	if (ret & 0xff00)
-@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
+@@ -430,7 +504,10 @@ int pcibios_set_irq_routing(struct pci_d
  {
  	int ret;
  
@@ -22500,7 +20862,7 @@ index a5f7d0d..64c1f42 100644
  		"jc 1f\n\t"
  		"xor %%ah, %%ah\n"
  		"1:"
-@@ -438,7 +515,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
+@@ -438,7 +515,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)),
@@ -22510,10 +20872,9 @@ index a5f7d0d..64c1f42 100644
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
-index 5cab48e..ccd7831 100644
---- a/arch/x86/platform/efi/efi_32.c
-+++ b/arch/x86/platform/efi/efi_32.c
+diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_32.c linux-3.0.3/arch/x86/platform/efi/efi_32.c
+--- linux-3.0.3/arch/x86/platform/efi/efi_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/platform/efi/efi_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -38,70 +38,37 @@
   */
  
@@ -22594,10 +20955,9 @@ index 5cab48e..ccd7831 100644
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
-index fbe66e6..1f61a01 100644
---- a/arch/x86/platform/efi/efi_stub_32.S
-+++ b/arch/x86/platform/efi/efi_stub_32.S
+diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -22696,23 +21056,43 @@ index fbe66e6..1f61a01 100644
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
-index 3796f99..ec032db 100644
---- a/arch/x86/platform/uv/tlb_uv.c
-+++ b/arch/x86/platform/uv/tlb_uv.c
-@@ -341,6 +341,8 @@ static void uv_reset_with_ipi(struct bau_target_uvhubmask *distribution,
+diff -urNp linux-3.0.3/arch/x86/platform/mrst/mrst.c linux-3.0.3/arch/x86/platform/mrst/mrst.c
+--- linux-3.0.3/arch/x86/platform/mrst/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/platform/mrst/mrst.c	2011-08-23 21:47:55.000000000 -0400
+@@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
+ }
+ 
+ /* Reboot and power off are handled by the SCU on a MID device */
+-static void mrst_power_off(void)
++static __noreturn void mrst_power_off(void)
+ {
+ 	intel_scu_ipc_simple_command(0xf1, 1);
++	BUG();
+ }
+ 
+-static void mrst_reboot(void)
++static __noreturn void mrst_reboot(void)
+ {
+ 	intel_scu_ipc_simple_command(0xf1, 0);
++	BUG();
+ }
+ 
+ /*
+diff -urNp linux-3.0.3/arch/x86/platform/uv/tlb_uv.c linux-3.0.3/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.0.3/arch/x86/platform/uv/tlb_uv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/platform/uv/tlb_uv.c	2011-08-23 21:48:14.000000000 -0400
+@@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta
  	cpumask_t mask;
  	struct reset_args reset_args;
  
 +	pax_track_stack();
 +
  	reset_args.sender = sender;
- 
  	cpus_clear(mask);
-diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
-index 87bb35e..eff2da8 100644
---- a/arch/x86/power/cpu.c
-+++ b/arch/x86/power/cpu.c
+ 	/* find a single cpu for each uvhub in this distribution mask */
+diff -urNp linux-3.0.3/arch/x86/power/cpu.c linux-3.0.3/arch/x86/power/cpu.c
+--- linux-3.0.3/arch/x86/power/cpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/power/cpu.c	2011-08-23 21:47:55.000000000 -0400
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -22732,11 +21112,10 @@ index 87bb35e..eff2da8 100644
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
-index b6552b1..eda463a 100644
---- a/arch/x86/vdso/Makefile
-+++ b/arch/x86/vdso/Makefile
-@@ -123,7 +123,7 @@ quiet_cmd_vdso = VDSO    $@
+diff -urNp linux-3.0.3/arch/x86/vdso/Makefile linux-3.0.3/arch/x86/vdso/Makefile
+--- linux-3.0.3/arch/x86/vdso/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/vdso/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO    $@
  		       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
  		 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
  
@@ -22745,126 +21124,9 @@ index b6552b1..eda463a 100644
  GCOV_PROFILE := n
  
  #
-diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
-index ee55754..0013b2e 100644
---- a/arch/x86/vdso/vclock_gettime.c
-+++ b/arch/x86/vdso/vclock_gettime.c
-@@ -22,24 +22,48 @@
- #include <asm/hpet.h>
- #include <asm/unistd.h>
- #include <asm/io.h>
-+#include <asm/fixmap.h>
- #include "vextern.h"
- 
- #define gtod vdso_vsyscall_gtod_data
- 
-+notrace noinline long __vdso_fallback_time(long *t)
-+{
-+	long secs;
-+	asm volatile("syscall"
-+		: "=a" (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" : "=a" (ret) :
--	    "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory");
-+	    "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "memory");
- 	return ret;
- }
- 
-+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 = (cycle_t)vget_cycles();
-+
-+	return ret >= gtod->clock.cycle_last ? ret : gtod->clock.cycle_last;
-+}
-+
- notrace static inline long vgetns(void)
- {
- 	long v;
--	cycles_t (*vread)(void);
--	vread = gtod->clock.vread;
--	v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
-+	if (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])
-+		v = __vdso_vread_tsc();
-+	else
-+		v = __vdso_vread_hpet();
-+	v = (v - gtod->clock.cycle_last) & gtod->clock.mask;
- 	return (v * gtod->clock.mult) >> gtod->clock.shift;
- }
- 
-@@ -113,7 +137,9 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts)
- 
- 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] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
-+		    (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
- 		switch (clock) {
- 		case CLOCK_REALTIME:
- 			if (likely(gtod->clock.vread))
-@@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
- int clock_gettime(clockid_t, struct timespec *)
- 	__attribute__((weak, alias("__vdso_clock_gettime")));
- 
--notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
-+notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, struct timezone *tz)
- {
- 	long ret;
--	if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
-+	asm("syscall" : "=a" (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] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
-+		    (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
-+	{
- 		if (likely(tv != NULL)) {
- 			BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
- 				     offsetof(struct timespec, tv_nsec) ||
-@@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
- 		}
- 		return 0;
- 	}
--	asm("syscall" : "=a" (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 --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
-index 4e5dd3b..00ba15e 100644
---- a/arch/x86/vdso/vdso.lds.S
-+++ b/arch/x86/vdso/vdso.lds.S
-@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
- #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
- #include "vextern.h"
- #undef	VEXTERN
-+
-+#define VEXTERN(x)	VDSO64_ ## x = __vdso_ ## x;
-+VEXTERN(fallback_gettimeofday)
-+VEXTERN(fallback_time)
-+VEXTERN(getcpu)
-+#undef	VEXTERN
-diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
-index 36df991..1baa5ce 100644
---- a/arch/x86/vdso/vdso32-setup.c
-+++ b/arch/x86/vdso/vdso32-setup.c
+diff -urNp linux-3.0.3/arch/x86/vdso/vdso32-setup.c linux-3.0.3/arch/x86/vdso/vdso32-setup.c
+--- linux-3.0.3/arch/x86/vdso/vdso32-setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/vdso/vdso32-setup.c	2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -22873,7 +21135,7 @@ index 36df991..1baa5ce 100644
  
  enum {
  	VDSO_DISABLED = 0,
-@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
+@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int m
  void enable_sep_cpu(void)
  {
  	int cpu = get_cpu();
@@ -22891,7 +21153,7 @@ index 36df991..1baa5ce 100644
  	/*
  	 * 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 linux_binprm *bprm, int uses_interp)
+@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct l
  	if (compat)
  		addr = VDSO_HIGH_BASE;
  	else {
@@ -22908,7 +21170,7 @@ index 36df991..1baa5ce 100644
  
  	if (compat_uses_vma || !compat) {
  		/*
-@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct l
  	}
  
  	current_thread_info()->sysenter_return =
@@ -22938,58 +21200,110 @@ index 36df991..1baa5ce 100644
  	return NULL;
  }
  
-@@ -422,7 +429,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
- 	struct mm_struct *mm = tsk->mm;
- 
- 	/* Check to see if this task was created in compat vdso mode */
+@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(stru
+ 	 * Check to see if the corresponding task was created in compat vdso
+ 	 * mode.
+ 	 */
 -	if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
 +	if (mm && mm->context.vdso == VDSO_HIGH_BASE)
  		return &gate_vma;
  	return NULL;
  }
-diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h
-index 1683ba2..48d07f3 100644
---- a/arch/x86/vdso/vextern.h
-+++ b/arch/x86/vdso/vextern.h
-@@ -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.   */
- 
--VEXTERN(jiffies)
- VEXTERN(vgetcpu_mode)
- VEXTERN(vsyscall_gtod_data)
-diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
-index 4b5d26f..82030d8 100644
---- a/arch/x86/vdso/vma.c
-+++ b/arch/x86/vdso/vma.c
-@@ -58,7 +58,7 @@ static int __init init_vdso_vars(void)
- 	if (!vbase)
- 		goto oom;
+diff -urNp linux-3.0.3/arch/x86/vdso/vma.c linux-3.0.3/arch/x86/vdso/vma.c
+--- linux-3.0.3/arch/x86/vdso/vma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/vdso/vma.c	2011-08-23 21:47:55.000000000 -0400
+@@ -15,18 +15,19 @@
+ #include <asm/proto.h>
+ #include <asm/vdso.h>
+ 
+-unsigned int __read_mostly vdso_enabled = 1;
+-
+ extern char vdso_start[], vdso_end[];
+ extern unsigned short vdso_sync_cpuid;
++extern char __vsyscall_0;
+ 
+ static struct page **vdso_pages;
++static struct page *vsyscall_page;
+ static unsigned vdso_size;
  
--	if (memcmp(vbase, "\177ELF", 4)) {
-+	if (memcmp(vbase, ELFMAG, SELFMAG)) {
- 		printk("VDSO: I'm broken; not ELF\n");
- 		vdso_enabled = 0;
+ static int __init init_vdso_vars(void)
+ {
+-	int npages = (vdso_end - vdso_start + PAGE_SIZE - 1) / PAGE_SIZE;
+-	int i;
++	size_t nbytes = vdso_end - vdso_start;
++	size_t npages = (nbytes + PAGE_SIZE - 1) / PAGE_SIZE;
++	size_t i;
+ 
+ 	vdso_size = npages << PAGE_SHIFT;
+ 	vdso_pages = kmalloc(sizeof(struct page *) * npages, GFP_KERNEL);
+@@ -34,19 +35,19 @@ static int __init init_vdso_vars(void)
+ 		goto oom;
+ 	for (i = 0; i < npages; i++) {
+ 		struct page *p;
+-		p = alloc_page(GFP_KERNEL);
++		p = alloc_page(GFP_KERNEL | __GFP_ZERO);
+ 		if (!p)
+ 			goto oom;
+ 		vdso_pages[i] = p;
+-		copy_page(page_address(p), vdso_start + i*PAGE_SIZE);
++		memcpy(page_address(p), vdso_start + i*PAGE_SIZE, nbytes > PAGE_SIZE ? PAGE_SIZE : nbytes);
++		nbytes -= PAGE_SIZE;
  	}
-@@ -118,7 +118,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
++	vsyscall_page = pfn_to_page((__pa_symbol(&__vsyscall_0)) >> PAGE_SHIFT);
+ 
+ 	return 0;
+ 
+  oom:
+-	printk("Cannot allocate vdso\n");
+-	vdso_enabled = 0;
+-	return -ENOMEM;
++	panic("Cannot allocate vdso\n");
+ }
+ subsys_initcall(init_vdso_vars);
+ 
+@@ -80,37 +81,35 @@ int arch_setup_additional_pages(struct l
+ 	unsigned long addr;
+ 	int ret;
+ 
+-	if (!vdso_enabled)
+-		return 0;
+-
+ 	down_write(&mm->mmap_sem);
+-	addr = vdso_addr(mm->start_stack, vdso_size);
+-	addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
++	addr = vdso_addr(mm->start_stack, vdso_size + PAGE_SIZE);
++	addr = get_unmapped_area(NULL, addr, vdso_size + PAGE_SIZE, 0, 0);
+ 	if (IS_ERR_VALUE(addr)) {
+ 		ret = addr;
  		goto up_fail;
  	}
  
 -	current->mm->context.vdso = (void *)addr;
-+	current->mm->context.vdso = addr;
++	mm->context.vdso = addr + PAGE_SIZE;
  
- 	ret = install_special_mapping(mm, addr, vdso_size,
+-	ret = install_special_mapping(mm, addr, vdso_size,
++	ret = install_special_mapping(mm, addr, PAGE_SIZE,
  				      VM_READ|VM_EXEC|
-@@ -126,7 +126,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
+-				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
++				      VM_MAYREAD|VM_MAYEXEC|
  				      VM_ALWAYSDUMP,
- 				      vdso_pages);
+-				      vdso_pages);
++				      &vsyscall_page);
  	if (ret) {
 -		current->mm->context.vdso = NULL;
-+		current->mm->context.vdso = 0;
++		mm->context.vdso = 0;
  		goto up_fail;
  	}
  
-@@ -134,10 +134,3 @@ up_fail:
++	ret = install_special_mapping(mm, addr + PAGE_SIZE, vdso_size,
++				      VM_READ|VM_EXEC|
++				      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
++				      VM_ALWAYSDUMP,
++				      vdso_pages);
++	if (ret)
++		mm->context.vdso = 0;
++
+ up_fail:
  	up_write(&mm->mmap_sem);
  	return ret;
  }
@@ -23000,10 +21314,9 @@ index 4b5d26f..82030d8 100644
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
-index 50542ef..102889d 100644
---- a/arch/x86/xen/enlighten.c
-+++ b/arch/x86/xen/enlighten.c
+diff -urNp linux-3.0.3/arch/x86/xen/enlighten.c linux-3.0.3/arch/x86/xen/enlighten.c
+--- linux-3.0.3/arch/x86/xen/enlighten.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/enlighten.c	2011-08-23 21:47:55.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -23013,7 +21326,7 @@ index 50542ef..102889d 100644
  RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
  __read_mostly int xen_have_vector_callback;
  EXPORT_SYMBOL_GPL(xen_have_vector_callback);
-@@ -1017,7 +1015,7 @@ static const struct pv_apic_ops xen_apic_ops __initdata = {
+@@ -1010,7 +1008,7 @@ static const struct pv_apic_ops xen_apic
  #endif
  };
  
@@ -23022,7 +21335,7 @@ index 50542ef..102889d 100644
  {
  	struct sched_shutdown r = { .reason = reason };
  
-@@ -1025,17 +1023,17 @@ static void xen_reboot(int reason)
+@@ -1018,17 +1016,17 @@ static void xen_reboot(int reason)
  		BUG();
  }
  
@@ -23043,7 +21356,7 @@ index 50542ef..102889d 100644
  {
  	xen_reboot(SHUTDOWN_poweroff);
  }
-@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1134,7 +1132,17 @@ asmlinkage void __init xen_start_kernel(
  	__userpte_alloc_gfp &= ~__GFP_HIGHMEM;
  
  	/* Work out if we support NX */
@@ -23062,7 +21375,7 @@ index 50542ef..102889d 100644
  
  	xen_setup_features();
  
-@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(void)
+@@ -1165,13 +1173,6 @@ asmlinkage void __init xen_start_kernel(
  
  	machine_ops = xen_machine_ops;
  
@@ -23076,11 +21389,10 @@ index 50542ef..102889d 100644
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index d835bc2..2cff98e 100644
---- a/arch/x86/xen/mmu.c
-+++ b/arch/x86/xen/mmu.c
-@@ -1721,6 +1721,8 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
+--- linux-3.0.3/arch/x86/xen/mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/mmu.c	2011-08-24 18:10:12.000000000 -0400
+@@ -1679,6 +1679,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
  	convert_pfn_mfn(level3_kernel_pgt);
@@ -23089,7 +21401,7 @@ index d835bc2..2cff98e 100644
  
  	l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
  	l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1739,7 +1741,10 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
+@@ -1697,7 +1699,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	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);
@@ -23100,24 +21412,26 @@ index d835bc2..2cff98e 100644
  	set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
  	set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-diff --git a/arch/x86/xen/pci-swiotlb-xen.c b/arch/x86/xen/pci-swiotlb-xen.c
-index bfd0632..c10462a 100644
---- a/arch/x86/xen/pci-swiotlb-xen.c
-+++ b/arch/x86/xen/pci-swiotlb-xen.c
-@@ -10,7 +10,7 @@
+@@ -1909,6 +1914,7 @@ static void __init xen_post_allocator_in
+ 	pv_mmu_ops.set_pud = xen_set_pud;
+ #if PAGETABLE_LEVELS == 4
+ 	pv_mmu_ops.set_pgd = xen_set_pgd;
++	pv_mmu_ops.set_pgd_batched = xen_set_pgd;
+ #endif
  
- int xen_swiotlb __read_mostly;
+ 	/* This will work as long as patching hasn't happened yet
+@@ -1990,6 +1996,7 @@ static const struct pv_mmu_ops xen_mmu_o
+ 	.pud_val = PV_CALLEE_SAVE(xen_pud_val),
+ 	.make_pud = PV_CALLEE_SAVE(xen_make_pud),
+ 	.set_pgd = xen_set_pgd_hyper,
++	.set_pgd_batched = xen_set_pgd_hyper,
  
--static struct dma_map_ops xen_swiotlb_dma_ops = {
-+static const struct dma_map_ops xen_swiotlb_dma_ops = {
- 	.mapping_error = xen_swiotlb_dma_mapping_error,
- 	.alloc_coherent = xen_swiotlb_alloc_coherent,
- 	.free_coherent = xen_swiotlb_free_coherent,
-diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
-index 72a4c79..94cc180 100644
---- a/arch/x86/xen/smp.c
-+++ b/arch/x86/xen/smp.c
-@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
+ 	.alloc_pud = xen_alloc_pmd_init,
+ 	.release_pud = xen_release_pmd_init,
+diff -urNp linux-3.0.3/arch/x86/xen/smp.c linux-3.0.3/arch/x86/xen/smp.c
+--- linux-3.0.3/arch/x86/xen/smp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/smp.c	2011-08-23 21:47:55.000000000 -0400
+@@ -193,11 +193,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
  	native_smp_prepare_boot_cpu();
@@ -23129,7 +21443,7 @@ index 72a4c79..94cc180 100644
  	xen_filter_cpu_maps();
  	xen_setup_vcpu_info_placement();
  }
-@@ -259,12 +254,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
+@@ -265,12 +260,12 @@ cpu_initialize_context(unsigned int cpu,
  	gdt = get_cpu_gdt_table(cpu);
  
  	ctxt->flags = VGCF_IN_KERNEL;
@@ -23145,7 +21459,7 @@ index 72a4c79..94cc180 100644
  #else
  	ctxt->gs_base_kernel = per_cpu_offset(cpu);
  #endif
-@@ -315,13 +310,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
+@@ -321,13 +316,12 @@ static int __cpuinit xen_cpu_up(unsigned
  	int rc;
  
  	per_cpu(current_task, cpu) = idle;
@@ -23161,10 +21475,9 @@ index 72a4c79..94cc180 100644
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
-index 22a2093..594dbcc 100644
---- a/arch/x86/xen/xen-asm_32.S
-+++ b/arch/x86/xen/xen-asm_32.S
+diff -urNp linux-3.0.3/arch/x86/xen/xen-asm_32.S linux-3.0.3/arch/x86/xen/xen-asm_32.S
+--- linux-3.0.3/arch/x86/xen/xen-asm_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/xen-asm_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -23186,10 +21499,9 @@ index 22a2093..594dbcc 100644
  #else
  	movl xen_vcpu, %eax
  #endif
-diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
-index 1a5ff24..a187d40 100644
---- a/arch/x86/xen/xen-head.S
-+++ b/arch/x86/xen/xen-head.S
+diff -urNp linux-3.0.3/arch/x86/xen/xen-head.S linux-3.0.3/arch/x86/xen/xen-head.S
+--- linux-3.0.3/arch/x86/xen/xen-head.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/xen-head.S	2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
  	mov %esi,xen_start_info
@@ -23208,10 +21520,9 @@ index 1a5ff24..a187d40 100644
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
-index 9d41bf9..f08f7a9 100644
---- a/arch/x86/xen/xen-ops.h
-+++ b/arch/x86/xen/xen-ops.h
+diff -urNp linux-3.0.3/arch/x86/xen/xen-ops.h linux-3.0.3/arch/x86/xen/xen-ops.h
+--- linux-3.0.3/arch/x86/xen/xen-ops.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/arch/x86/xen/xen-ops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -23221,11 +21532,10 @@ index 9d41bf9..f08f7a9 100644
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
-index 58916af..9cb880b 100644
---- a/block/blk-iopoll.c
-+++ b/block/blk-iopoll.c
-@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
+diff -urNp linux-3.0.3/block/blk-iopoll.c linux-3.0.3/block/blk-iopoll.c
+--- linux-3.0.3/block/blk-iopoll.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/block/blk-iopoll.c	2011-08-23 21:47:55.000000000 -0400
+@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
  
@@ -23234,11 +21544,10 @@ index 58916af..9cb880b 100644
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff --git a/block/blk-map.c b/block/blk-map.c
-index e663ac2..f3cbc33 100644
---- a/block/blk-map.c
-+++ b/block/blk-map.c
-@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
+diff -urNp linux-3.0.3/block/blk-map.c linux-3.0.3/block/blk-map.c
+--- linux-3.0.3/block/blk-map.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/block/blk-map.c	2011-08-23 21:47:55.000000000 -0400
+@@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
  	if (!len || !kbuf)
  		return -EINVAL;
  
@@ -23247,11 +21556,10 @@ index e663ac2..f3cbc33 100644
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff --git a/block/blk-softirq.c b/block/blk-softirq.c
-index ee9c216..58d410a 100644
---- a/block/blk-softirq.c
-+++ b/block/blk-softirq.c
-@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
+diff -urNp linux-3.0.3/block/blk-softirq.c linux-3.0.3/block/blk-softirq.c
+--- linux-3.0.3/block/blk-softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/block/blk-softirq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
   */
@@ -23260,11 +21568,10 @@ index ee9c216..58d410a 100644
  {
  	struct list_head *cpu_list, local_list;
  
-diff --git a/block/bsg.c b/block/bsg.c
-index 0c8b64a..688c154 100644
---- a/block/bsg.c
-+++ b/block/bsg.c
-@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
+diff -urNp linux-3.0.3/block/bsg.c linux-3.0.3/block/bsg.c
+--- linux-3.0.3/block/bsg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/block/bsg.c	2011-08-23 21:47:55.000000000 -0400
+@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
  				struct sg_io_v4 *hdr, struct bsg_device *bd,
  				fmode_t has_write_perm)
  {
@@ -23291,10 +21598,9 @@ index 0c8b64a..688c154 100644
  	if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
  		if (blk_verify_command(rq->cmd, has_write_perm))
  			return -EPERM;
-diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
-index 4f4230b..0feae9a 100644
---- a/block/scsi_ioctl.c
-+++ b/block/scsi_ioctl.c
+diff -urNp linux-3.0.3/block/scsi_ioctl.c linux-3.0.3/block/scsi_ioctl.c
+--- linux-3.0.3/block/scsi_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/block/scsi_ioctl.c	2011-08-23 21:47:55.000000000 -0400
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
  			     struct sg_io_hdr *hdr, fmode_t mode)
@@ -23317,7 +21623,7 @@ index 4f4230b..0feae9a 100644
  	if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
  		return -EPERM;
  
-@@ -432,6 +444,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -432,6 +444,8 @@ int sg_scsi_ioctl(struct request_queue *
  	int err;
  	unsigned int in_len, out_len, bytes, opcode, cmdlen;
  	char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
@@ -23326,7 +21632,7 @@ index 4f4230b..0feae9a 100644
  
  	if (!sic)
  		return -EINVAL;
-@@ -465,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
+@@ -465,9 +479,18 @@ int sg_scsi_ioctl(struct request_queue *
  	 */
  	err = -EFAULT;
  	rq->cmd_len = cmdlen;
@@ -23346,11 +21652,52 @@ index 4f4230b..0feae9a 100644
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff --git a/crypto/serpent.c b/crypto/serpent.c
-index b651a55..a9ddd79b 100644
---- a/crypto/serpent.c
-+++ b/crypto/serpent.c
-@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
+diff -urNp linux-3.0.3/crypto/cryptd.c linux-3.0.3/crypto/cryptd.c
+--- linux-3.0.3/crypto/cryptd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/crypto/cryptd.c	2011-08-23 21:47:55.000000000 -0400
+@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
+ 
+ struct cryptd_blkcipher_request_ctx {
+ 	crypto_completion_t complete;
+-};
++} __no_const;
+ 
+ struct cryptd_hash_ctx {
+ 	struct crypto_shash *child;
+@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
+ 
+ struct cryptd_aead_request_ctx {
+ 	crypto_completion_t complete;
+-};
++} __no_const;
+ 
+ static void cryptd_queue_worker(struct work_struct *work);
+ 
+diff -urNp linux-3.0.3/crypto/gf128mul.c linux-3.0.3/crypto/gf128mul.c
+--- linux-3.0.3/crypto/gf128mul.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/crypto/gf128mul.c	2011-08-23 21:47:55.000000000 -0400
+@@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
+ 	for (i = 0; i < 7; ++i)
+ 		gf128mul_x_lle(&p[i + 1], &p[i]);
+ 
+-	memset(r, 0, sizeof(r));
++	memset(r, 0, sizeof(*r));
+ 	for (i = 0;;) {
+ 		u8 ch = ((u8 *)b)[15 - i];
+ 
+@@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128 
+ 	for (i = 0; i < 7; ++i)
+ 		gf128mul_x_bbe(&p[i + 1], &p[i]);
+ 
+-	memset(r, 0, sizeof(r));
++	memset(r, 0, sizeof(*r));
+ 	for (i = 0;;) {
+ 		u8 ch = ((u8 *)b)[i];
+ 
+diff -urNp linux-3.0.3/crypto/serpent.c linux-3.0.3/crypto/serpent.c
+--- linux-3.0.3/crypto/serpent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/crypto/serpent.c	2011-08-23 21:48:14.000000000 -0400
+@@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
  	u32 r0,r1,r2,r3,r4;
  	int i;
  
@@ -23359,11 +21706,140 @@ index b651a55..a9ddd79b 100644
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
-index 31464a0..03b986c 100644
---- a/drivers/acpi/apei/cper.c
-+++ b/drivers/acpi/apei/cper.c
-@@ -37,12 +37,12 @@
+diff -urNp linux-3.0.3/Documentation/dontdiff linux-3.0.3/Documentation/dontdiff
+--- linux-3.0.3/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/Documentation/dontdiff	2011-08-23 21:47:55.000000000 -0400
+@@ -5,6 +5,7 @@
+ *.cis
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+@@ -48,9 +49,11 @@
+ *.tab.h
+ *.tex
+ *.ver
++*.vim
+ *.xml
+ *.xz
+ *_MODULES
++*_reg_safe.h
+ *_vga16.c
+ *~
+ \#*#
+@@ -70,6 +73,7 @@ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -98,6 +102,8 @@ bzImage*
+ capability_names.h
+ capflags.c
+ classlist.h*
++clut_vga16.c
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -126,12 +132,14 @@ fore200e_pca_fw.c*
+ gconf
+ gconf.glade.h
+ gen-devlist
++gen-kdb_cmds.c
+ gen_crc32table
+ gen_init_cpio
+ generated
+ genheaders
+ genksyms
+ *_gray256.c
++hash
+ hpet_example
+ hugepage-mmap
+ hugepage-shm
+@@ -146,7 +154,6 @@ int32.c
+ int4.c
+ int8.c
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -154,7 +161,6 @@ kxgettext
+ lkc_defs.h
+ lex.c
+ lex.*.c
+-linux
+ logo_*.c
+ logo_*_clut224.c
+ logo_*_mono.c
+@@ -174,6 +180,7 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
+ mkregtable
+ mktables
+@@ -209,6 +216,7 @@ r300_reg_safe.h
+ r420_reg_safe.h
+ r600_reg_safe.h
+ recordmcount
++regdb.c
+ relocs
+ rlim_names.h
+ rn50_reg_safe.h
+@@ -219,6 +227,7 @@ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -246,7 +255,9 @@ vmlinux
+ vmlinux-*
+ vmlinux.aout
+ vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
+ vmlinuz
+ voffset.h
+ vsyscall.lds
+@@ -254,6 +265,7 @@ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+diff -urNp linux-3.0.3/Documentation/kernel-parameters.txt linux-3.0.3/Documentation/kernel-parameters.txt
+--- linux-3.0.3/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/Documentation/kernel-parameters.txt	2011-08-23 21:47:55.000000000 -0400
+@@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
+ 			the specified number of seconds.  This is to be used if
+ 			your oopses keep scrolling off the screen.
+ 
++	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=	0/1 to disable/enable PaX softmode on boot already.
++
+ 	pcbit=		[HW,ISDN]
+ 
+ 	pcd.		[PARIDE]
+diff -urNp linux-3.0.3/drivers/acpi/apei/cper.c linux-3.0.3/drivers/acpi/apei/cper.c
+--- linux-3.0.3/drivers/acpi/apei/cper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/acpi/apei/cper.c	2011-08-23 21:47:55.000000000 -0400
+@@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
  {
@@ -23380,97 +21856,87 @@ index 31464a0..03b986c 100644
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
-index fcc13ac..47969fb 100644
---- a/drivers/acpi/battery.c
-+++ b/drivers/acpi/battery.c
-@@ -864,7 +864,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
- 	}
- 
- static struct battery_file {
--	struct file_operations ops;
-+	const struct file_operations ops;
- 	mode_t mode;
- 	const char *name;
- } acpi_battery_file[] = {
-diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
-index 1864ad3..19a6113 100644
---- a/drivers/acpi/dock.c
-+++ b/drivers/acpi/dock.c
-@@ -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;
- };
+diff -urNp linux-3.0.3/drivers/acpi/ec_sys.c linux-3.0.3/drivers/acpi/ec_sys.c
+--- linux-3.0.3/drivers/acpi/ec_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/acpi/ec_sys.c	2011-08-24 19:06:55.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <linux/kernel.h>
+ #include <linux/acpi.h>
+ #include <linux/debugfs.h>
++#include <asm/uaccess.h>
+ #include "internal.h"
  
-@@ -589,7 +589,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
-  * 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 --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
-index 411620e..cf71966 100644
---- a/drivers/acpi/ec_sys.c
-+++ b/drivers/acpi/ec_sys.c
-@@ -96,7 +96,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
- 	return count;
- }
+ MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
+@@ -39,7 +40,7 @@ static ssize_t acpi_ec_read_io(struct fi
+ 	 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
+ 	 */
+ 	unsigned int size = EC_SPACE_SIZE;
+-	u8 *data = (u8 *) buf;
++	u8 data;
+ 	loff_t init_off = *off;
+ 	int err = 0;
  
--static struct file_operations acpi_ec_io_ops = {
-+static const struct file_operations acpi_ec_io_ops = {
- 	.owner = THIS_MODULE,
- 	.open  = acpi_ec_open_io,
- 	.read  = acpi_ec_read_io,
-diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
-index 66f6729..2d6de0a 100644
---- a/drivers/acpi/power_meter.c
-+++ b/drivers/acpi/power_meter.c
-@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
- 		return res;
+@@ -52,9 +53,11 @@ static ssize_t acpi_ec_read_io(struct fi
+ 		size = count;
  
- 	temp /= 1000;
--	if (temp < 0)
--		return -EINVAL;
+ 	while (size) {
+-		err = ec_read(*off, &data[*off - init_off]);
++		err = ec_read(*off, &data);
+ 		if (err)
+ 			return err;
++		if (put_user(data, &buf[*off - init_off]))
++			return -EFAULT;
+ 		*off += 1;
+ 		size--;
+ 	}
+@@ -70,7 +73,6 @@ static ssize_t acpi_ec_write_io(struct f
  
- 	mutex_lock(&resource->lock);
- 	resource->trip[attr->index - 7] = temp;
-diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
-index f5f9869..da87aeb 100644
---- a/drivers/acpi/proc.c
-+++ b/drivers/acpi/proc.c
-@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct file *file,
+ 	unsigned int size = count;
+ 	loff_t init_off = *off;
+-	u8 *data = (u8 *) buf;
+ 	int err = 0;
+ 
+ 	if (*off >= EC_SPACE_SIZE)
+@@ -81,7 +83,9 @@ static ssize_t acpi_ec_write_io(struct f
+ 	}
+ 
+ 	while (size) {
+-		u8 byte_write = data[*off - init_off];
++		u8 byte_write;
++		if (get_user(byte_write, &buf[*off - init_off]))
++			return -EFAULT;
+ 		err = ec_write(*off, byte_write);
+ 		if (err)
+ 			return err;
+diff -urNp linux-3.0.3/drivers/acpi/proc.c linux-3.0.3/drivers/acpi/proc.c
+--- linux-3.0.3/drivers/acpi/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/acpi/proc.c	2011-08-23 21:47:55.000000000 -0400
+@@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
  				size_t count, loff_t * ppos)
  {
  	struct list_head *node, *next;
 -	char strbuf[5];
 -	char str[5] = "";
 -	unsigned int len = count;
-+	char strbuf[5] = {0};
- 
+-
 -	if (len > 4)
 -		len = 4;
 -	if (len < 0)
+-		return -EFAULT;
++	char strbuf[5] = {0};
+ 
+-	if (copy_from_user(strbuf, buffer, len))
 +	if (count > 4)
 +		count = 4;
 +	if (copy_from_user(strbuf, buffer, count))
  		return -EFAULT;
--
--	if (copy_from_user(strbuf, buffer, len))
--		return -EFAULT;
 -	strbuf[len] = '\0';
 -	sscanf(strbuf, "%s", str);
 +	strbuf[count] = '\0';
  
  	mutex_lock(&acpi_device_lock);
  	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
-@@ -363,7 +357,7 @@ acpi_system_write_wakeup_device(struct file *file,
+@@ -363,7 +357,7 @@ acpi_system_write_wakeup_device(struct f
  		if (!dev->wakeup.flags.valid)
  			continue;
  
@@ -23479,11 +21945,10 @@ index f5f9869..da87aeb 100644
  			if (device_can_wakeup(&dev->dev)) {
  				bool enable = !device_may_wakeup(&dev->dev);
  				device_set_wakeup_enable(&dev->dev, enable);
-diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
-index 360a74e..575aa5a 100644
---- a/drivers/acpi/processor_driver.c
-+++ b/drivers/acpi/processor_driver.c
-@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
+diff -urNp linux-3.0.3/drivers/acpi/processor_driver.c linux-3.0.3/drivers/acpi/processor_driver.c
+--- linux-3.0.3/drivers/acpi/processor_driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/acpi/processor_driver.c	2011-08-23 21:47:55.000000000 -0400
+@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
  		return 0;
  #endif
  
@@ -23492,163 +21957,10 @@ index 360a74e..575aa5a 100644
  
  	/*
  	 * Buggy BIOS check
-diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
-index d615b7d..8607961 100644
---- a/drivers/acpi/processor_idle.c
-+++ b/drivers/acpi/processor_idle.c
-@@ -121,7 +121,7 @@ static struct dmi_system_id __cpuinitdata processor_power_dmi_table[] = {
- 	  DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
- 	  DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")},
- 	 (void *)1},
--	{},
-+	{}
- };
- 
- 
-diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
-index 339c210..ed4f197 100644
---- a/drivers/ata/acard-ahci.c
-+++ b/drivers/ata/acard-ahci.c
-@@ -87,7 +87,7 @@ static struct scsi_host_template acard_ahci_sht = {
- 	AHCI_SHT("acard-ahci"),
- };
- 
--static struct ata_port_operations acard_ops = {
-+static const struct ata_port_operations acard_ops = {
- 	.inherits		= &ahci_ops,
- 	.qc_prep		= acard_ahci_qc_prep,
- 	.qc_fill_rtf		= acard_ahci_qc_fill_rtf,
-diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 54c096b..93f8ec5 100644
---- a/drivers/ata/ahci.c
-+++ b/drivers/ata/ahci.c
-@@ -94,17 +94,17 @@ static struct scsi_host_template ahci_sht = {
- 	AHCI_SHT("ahci"),
- };
- 
--static struct ata_port_operations ahci_vt8251_ops = {
-+static const struct ata_port_operations ahci_vt8251_ops = {
- 	.inherits		= &ahci_ops,
- 	.hardreset		= ahci_vt8251_hardreset,
- };
- 
--static struct ata_port_operations ahci_p5wdh_ops = {
-+static const struct ata_port_operations ahci_p5wdh_ops = {
- 	.inherits		= &ahci_ops,
- 	.hardreset		= ahci_p5wdh_hardreset,
- };
- 
--static struct ata_port_operations ahci_sb600_ops = {
-+static const struct ata_port_operations ahci_sb600_ops = {
- 	.inherits		= &ahci_ops,
- 	.softreset		= ahci_sb600_softreset,
- 	.pmp_softreset		= ahci_sb600_softreset,
-diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
-index 3e606c3..91a5d12 100644
---- a/drivers/ata/ahci.h
-+++ b/drivers/ata/ahci.h
-@@ -309,7 +309,7 @@ extern struct device_attribute *ahci_sdev_attrs[];
- 	.shost_attrs		= ahci_shost_attrs,			\
- 	.sdev_attrs		= ahci_sdev_attrs
- 
--extern struct ata_port_operations ahci_ops;
-+extern const struct ata_port_operations ahci_ops;
- 
- void ahci_fill_cmd_slot(struct ahci_port_priv *pp, unsigned int tag,
- 			u32 opts);
-diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
-index 6981f76..a874967 100644
---- a/drivers/ata/ata_generic.c
-+++ b/drivers/ata/ata_generic.c
-@@ -101,7 +101,7 @@ static struct scsi_host_template generic_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations generic_port_ops = {
-+static const struct ata_port_operations generic_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_mode	= generic_set_mode,
-diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
-index 6cb14ca..b370962 100644
---- a/drivers/ata/ata_piix.c
-+++ b/drivers/ata/ata_piix.c
-@@ -327,12 +327,12 @@ static struct scsi_host_template piix_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations piix_sata_ops = {
-+static const struct ata_port_operations piix_sata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.sff_irq_check		= piix_irq_check,
- };
- 
--static struct ata_port_operations piix_pata_ops = {
-+static const struct ata_port_operations piix_pata_ops = {
- 	.inherits		= &piix_sata_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= piix_set_piomode,
-@@ -340,12 +340,12 @@ static struct ata_port_operations piix_pata_ops = {
- 	.prereset		= piix_pata_prereset,
- };
- 
--static struct ata_port_operations piix_vmw_ops = {
-+static const struct ata_port_operations piix_vmw_ops = {
- 	.inherits		= &piix_pata_ops,
- 	.bmdma_status		= piix_vmw_bmdma_status,
- };
- 
--static struct ata_port_operations ich_pata_ops = {
-+static const struct ata_port_operations ich_pata_ops = {
- 	.inherits		= &piix_pata_ops,
- 	.cable_detect		= ich_pata_cable_detect,
- 	.set_dmamode		= ich_set_dmamode,
-@@ -361,7 +361,7 @@ static struct scsi_host_template piix_sidpr_sht = {
- 	.shost_attrs		= piix_sidpr_shost_attrs,
- };
- 
--static struct ata_port_operations piix_sidpr_sata_ops = {
-+static const struct ata_port_operations piix_sidpr_sata_ops = {
- 	.inherits		= &piix_sata_ops,
- 	.hardreset		= sata_std_hardreset,
- 	.scr_read		= piix_sidpr_scr_read,
-diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
-index 8498eb5..dacd080 100644
---- a/drivers/ata/libahci.c
-+++ b/drivers/ata/libahci.c
-@@ -137,7 +137,7 @@ struct device_attribute *ahci_sdev_attrs[] = {
- };
- EXPORT_SYMBOL_GPL(ahci_sdev_attrs);
- 
--struct ata_port_operations ahci_ops = {
-+const struct ata_port_operations ahci_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= ahci_pmp_qc_defer,
-diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
-index 8b5ea39..a409970 100644
---- a/drivers/ata/libata-acpi.c
-+++ b/drivers/ata/libata-acpi.c
-@@ -218,12 +218,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)
- 	ata_acpi_uevent(dev->link->ap, dev, event);
- }
- 
--static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
-+static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
- 	.handler = ata_acpi_dev_notify_dock,
- 	.uevent = ata_acpi_dev_uevent,
- };
- 
--static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
-+static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
- 	.handler = ata_acpi_ap_notify_dock,
- 	.uevent = ata_acpi_ap_uevent,
- };
-diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
-index 4ccce0f..e9b3ccc 100644
---- a/drivers/ata/libata-core.c
-+++ b/drivers/ata/libata-core.c
-@@ -4746,7 +4746,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+diff -urNp linux-3.0.3/drivers/ata/libata-core.c linux-3.0.3/drivers/ata/libata-core.c
+--- linux-3.0.3/drivers/ata/libata-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ata/libata-core.c	2011-08-23 21:47:55.000000000 -0400
+@@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
  	struct ata_port *ap;
  	unsigned int tag;
  
@@ -23657,7 +21969,7 @@ index 4ccce0f..e9b3ccc 100644
  	ap = qc->ap;
  
  	qc->flags = 0;
-@@ -4762,7 +4762,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+@@ -4769,7 +4769,7 @@ void __ata_qc_complete(struct ata_queued
  	struct ata_port *ap;
  	struct ata_link *link;
  
@@ -23666,16 +21978,7 @@ index 4ccce0f..e9b3ccc 100644
  	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
  	ap = qc->ap;
  	link = qc->dev->link;
-@@ -5755,7 +5755,7 @@ static void ata_host_stop(struct device *gendev, void *res)
-  *	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;
-@@ -5767,6 +5767,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5774,6 +5774,7 @@ static void ata_finalize_port_ops(struct
  		return;
  
  	spin_lock(&lock);
@@ -23683,40 +21986,21 @@ index 4ccce0f..e9b3ccc 100644
  
  	for (cur = ops->inherits; cur; cur = cur->inherits) {
  		void **inherit = (void **)cur;
-@@ -5780,8 +5781,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
+@@ -5787,8 +5788,9 @@ static void ata_finalize_port_ops(struct
  		if (IS_ERR(*pp))
  			*pp = NULL;
  
 -	ops->inherits = NULL;
-+	((struct ata_port_operations *)ops)->inherits = NULL;
++	*(struct ata_port_operations **)&ops->inherits = NULL;
  
 +	pax_close_kernel();
  	spin_unlock(&lock);
  }
  
-@@ -5878,7 +5880,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);
- 	mutex_init(&host->eh_mutex);
-@@ -6584,7 +6586,7 @@ static void ata_dummy_error_handler(struct ata_port *ap)
- 	/* truly dummy */
- }
- 
--struct ata_port_operations ata_dummy_port_ops = {
-+const struct ata_port_operations ata_dummy_port_ops = {
- 	.qc_prep		= ata_noop_qc_prep,
- 	.qc_issue		= ata_dummy_qc_issue,
- 	.error_handler		= ata_dummy_error_handler,
-diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
-index 09329a1..11da8d7 100644
---- a/drivers/ata/libata-eh.c
-+++ b/drivers/ata/libata-eh.c
-@@ -2478,6 +2478,8 @@ void ata_eh_report(struct ata_port *ap)
+diff -urNp linux-3.0.3/drivers/ata/libata-eh.c linux-3.0.3/drivers/ata/libata-eh.c
+--- linux-3.0.3/drivers/ata/libata-eh.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ata/libata-eh.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
  {
  	struct ata_link *link;
  
@@ -23725,1550 +22009,24 @@ index 09329a1..11da8d7 100644
  	ata_for_each_link(link, ap, HOST_FIRST)
  		ata_eh_link_report(link);
  }
-@@ -3882,7 +3884,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
-  */
- void ata_std_error_handler(struct ata_port *ap)
- {
--	struct ata_port_operations *ops = ap->ops;
-+	const struct ata_port_operations *ops = ap->ops;
- 	ata_reset_fn_t hardreset = ops->hardreset;
- 
- 	/* ignore built-in hardreset if SCR access is not available */
-diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
-index 3120596..95227f9 100644
---- a/drivers/ata/libata-pmp.c
-+++ b/drivers/ata/libata-pmp.c
-@@ -912,7 +912,7 @@ static int sata_pmp_handle_link_fail(struct ata_link *link, int *link_tries)
-  */
- static int sata_pmp_eh_recover(struct ata_port *ap)
- {
--	struct ata_port_operations *ops = ap->ops;
-+	const struct ata_port_operations *ops = ap->ops;
- 	int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
- 	struct ata_link *pmp_link = &ap->link;
- 	struct ata_device *pmp_dev = pmp_link->device;
-diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
-index c8d4703..e9e7d35 100644
---- a/drivers/ata/pata_acpi.c
-+++ b/drivers/ata/pata_acpi.c
-@@ -216,7 +216,7 @@ static struct scsi_host_template pacpi_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pacpi_ops = {
-+static const struct ata_port_operations pacpi_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= pacpi_qc_issue,
- 	.cable_detect		= pacpi_cable_detect,
-diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
-index 794ec6e..77b1883 100644
---- a/drivers/ata/pata_ali.c
-+++ b/drivers/ata/pata_ali.c
-@@ -363,7 +363,7 @@ static struct scsi_host_template ali_sht = {
-  *	Port operations for PIO only ALi
-  */
- 
--static struct ata_port_operations ali_early_port_ops = {
-+static const struct ata_port_operations ali_early_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= ali_set_piomode,
-@@ -380,7 +380,7 @@ static const struct ata_port_operations ali_dma_base_ops = {
-  *	Port operations for DMA capable ALi without cable
-  *	detect
-  */
--static struct ata_port_operations ali_20_port_ops = {
-+static const struct ata_port_operations ali_20_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.mode_filter	= ali_20_filter,
-@@ -391,7 +391,7 @@ static struct ata_port_operations ali_20_port_ops = {
- /*
-  *	Port operations for DMA capable ALi with cable detect
-  */
--static struct ata_port_operations ali_c2_port_ops = {
-+static const struct ata_port_operations ali_c2_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.cable_detect	= ali_c2_cable_detect,
-@@ -402,7 +402,7 @@ static struct ata_port_operations ali_c2_port_ops = {
- /*
-  *	Port operations for DMA capable ALi with cable detect
-  */
--static struct ata_port_operations ali_c4_port_ops = {
-+static const struct ata_port_operations ali_c4_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.cable_detect	= ali_c2_cable_detect,
-@@ -412,7 +412,7 @@ static struct ata_port_operations ali_c4_port_ops = {
- /*
-  *	Port operations for DMA capable ALi with cable detect and LBA48
-  */
--static struct ata_port_operations ali_c5_port_ops = {
-+static const struct ata_port_operations ali_c5_port_ops = {
- 	.inherits	= &ali_dma_base_ops,
- 	.check_atapi_dma = ali_check_atapi_dma,
- 	.dev_config	= ali_warn_atapi_dma,
-diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
-index 620a07c..06d4e17 100644
---- a/drivers/ata/pata_amd.c
-+++ b/drivers/ata/pata_amd.c
-@@ -397,28 +397,28 @@ static const struct ata_port_operations amd_base_port_ops = {
- 	.prereset	= amd_pre_reset,
- };
- 
--static struct ata_port_operations amd33_port_ops = {
-+static const struct ata_port_operations amd33_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= amd33_set_piomode,
- 	.set_dmamode	= amd33_set_dmamode,
- };
- 
--static struct ata_port_operations amd66_port_ops = {
-+static const struct ata_port_operations amd66_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= amd66_set_piomode,
- 	.set_dmamode	= amd66_set_dmamode,
- };
- 
--static struct ata_port_operations amd100_port_ops = {
-+static const struct ata_port_operations amd100_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= amd100_set_piomode,
- 	.set_dmamode	= amd100_set_dmamode,
- };
- 
--static struct ata_port_operations amd133_port_ops = {
-+static const struct ata_port_operations amd133_port_ops = {
- 	.inherits	= &amd_base_port_ops,
- 	.cable_detect	= amd_cable_detect,
- 	.set_piomode	= amd133_set_piomode,
-@@ -433,13 +433,13 @@ static const struct ata_port_operations nv_base_port_ops = {
- 	.host_stop	= nv_host_stop,
- };
- 
--static struct ata_port_operations nv100_port_ops = {
-+static const struct ata_port_operations nv100_port_ops = {
- 	.inherits	= &nv_base_port_ops,
- 	.set_piomode	= nv100_set_piomode,
- 	.set_dmamode	= nv100_set_dmamode,
- };
- 
--static struct ata_port_operations nv133_port_ops = {
-+static const struct ata_port_operations nv133_port_ops = {
- 	.inherits	= &nv_base_port_ops,
- 	.set_piomode	= nv133_set_piomode,
- 	.set_dmamode	= nv133_set_dmamode,
-diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
-index 2215632..6a02a6f 100644
---- a/drivers/ata/pata_artop.c
-+++ b/drivers/ata/pata_artop.c
-@@ -312,7 +312,7 @@ static struct scsi_host_template artop_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations artop6210_ops = {
-+static const struct ata_port_operations artop6210_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= artop6210_set_piomode,
-@@ -321,7 +321,7 @@ static struct ata_port_operations artop6210_ops = {
- 	.qc_defer		= artop6210_qc_defer,
- };
- 
--static struct ata_port_operations artop6260_ops = {
-+static const struct ata_port_operations artop6260_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= artop6260_cable_detect,
- 	.set_piomode		= artop6260_set_piomode,
-diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
-index 66ce6a5..2e36304 100644
---- a/drivers/ata/pata_at32.c
-+++ b/drivers/ata/pata_at32.c
-@@ -173,7 +173,7 @@ static struct scsi_host_template at32_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations at32_port_ops = {
-+static const struct ata_port_operations at32_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 	.set_piomode		= pata_at32_set_piomode,
-diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
-index 0da0dcc..04d7d77 100644
---- a/drivers/ata/pata_at91.c
-+++ b/drivers/ata/pata_at91.c
-@@ -196,7 +196,7 @@ static struct scsi_host_template pata_at91_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pata_at91_port_ops = {
-+static const struct ata_port_operations pata_at91_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 
- 	.sff_data_xfer	= pata_at91_data_xfer_noirq,
-diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
-index 4375561..cfe4ef5 100644
---- a/drivers/ata/pata_atiixp.c
-+++ b/drivers/ata/pata_atiixp.c
-@@ -214,7 +214,7 @@ static struct scsi_host_template atiixp_sht = {
- 	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations atiixp_port_ops = {
-+static const struct ata_port_operations atiixp_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
-index 9529593..5fcc356 100644
---- a/drivers/ata/pata_atp867x.c
-+++ b/drivers/ata/pata_atp867x.c
-@@ -275,7 +275,7 @@ static struct scsi_host_template atp867x_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations atp867x_ops = {
-+static const struct ata_port_operations atp867x_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= atp867x_cable_detect,
- 	.set_piomode		= atp867x_set_piomode,
-diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
-index 7aed5c7..7d8c660 100644
---- a/drivers/ata/pata_bf54x.c
-+++ b/drivers/ata/pata_bf54x.c
-@@ -1420,7 +1420,7 @@ static struct scsi_host_template bfin_sht = {
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations bfin_pata_ops = {
-+static const struct ata_port_operations bfin_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.set_piomode		= bfin_set_piomode,
-diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
-index 549d28d..bc2bb40 100644
---- a/drivers/ata/pata_cmd640.c
-+++ b/drivers/ata/pata_cmd640.c
-@@ -176,7 +176,7 @@ static struct scsi_host_template cmd640_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cmd640_port_ops = {
-+static const struct ata_port_operations cmd640_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	/* In theory xfer_noirq is not needed once we kill the prefetcher */
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
-diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
-index 635a759..02aa9e4 100644
---- a/drivers/ata/pata_cmd64x.c
-+++ b/drivers/ata/pata_cmd64x.c
-@@ -271,18 +271,18 @@ static const struct ata_port_operations cmd64x_base_ops = {
- 	.set_dmamode	= cmd64x_set_dmamode,
- };
- 
--static struct ata_port_operations cmd64x_port_ops = {
-+static const struct ata_port_operations cmd64x_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations cmd646r1_port_ops = {
-+static const struct ata_port_operations cmd646r1_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.bmdma_stop	= cmd646r1_bmdma_stop,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations cmd648_port_ops = {
-+static const struct ata_port_operations cmd648_port_ops = {
- 	.inherits	= &cmd64x_base_ops,
- 	.bmdma_stop	= cmd648_bmdma_stop,
- 	.cable_detect	= cmd648_cable_detect,
-diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
-index 030952f..2984d7a 100644
---- a/drivers/ata/pata_cs5520.c
-+++ b/drivers/ata/pata_cs5520.c
-@@ -108,7 +108,7 @@ static struct scsi_host_template cs5520_sht = {
- 	.sg_tablesize		= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations cs5520_port_ops = {
-+static const struct ata_port_operations cs5520_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_prep		= ata_bmdma_dumb_qc_prep,
- 	.cable_detect		= ata_cable_40wire,
-diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
-index f792330..d4a893a 100644
---- a/drivers/ata/pata_cs5530.c
-+++ b/drivers/ata/pata_cs5530.c
-@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_sht = {
- 	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations cs5530_port_ops = {
-+static const struct ata_port_operations cs5530_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
-diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
-index 03a9318..003dadf 100644
---- a/drivers/ata/pata_cs5535.c
-+++ b/drivers/ata/pata_cs5535.c
-@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cs5535_port_ops = {
-+static const struct ata_port_operations cs5535_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= cs5535_cable_detect,
- 	.set_piomode	= cs5535_set_piomode,
-diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
-index 628c8fa..a6f1164 100644
---- a/drivers/ata/pata_cs5536.c
-+++ b/drivers/ata/pata_cs5536.c
-@@ -233,7 +233,7 @@ static struct scsi_host_template cs5536_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cs5536_port_ops = {
-+static const struct ata_port_operations cs5536_port_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.cable_detect		= cs5536_cable_detect,
- 	.set_piomode		= cs5536_set_piomode,
-diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
-index 6d915b0..5f95c77 100644
---- a/drivers/ata/pata_cypress.c
-+++ b/drivers/ata/pata_cypress.c
-@@ -115,7 +115,7 @@ static struct scsi_host_template cy82c693_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations cy82c693_port_ops = {
-+static const struct ata_port_operations cy82c693_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= cy82c693_set_piomode,
-diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
-index a088347..505e510 100644
---- a/drivers/ata/pata_efar.c
-+++ b/drivers/ata/pata_efar.c
-@@ -238,7 +238,7 @@ static struct scsi_host_template efar_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations efar_ops = {
-+static const struct ata_port_operations efar_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= efar_cable_detect,
- 	.set_piomode		= efar_set_piomode,
-diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
-index 538ec38..a3c6d66 100644
---- a/drivers/ata/pata_hpt366.c
-+++ b/drivers/ata/pata_hpt366.c
-@@ -275,7 +275,7 @@ static struct scsi_host_template hpt36x_sht = {
-  *	Configuration for HPT366/68
-  */
- 
--static struct ata_port_operations hpt366_port_ops = {
-+static const struct ata_port_operations hpt366_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= hpt36x_cable_detect,
- 	.mode_filter	= hpt366_filter,
-diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
-index 4c5b518..5fae9d5 100644
---- a/drivers/ata/pata_hpt37x.c
-+++ b/drivers/ata/pata_hpt37x.c
-@@ -587,7 +587,7 @@ static struct scsi_host_template hpt37x_sht = {
-  *	Configuration for HPT370
-  */
- 
--static struct ata_port_operations hpt370_port_ops = {
-+static const struct ata_port_operations hpt370_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt370_bmdma_stop,
-@@ -603,7 +603,7 @@ static struct ata_port_operations hpt370_port_ops = {
-  *	Configuration for HPT370A. Close to 370 but less filters
-  */
- 
--static struct ata_port_operations hpt370a_port_ops = {
-+static const struct ata_port_operations hpt370a_port_ops = {
- 	.inherits	= &hpt370_port_ops,
- 	.mode_filter	= hpt370a_filter,
- };
-@@ -613,7 +613,7 @@ static struct ata_port_operations hpt370a_port_ops = {
-  *	mode setting functionality.
-  */
- 
--static struct ata_port_operations hpt302_port_ops = {
-+static const struct ata_port_operations hpt302_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt37x_bmdma_stop,
-@@ -629,7 +629,7 @@ static struct ata_port_operations hpt302_port_ops = {
-  *	but we have a mode filter.
-  */
- 
--static struct ata_port_operations hpt372_port_ops = {
-+static const struct ata_port_operations hpt372_port_ops = {
- 	.inherits	= &hpt302_port_ops,
- 	.mode_filter	= hpt372_filter,
- };
-@@ -639,7 +639,7 @@ static struct ata_port_operations hpt372_port_ops = {
-  *	but we have a different cable detection procedure for function 1.
-  */
- 
--static struct ata_port_operations hpt374_fn1_port_ops = {
-+static const struct ata_port_operations hpt374_fn1_port_ops = {
- 	.inherits	= &hpt372_port_ops,
- 	.cable_detect	= hpt374_fn1_cable_detect,
- };
-diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
-index eca68ca..5dcd3a4 100644
---- a/drivers/ata/pata_hpt3x2n.c
-+++ b/drivers/ata/pata_hpt3x2n.c
-@@ -348,7 +348,7 @@ static struct scsi_host_template hpt3x2n_sht = {
-  *	Configuration for HPT302N/371N.
-  */
- 
--static struct ata_port_operations hpt3xxn_port_ops = {
-+static const struct ata_port_operations hpt3xxn_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.bmdma_stop	= hpt3x2n_bmdma_stop,
-@@ -366,7 +366,7 @@ static struct ata_port_operations hpt3xxn_port_ops = {
-  *	Configuration for HPT372N. Same as 302N/371N but we have a mode filter.
-  */
- 
--static struct ata_port_operations hpt372n_port_ops = {
-+static const struct ata_port_operations hpt372n_port_ops = {
- 	.inherits	= &hpt3xxn_port_ops,
- 	.mode_filter	= &hpt372n_filter,
- };
-diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
-index b63d5e2..d8f14d6 100644
---- a/drivers/ata/pata_hpt3x3.c
-+++ b/drivers/ata/pata_hpt3x3.c
-@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations hpt3x3_port_ops = {
-+static const struct ata_port_operations hpt3x3_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= hpt3x3_set_piomode,
-diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
-index 9f2889f..aeb00ba 100644
---- a/drivers/ata/pata_icside.c
-+++ b/drivers/ata/pata_icside.c
-@@ -320,7 +320,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
- 	}
- }
- 
--static struct ata_port_operations pata_icside_port_ops = {
-+static const struct ata_port_operations pata_icside_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	/* no need to build any PRD tables for DMA */
- 	.qc_prep		= ata_noop_qc_prep,
-diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
-index 4bceb88..457dfb6 100644
---- a/drivers/ata/pata_isapnp.c
-+++ b/drivers/ata/pata_isapnp.c
-@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations isapnp_port_ops = {
-+static const struct ata_port_operations isapnp_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- };
- 
--static struct ata_port_operations isapnp_noalt_port_ops = {
-+static const struct ata_port_operations isapnp_noalt_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	/* No altstatus so we don't want to use the lost interrupt poll */
-diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
-index 4d142a2..9c78bee 100644
---- a/drivers/ata/pata_it8213.c
-+++ b/drivers/ata/pata_it8213.c
-@@ -233,7 +233,7 @@ static struct scsi_host_template it8213_sht = {
- };
- 
- 
--static struct ata_port_operations it8213_ops = {
-+static const struct ata_port_operations it8213_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= it8213_cable_detect,
- 	.set_piomode		= it8213_set_piomode,
-diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
-index aa0e0c5..90bdcf7 100644
---- a/drivers/ata/pata_it821x.c
-+++ b/drivers/ata/pata_it821x.c
-@@ -801,7 +801,7 @@ static struct scsi_host_template it821x_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations it821x_smart_port_ops = {
-+static const struct ata_port_operations it821x_smart_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -815,7 +815,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
- 	.port_start	= it821x_port_start,
- };
- 
--static struct ata_port_operations it821x_passthru_port_ops = {
-+static const struct ata_port_operations it821x_passthru_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-@@ -831,7 +831,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
- 	.port_start	= it821x_port_start,
- };
- 
--static struct ata_port_operations it821x_rdc_port_ops = {
-+static const struct ata_port_operations it821x_rdc_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma= it821x_check_atapi_dma,
-diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
-index ba54b08..4b952b7 100644
---- a/drivers/ata/pata_ixp4xx_cf.c
-+++ b/drivers/ata/pata_ixp4xx_cf.c
-@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ixp4xx_port_ops = {
-+static const struct ata_port_operations ixp4xx_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ixp4xx_mmio_data_xfer,
- 	.cable_detect		= ata_cable_40wire,
-diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
-index cb3babb..6770bd8 100644
---- a/drivers/ata/pata_jmicron.c
-+++ b/drivers/ata/pata_jmicron.c
-@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations jmicron_ops = {
-+static const struct ata_port_operations jmicron_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= jmicron_pre_reset,
- };
-diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
-index 6bd9425..418bf11 100644
---- a/drivers/ata/pata_legacy.c
-+++ b/drivers/ata/pata_legacy.c
-@@ -116,7 +116,7 @@ struct legacy_probe {
- 
- 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;
-@@ -239,12 +239,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
-  *	pio_mask as well.
-  */
- 
--static struct ata_port_operations simple_port_ops = {
-+static const struct ata_port_operations simple_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- };
- 
--static struct ata_port_operations legacy_port_ops = {
-+static const struct ata_port_operations legacy_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- 	.set_mode	= legacy_set_mode,
-@@ -340,7 +340,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
- 	return buflen;
- }
- 
--static struct ata_port_operations pdc20230_port_ops = {
-+static const struct ata_port_operations pdc20230_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= pdc20230_set_piomode,
- 	.sff_data_xfer	= pdc_data_xfer_vlb,
-@@ -373,7 +373,7 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
- 	ioread8(ap->ioaddr.status_addr);
- }
- 
--static struct ata_port_operations ht6560a_port_ops = {
-+static const struct ata_port_operations ht6560a_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= ht6560a_set_piomode,
- };
-@@ -416,7 +416,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
- 	ioread8(ap->ioaddr.status_addr);
- }
- 
--static struct ata_port_operations ht6560b_port_ops = {
-+static const struct ata_port_operations ht6560b_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= ht6560b_set_piomode,
- };
-@@ -515,7 +515,7 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
- }
- 
- 
--static struct ata_port_operations opti82c611a_port_ops = {
-+static const struct ata_port_operations opti82c611a_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= opti82c611a_set_piomode,
- };
-@@ -625,7 +625,7 @@ static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc)
- 	return ata_sff_qc_issue(qc);
- }
- 
--static struct ata_port_operations opti82c46x_port_ops = {
-+static const struct ata_port_operations opti82c46x_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= opti82c46x_set_piomode,
- 	.qc_issue	= opti82c46x_qc_issue,
-@@ -787,20 +787,20 @@ static int qdi_port(struct platform_device *dev,
- 	return 0;
- }
- 
--static struct ata_port_operations qdi6500_port_ops = {
-+static const struct ata_port_operations qdi6500_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6500_set_piomode,
- 	.qc_issue	= qdi_qc_issue,
- 	.sff_data_xfer	= vlb32_data_xfer,
- };
- 
--static struct ata_port_operations qdi6580_port_ops = {
-+static const struct ata_port_operations qdi6580_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6580_set_piomode,
- 	.sff_data_xfer	= vlb32_data_xfer,
- };
- 
--static struct ata_port_operations qdi6580dp_port_ops = {
-+static const struct ata_port_operations qdi6580dp_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= qdi6580dp_set_piomode,
- 	.qc_issue	= qdi_qc_issue,
-@@ -872,7 +872,7 @@ static int winbond_port(struct platform_device *dev,
- 	return 0;
- }
- 
--static struct ata_port_operations winbond_port_ops = {
-+static const struct ata_port_operations winbond_port_ops = {
- 	.inherits	= &legacy_base_port_ops,
- 	.set_piomode	= winbond_set_piomode,
- 	.sff_data_xfer	= vlb32_data_xfer,
-@@ -995,7 +995,7 @@ static __init int legacy_init_one(struct legacy_probe *probe)
- 	int pio_modes = controller->pio_mask;
- 	unsigned long io = probe->port;
- 	u32 mask = (1 << probe->slot);
--	struct ata_port_operations *ops = controller->ops;
-+	const struct ata_port_operations *ops = controller->ops;
- 	struct legacy_data *ld = &legacy_data[probe->slot];
- 	struct ata_host *host = NULL;
- 	struct ata_port *ap;
-diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
-index 75b49d0..9fa605b 100644
---- a/drivers/ata/pata_macio.c
-+++ b/drivers/ata/pata_macio.c
-@@ -918,9 +918,8 @@ static struct scsi_host_template pata_macio_sht = {
- 	.slave_configure	= pata_macio_slave_config,
- };
- 
--static struct ata_port_operations pata_macio_ops = {
-+static const struct ata_port_operations pata_macio_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
--
- 	.freeze			= pata_macio_freeze,
- 	.set_piomode		= pata_macio_set_timings,
- 	.set_dmamode		= pata_macio_set_timings,
-diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
-index dd38083..b73db04 100644
---- a/drivers/ata/pata_marvell.c
-+++ b/drivers/ata/pata_marvell.c
-@@ -100,7 +100,7 @@ static struct scsi_host_template marvell_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations marvell_ops = {
-+static const struct ata_port_operations marvell_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= marvell_cable_detect,
- 	.prereset		= marvell_pre_reset,
-diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
-index d7d8026..caf4a3c 100644
---- a/drivers/ata/pata_mpc52xx.c
-+++ b/drivers/ata/pata_mpc52xx.c
-@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations mpc52xx_ata_port_ops = {
-+static const struct ata_port_operations mpc52xx_ata_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_dev_select		= mpc52xx_ata_dev_select,
- 	.set_piomode		= mpc52xx_ata_set_piomode,
-diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
-index b21f002..0a27e7f 100644
---- a/drivers/ata/pata_mpiix.c
-+++ b/drivers/ata/pata_mpiix.c
-@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations mpiix_port_ops = {
-+static const struct ata_port_operations mpiix_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= mpiix_qc_issue,
- 	.cable_detect	= ata_cable_40wire,
-diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
-index 3eb921c..c167317 100644
---- a/drivers/ata/pata_netcell.c
-+++ b/drivers/ata/pata_netcell.c
-@@ -34,7 +34,7 @@ static struct scsi_host_template netcell_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations netcell_ops = {
-+static const struct ata_port_operations netcell_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_80wire,
- 	.read_id	= netcell_read_id,
-diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
-index cc50bd0..123fe21 100644
---- a/drivers/ata/pata_ninja32.c
-+++ b/drivers/ata/pata_ninja32.c
-@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ninja32_port_ops = {
-+static const struct ata_port_operations ninja32_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.sff_dev_select = ninja32_dev_select,
- 	.cable_detect	= ata_cable_40wire,
-diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
-index 2110863..6144b43 100644
---- a/drivers/ata/pata_ns87410.c
-+++ b/drivers/ata/pata_ns87410.c
-@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations ns87410_port_ops = {
-+static const struct ata_port_operations ns87410_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= ns87410_qc_issue,
- 	.cable_detect	= ata_cable_40wire,
-diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
-index 605f198..f5fee2f 100644
---- a/drivers/ata/pata_ns87415.c
-+++ b/drivers/ata/pata_ns87415.c
-@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct ata_port *ap)
- }
- #endif		/* 87560 SuperIO Support */
- 
--static struct ata_port_operations ns87415_pata_ops = {
-+static const struct ata_port_operations ns87415_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.check_atapi_dma	= ns87415_check_atapi_dma,
-@@ -313,7 +313,7 @@ static struct ata_port_operations ns87415_pata_ops = {
- };
- 
- #if defined(CONFIG_SUPERIO)
--static struct ata_port_operations ns87560_pata_ops = {
-+static const struct ata_port_operations ns87560_pata_ops = {
- 	.inherits		= &ns87415_pata_ops,
- 	.sff_tf_read		= ns87560_tf_read,
- 	.sff_check_status	= ns87560_check_status,
-diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
-index fa1b95a..d9d8389 100644
---- a/drivers/ata/pata_octeon_cf.c
-+++ b/drivers/ata/pata_octeon_cf.c
-@@ -780,7 +780,7 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc)
- 	return 0;
- }
- 
--static struct ata_port_operations octeon_cf_ops = {
-+static struct ata_port_operations octeon_cf_ops = {	/* cannot be const */
- 	.inherits		= &ata_sff_port_ops,
- 	.check_atapi_dma	= octeon_cf_check_atapi_dma,
- 	.qc_prep		= ata_noop_qc_prep,
-diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
-index b811c16..e23051e 100644
---- a/drivers/ata/pata_oldpiix.c
-+++ b/drivers/ata/pata_oldpiix.c
-@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations oldpiix_pata_ops = {
-+static const struct ata_port_operations oldpiix_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= oldpiix_qc_issue,
- 	.cable_detect		= ata_cable_40wire,
-diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
-index 00c5a02..b486a97 100644
---- a/drivers/ata/pata_opti.c
-+++ b/drivers/ata/pata_opti.c
-@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations opti_port_ops = {
-+static const struct ata_port_operations opti_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= opti_set_piomode,
-diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
-index 0852cd0..62f6a68 100644
---- a/drivers/ata/pata_optidma.c
-+++ b/drivers/ata/pata_optidma.c
-@@ -337,7 +337,7 @@ static struct scsi_host_template optidma_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations optidma_port_ops = {
-+static const struct ata_port_operations optidma_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_piomode	= optidma_set_pio_mode,
-@@ -346,7 +346,7 @@ static struct ata_port_operations optidma_port_ops = {
- 	.prereset	= optidma_pre_reset,
- };
- 
--static struct ata_port_operations optiplus_port_ops = {
-+static const struct ata_port_operations optiplus_port_ops = {
- 	.inherits	= &optidma_port_ops,
- 	.set_piomode	= optiplus_set_pio_mode,
- 	.set_dmamode	= optiplus_set_dma_mode,
-diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
-index 11fb4cc..1a14022 100644
---- a/drivers/ata/pata_palmld.c
-+++ b/drivers/ata/pata_palmld.c
-@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations palmld_port_ops = {
-+static const struct ata_port_operations palmld_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer_noirq,
- 	.cable_detect		= ata_cable_40wire,
-diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
-index 8062921..ef15855 100644
---- a/drivers/ata/pata_pcmcia.c
-+++ b/drivers/ata/pata_pcmcia.c
-@@ -151,14 +151,14 @@ static struct scsi_host_template pcmcia_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pcmcia_port_ops = {
-+static const struct ata_port_operations pcmcia_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_mode	= pcmcia_set_mode,
- };
- 
--static struct ata_port_operations pcmcia_8bit_port_ops = {
-+static const struct ata_port_operations pcmcia_8bit_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.sff_data_xfer	= ata_data_xfer_8bit,
- 	.cable_detect	= ata_cable_40wire,
-@@ -205,7 +205,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
- 	unsigned long io_base, ctl_base;
- 	void __iomem *io_addr, *ctl_addr;
- 	int n_ports = 1;
--	struct ata_port_operations *ops = &pcmcia_port_ops;
-+	const struct ata_port_operations *ops = &pcmcia_port_ops;
- 
- 	/* Set up attributes in order to probe card and get resources */
- 	pdev->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO |
-diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
-index b183511..c3ee285 100644
---- a/drivers/ata/pata_pdc2027x.c
-+++ b/drivers/ata/pata_pdc2027x.c
-@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027x_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pdc2027x_pata100_ops = {
-+static const struct ata_port_operations pdc2027x_pata100_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.check_atapi_dma	= pdc2027x_check_atapi_dma,
- 	.cable_detect		= pdc2027x_cable_detect,
- 	.prereset		= pdc2027x_prereset,
- };
- 
--static struct ata_port_operations pdc2027x_pata133_ops = {
-+static const struct ata_port_operations pdc2027x_pata133_ops = {
- 	.inherits		= &pdc2027x_pata100_ops,
- 	.mode_filter		= pdc2027x_mode_filter,
- 	.set_piomode		= pdc2027x_set_piomode,
-diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
-index c2ed586..b3e73aa 100644
---- a/drivers/ata/pata_pdc202xx_old.c
-+++ b/drivers/ata/pata_pdc202xx_old.c
-@@ -295,7 +295,7 @@ static struct scsi_host_template pdc202xx_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pdc2024x_port_ops = {
-+static const struct ata_port_operations pdc2024x_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.cable_detect		= ata_cable_40wire,
-@@ -306,7 +306,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
- 	.sff_irq_check		= pdc202xx_irq_check,
- };
- 
--static struct ata_port_operations pdc2026x_port_ops = {
-+static const struct ata_port_operations pdc2026x_port_ops = {
- 	.inherits		= &pdc2024x_port_ops,
- 
- 	.check_atapi_dma	= pdc2026x_check_atapi_dma,
-diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c
-index cb01bf9..3eb315d 100644
---- a/drivers/ata/pata_piccolo.c
-+++ b/drivers/ata/pata_piccolo.c
-@@ -67,7 +67,7 @@ static struct scsi_host_template tosh_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations tosh_port_ops = {
-+static const struct ata_port_operations tosh_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= ata_cable_unknown,
- 	.set_piomode	= tosh_set_piomode,
-diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
-index 50400fa..8af063f 100644
---- a/drivers/ata/pata_platform.c
-+++ b/drivers/ata/pata_platform.c
-@@ -48,7 +48,7 @@ static struct scsi_host_template pata_platform_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pata_platform_port_ops = {
-+static const struct ata_port_operations pata_platform_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer_noirq,
- 	.cable_detect		= ata_cable_unknown,
-diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
-index 1898c6e..78af048 100644
---- a/drivers/ata/pata_pxa.c
-+++ b/drivers/ata/pata_pxa.c
-@@ -198,7 +198,7 @@ static struct scsi_host_template pxa_ata_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pxa_ata_port_ops = {
-+static const struct ata_port_operations pxa_ata_port_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_40wire,
- 
-diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
-index 45879dc..165a9f9 100644
---- a/drivers/ata/pata_qdi.c
-+++ b/drivers/ata/pata_qdi.c
-@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations qdi6500_port_ops = {
-+static const struct ata_port_operations qdi6500_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.qc_issue	= qdi_qc_issue,
- 	.sff_data_xfer	= qdi_data_xfer,
-@@ -165,7 +165,7 @@ static struct ata_port_operations qdi6500_port_ops = {
- 	.set_piomode	= qdi6500_set_piomode,
- };
- 
--static struct ata_port_operations qdi6580_port_ops = {
-+static const struct ata_port_operations qdi6580_port_ops = {
- 	.inherits	= &qdi6500_port_ops,
- 	.set_piomode	= qdi6580_set_piomode,
- };
-diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
-index 8574b31..53789fe 100644
---- a/drivers/ata/pata_radisys.c
-+++ b/drivers/ata/pata_radisys.c
-@@ -187,7 +187,7 @@ static struct scsi_host_template radisys_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations radisys_pata_ops = {
-+static const struct ata_port_operations radisys_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.qc_issue		= radisys_qc_issue,
- 	.cable_detect		= ata_cable_unknown,
-diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
-index 0ffd631..7c6c78d 100644
---- a/drivers/ata/pata_rb532_cf.c
-+++ b/drivers/ata/pata_rb532_cf.c
-@@ -69,7 +69,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
- 	return IRQ_HANDLED;
- }
- 
--static struct ata_port_operations rb532_pata_port_ops = {
-+static const struct ata_port_operations rb532_pata_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_data_xfer		= ata_sff_data_xfer32,
- };
-diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
-index 5fbe9b1..1d0cdc0 100644
---- a/drivers/ata/pata_rdc.c
-+++ b/drivers/ata/pata_rdc.c
-@@ -273,7 +273,7 @@ static void rdc_set_dmamode(struct ata_port *ap, struct ata_device *adev)
- 	pci_write_config_byte(dev, 0x48, udma_enable);
- }
- 
--static struct ata_port_operations rdc_pata_ops = {
-+static const struct ata_port_operations rdc_pata_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.cable_detect		= rdc_pata_cable_detect,
- 	.set_piomode		= rdc_set_piomode,
-diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
-index 4a454a8..b95ac1a 100644
---- a/drivers/ata/pata_rz1000.c
-+++ b/drivers/ata/pata_rz1000.c
-@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations rz1000_port_ops = {
-+static const struct ata_port_operations rz1000_port_ops = {
- 	.inherits	= &ata_sff_port_ops,
- 	.cable_detect	= ata_cable_40wire,
- 	.set_mode	= rz1000_set_mode,
-diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
-index 8a51d67..7356fad 100644
---- a/drivers/ata/pata_samsung_cf.c
-+++ b/drivers/ata/pata_samsung_cf.c
-@@ -399,7 +399,7 @@ static struct scsi_host_template pata_s3c_sht = {
- 	ATA_PIO_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations pata_s3c_port_ops = {
-+static const struct ata_port_operations pata_s3c_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.sff_check_status	= pata_s3c_check_status,
- 	.sff_check_altstatus    = pata_s3c_check_altstatus,
-@@ -413,7 +413,7 @@ static struct ata_port_operations pata_s3c_port_ops = {
- 	.set_piomode		= pata_s3c_set_piomode,
- };
- 
--static struct ata_port_operations pata_s5p_port_ops = {
-+static const struct ata_port_operations pata_s5p_port_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 	.set_piomode		= pata_s3c_set_piomode,
- };
-diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
-index e2c1825..9b54b46 100644
---- a/drivers/ata/pata_sc1200.c
-+++ b/drivers/ata/pata_sc1200.c
-@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_sht = {
- 	.sg_tablesize	= LIBATA_DUMB_MAX_PRD,
- };
- 
--static struct ata_port_operations sc1200_port_ops = {
-+static const struct ata_port_operations sc1200_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.qc_prep 	= ata_bmdma_dumb_qc_prep,
- 	.qc_issue	= sc1200_qc_issue,
-diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
-index 093715c..aebe2ee 100644
---- a/drivers/ata/pata_scc.c
-+++ b/drivers/ata/pata_scc.c
-@@ -926,7 +926,7 @@ static struct scsi_host_template scc_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations scc_pata_ops = {
-+static const struct ata_port_operations scc_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.set_piomode		= scc_set_piomode,
-diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
-index e97b32f..464f5a5 100644
---- a/drivers/ata/pata_sch.c
-+++ b/drivers/ata/pata_sch.c
-@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations sch_pata_ops = {
-+static const struct ata_port_operations sch_pata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.cable_detect		= ata_cable_unknown,
- 	.set_piomode		= sch_set_piomode,
-diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
-index 86dd714..ac4a72d 100644
---- a/drivers/ata/pata_serverworks.c
-+++ b/drivers/ata/pata_serverworks.c
-@@ -300,7 +300,7 @@ static struct scsi_host_template serverworks_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations serverworks_osb4_port_ops = {
-+static const struct ata_port_operations serverworks_osb4_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= serverworks_cable_detect,
- 	.mode_filter	= serverworks_osb4_filter,
-@@ -308,7 +308,7 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
- 	.set_dmamode	= serverworks_set_dmamode,
- };
- 
--static struct ata_port_operations serverworks_csb_port_ops = {
-+static const struct ata_port_operations serverworks_csb_port_ops = {
- 	.inherits	= &serverworks_osb4_port_ops,
- 	.mode_filter	= serverworks_csb_filter,
- };
-diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
-index 00eefbd..cb5ad26 100644
---- a/drivers/ata/pata_sil680.c
-+++ b/drivers/ata/pata_sil680.c
-@@ -225,8 +225,7 @@ static struct scsi_host_template sil680_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--
--static struct ata_port_operations sil680_port_ops = {
-+static const struct ata_port_operations sil680_port_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.sff_exec_command	= sil680_sff_exec_command,
- 	.sff_irq_check		= sil680_sff_irq_check,
-diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
-index 60cea13..048e50e 100644
---- a/drivers/ata/pata_sis.c
-+++ b/drivers/ata/pata_sis.c
-@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations sis_133_for_sata_ops = {
-+static const struct ata_port_operations sis_133_for_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.set_piomode		= sis_133_set_piomode,
- 	.set_dmamode		= sis_133_set_dmamode,
- 	.cable_detect		= sis_133_cable_detect,
- };
- 
--static struct ata_port_operations sis_base_ops = {
-+static const struct ata_port_operations sis_base_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= sis_pre_reset,
- };
- 
--static struct ata_port_operations sis_133_ops = {
-+static const struct ata_port_operations sis_133_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_133_set_piomode,
- 	.set_dmamode		= sis_133_set_dmamode,
- 	.cable_detect		= sis_133_cable_detect,
- };
- 
--static struct ata_port_operations sis_133_early_ops = {
-+static const struct ata_port_operations sis_133_early_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_100_set_piomode,
- 	.set_dmamode		= sis_133_early_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_100_ops = {
-+static const struct ata_port_operations sis_100_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_100_set_piomode,
- 	.set_dmamode		= sis_100_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_66_ops = {
-+static const struct ata_port_operations sis_66_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_old_set_piomode,
- 	.set_dmamode		= sis_66_set_dmamode,
- 	.cable_detect		= sis_66_cable_detect,
- };
- 
--static struct ata_port_operations sis_old_ops = {
-+static const struct ata_port_operations sis_old_ops = {
- 	.inherits		= &sis_base_ops,
- 	.set_piomode		= sis_old_set_piomode,
- 	.set_dmamode		= sis_old_set_dmamode,
-diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
-index 7f5d020..258d918 100644
---- a/drivers/ata/pata_sl82c105.c
-+++ b/drivers/ata/pata_sl82c105.c
-@@ -241,7 +241,7 @@ static struct scsi_host_template sl82c105_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations sl82c105_port_ops = {
-+static const struct ata_port_operations sl82c105_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.qc_defer	= sl82c105_qc_defer,
- 	.bmdma_start 	= sl82c105_bmdma_start,
-diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
-index 0d1f89e..581bdb1 100644
---- a/drivers/ata/pata_triflex.c
-+++ b/drivers/ata/pata_triflex.c
-@@ -178,7 +178,7 @@ static struct scsi_host_template triflex_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations triflex_port_ops = {
-+static const struct ata_port_operations triflex_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.bmdma_start 	= triflex_bmdma_start,
- 	.bmdma_stop	= triflex_bmdma_stop,
-diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
-index ac8d7d9..9d02ee8 100644
---- a/drivers/ata/pata_via.c
-+++ b/drivers/ata/pata_via.c
-@@ -441,7 +441,7 @@ static struct scsi_host_template via_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations via_port_ops = {
-+static const struct ata_port_operations via_port_ops = {
- 	.inherits	= &ata_bmdma_port_ops,
- 	.cable_detect	= via_cable_detect,
- 	.set_piomode	= via_set_piomode,
-@@ -452,7 +452,7 @@ static struct ata_port_operations via_port_ops = {
- 	.mode_filter	= via_mode_filter,
- };
- 
--static struct ata_port_operations via_port_ops_noirq = {
-+static const struct ata_port_operations via_port_ops_noirq = {
- 	.inherits	= &via_port_ops,
- 	.sff_data_xfer	= ata_sff_data_xfer_noirq,
- };
-diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
-index adbe042..c13c7b7 100644
---- a/drivers/ata/pdc_adma.c
-+++ b/drivers/ata/pdc_adma.c
-@@ -146,7 +146,7 @@ static struct scsi_host_template adma_ata_sht = {
- 	.dma_boundary		= ADMA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations adma_ata_ops = {
-+static const struct ata_port_operations adma_ata_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c
-index 6cf57c5..41b1c88 100644
---- a/drivers/ata/sata_dwc_460ex.c
-+++ b/drivers/ata/sata_dwc_460ex.c
-@@ -1560,7 +1560,7 @@ static struct scsi_host_template sata_dwc_sht = {
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sata_dwc_ops = {
-+static const struct ata_port_operations sata_dwc_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.error_handler		= sata_dwc_error_handler,
-diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
-index b0214d0..dd6c277 100644
---- a/drivers/ata/sata_fsl.c
-+++ b/drivers/ata/sata_fsl.c
-@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fsl_sht = {
- 	.dma_boundary = ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sata_fsl_ops = {
-+static const struct ata_port_operations sata_fsl_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer = ata_std_qc_defer,
-diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
-index 83a4447..6652c51 100644
---- a/drivers/ata/sata_inic162x.c
-+++ b/drivers/ata/sata_inic162x.c
-@@ -705,7 +705,7 @@ static int inic_port_start(struct ata_port *ap)
- 	return 0;
- }
- 
--static struct ata_port_operations inic_port_ops = {
-+static const struct ata_port_operations inic_port_ops = {
- 	.inherits		= &sata_port_ops,
- 
- 	.check_atapi_dma	= inic_check_atapi_dma,
-diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
-index bf74a36..c76f715 100644
---- a/drivers/ata/sata_mv.c
-+++ b/drivers/ata/sata_mv.c
-@@ -663,7 +663,7 @@ static struct scsi_host_template mv6_sht = {
- 	.dma_boundary		= MV_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations mv5_ops = {
-+static const struct ata_port_operations mv5_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-@@ -683,7 +683,7 @@ static struct ata_port_operations mv5_ops = {
- 	.port_stop		= mv_port_stop,
- };
- 
--static struct ata_port_operations mv6_ops = {
-+static const struct ata_port_operations mv6_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 
- 	.lost_interrupt		= ATA_OP_NULL,
-@@ -717,7 +717,7 @@ static struct ata_port_operations mv6_ops = {
- 	.port_stop		= mv_port_stop,
- };
- 
--static struct ata_port_operations mv_iie_ops = {
-+static const struct ata_port_operations mv_iie_ops = {
- 	.inherits		= &mv6_ops,
- 	.dev_config		= ATA_OP_NULL,
- 	.qc_prep		= mv_qc_prep_iie,
-diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
-index 7254e25..4ca53ea 100644
---- a/drivers/ata/sata_nv.c
-+++ b/drivers/ata/sata_nv.c
-@@ -465,7 +465,7 @@ static struct scsi_host_template nv_swncq_sht = {
-  * 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 = {
-+static const struct ata_port_operations nv_generic_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.lost_interrupt		= ATA_OP_NULL,
- 	.scr_read		= nv_scr_read,
-@@ -473,20 +473,20 @@ static struct ata_port_operations nv_generic_ops = {
- 	.hardreset		= nv_hardreset,
- };
- 
--static struct ata_port_operations nv_nf2_ops = {
-+static const struct ata_port_operations nv_nf2_ops = {
- 	.inherits		= &nv_generic_ops,
- 	.freeze			= nv_nf2_freeze,
- 	.thaw			= nv_nf2_thaw,
- };
- 
--static struct ata_port_operations nv_ck804_ops = {
-+static const struct ata_port_operations nv_ck804_ops = {
- 	.inherits		= &nv_generic_ops,
- 	.freeze			= nv_ck804_freeze,
- 	.thaw			= nv_ck804_thaw,
- 	.host_stop		= nv_ck804_host_stop,
- };
- 
--static struct ata_port_operations nv_adma_ops = {
-+static const struct ata_port_operations nv_adma_ops = {
- 	.inherits		= &nv_ck804_ops,
- 
- 	.check_atapi_dma	= nv_adma_check_atapi_dma,
-@@ -510,7 +510,7 @@ static struct ata_port_operations nv_adma_ops = {
- 	.host_stop		= nv_adma_host_stop,
- };
- 
--static struct ata_port_operations nv_swncq_ops = {
-+static const struct ata_port_operations nv_swncq_ops = {
- 	.inherits		= &nv_generic_ops,
- 
- 	.qc_defer		= ata_std_qc_defer,
-diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
-index f03ad48..4b0fc9e 100644
---- a/drivers/ata/sata_promise.c
-+++ b/drivers/ata/sata_promise.c
-@@ -196,7 +196,7 @@ static const struct ata_port_operations pdc_common_ops = {
- 	.error_handler		= pdc_error_handler,
- };
- 
--static struct ata_port_operations pdc_sata_ops = {
-+static const struct ata_port_operations pdc_sata_ops = {
- 	.inherits		= &pdc_common_ops,
- 	.cable_detect		= pdc_sata_cable_detect,
- 	.freeze			= pdc_sata_freeze,
-@@ -209,14 +209,14 @@ static struct ata_port_operations pdc_sata_ops = {
- 
- /* First-generation chips need a more restrictive ->check_atapi_dma op,
-    and ->freeze/thaw that ignore the hotplug controls. */
--static struct ata_port_operations pdc_old_sata_ops = {
-+static const struct ata_port_operations pdc_old_sata_ops = {
- 	.inherits		= &pdc_sata_ops,
- 	.freeze			= pdc_freeze,
- 	.thaw			= pdc_thaw,
- 	.check_atapi_dma	= pdc_old_sata_check_atapi_dma,
- };
- 
--static struct ata_port_operations pdc_pata_ops = {
-+static const struct ata_port_operations pdc_pata_ops = {
- 	.inherits		= &pdc_common_ops,
- 	.cable_detect		= pdc_pata_cable_detect,
- 	.freeze			= pdc_freeze,
-diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
-index daeebf1..64fdbb8 100644
---- a/drivers/ata/sata_qstor.c
-+++ b/drivers/ata/sata_qstor.c
-@@ -131,7 +131,7 @@ static struct scsi_host_template qs_ata_sht = {
- 	.dma_boundary		= QS_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations qs_ata_ops = {
-+static const struct ata_port_operations qs_ata_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.check_atapi_dma	= qs_check_atapi_dma,
-diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
-index 3a4f842..24382d6 100644
---- a/drivers/ata/sata_sil.c
-+++ b/drivers/ata/sata_sil.c
-@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht = {
- 	.sg_tablesize		= ATA_MAX_PRD
- };
- 
--static struct ata_port_operations sil_ops = {
-+static const struct ata_port_operations sil_ops = {
- 	.inherits		= &ata_bmdma32_port_ops,
- 	.dev_config		= sil_dev_config,
- 	.set_mode		= sil_set_mode,
-diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
-index af41c6f..ef0b71d 100644
---- a/drivers/ata/sata_sil24.c
-+++ b/drivers/ata/sata_sil24.c
-@@ -389,7 +389,7 @@ static struct scsi_host_template sil24_sht = {
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= sil24_qc_defer,
-diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
-index 2bfe3ae..c80f777 100644
---- a/drivers/ata/sata_sis.c
-+++ b/drivers/ata/sata_sis.c
-@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations sis_ops = {
-+static const struct ata_port_operations sis_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.scr_read		= sis_scr_read,
- 	.scr_write		= sis_scr_write,
-diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
-index 7d9db4a..0954357 100644
---- a/drivers/ata/sata_svw.c
-+++ b/drivers/ata/sata_svw.c
-@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata_sht = {
- };
- 
- 
--static struct ata_port_operations k2_sata_ops = {
-+static const struct ata_port_operations k2_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_tf_load		= k2_sata_tf_load,
- 	.sff_tf_read		= k2_sata_tf_read,
-diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
-index bedd518..feb4028 100644
---- a/drivers/ata/sata_sx4.c
-+++ b/drivers/ata/sata_sx4.c
-@@ -249,7 +249,7 @@ static struct scsi_host_template pdc_sata_sht = {
- };
- 
- /* TODO: inherit from base port_ops after converting to new EH */
--static struct ata_port_operations pdc_20621_ops = {
-+static const struct ata_port_operations pdc_20621_ops = {
- 	.inherits		= &ata_sff_port_ops,
- 
- 	.check_atapi_dma	= pdc_check_atapi_dma,
-diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
-index b8578c3..41e5c92 100644
---- a/drivers/ata/sata_uli.c
-+++ b/drivers/ata/sata_uli.c
-@@ -80,7 +80,7 @@ static struct scsi_host_template uli_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations uli_ops = {
-+static const struct ata_port_operations uli_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.scr_read		= uli_scr_read,
- 	.scr_write		= uli_scr_write,
-diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
-index 8b677bb..d13c445 100644
---- a/drivers/ata/sata_via.c
-+++ b/drivers/ata/sata_via.c
-@@ -115,32 +115,32 @@ static struct scsi_host_template svia_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations svia_base_ops = {
-+static const struct ata_port_operations svia_base_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.sff_tf_load		= svia_tf_load,
- };
- 
--static struct ata_port_operations vt6420_sata_ops = {
-+static const struct ata_port_operations vt6420_sata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.freeze			= svia_noop_freeze,
- 	.prereset		= vt6420_prereset,
- 	.bmdma_start		= vt6420_bmdma_start,
- };
- 
--static struct ata_port_operations vt6421_pata_ops = {
-+static const struct ata_port_operations vt6421_pata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.cable_detect		= vt6421_pata_cable_detect,
- 	.set_piomode		= vt6421_set_pio_mode,
- 	.set_dmamode		= vt6421_set_dma_mode,
- };
- 
--static struct ata_port_operations vt6421_sata_ops = {
-+static const struct ata_port_operations vt6421_sata_ops = {
- 	.inherits		= &svia_base_ops,
- 	.scr_read		= svia_scr_read,
- 	.scr_write		= svia_scr_write,
- };
- 
--static struct ata_port_operations vt8251_ops = {
-+static const struct ata_port_operations vt8251_ops = {
- 	.inherits		= &svia_base_ops,
- 	.hardreset		= sata_std_hardreset,
- 	.scr_read		= vt8251_scr_read,
-diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
-index e079cf2..feb97bdb 100644
---- a/drivers/ata/sata_vsc.c
-+++ b/drivers/ata/sata_vsc.c
-@@ -300,7 +300,7 @@ static struct scsi_host_template vsc_sata_sht = {
- };
- 
- 
--static struct ata_port_operations vsc_sata_ops = {
-+static const struct ata_port_operations vsc_sata_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	/* The IRQ handling is not quite standard SFF behaviour so we
- 	   cannot use the default lost interrupt handler */
-diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
-index f9b983a..887b9d8 100644
---- a/drivers/atm/adummy.c
-+++ b/drivers/atm/adummy.c
-@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
+diff -urNp linux-3.0.3/drivers/ata/pata_arasan_cf.c linux-3.0.3/drivers/ata/pata_arasan_cf.c
+--- linux-3.0.3/drivers/ata/pata_arasan_cf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ata/pata_arasan_cf.c	2011-08-23 21:47:55.000000000 -0400
+@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
+ 	/* Handle platform specific quirks */
+ 	if (pdata->quirk) {
+ 		if (pdata->quirk & CF_BROKEN_PIO) {
+-			ap->ops->set_piomode = NULL;
++			pax_open_kernel();
++			*(void **)&ap->ops->set_piomode = NULL;
++			pax_close_kernel();
+ 			ap->pio_mask = 0;
+ 		}
+ 		if (pdata->quirk & CF_BROKEN_MWDMA)
+diff -urNp linux-3.0.3/drivers/atm/adummy.c linux-3.0.3/drivers/atm/adummy.c
+--- linux-3.0.3/drivers/atm/adummy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/adummy.c	2011-08-23 21:47:55.000000000 -0400
+@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
  		vcc->pop(vcc, skb);
  	else
  		dev_kfree_skb_any(skb);
@@ -25277,11 +22035,10 @@ index f9b983a..887b9d8 100644
  
  	return 0;
  }
-diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
-index 9f47e86..5539f36 100644
---- a/drivers/atm/ambassador.c
-+++ b/drivers/atm/ambassador.c
-@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
+diff -urNp linux-3.0.3/drivers/atm/ambassador.c linux-3.0.3/drivers/atm/ambassador.c
+--- linux-3.0.3/drivers/atm/ambassador.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/ambassador.c	2011-08-23 21:47:55.000000000 -0400
+@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
    // VC layer stats
@@ -25290,16 +22047,16 @@ index 9f47e86..5539f36 100644
    
    // free the descriptor
    kfree (tx_descr);
-@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
+@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, 
  	  dump_skb ("<<<", vc, skb);
  	  
  	  // VC layer stats
 -	  atomic_inc(&atm_vcc->stats->rx);
 +	  atomic_inc_unchecked(&atm_vcc->stats->rx);
  	  __net_timestamp(skb);
- 	  // end of our responsability
+ 	  // end of our responsibility
  	  atm_vcc->push (atm_vcc, skb);
-@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
+@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, 
        } else {
        	PRINTK (KERN_INFO, "dropped over-size frame");
  	// should we count this?
@@ -25308,7 +22065,7 @@ index 9f47e86..5539f36 100644
        }
        
      } else {
-@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
+@@ -1342,7 +1342,7 @@ static int amb_send (struct atm_vcc * at
    }
    
    if (check_area (skb->data, skb->len)) {
@@ -25317,11 +22074,10 @@ index 9f47e86..5539f36 100644
      return -ENOMEM; // ?
    }
    
-diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
-index 0b06250..9a7e2d8 100644
---- a/drivers/atm/atmtcp.c
-+++ b/drivers/atm/atmtcp.c
-@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+diff -urNp linux-3.0.3/drivers/atm/atmtcp.c linux-3.0.3/drivers/atm/atmtcp.c
+--- linux-3.0.3/drivers/atm/atmtcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/atmtcp.c	2011-08-23 21:47:55.000000000 -0400
+@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
  		if (dev_data) return 0;
@@ -25330,7 +22086,7 @@ index 0b06250..9a7e2d8 100644
  		return -ENOLINK;
  	}
  	size = skb->len+sizeof(struct atmtcp_hdr);
-@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc 
  	if (!new_skb) {
  		if (vcc->pop) vcc->pop(vcc,skb);
  		else dev_kfree_skb(skb);
@@ -25339,7 +22095,7 @@ index 0b06250..9a7e2d8 100644
  		return -ENOBUFS;
  	}
  	hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
-@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc 
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
  	out_vcc->push(out_vcc,new_skb);
@@ -25350,7 +22106,7 @@ index 0b06250..9a7e2d8 100644
  	return 0;
  }
  
-@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc 
  	out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
  	read_unlock(&vcc_sklist_lock);
  	if (!out_vcc) {
@@ -25359,7 +22115,7 @@ index 0b06250..9a7e2d8 100644
  		goto done;
  	}
  	skb_pull(skb,sizeof(struct atmtcp_hdr));
-@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
+@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc 
  	__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);
@@ -25370,10 +22126,9 @@ index 0b06250..9a7e2d8 100644
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
-index c495fae..96ed96d 100644
---- a/drivers/atm/eni.c
-+++ b/drivers/atm/eni.c
+diff -urNp linux-3.0.3/drivers/atm/eni.c linux-3.0.3/drivers/atm/eni.c
+--- linux-3.0.3/drivers/atm/eni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/eni.c	2011-08-23 21:47:55.000000000 -0400
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
  		DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
  		    vcc->dev->number);
@@ -25410,7 +22165,7 @@ index c495fae..96ed96d 100644
  	}
  	wake_up(&eni_dev->rx_wait);
  }
-@@ -1228,7 +1228,7 @@ static void dequeue_tx(struct atm_dev *dev)
+@@ -1228,7 +1228,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);
@@ -25419,11 +22174,10 @@ index c495fae..96ed96d 100644
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
-index 7d912ba..a2c6f7d 100644
---- a/drivers/atm/firestream.c
-+++ b/drivers/atm/firestream.c
-@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
+diff -urNp linux-3.0.3/drivers/atm/firestream.c linux-3.0.3/drivers/atm/firestream.c
+--- linux-3.0.3/drivers/atm/firestream.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/firestream.c	2011-08-23 21:47:55.000000000 -0400
+@@ -749,7 +749,7 @@ static void process_txdone_queue (struct
  				}
  			}
  
@@ -25432,7 +22186,7 @@ index 7d912ba..a2c6f7d 100644
  
  			fs_dprintk (FS_DEBUG_TXMEM, "i");
  			fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
-@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
+@@ -816,7 +816,7 @@ static void process_incoming (struct fs_
  #endif
  				skb_put (skb, qe->p1 & 0xffff); 
  				ATM_SKB(skb)->vcc = atm_vcc;
@@ -25441,7 +22195,7 @@ index 7d912ba..a2c6f7d 100644
  				__net_timestamp(skb);
  				fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
  				atm_vcc->push (atm_vcc, skb);
-@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
+@@ -837,12 +837,12 @@ static void process_incoming (struct fs_
  				kfree (pe);
  			}
  			if (atm_vcc)
@@ -25456,11 +22210,10 @@ index 7d912ba..a2c6f7d 100644
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
-index 44f7785..c1a5a5f 100644
---- a/drivers/atm/fore200e.c
-+++ b/drivers/atm/fore200e.c
-@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
+diff -urNp linux-3.0.3/drivers/atm/fore200e.c linux-3.0.3/drivers/atm/fore200e.c
+--- linux-3.0.3/drivers/atm/fore200e.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/fore200e.c	2011-08-23 21:47:55.000000000 -0400
+@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
  		/* check error condition */
  		if (*entry->status & STATUS_ERROR)
@@ -25472,7 +22225,7 @@ index 44f7785..c1a5a5f 100644
  	    }
  	}
  
-@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore2
      if (skb == NULL) {
  	DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
  
@@ -25481,7 +22234,7 @@ index 44f7785..c1a5a5f 100644
  	return -ENOMEM;
      } 
  
-@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
+@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore2
  
  	dev_kfree_skb_any(skb);
  
@@ -25498,7 +22251,7 @@ index 44f7785..c1a5a5f 100644
  
      ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
  
-@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
+@@ -1212,7 +1212,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);
@@ -25507,7 +22260,7 @@ index 44f7785..c1a5a5f 100644
  	    }
  	}
  
-@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struc
  		goto retry_here;
  	    }
  
@@ -25516,11 +22269,10 @@ index 44f7785..c1a5a5f 100644
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff --git a/drivers/atm/he.c b/drivers/atm/he.c
-index 6cf59bf..32c0bce 100644
---- a/drivers/atm/he.c
-+++ b/drivers/atm/he.c
-@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+diff -urNp linux-3.0.3/drivers/atm/he.c linux-3.0.3/drivers/atm/he.c
+--- linux-3.0.3/drivers/atm/he.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/he.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
  		if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
  			hprintk("HBUF_ERR!  (cid 0x%x)\n", cid);
@@ -25529,7 +22281,7 @@ index 6cf59bf..32c0bce 100644
  			goto return_host_buffers;
  		}
  
-@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  				RBRQ_LEN_ERR(he_dev->rbrq_head)
  							? "LEN_ERR" : "",
  							vcc->vpi, vcc->vci);
@@ -25538,7 +22290,7 @@ index 6cf59bf..32c0bce 100644
  			goto return_host_buffers;
  		}
  
-@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
+@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  		vcc->push(vcc, skb);
  		spin_lock(&he_dev->global_lock);
  
@@ -25547,7 +22299,7 @@ index 6cf59bf..32c0bce 100644
  
  return_host_buffers:
  		++pdus_assembled;
-@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
+@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, str
  					tpd->vcc->pop(tpd->vcc, tpd->skb);
  				else
  					dev_kfree_skb_any(tpd->skb);
@@ -25556,7 +22308,7 @@ index 6cf59bf..32c0bce 100644
  			}
  			pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
  			return;
-@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -25565,7 +22317,7 @@ index 6cf59bf..32c0bce 100644
  		return -EINVAL;
  	}
  
-@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -25574,7 +22326,7 @@ index 6cf59bf..32c0bce 100644
  		return -EINVAL;
  	}
  #endif
-@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
  			vcc->pop(vcc, skb);
  		else
  			dev_kfree_skb_any(skb);
@@ -25583,7 +22335,7 @@ index 6cf59bf..32c0bce 100644
  		spin_unlock_irqrestore(&he_dev->global_lock, flags);
  		return -ENOMEM;
  	}
-@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
  					vcc->pop(vcc, skb);
  				else
  					dev_kfree_skb_any(skb);
@@ -25592,7 +22344,7 @@ index 6cf59bf..32c0bce 100644
  				spin_unlock_irqrestore(&he_dev->global_lock, flags);
  				return -ENOMEM;
  			}
-@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_b
  	__enqueue_tpd(he_dev, tpd, cid);
  	spin_unlock_irqrestore(&he_dev->global_lock, flags);
  
@@ -25601,20 +22353,19 @@ index 6cf59bf..32c0bce 100644
  
  	return 0;
  }
-diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
-index 24761e1..f7c5a40 100644
---- a/drivers/atm/horizon.c
-+++ b/drivers/atm/horizon.c
-@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
+diff -urNp linux-3.0.3/drivers/atm/horizon.c linux-3.0.3/drivers/atm/horizon.c
+--- linux-3.0.3/drivers/atm/horizon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/horizon.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
  	{
  	  struct atm_vcc * vcc = 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
+ 	  // end of our responsibility
  	  vcc->push (vcc, skb);
-@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
+@@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const
  	dev->tx_iovec = NULL;
  	
  	// VC layer stats
@@ -25623,11 +22374,10 @@ index 24761e1..f7c5a40 100644
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
-index bfb7fee..8608631 100644
---- a/drivers/atm/idt77252.c
-+++ b/drivers/atm/idt77252.c
-@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
+diff -urNp linux-3.0.3/drivers/atm/idt77252.c linux-3.0.3/drivers/atm/idt77252.c
+--- linux-3.0.3/drivers/atm/idt77252.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/idt77252.c	2011-08-23 21:47:55.000000000 -0400
+@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
  		else
  			dev_kfree_skb(skb);
  
@@ -25636,7 +22386,7 @@ index bfb7fee..8608631 100644
  	}
  
  	atomic_dec(&scq->used);
-@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1074,13 +1074,13 @@ dequeue_rx(struct idt77252_dev *card, st
  			if ((sb = dev_alloc_skb(64)) == NULL) {
  				printk("%s: Can't allocate buffers for aal0.\n",
  				       card->name);
@@ -25652,7 +22402,7 @@ index bfb7fee..8608631 100644
  				dev_kfree_skb(sb);
  				break;
  			}
-@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1097,7 +1097,7 @@ dequeue_rx(struct idt77252_dev *card, st
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -25661,7 +22411,7 @@ index bfb7fee..8608631 100644
  
  			cell += ATM_CELL_PAYLOAD;
  		}
-@@ -1134,13 +1134,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1134,13 +1134,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);
@@ -25677,7 +22427,7 @@ index bfb7fee..8608631 100644
  			return;
  		}
  		if (skb_queue_len(&rpp->queue) > 1) {
-@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1151,7 +1151,7 @@ dequeue_rx(struct idt77252_dev *card, st
  				RXPRINTK("%s: Can't alloc RX skb.\n",
  					 card->name);
  				recycle_rx_pool_skb(card, rpp);
@@ -25686,7 +22436,7 @@ index bfb7fee..8608631 100644
  				return;
  			}
  			if (!atm_charge(vcc, skb->truesize)) {
-@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1170,7 +1170,7 @@ dequeue_rx(struct idt77252_dev *card, st
  			__net_timestamp(skb);
  
  			vcc->push(vcc, skb);
@@ -25695,7 +22445,7 @@ index bfb7fee..8608631 100644
  
  			return;
  		}
-@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
+@@ -1192,7 +1192,7 @@ dequeue_rx(struct idt77252_dev *card, st
  		__net_timestamp(skb);
  
  		vcc->push(vcc, skb);
@@ -25704,7 +22454,7 @@ index bfb7fee..8608631 100644
  
  		if (skb->truesize > SAR_FB_SIZE_3)
  			add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
-@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *car
  		if (vcc->qos.aal != ATM_AAL0) {
  			RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
  				card->name, vpi, vci);
@@ -25721,7 +22471,7 @@ index bfb7fee..8608631 100644
  			goto drop;
  		}
  
-@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
+@@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *car
  		ATM_SKB(sb)->vcc = vcc;
  		__net_timestamp(sb);
  		vcc->push(vcc, sb);
@@ -25730,7 +22480,7 @@ index bfb7fee..8608631 100644
  
  drop:
  		skb_pull(queue, 64);
-@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
  	if (vc == NULL) {
  		printk("%s: NULL connection in send().\n", card->name);
@@ -25746,7 +22496,7 @@ index bfb7fee..8608631 100644
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -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);
@@ -25763,7 +22513,7 @@ index bfb7fee..8608631 100644
  		dev_kfree_skb(skb);
  		return -EINVAL;
  	}
-@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
+@@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, s
  
  	err = queue_skb(card, vc, skb, oam);
  	if (err) {
@@ -25772,7 +22522,7 @@ index bfb7fee..8608631 100644
  		dev_kfree_skb(skb);
  		return err;
  	}
-@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
+@@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, v
  	skb = dev_alloc_skb(64);
  	if (!skb) {
  		printk("%s: Out of memory in send_oam().\n", card->name);
@@ -25781,11 +22531,10 @@ index bfb7fee..8608631 100644
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
-index d80d51b..762a8d4 100644
---- a/drivers/atm/iphase.c
-+++ b/drivers/atm/iphase.c
-@@ -1124,7 +1124,7 @@ static int rx_pkt(struct atm_dev *dev)
+diff -urNp linux-3.0.3/drivers/atm/iphase.c linux-3.0.3/drivers/atm/iphase.c
+--- linux-3.0.3/drivers/atm/iphase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/iphase.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1120,7 +1120,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	status = (u_short) (buf_desc_ptr->desc_mode);  
  	if (status & (RX_CER | RX_PTE | RX_OFL))  
  	{  
@@ -25794,7 +22543,7 @@ index d80d51b..762a8d4 100644
  		IF_ERR(printk("IA: bad packet, dropping it");)  
                  if (status & RX_CER) { 
                      IF_ERR(printk(" cause: packet CRC error\n");)
-@@ -1147,7 +1147,7 @@ static int rx_pkt(struct atm_dev *dev)
+@@ -1143,7 +1143,7 @@ static int rx_pkt(struct atm_dev *dev)  
  	len = dma_addr - buf_addr;  
          if (len > iadev->rx_buf_sz) {
             printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
@@ -25803,7 +22552,7 @@ index d80d51b..762a8d4 100644
  	   goto out_free_desc;
          }
  		  
-@@ -1297,7 +1297,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+@@ -1293,7 +1293,7 @@ static void rx_dle_intr(struct atm_dev *
            ia_vcc = INPH_IA_VCC(vcc);
            if (ia_vcc == NULL)
            {
@@ -25812,7 +22561,7 @@ index d80d51b..762a8d4 100644
               dev_kfree_skb_any(skb);
               atm_return(vcc, atm_guess_pdu2truesize(len));
               goto INCR_DLE;
-@@ -1309,7 +1309,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+@@ -1305,7 +1305,7 @@ static void rx_dle_intr(struct atm_dev *
            if ((length > iadev->rx_buf_sz) || (length > 
                                (skb->len - sizeof(struct cpcs_trailer))))
            {
@@ -25821,7 +22570,7 @@ index d80d51b..762a8d4 100644
               IF_ERR(printk("rx_dle_intr: Bad  AAL5 trailer %d (skb len %d)", 
                                                              length, skb->len);)
               dev_kfree_skb_any(skb);
-@@ -1325,7 +1325,7 @@ static void rx_dle_intr(struct atm_dev *dev)
+@@ -1321,7 +1321,7 @@ static void rx_dle_intr(struct atm_dev *
  
  	  IF_RX(printk("rx_dle_intr: skb push");)  
  	  vcc->push(vcc,skb);  
@@ -25830,7 +22579,7 @@ index d80d51b..762a8d4 100644
            iadev->rx_pkt_cnt++;
        }  
  INCR_DLE:
-@@ -2807,15 +2807,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
+@@ -2801,15 +2801,15 @@ static int ia_ioctl(struct atm_dev *dev,
           {
               struct k_sonet_stats *stats;
               stats = &PRIV(_ia_dev[board])->sonet_stats;
@@ -25855,7 +22604,7 @@ index d80d51b..762a8d4 100644
           }
              ia_cmds.status = 0;
              break;
-@@ -2920,7 +2920,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -2914,7 +2914,7 @@ static int ia_pkt_tx (struct atm_vcc *vc
  	if ((desc == 0) || (desc > iadev->num_tx_desc))  
  	{  
  		IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) 
@@ -25864,7 +22613,7 @@ index d80d51b..762a8d4 100644
  		if (vcc->pop)   
  		    vcc->pop(vcc, skb);   
  		else  
-@@ -3025,14 +3025,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
+@@ -3019,14 +3019,14 @@ static int ia_pkt_tx (struct atm_vcc *vc
          ATM_DESC(skb) = vcc->vci;
          skb_queue_tail(&iadev->tx_dma_q, skb);
  
@@ -25881,11 +22630,10 @@ index d80d51b..762a8d4 100644
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
-index 52880c8..9151062 100644
---- a/drivers/atm/lanai.c
-+++ b/drivers/atm/lanai.c
-@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
+diff -urNp linux-3.0.3/drivers/atm/lanai.c linux-3.0.3/drivers/atm/lanai.c
+--- linux-3.0.3/drivers/atm/lanai.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/lanai.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1303,7 +1303,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);
@@ -25894,7 +22642,7 @@ index 52880c8..9151062 100644
  }
  
  /* Try to fill the buffer - don't call unless there is backlog */
-@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
+@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc
  	ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
  	__net_timestamp(skb);
  	lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
@@ -25903,7 +22651,7 @@ index 52880c8..9151062 100644
      out:
  	lvcc->rx.buf.ptr = end;
  	cardvcc_write(lvcc, endptr, vcc_rxreadptr);
-@@ -1668,7 +1668,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1668,7 +1668,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++;
@@ -25912,7 +22660,7 @@ index 52880c8..9151062 100644
  		return 0;
  	}
  	if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
-@@ -1680,7 +1680,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1680,7 +1680,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);
@@ -25921,7 +22669,7 @@ index 52880c8..9151062 100644
  		lvcc->stats.x.aal5.service_trash++;
  		bytes = (SERVICE_GET_END(s) * 16) -
  		    (((unsigned long) lvcc->rx.buf.ptr) -
-@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1692,7 +1692,7 @@ static int handle_service(struct lanai_d
  	}
  	if (s & SERVICE_STREAM) {
  		read_unlock(&vcc_sklist_lock);
@@ -25930,7 +22678,7 @@ index 52880c8..9151062 100644
  		lvcc->stats.x.aal5.service_stream++;
  		printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
  		    "PDU on VCI %d!\n", lanai->number, vci);
-@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
+@@ -1700,7 +1700,7 @@ static int handle_service(struct lanai_d
  		return 0;
  	}
  	DPRINTK("got rx crc error on vci %d\n", vci);
@@ -25939,11 +22687,10 @@ index 52880c8..9151062 100644
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
-index 6b313ee..3891287 100644
---- a/drivers/atm/nicstar.c
-+++ b/drivers/atm/nicstar.c
-@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+diff -urNp linux-3.0.3/drivers/atm/nicstar.c linux-3.0.3/drivers/atm/nicstar.c
+--- linux-3.0.3/drivers/atm/nicstar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/nicstar.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
  	if ((vc = (vc_map *) vcc->dev_data) == NULL) {
  		printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
  		       card->index);
@@ -25952,7 +22699,7 @@ index 6b313ee..3891287 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, 
  	if (!vc->tx) {
  		printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
  		       card->index);
@@ -25961,7 +22708,7 @@ index 6b313ee..3891287 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, 
  	if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
  		printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
  		       card->index);
@@ -25978,7 +22725,7 @@ index 6b313ee..3891287 100644
  		dev_kfree_skb_any(skb);
  		return -EINVAL;
  	}
-@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
+@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, 
  	}
  
  	if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
@@ -25992,7 +22739,7 @@ index 6b313ee..3891287 100644
  
  	return 0;
  }
-@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns
  				printk
  				    ("nicstar%d: Can't allocate buffers for aal0.\n",
  				     card->index);
@@ -26009,7 +22756,7 @@ index 6b313ee..3891287 100644
  				dev_kfree_skb_any(sb);
  				break;
  			}
-@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns
  			ATM_SKB(sb)->vcc = vcc;
  			__net_timestamp(sb);
  			vcc->push(vcc, sb);
@@ -26018,7 +22765,7 @@ index 6b313ee..3891287 100644
  			cell += ATM_CELL_PAYLOAD;
  		}
  
-@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns
  			if (iovb == NULL) {
  				printk("nicstar%d: Out of iovec buffers.\n",
  				       card->index);
@@ -26027,7 +22774,7 @@ index 6b313ee..3891287 100644
  				recycle_rx_buf(card, skb);
  				return;
  			}
-@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns
  		   small or large buffer itself. */
  	} else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
  		printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
@@ -26036,7 +22783,7 @@ index 6b313ee..3891287 100644
  		recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  				      NS_MAX_IOVECS);
  		NS_PRV_IOVCNT(iovb) = 0;
-@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns
  			    ("nicstar%d: Expected a small buffer, and this is not one.\n",
  			     card->index);
  			which_list(card, skb);
@@ -26045,7 +22792,7 @@ index 6b313ee..3891287 100644
  			recycle_rx_buf(card, skb);
  			vc->rx_iov = NULL;
  			recycle_iov_buf(card, iovb);
-@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns
  			    ("nicstar%d: Expected a large buffer, and this is not one.\n",
  			     card->index);
  			which_list(card, skb);
@@ -26054,7 +22801,7 @@ index 6b313ee..3891287 100644
  			recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  					      NS_PRV_IOVCNT(iovb));
  			vc->rx_iov = NULL;
-@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns
  				printk(" - PDU size mismatch.\n");
  			else
  				printk(".\n");
@@ -26063,7 +22810,7 @@ index 6b313ee..3891287 100644
  			recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
  					      NS_PRV_IOVCNT(iovb));
  			vc->rx_iov = NULL;
-@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns
  			/* skb points to a small buffer */
  			if (!atm_charge(vcc, skb->truesize)) {
  				push_rxbufs(card, skb);
@@ -26072,7 +22819,7 @@ index 6b313ee..3891287 100644
  			} else {
  				skb_put(skb, len);
  				dequeue_sm_buf(card, skb);
-@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns
  				ATM_SKB(skb)->vcc = vcc;
  				__net_timestamp(skb);
  				vcc->push(vcc, skb);
@@ -26081,7 +22828,7 @@ index 6b313ee..3891287 100644
  			}
  		} else if (NS_PRV_IOVCNT(iovb) == 2) {	/* One small plus one large buffer */
  			struct sk_buff *sb;
-@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns
  			if (len <= NS_SMBUFSIZE) {
  				if (!atm_charge(vcc, sb->truesize)) {
  					push_rxbufs(card, sb);
@@ -26090,7 +22837,7 @@ index 6b313ee..3891287 100644
  				} else {
  					skb_put(sb, len);
  					dequeue_sm_buf(card, sb);
-@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns
  					ATM_SKB(sb)->vcc = vcc;
  					__net_timestamp(sb);
  					vcc->push(vcc, sb);
@@ -26099,7 +22846,7 @@ index 6b313ee..3891287 100644
  				}
  
  				push_rxbufs(card, skb);
-@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns
  
  				if (!atm_charge(vcc, skb->truesize)) {
  					push_rxbufs(card, skb);
@@ -26108,7 +22855,7 @@ index 6b313ee..3891287 100644
  				} else {
  					dequeue_lg_buf(card, skb);
  #ifdef NS_USE_DESTRUCTORS
-@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns
  					ATM_SKB(skb)->vcc = vcc;
  					__net_timestamp(skb);
  					vcc->push(vcc, skb);
@@ -26117,7 +22864,7 @@ index 6b313ee..3891287 100644
  				}
  
  				push_rxbufs(card, sb);
-@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns
  					printk
  					    ("nicstar%d: Out of huge buffers.\n",
  					     card->index);
@@ -26126,7 +22873,7 @@ index 6b313ee..3891287 100644
  					recycle_iovec_rx_bufs(card,
  							      (struct iovec *)
  							      iovb->data,
-@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns
  					card->hbpool.count++;
  				} else
  					dev_kfree_skb_any(hb);
@@ -26135,7 +22882,7 @@ index 6b313ee..3891287 100644
  			} else {
  				/* Copy the small buffer to the huge buffer */
  				sb = (struct sk_buff *)iov->iov_base;
-@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
+@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns
  #endif /* NS_USE_DESTRUCTORS */
  				__net_timestamp(hb);
  				vcc->push(vcc, hb);
@@ -26144,11 +22891,10 @@ index 6b313ee..3891287 100644
  			}
  		}
  
-diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
-index b836e11..6dad74c 100644
---- a/drivers/atm/solos-pci.c
-+++ b/drivers/atm/solos-pci.c
-@@ -715,7 +715,7 @@ void solos_bh(unsigned long card_arg)
+diff -urNp linux-3.0.3/drivers/atm/solos-pci.c linux-3.0.3/drivers/atm/solos-pci.c
+--- linux-3.0.3/drivers/atm/solos-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/solos-pci.c	2011-08-23 21:48:14.000000000 -0400
+@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
  				}
  				atm_charge(vcc, skb->truesize);
  				vcc->push(vcc, skb);
@@ -26157,7 +22903,7 @@ index b836e11..6dad74c 100644
  				break;
  
  			case PKT_STATUS:
-@@ -900,6 +900,8 @@ static int print_buffer(struct sk_buff *buf)
+@@ -899,6 +899,8 @@ static int print_buffer(struct sk_buff *
  	char msg[500];
  	char item[10];
  
@@ -26166,7 +22912,7 @@ index b836e11..6dad74c 100644
  	len = buf->len;
  	for (i = 0; i < len; i++){
  		if(i % 8 == 0)
-@@ -1009,7 +1011,7 @@ static uint32_t fpga_tx(struct solos_card *card)
+@@ -1008,7 +1010,7 @@ static uint32_t fpga_tx(struct solos_car
  			vcc = SKB_CB(oldskb)->vcc;
  
  			if (vcc) {
@@ -26175,10 +22921,9 @@ index b836e11..6dad74c 100644
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
-index 41c56ea..83df600 100644
---- a/drivers/atm/suni.c
-+++ b/drivers/atm/suni.c
+diff -urNp linux-3.0.3/drivers/atm/suni.c linux-3.0.3/drivers/atm/suni.c
+--- linux-3.0.3/drivers/atm/suni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/suni.c	2011-08-23 21:47:55.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -26190,11 +22935,10 @@ index 41c56ea..83df600 100644
  
  
  static void suni_hz(unsigned long from_timer)
-diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
-index c45ae05..ed6f0c4 100644
---- a/drivers/atm/uPD98402.c
-+++ b/drivers/atm/uPD98402.c
-@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
+diff -urNp linux-3.0.3/drivers/atm/uPD98402.c linux-3.0.3/drivers/atm/uPD98402.c
+--- linux-3.0.3/drivers/atm/uPD98402.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/uPD98402.c	2011-08-23 21:47:55.000000000 -0400
+@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
  	struct sonet_stats tmp;
   	int error = 0;
  
@@ -26203,7 +22947,7 @@ index c45ae05..ed6f0c4 100644
  	sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
  	if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
  	if (zero && !error) {
-@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
+@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev
  
  
  #define ADD_LIMITED(s,v) \
@@ -26216,7 +22960,7 @@ index c45ae05..ed6f0c4 100644
  
  
  static void stat_event(struct atm_dev *dev)
-@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
+@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev 
  		if (reason & uPD98402_INT_PFM) stat_event(dev);
  		if (reason & uPD98402_INT_PCO) {
  			(void) GET(PCOCR); /* clear interrupt cause */
@@ -26225,7 +22969,7 @@ index c45ae05..ed6f0c4 100644
  			    &PRIV(dev)->sonet_stats.uncorr_hcs);
  		}
  		if ((reason & uPD98402_INT_RFO) && 
-@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
+@@ -222,9 +222,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 */
@@ -26238,11 +22982,10 @@ index c45ae05..ed6f0c4 100644
  	return 0;
  }
  
-diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
-index 6249179..b062f45 100644
---- a/drivers/atm/zatm.c
-+++ b/drivers/atm/zatm.c
-@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
+diff -urNp linux-3.0.3/drivers/atm/zatm.c linux-3.0.3/drivers/atm/zatm.c
+--- linux-3.0.3/drivers/atm/zatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/atm/zatm.c	2011-08-23 21:47:55.000000000 -0400
+@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		}
  		if (!size) {
  			dev_kfree_skb_irq(skb);
@@ -26251,7 +22994,7 @@ index 6249179..b062f45 100644
  			continue;
  		}
  		if (!atm_charge(vcc,skb->truesize)) {
-@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
+@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
  		skb->len = size;
  		ATM_SKB(skb)->vcc = vcc;
  		vcc->push(vcc,skb);
@@ -26260,7 +23003,7 @@ index 6249179..b062f45 100644
  	}
  	zout(pos & 0xffff,MTA(mbx));
  #if 0 /* probably a stupid idea */
-@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
+@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD
  			skb_queue_head(&zatm_vcc->backlog,skb);
  			break;
  		}
@@ -26269,73 +23012,48 @@ index 6249179..b062f45 100644
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
-index 8ec406d..f46eb8d 100644
---- a/drivers/base/power/wakeup.c
-+++ b/drivers/base/power/wakeup.c
-@@ -25,7 +25,7 @@
- bool events_check_enabled;
- 
- /* The counter of registered wakeup events. */
--static atomic_t event_count = ATOMIC_INIT(0);
-+static atomic_unchecked_t event_count = ATOMIC_INIT(0);
- /* A preserved old value of event_count. */
- static unsigned int saved_count;
- /* The counter of wakeup events being processed. */
-@@ -399,7 +399,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
- 	 * pm_save_wakeup_count() don't see the old value of event_count and
- 	 * events_in_progress equal to zero at the same time.
- 	 */
--	atomic_inc(&event_count);
-+	atomic_inc_unchecked(&event_count);
- 	smp_mb__before_atomic_dec();
- 	atomic_dec(&events_in_progress);
- }
-@@ -556,7 +556,7 @@ bool pm_wakeup_pending(void)
+diff -urNp linux-3.0.3/drivers/base/power/wakeup.c linux-3.0.3/drivers/base/power/wakeup.c
+--- linux-3.0.3/drivers/base/power/wakeup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/base/power/wakeup.c	2011-08-23 21:47:55.000000000 -0400
+@@ -29,14 +29,14 @@ bool events_check_enabled;
+  * They need to be modified together atomically, so it's better to use one
+  * atomic variable to hold them both.
+  */
+-static atomic_t combined_event_count = ATOMIC_INIT(0);
++static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
  
- 	spin_lock_irqsave(&events_lock, flags);
- 	if (events_check_enabled) {
--		ret = ((unsigned int)atomic_read(&event_count) != saved_count)
-+		ret = ((unsigned int)atomic_read_unchecked(&event_count) != saved_count)
- 			|| atomic_read(&events_in_progress);
- 		events_check_enabled = !ret;
- 	}
-@@ -590,7 +590,7 @@ bool pm_get_wakeup_count(unsigned int *count)
- 	}
+ #define IN_PROGRESS_BITS	(sizeof(int) * 4)
+ #define MAX_IN_PROGRESS		((1 << IN_PROGRESS_BITS) - 1)
  
- 	ret = !atomic_read(&events_in_progress);
--	*count = atomic_read(&event_count);
-+	*count = atomic_read_unchecked(&event_count);
- 	return ret;
+ static void split_counters(unsigned int *cnt, unsigned int *inpr)
+ {
+-	unsigned int comb = atomic_read(&combined_event_count);
++	unsigned int comb = atomic_read_unchecked(&combined_event_count);
+ 
+ 	*cnt = (comb >> IN_PROGRESS_BITS);
+ 	*inpr = comb & MAX_IN_PROGRESS;
+@@ -350,7 +350,7 @@ static void wakeup_source_activate(struc
+ 	ws->last_time = ktime_get();
+ 
+ 	/* Increment the counter of events in progress. */
+-	atomic_inc(&combined_event_count);
++	atomic_inc_unchecked(&combined_event_count);
  }
  
-@@ -608,7 +608,7 @@ bool pm_save_wakeup_count(unsigned int count)
- 	bool ret = false;
- 
- 	spin_lock_irq(&events_lock);
--	if (count == (unsigned int)atomic_read(&event_count)
-+	if (count == (unsigned int)atomic_read_unchecked(&event_count)
- 	    && !atomic_read(&events_in_progress)) {
- 		saved_count = count;
- 		events_check_enabled = true;
-diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
-index 1f286ab..ec4ec0e 100644
---- a/drivers/block/DAC960.c
-+++ b/drivers/block/DAC960.c
-@@ -1979,6 +1979,8 @@ static bool DAC960_V1_ReadDeviceConfiguration(DAC960_Controller_T
-   unsigned long flags;
-   int Channel, TargetID;
+ /**
+@@ -440,7 +440,7 @@ static void wakeup_source_deactivate(str
+ 	 * Increment the counter of registered wakeup events and decrement the
+ 	 * couter of wakeup events in progress simultaneously.
+ 	 */
+-	atomic_add(MAX_IN_PROGRESS, &combined_event_count);
++	atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
+ }
  
-+  pax_track_stack();
-+
-   if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
- 		DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
- 			sizeof(DAC960_SCSI_Inquiry_T) +
-diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 9279272..a827aac 100644
---- a/drivers/block/cciss.c
-+++ b/drivers/block/cciss.c
-@@ -1112,6 +1112,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
+ /**
+diff -urNp linux-3.0.3/drivers/block/cciss.c linux-3.0.3/drivers/block/cciss.c
+--- linux-3.0.3/drivers/block/cciss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/cciss.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
  	int err;
  	u32 cp;
  
@@ -26344,24 +23062,288 @@ index 9279272..a827aac 100644
  	err = 0;
  	err |=
  	    copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
-diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
-index 946dad4..4bdc9e0 100644
---- a/drivers/block/cpqarray.c
-+++ b/drivers/block/cpqarray.c
-@@ -911,6 +911,8 @@ static void do_ida_request(struct request_queue *q)
+@@ -2986,7 +2988,7 @@ static void start_io(ctlr_info_t *h)
+ 	while (!list_empty(&h->reqQ)) {
+ 		c = list_entry(h->reqQ.next, CommandList_struct, list);
+ 		/* can't do anything if fifo is full */
+-		if ((h->access.fifo_full(h))) {
++		if ((h->access->fifo_full(h))) {
+ 			dev_warn(&h->pdev->dev, "fifo full\n");
+ 			break;
+ 		}
+@@ -2996,7 +2998,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
+ 
+ 		/* Tell the controller execute command */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Put job onto the completed Q */
+ 		addQ(&h->cmpQ, c);
+@@ -3422,17 +3424,17 @@ startio:
+ 
+ static inline unsigned long get_next_completion(ctlr_info_t *h)
+ {
+-	return h->access.command_completed(h);
++	return h->access->command_completed(h);
+ }
+ 
+ static inline int interrupt_pending(ctlr_info_t *h)
+ {
+-	return h->access.intr_pending(h);
++	return h->access->intr_pending(h);
+ }
+ 
+ static inline long interrupt_not_for_us(ctlr_info_t *h)
+ {
+-	return ((h->access.intr_pending(h) == 0) ||
++	return ((h->access->intr_pending(h) == 0) ||
+ 		(h->interrupts_enabled == 0));
+ }
+ 
+@@ -3465,7 +3467,7 @@ static inline u32 next_command(ctlr_info
+ 	u32 a;
+ 
+ 	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
+-		return h->access.command_completed(h);
++		return h->access->command_completed(h);
+ 
+ 	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
+ 		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
+@@ -4020,7 +4022,7 @@ static void __devinit cciss_put_controll
+ 		trans_support & CFGTBL_Trans_use_short_tags);
+ 
+ 	/* Change the access methods to the performant access methods */
+-	h->access = SA5_performant_access;
++	h->access = &SA5_performant_access;
+ 	h->transMethod = CFGTBL_Trans_Performant;
+ 
+ 	return;
+@@ -4292,7 +4294,7 @@ static int __devinit cciss_pci_init(ctlr
+ 	if (prod_index < 0)
+ 		return -ENODEV;
+ 	h->product_name = products[prod_index].product_name;
+-	h->access = *(products[prod_index].access);
++	h->access = products[prod_index].access;
+ 
+ 	if (cciss_board_disabled(h)) {
+ 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
+@@ -5002,7 +5004,7 @@ reinit_after_soft_reset:
+ 	}
+ 
+ 	/* make sure the board interrupts are off */
+-	h->access.set_intr_mask(h, CCISS_INTR_OFF);
++	h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 	rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
+ 	if (rc)
+ 		goto clean2;
+@@ -5054,7 +5056,7 @@ reinit_after_soft_reset:
+ 		 * fake ones to scoop up any residual completions.
+ 		 */
+ 		spin_lock_irqsave(&h->lock, flags);
+-		h->access.set_intr_mask(h, CCISS_INTR_OFF);
++		h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 		spin_unlock_irqrestore(&h->lock, flags);
+ 		free_irq(h->intr[PERF_MODE_INT], h);
+ 		rc = cciss_request_irq(h, cciss_msix_discard_completions,
+@@ -5074,9 +5076,9 @@ reinit_after_soft_reset:
+ 		dev_info(&h->pdev->dev, "Board READY.\n");
+ 		dev_info(&h->pdev->dev,
+ 			"Waiting for stale completions to drain.\n");
+-		h->access.set_intr_mask(h, CCISS_INTR_ON);
++		h->access->set_intr_mask(h, CCISS_INTR_ON);
+ 		msleep(10000);
+-		h->access.set_intr_mask(h, CCISS_INTR_OFF);
++		h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 
+ 		rc = controller_reset_failed(h->cfgtable);
+ 		if (rc)
+@@ -5099,7 +5101,7 @@ reinit_after_soft_reset:
+ 	cciss_scsi_setup(h);
+ 
+ 	/* Turn the interrupts on so we can service requests */
+-	h->access.set_intr_mask(h, CCISS_INTR_ON);
++	h->access->set_intr_mask(h, CCISS_INTR_ON);
+ 
+ 	/* Get the firmware version */
+ 	inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
+@@ -5171,7 +5173,7 @@ static void cciss_shutdown(struct pci_de
+ 	kfree(flush_buf);
+ 	if (return_code != IO_OK)
+ 		dev_warn(&h->pdev->dev, "Error flushing cache\n");
+-	h->access.set_intr_mask(h, CCISS_INTR_OFF);
++	h->access->set_intr_mask(h, CCISS_INTR_OFF);
+ 	free_irq(h->intr[PERF_MODE_INT], h);
+ }
+ 
+diff -urNp linux-3.0.3/drivers/block/cciss.h linux-3.0.3/drivers/block/cciss.h
+--- linux-3.0.3/drivers/block/cciss.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/block/cciss.h	2011-08-23 21:47:55.000000000 -0400
+@@ -100,7 +100,7 @@ struct ctlr_info
+ 	/* information about each logical volume */
+ 	drive_info_struct *drv[CISS_MAX_LUN];
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	/* queue and queue Info */ 
+ 	struct list_head reqQ;
+diff -urNp linux-3.0.3/drivers/block/cpqarray.c linux-3.0.3/drivers/block/cpqarray.c
+--- linux-3.0.3/drivers/block/cpqarray.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/cpqarray.c	2011-08-23 21:48:14.000000000 -0400
+@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
+ 	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]))
+ 	{
+@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_c
+ 	add_timer(&hba[i]->timer);
+ 
+ 	/* 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);
+ 
+ 	for(j=0; j<NWD; j++) {
+ 		struct gendisk *disk = ida_gendisk[i][j];
+@@ -694,7 +694,7 @@ DBGINFO(
+ 	for(i=0; i<NR_PRODUCTS; i++) {
+ 		if (board_id == products[i].board_id) {
+ 			c->product_name = products[i].product_name;
+-			c->access = *(products[i].access);
++			c->access = products[i].access;
+ 			break;
+ 		}
+ 	}
+@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detec
+ 		hba[ctlr]->intr = intr;
+ 		sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
+ 		hba[ctlr]->product_name = products[j].product_name;
+-		hba[ctlr]->access = *(products[j].access);
++		hba[ctlr]->access = products[j].access;
+ 		hba[ctlr]->ctlr = ctlr;
+ 		hba[ctlr]->board_id = board_id;
+ 		hba[ctlr]->pci_dev = NULL; /* not PCI */
+@@ -911,6 +911,8 @@ static void do_ida_request(struct reques
  	struct scatterlist tmp_sg[SG_MAX];
  	int i, dir, seg;
  
 +	pax_track_stack();
 +
- 	if (blk_queue_plugged(q))
- 		goto startio;
+ queue_next:
+ 	creq = blk_peek_request(q);
+ 	if (!creq)
+@@ -980,7 +982,7 @@ static void start_io(ctlr_info_t *h)
+ 
+ 	while((c = h->reqQ) != NULL) {
+ 		/* Can't do anything if we're busy */
+-		if (h->access.fifo_full(h) == 0)
++		if (h->access->fifo_full(h) == 0)
+ 			return;
+ 
+ 		/* Get the first entry from the request Q */
+@@ -988,7 +990,7 @@ static void start_io(ctlr_info_t *h)
+ 		h->Qdepth--;
+ 	
+ 		/* Tell the controller to do our bidding */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Get onto the completion Q */
+ 		addQ(&h->cmpQ, c);
+@@ -1050,7 +1052,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	unsigned long flags;
+ 	__u32 a,a1;
+ 
+-	istat = h->access.intr_pending(h);
++	istat = h->access->intr_pending(h);
+ 	/* Is this interrupt for us? */
+ 	if (istat == 0)
+ 		return IRQ_NONE;
+@@ -1061,7 +1063,7 @@ static irqreturn_t do_ida_intr(int irq, 
+ 	 */
+ 	spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
+ 	if (istat & FIFO_NOT_EMPTY) {
+-		while((a = h->access.command_completed(h))) {
++		while((a = h->access->command_completed(h))) {
+ 			a1 = a; a &= ~3;
+ 			if ((c = h->cmpQ) == NULL)
+ 			{  
+@@ -1449,11 +1451,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 = 200000; i > 0; i--) {
+-		temp = info_p->access.fifo_full(info_p);
++		temp = info_p->access->fifo_full(info_p);
+ 		if (temp != 0) {
+ 			break;
+ 		}
+@@ -1466,7 +1468,7 @@ DBG(
+ 	/*
+ 	 * Send the cmd
+ 	 */
+-	info_p->access.submit_command(info_p, c);
++	info_p->access->submit_command(info_p, c);
+ 	complete = pollcomplete(ctlr);
+ 	
+ 	pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr, 
+@@ -1549,9 +1551,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);
+ 
+ 	for(i=0; i<NWD; i++) {
+ 		struct gendisk *disk = ida_gendisk[ctlr][i];
+@@ -1591,7 +1593,7 @@ static int pollcomplete(int ctlr)
+ 	/* Wait (up to 2 seconds) for a command to complete */
+ 
+ 	for (i = 200000; i > 0; i--) {
+-		done = hba[ctlr]->access.command_completed(hba[ctlr]);
++		done = hba[ctlr]->access->command_completed(hba[ctlr]);
+ 		if (done == 0) {
+ 			udelay(10);	/* a short fixed delay */
+ 		} else
+diff -urNp linux-3.0.3/drivers/block/cpqarray.h linux-3.0.3/drivers/block/cpqarray.h
+--- linux-3.0.3/drivers/block/cpqarray.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/cpqarray.h	2011-08-23 21:47:55.000000000 -0400
+@@ -99,7 +99,7 @@ struct ctlr_info {
+ 	drv_info_t	drv[NWD];
+ 	struct proc_dir_entry *proc;
+ 
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	cmdlist_t *reqQ;
+ 	cmdlist_t *cmpQ;
+diff -urNp linux-3.0.3/drivers/block/DAC960.c linux-3.0.3/drivers/block/DAC960.c
+--- linux-3.0.3/drivers/block/DAC960.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/DAC960.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
+   unsigned long flags;
+   int Channel, TargetID;
  
-diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
-index 3803a03..b10983a 100644
---- a/drivers/block/drbd/drbd_int.h
-+++ b/drivers/block/drbd/drbd_int.h
-@@ -742,7 +742,7 @@ struct drbd_request;
++  pax_track_stack();
++
+   if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
+ 		DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
+ 			sizeof(DAC960_SCSI_Inquiry_T) +
+diff -urNp linux-3.0.3/drivers/block/drbd/drbd_int.h linux-3.0.3/drivers/block/drbd/drbd_int.h
+--- linux-3.0.3/drivers/block/drbd/drbd_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/drbd/drbd_int.h	2011-08-23 21:47:55.000000000 -0400
+@@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
  	unsigned int barrier_nr;
@@ -26370,7 +23352,7 @@ index 3803a03..b10983a 100644
  	atomic_t active;     /* increased on every req. added, and dec on every finished. */
  	unsigned long flags;
  };
-@@ -1083,7 +1083,7 @@ struct drbd_conf {
+@@ -1109,7 +1109,7 @@ struct drbd_conf {
  	void *int_dig_in;
  	void *int_dig_vv;
  	wait_queue_head_t seq_wait;
@@ -26379,11 +23361,10 @@ index 3803a03..b10983a 100644
  	unsigned int peer_seq;
  	spinlock_t peer_seq_lock;
  	unsigned int minor;
-diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
-index 29cd0dc..73a73b1 100644
---- a/drivers/block/drbd/drbd_main.c
-+++ b/drivers/block/drbd/drbd_main.c
-@@ -2217,7 +2217,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
+diff -urNp linux-3.0.3/drivers/block/drbd/drbd_main.c linux-3.0.3/drivers/block/drbd/drbd_main.c
+--- linux-3.0.3/drivers/block/drbd/drbd_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/drbd/drbd_main.c	2011-08-23 21:47:55.000000000 -0400
+@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
  	p.sector   = sector;
  	p.block_id = block_id;
  	p.blksize  = blksize;
@@ -26391,8 +23372,8 @@ index 29cd0dc..73a73b1 100644
 +	p.seq_num  = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
  
  	if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
- 		return FALSE;
-@@ -2517,7 +2517,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
+ 		return false;
+@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *m
  	p.sector   = cpu_to_be64(req->sector);
  	p.block_id = (unsigned long)req;
  	p.seq_num  = cpu_to_be32(req->seq_num =
@@ -26401,7 +23382,7 @@ index 29cd0dc..73a73b1 100644
  
  	dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
  
-@@ -2795,7 +2795,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
+@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_
  	atomic_set(&mdev->unacked_cnt, 0);
  	atomic_set(&mdev->local_cnt, 0);
  	atomic_set(&mdev->net_cnt, 0);
@@ -26410,7 +23391,7 @@ index 29cd0dc..73a73b1 100644
  	atomic_set(&mdev->pp_in_use, 0);
  	atomic_set(&mdev->pp_in_use_by_net, 0);
  	atomic_set(&mdev->rs_sect_in, 0);
-@@ -2866,8 +2866,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
+@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf 
  				mdev->receiver.t_state);
  
  	/* no need to lock it, I'm the only thread alive */
@@ -26421,11 +23402,10 @@ index 29cd0dc..73a73b1 100644
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
-index 8cbfaa6..6b1c645 100644
---- a/drivers/block/drbd/drbd_nl.c
-+++ b/drivers/block/drbd/drbd_nl.c
-@@ -2238,7 +2238,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
+diff -urNp linux-3.0.3/drivers/block/drbd/drbd_nl.c linux-3.0.3/drivers/block/drbd/drbd_nl.c
+--- linux-3.0.3/drivers/block/drbd/drbd_nl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/drbd/drbd_nl.c	2011-08-23 21:47:55.000000000 -0400
+@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
  	module_put(THIS_MODULE);
  }
  
@@ -26434,7 +23414,7 @@ index 8cbfaa6..6b1c645 100644
  
  static unsigned short *
  __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
-@@ -2309,7 +2309,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
+@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *
  	cn_reply->id.idx = CN_IDX_DRBD;
  	cn_reply->id.val = CN_VAL_DRBD;
  
@@ -26443,7 +23423,7 @@ index 8cbfaa6..6b1c645 100644
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-@@ -2341,7 +2341,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
+@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_co
  	cn_reply->id.idx = CN_IDX_DRBD;
  	cn_reply->id.val = CN_VAL_DRBD;
  
@@ -26452,7 +23432,7 @@ index 8cbfaa6..6b1c645 100644
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-@@ -2416,7 +2416,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
+@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mde
  	cn_reply->id.idx = CN_IDX_DRBD;
  	cn_reply->id.val = CN_VAL_DRBD;
  
@@ -26461,7 +23441,7 @@ index 8cbfaa6..6b1c645 100644
  	cn_reply->ack = 0; // not used here.
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char*)tl - (char*)reply->tag_list);
-@@ -2455,7 +2455,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
+@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drb
  	cn_reply->id.idx = CN_IDX_DRBD;
  	cn_reply->id.val = CN_VAL_DRBD;
  
@@ -26470,11 +23450,10 @@ index 8cbfaa6..6b1c645 100644
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
-index 24487d4..0ef9f70 100644
---- a/drivers/block/drbd/drbd_receiver.c
-+++ b/drivers/block/drbd/drbd_receiver.c
-@@ -907,7 +907,7 @@ retry:
+diff -urNp linux-3.0.3/drivers/block/drbd/drbd_receiver.c linux-3.0.3/drivers/block/drbd/drbd_receiver.c
+--- linux-3.0.3/drivers/block/drbd/drbd_receiver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/drbd/drbd_receiver.c	2011-08-23 21:47:55.000000000 -0400
+@@ -894,7 +894,7 @@ retry:
  	sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
  	sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
  
@@ -26483,7 +23462,7 @@ index 24487d4..0ef9f70 100644
  	mdev->peer_seq = 0;
  
  	drbd_thread_start(&mdev->asender);
-@@ -1001,7 +1001,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
+@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish
  	do {
  		next_epoch = NULL;
  
@@ -26492,7 +23471,7 @@ index 24487d4..0ef9f70 100644
  
  		switch (ev & ~EV_CLEANUP) {
  		case EV_PUT:
-@@ -1036,7 +1036,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
+@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish
  					rv = FE_DESTROYED;
  			} else {
  				epoch->flags = 0;
@@ -26501,7 +23480,7 @@ index 24487d4..0ef9f70 100644
  				/* atomic_set(&epoch->active, 0); is already zero */
  				if (rv == FE_STILL_LIVE)
  					rv = FE_RECYCLED;
-@@ -1197,14 +1197,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
+@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_c
  		drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
  		drbd_flush(mdev);
  
@@ -26518,7 +23497,7 @@ index 24487d4..0ef9f70 100644
  
  		D_ASSERT(atomic_read(&epoch->active) == 0);
  		D_ASSERT(epoch->flags == 0);
-@@ -1216,11 +1216,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
+@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_c
  	}
  
  	epoch->flags = 0;
@@ -26532,7 +23511,7 @@ index 24487d4..0ef9f70 100644
  		list_add(&epoch->list, &mdev->current_epoch->list);
  		mdev->current_epoch = epoch;
  		mdev->epochs++;
-@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
+@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf
  		spin_unlock(&mdev->peer_seq_lock);
  
  		drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
@@ -26541,7 +23520,7 @@ index 24487d4..0ef9f70 100644
  		return drbd_drain_block(mdev, data_size);
  	}
  
-@@ -1683,7 +1683,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
+@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf
  
  	spin_lock(&mdev->epoch_lock);
  	e->epoch = mdev->current_epoch;
@@ -26550,16 +23529,7 @@ index 24487d4..0ef9f70 100644
  	atomic_inc(&e->epoch->active);
  	spin_unlock(&mdev->epoch_lock);
  
-@@ -1866,7 +1866,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
- out_interrupted:
- 	/* yes, the epoch_size now is imbalanced.
- 	 * but we drop the connection anyways, so we don't have a chance to
--	 * receive a barrier... atomic_inc(&mdev->epoch_size); */
-+	 * receive a barrier... atomic_inc_unchecked(&mdev->epoch_size); */
- 	put_ldev(mdev);
- 	drbd_free_ee(mdev, e);
- 	return FALSE;
-@@ -3821,7 +3821,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
+@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_
  	D_ASSERT(list_empty(&mdev->done_ee));
  
  	/* ok, no more ee's on the fly, it is safe to reset the epoch_size */
@@ -26568,11 +23538,10 @@ index 24487d4..0ef9f70 100644
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
-index e6fc716..e8f59e5 100644
---- a/drivers/block/nbd.c
-+++ b/drivers/block/nbd.c
-@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
+diff -urNp linux-3.0.3/drivers/block/nbd.c linux-3.0.3/drivers/block/nbd.c
+--- linux-3.0.3/drivers/block/nbd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/block/nbd.c	2011-08-23 21:48:14.000000000 -0400
+@@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
  	struct kvec iov;
  	sigset_t blocked, oldset;
  
@@ -26581,7 +23550,7 @@ index e6fc716..e8f59e5 100644
  	if (unlikely(!sock)) {
  		printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
  		       lo->disk->disk_name, (send ? "send" : "recv"));
-@@ -571,6 +573,8 @@ static void do_nbd_request(struct request_queue *q)
+@@ -572,6 +574,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)
  {
@@ -26590,33 +23559,10 @@ index e6fc716..e8f59e5 100644
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index b7980a83..fda31bb 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
- 
- 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
-@@ -1132,6 +1133,7 @@ config DEVPORT
- 	bool
- 	depends on !M68K
- 	depends on ISA || PCI
-+	depends on !GRKERNSEC_KMEM
- 	default y
- 
- source "drivers/s390/char/Kconfig"
-diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
-index 2e04433..22afc64 100644
---- a/drivers/char/agp/frontend.c
-+++ b/drivers/char/agp/frontend.c
-@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
+diff -urNp linux-3.0.3/drivers/char/agp/frontend.c linux-3.0.3/drivers/char/agp/frontend.c
+--- linux-3.0.3/drivers/char/agp/frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/agp/frontend.c	2011-08-23 21:47:55.000000000 -0400
+@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
  	if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
  		return -EFAULT;
  
@@ -26625,10 +23571,9 @@ index 2e04433..22afc64 100644
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
-index 095ab90..afad0a4 100644
---- a/drivers/char/briq_panel.c
-+++ b/drivers/char/briq_panel.c
+diff -urNp linux-3.0.3/drivers/char/briq_panel.c linux-3.0.3/drivers/char/briq_panel.c
+--- linux-3.0.3/drivers/char/briq_panel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/briq_panel.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -26645,7 +23590,7 @@ index 095ab90..afad0a4 100644
  
  static void update_vfd(void)
  {
-@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
+@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct f
  	if (!vfd_is_open)
  		return -EBUSY;
  
@@ -26662,7 +23607,7 @@ index 095ab90..afad0a4 100644
  		if (esc) {
  			set_led(c);
  			esc = 0;
-@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
+@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct f
  		buf++;
  	}
  	update_vfd();
@@ -26670,11 +23615,10 @@ index 095ab90..afad0a4 100644
  
  	return len;
  }
-diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
-index f773a9d..65cd683 100644
---- a/drivers/char/genrtc.c
-+++ b/drivers/char/genrtc.c
-@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
+diff -urNp linux-3.0.3/drivers/char/genrtc.c linux-3.0.3/drivers/char/genrtc.c
+--- linux-3.0.3/drivers/char/genrtc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/genrtc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
  	switch (cmd) {
  
  	case RTC_PLL_GET:
@@ -26682,11 +23626,10 @@ index f773a9d..65cd683 100644
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
-index 7066e80..2f854be 100644
---- a/drivers/char/hpet.c
-+++ b/drivers/char/hpet.c
-@@ -553,7 +553,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
+diff -urNp linux-3.0.3/drivers/char/hpet.c linux-3.0.3/drivers/char/hpet.c
+--- linux-3.0.3/drivers/char/hpet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/hpet.c	2011-08-23 21:47:55.000000000 -0400
+@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
  static int
@@ -26695,11 +23638,10 @@ index 7066e80..2f854be 100644
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index 38223e9..8841897 100644
---- a/drivers/char/ipmi/ipmi_msghandler.c
-+++ b/drivers/char/ipmi/ipmi_msghandler.c
-@@ -414,7 +414,7 @@ struct ipmi_smi {
+diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c	2011-08-23 21:48:14.000000000 -0400
+@@ -415,7 +415,7 @@ struct ipmi_smi {
  	struct proc_dir_entry *proc_dir;
  	char                  proc_dir_name[10];
  
@@ -26708,7 +23650,7 @@ index 38223e9..8841897 100644
  
  	/*
  	 * run_to_completion duplicate of smb_info, smi_info
-@@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
+@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
  
  
  #define ipmi_inc_stat(intf, stat) \
@@ -26720,7 +23662,7 @@ index 38223e9..8841897 100644
  
  static int is_lan_addr(struct ipmi_addr *addr)
  {
-@@ -2844,7 +2844,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
+@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_ha
  	INIT_LIST_HEAD(&intf->cmd_rcvrs);
  	init_waitqueue_head(&intf->waitq);
  	for (i = 0; i < IPMI_NUM_STATS; i++)
@@ -26729,7 +23671,7 @@ index 38223e9..8841897 100644
  
  	intf->proc_dir = NULL;
  
-@@ -4196,6 +4196,8 @@ static void send_panic_events(char *str)
+@@ -4220,6 +4220,8 @@ static void send_panic_events(char *str)
  	struct ipmi_smi_msg               smi_msg;
  	struct ipmi_recv_msg              recv_msg;
  
@@ -26738,11 +23680,10 @@ index 38223e9..8841897 100644
  	si = (struct ipmi_system_interface_addr *) &addr;
  	si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
  	si->channel = IPMI_BMC_CHANNEL;
-diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
-index 62787e3..861f9d3 100644
---- a/drivers/char/ipmi/ipmi_si_intf.c
-+++ b/drivers/char/ipmi/ipmi_si_intf.c
-@@ -285,7 +285,7 @@ struct smi_info {
+diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c	2011-08-23 21:47:55.000000000 -0400
+@@ -277,7 +277,7 @@ struct smi_info {
  	unsigned char slave_addr;
  
  	/* Counters and things for the proc filesystem. */
@@ -26751,7 +23692,7 @@ index 62787e3..861f9d3 100644
  
  	struct task_struct *thread;
  
-@@ -294,9 +294,9 @@ struct smi_info {
+@@ -286,9 +286,9 @@ struct smi_info {
  };
  
  #define smi_inc_stat(smi, stat) \
@@ -26763,7 +23704,7 @@ index 62787e3..861f9d3 100644
  
  #define SI_MAX_PARMS 4
  
-@@ -3202,7 +3202,7 @@ static int try_smi_init(struct smi_info *new_smi)
+@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info 
  	atomic_set(&new_smi->req_events, 0);
  	new_smi->run_to_completion = 0;
  	for (i = 0; i < SI_NUM_STATS; i++)
@@ -26772,48 +23713,30 @@ index 62787e3..861f9d3 100644
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
-index 7c6de4c..e19e6ac 100644
---- a/drivers/char/istallion.c
-+++ b/drivers/char/istallion.c
-@@ -186,7 +186,6 @@ static struct ktermios		stli_deftermios = {
-  *	re-used for each stats call.
-  */
- static comstats_t	stli_comstats;
--static combrd_t		stli_brdstats;
- static struct asystats	stli_cdkstats;
- 
- /*****************************************************************************/
-@@ -4005,6 +4004,7 @@ static int stli_getbrdstats(combrd_t __user *bp)
- {
- 	struct stlibrd *brdp;
- 	unsigned int i;
-+	combrd_t stli_brdstats;
- 
- 	if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
- 		return -EFAULT;
-@@ -4226,6 +4226,8 @@ static int stli_getportstruct(struct stliport __user *arg)
- 	struct stliport stli_dummyport;
- 	struct stliport *portp;
+diff -urNp linux-3.0.3/drivers/char/Kconfig linux-3.0.3/drivers/char/Kconfig
+--- linux-3.0.3/drivers/char/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
-+	pax_track_stack();
-+
- 	if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
- 		return -EFAULT;
- 	portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
-@@ -4248,6 +4250,8 @@ static int stli_getbrdstruct(struct stlibrd __user *arg)
- 	struct stlibrd stli_dummybrd;
- 	struct stlibrd *brdp;
+ 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
+@@ -596,6 +597,7 @@ config DEVPORT
+ 	bool
+ 	depends on !M68K
+ 	depends on ISA || PCI
++	depends on !GRKERNSEC_KMEM
+ 	default y
  
-+	pax_track_stack();
-+
- 	if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
- 		return -EFAULT;
- 	if (stli_dummybrd.brdnr >= STL_MAXBRDS)
-diff --git a/drivers/char/mem.c b/drivers/char/mem.c
-index 1256454..490ed2f 100644
---- a/drivers/char/mem.c
-+++ b/drivers/char/mem.c
+ source "drivers/s390/char/Kconfig"
+diff -urNp linux-3.0.3/drivers/char/mem.c linux-3.0.3/drivers/char/mem.c
+--- linux-3.0.3/drivers/char/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -26833,7 +23756,7 @@ index 1256454..490ed2f 100644
  static inline unsigned long size_inside_page(unsigned long start,
  					     unsigned long size)
  {
-@@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -65,9 +70,13 @@ static inline int range_is_allowed(unsig
  
  	while (cursor < to) {
  		if (!devmem_is_allowed(pfn)) {
@@ -26847,7 +23770,7 @@ index 1256454..490ed2f 100644
  			return 0;
  		}
  		cursor += PAGE_SIZE;
-@@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
+@@ -75,6 +84,11 @@ static inline int range_is_allowed(unsig
  	}
  	return 1;
  }
@@ -26859,7 +23782,7 @@ index 1256454..490ed2f 100644
  #else
  static inline int range_is_allowed(unsigned long pfn, unsigned long size)
  {
-@@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -117,6 +131,7 @@ static ssize_t read_mem(struct file *fil
  
  	while (count > 0) {
  		unsigned long remaining;
@@ -26867,7 +23790,7 @@ index 1256454..490ed2f 100644
  
  		sz = size_inside_page(p, count);
  
-@@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
+@@ -132,7 +147,23 @@ static ssize_t read_mem(struct file *fil
  		if (!ptr)
  			return -EFAULT;
  
@@ -26892,7 +23815,7 @@ index 1256454..490ed2f 100644
  		unxlate_dev_mem_ptr(p, ptr);
  		if (remaining)
  			return -EFAULT;
-@@ -398,9 +429,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -395,9 +426,8 @@ static ssize_t read_kmem(struct file *fi
  			 size_t count, loff_t *ppos)
  {
  	unsigned long p = *ppos;
@@ -26903,7 +23826,7 @@ index 1256454..490ed2f 100644
  
  	read = 0;
  	if (p < (unsigned long) high_memory) {
-@@ -422,6 +452,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -419,6 +449,8 @@ static ssize_t read_kmem(struct file *fi
  		}
  #endif
  		while (low_count > 0) {
@@ -26912,7 +23835,7 @@ index 1256454..490ed2f 100644
  			sz = size_inside_page(p, low_count);
  
  			/*
-@@ -431,7 +463,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
+@@ -428,7 +460,22 @@ static ssize_t read_kmem(struct file *fi
  			 */
  			kbuf = xlate_dev_kmem_ptr((char *)p);
  
@@ -26936,7 +23859,7 @@ index 1256454..490ed2f 100644
  				return -EFAULT;
  			buf += sz;
  			p += sz;
-@@ -857,6 +904,9 @@ static const struct memdev {
+@@ -866,6 +913,9 @@ static const struct memdev {
  #ifdef CONFIG_CRASH_DUMP
  	[12] = { "oldmem", 0, &oldmem_fops, NULL },
  #endif
@@ -26946,11 +23869,10 @@ index 1256454..490ed2f 100644
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
-index 166f1e7..c579d46 100644
---- a/drivers/char/nvram.c
-+++ b/drivers/char/nvram.c
-@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
+diff -urNp linux-3.0.3/drivers/char/nvram.c linux-3.0.3/drivers/char/nvram.c
+--- linux-3.0.3/drivers/char/nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/nvram.c	2011-08-23 21:47:55.000000000 -0400
+@@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
  	spin_unlock_irq(&rtc_lock);
  
@@ -26959,137 +23881,10 @@ index 166f1e7..c579d46 100644
  		return -EFAULT;
  
  	*ppos = i;
-diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
-index f5eb28b..490c9e0 100644
---- a/drivers/char/pcmcia/ipwireless/tty.c
-+++ b/drivers/char/pcmcia/ipwireless/tty.c
-@@ -29,6 +29,7 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_flip.h>
- #include <linux/uaccess.h>
-+#include <asm/local.h>
- 
- #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 *linux_tty, struct file *filp)
- 		mutex_unlock(&tty->ipw_tty_mutex);
- 		return -ENODEV;
- 	}
--	if (tty->open_count == 0)
-+	if (local_read(&tty->open_count) == 0)
- 		tty->tx_bytes_queued = 0;
- 
--	tty->open_count++;
-+	local_inc(&tty->open_count);
- 
- 	tty->linux_tty = linux_tty;
- 	linux_tty->driver_data = tty;
-@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
- 
- static void do_ipw_close(struct ipw_tty *tty)
- {
--	tty->open_count--;
--
--	if (tty->open_count == 0) {
-+	if (local_dec_return(&tty->open_count) == 0) {
- 		struct tty_struct *linux_tty = tty->linux_tty;
- 
- 		if (linux_tty != NULL) {
-@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
- 		return;
- 
- 	mutex_lock(&tty->ipw_tty_mutex);
--	if (tty->open_count == 0) {
-+	if (local_read(&tty->open_count) == 0) {
- 		mutex_unlock(&tty->ipw_tty_mutex);
- 		return;
- 	}
-@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
- 		return;
- 	}
- 
--	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 *linux_tty,
- 		return -ENODEV;
- 
- 	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_struct *linux_tty)
- 	if (!tty)
- 		return -ENODEV;
- 
--	if (!tty->open_count)
-+	if (!local_read(&tty->open_count))
- 		return -EINVAL;
- 
- 	room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
-@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
- 	if (!tty)
- 		return 0;
- 
--	if (!tty->open_count)
-+	if (!local_read(&tty->open_count))
- 		return 0;
- 
- 	return tty->tx_bytes_queued;
-@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
- 	if (!tty)
- 		return -ENODEV;
- 
--	if (!tty->open_count)
-+	if (!local_read(&tty->open_count))
- 		return -EINVAL;
- 
- 	return get_control_lines(tty);
-@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
- 	if (!tty)
- 		return -ENODEV;
- 
--	if (!tty->open_count)
-+	if (!local_read(&tty->open_count))
- 		return -EINVAL;
- 
- 	return set_control_lines(tty, set, clear);
-@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
- 	if (!tty)
- 		return -ENODEV;
- 
--	if (!tty->open_count)
-+	if (!local_read(&tty->open_count))
- 		return -EINVAL;
- 
- 	/* FIXME: Exactly how is the tty object locked here .. */
-@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
- 				   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 --git a/drivers/char/random.c b/drivers/char/random.c
-index 72a4fcb..b0c09f2 100644
---- a/drivers/char/random.c
-+++ b/drivers/char/random.c
-@@ -254,8 +254,13 @@
+diff -urNp linux-3.0.3/drivers/char/random.c linux-3.0.3/drivers/char/random.c
+--- linux-3.0.3/drivers/char/random.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/char/random.c	2011-08-23 21:48:14.000000000 -0400
+@@ -261,8 +261,13 @@
  /*
   * Configuration information
   */
@@ -27103,7 +23898,7 @@ index 72a4fcb..b0c09f2 100644
  #define SEC_XFER_SIZE 512
  #define EXTRACT_SIZE 10
  
-@@ -293,10 +298,17 @@ static struct poolinfo {
+@@ -300,10 +305,17 @@ static struct poolinfo {
  	int poolwords;
  	int tap1, tap2, tap3, tap4, tap5;
  } poolinfo_table[] = {
@@ -27121,7 +23916,7 @@ index 72a4fcb..b0c09f2 100644
  #if 0
  	/* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1  -- 115 */
  	{ 2048,	1638,	1231,	819,	411,	1 },
-@@ -902,7 +914,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
+@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(stru
  
  		extract_buf(r, tmp);
  		i = min_t(int, nbytes, EXTRACT_SIZE);
@@ -27130,7 +23925,7 @@ index 72a4fcb..b0c09f2 100644
  			ret = -EFAULT;
  			break;
  		}
-@@ -1207,7 +1219,7 @@ EXPORT_SYMBOL(generate_random_uuid);
+@@ -1214,7 +1226,7 @@ EXPORT_SYMBOL(generate_random_uuid);
  #include <linux/sysctl.h>
  
  static int min_read_thresh = 8, min_write_thresh;
@@ -27139,23 +23934,9 @@ index 72a4fcb..b0c09f2 100644
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
-index 3e4e73a..a45a6ba 100644
---- a/drivers/char/rocket.c
-+++ b/drivers/char/rocket.c
-@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info, struct rocket_ports __user *retports)
- 	struct rocket_ports tmp;
- 	int board;
- 
-+	pax_track_stack();
-+
- 	if (!retports)
- 		return -EFAULT;
- 	memset(&tmp, 0, sizeof (tmp));
-diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
-index 79e36c8..dbfcc65 100644
---- a/drivers/char/sonypi.c
-+++ b/drivers/char/sonypi.c
+diff -urNp linux-3.0.3/drivers/char/sonypi.c linux-3.0.3/drivers/char/sonypi.c
+--- linux-3.0.3/drivers/char/sonypi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/sonypi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -27173,7 +23954,7 @@ index 79e36c8..dbfcc65 100644
  	int model;
  	struct input_dev *input_jog_dev;
  	struct input_dev *input_key_dev;
-@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
+@@ -898,7 +899,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);
@@ -27182,7 +23963,7 @@ index 79e36c8..dbfcc65 100644
  	mutex_unlock(&sonypi_device.lock);
  	return 0;
  }
-@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
+@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode
  {
  	mutex_lock(&sonypi_device.lock);
  	/* Flush input queue on first open */
@@ -27194,46 +23975,10 @@ index 79e36c8..dbfcc65 100644
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
-index 461a5a0..e4cf4dc 100644
---- a/drivers/char/stallion.c
-+++ b/drivers/char/stallion.c
-@@ -2407,6 +2407,8 @@ static int stl_getportstruct(struct stlport __user *arg)
- 	struct stlport	stl_dummyport;
- 	struct stlport	*portp;
- 
-+	pax_track_stack();
-+
- 	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
- 		return -EFAULT;
- 	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
-index 7beb0e2..c2ec85b 100644
---- a/drivers/char/tpm/tpm.c
-+++ b/drivers/char/tpm/tpm.c
-@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
- 		    chip->vendor.req_complete_val)
- 			goto out_recv;
- 
--		if ((status == chip->vendor.req_canceled)) {
-+		if (status == chip->vendor.req_canceled) {
- 			dev_err(chip->dev, "Operation Canceled\n");
- 			rc = -ECANCELED;
- 			goto out;
-@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
- 
- 	struct tpm_chip *chip = dev_get_drvdata(dev);
- 
-+	pax_track_stack();
-+
- 	tpm_cmd.header.in = tpm_readpubek_header;
- 	err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
- 			"attempting to read the PUBEK");
-diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
-index 0636520..b29fde6 100644
---- a/drivers/char/tpm/tpm_bios.c
-+++ b/drivers/char/tpm/tpm_bios.c
-@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
+diff -urNp linux-3.0.3/drivers/char/tpm/tpm_bios.c linux-3.0.3/drivers/char/tpm/tpm_bios.c
+--- linux-3.0.3/drivers/char/tpm/tpm_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/tpm/tpm_bios.c	2011-08-23 21:47:55.000000000 -0400
+@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
  	if ((event->event_type == 0 && event->event_size == 0) ||
@@ -27242,7 +23987,7 @@ index 0636520..b29fde6 100644
  		return NULL;
  
  	return addr;
-@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
+@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(
  		return NULL;
  
  	if ((event->event_type == 0 && event->event_size == 0) ||
@@ -27251,7 +23996,7 @@ index 0636520..b29fde6 100644
  		return NULL;
  
  	(*pos)++;
-@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
+@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_
  	int i;
  
  	for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
@@ -27261,7 +24006,7 @@ index 0636520..b29fde6 100644
  
  	return 0;
  }
-@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log *log)
+@@ -410,6 +411,11 @@ static int read_log(struct tpm_bios_log 
  	log->bios_event_log_end = log->bios_event_log + len;
  
  	virt = acpi_os_map_memory(start, len);
@@ -27273,24 +24018,31 @@ index 0636520..b29fde6 100644
  
  	memcpy(log->bios_event_log, virt, len);
  
-diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
-index 0310ffa..be7917ec 100644
---- a/drivers/cpuidle/sysfs.c
-+++ b/drivers/cpuidle/sysfs.c
-@@ -300,7 +300,7 @@ static struct kobj_type ktype_state_cpuidle = {
- 	.release = cpuidle_state_sysfs_release,
- };
+diff -urNp linux-3.0.3/drivers/char/tpm/tpm.c linux-3.0.3/drivers/char/tpm/tpm.c
+--- linux-3.0.3/drivers/char/tpm/tpm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/char/tpm/tpm.c	2011-08-23 21:48:14.000000000 -0400
+@@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
+ 		    chip->vendor.req_complete_val)
+ 			goto out_recv;
  
--static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
-+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
- {
- 	kobject_put(&device->kobjs[i]->kobj);
- 	wait_for_completion(&device->kobjs[i]->kobj_unregister);
-diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
-index a84250a..68c725e 100644
---- a/drivers/crypto/hifn_795x.c
-+++ b/drivers/crypto/hifn_795x.c
-@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device *dev, int encdec, u8 snum)
+-		if ((status == chip->vendor.req_canceled)) {
++		if (status == chip->vendor.req_canceled) {
+ 			dev_err(chip->dev, "Operation Canceled\n");
+ 			rc = -ECANCELED;
+ 			goto out;
+@@ -844,6 +844,8 @@ ssize_t tpm_show_pubek(struct device *de
+ 
+ 	struct tpm_chip *chip = dev_get_drvdata(dev);
+ 
++	pax_track_stack();
++
+ 	tpm_cmd.header.in = tpm_readpubek_header;
+ 	err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
+ 			"attempting to read the PUBEK");
+diff -urNp linux-3.0.3/drivers/crypto/hifn_795x.c linux-3.0.3/drivers/crypto/hifn_795x.c
+--- linux-3.0.3/drivers/crypto/hifn_795x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/crypto/hifn_795x.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
  		0xCA, 0x34, 0x2B, 0x2E};
  	struct scatterlist sg;
  
@@ -27299,11 +24051,10 @@ index a84250a..68c725e 100644
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
-index db33d30..7823369 100644
---- a/drivers/crypto/padlock-aes.c
-+++ b/drivers/crypto/padlock-aes.c
-@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+diff -urNp linux-3.0.3/drivers/crypto/padlock-aes.c linux-3.0.3/drivers/crypto/padlock-aes.c
+--- linux-3.0.3/drivers/crypto/padlock-aes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/crypto/padlock-aes.c	2011-08-23 21:48:14.000000000 -0400
+@@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
  	struct crypto_aes_ctx gen_aes;
  	int cpu;
  
@@ -27312,24 +24063,10 @@ index db33d30..7823369 100644
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
-index 39d97cf..4861b39 100644
---- a/drivers/edac/edac_mc_sysfs.c
-+++ b/drivers/edac/edac_mc_sysfs.c
-@@ -761,7 +761,7 @@ static void edac_inst_grp_release(struct kobject *kobj)
- }
- 
- /* Intermediate show/store table */
--static struct sysfs_ops inst_grp_ops = {
-+static const struct sysfs_ops inst_grp_ops = {
- 	.show = inst_grp_show,
- 	.store = inst_grp_store
- };
-diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
-index 023b01c..1289a23 100644
---- a/drivers/edac/edac_pci_sysfs.c
-+++ b/drivers/edac/edac_pci_sysfs.c
-@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;		/* log PCI parity errors */
+diff -urNp linux-3.0.3/drivers/edac/edac_pci_sysfs.c linux-3.0.3/drivers/edac/edac_pci_sysfs.c
+--- linux-3.0.3/drivers/edac/edac_pci_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/edac/edac_pci_sysfs.c	2011-08-23 21:47:55.000000000 -0400
+@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;		/* log 
  static int edac_pci_log_npe = 1;	/* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000;	/* one second workq period */
  
@@ -27340,7 +24077,7 @@ index 023b01c..1289a23 100644
  
  static struct kobject *edac_pci_top_main_kobj;
  static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
-@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(str
  			edac_printk(KERN_CRIT, EDAC_PCI,
  				"Signaled System Error on %s\n",
  				pci_name(dev));
@@ -27349,7 +24086,7 @@ index 023b01c..1289a23 100644
  		}
  
  		if (status & (PCI_STATUS_PARITY)) {
-@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(str
  				"Master Data Parity Error on %s\n",
  				pci_name(dev));
  
@@ -27358,7 +24095,7 @@ index 023b01c..1289a23 100644
  		}
  
  		if (status & (PCI_STATUS_DETECTED_PARITY)) {
-@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(str
  				"Detected Parity Error on %s\n",
  				pci_name(dev));
  
@@ -27367,7 +24104,7 @@ index 023b01c..1289a23 100644
  		}
  	}
  
-@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -619,7 +619,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));
@@ -27376,7 +24113,7 @@ index 023b01c..1289a23 100644
  			}
  
  			if (status & (PCI_STATUS_PARITY)) {
-@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(str
  					"Master Data Parity Error on "
  					"%s\n", pci_name(dev));
  
@@ -27385,7 +24122,7 @@ index 023b01c..1289a23 100644
  			}
  
  			if (status & (PCI_STATUS_DETECTED_PARITY)) {
-@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
+@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(str
  					"Detected Parity Error on %s\n",
  					pci_name(dev));
  
@@ -27412,11 +24149,46 @@ index 023b01c..1289a23 100644
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
-index 48ae712..1a1058a 100644
---- a/drivers/firewire/core-cdev.c
-+++ b/drivers/firewire/core-cdev.c
-@@ -1329,8 +1329,7 @@ static int init_iso_resource(struct client *client,
+diff -urNp linux-3.0.3/drivers/edac/i7core_edac.c linux-3.0.3/drivers/edac/i7core_edac.c
+--- linux-3.0.3/drivers/edac/i7core_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/edac/i7core_edac.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1670,7 +1670,7 @@ static void i7core_mce_output_error(stru
+ 	char *type, *optype, *err, *msg;
+ 	unsigned long error = m->status & 0x1ff0000l;
+ 	u32 optypenum = (m->status >> 4) & 0x07;
+-	u32 core_err_cnt = (m->status >> 38) && 0x7fff;
++	u32 core_err_cnt = (m->status >> 38) & 0x7fff;
+ 	u32 dimm = (m->misc >> 16) & 0x3;
+ 	u32 channel = (m->misc >> 18) & 0x3;
+ 	u32 syndrome = m->misc >> 32;
+diff -urNp linux-3.0.3/drivers/edac/mce_amd.h linux-3.0.3/drivers/edac/mce_amd.h
+--- linux-3.0.3/drivers/edac/mce_amd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/edac/mce_amd.h	2011-08-23 21:47:55.000000000 -0400
+@@ -83,7 +83,7 @@ struct amd_decoder_ops {
+ 	bool (*dc_mce)(u16, u8);
+ 	bool (*ic_mce)(u16, u8);
+ 	bool (*nb_mce)(u16, u8);
+-};
++} __no_const;
+ 
+ void amd_report_gart_errors(bool);
+ void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
+diff -urNp linux-3.0.3/drivers/firewire/core-card.c linux-3.0.3/drivers/firewire/core-card.c
+--- linux-3.0.3/drivers/firewire/core-card.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/firewire/core-card.c	2011-08-23 21:47:55.000000000 -0400
+@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
+ 
+ void fw_core_remove_card(struct fw_card *card)
+ {
+-	struct fw_card_driver dummy_driver = dummy_driver_template;
++	fw_card_driver_no_const dummy_driver = dummy_driver_template;
+ 
+ 	card->driver->update_phy_reg(card, 4,
+ 				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
+diff -urNp linux-3.0.3/drivers/firewire/core-cdev.c linux-3.0.3/drivers/firewire/core-cdev.c
+--- linux-3.0.3/drivers/firewire/core-cdev.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/firewire/core-cdev.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
  	int ret;
  
  	if ((request->channels == 0 && request->bandwidth == 0) ||
@@ -27426,19 +24198,29 @@ index 48ae712..1a1058a 100644
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
-index d00f8ce..b5ec272 100644
---- a/drivers/firewire/core-transaction.c
-+++ b/drivers/firewire/core-transaction.c
-@@ -36,6 +36,7 @@
- #include <linux/string.h>
+diff -urNp linux-3.0.3/drivers/firewire/core.h linux-3.0.3/drivers/firewire/core.h
+--- linux-3.0.3/drivers/firewire/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/firewire/core.h	2011-08-23 21:47:55.000000000 -0400
+@@ -101,6 +101,7 @@ struct fw_card_driver {
+ 
+ 	int (*stop_iso)(struct fw_iso_context *ctx);
+ };
++typedef struct fw_card_driver __no_const fw_card_driver_no_const;
+ 
+ void fw_card_initialize(struct fw_card *card,
+ 		const struct fw_card_driver *driver, struct device *device);
+diff -urNp linux-3.0.3/drivers/firewire/core-transaction.c linux-3.0.3/drivers/firewire/core-transaction.c
+--- linux-3.0.3/drivers/firewire/core-transaction.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/firewire/core-transaction.c	2011-08-23 21:48:14.000000000 -0400
+@@ -37,6 +37,7 @@
  #include <linux/timer.h>
  #include <linux/types.h>
+ #include <linux/workqueue.h>
 +#include <linux/sched.h>
  
  #include <asm/byteorder.h>
  
-@@ -420,6 +421,8 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
+@@ -422,6 +423,8 @@ int fw_run_transaction(struct fw_card *c
  	struct transaction_callback_data d;
  	struct fw_transaction t;
  
@@ -27447,10 +24229,9 @@ index d00f8ce..b5ec272 100644
  	init_timer_on_stack(&t.split_timeout_timer);
  	init_completion(&d.done);
  	d.payload = payload;
-diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
-index bcb1126..c1fce76 100644
---- a/drivers/firmware/dmi_scan.c
-+++ b/drivers/firmware/dmi_scan.c
+diff -urNp linux-3.0.3/drivers/firmware/dmi_scan.c linux-3.0.3/drivers/firmware/dmi_scan.c
+--- linux-3.0.3/drivers/firmware/dmi_scan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/firmware/dmi_scan.c	2011-08-23 21:47:55.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -27463,10 +24244,9 @@ index bcb1126..c1fce76 100644
  		p = dmi_ioremap(0xF0000, 0x10000);
  		if (p == NULL)
  			goto error;
-diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c
-index cffa3bd..9523309 100644
---- a/drivers/gpio/vr41xx_giu.c
-+++ b/drivers/gpio/vr41xx_giu.c
+diff -urNp linux-3.0.3/drivers/gpio/vr41xx_giu.c linux-3.0.3/drivers/gpio/vr41xx_giu.c
+--- linux-3.0.3/drivers/gpio/vr41xx_giu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpio/vr41xx_giu.c	2011-08-23 21:47:55.000000000 -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);
@@ -27476,11 +24256,10 @@ index cffa3bd..9523309 100644
  
  	return -EINVAL;
  }
-diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
-index 9236965..f9ea6cd 100644
---- a/drivers/gpu/drm/drm_crtc_helper.c
-+++ b/drivers/gpu/drm/drm_crtc_helper.c
-@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c	2011-08-23 21:48:14.000000000 -0400
+@@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
  	struct drm_crtc *tmp;
  	int crtc_mask = 1;
  
@@ -27489,7 +24268,7 @@ index 9236965..f9ea6cd 100644
  
  	dev = crtc->dev;
  
-@@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
+@@ -343,6 +343,8 @@ bool drm_crtc_helper_set_mode(struct drm
  	struct drm_encoder *encoder;
  	bool ret = true;
  
@@ -27498,11 +24277,10 @@ index 9236965..f9ea6cd 100644
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  	if (!crtc->enabled)
  		return true;
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
-index 271835a..362df6a 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -425,7 +425,7 @@ long drm_ioctl(struct file *filp,
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_drv.c linux-3.0.3/drivers/gpu/drm/drm_drv.c
+--- linux-3.0.3/drivers/gpu/drm/drm_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_drv.c	2011-08-23 21:47:55.000000000 -0400
+@@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
  
  	dev = file_priv->minor->dev;
  	atomic_inc(&dev->ioctl_count);
@@ -27511,11 +24289,10 @@ index 271835a..362df6a 100644
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
-index 2ec7d48..be14bb1 100644
---- a/drivers/gpu/drm/drm_fops.c
-+++ b/drivers/gpu/drm/drm_fops.c
-@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device * dev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_fops.c linux-3.0.3/drivers/gpu/drm/drm_fops.c
+--- linux-3.0.3/drivers/gpu/drm/drm_fops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_fops.c	2011-08-23 21:47:55.000000000 -0400
+@@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
  	}
  
  	for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
@@ -27524,7 +24301,7 @@ index 2ec7d48..be14bb1 100644
  
  	dev->sigdata.lock = NULL;
  
-@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct file *filp)
+@@ -134,8 +134,8 @@ int drm_open(struct inode *inode, struct
  
  	retcode = drm_open_helper(inode, filp, dev);
  	if (!retcode) {
@@ -27535,7 +24312,7 @@ index 2ec7d48..be14bb1 100644
  			retcode = drm_setup(dev);
  	}
  	if (!retcode) {
-@@ -472,7 +472,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -472,7 +472,7 @@ int drm_release(struct inode *inode, str
  
  	mutex_lock(&drm_global_mutex);
  
@@ -27544,7 +24321,7 @@ index 2ec7d48..be14bb1 100644
  
  	if (dev->driver->preclose)
  		dev->driver->preclose(dev, file_priv);
-@@ -484,7 +484,7 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -484,7 +484,7 @@ int drm_release(struct inode *inode, str
  	DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
  		  task_pid_nr(current),
  		  (long)old_encode_dev(file_priv->minor->device),
@@ -27553,7 +24330,7 @@ index 2ec7d48..be14bb1 100644
  
  	/* if the master has gone away we can't do anything with the lock */
  	if (file_priv->minor->master)
-@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, struct file *filp)
+@@ -565,8 +565,8 @@ int drm_release(struct inode *inode, str
  	 * End inline drm_release
  	 */
  
@@ -27564,10 +24341,9 @@ index 2ec7d48..be14bb1 100644
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
-index c87dc96..326055d 100644
---- a/drivers/gpu/drm/drm_global.c
-+++ b/drivers/gpu/drm/drm_global.c
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_global.c linux-3.0.3/drivers/gpu/drm/drm_global.c
+--- linux-3.0.3/drivers/gpu/drm/drm_global.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_global.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@
  struct drm_global_item {
  	struct mutex mutex;
@@ -27595,7 +24371,7 @@ index c87dc96..326055d 100644
  	}
  }
  
-@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
+@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_globa
  	void *object;
  
  	mutex_lock(&item->mutex);
@@ -27604,7 +24380,7 @@ index c87dc96..326055d 100644
  		item->object = kzalloc(ref->size, GFP_KERNEL);
  		if (unlikely(item->object == NULL)) {
  			ret = -ENOMEM;
-@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
+@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_globa
  			goto out_err;
  
  	}
@@ -27613,7 +24389,7 @@ index c87dc96..326055d 100644
  	ref->object = item->object;
  	object = item->object;
  	mutex_unlock(&item->mutex);
-@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
+@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_gl
  	struct drm_global_item *item = &glob[ref->global_type];
  
  	mutex_lock(&item->mutex);
@@ -27625,11 +24401,10 @@ index c87dc96..326055d 100644
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
-index be9a9c0..8a9bc65 100644
---- a/drivers/gpu/drm/drm_info.c
-+++ b/drivers/gpu/drm/drm_info.c
-@@ -86,10 +86,14 @@ int drm_vm_info(struct seq_file *m, void *data)
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_info.c linux-3.0.3/drivers/gpu/drm/drm_info.c
+--- linux-3.0.3/drivers/gpu/drm/drm_info.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_info.c	2011-08-23 21:48:14.000000000 -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;
  
@@ -27648,7 +24423,7 @@ index be9a9c0..8a9bc65 100644
  	const char *type;
  	int i;
  
-@@ -100,7 +104,7 @@ int drm_vm_info(struct seq_file *m, void *data)
+@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void
  		map = r_list->map;
  		if (!map)
  			continue;
@@ -27657,7 +24432,7 @@ index be9a9c0..8a9bc65 100644
  			type = "??";
  		else
  			type = types[map->type];
-@@ -301,7 +305,11 @@ int drm_vma_info(struct seq_file *m, void *data)
+@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, voi
  			   vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
  			   vma->vm_flags & VM_LOCKED ? 'l' : '-',
  			   vma->vm_flags & VM_IO ? 'i' : '-',
@@ -27669,11 +24444,10 @@ index be9a9c0..8a9bc65 100644
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
-index 47db4df..74c7209 100644
---- a/drivers/gpu/drm/drm_ioctl.c
-+++ b/drivers/gpu/drm/drm_ioctl.c
-@@ -353,7 +353,7 @@ int drm_getstats(struct drm_device *dev, void *data,
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_ioctl.c linux-3.0.3/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.0.3/drivers/gpu/drm/drm_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_ioctl.c	2011-08-23 21:47:55.000000000 -0400
+@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
  			stats->data[i].value =
  			    (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
  		else
@@ -27682,11 +24456,10 @@ index 47db4df..74c7209 100644
  		stats->data[i].type = dev->types[i];
  	}
  
-diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
-index 632ae24..244cf4a 100644
---- a/drivers/gpu/drm/drm_lock.c
-+++ b/drivers/gpu/drm/drm_lock.c
-@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
+diff -urNp linux-3.0.3/drivers/gpu/drm/drm_lock.c linux-3.0.3/drivers/gpu/drm/drm_lock.c
+--- linux-3.0.3/drivers/gpu/drm/drm_lock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/drm_lock.c	2011-08-23 21:47:55.000000000 -0400
+@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
  		if (drm_lock_take(&master->lock, lock->context)) {
  			master->lock.file_priv = file_priv;
  			master->lock.lock_time = jiffies;
@@ -27695,7 +24468,7 @@ index 632ae24..244cf4a 100644
  			break;	/* Got lock */
  		}
  
-@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
+@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, v
  		return -EINVAL;
  	}
  
@@ -27704,11 +24477,10 @@ index 632ae24..244cf4a 100644
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
-index ff33e53..8c5c165 100644
---- a/drivers/gpu/drm/i810/i810_dma.c
-+++ b/drivers/gpu/drm/i810/i810_dma.c
-@@ -953,8 +953,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
+diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c	2011-08-23 21:47:55.000000000 -0400
+@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
  				 dma->buflist[vertex->idx],
  				 vertex->discard, vertex->used);
  
@@ -27719,7 +24491,7 @@ index ff33e53..8c5c165 100644
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-@@ -1114,8 +1114,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
+@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device
  	i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
  			     mc->last_render);
  
@@ -27730,10 +24502,9 @@ index ff33e53..8c5c165 100644
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
-index c9339f4..f5e1b9d 100644
---- a/drivers/gpu/drm/i810/i810_drv.h
-+++ b/drivers/gpu/drm/i810/i810_drv.h
+diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
  	int page_flipping;
  
@@ -27745,186 +24516,10 @@ index c9339f4..f5e1b9d 100644
  
  	int front_offset;
  } drm_i810_private_t;
-diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
-index 0df1c72..9142c9c 100644
---- a/drivers/gpu/drm/i830/i830_drv.h
-+++ b/drivers/gpu/drm/i830/i830_drv.h
-@@ -115,8 +115,8 @@ typedef struct drm_i830_private {
- 	int page_flipping;
- 
- 	wait_queue_head_t irq_queue;
--	atomic_t irq_received;
--	atomic_t irq_emitted;
-+	atomic_unchecked_t irq_received;
-+	atomic_unchecked_t irq_emitted;
- 
- 	int use_mi_batchbuffer_start;
- 
-diff --git a/drivers/gpu/drm/i830/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c
-index d1a6b95..cb934a2 100644
---- a/drivers/gpu/drm/i830/i830_irq.c
-+++ b/drivers/gpu/drm/i830/i830_irq.c
-@@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
- 
- 	I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
- 
--	atomic_inc(&dev_priv->irq_received);
-+	atomic_inc_unchecked(&dev_priv->irq_received);
- 	wake_up_interruptible(&dev_priv->irq_queue);
- 
- 	return IRQ_HANDLED;
-@@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_device *dev)
- 
- 	DRM_DEBUG("%s\n", __func__);
- 
--	atomic_inc(&dev_priv->irq_emitted);
-+	atomic_inc_unchecked(&dev_priv->irq_emitted);
- 
- 	BEGIN_LP_RING(2);
- 	OUT_RING(0);
- 	OUT_RING(GFX_OP_USER_INTERRUPT);
- 	ADVANCE_LP_RING();
- 
--	return atomic_read(&dev_priv->irq_emitted);
-+	return atomic_read_unchecked(&dev_priv->irq_emitted);
- }
- 
- static int i830_wait_irq(struct drm_device *dev, int irq_nr)
-@@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_device *dev, int irq_nr)
- 
- 	DRM_DEBUG("%s\n", __func__);
- 
--	if (atomic_read(&dev_priv->irq_received) >= irq_nr)
-+	if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
- 		return 0;
- 
- 	dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
-@@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_device *dev, int irq_nr)
- 
- 	for (;;) {
- 		__set_current_state(TASK_INTERRUPTIBLE);
--		if (atomic_read(&dev_priv->irq_received) >= irq_nr)
-+		if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
- 			break;
- 		if ((signed)(end - jiffies) <= 0) {
- 			DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
-@@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct drm_device *dev)
- 	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);
- }
- 
-diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
-index 8c2ad01..bfc522e 100644
---- a/drivers/gpu/drm/i915/dvo.h
-+++ b/drivers/gpu/drm/i915/dvo.h
-@@ -122,23 +122,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);
- 
- 	/**
- 	 * Clean up driver-specific bits of the output
- 	 */
--	void (*destroy) (struct intel_dvo_device *dvo);
-+	void (* const destroy) (struct intel_dvo_device *dvo);
- 
- 	/**
- 	 * 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);
- };
- 
--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;
- 
- #endif /* _INTEL_DVO_H */
-diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
-index d3e8c54..0905775 100644
---- a/drivers/gpu/drm/i915/dvo_ch7017.c
-+++ b/drivers/gpu/drm/i915/dvo_ch7017.c
-@@ -390,7 +390,7 @@ static void ch7017_destroy(struct intel_dvo_device *dvo)
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- 	.init = ch7017_init,
- 	.detect = ch7017_detect,
- 	.mode_valid = ch7017_mode_valid,
-diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
-index 7eaa94e..60c311a1 100644
---- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
-+++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
-@@ -320,7 +320,7 @@ static void ch7xxx_destroy(struct intel_dvo_device *dvo)
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- 	.init = ch7xxx_init,
- 	.detect = ch7xxx_detect,
- 	.mode_valid = ch7xxx_mode_valid,
-diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
-index a12ed94..2609937 100644
---- a/drivers/gpu/drm/i915/dvo_ivch.c
-+++ b/drivers/gpu/drm/i915/dvo_ivch.c
-@@ -410,7 +410,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo)
- 	}
- }
- 
--struct intel_dvo_dev_ops ivch_ops= {
-+const struct intel_dvo_dev_ops ivch_ops= {
- 	.init = ivch_init,
- 	.dpms = ivch_dpms,
- 	.mode_valid = ivch_mode_valid,
-diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
-index e4b4091..3362aa7 100644
---- a/drivers/gpu/drm/i915/dvo_sil164.c
-+++ b/drivers/gpu/drm/i915/dvo_sil164.c
-@@ -252,7 +252,7 @@ static void sil164_destroy(struct intel_dvo_device *dvo)
- 	}
- }
- 
--struct intel_dvo_dev_ops sil164_ops = {
-+const struct intel_dvo_dev_ops sil164_ops = {
- 	.init = sil164_init,
- 	.detect = sil164_detect,
- 	.mode_valid = sil164_mode_valid,
-diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
-index 8ab2855..dea1e14 100644
---- a/drivers/gpu/drm/i915/dvo_tfp410.c
-+++ b/drivers/gpu/drm/i915/dvo_tfp410.c
-@@ -293,7 +293,7 @@ static void tfp410_destroy(struct intel_dvo_device *dvo)
- 	}
- }
- 
--struct intel_dvo_dev_ops tfp410_ops = {
-+const struct intel_dvo_dev_ops tfp410_ops = {
- 	.init = tfp410_init,
- 	.detect = tfp410_detect,
- 	.mode_valid = tfp410_mode_valid,
-diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
-index 4ff9b6c..7470581 100644
---- a/drivers/gpu/drm/i915/i915_debugfs.c
-+++ b/drivers/gpu/drm/i915/i915_debugfs.c
-@@ -496,7 +496,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c	2011-08-23 21:47:55.000000000 -0400
+@@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
  	seq_printf(m, "Interrupts received: %d\n",
@@ -27933,11 +24528,10 @@ index 4ff9b6c..7470581 100644
  	for (i = 0; i < I915_NUM_RINGS; i++) {
  		if (IS_GEN6(dev)) {
  			seq_printf(m, "Graphics Interrupt mask (%s):	%08x\n",
-diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index e33d9be..a886ceb 100644
---- a/drivers/gpu/drm/i915/i915_dma.c
-+++ b/drivers/gpu/drm/i915/i915_dma.c
-@@ -1159,7 +1159,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -27946,33 +24540,28 @@ index e33d9be..a886ceb 100644
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index 22ec066..fda258a 100644
---- a/drivers/gpu/drm/i915/i915_drv.c
-+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -673,7 +673,7 @@ static const struct dev_pm_ops i915_pm_ops = {
-      .restore = i915_pm_resume,
- };
- 
--static struct vm_operations_struct i915_gem_vm_ops = {
-+static const struct vm_operations_struct i915_gem_vm_ops = {
- 	.fault = i915_gem_fault,
- 	.open = drm_gem_vm_open,
- 	.close = drm_gem_vm_close,
-diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 456f404..24fd152 100644
---- a/drivers/gpu/drm/i915/i915_drv.h
-+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -288,7 +288,7 @@ typedef struct drm_i915_private {
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h	2011-08-23 21:47:55.000000000 -0400
+@@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
+ 	/* render clock increase/decrease */
+ 	/* display clock increase/decrease */
+ 	/* pll clock increase/decrease */
+-};
++} __no_const;
+ 
+ struct intel_device_info {
+ 	u8 gen;
+@@ -300,7 +300,7 @@ typedef struct drm_i915_private {
  	int current_page;
  	int page_flipping;
  
 -	atomic_t irq_received;
 +	atomic_unchecked_t irq_received;
- 	u32 trace_irq_seqno;
  
  	/* protects the irq masks */
-@@ -843,7 +843,7 @@ struct drm_i915_gem_object {
+ 	spinlock_t irq_lock;
+@@ -874,7 +874,7 @@ struct drm_i915_gem_object {
  	 * will be page flipped away on the next vblank.  When it
  	 * reaches 0, dev_priv->pending_flip_queue will be woken up.
  	 */
@@ -27981,7 +24570,7 @@ index 456f404..24fd152 100644
  };
  
  #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
-@@ -1229,7 +1229,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
+@@ -1247,7 +1247,7 @@ extern int intel_setup_gmbus(struct drm_
  extern void intel_teardown_gmbus(struct drm_device *dev);
  extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
  extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
@@ -27990,33 +24579,49 @@ index 456f404..24fd152 100644
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index ded73a6..8a6d555 100644
---- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-@@ -904,7 +904,7 @@ i915_gem_execbuffer_wait_for_flips(struct intel_ring_buffer *ring,
- 	flips = 0;
- 	list_for_each_entry(obj, objects, exec_list) {
- 		if (obj->base.write_domain)
--			flips |= atomic_read(&obj->pending_flip);
-+			flips |= atomic_read_unchecked(&obj->pending_flip);
- 	}
- 	if (flips) {
- 		int plane, flip_mask, ret;
-diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 2347bc1..3edcc24 100644
---- a/drivers/gpu/drm/i915/i915_irq.c
-+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -1106,7 +1106,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
- 	int irq_received;
- 	int ret = IRQ_NONE;
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-08-23 21:47:55.000000000 -0400
+@@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
+ 		i915_gem_clflush_object(obj);
+ 
+ 	if (obj->base.pending_write_domain)
+-		cd->flips |= atomic_read(&obj->pending_flip);
++		cd->flips |= atomic_read_unchecked(&obj->pending_flip);
+ 
+ 	/* The actual obj->write_domain will be updated with
+ 	 * pending_write_domain after we emit the accumulated flush for all
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
+ 	u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
+ 	struct drm_i915_master_private *master_priv;
+ 
+-	atomic_inc(&dev_priv->irq_received);
++	atomic_inc_unchecked(&dev_priv->irq_received);
+ 
+ 	/* disable master interrupt before clearing iir  */
+ 	de_ier = I915_READ(DEIER);
+@@ -563,7 +563,7 @@ static irqreturn_t ironlake_irq_handler(
+ 	struct drm_i915_master_private *master_priv;
+ 	u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
  
 -	atomic_inc(&dev_priv->irq_received);
 +	atomic_inc_unchecked(&dev_priv->irq_received);
  
- 	if (HAS_PCH_SPLIT(dev))
- 		return ironlake_irq_handler(dev);
-@@ -1684,7 +1684,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+ 	if (IS_GEN6(dev))
+ 		bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
+@@ -1226,7 +1226,7 @@ static irqreturn_t i915_driver_irq_handl
+ 	int ret = IRQ_NONE, pipe;
+ 	bool blc_event = false;
+ 
+-	atomic_inc(&dev_priv->irq_received);
++	atomic_inc_unchecked(&dev_priv->irq_received);
+ 
+ 	iir = I915_READ(IIR);
+ 
+@@ -1735,7 +1735,7 @@ static void ironlake_irq_preinstall(stru
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
  
@@ -28025,11 +24630,19 @@ index 2347bc1..3edcc24 100644
  
  	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
  	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 841558b..805c5df 100644
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -1631,7 +1631,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
+@@ -1899,7 +1899,7 @@ static void i915_driver_irq_preinstall(s
+ 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ 	int pipe;
+ 
+-	atomic_set(&dev_priv->irq_received, 0);
++	atomic_set_unchecked(&dev_priv->irq_received, 0);
+ 
+ 	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
+ 	INIT_WORK(&dev_priv->error_work, i915_error_work_func);
+diff -urNp linux-3.0.3/drivers/gpu/drm/i915/intel_display.c linux-3.0.3/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.0.3/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
  		wait_event(dev_priv->pending_flip_queue,
  			   atomic_read(&dev_priv->mm.wedged) ||
@@ -28038,7 +24651,7 @@ index 841558b..805c5df 100644
  
  		/* Big Hammer, we also need to ensure that any pending
  		 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
-@@ -2042,7 +2042,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
+@@ -2548,7 +2548,7 @@ static void intel_crtc_wait_for_pending_
  	obj = to_intel_framebuffer(crtc->fb)->obj;
  	dev_priv = crtc->dev->dev_private;
  	wait_event(dev_priv->pending_flip_queue,
@@ -28047,7 +24660,7 @@ index 841558b..805c5df 100644
  }
  
  static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
-@@ -5428,7 +5428,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
+@@ -6225,7 +6225,7 @@ static void do_intel_finish_page_flip(st
  
  	atomic_clear_mask(1 << intel_crtc->plane,
  			  &obj->pending_flip.counter);
@@ -28056,19 +24669,27 @@ index 841558b..805c5df 100644
  		wake_up(&dev_priv->pending_flip_queue);
  
  	schedule_work(&work->work);
-@@ -5557,7 +5557,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+@@ -6514,7 +6514,7 @@ static int intel_crtc_page_flip(struct d
  	/* Block clients from rendering to the new back buffer until
  	 * the flip occurs and the object is no longer visible.
  	 */
 -	atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
 +	atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
  
- 	switch (INTEL_INFO(dev)->gen) {
- 	case 2:
-diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
-index 1084fa4..ca2833d 100644
---- a/drivers/gpu/drm/mga/mga_drv.h
-+++ b/drivers/gpu/drm/mga/mga_drv.h
+ 	ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
+ 	if (ret)
+@@ -6527,7 +6527,7 @@ static int intel_crtc_page_flip(struct d
+ 	return 0;
+ 
+ cleanup_pending:
+-	atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
++	atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
+ cleanup_objs:
+ 	drm_gem_object_unreference(&work->old_fb_obj->base);
+ 	drm_gem_object_unreference(&obj->base);
+diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
  	u32 clear_cmd;
  	u32 maccess;
@@ -28081,11 +24702,10 @@ index 1084fa4..ca2833d 100644
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
-index 2581202..f230a8d9 100644
---- a/drivers/gpu/drm/mga/mga_irq.c
-+++ b/drivers/gpu/drm/mga/mga_irq.c
-@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
+diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
  
@@ -28094,7 +24714,7 @@ index 2581202..f230a8d9 100644
  }
  
  
-@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
  	/* VBLANK interrupt */
  	if (status & MGA_VLINEPEN) {
  		MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
@@ -28103,7 +24723,7 @@ index 2581202..f230a8d9 100644
  		drm_handle_vblank(dev, 0);
  		handled = 1;
  	}
-@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_I
  		if ((prim_start & ~0x03) != (prim_end & ~0x03))
  			MGA_WRITE(MGA_PRIMEND, prim_end);
  
@@ -28112,7 +24732,7 @@ index 2581202..f230a8d9 100644
  		DRM_WAKEUP(&dev_priv->fence_queue);
  		handled = 1;
  	}
-@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
+@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_dev
  	 * using fences.
  	 */
  	DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
@@ -28121,11 +24741,22 @@ index 2581202..f230a8d9 100644
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
-index 982d70b..9df4be6 100644
---- a/drivers/gpu/drm/nouveau/nouveau_drv.h
-+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
-@@ -226,7 +226,7 @@ struct nouveau_channel {
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-08-23 21:47:55.000000000 -0400
+@@ -5488,7 +5488,7 @@ parse_bit_displayport_tbl_entry(struct d
+ struct bit_table {
+ 	const char id;
+ 	int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
+-};
++} __no_const;
+ 
+ #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
+ 
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-08-23 21:47:55.000000000 -0400
+@@ -227,7 +227,7 @@ struct nouveau_channel {
  		struct list_head pending;
  		uint32_t sequence;
  		uint32_t sequence_ack;
@@ -28134,7 +24765,41 @@ index 982d70b..9df4be6 100644
  	} fence;
  
  	/* DMA push buffer */
-@@ -661,7 +661,7 @@ struct drm_nouveau_private {
+@@ -304,7 +304,7 @@ struct nouveau_exec_engine {
+ 			   u32 handle, u16 class);
+ 	void (*set_tile_region)(struct drm_device *dev, int i);
+ 	void (*tlb_flush)(struct drm_device *, int engine);
+-};
++} __no_const;
+ 
+ struct nouveau_instmem_engine {
+ 	void	*priv;
+@@ -325,13 +325,13 @@ struct nouveau_instmem_engine {
+ struct nouveau_mc_engine {
+ 	int  (*init)(struct drm_device *dev);
+ 	void (*takedown)(struct drm_device *dev);
+-};
++} __no_const;
+ 
+ struct nouveau_timer_engine {
+ 	int      (*init)(struct drm_device *dev);
+ 	void     (*takedown)(struct drm_device *dev);
+ 	uint64_t (*read)(struct drm_device *dev);
+-};
++} __no_const;
+ 
+ struct nouveau_fb_engine {
+ 	int num_tiles;
+@@ -494,7 +494,7 @@ struct nouveau_vram_engine {
+ 	void (*put)(struct drm_device *, struct nouveau_mem **);
+ 
+ 	bool (*flags_valid)(struct drm_device *, u32 tile_flags);
+-};
++} __no_const;
+ 
+ struct nouveau_engine {
+ 	struct nouveau_instmem_engine instmem;
+@@ -640,7 +640,7 @@ struct drm_nouveau_private {
  		struct drm_global_reference mem_global_ref;
  		struct ttm_bo_global_ref bo_global_ref;
  		struct ttm_bo_device bdev;
@@ -28143,11 +24808,10 @@ index 982d70b..9df4be6 100644
  	} ttm;
  
  	struct {
-diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
-index 221b846..798ec9d 100644
---- a/drivers/gpu/drm/nouveau/nouveau_fence.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
-@@ -83,7 +83,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-08-23 21:47:55.000000000 -0400
+@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
  		if (USE_REFCNT(dev))
  			sequence = nvchan_rd32(chan, 0x48);
  		else
@@ -28156,20 +24820,19 @@ index 221b846..798ec9d 100644
  
  		if (chan->fence.sequence_ack == sequence)
  			goto out;
-@@ -490,7 +490,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
+@@ -544,7 +544,7 @@ nouveau_fence_channel_init(struct nouvea
  
  	INIT_LIST_HEAD(&chan->fence.pending);
  	spin_lock_init(&chan->fence.lock);
 -	atomic_set(&chan->fence.last_sequence_irq, 0);
 +	atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
- 
  	return 0;
  }
-diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
-index 506c508..018277db 100644
---- a/drivers/gpu/drm/nouveau/nouveau_gem.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
-@@ -241,7 +241,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
+ 
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-08-23 21:47:55.000000000 -0400
+@@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
  	int trycnt = 0;
  	int ret, i;
  
@@ -28178,11 +24841,10 @@ index 506c508..018277db 100644
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
-index a54fc43..1c0c8dd 100644
---- a/drivers/gpu/drm/nouveau/nouveau_state.c
-+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
-@@ -621,7 +621,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c	2011-08-23 21:47:55.000000000 -0400
+@@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -28191,11 +24853,10 @@ index a54fc43..1c0c8dd 100644
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
-index af75015..35c1de5 100644
---- a/drivers/gpu/drm/nouveau/nv04_graph.c
-+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
-@@ -552,7 +552,7 @@ static int
+diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c	2011-08-23 21:47:55.000000000 -0400
+@@ -560,7 +560,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
  			u32 class, u32 mthd, u32 data)
  {
@@ -28204,11 +24865,10 @@ index af75015..35c1de5 100644
  	return 0;
  }
  
-diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
-index 570e190..084a31a 100644
---- a/drivers/gpu/drm/r128/r128_cce.c
-+++ b/drivers/gpu/drm/r128/r128_cce.c
-@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
+diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c	2011-08-23 21:47:55.000000000 -0400
+@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
  	/* GH: Simple idle check.
  	 */
@@ -28217,10 +24877,9 @@ index 570e190..084a31a 100644
  
  	/* 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 --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
-index 930c71b..499aded 100644
---- a/drivers/gpu/drm/r128/r128_drv.h
-+++ b/drivers/gpu/drm/r128/r128_drv.h
+diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
  	int is_pci;
  	unsigned long cce_buffers_offset;
@@ -28238,11 +24897,10 @@ index 930c71b..499aded 100644
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
-index 429d5a0..7e899ed 100644
---- a/drivers/gpu/drm/r128/r128_irq.c
-+++ b/drivers/gpu/drm/r128/r128_irq.c
-@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
+diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
  	if (crtc != 0)
  		return 0;
  
@@ -28251,7 +24909,7 @@ index 429d5a0..7e899ed 100644
  }
  
  irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -56,7 +56,7 @@ 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);
@@ -28260,11 +24918,10 @@ index 429d5a0..7e899ed 100644
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
-index a9e33ce..09edd4b 100644
---- a/drivers/gpu/drm/r128/r128_state.c
-+++ b/drivers/gpu/drm/r128/r128_state.c
-@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
+diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_state.c linux-3.0.3/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.0.3/drivers/gpu/drm/r128/r128_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/r128/r128_state.c	2011-08-23 21:47:55.000000000 -0400
+@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
  {
@@ -28277,11 +24934,10 @@ index a9e33ce..09edd4b 100644
  }
  
  #endif
-diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
-index 7bd7456..9086484 100644
---- a/drivers/gpu/drm/radeon/atom.c
-+++ b/drivers/gpu/drm/radeon/atom.c
-@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/atom.c linux-3.0.3/drivers/gpu/drm/radeon/atom.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/atom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/atom.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
  	char name[512];
  	int i;
  
@@ -28290,11 +24946,10 @@ index 7bd7456..9086484 100644
  	ctx->card = card;
  	ctx->bios = bios;
  
-diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
-index 5a82b6b..9e69c73 100644
---- a/drivers/gpu/drm/radeon/mkregtable.c
-+++ b/drivers/gpu/drm/radeon/mkregtable.c
-@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c	2011-08-23 21:47:55.000000000 -0400
+@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
  	regex_t mask_rex;
  	regmatch_t match[4];
  	char buf[1024];
@@ -28311,24 +24966,10 @@ index 5a82b6b..9e69c73 100644
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
-index 6b34294..c5fe0e4 100644
---- a/drivers/gpu/drm/radeon/radeon.h
-+++ b/drivers/gpu/drm/radeon/radeon.h
-@@ -189,7 +189,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
-  */
- struct radeon_fence_driver {
- 	uint32_t			scratch_reg;
--	atomic_t			seq;
-+	atomic_unchecked_t		seq;
- 	uint32_t			last_seq;
- 	unsigned long			last_jiffies;
- 	unsigned long			last_timeout;
-diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
-index ad11a05..73756de 100644
---- a/drivers/gpu/drm/radeon/radeon_atombios.c
-+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
-@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c	2011-08-23 21:48:14.000000000 -0400
+@@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
  	struct radeon_gpio_rec gpio;
  	struct radeon_hpd hpd;
  
@@ -28337,11 +24978,10 @@ index ad11a05..73756de 100644
  	if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
  		return false;
  
-diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
-index 4954e2d..533bd73 100644
---- a/drivers/gpu/drm/radeon/radeon_device.c
-+++ b/drivers/gpu/drm/radeon/radeon_device.c
-@@ -673,7 +673,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:47:55.000000000 -0400
+@@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
  	bool can_switch;
  
  	spin_lock(&dev->count_lock);
@@ -28350,11 +24990,10 @@ index 4954e2d..533bd73 100644
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
-index 3e7e7f9..2496a60 100644
---- a/drivers/gpu/drm/radeon/radeon_display.c
-+++ b/drivers/gpu/drm/radeon/radeon_display.c
-@@ -934,6 +934,8 @@ void radeon_compute_pll_legacy(struct radeon_pll *pll,
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:48:14.000000000 -0400
+@@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
  	uint32_t post_div;
  	u32 pll_out_min, pll_out_max;
  
@@ -28363,10 +25002,9 @@ index 3e7e7f9..2496a60 100644
  	DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
  	freq = freq * 1000;
  
-diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 5cba46b..2b5ece3 100644
---- a/drivers/gpu/drm/radeon/radeon_drv.h
-+++ b/drivers/gpu/drm/radeon/radeon_drv.h
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
  	/* SW interrupt */
@@ -28376,33 +25014,52 @@ index 5cba46b..2b5ece3 100644
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
-index 2b0ee62..f1bbb30 100644
---- a/drivers/gpu/drm/radeon/radeon_fence.c
-+++ b/drivers/gpu/drm/radeon/radeon_fence.c
-@@ -49,7 +49,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c	2011-08-23 21:47:55.000000000 -0400
+@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
  		write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
  		return 0;
  	}
 -	fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
 +	fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
- 	if (!rdev->cp.ready) {
+ 	if (!rdev->cp.ready)
  		/* FIXME: cp is not running assume everythings is done right
  		 * away
-@@ -354,7 +354,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
+@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct rade
  		return r;
  	}
- 	WREG32(rdev->fence_drv.scratch_reg, 0);
+ 	radeon_fence_write(rdev, 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 --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
-index 48b7cea..342236f 100644
---- a/drivers/gpu/drm/radeon/radeon_ioc32.c
-+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
-@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon.h linux-3.0.3/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon.h	2011-08-23 21:47:55.000000000 -0400
+@@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d
+  */
+ struct radeon_fence_driver {
+ 	uint32_t			scratch_reg;
+-	atomic_t			seq;
++	atomic_unchecked_t		seq;
+ 	uint32_t			last_seq;
+ 	unsigned long			last_jiffies;
+ 	unsigned long			last_timeout;
+@@ -960,7 +960,7 @@ struct radeon_asic {
+ 	void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
+ 	u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
+ 	void (*post_page_flip)(struct radeon_device *rdev, int crtc);
+-};
++} __no_const;
+ 
+ /*
+  * Asic structures
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-08-23 21:47:55.000000000 -0400
+@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
  	request = compat_alloc_user_space(sizeof(*request));
  	if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
  	    || __put_user(req32.param, &request->param)
@@ -28411,11 +25068,10 @@ index 48b7cea..342236f 100644
  			  &request->value))
  		return -EFAULT;
  
-diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
-index 465746b..cb2b055 100644
---- a/drivers/gpu/drm/radeon/radeon_irq.c
-+++ b/drivers/gpu/drm/radeon/radeon_irq.c
-@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
  	unsigned int ret;
  	RING_LOCALS;
  
@@ -28426,7 +25082,7 @@ index 465746b..cb2b055 100644
  
  	BEGIN_RING(4);
  	OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
-@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
+@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct
  	drm_radeon_private_t *dev_priv =
  	    (drm_radeon_private_t *) dev->dev_private;
  
@@ -28435,11 +25091,10 @@ index 465746b..cb2b055 100644
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
-index 4ae5a3d..07a5da3 100644
---- a/drivers/gpu/drm/radeon/radeon_state.c
-+++ b/drivers/gpu/drm/radeon/radeon_state.c
-@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c	2011-08-23 21:47:55.000000000 -0400
+@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
  	if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
  		sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
  
@@ -28448,7 +25103,7 @@ index 4ae5a3d..07a5da3 100644
  			       sarea_priv->nbox * sizeof(depth_boxes[0])))
  		return -EFAULT;
  
-@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm
  {
  	drm_radeon_private_t *dev_priv = dev->dev_private;
  	drm_radeon_getparam_t *param = data;
@@ -28457,75 +25112,26 @@ index 4ae5a3d..07a5da3 100644
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
-index 8389b4c..3c551cd 100644
---- a/drivers/gpu/drm/radeon/radeon_ttm.c
-+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -603,8 +603,9 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
- 	man->size = size >> PAGE_SHIFT;
- }
- 
--static struct vm_operations_struct radeon_ttm_vm_ops;
--static const struct vm_operations_struct *ttm_vm_ops = NULL;
-+extern int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf);
-+extern void ttm_bo_vm_open(struct vm_area_struct *vma);
-+extern void ttm_bo_vm_close(struct vm_area_struct *vma);
- 
- static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
-@@ -612,17 +613,22 @@ static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- 	struct radeon_device *rdev;
- 	int r;
- 
--	bo = (struct ttm_buffer_object *)vma->vm_private_data;	
--	if (bo == NULL) {
-+	bo = (struct ttm_buffer_object *)vma->vm_private_data;
-+	if (!bo)
- 		return VM_FAULT_NOPAGE;
--	}
- 	rdev = radeon_get_rdev(bo->bdev);
- 	mutex_lock(&rdev->vram_mutex);
--	r = ttm_vm_ops->fault(vma, vmf);
-+	r = ttm_bo_vm_fault(vma, vmf);
- 	mutex_unlock(&rdev->vram_mutex);
- 	return r;
- }
- 
-+static const struct vm_operations_struct radeon_ttm_vm_ops = {
-+	.fault = radeon_ttm_fault,
-+	.open = ttm_bo_vm_open,
-+	.close = ttm_bo_vm_close
-+};
-+
- int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
- {
- 	struct drm_file *file_priv;
-@@ -635,18 +641,11 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
- 
- 	file_priv = filp->private_data;
- 	rdev = file_priv->minor->dev->dev_private;
--	if (rdev == NULL) {
-+	if (!rdev)
- 		return -EINVAL;
--	}
- 	r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
--	if (unlikely(r != 0)) {
-+	if (r)
- 		return r;
--	}
--	if (unlikely(ttm_vm_ops == NULL)) {
--		ttm_vm_ops = vma->vm_ops;
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c	2011-08-23 21:47:55.000000000 -0400
+@@ -644,8 +644,10 @@ int radeon_mmap(struct file *filp, struc
+ 	}
+ 	if (unlikely(ttm_vm_ops == NULL)) {
+ 		ttm_vm_ops = vma->vm_ops;
 -		radeon_ttm_vm_ops = *ttm_vm_ops;
 -		radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
--	}
++		pax_open_kernel();
++		memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
++		*(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
++		pax_close_kernel();
+ 	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
- }
-diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
-index 66c949b..914a36a 100644
---- a/drivers/gpu/drm/radeon/rs690.c
-+++ b/drivers/gpu/drm/radeon/rs690.c
-@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
+diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/rs690.c linux-3.0.3/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.0.3/drivers/gpu/drm/radeon/rs690.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/radeon/rs690.c	2011-08-23 21:47:55.000000000 -0400
+@@ -304,9 +304,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 = rdev->pm.sideport_bandwidth;
@@ -28538,74 +25144,12 @@ index 66c949b..914a36a 100644
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
-index 221b924..3bc5ff4 100644
---- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
-+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
-@@ -69,11 +69,11 @@ static struct ttm_buffer_object *ttm_bo_vm_lookup_rb(struct ttm_bo_device *bdev,
- 	return best_bo;
- }
- 
--static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-+int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- {
- 	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
- 	    vma->vm_private_data;
--	struct ttm_bo_device *bdev = bo->bdev;
-+	struct ttm_bo_device *bdev;
- 	unsigned long page_offset;
- 	unsigned long page_last;
- 	unsigned long pfn;
-@@ -83,8 +83,12 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- 	int i;
- 	unsigned long address = (unsigned long)vmf->virtual_address;
- 	int retval = VM_FAULT_NOPAGE;
--	struct ttm_mem_type_manager *man =
--		&bdev->man[bo->mem.mem_type];
-+	struct ttm_mem_type_manager *man;
-+
-+	if (!bo)
-+		return VM_FAULT_NOPAGE;
-+	bdev = bo->bdev;
-+	man = &bdev->man[bo->mem.mem_type];
- 
- 	/*
- 	 * Work around locking order reversal in fault / nopfn
-@@ -219,22 +223,25 @@ out_unlock:
- 	ttm_bo_unreserve(bo);
- 	return retval;
- }
-+EXPORT_SYMBOL(ttm_bo_vm_fault);
- 
--static void ttm_bo_vm_open(struct vm_area_struct *vma)
-+void ttm_bo_vm_open(struct vm_area_struct *vma)
- {
- 	struct ttm_buffer_object *bo =
- 	    (struct ttm_buffer_object *)vma->vm_private_data;
- 
- 	(void)ttm_bo_reference(bo);
- }
-+EXPORT_SYMBOL(ttm_bo_vm_open);
- 
--static void ttm_bo_vm_close(struct vm_area_struct *vma)
-+void ttm_bo_vm_close(struct vm_area_struct *vma)
- {
- 	struct ttm_buffer_object *bo = (struct ttm_buffer_object *)vma->vm_private_data;
- 
- 	ttm_bo_unref(&bo);
- 	vma->vm_private_data = NULL;
- }
-+EXPORT_SYMBOL(ttm_bo_vm_close);
- 
- static const struct vm_operations_struct ttm_bo_vm_ops = {
- 	.fault = ttm_bo_vm_fault,
-diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-index b1e02ff..c7c28da 100644
---- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
-+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
-@@ -396,9 +396,9 @@ static int ttm_pool_get_num_unused_pages(void)
-  */
- static int ttm_pool_mm_shrink(struct shrinker *shrink, int shrink_pages, gfp_t gfp_mask)
+diff -urNp linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-08-23 21:47:55.000000000 -0400
+@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
+ static int ttm_pool_mm_shrink(struct shrinker *shrink,
+ 			      struct shrink_control *sc)
  {
 -	static atomic_t start_pool = ATOMIC_INIT(0);
 +	static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
@@ -28613,12 +25157,11 @@ index b1e02ff..c7c28da 100644
 -	unsigned pool_offset = atomic_add_return(1, &start_pool);
 +	unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
  	struct ttm_page_pool *pool;
+ 	int shrink_pages = sc->nr_to_scan;
  
- 	pool_offset = pool_offset % NUM_POOLS;
-diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
-index 9cf87d9..2000b7d 100644
---- a/drivers/gpu/drm/via/via_drv.h
-+++ b/drivers/gpu/drm/via/via_drv.h
+diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_drv.h linux-3.0.3/drivers/gpu/drm/via/via_drv.h
+--- linux-3.0.3/drivers/gpu/drm/via/via_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/via/via_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -28637,11 +25180,10 @@ index 9cf87d9..2000b7d 100644
  	drm_via_state_t hc_state;
  	char pci_buf[VIA_PCI_BUF_SIZE];
  	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
-index d391f48..10c8ca3 100644
---- a/drivers/gpu/drm/via/via_irq.c
-+++ b/drivers/gpu/drm/via/via_irq.c
-@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
+diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_irq.c linux-3.0.3/drivers/gpu/drm/via/via_irq.c
+--- linux-3.0.3/drivers/gpu/drm/via/via_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/via/via_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
  	if (crtc != 0)
  		return 0;
  
@@ -28650,7 +25192,7 @@ index d391f48..10c8ca3 100644
  }
  
  irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
-@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_I
  
  	status = VIA_READ(VIA_REG_INTERRUPT);
  	if (status & VIA_IRQ_VBLANK_PENDING) {
@@ -28661,7 +25203,7 @@ index d391f48..10c8ca3 100644
  			do_gettimeofday(&cur_vblank);
  			if (dev_priv->last_vblank_valid) {
  				dev_priv->usec_per_vblank =
-@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
  			dev_priv->last_vblank = cur_vblank;
  			dev_priv->last_vblank_valid = 1;
  		}
@@ -28670,7 +25212,7 @@ index d391f48..10c8ca3 100644
  			DRM_DEBUG("US per vblank is: %u\n",
  				  dev_priv->usec_per_vblank);
  		}
-@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_I
  
  	for (i = 0; i < dev_priv->num_irqs; ++i) {
  		if (status & cur_irq->pending_mask) {
@@ -28679,7 +25221,7 @@ index d391f48..10c8ca3 100644
  			DRM_WAKEUP(&cur_irq->irq_queue);
  			handled = 1;
  			if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
-@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
+@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *d
  		DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
  			    ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
  			     masks[irq][4]));
@@ -28693,7 +25235,7 @@ index d391f48..10c8ca3 100644
  			      *sequence) <= (1 << 23)));
  	}
  	*sequence = cur_irq_sequence;
-@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
+@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct dr
  		}
  
  		for (i = 0; i < dev_priv->num_irqs; ++i) {
@@ -28702,7 +25244,7 @@ index d391f48..10c8ca3 100644
  			cur_irq->enable_mask = dev_priv->irq_masks[i][0];
  			cur_irq->pending_mask = dev_priv->irq_masks[i][1];
  			DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
-@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
+@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev,
  	switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
  	case VIA_IRQ_RELATIVE:
  		irqwait->request.sequence +=
@@ -28711,10 +25253,9 @@ index d391f48..10c8ca3 100644
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-index 10fc01f..b4e9822 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-08-23 21:47:55.000000000 -0400
 @@ -240,7 +240,7 @@ struct vmw_private {
  	 * Fencing and IRQs.
  	 */
@@ -28724,11 +25265,10 @@ index 10fc01f..b4e9822 100644
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
-index 61eacc1..ee38ce8 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
-@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
+diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-08-23 21:47:55.000000000 -0400
+@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
  	while (!vmw_lag_lt(queue, us)) {
  		spin_lock(&queue->lock);
  		if (list_empty(&queue->head))
@@ -28737,11 +25277,10 @@ index 61eacc1..ee38ce8 100644
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-index 635c0ff..f12fa3d 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
-@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
+diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-08-23 21:47:55.000000000 -0400
+@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
  
@@ -28750,7 +25289,7 @@ index 635c0ff..f12fa3d 100644
  	iowrite32(dev_priv->last_read_sequence, fifo_mem + SVGA_FIFO_FENCE);
  	vmw_fence_queue_init(&fifo->fence_queue);
  	return vmw_fifo_send_fence(dev_priv, &dummy);
-@@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *sequence)
+@@ -476,7 +476,7 @@ int vmw_fifo_send_fence(struct vmw_priva
  
  	fm = vmw_fifo_reserve(dev_priv, bytes);
  	if (unlikely(fm == NULL)) {
@@ -28759,7 +25298,7 @@ index 635c0ff..f12fa3d 100644
  		ret = -ENOMEM;
  		(void)vmw_fallback_wait(dev_priv, false, true, *sequence,
  					false, 3*HZ);
-@@ -484,7 +484,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *sequence)
+@@ -484,7 +484,7 @@ int vmw_fifo_send_fence(struct vmw_priva
  	}
  
  	do {
@@ -28768,20 +25307,10 @@ index 635c0ff..f12fa3d 100644
  	} while (*sequence == 0);
  
  	if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-@@ -534,7 +534,7 @@ static int vmw_fifo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- 	return VM_FAULT_SIGBUS;
- }
- 
--static struct vm_operations_struct vmw_fifo_vm_ops = {
-+static const struct vm_operations_struct vmw_fifo_vm_ops = {
- 	.fault = vmw_fifo_vm_fault,
- 	.open = NULL,
- 	.close = NULL
-diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-index e92298a..f68f2d6 100644
---- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
-@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_private *dev_priv,
+diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-08-23 21:47:55.000000000 -0400
+@@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
  	 * emitted. Then the fence is stale and signaled.
  	 */
  
@@ -28790,7 +25319,7 @@ index e92298a..f68f2d6 100644
  	       > VMW_FENCE_WRAP);
  
  	return ret;
-@@ -131,7 +131,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
+@@ -131,7 +131,7 @@ int vmw_fallback_wait(struct vmw_private
  
  	if (fifo_idle)
  		down_read(&fifo_state->rwsem);
@@ -28799,11 +25328,10 @@ index e92298a..f68f2d6 100644
  	ret = 0;
  
  	for (;;) {
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index 9477b2a..41aa080 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1846,7 +1846,7 @@ static bool hid_ignore(struct hid_device *hdev)
+diff -urNp linux-3.0.3/drivers/hid/hid-core.c linux-3.0.3/drivers/hid/hid-core.c
+--- linux-3.0.3/drivers/hid/hid-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/hid/hid-core.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
  {
@@ -28812,7 +25340,7 @@ index 9477b2a..41aa080 100644
  	int ret;
  
  	if (WARN_ON(hdev->status & HID_STAT_ADDED))
-@@ -1861,7 +1861,7 @@ int hid_add_device(struct hid_device *hdev)
+@@ -1938,7 +1938,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,
@@ -28821,11 +25349,10 @@ index 9477b2a..41aa080 100644
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
-index af0a7c1..969143a 100644
---- a/drivers/hid/usbhid/hiddev.c
-+++ b/drivers/hid/usbhid/hiddev.c
-@@ -613,7 +613,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+diff -urNp linux-3.0.3/drivers/hid/usbhid/hiddev.c linux-3.0.3/drivers/hid/usbhid/hiddev.c
+--- linux-3.0.3/drivers/hid/usbhid/hiddev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/hid/usbhid/hiddev.c	2011-08-23 21:47:55.000000000 -0400
+@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
  		break;
  
  	case HIDIOCAPPLICATION:
@@ -28834,73 +25361,31 @@ index af0a7c1..969143a 100644
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
-index d805e8e..1c78d9a 100644
---- a/drivers/hwmon/lis3lv02d.c
-+++ b/drivers/hwmon/lis3lv02d.c
-@@ -436,7 +436,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
- 	 * the lid is closed. This leads to interrupts as soon as a little move
- 	 * is done.
- 	 */
--	atomic_inc(&lis3_dev.count);
-+	atomic_inc_unchecked(&lis3_dev.count);
- 
- 	wake_up_interruptible(&lis3_dev.misc_wait);
- 	kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
-@@ -519,7 +519,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
- 	if (lis3_dev.pm_dev)
- 		pm_runtime_get_sync(lis3_dev.pm_dev);
- 
--	atomic_set(&lis3_dev.count, 0);
-+	atomic_set_unchecked(&lis3_dev.count, 0);
- 	return 0;
- }
- 
-@@ -546,7 +546,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
- 	add_wait_queue(&lis3_dev.misc_wait, &wait);
- 	while (true) {
- 		set_current_state(TASK_INTERRUPTIBLE);
--		data = atomic_xchg(&lis3_dev.count, 0);
-+		data = atomic_xchg_unchecked(&lis3_dev.count, 0);
- 		if (data)
- 			break;
+diff -urNp linux-3.0.3/drivers/hwmon/acpi_power_meter.c linux-3.0.3/drivers/hwmon/acpi_power_meter.c
+--- linux-3.0.3/drivers/hwmon/acpi_power_meter.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/hwmon/acpi_power_meter.c	2011-08-23 21:47:55.000000000 -0400
+@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
+ 		return res;
  
-@@ -584,7 +584,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 --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
-index a193958..4d7ecd2 100644
---- a/drivers/hwmon/lis3lv02d.h
-+++ b/drivers/hwmon/lis3lv02d.h
-@@ -265,7 +265,7 @@ struct lis3lv02d {
- 	struct input_polled_dev	*idev;     /* input device */
- 	struct platform_device	*pdev;     /* platform device */
- 	struct regulator_bulk_data regulators[2];
--	atomic_t		count;     /* interrupt count after last read */
-+	atomic_unchecked_t	count;     /* interrupt count after last read */
- 	union axis_conversion	ac;        /* hw -> logical axis */
- 	int			mapped_btns[3];
+ 	temp /= 1000;
+-	if (temp < 0)
+-		return -EINVAL;
  
-diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
-index 38a41d2..ef64d3b 100644
---- a/drivers/hwmon/sht15.c
-+++ b/drivers/hwmon/sht15.c
-@@ -113,7 +113,7 @@ struct sht15_data {
+ 	mutex_lock(&resource->lock);
+ 	resource->trip[attr->index - 7] = temp;
+diff -urNp linux-3.0.3/drivers/hwmon/sht15.c linux-3.0.3/drivers/hwmon/sht15.c
+--- linux-3.0.3/drivers/hwmon/sht15.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/hwmon/sht15.c	2011-08-23 21:47:55.000000000 -0400
+@@ -166,7 +166,7 @@ struct sht15_data {
  	int				supply_uV;
- 	int				supply_uV_valid;
+ 	bool				supply_uV_valid;
  	struct work_struct		update_supply_work;
 -	atomic_t			interrupt_handled;
 +	atomic_unchecked_t		interrupt_handled;
  };
  
  /**
-@@ -246,13 +246,13 @@ static inline int sht15_update_single_val(struct sht15_data *data,
+@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht1
  		return ret;
  
  	gpio_direction_input(data->pdata->gpio_data);
@@ -28910,40 +25395,39 @@ index 38a41d2..ef64d3b 100644
  	enable_irq(gpio_to_irq(data->pdata->gpio_data));
  	if (gpio_get_value(data->pdata->gpio_data) == 0) {
  		disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
- 		/* Only relevant if the interrupt hasn't occured. */
+ 		/* Only relevant if the interrupt hasn't occurred. */
 -		if (!atomic_read(&data->interrupt_handled))
 +		if (!atomic_read_unchecked(&data->interrupt_handled))
  			schedule_work(&data->read_work);
  	}
  	ret = wait_event_timeout(data->wait_queue,
-@@ -399,7 +399,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
- 	struct sht15_data *data = d;
+@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired
+ 
  	/* 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 != SHT15_READING_NOTHING)
+ 	if (data->state != SHT15_READING_NOTHING)
  		schedule_work(&data->read_work);
-@@ -450,11 +450,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
- 		   here as could have gone low in meantime so verify
- 		   it hasn't!
- 		*/
+@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct wo
+ 		 * If not, then start the interrupt again - care 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 still not occurred 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 --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
-index 400a88b..2392c35 100644
---- a/drivers/hwmon/w83791d.c
-+++ b/drivers/hwmon/w83791d.c
-@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_client *client,
+ 
+diff -urNp linux-3.0.3/drivers/hwmon/w83791d.c linux-3.0.3/drivers/hwmon/w83791d.c
+--- linux-3.0.3/drivers/hwmon/w83791d.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/hwmon/w83791d.c	2011-08-23 21:47:55.000000000 -0400
+@@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
  			  struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
  
@@ -28954,11 +25438,46 @@ index 400a88b..2392c35 100644
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
-index 413e4ef..d992603 100644
---- a/drivers/ide/ide-cd.c
-+++ b/drivers/ide/ide-cd.c
-@@ -776,7 +776,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
+diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:47:55.000000000 -0400
+@@ -43,7 +43,7 @@
+ extern struct i2c_adapter amd756_smbus;
+ 
+ static struct i2c_adapter *s4882_adapter;
+-static struct i2c_algorithm *s4882_algo;
++static i2c_algorithm_no_const *s4882_algo;
+ 
+ /* Wrapper access functions for multiplexed SMBus */
+ static DEFINE_MUTEX(amd756_lock);
+diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:47:55.000000000 -0400
+@@ -41,7 +41,7 @@
+ extern struct i2c_adapter *nforce2_smbus;
+ 
+ static struct i2c_adapter *s4985_adapter;
+-static struct i2c_algorithm *s4985_algo;
++static i2c_algorithm_no_const *s4985_algo;
+ 
+ /* Wrapper access functions for multiplexed SMBus */
+ static DEFINE_MUTEX(nforce2_lock);
+diff -urNp linux-3.0.3/drivers/i2c/i2c-mux.c linux-3.0.3/drivers/i2c/i2c-mux.c
+--- linux-3.0.3/drivers/i2c/i2c-mux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/i2c/i2c-mux.c	2011-08-23 21:47:55.000000000 -0400
+@@ -28,7 +28,7 @@
+ /* multiplexer per channel data */
+ struct i2c_mux_priv {
+ 	struct i2c_adapter adap;
+-	struct i2c_algorithm algo;
++	i2c_algorithm_no_const algo;
+ 
+ 	struct i2c_adapter *parent;
+ 	void *mux_dev;	/* the mux chip/device */
+diff -urNp linux-3.0.3/drivers/ide/ide-cd.c linux-3.0.3/drivers/ide/ide-cd.c
+--- linux-3.0.3/drivers/ide/ide-cd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ide/ide-cd.c	2011-08-23 21:47:55.000000000 -0400
+@@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
  		alignment = queue_dma_alignment(q) | q->dma_pad_mask;
  		if ((unsigned long)buf & alignment
  		    || blk_rq_bytes(rq) & q->dma_pad_mask
@@ -28967,11 +25486,10 @@ index 413e4ef..d992603 100644
  			drive->dma = 0;
  	}
  }
-diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
-index 5406b6e..ad866b7 100644
---- a/drivers/ide/ide-floppy.c
-+++ b/drivers/ide/ide-floppy.c
-@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
+diff -urNp linux-3.0.3/drivers/ide/ide-floppy.c linux-3.0.3/drivers/ide/ide-floppy.c
+--- linux-3.0.3/drivers/ide/ide-floppy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ide/ide-floppy.c	2011-08-23 21:48:14.000000000 -0400
+@@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
  	u8 pc_buf[256], header_len, desc_cnt;
  	int i, rc = 1, blocks, length;
  
@@ -28980,11 +25498,10 @@ index 5406b6e..ad866b7 100644
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
-index ab3db61..afed580 100644
---- a/drivers/ide/setup-pci.c
-+++ b/drivers/ide/setup-pci.c
-@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
+diff -urNp linux-3.0.3/drivers/ide/setup-pci.c linux-3.0.3/drivers/ide/setup-pci.c
+--- linux-3.0.3/drivers/ide/setup-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/ide/setup-pci.c	2011-08-23 21:48:14.000000000 -0400
+@@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
  	int ret, i, n_ports = dev2 ? 4 : 2;
  	struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
  
@@ -28993,11 +25510,10 @@ index ab3db61..afed580 100644
  	for (i = 0; i < n_ports / 2; i++) {
  		ret = ide_setup_pci_controller(pdev[i], d, !i);
  		if (ret < 0)
-diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
-index 1d9616b..828c022 100644
---- a/drivers/infiniband/core/cm.c
-+++ b/drivers/infiniband/core/cm.c
-@@ -113,7 +113,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
+diff -urNp linux-3.0.3/drivers/infiniband/core/cm.c linux-3.0.3/drivers/infiniband/core/cm.c
+--- linux-3.0.3/drivers/infiniband/core/cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/core/cm.c	2011-08-23 21:47:55.000000000 -0400
+@@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
  	struct kobject obj;
@@ -29006,7 +25522,7 @@ index 1d9616b..828c022 100644
  };
  
  struct cm_counter_attribute {
-@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm_work *work,
+@@ -1387,7 +1387,7 @@ static void cm_dup_req_handler(struct cm
  	struct ib_mad_send_buf *msg = NULL;
  	int ret;
  
@@ -29015,7 +25531,7 @@ index 1d9616b..828c022 100644
  			counter[CM_REQ_COUNTER]);
  
  	/* Quick state check to discard duplicate REQs. */
-@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
+@@ -1765,7 +1765,7 @@ static void cm_dup_rep_handler(struct cm
  	if (!cm_id_priv)
  		return;
  
@@ -29024,7 +25540,7 @@ index 1d9616b..828c022 100644
  			counter[CM_REP_COUNTER]);
  	ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
  	if (ret)
-@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work *work)
+@@ -1932,7 +1932,7 @@ static int cm_rtu_handler(struct cm_work
  	if (cm_id_priv->id.state != IB_CM_REP_SENT &&
  	    cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
  		spin_unlock_irq(&cm_id_priv->lock);
@@ -29033,7 +25549,7 @@ index 1d9616b..828c022 100644
  				counter[CM_RTU_COUNTER]);
  		goto out;
  	}
-@@ -2111,7 +2111,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2115,7 +2115,7 @@ static int cm_dreq_handler(struct cm_wor
  	cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
  				   dreq_msg->local_comm_id);
  	if (!cm_id_priv) {
@@ -29042,7 +25558,7 @@ index 1d9616b..828c022 100644
  				counter[CM_DREQ_COUNTER]);
  		cm_issue_drep(work->port, work->mad_recv_wc);
  		return -EINVAL;
-@@ -2132,7 +2132,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2140,7 +2140,7 @@ static int cm_dreq_handler(struct cm_wor
  	case IB_CM_MRA_REP_RCVD:
  		break;
  	case IB_CM_TIMEWAIT:
@@ -29051,7 +25567,7 @@ index 1d9616b..828c022 100644
  				counter[CM_DREQ_COUNTER]);
  		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
  			goto unlock;
-@@ -2146,7 +2146,7 @@ static int cm_dreq_handler(struct cm_work *work)
+@@ -2154,7 +2154,7 @@ static int cm_dreq_handler(struct cm_wor
  			cm_free_msg(msg);
  		goto deref;
  	case IB_CM_DREQ_RCVD:
@@ -29060,7 +25576,7 @@ index 1d9616b..828c022 100644
  				counter[CM_DREQ_COUNTER]);
  		goto unlock;
  	default:
-@@ -2504,7 +2504,7 @@ static int cm_mra_handler(struct cm_work *work)
+@@ -2521,7 +2521,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 == IB_CM_MRA_LAP_RCVD)
@@ -29069,7 +25585,7 @@ index 1d9616b..828c022 100644
  						counter_group[CM_RECV_DUPLICATES].
  						counter[CM_MRA_COUNTER]);
  			goto out;
-@@ -2513,7 +2513,7 @@ static int cm_mra_handler(struct cm_work *work)
+@@ -2530,7 +2530,7 @@ static int cm_mra_handler(struct cm_work
  		break;
  	case IB_CM_MRA_REQ_RCVD:
  	case IB_CM_MRA_REP_RCVD:
@@ -29078,7 +25594,7 @@ index 1d9616b..828c022 100644
  				counter[CM_MRA_COUNTER]);
  		/* fall through */
  	default:
-@@ -2675,7 +2675,7 @@ static int cm_lap_handler(struct cm_work *work)
+@@ -2692,7 +2692,7 @@ static int cm_lap_handler(struct cm_work
  	case IB_CM_LAP_IDLE:
  		break;
  	case IB_CM_MRA_LAP_SENT:
@@ -29087,7 +25603,7 @@ index 1d9616b..828c022 100644
  				counter[CM_LAP_COUNTER]);
  		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
  			goto unlock;
-@@ -2691,7 +2691,7 @@ static int cm_lap_handler(struct cm_work *work)
+@@ -2708,7 +2708,7 @@ static int cm_lap_handler(struct cm_work
  			cm_free_msg(msg);
  		goto deref;
  	case IB_CM_LAP_RCVD:
@@ -29096,7 +25612,7 @@ index 1d9616b..828c022 100644
  				counter[CM_LAP_COUNTER]);
  		goto unlock;
  	default:
-@@ -2975,7 +2975,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
+@@ -2992,7 +2992,7 @@ static int cm_sidr_req_handler(struct cm
  	cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
  	if (cur_cm_id_priv) {
  		spin_unlock_irq(&cm.lock);
@@ -29105,7 +25621,7 @@ index 1d9616b..828c022 100644
  				counter[CM_SIDR_REQ_COUNTER]);
  		goto out; /* Duplicate message. */
  	}
-@@ -3187,10 +3187,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
+@@ -3204,10 +3204,10 @@ static void cm_send_handler(struct ib_ma
  	if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
  		msg->retries = 1;
  
@@ -29118,7 +25634,7 @@ index 1d9616b..828c022 100644
  				&port->counter_group[CM_XMIT_RETRIES].
  				counter[attr_index]);
  
-@@ -3400,7 +3400,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
+@@ -3417,7 +3417,7 @@ static void cm_recv_handler(struct ib_ma
  	}
  
  	attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
@@ -29127,7 +25643,7 @@ index 1d9616b..828c022 100644
  			counter[attr_id - CM_ATTR_ID_OFFSET]);
  
  	work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
-@@ -3598,7 +3598,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
+@@ -3615,7 +3615,7 @@ static ssize_t cm_show_counter(struct ko
  	cm_attr = container_of(attr, struct cm_counter_attribute, attr);
  
  	return sprintf(buf, "%ld\n",
@@ -29136,10 +25652,9 @@ index 1d9616b..828c022 100644
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
-index 4507043..14ad522 100644
---- a/drivers/infiniband/core/fmr_pool.c
-+++ b/drivers/infiniband/core/fmr_pool.c
+diff -urNp linux-3.0.3/drivers/infiniband/core/fmr_pool.c linux-3.0.3/drivers/infiniband/core/fmr_pool.c
+--- linux-3.0.3/drivers/infiniband/core/fmr_pool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/core/fmr_pool.c	2011-08-23 21:47:55.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
  	struct task_struct       *thread;
@@ -29151,7 +25666,7 @@ index 4507043..14ad522 100644
  
  	wait_queue_head_t         force_wait;
  };
-@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
+@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *p
  	struct ib_fmr_pool *pool = pool_ptr;
  
  	do {
@@ -29164,7 +25679,7 @@ index 4507043..14ad522 100644
  			wake_up_interruptible(&pool->force_wait);
  
  			if (pool->flush_function)
-@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
+@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *p
  		}
  
  		set_current_state(TASK_INTERRUPTIBLE);
@@ -29173,7 +25688,7 @@ index 4507043..14ad522 100644
  		    !kthread_should_stop())
  			schedule();
  		__set_current_state(TASK_RUNNING);
-@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
+@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(s
  	pool->dirty_watermark = params->dirty_watermark;
  	pool->dirty_len       = 0;
  	spin_lock_init(&pool->pool_lock);
@@ -29184,7 +25699,7 @@ index 4507043..14ad522 100644
  	init_waitqueue_head(&pool->force_wait);
  
  	pool->thread = kthread_run(ib_fmr_cleanup_thread,
-@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
+@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool
  	}
  	spin_unlock_irq(&pool->pool_lock);
  
@@ -29198,7 +25713,7 @@ index 4507043..14ad522 100644
  		return -EINTR;
  
  	return 0;
-@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
+@@ -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 >= pool->dirty_watermark) {
@@ -29207,11 +25722,10 @@ index 4507043..14ad522 100644
  				wake_up_process(pool->thread);
  			}
  		}
-diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
-index 273ffe4..a997eaa 100644
---- a/drivers/infiniband/hw/cxgb4/mem.c
-+++ b/drivers/infiniband/hw/cxgb4/mem.c
-@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+diff -urNp linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c	2011-08-23 21:47:55.000000000 -0400
+@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
  	int err;
  	struct fw_ri_tpte tpt;
  	u32 stag_idx;
@@ -29220,7 +25734,7 @@ index 273ffe4..a997eaa 100644
  
  	if (c4iw_fatal_error(rdev))
  		return -EIO;
-@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_r
  					     &rdev->resource.tpt_fifo_lock);
  		if (!stag_idx)
  			return -ENOMEM;
@@ -29229,11 +25743,10 @@ index 273ffe4..a997eaa 100644
  	}
  	PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
  	     __func__, stag_state, type, pdid, stag_idx);
-diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
-index 31ae1b1..2f5b038 100644
---- a/drivers/infiniband/hw/ipath/ipath_fs.c
-+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
-@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
+diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
  	struct infinipath_counters counters;
  	struct ipath_devdata *dd;
  
@@ -29242,11 +25755,10 @@ index 31ae1b1..2f5b038 100644
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
-index 79b3dbc..96e5fcc 100644
---- a/drivers/infiniband/hw/ipath/ipath_rc.c
-+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
-@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
+diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
  		struct ib_atomic_eth *ateth;
  		struct ipath_ack_entry *e;
  		u64 vaddr;
@@ -29255,7 +25767,7 @@ index 79b3dbc..96e5fcc 100644
  		u64 sdata;
  		u32 rkey;
  		u8 next;
-@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
+@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *de
  					    IB_ACCESS_REMOTE_ATOMIC)))
  			goto nack_acc_unlck;
  		/* Perform atomic OP and save result. */
@@ -29269,11 +25781,10 @@ index 79b3dbc..96e5fcc 100644
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      be64_to_cpu(ateth->compare_data),
  				      sdata);
-diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
-index 1f95bba..9530f87 100644
---- a/drivers/infiniband/hw/ipath/ipath_ruc.c
-+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
-@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
+diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-08-23 21:47:55.000000000 -0400
+@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
  	unsigned long flags;
  	struct ib_wc wc;
  	u64 sdata;
@@ -29296,11 +25807,10 @@ index 1f95bba..9530f87 100644
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
-diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
-index 3b4ec32..2050fb1 100644
---- a/drivers/infiniband/hw/nes/nes.c
-+++ b/drivers/infiniband/hw/nes/nes.c
-@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
+diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.c linux-3.0.3/drivers/infiniband/hw/nes/nes.c
+--- linux-3.0.3/drivers/infiniband/hw/nes/nes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/nes/nes.c	2011-08-23 21:47:55.000000000 -0400
+@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
  
@@ -29309,7 +25819,7 @@ index 3b4ec32..2050fb1 100644
  
  static unsigned int ee_flsh_adapter;
  static unsigned int sysfs_nonidx_addr;
-@@ -274,7 +274,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
+@@ -275,7 +275,7 @@ static void nes_cqp_rem_ref_callback(str
  	struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
  	struct nes_adapter *nesadapter = nesdev->nesadapter;
  
@@ -29318,65 +25828,9 @@ index 3b4ec32..2050fb1 100644
  
  	/* Free the control structures */
  
-diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
-index 6fe7987..68637b5 100644
---- a/drivers/infiniband/hw/nes/nes.h
-+++ b/drivers/infiniband/hw/nes/nes.h
-@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
- extern unsigned int wqm_quanta;
- extern struct list_head nes_adapter_list;
- 
--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;
-@@ -194,14 +194,14 @@ extern u32 cm_packets_created;
- extern u32 cm_packets_received;
- extern u32 cm_packets_dropped;
- extern u32 cm_packets_retrans;
--extern atomic_t cm_listens_created;
--extern atomic_t cm_listens_destroyed;
-+extern atomic_unchecked_t cm_listens_created;
-+extern atomic_unchecked_t 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;
- 
- extern u32 int_mod_timer_init;
- extern u32 int_mod_cq_depth_256;
-diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
-index 009ec81..6e65648 100644
---- a/drivers/infiniband/hw/nes/nes_cm.c
-+++ b/drivers/infiniband/hw/nes/nes_cm.c
+diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -29420,7 +25874,7 @@ index 009ec81..6e65648 100644
  
  
  /**
-@@ -1045,7 +1045,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
+@@ -1045,7 +1045,7 @@ static int mini_cm_dec_refcnt_listen(str
  		kfree(listener);
  		listener = NULL;
  		ret = 0;
@@ -29429,7 +25883,7 @@ index 009ec81..6e65648 100644
  	} else {
  		spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
  	}
-@@ -1242,7 +1242,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
+@@ -1240,7 +1240,7 @@ static struct nes_cm_node *make_cm_node(
  		  cm_node->rem_mac);
  
  	add_hte_node(cm_core, cm_node);
@@ -29438,7 +25892,7 @@ index 009ec81..6e65648 100644
  
  	return cm_node;
  }
-@@ -1300,7 +1300,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
+@@ -1298,7 +1298,7 @@ static int rem_ref_cm_node(struct nes_cm
  	}
  
  	atomic_dec(&cm_core->node_cnt);
@@ -29447,7 +25901,7 @@ index 009ec81..6e65648 100644
  	nesqp = cm_node->nesqp;
  	if (nesqp) {
  		nesqp->cm_node = NULL;
-@@ -1367,7 +1367,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
+@@ -1365,7 +1365,7 @@ static int process_options(struct nes_cm
  
  static void drop_packet(struct sk_buff *skb)
  {
@@ -29456,7 +25910,7 @@ index 009ec81..6e65648 100644
  	dev_kfree_skb_any(skb);
  }
  
-@@ -1430,7 +1430,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
+@@ -1428,7 +1428,7 @@ static void handle_rst_pkt(struct nes_cm
  {
  
  	int	reset = 0;	/* whether to send reset in case of err.. */
@@ -29465,7 +25919,7 @@ index 009ec81..6e65648 100644
  	nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
  			" refcnt=%d\n", cm_node, cm_node->state,
  			atomic_read(&cm_node->ref_count));
-@@ -2059,7 +2059,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
+@@ -2057,7 +2057,7 @@ static struct nes_cm_node *mini_cm_conne
  				rem_ref_cm_node(cm_node->cm_core, cm_node);
  				return NULL;
  			}
@@ -29474,7 +25928,7 @@ index 009ec81..6e65648 100644
  			loopbackremotenode->loopbackpartner = cm_node;
  			loopbackremotenode->tcp_cntxt.rcv_wscale =
  				NES_CM_DEFAULT_RCV_WND_SCALE;
-@@ -2334,7 +2334,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
+@@ -2332,7 +2332,7 @@ static int mini_cm_recv_pkt(struct nes_c
  			add_ref_cm_node(cm_node);
  		} else if (cm_node->state == NES_CM_STATE_TSA) {
  			rem_ref_cm_node(cm_core, cm_node);
@@ -29483,7 +25937,7 @@ index 009ec81..6e65648 100644
  			dev_kfree_skb_any(skb);
  			break;
  		}
-@@ -2640,7 +2640,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2638,7 +2638,7 @@ static int nes_cm_disconn_true(struct ne
  
  	if ((cm_id) && (cm_id->event_handler)) {
  		if (issue_disconn) {
@@ -29492,7 +25946,7 @@ index 009ec81..6e65648 100644
  			cm_event.event = IW_CM_EVENT_DISCONNECT;
  			cm_event.status = disconn_status;
  			cm_event.local_addr = cm_id->local_addr;
-@@ -2662,7 +2662,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
+@@ -2660,7 +2660,7 @@ static int nes_cm_disconn_true(struct ne
  		}
  
  		if (issue_close) {
@@ -29501,7 +25955,7 @@ index 009ec81..6e65648 100644
  			nes_disconnect(nesqp, 1);
  
  			cm_id->provider_data = nesqp;
-@@ -2793,7 +2793,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -2791,7 +2791,7 @@ int nes_accept(struct iw_cm_id *cm_id, s
  
  	nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
  		nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
@@ -29510,7 +25964,7 @@ index 009ec81..6e65648 100644
  
  	nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
  			netdev_refcnt_read(nesvnic->netdev));
-@@ -3003,7 +3003,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+@@ -3001,7 +3001,7 @@ int nes_reject(struct iw_cm_id *cm_id, c
  
  	struct nes_cm_core *cm_core;
  
@@ -29519,7 +25973,7 @@ index 009ec81..6e65648 100644
  	cm_node = (struct nes_cm_node *) cm_id->provider_data;
  	loopback = cm_node->loopbackpartner;
  	cm_core = cm_node->cm_core;
-@@ -3069,7 +3069,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+@@ -3067,7 +3067,7 @@ int nes_connect(struct iw_cm_id *cm_id, 
  		ntohl(cm_id->local_addr.sin_addr.s_addr),
  		ntohs(cm_id->local_addr.sin_port));
  
@@ -29528,7 +25982,7 @@ index 009ec81..6e65648 100644
  	nesqp->active_conn = 1;
  
  	/* cache the cm_id in the qp */
-@@ -3175,7 +3175,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
+@@ -3173,7 +3173,7 @@ int nes_create_listen(struct iw_cm_id *c
  			g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
  			return err;
  		}
@@ -29537,7 +25991,7 @@ index 009ec81..6e65648 100644
  	}
  
  	cm_id->add_ref(cm_id);
-@@ -3280,7 +3280,7 @@ static void cm_event_connected(struct nes_cm_event *event)
+@@ -3278,7 +3278,7 @@ static void cm_event_connected(struct ne
  	if (nesqp->destroyed) {
  		return;
  	}
@@ -29546,16 +26000,16 @@ index 009ec81..6e65648 100644
  	nes_debug(NES_DBG_CM, "QP%u attempting to connect to  0x%08X:0x%04X on"
  			" local port 0x%04X. jiffies = %lu.\n",
  			nesqp->hwqp.qp_id,
-@@ -3495,7 +3495,7 @@ static void cm_event_reset(struct nes_cm_event *event)
+@@ -3493,7 +3493,7 @@ static void cm_event_reset(struct nes_cm
  
  	cm_id->add_ref(cm_id);
  	ret = cm_id->event_handler(cm_id, &cm_event);
 -	atomic_inc(&cm_closes);
 +	atomic_inc_unchecked(&cm_closes);
  	cm_event.event = IW_CM_EVENT_CLOSE;
- 	cm_event.status = IW_CM_EVENT_STATUS_OK;
+ 	cm_event.status = 0;
  	cm_event.provider_data = cm_id->provider_data;
-@@ -3531,7 +3531,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
+@@ -3529,7 +3529,7 @@ static void cm_event_mpa_req(struct nes_
  		return;
  	cm_id = cm_node->cm_id;
  
@@ -29564,7 +26018,7 @@ index 009ec81..6e65648 100644
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-@@ -3569,7 +3569,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
+@@ -3567,7 +3567,7 @@ static void cm_event_mpa_reject(struct n
  		return;
  	cm_id = cm_node->cm_id;
  
@@ -29573,11 +26027,64 @@ index 009ec81..6e65648 100644
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
-index 2c9c193..4bebd0f 100644
---- a/drivers/infiniband/hw/nes/nes_nic.c
-+++ b/drivers/infiniband/hw/nes/nes_nic.c
-@@ -1302,31 +1302,31 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
+diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.h linux-3.0.3/drivers/infiniband/hw/nes/nes.h
+--- linux-3.0.3/drivers/infiniband/hw/nes/nes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/nes/nes.h	2011-08-23 21:47:55.000000000 -0400
+@@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
+ extern unsigned int wqm_quanta;
+ extern struct list_head nes_adapter_list;
+ 
+-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;
+@@ -194,14 +194,14 @@ extern u32 cm_packets_created;
+ extern u32 cm_packets_received;
+ extern u32 cm_packets_dropped;
+ extern u32 cm_packets_retrans;
+-extern atomic_t cm_listens_created;
+-extern atomic_t cm_listens_destroyed;
++extern atomic_unchecked_t cm_listens_created;
++extern atomic_unchecked_t 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;
+ 
+ extern u32 int_mod_timer_init;
+ extern u32 int_mod_cq_depth_256;
+diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
  	target_stat_values[++index] = mh_detected;
  	target_stat_values[++index] = mh_pauses_sent;
  	target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
@@ -29627,10 +26134,9 @@ index 2c9c193..4bebd0f 100644
  	target_stat_values[++index] = nesadapter->free_4kpbl;
  	target_stat_values[++index] = nesadapter->free_256pbl;
  	target_stat_values[++index] = int_mod_timer_init;
-diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
-index 26d8018..cffad93 100644
---- a/drivers/infiniband/hw/nes/nes_verbs.c
-+++ b/drivers/infiniband/hw/nes/nes_verbs.c
+diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -29644,7 +26150,7 @@ index 26d8018..cffad93 100644
  
  static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
  
-@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
+@@ -1141,7 +1141,7 @@ static struct ib_qp *nes_create_qp(struc
  	if (init_attr->create_flags)
  		return ERR_PTR(-EINVAL);
  
@@ -29653,7 +26159,7 @@ index 26d8018..cffad93 100644
  	switch (init_attr->qp_type) {
  		case IB_QPT_RC:
  			if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
-@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
+@@ -1470,7 +1470,7 @@ static int nes_destroy_qp(struct ib_qp *
  	struct iw_cm_event cm_event;
  	int ret;
  
@@ -29662,10 +26168,9 @@ index 26d8018..cffad93 100644
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
-index 73225ee..949a406 100644
---- a/drivers/infiniband/hw/qib/qib.h
-+++ b/drivers/infiniband/hw/qib/qib.h
+diff -urNp linux-3.0.3/drivers/infiniband/hw/qib/qib.h linux-3.0.3/drivers/infiniband/hw/qib/qib.h
+--- linux-3.0.3/drivers/infiniband/hw/qib/qib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/infiniband/hw/qib/qib.h	2011-08-23 21:47:55.000000000 -0400
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -29674,10 +26179,9 @@ index 73225ee..949a406 100644
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
-index 5b8f59d..7f36886 100644
---- a/drivers/input/gameport/gameport.c
-+++ b/drivers/input/gameport/gameport.c
+diff -urNp linux-3.0.3/drivers/input/gameport/gameport.c linux-3.0.3/drivers/input/gameport/gameport.c
+--- linux-3.0.3/drivers/input/gameport/gameport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/gameport/gameport.c	2011-08-23 21:47:55.000000000 -0400
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -29695,11 +26199,10 @@ index 5b8f59d..7f36886 100644
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff --git a/drivers/input/input.c b/drivers/input/input.c
-index 11905b6..0892a58 100644
---- a/drivers/input/input.c
-+++ b/drivers/input/input.c
-@@ -1820,7 +1820,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
+diff -urNp linux-3.0.3/drivers/input/input.c linux-3.0.3/drivers/input/input.c
+--- linux-3.0.3/drivers/input/input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/input.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
  {
@@ -29708,8 +26211,8 @@ index 11905b6..0892a58 100644
  	struct input_handler *handler;
  	const char *path;
  	int error;
-@@ -1853,7 +1853,7 @@ int input_register_device(struct input_dev *dev)
- 		dev->setkeycode_new = input_default_setkeycode;
+@@ -1851,7 +1851,7 @@ int input_register_device(struct input_d
+ 		dev->setkeycode = input_default_setkeycode;
  
  	dev_set_name(&dev->dev, "input%ld",
 -		     (unsigned long) atomic_inc_return(&input_no) - 1);
@@ -29717,10 +26220,9 @@ index 11905b6..0892a58 100644
  
  	error = device_add(&dev->dev);
  	if (error)
-diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
-index b8d8611..15f8d2c 100644
---- a/drivers/input/joystick/sidewinder.c
-+++ b/drivers/input/joystick/sidewinder.c
+diff -urNp linux-3.0.3/drivers/input/joystick/sidewinder.c linux-3.0.3/drivers/input/joystick/sidewinder.c
+--- linux-3.0.3/drivers/input/joystick/sidewinder.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/joystick/sidewinder.c	2011-08-23 21:48:14.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -29738,11 +26240,10 @@ index b8d8611..15f8d2c 100644
  	i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
  	if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {		/* Broken packet, try to fix */
-diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
-index 56abf3d..d8dd85d 100644
---- a/drivers/input/joystick/xpad.c
-+++ b/drivers/input/joystick/xpad.c
-@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
+diff -urNp linux-3.0.3/drivers/input/joystick/xpad.c linux-3.0.3/drivers/input/joystick/xpad.c
+--- linux-3.0.3/drivers/input/joystick/xpad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/joystick/xpad.c	2011-08-23 21:47:55.000000000 -0400
+@@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
  {
@@ -29751,7 +26252,7 @@ index 56abf3d..d8dd85d 100644
  	long led_no;
  	struct xpad_led *led;
  	struct led_classdev *led_cdev;
-@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
+@@ -702,7 +702,7 @@ static int xpad_led_probe(struct usb_xpa
  	if (!led)
  		return -ENOMEM;
  
@@ -29760,11 +26261,10 @@ index 56abf3d..d8dd85d 100644
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
-index 7630273..3b86407 100644
---- a/drivers/input/mousedev.c
-+++ b/drivers/input/mousedev.c
-@@ -764,7 +764,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
+diff -urNp linux-3.0.3/drivers/input/mousedev.c linux-3.0.3/drivers/input/mousedev.c
+--- linux-3.0.3/drivers/input/mousedev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/mousedev.c	2011-08-23 21:47:55.000000000 -0400
+@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
  
  	spin_unlock_irq(&client->packet_lock);
  
@@ -29773,11 +26273,10 @@ index 7630273..3b86407 100644
  		return -EFAULT;
  
  	return count;
-diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
-index ba70058..571d25d 100644
---- a/drivers/input/serio/serio.c
-+++ b/drivers/input/serio/serio.c
-@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
+diff -urNp linux-3.0.3/drivers/input/serio/serio.c linux-3.0.3/drivers/input/serio/serio.c
+--- linux-3.0.3/drivers/input/serio/serio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/input/serio/serio.c	2011-08-23 21:47:55.000000000 -0400
+@@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
  {
@@ -29786,7 +26285,7 @@ index ba70058..571d25d 100644
  
  	__module_get(THIS_MODULE);
  
-@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
+@@ -508,7 +508,7 @@ static void serio_init_port(struct serio
  	mutex_init(&serio->drv_mutex);
  	device_initialize(&serio->dev);
  	dev_set_name(&serio->dev, "serio%ld",
@@ -29795,11 +26294,10 @@ index ba70058..571d25d 100644
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	serio->dev.groups = serio_device_attr_groups;
-diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
-index f80a7c4..ae8f642 100644
---- a/drivers/isdn/capi/capi.c
-+++ b/drivers/isdn/capi/capi.c
-@@ -89,8 +89,8 @@ struct capiminor {
+diff -urNp linux-3.0.3/drivers/isdn/capi/capi.c linux-3.0.3/drivers/isdn/capi/capi.c
+--- linux-3.0.3/drivers/isdn/capi/capi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/capi/capi.c	2011-08-23 21:47:55.000000000 -0400
+@@ -83,8 +83,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
  	u32			ncci;
@@ -29810,7 +26308,7 @@ index f80a7c4..ae8f642 100644
  
  	struct tty_port port;
  	int                ttyinstop;
-@@ -414,7 +414,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
+@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *m
  		capimsg_setu16(s, 2, mp->ap->applid);
  		capimsg_setu8 (s, 4, CAPI_DATA_B3);
  		capimsg_setu8 (s, 5, CAPI_RESP);
@@ -29819,7 +26317,7 @@ index f80a7c4..ae8f642 100644
  		capimsg_setu32(s, 8, mp->ncci);
  		capimsg_setu16(s, 12, datahandle);
  	}
-@@ -547,14 +547,14 @@ static void handle_minor_send(struct capiminor *mp)
+@@ -518,14 +518,14 @@ static void handle_minor_send(struct cap
  		mp->outbytes -= len;
  		spin_unlock_bh(&mp->outlock);
  
@@ -29836,11 +26334,10 @@ index f80a7c4..ae8f642 100644
  		capimsg_setu32(skb->data, 8, mp->ncci);	/* NCCI */
  		capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
  		capimsg_setu16(skb->data, 16, len);	/* Data length */
-diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
-index db621db..825ea1a 100644
---- a/drivers/isdn/gigaset/common.c
-+++ b/drivers/isdn/gigaset/common.c
-@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
+diff -urNp linux-3.0.3/drivers/isdn/gigaset/common.c linux-3.0.3/drivers/isdn/gigaset/common.c
+--- linux-3.0.3/drivers/isdn/gigaset/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/gigaset/common.c	2011-08-23 21:47:55.000000000 -0400
+@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
  	cs->commands_pending = 0;
  	cs->cur_at_seq = 0;
  	cs->gotfwver = -1;
@@ -29849,10 +26346,9 @@ index db621db..825ea1a 100644
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
-index 6dd3607..b66e23e 100644
---- a/drivers/isdn/gigaset/gigaset.h
-+++ b/drivers/isdn/gigaset/gigaset.h
+diff -urNp linux-3.0.3/drivers/isdn/gigaset/gigaset.h linux-3.0.3/drivers/isdn/gigaset/gigaset.h
+--- linux-3.0.3/drivers/isdn/gigaset/gigaset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/gigaset/gigaset.h	2011-08-23 21:47:55.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -29870,12 +26366,11 @@ index 6dd3607..b66e23e 100644
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
-index bb710d16..e09da98 100644
---- a/drivers/isdn/gigaset/interface.c
-+++ b/drivers/isdn/gigaset/interface.c
-@@ -160,9 +160,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
- 		return -ERESTARTSYS;
+diff -urNp linux-3.0.3/drivers/isdn/gigaset/interface.c linux-3.0.3/drivers/isdn/gigaset/interface.c
+--- linux-3.0.3/drivers/isdn/gigaset/interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/gigaset/interface.c	2011-08-23 21:47:55.000000000 -0400
+@@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
+ 	}
  	tty->driver_data = cs;
  
 -	++cs->open_count;
@@ -29885,7 +26380,7 @@ index bb710d16..e09da98 100644
  		spin_lock_irqsave(&cs->lock, flags);
  		cs->tty = tty;
  		spin_unlock_irqrestore(&cs->lock, flags);
-@@ -190,10 +188,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
+@@ -192,10 +190,10 @@ static void if_close(struct tty_struct *
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
@@ -29898,7 +26393,7 @@ index bb710d16..e09da98 100644
  			spin_lock_irqsave(&cs->lock, flags);
  			cs->tty = NULL;
  			spin_unlock_irqrestore(&cs->lock, flags);
-@@ -228,7 +226,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
+@@ -230,7 +228,7 @@ static int if_ioctl(struct tty_struct *t
  	if (!cs->connected) {
  		gig_dbg(DEBUG_IF, "not connected");
  		retval = -ENODEV;
@@ -29907,7 +26402,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else {
  		retval = 0;
-@@ -358,7 +356,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
+@@ -360,7 +358,7 @@ static int if_write(struct tty_struct *t
  		retval = -ENODEV;
  		goto done;
  	}
@@ -29916,7 +26411,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		retval = -ENODEV;
  		goto done;
-@@ -411,7 +409,7 @@ static int if_write_room(struct tty_struct *tty)
+@@ -413,7 +411,7 @@ static int if_write_room(struct tty_stru
  	if (!cs->connected) {
  		gig_dbg(DEBUG_IF, "not connected");
  		retval = -ENODEV;
@@ -29925,7 +26420,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else if (cs->mstate != MS_LOCKED) {
  		dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -441,7 +439,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
+@@ -443,7 +441,7 @@ static int if_chars_in_buffer(struct tty
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");
@@ -29934,7 +26429,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else if (cs->mstate != MS_LOCKED)
  		dev_warn(cs->dev, "can't write to unlocked device\n");
-@@ -469,7 +467,7 @@ static void if_throttle(struct tty_struct *tty)
+@@ -471,7 +469,7 @@ static void if_throttle(struct tty_struc
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
@@ -29943,7 +26438,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else
  		gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
-@@ -493,7 +491,7 @@ static void if_unthrottle(struct tty_struct *tty)
+@@ -495,7 +493,7 @@ static void if_unthrottle(struct tty_str
  
  	if (!cs->connected)
  		gig_dbg(DEBUG_IF, "not connected");	/* nothing to do */
@@ -29952,7 +26447,7 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  	else
  		gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
-@@ -524,7 +522,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -526,7 +524,7 @@ static void if_set_termios(struct tty_st
  		goto out;
  	}
  
@@ -29961,11 +26456,10 @@ index bb710d16..e09da98 100644
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
-index 2a57da59..e7a12ed 100644
---- a/drivers/isdn/hardware/avm/b1.c
-+++ b/drivers/isdn/hardware/avm/b1.c
-@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/avm/b1.c linux-3.0.3/drivers/isdn/hardware/avm/b1.c
+--- linux-3.0.3/drivers/isdn/hardware/avm/b1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/avm/b1.c	2011-08-23 21:47:55.000000000 -0400
+@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
  	}
  	if (left) {
  		if (t4file->user) {
@@ -29974,7 +26468,7 @@ index 2a57da59..e7a12ed 100644
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
+@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capilo
  	}
  	if (left) {
  		if (config->user) {
@@ -29983,11 +26477,10 @@ index 2a57da59..e7a12ed 100644
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff --git a/drivers/isdn/hardware/eicon/capidtmf.c b/drivers/isdn/hardware/eicon/capidtmf.c
-index f130724..c373c68 100644
---- a/drivers/isdn/hardware/eicon/capidtmf.c
-+++ b/drivers/isdn/hardware/eicon/capidtmf.c
-@@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_state   *p_state, byte   *buffer, word leng
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c	2011-08-23 21:48:14.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];
  
@@ -29995,10 +26488,9 @@ index f130724..c373c68 100644
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
-index 4d425c6..a9be6c4 100644
---- a/drivers/isdn/hardware/eicon/capifunc.c
-+++ b/drivers/isdn/hardware/eicon/capifunc.c
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -30008,11 +26500,10 @@ index 4d425c6..a9be6c4 100644
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff --git a/drivers/isdn/hardware/eicon/diddfunc.c b/drivers/isdn/hardware/eicon/diddfunc.c
-index 3029234..ef0d9e2 100644
---- a/drivers/isdn/hardware/eicon/diddfunc.c
-+++ b/drivers/isdn/hardware/eicon/diddfunc.c
-@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
  
@@ -30021,11 +26512,10 @@ index 3029234..ef0d9e2 100644
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c
-index d36a4c0..11e7d1a 100644
---- a/drivers/isdn/hardware/eicon/divasfunc.c
-+++ b/drivers/isdn/hardware/eicon/divasfunc.c
-@@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
  
@@ -30034,11 +26524,22 @@ index d36a4c0..11e7d1a 100644
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff --git a/drivers/isdn/hardware/eicon/idifunc.c b/drivers/isdn/hardware/eicon/idifunc.c
-index db87d51..7d09acf 100644
---- a/drivers/isdn/hardware/eicon/idifunc.c
-+++ b/drivers/isdn/hardware/eicon/idifunc.c
-@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h	2011-08-23 21:47: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-3.0.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
  
@@ -30047,11 +26548,10 @@ index db87d51..7d09acf 100644
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
-index 341ef17..843598e 100644
---- a/drivers/isdn/hardware/eicon/message.c
-+++ b/drivers/isdn/hardware/eicon/message.c
-@@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/message.c linux-3.0.3/drivers/isdn/hardware/eicon/message.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/message.c	2011-08-23 21:48:14.000000000 -0400
+@@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
  
@@ -30060,7 +26560,7 @@ index 341ef17..843598e 100644
    a = plci->adapter;
    Id = ((word)plci->Id<<8)|a->Id;
    PUT_WORD(&SS_Ind[4],0x0000);
-@@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE *bp, word b_channel_info,
+@@ -7480,6 +7482,8 @@ static word add_b1(PLCI *plci, API_PARSE
    word j, n, w;
    dword d;
  
@@ -30069,7 +26569,7 @@ index 341ef17..843598e 100644
  
    for(i=0;i<8;i++) bp_parms[i].length = 0;
    for(i=0;i<2;i++) global_config[i].length = 0;
-@@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
+@@ -7954,6 +7958,8 @@ static word add_b23(PLCI *plci, API_PARS
    const byte llc3[] = {4,3,2,2,6,6,0};
    const byte header[] = {0,2,3,3,0,0,0};
  
@@ -30078,7 +26578,7 @@ index 341ef17..843598e 100644
    for(i=0;i<8;i++) bp_parms[i].length = 0;
    for(i=0;i<6;i++) b2_config_parms[i].length = 0;
    for(i=0;i<5;i++) b3_config_parms[i].length = 0;
-@@ -14760,6 +14766,8 @@ static void group_optimization(DIVA_CAPI_ADAPTER   * a, PLCI   * plci)
+@@ -14741,6 +14747,8 @@ static void group_optimization(DIVA_CAPI
    word appl_number_group_type[MAX_APPL];
    PLCI   *auxplci;
  
@@ -30087,11 +26587,10 @@ index 341ef17..843598e 100644
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c
-index a564b75..f3cf8b5 100644
---- a/drivers/isdn/hardware/eicon/mntfunc.c
-+++ b/drivers/isdn/hardware/eicon/mntfunc.c
-@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
  	IDI_SYNC_REQ req;
  	DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
  
@@ -30100,11 +26599,22 @@ index a564b75..f3cf8b5 100644
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
-index 15632bd..ff8b1c2 100644
---- a/drivers/isdn/i4l/isdn_common.c
-+++ b/drivers/isdn/i4l/isdn_common.c
-@@ -1292,6 +1292,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
+diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-23 21:47: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;
+ 
+ typedef struct _diva_os_xdi_adapter {
+ 	struct list_head link;
+diff -urNp linux-3.0.3/drivers/isdn/i4l/isdn_common.c linux-3.0.3/drivers/isdn/i4l/isdn_common.c
+--- linux-3.0.3/drivers/isdn/i4l/isdn_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/i4l/isdn_common.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, 
  	} iocpar;
  	void __user *argp = (void __user *)arg;
  
@@ -30113,11 +26623,10 @@ index 15632bd..ff8b1c2 100644
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
-index 1f355bb..43f1fea 100644
---- a/drivers/isdn/icn/icn.c
-+++ b/drivers/isdn/icn/icn.c
-@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
+diff -urNp linux-3.0.3/drivers/isdn/icn/icn.c linux-3.0.3/drivers/isdn/icn/icn.c
+--- linux-3.0.3/drivers/isdn/icn/icn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/isdn/icn/icn.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
  		if (count > len)
  			count = len;
  		if (user) {
@@ -30126,10 +26635,9 @@ index 1f355bb..43f1fea 100644
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
-index efa2024..2e18d14 100644
---- a/drivers/lguest/core.c
-+++ b/drivers/lguest/core.c
+diff -urNp linux-3.0.3/drivers/lguest/core.c linux-3.0.3/drivers/lguest/core.c
+--- linux-3.0.3/drivers/lguest/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/lguest/core.c	2011-08-23 21:47:55.000000000 -0400
 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
  	 * it's worked so far.  The end address needs +1 because __get_vm_area
  	 * allocates an extra guard page, so we need space for that.
@@ -30157,10 +26665,9 @@ index efa2024..2e18d14 100644
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
-index 9f1659c..5352032 100644
---- a/drivers/lguest/x86/core.c
-+++ b/drivers/lguest/x86/core.c
+diff -urNp linux-3.0.3/drivers/lguest/x86/core.c linux-3.0.3/drivers/lguest/x86/core.c
+--- linux-3.0.3/drivers/lguest/x86/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/lguest/x86/core.c	2011-08-23 21:47:55.000000000 -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)
@@ -30170,7 +26677,7 @@ index 9f1659c..5352032 100644
  }
  
  /* This cpu's struct lguest_pages. */
-@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *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.
  	 */
@@ -30202,10 +26709,9 @@ index 9f1659c..5352032 100644
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
-index 40634b0..4f5855e 100644
---- a/drivers/lguest/x86/switcher_32.S
-+++ b/drivers/lguest/x86/switcher_32.S
+diff -urNp linux-3.0.3/drivers/lguest/x86/switcher_32.S linux-3.0.3/drivers/lguest/x86/switcher_32.S
+--- linux-3.0.3/drivers/lguest/x86/switcher_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/lguest/x86/switcher_32.S	2011-08-23 21:47:55.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -30264,11 +26770,67 @@ index 40634b0..4f5855e 100644
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
-index 6d12775..38ed27d 100644
---- a/drivers/md/dm-ioctl.c
-+++ b/drivers/md/dm-ioctl.c
-@@ -1541,7 +1541,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
+diff -urNp linux-3.0.3/drivers/md/dm.c linux-3.0.3/drivers/md/dm.c
+--- linux-3.0.3/drivers/md/dm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/md/dm.c	2011-08-23 21:47:55.000000000 -0400
+@@ -164,9 +164,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 */
+ 
+@@ -1842,8 +1842,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);
+ 
+@@ -1977,7 +1977,7 @@ static void event_callback(void *context
+ 
+ 	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
+ 
+-	atomic_inc(&md->event_nr);
++	atomic_inc_unchecked(&md->event_nr);
+ 	wake_up(&md->eventq);
+ }
+ 
+@@ -2553,18 +2553,18 @@ int dm_kobject_uevent(struct mapped_devi
+ 
+ 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);
+ }
+ 
+ uint32_t dm_get_event_nr(struct mapped_device *md)
+ {
+-	return atomic_read(&md->event_nr);
++	return atomic_read_unchecked(&md->event_nr);
+ }
+ 
+ int dm_wait_event(struct mapped_device *md, int event_nr)
+ {
+ 	return wait_event_interruptible(md->eventq,
+-			(event_nr != atomic_read(&md->event_nr)));
++			(event_nr != atomic_read_unchecked(&md->event_nr)));
+ }
+ 
+ void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
+diff -urNp linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3/drivers/md/dm-ioctl.c
+--- linux-3.0.3/drivers/md/dm-ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/dm-ioctl.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
  	    cmd == DM_LIST_VERSIONS_CMD)
  		return 0;
  
@@ -30277,11 +26839,10 @@ index 6d12775..38ed27d 100644
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
-index dee3267..74bd5fb 100644
---- a/drivers/md/dm-raid1.c
-+++ b/drivers/md/dm-raid1.c
-@@ -42,7 +42,7 @@ enum dm_raid1_error {
+diff -urNp linux-3.0.3/drivers/md/dm-raid1.c linux-3.0.3/drivers/md/dm-raid1.c
+--- linux-3.0.3/drivers/md/dm-raid1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/dm-raid1.c	2011-08-23 21:47:55.000000000 -0400
+@@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
  	struct mirror_set *ms;
@@ -30290,7 +26851,7 @@ index dee3267..74bd5fb 100644
  	unsigned long error_type;
  	struct dm_dev *dev;
  	sector_t offset;
-@@ -187,7 +187,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
+@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(s
  	struct mirror *m;
  
  	for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
@@ -30299,7 +26860,7 @@ index dee3267..74bd5fb 100644
  			return m;
  
  	return NULL;
-@@ -219,7 +219,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
+@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m
  	 * simple way to tell if a device has encountered
  	 * errors.
  	 */
@@ -30308,7 +26869,7 @@ index dee3267..74bd5fb 100644
  
  	if (test_and_set_bit(error_type, &m->error_type))
  		return;
-@@ -410,7 +410,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
+@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(stru
  	struct mirror *m = get_default_mirror(ms);
  
  	do {
@@ -30317,7 +26878,7 @@ index dee3267..74bd5fb 100644
  			return m;
  
  		if (m-- == ms->mirror)
-@@ -424,7 +424,7 @@ static int default_ok(struct mirror *m)
+@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
  {
  	struct mirror *default_mirror = get_default_mirror(m->ms);
  
@@ -30326,7 +26887,7 @@ index dee3267..74bd5fb 100644
  }
  
  static int mirror_available(struct mirror_set *ms, struct bio *bio)
-@@ -561,7 +561,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
+@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *
  		 */
  		if (likely(region_in_sync(ms, region, 1)))
  			m = choose_mirror(ms, bio->bi_sector);
@@ -30335,7 +26896,7 @@ index dee3267..74bd5fb 100644
  			m = NULL;
  
  		if (likely(m))
-@@ -941,7 +941,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
+@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set 
  	}
  
  	ms->mirror[mirror].ms = ms;
@@ -30344,7 +26905,7 @@ index dee3267..74bd5fb 100644
  	ms->mirror[mirror].error_type = 0;
  	ms->mirror[mirror].offset = offset;
  
-@@ -1349,7 +1349,7 @@ static void mirror_resume(struct dm_target *ti)
+@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_targ
   */
  static char device_status_char(struct mirror *m)
  {
@@ -30353,10 +26914,9 @@ index dee3267..74bd5fb 100644
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
-index dddfa14..6080ffd 100644
---- a/drivers/md/dm-stripe.c
-+++ b/drivers/md/dm-stripe.c
+diff -urNp linux-3.0.3/drivers/md/dm-stripe.c linux-3.0.3/drivers/md/dm-stripe.c
+--- linux-3.0.3/drivers/md/dm-stripe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/dm-stripe.c	2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
  	struct dm_dev *dev;
  	sector_t physical_start;
@@ -30366,7 +26926,7 @@ index dddfa14..6080ffd 100644
  };
  
  struct stripe_c {
-@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
+@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *
  			kfree(sc);
  			return r;
  		}
@@ -30375,7 +26935,7 @@ index dddfa14..6080ffd 100644
  	}
  
  	ti->private = sc;
-@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
+@@ -314,7 +314,7 @@ static int stripe_status(struct dm_targe
  		DMEMIT("%d ", sc->stripes);
  		for (i = 0; i < sc->stripes; i++)  {
  			DMEMIT("%s ", sc->stripe[i].dev->name);
@@ -30384,7 +26944,7 @@ index dddfa14..6080ffd 100644
  				'D' : 'A';
  		}
  		buffer[i] = '\0';
-@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
+@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_targe
  	 */
  	for (i = 0; i < sc->stripes; i++)
  		if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
@@ -30395,11 +26955,10 @@ index dddfa14..6080ffd 100644
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
-index abd23aa..36c7c0f 100644
---- a/drivers/md/dm-table.c
-+++ b/drivers/md/dm-table.c
-@@ -389,7 +389,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
+diff -urNp linux-3.0.3/drivers/md/dm-table.c linux-3.0.3/drivers/md/dm-table.c
+--- linux-3.0.3/drivers/md/dm-table.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/dm-table.c	2011-08-23 21:47:55.000000000 -0400
+@@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
  
@@ -30408,68 +26967,9 @@ index abd23aa..36c7c0f 100644
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff --git a/drivers/md/dm.c b/drivers/md/dm.c
-index eaa3af0..8c9a4d7 100644
---- a/drivers/md/dm.c
-+++ b/drivers/md/dm.c
-@@ -162,9 +162,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 */
- 
-@@ -1855,8 +1855,8 @@ static struct mapped_device *alloc_dev(int minor)
- 	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);
- 
-@@ -1990,7 +1990,7 @@ static void event_callback(void *context)
- 
- 	dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
- 
--	atomic_inc(&md->event_nr);
-+	atomic_inc_unchecked(&md->event_nr);
- 	wake_up(&md->eventq);
- }
- 
-@@ -2569,18 +2569,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
- 
- 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);
- }
- 
- uint32_t dm_get_event_nr(struct mapped_device *md)
- {
--	return atomic_read(&md->event_nr);
-+	return atomic_read_unchecked(&md->event_nr);
- }
- 
- int dm_wait_event(struct mapped_device *md, int event_nr)
- {
- 	return wait_event_interruptible(md->eventq,
--			(event_nr != atomic_read(&md->event_nr)));
-+			(event_nr != atomic_read_unchecked(&md->event_nr)));
- }
- 
- void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff --git a/drivers/md/md.c b/drivers/md/md.c
-index 3683a07..720bbe6 100644
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
+diff -urNp linux-3.0.3/drivers/md/md.c linux-3.0.3/drivers/md/md.c
+--- linux-3.0.3/drivers/md/md.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/md.c	2011-08-23 21:47:55.000000000 -0400
 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
@@ -30492,7 +26992,7 @@ index 3683a07..720bbe6 100644
  	wake_up(&md_event_waiters);
  }
  
-@@ -1443,7 +1443,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
+@@ -1457,7 +1457,7 @@ static int super_1_load(mdk_rdev_t *rdev
  
  	rdev->preferred_minor = 0xffff;
  	rdev->data_offset = le64_to_cpu(sb->data_offset);
@@ -30501,7 +27001,7 @@ index 3683a07..720bbe6 100644
  
  	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
  	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1621,7 +1621,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
+@@ -1635,7 +1635,7 @@ static void super_1_sync(mddev_t *mddev,
  	else
  		sb->resync_offset = cpu_to_le64(0);
  
@@ -30510,7 +27010,7 @@ index 3683a07..720bbe6 100644
  
  	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
  	sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2403,7 +2403,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
+@@ -2428,7 +2428,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
  static ssize_t
  errors_show(mdk_rdev_t *rdev, char *page)
  {
@@ -30519,7 +27019,7 @@ index 3683a07..720bbe6 100644
  }
  
  static ssize_t
-@@ -2412,7 +2412,7 @@ errors_store(mdk_rdev_t *rdev, const char *buf, size_t len)
+@@ -2437,7 +2437,7 @@ errors_store(mdk_rdev_t *rdev, const cha
  	char *e;
  	unsigned long n = simple_strtoul(buf, &e, 10);
  	if (*buf && (*e == 0 || *e == '\n')) {
@@ -30528,7 +27028,7 @@ index 3683a07..720bbe6 100644
  		return len;
  	}
  	return -EINVAL;
-@@ -2768,8 +2768,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
+@@ -2793,8 +2793,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
  	rdev->last_read_error.tv_sec  = 0;
  	rdev->last_read_error.tv_nsec = 0;
  	atomic_set(&rdev->nr_pending, 0);
@@ -30539,7 +27039,7 @@ index 3683a07..720bbe6 100644
  
  	INIT_LIST_HEAD(&rdev->same_set);
  	init_waitqueue_head(&rdev->blocked_wait);
-@@ -6378,7 +6378,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -6415,7 +6415,7 @@ static int md_seq_show(struct seq_file *
  
  		spin_unlock(&pers_lock);
  		seq_printf(seq, "\n");
@@ -30548,7 +27048,7 @@ index 3683a07..720bbe6 100644
  		return 0;
  	}
  	if (v == (void*)2) {
-@@ -6467,7 +6467,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
+@@ -6504,7 +6504,7 @@ static int md_seq_show(struct seq_file *
  				chunk_kb ? "KB" : "B");
  			if (bitmap->file) {
  				seq_printf(seq, ", file: ");
@@ -30557,7 +27057,7 @@ index 3683a07..720bbe6 100644
  			}
  
  			seq_printf(seq, "\n");
-@@ -6501,7 +6501,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
+@@ -6538,7 +6538,7 @@ static int md_seq_open(struct inode *ino
  	else {
  		struct seq_file *p = file->private_data;
  		p->private = mi;
@@ -30566,7 +27066,7 @@ index 3683a07..720bbe6 100644
  	}
  	return error;
  }
-@@ -6517,7 +6517,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
+@@ -6554,7 +6554,7 @@ static unsigned int mdstat_poll(struct f
  	/* always allow read */
  	mask = POLLIN | POLLRDNORM;
  
@@ -30575,7 +27075,7 @@ index 3683a07..720bbe6 100644
  		mask |= POLLERR | POLLPRI;
  	return mask;
  }
-@@ -6561,7 +6561,7 @@ static int is_mddev_idle(mddev_t *mddev, int init)
+@@ -6598,7 +6598,7 @@ static int is_mddev_idle(mddev_t *mddev,
  		struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
  		curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
  			      (int)part_stat_read(&disk->part0, sectors[1]) -
@@ -30584,11 +27084,10 @@ index 3683a07..720bbe6 100644
  		/* 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 --git a/drivers/md/md.h b/drivers/md/md.h
-index 12215d4..4c2d3d3 100644
---- a/drivers/md/md.h
-+++ b/drivers/md/md.h
-@@ -117,13 +117,13 @@ struct mdk_rdev_s
+diff -urNp linux-3.0.3/drivers/md/md.h linux-3.0.3/drivers/md/md.h
+--- linux-3.0.3/drivers/md/md.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/md.h	2011-08-23 21:47:55.000000000 -0400
+@@ -97,13 +97,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
  					 */
@@ -30604,7 +27103,7 @@ index 12215d4..4c2d3d3 100644
  					   * for reporting to userspace and storing
  					   * in superblock.
  					   */
-@@ -360,7 +360,7 @@ static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
+@@ -344,7 +344,7 @@ static inline void rdev_dec_pending(mdk_
  
  static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
  {
@@ -30613,33 +27112,10 @@ index 12215d4..4c2d3d3 100644
  }
  
  struct mdk_personality
-diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
-index 06cd712..c0627a2 100644
---- a/drivers/md/raid1.c
-+++ b/drivers/md/raid1.c
-@@ -1392,7 +1392,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
- 					if (r1_bio->bios[d]->bi_end_io != end_sync_read)
- 						continue;
- 					rdev = conf->mirrors[d].rdev;
--					atomic_add(s, &rdev->corrected_errors);
-+					atomic_add_unchecked(s, &rdev->corrected_errors);
- 					if (sync_page_io(rdev,
- 							 sect,
- 							 s<<9,
-@@ -1538,7 +1538,7 @@ static void fix_read_error(conf_t *conf, int read_disk,
- 					/* 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
- 					       "md/raid1:%s: read error corrected "
- 					       "(%d sectors at %llu on %s)\n",
-diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
-index 747d061..407fe38c 100644
---- a/drivers/md/raid10.c
-+++ b/drivers/md/raid10.c
-@@ -1258,7 +1258,7 @@ static void end_sync_read(struct bio *bio, int error)
+diff -urNp linux-3.0.3/drivers/md/raid10.c linux-3.0.3/drivers/md/raid10.c
+--- linux-3.0.3/drivers/md/raid10.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/raid10.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1186,7 +1186,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 {
@@ -30648,7 +27124,7 @@ index 747d061..407fe38c 100644
  			   &conf->mirrors[d].rdev->corrected_errors);
  		if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
  			md_error(r10_bio->mddev,
-@@ -1466,7 +1466,7 @@ static void check_decay_read_errors(mddev_t *mddev, mdk_rdev_t *rdev)
+@@ -1394,7 +1394,7 @@ static void check_decay_read_errors(mdde
  {
  	struct timespec cur_time_mon;
  	unsigned long hours_since_last;
@@ -30657,7 +27133,7 @@ index 747d061..407fe38c 100644
  
  	ktime_get_ts(&cur_time_mon);
  
-@@ -1488,9 +1488,9 @@ static void check_decay_read_errors(mddev_t *mddev, mdk_rdev_t *rdev)
+@@ -1416,9 +1416,9 @@ static void check_decay_read_errors(mdde
  	 * overflowing the shift of read_errors by hours_since_last.
  	 */
  	if (hours_since_last >= 8 * sizeof(read_errors))
@@ -30669,18 +27145,27 @@ index 747d061..407fe38c 100644
  }
  
  /*
-@@ -1525,8 +1525,8 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
- 		}
+@@ -1448,8 +1448,8 @@ static void fix_read_error(conf_t *conf,
+ 		return;
  
- 		check_decay_read_errors(mddev, rdev);
--		atomic_inc(&rdev->read_errors);
--		cur_read_error_count = atomic_read(&rdev->read_errors);
-+		atomic_inc_unchecked(&rdev->read_errors);
-+		cur_read_error_count = atomic_read_unchecked(&rdev->read_errors);
- 		if (cur_read_error_count > max_read_errors) {
- 			rcu_read_unlock();
- 			printk(KERN_NOTICE
-@@ -1599,7 +1599,7 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
+ 	check_decay_read_errors(mddev, rdev);
+-	atomic_inc(&rdev->read_errors);
+-	if (atomic_read(&rdev->read_errors) > max_read_errors) {
++	atomic_inc_unchecked(&rdev->read_errors);
++	if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
+ 		char b[BDEVNAME_SIZE];
+ 		bdevname(rdev->bdev, b);
+ 
+@@ -1457,7 +1457,7 @@ static void fix_read_error(conf_t *conf,
+ 		       "md/raid10:%s: %s: Raid device exceeded "
+ 		       "read_error threshold [cur %d:max %d]\n",
+ 		       mdname(mddev), b,
+-		       atomic_read(&rdev->read_errors), max_read_errors);
++		       atomic_read_unchecked(&rdev->read_errors), max_read_errors);
+ 		printk(KERN_NOTICE
+ 		       "md/raid10:%s: %s: Failing raid device\n",
+ 		       mdname(mddev), b);
+@@ -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();
@@ -30689,20 +27174,40 @@ index 747d061..407fe38c 100644
  				if (sync_page_io(rdev,
  						 r10_bio->devs[sl].addr +
  						 sect,
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 78536fd..32b7220 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -555,7 +555,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
+diff -urNp linux-3.0.3/drivers/md/raid1.c linux-3.0.3/drivers/md/raid1.c
+--- linux-3.0.3/drivers/md/raid1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/raid1.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
+ 				rdev_dec_pending(rdev, mddev);
+ 				md_error(mddev, rdev);
+ 			} else
+-				atomic_add(s, &rdev->corrected_errors);
++				atomic_add_unchecked(s, &rdev->corrected_errors);
+ 		}
+ 		d = start;
+ 		while (d != r1_bio->read_disk) {
+@@ -1492,7 +1492,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
+ 					       "md/raid1:%s: read error corrected "
+ 					       "(%d sectors at %llu on %s)\n",
+diff -urNp linux-3.0.3/drivers/md/raid5.c linux-3.0.3/drivers/md/raid5.c
+--- linux-3.0.3/drivers/md/raid5.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/md/raid5.c	2011-08-23 21:48:14.000000000 -0400
+@@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
- 			if (rw == WRITE &&
+ 			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 {
-@@ -1602,15 +1602,15 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1596,15 +1596,15 @@ static void raid5_end_read_request(struc
  			clear_bit(R5_ReadError, &sh->dev[i].flags);
  			clear_bit(R5_ReWrite, &sh->dev[i].flags);
  		}
@@ -30721,7 +27226,7 @@ index 78536fd..32b7220 100644
  		if (conf->mddev->degraded >= conf->max_degraded)
  			printk_rl(KERN_WARNING
  				  "md/raid:%s: read error not correctable "
-@@ -1628,7 +1628,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
+@@ -1622,7 +1622,7 @@ static void raid5_end_read_request(struc
  				  (unsigned long long)(sh->sector
  						       + rdev->data_offset),
  				  bdn);
@@ -30730,7 +27235,7 @@ index 78536fd..32b7220 100644
  			 > conf->max_nr_stripes)
  			printk(KERN_WARNING
  			       "md/raid:%s: Too many read errors, failing device %s.\n",
-@@ -1953,6 +1953,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
+@@ -1945,6 +1945,7 @@ static sector_t compute_blocknr(struct s
  	sector_t r_sector;
  	struct stripe_head sh2;
  
@@ -30738,11 +27243,10 @@ index 78536fd..32b7220 100644
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
-index 1d1d8d2..6c6837a 100644
---- a/drivers/media/common/saa7146_hlp.c
-+++ b/drivers/media/common/saa7146_hlp.c
-@@ -353,6 +353,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
+diff -urNp linux-3.0.3/drivers/media/common/saa7146_hlp.c linux-3.0.3/drivers/media/common/saa7146_hlp.c
+--- linux-3.0.3/drivers/media/common/saa7146_hlp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/common/saa7146_hlp.c	2011-08-23 21:48:14.000000000 -0400
+@@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
  	int x[32], y[32], w[32], h[32];
  
@@ -30751,11 +27255,10 @@ index 1d1d8d2..6c6837a 100644
  	/* clear out memory */
  	memset(&line_list[0],  0x00, sizeof(u32)*32);
  	memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
-index 7ea517b..252fe54 100644
---- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
-+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
-@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-08-23 21:48:14.000000000 -0400
+@@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
  	u8 buf[HOST_LINK_BUF_SIZE];
  	int i;
  
@@ -30764,7 +27267,7 @@ index 7ea517b..252fe54 100644
  	dprintk("%s\n", __func__);
  
  	/* 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(struct file *file,
+@@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(s
  	unsigned long timeout;
  	int written;
  
@@ -30773,45 +27276,96 @@ index 7ea517b..252fe54 100644
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
-index f732877..25c4bf2 100644
---- a/drivers/media/dvb/dvb-core/dvbdev.c
-+++ b/drivers/media/dvb/dvb-core/dvbdev.c
-@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-24 18:24:40.000000000 -0400
+@@ -68,12 +68,12 @@ struct dvb_demux_feed {
+ 	union {
+ 		struct dmx_ts_feed ts;
+ 		struct dmx_section_feed sec;
+-	} feed;
++	} __no_const feed;
+ 
+ 	union {
+ 		dmx_ts_cb ts;
+ 		dmx_section_cb sec;
+-	} cb;
++	} __no_const cb;
+ 
+ 	struct dvb_demux *demux;
+ 	void *priv;
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-24 18:24:19.000000000 -0400
+@@ -192,7 +192,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;
-+	struct file_operations *dvbdevfops;	/* cannot be const, see this function */
++	file_operations_no_const *dvbdevfops;
  	struct device *clsdev;
  	int minor;
  	int id;
-diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
-index 98ffb40..75809c7 100644
---- a/drivers/media/dvb/dvb-usb/dib0700_core.c
-+++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
-@@ -366,6 +366,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
- 
- 	u8 buf[260];
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-24 18:26:33.000000000 -0400
+@@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
+ struct dib0700_adapter_state {
+ 	int (*set_param_save) (struct dvb_frontend *,
+ 			       struct dvb_frontend_parameters *);
+-};
++} __no_const;
+ 
+ static int dib7070_set_param_override(struct dvb_frontend *fe,
+ 				      struct dvb_frontend_parameters *fep)
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-08-23 21:48:14.000000000 -0400
+@@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb
+ 	if (!buf)
+ 		return -ENOMEM;
  
 +	pax_track_stack();
 +
  	while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
  		deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
  				hx.addr, hx.len, hx.chk);
-diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
-index 46ccd01..1dbaf3a 100644
---- a/drivers/media/dvb/dvb-usb/lmedm04.c
-+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
-@@ -611,6 +611,7 @@ static int lme2510_download_firmware(struct usb_device *dev,
- 	packet_size = 0x31;
- 	len_in = 1;
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h
+--- linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h	2011-08-24 18:27:27.000000000 -0400
+@@ -97,7 +97,7 @@
+ #define DIBUSB_IOCTL_CMD_DISABLE_STREAM	0x02
+ 
+ struct dibusb_state {
+-	struct dib_fe_xfer_ops ops;
++	dib_fe_xfer_ops_no_const ops;
+ 	int mt2060_present;
+ 	u8 tuner_addr;
+ };
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c	2011-08-24 18:27:45.000000000 -0400
+@@ -95,7 +95,7 @@ struct su3000_state {
+ 
+ struct s6x0_state {
+ 	int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
+-};
++} __no_const;
+ 
+ /* debug */
+ static int dvb_usb_dw2102_debug;
+diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c	2011-08-23 21:48:14.000000000 -0400
+@@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
+ 	usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
+ 			0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
  
 +	pax_track_stack();
  
- 	info("FRM Starting Firmware Download");
- 
-@@ -666,6 +667,8 @@ static void lme_coldreset(struct usb_device *dev)
+ 	data[0] = 0x8a;
+ 	len_in = 1;
+@@ -764,6 +765,8 @@ static void lme_coldreset(struct usb_dev
  	int ret = 0, len_in;
  	u8 data[512] = {0};
  
@@ -30820,11 +27374,38 @@ index 46ccd01..1dbaf3a 100644
  	data[0] = 0x0a;
  	len_in = 1;
  	info("FRM Firmware Cold Reset");
-diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
-index 33b6323..121531a 100644
---- a/drivers/media/dvb/frontends/mb86a16.c
-+++ b/drivers/media/dvb/frontends/mb86a16.c
-@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16_state *state)
+diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000.h linux-3.0.3/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.0.3/drivers/media/dvb/frontends/dib3000.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/frontends/dib3000.h	2011-08-24 18:28:18.000000000 -0400
+@@ -40,10 +40,11 @@ struct dib_fe_xfer_ops
+ 	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);
+ };
++typedef struct dib_fe_xfer_ops __no_const dib_fe_xfer_ops_no_const;
+ 
+ #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
+ extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+-					     struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops);
++					     struct i2c_adapter* i2c, dib_fe_xfer_ops_no_const *xfer_ops);
+ #else
+ static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+ 					     struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
+diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c
+--- linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c	2011-08-24 18:28:42.000000000 -0400
+@@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
+ static struct dvb_frontend_ops dib3000mb_ops;
+ 
+ struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
+-				      struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
++				      struct i2c_adapter* i2c, dib_fe_xfer_ops_no_const *xfer_ops)
+ {
+ 	struct dib3000_state* state = NULL;
+ 
+diff -urNp linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
  	int ret = -1;
  	int sync;
  
@@ -30833,11 +27414,10 @@ index 33b6323..121531a 100644
  	dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
  	fcp = 3000;
-diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
-index c709ce6..b3fe620 100644
---- a/drivers/media/dvb/frontends/or51211.c
-+++ b/drivers/media/dvb/frontends/or51211.c
-@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
+diff -urNp linux-3.0.3/drivers/media/dvb/frontends/or51211.c linux-3.0.3/drivers/media/dvb/frontends/or51211.c
+--- linux-3.0.3/drivers/media/dvb/frontends/or51211.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/dvb/frontends/or51211.c	2011-08-23 21:48:14.000000000 -0400
+@@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
  	u8 tudata[585];
  	int i;
  
@@ -30846,81 +27426,10 @@ index c709ce6..b3fe620 100644
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
-index bc9ad08..c35ffa7 100644
---- a/drivers/media/radio/radio-cadet.c
-+++ b/drivers/media/radio/radio-cadet.c
-@@ -349,7 +349,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
- 		readbuf[i++] = dev->rdsbuf[dev->rdsout++];
- 	mutex_unlock(&dev->lock);
- 
--	if (copy_to_user(data, readbuf, i))
-+	if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
- 		return -EFAULT;
- 	return i;
- }
-diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
-index 1c5cc65..ebe94dd 100644
---- a/drivers/media/rc/ir-lirc-codec.c
-+++ b/drivers/media/rc/ir-lirc-codec.c
-@@ -277,7 +277,7 @@ static void ir_lirc_close(void *data)
- 	return;
- }
- 
--static struct file_operations lirc_fops = {
-+static const struct file_operations lirc_fops = {
- 	.owner		= THIS_MODULE,
- 	.write		= ir_lirc_transmit_ir,
- 	.unlocked_ioctl	= ir_lirc_ioctl,
-diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
-index fd237ab..6421d53 100644
---- a/drivers/media/rc/lirc_dev.c
-+++ b/drivers/media/rc/lirc_dev.c
-@@ -151,7 +151,7 @@ static int lirc_thread(void *irctl)
- }
- 
- 
--static struct file_operations lirc_dev_fops = {
-+static const struct file_operations lirc_dev_fops = {
- 	.owner		= THIS_MODULE,
- 	.read		= lirc_dev_fop_read,
- 	.write		= lirc_dev_fop_write,
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index 5b4422e..7a64f92 100644
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -994,7 +994,7 @@ EXPORT_SYMBOL_GPL(rc_free_device);
- 
- int rc_register_device(struct rc_dev *dev)
- {
--	static atomic_t devno = ATOMIC_INIT(0);
-+	static atomic_unchecked_t devno = ATOMIC_INIT(0);
- 	struct rc_map *rc_map;
- 	const char *path;
- 	int rc;
-@@ -1017,7 +1017,7 @@ int rc_register_device(struct rc_dev *dev)
- 	if (dev->close)
- 		dev->input_dev->close = ir_close;
- 
--	dev->devno = (unsigned long)(atomic_inc_return(&devno) - 1);
-+	dev->devno = (unsigned long)(atomic_inc_return_unchecked(&devno) - 1);
- 	dev_set_name(&dev->dev, "rc%ld", dev->devno);
- 	dev_set_drvdata(&dev->dev, dev);
- 	rc = device_add(&dev->dev);
-diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
-index b1c3cbd..cc224e8 100644
---- a/drivers/media/video/cx18/cx18-driver.c
-+++ b/drivers/media/video/cx18/cx18-driver.c
-@@ -60,7 +60,7 @@ static struct pci_device_id cx18_pci_tbl[] __devinitdata = {
- 
- MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
- 
--static atomic_t cx18_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0);
- 
- /* Parameter declarations */
- static int cardtype[CX18_MAX_CARDS];
-@@ -326,6 +326,8 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
+diff -urNp linux-3.0.3/drivers/media/video/cx18/cx18-driver.c linux-3.0.3/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.0.3/drivers/media/video/cx18/cx18-driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/cx18/cx18-driver.c	2011-08-23 21:48:14.000000000 -0400
+@@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
  	struct i2c_client c;
  	u8 eedata[256];
  
@@ -30929,20 +27438,10 @@ index b1c3cbd..cc224e8 100644
  	memset(&c, 0, sizeof(c));
  	strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
  	c.adapter = &cx->i2c_adap[0];
-@@ -884,7 +886,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
- 	struct cx18 *cx;
- 
- 	/* FIXME - module parameter arrays constrain max instances */
--	i = atomic_inc_return(&cx18_instance) - 1;
-+	i = atomic_inc_return_unchecked(&cx18_instance) - 1;
- 	if (i >= 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 --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
-index 199b996..d7d6620 100644
---- a/drivers/media/video/cx23885/cx23885-input.c
-+++ b/drivers/media/video/cx23885/cx23885-input.c
-@@ -53,6 +53,8 @@ static void cx23885_input_process_measurements(struct cx23885_dev *dev,
+diff -urNp linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c	2011-08-23 21:48:14.000000000 -0400
+@@ -53,6 +53,8 @@ static void cx23885_input_process_measur
  	bool handle = false;
  	struct ir_raw_event ir_core_event[64];
  
@@ -30951,50 +27450,10 @@ index 199b996..d7d6620 100644
  	do {
  		num = 0;
  		v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
-index 3994642..31dff6d 100644
---- a/drivers/media/video/ivtv/ivtv-driver.c
-+++ b/drivers/media/video/ivtv/ivtv-driver.c
-@@ -80,7 +80,7 @@ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = {
- MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
- 
- /* ivtv instance counter */
--static atomic_t ivtv_instance = ATOMIC_INIT(0);
-+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
- 
- /* Parameter declarations */
- static int cardtype[IVTV_MAX_CARDS];
-diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
-index 0175527..90467b9 100644
---- a/drivers/media/video/omap24xxcam.c
-+++ b/drivers/media/video/omap24xxcam.c
-@@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma,
- 	spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
- 
- 	do_gettimeofday(&vb->ts);
--	vb->field_count = atomic_add_return(2, &fh->field_count);
-+	vb->field_count = atomic_add_return_unchecked(2, &fh->field_count);
- 	if (csr & csr_error) {
- 		vb->state = VIDEOBUF_ERROR;
- 		if (!atomic_read(&fh->cam->in_reset)) {
-diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h
-index 2ce67f5..cf26a5b 100644
---- a/drivers/media/video/omap24xxcam.h
-+++ b/drivers/media/video/omap24xxcam.h
-@@ -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 --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
-index aeed1c2..8402a00 100644
---- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
-+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
-@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
+diff -urNp linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-08-23 21:48:14.000000000 -0400
+@@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
  	u8 *eeprom;
  	struct tveeprom tvdata;
  
@@ -31003,11 +27462,10 @@ index aeed1c2..8402a00 100644
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
-index f9f29cc..5a2e330 100644
---- a/drivers/media/video/saa7134/saa6752hs.c
-+++ b/drivers/media/video/saa7134/saa6752hs.c
-@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_subdev *sd, u32 leading_null_bytes)
+diff -urNp linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
  	unsigned char localPAT[256];
  	unsigned char localPMT[256];
  
@@ -31016,11 +27474,10 @@ index f9f29cc..5a2e330 100644
  	/* Set video format - must be done first as it resets other settings */
  	set_reg8(client, 0x41, h->video_format);
  
-diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
-index a97ae17..8815f43 100644
---- a/drivers/media/video/saa7164/saa7164-cmd.c
-+++ b/drivers/media/video/saa7164/saa7164-cmd.c
-@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
+diff -urNp linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c	2011-08-23 21:48:14.000000000 -0400
+@@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
  	u8 tmp[512];
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
  
@@ -31029,7 +27486,7 @@ index a97ae17..8815f43 100644
  	/* While any outstand message on the bus exists... */
  	do {
  
-@@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
+@@ -141,6 +143,8 @@ int saa7164_cmd_dequeue(struct saa7164_d
  	u8 tmp[512];
  	dprintk(DBGLVL_CMD, "%s()\n", __func__);
  
@@ -31038,11 +27495,22 @@ index a97ae17..8815f43 100644
  	while (loop) {
  
  		struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
-index c8feb0d..1162a10 100644
---- a/drivers/media/video/usbvision/usbvision-core.c
-+++ b/drivers/media/video/usbvision/usbvision-core.c
-@@ -799,6 +799,8 @@ static enum parse_state usbvision_parse_compress(struct usb_usbvision *usbvision
+diff -urNp linux-3.0.3/drivers/media/video/timblogiw.c linux-3.0.3/drivers/media/video/timblogiw.c
+--- linux-3.0.3/drivers/media/video/timblogiw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/timblogiw.c	2011-08-24 18:29:20.000000000 -0400
+@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
+ 
+ /* Platform device functions */
+ 
+-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
++static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
+ 	.vidioc_querycap		= timblogiw_querycap,
+ 	.vidioc_enum_fmt_vid_cap	= timblogiw_enum_fmt,
+ 	.vidioc_g_fmt_vid_cap		= timblogiw_g_fmt,
+diff -urNp linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c	2011-08-23 21:48:14.000000000 -0400
+@@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
  	unsigned char rv, gv, bv;
  	static unsigned char *Y, *U, *V;
  
@@ -31051,26 +27519,9 @@ index c8feb0d..1162a10 100644
  	frame = usbvision->cur_frame;
  	image_size = frame->frmwidth * frame->frmheight;
  	if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
-index 3504fc6..92a24fb 100644
---- a/drivers/media/video/v4l2-device.c
-+++ b/drivers/media/video/v4l2-device.c
-@@ -55,9 +55,9 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
- EXPORT_SYMBOL_GPL(v4l2_device_register);
- 
- int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
--						atomic_t *instance)
-+						atomic_unchecked_t *instance)
- {
--	int num = atomic_inc_return(instance) - 1;
-+	int num = atomic_inc_return_unchecked(instance) - 1;
- 	int len = strlen(basename);
- 
- 	if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
-diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
-index ddb8f4b..35fce12 100644
---- a/drivers/media/video/videobuf-dma-sg.c
-+++ b/drivers/media/video/videobuf-dma-sg.c
+diff -urNp linux-3.0.3/drivers/media/video/videobuf-dma-sg.c linux-3.0.3/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.0.3/drivers/media/video/videobuf-dma-sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/media/video/videobuf-dma-sg.c	2011-08-23 21:48:14.000000000 -0400
 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
  {
  	struct videobuf_queue q;
@@ -31080,11 +27531,10 @@ index ddb8f4b..35fce12 100644
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
-index 3358c0a..687cbdf 100644
---- a/drivers/message/fusion/mptbase.c
-+++ b/drivers/message/fusion/mptbase.c
-@@ -6683,8 +6683,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
+diff -urNp linux-3.0.3/drivers/message/fusion/mptbase.c linux-3.0.3/drivers/message/fusion/mptbase.c
+--- linux-3.0.3/drivers/message/fusion/mptbase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/fusion/mptbase.c	2011-08-23 21:48:14.000000000 -0400
+@@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct 
  	seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
  	seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
  
@@ -31098,11 +27548,10 @@ index 3358c0a..687cbdf 100644
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index 8aefb18..ebdb8da 100644
---- a/drivers/message/fusion/mptsas.c
-+++ b/drivers/message/fusion/mptsas.c
-@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
+diff -urNp linux-3.0.3/drivers/message/fusion/mptsas.c linux-3.0.3/drivers/message/fusion/mptsas.c
+--- linux-3.0.3/drivers/message/fusion/mptsas.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/fusion/mptsas.c	2011-08-23 21:47:55.000000000 -0400
+@@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
  		return 0;
  }
  
@@ -31126,7 +27575,7 @@ index 8aefb18..ebdb8da 100644
  /* no mutex */
  static void
  mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
-@@ -477,23 +494,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
+@@ -477,23 +494,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
  		return NULL;
  }
  
@@ -31150,10 +27599,9 @@ index 8aefb18..ebdb8da 100644
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
-index 0d9b82a..d1918d0 100644
---- a/drivers/message/fusion/mptscsih.c
-+++ b/drivers/message/fusion/mptscsih.c
+diff -urNp linux-3.0.3/drivers/message/fusion/mptscsih.c linux-3.0.3/drivers/message/fusion/mptscsih.c
+--- linux-3.0.3/drivers/message/fusion/mptscsih.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/fusion/mptscsih.c	2011-08-23 21:47:55.000000000 -0400
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
  	h = shost_priv(SChost);
@@ -31179,11 +27627,10 @@ index 0d9b82a..d1918d0 100644
  
  	return h->info_kbuf;
  }
-diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
-index 7d3cc57..b8dfb35 100644
---- a/drivers/message/i2o/i2o_config.c
-+++ b/drivers/message/i2o/i2o_config.c
-@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned long arg)
+diff -urNp linux-3.0.3/drivers/message/i2o/i2o_config.c linux-3.0.3/drivers/message/i2o/i2o_config.c
+--- linux-3.0.3/drivers/message/i2o/i2o_config.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/i2o/i2o_config.c	2011-08-23 21:48:14.000000000 -0400
+@@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
  	struct i2o_message *msg;
  	unsigned int iop;
  
@@ -31192,10 +27639,9 @@ index 7d3cc57..b8dfb35 100644
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
-index 07dbeaf..5533142 100644
---- a/drivers/message/i2o/i2o_proc.c
-+++ b/drivers/message/i2o/i2o_proc.c
+diff -urNp linux-3.0.3/drivers/message/i2o/i2o_proc.c linux-3.0.3/drivers/message/i2o/i2o_proc.c
+--- linux-3.0.3/drivers/message/i2o/i2o_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/i2o/i2o_proc.c	2011-08-23 21:47:55.000000000 -0400
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
  	"Array Controller Device"
  };
@@ -31210,7 +27656,7 @@ index 07dbeaf..5533142 100644
  static int i2o_report_query_status(struct seq_file *seq, int block_status,
  				   char *group)
  {
-@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
+@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct
  
  		seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
  		seq_printf(seq, "%-#8x", ddm_table.module_id);
@@ -31220,7 +27666,7 @@ index 07dbeaf..5533142 100644
  		seq_printf(seq, "%9d  ", ddm_table.data_size);
  		seq_printf(seq, "%8d", ddm_table.code_size);
  
-@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
+@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(s
  
  		seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
  		seq_printf(seq, "%-#8x", dst->module_id);
@@ -31231,7 +27677,7 @@ index 07dbeaf..5533142 100644
  		seq_printf(seq, "%8d ", dst->module_size);
  		seq_printf(seq, "%8d ", dst->mpb_size);
  		seq_printf(seq, "0x%04x", dst->module_flags);
-@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
+@@ -1272,14 +1264,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]);
@@ -31250,7 +27696,7 @@ index 07dbeaf..5533142 100644
  
  	seq_printf(seq, "Serial number : ");
  	print_serial_number(seq, (u8 *) (work32 + 16),
-@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
+@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(str
  	}
  
  	seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
@@ -31263,7 +27709,7 @@ index 07dbeaf..5533142 100644
  
  	seq_printf(seq, "Serial number       : ");
  	print_serial_number(seq, result.serial_number, sizeof(result) - 36);
-@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
+@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq
  		return 0;
  	}
  
@@ -31282,11 +27728,10 @@ index 07dbeaf..5533142 100644
  
  	return 0;
  }
-diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
-index 090d2a3..5f24ef8 100644
---- a/drivers/message/i2o/iop.c
-+++ b/drivers/message/i2o/iop.c
-@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
+diff -urNp linux-3.0.3/drivers/message/i2o/iop.c linux-3.0.3/drivers/message/i2o/iop.c
+--- linux-3.0.3/drivers/message/i2o/iop.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/message/i2o/iop.c	2011-08-23 21:47:55.000000000 -0400
+@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
  	spin_lock_irqsave(&c->context_list_lock, flags);
  
@@ -31300,7 +27745,7 @@ index 090d2a3..5f24ef8 100644
  
  	list_add(&entry->list, &c->context_list);
  
-@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
+@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(voi
  
  #if BITS_PER_LONG == 64
  	spin_lock_init(&c->context_list_lock);
@@ -31309,10 +27754,21 @@ index 090d2a3..5f24ef8 100644
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
-index 36a166b..b044e14 100644
---- a/drivers/mfd/janz-cmodio.c
-+++ b/drivers/mfd/janz-cmodio.c
+diff -urNp linux-3.0.3/drivers/mfd/abx500-core.c linux-3.0.3/drivers/mfd/abx500-core.c
+--- linux-3.0.3/drivers/mfd/abx500-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mfd/abx500-core.c	2011-08-23 21:47:55.000000000 -0400
+@@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
+ 
+ struct abx500_device_entry {
+ 	struct list_head list;
+-	struct abx500_ops ops;
++	abx500_ops_no_const ops;
+ 	struct device *dev;
+ };
+ 
+diff -urNp linux-3.0.3/drivers/mfd/janz-cmodio.c linux-3.0.3/drivers/mfd/janz-cmodio.c
+--- linux-3.0.3/drivers/mfd/janz-cmodio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mfd/janz-cmodio.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -31321,11 +27777,10 @@ index 36a166b..b044e14 100644
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
-index 5fe5de1..af64f53 100644
---- a/drivers/mfd/wm8350-i2c.c
-+++ b/drivers/mfd/wm8350-i2c.c
-@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,
+diff -urNp linux-3.0.3/drivers/mfd/wm8350-i2c.c linux-3.0.3/drivers/mfd/wm8350-i2c.c
+--- linux-3.0.3/drivers/mfd/wm8350-i2c.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mfd/wm8350-i2c.c	2011-08-23 21:48:14.000000000 -0400
+@@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
  	u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
  	int ret;
  
@@ -31334,33 +27789,61 @@ index 5fe5de1..af64f53 100644
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
-index 59c118c..fb7c59a 100644
---- a/drivers/misc/kgdbts.c
-+++ b/drivers/misc/kgdbts.c
-@@ -118,7 +118,7 @@
- 	} while (0)
- #define MAX_CONFIG_LEN		40
+diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c	2011-08-23 21:47:55.000000000 -0400
+@@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in
+ 	 * the lid is closed. This leads to interrupts as soon as a little move
+ 	 * is done.
+ 	 */
+-	atomic_inc(&lis3_dev.count);
++	atomic_inc_unchecked(&lis3_dev.count);
+ 
+ 	wake_up_interruptible(&lis3_dev.misc_wait);
+ 	kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
+@@ -518,7 +518,7 @@ static int lis3lv02d_misc_open(struct in
+ 	if (lis3_dev.pm_dev)
+ 		pm_runtime_get_sync(lis3_dev.pm_dev);
+ 
+-	atomic_set(&lis3_dev.count, 0);
++	atomic_set_unchecked(&lis3_dev.count, 0);
+ 	return 0;
+ }
+ 
+@@ -545,7 +545,7 @@ static ssize_t lis3lv02d_misc_read(struc
+ 	add_wait_queue(&lis3_dev.misc_wait, &wait);
+ 	while (true) {
+ 		set_current_state(TASK_INTERRUPTIBLE);
+-		data = atomic_xchg(&lis3_dev.count, 0);
++		data = atomic_xchg_unchecked(&lis3_dev.count, 0);
+ 		if (data)
+ 			break;
+ 
+@@ -583,7 +583,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-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h	2011-08-23 21:47:55.000000000 -0400
+@@ -265,7 +265,7 @@ struct lis3lv02d {
+ 	struct input_polled_dev	*idev;     /* input device */
+ 	struct platform_device	*pdev;     /* platform device */
+ 	struct regulator_bulk_data regulators[2];
+-	atomic_t		count;     /* interrupt count after last read */
++	atomic_unchecked_t	count;     /* interrupt count after last read */
+ 	union axis_conversion	ac;        /* hw -> logical axis */
+ 	int			mapped_btns[3];
  
--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];
-@@ -1103,7 +1103,7 @@ static void kgdbts_post_exp_handler(void)
- 		module_put(THIS_MODULE);
- }
- 
--static struct kgdb_io kgdbts_io_ops = {
-+static const struct kgdb_io kgdbts_io_ops = {
- 	.name			= "kgdbts",
- 	.read_char		= kgdbts_get_char,
- 	.write_char		= kgdbts_put_char,
-diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
-index 2f30bad..c4c13d0 100644
---- a/drivers/misc/sgi-gru/gruhandles.c
-+++ b/drivers/misc/sgi-gru/gruhandles.c
-@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
+diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c	2011-08-23 21:47:55.000000000 -0400
+@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
  	unsigned long nsec;
  
  	nsec = CLKS2NSEC(clks);
@@ -31371,10 +27854,9 @@ index 2f30bad..c4c13d0 100644
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
-index 7768b87..f8aac38 100644
---- a/drivers/misc/sgi-gru/gruprocfs.c
-+++ b/drivers/misc/sgi-gru/gruprocfs.c
+diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)		printstat_val(s, &gru_stats.f, #f)
@@ -31387,7 +27869,7 @@ index 7768b87..f8aac38 100644
  
  	seq_printf(s, "%16lu %s\n", val, id);
  }
-@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
+@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct se
  
  	seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
  	for (op = 0; op < mcsop_last; op++) {
@@ -31398,10 +27880,9 @@ index 7768b87..f8aac38 100644
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
-index 7a8b906..8f7d44e 100644
---- a/drivers/misc/sgi-gru/grutables.h
-+++ b/drivers/misc/sgi-gru/grutables.h
+diff -urNp linux-3.0.3/drivers/misc/sgi-gru/grutables.h linux-3.0.3/drivers/misc/sgi-gru/grutables.h
+--- linux-3.0.3/drivers/misc/sgi-gru/grutables.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/sgi-gru/grutables.h	2011-08-23 21:47:55.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -31561,7 +28042,7 @@ index 7a8b906..8f7d44e 100644
  
  };
  
-@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
+@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start
  	tghop_invalidate, mcsop_last};
  
  struct mcs_op_statistic {
@@ -31572,7 +28053,7 @@ index 7a8b906..8f7d44e 100644
  	unsigned long	max;
  };
  
-@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
+@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_st
  
  #define STAT(id)	do {						\
  				if (gru_options & OPT_STATS)		\
@@ -31581,11 +28062,22 @@ index 7a8b906..8f7d44e 100644
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
-index 4aaa88f..5825a7d 100644
---- a/drivers/mtd/chips/cfi_cmdset_0001.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long
+diff -urNp linux-3.0.3/drivers/misc/sgi-xp/xp.h linux-3.0.3/drivers/misc/sgi-xp/xp.h
+--- linux-3.0.3/drivers/misc/sgi-xp/xp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/misc/sgi-xp/xp.h	2011-08-23 21:47:55.000000000 -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;
+ 
+ extern struct xpc_interface xpc_interface;
+ 
+diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c	2011-08-23 21:48:14.000000000 -0400
+@@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
  	struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  	unsigned long timeo = jiffies + HZ;
  
@@ -31594,7 +28086,7 @@ index 4aaa88f..5825a7d 100644
  	/* Prevent setting state FL_SYNCING for chip in suspended state. */
  	if (mode == FL_SYNCING && chip->oldstate != FL_READY)
  		goto sleep;
-@@ -1657,6 +1659,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
+@@ -1653,6 +1655,8 @@ static int __xipram do_write_buffer(stru
  	unsigned long initial_adr;
  	int initial_len = len;
  
@@ -31603,7 +28095,7 @@ index 4aaa88f..5825a7d 100644
  	wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
  	adr += chip->start;
  	initial_adr = adr;
-@@ -1875,6 +1879,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
+@@ -1871,6 +1875,8 @@ static int __xipram do_erase_oneblock(st
  	int retries = 3;
  	int ret;
  
@@ -31612,11 +28104,10 @@ index 4aaa88f..5825a7d 100644
  	adr += chip->start;
  
   retry:
-diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
-index c04b765..99ed9cd 100644
---- a/drivers/mtd/chips/cfi_cmdset_0020.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
-@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
+diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c	2011-08-23 21:48:14.000000000 -0400
+@@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
  	unsigned long cmd_addr;
  	struct cfi_private *cfi = map->fldrv_priv;
  
@@ -31625,7 +28116,7 @@ index c04b765..99ed9cd 100644
  	adr += chip->start;
  
  	/* Ensure cmd read/writes are aligned. */
-@@ -428,6 +430,8 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
+@@ -429,6 +431,8 @@ static inline int do_write_buffer(struct
  	DECLARE_WAITQUEUE(wait, current);
  	int wbufsize, z;
  
@@ -31634,7 +28125,7 @@ index c04b765..99ed9cd 100644
          /* 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(struct map_info *map, struct flchip *chip, u
+@@ -743,6 +747,8 @@ static inline int do_erase_oneblock(stru
  	DECLARE_WAITQUEUE(wait, current);
  	int ret = 0;
  
@@ -31643,7 +28134,7 @@ index c04b765..99ed9cd 100644
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-@@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, un
+@@ -1048,6 +1054,8 @@ static inline int do_lock_oneblock(struc
  	unsigned long timeo = jiffies + HZ;
  	DECLARE_WAITQUEUE(wait, current);
  
@@ -31652,7 +28143,7 @@ index c04b765..99ed9cd 100644
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-@@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip,
+@@ -1197,6 +1205,8 @@ static inline int do_unlock_oneblock(str
  	unsigned long timeo = jiffies + HZ;
  	DECLARE_WAITQUEUE(wait, current);
  
@@ -31661,11 +28152,10 @@ index c04b765..99ed9cd 100644
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
-index 5bf5f46..c5de373 100644
---- a/drivers/mtd/devices/doc2000.c
-+++ b/drivers/mtd/devices/doc2000.c
-@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
+diff -urNp linux-3.0.3/drivers/mtd/devices/doc2000.c linux-3.0.3/drivers/mtd/devices/doc2000.c
+--- linux-3.0.3/drivers/mtd/devices/doc2000.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/devices/doc2000.c	2011-08-23 21:47:55.000000000 -0400
+@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
  		/* The ECC will not be calculated correctly if less than 512 is written */
  /* DBB-
@@ -31674,11 +28164,10 @@ index 5bf5f46..c5de373 100644
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
-index 0990f78..bb4e8a4 100644
---- a/drivers/mtd/devices/doc2001.c
-+++ b/drivers/mtd/devices/doc2001.c
-@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
+diff -urNp linux-3.0.3/drivers/mtd/devices/doc2001.c linux-3.0.3/drivers/mtd/devices/doc2001.c
+--- linux-3.0.3/drivers/mtd/devices/doc2001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/devices/doc2001.c	2011-08-23 21:47:55.000000000 -0400
+@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
  	struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
  	/* Don't allow read past end of device */
@@ -31687,11 +28176,10 @@ index 0990f78..bb4e8a4 100644
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
-index 037b399..225a71d 100644
---- a/drivers/mtd/ftl.c
-+++ b/drivers/mtd/ftl.c
-@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,
+diff -urNp linux-3.0.3/drivers/mtd/ftl.c linux-3.0.3/drivers/mtd/ftl.c
+--- linux-3.0.3/drivers/mtd/ftl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/ftl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
  
@@ -31700,11 +28188,10 @@ index 037b399..225a71d 100644
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
-index d7592e6..31c505c 100644
---- a/drivers/mtd/inftlcore.c
-+++ b/drivers/mtd/inftlcore.c
-@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
+diff -urNp linux-3.0.3/drivers/mtd/inftlcore.c linux-3.0.3/drivers/mtd/inftlcore.c
+--- linux-3.0.3/drivers/mtd/inftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/inftlcore.c	2011-08-23 21:48:14.000000000 -0400
+@@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
  	struct inftl_oob oob;
  	size_t retlen;
  
@@ -31713,11 +28200,10 @@ index d7592e6..31c505c 100644
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
  		"pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
-index 104052e..6232be5 100644
---- a/drivers/mtd/inftlmount.c
-+++ b/drivers/mtd/inftlmount.c
-@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
+diff -urNp linux-3.0.3/drivers/mtd/inftlmount.c linux-3.0.3/drivers/mtd/inftlmount.c
+--- linux-3.0.3/drivers/mtd/inftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/inftlmount.c	2011-08-23 21:48:14.000000000 -0400
+@@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
  	struct INFTLPartition *ip;
  	size_t retlen;
  
@@ -31726,11 +28212,10 @@ index 104052e..6232be5 100644
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
-index dbfe17b..c7b0918 100644
---- a/drivers/mtd/lpddr/qinfo_probe.c
-+++ b/drivers/mtd/lpddr/qinfo_probe.c
-@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map_info *map, struct lpddr_private *lpddr)
+diff -urNp linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c	2011-08-23 21:48:14.000000000 -0400
+@@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
  	map_word pfow_val[4];
  
@@ -31739,11 +28224,10 @@ index dbfe17b..c7b0918 100644
  	/* Check identification string */
  	pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
  	pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
-index 145b3d0d..24b16dc 100644
---- a/drivers/mtd/mtdchar.c
-+++ b/drivers/mtd/mtdchar.c
-@@ -560,6 +560,8 @@ static int mtd_ioctl(struct file *file, u_int cmd, u_long arg)
+diff -urNp linux-3.0.3/drivers/mtd/mtdchar.c linux-3.0.3/drivers/mtd/mtdchar.c
+--- linux-3.0.3/drivers/mtd/mtdchar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/mtdchar.c	2011-08-23 21:48:14.000000000 -0400
+@@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, 
  	u_long size;
  	struct mtd_info_user info;
  
@@ -31752,11 +28236,10 @@ index 145b3d0d..24b16dc 100644
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
-index 8c8d3c8..fcbff64 100644
---- a/drivers/mtd/nand/denali.c
-+++ b/drivers/mtd/nand/denali.c
-@@ -25,6 +25,7 @@
+diff -urNp linux-3.0.3/drivers/mtd/nand/denali.c linux-3.0.3/drivers/mtd/nand/denali.c
+--- linux-3.0.3/drivers/mtd/nand/denali.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/nand/denali.c	2011-08-23 21:47:55.000000000 -0400
+@@ -26,6 +26,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
  #include <linux/module.h>
@@ -31764,11 +28247,10 @@ index 8c8d3c8..fcbff64 100644
  
  #include "denali.h"
  
-diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
-index b155666..611b801 100644
---- a/drivers/mtd/nftlcore.c
-+++ b/drivers/mtd/nftlcore.c
-@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
+diff -urNp linux-3.0.3/drivers/mtd/nftlcore.c linux-3.0.3/drivers/mtd/nftlcore.c
+--- linux-3.0.3/drivers/mtd/nftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/nftlcore.c	2011-08-23 21:48:14.000000000 -0400
+@@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
  	int inplace = 1;
  	size_t retlen;
  
@@ -31777,10 +28259,9 @@ index b155666..611b801 100644
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
-index e3cd1ff..0ea79a3 100644
---- a/drivers/mtd/nftlmount.c
-+++ b/drivers/mtd/nftlmount.c
+diff -urNp linux-3.0.3/drivers/mtd/nftlmount.c linux-3.0.3/drivers/mtd/nftlmount.c
+--- linux-3.0.3/drivers/mtd/nftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/nftlmount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -31789,7 +28270,7 @@ index e3cd1ff..0ea79a3 100644
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/nand.h>
  #include <linux/mtd/nftl.h>
-@@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLrecord *nftl)
+@@ -45,6 +46,8 @@ static int find_boot_record(struct NFTLr
  	struct mtd_info *mtd = nftl->mbd.mtd;
  	unsigned int i;
  
@@ -31798,11 +28279,10 @@ index e3cd1ff..0ea79a3 100644
          /* Assume logical EraseSize == physical erasesize for starting the scan.
  	   We'll sort it out later if we find a MediaHeader which says otherwise */
  	/* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
-index 5ebe280..e7af207 100644
---- a/drivers/mtd/ubi/build.c
-+++ b/drivers/mtd/ubi/build.c
-@@ -1285,7 +1285,7 @@ module_exit(ubi_exit);
+diff -urNp linux-3.0.3/drivers/mtd/ubi/build.c linux-3.0.3/drivers/mtd/ubi/build.c
+--- linux-3.0.3/drivers/mtd/ubi/build.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/mtd/ubi/build.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
  	char *endp;
@@ -31811,7 +28291,7 @@ index 5ebe280..e7af207 100644
  
  	result = simple_strtoul(str, &endp, 0);
  	if (str == endp || result >= INT_MAX) {
-@@ -1296,11 +1296,11 @@ static int __init bytes_str_to_int(const char *str)
+@@ -1298,11 +1298,11 @@ static int __init bytes_str_to_int(const
  
  	switch (*endp) {
  	case 'G':
@@ -31826,7 +28306,7 @@ index 5ebe280..e7af207 100644
  		if (endp[1] == 'i' && endp[2] == 'B')
  			endp += 2;
  	case '\0':
-@@ -1311,7 +1311,13 @@ static int __init bytes_str_to_int(const char *str)
+@@ -1313,7 +1313,13 @@ static int __init bytes_str_to_int(const
  		return -EINVAL;
  	}
  
@@ -31841,11 +28321,121 @@ index 5ebe280..e7af207 100644
  }
  
  /**
-diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
-index 0ba59d5..fbf134e 100644
---- a/drivers/net/bnx2.c
-+++ b/drivers/net/bnx2.c
-@@ -5826,6 +5826,8 @@ bnx2_test_nvram(struct bnx2 *bp)
+diff -urNp linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c	2011-08-23 21:47:55.000000000 -0400
+@@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
+ static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
+ static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
+ 
+-static struct bfa_ioc_hwif nw_hwif_ct;
++static struct bfa_ioc_hwif nw_hwif_ct = {
++	.ioc_pll_init = bfa_ioc_ct_pll_init,
++	.ioc_firmware_lock = bfa_ioc_ct_firmware_lock,
++	.ioc_firmware_unlock = bfa_ioc_ct_firmware_unlock,
++	.ioc_reg_init = bfa_ioc_ct_reg_init,
++	.ioc_map_port = bfa_ioc_ct_map_port,
++	.ioc_isr_mode_set = bfa_ioc_ct_isr_mode_set,
++	.ioc_notify_fail = bfa_ioc_ct_notify_fail,
++	.ioc_ownership_reset = bfa_ioc_ct_ownership_reset,
++	.ioc_sync_start = bfa_ioc_ct_sync_start,
++	.ioc_sync_join = bfa_ioc_ct_sync_join,
++	.ioc_sync_leave = bfa_ioc_ct_sync_leave,
++	.ioc_sync_ack = bfa_ioc_ct_sync_ack,
++	.ioc_sync_complete = bfa_ioc_ct_sync_complete
++};
+ 
+ /**
+  * Called from bfa_ioc_attach() to map asic specific calls.
+@@ -56,20 +70,6 @@ static struct bfa_ioc_hwif nw_hwif_ct;
+ void
+ bfa_nw_ioc_set_ct_hwif(struct bfa_ioc *ioc)
+ {
+-	nw_hwif_ct.ioc_pll_init = bfa_ioc_ct_pll_init;
+-	nw_hwif_ct.ioc_firmware_lock = bfa_ioc_ct_firmware_lock;
+-	nw_hwif_ct.ioc_firmware_unlock = bfa_ioc_ct_firmware_unlock;
+-	nw_hwif_ct.ioc_reg_init = bfa_ioc_ct_reg_init;
+-	nw_hwif_ct.ioc_map_port = bfa_ioc_ct_map_port;
+-	nw_hwif_ct.ioc_isr_mode_set = bfa_ioc_ct_isr_mode_set;
+-	nw_hwif_ct.ioc_notify_fail = bfa_ioc_ct_notify_fail;
+-	nw_hwif_ct.ioc_ownership_reset = bfa_ioc_ct_ownership_reset;
+-	nw_hwif_ct.ioc_sync_start = bfa_ioc_ct_sync_start;
+-	nw_hwif_ct.ioc_sync_join = bfa_ioc_ct_sync_join;
+-	nw_hwif_ct.ioc_sync_leave = bfa_ioc_ct_sync_leave;
+-	nw_hwif_ct.ioc_sync_ack = bfa_ioc_ct_sync_ack;
+-	nw_hwif_ct.ioc_sync_complete = bfa_ioc_ct_sync_complete;
+-
+ 	ioc->ioc_hwif = &nw_hwif_ct;
+ }
+ 
+diff -urNp linux-3.0.3/drivers/net/bna/bnad.c linux-3.0.3/drivers/net/bna/bnad.c
+--- linux-3.0.3/drivers/net/bna/bnad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/bna/bnad.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+ 	struct bna_intr_info *intr_info =
+ 			&res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
+ 	struct bna_tx_config *tx_config = &bnad->tx_config[tx_id];
+-	struct bna_tx_event_cbfn tx_cbfn;
++	static struct bna_tx_event_cbfn tx_cbfn = {
++		/* Initialize the tx event handlers */
++		.tcb_setup_cbfn = bnad_cb_tcb_setup,
++		.tcb_destroy_cbfn = bnad_cb_tcb_destroy,
++		.tx_stall_cbfn = bnad_cb_tx_stall,
++		.tx_resume_cbfn = bnad_cb_tx_resume,
++		.tx_cleanup_cbfn = bnad_cb_tx_cleanup
++	};
+ 	struct bna_tx *tx;
+ 	unsigned long flags;
+ 
+@@ -1690,13 +1697,6 @@ bnad_setup_tx(struct bnad *bnad, uint tx
+ 	tx_config->txq_depth = bnad->txq_depth;
+ 	tx_config->tx_type = BNA_TX_T_REGULAR;
+ 
+-	/* Initialize the tx event handlers */
+-	tx_cbfn.tcb_setup_cbfn = bnad_cb_tcb_setup;
+-	tx_cbfn.tcb_destroy_cbfn = bnad_cb_tcb_destroy;
+-	tx_cbfn.tx_stall_cbfn = bnad_cb_tx_stall;
+-	tx_cbfn.tx_resume_cbfn = bnad_cb_tx_resume;
+-	tx_cbfn.tx_cleanup_cbfn = bnad_cb_tx_cleanup;
+-
+ 	/* Get BNA's resource requirement for one tx object */
+ 	spin_lock_irqsave(&bnad->bna_lock, flags);
+ 	bna_tx_res_req(bnad->num_txq_per_tx,
+@@ -1827,21 +1827,21 @@ bnad_setup_rx(struct bnad *bnad, uint rx
+ 	struct bna_intr_info *intr_info =
+ 			&res_info[BNA_RX_RES_T_INTR].res_u.intr_info;
+ 	struct bna_rx_config *rx_config = &bnad->rx_config[rx_id];
+-	struct bna_rx_event_cbfn rx_cbfn;
++	static struct bna_rx_event_cbfn rx_cbfn = {
++		/* Initialize the Rx event handlers */
++		.rcb_setup_cbfn = bnad_cb_rcb_setup,
++		.rcb_destroy_cbfn = bnad_cb_rcb_destroy,
++		.ccb_setup_cbfn = bnad_cb_ccb_setup,
++		.ccb_destroy_cbfn = bnad_cb_ccb_destroy,
++		.rx_cleanup_cbfn = bnad_cb_rx_cleanup,
++		.rx_post_cbfn = bnad_cb_rx_post
++	};
+ 	struct bna_rx *rx;
+ 	unsigned long flags;
+ 
+ 	/* Initialize the Rx object configuration */
+ 	bnad_init_rx_config(bnad, rx_config);
+ 
+-	/* Initialize the Rx event handlers */
+-	rx_cbfn.rcb_setup_cbfn = bnad_cb_rcb_setup;
+-	rx_cbfn.rcb_destroy_cbfn = bnad_cb_rcb_destroy;
+-	rx_cbfn.ccb_setup_cbfn = bnad_cb_ccb_setup;
+-	rx_cbfn.ccb_destroy_cbfn = bnad_cb_ccb_destroy;
+-	rx_cbfn.rx_cleanup_cbfn = bnad_cb_rx_cleanup;
+-	rx_cbfn.rx_post_cbfn = bnad_cb_rx_post;
+-
+ 	/* Get BNA's resource requirement for one Rx object */
+ 	spin_lock_irqsave(&bnad->bna_lock, flags);
+ 	bna_rx_res_req(rx_config, res_info);
+diff -urNp linux-3.0.3/drivers/net/bnx2.c linux-3.0.3/drivers/net/bnx2.c
+--- linux-3.0.3/drivers/net/bnx2.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/bnx2.c	2011-08-23 21:48:14.000000000 -0400
+@@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
  
@@ -31854,11 +28444,10 @@ index 0ba59d5..fbf134e 100644
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff --git a/drivers/net/bnx2x/bnx2x_ethtool.c b/drivers/net/bnx2x/bnx2x_ethtool.c
-index 7e92f9d..afe234b 100644
---- a/drivers/net/bnx2x/bnx2x_ethtool.c
-+++ b/drivers/net/bnx2x/bnx2x_ethtool.c
-@@ -1788,6 +1788,8 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
+diff -urNp linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
  	int i, rc;
  	u32 magic, crc;
  
@@ -31867,11 +28456,22 @@ index 7e92f9d..afe234b 100644
  	if (BP_NOMCP(bp))
  		return 0;
  
-diff --git a/drivers/net/cxgb4/cxgb4_main.c b/drivers/net/cxgb4/cxgb4_main.c
-index ec35d45..b83aede 100644
---- a/drivers/net/cxgb4/cxgb4_main.c
-+++ b/drivers/net/cxgb4/cxgb4_main.c
-@@ -3429,6 +3429,8 @@ static int __devinit enable_msix(struct adapter *adap)
+diff -urNp linux-3.0.3/drivers/net/cxgb3/l2t.h linux-3.0.3/drivers/net/cxgb3/l2t.h
+--- linux-3.0.3/drivers/net/cxgb3/l2t.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/cxgb3/l2t.h	2011-08-23 21:47:55.000000000 -0400
+@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
+  */
+ struct l2t_skb_cb {
+ 	arp_failure_handler_func arp_failure_handler;
+-};
++} __no_const;
+ 
+ #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
+ 
+diff -urNp linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c	2011-08-23 21:48:14.000000000 -0400
+@@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct 
  	unsigned int nchan = adap->params.nports;
  	struct msix_entry entries[MAX_INGQ + 1];
  
@@ -31880,11 +28480,10 @@ index ec35d45..b83aede 100644
  	for (i = 0; i < ARRAY_SIZE(entries); ++i)
  		entries[i].entry = i;
  
-diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
-index b9fd8a6..e1ec7cd 100644
---- a/drivers/net/cxgb4/t4_hw.c
-+++ b/drivers/net/cxgb4/t4_hw.c
-@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
+diff -urNp linux-3.0.3/drivers/net/cxgb4/t4_hw.c linux-3.0.3/drivers/net/cxgb4/t4_hw.c
+--- linux-3.0.3/drivers/net/cxgb4/t4_hw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/cxgb4/t4_hw.c	2011-08-23 21:48:14.000000000 -0400
+@@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
  	u8 vpd[VPD_LEN], csum;
  	unsigned int vpdr_len, kw_offset, id_len;
  
@@ -31893,202 +28492,83 @@ index b9fd8a6..e1ec7cd 100644
  	ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
  	if (ret < 0)
  		return ret;
-diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
-index 89a6903..014abb1 100644
---- a/drivers/net/e1000e/82571.c
-+++ b/drivers/net/e1000e/82571.c
-@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
+diff -urNp linux-3.0.3/drivers/net/e1000e/82571.c linux-3.0.3/drivers/net/e1000e/82571.c
+--- linux-3.0.3/drivers/net/e1000e/82571.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/e1000e/82571.c	2011-08-23 21:47:55.000000000 -0400
+@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
 -	struct e1000_mac_operations *func = &mac->ops;
-+	struct e1000_mac_operations *func = &mac->ops;	/* cannot be const */
++	e1000_mac_operations_no_const *func = &mac->ops;
  	u32 swsm = 0;
  	u32 swsm2 = 0;
  	bool force_clear_smbi = false;
-@@ -1930,7 +1930,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
- 	er32(ICRXDMTC);
- }
- 
--static struct e1000_mac_operations e82571_mac_ops = {
-+static const struct e1000_mac_operations e82571_mac_ops = {
- 	/* .check_mng_mode: mac type dependent */
- 	/* .check_for_link: media type dependent */
- 	.id_led_init		= e1000e_id_led_init,
-@@ -1952,7 +1952,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
- 	.read_mac_addr		= e1000_read_mac_addr_82571,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_igp = {
-+static const struct e1000_phy_operations e82_phy_ops_igp = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_igp,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1970,7 +1970,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_m88 = {
-+static const struct e1000_phy_operations e82_phy_ops_m88 = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1988,7 +1988,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_phy_operations e82_phy_ops_bm = {
-+static const struct e1000_phy_operations e82_phy_ops_bm = {
- 	.acquire		= e1000_get_hw_semaphore_82571,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -2006,7 +2006,7 @@ static struct e1000_phy_operations e82_phy_ops_bm = {
- 	.cfg_on_link_up      	= NULL,
- };
- 
--static struct e1000_nvm_operations e82571_nvm_ops = {
-+static const struct e1000_nvm_operations e82571_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_82571,
- 	.read			= e1000e_read_nvm_eerd,
- 	.release		= e1000_release_nvm_82571,
-diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
-index e610e13..5d2a574 100644
---- a/drivers/net/e1000e/e1000.h
-+++ b/drivers/net/e1000e/e1000.h
-@@ -408,9 +408,9 @@ struct e1000_info {
- 	u32			pba;
- 	u32			max_hw_frame_size;
- 	s32			(*get_variants)(struct e1000_adapter *);
--	struct e1000_mac_operations *mac_ops;
--	struct e1000_phy_operations *phy_ops;
--	struct e1000_nvm_operations *nvm_ops;
-+	const struct e1000_mac_operations *mac_ops;
-+	const struct e1000_phy_operations *phy_ops;
-+	const struct e1000_nvm_operations *nvm_ops;
- };
- 
- /* hardware capability, feature, and workaround flags */
-diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
-index 2fefa82..a2ba867 100644
---- a/drivers/net/e1000e/es2lan.c
-+++ b/drivers/net/e1000e/es2lan.c
-@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
+diff -urNp linux-3.0.3/drivers/net/e1000e/es2lan.c linux-3.0.3/drivers/net/e1000e/es2lan.c
+--- linux-3.0.3/drivers/net/e1000e/es2lan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/e1000e/es2lan.c	2011-08-23 21:47:55.000000000 -0400
+@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
  	struct e1000_hw *hw = &adapter->hw;
  	struct e1000_mac_info *mac = &hw->mac;
 -	struct e1000_mac_operations *func = &mac->ops;
-+	struct e1000_mac_operations *func = &mac->ops;	/* cannot be const */
++	e1000_mac_operations_no_const *func = &mac->ops;
  
  	/* Set media type */
  	switch (adapter->pdev->device) {
-@@ -1431,7 +1431,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
- 	er32(ICRXDMTC);
- }
- 
--static struct e1000_mac_operations es2_mac_ops = {
-+static const struct e1000_mac_operations es2_mac_ops = {
- 	.read_mac_addr		= e1000_read_mac_addr_80003es2lan,
- 	.id_led_init		= e1000e_id_led_init,
- 	.check_mng_mode		= e1000e_check_mng_mode_generic,
-@@ -1453,7 +1453,7 @@ static struct e1000_mac_operations es2_mac_ops = {
- 	.setup_led		= e1000e_setup_led_generic,
+diff -urNp linux-3.0.3/drivers/net/e1000e/hw.h linux-3.0.3/drivers/net/e1000e/hw.h
+--- linux-3.0.3/drivers/net/e1000e/hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/e1000e/hw.h	2011-08-23 21:47:55.000000000 -0400
+@@ -776,6 +776,7 @@ struct e1000_mac_operations {
+ 	void (*write_vfta)(struct e1000_hw *, u32, u32);
+ 	s32  (*read_mac_addr)(struct e1000_hw *);
  };
++typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
  
--static struct e1000_phy_operations es2_phy_ops = {
-+static const struct e1000_phy_operations es2_phy_ops = {
- 	.acquire		= e1000_acquire_phy_80003es2lan,
- 	.check_polarity		= e1000_check_polarity_m88,
- 	.check_reset_block	= e1000e_check_reset_block_generic,
-@@ -1471,7 +1471,7 @@ static struct e1000_phy_operations es2_phy_ops = {
- 	.cfg_on_link_up      	= e1000_cfg_on_link_up_80003es2lan,
+ /* Function pointers for the PHY. */
+ struct e1000_phy_operations {
+@@ -799,6 +800,7 @@ struct e1000_phy_operations {
+ 	void (*power_up)(struct e1000_hw *);
+ 	void (*power_down)(struct e1000_hw *);
  };
- 
--static struct e1000_nvm_operations es2_nvm_ops = {
-+static const struct e1000_nvm_operations es2_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_80003es2lan,
- 	.read			= e1000e_read_nvm_eerd,
- 	.release		= e1000_release_nvm_80003es2lan,
-diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
-index bc0860a..efaa65c 100644
---- a/drivers/net/e1000e/hw.h
-+++ b/drivers/net/e1000e/hw.h
-@@ -801,16 +801,17 @@ struct e1000_phy_operations {
++typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
  
  /* Function pointers for the NVM. */
  struct e1000_nvm_operations {
--	s32  (*acquire)(struct e1000_hw *);
--	s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
--	void (*release)(struct e1000_hw *);
--	s32  (*update)(struct e1000_hw *);
--	s32  (*valid_led_default)(struct e1000_hw *, u16 *);
--	s32  (*validate)(struct e1000_hw *);
--	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-+	s32  (* acquire)(struct e1000_hw *);	/* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */
-+	s32  (* const read)(struct e1000_hw *, u16, u16, u16 *);
-+	void (* release)(struct e1000_hw *);	/* cannot be const, see drivers/net/e1000e/82571.c e1000_init_nvm_params_82571() */
-+	s32  (* const update)(struct e1000_hw *);
-+	s32  (* const valid_led_default)(struct e1000_hw *, u16 *);
-+	s32  (* const validate)(struct e1000_hw *);
-+	s32  (* const write)(struct e1000_hw *, u16, u16, u16 *);
+@@ -810,9 +812,10 @@ struct e1000_nvm_operations {
+ 	s32  (*validate)(struct e1000_hw *);
+ 	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
  };
++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
  
  struct e1000_mac_info {
-+	/* cannot be const see e1000_init_mac_params_ich8lan */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
+ 	u8 addr[ETH_ALEN];
+ 	u8 perm_addr[ETH_ALEN];
  
- 	u8 addr[6];
-@@ -853,6 +854,7 @@ struct e1000_mac_info {
+@@ -853,7 +856,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
-+	/* Cannot be const see e1000_init_phy_params_82571() */
- 	struct e1000_phy_operations ops;
+-	struct e1000_phy_operations ops;
++	e1000_phy_operations_no_const ops;
  
  	enum e1000_phy_type type;
-@@ -887,6 +889,7 @@ struct e1000_phy_info {
+ 
+@@ -887,7 +890,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
-+	/* cannot be const */
- 	struct e1000_nvm_operations ops;
+-	struct e1000_nvm_operations ops;
++	e1000_nvm_operations_no_const ops;
  
  	enum e1000_nvm_type type;
-diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
-index fb46974..5eb0897 100644
---- a/drivers/net/e1000e/ich8lan.c
-+++ b/drivers/net/e1000e/ich8lan.c
-@@ -3840,7 +3840,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
- 	}
- }
- 
--static struct e1000_mac_operations ich8_mac_ops = {
-+static const struct e1000_mac_operations ich8_mac_ops = {
- 	.id_led_init		= e1000e_id_led_init,
- 	/* check_mng_mode dependent on mac type */
- 	.check_for_link		= e1000_check_for_copper_link_ich8lan,
-@@ -3859,7 +3859,7 @@ static struct e1000_mac_operations ich8_mac_ops = {
- 	/* id_led_init dependent on mac type */
- };
- 
--static struct e1000_phy_operations ich8_phy_ops = {
-+static const struct e1000_phy_operations ich8_phy_ops = {
- 	.acquire		= e1000_acquire_swflag_ich8lan,
- 	.check_reset_block	= e1000_check_reset_block_ich8lan,
- 	.commit			= NULL,
-@@ -3873,7 +3873,7 @@ static struct e1000_phy_operations ich8_phy_ops = {
- 	.write_reg		= e1000e_write_phy_reg_igp,
- };
- 
--static struct e1000_nvm_operations ich8_nvm_ops = {
-+static const struct e1000_nvm_operations ich8_nvm_ops = {
- 	.acquire		= e1000_acquire_nvm_ich8lan,
- 	.read		 	= e1000_read_nvm_ich8lan,
- 	.release		= e1000_release_nvm_ich8lan,
-diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
-index 3e5d0b6..f8608d4 100644
---- a/drivers/net/hamradio/6pack.c
-+++ b/drivers/net/hamradio/6pack.c
-@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct tty_struct *tty,
+ 	enum e1000_nvm_override override;
+diff -urNp linux-3.0.3/drivers/net/hamradio/6pack.c linux-3.0.3/drivers/net/hamradio/6pack.c
+--- linux-3.0.3/drivers/net/hamradio/6pack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/hamradio/6pack.c	2011-08-23 21:48:14.000000000 -0400
+@@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
  	unsigned char buf[512];
  	int count1;
  
@@ -32097,103 +28577,113 @@ index 3e5d0b6..f8608d4 100644
  	if (!count)
  		return;
  
-diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
-index 0a2368f..761ae4e 100644
---- a/drivers/net/igb/e1000_82575.c
-+++ b/drivers/net/igb/e1000_82575.c
-@@ -1747,7 +1747,7 @@ u16 igb_rxpbs_adjust_82580(u32 data)
- 	return ret_val;
- }
- 
--static struct e1000_mac_operations e1000_mac_ops_82575 = {
-+static const struct e1000_mac_operations e1000_mac_ops_82575 = {
- 	.init_hw              = igb_init_hw_82575,
- 	.check_for_link       = igb_check_for_link_82575,
- 	.rar_set              = igb_rar_set,
-@@ -1755,13 +1755,13 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = {
- 	.get_speed_and_duplex = igb_get_speed_and_duplex_copper,
- };
- 
--static struct e1000_phy_operations e1000_phy_ops_82575 = {
-+static const struct e1000_phy_operations e1000_phy_ops_82575 = {
- 	.acquire              = igb_acquire_phy_82575,
- 	.get_cfg_done         = igb_get_cfg_done_82575,
- 	.release              = igb_release_phy_82575,
+diff -urNp linux-3.0.3/drivers/net/igb/e1000_hw.h linux-3.0.3/drivers/net/igb/e1000_hw.h
+--- linux-3.0.3/drivers/net/igb/e1000_hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/igb/e1000_hw.h	2011-08-23 21:47:55.000000000 -0400
+@@ -314,6 +314,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;
  
--static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
-+static const struct e1000_nvm_operations e1000_nvm_ops_82575 = {
- 	.acquire              = igb_acquire_nvm_82575,
- 	.read                 = igb_read_nvm_eerd,
- 	.release              = igb_release_nvm_82575,
-diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
-index e2638af..5e535e5 100644
---- a/drivers/net/igb/e1000_hw.h
-+++ b/drivers/net/igb/e1000_hw.h
-@@ -327,22 +327,23 @@ struct e1000_phy_operations {
+ struct e1000_phy_operations {
+ 	s32  (*acquire)(struct e1000_hw *);
+@@ -330,6 +331,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;
  
  struct e1000_nvm_operations {
--	s32  (*acquire)(struct e1000_hw *);
--	s32  (*read)(struct e1000_hw *, u16, u16, u16 *);
--	void (*release)(struct e1000_hw *);
--	s32  (*write)(struct e1000_hw *, u16, u16, u16 *);
-+	s32  (* const acquire)(struct e1000_hw *);
-+	s32  (* const read)(struct e1000_hw *, u16, u16, u16 *);
-+	void (* const release)(struct e1000_hw *);
-+	s32  (* const write)(struct e1000_hw *, u16, u16, u16 *);
+ 	s32  (*acquire)(struct e1000_hw *);
+@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
+ 	s32  (*update)(struct e1000_hw *);
+ 	s32  (*validate)(struct e1000_hw *);
  };
++typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
  
  struct e1000_info {
  	s32 (*get_invariants)(struct e1000_hw *);
--	struct e1000_mac_operations *mac_ops;
--	struct e1000_phy_operations *phy_ops;
--	struct e1000_nvm_operations *nvm_ops;
-+	const struct e1000_mac_operations *mac_ops;
-+	const struct e1000_phy_operations *phy_ops;
-+	const struct e1000_nvm_operations *nvm_ops;
- };
- 
+@@ -350,7 +353,7 @@ struct e1000_info {
  extern const struct e1000_info e1000_82575_info;
  
  struct e1000_mac_info {
-+	/* cannot be const see igb_get_invariants_82575() */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
  
  	u8 addr[6];
-@@ -381,6 +382,7 @@ struct e1000_mac_info {
+ 	u8 perm_addr[6];
+@@ -388,7 +391,7 @@ struct e1000_mac_info {
  };
  
  struct e1000_phy_info {
-+	/* cannot be const see igb_get_invariants_82575() */
- 	struct e1000_phy_operations ops;
+-	struct e1000_phy_operations ops;
++	e1000_phy_operations_no_const ops;
  
  	enum e1000_phy_type type;
-@@ -416,6 +418,7 @@ struct e1000_phy_info {
+ 
+@@ -423,7 +426,7 @@ struct e1000_phy_info {
  };
  
  struct e1000_nvm_info {
-+	/* cannot be const */
- 	struct e1000_nvm_operations ops;
- 
+-	struct e1000_nvm_operations ops;
++	e1000_nvm_operations_no_const ops;
  	enum e1000_nvm_type type;
-diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h
-index d7ed58f..be1ea32 100644
---- a/drivers/net/igbvf/vf.h
-+++ b/drivers/net/igbvf/vf.h
-@@ -191,6 +191,7 @@ struct e1000_mac_operations {
+ 	enum e1000_nvm_override override;
+ 
+@@ -468,6 +471,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;
+ 
+ struct e1000_mbx_stats {
+ 	u32 msgs_tx;
+@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
+ };
+ 
+ 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-3.0.3/drivers/net/igbvf/vf.h linux-3.0.3/drivers/net/igbvf/vf.h
+--- linux-3.0.3/drivers/net/igbvf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/igbvf/vf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -189,9 +189,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;
  
  struct e1000_mac_info {
-+	/* cannot be const see e1000_init_mac_params_vf() */
- 	struct e1000_mac_operations ops;
+-	struct e1000_mac_operations ops;
++	e1000_mac_operations_no_const ops;
  	u8 addr[6];
  	u8 perm_addr[6];
-diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
-index 5639ccc..837c059 100644
---- a/drivers/net/ixgb/ixgb_main.c
-+++ b/drivers/net/ixgb/ixgb_main.c
-@@ -1072,6 +1072,8 @@ ixgb_set_multi(struct net_device *netdev)
+ 
+@@ -213,6 +214,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;
+ 
+ struct e1000_mbx_stats {
+ 	u32 msgs_tx;
+@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
+ };
+ 
+ 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-3.0.3/drivers/net/ixgb/ixgb_main.c linux-3.0.3/drivers/net/ixgb/ixgb_main.c
+--- linux-3.0.3/drivers/net/ixgb/ixgb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ixgb/ixgb_main.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
  	u32 rctl;
  	int i;
  
@@ -32202,10 +28692,9 @@ index 5639ccc..837c059 100644
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
-index dd7fbeb..44b9bbf 100644
---- a/drivers/net/ixgb/ixgb_param.c
-+++ b/drivers/net/ixgb/ixgb_param.c
+diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_param.c linux-3.0.3/drivers/net/ixgb/ixgb_param.c
+--- linux-3.0.3/drivers/net/ixgb/ixgb_param.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ixgb/ixgb_param.c	2011-08-23 21:48:14.000000000 -0400
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -32216,11 +28705,113 @@ index dd7fbeb..44b9bbf 100644
  	if (bd >= IXGB_MAX_NIC) {
  		pr_notice("Warning: no configuration for board #%i\n", bd);
  		pr_notice("Using defaults for all values\n");
-diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
-index 540a8dc..a24ce6e 100644
---- a/drivers/net/ksz884x.c
-+++ b/drivers/net/ksz884x.c
-@@ -6536,6 +6536,8 @@ static void netdev_get_ethtool_stats(struct net_device *dev,
+diff -urNp linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:47:55.000000000 -0400
+@@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
+ 	s32 (*update_checksum)(struct ixgbe_hw *);
+ 	u16 (*calc_checksum)(struct ixgbe_hw *);
+ };
++typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
+ 
+ struct ixgbe_mac_operations {
+ 	s32 (*init_hw)(struct ixgbe_hw *);
+@@ -2639,6 +2640,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;
+ 
+ struct ixgbe_phy_operations {
+ 	s32 (*identify)(struct ixgbe_hw *);
+@@ -2658,9 +2660,10 @@ struct ixgbe_phy_operations {
+ 	s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
+ 	s32 (*check_overtemp)(struct ixgbe_hw *);
+ };
++typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
+ 
+ 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;
+@@ -2670,7 +2673,7 @@ struct ixgbe_eeprom_info {
+ 
+ #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED	0x01
+ 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];
+@@ -2698,7 +2701,7 @@ struct ixgbe_mac_info {
+ };
+ 
+ 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;
+@@ -2726,6 +2729,7 @@ struct ixgbe_mbx_operations {
+ 	s32 (*check_for_ack)(struct ixgbe_hw *, u16);
+ 	s32 (*check_for_rst)(struct ixgbe_hw *, u16);
+ };
++typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
+ 
+ struct ixgbe_mbx_stats {
+ 	u32 msgs_tx;
+@@ -2737,7 +2741,7 @@ struct ixgbe_mbx_stats {
+ };
+ 
+ struct ixgbe_mbx_info {
+-	struct ixgbe_mbx_operations ops;
++	ixgbe_mbx_operations_no_const ops;
+ 	struct ixgbe_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 usec_delay;
+diff -urNp linux-3.0.3/drivers/net/ixgbevf/vf.h linux-3.0.3/drivers/net/ixgbevf/vf.h
+--- linux-3.0.3/drivers/net/ixgbevf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ixgbevf/vf.h	2011-08-23 21:47:55.000000000 -0400
+@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
+ 	s32 (*clear_vfta)(struct ixgbe_hw *);
+ 	s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
+ };
++typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
+ 
+ enum ixgbe_mac_type {
+ 	ixgbe_mac_unknown = 0,
+@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
+ };
+ 
+ struct ixgbe_mac_info {
+-	struct ixgbe_mac_operations ops;
++	ixgbe_mac_operations_no_const ops;
+ 	u8 addr[6];
+ 	u8 perm_addr[6];
+ 
+@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
+ 	s32 (*check_for_ack)(struct ixgbe_hw *);
+ 	s32 (*check_for_rst)(struct ixgbe_hw *);
+ };
++typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
+ 
+ struct ixgbe_mbx_stats {
+ 	u32 msgs_tx;
+@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
+ };
+ 
+ struct ixgbe_mbx_info {
+-	struct ixgbe_mbx_operations ops;
++	ixgbe_mbx_operations_no_const ops;
+ 	struct ixgbe_mbx_stats stats;
+ 	u32 timeout;
+ 	u32 udelay;
+diff -urNp linux-3.0.3/drivers/net/ksz884x.c linux-3.0.3/drivers/net/ksz884x.c
+--- linux-3.0.3/drivers/net/ksz884x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ksz884x.c	2011-08-23 21:48:14.000000000 -0400
+@@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
  	int rc;
  	u64 counter[TOTAL_PORT_COUNTER_NUM];
  
@@ -32229,19 +28820,18 @@ index 540a8dc..a24ce6e 100644
  	mutex_lock(&hw_priv->lock);
  	n = SWITCH_PORT_NUM;
  	for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
-index 2765a3c..972e466 100644
---- a/drivers/net/mlx4/main.c
-+++ b/drivers/net/mlx4/main.c
-@@ -39,6 +39,7 @@
- #include <linux/pci.h>
+diff -urNp linux-3.0.3/drivers/net/mlx4/main.c linux-3.0.3/drivers/net/mlx4/main.c
+--- linux-3.0.3/drivers/net/mlx4/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/mlx4/main.c	2011-08-23 21:48:14.000000000 -0400
+@@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
+ #include <linux/io-mapping.h>
 +#include <linux/sched.h>
  
  #include <linux/mlx4/device.h>
  #include <linux/mlx4/doorbell.h>
-@@ -737,6 +738,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
+@@ -764,6 +765,8 @@ static int mlx4_init_hca(struct mlx4_dev
  	u64 icm_size;
  	int err;
  
@@ -32250,11 +28840,10 @@ index 2765a3c..972e466 100644
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff --git a/drivers/net/niu.c b/drivers/net/niu.c
-index 9fb59d3..b38b68b 100644
---- a/drivers/net/niu.c
-+++ b/drivers/net/niu.c
-@@ -9067,6 +9067,8 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map)
+diff -urNp linux-3.0.3/drivers/net/niu.c linux-3.0.3/drivers/net/niu.c
+--- linux-3.0.3/drivers/net/niu.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/net/niu.c	2011-08-23 21:48:14.000000000 -0400
+@@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
  	int i, num_irqs, err;
  	u8 first_ldg;
  
@@ -32263,10 +28852,9 @@ index 9fb59d3..b38b68b 100644
  	first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
  	for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
  		ldg_num_map[i] = first_ldg + i;
-diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
-index aee3bb0..f466d90 100644
---- a/drivers/net/pcnet32.c
-+++ b/drivers/net/pcnet32.c
+diff -urNp linux-3.0.3/drivers/net/pcnet32.c linux-3.0.3/drivers/net/pcnet32.c
+--- linux-3.0.3/drivers/net/pcnet32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/pcnet32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -32276,11 +28864,623 @@ index aee3bb0..f466d90 100644
      { 0x300, 0x320, 0x340, 0x360, 0 };
  
  static int pcnet32_debug;
-diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
-index c7a6c44..6652313 100644
---- a/drivers/net/ppp_generic.c
-+++ b/drivers/net/ppp_generic.c
-@@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -270,7 +270,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 */
+@@ -460,9 +460,9 @@ static void pcnet32_netif_start(struct n
+ 	u16 val;
+ 
+ 	netif_wake_queue(dev);
+-	val = lp->a.read_csr(ioaddr, CSR3);
++	val = lp->a->read_csr(ioaddr, CSR3);
+ 	val &= 0x00ff;
+-	lp->a.write_csr(ioaddr, CSR3, val);
++	lp->a->write_csr(ioaddr, CSR3, val);
+ 	napi_enable(&lp->napi);
+ }
+ 
+@@ -730,7 +730,7 @@ static u32 pcnet32_get_link(struct net_d
+ 		r = mii_link_ok(&lp->mii_if);
+ 	} else if (lp->chip_version >= PCNET32_79C970A) {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	} else {	/* can not detect link on really old chips */
+ 		r = 1;
+ 	}
+@@ -792,7 +792,7 @@ static int pcnet32_set_ringparam(struct 
+ 		pcnet32_netif_stop(dev);
+ 
+ 	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 */
+ 
+ 	size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
+ 
+@@ -868,7 +868,7 @@ static void pcnet32_ethtool_test(struct 
+ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;	/* access to registers */
++	struct pcnet32_access *a = lp->a;	/* access to registers */
+ 	ulong ioaddr = dev->base_addr;	/* card base I/O address */
+ 	struct sk_buff *skb;	/* sk buff */
+ 	int x, i;		/* counters */
+@@ -888,21 +888,21 @@ static int pcnet32_loopback_test(struct 
+ 		pcnet32_netif_stop(dev);
+ 
+ 	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 */
+ 
+ 	numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
+ 
+ 	/* 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 */
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	/* purge & init rings but don't actually restart */
+ 	pcnet32_restart(dev, 0x0000);
+ 
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
++	lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);	/* Set STOP bit */
+ 
+ 	/* Initialize Transmit buffers. */
+ 	size = data_len + 15;
+@@ -947,10 +947,10 @@ static int pcnet32_loopback_test(struct 
+ 
+ 	/* set int loopback in CSR15 */
+ 	x = a->read_csr(ioaddr, CSR15) & 0xfffc;
+-	lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
++	lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
+ 
+ 	teststatus = 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 */
+ 
+ 	/* Check status of descriptors */
+ 	for (x = 0; x < numbuffs; x++) {
+@@ -969,7 +969,7 @@ static int pcnet32_loopback_test(struct 
+ 		}
+ 	}
+ 
+-	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)) {
+ 		netdev_printk(KERN_DEBUG, dev, "RX loopback packets:\n");
+@@ -1015,7 +1015,7 @@ clean_up:
+ 		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);
+ 
+@@ -1026,7 +1026,7 @@ static int pcnet32_set_phys_id(struct ne
+ 			       enum ethtool_phys_id_state state)
+ {
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 	int i;
+@@ -1067,7 +1067,7 @@ static int pcnet32_suspend(struct net_de
+ {
+ 	int csr5;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	int ticks;
+ 
+@@ -1324,8 +1324,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);
+ 	}
+@@ -1337,12 +1337,12 @@ static int pcnet32_poll(struct napi_stru
+ 		__napi_complete(napi);
+ 
+ 		/* clear interrupt masks */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val &= 0x00ff;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 		/* Set interrupt enable. */
+-		lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
++		lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
+ 
+ 		spin_unlock_irqrestore(&lp->lock, flags);
+ 	}
+@@ -1365,7 +1365,7 @@ static void pcnet32_get_regs(struct net_
+ 	int i, csr0;
+ 	u16 *buff = ptr;
+ 	struct pcnet32_private *lp = netdev_priv(dev);
+-	struct pcnet32_access *a = &lp->a;
++	struct pcnet32_access *a = lp->a;
+ 	ulong ioaddr = dev->base_addr;
+ 	unsigned long flags;
+ 
+@@ -1401,9 +1401,9 @@ static void pcnet32_get_regs(struct net_
+ 		for (j = 0; j < PCNET32_MAX_PHYS; j++) {
+ 			if (lp->phymask & (1 << j)) {
+ 				for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
+-					lp->a.write_bcr(ioaddr, 33,
++					lp->a->write_bcr(ioaddr, 33,
+ 							(j << 5) | i);
+-					*buff++ = lp->a.read_bcr(ioaddr, 34);
++					*buff++ = lp->a->read_bcr(ioaddr, 34);
+ 				}
+ 			}
+ 		}
+@@ -1785,7 +1785,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
+ 		lp->options |= PCNET32_PORT_FD;
+ 
+-	lp->a = *a;
++	lp->a = a;
+ 
+ 	/* prior to register_netdev, dev->name is not yet correct */
+ 	if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
+@@ -1844,7 +1844,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 	if (lp->mii) {
+ 		/* lp->phycount and lp->phymask are set to 0 by memset above */
+ 
+-		lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
++		lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
+ 		/* scan for PHYs */
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+ 			unsigned short id1, id2;
+@@ -1864,7 +1864,7 @@ pcnet32_probe1(unsigned long ioaddr, int
+ 				pr_info("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 |= PCNET32_PORT_MII;
+ 	}
+@@ -2020,10 +2020,10 @@ static int pcnet32_open(struct net_devic
+ 	}
+ 
+ 	/* Reset the PCNET32 */
+-	lp->a.reset(ioaddr);
++	lp->a->reset(ioaddr);
+ 
+ 	/* switch pcnet32 to 32bit mode */
+-	lp->a.write_bcr(ioaddr, 20, 2);
++	lp->a->write_bcr(ioaddr, 20, 2);
+ 
+ 	netif_printk(lp, ifup, KERN_DEBUG, dev,
+ 		     "%s() irq %d tx/rx rings %#x/%#x init %#x\n",
+@@ -2032,14 +2032,14 @@ static int pcnet32_open(struct net_devic
+ 		     (u32) (lp->init_dma_addr));
+ 
+ 	/* set/reset autoselect bit */
+-	val = lp->a.read_bcr(ioaddr, 2) & ~2;
++	val = lp->a->read_bcr(ioaddr, 2) & ~2;
+ 	if (lp->options & PCNET32_PORT_ASEL)
+ 		val |= 2;
+-	lp->a.write_bcr(ioaddr, 2, val);
++	lp->a->write_bcr(ioaddr, 2, val);
+ 
+ 	/* handle full duplex setting */
+ 	if (lp->mii_if.full_duplex) {
+-		val = lp->a.read_bcr(ioaddr, 9) & ~3;
++		val = lp->a->read_bcr(ioaddr, 9) & ~3;
+ 		if (lp->options & PCNET32_PORT_FD) {
+ 			val |= 1;
+ 			if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
+@@ -2049,14 +2049,14 @@ static int pcnet32_open(struct net_devic
+ 			if (lp->chip_version == 0x2627)
+ 				val |= 3;
+ 		}
+-		lp->a.write_bcr(ioaddr, 9, val);
++		lp->a->write_bcr(ioaddr, 9, val);
+ 	}
+ 
+ 	/* set/reset GPSI bit in test register */
+-	val = lp->a.read_csr(ioaddr, 124) & ~0x10;
++	val = lp->a->read_csr(ioaddr, 124) & ~0x10;
+ 	if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
+ 		val |= 0x10;
+-	lp->a.write_csr(ioaddr, 124, val);
++	lp->a->write_csr(ioaddr, 124, val);
+ 
+ 	/* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
+ 	if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
+@@ -2075,24 +2075,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 = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
++			val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
+ 			if (lp->options & PCNET32_PORT_FD)
+ 				val |= 0x10;
+ 			if (lp->options & PCNET32_PORT_100)
+ 				val |= 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 = lp->a.read_bcr(ioaddr, 32) & ~0x98;
++				val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
+ 				val |= 0x20;
+-				lp->a.write_bcr(ioaddr, 32, val);
++				lp->a->write_bcr(ioaddr, 32, val);
+ 			}
+ 		}
+ 	} else {
+@@ -2105,10 +2105,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 = lp->a.read_bcr(ioaddr, 2);
+-		lp->a.write_bcr(ioaddr, 2, val & ~2);
+-		val = lp->a.read_bcr(ioaddr, 32);
+-		lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
++		val = lp->a->read_bcr(ioaddr, 2);
++		lp->a->write_bcr(ioaddr, 2, val & ~2);
++		val = lp->a->read_bcr(ioaddr, 32);
++		lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7));	/* stop MII manager */
+ 
+ 		if (!(lp->options & PCNET32_PORT_ASEL)) {
+ 			/* setup ecmd */
+@@ -2118,7 +2118,7 @@ static int pcnet32_open(struct net_devic
+ 			ethtool_cmd_speed_set(&ecmd,
+ 					      (lp->options & PCNET32_PORT_100) ?
+ 					      SPEED_100 : SPEED_10);
+-			bcr9 = lp->a.read_bcr(ioaddr, 9);
++			bcr9 = lp->a->read_bcr(ioaddr, 9);
+ 
+ 			if (lp->options & PCNET32_PORT_FD) {
+ 				ecmd.duplex = DUPLEX_FULL;
+@@ -2127,7 +2127,7 @@ static int pcnet32_open(struct net_devic
+ 				ecmd.duplex = DUPLEX_HALF;
+ 				bcr9 |= ~(1 << 0);
+ 			}
+-			lp->a.write_bcr(ioaddr, 9, bcr9);
++			lp->a->write_bcr(ioaddr, 9, bcr9);
+ 		}
+ 
+ 		for (i = 0; i < PCNET32_MAX_PHYS; i++) {
+@@ -2158,9 +2158,9 @@ static int pcnet32_open(struct net_devic
+ 
+ #ifdef DO_DXSUFLO
+ 	if (lp->dxsuflo) {	/* Disable transmit stop on underflow */
+-		val = lp->a.read_csr(ioaddr, CSR3);
++		val = lp->a->read_csr(ioaddr, CSR3);
+ 		val |= 0x40;
+-		lp->a.write_csr(ioaddr, CSR3, val);
++		lp->a->write_csr(ioaddr, CSR3, val);
+ 	}
+ #endif
+ 
+@@ -2176,11 +2176,11 @@ static int pcnet32_open(struct net_devic
+ 	napi_enable(&lp->napi);
+ 
+ 	/* 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));
+ 
+-	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);
+ 
+ 	netif_start_queue(dev);
+ 
+@@ -2192,19 +2192,19 @@ static int pcnet32_open(struct net_devic
+ 
+ 	i = 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);
+ 
+ 	netif_printk(lp, ifup, KERN_DEBUG, dev,
+ 		     "pcnet32 open after %d ticks, init block %#x csr0 %4.4x\n",
+ 		     i,
+ 		     (u32) (lp->init_dma_addr),
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -2218,7 +2218,7 @@ err_free_ring:
+ 	 * 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);
+ 
+ err_free_irq:
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+@@ -2323,7 +2323,7 @@ static void pcnet32_restart(struct net_d
+ 
+ 	/* wait for stop */
+ 	for (i = 0; i < 100; i++)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
+ 			break;
+ 
+ 	if (i >= 100)
+@@ -2335,13 +2335,13 @@ static void pcnet32_restart(struct net_d
+ 		return;
+ 
+ 	/* ReInit Ring */
+-	lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
++	lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
+ 	i = 0;
+ 	while (i++ < 1000)
+-		if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
++		if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
+ 			break;
+ 
+-	lp->a.write_csr(ioaddr, CSR0, csr0_bits);
++	lp->a->write_csr(ioaddr, CSR0, csr0_bits);
+ }
+ 
+ static void pcnet32_tx_timeout(struct net_device *dev)
+@@ -2353,8 +2353,8 @@ static void pcnet32_tx_timeout(struct ne
+ 	/* Transmitter timeout, serious problems. */
+ 	if (pcnet32_debug & NETIF_MSG_DRV)
+ 		pr_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;
+@@ -2397,7 +2397,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 
+ 	netif_printk(lp, tx_queued, KERN_DEBUG, dev,
+ 		     "%s() called, csr0 %4.4x\n",
+-		     __func__, lp->a.read_csr(ioaddr, CSR0));
++		     __func__, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	/* Default status -- will not enable Successful-TxDone
+ 	 * interrupt when that option is available to us.
+@@ -2427,7 +2427,7 @@ static netdev_tx_t pcnet32_start_xmit(st
+ 	dev->stats.tx_bytes += skb->len;
+ 
+ 	/* 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);
+ 
+ 	if (lp->tx_ring[(entry + 1) & lp->tx_mod_mask].base != 0) {
+ 		lp->tx_full = 1;
+@@ -2452,16 +2452,16 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 
+ 	spin_lock(&lp->lock);
+ 
+-	csr0 = lp->a.read_csr(ioaddr, CSR0);
++	csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	while ((csr0 & 0x8f00) && --boguscnt >= 0) {
+ 		if (csr0 == 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);
+ 
+ 		netif_printk(lp, intr, KERN_DEBUG, dev,
+ 			     "interrupt  csr0=%#2.2x new csr=%#2.2x\n",
+-			     csr0, lp->a.read_csr(ioaddr, CSR0));
++			     csr0, lp->a->read_csr(ioaddr, CSR0));
+ 
+ 		/* Log misc errors. */
+ 		if (csr0 & 0x4000)
+@@ -2488,19 +2488,19 @@ pcnet32_interrupt(int irq, void *dev_id)
+ 		if (napi_schedule_prep(&lp->napi)) {
+ 			u16 val;
+ 			/* set interrupt masks */
+-			val = lp->a.read_csr(ioaddr, CSR3);
++			val = lp->a->read_csr(ioaddr, CSR3);
+ 			val |= 0x5f00;
+-			lp->a.write_csr(ioaddr, CSR3, val);
++			lp->a->write_csr(ioaddr, CSR3, val);
+ 
+ 			__napi_schedule(&lp->napi);
+ 			break;
+ 		}
+-		csr0 = lp->a.read_csr(ioaddr, CSR0);
++		csr0 = lp->a->read_csr(ioaddr, CSR0);
+ 	}
+ 
+ 	netif_printk(lp, intr, KERN_DEBUG, dev,
+ 		     "exiting interrupt, csr0=%#4.4x\n",
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	spin_unlock(&lp->lock);
+ 
+@@ -2520,20 +2520,20 @@ static int pcnet32_close(struct net_devi
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
+ 
+ 	netif_printk(lp, ifdown, KERN_DEBUG, dev,
+ 		     "Shutting down ethercard, status was %2.2x\n",
+-		     lp->a.read_csr(ioaddr, CSR0));
++		     lp->a->read_csr(ioaddr, CSR0));
+ 
+ 	/* 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);
+ 
+ 	/*
+ 	 * 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);
+ 
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+@@ -2556,7 +2556,7 @@ static struct net_device_stats *pcnet32_
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
++	dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ 
+ 	return &dev->stats;
+@@ -2578,10 +2578,10 @@ static void pcnet32_load_multicast(struc
+ 	if (dev->flags & IFF_ALLMULTI) {
+ 		ib->filter[0] = cpu_to_le32(~0U);
+ 		ib->filter[1] = 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 */
+@@ -2601,7 +2601,7 @@ static void pcnet32_load_multicast(struc
+ 		mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
+ 	}
+ 	for (i = 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]));
+ }
+ 
+@@ -2616,28 +2616,28 @@ static void pcnet32_set_multicast_list(s
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 	suspended = pcnet32_suspend(dev, &flags, 0);
+-	csr15 = lp->a.read_csr(ioaddr, CSR15);
++	csr15 = lp->a->read_csr(ioaddr, CSR15);
+ 	if (dev->flags & IFF_PROMISC) {
+ 		/* Log any net taps. */
+ 		netif_info(lp, hw, dev, "Promiscuous mode enabled\n");
+ 		lp->init_block->mode =
+ 		    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 =
+ 		    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);
+ 	}
+ 
+ 	if (suspended) {
+ 		int csr5;
+ 		/* clear SUSPEND (SPND) - CSR5 bit 0 */
+-		csr5 = lp->a.read_csr(ioaddr, CSR5);
+-		lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
++		csr5 = 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);
+ 	}
+@@ -2655,8 +2655,8 @@ static int mdio_read(struct net_device *
+ 	if (!lp->mii)
+ 		return 0;
+ 
+-	lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
+-	val_out = lp->a.read_bcr(ioaddr, 34);
++	lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
++	val_out = lp->a->read_bcr(ioaddr, 34);
+ 
+ 	return val_out;
+ }
+@@ -2670,8 +2670,8 @@ static void mdio_write(struct net_device
+ 	if (!lp->mii)
+ 		return;
+ 
+-	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);
+ }
+ 
+ static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -2748,7 +2748,7 @@ static void pcnet32_check_media(struct n
+ 		curr_link = mii_link_ok(&lp->mii_if);
+ 	} else {
+ 		ulong ioaddr = dev->base_addr;	/* card base I/O address */
+-		curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
++		curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
+ 	}
+ 	if (!curr_link) {
+ 		if (prev_link || verbose) {
+@@ -2771,13 +2771,13 @@ static void pcnet32_check_media(struct n
+ 					    (ecmd.duplex == DUPLEX_FULL)
+ 					    ? "full" : "half");
+ 			}
+-			bcr9 = lp->a.read_bcr(dev->base_addr, 9);
++			bcr9 = lp->a->read_bcr(dev->base_addr, 9);
+ 			if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
+ 				if (lp->mii_if.full_duplex)
+ 					bcr9 |= (1 << 0);
+ 				else
+ 					bcr9 &= ~(1 << 0);
+-				lp->a.write_bcr(dev->base_addr, 9, bcr9);
++				lp->a->write_bcr(dev->base_addr, 9, bcr9);
+ 			}
+ 		} else {
+ 			netif_info(lp, link, dev, "link up\n");
+diff -urNp linux-3.0.3/drivers/net/ppp_generic.c linux-3.0.3/drivers/net/ppp_generic.c
+--- linux-3.0.3/drivers/net/ppp_generic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/ppp_generic.c	2011-08-23 21:47:55.000000000 -0400
+@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
  	void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
  	struct ppp_stats stats;
  	struct ppp_comp_stats cstats;
@@ -32288,7 +29488,7 @@ index c7a6c44..6652313 100644
  
  	switch (cmd) {
  	case SIOCGPPPSTATS:
-@@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, st
  		break;
  
  	case SIOCGPPPVER:
@@ -32298,24 +29498,28 @@ index c7a6c44..6652313 100644
  			break;
  		err = 0;
  		break;
-diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
-index 06c0e503..5ead531 100644
---- a/drivers/net/tg3.c
-+++ b/drivers/net/tg3.c
-@@ -13003,7 +13003,7 @@ done:
- 
- static struct pci_dev * __devinit tg3_find_peer(struct tg3 *);
- 
--static void inline vlan_features_add(struct net_device *dev, unsigned long flags)
-+static inline void vlan_features_add(struct net_device *dev, unsigned long flags)
- {
- 	dev->vlan_features |= flags;
- }
-diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
-index f528243..3a68bba 100644
---- a/drivers/net/tg3.h
-+++ b/drivers/net/tg3.h
-@@ -131,6 +131,7 @@
+diff -urNp linux-3.0.3/drivers/net/r8169.c linux-3.0.3/drivers/net/r8169.c
+--- linux-3.0.3/drivers/net/r8169.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/net/r8169.c	2011-08-23 21:47:55.000000000 -0400
+@@ -645,12 +645,12 @@ struct rtl8169_private {
+ 	struct mdio_ops {
+ 		void (*write)(void __iomem *, int, int);
+ 		int (*read)(void __iomem *, int);
+-	} mdio_ops;
++	} __no_const mdio_ops;
+ 
+ 	struct pll_power_ops {
+ 		void (*down)(struct rtl8169_private *);
+ 		void (*up)(struct rtl8169_private *);
+-	} pll_power_ops;
++	} __no_const pll_power_ops;
+ 
+ 	int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
+ 	int (*get_settings)(struct net_device *, struct ethtool_cmd *);
+diff -urNp linux-3.0.3/drivers/net/tg3.h linux-3.0.3/drivers/net/tg3.h
+--- linux-3.0.3/drivers/net/tg3.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tg3.h	2011-08-23 21:47:55.000000000 -0400
+@@ -134,6 +134,7 @@
  #define  CHIPREV_ID_5750_A0		 0x4000
  #define  CHIPREV_ID_5750_A1		 0x4001
  #define  CHIPREV_ID_5750_A3		 0x4003
@@ -32323,11 +29527,83 @@ index f528243..3a68bba 100644
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
-index b13c6b0..6a3f6d1 100644
---- a/drivers/net/tulip/de2104x.c
-+++ b/drivers/net/tulip/de2104x.c
-@@ -1817,6 +1817,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
+diff -urNp linux-3.0.3/drivers/net/tokenring/abyss.c linux-3.0.3/drivers/net/tokenring/abyss.c
+--- linux-3.0.3/drivers/net/tokenring/abyss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tokenring/abyss.c	2011-08-23 21:47:55.000000000 -0400
+@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
+ 
+ static int __init abyss_init (void)
+ {
+-	abyss_netdev_ops = tms380tr_netdev_ops;
++	pax_open_kernel();
++	memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
+ 
+-	abyss_netdev_ops.ndo_open = abyss_open;
+-	abyss_netdev_ops.ndo_stop = abyss_close;
++	*(void **)&abyss_netdev_ops.ndo_open = abyss_open;
++	*(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
++	pax_close_kernel();
+ 
+ 	return pci_register_driver(&abyss_driver);
+ }
+diff -urNp linux-3.0.3/drivers/net/tokenring/madgemc.c linux-3.0.3/drivers/net/tokenring/madgemc.c
+--- linux-3.0.3/drivers/net/tokenring/madgemc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tokenring/madgemc.c	2011-08-23 21:47:55.000000000 -0400
+@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
+ 
+ static int __init madgemc_init (void)
+ {
+-	madgemc_netdev_ops = tms380tr_netdev_ops;
+-	madgemc_netdev_ops.ndo_open = madgemc_open;
+-	madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_open_kernel();
++	memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
++	*(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
++	pax_close_kernel();
+ 
+ 	return mca_register_driver (&madgemc_driver);
+ }
+diff -urNp linux-3.0.3/drivers/net/tokenring/proteon.c linux-3.0.3/drivers/net/tokenring/proteon.c
+--- linux-3.0.3/drivers/net/tokenring/proteon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tokenring/proteon.c	2011-08-23 21:47:55.000000000 -0400
+@@ -353,9 +353,11 @@ static int __init proteon_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
+ 
+-	proteon_netdev_ops = tms380tr_netdev_ops;
+-	proteon_netdev_ops.ndo_open = proteon_open;
+-	proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&proteon_netdev_ops.ndo_open = proteon_open;
++	*(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
+ 
+ 	err = platform_driver_register(&proteon_driver);
+ 	if (err)
+diff -urNp linux-3.0.3/drivers/net/tokenring/skisa.c linux-3.0.3/drivers/net/tokenring/skisa.c
+--- linux-3.0.3/drivers/net/tokenring/skisa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tokenring/skisa.c	2011-08-23 21:47:55.000000000 -0400
+@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
+ 	struct platform_device *pdev;
+ 	int i, num = 0, err = 0;
+ 
+-	sk_isa_netdev_ops = tms380tr_netdev_ops;
+-	sk_isa_netdev_ops.ndo_open = sk_isa_open;
+-	sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_open_kernel();
++	memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
++	*(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
++	*(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
++	pax_close_kernel();
+ 
+ 	err = platform_driver_register(&sk_isa_driver);
+ 	if (err)
+diff -urNp linux-3.0.3/drivers/net/tulip/de2104x.c linux-3.0.3/drivers/net/tulip/de2104x.c
+--- linux-3.0.3/drivers/net/tulip/de2104x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tulip/de2104x.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
  	struct de_srom_info_leaf *il;
  	void *bufp;
  
@@ -32336,11 +29612,10 @@ index b13c6b0..6a3f6d1 100644
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
-index 4dbd493..0cbae09 100644
---- a/drivers/net/tulip/de4x5.c
-+++ b/drivers/net/tulip/de4x5.c
-@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+diff -urNp linux-3.0.3/drivers/net/tulip/de4x5.c linux-3.0.3/drivers/net/tulip/de4x5.c
+--- linux-3.0.3/drivers/net/tulip/de4x5.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/tulip/de4x5.c	2011-08-23 21:47:55.000000000 -0400
+@@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
  	for (i=0; i<ETH_ALEN; i++) {
  	    tmp.addr[i] = dev->dev_addr[i];
  	}
@@ -32349,7 +29624,7 @@ index 4dbd493..0cbae09 100644
  	break;
  
      case DE4X5_SET_HWADDR:           /* Set the hardware address */
-@@ -5441,7 +5441,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+@@ -5441,7 +5441,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);
@@ -32358,10 +29633,9 @@ index 4dbd493..0cbae09 100644
  		return -EFAULT;
  	break;
      }
-diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
-index 6d83812..a7e7c1a 100644
---- a/drivers/net/usb/hso.c
-+++ b/drivers/net/usb/hso.c
+diff -urNp linux-3.0.3/drivers/net/usb/hso.c linux-3.0.3/drivers/net/usb/hso.c
+--- linux-3.0.3/drivers/net/usb/hso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/usb/hso.c	2011-08-23 21:47:55.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -32380,7 +29654,7 @@ index 6d83812..a7e7c1a 100644
  	spinlock_t serial_lock;
  
  	int (*write_data) (struct hso_serial *serial);
-@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
+@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_
  	struct urb *urb;
  
  	urb = serial->rx_urb[0];
@@ -32389,7 +29663,7 @@ index 6d83812..a7e7c1a 100644
  		count = put_rxbuf_data(urb, serial);
  		if (count == -1)
  			return;
-@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
+@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_cal
  	DUMP1(urb->transfer_buffer, urb->actual_length);
  
  	/* Anyone listening? */
@@ -32398,7 +29672,7 @@ index 6d83812..a7e7c1a 100644
  		return;
  
  	if (status == 0) {
-@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_st
  	spin_unlock_irq(&serial->serial_lock);
  
  	/* check for port already opened, if not set the termios */
@@ -32408,7 +29682,7 @@ index 6d83812..a7e7c1a 100644
  		serial->rx_state = RX_IDLE;
  		/* Force default termio settings */
  		_hso_serial_set_termios(tty, NULL);
-@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
+@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_st
  		result = hso_start_serial_device(serial->parent, GFP_KERNEL);
  		if (result) {
  			hso_stop_serial_device(serial->parent);
@@ -32417,7 +29691,7 @@ index 6d83812..a7e7c1a 100644
  			kref_put(&serial->parent->ref, hso_serial_ref_free);
  		}
  	} else {
-@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
+@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_
  
  	/* reset the rts and dtr */
  	/* do the actual close */
@@ -32431,7 +29705,7 @@ index 6d83812..a7e7c1a 100644
  		spin_lock_irq(&serial->serial_lock);
  		if (serial->tty == tty) {
  			serial->tty->driver_data = NULL;
-@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
+@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struc
  
  	/* the actual setup */
  	spin_lock_irqsave(&serial->serial_lock, flags);
@@ -32440,7 +29714,7 @@ index 6d83812..a7e7c1a 100644
  		_hso_serial_set_termios(tty, old);
  	else
  		tty->termios = old;
-@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
+@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *ur
  				D1("Pending read interrupt on port %d\n", i);
  				spin_lock(&serial->serial_lock);
  				if (serial->rx_state == RX_IDLE &&
@@ -32449,7 +29723,7 @@ index 6d83812..a7e7c1a 100644
  					/* Setup and send a ctrl req read on
  					 * port i */
  					if (!serial->rx_urb_filled[0]) {
-@@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interface *iface)
+@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interfa
  	/* Start all serial ports */
  	for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
  		if (serial_table[i] && (serial_table[i]->interface == iface)) {
@@ -32458,11 +29732,10 @@ index 6d83812..a7e7c1a 100644
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
-index 9764672..20eff26 100644
---- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
-+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
-@@ -631,8 +631,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
+diff -urNp linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-08-23 21:47:55.000000000 -0400
+@@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device 
  		 * Return with error code if any of the queue indices
  		 * is out of range
  		 */
@@ -32472,11 +29745,22 @@ index 9764672..20eff26 100644
  			return -EINVAL;
  	}
  
-diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
-index c81a651..5c4dafb 100644
---- a/drivers/net/vxge/vxge-main.c
-+++ b/drivers/net/vxge/vxge-main.c
-@@ -97,6 +97,8 @@ static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo)
+diff -urNp linux-3.0.3/drivers/net/vxge/vxge-config.h linux-3.0.3/drivers/net/vxge/vxge-config.h
+--- linux-3.0.3/drivers/net/vxge/vxge-config.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/vxge/vxge-config.h	2011-08-23 21:47:55.000000000 -0400
+@@ -512,7 +512,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;
+ 
+ /*
+  * struct __vxge_hw_blockpool_entry - Block private data structure
+diff -urNp linux-3.0.3/drivers/net/vxge/vxge-main.c linux-3.0.3/drivers/net/vxge/vxge-main.c
+--- linux-3.0.3/drivers/net/vxge/vxge-main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/vxge/vxge-main.c	2011-08-23 21:48:14.000000000 -0400
+@@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
  	struct sk_buff *completed[NR_SKB_COMPLETED];
  	int more;
  
@@ -32485,7 +29769,7 @@ index c81a651..5c4dafb 100644
  	do {
  		more = 0;
  		skb_ptr = completed;
-@@ -1889,6 +1891,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
+@@ -1920,6 +1922,8 @@ static enum vxge_hw_status vxge_rth_conf
  	u8 mtable[256] = {0}; /* CPU to vpath mapping  */
  	int index;
  
@@ -32494,11 +29778,22 @@ index c81a651..5c4dafb 100644
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
-index cf9e15f..9789469 100644
---- a/drivers/net/wan/cycx_x25.c
-+++ b/drivers/net/wan/cycx_x25.c
-@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned char *p, int len)
+diff -urNp linux-3.0.3/drivers/net/vxge/vxge-traffic.h linux-3.0.3/drivers/net/vxge/vxge-traffic.h
+--- linux-3.0.3/drivers/net/vxge/vxge-traffic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/vxge/vxge-traffic.h	2011-08-23 21:47:55.000000000 -0400
+@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
+ 			struct vxge_hw_mempool_dma	*dma_object,
+ 			u32			index,
+ 			u32			is_last);
+-};
++} __no_const;
+ 
+ #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)				\
+ 		((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
+diff -urNp linux-3.0.3/drivers/net/wan/cycx_x25.c linux-3.0.3/drivers/net/wan/cycx_x25.c
+--- linux-3.0.3/drivers/net/wan/cycx_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wan/cycx_x25.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
  	unsigned char hex[1024],
  	    	* phex = hex;
  
@@ -32507,11 +29802,38 @@ index cf9e15f..9789469 100644
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
-diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
-index b58ec56..cecbabb 100644
---- a/drivers/net/wimax/i2400m/usb-fw.c
-+++ b/drivers/net/wimax/i2400m/usb-fw.c
-@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *i2400m,
+diff -urNp linux-3.0.3/drivers/net/wan/hdlc_x25.c linux-3.0.3/drivers/net/wan/hdlc_x25.c
+--- linux-3.0.3/drivers/net/wan/hdlc_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wan/hdlc_x25.c	2011-08-23 21:47:55.000000000 -0400
+@@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
+ 
+ static int x25_open(struct net_device *dev)
+ {
+-	struct lapb_register_struct cb;
++	static struct lapb_register_struct cb = {
++		.connect_confirmation = x25_connected,
++		.connect_indication = x25_connected,
++		.disconnect_confirmation = x25_disconnected,
++		.disconnect_indication = x25_disconnected,
++		.data_indication = x25_data_indication,
++		.data_transmit = x25_data_transmit
++	};
+ 	int result;
+ 
+-	cb.connect_confirmation = x25_connected;
+-	cb.connect_indication = x25_connected;
+-	cb.disconnect_confirmation = x25_disconnected;
+-	cb.disconnect_indication = x25_disconnected;
+-	cb.data_indication = x25_data_indication;
+-	cb.data_transmit = x25_data_transmit;
+-
+ 	result = lapb_register(dev, &cb);
+ 	if (result != LAPB_OK)
+ 		return result;
+diff -urNp linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c	2011-08-23 21:48:14.000000000 -0400
+@@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
  	int do_autopm = 1;
  	DECLARE_COMPLETION_ONSTACK(notif_completion);
  
@@ -32520,11 +29842,10 @@ index b58ec56..cecbabb 100644
  	d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
  		  i2400m, ack, ack_size);
  	BUG_ON(_ack == i2400m->bm_ack_buf);
-diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
-index 57a79b0..3261730 100644
---- a/drivers/net/wireless/airo.c
-+++ b/drivers/net/wireless/airo.c
-@@ -3001,6 +3001,8 @@ static void airo_process_scan_results (struct airo_info *ai) {
+diff -urNp linux-3.0.3/drivers/net/wireless/airo.c linux-3.0.3/drivers/net/wireless/airo.c
+--- linux-3.0.3/drivers/net/wireless/airo.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/airo.c	2011-08-23 21:48:14.000000000 -0400
+@@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
  	BSSListElement * loop_net;
  	BSSListElement * tmp_net;
  
@@ -32533,7 +29854,7 @@ index 57a79b0..3261730 100644
  	/* 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);
-@@ -3792,6 +3794,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
+@@ -3794,6 +3796,8 @@ static u16 setup_card(struct airo_info *
  	WepKeyRid wkr;
  	int rc;
  
@@ -32542,7 +29863,7 @@ index 57a79b0..3261730 100644
  	memset( &mySsid, 0, sizeof( mySsid ) );
  	kfree (ai->flash);
  	ai->flash = NULL;
-@@ -4760,6 +4764,8 @@ static int proc_stats_rid_open( struct inode *inode,
+@@ -4753,6 +4757,8 @@ static int proc_stats_rid_open( struct i
  	__le32 *vals = stats.vals;
  	int len;
  
@@ -32551,7 +29872,7 @@ index 57a79b0..3261730 100644
  	if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
  		return -ENOMEM;
  	data = file->private_data;
-@@ -5483,6 +5489,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
+@@ -5476,6 +5482,8 @@ static int proc_BSSList_open( struct ino
  	/* If doLoseSync is not 1, we won't do a Lose Sync */
  	int doLoseSync = -1;
  
@@ -32560,7 +29881,7 @@ index 57a79b0..3261730 100644
  	if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
  		return -ENOMEM;
  	data = file->private_data;
-@@ -7190,6 +7198,8 @@ static int airo_get_aplist(struct net_device *dev,
+@@ -7181,6 +7189,8 @@ static int airo_get_aplist(struct net_de
  	int i;
  	int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;
  
@@ -32569,7 +29890,7 @@ index 57a79b0..3261730 100644
  	qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL);
  	if (!qual)
  		return -ENOMEM;
-@@ -7750,6 +7760,8 @@ static void airo_read_wireless_stats(struct airo_info *local)
+@@ -7741,6 +7751,8 @@ static void airo_read_wireless_stats(str
  	CapabilityRid cap_rid;
  	__le32 *vals = stats_rid.vals;
  
@@ -32578,11 +29899,10 @@ index 57a79b0..3261730 100644
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
-index d2f84d7..215dfb4 100644
---- a/drivers/net/wireless/ath/ath5k/debug.c
-+++ b/drivers/net/wireless/ath/ath5k/debug.c
-@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf,
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c	2011-08-23 21:48:14.000000000 -0400
+@@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
  	unsigned int v;
  	u64 tsf;
  
@@ -32591,7 +29911,7 @@ index d2f84d7..215dfb4 100644
  	v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
  	len += snprintf(buf+len, sizeof(buf)-len,
  		"%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
-@@ -325,6 +327,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
+@@ -323,6 +325,8 @@ static ssize_t read_file_debug(struct fi
  	unsigned int len = 0;
  	unsigned int i;
  
@@ -32600,7 +29920,7 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len,
  		"DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
  
-@@ -386,6 +390,8 @@ static ssize_t read_file_antenna(struct file *file, char __user *user_buf,
+@@ -384,6 +388,8 @@ static ssize_t read_file_antenna(struct 
  	unsigned int i;
  	unsigned int v;
  
@@ -32609,7 +29929,7 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len, "antenna mode\t%d\n",
  		sc->ah->ah_ant_mode);
  	len += snprintf(buf+len, sizeof(buf)-len, "default antenna\t%d\n",
-@@ -496,6 +502,8 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
+@@ -494,6 +500,8 @@ static ssize_t read_file_misc(struct fil
  	unsigned int len = 0;
  	u32 filt = ath5k_hw_get_rx_filter(sc->ah);
  
@@ -32618,7 +29938,7 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len, "bssid-mask: %pM\n",
  			sc->bssidmask);
  	len += snprintf(buf+len, sizeof(buf)-len, "filter-flags: 0x%x ",
-@@ -552,6 +560,8 @@ static ssize_t read_file_frameerrors(struct file *file, char __user *user_buf,
+@@ -550,6 +558,8 @@ static ssize_t read_file_frameerrors(str
  	unsigned int len = 0;
  	int i;
  
@@ -32627,7 +29947,7 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"RX\n---------------------\n");
  	len += snprintf(buf+len, sizeof(buf)-len, "CRC\t%u\t(%u%%)\n",
-@@ -669,6 +679,8 @@ static ssize_t read_file_ani(struct file *file, char __user *user_buf,
+@@ -667,6 +677,8 @@ static ssize_t read_file_ani(struct file
  	char buf[700];
  	unsigned int len = 0;
  
@@ -32636,7 +29956,7 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"HW has PHY error counters:\t%s\n",
  			sc->ah->ah_capabilities.cap_has_phyerr_counters ?
-@@ -829,6 +841,8 @@ static ssize_t read_file_queue(struct file *file, char __user *user_buf,
+@@ -827,6 +839,8 @@ static ssize_t read_file_queue(struct fi
  	struct ath5k_buf *bf, *bf0;
  	int i, n;
  
@@ -32645,21 +29965,11 @@ index d2f84d7..215dfb4 100644
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"available txbuffers: %d\n", sc->txbuf_len);
  
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-index 4a4cd88..caf592b 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-@@ -734,6 +734,8 @@ static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
- 	s32 i, j, ip, im, nmeasurement;
- 	u8 nchains = get_streams(common->tx_chainmask);
- 
-+	pax_track_stack();
-+
- 	for (ip = 0; ip < MPASS; ip++) {
- 		REG_RMW_FIELD(ah, AR_PHY_TX_IQCAL_CONTROL_1,
- 			      AR_PHY_TX_IQCAQL_CONTROL_1_IQCORR_I_Q_COFF_DELPT,
-@@ -856,6 +858,8 @@ static void ar9003_hw_tx_iq_cal_post_proc(struct ath_hw *ah)
- 	int i, ip, im, j;
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-08-23 21:48:14.000000000 -0400
+@@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
+ 	int i, im, j;
  	int nmeasurement;
  
 +	pax_track_stack();
@@ -32667,11 +29977,10 @@ index 4a4cd88..caf592b 100644
  	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
  		if (ah->txchainmask & (1 << i))
  			num_chains++;
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-index 356d2fd7..cdb795f 100644
---- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-08-23 21:48:14.000000000 -0400
+@@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
  	int theta_low_bin = 0;
  	int i;
  
@@ -32680,11 +29989,10 @@ index 356d2fd7..cdb795f 100644
  	/* disregard any bin that contains <= 16 samples */
  	thresh_accum_cnt = 16;
  	scale_factor = 5;
-diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
-index 3586c43..5d72a11 100644
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -321,6 +321,8 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c	2011-08-23 21:48:14.000000000 -0400
+@@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
  	char buf[512];
  	unsigned int len = 0;
  
@@ -32693,20 +30001,28 @@ index 3586c43..5d72a11 100644
  	if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
  		len += snprintf(buf + len, sizeof(buf) - len,
  			"%8s: %10u\n", "RXLP", sc->debug.stats.istats.rxlp);
-@@ -410,6 +412,8 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
+@@ -427,6 +429,8 @@ static ssize_t read_file_wiphy(struct fi
  	u8 addr[ETH_ALEN];
  	u32 tmp;
  
 +	pax_track_stack();
 +
  	len += snprintf(buf + len, sizeof(buf) - len,
- 			"primary: %s (%s chan=%d ht=%d)\n",
- 			wiphy_name(sc->pri_wiphy->hw->wiphy),
-diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-index 6bb5995..dca3c90 100644
---- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-@@ -620,6 +620,8 @@ static ssize_t read_file_tgt_stats(struct file *file, char __user *user_buf,
+ 			"%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
+ 			wiphy_name(sc->hw->wiphy),
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-08-23 21:48:14.000000000 -0400
+@@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
+ 	unsigned int len = 0;
+ 	int ret = 0;
+ 
++	pax_track_stack();
++
+ 	memset(&cmd_rsp, 0, sizeof(cmd_rsp));
+ 
+ 	ath9k_htc_ps_wakeup(priv);
+@@ -89,6 +91,8 @@ static ssize_t read_file_tgt_tx_stats(st
  	unsigned int len = 0;
  	int ret = 0;
  
@@ -32714,8 +30030,17 @@ index 6bb5995..dca3c90 100644
 +
  	memset(&cmd_rsp, 0, sizeof(cmd_rsp));
  
- 	WMI_CMD(WMI_TGT_STATS_CMDID);
-@@ -665,6 +667,8 @@ static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
+ 	ath9k_htc_ps_wakeup(priv);
+@@ -159,6 +163,8 @@ static ssize_t read_file_tgt_rx_stats(st
+ 	unsigned int len = 0;
+ 	int ret = 0;
+ 
++	pax_track_stack();
++
+ 	memset(&cmd_rsp, 0, sizeof(cmd_rsp));
+ 
+ 	ath9k_htc_ps_wakeup(priv);
+@@ -203,6 +209,8 @@ static ssize_t read_file_xmit(struct fil
  	char buf[512];
  	unsigned int len = 0;
  
@@ -32724,46 +30049,69 @@ index 6bb5995..dca3c90 100644
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"%20s : %10u\n", "Buffers queued",
  			priv->debug.tx_stats.buf_queued);
-@@ -714,6 +718,8 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf,
+@@ -376,6 +384,8 @@ static ssize_t read_file_slot(struct fil
  	char buf[512];
  	unsigned int len = 0;
  
 +	pax_track_stack();
 +
- 	len += snprintf(buf + len, sizeof(buf) - len,
- 			"%20s : %10u\n", "SKBs allocated",
- 			priv->debug.rx_stats.skb_allocated);
-diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
-index 59f59fa..7ccbe5e 100644
---- a/drivers/net/wireless/b43/debugfs.c
-+++ b/drivers/net/wireless/b43/debugfs.c
-@@ -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;
+ 	spin_lock_bh(&priv->tx.tx_lock);
+ 
+ 	len += snprintf(buf + len, sizeof(buf) - len, "TX slot bitmap : ");
+@@ -411,6 +421,8 @@ static ssize_t read_file_queue(struct fi
+ 	char buf[512];
+ 	unsigned int len = 0;
+ 
++	pax_track_stack();
++
+ 	len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
+ 			"Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
+ 
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:47:55.000000000 -0400
+@@ -585,7 +585,7 @@ struct ath_hw_private_ops {
+ 
+ 	/* ANI */
+ 	void (*ani_cache_ini_regs)(struct ath_hw *ah);
+-};
++} __no_const;
+ 
+ /**
+  * struct ath_hw_ops - callbacks used by hardware code and driver code
+@@ -637,7 +637,7 @@ struct ath_hw_ops {
+ 	void (*antdiv_comb_conf_set)(struct ath_hw *ah,
+ 			struct ath_hw_antcomb_conf *antconf);
+ 
+-};
++} __no_const;
+ 
+ struct ath_nf_limits {
+ 	s16 max;
+@@ -650,7 +650,7 @@ struct ath_nf_limits {
+ #define AH_UNPLUGGED    0x2 /* The card has been physically removed. */
+ 
+ struct ath_hw {
+-	struct ath_ops reg_ops;
++	ath_ops_no_const reg_ops;
+ 
+ 	struct ieee80211_hw *hw;
+ 	struct ath_common common;
+diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath.h linux-3.0.3/drivers/net/wireless/ath/ath.h
+--- linux-3.0.3/drivers/net/wireless/ath/ath.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ath/ath.h	2011-08-23 21:47:55.000000000 -0400
+@@ -121,6 +121,7 @@ struct ath_ops {
+ 	void (*write_flush) (void *);
+ 	u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
  };
-diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
-index f232618..266b676 100644
---- a/drivers/net/wireless/b43legacy/debugfs.c
-+++ b/drivers/net/wireless/b43legacy/debugfs.c
-@@ -44,7 +44,7 @@ static struct dentry *rootdir;
- struct b43legacy_debugfs_fops {
- 	ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
- 	int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);
--	struct file_operations fops;
-+	const struct file_operations fops;
- 	/* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
- 	size_t file_struct_offset;
- 	/* Take wl->irq_lock before calling read/write? */
-diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
-index 61915f3..a848ae8 100644
---- a/drivers/net/wireless/ipw2x00/ipw2100.c
-+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
-@@ -2101,6 +2101,8 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
++typedef struct ath_ops __no_const ath_ops_no_const;
+ 
+ struct ath_common;
+ struct ath_bus_ops;
+diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
  	int err;
  	DECLARE_SSID_BUF(ssid);
  
@@ -32772,7 +30120,7 @@ index 61915f3..a848ae8 100644
  	IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
  
  	if (ssid_len)
-@@ -5455,6 +5457,8 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
+@@ -5449,6 +5451,8 @@ static int ipw2100_set_key(struct ipw210
  	struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
  	int err;
  
@@ -32781,11 +30129,10 @@ index 61915f3..a848ae8 100644
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
-index 0de1b18..d56ceac 100644
---- a/drivers/net/wireless/ipw2x00/libipw_rx.c
-+++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
-@@ -1565,6 +1565,8 @@ static void libipw_process_probe_response(struct libipw_device
+diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
  	unsigned long flags;
  	DECLARE_SSID_BUF(ssid);
  
@@ -32794,11 +30141,24 @@ index 0de1b18..d56ceac 100644
  	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 --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
-index 75fcd30..70eb079 100644
---- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
-@@ -883,6 +883,8 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
+diff -urNp linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-08-23 21:47:55.000000000 -0400
+@@ -3962,7 +3962,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 = NULL;
++		pax_open_kernel();
++		*(void **)&iwl3945_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
+diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
  	struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
  	struct iwl_rxon_context *ctx = sta_priv->common.ctx;
  
@@ -32807,8 +30167,8 @@ index 75fcd30..70eb079 100644
  	IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
  
  	/* Treat uninitialized rate scaling data same as non-existing. */
-@@ -2892,6 +2894,8 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
- 	u8 valid_tx_ant = 0;
+@@ -2918,6 +2920,8 @@ static void rs_fill_link_cmd(struct iwl_
+ 		container_of(lq_sta, struct iwl_station_priv, lq_sta);
  	struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
  
 +	pax_track_stack();
@@ -32816,26 +30176,10 @@ index 75fcd30..70eb079 100644
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
-index ebdea3b..9ec3ff3 100644
---- a/drivers/net/wireless/iwlwifi/iwl-debug.h
-+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
-@@ -68,8 +68,8 @@ do {                                            			\
- } while (0)
- 
- #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,
- 				      const void *p, u32 len)
- {}
-diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
-index 6fe80b5..7fee03e3 100644
---- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
-@@ -518,6 +518,8 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
+diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
  	int pos = 0;
  	const size_t bufsz = sizeof(buf);
  
@@ -32844,7 +30188,7 @@ index 6fe80b5..7fee03e3 100644
  	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
  		test_bit(STATUS_HCMD_ACTIVE, &priv->status));
  	pos += scnprintf(buf + pos, bufsz - pos, "STATUS_INT_ENABLED:\t %d\n",
-@@ -650,6 +652,8 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf,
+@@ -680,6 +682,8 @@ static ssize_t iwl_dbgfs_qos_read(struct
  	char buf[256 * NUM_IWL_RXON_CTX];
  	const size_t bufsz = sizeof(buf);
  
@@ -32853,11 +30197,24 @@ index 6fe80b5..7fee03e3 100644
  	for_each_context(priv, ctx) {
  		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
  				 ctx->ctxid);
-diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
-index 0a0cc96..fd49ad8 100644
---- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
-+++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
-@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(struct file *filp,
+diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-08-23 21:47:55.000000000 -0400
+@@ -68,8 +68,8 @@ do {                                    
+ } while (0)
+ 
+ #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,
+ 				      const void *p, u32 len)
+ {}
+diff -urNp linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
  	int buf_len = 512;
  	size_t len = 0;
  
@@ -32866,24 +30223,28 @@ index 0a0cc96..fd49ad8 100644
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
-index fbf3b033..064bc9a 100644
---- a/drivers/net/wireless/libertas/debugfs.c
-+++ b/drivers/net/wireless/libertas/debugfs.c
-@@ -702,7 +702,7 @@ out_unlock:
- struct lbs_debugfs_files {
- 	const char *name;
- 	int perm;
--	struct file_operations fops;
-+	const struct file_operations fops;
- };
+diff -urNp linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
+ 		return -EINVAL;
+ 
+ 	if (fake_hw_scan) {
+-		mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
+-		mac80211_hwsim_ops.sw_scan_start = NULL;
+-		mac80211_hwsim_ops.sw_scan_complete = NULL;
++		pax_open_kernel();
++		*(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
++		*(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
++		*(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
++		pax_close_kernel();
+ 	}
  
- static const struct lbs_debugfs_files debugfs_files[] = {
-diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
-index 518542b..2a7bd29 100644
---- a/drivers/net/wireless/rndis_wlan.c
-+++ b/drivers/net/wireless/rndis_wlan.c
-@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
+ 	spin_lock_init(&hwsim_radio_lock);
+diff -urNp linux-3.0.3/drivers/net/wireless/rndis_wlan.c linux-3.0.3/drivers/net/wireless/rndis_wlan.c
+--- linux-3.0.3/drivers/net/wireless/rndis_wlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/rndis_wlan.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
  	netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
  
@@ -32892,11 +30253,10 @@ index 518542b..2a7bd29 100644
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
-index 4504411..f0d94bf 100644
---- a/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
-+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/phy.c
-@@ -1277,6 +1277,8 @@ static bool _rtl92c_phy_sw_chnl_step_by_step(struct ieee80211_hw *hw,
+diff -urNp linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-08-23 21:48:14.000000000 -0400
+@@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
  	u8 rfpath;
  	u8 num_total_rfpath = rtlphy->num_total_rfpath;
  
@@ -32905,11 +30265,22 @@ index 4504411..f0d94bf 100644
  	precommoncmdcnt = 0;
  	_rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
  					 MAX_PRECMD_CNT,
-diff --git a/drivers/net/wireless/wl12xx/spi.c b/drivers/net/wireless/wl12xx/spi.c
-index 7145ea5..de31450 100644
---- a/drivers/net/wireless/wl12xx/spi.c
-+++ b/drivers/net/wireless/wl12xx/spi.c
-@@ -279,6 +279,8 @@ static void wl1271_spi_raw_write(struct wl1271 *wl, int addr, void *buf,
+diff -urNp linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h	2011-08-23 21:47:55.000000000 -0400
+@@ -266,7 +266,7 @@ struct wl1251_if_operations {
+ 	void (*reset)(struct wl1251 *wl);
+ 	void (*enable_irq)(struct wl1251 *wl);
+ 	void (*disable_irq)(struct wl1251 *wl);
+-};
++} __no_const;
+ 
+ struct wl1251 {
+ 	struct ieee80211_hw *hw;
+diff -urNp linux-3.0.3/drivers/net/wireless/wl12xx/spi.c linux-3.0.3/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.0.3/drivers/net/wireless/wl12xx/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/net/wireless/wl12xx/spi.c	2011-08-23 21:48:14.000000000 -0400
+@@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
  	u32 chunk_len;
  	int i;
  
@@ -32918,11 +30289,10 @@ index 7145ea5..de31450 100644
  	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
  	spi_message_init(&m);
-diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
-index a3984f4..0ccba79 100644
---- a/drivers/oprofile/buffer_sync.c
-+++ b/drivers/oprofile/buffer_sync.c
-@@ -342,7 +342,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
+diff -urNp linux-3.0.3/drivers/oprofile/buffer_sync.c linux-3.0.3/drivers/oprofile/buffer_sync.c
+--- linux-3.0.3/drivers/oprofile/buffer_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/buffer_sync.c	2011-08-23 21:47:55.000000000 -0400
+@@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
  		if (cookie == NO_COOKIE)
  			offset = pc;
  		if (cookie == INVALID_COOKIE) {
@@ -32931,7 +30301,7 @@ index a3984f4..0ccba79 100644
  			offset = pc;
  		}
  		if (cookie != last_cookie) {
-@@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
+@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct 
  	/* add userspace sample */
  
  	if (!mm) {
@@ -32948,7 +30318,7 @@ index a3984f4..0ccba79 100644
  		return 0;
  	}
  
-@@ -562,7 +562,7 @@ void sync_buffer(int cpu)
+@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
  		/* ignore backtraces if failed to add a sample */
  		if (state == sb_bt_start) {
  			state = sb_bt_ignore;
@@ -32957,11 +30327,10 @@ index a3984f4..0ccba79 100644
  		}
  	}
  	release_mm(mm);
-diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
-index dd87e86..bc0148c 100644
---- a/drivers/oprofile/event_buffer.c
-+++ b/drivers/oprofile/event_buffer.c
-@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
+diff -urNp linux-3.0.3/drivers/oprofile/event_buffer.c linux-3.0.3/drivers/oprofile/event_buffer.c
+--- linux-3.0.3/drivers/oprofile/event_buffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/event_buffer.c	2011-08-23 21:47:55.000000000 -0400
+@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
  	if (buffer_pos == buffer_size) {
@@ -32970,11 +30339,10 @@ index dd87e86..bc0148c 100644
  		return;
  	}
  
-diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
-index f9bda64..3034df4 100644
---- a/drivers/oprofile/oprof.c
-+++ b/drivers/oprofile/oprof.c
-@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
+diff -urNp linux-3.0.3/drivers/oprofile/oprof.c linux-3.0.3/drivers/oprofile/oprof.c
+--- linux-3.0.3/drivers/oprofile/oprof.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/oprof.c	2011-08-23 21:47:55.000000000 -0400
+@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
  	if (oprofile_ops.switch_events())
  		return;
  
@@ -32983,10 +30351,21 @@ index f9bda64..3034df4 100644
  	start_switch_worker();
  }
  
-diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
-index 917d28e..d62d981 100644
---- a/drivers/oprofile/oprofile_stats.c
-+++ b/drivers/oprofile/oprofile_stats.c
+diff -urNp linux-3.0.3/drivers/oprofile/oprofilefs.c linux-3.0.3/drivers/oprofile/oprofilefs.c
+--- linux-3.0.3/drivers/oprofile/oprofilefs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/oprofilefs.c	2011-08-23 21:47:55.000000000 -0400
+@@ -186,7 +186,7 @@ static const struct file_operations atom
+ 
+ 
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+-	char const *name, atomic_t *val)
++	char const *name, atomic_unchecked_t *val)
+ {
+ 	return __oprofilefs_create_file(sb, root, name,
+ 					&atomic_ro_fops, 0444, val);
+diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.c linux-3.0.3/drivers/oprofile/oprofile_stats.c
+--- linux-3.0.3/drivers/oprofile/oprofile_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/oprofile_stats.c	2011-08-23 21:47:55.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
  		cpu_buf->sample_invalid_eip = 0;
  	}
@@ -33004,10 +30383,9 @@ index 917d28e..d62d981 100644
  }
  
  
-diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
-index 0b54e46..a37c527 100644
---- a/drivers/oprofile/oprofile_stats.h
-+++ b/drivers/oprofile/oprofile_stats.h
+diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.h linux-3.0.3/drivers/oprofile/oprofile_stats.h
+--- linux-3.0.3/drivers/oprofile/oprofile_stats.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/oprofile/oprofile_stats.h	2011-08-23 21:47:55.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -33025,24 +30403,10 @@ index 0b54e46..a37c527 100644
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
-index e9ff6f7..28e259a 100644
---- a/drivers/oprofile/oprofilefs.c
-+++ b/drivers/oprofile/oprofilefs.c
-@@ -186,7 +186,7 @@ static const struct file_operations atomic_ro_fops = {
- 
- 
- 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)
- {
- 	return __oprofilefs_create_file(sb, root, name,
- 					&atomic_ro_fops, 0444, val);
-diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
-index 3f56bc0..707d642 100644
---- a/drivers/parport/procfs.c
-+++ b/drivers/parport/procfs.c
-@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
+diff -urNp linux-3.0.3/drivers/parport/procfs.c linux-3.0.3/drivers/parport/procfs.c
+--- linux-3.0.3/drivers/parport/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/parport/procfs.c	2011-08-23 21:47:55.000000000 -0400
+@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
  	*ppos += len;
  
@@ -33051,7 +30415,7 @@ index 3f56bc0..707d642 100644
  }
  
  #ifdef CONFIG_PARPORT_1284
-@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
+@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table
  
  	*ppos += len;
  
@@ -33060,24 +30424,22 @@ index 3f56bc0..707d642 100644
  }
  #endif /* IEEE1284.3 support. */
  
-diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
-index e610cfe..b5e20c3 100644
---- a/drivers/pci/hotplug/acpiphp_glue.c
-+++ b/drivers/pci/hotplug/acpiphp_glue.c
-@@ -110,7 +110,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
- }
- 
- 
--static struct acpi_dock_ops acpiphp_dock_ops = {
-+static const struct acpi_dock_ops acpiphp_dock_ops = {
- 	.handler = handle_hotplug_event_func,
- };
- 
-diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
-index 76ba8a1..20ca857 100644
---- a/drivers/pci/hotplug/cpqphp_nvram.c
-+++ b/drivers/pci/hotplug/cpqphp_nvram.c
-@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
+diff -urNp linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h	2011-08-23 21:47: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;
+ 
+ struct cpci_hp_controller {
+ 	unsigned int irq;
+diff -urNp linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c	2011-08-23 21:47:55.000000000 -0400
+@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
  {
@@ -33091,23 +30453,9 @@ index 76ba8a1..20ca857 100644
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
-index 5dc5d3e..cd81354 100644
---- a/drivers/pci/intel-iommu.c
-+++ b/drivers/pci/intel-iommu.c
-@@ -2934,7 +2934,7 @@ static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
- 	return !dma_addr;
- }
- 
--struct dma_map_ops intel_dma_ops = {
-+const struct dma_map_ops intel_dma_ops = {
- 	.alloc_coherent = intel_alloc_coherent,
- 	.free_coherent = intel_free_coherent,
- 	.map_sg = intel_map_sg,
-diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
-index bbdb4fd..2fd322a 100644
---- a/drivers/pci/pcie/aspm.c
-+++ b/drivers/pci/pcie/aspm.c
+diff -urNp linux-3.0.3/drivers/pci/pcie/aspm.c linux-3.0.3/drivers/pci/pcie/aspm.c
+--- linux-3.0.3/drivers/pci/pcie/aspm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/pcie/aspm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -33121,28 +30469,10 @@ index bbdb4fd..2fd322a 100644
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index c84900d..67aa999 100644
---- a/drivers/pci/probe.c
-+++ b/drivers/pci/probe.c
-@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
- 	return ret;
- }
- 
--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);
- }
- 
--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)
- {
-@@ -165,7 +165,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
+diff -urNp linux-3.0.3/drivers/pci/probe.c linux-3.0.3/drivers/pci/probe.c
+--- linux-3.0.3/drivers/pci/probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/probe.c	2011-08-23 21:47:55.000000000 -0400
+@@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
  	u32 l, sz, mask;
  	u16 orig_cmd;
  
@@ -33151,11 +30481,10 @@ index c84900d..67aa999 100644
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
-index 27911b5..5b6db88 100644
---- a/drivers/pci/proc.c
-+++ b/drivers/pci/proc.c
-@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
+diff -urNp linux-3.0.3/drivers/pci/proc.c linux-3.0.3/drivers/pci/proc.c
+--- linux-3.0.3/drivers/pci/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/proc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
  	struct pci_dev *dev = NULL;
@@ -33172,11 +30501,10 @@ index 27911b5..5b6db88 100644
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff --git a/drivers/pci/xen-pcifront.c b/drivers/pci/xen-pcifront.c
-index 3a5a6fc..bd02f47 100644
---- a/drivers/pci/xen-pcifront.c
-+++ b/drivers/pci/xen-pcifront.c
-@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_bus *bus, unsigned int devfn,
+diff -urNp linux-3.0.3/drivers/pci/xen-pcifront.c linux-3.0.3/drivers/pci/xen-pcifront.c
+--- linux-3.0.3/drivers/pci/xen-pcifront.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pci/xen-pcifront.c	2011-08-23 21:48:14.000000000 -0400
+@@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
  	struct pcifront_sd *sd = bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  
@@ -33185,7 +30513,7 @@ index 3a5a6fc..bd02f47 100644
  	if (verbose_request)
  		dev_info(&pdev->xdev->dev,
  			 "read dev=%04x:%02x:%02x.%01x - offset %x size %d\n",
-@@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci_bus *bus, unsigned int devfn,
+@@ -226,6 +228,8 @@ static int pcifront_bus_write(struct pci
  	struct pcifront_sd *sd = bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  
@@ -33194,7 +30522,7 @@ index 3a5a6fc..bd02f47 100644
  	if (verbose_request)
  		dev_info(&pdev->xdev->dev,
  			 "write dev=%04x:%02x:%02x.%01x - "
-@@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
+@@ -258,6 +262,8 @@ static int pci_frontend_enable_msix(stru
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  	struct msi_desc *entry;
  
@@ -33203,7 +30531,7 @@ index 3a5a6fc..bd02f47 100644
  	if (nvec > SH_INFO_MAX_VEC) {
  		dev_err(&dev->dev, "too much vector for pci frontend: %x."
  				   " Increase SH_INFO_MAX_VEC.\n", nvec);
-@@ -303,6 +309,8 @@ static void pci_frontend_disable_msix(struct pci_dev *dev)
+@@ -309,6 +315,8 @@ static void pci_frontend_disable_msix(st
  	struct pcifront_sd *sd = dev->bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  
@@ -33212,7 +30540,7 @@ index 3a5a6fc..bd02f47 100644
  	err = do_pci_op(pdev, &op);
  
  	/* What should do for error ? */
-@@ -322,6 +330,8 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)
+@@ -328,6 +336,8 @@ static int pci_frontend_enable_msi(struc
  	struct pcifront_sd *sd = dev->bus->sysdata;
  	struct pcifront_device *pdev = pcifront_get_pdev(sd);
  
@@ -33220,23 +30548,22 @@ index 3a5a6fc..bd02f47 100644
 +
  	err = do_pci_op(pdev, &op);
  	if (likely(!err)) {
- 		*(*vector) = op.value;
-diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
-index f3aa6a7..74233d2 100644
---- a/drivers/platform/x86/asus-laptop.c
-+++ b/drivers/platform/x86/asus-laptop.c
-@@ -243,7 +243,6 @@ struct asus_laptop {
- 	struct asus_led gled;
- 	struct asus_led kled;
- 	struct workqueue_struct *led_workqueue;
--
- 	int wireless_status;
- 	bool have_rsts;
- 	int lcd_state;
-diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
-index 8591f6a..a0f2b81 100644
---- a/drivers/pnp/pnpbios/bioscalls.c
-+++ b/drivers/pnp/pnpbios/bioscalls.c
+ 		vector[0] = op.value;
+diff -urNp linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c	2011-08-23 21:47:55.000000000 -0400
+@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
+ 	return 0;
+ }
+ 
+-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 = hotkey_driver_mask &
+diff -urNp linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c	2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ do { \
  	set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -33246,7 +30573,7 @@ index 8591f6a..a0f2b81 100644
  			(unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
  
  /*
-@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func
  
  	cpu = get_cpu();
  	save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
@@ -33257,7 +30584,7 @@ index 8591f6a..a0f2b81 100644
  
  	/* On some boxes IRQ's during PnP BIOS calls are deadly.  */
  	spin_lock_irqsave(&pnp_bios_lock, flags);
-@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
+@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func
  			     :"memory");
  	spin_unlock_irqrestore(&pnp_bios_lock, flags);
  
@@ -33268,7 +30595,7 @@ index 8591f6a..a0f2b81 100644
  	put_cpu();
  
  	/* If we get here and this is set then the PnP BIOS faulted on us. */
-@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
+@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 n
  	return status;
  }
  
@@ -33277,7 +30604,7 @@ index 8591f6a..a0f2b81 100644
  {
  	int i;
  
-@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_i
  	pnp_bios_callpoint.offset = header->fields.pm16offset;
  	pnp_bios_callpoint.segment = PNP_CS16;
  
@@ -33286,18 +30613,17 @@ index 8591f6a..a0f2b81 100644
  	for_each_possible_cpu(i) {
  		struct desc_struct *gdt = get_cpu_gdt_table(i);
  		if (!gdt)
-@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
+@@ -487,4 +495,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 --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
-index a925e6b..112b90f 100644
---- a/drivers/pnp/resource.c
-+++ b/drivers/pnp/resource.c
-@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
+diff -urNp linux-3.0.3/drivers/pnp/resource.c linux-3.0.3/drivers/pnp/resource.c
+--- linux-3.0.3/drivers/pnp/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/pnp/resource.c	2011-08-23 21:47:55.000000000 -0400
+@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
  		return 1;
  
  	/* check if the resource is valid */
@@ -33306,7 +30632,7 @@ index a925e6b..112b90f 100644
  		return 0;
  
  	/* check if the resource is reserved */
-@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
+@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, s
  		return 1;
  
  	/* check if the resource is valid */
@@ -33315,10 +30641,55 @@ index a925e6b..112b90f 100644
  		return 0;
  
  	/* check if the resource is reserved */
-diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
-index d0e06ed..9b30711 100644
---- a/drivers/rtc/rtc-dev.c
-+++ b/drivers/rtc/rtc-dev.c
+diff -urNp linux-3.0.3/drivers/power/bq27x00_battery.c linux-3.0.3/drivers/power/bq27x00_battery.c
+--- linux-3.0.3/drivers/power/bq27x00_battery.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/power/bq27x00_battery.c	2011-08-23 21:47:55.000000000 -0400
+@@ -67,7 +67,7 @@
+ struct bq27x00_device_info;
+ struct bq27x00_access_methods {
+ 	int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
+-};
++} __no_const;
+ 
+ enum bq27x00_chip { BQ27000, BQ27500 };
+ 
+diff -urNp linux-3.0.3/drivers/regulator/max8660.c linux-3.0.3/drivers/regulator/max8660.c
+--- linux-3.0.3/drivers/regulator/max8660.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/regulator/max8660.c	2011-08-23 21:47:55.000000000 -0400
+@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
+ 		max8660->shadow_regs[MAX8660_OVER1] = 5;
+ 	} else {
+ 		/* Otherwise devices can be toggled via software */
+-		max8660_dcdc_ops.enable = max8660_dcdc_enable;
+-		max8660_dcdc_ops.disable = max8660_dcdc_disable;
++		pax_open_kernel();
++		*(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
++		*(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
++		pax_close_kernel();
+ 	}
+ 
+ 	/*
+diff -urNp linux-3.0.3/drivers/regulator/mc13892-regulator.c linux-3.0.3/drivers/regulator/mc13892-regulator.c
+--- linux-3.0.3/drivers/regulator/mc13892-regulator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/regulator/mc13892-regulator.c	2011-08-23 21:47:55.000000000 -0400
+@@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
+ 	}
+ 	mc13xxx_unlock(mc13892);
+ 
+-	mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
++	pax_open_kernel();
++	*(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
+ 		= mc13892_vcam_set_mode;
+-	mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
++	*(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
+ 		= mc13892_vcam_get_mode;
++	pax_close_kernel();
+ 	for (i = 0; i < pdata->num_regulators; i++) {
+ 		init_data = &pdata->regulators[i];
+ 		priv->regulators[i] = regulator_register(
+diff -urNp linux-3.0.3/drivers/rtc/rtc-dev.c linux-3.0.3/drivers/rtc/rtc-dev.c
+--- linux-3.0.3/drivers/rtc/rtc-dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/rtc/rtc-dev.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -33327,7 +30698,7 @@ index d0e06ed..9b30711 100644
  #include "rtc-core.h"
  
  static dev_t rtc_devt;
-@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
+@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *f
  		if (copy_from_user(&tm, uarg, sizeof(tm)))
  			return -EFAULT;
  
@@ -33336,37 +30707,22 @@ index d0e06ed..9b30711 100644
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
-index f8b03a6..7d629c0 100644
---- a/drivers/s390/cio/qdio_debug.c
-+++ b/drivers/s390/cio/qdio_debug.c
-@@ -225,7 +225,7 @@ static int qperf_seq_open(struct inode *inode, struct file *filp)
- 			   filp->f_path.dentry->d_inode->i_private);
- }
- 
--static struct file_operations debugfs_perf_fops = {
-+static const struct file_operations debugfs_perf_fops = {
- 	.owner	 = THIS_MODULE,
- 	.open	 = qperf_seq_open,
- 	.read	 = seq_read,
-diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
-index f66c33b..7ae5823 100644
---- a/drivers/scsi/BusLogic.c
-+++ b/drivers/scsi/BusLogic.c
-@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda
- static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
- 						    *PrototypeHostAdapter)
- {
-+	pax_track_stack();
-+
- 	/*
- 	   If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
- 	   Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
-index 645ddd9..bdd3ba2 100644
---- a/drivers/scsi/aacraid/commctrl.c
-+++ b/drivers/scsi/aacraid/commctrl.c
-@@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
+diff -urNp linux-3.0.3/drivers/scsi/aacraid/aacraid.h linux-3.0.3/drivers/scsi/aacraid/aacraid.h
+--- linux-3.0.3/drivers/scsi/aacraid/aacraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/aacraid/aacraid.h	2011-08-23 21:47:55.000000000 -0400
+@@ -492,7 +492,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;
+ 
+ /*
+  *	Define which interrupt handler needs to be installed
+diff -urNp linux-3.0.3/drivers/scsi/aacraid/commctrl.c linux-3.0.3/drivers/scsi/aacraid/commctrl.c
+--- linux-3.0.3/drivers/scsi/aacraid/commctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/aacraid/commctrl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
  	u32 actual_fibsize64, actual_fibsize = 0;
  	int i;
  
@@ -33374,24 +30730,22 @@ index 645ddd9..bdd3ba2 100644
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
-index 3b7e83d..d5ff142 100644
---- a/drivers/scsi/aic94xx/aic94xx_init.c
-+++ b/drivers/scsi/aic94xx/aic94xx_init.c
-@@ -486,7 +486,7 @@ static ssize_t asd_show_update_bios(struct device *dev,
- 			flash_error_table[i].reason);
- }
- 
--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);
- 
- static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
-index 43fa986b..ffbfe41 100644
---- a/drivers/scsi/bfa/bfa_fcs_lport.c
-+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
-@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struct bfa_fcs_lport_fdmi_s *fdmi, u8 *pyld)
+diff -urNp linux-3.0.3/drivers/scsi/bfa/bfad.c linux-3.0.3/drivers/scsi/bfa/bfad.c
+--- linux-3.0.3/drivers/scsi/bfa/bfad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/bfa/bfad.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
+ 	struct bfad_vport_s *vport, *vport_new;
+ 	struct bfa_fcs_driver_info_s driver_info;
+ 
++	pax_track_stack();
++
+ 	/* Fill the driver_info info to fcs*/
+ 	memset(&driver_info, 0, sizeof(driver_info));
+ 	strncpy(driver_info.version, BFAD_DRIVER_VERSION,
+diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
  	u16        len, count;
  	u16	templen;
  
@@ -33400,7 +30754,7 @@ index 43fa986b..ffbfe41 100644
  	/*
  	 * get hba attributes
  	 */
-@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(struct bfa_fcs_lport_fdmi_s *fdmi,
+@@ -1836,6 +1838,8 @@ bfa_fcs_lport_fdmi_build_portattr_block(
  	u8	count = 0;
  	u16	templen;
  
@@ -33409,11 +30763,10 @@ index 43fa986b..ffbfe41 100644
  	/*
  	 * get port attributes
  	 */
-diff --git a/drivers/scsi/bfa/bfa_fcs_rport.c b/drivers/scsi/bfa/bfa_fcs_rport.c
-index caaee6f..efce56b 100644
---- a/drivers/scsi/bfa/bfa_fcs_rport.c
-+++ b/drivers/scsi/bfa/bfa_fcs_rport.c
-@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fcs_rport_s *rport,
+diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
  	struct fc_rpsc_speed_info_s speeds;
  	struct bfa_port_attr_s pport_attr;
  
@@ -33422,24 +30775,55 @@ index caaee6f..efce56b 100644
  	bfa_trc(port->fcs, rx_fchs->s_id);
  	bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c
-index 44524cf..c1f943b 100644
---- a/drivers/scsi/bfa/bfad.c
-+++ b/drivers/scsi/bfa/bfad.c
-@@ -1027,6 +1027,8 @@ bfad_start_ops(struct bfad_s *bfad) {
- 	struct bfad_vport_s *vport, *vport_new;
- 	struct bfa_fcs_driver_info_s driver_info;
+diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa.h linux-3.0.3/drivers/scsi/bfa/bfa.h
+--- linux-3.0.3/drivers/scsi/bfa/bfa.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/bfa/bfa.h	2011-08-23 21:47:55.000000000 -0400
+@@ -238,7 +238,7 @@ struct bfa_hwif_s {
+ 				u32 *nvecs, u32 *maxvec);
+ 	void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
+ 				       u32 *end);
+-};
++} __no_const;
+ typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
+ 
+ struct bfa_iocfc_s {
+diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h	2011-08-23 21:47:55.000000000 -0400
+@@ -196,7 +196,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;
  
+ /*
+  * Heartbeat failure notification queue element.
+@@ -268,7 +268,7 @@ struct bfa_ioc_hwif_s {
+ 	void		(*ioc_sync_leave)	(struct bfa_ioc_s *ioc);
+ 	void		(*ioc_sync_ack)		(struct bfa_ioc_s *ioc);
+ 	bfa_boolean_t	(*ioc_sync_complete)	(struct bfa_ioc_s *ioc);
+-};
++} __no_const;
+ 
+ #define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
+ #define bfa_ioc_devid(__ioc)		((__ioc)->pcidev.device_id)
+diff -urNp linux-3.0.3/drivers/scsi/BusLogic.c linux-3.0.3/drivers/scsi/BusLogic.c
+--- linux-3.0.3/drivers/scsi/BusLogic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/BusLogic.c	2011-08-23 21:48:14.000000000 -0400
+@@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
+ static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
+ 						    *PrototypeHostAdapter)
+ {
 +	pax_track_stack();
 +
- 	/* Fill the driver_info info to fcs*/
- 	memset(&driver_info, 0, sizeof(driver_info));
- 	strncpy(driver_info.version, BFAD_DRIVER_VERSION,
-diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
-index cffcb10..82e5eb1 100644
---- a/drivers/scsi/dpt_i2o.c
-+++ b/drivers/scsi/dpt_i2o.c
-@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg)
+ 	/*
+ 	   If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
+ 	   Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
+diff -urNp linux-3.0.3/drivers/scsi/dpt_i2o.c linux-3.0.3/drivers/scsi/dpt_i2o.c
+--- linux-3.0.3/drivers/scsi/dpt_i2o.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/dpt_i2o.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
  	dma_addr_t addr;
  	ulong flags = 0;
  
@@ -33448,7 +30832,7 @@ index cffcb10..82e5eb1 100644
  	memset(&msg, 0, MAX_MESSAGE_SIZE*4);
  	// get user msg size in u32s 
  	if(get_user(size, &user_msg[0])){
-@@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
+@@ -2317,6 +2319,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pH
  	s32 rcode;
  	dma_addr_t addr;
  
@@ -33457,11 +30841,10 @@ index cffcb10..82e5eb1 100644
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
-index 53925ac..0ce6fa1 100644
---- a/drivers/scsi/eata.c
-+++ b/drivers/scsi/eata.c
-@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long port_base, unsigned int j,
+diff -urNp linux-3.0.3/drivers/scsi/eata.c linux-3.0.3/drivers/scsi/eata.c
+--- linux-3.0.3/drivers/scsi/eata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/eata.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
  	struct hostdata *ha;
  	char name[16];
  
@@ -33470,11 +30853,10 @@ index 53925ac..0ce6fa1 100644
  	sprintf(name, "%s%d", driver_name, j);
  
  	if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
-index 625c6be..8db7e56 100644
---- a/drivers/scsi/fcoe/libfcoe.c
-+++ b/drivers/scsi/fcoe/libfcoe.c
-@@ -2484,6 +2484,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe_ctlr *fip, struct sk_buff *skb)
+diff -urNp linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
  	} buf;
  	int rc;
  
@@ -33483,10 +30865,9 @@ index 625c6be..8db7e56 100644
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  
-diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
-index 3242bca..45a83e7 100644
---- a/drivers/scsi/gdth.c
-+++ b/drivers/scsi/gdth.c
+diff -urNp linux-3.0.3/drivers/scsi/gdth.c linux-3.0.3/drivers/scsi/gdth.c
+--- linux-3.0.3/drivers/scsi/gdth.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/gdth.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -33496,7 +30877,7 @@ index 3242bca..45a83e7 100644
      if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
          return -EFAULT;
      ha = gdth_find_ha(ldrv.ionode);
-@@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)
+@@ -4139,6 +4141,8 @@ static int ioc_resetdrv(void __user *arg
      gdth_ha_str *ha;
      int rval;
  
@@ -33505,7 +30886,7 @@ index 3242bca..45a83e7 100644
      if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
          res.number >= MAX_HDRIVES)
          return -EFAULT;
-@@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg, char *cmnd)
+@@ -4174,6 +4178,8 @@ static int ioc_general(void __user *arg,
      gdth_ha_str *ha;
      int rval;
  
@@ -33524,11 +30905,10 @@ index 3242bca..45a83e7 100644
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
-index 6527543..81e4fe2 100644
---- a/drivers/scsi/gdth_proc.c
-+++ b/drivers/scsi/gdth_proc.c
-@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer,
+diff -urNp linux-3.0.3/drivers/scsi/gdth_proc.c linux-3.0.3/drivers/scsi/gdth_proc.c
+--- linux-3.0.3/drivers/scsi/gdth_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/gdth_proc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
      char            cmnd[MAX_COMMAND_SIZE];
@@ -33538,7 +30918,7 @@ index 6527543..81e4fe2 100644
      memset(cmnd, 0xff, 12);
      memset(&gdtcmd, 0, sizeof(gdth_cmd_str));
  
-@@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
+@@ -175,6 +178,8 @@ static int gdth_get_info(char *buffer,ch
      gdth_hget_str *phg;
      char cmnd[MAX_COMMAND_SIZE];
  
@@ -33547,10 +30927,9 @@ index 6527543..81e4fe2 100644
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
-index 4f7a582..b87341f 100644
---- a/drivers/scsi/hosts.c
-+++ b/drivers/scsi/hosts.c
+diff -urNp linux-3.0.3/drivers/scsi/hosts.c linux-3.0.3/drivers/scsi/hosts.c
+--- linux-3.0.3/drivers/scsi/hosts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/hosts.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -33560,7 +30939,7 @@ index 4f7a582..b87341f 100644
  
  
  static void scsi_host_cls_release(struct device *dev)
-@@ -354,7 +354,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
+@@ -354,7 +354,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
  	 */
@@ -33569,36 +30948,150 @@ index 4f7a582..b87341f 100644
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 12deffc..db49eec 100644
---- a/drivers/scsi/hpsa.c
-+++ b/drivers/scsi/hpsa.c
-@@ -2281,6 +2281,8 @@ static int hpsa_ioctl32_passthru(struct scsi_device *dev, int cmd, void *arg)
- 	int err;
- 	u32 cp;
+diff -urNp linux-3.0.3/drivers/scsi/hpsa.c linux-3.0.3/drivers/scsi/hpsa.c
+--- linux-3.0.3/drivers/scsi/hpsa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/hpsa.c	2011-08-23 21:47:55.000000000 -0400
+@@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
+ 	u32 a;
+ 
+ 	if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
+-		return h->access.command_completed(h);
++		return h->access->command_completed(h);
+ 
+ 	if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
+ 		a = *(h->reply_pool_head); /* Next cmd in ring buffer */
+@@ -2938,7 +2938,7 @@ static void start_io(struct ctlr_info *h
+ 	while (!list_empty(&h->reqQ)) {
+ 		c = list_entry(h->reqQ.next, struct CommandList, list);
+ 		/* can't do anything if fifo is full */
+-		if ((h->access.fifo_full(h))) {
++		if ((h->access->fifo_full(h))) {
+ 			dev_warn(&h->pdev->dev, "fifo full\n");
+ 			break;
+ 		}
+@@ -2948,7 +2948,7 @@ static void start_io(struct ctlr_info *h
+ 		h->Qdepth--;
  
-+	memset(&arg64, 0, sizeof(arg64));
-+
- 	err = 0;
- 	err |= copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
- 			   sizeof(arg64.LUN_info));
-diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
-index 9c5c8be..04d95bf 100644
---- a/drivers/scsi/ipr.c
-+++ b/drivers/scsi/ipr.c
-@@ -6207,7 +6207,7 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
- 	return true;
- }
- 
--static struct ata_port_operations ipr_sata_ops = {
-+static const struct ata_port_operations ipr_sata_ops = {
- 	.phy_reset = ipr_ata_phy_reset,
- 	.hardreset = ipr_sata_reset,
- 	.post_internal_cmd = ipr_ata_post_internal,
-diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
-index d21367d..09e8d4f 100644
---- a/drivers/scsi/libfc/fc_exch.c
-+++ b/drivers/scsi/libfc/fc_exch.c
+ 		/* Tell the controller execute command */
+-		h->access.submit_command(h, c);
++		h->access->submit_command(h, c);
+ 
+ 		/* Put job onto the completed Q */
+ 		addQ(&h->cmpQ, c);
+@@ -2957,17 +2957,17 @@ static void start_io(struct ctlr_info *h
+ 
+ static inline unsigned long get_next_completion(struct ctlr_info *h)
+ {
+-	return h->access.command_completed(h);
++	return h->access->command_completed(h);
+ }
+ 
+ static inline bool interrupt_pending(struct ctlr_info *h)
+ {
+-	return h->access.intr_pending(h);
++	return h->access->intr_pending(h);
+ }
+ 
+ static inline long interrupt_not_for_us(struct ctlr_info *h)
+ {
+-	return (h->access.intr_pending(h) == 0) ||
++	return (h->access->intr_pending(h) == 0) ||
+ 		(h->interrupts_enabled == 0);
+ }
+ 
+@@ -3857,7 +3857,7 @@ static int __devinit hpsa_pci_init(struc
+ 	if (prod_index < 0)
+ 		return -ENODEV;
+ 	h->product_name = products[prod_index].product_name;
+-	h->access = *(products[prod_index].access);
++	h->access = products[prod_index].access;
+ 
+ 	if (hpsa_board_disabled(h->pdev)) {
+ 		dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
+@@ -4134,7 +4134,7 @@ reinit_after_soft_reset:
+ 	}
+ 
+ 	/* make sure the board interrupts are off */
+-	h->access.set_intr_mask(h, HPSA_INTR_OFF);
++	h->access->set_intr_mask(h, HPSA_INTR_OFF);
+ 
+ 	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
+ 		goto clean2;
+@@ -4168,7 +4168,7 @@ reinit_after_soft_reset:
+ 		 * fake ones to scoop up any residual completions.
+ 		 */
+ 		spin_lock_irqsave(&h->lock, flags);
+-		h->access.set_intr_mask(h, HPSA_INTR_OFF);
++		h->access->set_intr_mask(h, HPSA_INTR_OFF);
+ 		spin_unlock_irqrestore(&h->lock, flags);
+ 		free_irq(h->intr[h->intr_mode], h);
+ 		rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
+@@ -4187,9 +4187,9 @@ reinit_after_soft_reset:
+ 		dev_info(&h->pdev->dev, "Board READY.\n");
+ 		dev_info(&h->pdev->dev,
+ 			"Waiting for stale completions to drain.\n");
+-		h->access.set_intr_mask(h, HPSA_INTR_ON);
++		h->access->set_intr_mask(h, HPSA_INTR_ON);
+ 		msleep(10000);
+-		h->access.set_intr_mask(h, HPSA_INTR_OFF);
++		h->access->set_intr_mask(h, HPSA_INTR_OFF);
+ 
+ 		rc = controller_reset_failed(h->cfgtable);
+ 		if (rc)
+@@ -4210,7 +4210,7 @@ reinit_after_soft_reset:
+ 	}
+ 
+ 	/* Turn the interrupts on so we can service requests */
+-	h->access.set_intr_mask(h, HPSA_INTR_ON);
++	h->access->set_intr_mask(h, HPSA_INTR_ON);
+ 
+ 	hpsa_hba_inquiry(h);
+ 	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
+@@ -4263,7 +4263,7 @@ static void hpsa_shutdown(struct pci_dev
+ 	 * To write all data in the battery backed cache to disks
+ 	 */
+ 	hpsa_flush_cache(h);
+-	h->access.set_intr_mask(h, HPSA_INTR_OFF);
++	h->access->set_intr_mask(h, HPSA_INTR_OFF);
+ 	free_irq(h->intr[h->intr_mode], h);
+ #ifdef CONFIG_PCI_MSI
+ 	if (h->msix_vector)
+@@ -4426,7 +4426,7 @@ static __devinit void hpsa_enter_perform
+ 		return;
+ 	}
+ 	/* Change the access methods to the performant access methods */
+-	h->access = SA5_performant_access;
++	h->access = &SA5_performant_access;
+ 	h->transMethod = CFGTBL_Trans_Performant;
+ }
+ 
+diff -urNp linux-3.0.3/drivers/scsi/hpsa.h linux-3.0.3/drivers/scsi/hpsa.h
+--- linux-3.0.3/drivers/scsi/hpsa.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/scsi/hpsa.h	2011-08-23 21:47:55.000000000 -0400
+@@ -73,7 +73,7 @@ struct ctlr_info {
+ 	unsigned int msix_vector;
+ 	unsigned int msi_vector;
+ 	int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
+-	struct access_method access;
++	struct access_method *access;
+ 
+ 	/* queue and queue Info */
+ 	struct list_head reqQ;
+diff -urNp linux-3.0.3/drivers/scsi/ips.h linux-3.0.3/drivers/scsi/ips.h
+--- linux-3.0.3/drivers/scsi/ips.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/ips.h	2011-08-23 21:47:55.000000000 -0400
+@@ -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;
+ 
+ typedef struct ips_ha {
+    uint8_t            ha_id[IPS_MAX_CHANNELS+1];
+diff -urNp linux-3.0.3/drivers/scsi/libfc/fc_exch.c linux-3.0.3/drivers/scsi/libfc/fc_exch.c
+--- linux-3.0.3/drivers/scsi/libfc/fc_exch.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:47:55.000000000 -0400
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
  	 * all together if not used XXX
  	 */
@@ -33618,7 +31111,7 @@ index d21367d..09e8d4f 100644
  	} stats;
  };
  
-@@ -687,7 +687,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
+@@ -700,7 +700,7 @@ static struct fc_exch *fc_exch_em_alloc(
  	/* allocate memory for exchange */
  	ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
  	if (!ep) {
@@ -33627,7 +31120,7 @@ index d21367d..09e8d4f 100644
  		goto out;
  	}
  	memset(ep, 0, sizeof(*ep));
-@@ -748,7 +748,7 @@ out:
+@@ -761,7 +761,7 @@ out:
  	return ep;
  err:
  	spin_unlock_bh(&pool->lock);
@@ -33636,7 +31129,7 @@ index d21367d..09e8d4f 100644
  	mempool_free(ep, mp->ep_pool);
  	return NULL;
  }
-@@ -893,7 +893,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -906,7 +906,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  		xid = ntohs(fh->fh_ox_id);	/* we originated exch */
  		ep = fc_exch_find(mp, xid);
  		if (!ep) {
@@ -33645,7 +31138,7 @@ index d21367d..09e8d4f 100644
  			reject = FC_RJT_OX_ID;
  			goto out;
  		}
-@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -936,7 +936,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  		ep = fc_exch_find(mp, xid);
  		if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
  			if (ep) {
@@ -33654,7 +31147,7 @@ index d21367d..09e8d4f 100644
  				reject = FC_RJT_RX_ID;
  				goto rel;
  			}
-@@ -934,7 +934,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -947,7 +947,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  			}
  			xid = ep->xid;	/* get our XID */
  		} else if (!ep) {
@@ -33663,7 +31156,7 @@ index d21367d..09e8d4f 100644
  			reject = FC_RJT_RX_ID;	/* XID not found */
  			goto out;
  		}
-@@ -951,7 +951,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
+@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_look
  	} else {
  		sp = &ep->seq;
  		if (sp->id != fh->fh_seq_id) {
@@ -33672,7 +31165,7 @@ index d21367d..09e8d4f 100644
  			reject = FC_RJT_SEQ_ID;	/* sequence/exch should exist */
  			goto rel;
  		}
-@@ -1368,22 +1368,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1392,22 +1392,22 @@ static void fc_exch_recv_seq_resp(struct
  
  	ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
  	if (!ep) {
@@ -33699,7 +31192,7 @@ index d21367d..09e8d4f 100644
  		goto rel;
  	}
  	sof = fr_sof(fp);
-@@ -1392,7 +1392,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1416,7 +1416,7 @@ static void fc_exch_recv_seq_resp(struct
  		sp->ssb_stat |= SSB_ST_RESP;
  		sp->id = fh->fh_seq_id;
  	} else if (sp->id != fh->fh_seq_id) {
@@ -33708,7 +31201,7 @@ index d21367d..09e8d4f 100644
  		goto rel;
  	}
  
-@@ -1455,9 +1455,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
+@@ -1480,9 +1480,9 @@ static void fc_exch_recv_resp(struct fc_
  	sp = fc_seq_lookup_orig(mp, fp);	/* doesn't hold sequence */
  
  	if (!sp)
@@ -33720,66 +31213,31 @@ index d21367d..09e8d4f 100644
  
  	fc_frame_free(fp);
  }
-diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
-index e1a395b..af49bcd 100644
---- a/drivers/scsi/libsas/sas_ata.c
-+++ b/drivers/scsi/libsas/sas_ata.c
-@@ -348,7 +348,7 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
- 	}
- }
- 
--static struct ata_port_operations sas_sata_ops = {
-+static const struct ata_port_operations sas_sata_ops = {
- 	.phy_reset		= sas_ata_phy_reset,
+diff -urNp linux-3.0.3/drivers/scsi/libsas/sas_ata.c linux-3.0.3/drivers/scsi/libsas/sas_ata.c
+--- linux-3.0.3/drivers/scsi/libsas/sas_ata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/libsas/sas_ata.c	2011-08-23 21:47:55.000000000 -0400
+@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
+ 	.postreset		= ata_std_postreset,
+ 	.error_handler		= ata_std_error_handler,
  	.post_internal_cmd	= sas_ata_post_internal,
- 	.qc_defer               = ata_std_qc_defer,
-diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
-index 746dd3d..26ec905 100644
---- a/drivers/scsi/lpfc/lpfc.h
-+++ b/drivers/scsi/lpfc/lpfc.h
-@@ -414,7 +414,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;
-@@ -776,8 +776,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;
-@@ -791,7 +791,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
+-	.qc_defer               = ata_std_qc_defer,
++	.qc_defer		= ata_std_qc_defer,
+ 	.qc_prep		= ata_noop_qc_prep,
+ 	.qc_issue		= sas_ata_qc_issue,
+ 	.qc_fill_rtf		= sas_ata_qc_fill_rtf,
+diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
- 	/* Used for deferred freeing of ELS data buffers */
-diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
-index a80d938..1812f41 100644
---- a/drivers/scsi/lpfc/lpfc_debugfs.c
-+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
-@@ -125,7 +125,7 @@ struct lpfc_debug {
- 	int  len;
- };
+ #include <linux/debugfs.h>
  
 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
  static unsigned long lpfc_debugfs_start_time = 0L;
  
- /**
-@@ -159,7 +159,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
+ /* iDiag */
+@@ -141,7 +141,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_v
  	lpfc_debugfs_enable = 0;
  
  	len = 0;
@@ -33788,7 +31246,7 @@ index a80d938..1812f41 100644
  		(lpfc_debugfs_max_disc_trc - 1);
  	for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
  		dtp = vport->disc_trc + i;
-@@ -220,7 +220,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
+@@ -202,7 +202,7 @@ lpfc_debugfs_slow_ring_trc_data(struct l
  	lpfc_debugfs_enable = 0;
  
  	len = 0;
@@ -33797,7 +31255,7 @@ index a80d938..1812f41 100644
  		(lpfc_debugfs_max_slow_ring_trc - 1);
  	for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
  		dtp = phba->slow_ring_trc + i;
-@@ -398,6 +398,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
+@@ -380,6 +380,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpf
  	uint32_t *ptr;
  	char buffer[1024];
  
@@ -33806,7 +31264,7 @@ index a80d938..1812f41 100644
  	off = 0;
  	spin_lock_irq(&phba->hbalock);
  
-@@ -635,14 +637,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
+@@ -617,14 +619,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport 
  		!vport || !vport->disc_trc)
  		return;
  
@@ -33823,7 +31281,7 @@ index a80d938..1812f41 100644
  	dtp->jif = jiffies;
  #endif
  	return;
-@@ -673,14 +675,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
+@@ -655,14 +657,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_h
  		!phba || !phba->slow_ring_trc)
  		return;
  
@@ -33840,7 +31298,7 @@ index a80d938..1812f41 100644
  	dtp->jif = jiffies;
  #endif
  	return;
-@@ -1365,7 +1367,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -2606,7 +2608,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
  						 "slow_ring buffer\n");
  				goto debug_failed;
  			}
@@ -33849,7 +31307,7 @@ index a80d938..1812f41 100644
  			memset(phba->slow_ring_trc, 0,
  				(sizeof(struct lpfc_debugfs_trc) *
  				lpfc_debugfs_max_slow_ring_trc));
-@@ -1411,7 +1413,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
+@@ -2652,7 +2654,7 @@ lpfc_debugfs_initialize(struct lpfc_vpor
  				 "buffer\n");
  		goto debug_failed;
  	}
@@ -33858,11 +31316,58 @@ index a80d938..1812f41 100644
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
-index c97751c..8bc92d7 100644
---- a/drivers/scsi/lpfc/lpfc_scsi.c
-+++ b/drivers/scsi/lpfc/lpfc_scsi.c
-@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
+diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc.h linux-3.0.3/drivers/scsi/lpfc/lpfc.h
+--- linux-3.0.3/drivers/scsi/lpfc/lpfc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/lpfc/lpfc.h	2011-08-23 21:47:55.000000000 -0400
+@@ -420,7 +420,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;
+@@ -826,8 +826,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;
+@@ -841,7 +841,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;
+ 	/* iDiag debugfs sub-directory */
+ 	struct dentry *idiag_root;
+ 	struct dentry *idiag_pci_cfg;
+diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c	2011-08-23 21:47:56.000000000 -0400
+@@ -9923,8 +9923,10 @@ lpfc_init(void)
+ 	printk(LPFC_COPYRIGHT "\n");
+ 
+ 	if (lpfc_enable_npiv) {
+-		lpfc_transport_functions.vport_create = lpfc_vport_create;
+-		lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_open_kernel();
++		*(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
++		*(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
++		pax_close_kernel();
+ 	}
+ 	lpfc_transport_template =
+ 				fc_attach_transport(&lpfc_transport_functions);
+diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c	2011-08-23 21:47:56.000000000 -0400
+@@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
  	spin_lock_irqsave(&phba->hbalock, flags);
@@ -33871,7 +31376,7 @@ index c97751c..8bc92d7 100644
  	phba->last_rsrc_error_time = jiffies;
  
  	if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
-@@ -338,7 +338,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport  *vport,
+@@ -338,7 +338,7 @@ lpfc_rampup_queue_depth(struct lpfc_vpor
  	unsigned long flags;
  	struct lpfc_hba *phba = vport->phba;
  	uint32_t evt_posted;
@@ -33880,7 +31385,7 @@ index c97751c..8bc92d7 100644
  
  	if (vport->cfg_lun_queue_depth <= queue_depth)
  		return;
-@@ -382,8 +382,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -382,8 +382,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
  	unsigned long num_rsrc_err, num_cmd_success;
  	int i;
  
@@ -33891,7 +31396,7 @@ index c97751c..8bc92d7 100644
  
  	vports = lpfc_create_vport_work_array(phba);
  	if (vports != NULL)
-@@ -403,8 +403,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
+@@ -403,8 +403,8 @@ lpfc_ramp_down_queue_handler(struct lpfc
  			}
  		}
  	lpfc_destroy_vport_work_array(phba, vports);
@@ -33902,7 +31407,7 @@ index c97751c..8bc92d7 100644
  }
  
  /**
-@@ -438,8 +438,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
+@@ -438,8 +438,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_h
  			}
  		}
  	lpfc_destroy_vport_work_array(phba, vports);
@@ -33913,11 +31418,10 @@ index c97751c..8bc92d7 100644
  }
  
  /**
-diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
-index 5708cb2..40488d3 100644
---- a/drivers/scsi/megaraid/megaraid_mbox.c
-+++ b/drivers/scsi/megaraid/megaraid_mbox.c
-@@ -3510,6 +3510,8 @@ megaraid_cmm_register(adapter_t *adapter)
+diff -urNp linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c	2011-08-23 21:48:14.000000000 -0400
+@@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
  	int		rval;
  	int		i;
  
@@ -33926,11 +31430,10 @@ index 5708cb2..40488d3 100644
  	// Allocate memory for the base list of scb for management module.
  	adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
-index b37c8a3..1068773 100644
---- a/drivers/scsi/osd/osd_initiator.c
-+++ b/drivers/scsi/osd/osd_initiator.c
-@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(struct osd_dev *od,
+diff -urNp linux-3.0.3/drivers/scsi/osd/osd_initiator.c linux-3.0.3/drivers/scsi/osd/osd_initiator.c
+--- linux-3.0.3/drivers/scsi/osd/osd_initiator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/osd/osd_initiator.c	2011-08-23 21:48:14.000000000 -0400
+@@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
  	int nelem = ARRAY_SIZE(get_attrs), a = 0;
  	int ret;
  
@@ -33939,11 +31442,10 @@ index b37c8a3..1068773 100644
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
-index ce0701d..9b7fefe 100644
---- a/drivers/scsi/pmcraid.c
-+++ b/drivers/scsi/pmcraid.c
-@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
+diff -urNp linux-3.0.3/drivers/scsi/pmcraid.c linux-3.0.3/drivers/scsi/pmcraid.c
+--- linux-3.0.3/drivers/scsi/pmcraid.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/scsi/pmcraid.c	2011-08-23 21:47:56.000000000 -0400
+@@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
  		res->scsi_dev = scsi_dev;
  		scsi_dev->hostdata = res;
  		res->change_detected = 0;
@@ -33954,7 +31456,7 @@ index ce0701d..9b7fefe 100644
  		rc = 0;
  	}
  	spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
-@@ -2677,9 +2677,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
+@@ -2677,9 +2677,9 @@ static int pmcraid_error_handler(struct 
  
  	/* If this was a SCSI read/write command keep count of errors */
  	if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
@@ -33984,7 +31486,7 @@ index ce0701d..9b7fefe 100644
  			  pinstance->num_hrrq;
  
  	if (request_size) {
-@@ -4495,7 +4495,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
+@@ -4498,7 +4498,7 @@ static void pmcraid_worker_function(stru
  
  	pinstance = container_of(workp, struct pmcraid_instance, worker_q);
  	/* add resources only after host is added into system */
@@ -33993,7 +31495,7 @@ index ce0701d..9b7fefe 100644
  		return;
  
  	fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
-@@ -5329,8 +5329,8 @@ static int __devinit pmcraid_init_instance(
+@@ -5332,8 +5332,8 @@ static int __devinit pmcraid_init_instan
  	init_waitqueue_head(&pinstance->reset_wait_q);
  
  	atomic_set(&pinstance->outstanding_cmds, 0);
@@ -34004,7 +31506,7 @@ index ce0701d..9b7fefe 100644
  
  	INIT_LIST_HEAD(&pinstance->free_res_q);
  	INIT_LIST_HEAD(&pinstance->used_res_q);
-@@ -6045,7 +6045,7 @@ static int __devinit pmcraid_probe(
+@@ -6048,7 +6048,7 @@ static int __devinit pmcraid_probe(
  	/* Schedule worker thread to handle CCN and take care of adding and
  	 * removing devices to OS
  	 */
@@ -34013,11 +31515,10 @@ index ce0701d..9b7fefe 100644
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
-index 4db210d..9c7857c 100644
---- a/drivers/scsi/pmcraid.h
-+++ b/drivers/scsi/pmcraid.h
-@@ -750,7 +750,7 @@ struct pmcraid_instance {
+diff -urNp linux-3.0.3/drivers/scsi/pmcraid.h linux-3.0.3/drivers/scsi/pmcraid.h
+--- linux-3.0.3/drivers/scsi/pmcraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/pmcraid.h	2011-08-23 21:47:56.000000000 -0400
+@@ -749,7 +749,7 @@ struct pmcraid_instance {
  	struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
  	/* Message id as filled in last fired IOARCB, used to identify HRRQ */
@@ -34026,7 +31527,7 @@ index 4db210d..9c7857c 100644
  
  	/* configuration table */
  	struct pmcraid_config_table *cfg_table;
-@@ -779,7 +779,7 @@ struct pmcraid_instance {
+@@ -778,7 +778,7 @@ struct pmcraid_instance {
  	atomic_t outstanding_cmds;
  
  	/* should add/delete resources to mid-layer now ?*/
@@ -34035,7 +31536,7 @@ index 4db210d..9c7857c 100644
  
  
  
-@@ -815,8 +815,8 @@ struct pmcraid_resource_entry {
+@@ -814,8 +814,8 @@ struct pmcraid_resource_entry {
  		struct pmcraid_config_table_entry_ext cfg_entry_ext;
  	};
  	struct scsi_device *scsi_dev;	/* Link scsi_device structure */
@@ -34046,23 +31547,21 @@ index 4db210d..9c7857c 100644
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index 8f823bd..197f449 100644
---- a/drivers/scsi/qla2xxx/qla_os.c
-+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -4102,7 +4102,7 @@ static struct pci_driver qla2xxx_pci_driver = {
- 	.err_handler	= &qla2xxx_err_handler,
- };
- 
--static struct file_operations apidev_fops = {
-+static const struct file_operations apidev_fops = {
- 	.owner = THIS_MODULE,
- 	.llseek = noop_llseek,
- };
-diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
-index 2fc0045..8b41140 100644
---- a/drivers/scsi/qla4xxx/ql4_def.h
-+++ b/drivers/scsi/qla4xxx/ql4_def.h
+diff -urNp linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h	2011-08-23 21:47:56.000000000 -0400
+@@ -2244,7 +2244,7 @@ struct isp_operations {
+ 	int (*get_flash_version) (struct scsi_qla_host *, void *);
+ 	int (*start_scsi) (srb_t *);
+ 	int (*abort_isp) (struct scsi_qla_host *);
+-};
++} __no_const;
+ 
+ /* MSI-X Support *************************************************************/
+ 
+diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h	2011-08-23 21:47:56.000000000 -0400
 @@ -256,7 +256,7 @@ struct ddb_entry {
  	atomic_t retry_relogin_timer; /* Min Time between relogins
  				       * (4000 only) */
@@ -34072,11 +31571,10 @@ index 2fc0045..8b41140 100644
  				       * retried */
  
  	uint16_t port;
-diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
-index 1629c48..fa891b2 100644
---- a/drivers/scsi/qla4xxx/ql4_init.c
-+++ b/drivers/scsi/qla4xxx/ql4_init.c
-@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
+diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c	2011-08-23 21:47:56.000000000 -0400
+@@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
  	ddb_entry->fw_ddb_index = fw_ddb_index;
  	atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
  	atomic_set(&ddb_entry->relogin_timer, 0);
@@ -34085,20 +31583,19 @@ index 1629c48..fa891b2 100644
  	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] = ddb_entry;
-@@ -1570,7 +1570,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
- 	/* Device is back online. */
- 	if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) {
+@@ -1433,7 +1433,7 @@ int qla4xxx_process_ddb_changed(struct s
+ 	if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) &&
+ 	   (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) {
  		atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
 -		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 --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 3fc1d25..febec1a 100644
---- a/drivers/scsi/qla4xxx/ql4_os.c
-+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -801,13 +801,13 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
+ 		iscsi_unblock_session(ddb_entry->sess);
+diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c	2011-08-23 21:47:56.000000000 -0400
+@@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
  			    ddb_entry->fw_ddb_device_state ==
  			    DDB_DS_SESSION_FAILED) {
  				/* Reset retry relogin timer */
@@ -34114,11 +31611,10 @@ index 3fc1d25..febec1a 100644
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 2aeb2e9..46e3925 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+diff -urNp linux-3.0.3/drivers/scsi/scsi.c linux-3.0.3/drivers/scsi/scsi.c
+--- linux-3.0.3/drivers/scsi/scsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi.c	2011-08-23 21:47:56.000000000 -0400
+@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
  	unsigned long timeout;
  	int rtn = 0;
  
@@ -34127,11 +31623,10 @@ index 2aeb2e9..46e3925 100644
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
-index a6b2d72..e0aded7 100644
---- a/drivers/scsi/scsi_debug.c
-+++ b/drivers/scsi/scsi_debug.c
-@@ -1476,6 +1476,8 @@ static int resp_mode_select(struct scsi_cmnd * scp, int mselect6,
+diff -urNp linux-3.0.3/drivers/scsi/scsi_debug.c linux-3.0.3/drivers/scsi/scsi_debug.c
+--- linux-3.0.3/drivers/scsi/scsi_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_debug.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
  	unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
  	unsigned char *cmd = (unsigned char *)scp->cmnd;
  
@@ -34140,7 +31635,7 @@ index a6b2d72..e0aded7 100644
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-@@ -1573,6 +1575,8 @@ static int resp_log_sense(struct scsi_cmnd * scp,
+@@ -1590,6 +1592,8 @@ static int resp_log_sense(struct scsi_cm
  	unsigned char arr[SDEBUG_MAX_LSENSE_SZ];
  	unsigned char *cmd = (unsigned char *)scp->cmnd;
  
@@ -34149,11 +31644,10 @@ index a6b2d72..e0aded7 100644
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
-index 415fdf2..262e2e9 100644
---- a/drivers/scsi/scsi_lib.c
-+++ b/drivers/scsi/scsi_lib.c
-@@ -1381,7 +1381,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+diff -urNp linux-3.0.3/drivers/scsi/scsi_lib.c linux-3.0.3/drivers/scsi/scsi_lib.c
+--- linux-3.0.3/drivers/scsi/scsi_lib.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_lib.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
  	shost = sdev->host;
  	scsi_init_cmd_errh(cmd);
  	cmd->result = DID_NO_CONNECT << 16;
@@ -34162,7 +31656,7 @@ index 415fdf2..262e2e9 100644
  
  	/*
  	 * SCSI request completion path will do scsi_device_unbusy(),
-@@ -1407,9 +1407,9 @@ static void scsi_softirq_done(struct request *rq)
+@@ -1438,9 +1438,9 @@ static void scsi_softirq_done(struct req
  
  	INIT_LIST_HEAD(&cmd->eh_entry);
  
@@ -34174,11 +31668,10 @@ index 415fdf2..262e2e9 100644
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
-index 360b7cb..b310124 100644
---- a/drivers/scsi/scsi_sysfs.c
-+++ b/drivers/scsi/scsi_sysfs.c
-@@ -621,7 +621,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr,	\
+diff -urNp linux-3.0.3/drivers/scsi/scsi_sysfs.c linux-3.0.3/drivers/scsi/scsi_sysfs.c
+--- linux-3.0.3/drivers/scsi/scsi_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_sysfs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
  		    char *buf)						\
  {									\
  	struct scsi_device *sdev = to_scsi_device(dev);			\
@@ -34187,11 +31680,10 @@ index 360b7cb..b310124 100644
  	return snprintf(buf, 20, "0x%llx\n", count);			\
  }									\
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
-index 5c3ccfc..c31ffe1 100644
---- a/drivers/scsi/scsi_transport_fc.c
-+++ b/drivers/scsi/scsi_transport_fc.c
-@@ -485,7 +485,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
+diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_fc.c linux-3.0.3/drivers/scsi/scsi_transport_fc.c
+--- linux-3.0.3/drivers/scsi/scsi_transport_fc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_transport_fc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
  
@@ -34200,7 +31692,7 @@ index 5c3ccfc..c31ffe1 100644
  
  /**
   * fc_get_event_number - Obtain the next sequential FC event number
-@@ -498,7 +498,7 @@ static atomic_t fc_event_seq;
+@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
  u32
  fc_get_event_number(void)
  {
@@ -34209,7 +31701,7 @@ index 5c3ccfc..c31ffe1 100644
  }
  EXPORT_SYMBOL(fc_get_event_number);
  
-@@ -646,7 +646,7 @@ static __init int fc_transport_init(void)
+@@ -645,7 +645,7 @@ static __init int fc_transport_init(void
  {
  	int error;
  
@@ -34218,7 +31710,7 @@ index 5c3ccfc..c31ffe1 100644
  
  	error = transport_class_register(&fc_host_class);
  	if (error)
-@@ -836,7 +836,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
+@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char
  	char *cp;
  
  	*val = simple_strtoul(buf, &cp, 0);
@@ -34227,10 +31719,9 @@ index 5c3ccfc..c31ffe1 100644
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
-index 01543d2..9491fa7 100644
---- a/drivers/scsi/scsi_transport_iscsi.c
-+++ b/drivers/scsi/scsi_transport_iscsi.c
+diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c	2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct iscsi_internal {
  	struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -34240,7 +31731,7 @@ index 01543d2..9491fa7 100644
  static struct workqueue_struct *iscsi_eh_timer_workq;
  
  /*
-@@ -761,7 +761,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
+@@ -761,7 +761,7 @@ int iscsi_add_session(struct iscsi_cls_s
  	int err;
  
  	ihost = shost->shost_data;
@@ -34249,7 +31740,7 @@ index 01543d2..9491fa7 100644
  
  	if (id == ISCSI_MAX_TARGET) {
  		for (id = 0; id < ISCSI_MAX_TARGET; id++) {
-@@ -2130,7 +2130,7 @@ static __init int iscsi_transport_init(void)
+@@ -2200,7 +2200,7 @@ static __init int iscsi_transport_init(v
  	printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
  		ISCSI_TRANSPORT_VERSION);
  
@@ -34258,10 +31749,9 @@ index 01543d2..9491fa7 100644
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
-index 21a045e..ec89e03 100644
---- a/drivers/scsi/scsi_transport_srp.c
-+++ b/drivers/scsi/scsi_transport_srp.c
+diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_srp.c linux-3.0.3/drivers/scsi/scsi_transport_srp.c
+--- linux-3.0.3/drivers/scsi/scsi_transport_srp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/scsi_transport_srp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -34271,7 +31761,7 @@ index 21a045e..ec89e03 100644
  };
  #define to_srp_host_attrs(host)	((struct srp_host_attrs *)(host)->shost_data)
  
-@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
+@@ -62,7 +62,7 @@ static int srp_host_setup(struct transpo
  	struct Scsi_Host *shost = dev_to_shost(dev);
  	struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
  
@@ -34280,7 +31770,7 @@ index 21a045e..ec89e03 100644
  	return 0;
  }
  
-@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
+@@ -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 = ids->roles;
  
@@ -34289,10 +31779,9 @@ index 21a045e..ec89e03 100644
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
-index 909ed9e..a481c74 100644
---- a/drivers/scsi/sg.c
-+++ b/drivers/scsi/sg.c
+diff -urNp linux-3.0.3/drivers/scsi/sg.c linux-3.0.3/drivers/scsi/sg.c
+--- linux-3.0.3/drivers/scsi/sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/sg.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
  	const struct file_operations * fops;
  };
@@ -34311,11 +31800,10 @@ index 909ed9e..a481c74 100644
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
-index b4543f5..e1b34b8 100644
---- a/drivers/scsi/sym53c8xx_2/sym_glue.c
-+++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
-@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct pci_dev *pdev,
+diff -urNp linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
  	int do_iounmap = 0;
  	int do_disable_device = 1;
  
@@ -34324,11 +31812,10 @@ index b4543f5..e1b34b8 100644
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
-index a18996d..fe993cb 100644
---- a/drivers/scsi/vmw_pvscsi.c
-+++ b/drivers/scsi/vmw_pvscsi.c
-@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const struct pvscsi_adapter *adapter)
+diff -urNp linux-3.0.3/drivers/scsi/vmw_pvscsi.c linux-3.0.3/drivers/scsi/vmw_pvscsi.c
+--- linux-3.0.3/drivers/scsi/vmw_pvscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/scsi/vmw_pvscsi.c	2011-08-23 21:48:14.000000000 -0400
+@@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
  	dma_addr_t base;
  	unsigned i;
  
@@ -34337,51 +31824,46 @@ index a18996d..fe993cb 100644
  	cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
  	cmd.reqRingNumPages = adapter->req_pages;
  	cmd.cmpRingNumPages = adapter->cmp_pages;
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 34bb17f..0048b09 100644
---- a/drivers/spi/spi.c
-+++ b/drivers/spi/spi.c
-@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *master)
+diff -urNp linux-3.0.3/drivers/spi/spi.c linux-3.0.3/drivers/spi/spi.c
+--- linux-3.0.3/drivers/spi/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/spi/spi.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
  /* 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)
++#define	SPI_BUFSIZ	max(32UL,SMP_CACHE_BYTES)
  
  static u8	*buf;
  
-diff --git a/drivers/staging/autofs/root.c b/drivers/staging/autofs/root.c
-index bf0e975..8c52ab48 100644
---- a/drivers/staging/autofs/root.c
-+++ b/drivers/staging/autofs/root.c
-@@ -311,7 +311,8 @@ static int autofs_root_symlink(struct inode *dir, struct dentry *dentry, const c
- 	set_bit(n,sbi->symlink_bitmap);
- 	sl = &sbi->symlink[n];
- 	sl->len = strlen(symname);
--	sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
-+	slsize = sl->len+1;
-+	sl->data = kmalloc(slsize, GFP_KERNEL);
- 	if (!sl->data) {
- 		clear_bit(n,sbi->symlink_bitmap);
- 		unlock_kernel();
-diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
-index 31674ea..2186ab2 100644
---- a/drivers/staging/bcm/Bcmchar.c
-+++ b/drivers/staging/bcm/Bcmchar.c
-@@ -2093,7 +2093,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
- }
- 
- 
--static struct file_operations bcm_fops = {
-+static const struct file_operations bcm_fops = {
- 	.owner    = THIS_MODULE,
- 	.open     = bcm_char_open,
- 	.release  = bcm_char_release,
-diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
-index db45083..f52a544 100644
---- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
-+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
-@@ -863,14 +863,14 @@ static void dhd_op_if(dhd_if_t *ifp)
+diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:48:14.000000000 -0400
+@@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
+         (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
+ 
+ 
+-static struct net_device_ops ar6000_netdev_ops = {
++static net_device_ops_no_const ar6000_netdev_ops = {
+     .ndo_init               = NULL,
+     .ndo_open               = ar6000_open,
+     .ndo_stop               = ar6000_close,
+diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-08-23 21:47:56.000000000 -0400
+@@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
+ typedef struct ar6k_pal_config_s
+ {
+ 	ar6k_pal_recv_pkt_t fpar6k_pal_recv_pkt;
+-}ar6k_pal_config_t;
++} __no_const ar6k_pal_config_t;
+ 
+ void register_pal_cb(ar6k_pal_config_t *palConfig_p);
+ #endif /* _AR6K_PAL_H_ */
+diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-08-23 21:47:56.000000000 -0400
+@@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
  			free_netdev(ifp->net);
  		}
  		/* Allocate etherdev, including space for private structure */
@@ -34398,7 +31880,7 @@ index db45083..f52a544 100644
  			err = dhd_net_attach(&dhd->pub, ifp->idx);
  			if (err != 0) {
  				DHD_ERROR(("%s: dhd_net_attach failed, "
-@@ -1969,25 +1969,23 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
+@@ -1872,7 +1872,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
  		strcpy(nv_path, nvram_path);
  
  	/* Allocate etherdev, including space for private structure */
@@ -34407,27 +31889,16 @@ index db45083..f52a544 100644
  	if (!net) {
  		DHD_ERROR(("%s: OOM - alloc_etherdev\n", __func__));
  		goto fail;
- 	}
- 
- 	/* Allocate primary dhd_info */
--	dhd = kmalloc(sizeof(dhd_info_t), GFP_ATOMIC);
-+	dhd = kzalloc(sizeof(dhd_info_t), GFP_ATOMIC);
- 	if (!dhd) {
- 		DHD_ERROR(("%s: OOM - alloc dhd_info\n", __func__));
- 		goto fail;
- 	}
- 
--	memset(dhd, 0, sizeof(dhd_info_t));
--
+@@ -1888,7 +1888,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
  	/*
  	 * Save the dhd_info into the priv
  	 */
 -	memcpy(netdev_priv(net), &dhd, sizeof(dhd));
 +	memcpy(netdev_priv(net), dhd, sizeof(*dhd));
- 	dhd->pub.osh = osh;
  
  	/* Set network interface name if it was provided as module parameter */
-@@ -2105,7 +2103,7 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
+ 	if (iface_name[0]) {
+@@ -2004,7 +2004,7 @@ dhd_pub_t *dhd_attach(struct dhd_bus *bu
  	/*
  	 * Save the dhd_info into the priv
  	 */
@@ -34436,37 +31907,34 @@ index db45083..f52a544 100644
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
  	g_bus = bus;
-diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
-index db6e68e..1ef5977 100644
---- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
-+++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
-@@ -513,7 +513,7 @@ wl_iw_get_range(struct net_device *dev,
- 	list = (wl_u32_list_t *) channels;
- 
- 	dwrq->length = sizeof(struct iw_range);
--	memset(range, 0, sizeof(range));
-+	memset(range, 0, sizeof(*range));
- 
- 	range->min_nwid = range->max_nwid = 0;
- 
-diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
-index 093032b..02a13ad 100644
---- a/drivers/staging/comedi/comedi_fops.c
-+++ b/drivers/staging/comedi/comedi_fops.c
-@@ -1426,7 +1426,7 @@ static void comedi_unmap(struct vm_area_struct *area)
- 	mutex_unlock(&dev->mutex);
- }
- 
--static struct vm_operations_struct comedi_vm_ops = {
-+static const struct vm_operations_struct comedi_vm_ops = {
- 	.close = comedi_unmap,
- };
- 
-diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
-index 0f3473d..11f9411 100644
---- a/drivers/staging/et131x/et1310_tx.c
-+++ b/drivers/staging/et131x/et1310_tx.c
-@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
+diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
+--- linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-08-23 21:47:56.000000000 -0400
+@@ -593,7 +593,7 @@ struct phy_func_ptr {
+ 	initfn_t carrsuppr;
+ 	rxsigpwrfn_t rxsigpwr;
+ 	detachfn_t detach;
+-};
++} __no_const;
+ typedef struct phy_func_ptr phy_func_ptr_t;
+ 
+ struct phy_info {
+diff -urNp linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h
+--- linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h	2011-08-23 21:47:56.000000000 -0400
+@@ -185,7 +185,7 @@ typedef struct {
+ 			 u16 func, uint bustype, void *regsva, void *param);
+ 	/* detach from device */
+ 	void (*detach) (void *ch);
+-} bcmsdh_driver_t;
++} __no_const bcmsdh_driver_t;
+ 
+ /* platform specific/high level functions */
+ extern int bcmsdh_register(bcmsdh_driver_t *driver);
+diff -urNp linux-3.0.3/drivers/staging/et131x/et1310_tx.c linux-3.0.3/drivers/staging/et131x/et1310_tx.c
+--- linux-3.0.3/drivers/staging/et131x/et1310_tx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/et131x/et1310_tx.c	2011-08-23 21:47:56.000000000 -0400
+@@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
  	struct net_device_stats *stats = &etdev->net_stats;
  
  	if (tcb->flags & fMP_DEST_BROAD)
@@ -34481,11 +31949,10 @@ index 0f3473d..11f9411 100644
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
-index 64a678f..724a95c 100644
---- a/drivers/staging/et131x/et131x_adapter.h
-+++ b/drivers/staging/et131x/et131x_adapter.h
-@@ -112,11 +112,11 @@ typedef struct _ce_stats_t {
+diff -urNp linux-3.0.3/drivers/staging/et131x/et131x_adapter.h linux-3.0.3/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.0.3/drivers/staging/et131x/et131x_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/et131x/et131x_adapter.h	2011-08-23 21:47:56.000000000 -0400
+@@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
  	u32 unircv;	/* # multicast packets received */
@@ -34500,65 +31967,64 @@ index 64a678f..724a95c 100644
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
-index 149ba59..ef6403b 100644
---- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
-+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
-@@ -55,7 +55,7 @@ int numofmsgbuf = 0;
- //
- // Table of entry-point routines for char device
- //
--static struct file_operations ft1000fops =
-+static const struct file_operations ft1000fops =
- {
- 	.unlocked_ioctl	= ft1000_ioctl,
- 	.poll		= ft1000_poll_dev,
-diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
-index 2b27d8d..245b243 100644
---- a/drivers/staging/go7007/go7007-v4l2.c
-+++ b/drivers/staging/go7007/go7007-v4l2.c
-@@ -1672,7 +1672,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
- 	return 0;
- }
- 
--static struct vm_operations_struct go7007_vm_ops = {
-+static const struct vm_operations_struct go7007_vm_ops = {
- 	.open	= go7007_vm_open,
- 	.close	= go7007_vm_close,
- 	.fault	= go7007_vm_fault,
-diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
-index 09e596a..d7fa427 100644
---- a/drivers/staging/hv/channel.c
-+++ b/drivers/staging/hv/channel.c
-@@ -501,8 +501,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
- 	unsigned long flags;
+diff -urNp linux-3.0.3/drivers/staging/hv/channel.c linux-3.0.3/drivers/staging/hv/channel.c
+--- linux-3.0.3/drivers/staging/hv/channel.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/channel.c	2011-08-23 21:47:56.000000000 -0400
+@@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
  	int ret = 0;
+ 	int t;
  
--	next_gpadl_handle = atomic_read(&gVmbusConnection.NextGpadlHandle);
--	atomic_inc(&gVmbusConnection.NextGpadlHandle);
-+	next_gpadl_handle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
-+	atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
+-	next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
+-	atomic_inc(&vmbus_connection.next_gpadl_handle);
++	next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
++	atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
-index a34d713..c43c648 100644
---- a/drivers/staging/hv/hv.c
-+++ b/drivers/staging/hv/hv.c
-@@ -163,7 +163,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
+diff -urNp linux-3.0.3/drivers/staging/hv/hv.c linux-3.0.3/drivers/staging/hv/hv.c
+--- linux-3.0.3/drivers/staging/hv/hv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/hv.c	2011-08-23 21:47:56.000000000 -0400
+@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
  	u64 output_address = (output) ? virt_to_phys(output) : 0;
  	u32 output_address_hi = output_address >> 32;
  	u32 output_address_lo = output_address & 0xFFFFFFFF;
 -	volatile void *hypercall_page = hv_context.hypercall_page;
 +	volatile void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
  
- 	DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
- 		   control, input, output);
-diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
-index 53676dc..71909cf 100644
---- a/drivers/staging/hv/rndis_filter.c
-+++ b/drivers/staging/hv/rndis_filter.c
-@@ -47,7 +47,7 @@ struct rndis_device {
+ 	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
+ 			      "=a"(hv_status_lo) : "d" (control_hi),
+diff -urNp linux-3.0.3/drivers/staging/hv/hv_mouse.c linux-3.0.3/drivers/staging/hv/hv_mouse.c
+--- linux-3.0.3/drivers/staging/hv/hv_mouse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/hv_mouse.c	2011-08-23 21:47:56.000000000 -0400
+@@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
+ 	if (hid_dev) {
+ 		DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
+ 
+-		hid_dev->ll_driver->open  = mousevsc_hid_open;
+-		hid_dev->ll_driver->close = mousevsc_hid_close;
++		pax_open_kernel();
++		*(void **)&hid_dev->ll_driver->open  = mousevsc_hid_open;
++		*(void **)&hid_dev->ll_driver->close = mousevsc_hid_close;
++		pax_close_kernel();
+ 
+ 		hid_dev->bus = BUS_VIRTUAL;
+ 		hid_dev->vendor = input_device_ctx->device_info.vendor;
+diff -urNp linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h	2011-08-23 21:47:56.000000000 -0400
+@@ -559,7 +559,7 @@ enum vmbus_connect_state {
+ struct vmbus_connection {
+ 	enum vmbus_connect_state conn_state;
+ 
+-	atomic_t next_gpadl_handle;
++	atomic_unchecked_t next_gpadl_handle;
+ 
+ 	/*
+ 	 * Represents channel interrupts. Each bit position represents a
+diff -urNp linux-3.0.3/drivers/staging/hv/rndis_filter.c linux-3.0.3/drivers/staging/hv/rndis_filter.c
+--- linux-3.0.3/drivers/staging/hv/rndis_filter.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/rndis_filter.c	2011-08-23 21:47:56.000000000 -0400
+@@ -43,7 +43,7 @@ struct rndis_device {
  
  	enum rndis_device_state state;
  	u32 link_stat;
@@ -34567,7 +32033,7 @@ index 53676dc..71909cf 100644
  
  	spinlock_t request_lock;
  	struct list_head req_list;
-@@ -145,7 +145,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
+@@ -117,7 +117,7 @@ static struct rndis_request *get_rndis_r
  	 * template
  	 */
  	set = &rndis_msg->msg.set_req;
@@ -34576,7 +32042,7 @@ index 53676dc..71909cf 100644
  
  	/* Add to the request list */
  	spin_lock_irqsave(&dev->request_lock, flags);
-@@ -707,7 +707,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
+@@ -637,7 +637,7 @@ static void rndis_filter_halt_device(str
  
  	/* Setup the rndis set */
  	halt = &request->request_msg.msg.halt_req;
@@ -34585,45 +32051,58 @@ index 53676dc..71909cf 100644
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
-index 87e6cf2..35b1fc7 100644
---- a/drivers/staging/hv/vmbus_drv.c
-+++ b/drivers/staging/hv/vmbus_drv.c
-@@ -727,14 +727,14 @@ int vmbus_child_device_register(struct hv_device *root_device_obj,
- 				to_vm_device(root_device_obj);
- 	struct vm_device *child_device_ctx =
- 				to_vm_device(child_device_obj);
+diff -urNp linux-3.0.3/drivers/staging/hv/vmbus_drv.c linux-3.0.3/drivers/staging/hv/vmbus_drv.c
+--- linux-3.0.3/drivers/staging/hv/vmbus_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/hv/vmbus_drv.c	2011-08-23 21:47:56.000000000 -0400
+@@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
+ {
+ 	int ret = 0;
+ 
 -	static atomic_t device_num = ATOMIC_INIT(0);
 +	static atomic_unchecked_t device_num = ATOMIC_INIT(0);
  
- 	DPRINT_DBG(VMBUS_DRV, "child device (%p) registering",
- 		   child_device_ctx);
- 
  	/* Set the device name. Otherwise, device_register() will fail. */
- 	dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
+ 	dev_set_name(&child_device_obj->device, "vmbus_0_%d",
 -		     atomic_inc_return(&device_num));
 +		     atomic_inc_return_unchecked(&device_num));
  
  	/* The new device belongs to this bus */
- 	child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
-diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h
-index c75b2d7..adf3384 100644
---- a/drivers/staging/hv/vmbus_private.h
-+++ b/drivers/staging/hv/vmbus_private.h
-@@ -58,7 +58,7 @@ enum VMBUS_CONNECT_STATE {
- struct VMBUS_CONNECTION {
- 	enum VMBUS_CONNECT_STATE ConnectState;
- 
--	atomic_t NextGpadlHandle;
-+	atomic_unchecked_t NextGpadlHandle;
+ 	child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
+diff -urNp linux-3.0.3/drivers/staging/iio/ring_generic.h linux-3.0.3/drivers/staging/iio/ring_generic.h
+--- linux-3.0.3/drivers/staging/iio/ring_generic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/iio/ring_generic.h	2011-08-23 21:47:56.000000000 -0400
+@@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
+ 
+ 	int (*is_enabled)(struct iio_ring_buffer *ring);
+ 	int (*enable)(struct iio_ring_buffer *ring);
+-};
++} __no_const;
+ 
+ struct iio_ring_setup_ops {
+ 	int				(*preenable)(struct iio_dev *);
+diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet.c linux-3.0.3/drivers/staging/octeon/ethernet.c
+--- linux-3.0.3/drivers/staging/octeon/ethernet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/octeon/ethernet.c	2011-08-23 21:47:56.000000000 -0400
+@@ -258,11 +258,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
+ 	}
  
- 	/*
- 	 * Represents channel interrupts. Each bit position represents a
-diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
-index cb38f9e..6b137b2 100644
---- a/drivers/staging/octeon/ethernet-rx.c
-+++ b/drivers/staging/octeon/ethernet-rx.c
-@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet-rx.c linux-3.0.3/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.0.3/drivers/staging/octeon/ethernet-rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/octeon/ethernet-rx.c	2011-08-23 21:47:56.000000000 -0400
+@@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
  				/* Increment RX stats for virtual ports */
  				if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
  #ifdef CONFIG_64BIT
@@ -34639,7 +32118,7 @@ index cb38f9e..6b137b2 100644
  #endif
  				}
  				netif_receive_skb(skb);
-@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
+@@ -433,9 +433,9 @@ static int cvm_oct_napi_poll(struct napi
  					   dev->name);
  				*/
  #ifdef CONFIG_64BIT
@@ -34651,44 +32130,10 @@ index cb38f9e..6b137b2 100644
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
-index a8f780e..aef1098 100644
---- a/drivers/staging/octeon/ethernet.c
-+++ b/drivers/staging/octeon/ethernet.c
-@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
- 		 * 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
- 	}
- 
-diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
-index 683657c..f1054e9 100644
---- a/drivers/staging/phison/phison.c
-+++ b/drivers/staging/phison/phison.c
-@@ -43,7 +43,7 @@ static struct scsi_host_template phison_sht = {
- 	ATA_BMDMA_SHT(DRV_NAME),
- };
- 
--static struct ata_port_operations phison_ops = {
-+static const struct ata_port_operations phison_ops = {
- 	.inherits		= &ata_bmdma_port_ops,
- 	.prereset		= phison_pre_reset,
- };
-diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
-index 56d3a4e..8912e8b 100644
---- a/drivers/staging/pohmelfs/inode.c
-+++ b/drivers/staging/pohmelfs/inode.c
-@@ -1855,7 +1855,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
+diff -urNp linux-3.0.3/drivers/staging/pohmelfs/inode.c linux-3.0.3/drivers/staging/pohmelfs/inode.c
+--- linux-3.0.3/drivers/staging/pohmelfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/pohmelfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
  	mutex_init(&psb->mcache_lock);
  	psb->mcache_root = RB_ROOT;
  	psb->mcache_timeout = msecs_to_jiffies(5000);
@@ -34697,7 +32142,7 @@ index 56d3a4e..8912e8b 100644
  
  	psb->trans_max_pages = 100;
  
-@@ -1870,7 +1870,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
+@@ -1871,7 +1871,7 @@ static int pohmelfs_fill_super(struct su
  	INIT_LIST_HEAD(&psb->crypto_ready_list);
  	INIT_LIST_HEAD(&psb->crypto_active_list);
  
@@ -34706,11 +32151,10 @@ index 56d3a4e..8912e8b 100644
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
-index e22665c..a2a9390 100644
---- a/drivers/staging/pohmelfs/mcache.c
-+++ b/drivers/staging/pohmelfs/mcache.c
-@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
+diff -urNp linux-3.0.3/drivers/staging/pohmelfs/mcache.c linux-3.0.3/drivers/staging/pohmelfs/mcache.c
+--- linux-3.0.3/drivers/staging/pohmelfs/mcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/pohmelfs/mcache.c	2011-08-23 21:47:56.000000000 -0400
+@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
  	m->data = data;
  	m->start = start;
  	m->size = size;
@@ -34719,10 +32163,9 @@ index e22665c..a2a9390 100644
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
-index 63391d2..d478939 100644
---- a/drivers/staging/pohmelfs/netfs.h
-+++ b/drivers/staging/pohmelfs/netfs.h
+diff -urNp linux-3.0.3/drivers/staging/pohmelfs/netfs.h linux-3.0.3/drivers/staging/pohmelfs/netfs.h
+--- linux-3.0.3/drivers/staging/pohmelfs/netfs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/pohmelfs/netfs.h	2011-08-23 21:47:56.000000000 -0400
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
  	struct rb_root		mcache_root;
@@ -34740,11 +32183,10 @@ index 63391d2..d478939 100644
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
-index 36a2535..0591bf4 100644
---- a/drivers/staging/pohmelfs/trans.c
-+++ b/drivers/staging/pohmelfs/trans.c
-@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
+diff -urNp linux-3.0.3/drivers/staging/pohmelfs/trans.c linux-3.0.3/drivers/staging/pohmelfs/trans.c
+--- linux-3.0.3/drivers/staging/pohmelfs/trans.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/pohmelfs/trans.c	2011-08-23 21:47:56.000000000 -0400
+@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
  	int err;
  	struct netfs_cmd *cmd = t->iovec.iov_base;
  
@@ -34753,68 +32195,88 @@ index 36a2535..0591bf4 100644
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff --git a/drivers/staging/rtl8192u/ieee80211/proc.c b/drivers/staging/rtl8192u/ieee80211/proc.c
-index 6eda928..7e60f0e 100644
---- a/drivers/staging/rtl8192u/ieee80211/proc.c
-+++ b/drivers/staging/rtl8192u/ieee80211/proc.c
-@@ -99,7 +99,7 @@ static int crypto_info_open(struct inode *inode, struct file *file)
- 	return seq_open(file, &crypto_seq_ops);
- }
- 
--static struct file_operations proc_crypto_ops = {
-+static const struct file_operations proc_crypto_ops = {
- 	.open		= crypto_info_open,
- 	.read		= seq_read,
- 	.llseek		= seq_lseek,
-diff --git a/drivers/staging/spectra/ffsport.c b/drivers/staging/spectra/ffsport.c
-index 007b24b..4ec0b83 100644
---- a/drivers/staging/spectra/ffsport.c
-+++ b/drivers/staging/spectra/ffsport.c
-@@ -604,7 +604,7 @@ int GLOB_SBD_unlocked_ioctl(struct block_device *bdev, fmode_t mode,
- 	return ret;
- }
+diff -urNp linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h	2011-08-23 21:47:56.000000000 -0400
+@@ -83,7 +83,7 @@ struct	_io_ops {
+ 			  u8 *pmem);
+ 	u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
+ 			   u8 *pmem);
+-};
++} __no_const;
+ 
+ struct io_req {
+ 	struct list_head list;
+diff -urNp linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c	2011-08-24 18:21:41.000000000 -0400
+@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
+ 	t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
+ 
+ 	if (rlen)
+-		if (copy_to_user(data, &resp, rlen))
++		if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
+ 			return -EFAULT;
  
--static struct block_device_operations GLOB_SBD_ops = {
-+static const struct block_device_operations GLOB_SBD_ops = {
- 	.owner = THIS_MODULE,
- 	.open = GLOB_SBD_open,
- 	.release = GLOB_SBD_release,
-diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
-index afc3b1a..b06fc38 100644
---- a/drivers/staging/usbip/vhci.h
-+++ b/drivers/staging/usbip/vhci.h
-@@ -92,7 +92,7 @@ struct vhci_hcd {
- 	unsigned	resuming:1;
- 	unsigned long	re_timeout;
+ 	return 0;
+diff -urNp linux-3.0.3/drivers/staging/tty/stallion.c linux-3.0.3/drivers/staging/tty/stallion.c
+--- linux-3.0.3/drivers/staging/tty/stallion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/tty/stallion.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
+ 	struct stlport	stl_dummyport;
+ 	struct stlport	*portp;
+ 
++	pax_track_stack();
++
+ 	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
+ 		return -EFAULT;
+ 	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
+diff -urNp linux-3.0.3/drivers/staging/usbip/usbip_common.h linux-3.0.3/drivers/staging/usbip/usbip_common.h
+--- linux-3.0.3/drivers/staging/usbip/usbip_common.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/usbip/usbip_common.h	2011-08-23 21:47:56.000000000 -0400
+@@ -315,7 +315,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;
+ };
+ 
+ void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
+diff -urNp linux-3.0.3/drivers/staging/usbip/vhci.h linux-3.0.3/drivers/staging/usbip/vhci.h
+--- linux-3.0.3/drivers/staging/usbip/vhci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/usbip/vhci.h	2011-08-23 21:47:56.000000000 -0400
+@@ -94,7 +94,7 @@ struct vhci_hcd {
+ 	unsigned resuming:1;
+ 	unsigned long re_timeout;
  
 -	atomic_t seqnum;
 +	atomic_unchecked_t seqnum;
  
  	/*
  	 * NOTE:
-diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
-index 7284d0c..c5bcfb1 100644
---- a/drivers/staging/usbip/vhci_hcd.c
-+++ b/drivers/staging/usbip/vhci_hcd.c
-@@ -535,7 +535,7 @@ static void vhci_tx_urb(struct urb *urb)
+diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_hcd.c linux-3.0.3/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.0.3/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:47:56.000000000 -0400
+@@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
  		return;
  	}
  
 -	priv->seqnum = atomic_inc_return(&the_controller->seqnum);
 +	priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
  	if (priv->seqnum == 0xffff)
- 		usbip_uinfo("seqnum max\n");
+ 		dev_info(&urb->dev->dev, "seqnum max\n");
  
-@@ -794,7 +794,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -765,7 +765,7 @@ static int vhci_urb_dequeue(struct usb_h
  			return -ENOMEM;
  		}
  
 -		unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
 +		unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
  		if (unlink->seqnum == 0xffff)
- 			usbip_uinfo("seqnum max\n");
+ 			pr_info("seqnum max\n");
  
-@@ -989,7 +989,7 @@ static int vhci_start(struct usb_hcd *hcd)
+@@ -955,7 +955,7 @@ static int vhci_start(struct usb_hcd *hc
  		vdev->rhport = rhport;
  	}
  
@@ -34822,51 +32284,133 @@ index 7284d0c..c5bcfb1 100644
 +	atomic_set_unchecked(&vhci->seqnum, 0);
  	spin_lock_init(&vhci->lock);
  
- 
-diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
-index 109002a..4e0cae8 100644
---- a/drivers/staging/usbip/vhci_rx.c
-+++ b/drivers/staging/usbip/vhci_rx.c
-@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
- 		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));
+ 	hcd->power_budget = 0; /* no limit */
+diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_rx.c linux-3.0.3/drivers/staging/usbip/vhci_rx.c
+--- linux-3.0.3/drivers/staging/usbip/vhci_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/usbip/vhci_rx.c	2011-08-23 21:47:56.000000000 -0400
+@@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct 
+ 	if (!urb) {
+ 		pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
+ 		pr_info("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 --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
-index a571173..28f0f8e 100644
---- a/drivers/staging/vme/devices/vme_user.c
-+++ b/drivers/staging/vme/devices/vme_user.c
-@@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
- static int __devinit vme_user_probe(struct device *, int, int);
- static int __devexit vme_user_remove(struct device *, int, int);
- 
--static struct file_operations vme_user_fops = {
-+static const struct file_operations vme_user_fops = {
- 	.open = vme_user_open,
- 	.release = vme_user_release,
- 	.read = vme_user_read,
-diff --git a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
-index e1851f0..ae63ce3 100644
---- a/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
-+++ b/drivers/staging/westbridge/astoria/block/cyasblkdev_block.c
-@@ -426,7 +426,7 @@ int cyasblkdev_revalidate_disk(struct gendisk *gd)
- 
- 
- /*standard block device driver interface */
--static struct block_device_operations cyasblkdev_bdops = {
-+static const struct block_device_operations cyasblkdev_bdops = {
- 	.open			= cyasblkdev_blk_open,
- 	.release		= cyasblkdev_blk_release,
- 	.ioctl			= cyasblkdev_blk_ioctl,
-diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
-index 2c5fcfe..5387e01 100644
---- a/drivers/target/target_core_alua.c
-+++ b/drivers/target/target_core_alua.c
-@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_metadata(
+diff -urNp linux-3.0.3/drivers/staging/vt6655/hostap.c linux-3.0.3/drivers/staging/vt6655/hostap.c
+--- linux-3.0.3/drivers/staging/vt6655/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/vt6655/hostap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -79,14 +79,13 @@ static int          msglevel            
+  *
+  */
+ 
++static net_device_ops_no_const apdev_netdev_ops;
++
+ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
+ {
+     PSDevice apdev_priv;
+ 	struct net_device *dev = pDevice->dev;
+ 	int ret;
+-	const struct net_device_ops apdev_netdev_ops = {
+-		.ndo_start_xmit         = pDevice->tx_80211,
+-	};
+ 
+     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
+ 
+@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevic
+     *apdev_priv = *pDevice;
+ 	memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
+ 
++	/* only half broken now */
++	apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
+ 	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
+ 
+ 	pDevice->apdev->type = ARPHRD_IEEE80211;
+diff -urNp linux-3.0.3/drivers/staging/vt6656/hostap.c linux-3.0.3/drivers/staging/vt6656/hostap.c
+--- linux-3.0.3/drivers/staging/vt6656/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/vt6656/hostap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -80,14 +80,13 @@ static int          msglevel            
+  *
+  */
+ 
++static net_device_ops_no_const apdev_netdev_ops;
++
+ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
+ {
+     PSDevice apdev_priv;
+ 	struct net_device *dev = pDevice->dev;
+ 	int ret;
+-	const struct net_device_ops apdev_netdev_ops = {
+-		.ndo_start_xmit         = pDevice->tx_80211,
+-	};
+ 
+     DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
+ 
+@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevic
+     *apdev_priv = *pDevice;
+ 	memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
+ 
++	/* only half broken now */
++	apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
+ 	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
+ 
+ 	pDevice->apdev->type = ARPHRD_IEEE80211;
+diff -urNp linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 21:47:56.000000000 -0400
+@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
+ 
+ struct usbctlx_completor {
+ 	int (*complete) (struct usbctlx_completor *);
+-};
++} __no_const;
+ 
+ static int
+ hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
+diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.c linux-3.0.3/drivers/staging/zcache/tmem.c
+--- linux-3.0.3/drivers/staging/zcache/tmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/zcache/tmem.c	2011-08-23 21:47:56.000000000 -0400
+@@ -39,7 +39,7 @@
+  * A tmem host implementation must use this function to register callbacks
+  * for memory allocation.
+  */
+-static struct tmem_hostops tmem_hostops;
++static tmem_hostops_no_const tmem_hostops;
+ 
+ static void tmem_objnode_tree_init(void);
+ 
+@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_h
+  * A tmem host implementation must use this function to register
+  * callbacks for a page-accessible memory (PAM) implementation
+  */
+-static struct tmem_pamops tmem_pamops;
++static tmem_pamops_no_const tmem_pamops;
+ 
+ void tmem_register_pamops(struct tmem_pamops *m)
+ {
+diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.h linux-3.0.3/drivers/staging/zcache/tmem.h
+--- linux-3.0.3/drivers/staging/zcache/tmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/staging/zcache/tmem.h	2011-08-23 21:47:56.000000000 -0400
+@@ -171,6 +171,7 @@ struct tmem_pamops {
+ 	int (*get_data)(struct page *, void *, struct tmem_pool *);
+ 	void (*free)(void *, struct tmem_pool *);
+ };
++typedef struct tmem_pamops __no_const tmem_pamops_no_const;
+ extern void tmem_register_pamops(struct tmem_pamops *m);
+ 
+ /* memory allocation methods provided by the host implementation */
+@@ -180,6 +181,7 @@ struct tmem_hostops {
+ 	struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
+ 	void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
+ };
++typedef struct tmem_hostops __no_const tmem_hostops_no_const;
+ extern void tmem_register_hostops(struct tmem_hostops *m);
+ 
+ /* core tmem accessor functions */
+diff -urNp linux-3.0.3/drivers/target/target_core_alua.c linux-3.0.3/drivers/target/target_core_alua.c
+--- linux-3.0.3/drivers/target/target_core_alua.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_alua.c	2011-08-23 21:48:14.000000000 -0400
+@@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
  	char path[ALUA_METADATA_PATH_LEN];
  	int len;
  
@@ -34875,7 +32419,7 @@ index 2c5fcfe..5387e01 100644
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  
  	len = snprintf(md_buf, tg_pt_gp->tg_pt_gp_md_buf_len,
-@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondary_metadata(
+@@ -938,6 +940,8 @@ static int core_alua_update_tpg_secondar
  	char path[ALUA_METADATA_PATH_LEN], wwn[ALUA_SECONDARY_METADATA_WWN_LEN];
  	int len;
  
@@ -34884,11 +32428,10 @@ index 2c5fcfe..5387e01 100644
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  	memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff --git a/drivers/target/target_core_cdb.c b/drivers/target/target_core_cdb.c
-index 7f19c8b..5f21663 100644
---- a/drivers/target/target_core_cdb.c
-+++ b/drivers/target/target_core_cdb.c
-@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *cmd, int ten)
+diff -urNp linux-3.0.3/drivers/target/target_core_cdb.c linux-3.0.3/drivers/target/target_core_cdb.c
+--- linux-3.0.3/drivers/target/target_core_cdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_cdb.c	2011-08-23 21:48:14.000000000 -0400
+@@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
  	int length = 0;
  	unsigned char buf[SE_MODE_PAGE_BUF];
  
@@ -34897,11 +32440,10 @@ index 7f19c8b..5f21663 100644
  	memset(buf, 0, SE_MODE_PAGE_BUF);
  
  	switch (cdb[2] & 0x3f) {
-diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c
-index caf8dc1..177b334 100644
---- a/drivers/target/target_core_configfs.c
-+++ b/drivers/target/target_core_configfs.c
-@@ -1279,6 +1279,8 @@ static ssize_t target_core_dev_pr_show_attr_res_pr_registered_i_pts(
+diff -urNp linux-3.0.3/drivers/target/target_core_configfs.c linux-3.0.3/drivers/target/target_core_configfs.c
+--- linux-3.0.3/drivers/target/target_core_configfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_configfs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
  	ssize_t len = 0;
  	int reg_count = 0, prf_isid;
  
@@ -34910,11 +32452,10 @@ index caf8dc1..177b334 100644
  	if (!(su_dev->se_dev_ptr))
  		return -ENODEV;
  
-diff --git a/drivers/target/target_core_pr.c b/drivers/target/target_core_pr.c
-index 2521f75..0846a85 100644
---- a/drivers/target/target_core_pr.c
-+++ b/drivers/target/target_core_pr.c
-@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_registration(
+diff -urNp linux-3.0.3/drivers/target/target_core_pr.c linux-3.0.3/drivers/target/target_core_pr.c
+--- linux-3.0.3/drivers/target/target_core_pr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_pr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
  	unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
  	u16 tpgt;
  
@@ -34923,7 +32464,7 @@ index 2521f75..0846a85 100644
  	memset(i_port, 0, PR_APTPL_MAX_IPORT_LEN);
  	memset(t_port, 0, PR_APTPL_MAX_TPORT_LEN);
  	/*
-@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf(
+@@ -1861,6 +1863,8 @@ static int __core_scsi3_update_aptpl_buf
  	ssize_t len = 0;
  	int reg_count = 0;
  
@@ -34932,7 +32473,7 @@ index 2521f75..0846a85 100644
  	memset(buf, 0, pr_aptpl_buf_len);
  	/*
  	 * Called to clear metadata once APTPL has been deactivated.
-@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_file(
+@@ -1983,6 +1987,8 @@ static int __core_scsi3_write_aptpl_to_f
  	char path[512];
  	int ret;
  
@@ -34941,11 +32482,10 @@ index 2521f75..0846a85 100644
  	memset(iov, 0, sizeof(struct iovec));
  	memset(path, 0, 512);
  
-diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
-index 59b8b9c..5193b21 100644
---- a/drivers/target/target_core_tmr.c
-+++ b/drivers/target/target_core_tmr.c
-@@ -263,7 +263,7 @@ int core_tmr_lun_reset(
+diff -urNp linux-3.0.3/drivers/target/target_core_tmr.c linux-3.0.3/drivers/target/target_core_tmr.c
+--- linux-3.0.3/drivers/target/target_core_tmr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_tmr.c	2011-08-23 21:47:56.000000000 -0400
+@@ -269,7 +269,7 @@ int core_tmr_lun_reset(
  			CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
  			T_TASK(cmd)->t_task_cdbs,
  			atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
@@ -34954,7 +32494,7 @@ index 59b8b9c..5193b21 100644
  			atomic_read(&T_TASK(cmd)->t_transport_active),
  			atomic_read(&T_TASK(cmd)->t_transport_stop),
  			atomic_read(&T_TASK(cmd)->t_transport_sent));
-@@ -305,7 +305,7 @@ int core_tmr_lun_reset(
+@@ -311,7 +311,7 @@ int core_tmr_lun_reset(
  			DEBUG_LR("LUN_RESET: got t_transport_active = 1 for"
  				" task: %p, t_fe_count: %d dev: %p\n", task,
  				fe_count, dev);
@@ -34963,7 +32503,7 @@ index 59b8b9c..5193b21 100644
  			spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock,
  						flags);
  			core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
-@@ -315,7 +315,7 @@ int core_tmr_lun_reset(
+@@ -321,7 +321,7 @@ int core_tmr_lun_reset(
  		}
  		DEBUG_LR("LUN_RESET: Got t_transport_active = 0 for task: %p,"
  			" t_fe_count: %d dev: %p\n", task, fe_count, dev);
@@ -34972,11 +32512,10 @@ index 59b8b9c..5193b21 100644
  		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
-index d2a5768..b116627 100644
---- a/drivers/target/target_core_transport.c
-+++ b/drivers/target/target_core_transport.c
-@@ -1684,7 +1684,7 @@ struct se_device *transport_add_device_to_core_hba(
+diff -urNp linux-3.0.3/drivers/target/target_core_transport.c linux-3.0.3/drivers/target/target_core_transport.c
+--- linux-3.0.3/drivers/target/target_core_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/target/target_core_transport.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
  
  	dev->queue_depth	= dev_limits->queue_depth;
  	atomic_set(&dev->depth_left, dev->queue_depth);
@@ -34985,7 +32524,7 @@ index d2a5768..b116627 100644
  
  	se_dev_set_default_attribs(dev, dev_limits);
  
-@@ -1886,7 +1886,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
+@@ -1882,7 +1882,7 @@ static int transport_check_alloc_task_at
  	 * Used to determine when ORDERED commands should go from
  	 * Dormant to Active status.
  	 */
@@ -34994,7 +32533,7 @@ index d2a5768..b116627 100644
  	smp_mb__after_atomic_inc();
  	DEBUG_STA("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
  			cmd->se_ordered_id, cmd->sam_task_attr,
-@@ -2173,7 +2173,7 @@ static void transport_generic_request_failure(
+@@ -2169,7 +2169,7 @@ static void transport_generic_request_fa
  		" t_transport_active: %d t_transport_stop: %d"
  		" t_transport_sent: %d\n", T_TASK(cmd)->t_task_cdbs,
  		atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
@@ -35003,7 +32542,7 @@ index d2a5768..b116627 100644
  		atomic_read(&T_TASK(cmd)->t_task_cdbs_ex_left),
  		atomic_read(&T_TASK(cmd)->t_transport_active),
  		atomic_read(&T_TASK(cmd)->t_transport_stop),
-@@ -2677,9 +2677,9 @@ check_depth:
+@@ -2673,9 +2673,9 @@ check_depth:
  	spin_lock_irqsave(&T_TASK(cmd)->t_state_lock, flags);
  	atomic_set(&task->task_active, 1);
  	atomic_set(&task->task_sent, 1);
@@ -35015,7 +32554,7 @@ index d2a5768..b116627 100644
  	    T_TASK(cmd)->t_task_cdbs)
  		atomic_set(&cmd->transport_sent, 1);
  
-@@ -5569,7 +5569,7 @@ static void transport_generic_wait_for_tasks(
+@@ -5568,7 +5568,7 @@ static void transport_generic_wait_for_t
  		atomic_set(&T_TASK(cmd)->transport_lun_stop, 0);
  	}
  	if (!atomic_read(&T_TASK(cmd)->t_transport_active) ||
@@ -35024,7 +32563,7 @@ index d2a5768..b116627 100644
  		goto remove;
  
  	atomic_set(&T_TASK(cmd)->t_transport_stop, 1);
-@@ -5798,7 +5798,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
+@@ -5797,7 +5797,7 @@ int transport_check_aborted_status(struc
  {
  	int ret = 0;
  
@@ -35033,7 +32572,7 @@ index d2a5768..b116627 100644
  		if (!(send_status) ||
  		     (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
  			return 1;
-@@ -5826,7 +5826,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
+@@ -5825,7 +5825,7 @@ void transport_send_task_abort(struct se
  	 */
  	if (cmd->data_direction == DMA_TO_DEVICE) {
  		if (CMD_TFO(cmd)->write_pending_status(cmd) != 0) {
@@ -35042,7 +32581,7 @@ index d2a5768..b116627 100644
  			smp_mb__after_atomic_inc();
  			cmd->scsi_status = SAM_STAT_TASK_ABORTED;
  			transport_new_cmd_failure(cmd);
-@@ -5955,7 +5955,7 @@ static void transport_processing_shutdown(struct se_device *dev)
+@@ -5949,7 +5949,7 @@ static void transport_processing_shutdow
  			CMD_TFO(cmd)->get_task_tag(cmd),
  			T_TASK(cmd)->t_task_cdbs,
  			atomic_read(&T_TASK(cmd)->t_task_cdbs_left),
@@ -35051,10 +32590,9 @@ index d2a5768..b116627 100644
  			atomic_read(&T_TASK(cmd)->t_transport_active),
  			atomic_read(&T_TASK(cmd)->t_transport_stop),
  			atomic_read(&T_TASK(cmd)->t_transport_sent));
-diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
-index b001019..bd765f9 100644
---- a/drivers/telephony/ixj.c
-+++ b/drivers/telephony/ixj.c
+diff -urNp linux-3.0.3/drivers/telephony/ixj.c linux-3.0.3/drivers/telephony/ixj.c
+--- linux-3.0.3/drivers/telephony/ixj.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/telephony/ixj.c	2011-08-23 21:48:14.000000000 -0400
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
  	bool mContinue;
  	char *pIn, *pOut;
@@ -35064,62 +32602,9 @@ index b001019..bd765f9 100644
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h
-index 54381eba..41e362b 100644
---- a/drivers/tty/hvc/hvc_console.h
-+++ b/drivers/tty/hvc/hvc_console.h
-@@ -82,6 +82,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index,
- /* register a vterm for hvc tty operation (module_init or hotplug add) */
- extern struct hvc_struct * hvc_alloc(uint32_t vtermno, int data,
- 				     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);
- 
-diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
-index 3740e32..1edf7b4 100644
---- a/drivers/tty/hvc/hvc_xen.c
-+++ b/drivers/tty/hvc/hvc_xen.c
-@@ -123,7 +123,7 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len)
- 	return recv;
- }
- 
--static struct hv_ops domU_hvc_ops = {
-+static const struct hv_ops domU_hvc_ops = {
- 	.get_chars = domU_read_console,
- 	.put_chars = domU_write_console,
- 	.notifier_add = notifier_add_irq,
-@@ -149,7 +149,7 @@ static int dom0_write_console(uint32_t vtermno, const char *str, int len)
- 	return len;
- }
- 
--static struct hv_ops dom0_hvc_ops = {
-+static const struct hv_ops dom0_hvc_ops = {
- 	.get_chars = dom0_read_console,
- 	.put_chars = dom0_write_console,
- 	.notifier_add = notifier_add_irq,
-@@ -160,7 +160,7 @@ static struct hv_ops dom0_hvc_ops = {
- static int __init xen_hvc_init(void)
- {
- 	struct hvc_struct *hp;
--	struct hv_ops *ops;
-+	const struct hv_ops *ops;
- 
- 	if (!xen_pv_domain())
- 		return -ENODEV;
-@@ -203,7 +203,7 @@ static void __exit xen_hvc_fini(void)
- 
- static int xen_cons_init(void)
- {
--	struct hv_ops *ops;
-+	const struct hv_ops *ops;
- 
- 	if (!xen_pv_domain())
- 		return 0;
-diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
-index bedc6c1..67a4716 100644
---- a/drivers/tty/hvc/hvcs.c
-+++ b/drivers/tty/hvc/hvcs.c
+diff -urNp linux-3.0.3/drivers/tty/hvc/hvcs.c linux-3.0.3/drivers/tty/hvc/hvcs.c
+--- linux-3.0.3/drivers/tty/hvc/hvcs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/hvc/hvcs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -35137,7 +32622,7 @@ index bedc6c1..67a4716 100644
  
  	/*
  	 * Used to tell the driver kernel_thread what operations need to take
-@@ -420,7 +421,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
+@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(st
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  
@@ -35146,7 +32631,7 @@ index bedc6c1..67a4716 100644
  		spin_unlock_irqrestore(&hvcsd->lock, flags);
  		printk(KERN_INFO "HVCS: vterm state unchanged.  "
  				"The hvcs device node is still in use.\n");
-@@ -1136,7 +1137,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
+@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *
  		if ((retval = hvcs_partner_connect(hvcsd)))
  			goto error_release;
  
@@ -35155,7 +32640,7 @@ index bedc6c1..67a4716 100644
  	hvcsd->tty = tty;
  	tty->driver_data = hvcsd;
  
-@@ -1170,7 +1171,7 @@ fast_open:
+@@ -1179,7 +1180,7 @@ fast_open:
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  	kref_get(&hvcsd->kref);
@@ -35164,7 +32649,7 @@ index bedc6c1..67a4716 100644
  	hvcsd->todo_mask |= HVCS_SCHED_READ;
  	spin_unlock_irqrestore(&hvcsd->lock, flags);
  
-@@ -1214,7 +1215,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct
  	hvcsd = tty->driver_data;
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
@@ -35173,7 +32658,7 @@ index bedc6c1..67a4716 100644
  
  		vio_disable_interrupts(hvcsd->vdev);
  
-@@ -1240,10 +1241,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
+@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct
  		free_irq(irq, hvcsd);
  		kref_put(&hvcsd->kref, destroy_hvcs_struct);
  		return;
@@ -35186,7 +32671,7 @@ index bedc6c1..67a4716 100644
  	}
  
  	spin_unlock_irqrestore(&hvcsd->lock, flags);
-@@ -1259,7 +1260,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struc
  
  	spin_lock_irqsave(&hvcsd->lock, flags);
  	/* Preserve this so that we know how many kref refs to put */
@@ -35195,7 +32680,7 @@ index bedc6c1..67a4716 100644
  
  	/*
  	 * Don't kref put inside the spinlock because the destruction
-@@ -1274,7 +1275,7 @@ static void hvcs_hangup(struct tty_struct * tty)
+@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struc
  	hvcsd->tty->driver_data = NULL;
  	hvcsd->tty = NULL;
  
@@ -35204,7 +32689,7 @@ index bedc6c1..67a4716 100644
  
  	/* This will drop any buffered data on the floor which is OK in a hangup
  	 * scenario. */
-@@ -1345,7 +1346,7 @@ static int hvcs_write(struct tty_struct *tty,
+@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct 
  	 * the middle of a write operation?  This is a crummy place to do this
  	 * but we want to keep it all in the spinlock.
  	 */
@@ -35213,7 +32698,7 @@ index bedc6c1..67a4716 100644
  		spin_unlock_irqrestore(&hvcsd->lock, flags);
  		return -ENODEV;
  	}
-@@ -1419,7 +1420,7 @@ static int hvcs_write_room(struct tty_struct *tty)
+@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_st
  {
  	struct hvcs_struct *hvcsd = tty->driver_data;
  
@@ -35222,11 +32707,135 @@ index bedc6c1..67a4716 100644
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
-index c4b0ef1..42c0292 100644
---- a/drivers/tty/n_gsm.c
-+++ b/drivers/tty/n_gsm.c
-@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
+diff -urNp linux-3.0.3/drivers/tty/ipwireless/tty.c linux-3.0.3/drivers/tty/ipwireless/tty.c
+--- linux-3.0.3/drivers/tty/ipwireless/tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/ipwireless/tty.c	2011-08-23 21:47:56.000000000 -0400
+@@ -29,6 +29,7 @@
+ #include <linux/tty_driver.h>
+ #include <linux/tty_flip.h>
+ #include <linux/uaccess.h>
++#include <asm/local.h>
+ 
+ #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 == 0)
++	if (local_read(&tty->open_count) == 0)
+ 		tty->tx_bytes_queued = 0;
+ 
+-	tty->open_count++;
++	local_inc(&tty->open_count);
+ 
+ 	tty->linux_tty = linux_tty;
+ 	linux_tty->driver_data = tty;
+@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *l
+ 
+ static void do_ipw_close(struct ipw_tty *tty)
+ {
+-	tty->open_count--;
+-
+-	if (tty->open_count == 0) {
++	if (local_dec_return(&tty->open_count) == 0) {
+ 		struct tty_struct *linux_tty = tty->linux_tty;
+ 
+ 		if (linux_tty != NULL) {
+@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct
+ 		return;
+ 
+ 	mutex_lock(&tty->ipw_tty_mutex);
+-	if (tty->open_count == 0) {
++	if (local_read(&tty->open_count) == 0) {
+ 		mutex_unlock(&tty->ipw_tty_mutex);
+ 		return;
+ 	}
+@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_
+ 		return;
+ 	}
+ 
+-	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;
+ 
+ 	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;
+ 
+-	if (!tty->open_count)
++	if (!local_read(&tty->open_count))
+ 		return -EINVAL;
+ 
+ 	room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
+@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tt
+ 	if (!tty)
+ 		return 0;
+ 
+-	if (!tty->open_count)
++	if (!local_read(&tty->open_count))
+ 		return 0;
+ 
+ 	return tty->tx_bytes_queued;
+@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struc
+ 	if (!tty)
+ 		return -ENODEV;
+ 
+-	if (!tty->open_count)
++	if (!local_read(&tty->open_count))
+ 		return -EINVAL;
+ 
+ 	return get_control_lines(tty);
+@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tt
+ 	if (!tty)
+ 		return -ENODEV;
+ 
+-	if (!tty->open_count)
++	if (!local_read(&tty->open_count))
+ 		return -EINVAL;
+ 
+ 	return set_control_lines(tty, set, clear);
+@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *
+ 	if (!tty)
+ 		return -ENODEV;
+ 
+-	if (!tty->open_count)
++	if (!local_read(&tty->open_count))
+ 		return -EINVAL;
+ 
+ 	/* FIXME: Exactly how is the tty object locked here .. */
+@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty 
+ 				   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-3.0.3/drivers/tty/n_gsm.c linux-3.0.3/drivers/tty/n_gsm.c
+--- linux-3.0.3/drivers/tty/n_gsm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/drivers/tty/n_gsm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
  		return NULL;
  	spin_lock_init(&dlci->lock);
  	dlci->fifo = &dlci->_fifo;
@@ -35235,11 +32844,10 @@ index c4b0ef1..42c0292 100644
  		kfree(dlci);
  		return NULL;
  	}
-diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
-index 428f4fe..36561a9 100644
---- a/drivers/tty/n_tty.c
-+++ b/drivers/tty/n_tty.c
-@@ -2116,6 +2116,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
+diff -urNp linux-3.0.3/drivers/tty/n_tty.c linux-3.0.3/drivers/tty/n_tty.c
+--- linux-3.0.3/drivers/tty/n_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/n_tty.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
  	*ops = tty_ldisc_N_TTY;
  	ops->owner = NULL;
@@ -35248,222 +32856,162 @@ index 428f4fe..36561a9 100644
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
-index 923a485..95f0a42 100644
---- a/drivers/tty/pty.c
-+++ b/drivers/tty/pty.c
-@@ -700,7 +700,18 @@ out:
- 	return retval;
- }
- 
--static struct file_operations ptmx_fops;
-+static const struct file_operations ptmx_fops = {
-+	.llseek		= no_llseek,
-+	.read		= tty_read,
-+	.write		= tty_write,
-+	.poll		= tty_poll,
-+	.unlocked_ioctl	= tty_ioctl,
-+	.compat_ioctl	= tty_compat_ioctl,
-+	.open		= ptmx_open,
-+	.release	= tty_release,
-+	.fasync		= tty_fasync,
-+};
-+
- 
- static void __init unix98_pty_init(void)
- {
-@@ -753,10 +764,6 @@ static void __init unix98_pty_init(void)
- 
+diff -urNp linux-3.0.3/drivers/tty/pty.c linux-3.0.3/drivers/tty/pty.c
+--- linux-3.0.3/drivers/tty/pty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/pty.c	2011-08-23 21:47:56.000000000 -0400
+@@ -754,8 +754,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
--	/* Now create the /dev/ptmx special device */
--	tty_default_fops(&ptmx_fops);
+ 	/* Now create the /dev/ptmx special device */
++	pax_open_kernel();
+ 	tty_default_fops(&ptmx_fops);
 -	ptmx_fops.open = ptmx_open;
--
++	*(void **)&ptmx_fops.open = ptmx_open;
++	pax_close_kernel();
+ 
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
- 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
-diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
-index 25a8bc5..1699dca 100644
---- a/drivers/tty/serial/kgdboc.c
-+++ b/drivers/tty/serial/kgdboc.c
-@@ -22,7 +22,7 @@
+diff -urNp linux-3.0.3/drivers/tty/rocket.c linux-3.0.3/drivers/tty/rocket.c
+--- linux-3.0.3/drivers/tty/rocket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/rocket.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
+ 	struct rocket_ports tmp;
+ 	int board;
  
++	pax_track_stack();
++
+ 	if (!retports)
+ 		return -EFAULT;
+ 	memset(&tmp, 0, sizeof (tmp));
+diff -urNp linux-3.0.3/drivers/tty/serial/kgdboc.c linux-3.0.3/drivers/tty/serial/kgdboc.c
+--- linux-3.0.3/drivers/tty/serial/kgdboc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/serial/kgdboc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN		40
  
--static struct kgdb_io		kgdboc_io_ops;
-+static struct kgdb_io	kgdboc_io_ops;	/* cannot be const, see configure_kgdboc() */
+ static struct kgdb_io		kgdboc_io_ops;
++static struct kgdb_io		kgdboc_io_ops_console;
  
- /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
+-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
++/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
  static int configured		= -1;
-@@ -293,7 +293,7 @@ static void kgdboc_post_exp_handler(void)
- 	kgdboc_restore_input();
- }
- 
--static struct kgdb_io kgdboc_io_ops = {
-+static struct kgdb_io kgdboc_io_ops = {	/* cannot be const, see configure_kgdboc() */
- 	.name			= "kgdboc",
- 	.read_char		= kgdboc_get_char,
- 	.write_char		= kgdboc_put_char,
-diff --git a/drivers/tty/serial/mrst_max3110.c b/drivers/tty/serial/mrst_max3110.c
-index 37e13c3..e86ffa8 100644
---- a/drivers/tty/serial/mrst_max3110.c
-+++ b/drivers/tty/serial/mrst_max3110.c
-@@ -393,6 +393,8 @@ static void max3110_con_receive(struct uart_max3110 *max)
- 	int loop = 1, num, total = 0;
- 	u8 recv_buf[512], *pbuf;
  
-+	pax_track_stack();
-+
- 	pbuf = recv_buf;
- 	do {
- 		num = max3110_read_multi(max, pbuf);
-diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 0065da4..d1c81dd 100644
---- a/drivers/tty/tty_io.c
-+++ b/drivers/tty/tty_io.c
-@@ -140,21 +140,11 @@ EXPORT_SYMBOL(tty_mutex);
- /* Spinlock to protect the tty->tty_files list */
- DEFINE_SPINLOCK(tty_files_lock);
- 
--static ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
--static ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
- ssize_t redirected_tty_write(struct file *, const char __user *,
- 							size_t, loff_t *);
--static unsigned int tty_poll(struct file *, poll_table *);
- static int tty_open(struct inode *, struct file *);
- long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
--#ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
--				unsigned long arg);
--#else
--#define tty_compat_ioctl NULL
--#endif
- static int __tty_fasync(int fd, struct file *filp, int on);
--static int tty_fasync(int fd, struct file *filp, int on);
- static void release_tty(struct tty_struct *tty, int idx);
- static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
- static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
-@@ -938,7 +928,7 @@ EXPORT_SYMBOL(start_tty);
-  *	read calls may be outstanding in parallel.
-  */
- 
--static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
-+ssize_t tty_read(struct file *file, char __user *buf, size_t count,
- 			loff_t *ppos)
- {
- 	int i;
-@@ -964,6 +954,8 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
- 	return i;
+ static char config[MAX_CONFIG_LEN];
+@@ -147,6 +148,8 @@ static void cleanup_kgdboc(void)
+ 	kgdboc_unregister_kbd();
+ 	if (configured == 1)
+ 		kgdb_unregister_io_module(&kgdboc_io_ops);
++	else if (configured == 2)
++		kgdb_unregister_io_module(&kgdboc_io_ops_console);
  }
  
-+EXPORT_SYMBOL(tty_read);
-+
- void tty_write_unlock(struct tty_struct *tty)
- {
- 	mutex_unlock(&tty->atomic_write_lock);
-@@ -1113,7 +1105,7 @@ void tty_write_message(struct tty_struct *tty, char *msg)
-  *	write method will not be invoked in parallel for each device.
-  */
- 
--static ssize_t tty_write(struct file *file, const char __user *buf,
-+ssize_t tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
- 	struct inode *inode = file->f_path.dentry->d_inode;
-@@ -1139,6 +1131,8 @@ static ssize_t tty_write(struct file *file, const char __user *buf,
- 	return ret;
- }
+ static int configure_kgdboc(void)
+@@ -156,13 +159,13 @@ static int configure_kgdboc(void)
+ 	int err;
+ 	char *cptr = config;
+ 	struct console *cons;
++	int is_console = 0;
+ 
+ 	err = kgdboc_option_setup(config);
+ 	if (err || !strlen(config) || isspace(config[0]))
+ 		goto noconfig;
+ 
+ 	err = -ENODEV;
+-	kgdboc_io_ops.is_console = 0;
+ 	kgdb_tty_driver = NULL;
+ 
+ 	kgdboc_use_kms = 0;
+@@ -183,7 +186,7 @@ static int configure_kgdboc(void)
+ 		int idx;
+ 		if (cons->device && cons->device(cons, &idx) == p &&
+ 		    idx == tty_line) {
+-			kgdboc_io_ops.is_console = 1;
++			is_console = 1;
+ 			break;
+ 		}
+ 		cons = cons->next;
+@@ -193,12 +196,16 @@ static int configure_kgdboc(void)
+ 	kgdb_tty_line = tty_line;
+ 
+ do_register:
+-	err = kgdb_register_io_module(&kgdboc_io_ops);
++	if (is_console) {
++		err = kgdb_register_io_module(&kgdboc_io_ops_console);
++		configured = 2;
++	} else {
++		err = kgdb_register_io_module(&kgdboc_io_ops);
++		configured = 1;
++	}
+ 	if (err)
+ 		goto noconfig;
  
-+EXPORT_SYMBOL(tty_write);
-+
- ssize_t redirected_tty_write(struct file *file, const char __user *buf,
- 						size_t count, loff_t *ppos)
- {
-@@ -1778,6 +1772,8 @@ int tty_release(struct inode *inode, struct file *filp)
+-	configured = 1;
+-
  	return 0;
- }
  
-+EXPORT_SYMBOL(tty_release);
-+
- /**
-  *	tty_open		-	open a tty device
-  *	@inode: inode of device file
-@@ -1969,7 +1965,7 @@ got_driver:
-  *	may be re-entered freely by other callers.
-  */
- 
--static unsigned int tty_poll(struct file *filp, poll_table *wait)
-+unsigned int tty_poll(struct file *filp, poll_table *wait)
+ noconfig:
+@@ -212,7 +219,7 @@ noconfig:
+ static int __init init_kgdboc(void)
  {
- 	struct tty_struct *tty = file_tty(filp);
- 	struct tty_ldisc *ld;
-@@ -1985,6 +1981,8 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
- 	return ret;
- }
+ 	/* Already configured? */
+-	if (configured == 1)
++	if (configured >= 1)
+ 		return 0;
  
-+EXPORT_SYMBOL(tty_poll);
-+
- static int __tty_fasync(int fd, struct file *filp, int on)
- {
- 	struct tty_struct *tty = file_tty(filp);
-@@ -2026,7 +2024,7 @@ out:
- 	return retval;
- }
+ 	return configure_kgdboc();
+@@ -261,7 +268,7 @@ static int param_set_kgdboc_var(const ch
+ 	if (config[len - 1] == '\n')
+ 		config[len - 1] = '\0';
  
--static int tty_fasync(int fd, struct file *filp, int on)
-+int tty_fasync(int fd, struct file *filp, int on)
- {
- 	int retval;
- 	tty_lock();
-@@ -2035,6 +2033,8 @@ static int tty_fasync(int fd, struct file *filp, int on)
- 	return retval;
- }
+-	if (configured == 1)
++	if (configured >= 1)
+ 		cleanup_kgdboc();
  
-+EXPORT_SYMBOL(tty_fasync);
-+
- /**
-  *	tiocsti			-	fake input character
-  *	@tty: tty to fake input into
-@@ -2692,8 +2692,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- 	return retval;
- }
+ 	/* Go and configure with the new params. */
+@@ -301,6 +308,15 @@ static struct kgdb_io kgdboc_io_ops = {
+ 	.post_exception		= kgdboc_post_exp_handler,
+ };
  
-+EXPORT_SYMBOL(tty_ioctl);
++static struct kgdb_io kgdboc_io_ops_console = {
++	.name			= "kgdboc",
++	.read_char		= kgdboc_get_char,
++	.write_char		= kgdboc_put_char,
++	.pre_exception		= kgdboc_pre_exp_handler,
++	.post_exception		= kgdboc_post_exp_handler,
++	.is_console		= 1
++};
 +
- #ifdef CONFIG_COMPAT
--static long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+long tty_compat_ioctl(struct file *file, unsigned int cmd,
- 				unsigned long arg)
- {
- 	struct inode *inode = file->f_dentry->d_inode;
-@@ -2717,6 +2719,9 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
+ #ifdef CONFIG_KGDB_SERIAL_CONSOLE
+ /* This is only available if kgdboc is a built in for early debugging */
+ static int __init kgdboc_early_init(char *opt)
+diff -urNp linux-3.0.3/drivers/tty/serial/mrst_max3110.c linux-3.0.3/drivers/tty/serial/mrst_max3110.c
+--- linux-3.0.3/drivers/tty/serial/mrst_max3110.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/serial/mrst_max3110.c	2011-08-23 21:48:14.000000000 -0400
+@@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
+ 	int loop = 1, num, total = 0;
+ 	u8 recv_buf[512], *pbuf;
  
- 	return retval;
- }
-+
-+EXPORT_SYMBOL(tty_compat_ioctl);
++	pax_track_stack();
 +
- #endif
+ 	pbuf = recv_buf;
+ 	do {
+ 		num = max3110_read_multi(max, pbuf);
+diff -urNp linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3/drivers/tty/tty_io.c
+--- linux-3.0.3/drivers/tty/tty_io.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/tty_io.c	2011-08-23 21:47:56.000000000 -0400
+@@ -3215,7 +3215,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
- /*
-@@ -3195,11 +3200,6 @@ struct tty_struct *get_current_tty(void)
+ void tty_default_fops(struct file_operations *fops)
+ {
+-	*fops = tty_fops;
++	memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
  }
- EXPORT_SYMBOL_GPL(get_current_tty);
  
--void tty_default_fops(struct file_operations *fops)
--{
--	*fops = tty_fops;
--}
--
  /*
-  * Initialize the console device. This is called *early*, so
-  * we can't necessarily depend on lots of kernel help here.
-diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
-index 4214d58..4254a13 100644
---- a/drivers/tty/tty_ldisc.c
-+++ b/drivers/tty/tty_ldisc.c
-@@ -76,7 +76,7 @@ static void put_ldisc(struct tty_ldisc *ld)
+diff -urNp linux-3.0.3/drivers/tty/tty_ldisc.c linux-3.0.3/drivers/tty/tty_ldisc.c
+--- linux-3.0.3/drivers/tty/tty_ldisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/tty_ldisc.c	2011-08-23 21:47:56.000000000 -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 = ld->ops;
  
@@ -35472,7 +33020,7 @@ index 4214d58..4254a13 100644
  		module_put(ldo->owner);
  		spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
-@@ -111,7 +111,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
+@@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct 
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
  	tty_ldiscs[disc] = new_ldisc;
  	new_ldisc->num = disc;
@@ -35481,7 +33029,7 @@ index 4214d58..4254a13 100644
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  
  	return ret;
-@@ -139,7 +139,7 @@ int tty_unregister_ldisc(int disc)
+@@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
  		return -EINVAL;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -35490,7 +33038,7 @@ index 4214d58..4254a13 100644
  		ret = -EBUSY;
  	else
  		tty_ldiscs[disc] = NULL;
-@@ -160,7 +160,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
+@@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(i
  	if (ldops) {
  		ret = ERR_PTR(-EAGAIN);
  		if (try_module_get(ldops->owner)) {
@@ -35499,7 +33047,7 @@ index 4214d58..4254a13 100644
  			ret = ldops;
  		}
  	}
-@@ -173,7 +173,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
+@@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_o
  	unsigned long flags;
  
  	spin_lock_irqsave(&tty_ldisc_lock, flags);
@@ -35508,12 +33056,11 @@ index 4214d58..4254a13 100644
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
-index e95d787..3bc1ca2 100644
---- a/drivers/tty/vt/keyboard.c
-+++ b/drivers/tty/vt/keyboard.c
-@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
- 	     kbd->kbdmode == VC_MEDIUMRAW) &&
+diff -urNp linux-3.0.3/drivers/tty/vt/keyboard.c linux-3.0.3/drivers/tty/vt/keyboard.c
+--- linux-3.0.3/drivers/tty/vt/keyboard.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/vt/keyboard.c	2011-08-23 21:48:14.000000000 -0400
+@@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
+ 	     kbd->kbdmode == VC_OFF) &&
  	     value != KVAL(K_SAK))
  		return;		/* SAK is allowed even in raw mode */
 +
@@ -35529,11 +33076,10 @@ index e95d787..3bc1ca2 100644
  	fn_handler[value](vc);
  }
  
-diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
-index 147ede3..1610f45 100644
---- a/drivers/tty/vt/vt.c
-+++ b/drivers/tty/vt/vt.c
-@@ -262,7 +262,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier);
+diff -urNp linux-3.0.3/drivers/tty/vt/vt.c linux-3.0.3/drivers/tty/vt/vt.c
+--- linux-3.0.3/drivers/tty/vt/vt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/vt/vt.c	2011-08-23 21:47:56.000000000 -0400
+@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
  {
@@ -35542,11 +33088,10 @@ index 147ede3..1610f45 100644
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
-index 1235ebd..1b4973d 100644
---- a/drivers/tty/vt/vt_ioctl.c
-+++ b/drivers/tty/vt/vt_ioctl.c
-@@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
+diff -urNp linux-3.0.3/drivers/tty/vt/vt_ioctl.c linux-3.0.3/drivers/tty/vt/vt_ioctl.c
+--- linux-3.0.3/drivers/tty/vt/vt_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/tty/vt/vt_ioctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  	if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
  		return -EFAULT;
  
@@ -35556,7 +33101,7 @@ index 1235ebd..1b4973d 100644
  	switch (cmd) {
  	case KDGKBENT:
  		key_map = key_maps[s];
-@@ -224,6 +221,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
+@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __
  		    val = (i ? K_HOLE : K_NOSUCHMAP);
  		return put_user(val, &user_kbe->kb_value);
  	case KDSKBENT:
@@ -35566,7 +33111,7 @@ index 1235ebd..1b4973d 100644
  		if (!perm)
  			return -EPERM;
  		if (!i && v == K_NOSUCHMAP) {
-@@ -325,9 +325,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
  	int i, j, k;
  	int ret;
  
@@ -35576,7 +33121,7 @@ index 1235ebd..1b4973d 100644
  	kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
  	if (!kbs) {
  		ret = -ENOMEM;
-@@ -361,6 +358,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
+@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
  		kfree(kbs);
  		return ((p && *p) ? -EOVERFLOW : 0);
  	case KDSKBSENT:
@@ -35586,10 +33131,9 @@ index 1235ebd..1b4973d 100644
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
-index 51fe179..5acadc0 100644
---- a/drivers/uio/uio.c
-+++ b/drivers/uio/uio.c
+diff -urNp linux-3.0.3/drivers/uio/uio.c linux-3.0.3/drivers/uio/uio.c
+--- linux-3.0.3/drivers/uio/uio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/uio/uio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -35611,7 +33155,7 @@ index 51fe179..5acadc0 100644
  	struct uio_info		*info;
  	struct kobject		*map_dir;
  	struct kobject		*portio_dir;
-@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
+@@ -242,7 +243,7 @@ static ssize_t show_event(struct device 
  			  struct device_attribute *attr, char *buf)
  {
  	struct uio_device *idev = dev_get_drvdata(dev);
@@ -35620,7 +33164,7 @@ index 51fe179..5acadc0 100644
  }
  
  static struct device_attribute uio_class_attributes[] = {
-@@ -402,7 +403,7 @@ void uio_event_notify(struct uio_info *info)
+@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *i
  {
  	struct uio_device *idev = info->uio_dev;
  
@@ -35629,7 +33173,7 @@ index 51fe179..5acadc0 100644
  	wake_up_interruptible(&idev->wait);
  	kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
  }
-@@ -455,7 +456,7 @@ static int uio_open(struct inode *inode, struct file *filep)
+@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode,
  	}
  
  	listener->dev = idev;
@@ -35638,7 +33182,7 @@ index 51fe179..5acadc0 100644
  	filep->private_data = listener;
  
  	if (idev->info->open) {
-@@ -506,7 +507,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
+@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file
  		return -EIO;
  
  	poll_wait(filep, &idev->wait, wait);
@@ -35647,7 +33191,7 @@ index 51fe179..5acadc0 100644
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-@@ -531,7 +532,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
+@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *fil
  	do {
  		set_current_state(TASK_INTERRUPTIBLE);
  
@@ -35656,7 +33200,7 @@ index 51fe179..5acadc0 100644
  		if (event_count != listener->event_count) {
  			if (copy_to_user(buf, &event_count, count))
  				retval = -EFAULT;
-@@ -602,13 +603,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
+@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_
  static void uio_vma_open(struct vm_area_struct *vma)
  {
  	struct uio_device *idev = vma->vm_private_data;
@@ -35672,7 +33216,7 @@ index 51fe179..5acadc0 100644
  }
  
  static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
-@@ -819,7 +820,7 @@ int __uio_register_device(struct module *owner,
+@@ -823,7 +824,7 @@ int __uio_register_device(struct module 
  	idev->owner = owner;
  	idev->info = info;
  	init_waitqueue_head(&idev->wait);
@@ -35681,11 +33225,10 @@ index 51fe179..5acadc0 100644
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
-index a845f8b..4f54072 100644
---- a/drivers/usb/atm/cxacru.c
-+++ b/drivers/usb/atm/cxacru.c
-@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
+diff -urNp linux-3.0.3/drivers/usb/atm/cxacru.c linux-3.0.3/drivers/usb/atm/cxacru.c
+--- linux-3.0.3/drivers/usb/atm/cxacru.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/atm/cxacru.c	2011-08-23 21:47:56.000000000 -0400
+@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
  		ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
  		if (ret < 2)
  			return -EINVAL;
@@ -35694,11 +33237,10 @@ index a845f8b..4f54072 100644
  			return -EINVAL;
  		pos += tmp;
  
-diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
-index 989e16e..32c4bc7 100644
---- a/drivers/usb/atm/usbatm.c
-+++ b/drivers/usb/atm/usbatm.c
-@@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+diff -urNp linux-3.0.3/drivers/usb/atm/usbatm.c linux-3.0.3/drivers/usb/atm/usbatm.c
+--- linux-3.0.3/drivers/usb/atm/usbatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/atm/usbatm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -332,7 +332,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);
@@ -35707,7 +33249,7 @@ index 989e16e..32c4bc7 100644
  		return;
  	}
  
-@@ -360,7 +360,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -360,7 +360,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);
@@ -35716,7 +33258,7 @@ index 989e16e..32c4bc7 100644
  			goto out;
  		}
  
-@@ -369,14 +369,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -369,14 +369,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);
@@ -35733,7 +33275,7 @@ index 989e16e..32c4bc7 100644
  			goto out;
  		}
  
-@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(stru
  			if (printk_ratelimit())
  				atm_err(instance, "%s: no memory for skb (length: %u)!\n",
  					__func__, length);
@@ -35742,7 +33284,7 @@ index 989e16e..32c4bc7 100644
  			goto out;
  		}
  
-@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
+@@ -411,7 +411,7 @@ static void usbatm_extract_one_cell(stru
  
  		vcc->push(vcc, skb);
  
@@ -35751,7 +33293,7 @@ index 989e16e..32c4bc7 100644
  	out:
  		skb_trim(sarb, 0);
  	}
-@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned long data)
+@@ -614,7 +614,7 @@ static void usbatm_tx_process(unsigned l
  			struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
  
  			usbatm_pop(vcc, skb);
@@ -35760,7 +33302,7 @@ index 989e16e..32c4bc7 100644
  
  			skb = skb_dequeue(&instance->sndqueue);
  		}
-@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
+@@ -773,11 +773,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",
@@ -35777,11 +33319,10 @@ index 989e16e..32c4bc7 100644
  
  	if (!left--) {
  		if (instance->disconnected)
-diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
-index 96fdfb8..7b4b93b 100644
---- a/drivers/usb/core/devices.c
-+++ b/drivers/usb/core/devices.c
-@@ -126,7 +126,7 @@ static const char *format_endpt =
+diff -urNp linux-3.0.3/drivers/usb/core/devices.c linux-3.0.3/drivers/usb/core/devices.c
+--- linux-3.0.3/drivers/usb/core/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/core/devices.c	2011-08-23 21:47:56.000000000 -0400
+@@ -126,7 +126,7 @@ static const char format_endpt[] =
   * time it gets called.
   */
  static struct device_connect_event {
@@ -35790,7 +33331,7 @@ index 96fdfb8..7b4b93b 100644
  	wait_queue_head_t wait;
  } device_event = {
  	.count = ATOMIC_INIT(1),
-@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
+@@ -164,7 +164,7 @@ static const struct class_info clas_info
  
  void usbfs_conn_disc_event(void)
  {
@@ -35799,7 +33340,7 @@ index 96fdfb8..7b4b93b 100644
  	wake_up(&device_event.wait);
  }
  
-@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
+@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(stru
  
  	poll_wait(file, &device_event.wait, wait);
  
@@ -35808,33 +33349,10 @@ index 96fdfb8..7b4b93b 100644
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index a27dd22..973e94b 100644
---- a/drivers/usb/core/hcd.c
-+++ b/drivers/usb/core/hcd.c
-@@ -2454,7 +2454,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);
- 
- #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
- 
--struct usb_mon_operations *mon_ops;
-+const struct usb_mon_operations *mon_ops;
- 
- /*
-  * The registration is unlocked.
-@@ -2464,7 +2464,7 @@ struct usb_mon_operations *mon_ops;
-  * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
-  */
-  
--int usb_mon_register (struct usb_mon_operations *ops)
-+int usb_mon_register (const struct usb_mon_operations *ops)
- {
- 
- 	if (mon_ops)
-diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 8324874..2b581f6 100644
---- a/drivers/usb/core/message.c
-+++ b/drivers/usb/core/message.c
-@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
+diff -urNp linux-3.0.3/drivers/usb/core/message.c linux-3.0.3/drivers/usb/core/message.c
+--- linux-3.0.3/drivers/usb/core/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/core/message.c	2011-08-23 21:47:56.000000000 -0400
+@@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
  	buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
  	if (buf) {
  		len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
@@ -35845,33 +33363,50 @@ index 8324874..2b581f6 100644
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
-index 94ecdbc..414125e 100644
---- a/drivers/usb/early/ehci-dbgp.c
-+++ b/drivers/usb/early/ehci-dbgp.c
-@@ -96,7 +96,7 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
- }
+diff -urNp linux-3.0.3/drivers/usb/early/ehci-dbgp.c linux-3.0.3/drivers/usb/early/ehci-dbgp.c
+--- linux-3.0.3/drivers/usb/early/ehci-dbgp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/early/ehci-dbgp.c	2011-08-23 21:47:56.000000000 -0400
+@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
--static struct kgdb_io kgdbdbgp_io_ops;
-+static struct kgdb_io kgdbdbgp_io_ops;	/* cannot be const, see kgdbdbgp_parse_config */
- #define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
+ static struct kgdb_io kgdbdbgp_io_ops;
+-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
++static struct kgdb_io kgdbdbgp_io_ops_console;
++#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
  #else
  #define dbgp_kgdb_mode (0)
-@@ -1026,7 +1026,7 @@ static void kgdbdbgp_write_char(u8 chr)
- 	early_dbgp_write(NULL, &chr, 1);
- }
- 
--static struct kgdb_io kgdbdbgp_io_ops = {
-+static struct kgdb_io kgdbdbgp_io_ops = {	/* cannot be const, see kgdbdbgp_parse_config() */
- 	.name = "kgdbdbgp",
- 	.read_char = kgdbdbgp_read_char,
+ #endif
+@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = 
  	.write_char = kgdbdbgp_write_char,
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 175434d..d63e1a8 100644
---- a/drivers/usb/host/xhci-mem.c
-+++ b/drivers/usb/host/xhci-mem.c
-@@ -1615,6 +1615,8 @@ static int xhci_check_trb_in_td_math(struct xhci_hcd *xhci, gfp_t mem_flags)
+ };
+ 
++static struct kgdb_io kgdbdbgp_io_ops_console = {
++	.name = "kgdbdbgp",
++	.read_char = kgdbdbgp_read_char,
++	.write_char = kgdbdbgp_write_char,
++	.is_console = 1
++};
++
+ static int kgdbdbgp_wait_time;
+ 
+ static int __init kgdbdbgp_parse_config(char *str)
+@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(
+ 		ptr++;
+ 		kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
+ 	}
+-	kgdb_register_io_module(&kgdbdbgp_io_ops);
+-	kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
++	if (early_dbgp_console.index != -1)
++		kgdb_register_io_module(&kgdbdbgp_io_ops_console);
++	else
++		kgdb_register_io_module(&kgdbdbgp_io_ops);
+ 
+ 	return 0;
+ }
+diff -urNp linux-3.0.3/drivers/usb/host/xhci-mem.c linux-3.0.3/drivers/usb/host/xhci-mem.c
+--- linux-3.0.3/drivers/usb/host/xhci-mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/host/xhci-mem.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
  	unsigned int num_tests;
  	int i, ret;
  
@@ -35880,23 +33415,9 @@ index 175434d..d63e1a8 100644
  	num_tests = ARRAY_SIZE(simple_test_vector);
  	for (i = 0; i < num_tests; i++) {
  		ret = xhci_test_trb_in_td(xhci,
-diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
-index 1040511..64d4ce2 100644
---- a/drivers/usb/mon/mon_main.c
-+++ b/drivers/usb/mon/mon_main.c
-@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
- /*
-  * Ops
-  */
--static struct usb_mon_operations mon_ops_0 = {
-+static const struct usb_mon_operations mon_ops_0 = {
- 	.urb_submit =	mon_submit,
- 	.urb_submit_error = mon_submit_error,
- 	.urb_complete =	mon_complete,
-diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
-index d6bea3e..60b250e 100644
---- a/drivers/usb/wusbcore/wa-hc.h
-+++ b/drivers/usb/wusbcore/wa-hc.h
+diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-hc.h linux-3.0.3/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.0.3/drivers/usb/wusbcore/wa-hc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/wusbcore/wa-hc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
  	struct list_head xfer_delayed_list;
  	spinlock_t xfer_list_lock;
@@ -35906,7 +33427,7 @@ index d6bea3e..60b250e 100644
  };
  
  
-@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
+@@ -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);
@@ -35915,10 +33436,9 @@ index d6bea3e..60b250e 100644
  }
  
  /**
-diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
-index 84b744c..5674ac2 100644
---- a/drivers/usb/wusbcore/wa-xfer.c
-+++ b/drivers/usb/wusbcore/wa-xfer.c
+diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c	2011-08-23 21:47:56.000000000 -0400
 @@ -294,7 +294,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -35928,11 +33448,10 @@ index 84b744c..5674ac2 100644
  }
  
  /*
-diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
-index ade0568..e9dee76 100644
---- a/drivers/vhost/vhost.c
-+++ b/drivers/vhost/vhost.c
-@@ -565,7 +565,7 @@ static int init_used(struct vhost_virtqueue *vq,
+diff -urNp linux-3.0.3/drivers/vhost/vhost.c linux-3.0.3/drivers/vhost/vhost.c
+--- linux-3.0.3/drivers/vhost/vhost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/vhost/vhost.c	2011-08-23 21:47:56.000000000 -0400
+@@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
  	return get_user(vq->last_used_idx, &used->idx);
  }
  
@@ -35941,11 +33460,10 @@ index ade0568..e9dee76 100644
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
-index 5c3960d..15cf8fc 100644
---- a/drivers/video/fbcmap.c
-+++ b/drivers/video/fbcmap.c
-@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
+diff -urNp linux-3.0.3/drivers/video/fbcmap.c linux-3.0.3/drivers/video/fbcmap.c
+--- linux-3.0.3/drivers/video/fbcmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/fbcmap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
  		rc = -ENODEV;
  		goto out;
  	}
@@ -35955,11 +33473,10 @@ index 5c3960d..15cf8fc 100644
  		rc = -EINVAL;
  		goto out1;
  	}
-diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
-index e2bf953..337954a 100644
---- a/drivers/video/fbmem.c
-+++ b/drivers/video/fbmem.c
-@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+diff -urNp linux-3.0.3/drivers/video/fbmem.c linux-3.0.3/drivers/video/fbmem.c
+--- linux-3.0.3/drivers/video/fbmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/fbmem.c	2011-08-23 21:48:14.000000000 -0400
+@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dx += image->width + 8;
  		}
  	} else if (rotate == FB_ROTATE_UD) {
@@ -35968,7 +33485,7 @@ index e2bf953..337954a 100644
  			info->fbops->fb_imageblit(info, image);
  			image->dx -= image->width + 8;
  		}
-@@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
+@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_in
  			image->dy += image->height + 8;
  		}
  	} else if (rotate == FB_ROTATE_CCW) {
@@ -35977,7 +33494,7 @@ index e2bf953..337954a 100644
  			info->fbops->fb_imageblit(info, image);
  			image->dy -= image->height + 8;
  		}
-@@ -897,6 +897,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
+@@ -939,6 +939,8 @@ fb_set_var(struct fb_info *info, struct 
  	int flags = info->flags;
  	int ret = 0;
  
@@ -35986,7 +33503,7 @@ index e2bf953..337954a 100644
  	if (var->activate & FB_ACTIVATE_INV_MODE) {
  		struct fb_videomode mode1, mode2;
  
-@@ -1022,6 +1024,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1064,6 +1066,8 @@ static long do_fb_ioctl(struct fb_info *
  	void __user *argp = (void __user *)arg;
  	long ret = 0;
  
@@ -35995,7 +33512,7 @@ index e2bf953..337954a 100644
  	switch (cmd) {
  	case FBIOGET_VSCREENINFO:
  		if (!lock_fb_info(info))
-@@ -1101,7 +1105,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
+@@ -1143,7 +1147,7 @@ static long do_fb_ioctl(struct fb_info *
  			return -EFAULT;
  		if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
  			return -EINVAL;
@@ -36004,11 +33521,10 @@ index e2bf953..337954a 100644
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
-index f5bedee..28c6028 100644
---- a/drivers/video/i810/i810_accel.c
-+++ b/drivers/video/i810/i810_accel.c
-@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
+diff -urNp linux-3.0.3/drivers/video/i810/i810_accel.c linux-3.0.3/drivers/video/i810/i810_accel.c
+--- linux-3.0.3/drivers/video/i810/i810_accel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/i810/i810_accel.c	2011-08-23 21:47:56.000000000 -0400
+@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
  		}
  	}
  	printk("ringbuffer lockup!!!\n");
@@ -36016,24 +33532,10 @@ index f5bedee..28c6028 100644
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff --git a/drivers/video/pxa3xx-gcu.c b/drivers/video/pxa3xx-gcu.c
-index cf4beb9..378e591 100644
---- a/drivers/video/pxa3xx-gcu.c
-+++ b/drivers/video/pxa3xx-gcu.c
-@@ -103,7 +103,7 @@ struct pxa3xx_gcu_priv {
- 	dma_addr_t		  shared_phys;
- 	struct resource		 *resource_mem;
- 	struct miscdevice	  misc_dev;
--	struct file_operations	  misc_fops;
-+	const struct file_operations	  misc_fops;
- 	wait_queue_head_t	  wait_idle;
- 	wait_queue_head_t	  wait_free;
- 	spinlock_t		  spinlock;
-diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
-index 2c8364e..ef9ea63 100644
---- a/drivers/video/udlfb.c
-+++ b/drivers/video/udlfb.c
-@@ -584,11 +584,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
+diff -urNp linux-3.0.3/drivers/video/udlfb.c linux-3.0.3/drivers/video/udlfb.c
+--- linux-3.0.3/drivers/video/udlfb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/udlfb.c	2011-08-23 21:47:56.000000000 -0400
+@@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data 
  		dlfb_urb_completion(urb);
  
  error:
@@ -36049,7 +33551,7 @@ index 2c8364e..ef9ea63 100644
  		    >> 10)), /* Kcycles */
  		   &dev->cpu_kcycles_used);
  
-@@ -709,11 +709,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
+@@ -711,11 +711,11 @@ static void dlfb_dpy_deferred_io(struct 
  		dlfb_urb_completion(urb);
  
  error:
@@ -36065,7 +33567,7 @@ index 2c8364e..ef9ea63 100644
  		    >> 10)), /* Kcycles */
  		   &dev->cpu_kcycles_used);
  }
-@@ -1301,7 +1301,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
+@@ -1307,7 +1307,7 @@ static ssize_t metrics_bytes_rendered_sh
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36074,7 +33576,7 @@ index 2c8364e..ef9ea63 100644
  }
  
  static ssize_t metrics_bytes_identical_show(struct device *fbdev,
-@@ -1309,7 +1309,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
+@@ -1315,7 +1315,7 @@ static ssize_t metrics_bytes_identical_s
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36083,7 +33585,7 @@ index 2c8364e..ef9ea63 100644
  }
  
  static ssize_t metrics_bytes_sent_show(struct device *fbdev,
-@@ -1317,7 +1317,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
+@@ -1323,7 +1323,7 @@ static ssize_t metrics_bytes_sent_show(s
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36092,7 +33594,7 @@ index 2c8364e..ef9ea63 100644
  }
  
  static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
-@@ -1325,7 +1325,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
+@@ -1331,7 +1331,7 @@ static ssize_t metrics_cpu_kcycles_used_
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  	return snprintf(buf, PAGE_SIZE, "%u\n",
@@ -36101,7 +33603,7 @@ index 2c8364e..ef9ea63 100644
  }
  
  static ssize_t edid_show(
-@@ -1382,10 +1382,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
+@@ -1388,10 +1388,10 @@ static ssize_t metrics_reset_store(struc
  	struct fb_info *fb_info = dev_get_drvdata(fbdev);
  	struct dlfb_data *dev = fb_info->par;
  
@@ -36116,10 +33618,9 @@ index 2c8364e..ef9ea63 100644
  
  	return count;
  }
-diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
-index 52ec095..f2b41a5 100644
---- a/drivers/video/uvesafb.c
-+++ b/drivers/video/uvesafb.c
+diff -urNp linux-3.0.3/drivers/video/uvesafb.c linux-3.0.3/drivers/video/uvesafb.c
+--- linux-3.0.3/drivers/video/uvesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/uvesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -36137,7 +33638,7 @@ index 52ec095..f2b41a5 100644
  }
  
  /*
-@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
+@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(
  	if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
  		par->pmi_setpal = par->ypan = 0;
  	} else {
@@ -36170,7 +33671,7 @@ index 52ec095..f2b41a5 100644
  		printk(KERN_INFO "uvesafb: protected mode interface info at "
  				 "%04x:%04x\n",
  				 (u16)task->t.regs.es, (u16)task->t.regs.edi);
-@@ -1800,6 +1823,11 @@ out:
+@@ -1821,6 +1844,11 @@ out:
  	if (par->vbe_modes)
  		kfree(par->vbe_modes);
  
@@ -36182,7 +33683,7 @@ index 52ec095..f2b41a5 100644
  	framebuffer_release(info);
  	return err;
  }
-@@ -1826,6 +1854,12 @@ static int uvesafb_remove(struct platform_device *dev)
+@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platfor
  				kfree(par->vbe_state_orig);
  			if (par->vbe_state_saved)
  				kfree(par->vbe_state_saved);
@@ -36195,10 +33696,9 @@ index 52ec095..f2b41a5 100644
  		}
  
  		framebuffer_release(info);
-diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
-index 6a069d0..c039b56 100644
---- a/drivers/video/vesafb.c
-+++ b/drivers/video/vesafb.c
+diff -urNp linux-3.0.3/drivers/video/vesafb.c linux-3.0.3/drivers/video/vesafb.c
+--- linux-3.0.3/drivers/video/vesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/vesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -36207,7 +33707,7 @@ index 6a069d0..c039b56 100644
  #include <linux/kernel.h>
  #include <linux/errno.h>
  #include <linux/string.h>
-@@ -52,8 +53,8 @@ static int   vram_remap __initdata;		/* Set amount of memory to be used */
+@@ -52,8 +53,8 @@ static int   vram_remap __initdata;		/* 
  static int   vram_total __initdata;		/* Set total amount of memory */
  static int   pmi_setpal __read_mostly = 1;	/* pmi for palette changes ??? */
  static int   ypan       __read_mostly;		/* 0..nothing, 1..ypan, 2..ywrap */
@@ -36218,7 +33718,7 @@ index 6a069d0..c039b56 100644
  static int   depth      __read_mostly;
  static int   vga_compat __read_mostly;
  /* --------------------------------------------------------------------- */
-@@ -232,6 +233,7 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct pl
  	unsigned int size_vmode;
  	unsigned int size_remap;
  	unsigned int size_total;
@@ -36226,7 +33726,7 @@ index 6a069d0..c039b56 100644
  
  	if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
  		return -ENODEV;
-@@ -274,10 +276,6 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct pl
  		size_remap = size_total;
  	vesafb_fix.smem_len = size_remap;
  
@@ -36237,7 +33737,7 @@ index 6a069d0..c039b56 100644
  	if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
  		printk(KERN_WARNING
  		       "vesafb: cannot reserve video memory at 0x%lx\n",
-@@ -319,9 +317,21 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct pl
  	printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
  	       vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
  
@@ -36261,21 +33761,20 @@ index 6a069d0..c039b56 100644
  	}
  
  	if (screen_info.vesapm_seg < 0xc000)
-@@ -329,9 +339,25 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct pl
  
  	if (ypan || pmi_setpal) {
  		unsigned short *pmi_base;
--		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
++
+ 		pmi_base  = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
 -		pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
 -		pmi_pal   = (void*)((char*)pmi_base + pmi_base[2]);
 +
-+		pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
-+
 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
 +		pax_open_kernel();
 +		memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
 +#else
-+		pmi_code = pmi_base;
++		pmi_code  = pmi_base;
 +#endif
 +
 +		pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
@@ -36290,7 +33789,7 @@ index 6a069d0..c039b56 100644
  		printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
  		if (pmi_base[3]) {
  			printk(KERN_INFO "vesafb: pmi: ports = ");
-@@ -473,6 +499,11 @@ static int __init vesafb_probe(struct platform_device *dev)
+@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct pl
  	       info->node, info->fix.id);
  	return 0;
  err:
@@ -36302,11 +33801,22 @@ index 6a069d0..c039b56 100644
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
-index 0f1da45..63e50e5 100644
---- a/drivers/virtio/virtio_balloon.c
-+++ b/drivers/virtio/virtio_balloon.c
-@@ -176,6 +176,8 @@ static void update_balloon_stats(struct virtio_balloon *vb)
+diff -urNp linux-3.0.3/drivers/video/via/via_clock.h linux-3.0.3/drivers/video/via/via_clock.h
+--- linux-3.0.3/drivers/video/via/via_clock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/video/via/via_clock.h	2011-08-23 21:47:56.000000000 -0400
+@@ -56,7 +56,7 @@ struct via_clock {
+ 
+ 	void (*set_engine_pll_state)(u8 state);
+ 	void (*set_engine_pll)(struct via_pll_config config);
+-};
++} __no_const;
+ 
+ 
+ static inline u32 get_pll_internal_frequency(u32 ref_freq,
+diff -urNp linux-3.0.3/drivers/virtio/virtio_balloon.c linux-3.0.3/drivers/virtio/virtio_balloon.c
+--- linux-3.0.3/drivers/virtio/virtio_balloon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/drivers/virtio/virtio_balloon.c	2011-08-23 21:48:14.000000000 -0400
+@@ -174,6 +174,8 @@ static void update_balloon_stats(struct 
  	struct sysinfo i;
  	int idx = 0;
  
@@ -36315,11 +33825,10 @@ index 0f1da45..63e50e5 100644
  	all_vm_events(events);
  	si_meminfo(&i);
  
-diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
-index b76a40b..2ae89d4 100644
---- a/fs/9p/vfs_inode.c
-+++ b/fs/9p/vfs_inode.c
-@@ -1094,7 +1094,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+diff -urNp linux-3.0.3/fs/9p/vfs_inode.c linux-3.0.3/fs/9p/vfs_inode.c
+--- linux-3.0.3/fs/9p/vfs_inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/9p/vfs_inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -36328,24 +33837,10 @@ index b76a40b..2ae89d4 100644
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
-index 79e2ca7..5828ad1 100644
---- a/fs/Kconfig.binfmt
-+++ b/fs/Kconfig.binfmt
-@@ -86,7 +86,7 @@ config HAVE_AOUT
- 
- config BINFMT_AOUT
- 	tristate "Kernel support for a.out and ECOFF binaries"
--	depends on HAVE_AOUT
-+	depends on HAVE_AOUT && BROKEN
- 	---help---
- 	  A.out (Assembler.OUTput) is a set of formats for libraries and
- 	  executables used in the earliest versions of UNIX.  Linux used
-diff --git a/fs/aio.c b/fs/aio.c
-index 88f0ed5..48eaaf0 100644
---- a/fs/aio.c
-+++ b/fs/aio.c
-@@ -130,7 +130,7 @@ static int aio_setup_ring(struct kioctx *ctx)
+diff -urNp linux-3.0.3/fs/aio.c linux-3.0.3/fs/aio.c
+--- linux-3.0.3/fs/aio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/aio.c	2011-08-23 21:48:14.000000000 -0400
+@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx 
  	size += sizeof(struct io_event) * nr_events;
  	nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
  
@@ -36354,7 +33849,7 @@ index 88f0ed5..48eaaf0 100644
  		return -EINVAL;
  
  	nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
-@@ -1099,6 +1099,8 @@ static int read_events(struct kioctx *ctx,
+@@ -1088,6 +1088,8 @@ static int read_events(struct kioctx *ct
  	struct aio_timeout	to;
  	int			retry = 0;
  
@@ -36363,11 +33858,40 @@ index 88f0ed5..48eaaf0 100644
  	/* needed to zero any padding within an entry (there shouldn't be 
  	 * any, but C is fun!
  	 */
-diff --git a/fs/attr.c b/fs/attr.c
-index 7ca4181..afd07f2 100644
---- a/fs/attr.c
-+++ b/fs/attr.c
-@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
+@@ -1381,22 +1383,27 @@ static ssize_t aio_fsync(struct kiocb *i
+ static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
+ {
+ 	ssize_t ret;
++	struct iovec iovstack;
+ 
+ #ifdef CONFIG_COMPAT
+ 	if (compat)
+ 		ret = compat_rw_copy_check_uvector(type,
+ 				(struct compat_iovec __user *)kiocb->ki_buf,
+-				kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
++				kiocb->ki_nbytes, 1, &iovstack,
+ 				&kiocb->ki_iovec);
+ 	else
+ #endif
+ 		ret = rw_copy_check_uvector(type,
+ 				(struct iovec __user *)kiocb->ki_buf,
+-				kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
++				kiocb->ki_nbytes, 1, &iovstack,
+ 				&kiocb->ki_iovec);
+ 	if (ret < 0)
+ 		goto out;
+ 
++	if (kiocb->ki_iovec == &iovstack) {
++		kiocb->ki_inline_vec = iovstack;
++		kiocb->ki_iovec = &kiocb->ki_inline_vec;
++	}
+ 	kiocb->ki_nr_segs = kiocb->ki_nbytes;
+ 	kiocb->ki_cur_seg = 0;
+ 	/* ki_nbytes/left now reflect bytes instead of segs */
+diff -urNp linux-3.0.3/fs/attr.c linux-3.0.3/fs/attr.c
+--- linux-3.0.3/fs/attr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/attr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
  		unsigned long limit;
  
  		limit = rlimit(RLIMIT_FSIZE);
@@ -36375,11 +33899,10 @@ index 7ca4181..afd07f2 100644
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
-index b1d0c79..7e0918f 100644
---- a/fs/befs/linuxvfs.c
-+++ b/fs/befs/linuxvfs.c
-@@ -499,7 +499,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
+diff -urNp linux-3.0.3/fs/befs/linuxvfs.c linux-3.0.3/fs/befs/linuxvfs.c
+--- linux-3.0.3/fs/befs/linuxvfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/befs/linuxvfs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
  	if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
@@ -36388,10 +33911,9 @@ index b1d0c79..7e0918f 100644
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
-index a6395bd..a5b24c4 100644
---- a/fs/binfmt_aout.c
-+++ b/fs/binfmt_aout.c
+diff -urNp linux-3.0.3/fs/binfmt_aout.c linux-3.0.3/fs/binfmt_aout.c
+--- linux-3.0.3/fs/binfmt_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/binfmt_aout.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -36400,7 +33922,7 @@ index a6395bd..a5b24c4 100644
  #include <linux/stat.h>
  #include <linux/fcntl.h>
  #include <linux/ptrace.h>
-@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredum
  #endif
  #       define START_STACK(u)   ((void __user *)u.start_stack)
  
@@ -36409,7 +33931,7 @@ index a6395bd..a5b24c4 100644
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
+@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredum
  
  /* If the size of the dump file exceeds the rlimit, then see what would happen
     if we wrote the stack, but not the data area.  */
@@ -36422,7 +33944,7 @@ index a6395bd..a5b24c4 100644
  	if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
  		dump.u_ssize = 0;
  
-@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux
  	rlim = rlimit(RLIMIT_DATA);
  	if (rlim >= RLIM_INFINITY)
  		rlim = ~0;
@@ -36431,7 +33953,7 @@ index a6395bd..a5b24c4 100644
  	if (ex.a_data + ex.a_bss > rlim)
  		return -ENOMEM;
  
-@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -262,6 +269,27 @@ static int load_aout_binary(struct linux
  	install_exec_creds(bprm);
   	current->flags &= ~PF_FORKNOEXEC;
  
@@ -36459,7 +33981,7 @@ index a6395bd..a5b24c4 100644
  	if (N_MAGIC(ex) == OMAGIC) {
  		unsigned long text_addr, map_size;
  		loff_t pos;
-@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
+@@ -334,7 +362,7 @@ static int load_aout_binary(struct linux
  
  		down_write(&current->mm->mmap_sem);
   		error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
@@ -36468,11 +33990,10 @@ index a6395bd..a5b24c4 100644
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
-index 70470b2..3052b8a 100644
---- a/fs/binfmt_elf.c
-+++ b/fs/binfmt_elf.c
-@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump_params *cprm);
+diff -urNp linux-3.0.3/fs/binfmt_elf.c linux-3.0.3/fs/binfmt_elf.c
+--- linux-3.0.3/fs/binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/binfmt_elf.c	2011-08-23 21:48:14.000000000 -0400
+@@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump	NULL
  #endif
  
@@ -36483,7 +34004,7 @@ index 70470b2..3052b8a 100644
  #if ELF_EXEC_PAGESIZE > PAGE_SIZE
  #define ELF_MIN_ALIGN	ELF_EXEC_PAGESIZE
  #else
-@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = {
+@@ -70,6 +74,11 @@ static struct linux_binfmt elf_format = 
  	.load_binary	= load_elf_binary,
  	.load_shlib	= load_elf_library,
  	.core_dump	= elf_core_dump,
@@ -36495,7 +34016,7 @@ index 70470b2..3052b8a 100644
  	.min_coredump	= ELF_EXEC_PAGESIZE,
  };
  
-@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = {
+@@ -77,6 +86,8 @@ static struct linux_binfmt elf_format = 
  
  static int set_brk(unsigned long start, unsigned long end)
  {
@@ -36504,7 +34025,7 @@ index 70470b2..3052b8a 100644
  	start = ELF_PAGEALIGN(start);
  	end = ELF_PAGEALIGN(end);
  	if (end > start) {
-@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, unsigned long end)
+@@ -87,7 +98,7 @@ static int set_brk(unsigned long start, 
  		if (BAD_ADDR(addr))
  			return addr;
  	}
@@ -36513,7 +34034,7 @@ index 70470b2..3052b8a 100644
  	return 0;
  }
  
-@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -148,12 +159,15 @@ create_elf_tables(struct linux_binprm *b
  	elf_addr_t __user *u_rand_bytes;
  	const char *k_platform = ELF_PLATFORM;
  	const char *k_base_platform = ELF_BASE_PLATFORM;
@@ -36530,7 +34051,7 @@ index 70470b2..3052b8a 100644
  
  	/*
  	 * In some cases (e.g. Hyper-Threading), we want to avoid L1
-@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -195,8 +209,12 @@ create_elf_tables(struct linux_binprm *b
  	 * Generate 16 random bytes for userspace PRNG seeding.
  	 */
  	get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
@@ -36545,7 +34066,7 @@ index 70470b2..3052b8a 100644
  	if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
  		return -EFAULT;
  
-@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
+@@ -308,9 +326,11 @@ create_elf_tables(struct linux_binprm *b
  		return -EFAULT;
  	current->mm->env_end = p;
  
@@ -36558,7 +34079,7 @@ index 70470b2..3052b8a 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -381,10 +401,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -381,10 +401,10 @@ static unsigned long load_elf_interp(str
  {
  	struct elf_phdr *elf_phdata;
  	struct elf_phdr *eppnt;
@@ -36571,7 +34092,7 @@ index 70470b2..3052b8a 100644
  	unsigned long total_size;
  	int retval, i, size;
  
-@@ -430,6 +450,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -430,6 +450,11 @@ static unsigned long load_elf_interp(str
  		goto out_close;
  	}
  
@@ -36583,7 +34104,7 @@ index 70470b2..3052b8a 100644
  	eppnt = elf_phdata;
  	for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
  		if (eppnt->p_type == PT_LOAD) {
-@@ -473,8 +498,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
+@@ -473,8 +498,8 @@ static unsigned long load_elf_interp(str
  			k = load_addr + eppnt->p_vaddr;
  			if (BAD_ADDR(k) ||
  			    eppnt->p_filesz > eppnt->p_memsz ||
@@ -36788,7 +34309,7 @@ index 70470b2..3052b8a 100644
  /*
   * These are the functions used to load ELF style executables and shared
   * libraries.  There is no binary dependent code anywhere else.
-@@ -544,6 +756,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
+@@ -544,6 +756,11 @@ static unsigned long randomize_stack_top
  {
  	unsigned int random_variable = 0;
  
@@ -36800,7 +34321,7 @@ index 70470b2..3052b8a 100644
  	if ((current->flags & PF_RANDOMIZE) &&
  		!(current->personality & ADDR_NO_RANDOMIZE)) {
  		random_variable = get_random_int() & STACK_RND_MASK;
-@@ -562,7 +779,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -562,7 +779,7 @@ static int load_elf_binary(struct linux_
   	unsigned long load_addr = 0, load_bias = 0;
  	int load_addr_set = 0;
  	char * elf_interpreter = NULL;
@@ -36809,9 +34330,9 @@ index 70470b2..3052b8a 100644
  	struct elf_phdr *elf_ppnt, *elf_phdata;
  	unsigned long elf_bss, elf_brk;
  	int retval, i;
-@@ -572,11 +789,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -572,11 +789,11 @@ static int load_elf_binary(struct linux_
  	unsigned long start_code, end_code, start_data, end_data;
- 	unsigned long reloc_func_desc = 0;
+ 	unsigned long reloc_func_desc __maybe_unused = 0;
  	int executable_stack = EXSTACK_DEFAULT;
 -	unsigned long def_flags = 0;
  	struct {
@@ -36822,7 +34343,7 @@ index 70470b2..3052b8a 100644
  
  	loc = kmalloc(sizeof(*loc), GFP_KERNEL);
  	if (!loc) {
-@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -714,11 +931,81 @@ static int load_elf_binary(struct linux_
  
  	/* OK, This is the point of no return */
  	current->flags &= ~PF_FORKNOEXEC;
@@ -36905,7 +34426,7 @@ index 70470b2..3052b8a 100644
  	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
  		current->personality |= READ_IMPLIES_EXEC;
  
-@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -800,6 +1087,20 @@ static int load_elf_binary(struct linux_
  #else
  			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
  #endif
@@ -36926,7 +34447,7 @@ index 70470b2..3052b8a 100644
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -832,9 +1133,9 @@ static int load_elf_binary(struct linux_
  		 * allowed task size. Note that p_filesz must always be
  		 * <= p_memsz so it is only necessary to check p_memsz.
  		 */
@@ -36939,7 +34460,7 @@ index 70470b2..3052b8a 100644
  			/* set_brk can never work. Avoid overflows. */
  			send_sig(SIGKILL, current, 0);
  			retval = -EINVAL;
-@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -862,6 +1163,11 @@ static int load_elf_binary(struct linux_
  	start_data += load_bias;
  	end_data += load_bias;
  
@@ -36951,7 +34472,7 @@ index 70470b2..3052b8a 100644
  	/* Calling set_brk effectively mmaps the pages that we need
  	 * for the bss and break sections.  We must do this before
  	 * mapping in the interpreter, to make sure it doesn't wind
-@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
+@@ -873,9 +1179,11 @@ static int load_elf_binary(struct linux_
  		goto out_free_dentry;
  	}
  	if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
@@ -36975,7 +34496,7 @@ index 70470b2..3052b8a 100644
  {
  #define FILTER(type)	(mm_flags & (1UL << MMF_DUMP_##type))
  
-@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
+@@ -1124,7 +1432,7 @@ static unsigned long vma_dump_size(struc
  	if (vma->vm_file == NULL)
  		return 0;
  
@@ -36984,7 +34505,7 @@ index 70470b2..3052b8a 100644
  		goto whole;
  
  	/*
-@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
+@@ -1346,9 +1654,9 @@ static void fill_auxv_note(struct memelf
  {
  	elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
  	int i = 0;
@@ -36996,7 +34517,7 @@ index 70470b2..3052b8a 100644
  	fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
  }
  
-@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
+@@ -1854,14 +2162,14 @@ static void fill_extnum_info(struct elfh
  }
  
  static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
@@ -37013,7 +34534,7 @@ index 70470b2..3052b8a 100644
  	return size;
  }
  
-@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1955,7 +2263,7 @@ static int elf_core_dump(struct coredump
  
  	dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
  
@@ -37022,7 +34543,7 @@ index 70470b2..3052b8a 100644
  	offset += elf_core_extra_data_size();
  	e_shoff = offset;
  
-@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1969,10 +2277,12 @@ static int elf_core_dump(struct coredump
  	offset = dataoff;
  
  	size += sizeof(*elf);
@@ -37035,7 +34556,7 @@ index 70470b2..3052b8a 100644
  	if (size > cprm->limit
  	    || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
  		goto end_coredump;
-@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1986,7 +2296,7 @@ static int elf_core_dump(struct coredump
  		phdr.p_offset = offset;
  		phdr.p_vaddr = vma->vm_start;
  		phdr.p_paddr = 0;
@@ -37044,7 +34565,7 @@ index 70470b2..3052b8a 100644
  		phdr.p_memsz = vma->vm_end - vma->vm_start;
  		offset += phdr.p_filesz;
  		phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
-@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -1997,6 +2307,7 @@ static int elf_core_dump(struct coredump
  		phdr.p_align = ELF_EXEC_PAGESIZE;
  
  		size += sizeof(phdr);
@@ -37052,7 +34573,7 @@ index 70470b2..3052b8a 100644
  		if (size > cprm->limit
  		    || !dump_write(cprm->file, &phdr, sizeof(phdr)))
  			goto end_coredump;
-@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2021,7 +2332,7 @@ static int elf_core_dump(struct coredump
  		unsigned long addr;
  		unsigned long end;
  
@@ -37061,7 +34582,7 @@ index 70470b2..3052b8a 100644
  
  		for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
  			struct page *page;
-@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2030,6 +2341,7 @@ static int elf_core_dump(struct coredump
  			page = get_dump_page(addr);
  			if (page) {
  				void *kaddr = kmap(page);
@@ -37069,7 +34590,7 @@ index 70470b2..3052b8a 100644
  				stop = ((size += PAGE_SIZE) > cprm->limit) ||
  					!dump_write(cprm->file, kaddr,
  						    PAGE_SIZE);
-@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump_params *cprm)
+@@ -2047,6 +2359,7 @@ static int elf_core_dump(struct coredump
  
  	if (e_phnum == PN_XNUM) {
  		size += sizeof(*shdr4extnum);
@@ -37175,11 +34696,10 @@ index 70470b2..3052b8a 100644
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
-index 811384b..8dcee62 100644
---- a/fs/binfmt_flat.c
-+++ b/fs/binfmt_flat.c
-@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
+diff -urNp linux-3.0.3/fs/binfmt_flat.c linux-3.0.3/fs/binfmt_flat.c
+--- linux-3.0.3/fs/binfmt_flat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/binfmt_flat.c	2011-08-23 21:47:56.000000000 -0400
+@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
  				realdatastart = (unsigned long) -ENOMEM;
  			printk("Unable to allocate RAM for process data, errno %d\n",
  					(int)-realdatastart);
@@ -37189,7 +34709,7 @@ index 811384b..8dcee62 100644
  			ret = realdatastart;
  			goto err;
  		}
-@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
+@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_b
  		}
  		if (IS_ERR_VALUE(result)) {
  			printk("Unable to read data+bss, errno %d\n", (int)-result);
@@ -37200,7 +34720,7 @@ index 811384b..8dcee62 100644
  			ret = result;
  			goto err;
  		}
-@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
+@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_b
  		}
  		if (IS_ERR_VALUE(result)) {
  			printk("Unable to read code+data+bss, errno %d\n",(int)-result);
@@ -37211,11 +34731,10 @@ index 811384b..8dcee62 100644
  			ret = result;
  			goto err;
  		}
-diff --git a/fs/bio.c b/fs/bio.c
-index 4bd454f..b9399e3 100644
---- a/fs/bio.c
-+++ b/fs/bio.c
-@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
+diff -urNp linux-3.0.3/fs/bio.c linux-3.0.3/fs/bio.c
+--- linux-3.0.3/fs/bio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/bio.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
  	const int read = bio_data_dir(bio) == READ;
  	struct bio_map_data *bmd = bio->bi_private;
  	int i;
@@ -37224,11 +34743,10 @@ index 4bd454f..b9399e3 100644
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff --git a/fs/block_dev.c b/fs/block_dev.c
-index 59277ba..7e99054 100644
---- a/fs/block_dev.c
-+++ b/fs/block_dev.c
-@@ -669,7 +669,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
+diff -urNp linux-3.0.3/fs/block_dev.c linux-3.0.3/fs/block_dev.c
+--- linux-3.0.3/fs/block_dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/block_dev.c	2011-08-23 21:47:56.000000000 -0400
+@@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
  	else if (bdev->bd_contains == bdev)
  		return true;  	 /* is a whole device which isn't held */
  
@@ -37237,11 +34755,10 @@ index 59277ba..7e99054 100644
  		return true; 	 /* is a partition of a device that is being partitioned */
  	else if (whole->bd_holder != NULL)
  		return false;	 /* is a partition of a held device */
-diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
-index b5baff0..b811a08 100644
---- a/fs/btrfs/ctree.c
-+++ b/fs/btrfs/ctree.c
-@@ -468,9 +468,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
+diff -urNp linux-3.0.3/fs/btrfs/ctree.c linux-3.0.3/fs/btrfs/ctree.c
+--- linux-3.0.3/fs/btrfs/ctree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/btrfs/ctree.c	2011-08-23 21:47:56.000000000 -0400
+@@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
  		free_extent_buffer(buf);
  		add_root_to_dirty_list(root);
  	} else {
@@ -37257,136 +34774,10 @@ index b5baff0..b811a08 100644
  			parent_start = 0;
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
-@@ -3776,7 +3779,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans,
- 
- 	ret = 0;
- 	if (slot == 0) {
--		struct btrfs_disk_key disk_key;
- 		btrfs_cpu_key_to_disk(&disk_key, cpu_key);
- 		ret = fixup_low_keys(trans, root, path, &disk_key, 1);
- 	}
-diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
-index edd9efa..479ffd2 100644
---- a/fs/btrfs/disk-io.c
-+++ b/fs/btrfs/disk-io.c
-@@ -41,7 +41,7 @@
- #include "tree-log.h"
- #include "free-space-cache.h"
- 
--static struct extent_io_ops btree_extent_io_ops;
-+static const struct extent_io_ops btree_extent_io_ops;
- static void end_workqueue_fn(struct btrfs_work *work);
- static void free_fs_root(struct btrfs_root *root);
- static void btrfs_check_super_valid(struct btrfs_fs_info *fs_info,
-@@ -3030,7 +3030,7 @@ static int btrfs_cleanup_transaction(struct btrfs_root *root)
- 	return 0;
- }
- 
--static struct extent_io_ops btree_extent_io_ops = {
-+static const struct extent_io_ops btree_extent_io_ops = {
- 	.write_cache_pages_lock_hook = btree_lock_page_hook,
- 	.readpage_end_io_hook = btree_readpage_end_io_hook,
- 	.submit_bio_hook = btree_submit_bio_hook,
-diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
-index 9318dfe..505cf61 100644
---- a/fs/btrfs/extent_io.h
-+++ b/fs/btrfs/extent_io.h
-@@ -55,36 +55,36 @@ typedef	int (extent_submit_bio_hook_t)(struct inode *inode, int rw,
- 				       struct bio *bio, int mirror_num,
- 				       unsigned long bio_flags, u64 bio_offset);
- struct extent_io_ops {
--	int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
-+	int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
- 			     u64 start, u64 end, int *page_started,
- 			     unsigned long *nr_written);
--	int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
--	int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
-+	int (* const writepage_start_hook)(struct page *page, u64 start, u64 end);
-+	int (* const writepage_io_hook)(struct page *page, u64 start, u64 end);
- 	extent_submit_bio_hook_t *submit_bio_hook;
--	int (*merge_bio_hook)(struct page *page, unsigned long offset,
-+	int (* const merge_bio_hook)(struct page *page, unsigned long offset,
- 			      size_t size, struct bio *bio,
- 			      unsigned long bio_flags);
--	int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
--	int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,
-+	int (* const readpage_io_hook)(struct page *page, u64 start, u64 end);
-+	int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page,
- 				       u64 start, u64 end,
- 				       struct extent_state *state);
--	int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,
-+	int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page,
- 					u64 start, u64 end,
- 				       struct extent_state *state);
--	int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
-+	int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end,
- 				    struct extent_state *state);
--	int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
-+	int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
- 				      struct extent_state *state, int uptodate);
--	int (*set_bit_hook)(struct inode *inode, struct extent_state *state,
-+	int (* const set_bit_hook)(struct inode *inode, struct extent_state *state,
- 			    int *bits);
--	int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
-+	int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
- 			      int *bits);
--	int (*merge_extent_hook)(struct inode *inode,
-+	int (* const merge_extent_hook)(struct inode *inode,
- 				 struct extent_state *new,
- 				 struct extent_state *other);
--	int (*split_extent_hook)(struct inode *inode,
-+	int (* const split_extent_hook)(struct inode *inode,
- 				 struct extent_state *orig, u64 split);
--	int (*write_cache_pages_lock_hook)(struct page *page);
-+	int (* const write_cache_pages_lock_hook)(struct page *page);
- };
- 
- struct extent_io_tree {
-@@ -94,7 +94,7 @@ struct extent_io_tree {
- 	u64 dirty_bytes;
- 	spinlock_t lock;
- 	spinlock_t buffer_lock;
--	struct extent_io_ops *ops;
-+	const struct extent_io_ops *ops;
- };
- 
- struct extent_state {
-diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
-index a039065..654d570 100644
---- a/fs/btrfs/free-space-cache.c
-+++ b/fs/btrfs/free-space-cache.c
-@@ -1855,8 +1855,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
- 
- 	while(1) {
- 		if (entry->bytes < bytes || entry->offset < min_start) {
--			struct rb_node *node;
--
- 			node = rb_next(&entry->offset_index);
- 			if (!node)
- 				break;
-@@ -2018,7 +2016,7 @@ again:
- 	 */
- 	while (entry->bitmap || found_bitmap ||
- 	       (!entry->bitmap && entry->bytes < min_bytes)) {
--		struct rb_node *node = rb_next(&entry->offset_index);
-+		node = rb_next(&entry->offset_index);
- 
- 		if (entry->bitmap && entry->bytes > bytes + empty_size) {
- 			ret = btrfs_bitmap_cluster(block_group, entry, cluster,
-diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
-index 9007bbd..0863573 100644
---- a/fs/btrfs/inode.c
-+++ b/fs/btrfs/inode.c
-@@ -64,7 +64,7 @@ static const struct inode_operations btrfs_file_inode_operations;
- static const struct address_space_operations btrfs_aops;
- static const struct address_space_operations btrfs_symlink_aops;
- static const struct file_operations btrfs_dir_file_operations;
--static struct extent_io_ops btrfs_extent_io_ops;
-+static const struct extent_io_ops btrfs_extent_io_ops;
- 
- static struct kmem_cache *btrfs_inode_cachep;
- struct kmem_cache *btrfs_trans_handle_cachep;
-@@ -6796,7 +6796,7 @@ fail:
+diff -urNp linux-3.0.3/fs/btrfs/inode.c linux-3.0.3/fs/btrfs/inode.c
+--- linux-3.0.3/fs/btrfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/btrfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -6895,7 +6895,7 @@ fail:
  	return -ENOMEM;
  }
  
@@ -37395,7 +34786,7 @@ index 9007bbd..0863573 100644
  			 struct dentry *dentry, struct kstat *stat)
  {
  	struct inode *inode = dentry->d_inode;
-@@ -6808,6 +6808,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
+@@ -6907,6 +6907,14 @@ static int btrfs_getattr(struct vfsmount
  	return 0;
  }
  
@@ -37407,23 +34798,13 @@ index 9007bbd..0863573 100644
 +}
 +EXPORT_SYMBOL(get_btrfs_dev_from_inode);
 +
- static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
- 			   struct inode *new_dir, struct dentry *new_dentry)
- {
-@@ -7311,7 +7319,7 @@ static const struct file_operations btrfs_dir_file_operations = {
- 	.fsync		= btrfs_sync_file,
- };
- 
--static struct extent_io_ops btrfs_extent_io_ops = {
-+static const struct extent_io_ops btrfs_extent_io_ops = {
- 	.fill_delalloc = run_delalloc_range,
- 	.submit_bio_hook = btrfs_submit_bio_hook,
- 	.merge_bio_hook = btrfs_merge_bio_hook,
-diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
-index 2ff51e6..8d66d4e 100644
---- a/fs/btrfs/ioctl.c
-+++ b/fs/btrfs/ioctl.c
-@@ -2274,9 +2274,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+ /*
+  * If a file is moved, it will inherit the cow and compression flags of the new
+  * directory.
+diff -urNp linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3/fs/btrfs/ioctl.c
+--- linux-3.0.3/fs/btrfs/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/btrfs/ioctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
  	for (i = 0; i < num_types; i++) {
  		struct btrfs_space_info *tmp;
  
@@ -37436,7 +34817,7 @@ index 2ff51e6..8d66d4e 100644
  		info = NULL;
  		rcu_read_lock();
  		list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
-@@ -2298,10 +2301,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
+@@ -2700,10 +2703,7 @@ long btrfs_ioctl_space_info(struct btrfs
  				memcpy(dest, &space, sizeof(space));
  				dest++;
  				space_args.total_spaces++;
@@ -37447,11 +34828,10 @@ index 2ff51e6..8d66d4e 100644
  		}
  		up_read(&info->groups_sem);
  	}
-diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
-index 31ade58..29dba6a 100644
---- a/fs/btrfs/relocation.c
-+++ b/fs/btrfs/relocation.c
-@@ -1239,7 +1239,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
+diff -urNp linux-3.0.3/fs/btrfs/relocation.c linux-3.0.3/fs/btrfs/relocation.c
+--- linux-3.0.3/fs/btrfs/relocation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/btrfs/relocation.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
  	}
  	spin_unlock(&rc->reloc_root_tree.lock);
  
@@ -37460,11 +34840,10 @@ index 31ade58..29dba6a 100644
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
-index a2603e7..4c28e75 100644
---- a/fs/cachefiles/bind.c
-+++ b/fs/cachefiles/bind.c
-@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
+diff -urNp linux-3.0.3/fs/cachefiles/bind.c linux-3.0.3/fs/cachefiles/bind.c
+--- linux-3.0.3/fs/cachefiles/bind.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/bind.c	2011-08-23 21:47:56.000000000 -0400
+@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
  	/* start by checking things over */
@@ -37480,11 +34859,10 @@ index a2603e7..4c28e75 100644
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
-index 0a1467b..6a53245 100644
---- a/fs/cachefiles/daemon.c
-+++ b/fs/cachefiles/daemon.c
-@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
+diff -urNp linux-3.0.3/fs/cachefiles/daemon.c linux-3.0.3/fs/cachefiles/daemon.c
+--- linux-3.0.3/fs/cachefiles/daemon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/daemon.c	2011-08-23 21:47:56.000000000 -0400
+@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
  	if (n > buflen)
  		return -EMSGSIZE;
  
@@ -37493,7 +34871,7 @@ index 0a1467b..6a53245 100644
  		return -EFAULT;
  
  	return n;
-@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
+@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(s
  	if (test_bit(CACHEFILES_DEAD, &cache->flags))
  		return -EIO;
  
@@ -37502,7 +34880,7 @@ index 0a1467b..6a53245 100644
  		return -EOPNOTSUPP;
  
  	/* drag the command string into the kernel so we can parse it */
-@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
+@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struc
  	if (args[0] != '%' || args[1] != '\0')
  		return -EINVAL;
  
@@ -37511,7 +34889,7 @@ index 0a1467b..6a53245 100644
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->fstop_percent = fstop;
-@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
+@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struc
  	if (args[0] != '%' || args[1] != '\0')
  		return -EINVAL;
  
@@ -37520,10 +34898,9 @@ index 0a1467b..6a53245 100644
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
-index bd6bc1b..b627b53 100644
---- a/fs/cachefiles/internal.h
-+++ b/fs/cachefiles/internal.h
+diff -urNp linux-3.0.3/fs/cachefiles/internal.h linux-3.0.3/fs/cachefiles/internal.h
+--- linux-3.0.3/fs/cachefiles/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -57,7 +57,7 @@ struct cachefiles_cache {
  	wait_queue_head_t		daemon_pollwq;	/* poll waitqueue for daemon */
  	struct rb_root			active_nodes;	/* active nodes (can't be culled) */
@@ -37533,7 +34910,7 @@ index bd6bc1b..b627b53 100644
  	unsigned			frun_percent;	/* when to stop culling (% files) */
  	unsigned			fcull_percent;	/* when to start culling (% files) */
  	unsigned			fstop_percent;	/* when to stop allocating (% files) */
-@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
+@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struc
   * proc.c
   */
  #ifdef CONFIG_CACHEFILES_HISTOGRAM
@@ -37558,11 +34935,10 @@ index bd6bc1b..b627b53 100644
  }
  
  #else
-diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
-index 42c7faf..475b0ca 100644
---- a/fs/cachefiles/namei.c
-+++ b/fs/cachefiles/namei.c
-@@ -309,7 +309,7 @@ try_again:
+diff -urNp linux-3.0.3/fs/cachefiles/namei.c linux-3.0.3/fs/cachefiles/namei.c
+--- linux-3.0.3/fs/cachefiles/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/namei.c	2011-08-23 21:47:56.000000000 -0400
+@@ -318,7 +318,7 @@ try_again:
  	/* first step is to make up a grave dentry in the graveyard */
  	sprintf(nbuffer, "%08x%08x",
  		(uint32_t) get_seconds(),
@@ -37571,10 +34947,9 @@ index 42c7faf..475b0ca 100644
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
-index eccd339..4c1d995 100644
---- a/fs/cachefiles/proc.c
-+++ b/fs/cachefiles/proc.c
+diff -urNp linux-3.0.3/fs/cachefiles/proc.c linux-3.0.3/fs/cachefiles/proc.c
+--- linux-3.0.3/fs/cachefiles/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -37588,7 +34963,7 @@ index eccd339..4c1d995 100644
  
  /*
   * display the latency histogram
-@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
+@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(str
  		return 0;
  	default:
  		index = (unsigned long) v - 3;
@@ -37601,11 +34976,10 @@ index eccd339..4c1d995 100644
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
-index 0e3c092..c4f23ec 100644
---- a/fs/cachefiles/rdwr.c
-+++ b/fs/cachefiles/rdwr.c
-@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
+diff -urNp linux-3.0.3/fs/cachefiles/rdwr.c linux-3.0.3/fs/cachefiles/rdwr.c
+--- linux-3.0.3/fs/cachefiles/rdwr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cachefiles/rdwr.c	2011-08-23 21:47:56.000000000 -0400
+@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
  			ret = file->f_op->write(
@@ -37614,11 +34988,10 @@ index 0e3c092..c4f23ec 100644
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
-index ebafa65..7e6acd8 100644
---- a/fs/ceph/dir.c
-+++ b/fs/ceph/dir.c
-@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
+diff -urNp linux-3.0.3/fs/ceph/dir.c linux-3.0.3/fs/ceph/dir.c
+--- linux-3.0.3/fs/ceph/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ceph/dir.c	2011-08-23 21:47:56.000000000 -0400
+@@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
  	struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
  	struct ceph_mds_client *mdsc = fsc->mdsc;
  	unsigned frag = fpos_frag(filp->f_pos);
@@ -37627,22 +35000,12 @@ index ebafa65..7e6acd8 100644
  	int err;
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
-@@ -358,7 +358,7 @@ more:
- 	rinfo = &fi->last_readdir->r_reply_info;
- 	dout("readdir frag %x num %d off %d chunkoff %d\n", frag,
- 	     rinfo->dir_nr, off, fi->offset);
--	while (off - fi->offset >= 0 && off - fi->offset < rinfo->dir_nr) {
-+	while (off >= fi->offset && off - fi->offset < rinfo->dir_nr) {
- 		u64 pos = ceph_make_fpos(frag, off);
- 		struct ceph_mds_reply_inode *in =
- 			rinfo->dir_in[off - fi->offset].in;
-diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
-index 65829d3..bbc9560 100644
---- a/fs/cifs/cifs_debug.c
-+++ b/fs/cifs/cifs_debug.c
-@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
+diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
+--- linux-3.0.3/fs/cifs/cifs_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cifs/cifs_debug.c	2011-08-23 21:47:56.000000000 -0400
+@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str
  					tcon = list_entry(tmp3,
- 							  struct cifsTconInfo,
+ 							  struct cifs_tcon,
  							  tcon_list);
 -					atomic_set(&tcon->num_smbs_sent, 0);
 -					atomic_set(&tcon->num_writes, 0);
@@ -37685,7 +35048,7 @@ index 65829d3..bbc9560 100644
  				}
  			}
  		}
-@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
+@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct s
  				if (tcon->need_reconnect)
  					seq_puts(m, "\tDISCONNECTED ");
  				seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
@@ -37747,11 +35110,10 @@ index 65829d3..bbc9560 100644
  			}
  		}
  	}
-diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
-index 17afb0f..c18ca8d 100644
---- a/fs/cifs/cifsglob.h
-+++ b/fs/cifs/cifsglob.h
-@@ -305,28 +305,28 @@ struct cifsTconInfo {
+diff -urNp linux-3.0.3/fs/cifs/cifsglob.h linux-3.0.3/fs/cifs/cifsglob.h
+--- linux-3.0.3/fs/cifs/cifsglob.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cifs/cifsglob.h	2011-08-23 21:47:56.000000000 -0400
+@@ -381,28 +381,28 @@ struct cifs_tcon {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
  #ifdef CONFIG_CIFS_STATS
@@ -37802,20 +35164,19 @@ index 17afb0f..c18ca8d 100644
  #ifdef CONFIG_CIFS_STATS2
  	unsigned long long time_writes;
  	unsigned long long time_reads;
-@@ -509,7 +509,7 @@ static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
+@@ -613,7 +613,7 @@ convert_delimiter(char *path, char delim
  }
  
  #ifdef CONFIG_CIFS_STATS
 -#define cifs_stats_inc atomic_inc
 +#define cifs_stats_inc atomic_inc_unchecked
  
- static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
+ static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
  					    unsigned int bytes)
-diff --git a/fs/cifs/link.c b/fs/cifs/link.c
-index e8804d3..9e0f281 100644
---- a/fs/cifs/link.c
-+++ b/fs/cifs/link.c
-@@ -577,7 +577,7 @@ symlink_exit:
+diff -urNp linux-3.0.3/fs/cifs/link.c linux-3.0.3/fs/cifs/link.c
+--- linux-3.0.3/fs/cifs/link.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/cifs/link.c	2011-08-23 21:47:56.000000000 -0400
+@@ -587,7 +587,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
  {
@@ -37824,10 +35185,9 @@ index e8804d3..9e0f281 100644
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff --git a/fs/coda/cache.c b/fs/coda/cache.c
-index 6901578..d402eb5 100644
---- a/fs/coda/cache.c
-+++ b/fs/coda/cache.c
+diff -urNp linux-3.0.3/fs/coda/cache.c linux-3.0.3/fs/coda/cache.c
+--- linux-3.0.3/fs/coda/cache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/coda/cache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -37837,7 +35197,7 @@ index 6901578..d402eb5 100644
  
  /* replace or extend an acl cache hit */
  void coda_cache_enter(struct inode *inode, int mask)
-@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
+@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inod
  	struct coda_inode_info *cii = ITOC(inode);
  
  	spin_lock(&cii->c_lock);
@@ -37846,7 +35206,7 @@ index 6901578..d402eb5 100644
  	if (cii->c_uid != current_fsuid()) {
  		cii->c_uid = current_fsuid();
                  cii->c_cached_perm = mask;
-@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
+@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode
  {
  	struct coda_inode_info *cii = ITOC(inode);
  	spin_lock(&cii->c_lock);
@@ -37863,7 +35223,7 @@ index 6901578..d402eb5 100644
  }
  
  
-@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
+@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode
  	spin_lock(&cii->c_lock);
  	hit = (mask & cii->c_cached_perm) == mask &&
  	    cii->c_uid == current_fsuid() &&
@@ -37872,11 +35232,27 @@ index 6901578..d402eb5 100644
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff --git a/fs/compat.c b/fs/compat.c
-index 691c3fd..c800dd4 100644
---- a/fs/compat.c
-+++ b/fs/compat.c
-@@ -594,7 +594,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
+diff -urNp linux-3.0.3/fs/compat_binfmt_elf.c linux-3.0.3/fs/compat_binfmt_elf.c
+--- linux-3.0.3/fs/compat_binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/compat_binfmt_elf.c	2011-08-23 21:47:56.000000000 -0400
+@@ -30,11 +30,13 @@
+ #undef	elf_phdr
+ #undef	elf_shdr
+ #undef	elf_note
++#undef	elf_dyn
+ #undef	elf_addr_t
+ #define elfhdr		elf32_hdr
+ #define elf_phdr	elf32_phdr
+ #define elf_shdr	elf32_shdr
+ #define elf_note	elf32_note
++#define elf_dyn		Elf32_Dyn
+ #define elf_addr_t	Elf32_Addr
+ 
+ /*
+diff -urNp linux-3.0.3/fs/compat.c linux-3.0.3/fs/compat.c
+--- linux-3.0.3/fs/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/compat.c	2011-08-23 22:49:33.000000000 -0400
+@@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
  		goto out;
  
  	ret = -EINVAL;
@@ -37885,7 +35261,7 @@ index 691c3fd..c800dd4 100644
  		goto out;
  	if (nr_segs > fast_segs) {
  		ret = -ENOMEM;
-@@ -876,6 +876,7 @@ struct compat_old_linux_dirent {
+@@ -848,6 +848,7 @@ struct compat_old_linux_dirent {
  
  struct compat_readdir_callback {
  	struct compat_old_linux_dirent __user *dirent;
@@ -37893,7 +35269,7 @@ index 691c3fd..c800dd4 100644
  	int result;
  };
  
-@@ -893,6 +894,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
+@@ -865,6 +866,10 @@ static int compat_fillonedir(void *__buf
  		buf->result = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -37904,7 +35280,7 @@ index 691c3fd..c800dd4 100644
  	buf->result++;
  	dirent = buf->dirent;
  	if (!access_ok(VERIFY_WRITE, dirent,
-@@ -925,6 +930,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
+@@ -897,6 +902,7 @@ asmlinkage long compat_sys_old_readdir(u
  
  	buf.result = 0;
  	buf.dirent = dirent;
@@ -37912,7 +35288,7 @@ index 691c3fd..c800dd4 100644
  
  	error = vfs_readdir(file, compat_fillonedir, &buf);
  	if (buf.result)
-@@ -945,6 +951,7 @@ struct compat_linux_dirent {
+@@ -917,6 +923,7 @@ struct compat_linux_dirent {
  struct compat_getdents_callback {
  	struct compat_linux_dirent __user *current_dir;
  	struct compat_linux_dirent __user *previous;
@@ -37920,7 +35296,7 @@ index 691c3fd..c800dd4 100644
  	int count;
  	int error;
  };
-@@ -966,6 +973,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
+@@ -938,6 +945,10 @@ static int compat_filldir(void *__buf, c
  		buf->error = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -37931,7 +35307,7 @@ index 691c3fd..c800dd4 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -1013,6 +1024,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
+@@ -985,6 +996,7 @@ asmlinkage long compat_sys_getdents(unsi
  	buf.previous = NULL;
  	buf.count = count;
  	buf.error = 0;
@@ -37939,7 +35315,7 @@ index 691c3fd..c800dd4 100644
  
  	error = vfs_readdir(file, compat_filldir, &buf);
  	if (error >= 0)
-@@ -1034,6 +1046,7 @@ out:
+@@ -1006,6 +1018,7 @@ out:
  struct compat_getdents_callback64 {
  	struct linux_dirent64 __user *current_dir;
  	struct linux_dirent64 __user *previous;
@@ -37947,7 +35323,7 @@ index 691c3fd..c800dd4 100644
  	int count;
  	int error;
  };
-@@ -1050,6 +1063,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
+@@ -1022,6 +1035,10 @@ static int compat_filldir64(void * __buf
  	buf->error = -EINVAL;	/* only used if we fail.. */
  	if (reclen > buf->count)
  		return -EINVAL;
@@ -37958,7 +35334,7 @@ index 691c3fd..c800dd4 100644
  	dirent = buf->previous;
  
  	if (dirent) {
-@@ -1101,6 +1118,7 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
+@@ -1073,6 +1090,7 @@ asmlinkage long compat_sys_getdents64(un
  	buf.previous = NULL;
  	buf.count = count;
  	buf.error = 0;
@@ -37966,96 +35342,7 @@ index 691c3fd..c800dd4 100644
  
  	error = vfs_readdir(file, compat_filldir64, &buf);
  	if (error >= 0)
-@@ -1464,6 +1482,11 @@ int compat_do_execve(char * filename,
- 	compat_uptr_t __user *envp,
- 	struct pt_regs * regs)
- {
-+#ifdef CONFIG_GRKERNSEC
-+	struct file *old_exec_file;
-+	struct acl_subject_label *old_acl;
-+	struct rlimit old_rlim[RLIM_NLIMITS];
-+#endif
- 	struct linux_binprm *bprm;
- 	struct file *file;
- 	struct files_struct *displaced;
-@@ -1500,6 +1523,19 @@ int compat_do_execve(char * filename,
- 	bprm->filename = filename;
- 	bprm->interp = filename;
- 
-+	if (gr_process_user_ban()) {
-+		retval = -EPERM;
-+		goto out_file;
-+	}
-+
-+	gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
-+	retval = -EAGAIN;
-+	if (gr_handle_nproc())
-+		goto out_file;
-+	retval = -EACCES;
-+	if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt))
-+		goto out_file;
-+
- 	retval = bprm_mm_init(bprm);
- 	if (retval)
- 		goto out_file;
-@@ -1529,9 +1565,40 @@ int compat_do_execve(char * filename,
- 	if (retval < 0)
- 		goto out;
- 
-+	if (!gr_tpe_allow(file)) {
-+		retval = -EACCES;
-+		goto out;
-+	}
-+
-+	if (gr_check_crash_exec(file)) {
-+		retval = -EACCES;
-+		goto out;
-+	}
-+
-+	gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
-+
-+	gr_handle_exec_args_compat(bprm, argv);
-+
-+#ifdef CONFIG_GRKERNSEC
-+	old_acl = current->acl;
-+	memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
-+	old_exec_file = current->exec_file;
-+	get_file(file);
-+	current->exec_file = file;
-+#endif
-+
-+	retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
-+				   bprm->unsafe & LSM_UNSAFE_SHARE);
-+	if (retval < 0)
-+		goto out_fail;
-+
- 	retval = search_binary_handler(bprm, regs);
- 	if (retval < 0)
--		goto out;
-+		goto out_fail;
-+#ifdef CONFIG_GRKERNSEC
-+	if (old_exec_file)
-+		fput(old_exec_file);
-+#endif
- 
- 	/* execve succeeded */
- 	current->fs->in_exec = 0;
-@@ -1542,6 +1609,14 @@ int compat_do_execve(char * filename,
- 		put_files_struct(displaced);
- 	return retval;
- 
-+out_fail:
-+#ifdef CONFIG_GRKERNSEC
-+	current->acl = old_acl;
-+	memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
-+	fput(current->exec_file);
-+	current->exec_file = old_exec_file;
-+#endif
-+
- out:
- 	if (bprm->mm) {
- 		acct_arg_size(bprm, 0);
-@@ -1712,6 +1787,8 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp,
+@@ -1446,6 +1464,8 @@ int compat_core_sys_select(int n, compat
  	struct fdtable *fdt;
  	long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
  
@@ -38064,29 +35351,10 @@ index 691c3fd..c800dd4 100644
  	if (n < 0)
  		goto out_nofds;
  
-diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
-index 112e45a..b59845b 100644
---- a/fs/compat_binfmt_elf.c
-+++ b/fs/compat_binfmt_elf.c
-@@ -30,11 +30,13 @@
- #undef	elf_phdr
- #undef	elf_shdr
- #undef	elf_note
-+#undef	elf_dyn
- #undef	elf_addr_t
- #define elfhdr		elf32_hdr
- #define elf_phdr	elf32_phdr
- #define elf_shdr	elf32_shdr
- #define elf_note	elf32_note
-+#define elf_dyn		Elf32_Dyn
- #define elf_addr_t	Elf32_Addr
- 
- /*
-diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
-index 61abb63..d93cbe5 100644
---- a/fs/compat_ioctl.c
-+++ b/fs/compat_ioctl.c
-@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
+diff -urNp linux-3.0.3/fs/compat_ioctl.c linux-3.0.3/fs/compat_ioctl.c
+--- linux-3.0.3/fs/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/compat_ioctl.c	2011-08-23 21:47:56.000000000 -0400
+@@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
  	err |= get_user(length, &up->length);
@@ -38095,7 +35363,7 @@ index 61abb63..d93cbe5 100644
  
  	up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
  	err  = put_user(compat_ptr(palp), &up_native->palette);
-@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
+@@ -1638,8 +1640,8 @@ asmlinkage long compat_sys_ioctl(unsigne
  static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
  {
  	unsigned int a, b;
@@ -38106,11 +35374,10 @@ index 61abb63..d93cbe5 100644
  	if (a > b)
  		return 1;
  	if (a < b)
-diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
-index 90ff3cb..c310eae 100644
---- a/fs/configfs/dir.c
-+++ b/fs/configfs/dir.c
-@@ -1571,7 +1571,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
+diff -urNp linux-3.0.3/fs/configfs/dir.c linux-3.0.3/fs/configfs/dir.c
+--- linux-3.0.3/fs/configfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/configfs/dir.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
  			}
  			for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
  				struct configfs_dirent *next;
@@ -38118,9 +35385,9 @@ index 90ff3cb..c310eae 100644
 +				const unsigned char * name;
 +				char d_name[sizeof(next->s_dentry->d_iname)];
  				int len;
+ 				struct inode *inode = NULL;
  
- 				next = list_entry(p, struct configfs_dirent,
-@@ -1580,7 +1581,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
+@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file 
  					continue;
  
  				name = configfs_get_name(next);
@@ -38131,14 +35398,13 @@ index 90ff3cb..c310eae 100644
 +					name = d_name;
 +				} else
 +					len = strlen(name);
- 				if (next->s_dentry)
- 					ino = next->s_dentry->d_inode->i_ino;
- 				else
-diff --git a/fs/dcache.c b/fs/dcache.c
-index 1baddc1..f72fb82 100644
---- a/fs/dcache.c
-+++ b/fs/dcache.c
-@@ -3092,7 +3092,7 @@ void __init vfs_caches_init(unsigned long mempages)
+ 
+ 				/*
+ 				 * We'll have a dentry and an inode for
+diff -urNp linux-3.0.3/fs/dcache.c linux-3.0.3/fs/dcache.c
+--- linux-3.0.3/fs/dcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/dcache.c	2011-08-23 21:47:56.000000000 -0400
+@@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
  	names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
@@ -38147,24 +35413,10 @@ index 1baddc1..f72fb82 100644
  
  	dcache_init();
  	inode_init();
-diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
-index f994a7d..4dca551 100644
---- a/fs/dlm/lockspace.c
-+++ b/fs/dlm/lockspace.c
-@@ -200,7 +200,7 @@ static int dlm_uevent(struct kset *kset, struct kobject *kobj,
- 	return 0;
- }
- 
--static struct kset_uevent_ops dlm_uevent_ops = {
-+static const struct kset_uevent_ops dlm_uevent_ops = {
- 	.uevent = dlm_uevent,
- };
- 
-diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
-index b592938..043ff74 100644
---- a/fs/ecryptfs/inode.c
-+++ b/fs/ecryptfs/inode.c
-@@ -658,7 +658,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
+diff -urNp linux-3.0.3/fs/ecryptfs/inode.c linux-3.0.3/fs/ecryptfs/inode.c
+--- linux-3.0.3/fs/ecryptfs/inode.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/fs/ecryptfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
  	rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
@@ -38173,7 +35425,7 @@ index b592938..043ff74 100644
  						   lower_bufsiz);
  	set_fs(old_fs);
  	if (rc < 0)
-@@ -704,7 +704,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -750,7 +750,7 @@ static void *ecryptfs_follow_link(struct
  	}
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -38182,7 +35434,7 @@ index b592938..043ff74 100644
  	set_fs(old_fs);
  	if (rc < 0) {
  		kfree(buf);
-@@ -719,7 +719,7 @@ out:
+@@ -765,7 +765,7 @@ out:
  static void
  ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
  {
@@ -38191,10 +35443,9 @@ index b592938..043ff74 100644
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
-index 940a82e..63af89e 100644
---- a/fs/ecryptfs/miscdev.c
-+++ b/fs/ecryptfs/miscdev.c
+diff -urNp linux-3.0.3/fs/ecryptfs/miscdev.c linux-3.0.3/fs/ecryptfs/miscdev.c
+--- linux-3.0.3/fs/ecryptfs/miscdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ecryptfs/miscdev.c	2011-08-23 21:47:56.000000000 -0400
 @@ -328,7 +328,7 @@ check_list:
  		goto out_unlock_msg_ctx;
  	i = 5;
@@ -38204,14 +35455,13 @@ index 940a82e..63af89e 100644
  			goto out_unlock_msg_ctx;
  		i += packet_length_size;
  		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff --git a/fs/exec.c b/fs/exec.c
-index 52a447d..3294552 100644
---- a/fs/exec.c
-+++ b/fs/exec.c
+diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
+--- linux-3.0.3/fs/exec.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/exec.c	2011-08-23 21:48:14.000000000 -0400
 @@ -55,12 +55,24 @@
- #include <linux/fs_struct.h>
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
+ #include <linux/compat.h>
 +#include <linux/random.h>
 +#include <linux/seq_file.h>
 +
@@ -38242,16 +35492,16 @@ index 52a447d..3294552 100644
  
  /* The maximal length of core_pattern is also specified in sysctl.c */
  
-@@ -120,7 +132,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library)
- 		goto out;
- 
- 	file = do_filp_open(AT_FDCWD, tmp,
--				O_LARGEFILE | O_RDONLY | __FMODE_EXEC, 0,
-+				O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC, 0,
- 				MAY_READ | MAY_EXEC | MAY_OPEN);
- 	putname(tmp);
- 	error = PTR_ERR(file);
-@@ -187,18 +199,10 @@ struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
+@@ -116,7 +128,7 @@ SYSCALL_DEFINE1(uselib, const char __use
+ 	char *tmp = getname(library);
+ 	int error = PTR_ERR(tmp);
+ 	static const struct open_flags uselib_flags = {
+-		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
++		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
+ 		.acc_mode = MAY_READ | MAY_EXEC | MAY_OPEN,
+ 		.intent = LOOKUP_OPEN
+ 	};
+@@ -195,18 +207,10 @@ static struct page *get_arg_page(struct 
  		int write)
  {
  	struct page *page;
@@ -38259,7 +35509,7 @@ index 52a447d..3294552 100644
  
 -#ifdef CONFIG_STACK_GROWSUP
 -	if (write) {
--		ret = expand_stack_downwards(bprm->vma, pos);
+-		ret = expand_downwards(bprm->vma, pos);
 -		if (ret < 0)
 -			return NULL;
 -	}
@@ -38267,13 +35517,13 @@ index 52a447d..3294552 100644
 -	ret = get_user_pages(current, bprm->mm, pos,
 -			1, write, 1, &page, NULL);
 -	if (ret <= 0)
-+	if (0 > expand_stack_downwards(bprm->vma, pos))
++	if (0 > expand_downwards(bprm->vma, pos))
 +		return NULL;
 +	if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
  		return NULL;
  
  	if (write) {
-@@ -273,6 +277,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -281,6 +285,11 @@ static int __bprm_mm_init(struct linux_b
  	vma->vm_end = STACK_TOP_MAX;
  	vma->vm_start = vma->vm_end - PAGE_SIZE;
  	vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
@@ -38285,7 +35535,7 @@ index 52a447d..3294552 100644
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  	INIT_LIST_HEAD(&vma->anon_vma_chain);
  
-@@ -287,6 +296,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+@@ -295,6 +304,12 @@ static int __bprm_mm_init(struct linux_b
  	mm->stack_vm = mm->total_vm = 1;
  	up_write(&mm->mmap_sem);
  	bprm->p = vma->vm_end - sizeof(void *);
@@ -38298,18 +35548,39 @@ index 52a447d..3294552 100644
  	return 0;
  err:
  	up_write(&mm->mmap_sem);
-@@ -522,7 +537,7 @@ int copy_strings_kernel(int argc, const char *const *argv,
+@@ -403,19 +418,7 @@ err:
+ 	return err;
+ }
+ 
+-struct user_arg_ptr {
+-#ifdef CONFIG_COMPAT
+-	bool is_compat;
+-#endif
+-	union {
+-		const char __user *const __user *native;
+-#ifdef CONFIG_COMPAT
+-		compat_uptr_t __user *compat;
+-#endif
+-	} ptr;
+-};
+-
+-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
++const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
+ {
+ 	const char __user *native;
+ 
+@@ -566,7 +569,7 @@ int copy_strings_kernel(int argc, const 
  	int r;
  	mm_segment_t oldfs = get_fs();
+ 	struct user_arg_ptr argv = {
+-		.ptr.native = (const char __user *const  __user *)__argv,
++		.ptr.native = (__force const char __user *const  __user *)__argv,
+ 	};
+ 
  	set_fs(KERNEL_DS);
--	r = copy_strings(argc, (const char __user *const  __user *)argv, bprm);
-+	r = copy_strings(argc, (__force const char __user *const __user *)argv, bprm);
- 	set_fs(oldfs);
- 	return r;
- }
-@@ -552,7 +567,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -601,7 +604,8 @@ static int shift_arg_pages(struct vm_are
  	unsigned long new_end = old_end - shift;
- 	struct mmu_gather *tlb;
+ 	struct mmu_gather tlb;
  
 -	BUG_ON(new_start > new_end);
 +	if (new_start >= new_end || new_start < mmap_min_addr)
@@ -38317,7 +35588,7 @@ index 52a447d..3294552 100644
  
  	/*
  	 * ensure there are no vmas between where we want to go
-@@ -561,6 +577,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
+@@ -610,6 +614,10 @@ static int shift_arg_pages(struct vm_are
  	if (vma != find_vma(mm, new_start))
  		return -EFAULT;
  
@@ -38328,7 +35599,7 @@ index 52a447d..3294552 100644
  	/*
  	 * cover the whole range: [new_start, old_end)
  	 */
-@@ -641,10 +661,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -690,10 +698,6 @@ int setup_arg_pages(struct linux_binprm 
  	stack_top = arch_align_stack(stack_top);
  	stack_top = PAGE_ALIGN(stack_top);
  
@@ -38339,7 +35610,7 @@ index 52a447d..3294552 100644
  	stack_shift = vma->vm_end - stack_top;
  
  	bprm->p -= stack_shift;
-@@ -656,8 +672,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -705,8 +709,28 @@ int setup_arg_pages(struct linux_binprm 
  	bprm->exec -= stack_shift;
  
  	down_write(&mm->mmap_sem);
@@ -38368,7 +35639,7 @@ index 52a447d..3294552 100644
  	/*
  	 * Adjust stack execute permissions; explicitly enable for
  	 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
-@@ -676,13 +712,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
+@@ -725,13 +749,6 @@ int setup_arg_pages(struct linux_binprm 
  		goto out_unlock;
  	BUG_ON(prev != vma);
  
@@ -38382,16 +35653,16 @@ index 52a447d..3294552 100644
  	/* mprotect_fixup is overkill to remove the temporary stack flags */
  	vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
  
-@@ -723,7 +752,7 @@ struct file *open_exec(const char *name)
+@@ -771,7 +788,7 @@ struct file *open_exec(const char *name)
+ 	struct file *file;
  	int err;
- 
- 	file = do_filp_open(AT_FDCWD, name,
--				O_LARGEFILE | O_RDONLY | __FMODE_EXEC, 0,
-+				O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC, 0,
- 				MAY_EXEC | MAY_OPEN);
- 	if (IS_ERR(file))
- 		goto out;
-@@ -760,7 +789,7 @@ int kernel_read(struct file *file, loff_t offset,
+ 	static const struct open_flags open_exec_flags = {
+-		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC,
++		.open_flag = O_LARGEFILE | O_RDONLY | __FMODE_EXEC | FMODE_GREXEC,
+ 		.acc_mode = MAY_EXEC | MAY_OPEN,
+ 		.intent = LOOKUP_OPEN
+ 	};
+@@ -812,7 +829,7 @@ int kernel_read(struct file *file, loff_
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -38400,7 +35671,7 @@ index 52a447d..3294552 100644
  	set_fs(old_fs);
  	return result;
  }
-@@ -1182,7 +1211,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
+@@ -1236,7 +1253,7 @@ int check_unsafe_exec(struct linux_binpr
  	}
  	rcu_read_unlock();
  
@@ -38409,9 +35680,9 @@ index 52a447d..3294552 100644
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	} else {
  		res = -EAGAIN;
-@@ -1378,6 +1407,11 @@ int do_execve(const char * filename,
- 	const char __user *const __user *envp,
- 	struct pt_regs * regs)
+@@ -1428,6 +1445,11 @@ static int do_execve_common(const char *
+ 				struct user_arg_ptr envp,
+ 				struct pt_regs *regs)
  {
 +#ifdef CONFIG_GRKERNSEC
 +	struct file *old_exec_file;
@@ -38421,7 +35692,7 @@ index 52a447d..3294552 100644
  	struct linux_binprm *bprm;
  	struct file *file;
  	struct files_struct *displaced;
-@@ -1414,6 +1448,23 @@ int do_execve(const char * filename,
+@@ -1464,6 +1486,23 @@ static int do_execve_common(const char *
  	bprm->filename = filename;
  	bprm->interp = filename;
  
@@ -38445,7 +35716,7 @@ index 52a447d..3294552 100644
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1443,9 +1494,40 @@ int do_execve(const char * filename,
+@@ -1493,9 +1532,40 @@ static int do_execve_common(const char *
  	if (retval < 0)
  		goto out;
  
@@ -38487,7 +35758,7 @@ index 52a447d..3294552 100644
  
  	/* execve succeeded */
  	current->fs->in_exec = 0;
-@@ -1456,6 +1538,14 @@ int do_execve(const char * filename,
+@@ -1506,6 +1576,14 @@ static int do_execve_common(const char *
  		put_files_struct(displaced);
  	return retval;
  
@@ -38502,7 +35773,7 @@ index 52a447d..3294552 100644
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-@@ -1501,7 +1591,7 @@ static int expand_corename(struct core_name *cn)
+@@ -1579,7 +1657,7 @@ static int expand_corename(struct core_n
  {
  	char *old_corename = cn->corename;
  
@@ -38511,7 +35782,7 @@ index 52a447d..3294552 100644
  	cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
  
  	if (!cn->corename) {
-@@ -1554,7 +1644,7 @@ static int format_corename(struct core_name *cn, long signr)
+@@ -1667,7 +1745,7 @@ static int format_corename(struct core_n
  	int pid_in_pattern = 0;
  	int err = 0;
  
@@ -38520,7 +35791,7 @@ index 52a447d..3294552 100644
  	cn->corename = kmalloc(cn->size, GFP_KERNEL);
  	cn->used = 0;
  
-@@ -1642,6 +1732,208 @@ out:
+@@ -1758,6 +1836,219 @@ out:
  	return ispipe;
  }
  
@@ -38712,7 +35983,7 @@ index 52a447d..3294552 100644
 +}
 +
 +
-+void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
++NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
 +{
 +	if (current->signal->curr_ip)
 +		printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
@@ -38726,10 +35997,21 @@ index 52a447d..3294552 100644
 +}
 +#endif
 +
++#ifdef CONFIG_PAX_MEMORY_STACKLEAK
++void pax_track_stack(void)
++{
++	unsigned long sp = (unsigned long)&sp;
++	if (sp < current_thread_info()->lowest_stack &&
++	    sp > (unsigned long)task_stack_page(current))
++		current_thread_info()->lowest_stack = sp;
++}
++EXPORT_SYMBOL(pax_track_stack);
++#endif
++
  static int zap_process(struct task_struct *start, int exit_code)
  {
  	struct task_struct *t;
-@@ -1852,17 +2144,17 @@ static void wait_for_dump_helpers(struct file *file)
+@@ -1969,17 +2260,17 @@ static void wait_for_dump_helpers(struct
  	pipe = file->f_path.dentry->d_inode->i_pipe;
  
  	pipe_lock(pipe);
@@ -38752,7 +36034,7 @@ index 52a447d..3294552 100644
  	pipe_unlock(pipe);
  
  }
-@@ -1923,7 +2215,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+@@ -2040,7 +2331,7 @@ void do_coredump(long signr, int exit_co
  	int retval = 0;
  	int flag = 0;
  	int ispipe;
@@ -38761,7 +36043,7 @@ index 52a447d..3294552 100644
  	struct coredump_params cprm = {
  		.signr = signr,
  		.regs = regs,
-@@ -1938,6 +2230,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+@@ -2055,6 +2346,9 @@ void do_coredump(long signr, int exit_co
  
  	audit_core_dumps(signr);
  
@@ -38771,7 +36053,7 @@ index 52a447d..3294552 100644
  	binfmt = mm->binfmt;
  	if (!binfmt || !binfmt->core_dump)
  		goto fail;
-@@ -1978,6 +2273,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+@@ -2095,6 +2389,8 @@ void do_coredump(long signr, int exit_co
  		goto fail_corename;
  	}
  
@@ -38780,7 +36062,7 @@ index 52a447d..3294552 100644
   	if (ispipe) {
  		int dump_count;
  		char **helper_argv;
-@@ -2005,7 +2302,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
+@@ -2122,7 +2418,7 @@ void do_coredump(long signr, int exit_co
  		}
  		cprm.limit = RLIM_INFINITY;
  
@@ -38789,7 +36071,7 @@ index 52a447d..3294552 100644
  		if (core_pipe_limit && (core_pipe_limit < dump_count)) {
  			printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
  			       task_tgid_vnr(current), current->comm);
-@@ -2075,7 +2372,7 @@ close_fail:
+@@ -2192,7 +2488,7 @@ close_fail:
  		filp_close(cprm.file, NULL);
  fail_dropcount:
  	if (ispipe)
@@ -38798,11 +36080,10 @@ index 52a447d..3294552 100644
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
-index 0d06f4e..3b518f1 100644
---- a/fs/ext2/balloc.c
-+++ b/fs/ext2/balloc.c
-@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
+diff -urNp linux-3.0.3/fs/ext2/balloc.c linux-3.0.3/fs/ext2/balloc.c
+--- linux-3.0.3/fs/ext2/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ext2/balloc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
  	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -38811,11 +36092,10 @@ index 0d06f4e..3b518f1 100644
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
-index 045995c..6105d65 100644
---- a/fs/ext3/balloc.c
-+++ b/fs/ext3/balloc.c
-@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
+diff -urNp linux-3.0.3/fs/ext3/balloc.c linux-3.0.3/fs/ext3/balloc.c
+--- linux-3.0.3/fs/ext3/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ext3/balloc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
  
  	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
  	root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
@@ -38824,24 +36104,24 @@ index 045995c..6105d65 100644
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
-index adf96b8..c4e34d6 100644
---- a/fs/ext4/balloc.c
-+++ b/fs/ext4/balloc.c
-@@ -519,7 +519,7 @@ static int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
+diff -urNp linux-3.0.3/fs/ext4/balloc.c linux-3.0.3/fs/ext4/balloc.c
+--- linux-3.0.3/fs/ext4/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ext4/balloc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
  	/* Hm, nope.  Are (enough) root reserved blocks available? */
  	if (sbi->s_resuid == current_fsuid() ||
  	    ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
--	    capable(CAP_SYS_RESOURCE)) {
-+	    capable_nolog(CAP_SYS_RESOURCE)) {
+-	    capable(CAP_SYS_RESOURCE) ||
+-		(flags & EXT4_MB_USE_ROOT_BLOCKS)) {
++		(flags & EXT4_MB_USE_ROOT_BLOCKS) ||
++	        capable_nolog(CAP_SYS_RESOURCE)) {
+ 
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
- 	}
-diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 0783b4f..353cc59 100644
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -1166,19 +1166,19 @@ struct ext4_sb_info {
+diff -urNp linux-3.0.3/fs/ext4/ext4.h linux-3.0.3/fs/ext4/ext4.h
+--- linux-3.0.3/fs/ext4/ext4.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/fs/ext4/ext4.h	2011-08-23 21:47:56.000000000 -0400
+@@ -1177,19 +1177,19 @@ struct ext4_sb_info {
  	unsigned long s_mb_last_start;
  
  	/* stats for buddy allocator */
@@ -38871,11 +36151,10 @@ index 0783b4f..353cc59 100644
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
-index 1738236..08fc93c9 100644
---- a/fs/ext4/mballoc.c
-+++ b/fs/ext4/mballoc.c
-@@ -1848,7 +1848,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
+diff -urNp linux-3.0.3/fs/ext4/mballoc.c linux-3.0.3/fs/ext4/mballoc.c
+--- linux-3.0.3/fs/ext4/mballoc.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/fs/ext4/mballoc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
  		BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
  		if (EXT4_SB(sb)->s_mb_stats)
@@ -38884,7 +36163,7 @@ index 1738236..08fc93c9 100644
  
  		break;
  	}
-@@ -2142,7 +2142,7 @@ repeat:
+@@ -2087,7 +2087,7 @@ repeat:
  			ac->ac_status = AC_STATUS_CONTINUE;
  			ac->ac_flags |= EXT4_MB_HINT_FIRST;
  			cr = 3;
@@ -38893,7 +36172,7 @@ index 1738236..08fc93c9 100644
  			goto repeat;
  		}
  	}
-@@ -2185,6 +2185,8 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
+@@ -2130,6 +2130,8 @@ static int ext4_mb_seq_groups_show(struc
  		ext4_grpblk_t counters[16];
  	} sg;
  
@@ -38902,7 +36181,7 @@ index 1738236..08fc93c9 100644
  	group--;
  	if (group == 0)
  		seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
-@@ -2608,25 +2610,25 @@ int ext4_mb_release(struct super_block *sb)
+@@ -2553,25 +2555,25 @@ int ext4_mb_release(struct super_block *
  	if (sbi->s_mb_stats) {
  		printk(KERN_INFO
  		       "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
@@ -38938,7 +36217,7 @@ index 1738236..08fc93c9 100644
  	}
  
  	free_percpu(sbi->s_locality_groups);
-@@ -3102,16 +3104,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
+@@ -3041,16 +3043,16 @@ static void ext4_mb_collect_stats(struct
  	struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
  
  	if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
@@ -38961,7 +36240,7 @@ index 1738236..08fc93c9 100644
  	}
  
  	if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
-@@ -3509,7 +3511,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
+@@ -3448,7 +3450,7 @@ ext4_mb_new_inode_pa(struct ext4_allocat
  	trace_ext4_mb_new_inode_pa(ac, pa);
  
  	ext4_mb_use_inode_pa(ac, pa);
@@ -38970,7 +36249,7 @@ index 1738236..08fc93c9 100644
  
  	ei = EXT4_I(ac->ac_inode);
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
-@@ -3569,7 +3571,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
+@@ -3508,7 +3510,7 @@ ext4_mb_new_group_pa(struct ext4_allocat
  	trace_ext4_mb_new_group_pa(ac, pa);
  
  	ext4_mb_use_group_pa(ac, pa);
@@ -38979,7 +36258,7 @@ index 1738236..08fc93c9 100644
  
  	grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
  	lg = ac->ac_lg;
-@@ -3656,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
+@@ -3595,7 +3597,7 @@ ext4_mb_release_inode_pa(struct ext4_bud
  		 * from the bitmap and continue.
  		 */
  	}
@@ -38988,7 +36267,7 @@ index 1738236..08fc93c9 100644
  
  	return err;
  }
-@@ -3674,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
+@@ -3613,7 +3615,7 @@ ext4_mb_release_group_pa(struct ext4_bud
  	ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
  	BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
  	mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
@@ -38997,11 +36276,10 @@ index 1738236..08fc93c9 100644
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff --git a/fs/fcntl.c b/fs/fcntl.c
-index cb10261..3f88c98 100644
---- a/fs/fcntl.c
-+++ b/fs/fcntl.c
-@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
+diff -urNp linux-3.0.3/fs/fcntl.c linux-3.0.3/fs/fcntl.c
+--- linux-3.0.3/fs/fcntl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fcntl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
  
@@ -39013,7 +36291,7 @@ index cb10261..3f88c98 100644
  	f_modown(filp, pid, type, force);
  	return 0;
  }
-@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
+@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned in
  	switch (cmd) {
  	case F_DUPFD:
  	case F_DUPFD_CLOEXEC:
@@ -39021,28 +36299,27 @@ index cb10261..3f88c98 100644
  		if (arg >= rlimit(RLIMIT_NOFILE))
  			break;
  		err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
-@@ -808,14 +814,14 @@ static int __init fcntl_init(void)
+@@ -835,14 +841,14 @@ static int __init fcntl_init(void)
  	 * Exceptions: O_NONBLOCK is a two bit define on parisc; O_NDELAY
  	 * is defined as O_NONBLOCK on some platforms and not on others.
  	 */
--	BUILD_BUG_ON(18 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
-+	BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
+-	BUILD_BUG_ON(19 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
++	BUILD_BUG_ON(20 - 1 /* for O_RDONLY being 0 */ != HWEIGHT32(
  		O_RDONLY	| O_WRONLY	| O_RDWR	|
  		O_CREAT		| O_EXCL	| O_NOCTTY	|
  		O_TRUNC		| O_APPEND	| /* O_NONBLOCK	| */
  		__O_SYNC	| O_DSYNC	| FASYNC	|
  		O_DIRECT	| O_LARGEFILE	| O_DIRECTORY	|
  		O_NOFOLLOW	| O_NOATIME	| O_CLOEXEC	|
--		__FMODE_EXEC
-+		__FMODE_EXEC	| FMODE_GREXEC
+-		__FMODE_EXEC	| O_PATH
++		__FMODE_EXEC	| O_PATH	| FMODE_GREXEC
  		));
  
  	fasync_cache = kmem_cache_create("fasync_cache",
-diff --git a/fs/fifo.c b/fs/fifo.c
-index 4e303c2..77a56b2 100644
---- a/fs/fifo.c
-+++ b/fs/fifo.c
-@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
+diff -urNp linux-3.0.3/fs/fifo.c linux-3.0.3/fs/fifo.c
+--- linux-3.0.3/fs/fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fifo.c	2011-08-23 21:47:56.000000000 -0400
+@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &read_pipefifo_fops;
  		pipe->r_counter++;
@@ -39055,7 +36332,7 @@ index 4e303c2..77a56b2 100644
  			if ((filp->f_flags & O_NONBLOCK)) {
  				/* suppress POLLHUP until we have
  				 * seen a writer */
-@@ -82,15 +82,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode
  	 *  errno=ENXIO when there is no process reading the FIFO.
  	 */
  		ret = -ENXIO;
@@ -39074,7 +36351,7 @@ index 4e303c2..77a56b2 100644
  			wait_for_partner(inode, &pipe->r_counter);
  			if (signal_pending(current))
  				goto err_wr;
-@@ -106,11 +106,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode
  	 */
  		filp->f_op = &rdwr_pipefifo_fops;
  
@@ -39089,7 +36366,7 @@ index 4e303c2..77a56b2 100644
  			wake_up_partner(inode);
  		break;
  
-@@ -124,19 +124,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
+@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode
  	return 0;
  
  err_rd:
@@ -39112,10 +36389,9 @@ index 4e303c2..77a56b2 100644
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff --git a/fs/file.c b/fs/file.c
-index 4c6992d..104cdea 100644
---- a/fs/file.c
-+++ b/fs/file.c
+diff -urNp linux-3.0.3/fs/file.c linux-3.0.3/fs/file.c
+--- linux-3.0.3/fs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/file.c	2011-08-23 21:48:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -39124,7 +36400,7 @@ index 4c6992d..104cdea 100644
  #include <linux/fdtable.h>
  #include <linux/bitops.h>
  #include <linux/interrupt.h>
-@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
+@@ -254,6 +255,7 @@ int expand_files(struct files_struct *fi
  	 * N.B. For clone tasks sharing a files structure, this test
  	 * will limit the total number of files that can be opened.
  	 */
@@ -39132,11 +36408,10 @@ index 4c6992d..104cdea 100644
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff --git a/fs/filesystems.c b/fs/filesystems.c
-index 751d6b2..0540ff2 100644
---- a/fs/filesystems.c
-+++ b/fs/filesystems.c
-@@ -275,7 +275,12 @@ struct file_system_type *get_fs_type(const char *name)
+diff -urNp linux-3.0.3/fs/filesystems.c linux-3.0.3/fs/filesystems.c
+--- linux-3.0.3/fs/filesystems.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/filesystems.c	2011-08-23 21:48:14.000000000 -0400
+@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
  	int len = dot ? dot - name : strlen(name);
  
  	fs = __get_fs_type(name, len);
@@ -39149,104 +36424,10 @@ index 751d6b2..0540ff2 100644
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff --git a/fs/fs_struct.c b/fs/fs_struct.c
-index 78b519c..212c0d0 100644
---- a/fs/fs_struct.c
-+++ b/fs/fs_struct.c
-@@ -4,6 +4,7 @@
- #include <linux/path.h>
- #include <linux/slab.h>
- #include <linux/fs_struct.h>
-+#include <linux/grsecurity.h>
- #include "internal.h"
- 
- static inline void path_get_longterm(struct path *path)
-@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
- 	old_root = fs->root;
- 	fs->root = *path;
- 	path_get_longterm(path);
-+	gr_set_chroot_entries(current, path);
- 	write_seqcount_end(&fs->seq);
- 	spin_unlock(&fs->lock);
- 	if (old_root.dentry)
-@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
- 			    && fs->root.mnt == old_root->mnt) {
- 				path_get_longterm(new_root);
- 				fs->root = *new_root;
-+				gr_set_chroot_entries(p, new_root);
- 				count++;
- 			}
- 			if (fs->pwd.dentry == old_root->dentry
-@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
- 		spin_lock(&fs->lock);
- 		write_seqcount_begin(&fs->seq);
- 		tsk->fs = NULL;
--		kill = !--fs->users;
-+		gr_clear_chroot_entries(tsk);
-+		kill = !atomic_dec_return(&fs->users);
- 		write_seqcount_end(&fs->seq);
- 		spin_unlock(&fs->lock);
- 		task_unlock(tsk);
-@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
- 	struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
- 	/* We don't need to lock fs - think why ;-) */
- 	if (fs) {
--		fs->users = 1;
-+		atomic_set(&fs->users, 1);
- 		fs->in_exec = 0;
- 		spin_lock_init(&fs->lock);
- 		seqcount_init(&fs->seq);
-@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
- 		spin_lock(&old->lock);
- 		fs->root = old->root;
- 		path_get_longterm(&fs->root);
-+		/* instead of calling gr_set_chroot_entries here,
-+		   we call it from every caller of this function
-+		*/
- 		fs->pwd = old->pwd;
- 		path_get_longterm(&fs->pwd);
- 		spin_unlock(&old->lock);
-@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
- 
- 	task_lock(current);
- 	spin_lock(&fs->lock);
--	kill = !--fs->users;
-+	kill = !atomic_dec_return(&fs->users);
- 	current->fs = new_fs;
-+	gr_set_chroot_entries(current, &new_fs->root);
- 	spin_unlock(&fs->lock);
- 	task_unlock(current);
- 
-@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask);
- 
- /* to be mentioned only in INIT_TASK */
- struct fs_struct init_fs = {
--	.users		= 1,
-+	.users		= ATOMIC_INIT(1),
- 	.lock		= __SPIN_LOCK_UNLOCKED(init_fs.lock),
- 	.seq		= SEQCNT_ZERO,
- 	.umask		= 0022,
-@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
- 		task_lock(current);
- 
- 		spin_lock(&init_fs.lock);
--		init_fs.users++;
-+		atomic_inc(&init_fs.users);
- 		spin_unlock(&init_fs.lock);
- 
- 		spin_lock(&fs->lock);
- 		current->fs = &init_fs;
--		kill = !--fs->users;
-+		gr_set_chroot_entries(current, &current->fs->root);
-+		kill = !atomic_dec_return(&fs->users);
- 		spin_unlock(&fs->lock);
- 
- 		task_unlock(current);
-diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
-index 9905350..02eaec4 100644
---- a/fs/fscache/cookie.c
-+++ b/fs/fscache/cookie.c
-@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
+diff -urNp linux-3.0.3/fs/fscache/cookie.c linux-3.0.3/fs/fscache/cookie.c
+--- linux-3.0.3/fs/fscache/cookie.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/cookie.c	2011-08-23 21:47:56.000000000 -0400
+@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
  	       parent ? (char *) parent->def->name : "<no-parent>",
  	       def->name, netfs_data);
  
@@ -39260,7 +36441,7 @@ index 9905350..02eaec4 100644
  		_leave(" [no parent]");
  		return NULL;
  	}
-@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire
  	/* allocate and initialise a cookie */
  	cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
  	if (!cookie) {
@@ -39269,7 +36450,7 @@ index 9905350..02eaec4 100644
  		_leave(" [ENOMEM]");
  		return NULL;
  	}
-@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire
  
  	switch (cookie->def->type) {
  	case FSCACHE_COOKIE_TYPE_INDEX:
@@ -39286,7 +36467,7 @@ index 9905350..02eaec4 100644
  		break;
  	}
  
-@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
+@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire
  		if (fscache_acquire_non_index_cookie(cookie) < 0) {
  			atomic_dec(&parent->n_children);
  			__fscache_cookie_put(cookie);
@@ -39302,7 +36483,7 @@ index 9905350..02eaec4 100644
  	_leave(" = %p", cookie);
  	return cookie;
  }
-@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
+@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_coo
  	cache = fscache_select_cache_for_object(cookie->parent);
  	if (!cache) {
  		up_read(&fscache_addremove_sem);
@@ -39311,7 +36492,7 @@ index 9905350..02eaec4 100644
  		_leave(" = -ENOMEDIUM [no cache]");
  		return -ENOMEDIUM;
  	}
-@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
+@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct f
  	object = cache->ops->alloc_object(cache, cookie);
  	fscache_stat_d(&fscache_n_cop_alloc_object);
  	if (IS_ERR(object)) {
@@ -39326,7 +36507,7 @@ index 9905350..02eaec4 100644
  
  	object->debug_id = atomic_inc_return(&fscache_object_debug_id);
  
-@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
+@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fsca
  	struct fscache_object *object;
  	struct hlist_node *_p;
  
@@ -39339,7 +36520,7 @@ index 9905350..02eaec4 100644
  		_leave(" [no cookie]");
  		return;
  	}
-@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct 
  	struct fscache_object *object;
  	unsigned long event;
  
@@ -39355,7 +36536,7 @@ index 9905350..02eaec4 100644
  		_leave(" [no cookie]");
  		return;
  	}
-@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
+@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct 
  
  	/* wait for the cookie to finish being instantiated (or to fail) */
  	if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
@@ -39364,10 +36545,9 @@ index 9905350..02eaec4 100644
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
-index f6aad48..88dcf26 100644
---- a/fs/fscache/internal.h
-+++ b/fs/fscache/internal.h
+diff -urNp linux-3.0.3/fs/fscache/internal.h linux-3.0.3/fs/fscache/internal.h
+--- linux-3.0.3/fs/fscache/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -39551,7 +36731,7 @@ index f6aad48..88dcf26 100644
  
  extern atomic_t fscache_n_cop_alloc_object;
  extern atomic_t fscache_n_cop_lookup_object;
-@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
+@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t
  	atomic_inc(stat);
  }
  
@@ -39563,7 +36743,7 @@ index f6aad48..88dcf26 100644
  static inline void fscache_stat_d(atomic_t *stat)
  {
  	atomic_dec(stat);
-@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
+@@ -267,6 +272,7 @@ extern const struct file_operations fsca
  
  #define __fscache_stat(stat) (NULL)
  #define fscache_stat(stat) do {} while (0)
@@ -39571,11 +36751,10 @@ index f6aad48..88dcf26 100644
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff --git a/fs/fscache/object.c b/fs/fscache/object.c
-index b6b897c..0ffff9c 100644
---- a/fs/fscache/object.c
-+++ b/fs/fscache/object.c
-@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+diff -urNp linux-3.0.3/fs/fscache/object.c linux-3.0.3/fs/fscache/object.c
+--- linux-3.0.3/fs/fscache/object.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/object.c	2011-08-23 21:47:56.000000000 -0400
+@@ -128,7 +128,7 @@ static void fscache_object_state_machine
  		/* update the object metadata on disk */
  	case FSCACHE_OBJECT_UPDATING:
  		clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
@@ -39584,7 +36763,7 @@ index b6b897c..0ffff9c 100644
  		fscache_stat(&fscache_n_cop_update_object);
  		object->cache->ops->update_object(object);
  		fscache_stat_d(&fscache_n_cop_update_object);
-@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+@@ -217,7 +217,7 @@ static void fscache_object_state_machine
  		spin_lock(&object->lock);
  		object->state = FSCACHE_OBJECT_DEAD;
  		spin_unlock(&object->lock);
@@ -39593,7 +36772,7 @@ index b6b897c..0ffff9c 100644
  		goto terminal_transit;
  
  		/* handle the parent cache of this object being withdrawn from
-@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
+@@ -232,7 +232,7 @@ static void fscache_object_state_machine
  		spin_lock(&object->lock);
  		object->state = FSCACHE_OBJECT_DEAD;
  		spin_unlock(&object->lock);
@@ -39602,7 +36781,7 @@ index b6b897c..0ffff9c 100644
  		goto terminal_transit;
  
  		/* complain about the object being woken up once it is
-@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
+@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct
  	       parent->cookie->def->name, cookie->def->name,
  	       object->cache->tag->name);
  
@@ -39611,7 +36790,7 @@ index b6b897c..0ffff9c 100644
  	fscache_stat(&fscache_n_cop_lookup_object);
  	ret = object->cache->ops->lookup_object(object);
  	fscache_stat_d(&fscache_n_cop_lookup_object);
-@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
+@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct
  	if (ret == -ETIMEDOUT) {
  		/* probably stuck behind another object, so move this one to
  		 * the back of the queue */
@@ -39620,7 +36799,7 @@ index b6b897c..0ffff9c 100644
  		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
  	}
  
-@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
+@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(stru
  
  	spin_lock(&object->lock);
  	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
@@ -39629,7 +36808,7 @@ index b6b897c..0ffff9c 100644
  
  		/* transit here to allow write requests to begin stacking up
  		 * and read requests to begin returning ENODATA */
-@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
+@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fsca
  	 * result, in which case there may be data available */
  	spin_lock(&object->lock);
  	if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
@@ -39638,7 +36817,7 @@ index b6b897c..0ffff9c 100644
  
  		clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
  
-@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
+@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fsca
  		set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
  	} else {
  		ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
@@ -39647,7 +36826,7 @@ index b6b897c..0ffff9c 100644
  
  		object->state = FSCACHE_OBJECT_AVAILABLE;
  		spin_unlock(&object->lock);
-@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
+@@ -602,7 +602,7 @@ static void fscache_object_available(str
  	fscache_enqueue_dependents(object);
  
  	fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
@@ -39656,7 +36835,7 @@ index b6b897c..0ffff9c 100644
  
  	_leave("");
  }
-@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(
  	enum fscache_checkaux result;
  
  	if (!object->cookie->def->check_aux) {
@@ -39665,7 +36844,7 @@ index b6b897c..0ffff9c 100644
  		return FSCACHE_CHECKAUX_OKAY;
  	}
  
-@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
+@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(
  	switch (result) {
  		/* entry okay as is */
  	case FSCACHE_CHECKAUX_OKAY:
@@ -39686,10 +36865,9 @@ index b6b897c..0ffff9c 100644
  		break;
  
  	default:
-diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
-index 48a18f1..e58a5e6 100644
---- a/fs/fscache/operation.c
-+++ b/fs/fscache/operation.c
+diff -urNp linux-3.0.3/fs/fscache/operation.c linux-3.0.3/fs/fscache/operation.c
+--- linux-3.0.3/fs/fscache/operation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/operation.c	2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -39699,7 +36877,7 @@ index 48a18f1..e58a5e6 100644
  EXPORT_SYMBOL(fscache_op_debug_id);
  
  /**
-@@ -40,7 +40,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
+@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fs
  	ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
  	ASSERTCMP(atomic_read(&op->usage), >, 0);
  
@@ -39708,7 +36886,7 @@ index 48a18f1..e58a5e6 100644
  	switch (op->flags & FSCACHE_OP_TYPE) {
  	case FSCACHE_OP_ASYNC:
  		_debug("queue async");
-@@ -73,7 +73,7 @@ static void fscache_run_op(struct fscache_object *object,
+@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscach
  		wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
  	if (op->processor)
  		fscache_enqueue_operation(op);
@@ -39717,7 +36895,7 @@ index 48a18f1..e58a5e6 100644
  }
  
  /*
-@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct f
  		if (object->n_ops > 1) {
  			atomic_inc(&op->usage);
  			list_add_tail(&op->pend_link, &object->pending_ops);
@@ -39731,7 +36909,7 @@ index 48a18f1..e58a5e6 100644
  			fscache_start_operations(object);
  		} else {
  			ASSERTCMP(object->n_in_progress, ==, 0);
-@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
+@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct f
  		object->n_exclusive++;	/* reads and writes must wait */
  		atomic_inc(&op->usage);
  		list_add_tail(&op->pend_link, &object->pending_ops);
@@ -39740,7 +36918,7 @@ index 48a18f1..e58a5e6 100644
  		ret = 0;
  	} else {
  		/* not allowed to submit ops in any other state */
-@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_obj
  		if (object->n_exclusive > 0) {
  			atomic_inc(&op->usage);
  			list_add_tail(&op->pend_link, &object->pending_ops);
@@ -39754,7 +36932,7 @@ index 48a18f1..e58a5e6 100644
  			fscache_start_operations(object);
  		} else {
  			ASSERTCMP(object->n_exclusive, ==, 0);
-@@ -227,12 +227,12 @@ int fscache_submit_op(struct fscache_object *object,
+@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_obj
  		object->n_ops++;
  		atomic_inc(&op->usage);
  		list_add_tail(&op->pend_link, &object->pending_ops);
@@ -39769,7 +36947,7 @@ index 48a18f1..e58a5e6 100644
  		ret = -ENOBUFS;
  	} else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
  		fscache_report_unexpected_submission(object, op, ostate);
-@@ -302,7 +302,7 @@ int fscache_cancel_op(struct fscache_operation *op)
+@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_ope
  
  	ret = -EBUSY;
  	if (!list_empty(&op->pend_link)) {
@@ -39778,7 +36956,7 @@ index 48a18f1..e58a5e6 100644
  		list_del_init(&op->pend_link);
  		object->n_ops--;
  		if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
-@@ -341,7 +341,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscach
  	if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
  		BUG();
  
@@ -39787,7 +36965,7 @@ index 48a18f1..e58a5e6 100644
  
  	if (op->release) {
  		op->release(op);
-@@ -358,7 +358,7 @@ void fscache_put_operation(struct fscache_operation *op)
+@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscach
  	 * lock, and defer it otherwise */
  	if (!spin_trylock(&object->lock)) {
  		_debug("defer put");
@@ -39796,7 +36974,7 @@ index 48a18f1..e58a5e6 100644
  
  		cache = object->cache;
  		spin_lock(&cache->op_gc_list_lock);
-@@ -420,7 +420,7 @@ void fscache_operation_gc(struct work_struct *work)
+@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_st
  
  		_debug("GC DEFERRED REL OBJ%x OP%x",
  		       object->debug_id, op->debug_id);
@@ -39805,11 +36983,10 @@ index 48a18f1..e58a5e6 100644
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff --git a/fs/fscache/page.c b/fs/fscache/page.c
-index 41c441c..39ffc1e 100644
---- a/fs/fscache/page.c
-+++ b/fs/fscache/page.c
-@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
+diff -urNp linux-3.0.3/fs/fscache/page.c linux-3.0.3/fs/fscache/page.c
+--- linux-3.0.3/fs/fscache/page.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/page.c	2011-08-23 21:47:56.000000000 -0400
+@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
  	val = radix_tree_lookup(&cookie->stores, page->index);
  	if (!val) {
  		rcu_read_unlock();
@@ -39818,7 +36995,7 @@ index 41c441c..39ffc1e 100644
  		__fscache_uncache_page(cookie, page);
  		return true;
  	}
-@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
+@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct
  	spin_unlock(&cookie->stores_lock);
  
  	if (xpage) {
@@ -39842,7 +37019,7 @@ index 41c441c..39ffc1e 100644
  	return false;
  }
  EXPORT_SYMBOL(__fscache_maybe_release_page);
-@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
+@@ -131,7 +131,7 @@ static void fscache_end_page_write(struc
  				     FSCACHE_COOKIE_STORING_TAG);
  		if (!radix_tree_tag_get(&cookie->stores, page->index,
  					FSCACHE_COOKIE_PENDING_TAG)) {
@@ -39851,7 +37028,7 @@ index 41c441c..39ffc1e 100644
  			xpage = radix_tree_delete(&cookie->stores, page->index);
  		}
  		spin_unlock(&cookie->stores_lock);
-@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
+@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(stru
  
  	_enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
  
@@ -39859,8 +37036,8 @@ index 41c441c..39ffc1e 100644
 +	fscache_stat_unchecked(&fscache_n_attr_changed_calls);
  
  	if (fscache_object_is_active(object)) {
- 		fscache_set_op_state(op, "CallFS");
-@@ -179,11 +179,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+ 		fscache_stat(&fscache_n_cop_attr_changed);
+@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscach
  
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  
@@ -39874,7 +37051,7 @@ index 41c441c..39ffc1e 100644
  		_leave(" = -ENOMEM");
  		return -ENOMEM;
  	}
-@@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscach
  	if (fscache_submit_exclusive_op(object, op) < 0)
  		goto nobufs;
  	spin_unlock(&cookie->lock);
@@ -39883,7 +37060,7 @@ index 41c441c..39ffc1e 100644
  	fscache_put_operation(op);
  	_leave(" = 0");
  	return 0;
-@@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
+@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscach
  nobufs:
  	spin_unlock(&cookie->lock);
  	kfree(op);
@@ -39892,7 +37069,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = %d", -ENOBUFS);
  	return -ENOBUFS;
  }
-@@ -246,7 +246,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
+@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache
  	/* allocate a retrieval operation and attempt to submit it */
  	op = kzalloc(sizeof(*op), GFP_NOIO);
  	if (!op) {
@@ -39901,7 +37078,7 @@ index 41c441c..39ffc1e 100644
  		return NULL;
  	}
  
-@@ -275,13 +275,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
+@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_loo
  		return 0;
  	}
  
@@ -39917,7 +37094,7 @@ index 41c441c..39ffc1e 100644
  		_leave(" = -ERESTARTSYS");
  		return -ERESTARTSYS;
  	}
-@@ -299,8 +299,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
+@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_loo
   */
  static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
  						 struct fscache_retrieval *op,
@@ -39928,7 +37105,7 @@ index 41c441c..39ffc1e 100644
  {
  	int ret;
  
-@@ -308,7 +308,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_ac
  		goto check_if_dead;
  
  	_debug(">>> WT");
@@ -39937,7 +37114,7 @@ index 41c441c..39ffc1e 100644
  	if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
  			fscache_wait_bit_interruptible,
  			TASK_INTERRUPTIBLE) < 0) {
-@@ -325,7 +325,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
+@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_ac
  
  check_if_dead:
  	if (unlikely(fscache_object_is_dead(object))) {
@@ -39946,7 +37123,7 @@ index 41c441c..39ffc1e 100644
  		return -ENOBUFS;
  	}
  	return 0;
-@@ -352,7 +352,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct 
  
  	_enter("%p,%p,,,", cookie, page);
  
@@ -39955,7 +37132,7 @@ index 41c441c..39ffc1e 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -386,7 +386,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct 
  		goto nobufs_unlock;
  	spin_unlock(&cookie->lock);
  
@@ -39964,7 +37141,7 @@ index 41c441c..39ffc1e 100644
  
  	/* pin the netfs read context in case we need to do the actual netfs
  	 * read because we've encountered a cache read failure */
-@@ -416,15 +416,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
+@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct 
  
  error:
  	if (ret == -ENOMEM)
@@ -39985,7 +37162,7 @@ index 41c441c..39ffc1e 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -434,7 +434,7 @@ nobufs_unlock:
+@@ -429,7 +429,7 @@ nobufs_unlock:
  	spin_unlock(&cookie->lock);
  	kfree(op);
  nobufs:
@@ -39994,7 +37171,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -472,7 +472,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct
  
  	_enter("%p,,%d,,,", cookie, *nr_pages);
  
@@ -40003,7 +37180,7 @@ index 41c441c..39ffc1e 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -503,7 +503,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct
  		goto nobufs_unlock;
  	spin_unlock(&cookie->lock);
  
@@ -40012,7 +37189,7 @@ index 41c441c..39ffc1e 100644
  
  	/* pin the netfs read context in case we need to do the actual netfs
  	 * read because we've encountered a cache read failure */
-@@ -533,15 +533,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
+@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct
  
  error:
  	if (ret == -ENOMEM)
@@ -40033,7 +37210,7 @@ index 41c441c..39ffc1e 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -551,7 +551,7 @@ nobufs_unlock:
+@@ -545,7 +545,7 @@ nobufs_unlock:
  	spin_unlock(&cookie->lock);
  	kfree(op);
  nobufs:
@@ -40042,7 +37219,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -575,7 +575,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_
  
  	_enter("%p,%p,,,", cookie, page);
  
@@ -40051,7 +37228,7 @@ index 41c441c..39ffc1e 100644
  
  	if (hlist_empty(&cookie->backing_objects))
  		goto nobufs;
-@@ -602,7 +602,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_
  		goto nobufs_unlock;
  	spin_unlock(&cookie->lock);
  
@@ -40060,7 +37237,7 @@ index 41c441c..39ffc1e 100644
  
  	ret = fscache_wait_for_retrieval_activation(
  		object, op,
-@@ -618,11 +618,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
+@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_
  
  error:
  	if (ret == -ERESTARTSYS)
@@ -40075,7 +37252,7 @@ index 41c441c..39ffc1e 100644
  
  	fscache_put_retrieval(op);
  	_leave(" = %d", ret);
-@@ -632,7 +632,7 @@ nobufs_unlock:
+@@ -625,7 +625,7 @@ nobufs_unlock:
  	spin_unlock(&cookie->lock);
  	kfree(op);
  nobufs:
@@ -40084,7 +37261,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = -ENOBUFS");
  	return -ENOBUFS;
  }
-@@ -675,7 +675,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -666,7 +666,7 @@ static void fscache_write_op(struct fsca
  
  	spin_lock(&cookie->stores_lock);
  
@@ -40093,7 +37270,7 @@ index 41c441c..39ffc1e 100644
  
  	/* find a page to store */
  	page = NULL;
-@@ -686,7 +686,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -677,7 +677,7 @@ static void fscache_write_op(struct fsca
  	page = results[0];
  	_debug("gang %d [%lx]", n, page->index);
  	if (page->index > op->store_limit) {
@@ -40102,16 +37279,16 @@ index 41c441c..39ffc1e 100644
  		goto superseded;
  	}
  
-@@ -699,7 +699,7 @@ static void fscache_write_op(struct fscache_operation *_op)
+@@ -689,7 +689,7 @@ static void fscache_write_op(struct fsca
+ 	spin_unlock(&cookie->stores_lock);
  	spin_unlock(&object->lock);
  
- 	fscache_set_op_state(&op->op, "Store");
 -	fscache_stat(&fscache_n_store_pages);
 +	fscache_stat_unchecked(&fscache_n_store_pages);
  	fscache_stat(&fscache_n_cop_write_page);
  	ret = object->cache->ops->write_page(op, page);
  	fscache_stat_d(&fscache_n_cop_write_page);
-@@ -769,7 +769,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  	ASSERT(PageFsCache(page));
  
@@ -40120,7 +37297,7 @@ index 41c441c..39ffc1e 100644
  
  	op = kzalloc(sizeof(*op), GFP_NOIO);
  	if (!op)
-@@ -821,7 +821,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_
  	spin_unlock(&cookie->stores_lock);
  	spin_unlock(&object->lock);
  
@@ -40129,7 +37306,7 @@ index 41c441c..39ffc1e 100644
  	op->store_limit = object->store_limit;
  
  	if (fscache_submit_op(object, &op->op) < 0)
-@@ -829,8 +829,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_
  
  	spin_unlock(&cookie->lock);
  	radix_tree_preload_end();
@@ -40140,7 +37317,7 @@ index 41c441c..39ffc1e 100644
  
  	/* the work queue now carries its own ref on the object */
  	fscache_put_operation(&op->op);
-@@ -838,14 +838,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
+@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_
  	return 0;
  
  already_queued:
@@ -40157,7 +37334,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = 0");
  	return 0;
  
-@@ -864,14 +864,14 @@ nobufs:
+@@ -851,14 +851,14 @@ nobufs:
  	spin_unlock(&cookie->lock);
  	radix_tree_preload_end();
  	kfree(op);
@@ -40174,7 +37351,7 @@ index 41c441c..39ffc1e 100644
  	_leave(" = -ENOMEM");
  	return -ENOMEM;
  }
-@@ -889,7 +889,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
+@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscac
  	ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
  	ASSERTCMP(page, !=, NULL);
  
@@ -40183,7 +37360,7 @@ index 41c441c..39ffc1e 100644
  
  	/* cache withdrawal may beat us to it */
  	if (!PageFsCache(page))
-@@ -942,7 +942,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
+@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fs
  	unsigned long loop;
  
  #ifdef CONFIG_FSCACHE_STATS
@@ -40192,10 +37369,9 @@ index 41c441c..39ffc1e 100644
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
-index 4765190..2a067f2 100644
---- a/fs/fscache/stats.c
-+++ b/fs/fscache/stats.c
+diff -urNp linux-3.0.3/fs/fscache/stats.c linux-3.0.3/fs/fscache/stats.c
+--- linux-3.0.3/fs/fscache/stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fscache/stats.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -40381,7 +37557,7 @@ index 4765190..2a067f2 100644
  
  atomic_t fscache_n_cop_alloc_object;
  atomic_t fscache_n_cop_lookup_object;
-@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
+@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq
  	seq_puts(m, "FS-Cache statistics\n");
  
  	seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
@@ -40571,67 +37747,122 @@ index 4765190..2a067f2 100644
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
-index 3e87cce..b555884 100644
---- a/fs/fuse/cuse.c
-+++ b/fs/fuse/cuse.c
-@@ -530,8 +530,18 @@ static int cuse_channel_release(struct inode *inode, struct file *file)
- 	return rc;
- }
+diff -urNp linux-3.0.3/fs/fs_struct.c linux-3.0.3/fs/fs_struct.c
+--- linux-3.0.3/fs/fs_struct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fs_struct.c	2011-08-23 21:48:14.000000000 -0400
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/grsecurity.h>
+ #include "internal.h"
  
--static struct file_operations cuse_channel_fops; /* initialized during init */
--
-+static const struct file_operations cuse_channel_fops = { /* initialized during init */
-+	.owner		= THIS_MODULE,
-+	.llseek		= no_llseek,
-+	.read		= do_sync_read,
-+	.aio_read	= fuse_dev_read,
-+	.write		= do_sync_write,
-+	.aio_write	= fuse_dev_write,
-+	.poll		= fuse_dev_poll,
-+	.open		= cuse_channel_open,
-+	.release	= cuse_channel_release,
-+	.fasync		= fuse_dev_fasync,
-+};
+ static inline void path_get_longterm(struct path *path)
+@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, s
+ 	old_root = fs->root;
+ 	fs->root = *path;
+ 	path_get_longterm(path);
++	gr_set_chroot_entries(current, path);
+ 	write_seqcount_end(&fs->seq);
+ 	spin_unlock(&fs->lock);
+ 	if (old_root.dentry)
+@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_roo
+ 			    && fs->root.mnt == old_root->mnt) {
+ 				path_get_longterm(new_root);
+ 				fs->root = *new_root;
++				gr_set_chroot_entries(p, new_root);
+ 				count++;
+ 			}
+ 			if (fs->pwd.dentry == old_root->dentry
+@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
+ 		spin_lock(&fs->lock);
+ 		write_seqcount_begin(&fs->seq);
+ 		tsk->fs = NULL;
+-		kill = !--fs->users;
++		gr_clear_chroot_entries(tsk);
++		kill = !atomic_dec_return(&fs->users);
+ 		write_seqcount_end(&fs->seq);
+ 		spin_unlock(&fs->lock);
+ 		task_unlock(tsk);
+@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct 
+ 	struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
+ 	/* We don't need to lock fs - think why ;-) */
+ 	if (fs) {
+-		fs->users = 1;
++		atomic_set(&fs->users, 1);
+ 		fs->in_exec = 0;
+ 		spin_lock_init(&fs->lock);
+ 		seqcount_init(&fs->seq);
+@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct 
+ 		spin_lock(&old->lock);
+ 		fs->root = old->root;
+ 		path_get_longterm(&fs->root);
++		/* instead of calling gr_set_chroot_entries here,
++		   we call it from every caller of this function
++		*/
+ 		fs->pwd = old->pwd;
+ 		path_get_longterm(&fs->pwd);
+ 		spin_unlock(&old->lock);
+@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
  
- /**************************************************************************
-  * Misc stuff and module initializatiion
-@@ -577,12 +587,6 @@ static int __init cuse_init(void)
- 	for (i = 0; i < CUSE_CONNTBL_LEN; i++)
+ 	task_lock(current);
+ 	spin_lock(&fs->lock);
+-	kill = !--fs->users;
++	kill = !atomic_dec_return(&fs->users);
+ 	current->fs = new_fs;
++	gr_set_chroot_entries(current, &new_fs->root);
+ 	spin_unlock(&fs->lock);
+ 	task_unlock(current);
+ 
+@@ -170,7 +178,7 @@ EXPORT_SYMBOL(current_umask);
+ 
+ /* to be mentioned only in INIT_TASK */
+ struct fs_struct init_fs = {
+-	.users		= 1,
++	.users		= ATOMIC_INIT(1),
+ 	.lock		= __SPIN_LOCK_UNLOCKED(init_fs.lock),
+ 	.seq		= SEQCNT_ZERO,
+ 	.umask		= 0022,
+@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
+ 		task_lock(current);
+ 
+ 		spin_lock(&init_fs.lock);
+-		init_fs.users++;
++		atomic_inc(&init_fs.users);
+ 		spin_unlock(&init_fs.lock);
+ 
+ 		spin_lock(&fs->lock);
+ 		current->fs = &init_fs;
+-		kill = !--fs->users;
++		gr_set_chroot_entries(current, &current->fs->root);
++		kill = !atomic_dec_return(&fs->users);
+ 		spin_unlock(&fs->lock);
+ 
+ 		task_unlock(current);
+diff -urNp linux-3.0.3/fs/fuse/cuse.c linux-3.0.3/fs/fuse/cuse.c
+--- linux-3.0.3/fs/fuse/cuse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fuse/cuse.c	2011-08-23 21:47:56.000000000 -0400
+@@ -586,10 +586,12 @@ static int __init cuse_init(void)
  		INIT_LIST_HEAD(&cuse_conntbl[i]);
  
--	/* inherit and extend fuse_dev_operations */
+ 	/* inherit and extend fuse_dev_operations */
 -	cuse_channel_fops		= fuse_dev_operations;
 -	cuse_channel_fops.owner		= THIS_MODULE;
 -	cuse_channel_fops.open		= cuse_channel_open;
 -	cuse_channel_fops.release	= cuse_channel_release;
--
++	pax_open_kernel();
++	memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
++	*(void **)&cuse_channel_fops.owner	= THIS_MODULE;
++	*(void **)&cuse_channel_fops.open	= cuse_channel_open;
++	*(void **)&cuse_channel_fops.release	= cuse_channel_release;
++	pax_close_kernel();
+ 
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
- 		return PTR_ERR(cuse_class);
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index cf8d28d..f110bb6 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -1183,7 +1183,7 @@ static ssize_t fuse_dev_do_read(struct fuse_conn *fc, struct file *file,
- 	return err;
- }
- 
--static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
- 			      unsigned long nr_segs, loff_t pos)
- {
- 	struct fuse_copy_state cs;
-@@ -1197,6 +1197,8 @@ static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
- 	return fuse_dev_do_read(fc, file, &cs, iov_length(iov, nr_segs));
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_read);
-+
- static int fuse_dev_pipe_buf_steal(struct pipe_inode_info *pipe,
- 				   struct pipe_buffer *buf)
- {
-@@ -1240,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
+diff -urNp linux-3.0.3/fs/fuse/dev.c linux-3.0.3/fs/fuse/dev.c
+--- linux-3.0.3/fs/fuse/dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fuse/dev.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
  	ret = 0;
  	pipe_lock(pipe);
  
@@ -40640,65 +37871,10 @@ index cf8d28d..f110bb6 100644
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-@@ -1733,7 +1735,7 @@ static ssize_t fuse_dev_do_write(struct fuse_conn *fc,
- 	return err;
- }
- 
--static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
- 			      unsigned long nr_segs, loff_t pos)
- {
- 	struct fuse_copy_state cs;
-@@ -1746,6 +1748,8 @@ static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
- 	return fuse_dev_do_write(fc, &cs, iov_length(iov, nr_segs));
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_write);
-+
- static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe,
- 				     struct file *out, loff_t *ppos,
- 				     size_t len, unsigned int flags)
-@@ -1824,7 +1828,7 @@ out:
- 	return ret;
- }
- 
--static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
-+unsigned fuse_dev_poll(struct file *file, poll_table *wait)
- {
- 	unsigned mask = POLLOUT | POLLWRNORM;
- 	struct fuse_conn *fc = fuse_get_conn(file);
-@@ -1843,6 +1847,8 @@ static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
- 	return mask;
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_poll);
-+
- /*
-  * Abort all requests on the given list (pending or processing)
-  *
-@@ -1962,7 +1968,7 @@ int fuse_dev_release(struct inode *inode, struct file *file)
- }
- EXPORT_SYMBOL_GPL(fuse_dev_release);
- 
--static int fuse_dev_fasync(int fd, struct file *file, int on)
-+int fuse_dev_fasync(int fd, struct file *file, int on)
- {
- 	struct fuse_conn *fc = fuse_get_conn(file);
- 	if (!fc)
-@@ -1972,6 +1978,8 @@ static int fuse_dev_fasync(int fd, struct file *file, int on)
- 	return fasync_helper(fd, file, on, &fc->fasync);
- }
- 
-+EXPORT_SYMBOL_GPL(fuse_dev_fasync);
-+
- const struct file_operations fuse_dev_operations = {
- 	.owner		= THIS_MODULE,
- 	.llseek		= no_llseek,
-diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
-index 8bd0ef9..c75c358 100644
---- a/fs/fuse/dir.c
-+++ b/fs/fuse/dir.c
-@@ -1133,7 +1133,7 @@ static char *read_link(struct dentry *dentry)
+diff -urNp linux-3.0.3/fs/fuse/dir.c linux-3.0.3/fs/fuse/dir.c
+--- linux-3.0.3/fs/fuse/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/fuse/dir.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
  	return link;
  }
  
@@ -40707,41 +37883,10 @@ index 8bd0ef9..c75c358 100644
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h
-index d428694..b44f072 100644
---- a/fs/fuse/fuse_i.h
-+++ b/fs/fuse/fuse_i.h
-@@ -541,6 +541,16 @@ extern const struct file_operations fuse_dev_operations;
- 
- extern const struct dentry_operations fuse_dentry_operations;
- 
-+extern ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
-+			      unsigned long nr_segs, loff_t pos);
-+
-+extern ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
-+			       unsigned long nr_segs, loff_t pos);
-+
-+extern unsigned fuse_dev_poll(struct file *file, poll_table *wait);
-+
-+extern int fuse_dev_fasync(int fd, struct file *file, int on);
-+
- /**
-  * Inode to nodeid comparison.
-  */
-diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
-index d8b26ac..95833f5 100644
---- a/fs/gfs2/ops_inode.c
-+++ b/fs/gfs2/ops_inode.c
-@@ -740,6 +740,8 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
- 	unsigned int x;
- 	int error;
- 
-+	pax_track_stack();
-+
- 	if (ndentry->d_inode) {
- 		nip = GFS2_I(ndentry->d_inode);
- 		if (ip == nip)
-@@ -1019,7 +1021,7 @@ out:
+diff -urNp linux-3.0.3/fs/gfs2/inode.c linux-3.0.3/fs/gfs2/inode.c
+--- linux-3.0.3/fs/gfs2/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/gfs2/inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1525,7 +1525,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -40750,11 +37895,10 @@ index d8b26ac..95833f5 100644
  	if (!IS_ERR(s))
  		kfree(s);
  }
-diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
-index b4ba1b3..6295691 100644
---- a/fs/hfsplus/catalog.c
-+++ b/fs/hfsplus/catalog.c
-@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
+diff -urNp linux-3.0.3/fs/hfsplus/catalog.c linux-3.0.3/fs/hfsplus/catalog.c
+--- linux-3.0.3/fs/hfsplus/catalog.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hfsplus/catalog.c	2011-08-23 21:48:14.000000000 -0400
+@@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
  	int err;
  	u16 type;
  
@@ -40763,7 +37907,7 @@ index b4ba1b3..6295691 100644
  	hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
  	err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
  	if (err)
-@@ -210,6 +212,8 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,
+@@ -210,6 +212,8 @@ int hfsplus_create_cat(u32 cnid, struct 
  	int entry_size;
  	int err;
  
@@ -40781,11 +37925,10 @@ index b4ba1b3..6295691 100644
  	dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
  		cnid, src_dir->i_ino, src_name->name,
  		dst_dir->i_ino, dst_name->name);
-diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
-index 4df5059..00a2dcd 100644
---- a/fs/hfsplus/dir.c
-+++ b/fs/hfsplus/dir.c
-@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
+diff -urNp linux-3.0.3/fs/hfsplus/dir.c linux-3.0.3/fs/hfsplus/dir.c
+--- linux-3.0.3/fs/hfsplus/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hfsplus/dir.c	2011-08-23 21:48:14.000000000 -0400
+@@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
  	struct hfsplus_readdir_data *rd;
  	u16 type;
  
@@ -40794,11 +37937,10 @@ index 4df5059..00a2dcd 100644
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
-index a8df651..2d77dbd 100644
---- a/fs/hfsplus/inode.c
-+++ b/fs/hfsplus/inode.c
-@@ -491,6 +491,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
+diff -urNp linux-3.0.3/fs/hfsplus/inode.c linux-3.0.3/fs/hfsplus/inode.c
+--- linux-3.0.3/fs/hfsplus/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hfsplus/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
  	int res = 0;
  	u16 type;
  
@@ -40807,7 +37949,7 @@ index a8df651..2d77dbd 100644
  	type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
  
  	HFSPLUS_I(inode)->linkid = 0;
-@@ -554,6 +556,8 @@ int hfsplus_cat_write_inode(struct inode *inode)
+@@ -552,6 +554,8 @@ int hfsplus_cat_write_inode(struct inode
  	struct hfs_find_data fd;
  	hfsplus_cat_entry entry;
  
@@ -40816,11 +37958,10 @@ index a8df651..2d77dbd 100644
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
-index 508ce66..1bdc653 100644
---- a/fs/hfsplus/ioctl.c
-+++ b/fs/hfsplus/ioctl.c
-@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
+diff -urNp linux-3.0.3/fs/hfsplus/ioctl.c linux-3.0.3/fs/hfsplus/ioctl.c
+--- linux-3.0.3/fs/hfsplus/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hfsplus/ioctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
  	struct hfsplus_cat_file *file;
  	int res;
  
@@ -40829,7 +37970,7 @@ index 508ce66..1bdc653 100644
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-@@ -166,6 +168,8 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
+@@ -166,6 +168,8 @@ ssize_t hfsplus_getxattr(struct dentry *
  	struct hfsplus_cat_file *file;
  	ssize_t res = 0;
  
@@ -40838,11 +37979,10 @@ index 508ce66..1bdc653 100644
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
-index b49b555..6caf51d 100644
---- a/fs/hfsplus/super.c
-+++ b/fs/hfsplus/super.c
-@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
+diff -urNp linux-3.0.3/fs/hfsplus/super.c linux-3.0.3/fs/hfsplus/super.c
+--- linux-3.0.3/fs/hfsplus/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hfsplus/super.c	2011-08-23 21:48:14.000000000 -0400
+@@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
  	struct nls_table *nls = NULL;
  	int err;
  
@@ -40851,11 +37991,10 @@ index b49b555..6caf51d 100644
  	err = -EINVAL;
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
-diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
-index 9885082..6837c7c 100644
---- a/fs/hugetlbfs/inode.c
-+++ b/fs/hugetlbfs/inode.c
-@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
+diff -urNp linux-3.0.3/fs/hugetlbfs/inode.c linux-3.0.3/fs/hugetlbfs/inode.c
+--- linux-3.0.3/fs/hugetlbfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/hugetlbfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
  	.kill_sb	= kill_litter_super,
  };
  
@@ -40864,11 +38003,10 @@ index 9885082..6837c7c 100644
  
  static int can_do_hugetlb_shm(void)
  {
-diff --git a/fs/inode.c b/fs/inode.c
-index 0647d80..349005c 100644
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -801,8 +801,8 @@ unsigned int get_next_ino(void)
+diff -urNp linux-3.0.3/fs/inode.c linux-3.0.3/fs/inode.c
+--- linux-3.0.3/fs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
  	if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
@@ -40879,11 +38017,10 @@ index 0647d80..349005c 100644
  
  		res = next - LAST_INO_BATCH;
  	}
-diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
-index e4b87bc..37402f7 100644
---- a/fs/jbd/checkpoint.c
-+++ b/fs/jbd/checkpoint.c
-@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal)
+diff -urNp linux-3.0.3/fs/jbd/checkpoint.c linux-3.0.3/fs/jbd/checkpoint.c
+--- linux-3.0.3/fs/jbd/checkpoint.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jbd/checkpoint.c	2011-08-23 21:48:14.000000000 -0400
+@@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
  	tid_t this_tid;
  	int result;
  
@@ -40892,11 +38029,10 @@ index e4b87bc..37402f7 100644
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
-index 16a5047..88ff6ca 100644
---- a/fs/jffs2/compr_rtime.c
-+++ b/fs/jffs2/compr_rtime.c
-@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned char *data_in,
+diff -urNp linux-3.0.3/fs/jffs2/compr_rtime.c linux-3.0.3/fs/jffs2/compr_rtime.c
+--- linux-3.0.3/fs/jffs2/compr_rtime.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jffs2/compr_rtime.c	2011-08-23 21:48:14.000000000 -0400
+@@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
  	int outpos = 0;
  	int pos=0;
  
@@ -40905,7 +38041,7 @@ index 16a5047..88ff6ca 100644
  	memset(positions,0,sizeof(positions));
  
  	while (pos < (*sourcelen) && outpos <= (*dstlen)-2) {
-@@ -78,6 +80,8 @@ static int jffs2_rtime_decompress(unsigned char *data_in,
+@@ -78,6 +80,8 @@ static int jffs2_rtime_decompress(unsign
  	int outpos = 0;
  	int pos=0;
  
@@ -40914,11 +38050,10 @@ index 16a5047..88ff6ca 100644
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
-index 9e7cec8..4713089 100644
---- a/fs/jffs2/compr_rubin.c
-+++ b/fs/jffs2/compr_rubin.c
-@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsigned char *data_in,
+diff -urNp linux-3.0.3/fs/jffs2/compr_rubin.c linux-3.0.3/fs/jffs2/compr_rubin.c
+--- linux-3.0.3/fs/jffs2/compr_rubin.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jffs2/compr_rubin.c	2011-08-23 21:48:14.000000000 -0400
+@@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
  	int ret;
  	uint32_t mysrclen, mydstlen;
  
@@ -40927,11 +38062,10 @@ index 9e7cec8..4713089 100644
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
-index e513f19..2ab1351 100644
---- a/fs/jffs2/erase.c
-+++ b/fs/jffs2/erase.c
-@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
+diff -urNp linux-3.0.3/fs/jffs2/erase.c linux-3.0.3/fs/jffs2/erase.c
+--- linux-3.0.3/fs/jffs2/erase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jffs2/erase.c	2011-08-23 21:47:56.000000000 -0400
+@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
  		struct jffs2_unknown_node marker = {
  			.magic =	cpu_to_je16(JFFS2_MAGIC_BITMASK),
  			.nodetype =	cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -40941,11 +38075,10 @@ index e513f19..2ab1351 100644
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
-index 07ee154..d8b657a 100644
---- a/fs/jffs2/wbuf.c
-+++ b/fs/jffs2/wbuf.c
-@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
+diff -urNp linux-3.0.3/fs/jffs2/wbuf.c linux-3.0.3/fs/jffs2/wbuf.c
+--- linux-3.0.3/fs/jffs2/wbuf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jffs2/wbuf.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
  	.magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
  	.nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
@@ -40955,11 +38088,10 @@ index 07ee154..d8b657a 100644
  };
  
  /*
-diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
-index 4f9cc04..dac9014 100644
---- a/fs/jffs2/xattr.c
-+++ b/fs/jffs2/xattr.c
-@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
+diff -urNp linux-3.0.3/fs/jffs2/xattr.c linux-3.0.3/fs/jffs2/xattr.c
+--- linux-3.0.3/fs/jffs2/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jffs2/xattr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
  	BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
  
@@ -40968,11 +38100,34 @@ index 4f9cc04..dac9014 100644
  	/* Phase.1 : Merge same xref */
  	for (i=0; i < XREF_TMPHASH_SIZE; i++)
  		xref_tmphash[i] = NULL;
-diff --git a/fs/libfs.c b/fs/libfs.c
-index c88eab5..40ef667 100644
---- a/fs/libfs.c
-+++ b/fs/libfs.c
-@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+diff -urNp linux-3.0.3/fs/jfs/super.c linux-3.0.3/fs/jfs/super.c
+--- linux-3.0.3/fs/jfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/jfs/super.c	2011-08-23 21:47:56.000000000 -0400
+@@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
+ 
+ 	jfs_inode_cachep =
+ 	    kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
+-			    SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
++			    SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
+ 			    init_once);
+ 	if (jfs_inode_cachep == NULL)
+ 		return -ENOMEM;
+diff -urNp linux-3.0.3/fs/Kconfig.binfmt linux-3.0.3/fs/Kconfig.binfmt
+--- linux-3.0.3/fs/Kconfig.binfmt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/Kconfig.binfmt	2011-08-23 21:47:56.000000000 -0400
+@@ -86,7 +86,7 @@ config HAVE_AOUT
+ 
+ config BINFMT_AOUT
+ 	tristate "Kernel support for a.out and ECOFF binaries"
+-	depends on HAVE_AOUT
++	depends on HAVE_AOUT && BROKEN
+ 	---help---
+ 	  A.out (Assembler.OUTput) is a set of formats for libraries and
+ 	  executables used in the earliest versions of UNIX.  Linux used
+diff -urNp linux-3.0.3/fs/libfs.c linux-3.0.3/fs/libfs.c
+--- linux-3.0.3/fs/libfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/libfs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
  
  			for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
  				struct dentry *next;
@@ -40982,7 +38137,7 @@ index c88eab5..40ef667 100644
  				next = list_entry(p, struct dentry, d_u.d_child);
  				spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
  				if (!simple_positive(next)) {
-@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
+@@ -172,7 +175,12 @@ int dcache_readdir(struct file * filp, v
  
  				spin_unlock(&next->d_lock);
  				spin_unlock(&dentry->d_lock);
@@ -40996,11 +38151,10 @@ index c88eab5..40ef667 100644
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
-index adb45ec..a8c217c 100644
---- a/fs/lockd/clntproc.c
-+++ b/fs/lockd/clntproc.c
-@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
+diff -urNp linux-3.0.3/fs/lockd/clntproc.c linux-3.0.3/fs/lockd/clntproc.c
+--- linux-3.0.3/fs/lockd/clntproc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/lockd/clntproc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
   */
@@ -41014,7 +38168,7 @@ index adb45ec..a8c217c 100644
  
  	memcpy(c->data, &cookie, 4);
  	c->len=4;
-@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)
+@@ -620,6 +620,8 @@ nlmclnt_reclaim(struct nlm_host *host, s
  	struct nlm_rqst reqst, *req;
  	int		status;
  
@@ -41023,24 +38177,10 @@ index adb45ec..a8c217c 100644
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
-index abfff9d..143361b 100644
---- a/fs/lockd/svc.c
-+++ b/fs/lockd/svc.c
-@@ -41,7 +41,7 @@
- 
- static struct svc_program	nlmsvc_program;
- 
--struct nlmsvc_binding *		nlmsvc_ops;
-+const struct nlmsvc_binding *	nlmsvc_ops;
- EXPORT_SYMBOL_GPL(nlmsvc_ops);
- 
- static DEFINE_MUTEX(nlmsvc_mutex);
-diff --git a/fs/locks.c b/fs/locks.c
-index 0f39982..8b81129 100644
---- a/fs/locks.c
-+++ b/fs/locks.c
-@@ -2044,16 +2044,16 @@ void locks_remove_flock(struct file *filp)
+diff -urNp linux-3.0.3/fs/locks.c linux-3.0.3/fs/locks.c
+--- linux-3.0.3/fs/locks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/locks.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
  	if (filp->f_op && filp->f_op->flock) {
@@ -41061,11 +38201,10 @@ index 0f39982..8b81129 100644
  	}
  
  	lock_flocks();
-diff --git a/fs/logfs/super.c b/fs/logfs/super.c
-index 33435e4..ea06c2b 100644
---- a/fs/logfs/super.c
-+++ b/fs/logfs/super.c
-@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super_block *sb)
+diff -urNp linux-3.0.3/fs/logfs/super.c linux-3.0.3/fs/logfs/super.c
+--- linux-3.0.3/fs/logfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/logfs/super.c	2011-08-23 21:48:14.000000000 -0400
+@@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
  	struct logfs_disk_super _ds1, *ds1 = &_ds1;
  	int err, valid0, valid1;
  
@@ -41074,69 +38213,92 @@ index 33435e4..ea06c2b 100644
  	/* read first superblock */
  	err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
  	if (err)
-diff --git a/fs/namei.c b/fs/namei.c
-index 3095ca8..3d19ac4 100644
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -226,20 +226,30 @@ int generic_permission(struct inode *inode, int mask, unsigned int flags,
+diff -urNp linux-3.0.3/fs/namei.c linux-3.0.3/fs/namei.c
+--- linux-3.0.3/fs/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/namei.c	2011-08-23 21:48:14.000000000 -0400
+@@ -237,21 +237,31 @@ int generic_permission(struct inode *ino
  		return ret;
  
  	/*
 -	 * Read/write DACs are always overridable.
--	 * Executable DACs are overridable if at least one exec bit is set.
+-	 * Executable DACs are overridable for all directories and
+-	 * for non-directories that have least one exec bit set.
 +	 * Searching includes executable on directories, else just read.
  	 */
 -	if (!(mask & MAY_EXEC) || execute_ok(inode))
--		if (capable(CAP_DAC_OVERRIDE))
+-		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
 +	mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
 +	if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE))) {
 +#ifdef CONFIG_GRKERNSEC
 +		if (flags & IPERM_FLAG_RCU)
 +			return -ECHILD;
 +#endif
-+		if (capable(CAP_DAC_READ_SEARCH))
++		if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
  			return 0;
 +	}
  
  	/*
 -	 * Searching includes executable on directories, else just read.
 +	 * Read/write DACs are always overridable.
-+	 * Executable DACs are overridable if at least one exec bit is set.
++	 * Executable DACs are overridable for all directories and
++	 * for non-directories that have least one exec bit set.
  	 */
 -	mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
 -	if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
--		if (capable(CAP_DAC_READ_SEARCH))
+-		if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
 +	if (!(mask & MAY_EXEC) || execute_ok(inode)) {
 +#ifdef CONFIG_GRKERNSEC
 +		if (flags & IPERM_FLAG_RCU)
 +			return -ECHILD;
 +#endif
-+		if (capable(CAP_DAC_OVERRIDE))
++		if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
  			return 0;
 +	}
  
  	return -EACCES;
  }
-@@ -687,8 +697,17 @@ static inline int exec_permission(struct inode *inode, unsigned int flags)
+@@ -547,6 +557,9 @@ static int complete_walk(struct nameidat
+ 		br_read_unlock(vfsmount_lock);
+ 	}
+ 
++	if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
++		return -ENOENT;
++
+ 	if (likely(!(nd->flags & LOOKUP_JUMPED)))
+ 		return 0;
+ 
+@@ -593,9 +606,16 @@ static inline int exec_permission(struct
  	if (ret == -ECHILD)
  		return ret;
  
--	if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
-+	if (capable_nolog(CAP_DAC_OVERRIDE))
+-	if (ns_capable(ns, CAP_DAC_OVERRIDE) ||
+-			ns_capable(ns, CAP_DAC_READ_SEARCH))
++	if (ns_capable_nolog(ns, CAP_DAC_OVERRIDE))
  		goto ok;
 +	else {
 +#ifdef CONFIG_GRKERNSEC
 +		if (flags & IPERM_FLAG_RCU)
 +			return -ECHILD;
 +#endif
-+		if (capable(CAP_DAC_READ_SEARCH) ||
-+			capable(CAP_DAC_OVERRIDE))
-+		goto ok;
++		if (ns_capable(ns, CAP_DAC_READ_SEARCH) || ns_capable(ns, CAP_DAC_OVERRIDE))
++			goto ok;
 +	}
  
  	return ret;
  ok:
-@@ -776,7 +795,7 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
+@@ -703,11 +723,19 @@ follow_link(struct path *link, struct na
+ 		return error;
+ 	}
+ 
++	if (gr_handle_follow_link(dentry->d_parent->d_inode,
++				  dentry->d_inode, dentry, nd->path.mnt)) {
++		error = -EACCES;
++		*p = ERR_PTR(error); /* no ->put_link(), please */
++		path_put(&nd->path);
++		return error;
++	}
++
+ 	nd->last_type = LAST_BIND;
  	*p = dentry->d_inode->i_op->follow_link(dentry, nd);
  	error = PTR_ERR(*p);
  	if (!IS_ERR(*p)) {
@@ -41145,59 +38307,8 @@ index 3095ca8..3d19ac4 100644
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -815,6 +834,13 @@ static inline int do_follow_link(struct inode *inode, struct path *path, struct
- 	err = security_inode_follow_link(path->dentry, nd);
- 	if (err)
- 		goto loop;
-+
-+	if (gr_handle_follow_link(path->dentry->d_parent->d_inode,
-+				  path->dentry->d_inode, path->dentry, nd->path.mnt)) {
-+		err = -EACCES;
-+		goto loop;
-+	}
-+
- 	current->link_count++;
- 	current->total_link_count++;
- 	nd->depth++;
-@@ -1506,13 +1532,36 @@ return_reval:
- return_base:
- 		if (nameidata_drop_rcu_last_maybe(nd))
- 			return -ECHILD;
-+
-+		if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
-+			err = -ENOENT;
-+			goto err_and_ret;
-+		}
-+
- 		return 0;
- out_dput:
- 		if (!(nd->flags & LOOKUP_RCU))
- 			path_put_conditional(&next, nd);
- 		break;
- 	}
-+#ifdef CONFIG_GRKERNSEC
-+	/* we do this because we can't operate here on an rcu'd dentry,
-+	   acquire a properly-referenced copy
-+	*/
-+	if (nameidata_drop_rcu_last_maybe(nd))
-+		return -ECHILD;
-+#endif
-+
-+	if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
-+		err = -ENOENT;
-+
-+err_and_ret:
-+#ifndef CONFIG_GRKERNSEC
-+	/* since we convert to ref-walk above, always put the path if we reach
-+	   here
-+	*/
- 	if (!(nd->flags & LOOKUP_RCU))
-+#endif
- 		path_put(&nd->path);
- return_err:
- 	return err;
-@@ -1739,6 +1788,9 @@ static int do_path_lookup(int dfd, const char *name,
- 	}
+@@ -1625,6 +1653,9 @@ static int do_path_lookup(int dfd, const
+ 		retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
  
  	if (likely(!retval)) {
 +		if (*name != '/' && nd->path.dentry && nd->inode && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
@@ -41206,7 +38317,7 @@ index 3095ca8..3d19ac4 100644
  		if (unlikely(!audit_dummy_context())) {
  			if (nd->path.dentry && nd->inode)
  				audit_inode(name, nd->path.dentry);
-@@ -2079,6 +2131,30 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
+@@ -1935,6 +1966,30 @@ int vfs_create(struct inode *dir, struct
  	return error;
  }
  
@@ -41234,10 +38345,10 @@ index 3095ca8..3d19ac4 100644
 +	return flag;
 +}
 +
- int may_open(struct path *path, int acc_mode, int flag)
+ static int may_open(struct path *path, int acc_mode, int flag)
  {
  	struct dentry *dentry = path->dentry;
-@@ -2127,7 +2203,27 @@ int may_open(struct path *path, int acc_mode, int flag)
+@@ -1987,7 +2042,27 @@ static int may_open(struct path *path, i
  	/*
  	 * Ensure there are no outstanding leases on the file.
  	 */
@@ -41266,33 +38377,10 @@ index 3095ca8..3d19ac4 100644
  }
  
  static int handle_truncate(struct file *filp)
-@@ -2162,6 +2258,12 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
- {
- 	int error;
- 	struct dentry *dir = nd->path.dentry;
-+	int flag = open_to_namei_flags(open_flag);
-+
-+	if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
-+		error = -EACCES;
-+		goto out_unlock;
-+	}
- 
- 	if (!IS_POSIXACL(dir->d_inode))
- 		mode &= ~current_umask();
-@@ -2169,6 +2271,8 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
- 	if (error)
- 		goto out_unlock;
- 	error = vfs_create(dir->d_inode, path->dentry, mode, nd);
-+	if (!error)
-+		gr_handle_create(path->dentry, nd->path.mnt);
- out_unlock:
- 	mutex_unlock(&dir->d_inode->i_mutex);
- 	dput(nd->path.dentry);
-@@ -2180,30 +2284,6 @@ out_unlock:
- 	return may_open(&nd->path, 0, open_flag & ~O_TRUNC);
+@@ -2013,30 +2088,6 @@ static int handle_truncate(struct file *
  }
  
--/*
+ /*
 - * Note that while the flag value (low two bits) for sys_open means:
 - *	00 - read-only
 - *	01 - write-only
@@ -41316,18 +38404,41 @@ index 3095ca8..3d19ac4 100644
 -	return flag;
 -}
 -
- static int open_will_truncate(int flag, struct inode *inode)
- {
- 	/*
-@@ -2274,6 +2354,7 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
- 			    int mode, const char *pathname)
- {
+-/*
+  * Handle the last step of open()
+  */
+ static struct file *do_last(struct nameidata *nd, struct path *path,
+@@ -2045,6 +2096,7 @@ static struct file *do_last(struct namei
  	struct dentry *dir = nd->path.dentry;
+ 	struct dentry *dentry;
+ 	int open_flag = op->open_flag;
 +	int flag = open_to_namei_flags(open_flag);
- 	struct file *filp;
- 	int error = -EISDIR;
- 
-@@ -2352,6 +2433,14 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
+ 	int will_truncate = open_flag & O_TRUNC;
+ 	int want_write = 0;
+ 	int acc_mode = op->acc_mode;
+@@ -2132,6 +2184,12 @@ static struct file *do_last(struct namei
+ 	/* Negative dentry, just create the file */
+ 	if (!dentry->d_inode) {
+ 		int mode = op->mode;
++
++		if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, flag, mode)) {
++			error = -EACCES;
++			goto exit_mutex_unlock;
++		}
++
+ 		if (!IS_POSIXACL(dir->d_inode))
+ 			mode &= ~current_umask();
+ 		/*
+@@ -2155,6 +2213,8 @@ static struct file *do_last(struct namei
+ 		error = vfs_create(dir->d_inode, dentry, mode, nd);
+ 		if (error)
+ 			goto exit_mutex_unlock;
++		else
++			gr_handle_create(path->dentry, path->mnt);
+ 		mutex_unlock(&dir->d_inode->i_mutex);
+ 		dput(nd->path.dentry);
+ 		nd->path.dentry = dentry;
+@@ -2164,6 +2224,14 @@ static struct file *do_last(struct namei
  	/*
  	 * It already exists.
  	 */
@@ -41342,19 +38453,7 @@ index 3095ca8..3d19ac4 100644
  	mutex_unlock(&dir->d_inode->i_mutex);
  	audit_inode(pathname, path->dentry);
  
-@@ -2535,6 +2624,11 @@ reval:
- 		error = security_inode_follow_link(link.dentry, &nd);
- 		if (error)
- 			goto exit_dput;
-+		if (gr_handle_follow_link(link.dentry->d_parent->d_inode,
-+					  link.dentry->d_inode, link.dentry, nd.path.mnt)) {
-+			error = -EACCES;
-+			goto exit_dput;
-+		}
- 		error = __do_follow_link(&link, &nd, &cookie);
- 		if (unlikely(error)) {
- 			if (!IS_ERR(cookie) && linki->i_op->put_link)
-@@ -2705,6 +2799,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
+@@ -2450,6 +2518,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	error = may_mknod(mode);
  	if (error)
  		goto out_dput;
@@ -41372,7 +38471,7 @@ index 3095ca8..3d19ac4 100644
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2725,6 +2830,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
+@@ -2470,6 +2549,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	}
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -41382,7 +38481,7 @@ index 3095ca8..3d19ac4 100644
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2777,6 +2885,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
+@@ -2522,6 +2604,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -41394,7 +38493,7 @@ index 3095ca8..3d19ac4 100644
  	if (!IS_POSIXACL(nd.path.dentry->d_inode))
  		mode &= ~current_umask();
  	error = mnt_want_write(nd.path.mnt);
-@@ -2788,6 +2901,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
+@@ -2533,6 +2620,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -41405,7 +38504,7 @@ index 3095ca8..3d19ac4 100644
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2867,6 +2984,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+@@ -2613,6 +2704,8 @@ static long do_rmdir(int dfd, const char
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -41414,27 +38513,25 @@ index 3095ca8..3d19ac4 100644
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2891,6 +3010,19 @@ static long do_rmdir(int dfd, const char __user *pathname)
- 	error = PTR_ERR(dentry);
- 	if (IS_ERR(dentry))
- 		goto exit2;
+@@ -2641,6 +2734,17 @@ static long do_rmdir(int dfd, const char
+ 		error = -ENOENT;
+ 		goto exit3;
+ 	}
 +
-+	if (dentry->d_inode != NULL) {
-+		if (dentry->d_inode->i_nlink <= 1) {
-+			saved_ino = dentry->d_inode->i_ino;
-+			saved_dev = gr_get_dev_from_dentry(dentry);
-+		}
++	if (dentry->d_inode->i_nlink <= 1) {
++		saved_ino = dentry->d_inode->i_ino;
++		saved_dev = gr_get_dev_from_dentry(dentry);
++	}
 +
-+		if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
-+			error = -EACCES;
-+			goto exit3;
-+		}
++	if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
++		error = -EACCES;
++		goto exit3;
 +	}
 +
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2898,6 +3030,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
+@@ -2648,6 +2752,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -41443,7 +38540,7 @@ index 3095ca8..3d19ac4 100644
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2960,6 +3094,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -2710,6 +2816,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -41452,26 +38549,24 @@ index 3095ca8..3d19ac4 100644
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2979,8 +3115,17 @@ static long do_unlinkat(int dfd, const char __user *pathname)
- 		if (nd.last.name[nd.last.len])
+@@ -2732,6 +2840,16 @@ static long do_unlinkat(int dfd, const c
+ 		if (!inode)
  			goto slashes;
- 		inode = dentry->d_inode;
--		if (inode)
-+		if (inode) {
- 			ihold(inode);
-+			if (inode->i_nlink <= 1) {
-+				saved_ino = inode->i_ino;
-+				saved_dev = gr_get_dev_from_dentry(dentry);
-+			}
-+			if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
-+				error = -EACCES;
-+				goto exit2;
-+			}
+ 		ihold(inode);
++
++		if (inode->i_nlink <= 1) {
++			saved_ino = inode->i_ino;
++			saved_dev = gr_get_dev_from_dentry(dentry);
++		}
++		if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
++			error = -EACCES;
++			goto exit2;
 +		}
++
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2988,6 +3133,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
+@@ -2739,6 +2857,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -41480,7 +38575,7 @@ index 3095ca8..3d19ac4 100644
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -3065,6 +3212,11 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
+@@ -2816,6 +2936,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -41492,7 +38587,7 @@ index 3095ca8..3d19ac4 100644
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -3072,6 +3224,8 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
+@@ -2823,6 +2948,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -41501,7 +38596,7 @@ index 3095ca8..3d19ac4 100644
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -3164,6 +3318,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -2931,6 +3058,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -41522,7 +38617,7 @@ index 3095ca8..3d19ac4 100644
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -3171,6 +3339,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
+@@ -2938,6 +3079,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	if (error)
  		goto out_drop_write;
  	error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
@@ -41531,7 +38626,7 @@ index 3095ca8..3d19ac4 100644
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -3348,6 +3518,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
+@@ -3113,6 +3256,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -41540,7 +38635,7 @@ index 3095ca8..3d19ac4 100644
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -3404,6 +3576,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
+@@ -3169,6 +3314,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -41553,7 +38648,7 @@ index 3095ca8..3d19ac4 100644
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -3413,6 +3591,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
+@@ -3178,6 +3329,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -41563,7 +38658,7 @@ index 3095ca8..3d19ac4 100644
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -3438,6 +3619,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
+@@ -3203,6 +3357,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -41572,7 +38667,7 @@ index 3095ca8..3d19ac4 100644
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3447,7 +3630,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
+@@ -3212,7 +3368,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -41588,11 +38683,10 @@ index 3095ca8..3d19ac4 100644
  		len = -EFAULT;
  out:
  	return len;
-diff --git a/fs/namespace.c b/fs/namespace.c
-index 445534b..5b2b3b5 100644
---- a/fs/namespace.c
-+++ b/fs/namespace.c
-@@ -1285,6 +1285,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+diff -urNp linux-3.0.3/fs/namespace.c linux-3.0.3/fs/namespace.c
+--- linux-3.0.3/fs/namespace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/namespace.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn
  		if (!(sb->s_flags & MS_RDONLY))
  			retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
  		up_write(&sb->s_umount);
@@ -41602,7 +38696,7 @@ index 445534b..5b2b3b5 100644
  		return retval;
  	}
  
-@@ -1304,6 +1307,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
+@@ -1347,6 +1350,9 @@ static int do_umount(struct vfsmount *mn
  	br_write_unlock(vfsmount_lock);
  	up_write(&namespace_sem);
  	release_mounts(&umount_list);
@@ -41612,7 +38706,7 @@ index 445534b..5b2b3b5 100644
  	return retval;
  }
  
-@@ -2241,6 +2247,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2338,6 +2344,16 @@ long do_mount(char *dev_name, char *dir_
  		   MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
  		   MS_STRICTATIME);
  
@@ -41629,7 +38723,7 @@ index 445534b..5b2b3b5 100644
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
  				    data_page);
-@@ -2255,6 +2271,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
+@@ -2352,6 +2368,9 @@ long do_mount(char *dev_name, char *dir_
  				      dev_name, data_page);
  dput_out:
  	path_put(&path);
@@ -41639,24 +38733,22 @@ index 445534b..5b2b3b5 100644
  	return retval;
  }
  
-@@ -2480,6 +2499,12 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
- 		goto out1;
- 	}
+@@ -2575,6 +2594,11 @@ SYSCALL_DEFINE2(pivot_root, const char _
+ 	if (error)
+ 		goto out2;
  
 +	if (gr_handle_chroot_pivot()) {
 +		error = -EPERM;
-+		path_put(&old);
-+		goto out1;
++		goto out2;
 +	}
 +
  	get_fs_root(current->fs, &root);
- 	down_write(&namespace_sem);
- 	mutex_lock(&old.dentry->d_inode->i_mutex);
-diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
-index f6946bb..c688671 100644
---- a/fs/ncpfs/dir.c
-+++ b/fs/ncpfs/dir.c
-@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentry, struct nameidata *nd)
+ 	error = lock_mount(&old);
+ 	if (error)
+diff -urNp linux-3.0.3/fs/ncpfs/dir.c linux-3.0.3/fs/ncpfs/dir.c
+--- linux-3.0.3/fs/ncpfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ncpfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+@@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
  	int res, val = 0, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
  
@@ -41665,7 +38757,7 @@ index f6946bb..c688671 100644
  	if (dentry == dentry->d_sb->s_root)
  		return 1;
  
-@@ -844,6 +846,8 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, struc
+@@ -844,6 +846,8 @@ static struct dentry *ncp_lookup(struct 
  	int error, res, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
  
@@ -41674,7 +38766,7 @@ index f6946bb..c688671 100644
  	error = -EIO;
  	if (!ncp_conn_valid(server))
  		goto finished;
-@@ -931,6 +935,8 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode,
+@@ -931,6 +935,8 @@ int ncp_create_new(struct inode *dir, st
  	PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
  		dentry->d_parent->d_name.name, dentry->d_name.name, mode);
  
@@ -41683,7 +38775,7 @@ index f6946bb..c688671 100644
  	ncp_age_dentry(server, dentry);
  	len = sizeof(__name);
  	error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
-@@ -992,6 +998,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+@@ -992,6 +998,8 @@ static int ncp_mkdir(struct inode *dir, 
  	int error, len;
  	__u8 __name[NCP_MAXPATHLEN + 1];
  
@@ -41692,7 +38784,7 @@ index f6946bb..c688671 100644
  	DPRINTK("ncp_mkdir: making %s/%s\n",
  		dentry->d_parent->d_name.name, dentry->d_name.name);
  
-@@ -1135,6 +1143,8 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
+@@ -1140,6 +1148,8 @@ static int ncp_rename(struct inode *old_
  	int old_len, new_len;
  	__u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
  
@@ -41701,24 +38793,31 @@ index f6946bb..c688671 100644
  	DPRINTK("ncp_rename: %s/%s to %s/%s\n",
  		old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
  		new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
-diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
-index 00a1d1c..944dba1 100644
---- a/fs/ncpfs/inode.c
-+++ b/fs/ncpfs/inode.c
-@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
+diff -urNp linux-3.0.3/fs/ncpfs/inode.c linux-3.0.3/fs/ncpfs/inode.c
+--- linux-3.0.3/fs/ncpfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ncpfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
  	struct ncp_entry_info finfo;
  
 +	pax_track_stack();
 +
- 	data.wdog_pid = NULL;
+ 	memset(&data, 0, sizeof(data));
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
-index 2f8e618..5094d93 100644
---- a/fs/nfs/inode.c
-+++ b/fs/nfs/inode.c
-@@ -998,16 +998,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
+diff -urNp linux-3.0.3/fs/nfs/inode.c linux-3.0.3/fs/nfs/inode.c
+--- linux-3.0.3/fs/nfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/nfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
+ 	nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ 	nfsi->attrtimeo_timestamp = jiffies;
+ 
+-	memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
++	memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
+ 	if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
+ 		nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
+ 	else
+@@ -1000,16 +1000,16 @@ static int nfs_size_need_update(const st
  	return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
  }
  
@@ -41738,24 +38837,10 @@ index 2f8e618..5094d93 100644
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
-index 7c831a2..332c6af 100644
---- a/fs/nfsd/lockd.c
-+++ b/fs/nfsd/lockd.c
-@@ -60,7 +60,7 @@ nlm_fclose(struct file *filp)
- 	fput(filp);
- }
- 
--static struct nlmsvc_binding	nfsd_nlm_ops = {
-+static const struct nlmsvc_binding	nfsd_nlm_ops = {
- 	.fopen		= nlm_fopen,		/* open file for locking */
- 	.fclose		= nlm_fclose,		/* close file */
- };
-diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
-index 18c356c..4ff7ed3 100644
---- a/fs/nfsd/nfs4state.c
-+++ b/fs/nfsd/nfs4state.c
-@@ -3783,6 +3783,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
+diff -urNp linux-3.0.3/fs/nfsd/nfs4state.c linux-3.0.3/fs/nfsd/nfs4state.c
+--- linux-3.0.3/fs/nfsd/nfs4state.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/fs/nfsd/nfs4state.c	2011-08-23 21:48:14.000000000 -0400
+@@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
  	unsigned int strhashval;
  	int err;
  
@@ -41764,11 +38849,10 @@ index 18c356c..4ff7ed3 100644
  	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
  		(long long) lock->lk_offset,
  		(long long) lock->lk_length);
-diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
-index c6766af..7d5e9ec 100644
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -1793,6 +1793,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
+diff -urNp linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3/fs/nfsd/nfs4xdr.c
+--- linux-3.0.3/fs/nfsd/nfs4xdr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/nfsd/nfs4xdr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
  		.dentry	= dentry,
  	};
  
@@ -41777,24 +38861,10 @@ index c6766af..7d5e9ec 100644
  	BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
  	BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
  	BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
-index 33b3e2b..4fc39f3 100644
---- a/fs/nfsd/nfsctl.c
-+++ b/fs/nfsd/nfsctl.c
-@@ -180,7 +180,7 @@ static int export_features_open(struct inode *inode, struct file *file)
- 	return single_open(file, export_features_show, NULL);
- }
- 
--static struct file_operations export_features_operations = {
-+static const struct file_operations export_features_operations = {
- 	.open		= export_features_open,
- 	.read		= seq_read,
- 	.llseek		= seq_lseek,
-diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
-index 435f407..363ad5a 100644
---- a/fs/nfsd/vfs.c
-+++ b/fs/nfsd/vfs.c
-@@ -898,7 +898,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+diff -urNp linux-3.0.3/fs/nfsd/vfs.c linux-3.0.3/fs/nfsd/vfs.c
+--- linux-3.0.3/fs/nfsd/vfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/nfsd/vfs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
  		set_fs(KERNEL_DS);
@@ -41803,7 +38873,7 @@ index 435f407..363ad5a 100644
  		set_fs(oldfs);
  	}
  
-@@ -1002,7 +1002,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
+@@ -1000,7 +1000,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s
  
  	/* Write the data. */
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -41812,7 +38882,7 @@ index 435f407..363ad5a 100644
  	set_fs(oldfs);
  	if (host_err < 0)
  		goto out_nfserr;
-@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
+@@ -1535,7 +1535,7 @@ nfsd_readlink(struct svc_rqst *rqstp, st
  	 */
  
  	oldfs = get_fs(); set_fs(KERNEL_DS);
@@ -41821,24 +38891,23 @@ index 435f407..363ad5a 100644
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
-index 3344bdd..b76f2a5 100644
---- a/fs/notify/dnotify/dnotify.c
-+++ b/fs/notify/dnotify/dnotify.c
-@@ -151,7 +151,7 @@ static void dnotify_free_mark(struct fsnotify_mark *fsn_mark)
- 	kmem_cache_free(dnotify_mark_cache, dn_mark);
- }
- 
--static struct fsnotify_ops dnotify_fsnotify_ops = {
-+static const struct fsnotify_ops dnotify_fsnotify_ops = {
- 	.handle_event = dnotify_handle_event,
- 	.should_send_event = dnotify_should_send_event,
- 	.free_group_priv = NULL,
-diff --git a/fs/notify/notification.c b/fs/notify/notification.c
-index f39260f..79e6b04 100644
---- a/fs/notify/notification.c
-+++ b/fs/notify/notification.c
-@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
+diff -urNp linux-3.0.3/fs/notify/fanotify/fanotify_user.c linux-3.0.3/fs/notify/fanotify/fanotify_user.c
+--- linux-3.0.3/fs/notify/fanotify/fanotify_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/notify/fanotify/fanotify_user.c	2011-08-23 21:48:14.000000000 -0400
+@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
+ 		goto out_close_fd;
+ 
+ 	ret = -EFAULT;
+-	if (copy_to_user(buf, &fanotify_event_metadata,
++	if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
++	    copy_to_user(buf, &fanotify_event_metadata,
+ 			 fanotify_event_metadata.event_len))
+ 		goto out_kill_access_response;
+ 
+diff -urNp linux-3.0.3/fs/notify/notification.c linux-3.0.3/fs/notify/notification.c
+--- linux-3.0.3/fs/notify/notification.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/notify/notification.c	2011-08-23 21:47:56.000000000 -0400
+@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
  static struct fsnotify_event *q_overflow_event;
@@ -41847,7 +38916,7 @@ index f39260f..79e6b04 100644
  
  /**
   * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
-@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
+@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = A
   */
  u32 fsnotify_get_cookie(void)
  {
@@ -41856,10 +38925,9 @@ index f39260f..79e6b04 100644
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
-index 0f48e7c..3cba773 100644
---- a/fs/ntfs/dir.c
-+++ b/fs/ntfs/dir.c
+diff -urNp linux-3.0.3/fs/ntfs/dir.c linux-3.0.3/fs/ntfs/dir.c
+--- linux-3.0.3/fs/ntfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ntfs/dir.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
  	ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
  			~(s64)(ndir->itype.index.block_size - 1)));
@@ -41869,11 +38937,10 @@ index 0f48e7c..3cba773 100644
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
-index f4b1057..a0e2493 100644
---- a/fs/ntfs/file.c
-+++ b/fs/ntfs/file.c
-@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_inode_ops = {
+diff -urNp linux-3.0.3/fs/ntfs/file.c linux-3.0.3/fs/ntfs/file.c
+--- linux-3.0.3/fs/ntfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ntfs/file.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
  
@@ -41882,11 +38949,10 @@ index f4b1057..a0e2493 100644
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
-index ec6adbf..f129c5e 100644
---- a/fs/ocfs2/localalloc.c
-+++ b/fs/ocfs2/localalloc.c
-@@ -1307,7 +1307,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
+diff -urNp linux-3.0.3/fs/ocfs2/localalloc.c linux-3.0.3/fs/ocfs2/localalloc.c
+--- linux-3.0.3/fs/ocfs2/localalloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/localalloc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
  		goto bail;
  	}
  
@@ -41895,11 +38961,10 @@ index ec6adbf..f129c5e 100644
  
  bail:
  	if (handle)
-diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
-index 849fb4a..f48c5b7 100644
---- a/fs/ocfs2/namei.c
-+++ b/fs/ocfs2/namei.c
-@@ -1064,6 +1064,8 @@ static int ocfs2_rename(struct inode *old_dir,
+diff -urNp linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3/fs/ocfs2/namei.c
+--- linux-3.0.3/fs/ocfs2/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/namei.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
  	struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
  	struct ocfs2_dir_lookup_result target_insert = { NULL, };
  
@@ -41908,11 +38973,10 @@ index 849fb4a..f48c5b7 100644
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
-index 51cd689..a150644 100644
---- a/fs/ocfs2/ocfs2.h
-+++ b/fs/ocfs2/ocfs2.h
-@@ -230,11 +230,11 @@ enum ocfs2_vol_state
+diff -urNp linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3/fs/ocfs2/ocfs2.h
+--- linux-3.0.3/fs/ocfs2/ocfs2.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/ocfs2.h	2011-08-23 21:47:56.000000000 -0400
+@@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
  {
@@ -41929,11 +38993,10 @@ index 51cd689..a150644 100644
  };
  
  enum ocfs2_local_alloc_state
-diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
-index 71998d4..73d7c38 100644
---- a/fs/ocfs2/suballoc.c
-+++ b/fs/ocfs2/suballoc.c
-@@ -877,7 +877,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
+diff -urNp linux-3.0.3/fs/ocfs2/suballoc.c linux-3.0.3/fs/ocfs2/suballoc.c
+--- linux-3.0.3/fs/ocfs2/suballoc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/suballoc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
  				mlog_errno(status);
  			goto bail;
  		}
@@ -41942,7 +39005,7 @@ index 71998d4..73d7c38 100644
  
  		/* You should never ask for this much metadata */
  		BUG_ON(bits_wanted >
-@@ -2012,7 +2012,7 @@ int ocfs2_claim_metadata(handle_t *handle,
+@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handl
  		mlog_errno(status);
  		goto bail;
  	}
@@ -41951,16 +39014,16 @@ index 71998d4..73d7c38 100644
  
  	*suballoc_loc = res.sr_bg_blkno;
  	*suballoc_bit_start = res.sr_bit_offset;
-@@ -2175,7 +2175,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
- 	mlog(0, "Allocated %u bits from suballocator %llu\n", res->sr_bits,
- 	     (unsigned long long)di_blkno);
+@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_
+ 	trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
+ 					   res->sr_bits);
  
 -	atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
 +	atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
  
  	BUG_ON(res->sr_bits != 1);
  
-@@ -2219,7 +2219,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
+@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *hand
  		mlog_errno(status);
  		goto bail;
  	}
@@ -41969,7 +39032,7 @@ index 71998d4..73d7c38 100644
  
  	BUG_ON(res.sr_bits != 1);
  
-@@ -2324,7 +2324,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *han
  						      cluster_start,
  						      num_clusters);
  		if (!status)
@@ -41978,7 +39041,7 @@ index 71998d4..73d7c38 100644
  	} else {
  		if (min_clusters > (osb->bitmap_cpg - 1)) {
  			/* The only paths asking for contiguousness
-@@ -2350,7 +2350,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
+@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *han
  				ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
  								 res.sr_bg_blkno,
  								 res.sr_bit_offset);
@@ -41987,11 +39050,10 @@ index 71998d4..73d7c38 100644
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
-index 36c423f..2f7ae8e 100644
---- a/fs/ocfs2/super.c
-+++ b/fs/ocfs2/super.c
-@@ -297,11 +297,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
+diff -urNp linux-3.0.3/fs/ocfs2/super.c linux-3.0.3/fs/ocfs2/super.c
+--- linux-3.0.3/fs/ocfs2/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/super.c	2011-08-23 21:47:56.000000000 -0400
+@@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
  			"%10s => GlobalAllocs: %d  LocalAllocs: %d  "
  			"SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
  			"Stats",
@@ -42008,7 +39070,7 @@ index 36c423f..2f7ae8e 100644
  
  	out += snprintf(buf + out, len - out,
  			"%10s => State: %u  Descriptor: %llu  Size: %u bits  "
-@@ -2141,11 +2141,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
+@@ -2112,11 +2112,11 @@ static int ocfs2_initialize_super(struct
  	spin_lock_init(&osb->osb_xattr_lock);
  	ocfs2_init_steal_slots(osb);
  
@@ -42025,11 +39087,10 @@ index 36c423f..2f7ae8e 100644
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
-index 9975457..7a170f2 100644
---- a/fs/ocfs2/symlink.c
-+++ b/fs/ocfs2/symlink.c
-@@ -148,7 +148,7 @@ bail:
+diff -urNp linux-3.0.3/fs/ocfs2/symlink.c linux-3.0.3/fs/ocfs2/symlink.c
+--- linux-3.0.3/fs/ocfs2/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/ocfs2/symlink.c	2011-08-23 21:47:56.000000000 -0400
+@@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
  {
@@ -42038,11 +39099,10 @@ index 9975457..7a170f2 100644
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff --git a/fs/open.c b/fs/open.c
-index b47aab3..f230762 100644
---- a/fs/open.c
-+++ b/fs/open.c
-@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
+diff -urNp linux-3.0.3/fs/open.c linux-3.0.3/fs/open.c
+--- linux-3.0.3/fs/open.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/open.c	2011-08-23 21:48:14.000000000 -0400
+@@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
  		error = security_path_truncate(&path);
@@ -42053,7 +39113,7 @@ index b47aab3..f230762 100644
  	if (!error)
  		error = do_truncate(path.dentry, length, 0, NULL);
  
-@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
+@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con
  	if (__mnt_is_readonly(path.mnt))
  		res = -EROFS;
  
@@ -42063,7 +39123,7 @@ index b47aab3..f230762 100644
  out_path_release:
  	path_put(&path);
  out:
-@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
+@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user
  	if (error)
  		goto dput_and_out;
  
@@ -42072,7 +39132,7 @@ index b47aab3..f230762 100644
  	set_fs_pwd(current->fs, &path);
  
  dput_and_out:
-@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
+@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd
  		goto out_putf;
  
  	error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
@@ -42086,7 +39146,7 @@ index b47aab3..f230762 100644
  	if (!error)
  		set_fs_pwd(current->fs, &file->f_path);
  out_putf:
-@@ -438,7 +454,18 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
+@@ -438,7 +454,18 @@ SYSCALL_DEFINE1(chroot, const char __use
  	if (error)
  		goto dput_and_out;
  
@@ -42105,7 +39165,7 @@ index b47aab3..f230762 100644
  	error = 0;
  dput_and_out:
  	path_put(&path);
-@@ -466,12 +493,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode)
+@@ -466,12 +493,25 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd
  	err = mnt_want_write_file(file);
  	if (err)
  		goto out_putf;
@@ -42131,7 +39191,7 @@ index b47aab3..f230762 100644
  	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
  	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
  	err = notify_change(dentry, &newattrs);
-@@ -499,12 +539,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
+@@ -499,12 +539,25 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons
  	error = mnt_want_write(path.mnt);
  	if (error)
  		goto dput_and_out;
@@ -42157,7 +39217,7 @@ index b47aab3..f230762 100644
  	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
  	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
  	error = notify_change(path.dentry, &newattrs);
-@@ -528,6 +581,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
+@@ -528,6 +581,9 @@ static int chown_common(struct path *pat
  	int error;
  	struct iattr newattrs;
  
@@ -42167,23 +39227,22 @@ index b47aab3..f230762 100644
  	newattrs.ia_valid =  ATTR_CTIME;
  	if (user != (uid_t) -1) {
  		newattrs.ia_valid |= ATTR_UID;
-@@ -898,7 +954,10 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
+@@ -998,7 +1054,10 @@ long do_sys_open(int dfd, const char __u
  	if (!IS_ERR(tmp)) {
  		fd = get_unused_fd_flags(flags);
  		if (fd >= 0) {
--			struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
+-			struct file *f = do_filp_open(dfd, tmp, &op, lookup);
 +			struct file *f;
 +			/* don't allow to be set by userland */
 +			flags &= ~FMODE_GREXEC;
-+			f = do_filp_open(dfd, tmp, flags, mode, 0);
++			f = do_filp_open(dfd, tmp, &op, lookup);
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
-index a29d5cc..116492b 100644
---- a/fs/partitions/ldm.c
-+++ b/fs/partitions/ldm.c
-@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
+diff -urNp linux-3.0.3/fs/partitions/ldm.c linux-3.0.3/fs/partitions/ldm.c
+--- linux-3.0.3/fs/partitions/ldm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/partitions/ldm.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
  		ldm_error ("A VBLK claims to have %d parts.", num);
  		return false;
  	}
@@ -42191,7 +39250,7 @@ index a29d5cc..116492b 100644
  	if (rec >= num) {
  		ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
  		return false;
-@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
+@@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data
  			goto found;
  	}
  
@@ -42200,10 +39259,9 @@ index a29d5cc..116492b 100644
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff --git a/fs/pipe.c b/fs/pipe.c
-index da42f7d..315f4e2 100644
---- a/fs/pipe.c
-+++ b/fs/pipe.c
+diff -urNp linux-3.0.3/fs/pipe.c linux-3.0.3/fs/pipe.c
+--- linux-3.0.3/fs/pipe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/pipe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -42216,7 +39274,7 @@ index da42f7d..315f4e2 100644
  			/* syscall merging: Usually we must not sleep
  			 * if O_NONBLOCK is set, or if we got some data.
  			 * But if a writer sleeps in kernel space, then
-@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
+@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const str
  	mutex_lock(&inode->i_mutex);
  	pipe = inode->i_pipe;
  
@@ -42246,7 +39304,7 @@ index da42f7d..315f4e2 100644
  	}
  out:
  	mutex_unlock(&inode->i_mutex);
-@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table 
  	mask = 0;
  	if (filp->f_mode & FMODE_READ) {
  		mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
@@ -42255,7 +39313,7 @@ index da42f7d..315f4e2 100644
  			mask |= POLLHUP;
  	}
  
-@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
+@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table 
  		 * Most Unices do not set POLLERR for FIFOs but on Linux they
  		 * behave exactly like pipes for poll().
  		 */
@@ -42264,7 +39322,7 @@ index da42f7d..315f4e2 100644
  			mask |= POLLERR;
  	}
  
-@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
+@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int de
  
  	mutex_lock(&inode->i_mutex);
  	pipe = inode->i_pipe;
@@ -42278,7 +39336,7 @@ index da42f7d..315f4e2 100644
  		free_pipe_info(inode);
  	} else {
  		wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
-@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
+@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, stru
  
  	if (inode->i_pipe) {
  		ret = 0;
@@ -42287,7 +39345,7 @@ index da42f7d..315f4e2 100644
  	}
  
  	mutex_unlock(&inode->i_mutex);
-@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
+@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, str
  
  	if (inode->i_pipe) {
  		ret = 0;
@@ -42296,7 +39354,7 @@ index da42f7d..315f4e2 100644
  	}
  
  	mutex_unlock(&inode->i_mutex);
-@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
+@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, stru
  	if (inode->i_pipe) {
  		ret = 0;
  		if (filp->f_mode & FMODE_READ)
@@ -42317,7 +39375,7 @@ index da42f7d..315f4e2 100644
  
  /*
   * pipefs_dname() is called from d_path().
-@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
+@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(voi
  		goto fail_iput;
  	inode->i_pipe = pipe;
  
@@ -42327,41 +39385,9 @@ index da42f7d..315f4e2 100644
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
-index 15af622..0e9f4467 100644
---- a/fs/proc/Kconfig
-+++ b/fs/proc/Kconfig
-@@ -30,12 +30,12 @@ config PROC_FS
- 
- config PROC_KCORE
- 	bool "/proc/kcore support" if !ARM
--	depends on PROC_FS && MMU
-+	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
- 
- config PROC_VMCORE
- 	bool "/proc/vmcore support"
--	depends on PROC_FS && CRASH_DUMP
--	default y
-+	depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
-+	default n
-         help
-         Exports the dump image of crashed kernel in ELF format.
- 
-@@ -59,8 +59,8 @@ config PROC_SYSCTL
- 	  limited in memory.
- 
- config PROC_PAGE_MONITOR
-- 	default y
--	depends on PROC_FS && MMU
-+ 	default n
-+	depends on PROC_FS && MMU && !GRKERNSEC
- 	bool "Enable /proc page monitoring" if EXPERT
-  	help
- 	  Various /proc files exist to monitor process memory utilization:
-diff --git a/fs/proc/array.c b/fs/proc/array.c
-index 5e4f776..5e06b36 100644
---- a/fs/proc/array.c
-+++ b/fs/proc/array.c
+diff -urNp linux-3.0.3/fs/proc/array.c linux-3.0.3/fs/proc/array.c
+--- linux-3.0.3/fs/proc/array.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/array.c	2011-08-23 21:48:14.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -42370,7 +39396,7 @@ index 5e4f776..5e06b36 100644
  #include <linux/proc_fs.h>
  #include <linux/ioport.h>
  #include <linux/uaccess.h>
-@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq
  	seq_putc(m, '\n');
  }
  
@@ -42392,7 +39418,7 @@ index 5e4f776..5e06b36 100644
  int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task)
  {
-@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, 
  	task_cpus_allowed(m, task);
  	cpuset_task_status_allowed(m, task);
  	task_context_switch_counts(m, task);
@@ -42417,7 +39443,7 @@ index 5e4f776..5e06b36 100644
  static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
  			struct pid *pid, struct task_struct *task, int whole)
  {
-@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -375,9 +406,11 @@ static int do_task_stat(struct seq_file 
  	cputime_t cutime, cstime, utime, stime;
  	cputime_t cgtime, gtime;
  	unsigned long rsslim = 0;
@@ -42430,7 +39456,7 @@ index 5e4f776..5e06b36 100644
  	state = *get_task_state(task);
  	vsize = eip = esp = 0;
  	permitted = ptrace_may_access(task, PTRACE_MODE_READ);
-@@ -449,6 +482,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -449,6 +482,19 @@ static int do_task_stat(struct seq_file 
  		gtime = task->gtime;
  	}
  
@@ -42450,7 +39476,7 @@ index 5e4f776..5e06b36 100644
  	/* scale priority and nice values from timeslices to -20..20 */
  	/* to make it look like a "normal" Unix priority/nice value  */
  	priority = task_prio(task);
-@@ -489,9 +535,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
+@@ -489,9 +535,15 @@ static int do_task_stat(struct seq_file 
  		vsize,
  		mm ? get_mm_rss(mm) : 0,
  		rsslim,
@@ -42466,7 +39492,7 @@ index 5e4f776..5e06b36 100644
  		esp,
  		eip,
  		/* The signal information here is obsolete.
-@@ -544,3 +596,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
+@@ -544,3 +596,18 @@ int proc_pid_statm(struct seq_file *m, s
  
  	return 0;
  }
@@ -42485,11 +39511,10 @@ index 5e4f776..5e06b36 100644
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 71a85d8..a91e039 100644
---- a/fs/proc/base.c
-+++ b/fs/proc/base.c
-@@ -104,6 +104,22 @@ struct pid_entry {
+diff -urNp linux-3.0.3/fs/proc/base.c linux-3.0.3/fs/proc/base.c
+--- linux-3.0.3/fs/proc/base.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/fs/proc/base.c	2011-08-23 21:48:14.000000000 -0400
+@@ -107,6 +107,22 @@ struct pid_entry {
  	union proc_op op;
  };
  
@@ -42512,17 +39537,17 @@ index 71a85d8..a91e039 100644
  #define NOD(NAME, MODE, IOP, FOP, OP) {			\
  	.name = (NAME),					\
  	.len  = sizeof(NAME) - 1,			\
-@@ -203,6 +219,9 @@ static int check_mem_permission(struct task_struct *task)
+@@ -209,6 +225,9 @@ static struct mm_struct *__check_mem_per
  	if (task == current)
- 		return 0;
+ 		return mm;
  
 +	if (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))
-+		return -EPERM;
++		return ERR_PTR(-EPERM);
 +
  	/*
  	 * If current is actively ptrace'ing, and would also be
  	 * permitted to freshly attach with ptrace now, permit it.
-@@ -250,6 +269,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+@@ -282,6 +301,9 @@ static int proc_pid_cmdline(struct task_
  	if (!mm->arg_end)
  		goto out_mm;	/* Shh! No looking before we're done */
  
@@ -42532,7 +39557,7 @@ index 71a85d8..a91e039 100644
   	len = mm->arg_end - mm->arg_start;
   
  	if (len > PAGE_SIZE)
-@@ -277,12 +299,28 @@ out:
+@@ -309,12 +331,28 @@ out:
  	return res;
  }
  
@@ -42544,9 +39569,9 @@ index 71a85d8..a91e039 100644
 +
  static int proc_pid_auxv(struct task_struct *task, char *buffer)
  {
- 	int res = 0;
- 	struct mm_struct *mm = get_task_mm(task);
- 	if (mm) {
+ 	struct mm_struct *mm = mm_for_maps(task);
+ 	int res = PTR_ERR(mm);
+ 	if (mm && !IS_ERR(mm)) {
  		unsigned int nwords = 0;
 +
 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
@@ -42561,7 +39586,7 @@ index 71a85d8..a91e039 100644
  		do {
  			nwords += 2;
  		} while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-@@ -296,7 +334,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
+@@ -328,7 +366,7 @@ static int proc_pid_auxv(struct task_str
  }
  
  
@@ -42570,16 +39595,16 @@ index 71a85d8..a91e039 100644
  /*
   * Provides a wchan file via kallsyms in a proper one-value-per-file format.
   * Returns the resolved symbol.  If that fails, simply return the address.
-@@ -318,7 +356,7 @@ static int proc_pid_wchan(struct task_struct *task, char *buffer)
+@@ -367,7 +405,7 @@ static void unlock_trace(struct task_str
+ 	mutex_unlock(&task->signal->cred_guard_mutex);
  }
- #endif /* CONFIG_KALLSYMS */
  
 -#ifdef CONFIG_STACKTRACE
 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
  
  #define MAX_STACK_TRACE_DEPTH	64
  
-@@ -503,7 +541,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
+@@ -558,7 +596,7 @@ static int proc_pid_limits(struct task_s
  	return count;
  }
  
@@ -42588,7 +39613,7 @@ index 71a85d8..a91e039 100644
  static int proc_pid_syscall(struct task_struct *task, char *buffer)
  {
  	long nr;
-@@ -528,7 +566,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
+@@ -587,7 +625,7 @@ static int proc_pid_syscall(struct task_
  /************************************************************************/
  
  /* permission checks */
@@ -42597,7 +39622,7 @@ index 71a85d8..a91e039 100644
  {
  	struct task_struct *task;
  	int allowed = 0;
-@@ -538,7 +576,10 @@ static int proc_fd_access_allowed(struct inode *inode)
+@@ -597,7 +635,10 @@ static int proc_fd_access_allowed(struct
  	 */
  	task = get_proc_task(inode);
  	if (task) {
@@ -42609,17 +39634,17 @@ index 71a85d8..a91e039 100644
  		put_task_struct(task);
  	}
  	return allowed;
-@@ -917,6 +958,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
+@@ -978,6 +1019,9 @@ static ssize_t environ_read(struct file 
  	if (!task)
  		goto out_no_task;
  
 +	if (gr_acl_handle_procpidmem(task))
 +		goto out;
 +
- 	if (!ptrace_may_access(task, PTRACE_MODE_READ))
- 		goto out;
- 
-@@ -1606,7 +1650,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
+ 	ret = -ENOMEM;
+ 	page = (char *)__get_free_page(GFP_TEMPORARY);
+ 	if (!page)
+@@ -1614,7 +1658,7 @@ static void *proc_pid_follow_link(struct
  	path_put(&nd->path);
  
  	/* Are we allowed to snoop on the tasks file descriptors? */
@@ -42628,7 +39653,7 @@ index 71a85d8..a91e039 100644
  		goto out;
  
  	error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
-@@ -1645,8 +1689,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
+@@ -1653,8 +1697,18 @@ static int proc_pid_readlink(struct dent
  	struct path path;
  
  	/* Are we allowed to snoop on the tasks file descriptors? */
@@ -42649,7 +39674,7 @@ index 71a85d8..a91e039 100644
  
  	error = PROC_I(inode)->op.proc_get_link(inode, &path);
  	if (error)
-@@ -1712,7 +1766,11 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
+@@ -1719,7 +1773,11 @@ struct inode *proc_pid_make_inode(struct
  		rcu_read_lock();
  		cred = __task_cred(task);
  		inode->i_uid = cred->euid;
@@ -42661,7 +39686,7 @@ index 71a85d8..a91e039 100644
  		rcu_read_unlock();
  	}
  	security_task_to_inode(task, inode);
-@@ -1730,6 +1788,9 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
+@@ -1737,6 +1795,9 @@ int pid_getattr(struct vfsmount *mnt, st
  	struct inode *inode = dentry->d_inode;
  	struct task_struct *task;
  	const struct cred *cred;
@@ -42671,7 +39696,7 @@ index 71a85d8..a91e039 100644
  
  	generic_fillattr(inode, stat);
  
-@@ -1737,12 +1798,34 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
+@@ -1744,13 +1805,41 @@ int pid_getattr(struct vfsmount *mnt, st
  	stat->uid = 0;
  	stat->gid = 0;
  	task = pid_task(proc_pid(inode), PIDTYPE_PID);
@@ -42688,7 +39713,7 @@ index 71a85d8..a91e039 100644
 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
 +		    || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
 +#endif
-+		)
++		) {
 +#endif
  		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
 +#ifdef CONFIG_GRKERNSEC_PROC_USER
@@ -42705,9 +39730,16 @@ index 71a85d8..a91e039 100644
  			stat->gid = cred->egid;
 +#endif
  		}
++#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++		} else {
++			rcu_read_unlock();
++			return -ENOENT;
++		}
++#endif
  	}
  	rcu_read_unlock();
-@@ -1780,11 +1863,20 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
+ 	return 0;
+@@ -1787,11 +1876,20 @@ int pid_revalidate(struct dentry *dentry
  
  	if (task) {
  		if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
@@ -42728,7 +39760,7 @@ index 71a85d8..a91e039 100644
  			rcu_read_unlock();
  		} else {
  			inode->i_uid = 0;
-@@ -1905,7 +1997,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
+@@ -1909,7 +2007,8 @@ static int proc_fd_info(struct inode *in
  	int fd = proc_fd(inode);
  
  	if (task) {
@@ -42738,16 +39770,12 @@ index 71a85d8..a91e039 100644
  		put_task_struct(task);
  	}
  	if (files) {
-@@ -2165,15 +2258,25 @@ static const struct file_operations proc_fd_operations = {
+@@ -2169,11 +2268,21 @@ static const struct file_operations proc
   */
  static int proc_fd_permission(struct inode *inode, int mask, unsigned int flags)
  {
 +	struct task_struct *task;
- 	int rv;
- 
- 	if (flags & IPERM_FLAG_RCU)
- 		return -ECHILD;
- 	rv = generic_permission(inode, mask, flags, NULL);
+ 	int rv = generic_permission(inode, mask, flags, NULL);
 -	if (rv == 0)
 -		return 0;
 +
@@ -42766,7 +39794,7 @@ index 71a85d8..a91e039 100644
  	return rv;
  }
  
-@@ -2283,6 +2386,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
+@@ -2283,6 +2392,9 @@ static struct dentry *proc_pident_lookup
  	if (!task)
  		goto out_no_task;
  
@@ -42776,7 +39804,7 @@ index 71a85d8..a91e039 100644
  	/*
  	 * Yes, it does not scale. And it should not. Don't add
  	 * new entries into /proc/<tgid>/ without very good reasons.
-@@ -2327,6 +2433,9 @@ static int proc_pident_readdir(struct file *filp,
+@@ -2327,6 +2439,9 @@ static int proc_pident_readdir(struct fi
  	if (!task)
  		goto out_no_task;
  
@@ -42786,7 +39814,7 @@ index 71a85d8..a91e039 100644
  	ret = 0;
  	i = filp->f_pos;
  	switch (i) {
-@@ -2597,7 +2706,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
+@@ -2597,7 +2712,7 @@ static void *proc_self_follow_link(struc
  static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
  				void *cookie)
  {
@@ -42795,16 +39823,16 @@ index 71a85d8..a91e039 100644
  	if (!IS_ERR(s))
  		__putname(s);
  }
-@@ -2777,7 +2886,7 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2795,7 +2910,7 @@ static const struct pid_entry tgid_base_
  	REG("autogroup",  S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
  #endif
  	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- 	INF("syscall",    S_IRUSR, proc_pid_syscall),
+ 	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2802,10 +2911,10 @@ static const struct pid_entry tgid_base_stuff[] = {
+@@ -2820,10 +2935,10 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_SECURITY
  	DIR("attr",       S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -42814,12 +39842,12 @@ index 71a85d8..a91e039 100644
  #endif
 -#ifdef CONFIG_STACKTRACE
 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- 	ONE("stack",      S_IRUSR, proc_pid_stack),
+ 	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2836,6 +2945,9 @@ static const struct pid_entry tgid_base_stuff[] = {
- #ifdef CONFIG_TASK_IO_ACCOUNTING
- 	INF("io",	S_IRUGO, proc_tgid_io_accounting),
+@@ -2857,6 +2972,9 @@ static const struct pid_entry tgid_base_
+ #ifdef CONFIG_HARDWALL
+ 	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
 +	INF("ipaddr",	  S_IRUSR, proc_pid_ipaddr),
@@ -42827,7 +39855,7 @@ index 71a85d8..a91e039 100644
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2961,7 +3073,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
+@@ -2982,7 +3100,14 @@ static struct dentry *proc_pid_instantia
  	if (!inode)
  		goto out;
  
@@ -42842,7 +39870,7 @@ index 71a85d8..a91e039 100644
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -3003,7 +3122,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
+@@ -3024,7 +3149,11 @@ struct dentry *proc_pid_lookup(struct in
  	if (!task)
  		goto out;
  
@@ -42854,7 +39882,7 @@ index 71a85d8..a91e039 100644
  	put_task_struct(task);
  out:
  	return result;
-@@ -3068,6 +3191,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
+@@ -3089,6 +3218,11 @@ int proc_pid_readdir(struct file * filp,
  {
  	unsigned int nr;
  	struct task_struct *reaper;
@@ -42866,7 +39894,7 @@ index 71a85d8..a91e039 100644
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -3091,8 +3219,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
+@@ -3112,8 +3246,27 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -42895,16 +39923,16 @@ index 71a85d8..a91e039 100644
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -3119,7 +3266,7 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3141,7 +3294,7 @@ static const struct pid_entry tid_base_s
  	REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
  	REG("comm",      S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
- 	INF("syscall",   S_IRUSR, proc_pid_syscall),
+ 	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3143,10 +3290,10 @@ static const struct pid_entry tid_base_stuff[] = {
+@@ -3165,10 +3318,10 @@ static const struct pid_entry tid_base_s
  #ifdef CONFIG_SECURITY
  	DIR("attr",      S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
  #endif
@@ -42914,14 +39942,13 @@ index 71a85d8..a91e039 100644
  #endif
 -#ifdef CONFIG_STACKTRACE
 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
- 	ONE("stack",      S_IRUSR, proc_pid_stack),
+ 	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
-index 82676e3..5f8518a 100644
---- a/fs/proc/cmdline.c
-+++ b/fs/proc/cmdline.c
-@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
+diff -urNp linux-3.0.3/fs/proc/cmdline.c linux-3.0.3/fs/proc/cmdline.c
+--- linux-3.0.3/fs/proc/cmdline.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/cmdline.c	2011-08-23 21:48:14.000000000 -0400
+@@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
  {
@@ -42933,11 +39960,10 @@ index 82676e3..5f8518a 100644
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff --git a/fs/proc/devices.c b/fs/proc/devices.c
-index b143471..bb105e5 100644
---- a/fs/proc/devices.c
-+++ b/fs/proc/devices.c
-@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
+diff -urNp linux-3.0.3/fs/proc/devices.c linux-3.0.3/fs/proc/devices.c
+--- linux-3.0.3/fs/proc/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/devices.c	2011-08-23 21:48:14.000000000 -0400
+@@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
  {
@@ -42949,11 +39975,10 @@ index b143471..bb105e5 100644
  	return 0;
  }
  module_init(proc_devices_init);
-diff --git a/fs/proc/inode.c b/fs/proc/inode.c
-index d6a7ca1..fc19786 100644
---- a/fs/proc/inode.c
-+++ b/fs/proc/inode.c
-@@ -435,7 +435,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
+diff -urNp linux-3.0.3/fs/proc/inode.c linux-3.0.3/fs/proc/inode.c
+--- linux-3.0.3/fs/proc/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -440,7 +440,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
  			inode->i_uid = de->uid;
@@ -42965,11 +39990,10 @@ index d6a7ca1..fc19786 100644
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff --git a/fs/proc/internal.h b/fs/proc/internal.h
-index 9ad561d..7d4c5f7 100644
---- a/fs/proc/internal.h
-+++ b/fs/proc/internal.h
-@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+diff -urNp linux-3.0.3/fs/proc/internal.h linux-3.0.3/fs/proc/internal.h
+--- linux-3.0.3/fs/proc/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/internal.h	2011-08-23 21:48:14.000000000 -0400
+@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
  				struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
  				struct pid *pid, struct task_struct *task);
@@ -42979,11 +40003,40 @@ index 9ad561d..7d4c5f7 100644
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
-index d245cb2..7e645bd 100644
---- a/fs/proc/kcore.c
-+++ b/fs/proc/kcore.c
-@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
+diff -urNp linux-3.0.3/fs/proc/Kconfig linux-3.0.3/fs/proc/Kconfig
+--- linux-3.0.3/fs/proc/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -30,12 +30,12 @@ config PROC_FS
+ 
+ config PROC_KCORE
+ 	bool "/proc/kcore support" if !ARM
+-	depends on PROC_FS && MMU
++	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
+ 
+ config PROC_VMCORE
+ 	bool "/proc/vmcore support"
+-	depends on PROC_FS && CRASH_DUMP
+-	default y
++	depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++	default n
+         help
+         Exports the dump image of crashed kernel in ELF format.
+ 
+@@ -59,8 +59,8 @@ config PROC_SYSCTL
+ 	  limited in memory.
+ 
+ config PROC_PAGE_MONITOR
+- 	default y
+-	depends on PROC_FS && MMU
++ 	default n
++	depends on PROC_FS && MMU && !GRKERNSEC
+ 	bool "Enable /proc page monitoring" if EXPERT
+  	help
+ 	  Various /proc files exist to monitor process memory utilization:
+diff -urNp linux-3.0.3/fs/proc/kcore.c linux-3.0.3/fs/proc/kcore.c
+--- linux-3.0.3/fs/proc/kcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/kcore.c	2011-08-23 21:48:14.000000000 -0400
+@@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
  	off_t offset = 0;
  	struct kcore_list *m;
  
@@ -42992,7 +40045,7 @@ index d245cb2..7e645bd 100644
  	/* setup ELF header */
  	elf = (struct elfhdr *) bufp;
  	bufp += sizeof(struct elfhdr);
-@@ -478,9 +480,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -478,9 +480,10 @@ read_kcore(struct file *file, char __use
  	 * the addresses in the elf_phdr on our list.
  	 */
  	start = kc_offset_to_vaddr(*fpos - elf_buflen);
@@ -43005,12 +40058,14 @@ index d245cb2..7e645bd 100644
  	while (buflen) {
  		struct kcore_list *m;
  
-@@ -509,20 +512,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -509,20 +512,23 @@ read_kcore(struct file *file, char __use
  			kfree(elf_buf);
  		} else {
  			if (kern_addr_valid(start)) {
 -				unsigned long n;
--
++				char *elf_buf;
++				mm_segment_t oldfs;
+ 
 -				n = copy_to_user(buffer, (char *)start, tsz);
 -				/*
 -				 * We cannot distingush between fault on source
@@ -43021,9 +40076,6 @@ index d245cb2..7e645bd 100644
 -				if (n) { 
 -					if (clear_user(buffer + tsz - n,
 -								n))
-+				char *elf_buf;
-+				mm_segment_t oldfs;
-+
 +				elf_buf = kmalloc(tsz, GFP_KERNEL);
 +				if (!elf_buf)
 +					return -ENOMEM;
@@ -43041,7 +40093,7 @@ index d245cb2..7e645bd 100644
  			} else {
  				if (clear_user(buffer, tsz))
  					return -EFAULT;
-@@ -542,6 +548,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
+@@ -542,6 +548,9 @@ read_kcore(struct file *file, char __use
  
  static int open_kcore(struct inode *inode, struct file *filp)
  {
@@ -43051,11 +40103,10 @@ index d245cb2..7e645bd 100644
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
-index ed257d1..dda1954 100644
---- a/fs/proc/meminfo.c
-+++ b/fs/proc/meminfo.c
-@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+diff -urNp linux-3.0.3/fs/proc/meminfo.c linux-3.0.3/fs/proc/meminfo.c
+--- linux-3.0.3/fs/proc/meminfo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/meminfo.c	2011-08-23 21:48:14.000000000 -0400
+@@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
  	unsigned long pages[NR_LRU_LISTS];
  	int lru;
  
@@ -43064,7 +40115,7 @@ index ed257d1..dda1954 100644
  /*
   * display in kilobytes.
   */
-@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
+@@ -157,7 +159,7 @@ static int meminfo_proc_show(struct seq_
  		vmi.used >> 10,
  		vmi.largest_chunk >> 10
  #ifdef CONFIG_MEMORY_FAILURE
@@ -43073,11 +40124,10 @@ index ed257d1..dda1954 100644
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
-index b1822dd..df622cb 100644
---- a/fs/proc/nommu.c
-+++ b/fs/proc/nommu.c
-@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
+diff -urNp linux-3.0.3/fs/proc/nommu.c linux-3.0.3/fs/proc/nommu.c
+--- linux-3.0.3/fs/proc/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/nommu.c	2011-08-23 21:47:56.000000000 -0400
+@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
  		if (len < 1)
  			len = 1;
  		seq_printf(m, "%*c", len, ' ');
@@ -43086,11 +40136,10 @@ index b1822dd..df622cb 100644
  	}
  
  	seq_putc(m, '\n');
-diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
-index 9020ac1..15a7335 100644
---- a/fs/proc/proc_net.c
-+++ b/fs/proc/proc_net.c
-@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
+diff -urNp linux-3.0.3/fs/proc/proc_net.c linux-3.0.3/fs/proc/proc_net.c
+--- linux-3.0.3/fs/proc/proc_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/proc_net.c	2011-08-23 21:48:14.000000000 -0400
+@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
  	struct task_struct *task;
  	struct nsproxy *ns;
  	struct net *net = NULL;
@@ -43108,10 +40157,9 @@ index 9020ac1..15a7335 100644
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
-index 8eb2522..5e5fdce 100644
---- a/fs/proc/proc_sysctl.c
-+++ b/fs/proc/proc_sysctl.c
+diff -urNp linux-3.0.3/fs/proc/proc_sysctl.c linux-3.0.3/fs/proc/proc_sysctl.c
+--- linux-3.0.3/fs/proc/proc_sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/proc_sysctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -8,6 +8,8 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -43121,7 +40169,7 @@ index 8eb2522..5e5fdce 100644
  static const struct dentry_operations proc_sys_dentry_operations;
  static const struct file_operations proc_sys_file_operations;
  static const struct inode_operations proc_sys_inode_operations;
-@@ -112,6 +114,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
+@@ -111,6 +113,9 @@ static struct dentry *proc_sys_lookup(st
  	if (!p)
  		goto out;
  
@@ -43131,7 +40179,7 @@ index 8eb2522..5e5fdce 100644
  	err = ERR_PTR(-ENOMEM);
  	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
  	if (h)
-@@ -231,6 +236,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
+@@ -230,6 +235,9 @@ static int scan(struct ctl_table_header 
  		if (*pos < file->f_pos)
  			continue;
  
@@ -43141,7 +40189,7 @@ index 8eb2522..5e5fdce 100644
  		res = proc_sys_fill_cache(file, dirent, filldir, head, table);
  		if (res)
  			return res;
-@@ -359,6 +367,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
+@@ -355,6 +363,9 @@ static int proc_sys_getattr(struct vfsmo
  	if (IS_ERR(head))
  		return PTR_ERR(head);
  
@@ -43151,11 +40199,10 @@ index 8eb2522..5e5fdce 100644
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff --git a/fs/proc/root.c b/fs/proc/root.c
-index ef9fa8e..1810de5 100644
---- a/fs/proc/root.c
-+++ b/fs/proc/root.c
-@@ -132,7 +132,15 @@ void __init proc_root_init(void)
+diff -urNp linux-3.0.3/fs/proc/root.c linux-3.0.3/fs/proc/root.c
+--- linux-3.0.3/fs/proc/root.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/root.c	2011-08-23 21:48:14.000000000 -0400
+@@ -123,7 +123,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
  	proc_device_tree_init();
  #endif
@@ -43171,11 +40218,10 @@ index ef9fa8e..1810de5 100644
  	proc_sys_init();
  }
  
-diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index c4bec29..d72bbaa 100644
---- a/fs/proc/task_mmu.c
-+++ b/fs/proc/task_mmu.c
-@@ -49,8 +49,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+diff -urNp linux-3.0.3/fs/proc/task_mmu.c linux-3.0.3/fs/proc/task_mmu.c
+--- linux-3.0.3/fs/proc/task_mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/task_mmu.c	2011-08-23 21:48:14.000000000 -0400
+@@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
  		"VmPTE:\t%8lu kB\n"
@@ -43191,7 +40237,7 @@ index c4bec29..d72bbaa 100644
  		(total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
  		mm->locked_vm << (PAGE_SHIFT-10),
  		hiwater_rss << (PAGE_SHIFT-10),
-@@ -58,7 +63,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -60,7 +65,13 @@ void task_mem(struct seq_file *m, struct
  		data << (PAGE_SHIFT-10),
  		mm->stack_vm << (PAGE_SHIFT-10), text, lib,
  		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
@@ -43206,17 +40252,7 @@ index c4bec29..d72bbaa 100644
  }
  
  unsigned long task_vsize(struct mm_struct *mm)
-@@ -180,7 +191,8 @@ static void m_stop(struct seq_file *m, void *v)
- 	struct proc_maps_private *priv = m->private;
- 	struct vm_area_struct *vma = v;
- 
--	vma_stop(priv, vma);
-+	if (!IS_ERR(vma))
-+		vma_stop(priv, vma);
- 	if (priv->task)
- 		put_task_struct(priv->task);
- }
-@@ -204,6 +216,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
+@@ -207,6 +218,12 @@ static int do_maps_open(struct inode *in
  	return ret;
  }
  
@@ -43229,37 +40265,26 @@ index c4bec29..d72bbaa 100644
  static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
  {
  	struct mm_struct *mm = vma->vm_mm;
-@@ -211,7 +229,6 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
- 	int flags = vma->vm_flags;
- 	unsigned long ino = 0;
- 	unsigned long long pgoff = 0;
--	unsigned long start, end;
- 	dev_t dev = 0;
- 	int len;
- 
-@@ -222,22 +239,23 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+@@ -225,13 +242,13 @@ static void show_map_vma(struct seq_file
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
  	}
  
 -	/* We don't show the stack guard page in /proc/maps */
--	start = vma->vm_start;
++#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
++	start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
++	end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
++#else
+ 	start = vma->vm_start;
 -	if (stack_guard_page_start(vma, start))
 -		start += PAGE_SIZE;
--	end = vma->vm_end;
+ 	end = vma->vm_end;
 -	if (stack_guard_page_end(vma, end))
 -		end -= PAGE_SIZE;
--
- 	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
--			start,
--			end,
-+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
-+			PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
-+			PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
-+#else
-+			vma->vm_start,
-+			vma->vm_end,
 +#endif
- 			flags & VM_READ ? 'r' : '-',
+ 
+ 	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
+ 			start,
+@@ -240,7 +257,11 @@ static void show_map_vma(struct seq_file
  			flags & VM_WRITE ? 'w' : '-',
  			flags & VM_EXEC ? 'x' : '-',
  			flags & VM_MAYSHARE ? 's' : 'p',
@@ -43271,7 +40296,7 @@ index c4bec29..d72bbaa 100644
  			MAJOR(dev), MINOR(dev), ino, &len);
  
  	/*
-@@ -246,16 +264,16 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
+@@ -249,7 +270,7 @@ static void show_map_vma(struct seq_file
  	 */
  	if (file) {
  		pad_len_spaces(m, len);
@@ -43280,10 +40305,9 @@ index c4bec29..d72bbaa 100644
  	} else {
  		const char *name = arch_vma_name(vma);
  		if (!name) {
- 			if (mm) {
--				if (vma->vm_start <= mm->brk &&
--						vma->vm_end >= mm->start_brk) {
-+				if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
+@@ -257,8 +278,9 @@ static void show_map_vma(struct seq_file
+ 				if (vma->vm_start <= mm->brk &&
+ 						vma->vm_end >= mm->start_brk) {
  					name = "[heap]";
 -				} else if (vma->vm_start <= mm->start_stack &&
 -					   vma->vm_end >= mm->start_stack) {
@@ -43293,7 +40317,7 @@ index c4bec29..d72bbaa 100644
  					name = "[stack]";
  				}
  			} else {
-@@ -401,11 +419,16 @@ static int show_smap(struct seq_file *m, void *v)
+@@ -433,11 +455,16 @@ static int show_smap(struct seq_file *m,
  	};
  
  	memset(&mss, 0, sizeof mss);
@@ -43315,7 +40339,7 @@ index c4bec29..d72bbaa 100644
  	show_map_vma(m, vma);
  
  	seq_printf(m,
-@@ -422,7 +445,11 @@ static int show_smap(struct seq_file *m, void *v)
+@@ -455,7 +482,11 @@ static int show_smap(struct seq_file *m,
  		   "KernelPageSize: %8lu kB\n"
  		   "MMUPageSize:    %8lu kB\n"
  		   "Locked:         %8lu kB\n",
@@ -43327,11 +40351,19 @@ index c4bec29..d72bbaa 100644
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
-index b535d3e..398f41e 100644
---- a/fs/proc/task_nommu.c
-+++ b/fs/proc/task_nommu.c
-@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
+@@ -1001,7 +1032,7 @@ static int show_numa_map(struct seq_file
+ 
+ 	if (file) {
+ 		seq_printf(m, " file=");
+-		seq_path(m, &file->f_path, "\n\t= ");
++		seq_path(m, &file->f_path, "\n\t\\= ");
+ 	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
+ 		seq_printf(m, " heap");
+ 	} else if (vma->vm_start <= mm->start_stack &&
+diff -urNp linux-3.0.3/fs/proc/task_nommu.c linux-3.0.3/fs/proc/task_nommu.c
+--- linux-3.0.3/fs/proc/task_nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/proc/task_nommu.c	2011-08-23 21:47:56.000000000 -0400
+@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
  	else
  		bytes += kobjsize(mm);
  	
@@ -43340,7 +40372,7 @@ index b535d3e..398f41e 100644
  		sbytes += kobjsize(current->fs);
  	else
  		bytes += kobjsize(current->fs);
-@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
+@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_fil
  
  	if (file) {
  		pad_len_spaces(m, len);
@@ -43349,11 +40381,10 @@ index b535d3e..398f41e 100644
  	} else if (mm) {
  		if (vma->vm_start <= mm->start_stack &&
  			vma->vm_end >= mm->start_stack) {
-diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
-index d67908b..d13f6a6 100644
---- a/fs/quota/netlink.c
-+++ b/fs/quota/netlink.c
-@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
+diff -urNp linux-3.0.3/fs/quota/netlink.c linux-3.0.3/fs/quota/netlink.c
+--- linux-3.0.3/fs/quota/netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/quota/netlink.c	2011-08-23 21:47:56.000000000 -0400
+@@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
  void quota_send_warning(short type, unsigned int id, dev_t dev,
  			const char warntype)
  {
@@ -43362,7 +40393,7 @@ index d67908b..d13f6a6 100644
  	struct sk_buff *skb;
  	void *msg_head;
  	int ret;
-@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
+@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsi
  		  "VFS: Not enough memory to send quota warning.\n");
  		return;
  	}
@@ -43371,10 +40402,9 @@ index d67908b..d13f6a6 100644
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff --git a/fs/readdir.c b/fs/readdir.c
-index 356f715..43d6f23 100644
---- a/fs/readdir.c
-+++ b/fs/readdir.c
+diff -urNp linux-3.0.3/fs/readdir.c linux-3.0.3/fs/readdir.c
+--- linux-3.0.3/fs/readdir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/readdir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -43391,7 +40421,7 @@ index 356f715..43d6f23 100644
  	int result;
  };
  
-@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
+@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, cons
  		buf->result = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -43402,7 +40432,7 @@ index 356f715..43d6f23 100644
  	buf->result++;
  	dirent = buf->dirent;
  	if (!access_ok(VERIFY_WRITE, dirent,
-@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
+@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned in
  
  	buf.result = 0;
  	buf.dirent = dirent;
@@ -43418,7 +40448,7 @@ index 356f715..43d6f23 100644
  	int count;
  	int error;
  };
-@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -163,6 +171,10 @@ static int filldir(void * __buf, const c
  		buf->error = -EOVERFLOW;
  		return -EOVERFLOW;
  	}
@@ -43429,7 +40459,7 @@ index 356f715..43d6f23 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
+@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, 
  	buf.previous = NULL;
  	buf.count = count;
  	buf.error = 0;
@@ -43445,7 +40475,7 @@ index 356f715..43d6f23 100644
  	int count;
  	int error;
  };
-@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
+@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const
  	buf->error = -EINVAL;	/* only used if we fail.. */
  	if (reclen > buf->count)
  		return -EINVAL;
@@ -43456,7 +40486,7 @@ index 356f715..43d6f23 100644
  	dirent = buf->previous;
  	if (dirent) {
  		if (__put_user(offset, &dirent->d_off))
-@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
+@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int
  
  	buf.current_dir = dirent;
  	buf.previous = NULL;
@@ -43464,11 +40494,10 @@ index 356f715..43d6f23 100644
  	buf.count = count;
  	buf.error = 0;
  
-diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
-index 198dabf..94f661b 100644
---- a/fs/reiserfs/dir.c
-+++ b/fs/reiserfs/dir.c
-@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
+diff -urNp linux-3.0.3/fs/reiserfs/dir.c linux-3.0.3/fs/reiserfs/dir.c
+--- linux-3.0.3/fs/reiserfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+@@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
  	struct reiserfs_dir_entry de;
  	int ret = 0;
  
@@ -43477,11 +40506,10 @@ index 198dabf..94f661b 100644
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
-index 60c0804..d814f98 100644
---- a/fs/reiserfs/do_balan.c
-+++ b/fs/reiserfs/do_balan.c
-@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,	/* tree_balance structure */
+diff -urNp linux-3.0.3/fs/reiserfs/do_balan.c linux-3.0.3/fs/reiserfs/do_balan.c
+--- linux-3.0.3/fs/reiserfs/do_balan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/do_balan.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
  		return;
  	}
  
@@ -43490,69 +40518,10 @@ index 60c0804..d814f98 100644
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
-index 72cb1cc..d0e3181 100644
---- a/fs/reiserfs/item_ops.c
-+++ b/fs/reiserfs/item_ops.c
-@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_item *vi)
- 			 vi->vi_index, vi->vi_type, vi->vi_ih);
- }
- 
--static struct item_operations stat_data_ops = {
-+static const struct item_operations stat_data_ops = {
- 	.bytes_number = sd_bytes_number,
- 	.decrement_key = sd_decrement_key,
- 	.is_left_mergeable = sd_is_left_mergeable,
-@@ -196,7 +196,7 @@ static void direct_print_vi(struct virtual_item *vi)
- 			 vi->vi_index, vi->vi_type, vi->vi_ih);
- }
- 
--static struct item_operations direct_ops = {
-+static const struct item_operations direct_ops = {
- 	.bytes_number = direct_bytes_number,
- 	.decrement_key = direct_decrement_key,
- 	.is_left_mergeable = direct_is_left_mergeable,
-@@ -341,7 +341,7 @@ static void indirect_print_vi(struct virtual_item *vi)
- 			 vi->vi_index, vi->vi_type, vi->vi_ih);
- }
- 
--static struct item_operations indirect_ops = {
-+static const struct item_operations indirect_ops = {
- 	.bytes_number = indirect_bytes_number,
- 	.decrement_key = indirect_decrement_key,
- 	.is_left_mergeable = indirect_is_left_mergeable,
-@@ -628,7 +628,7 @@ static void direntry_print_vi(struct virtual_item *vi)
- 	printk("\n");
- }
- 
--static struct item_operations direntry_ops = {
-+static const struct item_operations direntry_ops = {
- 	.bytes_number = direntry_bytes_number,
- 	.decrement_key = direntry_decrement_key,
- 	.is_left_mergeable = direntry_is_left_mergeable,
-@@ -724,7 +724,7 @@ static void errcatch_print_vi(struct virtual_item *vi)
- 			 "Invalid item type observed, run fsck ASAP");
- }
- 
--static struct item_operations errcatch_ops = {
-+static const struct item_operations errcatch_ops = {
- 	errcatch_bytes_number,
- 	errcatch_decrement_key,
- 	errcatch_is_left_mergeable,
-@@ -746,7 +746,7 @@ static struct item_operations errcatch_ops = {
- #error Item types must use disk-format assigned values.
- #endif
- 
--struct item_operations *item_ops[TYPE_ANY + 1] = {
-+const struct item_operations * const item_ops[TYPE_ANY + 1] = {
- 	&stat_data_ops,
- 	&indirect_ops,
- 	&direct_ops,
-diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
-index 3eea859..318aa12 100644
---- a/fs/reiserfs/journal.c
-+++ b/fs/reiserfs/journal.c
-@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev,
+diff -urNp linux-3.0.3/fs/reiserfs/journal.c linux-3.0.3/fs/reiserfs/journal.c
+--- linux-3.0.3/fs/reiserfs/journal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/journal.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
  	struct buffer_head *bh;
  	int i, j;
  
@@ -43561,11 +40530,10 @@ index 3eea859..318aa12 100644
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
-index 68fdf45..afb6494 100644
---- a/fs/reiserfs/namei.c
-+++ b/fs/reiserfs/namei.c
-@@ -1228,6 +1228,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
+diff -urNp linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3/fs/reiserfs/namei.c
+--- linux-3.0.3/fs/reiserfs/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/namei.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
  	unsigned long savelink = 1;
  	struct timespec ctime;
  
@@ -43574,11 +40542,10 @@ index 68fdf45..afb6494 100644
  	/* three balancings: (1) old name removal, (2) new name insertion
  	   and (3) maybe "save" link insertion
  	   stat data updates: (1) old directory,
-diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
-index 7a99811..2c9286f 100644
---- a/fs/reiserfs/procfs.c
-+++ b/fs/reiserfs/procfs.c
-@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
+diff -urNp linux-3.0.3/fs/reiserfs/procfs.c linux-3.0.3/fs/reiserfs/procfs.c
+--- linux-3.0.3/fs/reiserfs/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/procfs.c	2011-08-23 21:48:14.000000000 -0400
+@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
  		   "SMALL_TAILS " : "NO_TAILS ",
  		   replay_only(sb) ? "REPLAY_ONLY " : "",
  		   convert_reiserfs(sb) ? "CONV " : "",
@@ -43587,7 +40554,7 @@ index 7a99811..2c9286f 100644
  		   SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
  		   SF(s_do_balance), SF(s_unneeded_left_neighbor),
  		   SF(s_good_search_by_key_reada), SF(s_bmaps),
-@@ -299,6 +299,8 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
+@@ -299,6 +299,8 @@ static int show_journal(struct seq_file 
  	struct journal_params *jp = &rs->s_v1.s_journal;
  	char b[BDEVNAME_SIZE];
  
@@ -43596,11 +40563,10 @@ index 7a99811..2c9286f 100644
  	seq_printf(m,		/* on-disk fields */
  		   "jp_journal_1st_block: \t%i\n"
  		   "jp_journal_dev: \t%s[%x]\n"
-diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
-index 313d39d..3a5811b 100644
---- a/fs/reiserfs/stree.c
-+++ b/fs/reiserfs/stree.c
-@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
+diff -urNp linux-3.0.3/fs/reiserfs/stree.c linux-3.0.3/fs/reiserfs/stree.c
+--- linux-3.0.3/fs/reiserfs/stree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/stree.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
  	int iter = 0;
  #endif
  
@@ -43609,7 +40575,7 @@ index 313d39d..3a5811b 100644
  	BUG_ON(!th->t_trans_id);
  
  	init_tb_struct(th, &s_del_balance, sb, path,
-@@ -1333,6 +1335,8 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
+@@ -1333,6 +1335,8 @@ void reiserfs_delete_solid_item(struct r
  	int retval;
  	int quota_cut_bytes = 0;
  
@@ -43618,7 +40584,7 @@ index 313d39d..3a5811b 100644
  	BUG_ON(!th->t_trans_id);
  
  	le_key2cpu_key(&cpu_key, key);
-@@ -1562,6 +1566,8 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
+@@ -1562,6 +1566,8 @@ int reiserfs_cut_from_item(struct reiser
  	int quota_cut_bytes;
  	loff_t tail_pos = 0;
  
@@ -43627,7 +40593,7 @@ index 313d39d..3a5811b 100644
  	BUG_ON(!th->t_trans_id);
  
  	init_tb_struct(th, &s_cut_balance, inode->i_sb, path,
-@@ -1957,6 +1963,8 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
+@@ -1957,6 +1963,8 @@ int reiserfs_paste_into_item(struct reis
  	int retval;
  	int fs_gen;
  
@@ -43636,7 +40602,7 @@ index 313d39d..3a5811b 100644
  	BUG_ON(!th->t_trans_id);
  
  	fs_gen = get_generation(inode->i_sb);
-@@ -2045,6 +2053,8 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
+@@ -2045,6 +2053,8 @@ int reiserfs_insert_item(struct reiserfs
  	int fs_gen = 0;
  	int quota_bytes = 0;
  
@@ -43645,11 +40611,10 @@ index 313d39d..3a5811b 100644
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
-index 0aab04f..7aa917f 100644
---- a/fs/reiserfs/super.c
-+++ b/fs/reiserfs/super.c
-@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
+diff -urNp linux-3.0.3/fs/reiserfs/super.c linux-3.0.3/fs/reiserfs/super.c
+--- linux-3.0.3/fs/reiserfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/reiserfs/super.c	2011-08-23 21:48:14.000000000 -0400
+@@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
  		{.option_name = NULL}
  	};
  
@@ -43658,10 +40623,9 @@ index 0aab04f..7aa917f 100644
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff --git a/fs/select.c b/fs/select.c
-index e56560d..06082bb 100644
---- a/fs/select.c
-+++ b/fs/select.c
+diff -urNp linux-3.0.3/fs/select.c linux-3.0.3/fs/select.c
+--- linux-3.0.3/fs/select.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/select.c	2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -43670,7 +40634,7 @@ index e56560d..06082bb 100644
  #include <linux/personality.h> /* for STICKY_TIMEOUTS */
  #include <linux/file.h>
  #include <linux/fdtable.h>
-@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
+@@ -403,6 +404,8 @@ int do_select(int n, fd_set_bits *fds, s
  	int retval, i, timed_out = 0;
  	unsigned long slack = 0;
  
@@ -43679,7 +40643,7 @@ index e56560d..06082bb 100644
  	rcu_read_lock();
  	retval = max_select_fd(n, fds);
  	rcu_read_unlock();
-@@ -531,6 +534,8 @@ int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
+@@ -528,6 +531,8 @@ int core_sys_select(int n, fd_set __user
  	/* Allocate small arguments on the stack to save memory and be faster */
  	long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
  
@@ -43688,7 +40652,7 @@ index e56560d..06082bb 100644
  	ret = -EINVAL;
  	if (n < 0)
  		goto out_nofds;
-@@ -840,6 +845,9 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
+@@ -837,6 +842,9 @@ int do_sys_poll(struct pollfd __user *uf
   	struct poll_list *walk = head;
   	unsigned long todo = nfds;
  
@@ -43698,11 +40662,10 @@ index e56560d..06082bb 100644
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff --git a/fs/seq_file.c b/fs/seq_file.c
-index 05d6b0e..6537392 100644
---- a/fs/seq_file.c
-+++ b/fs/seq_file.c
-@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset)
+diff -urNp linux-3.0.3/fs/seq_file.c linux-3.0.3/fs/seq_file.c
+--- linux-3.0.3/fs/seq_file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/seq_file.c	2011-08-23 21:47:56.000000000 -0400
+@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
  		return 0;
  	}
  	if (!m->buf) {
@@ -43712,7 +40675,7 @@ index 05d6b0e..6537392 100644
  		if (!m->buf)
  			return -ENOMEM;
  	}
-@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, loff_t offset)
+@@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, 
  Eoverflow:
  	m->op->stop(m, p);
  	kfree(m->buf);
@@ -43722,7 +40685,7 @@ index 05d6b0e..6537392 100644
  	return !m->buf ? -ENOMEM : -EAGAIN;
  }
  
-@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+@@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char
  	m->version = file->f_version;
  	/* grab buffer if we didn't have one */
  	if (!m->buf) {
@@ -43732,7 +40695,7 @@ index 05d6b0e..6537392 100644
  		if (!m->buf)
  			goto Enomem;
  	}
-@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
+@@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char
  			goto Fill;
  		m->op->stop(m, p);
  		kfree(m->buf);
@@ -43742,11 +40705,19 @@ index 05d6b0e..6537392 100644
  		if (!m->buf)
  			goto Enomem;
  		m->count = 0;
-diff --git a/fs/splice.c b/fs/splice.c
-index 50a5d978..593d623 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -186,7 +186,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -549,7 +553,7 @@ static void single_stop(struct seq_file 
+ int single_open(struct file *file, int (*show)(struct seq_file *, void *),
+ 		void *data)
+ {
+-	struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
++	seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
+ 	int res = -ENOMEM;
+ 
+ 	if (op) {
+diff -urNp linux-3.0.3/fs/splice.c linux-3.0.3/fs/splice.c
+--- linux-3.0.3/fs/splice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/splice.c	2011-08-23 21:48:14.000000000 -0400
+@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
  	for (;;) {
@@ -43755,7 +40726,7 @@ index 50a5d978..593d623 100644
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -240,9 +240,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
+@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode
  			do_wakeup = 0;
  		}
  
@@ -43767,7 +40738,7 @@ index 50a5d978..593d623 100644
  	}
  
  	pipe_unlock(pipe);
-@@ -316,6 +316,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
+@@ -320,6 +320,8 @@ __generic_file_splice_read(struct file *
  		.spd_release = spd_release_page,
  	};
  
@@ -43776,7 +40747,7 @@ index 50a5d978..593d623 100644
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -556,7 +558,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
+@@ -560,7 +562,7 @@ static ssize_t kernel_readv(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -43785,7 +40756,7 @@ index 50a5d978..593d623 100644
  	set_fs(old_fs);
  
  	return res;
-@@ -571,7 +573,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
+@@ -575,7 +577,7 @@ static ssize_t kernel_write(struct file 
  	old_fs = get_fs();
  	set_fs(get_ds());
  	/* The cast to a user pointer is valid due to the set_fs() */
@@ -43794,7 +40765,7 @@ index 50a5d978..593d623 100644
  	set_fs(old_fs);
  
  	return res;
-@@ -599,6 +601,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
+@@ -603,6 +605,8 @@ ssize_t default_file_splice_read(struct 
  		.spd_release = spd_release_page,
  	};
  
@@ -43803,7 +40774,7 @@ index 50a5d978..593d623 100644
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -622,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
+@@ -626,7 +630,7 @@ ssize_t default_file_splice_read(struct 
  			goto err;
  
  		this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
@@ -43812,7 +40783,7 @@ index 50a5d978..593d623 100644
  		vec[i].iov_len = this_len;
  		spd.pages[i] = page;
  		spd.nr_pages++;
-@@ -842,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
+@@ -846,10 +850,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
  int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
  {
  	while (!pipe->nrbufs) {
@@ -43825,7 +40796,7 @@ index 50a5d978..593d623 100644
  			return 0;
  
  		if (sd->flags & SPLICE_F_NONBLOCK)
-@@ -1178,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
+@@ -1182,7 +1186,7 @@ ssize_t splice_direct_to_actor(struct fi
  		 * out of the pipe right after the splice_to_pipe(). So set
  		 * PIPE_READERS appropriately.
  		 */
@@ -43834,7 +40805,7 @@ index 50a5d978..593d623 100644
  
  		current->splice_pipe = pipe;
  	}
-@@ -1615,6 +1619,8 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
+@@ -1619,6 +1623,8 @@ static long vmsplice_to_pipe(struct file
  	};
  	long ret;
  
@@ -43843,7 +40814,7 @@ index 50a5d978..593d623 100644
  	pipe = get_pipe_info(file);
  	if (!pipe)
  		return -EBADF;
-@@ -1730,9 +1736,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1734,9 +1740,9 @@ static int ipipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -43855,7 +40826,7 @@ index 50a5d978..593d623 100644
  			if (flags & SPLICE_F_NONBLOCK) {
  				ret = -EAGAIN;
  				break;
-@@ -1764,7 +1770,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1768,7 +1774,7 @@ static int opipe_prep(struct pipe_inode_
  	pipe_lock(pipe);
  
  	while (pipe->nrbufs >= pipe->buffers) {
@@ -43864,7 +40835,7 @@ index 50a5d978..593d623 100644
  			send_sig(SIGPIPE, current, 0);
  			ret = -EPIPE;
  			break;
-@@ -1777,9 +1783,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
+@@ -1781,9 +1787,9 @@ static int opipe_prep(struct pipe_inode_
  			ret = -ERESTARTSYS;
  			break;
  		}
@@ -43876,7 +40847,7 @@ index 50a5d978..593d623 100644
  	}
  
  	pipe_unlock(pipe);
-@@ -1815,14 +1821,14 @@ retry:
+@@ -1819,14 +1825,14 @@ retry:
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -43893,7 +40864,7 @@ index 50a5d978..593d623 100644
  			break;
  
  		/*
-@@ -1922,7 +1928,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1923,7 +1929,7 @@ static int link_pipe(struct pipe_inode_i
  	pipe_double_lock(ipipe, opipe);
  
  	do {
@@ -43902,7 +40873,7 @@ index 50a5d978..593d623 100644
  			send_sig(SIGPIPE, current, 0);
  			if (!ret)
  				ret = -EPIPE;
-@@ -1967,7 +1973,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
+@@ -1968,7 +1974,7 @@ static int link_pipe(struct pipe_inode_i
  	 * return EAGAIN if we have the potential of some data in the
  	 * future, otherwise just return 0
  	 */
@@ -43911,11 +40882,10 @@ index 50a5d978..593d623 100644
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
-index da3fefe..0b429f2 100644
---- a/fs/sysfs/file.c
-+++ b/fs/sysfs/file.c
-@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
+diff -urNp linux-3.0.3/fs/sysfs/file.c linux-3.0.3/fs/sysfs/file.c
+--- linux-3.0.3/fs/sysfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/sysfs/file.c	2011-08-23 21:47:56.000000000 -0400
+@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
  	atomic_t		refcnt;
@@ -43924,7 +40894,7 @@ index da3fefe..0b429f2 100644
  	wait_queue_head_t	poll;
  	struct list_head	buffers; /* goes through sysfs_buffer.list */
  };
-@@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
+@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentr
  	if (!sysfs_get_active(attr_sd))
  		return -ENODEV;
  
@@ -43933,7 +40903,7 @@ index da3fefe..0b429f2 100644
  	count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
  
  	sysfs_put_active(attr_sd);
-@@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
+@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct 
  		return -ENOMEM;
  
  	atomic_set(&new_od->refcnt, 0);
@@ -43942,7 +40912,7 @@ index da3fefe..0b429f2 100644
  	init_waitqueue_head(&new_od->poll);
  	INIT_LIST_HEAD(&new_od->buffers);
  	goto retry;
-@@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
+@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct fi
  
  	sysfs_put_active(attr_sd);
  
@@ -43951,7 +40921,7 @@ index da3fefe..0b429f2 100644
  		goto trigger;
  
  	return DEFAULT_POLLMASK;
-@@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
+@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_di
  
  	od = sd->s_attr.open;
  	if (od) {
@@ -43960,10 +40930,9 @@ index da3fefe..0b429f2 100644
  		wake_up_interruptible(&od->poll);
  	}
  
-diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
-index 2668957..444dde5 100644
---- a/fs/sysfs/mount.c
-+++ b/fs/sysfs/mount.c
+diff -urNp linux-3.0.3/fs/sysfs/mount.c linux-3.0.3/fs/sysfs/mount.c
+--- linux-3.0.3/fs/sysfs/mount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/sysfs/mount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
  	.s_name		= "",
  	.s_count	= ATOMIC_INIT(1),
@@ -43976,11 +40945,10 @@ index 2668957..444dde5 100644
  	.s_ino		= 1,
  };
  
-diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
-index a7ac78f..02158e1 100644
---- a/fs/sysfs/symlink.c
-+++ b/fs/sysfs/symlink.c
-@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
+diff -urNp linux-3.0.3/fs/sysfs/symlink.c linux-3.0.3/fs/sysfs/symlink.c
+--- linux-3.0.3/fs/sysfs/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/sysfs/symlink.c	2011-08-23 21:47:56.000000000 -0400
+@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
  {
@@ -43989,11 +40957,10 @@ index a7ac78f..02158e1 100644
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff --git a/fs/udf/inode.c b/fs/udf/inode.c
-index c6a2e78..6d0bca2 100644
---- a/fs/udf/inode.c
-+++ b/fs/udf/inode.c
-@@ -477,6 +477,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
+diff -urNp linux-3.0.3/fs/udf/inode.c linux-3.0.3/fs/udf/inode.c
+--- linux-3.0.3/fs/udf/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/udf/inode.c	2011-08-23 21:48:14.000000000 -0400
+@@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
  	int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
  	int lastblock = 0;
  
@@ -44002,11 +40969,10 @@ index c6a2e78..6d0bca2 100644
  	prev_epos.offset = udf_file_entry_alloc_offset(inode);
  	prev_epos.block = iinfo->i_location;
  	prev_epos.bh = NULL;
-diff --git a/fs/udf/misc.c b/fs/udf/misc.c
-index 9215700..bf1f68e 100644
---- a/fs/udf/misc.c
-+++ b/fs/udf/misc.c
-@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
+diff -urNp linux-3.0.3/fs/udf/misc.c linux-3.0.3/fs/udf/misc.c
+--- linux-3.0.3/fs/udf/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/udf/misc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
  {
@@ -44015,10 +40981,9 @@ index 9215700..bf1f68e 100644
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff --git a/fs/utimes.c b/fs/utimes.c
-index 179b586..e334adb 100644
---- a/fs/utimes.c
-+++ b/fs/utimes.c
+diff -urNp linux-3.0.3/fs/utimes.c linux-3.0.3/fs/utimes.c
+--- linux-3.0.3/fs/utimes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/utimes.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -44027,7 +40992,7 @@ index 179b586..e334adb 100644
  #include <linux/linkage.h>
  #include <linux/mount.h>
  #include <linux/namei.h>
-@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
+@@ -101,6 +102,12 @@ static int utimes_common(struct path *pa
  				goto mnt_drop_write_and_out;
  		}
  	}
@@ -44040,11 +41005,24 @@ index 179b586..e334adb 100644
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff --git a/fs/xattr.c b/fs/xattr.c
-index 01bb813..c946fcd 100644
---- a/fs/xattr.c
-+++ b/fs/xattr.c
-@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
+diff -urNp linux-3.0.3/fs/xattr_acl.c linux-3.0.3/fs/xattr_acl.c
+--- linux-3.0.3/fs/xattr_acl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xattr_acl.c	2011-08-23 21:47:56.000000000 -0400
+@@ -17,8 +17,8 @@
+ struct posix_acl *
+ posix_acl_from_xattr(const void *value, size_t size)
+ {
+-	posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
+-	posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
++	const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
++	const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
+ 	int count;
+ 	struct posix_acl *acl;
+ 	struct posix_acl_entry *acl_e;
+diff -urNp linux-3.0.3/fs/xattr.c linux-3.0.3/fs/xattr.c
+--- linux-3.0.3/fs/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xattr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
  static long
@@ -44053,7 +41031,7 @@ index 01bb813..c946fcd 100644
  	 size_t size, int flags)
  {
  	int error;
-@@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
+@@ -278,7 +278,13 @@ setxattr(struct dentry *d, const char __
  			return PTR_ERR(kvalue);
  	}
  
@@ -44068,7 +41046,7 @@ index 01bb813..c946fcd 100644
  	kfree(kvalue);
  	return error;
  }
-@@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
+@@ -295,7 +301,7 @@ SYSCALL_DEFINE5(setxattr, const char __u
  		return error;
  	error = mnt_want_write(path.mnt);
  	if (!error) {
@@ -44077,7 +41055,7 @@ index 01bb813..c946fcd 100644
  		mnt_drop_write(path.mnt);
  	}
  	path_put(&path);
-@@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
+@@ -314,7 +320,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __
  		return error;
  	error = mnt_want_write(path.mnt);
  	if (!error) {
@@ -44086,7 +41064,7 @@ index 01bb813..c946fcd 100644
  		mnt_drop_write(path.mnt);
  	}
  	path_put(&path);
-@@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
+@@ -325,17 +331,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, cons
  		const void __user *,value, size_t, size, int, flags)
  {
  	struct file *f;
@@ -44106,25 +41084,20 @@ index 01bb813..c946fcd 100644
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
-index 8d5a506..7f62712 100644
---- a/fs/xattr_acl.c
-+++ b/fs/xattr_acl.c
-@@ -17,8 +17,8 @@
- struct posix_acl *
- posix_acl_from_xattr(const void *value, size_t size)
- {
--	posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
--	posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
-+	const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
-+	const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
- 	int count;
- 	struct posix_acl *acl;
- 	struct posix_acl_entry *acl_e;
-diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
-index 0ca0e3c..4a0a499 100644
---- a/fs/xfs/linux-2.6/xfs_ioctl.c
-+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
+diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-08-23 21:48:14.000000000 -0400
+@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
+ 	xfs_fsop_geom_t		  fsgeo;
+ 	int			  error;
+ 
++	memset(&fsgeo, 0, sizeof(fsgeo));
+ 	error = xfs_fs_geometry(mp, &fsgeo, 3);
+ 	if (error)
+ 		return -error;
+diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
  	}
  
@@ -44134,23 +41107,10 @@ index 0ca0e3c..4a0a499 100644
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
-diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
-index b3486df..f25d38e 100644
---- a/fs/xfs/linux-2.6/xfs_ioctl32.c
-+++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
-@@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
- 	xfs_fsop_geom_t		  fsgeo;
- 	int			  error;
- 
-+	memset(&fsgeo, 0, sizeof(fsgeo));
- 	error = xfs_fs_geometry(mp, &fsgeo, 3);
- 	if (error)
- 		return -error;
-diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
-index bd57278..403133d 100644
---- a/fs/xfs/linux-2.6/xfs_iops.c
-+++ b/fs/xfs/linux-2.6/xfs_iops.c
-@@ -436,7 +436,7 @@ xfs_vn_put_link(
+diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c	2011-08-23 21:47:56.000000000 -0400
+@@ -437,7 +437,7 @@ xfs_vn_put_link(
  	struct nameidata *nd,
  	void		*p)
  {
@@ -44159,11 +41119,10 @@ index bd57278..403133d 100644
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
-index dc3afd7..adf4edb 100644
---- a/fs/xfs/xfs_bmap.c
-+++ b/fs/xfs/xfs_bmap.c
-@@ -287,7 +287,7 @@ xfs_bmap_validate_ret(
+diff -urNp linux-3.0.3/fs/xfs/xfs_bmap.c linux-3.0.3/fs/xfs/xfs_bmap.c
+--- linux-3.0.3/fs/xfs/xfs_bmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xfs/xfs_bmap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
  	int			nmap,
  	int			ret_nmap);
  #else
@@ -44172,10 +41131,9 @@ index dc3afd7..adf4edb 100644
  #endif /* DEBUG */
  
  STATIC int
-diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
-index b1bae6b..5aa3993 100644
---- a/fs/xfs/xfs_dir2_sf.c
-+++ b/fs/xfs/xfs_dir2_sf.c
+diff -urNp linux-3.0.3/fs/xfs/xfs_dir2_sf.c linux-3.0.3/fs/xfs/xfs_dir2_sf.c
+--- linux-3.0.3/fs/xfs/xfs_dir2_sf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/fs/xfs/xfs_dir2_sf.c	2011-08-23 21:47:56.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -44193,1098 +41151,119 @@ index b1bae6b..5aa3993 100644
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
-new file mode 100644
-index 0000000..88cef24
---- /dev/null
-+++ b/grsecurity/Kconfig
-@@ -0,0 +1,1045 @@
-+#
-+# grecurity configuration
-+#
-+
-+menu "Grsecurity"
-+
-+config GRKERNSEC
-+	bool "Grsecurity"
-+	select CRYPTO
-+	select CRYPTO_SHA256
-+	help
-+	  If you say Y here, you will be able to configure many features
-+	  that will enhance the security of your system.  It is highly
-+	  recommended that you say Y here and read through the help
-+	  for each option so that you fully understand the features and
-+	  can evaluate their usefulness for your machine.
-+
-+choice
-+	prompt "Security Level"
-+	depends on GRKERNSEC
-+	default GRKERNSEC_CUSTOM
-+
-+config GRKERNSEC_LOW
-+	bool "Low"
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_CHDIR
-+
-+	help
-+	  If you choose this option, several of the grsecurity options will
-+	  be enabled that will give you greater protection against a number
-+	  of attacks, while assuring that none of your software will have any
-+	  conflicts with the additional security measures.  If you run a lot
-+	  of unusual software, or you are having problems with the higher
-+	  security levels, you should say Y here.  With this option, the
-+	  following features are enabled:
-+
-+	  - Linking restrictions
-+	  - FIFO restrictions
-+	  - Enforcing RLIMIT_NPROC on execve
-+	  - Restricted dmesg
-+	  - Enforced chdir("/") on chroot
-+	  - Runtime module disabling
-+
-+config GRKERNSEC_MEDIUM
-+	bool "Medium"
-+	select PAX
-+	select PAX_EI_PAX
-+	select PAX_PT_PAX_FLAGS
-+	select PAX_HAVE_ACL_FLAGS
-+	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_SYSCTL
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_FORKFAIL
-+	select GRKERNSEC_TIME
-+	select GRKERNSEC_SIGNAL
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_UNIX
-+	select GRKERNSEC_CHROOT_MOUNT
-+	select GRKERNSEC_CHROOT_PIVOT
-+	select GRKERNSEC_CHROOT_DOUBLE
-+	select GRKERNSEC_CHROOT_CHDIR
-+	select GRKERNSEC_CHROOT_MKNOD
-+	select GRKERNSEC_PROC
-+	select GRKERNSEC_PROC_USERGROUP
-+	select PAX_RANDUSTACK
-+	select PAX_ASLR
-+	select PAX_RANDMMAP
-+	select PAX_REFCOUNT if (X86 || SPARC64)
-+	select PAX_USERCOPY if ((X86 || SPARC32 || SPARC64 || PPC) && (SLAB || SLUB || SLOB))
-+
-+	help
-+	  If you say Y here, several features in addition to those included
-+	  in the low additional security level will be enabled.  These
-+	  features provide even more security to your system, though in rare
-+	  cases they may be incompatible with very old or poorly written
-+	  software.  If you enable this option, make sure that your auth
-+	  service (identd) is running as gid 1001.  With this option, 
-+	  the following features (in addition to those provided in the 
-+	  low additional security level) will be enabled:
-+
-+	  - Failed fork logging
-+	  - Time change logging
-+	  - Signal logging
-+	  - Deny mounts in chroot
-+	  - Deny double chrooting
-+	  - Deny sysctl writes in chroot
-+	  - Deny mknod in chroot
-+	  - Deny access to abstract AF_UNIX sockets out of chroot
-+	  - Deny pivot_root in chroot
-+	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
-+	  - /proc restrictions with special GID set to 10 (usually wheel)
-+	  - Address Space Layout Randomization (ASLR)
-+	  - Prevent exploitation of most refcount overflows
-+	  - Bounds checking of copying between the kernel and userland
-+
-+config GRKERNSEC_HIGH
-+	bool "High"
-+	select GRKERNSEC_LINK
-+	select GRKERNSEC_FIFO
-+	select GRKERNSEC_EXECVE
-+	select GRKERNSEC_DMESG
-+	select GRKERNSEC_FORKFAIL
-+	select GRKERNSEC_TIME
-+	select GRKERNSEC_SIGNAL
-+	select GRKERNSEC_CHROOT
-+	select GRKERNSEC_CHROOT_SHMAT
-+	select GRKERNSEC_CHROOT_UNIX
-+	select GRKERNSEC_CHROOT_MOUNT
-+	select GRKERNSEC_CHROOT_FCHDIR
-+	select GRKERNSEC_CHROOT_PIVOT
-+	select GRKERNSEC_CHROOT_DOUBLE
-+	select GRKERNSEC_CHROOT_CHDIR
-+	select GRKERNSEC_CHROOT_MKNOD
-+	select GRKERNSEC_CHROOT_CAPS
-+	select GRKERNSEC_CHROOT_SYSCTL
-+	select GRKERNSEC_CHROOT_FINDTASK
-+	select GRKERNSEC_SYSFS_RESTRICT
-+	select GRKERNSEC_PROC
-+	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
-+	select GRKERNSEC_HIDESYM
-+	select GRKERNSEC_BRUTE
-+	select GRKERNSEC_PROC_USERGROUP
-+	select GRKERNSEC_KMEM
-+	select GRKERNSEC_RESLOG
-+	select GRKERNSEC_RANDNET
-+	select GRKERNSEC_PROC_ADD
-+	select GRKERNSEC_CHROOT_CHMOD
-+	select GRKERNSEC_CHROOT_NICE
-+	select GRKERNSEC_AUDIT_MOUNT
-+	select GRKERNSEC_MODHARDEN if (MODULES)
-+	select GRKERNSEC_HARDEN_PTRACE
-+	select GRKERNSEC_VM86 if (X86_32)
-+	select GRKERNSEC_KERN_LOCKOUT if (X86)
-+	select PAX
-+	select PAX_RANDUSTACK
-+	select PAX_ASLR
-+	select PAX_RANDMMAP
-+	select PAX_NOEXEC
-+	select PAX_MPROTECT
-+	select PAX_EI_PAX
-+	select PAX_PT_PAX_FLAGS
-+	select PAX_HAVE_ACL_FLAGS
-+	select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
-+	select PAX_MEMORY_UDEREF if (X86 && !XEN)
-+	select PAX_RANDKSTACK if (X86_TSC && X86)
-+	select PAX_SEGMEXEC if (X86_32)
-+	select PAX_PAGEEXEC
-+	select PAX_EMUPLT if (ALPHA || PARISC || SPARC32 || SPARC64)
-+	select PAX_EMUTRAMP if (PARISC)
-+	select PAX_EMUSIGRT if (PARISC)
-+	select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
-+	select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
-+	select PAX_REFCOUNT if (X86 || SPARC64)
-+	select PAX_USERCOPY if ((X86 || PPC || SPARC32 || SPARC64) && (SLAB || SLUB || SLOB))
-+	help
-+	  If you say Y here, many of the features of grsecurity will be
-+	  enabled, which will protect you against many kinds of attacks
-+	  against your system.  The heightened security comes at a cost
-+	  of an increased chance of incompatibilities with rare software
-+	  on your machine.  Since this security level enables PaX, you should
-+	  view <http://pax.grsecurity.net> and read about the PaX
-+	  project.  While you are there, download chpax and run it on
-+	  binaries that cause problems with PaX.  Also remember that
-+	  since the /proc restrictions are enabled, you must run your
-+	  identd as gid 1001.  This security level enables the following 
-+	  features in addition to those listed in the low and medium 
-+	  security levels:
-+
-+	  - Additional /proc restrictions
-+	  - Chmod restrictions in chroot
-+	  - No signals, ptrace, or viewing of processes outside of chroot
-+	  - Capability restrictions in chroot
-+	  - Deny fchdir out of chroot
-+	  - Priority restrictions in chroot
-+	  - Segmentation-based implementation of PaX
-+	  - Mprotect restrictions
-+	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
-+	  - Kernel stack randomization
-+	  - Mount/unmount/remount logging
-+	  - Kernel symbol hiding
-+	  - Prevention of memory exhaustion-based exploits
-+	  - Hardening of module auto-loading
-+	  - Ptrace restrictions
-+	  - Restricted vm86 mode
-+	  - Restricted sysfs/debugfs
-+	  - Active kernel exploit response
-+
-+config GRKERNSEC_CUSTOM
-+	bool "Custom"
-+	help
-+	  If you say Y here, you will be able to configure every grsecurity
-+	  option, which allows you to enable many more features that aren't
-+	  covered in the basic security levels.  These additional features
-+	  include TPE, socket restrictions, and the sysctl system for
-+	  grsecurity.  It is advised that you read through the help for
-+	  each option to determine its usefulness in your situation.
-+
-+endchoice
-+
-+menu "Address Space Protection"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_KMEM
-+	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
-+	select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
-+	help
-+	  If you say Y here, /dev/kmem and /dev/mem won't be allowed to
-+	  be written to via mmap or otherwise to modify the running kernel.
-+	  /dev/port will also not be allowed to be opened. If you have module
-+	  support disabled, enabling this will close up four ways that are
-+	  currently used  to insert malicious code into the running kernel.
-+	  Even with all these features enabled, we still highly recommend that
-+	  you use the RBAC system, as it is still possible for an attacker to
-+	  modify the running kernel through privileged I/O granted by ioperm/iopl.
-+	  If you are not using XFree86, you may be able to stop this additional
-+	  case by enabling the 'Disable privileged I/O' option. Though nothing
-+	  legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
-+	  but only to video memory, which is the only writing we allow in this
-+	  case.  If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
-+	  not be allowed to mprotect it with PROT_WRITE later.
-+	  It is highly recommended that you say Y here if you meet all the
-+	  conditions above.
-+
-+config GRKERNSEC_VM86
-+	bool "Restrict VM86 mode"
-+	depends on X86_32
-+
-+	help
-+	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
-+	  make use of a special execution mode on 32bit x86 processors called
-+	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
-+	  video cards and will still work with this option enabled.  The purpose
-+	  of the option is to prevent exploitation of emulation errors in
-+	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
-+	  Nearly all users should be able to enable this option.
-+
-+config GRKERNSEC_IO
-+	bool "Disable privileged I/O"
-+	depends on X86
-+	select RTC_CLASS
-+	select RTC_INTF_DEV
-+	select RTC_DRV_CMOS
-+
-+	help
-+	  If you say Y here, all ioperm and iopl calls will return an error.
-+	  Ioperm and iopl can be used to modify the running kernel.
-+	  Unfortunately, some programs need this access to operate properly,
-+	  the most notable of which are XFree86 and hwclock.  hwclock can be
-+	  remedied by having RTC support in the kernel, so real-time 
-+	  clock support is enabled if this option is enabled, to ensure 
-+	  that hwclock operates correctly.  XFree86 still will not 
-+	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
-+	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
-+	  protect your kernel against modification, use the RBAC system.
-+
-+config GRKERNSEC_PROC_MEMMAP
-+	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
-+	default y if (PAX_NOEXEC || PAX_ASLR)
-+	depends on PAX_NOEXEC || PAX_ASLR
-+	help
-+	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
-+	  give no information about the addresses of its mappings if
-+	  PaX features that rely on random addresses are enabled on the task.
-+	  If you use PaX it is greatly recommended that you say Y here as it
-+	  closes up a hole that makes the full ASLR useless for suid
-+	  binaries.
-+
-+config GRKERNSEC_BRUTE
-+	bool "Deter exploit bruteforcing"
-+	help
-+	  If you say Y here, attempts to bruteforce exploits against forking
-+	  daemons such as apache or sshd, as well as against suid/sgid binaries
-+	  will be deterred.  When a child of a forking daemon is killed by PaX
-+	  or crashes due to an illegal instruction or other suspicious signal,
-+	  the parent process will be delayed 30 seconds upon every subsequent
-+	  fork until the administrator is able to assess the situation and
-+	  restart the daemon.
-+	  In the suid/sgid case, the attempt is logged, the user has all their
-+	  processes terminated, and they are prevented from executing any further
-+	  processes for 15 minutes.
-+	  It is recommended that you also enable signal logging in the auditing
-+	  section so that logs are generated when a process triggers a suspicious
-+	  signal.
-+
-+config GRKERNSEC_MODHARDEN
-+	bool "Harden module auto-loading"
-+	depends on MODULES
-+	help
-+	  If you say Y here, module auto-loading in response to use of some
-+	  feature implemented by an unloaded module will be restricted to
-+	  root users.  Enabling this option helps defend against attacks 
-+	  by unprivileged users who abuse the auto-loading behavior to 
-+	  cause a vulnerable module to load that is then exploited.
-+
-+	  If this option prevents a legitimate use of auto-loading for a 
-+	  non-root user, the administrator can execute modprobe manually 
-+	  with the exact name of the module mentioned in the alert log.
-+	  Alternatively, the administrator can add the module to the list
-+	  of modules loaded at boot by modifying init scripts.
-+
-+	  Modification of init scripts will most likely be needed on 
-+	  Ubuntu servers with encrypted home directory support enabled,
-+	  as the first non-root user logging in will cause the ecb(aes),
-+	  ecb(aes)-all, cbc(aes), and cbc(aes)-all  modules to be loaded.
-+
-+config GRKERNSEC_HIDESYM
-+	bool "Hide kernel symbols"
-+	help
-+	  If you say Y here, getting information on loaded modules, and
-+	  displaying all kernel symbols through a syscall will be restricted
-+	  to users with CAP_SYS_MODULE.  For software compatibility reasons,
-+	  /proc/kallsyms will be restricted to the root user.  The RBAC
-+	  system can hide that entry even from root.
-+
-+	  This option also prevents leaking of kernel addresses through
-+	  several /proc entries.
-+
-+	  Note that this option is only effective provided the following
-+	  conditions are met:
-+	  1) The kernel using grsecurity is not precompiled by some distribution
-+	  2) You have also enabled GRKERNSEC_DMESG
-+	  3) You are using the RBAC system and hiding other files such as your
-+	     kernel image and System.map.  Alternatively, enabling this option
-+	     causes the permissions on /boot, /lib/modules, and the kernel
-+	     source directory to change at compile time to prevent 
-+	     reading by non-root users.
-+	  If the above conditions are met, this option will aid in providing a
-+	  useful protection against local kernel exploitation of overflows
-+	  and arbitrary read/write vulnerabilities.
-+
-+config GRKERNSEC_KERN_LOCKOUT
-+	bool "Active kernel exploit response"
-+	depends on X86
-+	help
-+	  If you say Y here, when a PaX alert is triggered due to suspicious
-+	  activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
-+	  or an OOPs occurs due to bad memory accesses, instead of just
-+	  terminating the offending process (and potentially allowing
-+	  a subsequent exploit from the same user), we will take one of two
-+	  actions:
-+	   If the user was root, we will panic the system
-+	   If the user was non-root, we will log the attempt, terminate
-+	   all processes owned by the user, then prevent them from creating
-+	   any new processes until the system is restarted
-+	  This deters repeated kernel exploitation/bruteforcing attempts
-+	  and is useful for later forensics.
-+
-+endmenu
-+menu "Role Based Access Control Options"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_RBAC_DEBUG
-+	bool
-+
-+config GRKERNSEC_NO_RBAC
-+	bool "Disable RBAC system"
-+	help
-+	  If you say Y here, the /dev/grsec device will be removed from the kernel,
-+	  preventing the RBAC system from being enabled.  You should only say Y
-+	  here if you have no intention of using the RBAC system, so as to prevent
-+	  an attacker with root access from misusing the RBAC system to hide files
-+	  and processes when loadable module support and /dev/[k]mem have been
-+	  locked down.
-+
-+config GRKERNSEC_ACL_HIDEKERN
-+	bool "Hide kernel processes"
-+	help
-+	  If you say Y here, all kernel threads will be hidden to all
-+	  processes but those whose subject has the "view hidden processes"
-+	  flag.
-+
-+config GRKERNSEC_ACL_MAXTRIES
-+	int "Maximum tries before password lockout"
-+	default 3
-+	help
-+	  This option enforces the maximum number of times a user can attempt
-+	  to authorize themselves with the grsecurity RBAC system before being
-+	  denied the ability to attempt authorization again for a specified time.
-+	  The lower the number, the harder it will be to brute-force a password.
-+
-+config GRKERNSEC_ACL_TIMEOUT
-+	int "Time to wait after max password tries, in seconds"
-+	default 30
-+	help
-+	  This option specifies the time the user must wait after attempting to
-+	  authorize to the RBAC system with the maximum number of invalid
-+	  passwords.  The higher the number, the harder it will be to brute-force
-+	  a password.
-+
-+endmenu
-+menu "Filesystem Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_PROC
-+	bool "Proc restrictions"
-+	help
-+	  If you say Y here, the permissions of the /proc filesystem
-+	  will be altered to enhance system security and privacy.  You MUST
-+  	  choose either a user only restriction or a user and group restriction.
-+	  Depending upon the option you choose, you can either restrict users to
-+	  see only the processes they themselves run, or choose a group that can
-+	  view all processes and files normally restricted to root if you choose
-+	  the "restrict to user only" option.  NOTE: If you're running identd as
-+	  a non-root user, you will have to run it as the group you specify here.
-+
-+config GRKERNSEC_PROC_USER
-+	bool "Restrict /proc to user only"
-+	depends on GRKERNSEC_PROC
-+	help
-+	  If you say Y here, non-root users will only be able to view their own
-+	  processes, and restricts them from viewing network-related information,
-+	  and viewing kernel symbol and module information.
-+
-+config GRKERNSEC_PROC_USERGROUP
-+	bool "Allow special group"
-+	depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
-+	help
-+	  If you say Y here, you will be able to select a group that will be
-+          able to view all processes and network-related information.  If you've
-+          enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
-+          remain hidden.  This option is useful if you want to run identd as
-+          a non-root user.
-+
-+config GRKERNSEC_PROC_GID
-+	int "GID for special group"
-+	depends on GRKERNSEC_PROC_USERGROUP
-+	default 1001
-+
-+config GRKERNSEC_PROC_ADD
-+	bool "Additional restrictions"
-+	depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
-+	help
-+	  If you say Y here, additional restrictions will be placed on
-+	  /proc that keep normal users from viewing device information and 
-+	  slabinfo information that could be useful for exploits.
-+
-+config GRKERNSEC_LINK
-+	bool "Linking restrictions"
-+	help
-+	  If you say Y here, /tmp race exploits will be prevented, since users
-+	  will no longer be able to follow symlinks owned by other users in
-+	  world-writable +t directories (e.g. /tmp), unless the owner of the
-+	  symlink is the owner of the directory. users will also not be
-+	  able to hardlink to files they do not own.  If the sysctl option is
-+	  enabled, a sysctl option with name "linking_restrictions" is created.
-+
-+config GRKERNSEC_FIFO
-+	bool "FIFO restrictions"
-+	help
-+	  If you say Y here, users will not be able to write to FIFOs they don't
-+	  own in world-writable +t directories (e.g. /tmp), unless the owner of
-+	  the FIFO is the same owner of the directory it's held in.  If the sysctl
-+	  option is enabled, a sysctl option with name "fifo_restrictions" is
-+	  created.
-+
-+config GRKERNSEC_SYSFS_RESTRICT
-+	bool "Sysfs/debugfs restriction"
-+	depends on SYSFS
-+	help
-+	  If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
-+	  any filesystem normally mounted under it (e.g. debugfs) will only
-+	  be accessible by root.  These filesystems generally provide access
-+	  to hardware and debug information that isn't appropriate for unprivileged
-+	  users of the system.  Sysfs and debugfs have also become a large source
-+	  of new vulnerabilities, ranging from infoleaks to local compromise.
-+	  There has been very little oversight with an eye toward security involved
-+	  in adding new exporters of information to these filesystems, so their
-+	  use is discouraged.
-+	  This option is equivalent to a chmod 0700 of the mount paths.
-+
-+config GRKERNSEC_ROFS
-+	bool "Runtime read-only mount protection"
-+	help
-+	  If you say Y here, a sysctl option with name "romount_protect" will
-+	  be created.  By setting this option to 1 at runtime, filesystems
-+	  will be protected in the following ways:
-+	  * No new writable mounts will be allowed
-+	  * Existing read-only mounts won't be able to be remounted read/write
-+	  * Write operations will be denied on all block devices
-+	  This option acts independently of grsec_lock: once it is set to 1,
-+	  it cannot be turned off.  Therefore, please be mindful of the resulting
-+	  behavior if this option is enabled in an init script on a read-only
-+	  filesystem.  This feature is mainly intended for secure embedded systems.
-+
-+config GRKERNSEC_CHROOT
-+	bool "Chroot jail restrictions"
-+	help
-+	  If you say Y here, you will be able to choose several options that will
-+	  make breaking out of a chrooted jail much more difficult.  If you
-+	  encounter no software incompatibilities with the following options, it
-+	  is recommended that you enable each one.
-+
-+config GRKERNSEC_CHROOT_MOUNT
-+	bool "Deny mounts"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  mount or remount filesystems.  If the sysctl option is enabled, a
-+	  sysctl option with name "chroot_deny_mount" is created.
-+
-+config GRKERNSEC_CHROOT_DOUBLE
-+	bool "Deny double-chroots"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to chroot
-+	  again outside the chroot.  This is a widely used method of breaking
-+	  out of a chroot jail and should not be allowed.  If the sysctl 
-+	  option is enabled, a sysctl option with name 
-+	  "chroot_deny_chroot" is created.
-+
-+config GRKERNSEC_CHROOT_PIVOT
-+	bool "Deny pivot_root in chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to use
-+	  a function called pivot_root() that was introduced in Linux 2.3.41.  It
-+	  works similar to chroot in that it changes the root filesystem.  This
-+	  function could be misused in a chrooted process to attempt to break out
-+	  of the chroot, and therefore should not be allowed.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_deny_pivot" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_CHDIR
-+	bool "Enforce chdir(\"/\") on all chroots"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, the current working directory of all newly-chrooted
-+	  applications will be set to the the root directory of the chroot.
-+	  The man page on chroot(2) states:
-+	  Note that this call does not change  the  current  working
-+	  directory,  so  that `.' can be outside the tree rooted at
-+	  `/'.  In particular, the  super-user  can  escape  from  a
-+	  `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
-+
-+	  It is recommended that you say Y here, since it's not known to break
-+	  any software.  If the sysctl option is enabled, a sysctl option with
-+	  name "chroot_enforce_chdir" is created.
-+
-+config GRKERNSEC_CHROOT_CHMOD
-+	bool "Deny (f)chmod +s"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to chmod
-+	  or fchmod files to make them have suid or sgid bits.  This protects
-+	  against another published method of breaking a chroot.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_deny_chmod" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_FCHDIR
-+	bool "Deny fchdir out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, a well-known method of breaking chroots by fchdir'ing
-+	  to a file descriptor of the chrooting process that points to a directory
-+	  outside the filesystem will be stopped.  If the sysctl option
-+	  is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
-+
-+config GRKERNSEC_CHROOT_MKNOD
-+	bool "Deny mknod"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be allowed to
-+	  mknod.  The problem with using mknod inside a chroot is that it
-+	  would allow an attacker to create a device entry that is the same
-+	  as one on the physical root of your system, which could range from
-+	  anything from the console device to a device for your harddrive (which
-+	  they could then use to wipe the drive or steal data).  It is recommended
-+	  that you say Y here, unless you run into software incompatibilities.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "chroot_deny_mknod" is created.
-+
-+config GRKERNSEC_CHROOT_SHMAT
-+	bool "Deny shmat() out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to attach
-+	  to shared memory segments that were created outside of the chroot jail.
-+	  It is recommended that you say Y here.  If the sysctl option is enabled,
-+	  a sysctl option with name "chroot_deny_shmat" is created.
-+
-+config GRKERNSEC_CHROOT_UNIX
-+	bool "Deny access to abstract AF_UNIX sockets out of chroot"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  connect to abstract (meaning not belonging to a filesystem) Unix
-+	  domain sockets that were bound outside of a chroot.  It is recommended
-+	  that you say Y here.  If the sysctl option is enabled, a sysctl option
-+	  with name "chroot_deny_unix" is created.
-+
-+config GRKERNSEC_CHROOT_FINDTASK
-+	bool "Protect outside processes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to
-+	  kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, 
-+	  getsid, or view any process outside of the chroot.  If the sysctl
-+	  option is enabled, a sysctl option with name "chroot_findtask" is
-+	  created.
-+
-+config GRKERNSEC_CHROOT_NICE
-+	bool "Restrict priority changes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, processes inside a chroot will not be able to raise
-+	  the priority of processes in the chroot, or alter the priority of
-+	  processes outside the chroot.  This provides more security than simply
-+	  removing CAP_SYS_NICE from the process' capability set.  If the
-+	  sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
-+	  is created.
-+
-+config GRKERNSEC_CHROOT_SYSCTL
-+	bool "Deny sysctl writes"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, an attacker in a chroot will not be able to
-+	  write to sysctl entries, either by sysctl(2) or through a /proc
-+	  interface.  It is strongly recommended that you say Y here. If the
-+	  sysctl option is enabled, a sysctl option with name
-+	  "chroot_deny_sysctl" is created.
-+
-+config GRKERNSEC_CHROOT_CAPS
-+	bool "Capability restrictions"
-+	depends on GRKERNSEC_CHROOT
-+	help
-+	  If you say Y here, the capabilities on all root processes within a
-+	  chroot jail will be lowered to stop module insertion, raw i/o,
-+	  system and net admin tasks, rebooting the system, modifying immutable
-+	  files, modifying IPC owned by another, and changing the system time.
-+	  This is left an option because it can break some apps.  Disable this
-+	  if your chrooted apps are having problems performing those kinds of
-+	  tasks.  If the sysctl option is enabled, a sysctl option with
-+	  name "chroot_caps" is created.
-+
-+endmenu
-+menu "Kernel Auditing"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_AUDIT_GROUP
-+	bool "Single group for auditing"
-+	help
-+	  If you say Y here, the exec, chdir, and (un)mount logging features
-+	  will only operate on a group you specify.  This option is recommended
-+	  if you only want to watch certain users instead of having a large
-+	  amount of logs from the entire system.  If the sysctl option is enabled,
-+	  a sysctl option with name "audit_group" is created.
-+
-+config GRKERNSEC_AUDIT_GID
-+	int "GID for auditing"
-+	depends on GRKERNSEC_AUDIT_GROUP
-+	default 1007
-+
-+config GRKERNSEC_EXECLOG
-+	bool "Exec logging"
-+	help
-+	  If you say Y here, all execve() calls will be logged (since the
-+	  other exec*() calls are frontends to execve(), all execution
-+	  will be logged).  Useful for shell-servers that like to keep track
-+	  of their users.  If the sysctl option is enabled, a sysctl option with
-+	  name "exec_logging" is created.
-+	  WARNING: This option when enabled will produce a LOT of logs, especially
-+	  on an active system.
-+
-+config GRKERNSEC_RESLOG
-+	bool "Resource logging"
-+	help
-+	  If you say Y here, all attempts to overstep resource limits will
-+	  be logged with the resource name, the requested size, and the current
-+	  limit.  It is highly recommended that you say Y here.  If the sysctl
-+	  option is enabled, a sysctl option with name "resource_logging" is
-+	  created.  If the RBAC system is enabled, the sysctl value is ignored.
-+
-+config GRKERNSEC_CHROOT_EXECLOG
-+	bool "Log execs within chroot"
-+	help
-+	  If you say Y here, all executions inside a chroot jail will be logged
-+	  to syslog.  This can cause a large amount of logs if certain
-+	  applications (eg. djb's daemontools) are installed on the system, and
-+	  is therefore left as an option.  If the sysctl option is enabled, a
-+	  sysctl option with name "chroot_execlog" is created.
-+
-+config GRKERNSEC_AUDIT_PTRACE
-+	bool "Ptrace logging"
-+	help
-+	  If you say Y here, all attempts to attach to a process via ptrace
-+	  will be logged.  If the sysctl option is enabled, a sysctl option
-+	  with name "audit_ptrace" is created.
-+
-+config GRKERNSEC_AUDIT_CHDIR
-+	bool "Chdir logging"
-+	help
-+	  If you say Y here, all chdir() calls will be logged.  If the sysctl
-+ 	  option is enabled, a sysctl option with name "audit_chdir" is created.
-+
-+config GRKERNSEC_AUDIT_MOUNT
-+	bool "(Un)Mount logging"
-+	help
-+	  If you say Y here, all mounts and unmounts will be logged.  If the
-+	  sysctl option is enabled, a sysctl option with name "audit_mount" is
-+	  created.
-+
-+config GRKERNSEC_SIGNAL
-+	bool "Signal logging"
-+	help
-+	  If you say Y here, certain important signals will be logged, such as
-+	  SIGSEGV, which will as a result inform you of when a error in a program
-+	  occurred, which in some cases could mean a possible exploit attempt.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "signal_logging" is created.
-+
-+config GRKERNSEC_FORKFAIL
-+	bool "Fork failure logging"
-+	help
-+	  If you say Y here, all failed fork() attempts will be logged.
-+	  This could suggest a fork bomb, or someone attempting to overstep
-+	  their process limit.  If the sysctl option is enabled, a sysctl option
-+	  with name "forkfail_logging" is created.
-+
-+config GRKERNSEC_TIME
-+	bool "Time change logging"
-+	help
-+	  If you say Y here, any changes of the system clock will be logged.
-+	  If the sysctl option is enabled, a sysctl option with name
-+	  "timechange_logging" is created.
-+
-+config GRKERNSEC_PROC_IPADDR
-+	bool "/proc/<pid>/ipaddr support"
-+	help
-+	  If you say Y here, a new entry will be added to each /proc/<pid>
-+	  directory that contains the IP address of the person using the task.
-+	  The IP is carried across local TCP and AF_UNIX stream sockets.
-+	  This information can be useful for IDS/IPSes to perform remote response
-+	  to a local attack.  The entry is readable by only the owner of the
-+	  process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
-+	  the RBAC system), and thus does not create privacy concerns.
-+
-+config GRKERNSEC_RWXMAP_LOG
-+	bool 'Denied RWX mmap/mprotect logging'
-+	depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
-+	help
-+	  If you say Y here, calls to mmap() and mprotect() with explicit
-+	  usage of PROT_WRITE and PROT_EXEC together will be logged when
-+	  denied by the PAX_MPROTECT feature.  If the sysctl option is
-+	  enabled, a sysctl option with name "rwxmap_logging" is created.
-+
-+config GRKERNSEC_AUDIT_TEXTREL
-+	bool 'ELF text relocations logging (READ HELP)'
-+	depends on PAX_MPROTECT
-+	help
-+	  If you say Y here, text relocations will be logged with the filename
-+	  of the offending library or binary.  The purpose of the feature is
-+	  to help Linux distribution developers get rid of libraries and
-+	  binaries that need text relocations which hinder the future progress
-+	  of PaX.  Only Linux distribution developers should say Y here, and
-+	  never on a production machine, as this option creates an information
-+	  leak that could aid an attacker in defeating the randomization of
-+	  a single memory region.  If the sysctl option is enabled, a sysctl
-+	  option with name "audit_textrel" is created.
-+
-+endmenu
-+
-+menu "Executable Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_EXECVE
-+	bool "Enforce RLIMIT_NPROC on execs"
-+	help
-+	  If you say Y here, users with a resource limit on processes will
-+	  have the value checked during execve() calls.  The current system
-+	  only checks the system limit during fork() calls.  If the sysctl option
-+	  is enabled, a sysctl option with name "execve_limiting" is created.
-+
-+config GRKERNSEC_DMESG
-+	bool "Dmesg(8) restriction"
-+	help
-+	  If you say Y here, non-root users will not be able to use dmesg(8)
-+	  to view up to the last 4kb of messages in the kernel's log buffer.
-+	  The kernel's log buffer often contains kernel addresses and other
-+	  identifying information useful to an attacker in fingerprinting a
-+	  system for a targeted exploit.
-+	  If the sysctl option is enabled, a sysctl option with name "dmesg" is
-+	  created.
-+
-+config GRKERNSEC_HARDEN_PTRACE
-+	bool "Deter ptrace-based process snooping"
-+	help
-+	  If you say Y here, TTY sniffers and other malicious monitoring
-+	  programs implemented through ptrace will be defeated.  If you
-+	  have been using the RBAC system, this option has already been
-+	  enabled for several years for all users, with the ability to make
-+	  fine-grained exceptions.
-+
-+	  This option only affects the ability of non-root users to ptrace
-+	  processes that are not a descendent of the ptracing process.
-+	  This means that strace ./binary and gdb ./binary will still work,
-+	  but attaching to arbitrary processes will not.  If the sysctl
-+	  option is enabled, a sysctl option with name "harden_ptrace" is
-+	  created.
-+
-+config GRKERNSEC_TPE
-+	bool "Trusted Path Execution (TPE)"
-+	help
-+	  If you say Y here, you will be able to choose a gid to add to the
-+	  supplementary groups of users you want to mark as "untrusted."
-+	  These users will not be able to execute any files that are not in
-+	  root-owned directories writable only by root.  If the sysctl option
-+	  is enabled, a sysctl option with name "tpe" is created.
-+
-+config GRKERNSEC_TPE_ALL
-+	bool "Partially restrict all non-root users"
-+	depends on GRKERNSEC_TPE
-+	help
-+	  If you say Y here, all non-root users will be covered under
-+	  a weaker TPE restriction.  This is separate from, and in addition to,
-+	  the main TPE options that you have selected elsewhere.  Thus, if a
-+	  "trusted" GID is chosen, this restriction applies to even that GID.
-+	  Under this restriction, all non-root users will only be allowed to
-+	  execute files in directories they own that are not group or
-+	  world-writable, or in directories owned by root and writable only by
-+	  root.  If the sysctl option is enabled, a sysctl option with name
-+	  "tpe_restrict_all" is created.
-+
-+config GRKERNSEC_TPE_INVERT
-+	bool "Invert GID option"
-+	depends on GRKERNSEC_TPE
-+	help
-+	  If you say Y here, the group you specify in the TPE configuration will
-+	  decide what group TPE restrictions will be *disabled* for.  This
-+	  option is useful if you want TPE restrictions to be applied to most
-+	  users on the system.  If the sysctl option is enabled, a sysctl option
-+	  with name "tpe_invert" is created.  Unlike other sysctl options, this
-+	  entry will default to on for backward-compatibility.
-+
-+config GRKERNSEC_TPE_GID
-+	int "GID for untrusted users"
-+	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
-+	default 1005
-+	help
-+	  Setting this GID determines what group TPE restrictions will be
-+	  *enabled* for.  If the sysctl option is enabled, a sysctl option
-+	  with name "tpe_gid" is created.
-+
-+config GRKERNSEC_TPE_GID
-+	int "GID for trusted users"
-+	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
-+	default 1005
-+	help
-+	  Setting this GID determines what group TPE restrictions will be
-+	  *disabled* for.  If the sysctl option is enabled, a sysctl option
-+	  with name "tpe_gid" is created.
-+
-+endmenu
-+menu "Network Protections"
-+depends on GRKERNSEC
-+
-+config GRKERNSEC_RANDNET
-+	bool "Larger entropy pools"
-+	help
-+	  If you say Y here, the entropy pools used for many features of Linux
-+	  and grsecurity will be doubled in size.  Since several grsecurity
-+	  features use additional randomness, it is recommended that you say Y
-+	  here.  Saying Y here has a similar effect as modifying
-+	  /proc/sys/kernel/random/poolsize.
+diff -urNp linux-3.0.3/grsecurity/gracl_alloc.c linux-3.0.3/grsecurity/gracl_alloc.c
+--- linux-3.0.3/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_alloc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,105 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/gracl.h>
++#include <linux/grsecurity.h>
 +
-+config GRKERNSEC_BLACKHOLE
-+	bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
-+	help
-+	  If you say Y here, neither TCP resets nor ICMP
-+	  destination-unreachable packets will be sent in response to packets
-+	  sent to ports for which no associated listening process exists.
-+	  This feature supports both IPV4 and IPV6 and exempts the 
-+	  loopback interface from blackholing.  Enabling this feature 
-+	  makes a host more resilient to DoS attacks and reduces network
-+	  visibility against scanners.
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
 +
-+	  The blackhole feature as-implemented is equivalent to the FreeBSD
-+	  blackhole feature, as it prevents RST responses to all packets, not
-+	  just SYNs.  Under most application behavior this causes no
-+	  problems, but applications (like haproxy) may not close certain
-+	  connections in a way that cleanly terminates them on the remote
-+	  end, leaving the remote host in LAST_ACK state.  Because of this
-+	  side-effect and to prevent intentional LAST_ACK DoSes, this
-+	  feature also adds automatic mitigation against such attacks.
-+	  The mitigation drastically reduces the amount of time a socket
-+	  can spend in LAST_ACK state.  If you're using haproxy and not
-+	  all servers it connects to have this option enabled, consider
-+	  disabling this feature on the haproxy host.
++static __inline__ int
++alloc_pop(void)
++{
++	if (alloc_stack_next == 1)
++		return 0;
 +
-+	  If the sysctl option is enabled, two sysctl options with names
-+	  "ip_blackhole" and "lastack_retries" will be created.
-+	  While "ip_blackhole" takes the standard zero/non-zero on/off
-+	  toggle, "lastack_retries" uses the same kinds of values as
-+	  "tcp_retries1" and "tcp_retries2".  The default value of 4
-+	  prevents a socket from lasting more than 45 seconds in LAST_ACK
-+	  state.
++	kfree(alloc_stack[alloc_stack_next - 2]);
 +
-+config GRKERNSEC_SOCKET
-+	bool "Socket restrictions"
-+	help
-+	  If you say Y here, you will be able to choose from several options.
-+	  If you assign a GID on your system and add it to the supplementary
-+	  groups of users you want to restrict socket access to, this patch
-+	  will perform up to three things, based on the option(s) you choose.
++	alloc_stack_next--;
 +
-+config GRKERNSEC_SOCKET_ALL
-+	bool "Deny any sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to connect to other hosts from your machine or run server
-+	  applications from your machine.  If the sysctl option is enabled, a
-+	  sysctl option with name "socket_all" is created.
++	return 1;
++}
 +
-+config GRKERNSEC_SOCKET_ALL_GID
-+	int "GID to deny all sockets for"
-+	depends on GRKERNSEC_SOCKET_ALL
-+	default 1004
-+	help
-+	  Here you can choose the GID to disable socket access for. Remember to
-+	  add the users you want socket access disabled for to the GID
-+	  specified here.  If the sysctl option is enabled, a sysctl option
-+	  with name "socket_all_gid" is created.
++static __inline__ int
++alloc_push(void *buf)
++{
++	if (alloc_stack_next >= alloc_stack_size)
++		return 1;
 +
-+config GRKERNSEC_SOCKET_CLIENT
-+	bool "Deny client sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to connect to other hosts from your machine, but will be
-+	  able to run servers.  If this option is enabled, all users in the group
-+	  you specify will have to use passive mode when initiating ftp transfers
-+	  from the shell on your machine.  If the sysctl option is enabled, a
-+	  sysctl option with name "socket_client" is created.
++	alloc_stack[alloc_stack_next - 1] = buf;
 +
-+config GRKERNSEC_SOCKET_CLIENT_GID
-+	int "GID to deny client sockets for"
-+	depends on GRKERNSEC_SOCKET_CLIENT
-+	default 1003
-+	help
-+	  Here you can choose the GID to disable client socket access for.
-+	  Remember to add the users you want client socket access disabled for to
-+	  the GID specified here.  If the sysctl option is enabled, a sysctl
-+	  option with name "socket_client_gid" is created.
++	alloc_stack_next++;
 +
-+config GRKERNSEC_SOCKET_SERVER
-+	bool "Deny server sockets to group"
-+	depends on GRKERNSEC_SOCKET
-+	help
-+	  If you say Y here, you will be able to choose a GID of whose users will
-+	  be unable to run server applications from your machine.  If the sysctl
-+	  option is enabled, a sysctl option with name "socket_server" is created.
++	return 0;
++}
 +
-+config GRKERNSEC_SOCKET_SERVER_GID
-+	int "GID to deny server sockets for"
-+	depends on GRKERNSEC_SOCKET_SERVER
-+	default 1002
-+	help
-+	  Here you can choose the GID to disable server socket access for.
-+	  Remember to add the users you want server socket access disabled for to
-+	  the GID specified here.  If the sysctl option is enabled, a sysctl
-+	  option with name "socket_server_gid" is created.
++void *
++acl_alloc(unsigned long len)
++{
++	void *ret = NULL;
 +
-+endmenu
-+menu "Sysctl support"
-+depends on GRKERNSEC && SYSCTL
++	if (!len || len > PAGE_SIZE)
++		goto out;
 +
-+config GRKERNSEC_SYSCTL
-+	bool "Sysctl support"
-+	help
-+	  If you say Y here, you will be able to change the options that
-+	  grsecurity runs with at bootup, without having to recompile your
-+	  kernel.  You can echo values to files in /proc/sys/kernel/grsecurity
-+	  to enable (1) or disable (0) various features.  All the sysctl entries
-+	  are mutable until the "grsec_lock" entry is set to a non-zero value.
-+	  All features enabled in the kernel configuration are disabled at boot
-+	  if you do not say Y to the "Turn on features by default" option.
-+	  All options should be set at startup, and the grsec_lock entry should
-+	  be set to a non-zero value after all the options are set.
-+	  *THIS IS EXTREMELY IMPORTANT*
++	ret = kmalloc(len, GFP_KERNEL);
 +
-+config GRKERNSEC_SYSCTL_DISTRO
-+	bool "Extra sysctl support for distro makers (READ HELP)"
-+	depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
-+	help
-+	  If you say Y here, additional sysctl options will be created
-+	  for features that affect processes running as root.  Therefore,
-+	  it is critical when using this option that the grsec_lock entry be
-+	  enabled after boot.  Only distros with prebuilt kernel packages
-+	  with this option enabled that can ensure grsec_lock is enabled
-+	  after boot should use this option.
-+	  *Failure to set grsec_lock after boot makes all grsec features
-+	  this option covers useless*
++	if (ret) {
++		if (alloc_push(ret)) {
++			kfree(ret);
++			ret = NULL;
++		}
++	}
 +
-+	  Currently this option creates the following sysctl entries:
-+	  "Disable Privileged I/O": "disable_priv_io"	
++out:
++	return ret;
++}
 +
-+config GRKERNSEC_SYSCTL_ON
-+	bool "Turn on features by default"
-+	depends on GRKERNSEC_SYSCTL
-+	help
-+	  If you say Y here, instead of having all features enabled in the
-+	  kernel configuration disabled at boot time, the features will be
-+	  enabled at boot time.  It is recommended you say Y here unless
-+	  there is some reason you would want all sysctl-tunable features to
-+	  be disabled by default.  As mentioned elsewhere, it is important
-+	  to enable the grsec_lock entry once you have finished modifying
-+	  the sysctl entries.
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++	if (!len || (num > (PAGE_SIZE / len)))
++		return NULL;
 +
-+endmenu
-+menu "Logging Options"
-+depends on GRKERNSEC
++	return acl_alloc(num * len);
++}
 +
-+config GRKERNSEC_FLOODTIME
-+	int "Seconds in between log messages (minimum)"
-+	default 10
-+	help
-+	  This option allows you to enforce the number of seconds between
-+	  grsecurity log messages.  The default should be suitable for most
-+	  people, however, if you choose to change it, choose a value small enough
-+	  to allow informative logs to be produced, but large enough to
-+	  prevent flooding.
++void
++acl_free_all(void)
++{
++	if (gr_acl_is_enabled() || !alloc_stack)
++		return;
 +
-+config GRKERNSEC_FLOODBURST
-+	int "Number of messages in a burst (maximum)"
-+	default 4
-+	help
-+	  This option allows you to choose the maximum number of messages allowed
-+	  within the flood time interval you chose in a separate option.  The
-+	  default should be suitable for most people, however if you find that
-+	  many of your logs are being interpreted as flooding, you may want to
-+	  raise this value.
++	while (alloc_pop()) ;
 +
-+endmenu
++	if (alloc_stack) {
++		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++			kfree(alloc_stack);
++		else
++			vfree(alloc_stack);
++	}
 +
-+endmenu
-diff --git a/grsecurity/Makefile b/grsecurity/Makefile
-new file mode 100644
-index 0000000..de14237
---- /dev/null
-+++ b/grsecurity/Makefile
-@@ -0,0 +1,29 @@
-+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
-+# during 2001-2009 it has been completely redesigned by Brad Spengler
-+# into an RBAC system
-+#
-+# All code in this directory and various hooks inserted throughout the kernel
-+# are copyright Brad Spengler - Open Source Security, Inc., and released 
-+# under the GPL v2 or higher
++	alloc_stack = NULL;
++	alloc_stack_size = 1;
++	alloc_stack_next = 1;
 +
-+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
-+	grsec_mount.o grsec_sig.o grsec_sock.o grsec_sysctl.o \
-+	grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
++	return;
++}
 +
-+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_ip.o gracl_segv.o \
-+	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
-+	gracl_learn.o grsec_log.o
-+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
++int
++acl_alloc_stack_init(unsigned long size)
++{
++	if ((size * sizeof (void *)) <= PAGE_SIZE)
++		alloc_stack =
++		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++	else
++		alloc_stack = (void **) vmalloc(size * sizeof (void *));
 +
-+ifndef CONFIG_GRKERNSEC
-+obj-y += grsec_disabled.o
-+endif
++	alloc_stack_size = size;
 +
-+ifdef CONFIG_GRKERNSEC_HIDESYM
-+extra-y := grsec_hidesym.o
-+$(obj)/grsec_hidesym.o:
-+	@-chmod -f 500 /boot
-+	@-chmod -f 500 /lib/modules
-+	@-chmod -f 700 .
-+	@echo '  grsec: protected kernel image paths'
-+endif
-diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
-new file mode 100644
-index 0000000..b0493f1
---- /dev/null
-+++ b/grsecurity/gracl.c
-@@ -0,0 +1,4098 @@
++	if (!alloc_stack)
++		return 0;
++	else
++		return 1;
++}
+diff -urNp linux-3.0.3/grsecurity/gracl.c linux-3.0.3/grsecurity/gracl.c
+--- linux-3.0.3/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,4106 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -45295,7 +41274,6 @@ index 0000000..b0493f1
 +#include <linux/mount.h>
 +#include <linux/tty.h>
 +#include <linux/proc_fs.h>
-+#include <linux/smp_lock.h>
 +#include <linux/lglock.h>
 +#include <linux/slab.h>
 +#include <linux/vmalloc.h>
@@ -45360,14 +41338,18 @@ index 0000000..b0493f1
 +static unsigned int gr_auth_attempts = 0;
 +static unsigned long gr_auth_expires = 0UL;
 +
++#ifdef CONFIG_NET
 +extern struct vfsmount *sock_mnt;
++#endif
++
 +extern struct vfsmount *pipe_mnt;
 +extern struct vfsmount *shm_mnt;
 +#ifdef CONFIG_HUGETLBFS
 +extern struct vfsmount *hugetlbfs_vfsmount;
 +#endif
 +
-+static struct acl_object_label *fakefs_obj;
++static struct acl_object_label *fakefs_obj_rw;
++static struct acl_object_label *fakefs_obj_rwx;
 +
 +extern int gr_init_uidset(void);
 +extern void gr_free_uidset(void);
@@ -46111,10 +42093,15 @@ index 0000000..b0493f1
 +	printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
 +#endif
 +
-+	fakefs_obj = acl_alloc(sizeof(struct acl_object_label));
-+	if (fakefs_obj == NULL)
++	fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
++	if (fakefs_obj_rw == NULL)
++		return 1;
++	fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
++
++	fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
++	if (fakefs_obj_rwx == NULL)
 +		return 1;
-+	fakefs_obj->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
++	fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
 +
 +	subj_map_set.s_hash =
 +	    (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
@@ -47114,13 +43101,16 @@ index 0000000..b0493f1
 +	write_seqlock(&rename_lock);
 +	br_read_lock(vfsmount_lock);
 +
-+	if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt || mnt == sock_mnt ||
++	if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
++#ifdef CONFIG_NET
++	    mnt == sock_mnt ||
++#endif
 +#ifdef CONFIG_HUGETLBFS
 +	    (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
 +#endif
 +		/* ignore Eric Biederman */
 +	    IS_PRIVATE(l_dentry->d_inode))) {
-+		retval = fakefs_obj;
++		retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
 +		goto out;
 +	}
 +
@@ -48587,9 +44577,6 @@ index 0000000..b0493f1
 +		task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
 +					   task->role);
 +	if (task->acl) {
-+		struct acl_subject_label *curr;
-+		curr = task->acl;
-+
 +		task->is_writable = 0;
 +		/* ignore additional mmap checks for processes that are writable 
 +		   by the default ACL */
@@ -49383,122 +45370,9 @@ index 0000000..b0493f1
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
-new file mode 100644
-index 0000000..34fefda
---- /dev/null
-+++ b/grsecurity/gracl_alloc.c
-@@ -0,0 +1,105 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/gracl.h>
-+#include <linux/grsecurity.h>
-+
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
-+
-+static __inline__ int
-+alloc_pop(void)
-+{
-+	if (alloc_stack_next == 1)
-+		return 0;
-+
-+	kfree(alloc_stack[alloc_stack_next - 2]);
-+
-+	alloc_stack_next--;
-+
-+	return 1;
-+}
-+
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+	if (alloc_stack_next >= alloc_stack_size)
-+		return 1;
-+
-+	alloc_stack[alloc_stack_next - 1] = buf;
-+
-+	alloc_stack_next++;
-+
-+	return 0;
-+}
-+
-+void *
-+acl_alloc(unsigned long len)
-+{
-+	void *ret = NULL;
-+
-+	if (!len || len > PAGE_SIZE)
-+		goto out;
-+
-+	ret = kmalloc(len, GFP_KERNEL);
-+
-+	if (ret) {
-+		if (alloc_push(ret)) {
-+			kfree(ret);
-+			ret = NULL;
-+		}
-+	}
-+
-+out:
-+	return ret;
-+}
-+
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+	if (!len || (num > (PAGE_SIZE / len)))
-+		return NULL;
-+
-+	return acl_alloc(num * len);
-+}
-+
-+void
-+acl_free_all(void)
-+{
-+	if (gr_acl_is_enabled() || !alloc_stack)
-+		return;
-+
-+	while (alloc_pop()) ;
-+
-+	if (alloc_stack) {
-+		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+			kfree(alloc_stack);
-+		else
-+			vfree(alloc_stack);
-+	}
-+
-+	alloc_stack = NULL;
-+	alloc_stack_size = 1;
-+	alloc_stack_next = 1;
-+
-+	return;
-+}
-+
-+int
-+acl_alloc_stack_init(unsigned long size)
-+{
-+	if ((size * sizeof (void *)) <= PAGE_SIZE)
-+		alloc_stack =
-+		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
-+	else
-+		alloc_stack = (void **) vmalloc(size * sizeof (void *));
-+
-+	alloc_stack_size = size;
-+
-+	if (!alloc_stack)
-+		return 0;
-+	else
-+		return 1;
-+}
-diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
-new file mode 100644
-index 0000000..b033b49
---- /dev/null
-+++ b/grsecurity/gracl_cap.c
+diff -urNp linux-3.0.3/grsecurity/gracl_cap.c linux-3.0.3/grsecurity/gracl_cap.c
+--- linux-3.0.3/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_cap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,139 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -49639,11 +45513,9 @@ index 0000000..b033b49
 +	return 0;
 +}
 +
-diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
-new file mode 100644
-index 0000000..b560284
---- /dev/null
-+++ b/grsecurity/gracl_fs.c
+diff -urNp linux-3.0.3/grsecurity/gracl_fs.c linux-3.0.3/grsecurity/gracl_fs.c
+--- linux-3.0.3/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_fs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -50076,12 +45948,10 @@ index 0000000..b560284
 +
 +	return 0;
 +}
-diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
-new file mode 100644
-index 0000000..8f6bb84
---- /dev/null
-+++ b/grsecurity/gracl_ip.c
-@@ -0,0 +1,382 @@
+diff -urNp linux-3.0.3/grsecurity/gracl_ip.c linux-3.0.3/grsecurity/gracl_ip.c
+--- linux-3.0.3/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_ip.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
 +#include <asm/errno.h>
@@ -50093,7 +45963,6 @@ index 0000000..8f6bb84
 +#include <linux/skbuff.h>
 +#include <linux/ip.h>
 +#include <linux/udp.h>
-+#include <linux/smp_lock.h>
 +#include <linux/types.h>
 +#include <linux/sched.h>
 +#include <linux/netdevice.h>
@@ -50464,17 +46333,14 @@ index 0000000..8f6bb84
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
-new file mode 100644
-index 0000000..5a112b0
---- /dev/null
-+++ b/grsecurity/gracl_learn.c
-@@ -0,0 +1,211 @@
+diff -urNp linux-3.0.3/grsecurity/gracl_learn.c linux-3.0.3/grsecurity/gracl_learn.c
+--- linux-3.0.3/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_learn.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
 +#include <linux/sched.h>
 +#include <linux/poll.h>
-+#include <linux/smp_lock.h>
 +#include <linux/string.h>
 +#include <linux/file.h>
 +#include <linux/types.h>
@@ -50564,13 +46430,12 @@ index 0000000..5a112b0
 +	char *tmp;
 +
 +	mutex_lock(&gr_learn_user_mutex);
-+	if (learn_buffer != NULL) {
-+		spin_lock(&gr_learn_lock);
-+		tmp = learn_buffer;
-+		learn_buffer = NULL;
-+		spin_unlock(&gr_learn_lock);
-+		vfree(learn_buffer);
-+	}
++	spin_lock(&gr_learn_lock);
++	tmp = learn_buffer;
++	learn_buffer = NULL;
++	spin_unlock(&gr_learn_lock);
++	if (tmp)
++		vfree(tmp);
 +	if (learn_buffer_user != NULL) {
 +		vfree(learn_buffer_user);
 +		learn_buffer_user = NULL;
@@ -50650,17 +46515,15 @@ index 0000000..5a112b0
 +static int
 +close_learn(struct inode *inode, struct file *file)
 +{
-+	char *tmp;
-+
 +	if (file->f_mode & FMODE_READ) {
++		char *tmp = NULL;
 +		mutex_lock(&gr_learn_user_mutex);
-+		if (learn_buffer != NULL) {
-+			spin_lock(&gr_learn_lock);
-+			tmp = learn_buffer;
-+			learn_buffer = NULL;
-+			spin_unlock(&gr_learn_lock);
++		spin_lock(&gr_learn_lock);
++		tmp = learn_buffer;
++		learn_buffer = NULL;
++		spin_unlock(&gr_learn_lock);
++		if (tmp)
 +			vfree(tmp);
-+		}
 +		if (learn_buffer_user != NULL) {
 +			vfree(learn_buffer_user);
 +			learn_buffer_user = NULL;
@@ -50681,11 +46544,9 @@ index 0000000..5a112b0
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
-new file mode 100644
-index 0000000..39645c9
---- /dev/null
-+++ b/grsecurity/gracl_res.c
+diff -urNp linux-3.0.3/grsecurity/gracl_res.c linux-3.0.3/grsecurity/gracl_res.c
+--- linux-3.0.3/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_res.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -50755,12 +46616,10 @@ index 0000000..39645c9
 +	rcu_read_unlock();
 +	return;
 +}
-diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
-new file mode 100644
-index 0000000..66ebf6a
---- /dev/null
-+++ b/grsecurity/gracl_segv.c
-@@ -0,0 +1,300 @@
+diff -urNp linux-3.0.3/grsecurity/gracl_segv.c linux-3.0.3/grsecurity/gracl_segv.c
+--- linux-3.0.3/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_segv.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
 +#include <asm/uaccess.h>
@@ -50771,7 +46630,6 @@ index 0000000..66ebf6a
 +#include <linux/fs.h>
 +#include <linux/net.h>
 +#include <linux/in.h>
-+#include <linux/smp_lock.h>
 +#include <linux/slab.h>
 +#include <linux/types.h>
 +#include <linux/sched.h>
@@ -51061,11 +46919,9 @@ index 0000000..66ebf6a
 +
 +	return;
 +}
-diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
-new file mode 100644
-index 0000000..9d83a69
---- /dev/null
-+++ b/grsecurity/gracl_shm.c
+diff -urNp linux-3.0.3/grsecurity/gracl_shm.c linux-3.0.3/grsecurity/gracl_shm.c
+--- linux-3.0.3/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/gracl_shm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -51107,11 +46963,9 @@ index 0000000..9d83a69
 +
 +	return 1;
 +}
-diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
-new file mode 100644
-index 0000000..bc0be01
---- /dev/null
-+++ b/grsecurity/grsec_chdir.c
+diff -urNp linux-3.0.3/grsecurity/grsec_chdir.c linux-3.0.3/grsecurity/grsec_chdir.c
+--- linux-3.0.3/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_chdir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51132,12 +46986,10 @@ index 0000000..bc0be01
 +#endif
 +	return;
 +}
-diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
-new file mode 100644
-index 0000000..92e5bf7
---- /dev/null
-+++ b/grsecurity/grsec_chroot.c
-@@ -0,0 +1,355 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_chroot.c linux-3.0.3/grsecurity/grsec_chroot.c
+--- linux-3.0.3/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_chroot.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,349 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -51173,7 +47025,7 @@ index 0000000..92e5bf7
 +}	
 +
 +int
-+gr_handle_chroot_unix(struct pid *pid)
++gr_handle_chroot_unix(const pid_t pid)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
 +	struct task_struct *p;
@@ -51186,7 +47038,7 @@ index 0000000..92e5bf7
 +
 +	rcu_read_lock();
 +	read_lock(&tasklist_lock);
-+	p = pid_task(pid, PIDTYPE_PID);
++	p = find_task_by_vpid_unrestricted(pid);
 +	if (unlikely(p && !have_same_root(current, p))) {
 +		read_unlock(&tasklist_lock);
 +		rcu_read_unlock();
@@ -51314,7 +47166,7 @@ index 0000000..92e5bf7
 +		const time_t shm_createtime)
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
-+	struct pid *pid = NULL;
++	struct task_struct *p;
 +	time_t starttime;
 +
 +	if (unlikely(!grsec_enable_chroot_shmat))
@@ -51326,36 +47178,30 @@ index 0000000..92e5bf7
 +	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +
-+	pid = find_vpid(shm_cprid);
-+	if (pid) {
-+		struct task_struct *p;
-+		p = pid_task(pid, PIDTYPE_PID);
-+		if (p == NULL)
-+			goto unlock;
++	if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
 +		starttime = p->start_time.tv_sec;
-+		if (unlikely(!have_same_root(current, p) &&
-+			     time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime))) {
-+			read_unlock(&tasklist_lock);
-+			rcu_read_unlock();
-+			gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
-+			return 0;
-+		}
-+	} else {
-+		pid = find_vpid(shm_lapid);
-+		if (pid) {
-+			struct task_struct *p;
-+			p = pid_task(pid, PIDTYPE_PID);
-+			if (p == NULL)
-+				goto unlock;
-+			if (unlikely(!have_same_root(current, p))) {
++		if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
++			if (have_same_root(current, p)) {
++				goto allow;
++			} else {
 +				read_unlock(&tasklist_lock);
 +				rcu_read_unlock();
 +				gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
 +				return 0;
 +			}
 +		}
++		/* creator exited, pid reuse, fall through to next check */
 +	}
-+unlock:
++	if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
++		if (unlikely(!have_same_root(current, p))) {
++			read_unlock(&tasklist_lock);
++			rcu_read_unlock();
++			gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
++			return 0;
++		}
++	}
++
++allow:
 +	read_unlock(&tasklist_lock);
 +	rcu_read_unlock();
 +#endif
@@ -51392,7 +47238,7 @@ index 0000000..92e5bf7
 +{
 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
 +	if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
-+		gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name, dentry, mnt);
++		gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
 +		return -EPERM;
 +	}
 +#endif
@@ -51493,11 +47339,9 @@ index 0000000..92e5bf7
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
-new file mode 100644
-index 0000000..3ae621c
---- /dev/null
-+++ b/grsecurity/grsec_disabled.c
+diff -urNp linux-3.0.3/grsecurity/grsec_disabled.c linux-3.0.3/grsecurity/grsec_disabled.c
+--- linux-3.0.3/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_disabled.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -51946,23 +47790,20 @@ index 0000000..3ae621c
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
-new file mode 100644
-index 0000000..90d56b2
---- /dev/null
-+++ b/grsecurity/grsec_exec.c
-@@ -0,0 +1,147 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec.c
+--- linux-3.0.3/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_exec.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,87 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
 +#include <linux/binfmts.h>
-+#include <linux/smp_lock.h>
 +#include <linux/fs.h>
 +#include <linux/types.h>
 +#include <linux/grdefs.h>
++#include <linux/grsecurity.h>
 +#include <linux/grinternal.h>
 +#include <linux/capability.h>
-+#include <linux/compat.h>
 +
 +#include <asm/uaccess.h>
 +
@@ -51986,8 +47827,10 @@ index 0000000..90d56b2
 +	return 0;
 +}
 +
++extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
++
 +void
-+gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv)
++gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
 +{
 +#ifdef CONFIG_GRKERNSEC_EXECLOG
 +	char *grarg = gr_exec_arg_buf;
@@ -52002,17 +47845,14 @@ index 0000000..90d56b2
 +	mutex_lock(&gr_exec_arg_mutex);
 +	memset(grarg, 0, sizeof(gr_exec_arg_buf));
 +
-+	if (unlikely(argv == NULL))
-+		goto log;
-+
 +	for (i = 0; i < bprm->argc && execlen < 128; i++) {
 +		const char __user *p;
 +		unsigned int len;
 +
-+		if (copy_from_user(&p, argv + i, sizeof(p)))
-+			goto log;
-+		if (!p)
++		p = get_user_arg_ptr(argv, i);
++		if (IS_ERR(p))
 +			goto log;
++
 +		len = strnlen_user(p, 128 - execlen);
 +		if (len > 128 - execlen)
 +			len = 128 - execlen;
@@ -52041,69 +47881,9 @@ index 0000000..90d56b2
 +#endif
 +	return;
 +}
-+
-+#ifdef CONFIG_COMPAT
-+void
-+gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv)
-+{
-+#ifdef CONFIG_GRKERNSEC_EXECLOG
-+	char *grarg = gr_exec_arg_buf;
-+	unsigned int i, x, execlen = 0;
-+	char c;
-+
-+	if (!((grsec_enable_execlog && grsec_enable_group &&
-+	       in_group_p(grsec_audit_gid))
-+	      || (grsec_enable_execlog && !grsec_enable_group)))
-+		return;
-+
-+	mutex_lock(&gr_exec_arg_mutex);
-+	memset(grarg, 0, sizeof(gr_exec_arg_buf));
-+
-+	if (unlikely(argv == NULL))
-+		goto log;
-+
-+	for (i = 0; i < bprm->argc && execlen < 128; i++) {
-+		compat_uptr_t p;
-+		unsigned int len;
-+
-+		if (get_user(p, argv + i))
-+			goto log;
-+		len = strnlen_user(compat_ptr(p), 128 - execlen);
-+		if (len > 128 - execlen)
-+			len = 128 - execlen;
-+		else if (len > 0)
-+			len--;
-+		else
-+			goto log;
-+		if (copy_from_user(grarg + execlen, compat_ptr(p), len))
-+			goto log;
-+
-+		/* rewrite unprintable characters */
-+		for (x = 0; x < len; x++) {
-+			c = *(grarg + execlen + x);
-+			if (c < 32 || c > 126)
-+				*(grarg + execlen + x) = ' ';
-+		}
-+
-+		execlen += len;
-+		*(grarg + execlen) = ' ';
-+		*(grarg + execlen + 1) = '\0';
-+		execlen++;
-+	}
-+
-+      log:
-+	gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
-+			bprm->file->f_path.mnt, grarg);
-+	mutex_unlock(&gr_exec_arg_mutex);
-+#endif
-+	return;
-+}
-+#endif
-diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
-new file mode 100644
-index 0000000..d3ee748
---- /dev/null
-+++ b/grsecurity/grsec_fifo.c
+diff -urNp linux-3.0.3/grsecurity/grsec_fifo.c linux-3.0.3/grsecurity/grsec_fifo.c
+--- linux-3.0.3/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_fifo.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52129,11 +47909,9 @@ index 0000000..d3ee748
 +#endif
 +	return 0;
 +}
-diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
-new file mode 100644
-index 0000000..8ca18bf
---- /dev/null
-+++ b/grsecurity/grsec_fork.c
+diff -urNp linux-3.0.3/grsecurity/grsec_fork.c linux-3.0.3/grsecurity/grsec_fork.c
+--- linux-3.0.3/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_fork.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52158,22 +47936,20 @@ index 0000000..8ca18bf
 +#endif
 +	return;
 +}
-diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
-new file mode 100644
-index 0000000..15f4f4e
---- /dev/null
-+++ b/grsecurity/grsec_init.c
-@@ -0,0 +1,270 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init.c
+--- linux-3.0.3/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_init.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,273 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/mm.h>
-+#include <linux/smp_lock.h>
 +#include <linux/gracl.h>
 +#include <linux/slab.h>
 +#include <linux/vmalloc.h>
 +#include <linux/percpu.h>
 +#include <linux/module.h>
 +
++int grsec_enable_brute;
 +int grsec_enable_link;
 +int grsec_enable_dmesg;
 +int grsec_enable_harden_ptrace;
@@ -52338,6 +48114,9 @@ index 0000000..15f4f4e
 +#ifdef CONFIG_GRKERNSEC_LINK
 +	grsec_enable_link = 1;
 +#endif
++#ifdef CONFIG_GRKERNSEC_BRUTE
++	grsec_enable_brute = 1;
++#endif
 +#ifdef CONFIG_GRKERNSEC_DMESG
 +	grsec_enable_dmesg = 1;
 +#endif
@@ -52434,11 +48213,9 @@ index 0000000..15f4f4e
 +
 +	return;
 +}
-diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
-new file mode 100644
-index 0000000..3efe141
---- /dev/null
-+++ b/grsecurity/grsec_link.c
+diff -urNp linux-3.0.3/grsecurity/grsec_link.c linux-3.0.3/grsecurity/grsec_link.c
+--- linux-3.0.3/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_link.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52483,11 +48260,9 @@ index 0000000..3efe141
 +#endif
 +	return 0;
 +}
-diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
-new file mode 100644
-index 0000000..fca6cf4
---- /dev/null
-+++ b/grsecurity/grsec_log.c
+diff -urNp linux-3.0.3/grsecurity/grsec_log.c linux-3.0.3/grsecurity/grsec_log.c
+--- linux-3.0.3/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_log.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52799,11 +48574,9 @@ index 0000000..fca6cf4
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
-new file mode 100644
-index 0000000..6c0416b
---- /dev/null
-+++ b/grsecurity/grsec_mem.c
+diff -urNp linux-3.0.3/grsecurity/grsec_mem.c linux-3.0.3/grsecurity/grsec_mem.c
+--- linux-3.0.3/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52838,11 +48611,9 @@ index 0000000..6c0416b
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
-new file mode 100644
-index 0000000..cbbe03e
---- /dev/null
-+++ b/grsecurity/grsec_mount.c
+diff -urNp linux-3.0.3/grsecurity/grsec_mount.c linux-3.0.3/grsecurity/grsec_mount.c
+--- linux-3.0.3/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_mount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52875,7 +48646,7 @@ index 0000000..cbbe03e
 +{
 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
 +	if (grsec_enable_mount && (retval >= 0))
-+		gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from, to);
++		gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
 +#endif
 +	return;
 +}
@@ -52906,11 +48677,9 @@ index 0000000..cbbe03e
 +#endif
 +	return 0;
 +}
-diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
-new file mode 100644
-index 0000000..a3b12a0
---- /dev/null
-+++ b/grsecurity/grsec_pax.c
+diff -urNp linux-3.0.3/grsecurity/grsec_pax.c linux-3.0.3/grsecurity/grsec_pax.c
+--- linux-3.0.3/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_pax.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52948,11 +48717,9 @@ index 0000000..a3b12a0
 +#endif
 +	return;
 +}
-diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
-new file mode 100644
-index 0000000..472c1d6
---- /dev/null
-+++ b/grsecurity/grsec_ptrace.c
+diff -urNp linux-3.0.3/grsecurity/grsec_ptrace.c linux-3.0.3/grsecurity/grsec_ptrace.c
+--- linux-3.0.3/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_ptrace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52968,12 +48735,10 @@ index 0000000..472c1d6
 +#endif
 +	return;
 +}
-diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
-new file mode 100644
-index 0000000..306ba79
---- /dev/null
-+++ b/grsecurity/grsec_sig.c
-@@ -0,0 +1,203 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_sig.c linux-3.0.3/grsecurity/grsec_sig.c
+--- linux-3.0.3/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_sig.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/delay.h>
@@ -53065,6 +48830,9 @@ index 0000000..306ba79
 +#ifdef CONFIG_GRKERNSEC_BRUTE
 +	uid_t uid = 0;
 +
++	if (!grsec_enable_brute)
++		return;
++
 +	rcu_read_lock();
 +	read_lock(&tasklist_lock);
 +	read_lock(&grsec_exec_file_lock);
@@ -53177,12 +48945,10 @@ index 0000000..306ba79
 +#endif
 +	return 0;
 +}
-diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
-new file mode 100644
-index 0000000..b24f755
---- /dev/null
-+++ b/grsecurity/grsec_sock.c
-@@ -0,0 +1,275 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_sock.c linux-3.0.3/grsecurity/grsec_sock.c
+--- linux-3.0.3/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_sock.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -53196,9 +48962,6 @@ index 0000000..b24f755
 +#include <linux/grinternal.h>
 +#include <linux/gracl.h>
 +
-+kernel_cap_t gr_cap_rtnetlink(struct sock *sock);
-+EXPORT_SYMBOL(gr_cap_rtnetlink);
-+
 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
 +
@@ -53430,40 +49193,10 @@ index 0000000..b24f755
 +#endif
 +	return 0;
 +}
-+
-+kernel_cap_t
-+gr_cap_rtnetlink(struct sock *sock)
-+{
-+#ifdef CONFIG_GRKERNSEC
-+	if (!gr_acl_is_enabled())
-+		return current_cap();
-+	else if (sock->sk_protocol == NETLINK_ISCSI &&
-+		 cap_raised(current_cap(), CAP_SYS_ADMIN) &&
-+		 gr_is_capable(CAP_SYS_ADMIN))
-+		return current_cap();
-+	else if (sock->sk_protocol == NETLINK_AUDIT &&
-+		 cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
-+		 gr_is_capable(CAP_AUDIT_WRITE) &&
-+		 cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
-+		 gr_is_capable(CAP_AUDIT_CONTROL))
-+		return current_cap();
-+	else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
-+		 ((sock->sk_protocol == NETLINK_ROUTE) ? 
-+		  gr_is_capable_nolog(CAP_NET_ADMIN) : 
-+		  gr_is_capable(CAP_NET_ADMIN)))
-+		return current_cap();
-+	else
-+		return __cap_empty_set;
-+#else
-+	return current_cap();
-+#endif
-+}
-diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
-new file mode 100644
-index 0000000..0c12525
---- /dev/null
-+++ b/grsecurity/grsec_sysctl.c
-@@ -0,0 +1,433 @@
+diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sysctl.c
+--- linux-3.0.3/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_sysctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,442 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -53509,6 +49242,15 @@ index 0000000..0c12525
 +		.proc_handler	= &proc_dointvec,
 +	},
 +#endif
++#ifdef CONFIG_GRKERNSEC_BRUTE
++	{
++		.procname	= "deter_bruteforce",
++		.data		= &grsec_enable_brute,
++		.maxlen		= sizeof(int),
++		.mode		= 0600,
++		.proc_handler	= &proc_dointvec,
++	},
++#endif
 +#ifdef CONFIG_GRKERNSEC_FIFO
 +	{
 +		.procname	= "fifo_restrictions",
@@ -53897,11 +49639,9 @@ index 0000000..0c12525
 +	{ }
 +};
 +#endif
-diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
-new file mode 100644
-index 0000000..0dc13c3
---- /dev/null
-+++ b/grsecurity/grsec_time.c
+diff -urNp linux-3.0.3/grsecurity/grsec_time.c linux-3.0.3/grsecurity/grsec_time.c
+--- linux-3.0.3/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_time.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53919,11 +49659,9 @@ index 0000000..0dc13c3
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
-new file mode 100644
-index 0000000..4a78774
---- /dev/null
-+++ b/grsecurity/grsec_tpe.c
+diff -urNp linux-3.0.3/grsecurity/grsec_tpe.c linux-3.0.3/grsecurity/grsec_tpe.c
+--- linux-3.0.3/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsec_tpe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53964,11 +49702,9 @@ index 0000000..4a78774
 +#endif
 +	return 1;
 +}
-diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
-new file mode 100644
-index 0000000..9f7b1ac
---- /dev/null
-+++ b/grsecurity/grsum.c
+diff -urNp linux-3.0.3/grsecurity/grsum.c linux-3.0.3/grsecurity/grsum.c
+--- linux-3.0.3/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/grsum.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -54031,43 +49767,1113 @@ index 0000000..9f7b1ac
 +
 +	return retval;
 +}
-diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
-index 3090471..b70bc64 100644
---- a/include/acpi/acpi_drivers.h
-+++ b/include/acpi/acpi_drivers.h
-@@ -119,8 +119,8 @@ void pci_acpi_crs_quirks(void);
-                                   Dock Station
-   -------------------------------------------------------------------------- */
- struct acpi_dock_ops {
--	acpi_notify_handler handler;
--	acpi_notify_handler uevent;
-+	const acpi_notify_handler handler;
-+	const acpi_notify_handler uevent;
- };
- 
- #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
-@@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle);
- extern int register_dock_notifier(struct notifier_block *nb);
- extern void unregister_dock_notifier(struct notifier_block *nb);
- extern int register_hotplug_dock_device(acpi_handle handle,
--					struct acpi_dock_ops *ops,
-+					const struct acpi_dock_ops *ops,
- 					void *context);
- extern void unregister_hotplug_dock_device(acpi_handle handle);
- #else
-@@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
- {
- }
- static inline int register_hotplug_dock_device(acpi_handle handle,
--					       struct acpi_dock_ops *ops,
-+					       const struct acpi_dock_ops *ops,
- 					       void *context)
- {
- 	return -ENODEV;
-diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
-index b7babf0..5b6fcb5 100644
---- a/include/asm-generic/atomic-long.h
-+++ b/include/asm-generic/atomic-long.h
+diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
+--- linux-3.0.3/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,1050 @@
++#
++# grecurity configuration
++#
++
++menu "Grsecurity"
++
++config GRKERNSEC
++	bool "Grsecurity"
++	select CRYPTO
++	select CRYPTO_SHA256
++	help
++	  If you say Y here, you will be able to configure many features
++	  that will enhance the security of your system.  It is highly
++	  recommended that you say Y here and read through the help
++	  for each option so that you fully understand the features and
++	  can evaluate their usefulness for your machine.
++
++choice
++	prompt "Security Level"
++	depends on GRKERNSEC
++	default GRKERNSEC_CUSTOM
++
++config GRKERNSEC_LOW
++	bool "Low"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_CHDIR
++
++	help
++	  If you choose this option, several of the grsecurity options will
++	  be enabled that will give you greater protection against a number
++	  of attacks, while assuring that none of your software will have any
++	  conflicts with the additional security measures.  If you run a lot
++	  of unusual software, or you are having problems with the higher
++	  security levels, you should say Y here.  With this option, the
++	  following features are enabled:
++
++	  - Linking restrictions
++	  - FIFO restrictions
++	  - Enforcing RLIMIT_NPROC on execve
++	  - Restricted dmesg
++	  - Enforced chdir("/") on chroot
++	  - Runtime module disabling
++
++config GRKERNSEC_MEDIUM
++	bool "Medium"
++	select PAX
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_FORKFAIL
++	select GRKERNSEC_TIME
++	select GRKERNSEC_SIGNAL
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_UNIX
++	select GRKERNSEC_CHROOT_MOUNT
++	select GRKERNSEC_CHROOT_PIVOT
++	select GRKERNSEC_CHROOT_DOUBLE
++	select GRKERNSEC_CHROOT_CHDIR
++	select GRKERNSEC_CHROOT_MKNOD
++	select GRKERNSEC_PROC
++	select GRKERNSEC_PROC_USERGROUP
++	select PAX_RANDUSTACK
++	select PAX_ASLR
++	select PAX_RANDMMAP
++	select PAX_REFCOUNT if (X86 || SPARC64)
++	select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
++
++	help
++	  If you say Y here, several features in addition to those included
++	  in the low additional security level will be enabled.  These
++	  features provide even more security to your system, though in rare
++	  cases they may be incompatible with very old or poorly written
++	  software.  If you enable this option, make sure that your auth
++	  service (identd) is running as gid 1001.  With this option, 
++	  the following features (in addition to those provided in the 
++	  low additional security level) will be enabled:
++
++	  - Failed fork logging
++	  - Time change logging
++	  - Signal logging
++	  - Deny mounts in chroot
++	  - Deny double chrooting
++	  - Deny sysctl writes in chroot
++	  - Deny mknod in chroot
++	  - Deny access to abstract AF_UNIX sockets out of chroot
++	  - Deny pivot_root in chroot
++	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++	  - /proc restrictions with special GID set to 10 (usually wheel)
++	  - Address Space Layout Randomization (ASLR)
++	  - Prevent exploitation of most refcount overflows
++	  - Bounds checking of copying between the kernel and userland
++
++config GRKERNSEC_HIGH
++	bool "High"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_EXECVE
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_FORKFAIL
++	select GRKERNSEC_TIME
++	select GRKERNSEC_SIGNAL
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SHMAT
++	select GRKERNSEC_CHROOT_UNIX
++	select GRKERNSEC_CHROOT_MOUNT
++	select GRKERNSEC_CHROOT_FCHDIR
++	select GRKERNSEC_CHROOT_PIVOT
++	select GRKERNSEC_CHROOT_DOUBLE
++	select GRKERNSEC_CHROOT_CHDIR
++	select GRKERNSEC_CHROOT_MKNOD
++	select GRKERNSEC_CHROOT_CAPS
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_CHROOT_FINDTASK
++	select GRKERNSEC_SYSFS_RESTRICT
++	select GRKERNSEC_PROC
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_HIDESYM
++	select GRKERNSEC_BRUTE
++	select GRKERNSEC_PROC_USERGROUP
++	select GRKERNSEC_KMEM
++	select GRKERNSEC_RESLOG
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_PROC_ADD
++	select GRKERNSEC_CHROOT_CHMOD
++	select GRKERNSEC_CHROOT_NICE
++	select GRKERNSEC_AUDIT_MOUNT
++	select GRKERNSEC_MODHARDEN if (MODULES)
++	select GRKERNSEC_HARDEN_PTRACE
++	select GRKERNSEC_VM86 if (X86_32)
++	select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
++	select PAX
++	select PAX_RANDUSTACK
++	select PAX_ASLR
++	select PAX_RANDMMAP
++	select PAX_NOEXEC
++	select PAX_MPROTECT
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
++	select PAX_MEMORY_UDEREF if (X86 && !XEN)
++	select PAX_RANDKSTACK if (X86_TSC && X86)
++	select PAX_SEGMEXEC if (X86_32)
++	select PAX_PAGEEXEC
++	select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
++	select PAX_EMUTRAMP if (PARISC)
++	select PAX_EMUSIGRT if (PARISC)
++	select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
++	select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
++	select PAX_REFCOUNT if (X86 || SPARC64)
++	select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
++	help
++	  If you say Y here, many of the features of grsecurity will be
++	  enabled, which will protect you against many kinds of attacks
++	  against your system.  The heightened security comes at a cost
++	  of an increased chance of incompatibilities with rare software
++	  on your machine.  Since this security level enables PaX, you should
++	  view <http://pax.grsecurity.net> and read about the PaX
++	  project.  While you are there, download chpax and run it on
++	  binaries that cause problems with PaX.  Also remember that
++	  since the /proc restrictions are enabled, you must run your
++	  identd as gid 1001.  This security level enables the following 
++	  features in addition to those listed in the low and medium 
++	  security levels:
++
++	  - Additional /proc restrictions
++	  - Chmod restrictions in chroot
++	  - No signals, ptrace, or viewing of processes outside of chroot
++	  - Capability restrictions in chroot
++	  - Deny fchdir out of chroot
++	  - Priority restrictions in chroot
++	  - Segmentation-based implementation of PaX
++	  - Mprotect restrictions
++	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++	  - Kernel stack randomization
++	  - Mount/unmount/remount logging
++	  - Kernel symbol hiding
++	  - Prevention of memory exhaustion-based exploits
++	  - Hardening of module auto-loading
++	  - Ptrace restrictions
++	  - Restricted vm86 mode
++	  - Restricted sysfs/debugfs
++	  - Active kernel exploit response
++
++config GRKERNSEC_CUSTOM
++	bool "Custom"
++	help
++	  If you say Y here, you will be able to configure every grsecurity
++	  option, which allows you to enable many more features that aren't
++	  covered in the basic security levels.  These additional features
++	  include TPE, socket restrictions, and the sysctl system for
++	  grsecurity.  It is advised that you read through the help for
++	  each option to determine its usefulness in your situation.
++
++endchoice
++
++menu "Address Space Protection"
++depends on GRKERNSEC
++
++config GRKERNSEC_KMEM
++	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++	select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
++	help
++	  If you say Y here, /dev/kmem and /dev/mem won't be allowed to
++	  be written to via mmap or otherwise to modify the running kernel.
++	  /dev/port will also not be allowed to be opened. If you have module
++	  support disabled, enabling this will close up four ways that are
++	  currently used  to insert malicious code into the running kernel.
++	  Even with all these features enabled, we still highly recommend that
++	  you use the RBAC system, as it is still possible for an attacker to
++	  modify the running kernel through privileged I/O granted by ioperm/iopl.
++	  If you are not using XFree86, you may be able to stop this additional
++	  case by enabling the 'Disable privileged I/O' option. Though nothing
++	  legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
++	  but only to video memory, which is the only writing we allow in this
++	  case.  If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
++	  not be allowed to mprotect it with PROT_WRITE later.
++	  It is highly recommended that you say Y here if you meet all the
++	  conditions above.
++
++config GRKERNSEC_VM86
++	bool "Restrict VM86 mode"
++	depends on X86_32
++
++	help
++	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++	  make use of a special execution mode on 32bit x86 processors called
++	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
++	  video cards and will still work with this option enabled.  The purpose
++	  of the option is to prevent exploitation of emulation errors in
++	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
++	  Nearly all users should be able to enable this option.
++
++config GRKERNSEC_IO
++	bool "Disable privileged I/O"
++	depends on X86
++	select RTC_CLASS
++	select RTC_INTF_DEV
++	select RTC_DRV_CMOS
++
++	help
++	  If you say Y here, all ioperm and iopl calls will return an error.
++	  Ioperm and iopl can be used to modify the running kernel.
++	  Unfortunately, some programs need this access to operate properly,
++	  the most notable of which are XFree86 and hwclock.  hwclock can be
++	  remedied by having RTC support in the kernel, so real-time 
++	  clock support is enabled if this option is enabled, to ensure 
++	  that hwclock operates correctly.  XFree86 still will not 
++	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
++	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
++	  protect your kernel against modification, use the RBAC system.
++
++config GRKERNSEC_PROC_MEMMAP
++	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++	default y if (PAX_NOEXEC || PAX_ASLR)
++	depends on PAX_NOEXEC || PAX_ASLR
++	help
++	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++	  give no information about the addresses of its mappings if
++	  PaX features that rely on random addresses are enabled on the task.
++	  If you use PaX it is greatly recommended that you say Y here as it
++	  closes up a hole that makes the full ASLR useless for suid
++	  binaries.
++
++config GRKERNSEC_BRUTE
++	bool "Deter exploit bruteforcing"
++	help
++	  If you say Y here, attempts to bruteforce exploits against forking
++	  daemons such as apache or sshd, as well as against suid/sgid binaries
++	  will be deterred.  When a child of a forking daemon is killed by PaX
++	  or crashes due to an illegal instruction or other suspicious signal,
++	  the parent process will be delayed 30 seconds upon every subsequent
++	  fork until the administrator is able to assess the situation and
++	  restart the daemon.
++	  In the suid/sgid case, the attempt is logged, the user has all their
++	  processes terminated, and they are prevented from executing any further
++	  processes for 15 minutes.
++	  It is recommended that you also enable signal logging in the auditing
++	  section so that logs are generated when a process triggers a suspicious
++	  signal.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "deter_bruteforce" is created.
++
++
++config GRKERNSEC_MODHARDEN
++	bool "Harden module auto-loading"
++	depends on MODULES
++	help
++	  If you say Y here, module auto-loading in response to use of some
++	  feature implemented by an unloaded module will be restricted to
++	  root users.  Enabling this option helps defend against attacks 
++	  by unprivileged users who abuse the auto-loading behavior to 
++	  cause a vulnerable module to load that is then exploited.
++
++	  If this option prevents a legitimate use of auto-loading for a 
++	  non-root user, the administrator can execute modprobe manually 
++	  with the exact name of the module mentioned in the alert log.
++	  Alternatively, the administrator can add the module to the list
++	  of modules loaded at boot by modifying init scripts.
++
++	  Modification of init scripts will most likely be needed on 
++	  Ubuntu servers with encrypted home directory support enabled,
++	  as the first non-root user logging in will cause the ecb(aes),
++	  ecb(aes)-all, cbc(aes), and cbc(aes)-all  modules to be loaded.
++
++config GRKERNSEC_HIDESYM
++	bool "Hide kernel symbols"
++	help
++	  If you say Y here, getting information on loaded modules, and
++	  displaying all kernel symbols through a syscall will be restricted
++	  to users with CAP_SYS_MODULE.  For software compatibility reasons,
++	  /proc/kallsyms will be restricted to the root user.  The RBAC
++	  system can hide that entry even from root.
++
++	  This option also prevents leaking of kernel addresses through
++	  several /proc entries.
++
++	  Note that this option is only effective provided the following
++	  conditions are met:
++	  1) The kernel using grsecurity is not precompiled by some distribution
++	  2) You have also enabled GRKERNSEC_DMESG
++	  3) You are using the RBAC system and hiding other files such as your
++	     kernel image and System.map.  Alternatively, enabling this option
++	     causes the permissions on /boot, /lib/modules, and the kernel
++	     source directory to change at compile time to prevent 
++	     reading by non-root users.
++	  If the above conditions are met, this option will aid in providing a
++	  useful protection against local kernel exploitation of overflows
++	  and arbitrary read/write vulnerabilities.
++
++config GRKERNSEC_KERN_LOCKOUT
++	bool "Active kernel exploit response"
++	depends on X86 || ARM || PPC || SPARC
++	help
++	  If you say Y here, when a PaX alert is triggered due to suspicious
++	  activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
++	  or an OOPs occurs due to bad memory accesses, instead of just
++	  terminating the offending process (and potentially allowing
++	  a subsequent exploit from the same user), we will take one of two
++	  actions:
++	   If the user was root, we will panic the system
++	   If the user was non-root, we will log the attempt, terminate
++	   all processes owned by the user, then prevent them from creating
++	   any new processes until the system is restarted
++	  This deters repeated kernel exploitation/bruteforcing attempts
++	  and is useful for later forensics.
++
++endmenu
++menu "Role Based Access Control Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_RBAC_DEBUG
++	bool
++
++config GRKERNSEC_NO_RBAC
++	bool "Disable RBAC system"
++	help
++	  If you say Y here, the /dev/grsec device will be removed from the kernel,
++	  preventing the RBAC system from being enabled.  You should only say Y
++	  here if you have no intention of using the RBAC system, so as to prevent
++	  an attacker with root access from misusing the RBAC system to hide files
++	  and processes when loadable module support and /dev/[k]mem have been
++	  locked down.
++
++config GRKERNSEC_ACL_HIDEKERN
++	bool "Hide kernel processes"
++	help
++	  If you say Y here, all kernel threads will be hidden to all
++	  processes but those whose subject has the "view hidden processes"
++	  flag.
++
++config GRKERNSEC_ACL_MAXTRIES
++	int "Maximum tries before password lockout"
++	default 3
++	help
++	  This option enforces the maximum number of times a user can attempt
++	  to authorize themselves with the grsecurity RBAC system before being
++	  denied the ability to attempt authorization again for a specified time.
++	  The lower the number, the harder it will be to brute-force a password.
++
++config GRKERNSEC_ACL_TIMEOUT
++	int "Time to wait after max password tries, in seconds"
++	default 30
++	help
++	  This option specifies the time the user must wait after attempting to
++	  authorize to the RBAC system with the maximum number of invalid
++	  passwords.  The higher the number, the harder it will be to brute-force
++	  a password.
++
++endmenu
++menu "Filesystem Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_PROC
++	bool "Proc restrictions"
++	help
++	  If you say Y here, the permissions of the /proc filesystem
++	  will be altered to enhance system security and privacy.  You MUST
++  	  choose either a user only restriction or a user and group restriction.
++	  Depending upon the option you choose, you can either restrict users to
++	  see only the processes they themselves run, or choose a group that can
++	  view all processes and files normally restricted to root if you choose
++	  the "restrict to user only" option.  NOTE: If you're running identd as
++	  a non-root user, you will have to run it as the group you specify here.
++
++config GRKERNSEC_PROC_USER
++	bool "Restrict /proc to user only"
++	depends on GRKERNSEC_PROC
++	help
++	  If you say Y here, non-root users will only be able to view their own
++	  processes, and restricts them from viewing network-related information,
++	  and viewing kernel symbol and module information.
++
++config GRKERNSEC_PROC_USERGROUP
++	bool "Allow special group"
++	depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
++	help
++	  If you say Y here, you will be able to select a group that will be
++          able to view all processes and network-related information.  If you've
++          enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
++          remain hidden.  This option is useful if you want to run identd as
++          a non-root user.
++
++config GRKERNSEC_PROC_GID
++	int "GID for special group"
++	depends on GRKERNSEC_PROC_USERGROUP
++	default 1001
++
++config GRKERNSEC_PROC_ADD
++	bool "Additional restrictions"
++	depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
++	help
++	  If you say Y here, additional restrictions will be placed on
++	  /proc that keep normal users from viewing device information and 
++	  slabinfo information that could be useful for exploits.
++
++config GRKERNSEC_LINK
++	bool "Linking restrictions"
++	help
++	  If you say Y here, /tmp race exploits will be prevented, since users
++	  will no longer be able to follow symlinks owned by other users in
++	  world-writable +t directories (e.g. /tmp), unless the owner of the
++	  symlink is the owner of the directory. users will also not be
++	  able to hardlink to files they do not own.  If the sysctl option is
++	  enabled, a sysctl option with name "linking_restrictions" is created.
++
++config GRKERNSEC_FIFO
++	bool "FIFO restrictions"
++	help
++	  If you say Y here, users will not be able to write to FIFOs they don't
++	  own in world-writable +t directories (e.g. /tmp), unless the owner of
++	  the FIFO is the same owner of the directory it's held in.  If the sysctl
++	  option is enabled, a sysctl option with name "fifo_restrictions" is
++	  created.
++
++config GRKERNSEC_SYSFS_RESTRICT
++	bool "Sysfs/debugfs restriction"
++	depends on SYSFS
++	help
++	  If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
++	  any filesystem normally mounted under it (e.g. debugfs) will only
++	  be accessible by root.  These filesystems generally provide access
++	  to hardware and debug information that isn't appropriate for unprivileged
++	  users of the system.  Sysfs and debugfs have also become a large source
++	  of new vulnerabilities, ranging from infoleaks to local compromise.
++	  There has been very little oversight with an eye toward security involved
++	  in adding new exporters of information to these filesystems, so their
++	  use is discouraged.
++	  This option is equivalent to a chmod 0700 of the mount paths.
++
++config GRKERNSEC_ROFS
++	bool "Runtime read-only mount protection"
++	help
++	  If you say Y here, a sysctl option with name "romount_protect" will
++	  be created.  By setting this option to 1 at runtime, filesystems
++	  will be protected in the following ways:
++	  * No new writable mounts will be allowed
++	  * Existing read-only mounts won't be able to be remounted read/write
++	  * Write operations will be denied on all block devices
++	  This option acts independently of grsec_lock: once it is set to 1,
++	  it cannot be turned off.  Therefore, please be mindful of the resulting
++	  behavior if this option is enabled in an init script on a read-only
++	  filesystem.  This feature is mainly intended for secure embedded systems.
++
++config GRKERNSEC_CHROOT
++	bool "Chroot jail restrictions"
++	help
++	  If you say Y here, you will be able to choose several options that will
++	  make breaking out of a chrooted jail much more difficult.  If you
++	  encounter no software incompatibilities with the following options, it
++	  is recommended that you enable each one.
++
++config GRKERNSEC_CHROOT_MOUNT
++	bool "Deny mounts"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  mount or remount filesystems.  If the sysctl option is enabled, a
++	  sysctl option with name "chroot_deny_mount" is created.
++
++config GRKERNSEC_CHROOT_DOUBLE
++	bool "Deny double-chroots"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to chroot
++	  again outside the chroot.  This is a widely used method of breaking
++	  out of a chroot jail and should not be allowed.  If the sysctl 
++	  option is enabled, a sysctl option with name 
++	  "chroot_deny_chroot" is created.
++
++config GRKERNSEC_CHROOT_PIVOT
++	bool "Deny pivot_root in chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to use
++	  a function called pivot_root() that was introduced in Linux 2.3.41.  It
++	  works similar to chroot in that it changes the root filesystem.  This
++	  function could be misused in a chrooted process to attempt to break out
++	  of the chroot, and therefore should not be allowed.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_deny_pivot" is
++	  created.
++
++config GRKERNSEC_CHROOT_CHDIR
++	bool "Enforce chdir(\"/\") on all chroots"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, the current working directory of all newly-chrooted
++	  applications will be set to the the root directory of the chroot.
++	  The man page on chroot(2) states:
++	  Note that this call does not change  the  current  working
++	  directory,  so  that `.' can be outside the tree rooted at
++	  `/'.  In particular, the  super-user  can  escape  from  a
++	  `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
++
++	  It is recommended that you say Y here, since it's not known to break
++	  any software.  If the sysctl option is enabled, a sysctl option with
++	  name "chroot_enforce_chdir" is created.
++
++config GRKERNSEC_CHROOT_CHMOD
++	bool "Deny (f)chmod +s"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to chmod
++	  or fchmod files to make them have suid or sgid bits.  This protects
++	  against another published method of breaking a chroot.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_deny_chmod" is
++	  created.
++
++config GRKERNSEC_CHROOT_FCHDIR
++	bool "Deny fchdir out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, a well-known method of breaking chroots by fchdir'ing
++	  to a file descriptor of the chrooting process that points to a directory
++	  outside the filesystem will be stopped.  If the sysctl option
++	  is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
++
++config GRKERNSEC_CHROOT_MKNOD
++	bool "Deny mknod"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be allowed to
++	  mknod.  The problem with using mknod inside a chroot is that it
++	  would allow an attacker to create a device entry that is the same
++	  as one on the physical root of your system, which could range from
++	  anything from the console device to a device for your harddrive (which
++	  they could then use to wipe the drive or steal data).  It is recommended
++	  that you say Y here, unless you run into software incompatibilities.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "chroot_deny_mknod" is created.
++
++config GRKERNSEC_CHROOT_SHMAT
++	bool "Deny shmat() out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to attach
++	  to shared memory segments that were created outside of the chroot jail.
++	  It is recommended that you say Y here.  If the sysctl option is enabled,
++	  a sysctl option with name "chroot_deny_shmat" is created.
++
++config GRKERNSEC_CHROOT_UNIX
++	bool "Deny access to abstract AF_UNIX sockets out of chroot"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  connect to abstract (meaning not belonging to a filesystem) Unix
++	  domain sockets that were bound outside of a chroot.  It is recommended
++	  that you say Y here.  If the sysctl option is enabled, a sysctl option
++	  with name "chroot_deny_unix" is created.
++
++config GRKERNSEC_CHROOT_FINDTASK
++	bool "Protect outside processes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to
++	  kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, 
++	  getsid, or view any process outside of the chroot.  If the sysctl
++	  option is enabled, a sysctl option with name "chroot_findtask" is
++	  created.
++
++config GRKERNSEC_CHROOT_NICE
++	bool "Restrict priority changes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, processes inside a chroot will not be able to raise
++	  the priority of processes in the chroot, or alter the priority of
++	  processes outside the chroot.  This provides more security than simply
++	  removing CAP_SYS_NICE from the process' capability set.  If the
++	  sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
++	  is created.
++
++config GRKERNSEC_CHROOT_SYSCTL
++	bool "Deny sysctl writes"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, an attacker in a chroot will not be able to
++	  write to sysctl entries, either by sysctl(2) or through a /proc
++	  interface.  It is strongly recommended that you say Y here. If the
++	  sysctl option is enabled, a sysctl option with name
++	  "chroot_deny_sysctl" is created.
++
++config GRKERNSEC_CHROOT_CAPS
++	bool "Capability restrictions"
++	depends on GRKERNSEC_CHROOT
++	help
++	  If you say Y here, the capabilities on all root processes within a
++	  chroot jail will be lowered to stop module insertion, raw i/o,
++	  system and net admin tasks, rebooting the system, modifying immutable
++	  files, modifying IPC owned by another, and changing the system time.
++	  This is left an option because it can break some apps.  Disable this
++	  if your chrooted apps are having problems performing those kinds of
++	  tasks.  If the sysctl option is enabled, a sysctl option with
++	  name "chroot_caps" is created.
++
++endmenu
++menu "Kernel Auditing"
++depends on GRKERNSEC
++
++config GRKERNSEC_AUDIT_GROUP
++	bool "Single group for auditing"
++	help
++	  If you say Y here, the exec, chdir, and (un)mount logging features
++	  will only operate on a group you specify.  This option is recommended
++	  if you only want to watch certain users instead of having a large
++	  amount of logs from the entire system.  If the sysctl option is enabled,
++	  a sysctl option with name "audit_group" is created.
++
++config GRKERNSEC_AUDIT_GID
++	int "GID for auditing"
++	depends on GRKERNSEC_AUDIT_GROUP
++	default 1007
++
++config GRKERNSEC_EXECLOG
++	bool "Exec logging"
++	help
++	  If you say Y here, all execve() calls will be logged (since the
++	  other exec*() calls are frontends to execve(), all execution
++	  will be logged).  Useful for shell-servers that like to keep track
++	  of their users.  If the sysctl option is enabled, a sysctl option with
++	  name "exec_logging" is created.
++	  WARNING: This option when enabled will produce a LOT of logs, especially
++	  on an active system.
++
++config GRKERNSEC_RESLOG
++	bool "Resource logging"
++	help
++	  If you say Y here, all attempts to overstep resource limits will
++	  be logged with the resource name, the requested size, and the current
++	  limit.  It is highly recommended that you say Y here.  If the sysctl
++	  option is enabled, a sysctl option with name "resource_logging" is
++	  created.  If the RBAC system is enabled, the sysctl value is ignored.
++
++config GRKERNSEC_CHROOT_EXECLOG
++	bool "Log execs within chroot"
++	help
++	  If you say Y here, all executions inside a chroot jail will be logged
++	  to syslog.  This can cause a large amount of logs if certain
++	  applications (eg. djb's daemontools) are installed on the system, and
++	  is therefore left as an option.  If the sysctl option is enabled, a
++	  sysctl option with name "chroot_execlog" is created.
++
++config GRKERNSEC_AUDIT_PTRACE
++	bool "Ptrace logging"
++	help
++	  If you say Y here, all attempts to attach to a process via ptrace
++	  will be logged.  If the sysctl option is enabled, a sysctl option
++	  with name "audit_ptrace" is created.
++
++config GRKERNSEC_AUDIT_CHDIR
++	bool "Chdir logging"
++	help
++	  If you say Y here, all chdir() calls will be logged.  If the sysctl
++ 	  option is enabled, a sysctl option with name "audit_chdir" is created.
++
++config GRKERNSEC_AUDIT_MOUNT
++	bool "(Un)Mount logging"
++	help
++	  If you say Y here, all mounts and unmounts will be logged.  If the
++	  sysctl option is enabled, a sysctl option with name "audit_mount" is
++	  created.
++
++config GRKERNSEC_SIGNAL
++	bool "Signal logging"
++	help
++	  If you say Y here, certain important signals will be logged, such as
++	  SIGSEGV, which will as a result inform you of when a error in a program
++	  occurred, which in some cases could mean a possible exploit attempt.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "signal_logging" is created.
++
++config GRKERNSEC_FORKFAIL
++	bool "Fork failure logging"
++	help
++	  If you say Y here, all failed fork() attempts will be logged.
++	  This could suggest a fork bomb, or someone attempting to overstep
++	  their process limit.  If the sysctl option is enabled, a sysctl option
++	  with name "forkfail_logging" is created.
++
++config GRKERNSEC_TIME
++	bool "Time change logging"
++	help
++	  If you say Y here, any changes of the system clock will be logged.
++	  If the sysctl option is enabled, a sysctl option with name
++	  "timechange_logging" is created.
++
++config GRKERNSEC_PROC_IPADDR
++	bool "/proc/<pid>/ipaddr support"
++	help
++	  If you say Y here, a new entry will be added to each /proc/<pid>
++	  directory that contains the IP address of the person using the task.
++	  The IP is carried across local TCP and AF_UNIX stream sockets.
++	  This information can be useful for IDS/IPSes to perform remote response
++	  to a local attack.  The entry is readable by only the owner of the
++	  process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
++	  the RBAC system), and thus does not create privacy concerns.
++
++config GRKERNSEC_RWXMAP_LOG
++	bool 'Denied RWX mmap/mprotect logging'
++	depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
++	help
++	  If you say Y here, calls to mmap() and mprotect() with explicit
++	  usage of PROT_WRITE and PROT_EXEC together will be logged when
++	  denied by the PAX_MPROTECT feature.  If the sysctl option is
++	  enabled, a sysctl option with name "rwxmap_logging" is created.
++
++config GRKERNSEC_AUDIT_TEXTREL
++	bool 'ELF text relocations logging (READ HELP)'
++	depends on PAX_MPROTECT
++	help
++	  If you say Y here, text relocations will be logged with the filename
++	  of the offending library or binary.  The purpose of the feature is
++	  to help Linux distribution developers get rid of libraries and
++	  binaries that need text relocations which hinder the future progress
++	  of PaX.  Only Linux distribution developers should say Y here, and
++	  never on a production machine, as this option creates an information
++	  leak that could aid an attacker in defeating the randomization of
++	  a single memory region.  If the sysctl option is enabled, a sysctl
++	  option with name "audit_textrel" is created.
++
++endmenu
++
++menu "Executable Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_EXECVE
++	bool "Enforce RLIMIT_NPROC on execs"
++	help
++	  If you say Y here, users with a resource limit on processes will
++	  have the value checked during execve() calls.  The current system
++	  only checks the system limit during fork() calls.  If the sysctl option
++	  is enabled, a sysctl option with name "execve_limiting" is created.
++
++config GRKERNSEC_DMESG
++	bool "Dmesg(8) restriction"
++	help
++	  If you say Y here, non-root users will not be able to use dmesg(8)
++	  to view up to the last 4kb of messages in the kernel's log buffer.
++	  The kernel's log buffer often contains kernel addresses and other
++	  identifying information useful to an attacker in fingerprinting a
++	  system for a targeted exploit.
++	  If the sysctl option is enabled, a sysctl option with name "dmesg" is
++	  created.
++
++config GRKERNSEC_HARDEN_PTRACE
++	bool "Deter ptrace-based process snooping"
++	help
++	  If you say Y here, TTY sniffers and other malicious monitoring
++	  programs implemented through ptrace will be defeated.  If you
++	  have been using the RBAC system, this option has already been
++	  enabled for several years for all users, with the ability to make
++	  fine-grained exceptions.
++
++	  This option only affects the ability of non-root users to ptrace
++	  processes that are not a descendent of the ptracing process.
++	  This means that strace ./binary and gdb ./binary will still work,
++	  but attaching to arbitrary processes will not.  If the sysctl
++	  option is enabled, a sysctl option with name "harden_ptrace" is
++	  created.
++
++config GRKERNSEC_TPE
++	bool "Trusted Path Execution (TPE)"
++	help
++	  If you say Y here, you will be able to choose a gid to add to the
++	  supplementary groups of users you want to mark as "untrusted."
++	  These users will not be able to execute any files that are not in
++	  root-owned directories writable only by root.  If the sysctl option
++	  is enabled, a sysctl option with name "tpe" is created.
++
++config GRKERNSEC_TPE_ALL
++	bool "Partially restrict all non-root users"
++	depends on GRKERNSEC_TPE
++	help
++	  If you say Y here, all non-root users will be covered under
++	  a weaker TPE restriction.  This is separate from, and in addition to,
++	  the main TPE options that you have selected elsewhere.  Thus, if a
++	  "trusted" GID is chosen, this restriction applies to even that GID.
++	  Under this restriction, all non-root users will only be allowed to
++	  execute files in directories they own that are not group or
++	  world-writable, or in directories owned by root and writable only by
++	  root.  If the sysctl option is enabled, a sysctl option with name
++	  "tpe_restrict_all" is created.
++
++config GRKERNSEC_TPE_INVERT
++	bool "Invert GID option"
++	depends on GRKERNSEC_TPE
++	help
++	  If you say Y here, the group you specify in the TPE configuration will
++	  decide what group TPE restrictions will be *disabled* for.  This
++	  option is useful if you want TPE restrictions to be applied to most
++	  users on the system.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_invert" is created.  Unlike other sysctl options, this
++	  entry will default to on for backward-compatibility.
++
++config GRKERNSEC_TPE_GID
++	int "GID for untrusted users"
++	depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
++	default 1005
++	help
++	  Setting this GID determines what group TPE restrictions will be
++	  *enabled* for.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_gid" is created.
++
++config GRKERNSEC_TPE_GID
++	int "GID for trusted users"
++	depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
++	default 1005
++	help
++	  Setting this GID determines what group TPE restrictions will be
++	  *disabled* for.  If the sysctl option is enabled, a sysctl option
++	  with name "tpe_gid" is created.
++
++endmenu
++menu "Network Protections"
++depends on GRKERNSEC
++
++config GRKERNSEC_RANDNET
++	bool "Larger entropy pools"
++	help
++	  If you say Y here, the entropy pools used for many features of Linux
++	  and grsecurity will be doubled in size.  Since several grsecurity
++	  features use additional randomness, it is recommended that you say Y
++	  here.  Saying Y here has a similar effect as modifying
++	  /proc/sys/kernel/random/poolsize.
++
++config GRKERNSEC_BLACKHOLE
++	bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
++	depends on NET
++	help
++	  If you say Y here, neither TCP resets nor ICMP
++	  destination-unreachable packets will be sent in response to packets
++	  sent to ports for which no associated listening process exists.
++	  This feature supports both IPV4 and IPV6 and exempts the 
++	  loopback interface from blackholing.  Enabling this feature 
++	  makes a host more resilient to DoS attacks and reduces network
++	  visibility against scanners.
++
++	  The blackhole feature as-implemented is equivalent to the FreeBSD
++	  blackhole feature, as it prevents RST responses to all packets, not
++	  just SYNs.  Under most application behavior this causes no
++	  problems, but applications (like haproxy) may not close certain
++	  connections in a way that cleanly terminates them on the remote
++	  end, leaving the remote host in LAST_ACK state.  Because of this
++	  side-effect and to prevent intentional LAST_ACK DoSes, this
++	  feature also adds automatic mitigation against such attacks.
++	  The mitigation drastically reduces the amount of time a socket
++	  can spend in LAST_ACK state.  If you're using haproxy and not
++	  all servers it connects to have this option enabled, consider
++	  disabling this feature on the haproxy host.
++
++	  If the sysctl option is enabled, two sysctl options with names
++	  "ip_blackhole" and "lastack_retries" will be created.
++	  While "ip_blackhole" takes the standard zero/non-zero on/off
++	  toggle, "lastack_retries" uses the same kinds of values as
++	  "tcp_retries1" and "tcp_retries2".  The default value of 4
++	  prevents a socket from lasting more than 45 seconds in LAST_ACK
++	  state.
++
++config GRKERNSEC_SOCKET
++	bool "Socket restrictions"
++	depends on NET
++	help
++	  If you say Y here, you will be able to choose from several options.
++	  If you assign a GID on your system and add it to the supplementary
++	  groups of users you want to restrict socket access to, this patch
++	  will perform up to three things, based on the option(s) you choose.
++
++config GRKERNSEC_SOCKET_ALL
++	bool "Deny any sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to connect to other hosts from your machine or run server
++	  applications from your machine.  If the sysctl option is enabled, a
++	  sysctl option with name "socket_all" is created.
++
++config GRKERNSEC_SOCKET_ALL_GID
++	int "GID to deny all sockets for"
++	depends on GRKERNSEC_SOCKET_ALL
++	default 1004
++	help
++	  Here you can choose the GID to disable socket access for. Remember to
++	  add the users you want socket access disabled for to the GID
++	  specified here.  If the sysctl option is enabled, a sysctl option
++	  with name "socket_all_gid" is created.
++
++config GRKERNSEC_SOCKET_CLIENT
++	bool "Deny client sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to connect to other hosts from your machine, but will be
++	  able to run servers.  If this option is enabled, all users in the group
++	  you specify will have to use passive mode when initiating ftp transfers
++	  from the shell on your machine.  If the sysctl option is enabled, a
++	  sysctl option with name "socket_client" is created.
++
++config GRKERNSEC_SOCKET_CLIENT_GID
++	int "GID to deny client sockets for"
++	depends on GRKERNSEC_SOCKET_CLIENT
++	default 1003
++	help
++	  Here you can choose the GID to disable client socket access for.
++	  Remember to add the users you want client socket access disabled for to
++	  the GID specified here.  If the sysctl option is enabled, a sysctl
++	  option with name "socket_client_gid" is created.
++
++config GRKERNSEC_SOCKET_SERVER
++	bool "Deny server sockets to group"
++	depends on GRKERNSEC_SOCKET
++	help
++	  If you say Y here, you will be able to choose a GID of whose users will
++	  be unable to run server applications from your machine.  If the sysctl
++	  option is enabled, a sysctl option with name "socket_server" is created.
++
++config GRKERNSEC_SOCKET_SERVER_GID
++	int "GID to deny server sockets for"
++	depends on GRKERNSEC_SOCKET_SERVER
++	default 1002
++	help
++	  Here you can choose the GID to disable server socket access for.
++	  Remember to add the users you want server socket access disabled for to
++	  the GID specified here.  If the sysctl option is enabled, a sysctl
++	  option with name "socket_server_gid" is created.
++
++endmenu
++menu "Sysctl support"
++depends on GRKERNSEC && SYSCTL
++
++config GRKERNSEC_SYSCTL
++	bool "Sysctl support"
++	help
++	  If you say Y here, you will be able to change the options that
++	  grsecurity runs with at bootup, without having to recompile your
++	  kernel.  You can echo values to files in /proc/sys/kernel/grsecurity
++	  to enable (1) or disable (0) various features.  All the sysctl entries
++	  are mutable until the "grsec_lock" entry is set to a non-zero value.
++	  All features enabled in the kernel configuration are disabled at boot
++	  if you do not say Y to the "Turn on features by default" option.
++	  All options should be set at startup, and the grsec_lock entry should
++	  be set to a non-zero value after all the options are set.
++	  *THIS IS EXTREMELY IMPORTANT*
++
++config GRKERNSEC_SYSCTL_DISTRO
++	bool "Extra sysctl support for distro makers (READ HELP)"
++	depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
++	help
++	  If you say Y here, additional sysctl options will be created
++	  for features that affect processes running as root.  Therefore,
++	  it is critical when using this option that the grsec_lock entry be
++	  enabled after boot.  Only distros with prebuilt kernel packages
++	  with this option enabled that can ensure grsec_lock is enabled
++	  after boot should use this option.
++	  *Failure to set grsec_lock after boot makes all grsec features
++	  this option covers useless*
++
++	  Currently this option creates the following sysctl entries:
++	  "Disable Privileged I/O": "disable_priv_io"	
++
++config GRKERNSEC_SYSCTL_ON
++	bool "Turn on features by default"
++	depends on GRKERNSEC_SYSCTL
++	help
++	  If you say Y here, instead of having all features enabled in the
++	  kernel configuration disabled at boot time, the features will be
++	  enabled at boot time.  It is recommended you say Y here unless
++	  there is some reason you would want all sysctl-tunable features to
++	  be disabled by default.  As mentioned elsewhere, it is important
++	  to enable the grsec_lock entry once you have finished modifying
++	  the sysctl entries.
++
++endmenu
++menu "Logging Options"
++depends on GRKERNSEC
++
++config GRKERNSEC_FLOODTIME
++	int "Seconds in between log messages (minimum)"
++	default 10
++	help
++	  This option allows you to enforce the number of seconds between
++	  grsecurity log messages.  The default should be suitable for most
++	  people, however, if you choose to change it, choose a value small enough
++	  to allow informative logs to be produced, but large enough to
++	  prevent flooding.
++
++config GRKERNSEC_FLOODBURST
++	int "Number of messages in a burst (maximum)"
++	default 4
++	help
++	  This option allows you to choose the maximum number of messages allowed
++	  within the flood time interval you chose in a separate option.  The
++	  default should be suitable for most people, however if you find that
++	  many of your logs are being interpreted as flooding, you may want to
++	  raise this value.
++
++endmenu
++
++endmenu
+diff -urNp linux-3.0.3/grsecurity/Makefile linux-3.0.3/grsecurity/Makefile
+--- linux-3.0.3/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/grsecurity/Makefile	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,34 @@
++# grsecurity's ACL system was originally written in 2001 by Michael Dalton
++# during 2001-2009 it has been completely redesigned by Brad Spengler
++# into an RBAC system
++#
++# All code in this directory and various hooks inserted throughout the kernel
++# are copyright Brad Spengler - Open Source Security, Inc., and released 
++# under the GPL v2 or higher
++
++obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
++	grsec_mount.o grsec_sig.o grsec_sysctl.o \
++	grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
++
++obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
++	gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
++	gracl_learn.o grsec_log.o
++obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
++
++ifdef CONFIG_NET
++obj-y += grsec_sock.o
++obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
++endif
++
++ifndef CONFIG_GRKERNSEC
++obj-y += grsec_disabled.o
++endif
++
++ifdef CONFIG_GRKERNSEC_HIDESYM
++extra-y := grsec_hidesym.o
++$(obj)/grsec_hidesym.o:
++	@-chmod -f 500 /boot
++	@-chmod -f 500 /lib/modules
++	@-chmod -f 700 .
++	@echo '  grsec: protected kernel image paths'
++endif
+diff -urNp linux-3.0.3/include/acpi/acpi_bus.h linux-3.0.3/include/acpi/acpi_bus.h
+--- linux-3.0.3/include/acpi/acpi_bus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/acpi/acpi_bus.h	2011-08-23 21:47:56.000000000 -0400
+@@ -107,7 +107,7 @@ struct acpi_device_ops {
+ 	acpi_op_bind bind;
+ 	acpi_op_unbind unbind;
+ 	acpi_op_notify notify;
+-};
++} __no_const;
+ 
+ #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
+ 
+diff -urNp linux-3.0.3/include/asm-generic/atomic-long.h linux-3.0.3/include/asm-generic/atomic-long.h
+--- linux-3.0.3/include/asm-generic/atomic-long.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/atomic-long.h	2011-08-23 21:47:56.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -54081,7 +50887,7 @@ index b7babf0..5b6fcb5 100644
  #define ATOMIC_LONG_INIT(i)	ATOMIC64_INIT(i)
  
  static inline long atomic_long_read(atomic_long_t *l)
-@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
+@@ -31,6 +37,15 @@ static inline long atomic_long_read(atom
  	return (long)atomic64_read(v);
  }
  
@@ -54097,7 +50903,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_set(atomic_long_t *l, long i)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
+@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomi
  	atomic64_set(v, i);
  }
  
@@ -54113,7 +50919,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_inc(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
+@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomi
  	atomic64_inc(v);
  }
  
@@ -54129,7 +50935,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_dec(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
+@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomi
  	atomic64_dec(v);
  }
  
@@ -54145,7 +50951,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_add(long i, atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
+@@ -59,6 +101,15 @@ static inline void atomic_long_add(long 
  	atomic64_add(i, v);
  }
  
@@ -54161,7 +50967,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
+@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long 
  	atomic64_sub(i, v);
  }
  
@@ -54177,7 +50983,7 @@ index b7babf0..5b6fcb5 100644
  static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
+@@ -115,6 +175,15 @@ static inline long atomic_long_inc_retur
  	return (long)atomic64_inc_return(v);
  }
  
@@ -54193,7 +50999,7 @@ index b7babf0..5b6fcb5 100644
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
  	atomic64_t *v = (atomic64_t *)l;
-@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+@@ -140,6 +209,12 @@ static inline long atomic_long_add_unles
  
  typedef atomic_t atomic_long_t;
  
@@ -54206,7 +51012,7 @@ index b7babf0..5b6fcb5 100644
  #define ATOMIC_LONG_INIT(i)	ATOMIC_INIT(i)
  static inline long atomic_long_read(atomic_long_t *l)
  {
-@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
+@@ -148,6 +223,15 @@ static inline long atomic_long_read(atom
  	return (long)atomic_read(v);
  }
  
@@ -54222,7 +51028,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_set(atomic_long_t *l, long i)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
+@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomi
  	atomic_set(v, i);
  }
  
@@ -54238,7 +51044,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_inc(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
+@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomi
  	atomic_inc(v);
  }
  
@@ -54254,7 +51060,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_dec(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
+@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomi
  	atomic_dec(v);
  }
  
@@ -54270,7 +51076,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_add(long i, atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
+@@ -176,6 +287,15 @@ static inline void atomic_long_add(long 
  	atomic_add(i, v);
  }
  
@@ -54286,7 +51092,7 @@ index b7babf0..5b6fcb5 100644
  static inline void atomic_long_sub(long i, atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
+@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long 
  	atomic_sub(i, v);
  }
  
@@ -54302,7 +51108,7 @@ index b7babf0..5b6fcb5 100644
  static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
+@@ -232,6 +361,15 @@ static inline long atomic_long_inc_retur
  	return (long)atomic_inc_return(v);
  }
  
@@ -54318,7 +51124,7 @@ index b7babf0..5b6fcb5 100644
  static inline long atomic_long_dec_return(atomic_long_t *l)
  {
  	atomic_t *v = (atomic_t *)l;
-@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
+@@ -255,4 +393,49 @@ static inline long atomic_long_add_unles
  
  #endif  /*  BITS_PER_LONG == 64  */
  
@@ -54330,12 +51136,12 @@ index b7babf0..5b6fcb5 100644
 +	atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_inc_unchecked((atomic_unchecked_t *)NULL);
-+	atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
++	(void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
 +	atomic_dec_unchecked((atomic_unchecked_t *)NULL);
 +	atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
-+	atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
++	(void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
 +
 +	atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
 +	atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
@@ -54368,140 +51174,22 @@ index b7babf0..5b6fcb5 100644
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
-index 1bfcfe5..f4916f2 100644
---- a/include/asm-generic/cache.h
-+++ b/include/asm-generic/cache.h
+diff -urNp linux-3.0.3/include/asm-generic/cache.h linux-3.0.3/include/asm-generic/cache.h
+--- linux-3.0.3/include/asm-generic/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
  
 -#define L1_CACHE_SHIFT		5
 -#define L1_CACHE_BYTES		(1 << L1_CACHE_SHIFT)
-+#define L1_CACHE_SHIFT		5U
-+#define L1_CACHE_BYTES		(1U << L1_CACHE_SHIFT)
++#define L1_CACHE_SHIFT		5UL
++#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
-index 0c80bb3..6baf94b 100644
---- a/include/asm-generic/dma-mapping-common.h
-+++ b/include/asm-generic/dma-mapping-common.h
-@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
- 					      enum dma_data_direction dir,
- 					      struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	dma_addr_t addr;
- 
- 	kmemcheck_mark_initialized(ptr, size);
-@@ -30,7 +30,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
- 					  enum dma_data_direction dir,
- 					  struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->unmap_page)
-@@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
- 				   int nents, enum dma_data_direction dir,
- 				   struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	int i, ents;
- 	struct scatterlist *s;
- 
-@@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg
- 				      int nents, enum dma_data_direction dir,
- 				      struct dma_attrs *attrs)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	debug_dma_unmap_sg(dev, sg, nents, dir);
-@@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
- 				      size_t offset, size_t size,
- 				      enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 	dma_addr_t addr;
- 
- 	kmemcheck_mark_initialized(page_address(page) + offset, size);
-@@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
- static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
- 				  size_t size, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->unmap_page)
-@@ -97,7 +97,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
- 					   size_t size,
- 					   enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_for_cpu)
-@@ -109,7 +109,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
- 					      dma_addr_t addr, size_t size,
- 					      enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_single_for_device)
-@@ -139,7 +139,7 @@ static inline void
- dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
- 		    int nelems, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_sg_for_cpu)
-@@ -151,7 +151,7 @@ static inline void
- dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
- 		       int nelems, enum dma_data_direction dir)
- {
--	struct dma_map_ops *ops = get_dma_ops(dev);
-+	const struct dma_map_ops *ops = get_dma_ops(dev);
- 
- 	BUG_ON(!valid_dma_direction(dir));
- 	if (ops->sync_sg_for_device)
-diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
-index 3c2344f..4590a7d 100644
---- a/include/asm-generic/futex.h
-+++ b/include/asm-generic/futex.h
-@@ -6,7 +6,7 @@
- #include <asm/errno.h>
- 
- static inline int
--futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
-+futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
- {
- 	int op = (encoded_op >> 28) & 7;
- 	int cmp = (encoded_op >> 24) & 15;
-@@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
- }
- 
- static inline int
--futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
-+futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval)
- {
- 	return -ENOSYS;
- }
-diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
-index 1ca3efc..e3dc852 100644
---- a/include/asm-generic/int-l64.h
-+++ b/include/asm-generic/int-l64.h
+diff -urNp linux-3.0.3/include/asm-generic/int-l64.h linux-3.0.3/include/asm-generic/int-l64.h
+--- linux-3.0.3/include/asm-generic/int-l64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/int-l64.h	2011-08-23 21:47:56.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -54511,10 +51199,9 @@ index 1ca3efc..e3dc852 100644
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
-index f394147..b6152b9 100644
---- a/include/asm-generic/int-ll64.h
-+++ b/include/asm-generic/int-ll64.h
+diff -urNp linux-3.0.3/include/asm-generic/int-ll64.h linux-3.0.3/include/asm-generic/int-ll64.h
+--- linux-3.0.3/include/asm-generic/int-ll64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/int-ll64.h	2011-08-23 21:47:56.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -54524,10 +51211,9 @@ index f394147..b6152b9 100644
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
-index 0232ccb..13d9165 100644
---- a/include/asm-generic/kmap_types.h
-+++ b/include/asm-generic/kmap_types.h
+diff -urNp linux-3.0.3/include/asm-generic/kmap_types.h linux-3.0.3/include/asm-generic/kmap_types.h
+--- linux-3.0.3/include/asm-generic/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/kmap_types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -29,10 +29,11 @@ KMAP_D(16)	KM_IRQ_PTE,
  KMAP_D(17)	KM_NMI,
  KMAP_D(18)	KM_NMI_PTE,
@@ -54541,10 +51227,27 @@ index 0232ccb..13d9165 100644
  };
  
  #undef KMAP_D
-diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
-index 725612b..9cc513a 100644
---- a/include/asm-generic/pgtable-nopmd.h
-+++ b/include/asm-generic/pgtable-nopmd.h
+diff -urNp linux-3.0.3/include/asm-generic/pgtable.h linux-3.0.3/include/asm-generic/pgtable.h
+--- linux-3.0.3/include/asm-generic/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/pgtable.h	2011-08-23 21:47:56.000000000 -0400
+@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
+ #endif /* __HAVE_ARCH_PMD_WRITE */
+ #endif
+ 
++#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
++static inline unsigned long pax_open_kernel(void) { return 0; }
++#endif
++
++#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
++static inline unsigned long pax_close_kernel(void) { return 0; }
++#endif
++
+ #endif /* !__ASSEMBLY__ */
+ 
+ #endif /* _ASM_GENERIC_PGTABLE_H */
+diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopmd.h linux-3.0.3/include/asm-generic/pgtable-nopmd.h
+--- linux-3.0.3/include/asm-generic/pgtable-nopmd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/pgtable-nopmd.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -54581,10 +51284,9 @@ index 725612b..9cc513a 100644
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
-index 810431d..ccc3638 100644
---- a/include/asm-generic/pgtable-nopud.h
-+++ b/include/asm-generic/pgtable-nopud.h
+diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopud.h linux-3.0.3/include/asm-generic/pgtable-nopud.h
+--- linux-3.0.3/include/asm-generic/pgtable-nopud.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/pgtable-nopud.h	2011-08-23 21:47:56.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -54615,30 +51317,10 @@ index 810431d..ccc3638 100644
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
-index b4bfe33..625cfa2 100644
---- a/include/asm-generic/pgtable.h
-+++ b/include/asm-generic/pgtable.h
-@@ -447,6 +447,14 @@ static inline int pmd_write(pmd_t pmd)
- #endif /* __HAVE_ARCH_PMD_WRITE */
- #endif
- 
-+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
-+static inline unsigned long pax_open_kernel(void) { return 0; }
-+#endif
-+
-+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
-+static inline unsigned long pax_close_kernel(void) { return 0; }
-+#endif
-+
- #endif /* !__ASSEMBLY__ */
- 
- #endif /* _ASM_GENERIC_PGTABLE_H */
-diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
-index fe77e33..88723cb 100644
---- a/include/asm-generic/vmlinux.lds.h
-+++ b/include/asm-generic/vmlinux.lds.h
-@@ -213,6 +213,7 @@
+diff -urNp linux-3.0.3/include/asm-generic/vmlinux.lds.h linux-3.0.3/include/asm-generic/vmlinux.lds.h
+--- linux-3.0.3/include/asm-generic/vmlinux.lds.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/asm-generic/vmlinux.lds.h	2011-08-23 21:47:56.000000000 -0400
+@@ -217,6 +217,7 @@
  	.rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {		\
  		VMLINUX_SYMBOL(__start_rodata) = .;			\
  		*(.rodata) *(.rodata.*)					\
@@ -54646,38 +51328,53 @@ index fe77e33..88723cb 100644
  		*(__vermagic)		/* Kernel version magic */	\
  		. = ALIGN(8);						\
  		VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .;		\
-@@ -696,14 +697,15 @@
+@@ -723,17 +724,18 @@
   * section in the linker script will go there too.  @phdr should have
   * a leading colon.
   *
 - * Note that this macros defines __per_cpu_load as an absolute symbol.
 + * Note that this macros defines per_cpu_load as an absolute symbol.
   * If there is no need to put the percpu section at a predetermined
-  * address, use PERCPU().
+  * address, use PERCPU_SECTION.
   */
- #define PERCPU_VADDR(vaddr, phdr)					\
+ #define PERCPU_VADDR(cacheline, vaddr, phdr)				\
 -	VMLINUX_SYMBOL(__per_cpu_load) = .;				\
 -	.data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load)		\
 +	per_cpu_load = .;						\
 +	.data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load)		\
  				- LOAD_OFFSET) {			\
 +		VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load;	\
- 		VMLINUX_SYMBOL(__per_cpu_start) = .;			\
- 		*(.data..percpu..first)					\
- 		. = ALIGN(PAGE_SIZE);					\
-@@ -713,7 +715,7 @@
- 		*(.data..percpu..shared_aligned)			\
- 		VMLINUX_SYMBOL(__per_cpu_end) = .;			\
+ 		PERCPU_INPUT(cacheline)					\
  	} phdr								\
 -	. = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
 +	. = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
  
  /**
-  * PERCPU - define output section for percpu area, simple version
-diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index 348843b..e43a5a8 100644
---- a/include/drm/drmP.h
-+++ b/include/drm/drmP.h
+  * PERCPU_SECTION - define output section for percpu area, simple version
+diff -urNp linux-3.0.3/include/drm/drm_crtc_helper.h linux-3.0.3/include/drm/drm_crtc_helper.h
+--- linux-3.0.3/include/drm/drm_crtc_helper.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/drm/drm_crtc_helper.h	2011-08-23 21:47:56.000000000 -0400
+@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
+ 
+ 	/* disable crtc when not in use - more explicit than dpms off */
+ 	void (*disable)(struct drm_crtc *crtc);
+-};
++} __no_const;
+ 
+ struct drm_encoder_helper_funcs {
+ 	void (*dpms)(struct drm_encoder *encoder, int mode);
+@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
+ 					    struct drm_connector *connector);
+ 	/* disable encoder when not in use - more explicit than dpms off */
+ 	void (*disable)(struct drm_encoder *encoder);
+-};
++} __no_const;
+ 
+ struct drm_connector_helper_funcs {
+ 	int (*get_modes)(struct drm_connector *connector);
+diff -urNp linux-3.0.3/include/drm/drmP.h linux-3.0.3/include/drm/drmP.h
+--- linux-3.0.3/include/drm/drmP.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/drm/drmP.h	2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -54686,25 +51383,7 @@ index 348843b..e43a5a8 100644
  #include "drm.h"
  
  #include <linux/idr.h>
-@@ -881,7 +882,7 @@ struct drm_driver {
- 	void (*vgaarb_irq)(struct drm_device *dev, bool state);
- 
- 	/* Driver private ops for this object */
--	struct vm_operations_struct *gem_vm_ops;
-+	const struct vm_operations_struct *gem_vm_ops;
- 
- 	int major;
- 	int minor;
-@@ -894,7 +895,7 @@ struct drm_driver {
- 	int dev_priv_size;
- 	struct drm_ioctl_desc *ioctls;
- 	int num_ioctls;
--	struct file_operations fops;
-+	const struct file_operations fops;
- 	struct pci_driver pci_driver;
- 	struct platform_device *platform_device;
- 	/* List of devices hanging off this driver */
-@@ -991,7 +992,7 @@ struct drm_device {
+@@ -1033,7 +1034,7 @@ struct drm_device {
  
  	/** \name Usage Counters */
  	/*@{ */
@@ -54713,7 +51392,7 @@ index 348843b..e43a5a8 100644
  	atomic_t ioctl_count;		/**< Outstanding IOCTLs pending */
  	atomic_t vma_count;		/**< Outstanding vma areas open */
  	int buf_use;			/**< Buffers in use -- cannot alloc */
-@@ -1002,7 +1003,7 @@ struct drm_device {
+@@ -1044,7 +1045,7 @@ struct drm_device {
  	/*@{ */
  	unsigned long counters;
  	enum drm_stat_type types[15];
@@ -54722,19 +51401,21 @@ index 348843b..e43a5a8 100644
  	/*@} */
  
  	struct list_head filelist;
-@@ -1101,7 +1102,7 @@ struct drm_device {
- 	struct platform_device *platformdev; /**< Platform device struture */
- 
- 	struct drm_sg_mem *sg;	/**< Scatter gather memory */
--	unsigned int num_crtcs;                  /**< Number of CRTCs on this device */
-+	unsigned int num_crtcs;		/**< Number of CRTCs on this device */
- 	void *dev_private;		/**< device private data */
- 	void *mm_private;
- 	struct address_space *dev_mapping;
-diff --git a/include/linux/a.out.h b/include/linux/a.out.h
-index e86dfca..40cc55f 100644
---- a/include/linux/a.out.h
-+++ b/include/linux/a.out.h
+diff -urNp linux-3.0.3/include/drm/ttm/ttm_memory.h linux-3.0.3/include/drm/ttm/ttm_memory.h
+--- linux-3.0.3/include/drm/ttm/ttm_memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/drm/ttm/ttm_memory.h	2011-08-23 21:47:56.000000000 -0400
+@@ -47,7 +47,7 @@
+ 
+ struct ttm_mem_shrink {
+ 	int (*do_shrink) (struct ttm_mem_shrink *);
+-};
++} __no_const;
+ 
+ /**
+  * struct ttm_mem_global - Global memory accounting structure.
+diff -urNp linux-3.0.3/include/linux/a.out.h linux-3.0.3/include/linux/a.out.h
+--- linux-3.0.3/include/linux/a.out.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/a.out.h	2011-08-23 21:47:56.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
  };
@@ -54750,10 +51431,9 @@ index e86dfca..40cc55f 100644
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
-index 381f4ce..6e875a6 100644
---- a/include/linux/atmdev.h
-+++ b/include/linux/atmdev.h
+diff -urNp linux-3.0.3/include/linux/atmdev.h linux-3.0.3/include/linux/atmdev.h
+--- linux-3.0.3/include/linux/atmdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/atmdev.h	2011-08-23 21:47:56.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -54763,11 +51443,10 @@ index 381f4ce..6e875a6 100644
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
-index c3d6512..152b708 100644
---- a/include/linux/binfmts.h
-+++ b/include/linux/binfmts.h
-@@ -92,6 +92,7 @@ struct linux_binfmt {
+diff -urNp linux-3.0.3/include/linux/binfmts.h linux-3.0.3/include/linux/binfmts.h
+--- linux-3.0.3/include/linux/binfmts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/binfmts.h	2011-08-23 21:47:56.000000000 -0400
+@@ -88,6 +88,7 @@ struct linux_binfmt {
  	int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
  	int (*load_shlib)(struct file *);
  	int (*core_dump)(struct coredump_params *cprm);
@@ -54775,49 +51454,21 @@ index c3d6512..152b708 100644
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
-index 6566147..931b5e4 100644
---- a/include/linux/blkdev.h
-+++ b/include/linux/blkdev.h
-@@ -1250,22 +1250,22 @@ queue_max_integrity_segments(struct request_queue *q)
- #endif /* CONFIG_BLK_DEV_INTEGRITY */
- 
- struct block_device_operations {
--	int (*open) (struct block_device *, fmode_t);
--	int (*release) (struct gendisk *, fmode_t);
--	int (*ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
--	int (*compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
--	int (*direct_access) (struct block_device *, sector_t,
-+	int (* const open) (struct block_device *, fmode_t);
-+	int (* const release) (struct gendisk *, fmode_t);
-+	int (* const ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
-+	int (* const compat_ioctl) (struct block_device *, fmode_t, unsigned, unsigned long);
-+	int (* const direct_access) (struct block_device *, sector_t,
- 						void **, unsigned long *);
--	unsigned int (*check_events) (struct gendisk *disk,
-+	unsigned int (* const check_events) (struct gendisk *disk,
- 				      unsigned int clearing);
- 	/* ->media_changed() is DEPRECATED, use ->check_events() instead */
--	int (*media_changed) (struct gendisk *);
--	void (*unlock_native_capacity) (struct gendisk *);
--	int (*revalidate_disk) (struct gendisk *);
--	int (*getgeo)(struct block_device *, struct hd_geometry *);
-+	int (* const media_changed) (struct gendisk *);
-+	void (* const unlock_native_capacity) (struct gendisk *);
-+	int (* const revalidate_disk) (struct gendisk *);
-+	int (* const getgeo)(struct block_device *, struct hd_geometry *);
+diff -urNp linux-3.0.3/include/linux/blkdev.h linux-3.0.3/include/linux/blkdev.h
+--- linux-3.0.3/include/linux/blkdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/blkdev.h	2011-08-23 21:47:56.000000000 -0400
+@@ -1307,7 +1307,7 @@ struct block_device_operations {
+ 	int (*getgeo)(struct block_device *, struct hd_geometry *);
  	/* this callback is with swap_lock and sometimes page table lock held */
--	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
+ 	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
 -	struct module *owner;
-+	void (* const swap_slot_free_notify) (struct block_device *, unsigned long);
 +	struct module * const owner;
  };
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
-index b22fb0d..50e6873 100644
---- a/include/linux/blktrace_api.h
-+++ b/include/linux/blktrace_api.h
+diff -urNp linux-3.0.3/include/linux/blktrace_api.h linux-3.0.3/include/linux/blktrace_api.h
+--- linux-3.0.3/include/linux/blktrace_api.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/blktrace_api.h	2011-08-23 21:47:56.000000000 -0400
 @@ -161,7 +161,7 @@ struct blk_trace {
  	struct dentry *dir;
  	struct dentry *dropped_file;
@@ -54827,10 +51478,9 @@ index b22fb0d..50e6873 100644
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
-index 83195fb..0b0f77d 100644
---- a/include/linux/byteorder/little_endian.h
-+++ b/include/linux/byteorder/little_endian.h
+diff -urNp linux-3.0.3/include/linux/byteorder/little_endian.h linux-3.0.3/include/linux/byteorder/little_endian.h
+--- linux-3.0.3/include/linux/byteorder/little_endian.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/byteorder/little_endian.h	2011-08-23 21:47:56.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -54895,10 +51545,9 @@ index 83195fb..0b0f77d 100644
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff --git a/include/linux/cache.h b/include/linux/cache.h
-index 4c57065..4307975 100644
---- a/include/linux/cache.h
-+++ b/include/linux/cache.h
+diff -urNp linux-3.0.3/include/linux/cache.h linux-3.0.3/include/linux/cache.h
+--- linux-3.0.3/include/linux/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -54910,26 +51559,49 @@ index 4c57065..4307975 100644
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff --git a/include/linux/capability.h b/include/linux/capability.h
-index fb16a36..9c528fc 100644
---- a/include/linux/capability.h
-+++ b/include/linux/capability.h
-@@ -561,6 +561,7 @@ extern const kernel_cap_t __cap_init_eff_set;
- 	(security_real_capable_noaudit((t), (cap)) == 0)
- 
- extern int capable(int cap);
-+int capable_nolog(int cap);
+diff -urNp linux-3.0.3/include/linux/capability.h linux-3.0.3/include/linux/capability.h
+--- linux-3.0.3/include/linux/capability.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/capability.h	2011-08-23 21:48:14.000000000 -0400
+@@ -547,6 +547,9 @@ extern bool capable(int cap);
+ extern bool ns_capable(struct user_namespace *ns, int cap);
+ extern bool task_ns_capable(struct task_struct *t, int cap);
+ extern bool nsown_capable(int cap);
++extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
++extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
++extern bool capable_nolog(int cap);
  
  /* audit system wants to get cap info from files as well */
- struct dentry;
-diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
-index fcfa5b9..b487b3e 100644
---- a/include/linux/compiler-gcc4.h
-+++ b/include/linux/compiler-gcc4.h
-@@ -54,6 +54,10 @@
+ extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
+diff -urNp linux-3.0.3/include/linux/cleancache.h linux-3.0.3/include/linux/cleancache.h
+--- linux-3.0.3/include/linux/cleancache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/cleancache.h	2011-08-23 21:47:56.000000000 -0400
+@@ -31,7 +31,7 @@ struct cleancache_ops {
+ 	void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
+ 	void (*flush_inode)(int, struct cleancache_filekey);
+ 	void (*flush_fs)(int);
+-};
++} __no_const;
  
- #endif
+ extern struct cleancache_ops
+ 	cleancache_register_ops(struct cleancache_ops *ops);
+diff -urNp linux-3.0.3/include/linux/compiler-gcc4.h linux-3.0.3/include/linux/compiler-gcc4.h
+--- linux-3.0.3/include/linux/compiler-gcc4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/compiler-gcc4.h	2011-08-23 21:47:56.000000000 -0400
+@@ -31,6 +31,9 @@
  
+ 
+ #if __GNUC_MINOR__ >= 5
++
++#define __no_const __attribute__((no_const))
++
+ /*
+  * Mark a position in code as unreachable.  This can be used to
+  * suppress control flow warnings after asm blocks that transfer
+@@ -46,6 +49,11 @@
+ #define __noclone	__attribute__((__noclone__))
+ 
+ #endif
++
 +#define __alloc_size(...)	__attribute((alloc_size(__VA_ARGS__)))
 +#define __bos(ptr, arg)		__builtin_object_size((ptr), (arg))
 +#define __bos0(ptr)		__bos((ptr), 0)
@@ -54937,34 +51609,44 @@ index fcfa5b9..b487b3e 100644
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff --git a/include/linux/compiler.h b/include/linux/compiler.h
-index 320d6c9..561e1c9 100644
---- a/include/linux/compiler.h
-+++ b/include/linux/compiler.h
-@@ -273,6 +273,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compiler.h
+--- linux-3.0.3/include/linux/compiler.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/compiler.h	2011-08-23 21:47:56.000000000 -0400
+@@ -264,6 +264,10 @@ void ftrace_likely_update(struct ftrace_
+ # define __attribute_const__	/* unimplemented */
+ #endif
+ 
++#ifndef __no_const
++# define __no_const
++#endif
++
+ /*
+  * Tell gcc if a function is cold. The compiler will assume any path
+  * directly leading to the call is unlikely.
+@@ -273,6 +277,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
 +#ifndef __alloc_size
-+#define __alloc_size
++#define __alloc_size(...)
 +#endif
 +
 +#ifndef __bos
-+#define __bos
++#define __bos(ptr, arg)
 +#endif
 +
 +#ifndef __bos0
-+#define __bos0
++#define __bos0(ptr)
 +#endif
 +
 +#ifndef __bos1
-+#define __bos1
++#define __bos1(ptr)
 +#endif
 +
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -306,6 +322,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+@@ -306,6 +326,7 @@ void ftrace_likely_update(struct ftrace_
   * use is to mediate communication between process-level code and irq/NMI
   * handlers, all running on the same CPU.
   */
@@ -54973,11 +51655,10 @@ index 320d6c9..561e1c9 100644
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
-index f20eb8f..77a8fbc 100644
---- a/include/linux/cpuset.h
-+++ b/include/linux/cpuset.h
-@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
+diff -urNp linux-3.0.3/include/linux/cpuset.h linux-3.0.3/include/linux/cpuset.h
+--- linux-3.0.3/include/linux/cpuset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/cpuset.h	2011-08-23 21:47:56.000000000 -0400
+@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
  	smp_mb();
@@ -54986,10 +51667,37 @@ index f20eb8f..77a8fbc 100644
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
-index 4cb72b9..cb75820 100644
---- a/include/linux/decompress/mm.h
-+++ b/include/linux/decompress/mm.h
+diff -urNp linux-3.0.3/include/linux/crypto.h linux-3.0.3/include/linux/crypto.h
+--- linux-3.0.3/include/linux/crypto.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/crypto.h	2011-08-23 21:47:56.000000000 -0400
+@@ -361,7 +361,7 @@ struct cipher_tfm {
+ 	                  const u8 *key, unsigned int keylen);
+ 	void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+ 	void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
+-};
++} __no_const;
+ 
+ struct hash_tfm {
+ 	int (*init)(struct hash_desc *desc);
+@@ -382,13 +382,13 @@ struct compress_tfm {
+ 	int (*cot_decompress)(struct crypto_tfm *tfm,
+ 	                      const u8 *src, unsigned int slen,
+ 	                      u8 *dst, unsigned int *dlen);
+-};
++} __no_const;
+ 
+ struct rng_tfm {
+ 	int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
+ 			      unsigned int dlen);
+ 	int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
+-};
++} __no_const;
+ 
+ #define crt_ablkcipher	crt_u.ablkcipher
+ #define crt_aead	crt_u.aead
+diff -urNp linux-3.0.3/include/linux/decompress/mm.h linux-3.0.3/include/linux/decompress/mm.h
+--- linux-3.0.3/include/linux/decompress/mm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/decompress/mm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -54999,69 +51707,33 @@ index 4cb72b9..cb75820 100644
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index ba8319a..876b13e 100644
---- a/include/linux/dma-mapping.h
-+++ b/include/linux/dma-mapping.h
-@@ -16,40 +16,40 @@ enum dma_data_direction {
- };
- 
- struct dma_map_ops {
--	void* (*alloc_coherent)(struct device *dev, size_t size,
-+	void* (* const alloc_coherent)(struct device *dev, size_t size,
- 				dma_addr_t *dma_handle, gfp_t gfp);
--	void (*free_coherent)(struct device *dev, size_t size,
-+	void (* const free_coherent)(struct device *dev, size_t size,
- 			      void *vaddr, dma_addr_t dma_handle);
--	dma_addr_t (*map_page)(struct device *dev, struct page *page,
-+	dma_addr_t (* const map_page)(struct device *dev, struct page *page,
- 			       unsigned long offset, size_t size,
- 			       enum dma_data_direction dir,
- 			       struct dma_attrs *attrs);
--	void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
-+	void (* const unmap_page)(struct device *dev, dma_addr_t dma_handle,
- 			   size_t size, enum dma_data_direction dir,
- 			   struct dma_attrs *attrs);
--	int (*map_sg)(struct device *dev, struct scatterlist *sg,
-+	int (* const map_sg)(struct device *dev, struct scatterlist *sg,
- 		      int nents, enum dma_data_direction dir,
- 		      struct dma_attrs *attrs);
--	void (*unmap_sg)(struct device *dev,
-+	void (* const unmap_sg)(struct device *dev,
- 			 struct scatterlist *sg, int nents,
- 			 enum dma_data_direction dir,
- 			 struct dma_attrs *attrs);
--	void (*sync_single_for_cpu)(struct device *dev,
-+	void (* const sync_single_for_cpu)(struct device *dev,
- 				    dma_addr_t dma_handle, size_t size,
- 				    enum dma_data_direction dir);
--	void (*sync_single_for_device)(struct device *dev,
-+	void (* const sync_single_for_device)(struct device *dev,
- 				       dma_addr_t dma_handle, size_t size,
- 				       enum dma_data_direction dir);
--	void (*sync_sg_for_cpu)(struct device *dev,
-+	void (* const sync_sg_for_cpu)(struct device *dev,
- 				struct scatterlist *sg, int nents,
- 				enum dma_data_direction dir);
--	void (*sync_sg_for_device)(struct device *dev,
-+	void (* const sync_sg_for_device)(struct device *dev,
- 				   struct scatterlist *sg, int nents,
- 				   enum dma_data_direction dir);
--	int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
--	int (*dma_supported)(struct device *dev, u64 mask);
--	int (*set_dma_mask)(struct device *dev, u64 mask);
+diff -urNp linux-3.0.3/include/linux/dma-mapping.h linux-3.0.3/include/linux/dma-mapping.h
+--- linux-3.0.3/include/linux/dma-mapping.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/dma-mapping.h	2011-08-23 21:47:56.000000000 -0400
+@@ -49,7 +49,7 @@ struct dma_map_ops {
+ 	int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
+ 	int (*dma_supported)(struct device *dev, u64 mask);
+ 	int (*set_dma_mask)(struct device *dev, u64 mask);
 -	int is_phys;
-+	int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
-+	int (* const dma_supported)(struct device *dev, u64 mask);
-+	int (* set_dma_mask)(struct device *dev, u64 mask);
 +	const int is_phys;
  };
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff --git a/include/linux/elf.h b/include/linux/elf.h
-index 4d60801..9f6b7af 100644
---- a/include/linux/elf.h
-+++ b/include/linux/elf.h
+diff -urNp linux-3.0.3/include/linux/efi.h linux-3.0.3/include/linux/efi.h
+--- linux-3.0.3/include/linux/efi.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/efi.h	2011-08-23 21:47:56.000000000 -0400
+@@ -410,7 +410,7 @@ struct efivar_operations {
+ 	efi_get_variable_t *get_variable;
+ 	efi_get_next_variable_t *get_next_variable;
+ 	efi_set_variable_t *set_variable;
+-};
++} __no_const;
+ 
+ struct efivars {
+ 	/*
+diff -urNp linux-3.0.3/include/linux/elf.h linux-3.0.3/include/linux/elf.h
+--- linux-3.0.3/include/linux/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/elf.h	2011-08-23 21:47:56.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64	Elf64_Sxword;
  #define PT_GNU_EH_FRAME		0x6474e550
  
@@ -55118,7 +51790,7 @@ index 4d60801..9f6b7af 100644
  #define	ELFMAG0		0x7f		/* EI_MAG */
  #define	ELFMAG1		'E'
  #define	ELFMAG2		'L'
-@@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
+@@ -422,6 +450,7 @@ extern Elf32_Dyn _DYNAMIC [];
  #define elf_note	elf32_note
  #define elf_addr_t	Elf32_Off
  #define Elf_Half	Elf32_Half
@@ -55126,7 +51798,7 @@ index 4d60801..9f6b7af 100644
  
  #else
  
-@@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
+@@ -432,6 +461,7 @@ extern Elf64_Dyn _DYNAMIC [];
  #define elf_note	elf64_note
  #define elf_addr_t	Elf64_Off
  #define Elf_Half	Elf64_Half
@@ -55134,11 +51806,43 @@ index 4d60801..9f6b7af 100644
  
  #endif
  
-diff --git a/include/linux/fs.h b/include/linux/fs.h
-index e38b50a..07ff219 100644
---- a/include/linux/fs.h
-+++ b/include/linux/fs.h
-@@ -105,6 +105,11 @@ struct inodes_stat_t {
+diff -urNp linux-3.0.3/include/linux/firewire.h linux-3.0.3/include/linux/firewire.h
+--- linux-3.0.3/include/linux/firewire.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/firewire.h	2011-08-23 21:47:56.000000000 -0400
+@@ -428,7 +428,7 @@ struct fw_iso_context {
+ 	union {
+ 		fw_iso_callback_t sc;
+ 		fw_iso_mc_callback_t mc;
+-	} callback;
++	} __no_const callback;
+ 	void *callback_data;
+ };
+ 
+diff -urNp linux-3.0.3/include/linux/fscache-cache.h linux-3.0.3/include/linux/fscache-cache.h
+--- linux-3.0.3/include/linux/fscache-cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/fscache-cache.h	2011-08-23 21:47:56.000000000 -0400
+@@ -102,7 +102,7 @@ struct fscache_operation {
+ 	fscache_operation_release_t release;
+ };
+ 
+-extern atomic_t fscache_op_debug_id;
++extern atomic_unchecked_t fscache_op_debug_id;
+ extern void fscache_op_work_func(struct work_struct *work);
+ 
+ extern void fscache_enqueue_operation(struct fscache_operation *);
+@@ -122,7 +122,7 @@ static inline void fscache_operation_ini
+ {
+ 	INIT_WORK(&op->work, fscache_op_work_func);
+ 	atomic_set(&op->usage, 1);
+-	op->debug_id = atomic_inc_return(&fscache_op_debug_id);
++	op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
+ 	op->processor = processor;
+ 	op->release = release;
+ 	INIT_LIST_HEAD(&op->pend_link);
+diff -urNp linux-3.0.3/include/linux/fs.h linux-3.0.3/include/linux/fs.h
+--- linux-3.0.3/include/linux/fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/fs.h	2011-08-23 21:48:14.000000000 -0400
+@@ -109,6 +109,11 @@ struct inodes_stat_t {
  /* File was opened by fanotify and shouldn't generate fanotify events */
  #define FMODE_NONOTIFY		((__force fmode_t)0x1000000)
  
@@ -55150,148 +51854,38 @@ index e38b50a..07ff219 100644
  /*
   * The below are the various read and write types that we support. Some of
   * them include behavioral modifiers that send information down to the
-@@ -581,42 +586,42 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
- 		unsigned long, unsigned long);
- 
- struct address_space_operations {
--	int (*writepage)(struct page *page, struct writeback_control *wbc);
--	int (*readpage)(struct file *, struct page *);
--	void (*sync_page)(struct page *);
-+	int (* const writepage)(struct page *page, struct writeback_control *wbc);
-+	int (* const readpage)(struct file *, struct page *);
-+	void (* const sync_page)(struct page *);
- 
- 	/* Write back some dirty pages from this mapping. */
--	int (*writepages)(struct address_space *, struct writeback_control *);
-+	int (* const writepages)(struct address_space *, struct writeback_control *);
- 
- 	/* Set a page dirty.  Return true if this dirtied it */
--	int (*set_page_dirty)(struct page *page);
-+	int (* const set_page_dirty)(struct page *page);
- 
--	int (*readpages)(struct file *filp, struct address_space *mapping,
-+	int (* const readpages)(struct file *filp, struct address_space *mapping,
- 			struct list_head *pages, unsigned nr_pages);
- 
--	int (*write_begin)(struct file *, struct address_space *mapping,
-+	int (* const write_begin)(struct file *, struct address_space *mapping,
- 				loff_t pos, unsigned len, unsigned flags,
- 				struct page **pagep, void **fsdata);
--	int (*write_end)(struct file *, struct address_space *mapping,
-+	int (* const write_end)(struct file *, struct address_space *mapping,
- 				loff_t pos, unsigned len, unsigned copied,
- 				struct page *page, void *fsdata);
- 
- 	/* Unfortunately this kludge is needed for FIBMAP. Don't use it */
--	sector_t (*bmap)(struct address_space *, sector_t);
--	void (*invalidatepage) (struct page *, unsigned long);
--	int (*releasepage) (struct page *, gfp_t);
--	void (*freepage)(struct page *);
--	ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
-+	sector_t (* const bmap)(struct address_space *, sector_t);
-+	void (* const invalidatepage) (struct page *, unsigned long);
-+	int (* const releasepage) (struct page *, gfp_t);
-+	void (* const freepage)(struct page *);
-+	ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
- 			loff_t offset, unsigned long nr_segs);
--	int (*get_xip_mem)(struct address_space *, pgoff_t, int,
-+	int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
- 						void **, unsigned long *);
- 	/* migrate the contents of a page to the specified target */
--	int (*migratepage) (struct address_space *,
-+	int (* const migratepage) (struct address_space *,
- 			struct page *, struct page *);
--	int (*launder_page) (struct page *);
--	int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
-+	int (* const launder_page) (struct page *);
-+	int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
- 					unsigned long);
--	int (*error_remove_page)(struct address_space *, struct page *);
-+	int (* const error_remove_page)(struct address_space *, struct page *);
- };
- 
- /*
-@@ -1059,17 +1064,17 @@ static inline int file_check_writeable(struct file *filp)
- typedef struct files_struct *fl_owner_t;
- 
- struct file_lock_operations {
--	void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
--	void (*fl_release_private)(struct file_lock *);
-+	void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
-+	void (* const fl_release_private)(struct file_lock *);
- };
- 
- struct lock_manager_operations {
--	int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
--	void (*fl_notify)(struct file_lock *);	/* unblock callback */
--	int (*fl_grant)(struct file_lock *, struct file_lock *, int);
--	void (*fl_release_private)(struct file_lock *);
--	void (*fl_break)(struct file_lock *);
--	int (*fl_change)(struct file_lock **, int);
-+	int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
-+	void (* const fl_notify)(struct file_lock *);	/* unblock callback */
-+	int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
-+	void (* const fl_release_private)(struct file_lock *);
-+	void (* const fl_break)(struct file_lock *);
-+	int (* const fl_change)(struct file_lock **, int);
+@@ -1544,7 +1549,7 @@ struct block_device_operations;
+  * the big kernel lock held in all filesystems.
+  */
+ struct file_operations {
+-	struct module *owner;
++	struct module * const owner;
+ 	loff_t (*llseek) (struct file *, loff_t, int);
+ 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
+ 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
+@@ -1572,6 +1577,7 @@ struct file_operations {
+ 	long (*fallocate)(struct file *file, int mode, loff_t offset,
+ 			  loff_t len);
  };
++typedef struct file_operations __no_const file_operations_no_const;
  
- struct lock_manager {
-@@ -1604,29 +1609,29 @@ extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
- 		unsigned long, loff_t *);
+ #define IPERM_FLAG_RCU	0x0001
  
- struct super_operations {
--   	struct inode *(*alloc_inode)(struct super_block *sb);
--	void (*destroy_inode)(struct inode *);
--
--   	void (*dirty_inode) (struct inode *);
--	int (*write_inode) (struct inode *, struct writeback_control *wbc);
--	int (*drop_inode) (struct inode *);
--	void (*evict_inode) (struct inode *);
--	void (*put_super) (struct super_block *);
--	void (*write_super) (struct super_block *);
--	int (*sync_fs)(struct super_block *sb, int wait);
--	int (*freeze_fs) (struct super_block *);
--	int (*unfreeze_fs) (struct super_block *);
--	int (*statfs) (struct dentry *, struct kstatfs *);
--	int (*remount_fs) (struct super_block *, int *, char *);
--	void (*umount_begin) (struct super_block *);
--
--	int (*show_options)(struct seq_file *, struct vfsmount *);
--	int (*show_stats)(struct seq_file *, struct vfsmount *);
-+   	struct inode *(* const alloc_inode)(struct super_block *sb);
-+	void (* const destroy_inode)(struct inode *);
-+
-+   	void (* const dirty_inode) (struct inode *);
-+	int (* const write_inode) (struct inode *, struct writeback_control *wbc);
-+	int (* const drop_inode) (struct inode *);
-+	void (* const evict_inode) (struct inode *);
-+	void (* const put_super) (struct super_block *);
-+	void (* const write_super) (struct super_block *);
-+	int (* const sync_fs)(struct super_block *sb, int wait);
-+	int (* const freeze_fs) (struct super_block *);
-+	int (* const unfreeze_fs) (struct super_block *);
-+	int (* const statfs) (struct dentry *, struct kstatfs *);
-+	int (* const remount_fs) (struct super_block *, int *, char *);
-+	void (* const umount_begin) (struct super_block *);
-+
-+	int (* const show_options)(struct seq_file *, struct vfsmount *);
-+	int (* const show_stats)(struct seq_file *, struct vfsmount *);
- #ifdef CONFIG_QUOTA
--	ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
--	ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
-+	ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t);
-+	ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t);
- #endif
--	int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
-+	int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
- };
+diff -urNp linux-3.0.3/include/linux/fsnotify.h linux-3.0.3/include/linux/fsnotify.h
+--- linux-3.0.3/include/linux/fsnotify.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/fsnotify.h	2011-08-24 18:10:29.000000000 -0400
+@@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
+  */
+ static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
+ {
+-	return kstrdup(name, GFP_KERNEL);
++	return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
+ }
  
  /*
-diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
-index 003dc0f..3c4ea97 100644
---- a/include/linux/fs_struct.h
-+++ b/include/linux/fs_struct.h
+diff -urNp linux-3.0.3/include/linux/fs_struct.h linux-3.0.3/include/linux/fs_struct.h
+--- linux-3.0.3/include/linux/fs_struct.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/fs_struct.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -55301,33 +51895,19 @@ index 003dc0f..3c4ea97 100644
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
-index b8581c0..2934a3d 100644
---- a/include/linux/fscache-cache.h
-+++ b/include/linux/fscache-cache.h
-@@ -113,7 +113,7 @@ struct fscache_operation {
- #endif
- };
- 
--extern atomic_t fscache_op_debug_id;
-+extern atomic_unchecked_t fscache_op_debug_id;
- extern void fscache_op_work_func(struct work_struct *work);
- 
- extern void fscache_enqueue_operation(struct fscache_operation *);
-@@ -133,7 +133,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
- {
- 	INIT_WORK(&op->work, fscache_op_work_func);
- 	atomic_set(&op->usage, 1);
--	op->debug_id = atomic_inc_return(&fscache_op_debug_id);
-+	op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
- 	op->processor = processor;
- 	op->release = release;
- 	INIT_LIST_HEAD(&op->pend_link);
-diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
-index 47e3997..5c22516 100644
---- a/include/linux/ftrace_event.h
-+++ b/include/linux/ftrace_event.h
-@@ -236,7 +236,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
+diff -urNp linux-3.0.3/include/linux/ftrace_event.h linux-3.0.3/include/linux/ftrace_event.h
+--- linux-3.0.3/include/linux/ftrace_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/ftrace_event.h	2011-08-23 21:47:56.000000000 -0400
+@@ -96,7 +96,7 @@ struct trace_event_functions {
+ 	trace_print_func	raw;
+ 	trace_print_func	hex;
+ 	trace_print_func	binary;
+-};
++} __no_const;
+ 
+ struct trace_event {
+ 	struct hlist_node		node;
+@@ -247,7 +247,7 @@ extern int trace_define_field(struct ftr
  extern int trace_add_event_call(struct ftrace_event_call *call);
  extern void trace_remove_event_call(struct ftrace_event_call *call);
  
@@ -55336,10 +51916,9 @@ index 47e3997..5c22516 100644
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff --git a/include/linux/genhd.h b/include/linux/genhd.h
-index 035bc67..862d9e6 100644
---- a/include/linux/genhd.h
-+++ b/include/linux/genhd.h
+diff -urNp linux-3.0.3/include/linux/genhd.h linux-3.0.3/include/linux/genhd.h
+--- linux-3.0.3/include/linux/genhd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/genhd.h	2011-08-23 21:47:56.000000000 -0400
 @@ -184,7 +184,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -55349,11 +51928,9 @@ index 035bc67..862d9e6 100644
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff --git a/include/linux/gracl.h b/include/linux/gracl.h
-new file mode 100644
-index 0000000..0dc3943
---- /dev/null
-+++ b/include/linux/gracl.h
+diff -urNp linux-3.0.3/include/linux/gracl.h linux-3.0.3/include/linux/gracl.h
+--- linux-3.0.3/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/gracl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -55672,11 +52249,9 @@ index 0000000..0dc3943
 +
 +#endif
 +
-diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
-new file mode 100644
-index 0000000..323ecf2
---- /dev/null
-+++ b/include/linux/gralloc.h
+diff -urNp linux-3.0.3/include/linux/gralloc.h linux-3.0.3/include/linux/gralloc.h
+--- linux-3.0.3/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/gralloc.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -55687,12 +52262,10 @@ index 0000000..323ecf2
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
-new file mode 100644
-index 0000000..22d7a5d
---- /dev/null
-+++ b/include/linux/grdefs.h
-@@ -0,0 +1,139 @@
+diff -urNp linux-3.0.3/include/linux/grdefs.h linux-3.0.3/include/linux/grdefs.h
+--- linux-3.0.3/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/grdefs.h	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
 +
@@ -55782,7 +52355,8 @@ index 0000000..22d7a5d
 +	GR_PROCFIND	= 0x00008000,
 +	GR_POVERRIDE	= 0x00010000,
 +	GR_KERNELAUTH	= 0x00020000,
-+	GR_ATSECURE	= 0x00040000
++	GR_ATSECURE	= 0x00040000,
++	GR_SHMEXEC	= 0x00080000
 +};
 +
 +enum {
@@ -55832,11 +52406,9 @@ index 0000000..22d7a5d
 +};
 +
 +#endif
-diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
-new file mode 100644
-index 0000000..bdf0e10
---- /dev/null
-+++ b/include/linux/grinternal.h
+diff -urNp linux-3.0.3/include/linux/grinternal.h linux-3.0.3/include/linux/grinternal.h
+--- linux-3.0.3/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/grinternal.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -55886,7 +52458,6 @@ index 0000000..bdf0e10
 +extern int grsec_enable_time;
 +extern int grsec_enable_rofs;
 +extern int grsec_enable_chroot_shmat;
-+extern int grsec_enable_chroot_findtask;
 +extern int grsec_enable_chroot_mount;
 +extern int grsec_enable_chroot_double;
 +extern int grsec_enable_chroot_pivot;
@@ -55918,6 +52489,7 @@ index 0000000..bdf0e10
 +extern int grsec_resource_logging;
 +extern int grsec_enable_blackhole;
 +extern int grsec_lastack_retries;
++extern int grsec_enable_brute;
 +extern int grsec_lock;
 +
 +extern spinlock_t grsec_alert_lock;
@@ -56057,11 +52629,9 @@ index 0000000..bdf0e10
 +#endif
 +
 +#endif
-diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
-new file mode 100644
-index 0000000..0141e03
---- /dev/null
-+++ b/include/linux/grmsg.h
+diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
+--- linux-3.0.3/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/grmsg.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,108 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
@@ -56171,21 +52741,21 @@ index 0000000..0141e03
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
-new file mode 100644
-index 0000000..227c301
---- /dev/null
-+++ b/include/linux/grsecurity.h
-@@ -0,0 +1,212 @@
+diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grsecurity.h
+--- linux-3.0.3/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/grsecurity.h	2011-08-23 21:48:14.000000000 -0400
+@@ -0,0 +1,228 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
 +#include <linux/fs_struct.h>
 +#include <linux/binfmts.h>
 +#include <linux/gracl.h>
-+#include <linux/compat.h>
 +
 +/* notify of brain-dead configs */
++#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
++#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
++#endif
 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
 +#endif
@@ -56202,6 +52772,20 @@ index 0000000..227c301
 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
 +#endif
 +
++#include <linux/compat.h>
++
++struct user_arg_ptr {
++#ifdef CONFIG_COMPAT
++	bool is_compat;
++#endif
++	union {
++		const char __user *const __user *native;
++#ifdef CONFIG_COMPAT
++		compat_uptr_t __user *compat;
++#endif
++	} ptr;
++};
++
 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
 +void gr_handle_brute_check(void);
 +void gr_handle_kernel_exploit(void);
@@ -56235,7 +52819,7 @@ index 0000000..227c301
 +				  const struct vfsmount *mnt,
 +				  const char *dev_name);
 +int gr_handle_chroot_pivot(void);
-+int gr_handle_chroot_unix(struct pid *pid);
++int gr_handle_chroot_unix(const pid_t pid);
 +
 +int gr_handle_rawio(const struct inode *inode);
 +int gr_handle_nproc(void);
@@ -56255,10 +52839,7 @@ index 0000000..227c301
 +			 const struct vfsmount *mnt);
 +void gr_log_chroot_exec(const struct dentry *dentry,
 +			       const struct vfsmount *mnt);
-+void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
-+#ifdef CONFIG_COMPAT
-+void gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv);
-+#endif
++void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
 +void gr_log_remount(const char *devname, const int retval);
 +void gr_log_unmount(const char *devname, const int retval);
 +void gr_log_mount(const char *from, const char *to, const int retval);
@@ -56386,14 +52967,15 @@ index 0000000..227c301
 +
 +extern int grsec_enable_dmesg;
 +extern int grsec_disable_privio;
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++extern int grsec_enable_chroot_findtask;
++#endif
 +#endif
 +
 +#endif
-diff --git a/include/linux/grsock.h b/include/linux/grsock.h
-new file mode 100644
-index 0000000..e7ffaaf
---- /dev/null
-+++ b/include/linux/grsock.h
+diff -urNp linux-3.0.3/include/linux/grsock.h linux-3.0.3/include/linux/grsock.h
+--- linux-3.0.3/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/grsock.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -56414,11 +52996,22 @@ index 0000000..e7ffaaf
 +			    const int protocol);
 +
 +#endif
-diff --git a/include/linux/highmem.h b/include/linux/highmem.h
-index 3a93f73..b19d0b3 100644
---- a/include/linux/highmem.h
-+++ b/include/linux/highmem.h
-@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
+diff -urNp linux-3.0.3/include/linux/hid.h linux-3.0.3/include/linux/hid.h
+--- linux-3.0.3/include/linux/hid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/hid.h	2011-08-23 21:47:56.000000000 -0400
+@@ -675,7 +675,7 @@ struct hid_ll_driver {
+ 			unsigned int code, int value);
+ 
+ 	int (*parse)(struct hid_device *hdev);
+-};
++} __no_const;
+ 
+ #define	PM_HINT_FULLON	1<<5
+ #define PM_HINT_NORMAL	1<<1
+diff -urNp linux-3.0.3/include/linux/highmem.h linux-3.0.3/include/linux/highmem.h
+--- linux-3.0.3/include/linux/highmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/highmem.h	2011-08-23 21:47:56.000000000 -0400
+@@ -185,6 +185,18 @@ static inline void clear_highpage(struct
  	kunmap_atomic(kaddr, KM_USER0);
  }
  
@@ -56437,10 +53030,20 @@ index 3a93f73..b19d0b3 100644
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff --git a/include/linux/i2o.h b/include/linux/i2o.h
-index 9e7a12d..2a6f32e 100644
---- a/include/linux/i2o.h
-+++ b/include/linux/i2o.h
+diff -urNp linux-3.0.3/include/linux/i2c.h linux-3.0.3/include/linux/i2c.h
+--- linux-3.0.3/include/linux/i2c.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/i2c.h	2011-08-23 21:47:56.000000000 -0400
+@@ -346,6 +346,7 @@ struct i2c_algorithm {
+ 	/* To determine what the adapter supports */
+ 	u32 (*functionality) (struct i2c_adapter *);
+ };
++typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
+ 
+ /*
+  * i2c_adapter is the structure used to identify a physical i2c bus along
+diff -urNp linux-3.0.3/include/linux/i2o.h linux-3.0.3/include/linux/i2o.h
+--- linux-3.0.3/include/linux/i2o.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/i2o.h	2011-08-23 21:47:56.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
  	struct i2o_device *exec;	/* Executive */
  #if BITS_PER_LONG == 64
@@ -56450,11 +53053,10 @@ index 9e7a12d..2a6f32e 100644
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff --git a/include/linux/init.h b/include/linux/init.h
-index 577671c..b0042e9 100644
---- a/include/linux/init.h
-+++ b/include/linux/init.h
-@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
+diff -urNp linux-3.0.3/include/linux/init.h linux-3.0.3/include/linux/init.h
+--- linux-3.0.3/include/linux/init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/init.h	2011-08-23 21:47:56.000000000 -0400
+@@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
  #define module_init(initfn)					\
@@ -56470,12 +53072,11 @@ index 577671c..b0042e9 100644
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff --git a/include/linux/init_task.h b/include/linux/init_task.h
-index caa151f..462d8f2 100644
---- a/include/linux/init_task.h
-+++ b/include/linux/init_task.h
-@@ -83,6 +83,12 @@ extern struct group_info init_groups;
- #define INIT_IDS
+diff -urNp linux-3.0.3/include/linux/init_task.h linux-3.0.3/include/linux/init_task.h
+--- linux-3.0.3/include/linux/init_task.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/init_task.h	2011-08-23 21:47:56.000000000 -0400
+@@ -126,6 +126,12 @@ extern struct cred init_cred;
+ # define INIT_PERF_EVENTS(tsk)
  #endif
  
 +#ifdef CONFIG_X86
@@ -56485,9 +53086,9 @@ index caa151f..462d8f2 100644
 +#endif
 +
  /*
-  * Because of the reduced scope of CAP_SETPCAP when filesystem
-  * capabilities are in effect, it is safe to allow CAP_SETPCAP to
-@@ -163,6 +169,7 @@ extern struct cred init_cred;
+  *  INIT_TASK is used to set up the first task table, touch at
+  * your own risk!. Base=0, limit=0x1fffff (=2MB)
+@@ -164,6 +170,7 @@ extern struct cred init_cred;
  	RCU_INIT_POINTER(.cred, &init_cred),				\
  	.comm		= "swapper",					\
  	.thread		= INIT_THREAD,					\
@@ -56495,11 +53096,22 @@ index caa151f..462d8f2 100644
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
-index 55e0d42..88b62fb 100644
---- a/include/linux/interrupt.h
-+++ b/include/linux/interrupt.h
-@@ -393,7 +393,7 @@ enum
+diff -urNp linux-3.0.3/include/linux/intel-iommu.h linux-3.0.3/include/linux/intel-iommu.h
+--- linux-3.0.3/include/linux/intel-iommu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/intel-iommu.h	2011-08-23 21:47:56.000000000 -0400
+@@ -296,7 +296,7 @@ struct iommu_flush {
+ 			      u8 fm, u64 type);
+ 	void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
+ 			    unsigned int size_order, u64 type);
+-};
++} __no_const;
+ 
+ enum {
+ 	SR_DMAR_FECTL_REG,
+diff -urNp linux-3.0.3/include/linux/interrupt.h linux-3.0.3/include/linux/interrupt.h
+--- linux-3.0.3/include/linux/interrupt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/interrupt.h	2011-08-23 21:47:56.000000000 -0400
+@@ -422,7 +422,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
   */
@@ -56508,7 +53120,7 @@ index 55e0d42..88b62fb 100644
  
  /* softirq mask and active fields moved to irq_cpustat_t in
   * asm/hardirq.h to get better cache usage.  KAO
-@@ -401,12 +401,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
+@@ -430,12 +430,12 @@ extern char *softirq_to_name[NR_SOFTIRQS
  
  struct softirq_action
  {
@@ -56523,10 +53135,9 @@ index 55e0d42..88b62fb 100644
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
-index d8e9b3d..e6e63f9 100644
---- a/include/linux/kallsyms.h
-+++ b/include/linux/kallsyms.h
+diff -urNp linux-3.0.3/include/linux/kallsyms.h linux-3.0.3/include/linux/kallsyms.h
+--- linux-3.0.3/include/linux/kallsyms.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/kallsyms.h	2011-08-23 21:48:14.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -56537,13 +53148,14 @@ index d8e9b3d..e6e63f9 100644
  /* Lookup the address for a symbol. Returns 0 if not found. */
  unsigned long kallsyms_lookup_name(const char *name);
  
-@@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
+@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(un
  /* Stupid that this does nothing, but I didn't create this mess. */
  #define __print_symbol(fmt, addr)
  #endif /*CONFIG_KALLSYMS*/
 +#else /* when included by kallsyms.c, vsnprintf.c, or
 +	 arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
 +extern void __print_symbol(const char *fmt, unsigned long address);
++extern int sprint_backtrace(char *buffer, unsigned long address);
 +extern int sprint_symbol(char *buffer, unsigned long address);
 +const char *kallsyms_lookup(unsigned long addr,
 +			    unsigned long *symbolsize,
@@ -56553,10 +53165,9 @@ index d8e9b3d..e6e63f9 100644
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
-index 092e425..4f013a8 100644
---- a/include/linux/kgdb.h
-+++ b/include/linux/kgdb.h
+diff -urNp linux-3.0.3/include/linux/kgdb.h linux-3.0.3/include/linux/kgdb.h
+--- linux-3.0.3/include/linux/kgdb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/kgdb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -56566,44 +53177,38 @@ index 092e425..4f013a8 100644
  
  extern struct task_struct	*kgdb_usethread;
  extern struct task_struct	*kgdb_contthread;
-@@ -269,22 +269,22 @@ struct kgdb_arch {
+@@ -241,8 +241,8 @@ extern void kgdb_arch_late(void);
+  * hardware debug registers.
+  */
+ struct kgdb_arch {
+-	unsigned char		gdb_bpt_instr[BREAK_INSTR_SIZE];
+-	unsigned long		flags;
++	const unsigned char	gdb_bpt_instr[BREAK_INSTR_SIZE];
++	const unsigned long	flags;
+ 
+ 	int	(*set_breakpoint)(unsigned long, char *);
+ 	int	(*remove_breakpoint)(unsigned long, char *);
+@@ -268,14 +268,14 @@ struct kgdb_arch {
+  * not a console
   */
  struct kgdb_io {
- 	const char		*name;
--	int			(*read_char) (void);
--	void			(*write_char) (u8);
--	void			(*flush) (void);
--	int			(*init) (void);
--	void			(*pre_exception) (void);
--	void			(*post_exception) (void);
-+	int			(* const read_char) (void);
-+	void			(* const write_char) (u8);
-+	void			(* const flush) (void);
-+	int			(* const init) (void);
-+	void			(* const pre_exception) (void);
-+	void			(* const post_exception) (void);
- 	int			is_console;
+-	const char		*name;
++	const char * const	name;
+ 	int			(*read_char) (void);
+ 	void			(*write_char) (u8);
+ 	void			(*flush) (void);
+ 	int			(*init) (void);
+ 	void			(*pre_exception) (void);
+ 	void			(*post_exception) (void);
+-	int			is_console;
++	const int		is_console;
  };
  
--extern struct kgdb_arch		arch_kgdb_ops;
-+extern const struct kgdb_arch arch_kgdb_ops;
- 
- extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs);
- 
--extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
--extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
--extern struct kgdb_io *dbg_io_ops;
-+extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
-+extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
-+extern const struct kgdb_io *dbg_io_ops;
- 
- extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
- extern char *kgdb_mem2hex(char *mem, char *buf, int count);
-diff --git a/include/linux/kmod.h b/include/linux/kmod.h
-index 6efd7a7..1bd2600 100644
---- a/include/linux/kmod.h
-+++ b/include/linux/kmod.h
-@@ -33,6 +33,8 @@ extern char modprobe_path[]; /* for sysctl */
+ extern struct kgdb_arch		arch_kgdb_ops;
+diff -urNp linux-3.0.3/include/linux/kmod.h linux-3.0.3/include/linux/kmod.h
+--- linux-3.0.3/include/linux/kmod.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/kmod.h	2011-08-23 21:48:14.000000000 -0400
+@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
  	__attribute__((format(printf, 2, 3)));
@@ -56612,11 +53217,10 @@ index 6efd7a7..1bd2600 100644
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index b5021db..50b5c79 100644
---- a/include/linux/kvm_host.h
-+++ b/include/linux/kvm_host.h
-@@ -288,7 +288,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
+diff -urNp linux-3.0.3/include/linux/kvm_host.h linux-3.0.3/include/linux/kvm_host.h
+--- linux-3.0.3/include/linux/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/kvm_host.h	2011-08-23 21:47:56.000000000 -0400
+@@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
  
@@ -56625,7 +53229,7 @@ index b5021db..50b5c79 100644
  		  struct module *module);
  void kvm_exit(void);
  
-@@ -428,7 +428,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
+@@ -446,7 +446,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
  					struct kvm_guest_debug *dbg);
  int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
  
@@ -56634,86 +53238,57 @@ index b5021db..50b5c79 100644
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff --git a/include/linux/libata.h b/include/linux/libata.h
-index 1f00080..233a12e 100644
---- a/include/linux/libata.h
-+++ b/include/linux/libata.h
-@@ -531,11 +531,11 @@ struct ata_ioports {
- 
- struct ata_host {
- 	spinlock_t		lock;
--	struct device 		*dev;
-+	struct device		*dev;
- 	void __iomem * const	*iomap;
- 	unsigned int		n_ports;
- 	void			*private_data;
--	struct ata_port_operations *ops;
-+	const struct ata_port_operations *ops;
- 	unsigned long		flags;
- 
- 	struct mutex		eh_mutex;
-@@ -726,7 +726,7 @@ struct ata_link {
- 
- struct ata_port {
- 	struct Scsi_Host	*scsi_host; /* our co-allocated scsi host */
--	struct ata_port_operations *ops;
-+	const struct ata_port_operations *ops;
- 	spinlock_t		*lock;
- 	/* Flags owned by the EH context. Only EH should touch these once the
- 	   port is active */
-@@ -914,7 +914,7 @@ struct ata_port_info {
- 	unsigned long		pio_mask;
- 	unsigned long		mwdma_mask;
- 	unsigned long		udma_mask;
--	struct ata_port_operations *port_ops;
-+	const struct ata_port_operations *port_ops;
- 	void 			*private_data;
- };
- 
-@@ -938,7 +938,7 @@ extern const unsigned long sata_deb_timing_normal[];
- extern const unsigned long sata_deb_timing_hotplug[];
- extern const unsigned long sata_deb_timing_long[];
- 
--extern struct ata_port_operations ata_dummy_port_ops;
-+extern const struct ata_port_operations ata_dummy_port_ops;
- extern const struct ata_port_info ata_dummy_port_info;
- 
- static inline const unsigned long *
-@@ -984,7 +984,7 @@ extern int ata_host_activate(struct ata_host *host, int irq,
- 			     struct scsi_host_template *sht);
- extern void ata_host_detach(struct ata_host *host);
- extern void ata_host_init(struct ata_host *, struct device *,
--			  unsigned long, struct ata_port_operations *);
-+			  unsigned long, const struct ata_port_operations *);
- extern int ata_scsi_detect(struct scsi_host_template *sht);
- extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
- extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
-diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
-index fbc48f8..0886e57 100644
---- a/include/linux/lockd/bind.h
-+++ b/include/linux/lockd/bind.h
-@@ -23,13 +23,13 @@ struct svc_rqst;
-  * This is the set of functions for lockd->nfsd communication
-  */
- struct nlmsvc_binding {
--	__be32			(*fopen)(struct svc_rqst *,
-+	__be32			(* const fopen)(struct svc_rqst *,
- 						struct nfs_fh *,
- 						struct file **);
--	void			(*fclose)(struct file *);
-+	void			(* const fclose)(struct file *);
+diff -urNp linux-3.0.3/include/linux/libata.h linux-3.0.3/include/linux/libata.h
+--- linux-3.0.3/include/linux/libata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/libata.h	2011-08-23 21:47:56.000000000 -0400
+@@ -898,7 +898,7 @@ struct ata_port_operations {
+ 	 * ->inherits must be the last field and all the preceding
+ 	 * fields must be pointers.
+ 	 */
+-	const struct ata_port_operations	*inherits;
++	const struct ata_port_operations * const inherits;
  };
  
--extern struct nlmsvc_binding *	nlmsvc_ops;
-+extern const struct nlmsvc_binding *	nlmsvc_ops;
+ struct ata_port_info {
+diff -urNp linux-3.0.3/include/linux/mca.h linux-3.0.3/include/linux/mca.h
+--- linux-3.0.3/include/linux/mca.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mca.h	2011-08-23 21:47:56.000000000 -0400
+@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
+ 						  int region);
+ 	void *		(*mca_transform_memory)(struct mca_device *,
+ 						void *memory);
+-};
++} __no_const;
+ 
+ struct mca_bus {
+ 	u64			default_dma_mask;
+diff -urNp linux-3.0.3/include/linux/memory.h linux-3.0.3/include/linux/memory.h
+--- linux-3.0.3/include/linux/memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/memory.h	2011-08-23 21:47:56.000000000 -0400
+@@ -144,7 +144,7 @@ struct memory_accessor {
+ 			size_t count);
+ 	ssize_t (*write)(struct memory_accessor *, const char *buf,
+ 			 off_t offset, size_t count);
+-};
++} __no_const;
  
  /*
-  * Similar to nfs_client_initdata, but without the NFS-specific
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 957a90b..13ce8ac 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void *objp);
+  * Kernel text modification mutex, used for code patching. Users of this lock
+diff -urNp linux-3.0.3/include/linux/mfd/abx500.h linux-3.0.3/include/linux/mfd/abx500.h
+--- linux-3.0.3/include/linux/mfd/abx500.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mfd/abx500.h	2011-08-23 21:47:56.000000000 -0400
+@@ -234,6 +234,7 @@ struct abx500_ops {
+ 	int (*event_registers_startup_state_get) (struct device *, u8 *);
+ 	int (*startup_irq_enabled) (struct device *, unsigned int);
+ };
++typedef struct abx500_ops __no_const abx500_ops_no_const;
+ 
+ int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
+ void abx500_remove_ops(struct device *dev);
+diff -urNp linux-3.0.3/include/linux/mm.h linux-3.0.3/include/linux/mm.h
+--- linux-3.0.3/include/linux/mm.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/include/linux/mm.h	2011-08-23 21:47:56.000000000 -0400
+@@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000	/* Has ->fault & does nonlinear pages */
  #define VM_MIXEDMAP	0x10000000	/* Can contain "struct page" and pure PFN pages */
@@ -56728,7 +53303,7 @@ index 957a90b..13ce8ac 100644
  #define VM_PFN_AT_MMAP	0x40000000	/* PFNMAP vma that is fully mapped at mmap time */
  #define VM_MERGEABLE	0x80000000	/* KSM may merge identical pages */
  
-@@ -993,34 +1000,6 @@ int set_page_dirty(struct page *page);
+@@ -1009,34 +1016,6 @@ int set_page_dirty(struct page *page);
  int set_page_dirty_lock(struct page *page);
  int clear_page_dirty_for_io(struct page *page);
  
@@ -56763,14 +53338,14 @@ index 957a90b..13ce8ac 100644
  extern unsigned long move_page_tables(struct vm_area_struct *vma,
  		unsigned long old_addr, struct vm_area_struct *new_vma,
  		unsigned long new_addr, unsigned long len);
-@@ -1172,6 +1151,15 @@ struct shrinker {
+@@ -1169,6 +1148,15 @@ struct shrinker {
  extern void register_shrinker(struct shrinker *);
  extern void unregister_shrinker(struct shrinker *);
  
 +#ifdef CONFIG_MMU
-+pgprot_t vm_get_page_prot(unsigned long vm_flags);
++pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
 +#else
-+static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
++static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
 +{
 +	return __pgprot(0);
 +}
@@ -56779,7 +53354,7 @@ index 957a90b..13ce8ac 100644
  int vma_wants_writenotify(struct vm_area_struct *vma);
  
  extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
-@@ -1461,6 +1449,7 @@ out:
+@@ -1452,6 +1440,7 @@ out:
  }
  
  extern int do_munmap(struct mm_struct *, unsigned long, size_t);
@@ -56787,7 +53362,7 @@ index 957a90b..13ce8ac 100644
  
  extern unsigned long do_brk(unsigned long, unsigned long);
  
-@@ -1517,6 +1506,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
+@@ -1510,6 +1499,10 @@ extern struct vm_area_struct * find_vma(
  extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
  					     struct vm_area_struct **pprev);
  
@@ -56798,7 +53373,7 @@ index 957a90b..13ce8ac 100644
  /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
     NULL if none.  Assume start_addr < end_addr. */
  static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
-@@ -1533,15 +1526,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
+@@ -1526,15 +1519,6 @@ static inline unsigned long vma_pages(st
  	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
@@ -56814,16 +53389,16 @@ index 957a90b..13ce8ac 100644
  struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
  int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
  			unsigned long pfn, unsigned long size, pgprot_t);
-@@ -1650,7 +1634,7 @@ extern int unpoison_memory(unsigned long pfn);
+@@ -1647,7 +1631,7 @@ extern int unpoison_memory(unsigned long
  extern int sysctl_memory_failure_early_kill;
  extern int sysctl_memory_failure_recovery;
  extern void shake_page(struct page *p, int access);
 -extern atomic_long_t mce_bad_pages;
 +extern atomic_long_unchecked_t mce_bad_pages;
  extern int soft_offline_page(struct page *page, int flags);
- #ifdef CONFIG_MEMORY_FAILURE
- int is_hwpoison_address(unsigned long addr);
-@@ -1672,5 +1656,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
+ 
+ extern void dump_page(struct page *page);
+@@ -1661,5 +1645,11 @@ extern void copy_user_huge_page(struct p
  				unsigned int pages_per_huge_page);
  #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
  
@@ -56835,11 +53410,10 @@ index 957a90b..13ce8ac 100644
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index 26bc4e2..b521923 100644
---- a/include/linux/mm_types.h
-+++ b/include/linux/mm_types.h
-@@ -183,6 +183,8 @@ struct vm_area_struct {
+diff -urNp linux-3.0.3/include/linux/mm_types.h linux-3.0.3/include/linux/mm_types.h
+--- linux-3.0.3/include/linux/mm_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mm_types.h	2011-08-23 21:47:56.000000000 -0400
+@@ -184,6 +184,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
  	struct mempolicy *vm_policy;	/* NUMA policy for the VMA */
  #endif
@@ -56848,10 +53422,10 @@ index 26bc4e2..b521923 100644
  };
  
  struct core_thread {
-@@ -315,6 +317,24 @@ struct mm_struct {
+@@ -316,6 +318,24 @@ struct mm_struct {
+ #ifdef CONFIG_CPUMASK_OFFSTACK
+ 	struct cpumask cpumask_allocation;
  #endif
- 	/* How many tasks sharing this mm are OOM_DISABLE */
- 	atomic_t oom_disable_count;
 +
 +#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
 +	unsigned long pax_flags;
@@ -56872,12 +53446,11 @@ index 26bc4e2..b521923 100644
 +
  };
  
- /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
-diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
-index cc2e7df..a9690af 100644
---- a/include/linux/mmu_notifier.h
-+++ b/include/linux/mmu_notifier.h
-@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
+ static inline void mm_init_cpumask(struct mm_struct *mm)
+diff -urNp linux-3.0.3/include/linux/mmu_notifier.h linux-3.0.3/include/linux/mmu_notifier.h
+--- linux-3.0.3/include/linux/mmu_notifier.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mmu_notifier.h	2011-08-23 21:47:56.000000000 -0400
+@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)		\
  ({									\
@@ -56893,11 +53466,10 @@ index cc2e7df..a9690af 100644
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index 02ecb01..547679a 100644
---- a/include/linux/mmzone.h
-+++ b/include/linux/mmzone.h
-@@ -355,7 +355,7 @@ struct zone {
+diff -urNp linux-3.0.3/include/linux/mmzone.h linux-3.0.3/include/linux/mmzone.h
+--- linux-3.0.3/include/linux/mmzone.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mmzone.h	2011-08-23 21:47:56.000000000 -0400
+@@ -350,7 +350,7 @@ struct zone {
  	unsigned long		flags;		   /* zone flags, see below */
  
  	/* Zone statistics */
@@ -56906,10 +53478,9 @@ index 02ecb01..547679a 100644
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
-index 48c007d..01960ea 100644
---- a/include/linux/mod_devicetable.h
-+++ b/include/linux/mod_devicetable.h
+diff -urNp linux-3.0.3/include/linux/mod_devicetable.h linux-3.0.3/include/linux/mod_devicetable.h
+--- linux-3.0.3/include/linux/mod_devicetable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/mod_devicetable.h	2011-08-23 21:47:56.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -56928,11 +53499,18 @@ index 48c007d..01960ea 100644
  
  struct hid_device_id {
  	__u16 bus;
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 5de4204..18967e3 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -324,19 +324,16 @@ struct module
+diff -urNp linux-3.0.3/include/linux/module.h linux-3.0.3/include/linux/module.h
+--- linux-3.0.3/include/linux/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/module.h	2011-08-23 21:47:56.000000000 -0400
+@@ -16,6 +16,7 @@
+ #include <linux/kobject.h>
+ #include <linux/moduleparam.h>
+ #include <linux/tracepoint.h>
++#include <linux/fs.h>
+ 
+ #include <linux/percpu.h>
+ #include <asm/module.h>
+@@ -325,19 +326,16 @@ struct module
  	int (*init)(void);
  
  	/* If this is non-NULL, vfree after init() returns */
@@ -56956,7 +53534,18 @@ index 5de4204..18967e3 100644
  
  	/* Arch-specific module values */
  	struct mod_arch_specific arch;
-@@ -441,16 +438,46 @@ bool is_module_address(unsigned long addr);
+@@ -393,6 +391,10 @@ struct module
+ #ifdef CONFIG_EVENT_TRACING
+ 	struct ftrace_event_call **trace_events;
+ 	unsigned int num_trace_events;
++	struct file_operations trace_id;
++	struct file_operations trace_enable;
++	struct file_operations trace_format;
++	struct file_operations trace_filter;
+ #endif
+ #ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ 	unsigned int num_ftrace_callsites;
+@@ -443,16 +445,46 @@ bool is_module_address(unsigned long add
  bool is_module_percpu_address(unsigned long addr);
  bool is_module_text_address(unsigned long addr);
  
@@ -57007,11 +53596,10 @@ index 5de4204..18967e3 100644
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
-index c1f40c2..682ca53 100644
---- a/include/linux/moduleloader.h
-+++ b/include/linux/moduleloader.h
-@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
+diff -urNp linux-3.0.3/include/linux/moduleloader.h linux-3.0.3/include/linux/moduleloader.h
+--- linux-3.0.3/include/linux/moduleloader.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/moduleloader.h	2011-08-23 21:47:56.000000000 -0400
+@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
  
@@ -57033,11 +53621,10 @@ index c1f40c2..682ca53 100644
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
-index 07b4195..882bf56 100644
---- a/include/linux/moduleparam.h
-+++ b/include/linux/moduleparam.h
-@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock(void)
+diff -urNp linux-3.0.3/include/linux/moduleparam.h linux-3.0.3/include/linux/moduleparam.h
+--- linux-3.0.3/include/linux/moduleparam.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/moduleparam.h	2011-08-23 21:47:56.000000000 -0400
+@@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
  #define module_param_string(name, string, len, perm)			\
@@ -57046,33 +53633,19 @@ index 07b4195..882bf56 100644
  		= { len, string };					\
  	__module_param_call(MODULE_PARAM_PREFIX, name,			\
  			    &param_ops_string,				\
-@@ -370,7 +370,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
+@@ -370,7 +370,7 @@ extern int param_get_invbool(char *buffe
   * module_param_named() for why this might be necessary.
   */
  #define module_param_array_named(name, array, type, nump, perm)		\
 -	static const struct kparam_array __param_arr_##name		\
 +	static const struct kparam_array __param_arr_##name __used	\
- 	= { ARRAY_SIZE(array), nump, &param_ops_##type,			\
- 	    sizeof(array[0]), array };					\
- 	__module_param_call(MODULE_PARAM_PREFIX, name,			\
-diff --git a/include/linux/mutex.h b/include/linux/mutex.h
-index 94b48bd..c75471d 100644
---- a/include/linux/mutex.h
-+++ b/include/linux/mutex.h
-@@ -51,7 +51,7 @@ struct mutex {
- 	spinlock_t		wait_lock;
- 	struct list_head	wait_list;
- #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
--	struct thread_info	*owner;
-+	struct task_struct	*owner;
- #endif
- #ifdef CONFIG_DEBUG_MUTEXES
- 	const char 		*name;
-diff --git a/include/linux/namei.h b/include/linux/namei.h
-index f276d4f..e0b97b1 100644
---- a/include/linux/namei.h
-+++ b/include/linux/namei.h
-@@ -25,7 +25,7 @@ struct nameidata {
+ 	= { .max = ARRAY_SIZE(array), .num = nump,                      \
+ 	    .ops = &param_ops_##type,					\
+ 	    .elemsize = sizeof(array[0]), .elem = array };		\
+diff -urNp linux-3.0.3/include/linux/namei.h linux-3.0.3/include/linux/namei.h
+--- linux-3.0.3/include/linux/namei.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/namei.h	2011-08-23 21:47:56.000000000 -0400
+@@ -24,7 +24,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
  	unsigned	depth;
@@ -57081,7 +53654,7 @@ index f276d4f..e0b97b1 100644
  
  	/* Intent data */
  	union {
-@@ -88,12 +88,12 @@ extern int follow_up(struct path *);
+@@ -91,12 +91,12 @@ extern int follow_up(struct path *);
  extern struct dentry *lock_rename(struct dentry *, struct dentry *);
  extern void unlock_rename(struct dentry *, struct dentry *);
  
@@ -57096,11 +53669,20 @@ index f276d4f..e0b97b1 100644
  {
  	return nd->saved_names[nd->depth];
  }
-diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
-new file mode 100644
-index 0000000..33f4af8
---- /dev/null
-+++ b/include/linux/netfilter/xt_gradm.h
+diff -urNp linux-3.0.3/include/linux/netdevice.h linux-3.0.3/include/linux/netdevice.h
+--- linux-3.0.3/include/linux/netdevice.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/include/linux/netdevice.h	2011-08-23 21:47:56.000000000 -0400
+@@ -979,6 +979,7 @@ struct net_device_ops {
+ 	int			(*ndo_set_features)(struct net_device *dev,
+ 						    u32 features);
+ };
++typedef struct net_device_ops __no_const net_device_ops_no_const;
+ 
+ /*
+  *	The DEVICE structure.
+diff -urNp linux-3.0.3/include/linux/netfilter/xt_gradm.h linux-3.0.3/include/linux/netfilter/xt_gradm.h
+--- linux-3.0.3/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/include/linux/netfilter/xt_gradm.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -57111,11 +53693,10 @@ index 0000000..33f4af8
 +};
 +
 +#endif
-diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
-index 1ca6411..a44b46d 100644
---- a/include/linux/oprofile.h
-+++ b/include/linux/oprofile.h
-@@ -132,9 +132,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
+diff -urNp linux-3.0.3/include/linux/oprofile.h linux-3.0.3/include/linux/oprofile.h
+--- linux-3.0.3/include/linux/oprofile.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/oprofile.h	2011-08-23 21:47:56.000000000 -0400
+@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
  	char const * name, ulong * val);
   
@@ -57127,10 +53708,9 @@ index 1ca6411..a44b46d 100644
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff --git a/include/linux/padata.h b/include/linux/padata.h
-index 4633b2f..988bc08 100644
---- a/include/linux/padata.h
-+++ b/include/linux/padata.h
+diff -urNp linux-3.0.3/include/linux/padata.h linux-3.0.3/include/linux/padata.h
+--- linux-3.0.3/include/linux/padata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/padata.h	2011-08-23 21:47:56.000000000 -0400
 @@ -129,7 +129,7 @@ struct parallel_data {
  	struct padata_instance		*pinst;
  	struct padata_parallel_queue	__percpu *pqueue;
@@ -57140,11 +53720,10 @@ index 4633b2f..988bc08 100644
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
-index a9bd9c0..c6ba5b7 100644
---- a/include/linux/perf_event.h
-+++ b/include/linux/perf_event.h
-@@ -732,8 +732,8 @@ struct perf_event {
+diff -urNp linux-3.0.3/include/linux/perf_event.h linux-3.0.3/include/linux/perf_event.h
+--- linux-3.0.3/include/linux/perf_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/perf_event.h	2011-08-23 21:47:56.000000000 -0400
+@@ -761,8 +761,8 @@ struct perf_event {
  
  	enum perf_event_active_state	state;
  	unsigned int			attach_state;
@@ -57155,7 +53734,7 @@ index a9bd9c0..c6ba5b7 100644
  
  	/*
  	 * These are the total time in nanoseconds that the event
-@@ -784,8 +784,8 @@ struct perf_event {
+@@ -813,8 +813,8 @@ struct perf_event {
  	 * These accumulate total time (in nanoseconds) that children
  	 * events have been enabled and running, respectively.
  	 */
@@ -57166,10 +53745,9 @@ index a9bd9c0..c6ba5b7 100644
  
  	/*
  	 * Protect attach/detach and child_list:
-diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
-index 77257c9..51d473a 100644
---- a/include/linux/pipe_fs_i.h
-+++ b/include/linux/pipe_fs_i.h
+diff -urNp linux-3.0.3/include/linux/pipe_fs_i.h linux-3.0.3/include/linux/pipe_fs_i.h
+--- linux-3.0.3/include/linux/pipe_fs_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/pipe_fs_i.h	2011-08-23 21:47:56.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
  	wait_queue_head_t wait;
@@ -57183,11 +53761,10 @@ index 77257c9..51d473a 100644
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
-index d34f067..3bcebed 100644
---- a/include/linux/pm_runtime.h
-+++ b/include/linux/pm_runtime.h
-@@ -89,7 +89,7 @@ static inline bool pm_runtime_enabled(struct device *dev)
+diff -urNp linux-3.0.3/include/linux/pm_runtime.h linux-3.0.3/include/linux/pm_runtime.h
+--- linux-3.0.3/include/linux/pm_runtime.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/pm_runtime.h	2011-08-23 21:47:56.000000000 -0400
+@@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
  {
@@ -57196,10 +53773,9 @@ index d34f067..3bcebed 100644
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff --git a/include/linux/poison.h b/include/linux/poison.h
-index 2110a81..13a11bb 100644
---- a/include/linux/poison.h
-+++ b/include/linux/poison.h
+diff -urNp linux-3.0.3/include/linux/poison.h linux-3.0.3/include/linux/poison.h
+--- linux-3.0.3/include/linux/poison.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/poison.h	2011-08-23 21:47:56.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -57211,11 +53787,22 @@ index 2110a81..13a11bb 100644
  
  /********** include/linux/timer.h **********/
  /*
-diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
-index 379eaed..3471a57 100644
---- a/include/linux/proc_fs.h
-+++ b/include/linux/proc_fs.h
-@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
+diff -urNp linux-3.0.3/include/linux/preempt.h linux-3.0.3/include/linux/preempt.h
+--- linux-3.0.3/include/linux/preempt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/preempt.h	2011-08-23 21:47:56.000000000 -0400
+@@ -115,7 +115,7 @@ struct preempt_ops {
+ 	void (*sched_in)(struct preempt_notifier *notifier, int cpu);
+ 	void (*sched_out)(struct preempt_notifier *notifier,
+ 			  struct task_struct *next);
+-};
++} __no_const;
+ 
+ /**
+  * preempt_notifier - key for installing preemption notifiers
+diff -urNp linux-3.0.3/include/linux/proc_fs.h linux-3.0.3/include/linux/proc_fs.h
+--- linux-3.0.3/include/linux/proc_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/proc_fs.h	2011-08-23 21:48:14.000000000 -0400
+@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
  	return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
  
@@ -57235,11 +53822,19 @@ index 379eaed..3471a57 100644
  static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
  	mode_t mode, struct proc_dir_entry *base, 
  	read_proc_t *read_proc, void * data)
-diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
-index 9178d5c..ff0a136 100644
---- a/include/linux/ptrace.h
-+++ b/include/linux/ptrace.h
-@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_struct *child);
+@@ -258,7 +271,7 @@ union proc_op {
+ 	int (*proc_show)(struct seq_file *m,
+ 		struct pid_namespace *ns, struct pid *pid,
+ 		struct task_struct *task);
+-};
++} __no_const;
+ 
+ struct ctl_table_header;
+ struct ctl_table;
+diff -urNp linux-3.0.3/include/linux/ptrace.h linux-3.0.3/include/linux/ptrace.h
+--- linux-3.0.3/include/linux/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/ptrace.h	2011-08-23 21:48:14.000000000 -0400
+@@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
  #define PTRACE_MODE_ATTACH 2
@@ -57252,11 +53847,10 @@ index 9178d5c..ff0a136 100644
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff --git a/include/linux/random.h b/include/linux/random.h
-index fb7ab9d..262eb28 100644
---- a/include/linux/random.h
-+++ b/include/linux/random.h
-@@ -80,12 +80,17 @@ void srandom32(u32 seed);
+diff -urNp linux-3.0.3/include/linux/random.h linux-3.0.3/include/linux/random.h
+--- linux-3.0.3/include/linux/random.h	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/include/linux/random.h	2011-08-23 21:47:56.000000000 -0400
+@@ -69,12 +69,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
  
@@ -57275,11 +53869,10 @@ index fb7ab9d..262eb28 100644
  }
  
  /**
-diff --git a/include/linux/reboot.h b/include/linux/reboot.h
-index 3005d5a..77c2dba 100644
---- a/include/linux/reboot.h
-+++ b/include/linux/reboot.h
-@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
+diff -urNp linux-3.0.3/include/linux/reboot.h linux-3.0.3/include/linux/reboot.h
+--- linux-3.0.3/include/linux/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/reboot.h	2011-08-23 21:47:56.000000000 -0400
+@@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
  
@@ -57292,7 +53885,7 @@ index 3005d5a..77c2dba 100644
  
  extern void machine_shutdown(void);
  struct pt_regs;
-@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
+@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struc
   */
  
  extern void kernel_restart_prepare(char *cmd);
@@ -57314,11 +53907,10 @@ index 3005d5a..77c2dba 100644
  #include <asm/emergency-restart.h>
  
  #endif
-diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
-index c21072a..37d75a5 100644
---- a/include/linux/reiserfs_fs.h
-+++ b/include/linux/reiserfs_fs.h
-@@ -1403,7 +1403,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
+diff -urNp linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3/include/linux/reiserfs_fs.h
+--- linux-3.0.3/include/linux/reiserfs_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/reiserfs_fs.h	2011-08-23 21:47:56.000000000 -0400
+@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM		1	/* reiserfs user memory mode            */
  
  #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
@@ -57327,47 +53919,9 @@ index c21072a..37d75a5 100644
  #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)		\
-@@ -1615,24 +1615,24 @@ static inline struct super_block *sb_from_bi(struct buffer_info *bi)
- */
- 
- struct item_operations {
--	int (*bytes_number) (struct item_head * ih, int block_size);
--	void (*decrement_key) (struct cpu_key *);
--	int (*is_left_mergeable) (struct reiserfs_key * ih,
-+	int (* const bytes_number) (struct item_head * ih, int block_size);
-+	void (* const decrement_key) (struct cpu_key *);
-+	int (* const is_left_mergeable) (struct reiserfs_key * ih,
- 				  unsigned long bsize);
--	void (*print_item) (struct item_head *, char *item);
--	void (*check_item) (struct item_head *, char *item);
-+	void (* const print_item) (struct item_head *, char *item);
-+	void (* const check_item) (struct item_head *, char *item);
- 
--	int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
-+	int (* const create_vi) (struct virtual_node * vn, struct virtual_item * vi,
- 			  int is_affected, int insert_size);
--	int (*check_left) (struct virtual_item * vi, int free,
-+	int (* const check_left) (struct virtual_item * vi, int free,
- 			   int start_skip, int end_skip);
--	int (*check_right) (struct virtual_item * vi, int free);
--	int (*part_size) (struct virtual_item * vi, int from, int to);
--	int (*unit_num) (struct virtual_item * vi);
--	void (*print_vi) (struct virtual_item * vi);
-+	int (* const check_right) (struct virtual_item * vi, int free);
-+	int (* const part_size) (struct virtual_item * vi, int from, int to);
-+	int (* const unit_num) (struct virtual_item * vi);
-+	void (* const print_vi) (struct virtual_item * vi);
- };
- 
--extern struct item_operations *item_ops[TYPE_ANY + 1];
-+extern const struct item_operations * const item_ops[TYPE_ANY + 1];
- 
- #define op_bytes_number(ih,bsize)                    item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
- #define op_is_left_mergeable(key,bsize)              item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
-diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
-index 52c83b6..18ed7eb 100644
---- a/include/linux/reiserfs_fs_sb.h
-+++ b/include/linux/reiserfs_fs_sb.h
+diff -urNp linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.3/include/linux/reiserfs_fs_sb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/reiserfs_fs_sb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
  	/* Comment? -Hans */
  	wait_queue_head_t s_wait;
@@ -57377,11 +53931,33 @@ index 52c83b6..18ed7eb 100644
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff --git a/include/linux/rmap.h b/include/linux/rmap.h
-index e9fd04c..4aefe50 100644
---- a/include/linux/rmap.h
-+++ b/include/linux/rmap.h
-@@ -145,8 +145,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
+diff -urNp linux-3.0.3/include/linux/relay.h linux-3.0.3/include/linux/relay.h
+--- linux-3.0.3/include/linux/relay.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/relay.h	2011-08-23 21:47:56.000000000 -0400
+@@ -159,7 +159,7 @@ struct rchan_callbacks
+ 	 * The callback should return 0 if successful, negative if not.
+ 	 */
+ 	int (*remove_buf_file)(struct dentry *dentry);
+-};
++} __no_const;
+ 
+ /*
+  * CONFIG_RELAY kernel API, kernel/relay.c
+diff -urNp linux-3.0.3/include/linux/rfkill.h linux-3.0.3/include/linux/rfkill.h
+--- linux-3.0.3/include/linux/rfkill.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/rfkill.h	2011-08-23 21:47:56.000000000 -0400
+@@ -147,6 +147,7 @@ struct rfkill_ops {
+ 	void	(*query)(struct rfkill *rfkill, void *data);
+ 	int	(*set_block)(void *data, bool blocked);
+ };
++typedef struct rfkill_ops __no_const rfkill_ops_no_const;
+ 
+ #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
+ /**
+diff -urNp linux-3.0.3/include/linux/rmap.h linux-3.0.3/include/linux/rmap.h
+--- linux-3.0.3/include/linux/rmap.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/rmap.h	2011-08-23 21:47:56.000000000 -0400
+@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
  void anon_vma_init(void);	/* create anon_vma_cachep */
  int  anon_vma_prepare(struct vm_area_struct *);
  void unlink_anon_vmas(struct vm_area_struct *);
@@ -57390,29 +53966,19 @@ index e9fd04c..4aefe50 100644
 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
  void __anon_vma_link(struct vm_area_struct *);
- void anon_vma_free(struct anon_vma *);
- 
-diff --git a/include/linux/sched.h b/include/linux/sched.h
-index d2a5da91..62799a6 100644
---- a/include/linux/sched.h
-+++ b/include/linux/sched.h
-@@ -99,6 +99,7 @@ struct robust_list_head;
- struct bio_list;
+ 
+ static inline void anon_vma_merge(struct vm_area_struct *vma,
+diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
+--- linux-3.0.3/include/linux/sched.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/sched.h	2011-08-23 21:48:14.000000000 -0400
+@@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
+ struct blk_plug;
 +struct linux_binprm;
  
  /*
   * List of flags we want to share for kernel threads,
-@@ -359,7 +360,7 @@ extern signed long schedule_timeout_interruptible(signed long timeout);
- extern signed long schedule_timeout_killable(signed long timeout);
- extern signed long schedule_timeout_uninterruptible(signed long timeout);
- asmlinkage void schedule(void);
--extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
-+extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
- 
- struct nsproxy;
- struct user_namespace;
 @@ -380,10 +381,13 @@ struct user_namespace;
  #define DEFAULT_MAX_MAP_COUNT	(USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
  
@@ -57427,7 +53993,7 @@ index d2a5da91..62799a6 100644
  extern void arch_pick_mmap_layout(struct mm_struct *mm);
  extern unsigned long
  arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
-@@ -628,6 +632,17 @@ struct signal_struct {
+@@ -629,6 +633,17 @@ struct signal_struct {
  #ifdef CONFIG_TASKSTATS
  	struct taskstats *stats;
  #endif
@@ -57445,7 +54011,7 @@ index d2a5da91..62799a6 100644
  #ifdef CONFIG_AUDIT
  	unsigned audit_tty;
  	struct tty_audit_buf *tty_audit_buf;
-@@ -700,6 +715,11 @@ struct user_struct {
+@@ -710,6 +725,11 @@ struct user_struct {
  	struct key *session_keyring;	/* UID's default session keyring */
  #endif
  
@@ -57457,7 +54023,7 @@ index d2a5da91..62799a6 100644
  	/* Hash table maintenance information */
  	struct hlist_node uidhash_node;
  	uid_t uid;
-@@ -1310,8 +1330,8 @@ struct task_struct {
+@@ -1340,8 +1360,8 @@ struct task_struct {
  	struct list_head thread_group;
  
  	struct completion *vfork_done;		/* for vfork() */
@@ -57468,7 +54034,7 @@ index d2a5da91..62799a6 100644
  
  	cputime_t utime, stime, utimescaled, stimescaled;
  	cputime_t gtime;
-@@ -1327,13 +1347,6 @@ struct task_struct {
+@@ -1357,13 +1377,6 @@ struct task_struct {
  	struct task_cputime cputime_expires;
  	struct list_head cpu_timers[3];
  
@@ -57482,7 +54048,7 @@ index d2a5da91..62799a6 100644
  	char comm[TASK_COMM_LEN]; /* executable name excluding path
  				     - access with [gs]et_task_comm (which lock
  				       it with task_lock())
-@@ -1350,8 +1363,16 @@ struct task_struct {
+@@ -1380,8 +1393,16 @@ struct task_struct {
  #endif
  /* CPU-specific state of this task */
  	struct thread_struct thread;
@@ -57499,7 +54065,7 @@ index d2a5da91..62799a6 100644
  /* open file information */
  	struct files_struct *files;
  /* namespaces */
-@@ -1398,6 +1419,11 @@ struct task_struct {
+@@ -1428,6 +1449,11 @@ struct task_struct {
  	struct rt_mutex_waiter *pi_blocked_on;
  #endif
  
@@ -57511,7 +54077,7 @@ index d2a5da91..62799a6 100644
  #ifdef CONFIG_DEBUG_MUTEXES
  	/* mutex deadlock detection */
  	struct mutex_waiter *blocked_on;
-@@ -1502,6 +1528,21 @@ struct task_struct {
+@@ -1538,6 +1564,21 @@ struct task_struct {
  	unsigned long default_timer_slack_ns;
  
  	struct list_head	*scm_work_list;
@@ -57533,7 +54099,7 @@ index d2a5da91..62799a6 100644
  #ifdef CONFIG_FUNCTION_GRAPH_TRACER
  	/* Index of current stored address in ret_stack */
  	int curr_ret_stack;
-@@ -1536,6 +1577,63 @@ struct task_struct {
+@@ -1572,6 +1613,57 @@ struct task_struct {
  #endif
  };
  
@@ -57545,7 +54111,7 @@ index d2a5da91..62799a6 100644
 +#define MF_PAX_SEGMEXEC		0x20000000	/* Segmentation based non-executable pages */
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+extern unsigned int pax_softmode;
++extern int pax_softmode;
 +#endif
 +
 +extern int pax_check_flags(unsigned long *);
@@ -57577,27 +54143,21 @@ index d2a5da91..62799a6 100644
 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
 +#endif
 +
-+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
-+void pax_report_insns(void *pc, void *sp);
-+void pax_report_refcount_overflow(struct pt_regs *regs);
-+void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
-+
-+static inline void pax_track_stack(void)
-+{
++extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
++extern void pax_report_insns(void *pc, void *sp);
++extern void pax_report_refcount_overflow(struct pt_regs *regs);
++extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
 +
 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+	unsigned long sp = current_stack_pointer;
-+	if (current_thread_info()->lowest_stack > sp &&
-+	    (unsigned long)task_stack_page(current) < sp)
-+		current_thread_info()->lowest_stack = sp;
++extern void pax_track_stack(void);
++#else
++static inline void pax_track_stack(void) {}
 +#endif
 +
-+}
-+
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2005,7 +2103,9 @@ void yield(void);
+@@ -2056,7 +2148,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -57607,7 +54167,15 @@ index d2a5da91..62799a6 100644
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2175,7 +2275,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
+@@ -2089,6 +2183,7 @@ extern struct pid_namespace init_pid_ns;
+  */
+ 
+ extern struct task_struct *find_task_by_vpid(pid_t nr);
++extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
+ extern struct task_struct *find_task_by_pid_ns(pid_t nr,
+ 		struct pid_namespace *ns);
+ 
+@@ -2225,7 +2320,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -57616,7 +54184,7 @@ index d2a5da91..62799a6 100644
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2316,13 +2416,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
+@@ -2393,13 +2488,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -57636,10 +54204,9 @@ index d2a5da91..62799a6 100644
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
-index 899fbb4..1cb4138 100644
---- a/include/linux/screen_info.h
-+++ b/include/linux/screen_info.h
+diff -urNp linux-3.0.3/include/linux/screen_info.h linux-3.0.3/include/linux/screen_info.h
+--- linux-3.0.3/include/linux/screen_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/screen_info.h	2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
  	__u16 pages;		/* 0x32 */
  	__u16 vesa_attributes;	/* 0x34 */
@@ -57650,11 +54217,10 @@ index 899fbb4..1cb4138 100644
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff --git a/include/linux/security.h b/include/linux/security.h
-index b2b7f97..3ba03d9 100644
---- a/include/linux/security.h
-+++ b/include/linux/security.h
-@@ -35,6 +35,7 @@
+diff -urNp linux-3.0.3/include/linux/security.h linux-3.0.3/include/linux/security.h
+--- linux-3.0.3/include/linux/security.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/security.h	2011-08-23 21:48:14.000000000 -0400
+@@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
  #include <linux/slab.h>
@@ -57662,11 +54228,33 @@ index b2b7f97..3ba03d9 100644
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff --git a/include/linux/shm.h b/include/linux/shm.h
-index eca6235..c7417ed 100644
---- a/include/linux/shm.h
-+++ b/include/linux/shm.h
-@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the kernel */
+diff -urNp linux-3.0.3/include/linux/seq_file.h linux-3.0.3/include/linux/seq_file.h
+--- linux-3.0.3/include/linux/seq_file.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/seq_file.h	2011-08-23 21:47:56.000000000 -0400
+@@ -32,6 +32,7 @@ struct seq_operations {
+ 	void * (*next) (struct seq_file *m, void *v, loff_t *pos);
+ 	int (*show) (struct seq_file *m, void *v);
+ };
++typedef struct seq_operations __no_const seq_operations_no_const;
+ 
+ #define SEQ_SKIP 1
+ 
+diff -urNp linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3/include/linux/shmem_fs.h
+--- linux-3.0.3/include/linux/shmem_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/shmem_fs.h	2011-08-23 21:47:56.000000000 -0400
+@@ -10,7 +10,7 @@
+ 
+ #define SHMEM_NR_DIRECT 16
+ 
+-#define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
++#define SHMEM_SYMLINK_INLINE_LEN 64
+ 
+ struct shmem_inode_info {
+ 	spinlock_t		lock;
+diff -urNp linux-3.0.3/include/linux/shm.h linux-3.0.3/include/linux/shm.h
+--- linux-3.0.3/include/linux/shm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/shm.h	2011-08-23 21:48:14.000000000 -0400
+@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
  	pid_t			shm_cprid;
  	pid_t			shm_lprid;
  	struct user_struct	*mlock_user;
@@ -57677,11 +54265,10 @@ index eca6235..c7417ed 100644
  };
  
  /* shm_mode upper byte flags */
-diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
-index bf221d6..77434e4 100644
---- a/include/linux/skbuff.h
-+++ b/include/linux/skbuff.h
-@@ -589,7 +589,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
+diff -urNp linux-3.0.3/include/linux/skbuff.h linux-3.0.3/include/linux/skbuff.h
+--- linux-3.0.3/include/linux/skbuff.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/skbuff.h	2011-08-23 21:47:56.000000000 -0400
+@@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
  {
@@ -57690,7 +54277,7 @@ index bf221d6..77434e4 100644
  }
  
  /**
-@@ -602,7 +602,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
+@@ -605,7 +605,7 @@ static inline int skb_queue_empty(const 
  static inline bool skb_queue_is_last(const struct sk_buff_head *list,
  				     const struct sk_buff *skb)
  {
@@ -57699,7 +54286,7 @@ index bf221d6..77434e4 100644
  }
  
  /**
-@@ -615,7 +615,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
+@@ -618,7 +618,7 @@ static inline bool skb_queue_is_last(con
  static inline bool skb_queue_is_first(const struct sk_buff_head *list,
  				      const struct sk_buff *skb)
  {
@@ -57708,19 +54295,36 @@ index bf221d6..77434e4 100644
  }
  
  /**
-@@ -1432,7 +1432,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -1440,7 +1440,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */
  #ifndef NET_SKB_PAD
 -#define NET_SKB_PAD	max(32, L1_CACHE_BYTES)
-+#define NET_SKB_PAD	max(_AC(32,U), L1_CACHE_BYTES)
++#define NET_SKB_PAD	max(_AC(32,UL), L1_CACHE_BYTES)
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff --git a/include/linux/slab.h b/include/linux/slab.h
-index fa90866..15a7c4c 100644
---- a/include/linux/slab.h
-+++ b/include/linux/slab.h
+diff -urNp linux-3.0.3/include/linux/slab_def.h linux-3.0.3/include/linux/slab_def.h
+--- linux-3.0.3/include/linux/slab_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/slab_def.h	2011-08-23 21:47:56.000000000 -0400
+@@ -96,10 +96,10 @@ struct kmem_cache {
+ 	unsigned long node_allocs;
+ 	unsigned long node_frees;
+ 	unsigned long node_overflow;
+-	atomic_t allochit;
+-	atomic_t allocmiss;
+-	atomic_t freehit;
+-	atomic_t freemiss;
++	atomic_unchecked_t allochit;
++	atomic_unchecked_t allocmiss;
++	atomic_unchecked_t freehit;
++	atomic_unchecked_t freemiss;
+ 
+ 	/*
+ 	 * If debugging is enabled, then the allocator can add additional
+diff -urNp linux-3.0.3/include/linux/slab.h linux-3.0.3/include/linux/slab.h
+--- linux-3.0.3/include/linux/slab.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/slab.h	2011-08-23 21:47:56.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -57759,7 +54363,7 @@ index fa90866..15a7c4c 100644
  
  /*
   * struct kmem_cache related prototypes
-@@ -142,6 +153,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
+@@ -141,6 +152,7 @@ void * __must_check krealloc(const void 
  void kfree(const void *);
  void kzfree(const void *);
  size_t ksize(const void *);
@@ -57767,19 +54371,19 @@ index fa90866..15a7c4c 100644
  
  /*
   * Allocator specific definitions. These are mainly used to establish optimized
-@@ -334,4 +346,37 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
+@@ -333,4 +345,59 @@ static inline void *kzalloc_node(size_t 
  
  void __init kmem_cache_init_late(void);
  
-+#define kmalloc(x, y)					\
-+({							\
-+	void *___retval;				\
-+	intoverflow_t ___x = (intoverflow_t)x;		\
-+	if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
-+		___retval = NULL;			\
-+	else						\
-+		___retval = kmalloc((size_t)___x, (y));	\
-+	___retval;					\
++#define kmalloc(x, y)						\
++({								\
++	void *___retval;					\
++	intoverflow_t ___x = (intoverflow_t)x;			\
++	if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))	\
++		___retval = NULL;				\
++	else							\
++		___retval = kmalloc((size_t)___x, (y));		\
++	___retval;						\
 +})
 +
 +#define kmalloc_node(x, y, z)					\
@@ -57793,42 +54397,44 @@ index fa90866..15a7c4c 100644
 +	___retval;						\
 +})
 +
-+#define kzalloc(x, y)					\
-+({							\
-+	void *___retval;				\
-+	intoverflow_t ___x = (intoverflow_t)x;		\
-+	if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
-+		___retval = NULL;			\
-+	else						\
-+		___retval = kzalloc((size_t)___x, (y));	\
-+	___retval;					\
++#define kzalloc(x, y)						\
++({								\
++	void *___retval;					\
++	intoverflow_t ___x = (intoverflow_t)x;			\
++	if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))	\
++		___retval = NULL;				\
++	else							\
++		___retval = kzalloc((size_t)___x, (y));		\
++	___retval;						\
++})
++
++#define __krealloc(x, y, z)					\
++({								\
++	void *___retval;					\
++	intoverflow_t ___y = (intoverflow_t)y;			\
++	if (WARN(___y > ULONG_MAX, "__krealloc size overflow\n"))\
++		___retval = NULL;				\
++	else							\
++		___retval = __krealloc((x), (size_t)___y, (z));	\
++	___retval;						\
++})
++
++#define krealloc(x, y, z)					\
++({								\
++	void *___retval;					\
++	intoverflow_t ___y = (intoverflow_t)y;			\
++	if (WARN(___y > ULONG_MAX, "krealloc size overflow\n"))	\
++		___retval = NULL;				\
++	else							\
++		___retval = krealloc((x), (size_t)___y, (z));	\
++	___retval;						\
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index 83203ae..855726b 100644
---- a/include/linux/slab_def.h
-+++ b/include/linux/slab_def.h
-@@ -96,10 +96,10 @@ struct kmem_cache {
- 	unsigned long node_allocs;
- 	unsigned long node_frees;
- 	unsigned long node_overflow;
--	atomic_t allochit;
--	atomic_t allocmiss;
--	atomic_t freehit;
--	atomic_t freemiss;
-+	atomic_unchecked_t allochit;
-+	atomic_unchecked_t allocmiss;
-+	atomic_unchecked_t freehit;
-+	atomic_unchecked_t freemiss;
- 
- 	/*
- 	 * If debugging is enabled, then the allocator can add additional
-diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
-index 8b6e8ae..6c6a35b 100644
---- a/include/linux/slub_def.h
-+++ b/include/linux/slub_def.h
-@@ -79,7 +79,7 @@ struct kmem_cache {
+diff -urNp linux-3.0.3/include/linux/slub_def.h linux-3.0.3/include/linux/slub_def.h
+--- linux-3.0.3/include/linux/slub_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/slub_def.h	2011-08-23 21:47:56.000000000 -0400
+@@ -82,7 +82,7 @@ struct kmem_cache {
  	struct kmem_cache_order_objects max;
  	struct kmem_cache_order_objects min;
  	gfp_t allocflags;	/* gfp flags to use on each alloc */
@@ -57837,10 +54443,18 @@ index 8b6e8ae..6c6a35b 100644
  	void (*ctor)(void *);
  	int inuse;		/* Offset to metadata */
  	int align;		/* Alignment */
-diff --git a/include/linux/sonet.h b/include/linux/sonet.h
-index 67ad11f..0bbd8af 100644
---- a/include/linux/sonet.h
-+++ b/include/linux/sonet.h
+@@ -218,7 +218,7 @@ static __always_inline struct kmem_cache
+ }
+ 
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
+-void *__kmalloc(size_t size, gfp_t flags);
++void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
+ 
+ static __always_inline void *
+ kmalloc_order(size_t size, gfp_t flags, unsigned int order)
+diff -urNp linux-3.0.3/include/linux/sonet.h linux-3.0.3/include/linux/sonet.h
+--- linux-3.0.3/include/linux/sonet.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/sonet.h	2011-08-23 21:47:56.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -57850,11 +54464,10 @@ index 67ad11f..0bbd8af 100644
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
-index ef9476a..78dc662 100644
---- a/include/linux/sunrpc/clnt.h
-+++ b/include/linux/sunrpc/clnt.h
-@@ -168,9 +168,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
+diff -urNp linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3/include/linux/sunrpc/clnt.h
+--- linux-3.0.3/include/linux/sunrpc/clnt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/sunrpc/clnt.h	2011-08-23 21:47:56.000000000 -0400
+@@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
  	switch (sap->sa_family) {
  	case AF_INET:
@@ -57866,7 +54479,7 @@ index ef9476a..78dc662 100644
  	}
  	return 0;
  }
-@@ -203,7 +203,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
+@@ -204,7 +204,7 @@ static inline bool __rpc_cmp_addr4(const
  static inline bool __rpc_copy_addr4(struct sockaddr *dst,
  				    const struct sockaddr *src)
  {
@@ -57875,7 +54488,7 @@ index ef9476a..78dc662 100644
  	struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
  
  	dsin->sin_family = ssin->sin_family;
-@@ -300,7 +300,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
+@@ -301,7 +301,7 @@ static inline u32 rpc_get_scope_id(const
  	if (sa->sa_family != AF_INET6)
  		return 0;
  
@@ -57884,10 +54497,9 @@ index ef9476a..78dc662 100644
  }
  
  #endif /* __KERNEL__ */
-diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
-index c14fe86..393245e 100644
---- a/include/linux/sunrpc/svc_rdma.h
-+++ b/include/linux/sunrpc/svc_rdma.h
+diff -urNp linux-3.0.3/include/linux/sunrpc/svc_rdma.h linux-3.0.3/include/linux/sunrpc/svc_rdma.h
+--- linux-3.0.3/include/linux/sunrpc/svc_rdma.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/sunrpc/svc_rdma.h	2011-08-23 21:47:56.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -57913,66 +54525,9 @@ index c14fe86..393245e 100644
  
  #define RPCRDMA_VERSION 1
  
-diff --git a/include/linux/suspend.h b/include/linux/suspend.h
-index 5a89e36..922adcc 100644
---- a/include/linux/suspend.h
-+++ b/include/linux/suspend.h
-@@ -106,15 +106,15 @@ typedef int __bitwise suspend_state_t;
-  *	which require special recovery actions in that situation.
-  */
- struct platform_suspend_ops {
--	int (*valid)(suspend_state_t state);
--	int (*begin)(suspend_state_t state);
--	int (*prepare)(void);
--	int (*prepare_late)(void);
--	int (*enter)(suspend_state_t state);
--	void (*wake)(void);
--	void (*finish)(void);
--	void (*end)(void);
--	void (*recover)(void);
-+	int (* const valid)(suspend_state_t state);
-+	int (* const begin)(suspend_state_t state);
-+	int (* const prepare)(void);
-+	int (* const prepare_late)(void);
-+	int (* const enter)(suspend_state_t state);
-+	void (* const wake)(void);
-+	void (* const finish)(void);
-+	void (* const end)(void);
-+	void (* const recover)(void);
- };
- 
- #ifdef CONFIG_SUSPEND
-@@ -217,16 +217,16 @@ extern void mark_free_pages(struct zone *zone);
-  *	platforms which require special recovery actions in that situation.
-  */
- struct platform_hibernation_ops {
--	int (*begin)(void);
--	void (*end)(void);
--	int (*pre_snapshot)(void);
--	void (*finish)(void);
--	int (*prepare)(void);
--	int (*enter)(void);
--	void (*leave)(void);
--	int (*pre_restore)(void);
--	void (*restore_cleanup)(void);
--	void (*recover)(void);
-+	int (* const begin)(void);
-+	void (* const end)(void);
-+	int (* const pre_snapshot)(void);
-+	void (* const finish)(void);
-+	int (* const prepare)(void);
-+	int (* const enter)(void);
-+	void (* const leave)(void);
-+	int (* const pre_restore)(void);
-+	void (* const restore_cleanup)(void);
-+	void (* const recover)(void);
- };
- 
- #ifdef CONFIG_HIBERNATION
-diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
-index 11684d9..0d245eb 100644
---- a/include/linux/sysctl.h
-+++ b/include/linux/sysctl.h
+diff -urNp linux-3.0.3/include/linux/sysctl.h linux-3.0.3/include/linux/sysctl.h
+--- linux-3.0.3/include/linux/sysctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/sysctl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -155,7 +155,11 @@ enum
  	KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -57986,7 +54541,7 @@ index 11684d9..0d245eb 100644
  
  /* CTL_VM names: */
  enum
-@@ -967,6 +971,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
+@@ -967,6 +971,8 @@ typedef int proc_handler (struct ctl_tab
  
  extern int proc_dostring(struct ctl_table *, int,
  			 void __user *, size_t *, loff_t *);
@@ -57995,65 +54550,9 @@ index 11684d9..0d245eb 100644
  extern int proc_dointvec(struct ctl_table *, int,
  			 void __user *, size_t *, loff_t *);
  extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
-index 30b8815..a867952 100644
---- a/include/linux/sysfs.h
-+++ b/include/linux/sysfs.h
-@@ -110,8 +110,8 @@ struct bin_attribute {
- #define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
- 
- struct sysfs_ops {
--	ssize_t	(*show)(struct kobject *, struct attribute *,char *);
--	ssize_t	(*store)(struct kobject *,struct attribute *,const char *, size_t);
-+	ssize_t	(* const show)(struct kobject *, struct attribute *,char *);
-+	ssize_t	(* const store)(struct kobject *,struct attribute *,const char *, size_t);
- };
- 
- struct sysfs_dirent;
-diff --git a/include/linux/tty.h b/include/linux/tty.h
-index 54e4eaa..f27f0fc 100644
---- a/include/linux/tty.h
-+++ b/include/linux/tty.h
-@@ -13,6 +13,8 @@
- #include <linux/tty_driver.h>
- #include <linux/tty_ldisc.h>
- #include <linux/mutex.h>
-+#include <linux/poll.h>
-+#include <linux/smp_lock.h>
- 
- #include <asm/system.h>
- 
-@@ -465,7 +467,6 @@ extern int tty_perform_flush(struct tty_struct *tty, unsigned long arg);
- extern dev_t tty_devnum(struct tty_struct *tty);
- extern void proc_clear_tty(struct task_struct *p);
- extern struct tty_struct *get_current_tty(void);
--extern void tty_default_fops(struct file_operations *fops);
- extern struct tty_struct *alloc_tty_struct(void);
- extern int tty_add_file(struct tty_struct *tty, struct file *file);
- extern void free_tty_struct(struct tty_struct *tty);
-@@ -528,6 +529,18 @@ extern void tty_ldisc_begin(void);
- /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
- extern void tty_ldisc_enable(struct tty_struct *tty);
- 
-+/* tty_io.c */
-+extern ssize_t tty_read(struct file *, char __user *, size_t, loff_t *);
-+extern ssize_t tty_write(struct file *, const char __user *, size_t, loff_t *);
-+extern unsigned int tty_poll(struct file *, poll_table *);
-+#ifdef CONFIG_COMPAT
-+extern long tty_compat_ioctl(struct file *file, unsigned int cmd,
-+				unsigned long arg);
-+#else
-+#define tty_compat_ioctl NULL
-+#endif
-+extern int tty_release(struct inode *, struct file *);
-+extern int tty_fasync(int fd, struct file *filp, int on);
- 
- /* n_tty.c */
- extern struct tty_ldisc_ops tty_ldisc_N_TTY;
-diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
-index ff7dc08..893e1bd 100644
---- a/include/linux/tty_ldisc.h
-+++ b/include/linux/tty_ldisc.h
+diff -urNp linux-3.0.3/include/linux/tty_ldisc.h linux-3.0.3/include/linux/tty_ldisc.h
+--- linux-3.0.3/include/linux/tty_ldisc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/tty_ldisc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -58063,11 +54562,10 @@ index ff7dc08..893e1bd 100644
  };
  
  struct tty_ldisc {
-diff --git a/include/linux/types.h b/include/linux/types.h
-index c2a9eb4..03a71e9 100644
---- a/include/linux/types.h
-+++ b/include/linux/types.h
-@@ -207,10 +207,26 @@ typedef struct {
+diff -urNp linux-3.0.3/include/linux/types.h linux-3.0.3/include/linux/types.h
+--- linux-3.0.3/include/linux/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/types.h	2011-08-23 21:47:56.000000000 -0400
+@@ -213,10 +213,26 @@ typedef struct {
  	int counter;
  } atomic_t;
  
@@ -58094,11 +54592,10 @@ index c2a9eb4..03a71e9 100644
  #endif
  
  struct list_head {
-diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
-index d512d98..73371e8 100644
---- a/include/linux/uaccess.h
-+++ b/include/linux/uaccess.h
-@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
+diff -urNp linux-3.0.3/include/linux/uaccess.h linux-3.0.3/include/linux/uaccess.h
+--- linux-3.0.3/include/linux/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/uaccess.h	2011-08-23 21:47:56.000000000 -0400
+@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
  							\
@@ -58112,31 +54609,9 @@ index d512d98..73371e8 100644
  		ret;					\
  	})
  
-@@ -93,8 +93,8 @@ static inline unsigned long __copy_from_user_nocache(void *to,
-  * Safely read from address @src to the buffer at @dst.  If a kernel fault
-  * happens, handle that and return -EFAULT.
-  */
--extern long probe_kernel_read(void *dst, void *src, size_t size);
--extern long __probe_kernel_read(void *dst, void *src, size_t size);
-+extern long probe_kernel_read(void *dst, const void *src, size_t size);
-+extern long __probe_kernel_read(void *dst, const void *src, size_t size);
- 
- /*
-  * probe_kernel_write(): safely attempt to write to a location
-@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, void *src, size_t size);
-  * Safely write to address @dst from the buffer at @src.  If a kernel fault
-  * happens, handle that and return -EFAULT.
-  */
--extern long notrace probe_kernel_write(void *dst, void *src, size_t size);
--extern long notrace __probe_kernel_write(void *dst, void *src, size_t size);
-+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
-+extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
- 
- #endif		/* __LINUX_UACCESS_H__ */
-diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
-index 99c1b4d..bb94261 100644
---- a/include/linux/unaligned/access_ok.h
-+++ b/include/linux/unaligned/access_ok.h
+diff -urNp linux-3.0.3/include/linux/unaligned/access_ok.h linux-3.0.3/include/linux/unaligned/access_ok.h
+--- linux-3.0.3/include/linux/unaligned/access_ok.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/unaligned/access_ok.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -58176,33 +54651,10 @@ index 99c1b4d..bb94261 100644
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
-index f21f599..c6b2cc7 100644
---- a/include/linux/usb/hcd.h
-+++ b/include/linux/usb/hcd.h
-@@ -589,7 +589,7 @@ struct usb_mon_operations {
- 	/* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
- };
- 
--extern struct usb_mon_operations *mon_ops;
-+extern const struct usb_mon_operations *mon_ops;
- 
- static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
- {
-@@ -611,7 +611,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
- 		(*mon_ops->urb_complete)(bus, urb, status);
- }
- 
--int usb_mon_register(struct usb_mon_operations *ops);
-+int usb_mon_register(const struct usb_mon_operations *ops);
- void usb_mon_deregister(void);
- 
- #else
-diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
-index 4ed6fcd..14f54ff 100644
---- a/include/linux/vmalloc.h
-+++ b/include/linux/vmalloc.h
-@@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining user mapping in mm_types.h */
+diff -urNp linux-3.0.3/include/linux/vmalloc.h linux-3.0.3/include/linux/vmalloc.h
+--- linux-3.0.3/include/linux/vmalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/vmalloc.h	2011-08-23 21:47:56.000000000 -0400
+@@ -13,6 +13,11 @@ struct vm_area_struct;		/* vma defining 
  #define VM_MAP		0x00000004	/* vmap()ed pages */
  #define VM_USERMAP	0x00000008	/* suitable for remap_vmalloc_range */
  #define VM_VPAGES	0x00000010	/* buffer for pages was vmalloc'ed */
@@ -58214,8 +54666,8 @@ index 4ed6fcd..14f54ff 100644
  /* bits [20..32] reserved for arch specific ioremap internals */
  
  /*
-@@ -123,4 +128,103 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
- void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
+@@ -155,4 +160,103 @@ pcpu_free_vm_areas(struct vm_struct **vm
+ # endif
  #endif
  
 +#define vmalloc(x)						\
@@ -58318,11 +54770,10 @@ index 4ed6fcd..14f54ff 100644
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
-index 833e676..28d9d10 100644
---- a/include/linux/vmstat.h
-+++ b/include/linux/vmstat.h
-@@ -140,18 +140,18 @@ static inline void vm_events_fold_cpu(int cpu)
+diff -urNp linux-3.0.3/include/linux/vmstat.h linux-3.0.3/include/linux/vmstat.h
+--- linux-3.0.3/include/linux/vmstat.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/linux/vmstat.h	2011-08-23 21:47:56.000000000 -0400
+@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
   */
@@ -58345,7 +54796,7 @@ index 833e676..28d9d10 100644
  #ifdef CONFIG_SMP
  	if (x < 0)
  		x = 0;
-@@ -162,7 +162,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
+@@ -109,7 +109,7 @@ static inline unsigned long global_page_
  static inline unsigned long zone_page_state(struct zone *zone,
  					enum zone_stat_item item)
  {
@@ -58354,7 +54805,7 @@ index 833e676..28d9d10 100644
  #ifdef CONFIG_SMP
  	if (x < 0)
  		x = 0;
-@@ -179,7 +179,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
+@@ -126,7 +126,7 @@ static inline unsigned long zone_page_st
  static inline unsigned long zone_page_state_snapshot(struct zone *zone,
  					enum zone_stat_item item)
  {
@@ -58363,7 +54814,7 @@ index 833e676..28d9d10 100644
  
  #ifdef CONFIG_SMP
  	int cpu;
-@@ -273,8 +273,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
+@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state
  
  static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
  {
@@ -58374,7 +54825,7 @@ index 833e676..28d9d10 100644
  }
  
  static inline void __inc_zone_page_state(struct page *page,
-@@ -285,8 +285,8 @@ static inline void __inc_zone_page_state(struct page *page,
+@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state
  
  static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
  {
@@ -58385,23 +54836,41 @@ index 833e676..28d9d10 100644
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index b16f307..fdb36a4 100644
---- a/include/media/v4l2-device.h
-+++ b/include/media/v4l2-device.h
-@@ -77,7 +77,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
-    this function returns 0. If the name ends with a digit (e.g. cx18),
-    then the name will be set to cx18-0 since cx180 looks really odd. */
- int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
--						atomic_t *instance);
-+						atomic_unchecked_t *instance);
- 
- /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
-    Since the parent disappears this ensures that v4l2_dev doesn't have an
-diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
-index e54f639..7dffc71 100644
---- a/include/net/caif/cfctrl.h
-+++ b/include/net/caif/cfctrl.h
+diff -urNp linux-3.0.3/include/media/saa7146_vv.h linux-3.0.3/include/media/saa7146_vv.h
+--- linux-3.0.3/include/media/saa7146_vv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/media/saa7146_vv.h	2011-08-24 18:26:09.000000000 -0400
+@@ -163,7 +163,7 @@ struct saa7146_ext_vv
+ 	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
+ 
+ 	/* the extension can override this */
+-	struct v4l2_ioctl_ops ops;
++	v4l2_ioctl_ops_no_const ops;
+ 	/* pointer to the saa7146 core ops */
+ 	const struct v4l2_ioctl_ops *core_ops;
+ 
+diff -urNp linux-3.0.3/include/media/v4l2-ioctl.h linux-3.0.3/include/media/v4l2-ioctl.h
+--- linux-3.0.3/include/media/v4l2-ioctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/media/v4l2-ioctl.h	2011-08-24 18:25:45.000000000 -0400
+@@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
+ 	long (*vidioc_default)	       (struct file *file, void *fh,
+ 					bool valid_prio, int cmd, void *arg);
+ };
++typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
+ 
+ 
+ /* v4l debugging and diagnostics */
+diff -urNp linux-3.0.3/include/net/caif/cfctrl.h linux-3.0.3/include/net/caif/cfctrl.h
+--- linux-3.0.3/include/net/caif/cfctrl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/caif/cfctrl.h	2011-08-23 21:47:56.000000000 -0400
+@@ -52,7 +52,7 @@ struct cfctrl_rsp {
+ 	void (*radioset_rsp)(void);
+ 	void (*reject_rsp)(struct cflayer *layer, u8 linkid,
+ 				struct cflayer *client_layer);
+-};
++} __no_const;
+ 
+ /* Link Setup Parameters for CAIF-Links. */
+ struct cfctrl_link_param {
 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
  struct cfctrl {
  	struct cfsrvl serv;
@@ -58413,35 +54882,32 @@ index e54f639..7dffc71 100644
  	struct list_head list;
  	/* Protects from simultaneous access to first_req list */
  	spinlock_t info_list_lock;
-diff --git a/include/net/flow.h b/include/net/flow.h
-index 240b7f3..4266618 100644
---- a/include/net/flow.h
-+++ b/include/net/flow.h
-@@ -109,7 +109,7 @@ extern struct flow_cache_object *flow_cache_lookup(
+diff -urNp linux-3.0.3/include/net/flow.h linux-3.0.3/include/net/flow.h
+--- linux-3.0.3/include/net/flow.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/flow.h	2011-08-23 21:47:56.000000000 -0400
+@@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca
  		u8 dir, flow_resolve_t resolver, void *ctx);
  
  extern void flow_cache_flush(void);
 -extern atomic_t flow_cache_genid;
 +extern atomic_unchecked_t flow_cache_genid;
  
- static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
- {
-diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
-index 599d96e..1cb0341 100644
---- a/include/net/inetpeer.h
-+++ b/include/net/inetpeer.h
-@@ -38,8 +38,8 @@ struct inet_peer {
+ #endif
+diff -urNp linux-3.0.3/include/net/inetpeer.h linux-3.0.3/include/net/inetpeer.h
+--- linux-3.0.3/include/net/inetpeer.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/inetpeer.h	2011-08-23 21:47:56.000000000 -0400
+@@ -43,8 +43,8 @@ struct inet_peer {
  	 */
  	union {
  		struct {
--			atomic_t	rid;		/* Frag reception counter */
--			atomic_t	ip_id_count;	/* IP ID for the next packet */
-+			atomic_unchecked_t	rid;		/* Frag reception counter */
-+			atomic_unchecked_t	ip_id_count;	/* IP ID for the next packet */
- 			__u32		tcp_ts;
- 			__u32		tcp_ts_stamp;
- 		};
-@@ -88,7 +88,7 @@ static inline __u16	inet_getid(struct inet_peer *p, int more)
+-			atomic_t			rid;		/* Frag reception counter */
+-			atomic_t			ip_id_count;	/* IP ID for the next packet */
++			atomic_unchecked_t		rid;		/* Frag reception counter */
++			atomic_unchecked_t		ip_id_count;	/* IP ID for the next packet */
+ 			__u32				tcp_ts;
+ 			__u32				tcp_ts_stamp;
+ 			u32				metrics[RTAX_MAX];
+@@ -108,7 +108,7 @@ static inline __u16	inet_getid(struct in
  {
  	more++;
  	inet_peer_refcheck(p);
@@ -58450,11 +54916,22 @@ index 599d96e..1cb0341 100644
  }
  
  #endif /* _NET_INETPEER_H */
-diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
-index b7bbd6c..e11836e 100644
---- a/include/net/ip_vs.h
-+++ b/include/net/ip_vs.h
-@@ -404,7 +404,7 @@ struct ip_vs_conn {
+diff -urNp linux-3.0.3/include/net/ip_fib.h linux-3.0.3/include/net/ip_fib.h
+--- linux-3.0.3/include/net/ip_fib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/ip_fib.h	2011-08-23 21:47:56.000000000 -0400
+@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
+ 
+ #define FIB_RES_SADDR(net, res)				\
+ 	((FIB_RES_NH(res).nh_saddr_genid ==		\
+-	  atomic_read(&(net)->ipv4.dev_addr_genid)) ?	\
++	  atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ?	\
+ 	 FIB_RES_NH(res).nh_saddr :			\
+ 	 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
+ #define FIB_RES_GW(res)			(FIB_RES_NH(res).nh_gw)
+diff -urNp linux-3.0.3/include/net/ip_vs.h linux-3.0.3/include/net/ip_vs.h
+--- linux-3.0.3/include/net/ip_vs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/ip_vs.h	2011-08-23 21:47:56.000000000 -0400
+@@ -509,7 +509,7 @@ struct ip_vs_conn {
  	struct ip_vs_conn       *control;       /* Master control connection */
  	atomic_t                n_control;      /* Number of controlled ones */
  	struct ip_vs_dest       *dest;          /* real server */
@@ -58463,19 +54940,30 @@ index b7bbd6c..e11836e 100644
  
  	/* packet transmitter for different forwarding methods.  If it
  	   mangles the packet, it must return NF_DROP or better NF_STOLEN,
-@@ -513,7 +513,7 @@ struct ip_vs_dest {
- 	union nf_inet_addr	addr;		/* IP address of the server */
+@@ -647,7 +647,7 @@ struct ip_vs_dest {
  	__be16			port;		/* port number of the server */
+ 	union nf_inet_addr	addr;		/* IP address of the server */
  	volatile unsigned	flags;		/* dest status flags */
 -	atomic_t		conn_flags;	/* flags to copy to conn */
 +	atomic_unchecked_t	conn_flags;	/* flags to copy to conn */
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
-index eea2e61..08c692d 100644
---- a/include/net/irda/ircomm_tty.h
-+++ b/include/net/irda/ircomm_tty.h
+diff -urNp linux-3.0.3/include/net/irda/ircomm_core.h linux-3.0.3/include/net/irda/ircomm_core.h
+--- linux-3.0.3/include/net/irda/ircomm_core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/irda/ircomm_core.h	2011-08-23 21:47:56.000000000 -0400
+@@ -51,7 +51,7 @@ typedef struct {
+ 	int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
+ 	int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
+ 				  struct ircomm_info *);	
+-} call_t;
++} __no_const call_t;
+ 
+ struct ircomm_cb {
+ 	irda_queue_t queue;
+diff -urNp linux-3.0.3/include/net/irda/ircomm_tty.h linux-3.0.3/include/net/irda/ircomm_tty.h
+--- linux-3.0.3/include/net/irda/ircomm_tty.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/irda/ircomm_tty.h	2011-08-23 21:47:56.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -58495,10 +54983,9 @@ index eea2e61..08c692d 100644
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
-index f82a1e8..82d81e8 100644
---- a/include/net/iucv/af_iucv.h
-+++ b/include/net/iucv/af_iucv.h
+diff -urNp linux-3.0.3/include/net/iucv/af_iucv.h linux-3.0.3/include/net/iucv/af_iucv.h
+--- linux-3.0.3/include/net/iucv/af_iucv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/iucv/af_iucv.h	2011-08-23 21:47:56.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
  	struct hlist_head head;
@@ -58508,34 +54995,34 @@ index f82a1e8..82d81e8 100644
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff --git a/include/net/neighbour.h b/include/net/neighbour.h
-index 4014b62..22feab1 100644
---- a/include/net/neighbour.h
-+++ b/include/net/neighbour.h
-@@ -118,12 +118,12 @@ struct neighbour {
- 
- struct neigh_ops {
- 	int			family;
--	void			(*solicit)(struct neighbour *, struct sk_buff*);
--	void			(*error_report)(struct neighbour *, struct sk_buff*);
--	int			(*output)(struct sk_buff*);
--	int			(*connected_output)(struct sk_buff*);
--	int			(*hh_output)(struct sk_buff*);
--	int			(*queue_xmit)(struct sk_buff*);
-+	void			(* const solicit)(struct neighbour *, struct sk_buff*);
-+	void			(* const error_report)(struct neighbour *, struct sk_buff*);
-+	int			(* const output)(struct sk_buff*);
-+	int			(* const connected_output)(struct sk_buff*);
-+	int			(* const hh_output)(struct sk_buff*);
-+	int			(* const queue_xmit)(struct sk_buff*);
+diff -urNp linux-3.0.3/include/net/lapb.h linux-3.0.3/include/net/lapb.h
+--- linux-3.0.3/include/net/lapb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/lapb.h	2011-08-23 21:47:56.000000000 -0400
+@@ -95,7 +95,7 @@ struct lapb_cb {
+ 	struct sk_buff_head	write_queue;
+ 	struct sk_buff_head	ack_queue;
+ 	unsigned char		window;
+-	struct lapb_register_struct callbacks;
++	struct lapb_register_struct *callbacks;
+ 
+ 	/* FRMR control information */
+ 	struct lapb_frame	frmr_data;
+diff -urNp linux-3.0.3/include/net/neighbour.h linux-3.0.3/include/net/neighbour.h
+--- linux-3.0.3/include/net/neighbour.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/neighbour.h	2011-08-23 21:47:56.000000000 -0400
+@@ -117,7 +117,7 @@ struct neighbour {
  };
  
- struct pneigh_entry {
-diff --git a/include/net/netlink.h b/include/net/netlink.h
-index 373f1a9..e1016e2 100644
---- a/include/net/netlink.h
-+++ b/include/net/netlink.h
-@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
+ struct neigh_ops {
+-	int			family;
++	const int		family;
+ 	void			(*solicit)(struct neighbour *, struct sk_buff*);
+ 	void			(*error_report)(struct neighbour *, struct sk_buff*);
+ 	int			(*output)(struct sk_buff*);
+diff -urNp linux-3.0.3/include/net/netlink.h linux-3.0.3/include/net/netlink.h
+--- linux-3.0.3/include/net/netlink.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/netlink.h	2011-08-23 21:47:56.000000000 -0400
+@@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
  	if (mark)
@@ -58544,24 +55031,24 @@ index 373f1a9..e1016e2 100644
  }
  
  /**
-diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
-index d68c3f1..698378f 100644
---- a/include/net/netns/ipv4.h
-+++ b/include/net/netns/ipv4.h
-@@ -55,7 +55,7 @@ struct netns_ipv4 {
- 	int sysctl_rt_cache_rebuild_count;
- 	int current_rt_cache_rebuild_count;
+diff -urNp linux-3.0.3/include/net/netns/ipv4.h linux-3.0.3/include/net/netns/ipv4.h
+--- linux-3.0.3/include/net/netns/ipv4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/netns/ipv4.h	2011-08-23 21:47:56.000000000 -0400
+@@ -56,8 +56,8 @@ struct netns_ipv4 {
+ 
+ 	unsigned int sysctl_ping_group_range[2];
  
 -	atomic_t rt_genid;
+-	atomic_t dev_addr_genid;
 +	atomic_unchecked_t rt_genid;
++	atomic_unchecked_t dev_addr_genid;
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
-index 505845d..f2e8060 100644
---- a/include/net/sctp/sctp.h
-+++ b/include/net/sctp/sctp.h
-@@ -316,9 +316,9 @@ do {									\
+diff -urNp linux-3.0.3/include/net/sctp/sctp.h linux-3.0.3/include/net/sctp/sctp.h
+--- linux-3.0.3/include/net/sctp/sctp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/sctp/sctp.h	2011-08-23 21:47:56.000000000 -0400
+@@ -315,9 +315,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
  
@@ -58574,10 +55061,9 @@ index 505845d..f2e8060 100644
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff --git a/include/net/sock.h b/include/net/sock.h
-index bc1cf7d8..c6abfb4 100644
---- a/include/net/sock.h
-+++ b/include/net/sock.h
+diff -urNp linux-3.0.3/include/net/sock.h linux-3.0.3/include/net/sock.h
+--- linux-3.0.3/include/net/sock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/sock.h	2011-08-23 21:47:56.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
@@ -58587,37 +55073,47 @@ index bc1cf7d8..c6abfb4 100644
  	int			sk_rcvbuf;
  
  	struct sk_filter __rcu	*sk_filter;
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 38509f0..ac3205f 100644
---- a/include/net/tcp.h
-+++ b/include/net/tcp.h
-@@ -1382,7 +1382,7 @@ enum tcp_seq_states {
+@@ -1390,7 +1390,7 @@ static inline void sk_nocaps_add(struct 
+ }
+ 
+ static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
+-					   char __user *from, char *to,
++					   char __user *from, unsigned char *to,
+ 					   int copy, int offset)
+ {
+ 	if (skb->ip_summed == CHECKSUM_NONE) {
+diff -urNp linux-3.0.3/include/net/tcp.h linux-3.0.3/include/net/tcp.h
+--- linux-3.0.3/include/net/tcp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/tcp.h	2011-08-23 21:47:56.000000000 -0400
+@@ -1374,8 +1374,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
 -	struct file_operations	seq_fops;
-+	struct file_operations	seq_fops;	/* cannot be const */
- 	struct seq_operations	seq_ops;
+-	struct seq_operations	seq_ops;
++	file_operations_no_const	seq_fops;
++	seq_operations_no_const	seq_ops;
  };
  
-diff --git a/include/net/udp.h b/include/net/udp.h
-index bb967dd..e47c5f7 100644
---- a/include/net/udp.h
-+++ b/include/net/udp.h
-@@ -223,7 +223,7 @@ struct udp_seq_afinfo {
+ struct tcp_iter_state {
+diff -urNp linux-3.0.3/include/net/udp.h linux-3.0.3/include/net/udp.h
+--- linux-3.0.3/include/net/udp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/udp.h	2011-08-23 21:47:56.000000000 -0400
+@@ -234,8 +234,8 @@ struct udp_seq_afinfo {
  	char			*name;
  	sa_family_t		family;
  	struct udp_table	*udp_table;
 -	struct file_operations	seq_fops;
-+	struct file_operations	seq_fops;	/* cannot be const */
- 	struct seq_operations	seq_ops;
+-	struct seq_operations	seq_ops;
++	file_operations_no_const	seq_fops;
++	seq_operations_no_const	seq_ops;
  };
  
-diff --git a/include/net/xfrm.h b/include/net/xfrm.h
-index b9f385d..a29bd9c 100644
---- a/include/net/xfrm.h
-+++ b/include/net/xfrm.h
-@@ -484,7 +484,7 @@ struct xfrm_policy {
+ struct udp_iter_state {
+diff -urNp linux-3.0.3/include/net/xfrm.h linux-3.0.3/include/net/xfrm.h
+--- linux-3.0.3/include/net/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/net/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+@@ -505,7 +505,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
  	struct flow_cache_object flo;
@@ -58626,10 +55122,41 @@ index b9f385d..a29bd9c 100644
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
-index bfd36ff..a62ac9f 100644
---- a/include/scsi/scsi_device.h
-+++ b/include/scsi/scsi_device.h
+diff -urNp linux-3.0.3/include/rdma/iw_cm.h linux-3.0.3/include/rdma/iw_cm.h
+--- linux-3.0.3/include/rdma/iw_cm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/rdma/iw_cm.h	2011-08-23 21:47:56.000000000 -0400
+@@ -120,7 +120,7 @@ struct iw_cm_verbs {
+ 					 int backlog);
+ 
+ 	int		(*destroy_listen)(struct iw_cm_id *cm_id);
+-};
++} __no_const;
+ 
+ /**
+  * iw_create_cm_id - Create an IW CM identifier.
+diff -urNp linux-3.0.3/include/scsi/libfc.h linux-3.0.3/include/scsi/libfc.h
+--- linux-3.0.3/include/scsi/libfc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/scsi/libfc.h	2011-08-23 21:47:56.000000000 -0400
+@@ -750,6 +750,7 @@ struct libfc_function_template {
+ 	 */
+ 	void (*disc_stop_final) (struct fc_lport *);
+ };
++typedef struct libfc_function_template __no_const libfc_function_template_no_const;
+ 
+ /**
+  * struct fc_disc - Discovery context
+@@ -853,7 +854,7 @@ struct fc_lport {
+ 	struct fc_vport		       *vport;
+ 
+ 	/* Operational Information */
+-	struct libfc_function_template tt;
++	libfc_function_template_no_const tt;
+ 	u8			       link_up;
+ 	u8			       qfull;
+ 	enum fc_lport_state	       state;
+diff -urNp linux-3.0.3/include/scsi/scsi_device.h linux-3.0.3/include/scsi/scsi_device.h
+--- linux-3.0.3/include/scsi/scsi_device.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/scsi/scsi_device.h	2011-08-23 21:47:56.000000000 -0400
 @@ -161,9 +161,9 @@ struct scsi_device {
  	unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED	3
@@ -58643,37 +55170,159 @@ index bfd36ff..a62ac9f 100644
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
-index b602f47..8c2c872 100644
---- a/include/sound/ac97_codec.h
-+++ b/include/sound/ac97_codec.h
-@@ -419,15 +419,15 @@
- struct snd_ac97;
- 
- struct snd_ac97_build_ops {
--	int (*build_3d) (struct snd_ac97 *ac97);
--	int (*build_specific) (struct snd_ac97 *ac97);
--	int (*build_spdif) (struct snd_ac97 *ac97);
--	int (*build_post_spdif) (struct snd_ac97 *ac97);
-+	int (* const build_3d) (struct snd_ac97 *ac97);
-+	int (* const build_specific) (struct snd_ac97 *ac97);
-+	int (* const build_spdif) (struct snd_ac97 *ac97);
-+	int (* const build_post_spdif) (struct snd_ac97 *ac97);
- #ifdef CONFIG_PM
--	void (*suspend) (struct snd_ac97 *ac97);
--	void (*resume) (struct snd_ac97 *ac97);
-+	void (* const suspend) (struct snd_ac97 *ac97);
-+	void (* const resume) (struct snd_ac97 *ac97);
- #endif
--	void (*update_jacks) (struct snd_ac97 *ac97);	/* for jack-sharing */
-+	void (* const update_jacks) (struct snd_ac97 *ac97);	/* for jack-sharing */
+diff -urNp linux-3.0.3/include/scsi/scsi_transport_fc.h linux-3.0.3/include/scsi/scsi_transport_fc.h
+--- linux-3.0.3/include/scsi/scsi_transport_fc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/scsi/scsi_transport_fc.h	2011-08-23 21:47:56.000000000 -0400
+@@ -666,9 +666,9 @@ struct fc_function_template {
+ 	int	(*bsg_timeout)(struct fc_bsg_job *);
+ 
+ 	/* allocation lengths for host-specific data */
+-	u32	 			dd_fcrport_size;
+-	u32	 			dd_fcvport_size;
+-	u32				dd_bsg_size;
++	const u32			dd_fcrport_size;
++	const u32			dd_fcvport_size;
++	const u32			dd_bsg_size;
+ 
+ 	/*
+ 	 * The driver sets these to tell the transport class it
+@@ -678,39 +678,39 @@ struct fc_function_template {
+ 	 */
+ 
+ 	/* remote port fixed attributes */
+-	unsigned long	show_rport_maxframe_size:1;
+-	unsigned long	show_rport_supported_classes:1;
+-	unsigned long   show_rport_dev_loss_tmo:1;
++	const unsigned long	show_rport_maxframe_size:1;
++	const unsigned long	show_rport_supported_classes:1;
++	const unsigned long   show_rport_dev_loss_tmo:1;
+ 
+ 	/*
+ 	 * target dynamic attributes
+ 	 * These should all be "1" if the driver uses the remote port
+ 	 * add/delete functions (so attributes reflect rport values).
+ 	 */
+-	unsigned long	show_starget_node_name:1;
+-	unsigned long	show_starget_port_name:1;
+-	unsigned long	show_starget_port_id:1;
++	const unsigned long	show_starget_node_name:1;
++	const unsigned long	show_starget_port_name:1;
++	const unsigned long	show_starget_port_id:1;
+ 
+ 	/* host fixed attributes */
+-	unsigned long	show_host_node_name:1;
+-	unsigned long	show_host_port_name:1;
+-	unsigned long	show_host_permanent_port_name:1;
+-	unsigned long	show_host_supported_classes:1;
+-	unsigned long	show_host_supported_fc4s:1;
+-	unsigned long	show_host_supported_speeds:1;
+-	unsigned long	show_host_maxframe_size:1;
+-	unsigned long	show_host_serial_number:1;
++	const unsigned long	show_host_node_name:1;
++	const unsigned long	show_host_port_name:1;
++	const unsigned long	show_host_permanent_port_name:1;
++	const unsigned long	show_host_supported_classes:1;
++	const unsigned long	show_host_supported_fc4s:1;
++	const unsigned long	show_host_supported_speeds:1;
++	const unsigned long	show_host_maxframe_size:1;
++	const unsigned long	show_host_serial_number:1;
+ 	/* host dynamic attributes */
+-	unsigned long	show_host_port_id:1;
+-	unsigned long	show_host_port_type:1;
+-	unsigned long	show_host_port_state:1;
+-	unsigned long	show_host_active_fc4s:1;
+-	unsigned long	show_host_speed:1;
+-	unsigned long	show_host_fabric_name:1;
+-	unsigned long	show_host_symbolic_name:1;
+-	unsigned long	show_host_system_hostname:1;
++	const unsigned long	show_host_port_id:1;
++	const unsigned long	show_host_port_type:1;
++	const unsigned long	show_host_port_state:1;
++	const unsigned long	show_host_active_fc4s:1;
++	const unsigned long	show_host_speed:1;
++	const unsigned long	show_host_fabric_name:1;
++	const unsigned long	show_host_symbolic_name:1;
++	const unsigned long	show_host_system_hostname:1;
+ 
+-	unsigned long	disable_target_scan:1;
++	const unsigned long	disable_target_scan:1;
+ };
+ 
+ 
+diff -urNp linux-3.0.3/include/sound/ak4xxx-adda.h linux-3.0.3/include/sound/ak4xxx-adda.h
+--- linux-3.0.3/include/sound/ak4xxx-adda.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/ak4xxx-adda.h	2011-08-23 21:47:56.000000000 -0400
+@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
+ 	void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
+ 		      unsigned char val);
+ 	void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-};
++} __no_const;
+ 
+ #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
+ 
+diff -urNp linux-3.0.3/include/sound/hwdep.h linux-3.0.3/include/sound/hwdep.h
+--- linux-3.0.3/include/sound/hwdep.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/hwdep.h	2011-08-23 21:47:56.000000000 -0400
+@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
+ 			  struct snd_hwdep_dsp_status *status);
+ 	int (*dsp_load)(struct snd_hwdep *hw,
+ 			struct snd_hwdep_dsp_image *image);
+-};
++} __no_const;
+ 
+ struct snd_hwdep {
+ 	struct snd_card *card;
+diff -urNp linux-3.0.3/include/sound/info.h linux-3.0.3/include/sound/info.h
+--- linux-3.0.3/include/sound/info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/info.h	2011-08-23 21:47:56.000000000 -0400
+@@ -44,7 +44,7 @@ struct snd_info_entry_text {
+ 		     struct snd_info_buffer *buffer);
+ 	void (*write)(struct snd_info_entry *entry,
+ 		      struct snd_info_buffer *buffer);
+-};
++} __no_const;
+ 
+ struct snd_info_entry_ops {
+ 	int (*open)(struct snd_info_entry *entry,
+diff -urNp linux-3.0.3/include/sound/pcm.h linux-3.0.3/include/sound/pcm.h
+--- linux-3.0.3/include/sound/pcm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/pcm.h	2011-08-23 21:47:56.000000000 -0400
+@@ -81,6 +81,7 @@ struct snd_pcm_ops {
+ 	int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
+ 	int (*ack)(struct snd_pcm_substream *substream);
  };
++typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
+ 
+ /*
+  *
+diff -urNp linux-3.0.3/include/sound/sb16_csp.h linux-3.0.3/include/sound/sb16_csp.h
+--- linux-3.0.3/include/sound/sb16_csp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/sb16_csp.h	2011-08-23 21:47:56.000000000 -0400
+@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
+ 	int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
+ 	int (*csp_stop) (struct snd_sb_csp * p);
+ 	int (*csp_qsound_transfer) (struct snd_sb_csp * p);
+-};
++} __no_const;
  
- struct snd_ac97_bus_ops {
-diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
-index 444cd6b..3327cc5 100644
---- a/include/sound/ymfpci.h
-+++ b/include/sound/ymfpci.h
+ /*
+  * CSP private data
+diff -urNp linux-3.0.3/include/sound/soc.h linux-3.0.3/include/sound/soc.h
+--- linux-3.0.3/include/sound/soc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/soc.h	2011-08-23 21:47:56.000000000 -0400
+@@ -635,7 +635,7 @@ struct snd_soc_platform_driver {
+ 		struct snd_soc_dai *);
+ 
+ 	/* platform stream ops */
+-	struct snd_pcm_ops *ops;
++	struct snd_pcm_ops * const ops;
+ };
+ 
+ struct snd_soc_platform {
+diff -urNp linux-3.0.3/include/sound/ymfpci.h linux-3.0.3/include/sound/ymfpci.h
+--- linux-3.0.3/include/sound/ymfpci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/sound/ymfpci.h	2011-08-23 21:47:56.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
  	spinlock_t reg_lock;
  	spinlock_t voice_lock;
@@ -58683,10 +55332,18 @@ index 444cd6b..3327cc5 100644
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
-index 95c9d98..b0ac7e9 100644
---- a/include/target/target_core_base.h
-+++ b/include/target/target_core_base.h
+diff -urNp linux-3.0.3/include/target/target_core_base.h linux-3.0.3/include/target/target_core_base.h
+--- linux-3.0.3/include/target/target_core_base.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/target/target_core_base.h	2011-08-23 21:47:56.000000000 -0400
+@@ -364,7 +364,7 @@ struct t10_reservation_ops {
+ 	int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
+ 	int (*t10_pr_register)(struct se_cmd *);
+ 	int (*t10_pr_clear)(struct se_cmd *);
+-};
++} __no_const;
+ 
+ struct t10_reservation_template {
+ 	/* Reservation effects all target ports */
 @@ -432,8 +432,8 @@ struct se_transport_task {
  	atomic_t		t_task_cdbs_left;
  	atomic_t		t_task_cdbs_ex_left;
@@ -58698,7 +55355,7 @@ index 95c9d98..b0ac7e9 100644
  	atomic_t		t_transport_active;
  	atomic_t		t_transport_complete;
  	atomic_t		t_transport_queue_active;
-@@ -754,7 +754,7 @@ struct se_device {
+@@ -774,7 +774,7 @@ struct se_device {
  	atomic_t		active_cmds;
  	atomic_t		simple_cmds;
  	atomic_t		depth_left;
@@ -58707,10 +55364,9 @@ index 95c9d98..b0ac7e9 100644
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
-index 1c09820..7f5ec79 100644
---- a/include/trace/events/irq.h
-+++ b/include/trace/events/irq.h
+diff -urNp linux-3.0.3/include/trace/events/irq.h linux-3.0.3/include/trace/events/irq.h
+--- linux-3.0.3/include/trace/events/irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/trace/events/irq.h	2011-08-23 21:47:56.000000000 -0400
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -58729,10 +55385,9 @@ index 1c09820..7f5ec79 100644
  
  	TP_ARGS(irq, action, ret),
  
-diff --git a/include/video/udlfb.h b/include/video/udlfb.h
-index 69d485a..dd0bee7 100644
---- a/include/video/udlfb.h
-+++ b/include/video/udlfb.h
+diff -urNp linux-3.0.3/include/video/udlfb.h linux-3.0.3/include/video/udlfb.h
+--- linux-3.0.3/include/video/udlfb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/video/udlfb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -51,10 +51,10 @@ struct dlfb_data {
  	int base8;
  	u32 pseudo_palette[256];
@@ -58748,10 +55403,9 @@ index 69d485a..dd0bee7 100644
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
-index 0993a22..32ba2fe 100644
---- a/include/video/uvesafb.h
-+++ b/include/video/uvesafb.h
+diff -urNp linux-3.0.3/include/video/uvesafb.h linux-3.0.3/include/video/uvesafb.h
+--- linux-3.0.3/include/video/uvesafb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/include/video/uvesafb.h	2011-08-23 21:47:56.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
  	u8 ypan;			/* 0 - nothing, 1 - ypan, 2 - ywrap */
  	u8 pmi_setpal;			/* PMI for palette changes */
@@ -58760,24 +55414,10 @@ index 0993a22..32ba2fe 100644
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff --git a/init/Kconfig b/init/Kconfig
-index 47dd02f..37e5c40 100644
---- a/init/Kconfig
-+++ b/init/Kconfig
-@@ -1185,7 +1185,7 @@ config SLUB_DEBUG
- 
- config COMPAT_BRK
- 	bool "Disable heap randomization"
--	default y
-+	default n
- 	help
- 	  Randomizing heap placement makes heap exploits harder, but it
- 	  also breaks ancient binaries (including anything libc5 based).
-diff --git a/init/do_mounts.c b/init/do_mounts.c
-index 2b54bef..0628a7c 100644
---- a/init/do_mounts.c
-+++ b/init/do_mounts.c
-@@ -287,7 +287,7 @@ static void __init get_fs_names(char *page)
+diff -urNp linux-3.0.3/init/do_mounts.c linux-3.0.3/init/do_mounts.c
+--- linux-3.0.3/init/do_mounts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/do_mounts.c	2011-08-23 21:47:56.000000000 -0400
+@@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
  {
@@ -58786,7 +55426,7 @@ index 2b54bef..0628a7c 100644
  	if (err)
  		return err;
  
-@@ -382,18 +382,18 @@ void __init change_floppy(char *fmt, ...)
+@@ -383,18 +383,18 @@ void __init change_floppy(char *fmt, ...
  	va_start(args, fmt);
  	vsprintf(buf, fmt, args);
  	va_end(args);
@@ -58808,7 +55448,7 @@ index 2b54bef..0628a7c 100644
  		termios.c_lflag |= ICANON;
  		sys_ioctl(fd, TCSETSF, (long)&termios);
  		sys_close(fd);
-@@ -487,6 +487,6 @@ void __init prepare_namespace(void)
+@@ -488,6 +488,6 @@ void __init prepare_namespace(void)
  	mount_root();
  out:
  	devtmpfs_mount("dev");
@@ -58816,10 +55456,9 @@ index 2b54bef..0628a7c 100644
 +	sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
  	sys_chroot((const char __user __force *)".");
  }
-diff --git a/init/do_mounts.h b/init/do_mounts.h
-index f5b978a..1228092 100644
---- a/init/do_mounts.h
-+++ b/init/do_mounts.h
+diff -urNp linux-3.0.3/init/do_mounts.h linux-3.0.3/init/do_mounts.h
+--- linux-3.0.3/init/do_mounts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/do_mounts.h	2011-08-23 21:47:56.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -58839,10 +55478,9 @@ index f5b978a..1228092 100644
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
-index 3098a38..67a9120 100644
---- a/init/do_mounts_initrd.c
-+++ b/init/do_mounts_initrd.c
+diff -urNp linux-3.0.3/init/do_mounts_initrd.c linux-3.0.3/init/do_mounts_initrd.c
+--- linux-3.0.3/init/do_mounts_initrd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/do_mounts_initrd.c	2011-08-23 21:47:56.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -58917,10 +55555,9 @@ index 3098a38..67a9120 100644
 +	sys_unlink((__force const char __user *)"/initrd.image");
  	return 0;
  }
-diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
-index 32c4799..b194786 100644
---- a/init/do_mounts_md.c
-+++ b/init/do_mounts_md.c
+diff -urNp linux-3.0.3/init/do_mounts_md.c linux-3.0.3/init/do_mounts_md.c
+--- linux-3.0.3/init/do_mounts_md.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/do_mounts_md.c	2011-08-23 21:47:56.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -58939,10 +55576,9 @@ index 32c4799..b194786 100644
  			sys_ioctl(fd, BLKRRPART, 0);
  		}
  		sys_close(fd);
-diff --git a/init/initramfs.c b/init/initramfs.c
-index 2531811..cd32f02 100644
---- a/init/initramfs.c
-+++ b/init/initramfs.c
+diff -urNp linux-3.0.3/init/initramfs.c linux-3.0.3/init/initramfs.c
+--- linux-3.0.3/init/initramfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/initramfs.c	2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -58970,7 +55606,7 @@ index 2531811..cd32f02 100644
  	}
  	return 0;
  }
-@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
+@@ -280,11 +280,11 @@ static void __init clean_path(char *path
  {
  	struct stat st;
  
@@ -59051,11 +55687,22 @@ index 2531811..cd32f02 100644
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff --git a/init/main.c b/init/main.c
-index a7fcde2..78f0adc 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
+diff -urNp linux-3.0.3/init/Kconfig linux-3.0.3/init/Kconfig
+--- linux-3.0.3/init/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/Kconfig	2011-08-23 21:47:56.000000000 -0400
+@@ -1195,7 +1195,7 @@ config SLUB_DEBUG
+ 
+ config COMPAT_BRK
+ 	bool "Disable heap randomization"
+-	default y
++	default n
+ 	help
+ 	  Randomizing heap placement makes heap exploits harder, but it
+ 	  also breaks ancient binaries (including anything libc5 based).
+diff -urNp linux-3.0.3/init/main.c linux-3.0.3/init/main.c
+--- linux-3.0.3/init/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/init/main.c	2011-08-23 21:48:14.000000000 -0400
+@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
  
@@ -59064,7 +55711,7 @@ index a7fcde2..78f0adc 100644
  /*
   * Debug helper: via this flag we know that we are in 'early bootup code'
   * where only the boot processor is running with IRQ disabled.  This means
-@@ -206,6 +208,49 @@ static int __init set_reset_devices(char *str)
+@@ -149,6 +151,49 @@ static int __init set_reset_devices(char
  
  __setup("reset_devices", set_reset_devices);
  
@@ -59101,7 +55748,7 @@ index a7fcde2..78f0adc 100644
 +#endif
 +
 +#ifdef CONFIG_PAX_SOFTMODE
-+unsigned int pax_softmode;
++int pax_softmode;
 +
 +static int __init setup_pax_softmode(char *str)
 +{
@@ -59114,7 +55761,7 @@ index a7fcde2..78f0adc 100644
  static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
  const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
  static const char *panic_later, *panic_param;
-@@ -751,6 +796,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -667,6 +712,7 @@ int __init_or_module do_one_initcall(ini
  {
  	int count = preempt_count();
  	int ret;
@@ -59122,7 +55769,7 @@ index a7fcde2..78f0adc 100644
  
  	if (initcall_debug)
  		ret = do_one_initcall_debug(fn);
-@@ -763,15 +809,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
+@@ -679,15 +725,15 @@ int __init_or_module do_one_initcall(ini
  		sprintf(msgbuf, "error code %d ", ret);
  
  	if (preempt_count() != count) {
@@ -59142,7 +55789,7 @@ index a7fcde2..78f0adc 100644
  	}
  
  	return ret;
-@@ -898,7 +944,7 @@ static int __init kernel_init(void * unused)
+@@ -805,7 +851,7 @@ static int __init kernel_init(void * unu
  	do_basic_setup();
  
  	/* Open the /dev/console on the rootfs, this should never fail */
@@ -59151,7 +55798,7 @@ index a7fcde2..78f0adc 100644
  		printk(KERN_WARNING "Warning: unable to open an initial console.\n");
  
  	(void) sys_dup(0);
-@@ -911,11 +957,13 @@ static int __init kernel_init(void * unused)
+@@ -818,11 +864,13 @@ static int __init kernel_init(void * unu
  	if (!ramdisk_execute_command)
  		ramdisk_execute_command = "/init";
  
@@ -59166,11 +55813,10 @@ index a7fcde2..78f0adc 100644
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff --git a/ipc/mqueue.c b/ipc/mqueue.c
-index 14fb6d6..dba3157 100644
---- a/ipc/mqueue.c
-+++ b/ipc/mqueue.c
-@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
+diff -urNp linux-3.0.3/ipc/mqueue.c linux-3.0.3/ipc/mqueue.c
+--- linux-3.0.3/ipc/mqueue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/ipc/mqueue.c	2011-08-23 21:48:14.000000000 -0400
+@@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
  			mq_bytes = (mq_msg_tblsz +
  				(info->attr.mq_maxmsg * info->attr.mq_msgsize));
  
@@ -59178,11 +55824,66 @@ index 14fb6d6..dba3157 100644
  			spin_lock(&mq_lock);
  			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
  		 	    u->mq_bytes + mq_bytes >
-diff --git a/ipc/sem.c b/ipc/sem.c
-index 0e0d49b..cc52a40 100644
---- a/ipc/sem.c
-+++ b/ipc/sem.c
-@@ -854,6 +854,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
+diff -urNp linux-3.0.3/ipc/msg.c linux-3.0.3/ipc/msg.c
+--- linux-3.0.3/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/ipc/msg.c	2011-08-23 21:47:56.000000000 -0400
+@@ -309,18 +309,19 @@ static inline int msg_security(struct ke
+ 	return security_msg_queue_associate(msq, msgflg);
+ }
+ 
++static struct ipc_ops msg_ops = {
++	.getnew		= newque,
++	.associate	= msg_security,
++	.more_checks	= NULL
++};
++
+ SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops msg_ops;
+ 	struct ipc_params msg_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	msg_ops.getnew = newque;
+-	msg_ops.associate = msg_security;
+-	msg_ops.more_checks = NULL;
+-
+ 	msg_params.key = key;
+ 	msg_params.flg = msgflg;
+ 
+diff -urNp linux-3.0.3/ipc/sem.c linux-3.0.3/ipc/sem.c
+--- linux-3.0.3/ipc/sem.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/ipc/sem.c	2011-08-23 21:48:14.000000000 -0400
+@@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops sem_ops = {
++	.getnew		= newary,
++	.associate	= sem_security,
++	.more_checks	= sem_more_checks
++};
++
+ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops sem_ops;
+ 	struct ipc_params sem_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+@@ -329,10 +334,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
+ 	if (nsems < 0 || nsems > ns->sc_semmsl)
+ 		return -EINVAL;
+ 
+-	sem_ops.getnew = newary;
+-	sem_ops.associate = sem_security;
+-	sem_ops.more_checks = sem_more_checks;
+-
+ 	sem_params.key = key;
+ 	sem_params.flg = semflg;
+ 	sem_params.u.nsems = nsems;
+@@ -854,6 +855,8 @@ static int semctl_main(struct ipc_namesp
  	int nsems;
  	struct list_head tasks;
  
@@ -59191,7 +55892,7 @@ index 0e0d49b..cc52a40 100644
  	sma = sem_lock_check(ns, semid);
  	if (IS_ERR(sma))
  		return PTR_ERR(sma);
-@@ -1299,6 +1301,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
+@@ -1301,6 +1304,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, 
  	struct ipc_namespace *ns;
  	struct list_head tasks;
  
@@ -59200,11 +55901,10 @@ index 0e0d49b..cc52a40 100644
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff --git a/ipc/shm.c b/ipc/shm.c
-index 7d3bb22..2fee7a1 100644
---- a/ipc/shm.c
-+++ b/ipc/shm.c
-@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
+diff -urNp linux-3.0.3/ipc/shm.c linux-3.0.3/ipc/shm.c
+--- linux-3.0.3/ipc/shm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/ipc/shm.c	2011-08-23 21:48:14.000000000 -0400
+@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
  
@@ -59219,7 +55919,7 @@ index 7d3bb22..2fee7a1 100644
  void shm_init_ns(struct ipc_namespace *ns)
  {
  	ns->shm_ctlmax = SHMMAX;
-@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
+@@ -401,6 +409,14 @@ static int newseg(struct ipc_namespace *
  	shp->shm_lprid = 0;
  	shp->shm_atim = shp->shm_dtim = 0;
  	shp->shm_ctim = get_seconds();
@@ -59234,7 +55934,32 @@ index 7d3bb22..2fee7a1 100644
  	shp->shm_segsz = size;
  	shp->shm_nattch = 0;
  	shp->shm_file = file;
-@@ -761,8 +777,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int, cmd, struct shmid_ds __user *, buf)
+@@ -451,18 +467,19 @@ static inline int shm_more_checks(struct
+ 	return 0;
+ }
+ 
++static struct ipc_ops shm_ops = {
++	.getnew		= newseg,
++	.associate	= shm_security,
++	.more_checks	= shm_more_checks
++};
++
+ SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
+ {
+ 	struct ipc_namespace *ns;
+-	struct ipc_ops shm_ops;
+ 	struct ipc_params shm_params;
+ 
+ 	ns = current->nsproxy->ipc_ns;
+ 
+-	shm_ops.getnew = newseg;
+-	shm_ops.associate = shm_security;
+-	shm_ops.more_checks = shm_more_checks;
+-
+ 	shm_params.key = key;
+ 	shm_params.flg = shmflg;
+ 	shm_params.u.size = size;
+@@ -762,8 +779,6 @@ SYSCALL_DEFINE3(shmctl, int, shmid, int,
  	case SHM_LOCK:
  	case SHM_UNLOCK:
  	{
@@ -59243,7 +55968,7 @@ index 7d3bb22..2fee7a1 100644
  		lru_add_drain_all();  /* drain pagevecs to lru lists */
  
  		shp = shm_lock_check(ns, shmid);
-@@ -895,9 +909,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
+@@ -896,9 +911,21 @@ long do_shmat(int shmid, char __user *sh
  	if (err)
  		goto out_unlock;
  
@@ -59265,11 +55990,10 @@ index 7d3bb22..2fee7a1 100644
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff --git a/kernel/acct.c b/kernel/acct.c
-index fa7eb3d..60142a4 100644
---- a/kernel/acct.c
-+++ b/kernel/acct.c
-@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
+diff -urNp linux-3.0.3/kernel/acct.c linux-3.0.3/kernel/acct.c
+--- linux-3.0.3/kernel/acct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/acct.c	2011-08-23 21:47:56.000000000 -0400
+@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
@@ -59278,11 +56002,10 @@ index fa7eb3d..60142a4 100644
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff --git a/kernel/audit.c b/kernel/audit.c
-index e495624..ac77e48 100644
---- a/kernel/audit.c
-+++ b/kernel/audit.c
-@@ -110,7 +110,7 @@ u32		audit_sig_sid = 0;
+diff -urNp linux-3.0.3/kernel/audit.c linux-3.0.3/kernel/audit.c
+--- linux-3.0.3/kernel/audit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/audit.c	2011-08-23 21:47:56.000000000 -0400
+@@ -112,7 +112,7 @@ u32		audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
  */
@@ -59291,7 +56014,7 @@ index e495624..ac77e48 100644
  
  /* The netlink socket. */
  static struct sock *audit_sock;
-@@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
+@@ -234,7 +234,7 @@ void audit_log_lost(const char *message)
  	unsigned long		now;
  	int			print;
  
@@ -59300,7 +56023,7 @@ index e495624..ac77e48 100644
  
  	print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
  
-@@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
+@@ -253,7 +253,7 @@ void audit_log_lost(const char *message)
  			printk(KERN_WARNING
  				"audit: audit_lost=%d audit_rate_limit=%d "
  				"audit_backlog_limit=%d\n",
@@ -59309,7 +56032,7 @@ index e495624..ac77e48 100644
  				audit_rate_limit,
  				audit_backlog_limit);
  		audit_panic(message);
-@@ -684,7 +684,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+@@ -686,7 +686,7 @@ static int audit_receive_msg(struct sk_b
  		status_set.pid		 = audit_pid;
  		status_set.rate_limit	 = audit_rate_limit;
  		status_set.backlog_limit = audit_backlog_limit;
@@ -59318,11 +56041,10 @@ index e495624..ac77e48 100644
  		status_set.backlog	 = skb_queue_len(&audit_skb_queue);
  		audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
  				 &status_set, sizeof(status_set));
-diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index f49a031..f47cd5a 100644
---- a/kernel/auditsc.c
-+++ b/kernel/auditsc.c
-@@ -2111,7 +2111,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
+diff -urNp linux-3.0.3/kernel/auditsc.c linux-3.0.3/kernel/auditsc.c
+--- linux-3.0.3/kernel/auditsc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/auditsc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
  /* global counter which is incremented every time something logs in */
@@ -59331,7 +56053,7 @@ index f49a031..f47cd5a 100644
  
  /**
   * audit_set_loginuid - set a task's audit_context loginuid
-@@ -2124,7 +2124,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
+@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT
   */
  int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
  {
@@ -59340,11 +56062,10 @@ index f49a031..f47cd5a 100644
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff --git a/kernel/capability.c b/kernel/capability.c
-index 9e9385f..6e6d5e2 100644
---- a/kernel/capability.c
-+++ b/kernel/capability.c
-@@ -205,6 +205,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
+diff -urNp linux-3.0.3/kernel/capability.c linux-3.0.3/kernel/capability.c
+--- linux-3.0.3/kernel/capability.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/capability.c	2011-08-23 21:48:14.000000000 -0400
+@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
  		 * before modification is attempted and the application
  		 * fails.
  		 */
@@ -59354,39 +56075,60 @@ index 9e9385f..6e6d5e2 100644
  		if (copy_to_user(dataptr, kdata, tocopy
  				 * sizeof(struct __user_cap_data_struct))) {
  			return -EFAULT;
-@@ -306,10 +309,26 @@ int capable(int cap)
+@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *n
  		BUG();
  	}
  
--	if (security_capable(current_cred(), cap) == 0) {
-+	if (security_capable(current_cred(), cap) == 0 && gr_is_capable(cap)) {
+-	if (security_capable(ns, current_cred(), cap) == 0) {
++	if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
  		current->flags |= PF_SUPERPRIV;
- 		return 1;
+ 		return true;
  	}
- 	return 0;
+@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *n
  }
-+
-+int capable_nolog(int cap)
+ EXPORT_SYMBOL(ns_capable);
+ 
++bool ns_capable_nolog(struct user_namespace *ns, int cap)
 +{
 +	if (unlikely(!cap_valid(cap))) {
 +		printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
 +		BUG();
 +	}
 +
-+	if (security_capable(current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
++	if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
 +		current->flags |= PF_SUPERPRIV;
-+		return 1;
++		return true;
 +	}
-+	return 0;
++	return false;
 +}
++EXPORT_SYMBOL(ns_capable_nolog);
 +
- EXPORT_SYMBOL(capable);
++bool capable_nolog(int cap)
++{
++	return ns_capable_nolog(&init_user_ns, cap);
++}
 +EXPORT_SYMBOL(capable_nolog);
-diff --git a/kernel/cgroup.c b/kernel/cgroup.c
-index bcc7336..c6e1be5 100644
---- a/kernel/cgroup.c
-+++ b/kernel/cgroup.c
-@@ -598,6 +598,8 @@ static struct css_set *find_css_set(
++
+ /**
+  * task_ns_capable - Determine whether current task has a superior
+  * capability targeted at a specific task's user namespace.
+@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct 
+ }
+ EXPORT_SYMBOL(task_ns_capable);
+ 
++bool task_ns_capable_nolog(struct task_struct *t, int cap)
++{
++	return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
++}
++EXPORT_SYMBOL(task_ns_capable_nolog);
++
+ /**
+  * nsown_capable - Check superior capability to one's own user_ns
+  * @cap: The capability in question
+diff -urNp linux-3.0.3/kernel/cgroup.c linux-3.0.3/kernel/cgroup.c
+--- linux-3.0.3/kernel/cgroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/cgroup.c	2011-08-23 21:48:14.000000000 -0400
+@@ -593,6 +593,8 @@ static struct css_set *find_css_set(
  	struct hlist_head *hhead;
  	struct cg_cgroup_link *link;
  
@@ -59395,10 +56137,9 @@ index bcc7336..c6e1be5 100644
  	/* First see if we already have a cgroup group that matches
  	 * the desired set */
  	read_lock(&css_set_lock);
-diff --git a/kernel/compat.c b/kernel/compat.c
-index c9e2ec0..7830f9b 100644
---- a/kernel/compat.c
-+++ b/kernel/compat.c
+diff -urNp linux-3.0.3/kernel/compat.c linux-3.0.3/kernel/compat.c
+--- linux-3.0.3/kernel/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/compat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -59407,10 +56148,9 @@ index c9e2ec0..7830f9b 100644
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff --git a/kernel/configs.c b/kernel/configs.c
-index b4066b4..c2e76b1 100644
---- a/kernel/configs.c
-+++ b/kernel/configs.c
+diff -urNp linux-3.0.3/kernel/configs.c linux-3.0.3/kernel/configs.c
+--- linux-3.0.3/kernel/configs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/configs.c	2011-08-23 21:48:14.000000000 -0400
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
  	struct proc_dir_entry *entry;
  
@@ -59431,11 +56171,10 @@ index b4066b4..c2e76b1 100644
  	if (!entry)
  		return -ENOMEM;
  
-diff --git a/kernel/cred.c b/kernel/cred.c
-index 3a9d6dd..d99ac42 100644
---- a/kernel/cred.c
-+++ b/kernel/cred.c
-@@ -157,6 +157,8 @@ static void put_cred_rcu(struct rcu_head *rcu)
+diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
+--- linux-3.0.3/kernel/cred.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/cred.c	2011-08-23 21:48:14.000000000 -0400
+@@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
  {
@@ -59444,7 +56183,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("__put_cred(%p{%d,%d})", cred,
  	       atomic_read(&cred->usage),
  	       read_cred_subscribers(cred));
-@@ -181,6 +183,8 @@ void exit_creds(struct task_struct *tsk)
+@@ -182,6 +184,8 @@ void exit_creds(struct task_struct *tsk)
  {
  	struct cred *cred;
  
@@ -59453,7 +56192,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
  	       atomic_read(&tsk->cred->usage),
  	       read_cred_subscribers(tsk->cred));
-@@ -219,6 +223,8 @@ const struct cred *get_task_cred(struct task_struct *task)
+@@ -220,6 +224,8 @@ const struct cred *get_task_cred(struct 
  {
  	const struct cred *cred;
  
@@ -59462,7 +56201,7 @@ index 3a9d6dd..d99ac42 100644
  	rcu_read_lock();
  
  	do {
-@@ -238,6 +244,8 @@ struct cred *cred_alloc_blank(void)
+@@ -239,6 +245,8 @@ struct cred *cred_alloc_blank(void)
  {
  	struct cred *new;
  
@@ -59471,7 +56210,7 @@ index 3a9d6dd..d99ac42 100644
  	new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
  	if (!new)
  		return NULL;
-@@ -286,6 +294,8 @@ struct cred *prepare_creds(void)
+@@ -287,6 +295,8 @@ struct cred *prepare_creds(void)
  	const struct cred *old;
  	struct cred *new;
  
@@ -59480,7 +56219,7 @@ index 3a9d6dd..d99ac42 100644
  	validate_process_creds();
  
  	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
-@@ -332,6 +342,8 @@ struct cred *prepare_exec_creds(void)
+@@ -333,6 +343,8 @@ struct cred *prepare_exec_creds(void)
  	struct thread_group_cred *tgcred = NULL;
  	struct cred *new;
  
@@ -59489,7 +56228,7 @@ index 3a9d6dd..d99ac42 100644
  #ifdef CONFIG_KEYS
  	tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
  	if (!tgcred)
-@@ -384,6 +396,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
+@@ -385,6 +397,8 @@ int copy_creds(struct task_struct *p, un
  	struct cred *new;
  	int ret;
  
@@ -59498,7 +56237,7 @@ index 3a9d6dd..d99ac42 100644
  	if (
  #ifdef CONFIG_KEYS
  		!p->cred->thread_keyring &&
-@@ -469,6 +483,8 @@ int commit_creds(struct cred *new)
+@@ -475,6 +489,8 @@ int commit_creds(struct cred *new)
  	struct task_struct *task = current;
  	const struct cred *old = task->real_cred;
  
@@ -59507,7 +56246,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("commit_creds(%p{%d,%d})", new,
  	       atomic_read(&new->usage),
  	       read_cred_subscribers(new));
-@@ -483,6 +499,8 @@ int commit_creds(struct cred *new)
+@@ -489,6 +505,8 @@ int commit_creds(struct cred *new)
  
  	get_cred(new); /* we will require a ref for the subj creds too */
  
@@ -59516,7 +56255,7 @@ index 3a9d6dd..d99ac42 100644
  	/* dumpability changes */
  	if (old->euid != new->euid ||
  	    old->egid != new->egid ||
-@@ -545,6 +563,8 @@ EXPORT_SYMBOL(commit_creds);
+@@ -551,6 +569,8 @@ EXPORT_SYMBOL(commit_creds);
   */
  void abort_creds(struct cred *new)
  {
@@ -59525,7 +56264,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("abort_creds(%p{%d,%d})", new,
  	       atomic_read(&new->usage),
  	       read_cred_subscribers(new));
-@@ -568,6 +588,8 @@ const struct cred *override_creds(const struct cred *new)
+@@ -574,6 +594,8 @@ const struct cred *override_creds(const 
  {
  	const struct cred *old = current->cred;
  
@@ -59534,7 +56273,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("override_creds(%p{%d,%d})", new,
  	       atomic_read(&new->usage),
  	       read_cred_subscribers(new));
-@@ -597,6 +619,8 @@ void revert_creds(const struct cred *old)
+@@ -603,6 +625,8 @@ void revert_creds(const struct cred *old
  {
  	const struct cred *override = current->cred;
  
@@ -59543,7 +56282,7 @@ index 3a9d6dd..d99ac42 100644
  	kdebug("revert_creds(%p{%d,%d})", old,
  	       atomic_read(&old->usage),
  	       read_cred_subscribers(old));
-@@ -643,6 +667,8 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
+@@ -649,6 +673,8 @@ struct cred *prepare_kernel_cred(struct 
  	const struct cred *old;
  	struct cred *new;
  
@@ -59552,7 +56291,7 @@ index 3a9d6dd..d99ac42 100644
  	new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
  	if (!new)
  		return NULL;
-@@ -697,6 +723,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
+@@ -703,6 +729,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
   */
  int set_security_override(struct cred *new, u32 secid)
  {
@@ -59561,7 +56300,7 @@ index 3a9d6dd..d99ac42 100644
  	return security_kernel_act_as(new, secid);
  }
  EXPORT_SYMBOL(set_security_override);
-@@ -716,6 +744,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx)
+@@ -722,6 +750,8 @@ int set_security_override_from_ctx(struc
  	u32 secid;
  	int ret;
  
@@ -59570,20 +56309,10 @@ index 3a9d6dd..d99ac42 100644
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
-index cefd4a1..7a9d2b3 100644
---- a/kernel/debug/debug_core.c
-+++ b/kernel/debug/debug_core.c
-@@ -72,7 +72,7 @@ int			kgdb_io_module_registered;
- /* Guard for recursive entry */
- static int			exception_level;
- 
--struct kgdb_io		*dbg_io_ops;
-+const struct kgdb_io		*dbg_io_ops;
- static DEFINE_SPINLOCK(kgdb_registration_lock);
- 
- /* kgdb console driver is loaded */
-@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
+diff -urNp linux-3.0.3/kernel/debug/debug_core.c linux-3.0.3/kernel/debug/debug_core.c
+--- linux-3.0.3/kernel/debug/debug_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/debug/debug_core.c	2011-08-23 21:47:56.000000000 -0400
+@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t			masters_in_kgdb;
  static atomic_t			slaves_in_kgdb;
@@ -59621,7 +56350,7 @@ index cefd4a1..7a9d2b3 100644
  		if (kgdb_info[sstep_cpu].task)
  			kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
  		else
-@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
+@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(vo
  static void kgdb_tasklet_bpt(unsigned long ing)
  {
  	kgdb_breakpoint();
@@ -59643,29 +56372,10 @@ index cefd4a1..7a9d2b3 100644
  	tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-@@ -864,7 +864,7 @@ static void kgdb_initial_breakpoint(void)
-  *
-  *	Register it with the KGDB core.
-  */
--int kgdb_register_io_module(struct kgdb_io *new_dbg_io_ops)
-+int kgdb_register_io_module(const struct kgdb_io *new_dbg_io_ops)
- {
- 	int err;
- 
-@@ -909,7 +909,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_module);
-  *
-  *	Unregister it with the KGDB core.
-  */
--void kgdb_unregister_io_module(struct kgdb_io *old_dbg_io_ops)
-+void kgdb_unregister_io_module(const struct kgdb_io *old_dbg_io_ops)
- {
- 	BUG_ON(kgdb_connected);
- 
-diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
-index bd3e8e2..bc52173 100644
---- a/kernel/debug/kdb/kdb_main.c
-+++ b/kernel/debug/kdb/kdb_main.c
-@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
+diff -urNp linux-3.0.3/kernel/debug/kdb/kdb_main.c linux-3.0.3/kernel/debug/kdb/kdb_main.c
+--- linux-3.0.3/kernel/debug/kdb/kdb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/debug/kdb/kdb_main.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
  	list_for_each_entry(mod, kdb_modules, list) {
  
  		kdb_printf("%-20s%8u  0x%p ", mod->name,
@@ -59674,7 +56384,7 @@ index bd3e8e2..bc52173 100644
  #ifdef CONFIG_MODULE_UNLOAD
  		kdb_printf("%4d ", module_refcount(mod));
  #endif
-@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
+@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const cha
  			kdb_printf(" (Loading)");
  		else
  			kdb_printf(" (Live)");
@@ -59683,10 +56393,92 @@ index bd3e8e2..bc52173 100644
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff --git a/kernel/exit.c b/kernel/exit.c
-index 557a348..e74d865 100644
---- a/kernel/exit.c
-+++ b/kernel/exit.c
+diff -urNp linux-3.0.3/kernel/events/core.c linux-3.0.3/kernel/events/core.c
+--- linux-3.0.3/kernel/events/core.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/kernel/events/core.c	2011-08-23 21:47:56.000000000 -0400
+@@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
+ 	return 0;
+ }
+ 
+-static atomic64_t perf_event_id;
++static atomic64_unchecked_t perf_event_id;
+ 
+ static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
+ 			      enum event_type_t event_type);
+@@ -2488,7 +2488,7 @@ static void __perf_event_read(void *info
+ 
+ static inline u64 perf_event_count(struct perf_event *event)
+ {
+-	return local64_read(&event->count) + atomic64_read(&event->child_count);
++	return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
+ }
+ 
+ static u64 perf_event_read(struct perf_event *event)
+@@ -3023,9 +3023,9 @@ u64 perf_event_read_value(struct perf_ev
+ 	mutex_lock(&event->child_mutex);
+ 	total += perf_event_read(event);
+ 	*enabled += event->total_time_enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 	*running += event->total_time_running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 
+ 	list_for_each_entry(child, &event->child_list, child_list) {
+ 		total += perf_event_read(child);
+@@ -3388,10 +3388,10 @@ void perf_event_update_userpage(struct p
+ 		userpg->offset -= local64_read(&event->hw.prev_count);
+ 
+ 	userpg->time_enabled = event->total_time_enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 
+ 	userpg->time_running = event->total_time_running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 
+ 	barrier();
+ 	++userpg->lock;
+@@ -4188,11 +4188,11 @@ static void perf_output_read_one(struct 
+ 	values[n++] = perf_event_count(event);
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
+ 		values[n++] = enabled +
+-			atomic64_read(&event->child_total_time_enabled);
++			atomic64_read_unchecked(&event->child_total_time_enabled);
+ 	}
+ 	if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
+ 		values[n++] = running +
+-			atomic64_read(&event->child_total_time_running);
++			atomic64_read_unchecked(&event->child_total_time_running);
+ 	}
+ 	if (read_format & PERF_FORMAT_ID)
+ 		values[n++] = primary_event_id(event);
+@@ -6190,7 +6190,7 @@ perf_event_alloc(struct perf_event_attr 
+ 	event->parent		= parent_event;
+ 
+ 	event->ns		= get_pid_ns(current->nsproxy->pid_ns);
+-	event->id		= atomic64_inc_return(&perf_event_id);
++	event->id		= atomic64_inc_return_unchecked(&perf_event_id);
+ 
+ 	event->state		= PERF_EVENT_STATE_INACTIVE;
+ 
+@@ -6713,10 +6713,10 @@ static void sync_child_event(struct perf
+ 	/*
+ 	 * Add back the child's count to the parent's count:
+ 	 */
+-	atomic64_add(child_val, &parent_event->child_count);
+-	atomic64_add(child_event->total_time_enabled,
++	atomic64_add_unchecked(child_val, &parent_event->child_count);
++	atomic64_add_unchecked(child_event->total_time_enabled,
+ 		     &parent_event->child_total_time_enabled);
+-	atomic64_add(child_event->total_time_running,
++	atomic64_add_unchecked(child_event->total_time_running,
+ 		     &parent_event->child_total_time_running);
+ 
+ 	/*
+diff -urNp linux-3.0.3/kernel/exit.c linux-3.0.3/kernel/exit.c
+--- linux-3.0.3/kernel/exit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/exit.c	2011-08-23 21:48:14.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -59698,16 +56490,18 @@ index 557a348..e74d865 100644
  static void exit_mm(struct task_struct * tsk);
  
  static void __unhash_process(struct task_struct *p, bool group_dead)
-@@ -169,6 +173,8 @@ void release_task(struct task_struct * p)
+@@ -169,6 +173,10 @@ void release_task(struct task_struct * p
  	struct task_struct *leader;
  	int zap_leader;
  repeat:
++#ifdef CONFIG_NET
 +	gr_del_task_from_ip_table(p);
++#endif
 +
  	tracehook_prepare_release_task(p);
  	/* don't need to get the RCU readlock here - the process is dead and
  	 * can't be modifying its own credentials. But shut RCU-lockdep up */
-@@ -338,11 +344,22 @@ static void reparent_to_kthreadd(void)
+@@ -338,11 +346,22 @@ static void reparent_to_kthreadd(void)
  {
  	write_lock_irq(&tasklist_lock);
  
@@ -59730,7 +56524,7 @@ index 557a348..e74d865 100644
  	/* Set the exit signal to SIGCHLD so we signal init on exit */
  	current->exit_signal = SIGCHLD;
  
-@@ -394,7 +411,7 @@ int allow_signal(int sig)
+@@ -394,7 +413,7 @@ int allow_signal(int sig)
  	 * know it'll be handled, so that they don't get converted to
  	 * SIGKILL or just silently dropped.
  	 */
@@ -59739,7 +56533,7 @@ index 557a348..e74d865 100644
  	recalc_sigpending();
  	spin_unlock_irq(&current->sighand->siglock);
  	return 0;
-@@ -430,6 +447,17 @@ void daemonize(const char *name, ...)
+@@ -430,6 +449,17 @@ void daemonize(const char *name, ...)
  	vsnprintf(current->comm, sizeof(current->comm), name, args);
  	va_end(args);
  
@@ -59757,38 +56551,30 @@ index 557a348..e74d865 100644
  	/*
  	 * If we were started as result of loading a module, close all of the
  	 * user space pages.  We don't need them, and if we didn't close them
-@@ -905,17 +933,17 @@ NORET_TYPE void do_exit(long code)
+@@ -904,15 +934,8 @@ NORET_TYPE void do_exit(long code)
  	struct task_struct *tsk = current;
  	int group_dead;
  
 -	profile_task_exit(tsk);
 -
 -	WARN_ON(atomic_read(&tsk->fs_excl));
+-	WARN_ON(blk_needs_flush_plug(tsk));
 -
-+	/*
-+	 * Check this first since set_fs() below depends on
-+	 * current_thread_info(), which we better not access when we're in
-+	 * interrupt context.  Other than that, we want to do the set_fs()
-+	 * as early as possible.
-+	 */
  	if (unlikely(in_interrupt()))
  		panic("Aiee, killing interrupt handler!");
 -	if (unlikely(!tsk->pid))
 -		panic("Attempted to kill the idle task!");
  
  	/*
--	 * If do_exit is called because this processes oopsed, it's possible
-+	 * If do_exit is called because this processes Oops'ed, it's possible
- 	 * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
- 	 * continuing. Amongst other possible reasons, this is to prevent
- 	 * mm_release()->clear_child_tid() from writing to a user-controlled
-@@ -923,6 +951,13 @@ NORET_TYPE void do_exit(long code)
+ 	 * If do_exit is called because this processes oopsed, it's possible
+@@ -923,6 +946,14 @@ NORET_TYPE void do_exit(long code)
  	 */
  	set_fs(USER_DS);
  
 +	profile_task_exit(tsk);
 +
 +	WARN_ON(atomic_read(&tsk->fs_excl));
++	WARN_ON(blk_needs_flush_plug(tsk));
 +
 +	if (unlikely(!tsk->pid))
 +		panic("Attempted to kill the idle task!");
@@ -59796,7 +56582,7 @@ index 557a348..e74d865 100644
  	tracehook_report_exit(&code);
  
  	validate_creds_for_do_exit(tsk);
-@@ -983,6 +1018,9 @@ NORET_TYPE void do_exit(long code)
+@@ -983,6 +1014,9 @@ NORET_TYPE void do_exit(long code)
  	tsk->exit_code = code;
  	taskstats_exit(tsk, group_dead);
  
@@ -59806,11 +56592,10 @@ index 557a348..e74d865 100644
  	exit_mm(tsk);
  
  	if (group_dead)
-diff --git a/kernel/fork.c b/kernel/fork.c
-index 25e4291..ecb98e8 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -280,7 +280,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
+diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
+--- linux-3.0.3/kernel/fork.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/fork.c	2011-08-23 21:48:14.000000000 -0400
+@@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
  #ifdef CONFIG_CC_STACKPROTECTOR
@@ -59819,7 +56604,7 @@ index 25e4291..ecb98e8 100644
  #endif
  
  	/* One for us, one for whoever does the "release_task()" (usually parent) */
-@@ -302,13 +302,78 @@ out:
+@@ -308,13 +308,77 @@ out:
  }
  
  #ifdef CONFIG_MMU
@@ -59860,15 +56645,14 @@ index 25e4291..ecb98e8 100644
 +		get_file(file);
 +		if (tmp->vm_flags & VM_DENYWRITE)
 +			atomic_dec(&inode->i_writecount);
-+		spin_lock(&mapping->i_mmap_lock);
++		mutex_lock(&mapping->i_mmap_mutex);
 +		if (tmp->vm_flags & VM_SHARED)
 +			mapping->i_mmap_writable++;
-+		tmp->vm_truncate_count = mpnt->vm_truncate_count;
 +		flush_dcache_mmap_lock(mapping);
 +		/* insert tmp into the share list, just after mpnt */
 +		vma_prio_tree_add(tmp, mpnt);
 +		flush_dcache_mmap_unlock(mapping);
-+		spin_unlock(&mapping->i_mmap_lock);
++		mutex_unlock(&mapping->i_mmap_mutex);
 +	}
 +
 +	/*
@@ -59900,7 +56684,7 @@ index 25e4291..ecb98e8 100644
  
  	down_write(&oldmm->mmap_sem);
  	flush_cache_dup_mm(oldmm);
-@@ -320,8 +385,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -326,8 +390,8 @@ static int dup_mmap(struct mm_struct *mm
  	mm->locked_vm = 0;
  	mm->mmap = NULL;
  	mm->mmap_cache = NULL;
@@ -59911,7 +56695,7 @@ index 25e4291..ecb98e8 100644
  	mm->map_count = 0;
  	cpumask_clear(mm_cpumask(mm));
  	mm->mm_rb = RB_ROOT;
-@@ -337,8 +402,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -343,8 +407,6 @@ static int dup_mmap(struct mm_struct *mm
  
  	prev = NULL;
  	for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
@@ -59920,7 +56704,7 @@ index 25e4291..ecb98e8 100644
  		if (mpnt->vm_flags & VM_DONTCOPY) {
  			long pages = vma_pages(mpnt);
  			mm->total_vm -= pages;
-@@ -346,56 +409,13 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -352,55 +414,13 @@ static int dup_mmap(struct mm_struct *mm
  								-pages);
  			continue;
  		}
@@ -59954,15 +56738,14 @@ index 25e4291..ecb98e8 100644
 -			get_file(file);
 -			if (tmp->vm_flags & VM_DENYWRITE)
 -				atomic_dec(&inode->i_writecount);
--			spin_lock(&mapping->i_mmap_lock);
+-			mutex_lock(&mapping->i_mmap_mutex);
 -			if (tmp->vm_flags & VM_SHARED)
 -				mapping->i_mmap_writable++;
--			tmp->vm_truncate_count = mpnt->vm_truncate_count;
 -			flush_dcache_mmap_lock(mapping);
 -			/* insert tmp into the share list, just after mpnt */
 -			vma_prio_tree_add(tmp, mpnt);
 -			flush_dcache_mmap_unlock(mapping);
--			spin_unlock(&mapping->i_mmap_lock);
+-			mutex_unlock(&mapping->i_mmap_mutex);
 +		tmp = dup_vma(mm, mpnt);
 +		if (!tmp) {
 +			retval = -ENOMEM;
@@ -59981,7 +56764,7 @@ index 25e4291..ecb98e8 100644
  		 * Link in the new vma and copy the page table entries.
  		 */
  		*pprev = tmp;
-@@ -416,6 +436,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
+@@ -421,6 +441,31 @@ static int dup_mmap(struct mm_struct *mm
  		if (retval)
  			goto out;
  	}
@@ -60013,7 +56796,7 @@ index 25e4291..ecb98e8 100644
  	/* a new mm has just been created */
  	arch_dup_mmap(oldmm, mm);
  	retval = 0;
-@@ -424,14 +469,6 @@ out:
+@@ -429,14 +474,6 @@ out:
  	flush_tlb_mm(oldmm);
  	up_write(&oldmm->mmap_sem);
  	return retval;
@@ -60028,7 +56811,7 @@ index 25e4291..ecb98e8 100644
  }
  
  static inline int mm_alloc_pgd(struct mm_struct * mm)
-@@ -778,13 +815,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
+@@ -836,13 +873,14 @@ static int copy_fs(unsigned long clone_f
  			spin_unlock(&fs->lock);
  			return -EAGAIN;
  		}
@@ -60044,7 +56827,7 @@ index 25e4291..ecb98e8 100644
  	return 0;
  }
  
-@@ -1042,10 +1080,13 @@ static struct task_struct *copy_process(unsigned long clone_flags,
+@@ -1104,10 +1142,13 @@ static struct task_struct *copy_process(
  	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
  #endif
  	retval = -EAGAIN;
@@ -60060,16 +56843,16 @@ index 25e4291..ecb98e8 100644
  			goto bad_fork_free;
  	}
  
-@@ -1199,6 +1240,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
- 			goto bad_fork_free_pid;
- 	}
+@@ -1250,6 +1291,8 @@ static struct task_struct *copy_process(
+ 	if (clone_flags & CLONE_THREAD)
+ 		p->tgid = current->tgid;
  
 +	gr_copy_label(p);
 +
  	p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
  	/*
  	 * Clear TID on mm_release()?
-@@ -1356,6 +1399,8 @@ bad_fork_cleanup_count:
+@@ -1414,6 +1457,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
  	free_task(p);
  fork_out:
@@ -60078,7 +56861,7 @@ index 25e4291..ecb98e8 100644
  	return ERR_PTR(retval);
  }
  
-@@ -1444,6 +1489,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1502,6 +1547,8 @@ long do_fork(unsigned long clone_flags,
  		if (clone_flags & CLONE_PARENT_SETTID)
  			put_user(nr, parent_tidptr);
  
@@ -60087,7 +56870,7 @@ index 25e4291..ecb98e8 100644
  		if (clone_flags & CLONE_VFORK) {
  			p->vfork_done = &vfork;
  			init_completion(&vfork);
-@@ -1559,7 +1606,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
+@@ -1610,7 +1657,7 @@ static int unshare_fs(unsigned long unsh
  		return 0;
  
  	/* don't need lock here; in the worst case we'll do useless copy */
@@ -60096,7 +56879,7 @@ index 25e4291..ecb98e8 100644
  		return 0;
  
  	*new_fsp = copy_fs_struct(fs);
-@@ -1682,7 +1729,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+@@ -1697,7 +1744,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
  			fs = current->fs;
  			spin_lock(&fs->lock);
  			current->fs = new_fs;
@@ -60106,10 +56889,9 @@ index 25e4291..ecb98e8 100644
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff --git a/kernel/futex.c b/kernel/futex.c
-index d5065e8..6c02591 100644
---- a/kernel/futex.c
-+++ b/kernel/futex.c
+diff -urNp linux-3.0.3/kernel/futex.c linux-3.0.3/kernel/futex.c
+--- linux-3.0.3/kernel/futex.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/kernel/futex.c	2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -60118,9 +56900,9 @@ index d5065e8..6c02591 100644
  #include <linux/signal.h>
  #include <linux/module.h>
  #include <linux/magic.h>
-@@ -236,6 +237,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key)
+@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fsh
  	struct page *page, *page_head;
- 	int err;
+ 	int err, ro = 0;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +	if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
@@ -60130,7 +56912,7 @@ index d5065e8..6c02591 100644
  	/*
  	 * The futex address must be "naturally" aligned.
  	 */
-@@ -1833,6 +1839,8 @@ static int futex_wait(u32 __user *uaddr, unsigned int flags, u32 val,
+@@ -1863,6 +1869,8 @@ static int futex_wait(u32 __user *uaddr,
  	struct futex_q q = futex_q_init;
  	int ret;
  
@@ -60139,7 +56921,7 @@ index d5065e8..6c02591 100644
  	if (!bitset)
  		return -EINVAL;
  	q.bitset = bitset;
-@@ -2232,6 +2240,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
+@@ -2259,6 +2267,8 @@ static int futex_wait_requeue_pi(u32 __u
  	struct futex_q q = futex_q_init;
  	int res, ret;
  
@@ -60148,7 +56930,7 @@ index d5065e8..6c02591 100644
  	if (!bitset)
  		return -EINVAL;
  
-@@ -2404,7 +2414,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
+@@ -2431,7 +2441,9 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  {
  	struct robust_list_head __user *head;
  	unsigned long ret;
@@ -60158,7 +56940,7 @@ index d5065e8..6c02591 100644
  
  	if (!futex_cmpxchg_enabled)
  		return -ENOSYS;
-@@ -2420,11 +2432,16 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
+@@ -2447,6 +2459,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
  		if (!p)
  			goto err_unlock;
  		ret = -EPERM;
@@ -60167,15 +56949,17 @@ index d5065e8..6c02591 100644
 +			goto err_unlock;
 +#else
  		pcred = __task_cred(p);
- 		if (cred->euid != pcred->euid &&
- 		    cred->euid != pcred->uid &&
- 		    !capable(CAP_SYS_PTRACE))
+ 		/* If victim is in different user_ns, then uids are not
+ 		   comparable, so we must have CAP_SYS_PTRACE */
+@@ -2461,6 +2477,7 @@ SYSCALL_DEFINE3(get_robust_list, int, pi
+ 		    !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
  			goto err_unlock;
+ ok:
 +#endif
  		head = p->robust_list;
  		rcu_read_unlock();
  	}
-@@ -2667,6 +2684,7 @@ static int __init futex_init(void)
+@@ -2712,6 +2729,7 @@ static int __init futex_init(void)
  {
  	u32 curval;
  	int i;
@@ -60183,21 +56967,21 @@ index d5065e8..6c02591 100644
  
  	/*
  	 * This will fail and we want it. Some arch implementations do
-@@ -2678,7 +2696,10 @@ static int __init futex_init(void)
+@@ -2723,8 +2741,11 @@ static int __init futex_init(void)
  	 * implementation, the non-functional ones will return
  	 * -ENOSYS.
  	 */
 +	oldfs = get_fs();
 +	set_fs(USER_DS);
- 	curval = cmpxchg_futex_value_locked(NULL, 0, 0);
-+	set_fs(oldfs);
- 	if (curval == -EFAULT)
+ 	if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
  		futex_cmpxchg_enabled = 1;
++	set_fs(oldfs);
  
-diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
-index a7934ac..d21ff12 100644
---- a/kernel/futex_compat.c
-+++ b/kernel/futex_compat.c
+ 	for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
+ 		plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
+diff -urNp linux-3.0.3/kernel/futex_compat.c linux-3.0.3/kernel/futex_compat.c
+--- linux-3.0.3/kernel/futex_compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/futex_compat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -60206,7 +56990,7 @@ index a7934ac..d21ff12 100644
  
  #include <asm/uaccess.h>
  
-@@ -136,7 +137,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
+@@ -136,7 +137,10 @@ compat_sys_get_robust_list(int pid, comp
  {
  	struct compat_robust_list_head __user *head;
  	unsigned long ret;
@@ -60218,7 +57002,7 @@ index a7934ac..d21ff12 100644
  
  	if (!futex_cmpxchg_enabled)
  		return -ENOSYS;
-@@ -152,11 +156,16 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
+@@ -152,6 +156,10 @@ compat_sys_get_robust_list(int pid, comp
  		if (!p)
  			goto err_unlock;
  		ret = -EPERM;
@@ -60227,18 +57011,19 @@ index a7934ac..d21ff12 100644
 +			goto err_unlock;
 +#else
  		pcred = __task_cred(p);
- 		if (cred->euid != pcred->euid &&
- 		    cred->euid != pcred->uid &&
- 		    !capable(CAP_SYS_PTRACE))
+ 		/* If victim is in different user_ns, then uids are not
+ 		   comparable, so we must have CAP_SYS_PTRACE */
+@@ -166,6 +174,7 @@ compat_sys_get_robust_list(int pid, comp
+ 		    !ns_capable(pcred->user->user_ns, CAP_SYS_PTRACE))
  			goto err_unlock;
+ ok:
 +#endif
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
-index 9b22d03..6295b62 100644
---- a/kernel/gcov/base.c
-+++ b/kernel/gcov/base.c
+diff -urNp linux-3.0.3/kernel/gcov/base.c linux-3.0.3/kernel/gcov/base.c
+--- linux-3.0.3/kernel/gcov/base.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/gcov/base.c	2011-08-23 21:47:56.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -60251,7 +57036,7 @@ index 9b22d03..6295b62 100644
  /* Update list and generate events when modules are unloaded. */
  static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
  				void *data)
-@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
+@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct n
  	prev = NULL;
  	/* Remove entries located in module from linked list. */
  	for (info = gcov_info_head; info; info = info->next) {
@@ -60260,11 +57045,10 @@ index 9b22d03..6295b62 100644
  			if (prev)
  				prev->next = info->next;
  			else
-diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
-index 0c8d7c0..c25dfe5 100644
---- a/kernel/hrtimer.c
-+++ b/kernel/hrtimer.c
-@@ -1371,7 +1371,7 @@ void hrtimer_peek_ahead_timers(void)
+diff -urNp linux-3.0.3/kernel/hrtimer.c linux-3.0.3/kernel/hrtimer.c
+--- linux-3.0.3/kernel/hrtimer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/hrtimer.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
  	local_irq_restore(flags);
  }
  
@@ -60273,54 +57057,35 @@ index 0c8d7c0..c25dfe5 100644
  {
  	hrtimer_peek_ahead_timers();
  }
-diff --git a/kernel/jump_label.c b/kernel/jump_label.c
-index 3b79bd9..c8b0bf9 100644
---- a/kernel/jump_label.c
-+++ b/kernel/jump_label.c
-@@ -49,6 +49,17 @@ void jump_label_unlock(void)
- 	mutex_unlock(&jump_label_mutex);
+diff -urNp linux-3.0.3/kernel/jump_label.c linux-3.0.3/kernel/jump_label.c
+--- linux-3.0.3/kernel/jump_label.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/jump_label.c	2011-08-23 21:47:56.000000000 -0400
+@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
+ 
+ 	size = (((unsigned long)stop - (unsigned long)start)
+ 					/ sizeof(struct jump_entry));
++	pax_open_kernel();
+ 	sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
++	pax_close_kernel();
  }
  
-+static void jump_label_swap(void *a, void *b, int size)
-+{
-+	struct jump_entry t;
-+
-+	t = *(struct jump_entry *)a;
+ static void jump_label_update(struct jump_label_key *key, int enable);
+@@ -297,10 +299,12 @@ static void jump_label_invalidate_module
+ 	struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
+ 	struct jump_entry *iter;
+ 
 +	pax_open_kernel();
-+	*(struct jump_entry *)a = *(struct jump_entry *)b;
-+	*(struct jump_entry *)b = t;
+ 	for (iter = iter_start; iter < iter_stop; iter++) {
+ 		if (within_module_init(iter->code, mod))
+ 			iter->code = 0;
+ 	}
 +	pax_close_kernel();
-+}
-+
- static int jump_label_cmp(const void *a, const void *b)
- {
- 	const struct jump_entry *jea = a;
-@@ -70,7 +81,7 @@ sort_jump_label_entries(struct jump_entry *start, struct jump_entry *stop)
+ }
  
- 	size = (((unsigned long)stop - (unsigned long)start)
- 					/ sizeof(struct jump_entry));
--	sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
-+	sort(start, size, sizeof(struct jump_entry), jump_label_cmp, jump_label_swap);
- }
- 
- static struct jump_label_entry *get_jump_label_entry(jump_label_t key)
-@@ -407,8 +418,11 @@ static void remove_jump_label_module_init(struct module *mod)
- 				count = e_module->nr_entries;
- 				iter = e_module->table;
- 				while (count--) {
--					if (within_module_init(iter->code, mod))
-+					if (within_module_init(iter->code, mod)) {
-+						pax_open_kernel();
- 						iter->key = 0;
-+						pax_close_kernel();
-+					}
- 					iter++;
- 				}
- 			}
-diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
-index 6f6d091..b3aaa18 100644
---- a/kernel/kallsyms.c
-+++ b/kernel/kallsyms.c
+ static int
+diff -urNp linux-3.0.3/kernel/kallsyms.c linux-3.0.3/kernel/kallsyms.c
+--- linux-3.0.3/kernel/kallsyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/kallsyms.c	2011-08-23 21:48:14.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -60331,7 +57096,7 @@ index 6f6d091..b3aaa18 100644
  #include <linux/kallsyms.h>
  #include <linux/module.h>
  #include <linux/init.h>
-@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
+@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_mark
  
  static inline int is_kernel_inittext(unsigned long addr)
  {
@@ -60365,7 +57130,7 @@ index 6f6d091..b3aaa18 100644
  static inline int is_kernel_text(unsigned long addr)
  {
  	if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
-@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
+@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigne
  
  static inline int is_kernel(unsigned long addr)
  {
@@ -60380,7 +57145,7 @@ index 6f6d091..b3aaa18 100644
 +#endif
 +
  		return 1;
- 	return in_gate_area_no_task(addr);
+ 	return in_gate_area_no_mm(addr);
  }
  
  static int is_ksym_addr(unsigned long addr)
@@ -60394,7 +57159,7 @@ index 6f6d091..b3aaa18 100644
  	if (all_var)
  		return is_kernel(addr);
  
-@@ -416,7 +455,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
+@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(st
  
  static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
  {
@@ -60402,7 +57167,7 @@ index 6f6d091..b3aaa18 100644
  	iter->nameoff = get_symbol_offset(new_pos);
  	iter->pos = new_pos;
  }
-@@ -464,6 +502,11 @@ static int s_show(struct seq_file *m, void *p)
+@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, vo
  {
  	struct kallsym_iter *iter = m->private;
  
@@ -60414,7 +57179,7 @@ index 6f6d091..b3aaa18 100644
  	/* Some debugging symbols have no name.  Ignore them. */
  	if (!iter->name[0])
  		return 0;
-@@ -504,7 +547,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
+@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *i
  	struct kallsym_iter *iter;
  	int ret;
  
@@ -60423,11 +57188,10 @@ index 6f6d091..b3aaa18 100644
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff --git a/kernel/kmod.c b/kernel/kmod.c
-index 9cd0591..c778d07 100644
---- a/kernel/kmod.c
-+++ b/kernel/kmod.c
-@@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
+diff -urNp linux-3.0.3/kernel/kmod.c linux-3.0.3/kernel/kmod.c
+--- linux-3.0.3/kernel/kmod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/kmod.c	2011-08-23 21:48:14.000000000 -0400
+@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
   */
@@ -60443,7 +57207,7 @@ index 9cd0591..c778d07 100644
  	static char *envp[] = { "HOME=/",
  				"TERM=linux",
  				"PATH=/sbin:/usr/sbin:/bin:/usr/bin",
-@@ -80,9 +79,7 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -88,9 +87,7 @@ int __request_module(bool wait, const ch
  #define MAX_KMOD_CONCURRENT 50	/* Completely arbitrary value - KAO */
  	static int kmod_loop_msg;
  
@@ -60454,7 +57218,7 @@ index 9cd0591..c778d07 100644
  	if (ret >= MODULE_NAME_LEN)
  		return -ENAMETOOLONG;
  
-@@ -90,6 +87,20 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -98,6 +95,20 @@ int __request_module(bool wait, const ch
  	if (ret)
  		return ret;
  
@@ -60475,7 +57239,7 @@ index 9cd0591..c778d07 100644
  	/* If modprobe needs a service that is in a module, we get a recursive
  	 * loop.  Limit the number of running kmod threads to max_threads/2 or
  	 * MAX_KMOD_CONCURRENT, whichever is the smaller.  A cleaner method
-@@ -123,6 +134,47 @@ int __request_module(bool wait, const char *fmt, ...)
+@@ -131,6 +142,47 @@ int __request_module(bool wait, const ch
  	atomic_dec(&kmod_concurrent);
  	return ret;
  }
@@ -60523,11 +57287,10 @@ index 9cd0591..c778d07 100644
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff --git a/kernel/kprobes.c b/kernel/kprobes.c
-index 7798181..2fcc39d 100644
---- a/kernel/kprobes.c
-+++ b/kernel/kprobes.c
-@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
+diff -urNp linux-3.0.3/kernel/kprobes.c linux-3.0.3/kernel/kprobes.c
+--- linux-3.0.3/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/kprobes.c	2011-08-23 21:47:56.000000000 -0400
+@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
  	 * kernel image and loaded module images reside. This is required
  	 * so x86_64 can correctly handle the %rip-relative fixups.
  	 */
@@ -60536,7 +57299,7 @@ index 7798181..2fcc39d 100644
  	if (!kip->insns) {
  		kfree(kip);
  		return NULL;
-@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
+@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(st
  		 */
  		if (!list_is_singular(&kip->list)) {
  			list_del(&kip->list);
@@ -60554,7 +57317,7 @@ index 7798181..2fcc39d 100644
  	const char *symbol_name;
  	void *addr;
  	struct kprobe_blackpoint *kb;
-@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
+@@ -2062,7 +2062,7 @@ static int __kprobes show_kprobe_addr(st
  	const char *sym = NULL;
  	unsigned int i = *(loff_t *) v;
  	unsigned long offset = 0;
@@ -60563,11 +57326,10 @@ index 7798181..2fcc39d 100644
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff --git a/kernel/lockdep.c b/kernel/lockdep.c
-index 0d2058d..2cadb2c 100644
---- a/kernel/lockdep.c
-+++ b/kernel/lockdep.c
-@@ -571,6 +571,10 @@ static int static_obj(void *obj)
+diff -urNp linux-3.0.3/kernel/lockdep.c linux-3.0.3/kernel/lockdep.c
+--- linux-3.0.3/kernel/lockdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/lockdep.c	2011-08-23 21:47:56.000000000 -0400
+@@ -583,6 +583,10 @@ static int static_obj(void *obj)
  		      end   = (unsigned long) &_end,
  		      addr  = (unsigned long) obj;
  
@@ -60578,7 +57340,7 @@ index 0d2058d..2cadb2c 100644
  	/*
  	 * static variable?
  	 */
-@@ -706,6 +710,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
+@@ -718,6 +722,7 @@ register_lock_class(struct lockdep_map *
  	if (!static_obj(lock->key)) {
  		debug_locks_off();
  		printk("INFO: trying to register non-static key.\n");
@@ -60586,7 +57348,7 @@ index 0d2058d..2cadb2c 100644
  		printk("the code is fine but needs lockdep annotation.\n");
  		printk("turning off the locking correctness validator.\n");
  		dump_stack();
-@@ -2752,7 +2757,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
+@@ -2936,7 +2941,7 @@ static int __lock_acquire(struct lockdep
  		if (!class)
  			return 0;
  	}
@@ -60595,11 +57357,10 @@ index 0d2058d..2cadb2c 100644
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
-index 1969d2f..8741134 100644
---- a/kernel/lockdep_proc.c
-+++ b/kernel/lockdep_proc.c
-@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
+diff -urNp linux-3.0.3/kernel/lockdep_proc.c linux-3.0.3/kernel/lockdep_proc.c
+--- linux-3.0.3/kernel/lockdep_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/lockdep_proc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
  {
@@ -60608,19 +57369,18 @@ index 1969d2f..8741134 100644
  	const char *name = class->name;
  
  	if (!name) {
-diff --git a/kernel/module.c b/kernel/module.c
-index efa290e..f687dc4 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -57,6 +57,7 @@
- #include <linux/kmemleak.h>
+diff -urNp linux-3.0.3/kernel/module.c linux-3.0.3/kernel/module.c
+--- linux-3.0.3/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/module.c	2011-08-23 21:48:14.000000000 -0400
+@@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
+ #include <linux/bsearch.h>
 +#include <linux/grsecurity.h>
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/module.h>
-@@ -118,7 +119,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
+@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_not
  
  /* Bounds of module allocation, for speeding __module_address.
   * Protected by module_mutex. */
@@ -60630,7 +57390,7 @@ index efa290e..f687dc4 100644
  
  int register_module_notifier(struct notifier_block * nb)
  {
-@@ -282,7 +284,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
+@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(cons
  		return true;
  
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -60639,7 +57399,7 @@ index efa290e..f687dc4 100644
  			{ mod->syms, mod->syms + mod->num_syms, mod->crcs,
  			  NOT_GPL_ONLY, false },
  			{ mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
-@@ -304,7 +306,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
+@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(cons
  #endif
  		};
  
@@ -60648,7 +57408,7 @@ index efa290e..f687dc4 100644
  			return true;
  	}
  	return false;
-@@ -415,7 +417,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
+@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(
  static int percpu_modalloc(struct module *mod,
  			   unsigned long size, unsigned long align)
  {
@@ -60657,7 +57417,7 @@ index efa290e..f687dc4 100644
  		printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
  		       mod->name, align, PAGE_SIZE);
  		align = PAGE_SIZE;
-@@ -1143,7 +1145,7 @@ resolve_symbol_wait(struct module *mod,
+@@ -1166,7 +1168,7 @@ resolve_symbol_wait(struct module *mod,
   */
  #ifdef CONFIG_SYSFS
  
@@ -60666,33 +57426,37 @@ index efa290e..f687dc4 100644
  static inline bool sect_empty(const Elf_Shdr *sect)
  {
  	return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
-@@ -1612,17 +1614,17 @@ void unset_section_ro_nx(struct module *mod, void *module_region)
- {
- 	unsigned long total_pages;
+@@ -1632,21 +1634,21 @@ static void set_section_ro_nx(void *base
  
--	if (mod->module_core == module_region) {
-+	if (mod->module_core_rx == module_region) {
- 		/* Set core as NX+RW */
--		total_pages = MOD_NUMBER_OF_PAGES(mod->module_core, mod->core_size);
--		set_memory_nx((unsigned long)mod->module_core, total_pages);
--		set_memory_rw((unsigned long)mod->module_core, total_pages);
-+		total_pages = MOD_NUMBER_OF_PAGES(mod->module_core_rx, mod->core_size_rx);
-+		set_memory_nx((unsigned long)mod->module_core_rx, total_pages);
-+		set_memory_rw((unsigned long)mod->module_core_rx, total_pages);
+ static void unset_module_core_ro_nx(struct module *mod)
+ {
+-	set_page_attributes(mod->module_core + mod->core_text_size,
+-		mod->module_core + mod->core_size,
++	set_page_attributes(mod->module_core_rw,
++		mod->module_core_rw + mod->core_size_rw,
+ 		set_memory_x);
+-	set_page_attributes(mod->module_core,
+-		mod->module_core + mod->core_ro_size,
++	set_page_attributes(mod->module_core_rx,
++		mod->module_core_rx + mod->core_size_rx,
+ 		set_memory_rw);
+ }
  
--	} else if (mod->module_init == module_region) {
-+	} else if (mod->module_init_rx == module_region) {
- 		/* Set init as NX+RW */
--		total_pages = MOD_NUMBER_OF_PAGES(mod->module_init, mod->init_size);
--		set_memory_nx((unsigned long)mod->module_init, total_pages);
--		set_memory_rw((unsigned long)mod->module_init, total_pages);
-+		total_pages = MOD_NUMBER_OF_PAGES(mod->module_init_rx, mod->init_size_rx);
-+		set_memory_nx((unsigned long)mod->module_init_rx, total_pages);
-+		set_memory_rw((unsigned long)mod->module_init_rx, total_pages);
- 	}
+ static void unset_module_init_ro_nx(struct module *mod)
+ {
+-	set_page_attributes(mod->module_init + mod->init_text_size,
+-		mod->module_init + mod->init_size,
++	set_page_attributes(mod->module_init_rw,
++		mod->module_init_rw + mod->init_size_rw,
+ 		set_memory_x);
+-	set_page_attributes(mod->module_init,
+-		mod->module_init + mod->init_ro_size,
++	set_page_attributes(mod->module_init_rx,
++		mod->module_init_rx + mod->init_size_rx,
+ 		set_memory_rw);
  }
  
-@@ -1633,14 +1635,14 @@ void set_all_modules_text_rw()
+@@ -1657,14 +1659,14 @@ void set_all_modules_text_rw(void)
  
  	mutex_lock(&module_mutex);
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -60713,7 +57477,7 @@ index efa290e..f687dc4 100644
  						set_memory_rw);
  		}
  	}
-@@ -1654,14 +1656,14 @@ void set_all_modules_text_ro()
+@@ -1678,14 +1680,14 @@ void set_all_modules_text_ro(void)
  
  	mutex_lock(&module_mutex);
  	list_for_each_entry_rcu(mod, &modules, list) {
@@ -60734,13 +57498,11 @@ index efa290e..f687dc4 100644
  						set_memory_ro);
  		}
  	}
-@@ -1696,17 +1698,20 @@ static void free_module(struct module *mod)
- 	destroy_params(mod->kp, mod->num_kp);
+@@ -1722,16 +1724,19 @@ static void free_module(struct module *m
  
  	/* This may be NULL, but that's OK */
--	unset_section_ro_nx(mod, mod->module_init);
+ 	unset_module_init_ro_nx(mod);
 -	module_free(mod, mod->module_init);
-+	unset_section_ro_nx(mod, mod->module_init_rx);
 +	module_free(mod, mod->module_init_rw);
 +	module_free_exec(mod, mod->module_init_rx);
  	kfree(mod->args);
@@ -60752,15 +57514,14 @@ index efa290e..f687dc4 100644
 +	lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
  
  	/* Finally, free the core (containing the module structure) */
--	unset_section_ro_nx(mod, mod->module_core);
+ 	unset_module_core_ro_nx(mod);
 -	module_free(mod, mod->module_core);
-+	unset_section_ro_nx(mod, mod->module_core_rx);
 +	module_free_exec(mod, mod->module_core_rx);
 +	module_free(mod, mod->module_core_rw);
  
  #ifdef CONFIG_MPU
  	update_protections(current->mm);
-@@ -1775,10 +1780,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1800,10 +1805,31 @@ static int simplify_symbols(struct modul
  	unsigned int i;
  	int ret = 0;
  	const struct kernel_symbol *ksym;
@@ -60792,7 +57553,7 @@ index efa290e..f687dc4 100644
  		switch (sym[i].st_shndx) {
  		case SHN_COMMON:
  			/* We compiled with -fno-common.  These are not
-@@ -1799,7 +1825,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1824,7 +1850,9 @@ static int simplify_symbols(struct modul
  			ksym = resolve_symbol_wait(mod, info, name);
  			/* Ok if resolved.  */
  			if (ksym && !IS_ERR(ksym)) {
@@ -60802,7 +57563,7 @@ index efa290e..f687dc4 100644
  				break;
  			}
  
-@@ -1818,11 +1846,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
+@@ -1843,11 +1871,20 @@ static int simplify_symbols(struct modul
  				secbase = (unsigned long)mod_percpu(mod);
  			else
  				secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
@@ -60823,7 +57584,7 @@ index efa290e..f687dc4 100644
  	return ret;
  }
  
-@@ -1906,22 +1943,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -1931,22 +1968,12 @@ static void layout_sections(struct modul
  			    || s->sh_entsize != ~0UL
  			    || strstarts(sname, ".init"))
  				continue;
@@ -60850,7 +57611,7 @@ index efa290e..f687dc4 100644
  	}
  
  	DEBUGP("Init section allocation order:\n");
-@@ -1935,23 +1962,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
+@@ -1960,23 +1987,13 @@ static void layout_sections(struct modul
  			    || s->sh_entsize != ~0UL
  			    || !strstarts(sname, ".init"))
  				continue;
@@ -60879,7 +57640,7 @@ index efa290e..f687dc4 100644
  	}
  }
  
-@@ -2119,7 +2136,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2141,7 +2158,7 @@ static void layout_symtab(struct module 
  
  	/* Put symbol section at end of init part of module. */
  	symsect->sh_flags |= SHF_ALLOC;
@@ -60888,7 +57649,7 @@ index efa290e..f687dc4 100644
  					 info->index.sym) | INIT_OFFSET_MASK;
  	DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
  
-@@ -2136,19 +2153,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
+@@ -2158,19 +2175,19 @@ static void layout_symtab(struct module 
  		}
  
  	/* Append room for core symbols at end of core part. */
@@ -60913,7 +57674,7 @@ index efa290e..f687dc4 100644
  }
  
  static void add_kallsyms(struct module *mod, const struct load_info *info)
-@@ -2164,11 +2181,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2186,11 +2203,13 @@ static void add_kallsyms(struct module *
  	/* Make sure we get permanent strtab: don't use info->strtab. */
  	mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
  
@@ -60928,7 +57689,7 @@ index efa290e..f687dc4 100644
  	src = mod->symtab;
  	*dst = *src;
  	for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
-@@ -2181,10 +2200,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
+@@ -2203,10 +2222,12 @@ static void add_kallsyms(struct module *
  	}
  	mod->core_num_syms = ndst;
  
@@ -60942,7 +57703,7 @@ index efa290e..f687dc4 100644
  }
  #else
  static inline void layout_symtab(struct module *mod, struct load_info *info)
-@@ -2213,17 +2234,33 @@ static void dynamic_debug_remove(struct _ddebug *debug)
+@@ -2235,17 +2256,33 @@ static void dynamic_debug_remove(struct 
  		ddebug_remove_module(debug->modname);
  }
  
@@ -60981,7 +57742,7 @@ index efa290e..f687dc4 100644
  		mutex_unlock(&module_mutex);
  	}
  	return ret;
-@@ -2516,7 +2553,7 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2538,7 +2575,7 @@ static int move_module(struct module *mo
  	void *ptr;
  
  	/* Do the allocs. */
@@ -60990,7 +57751,7 @@ index efa290e..f687dc4 100644
  	/*
  	 * The pointer to this block is stored in the module structure
  	 * which is inside the block. Just mark it as not being a
-@@ -2526,23 +2563,50 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2548,23 +2585,50 @@ static int move_module(struct module *mo
  	if (!ptr)
  		return -ENOMEM;
  
@@ -61049,7 +57810,7 @@ index efa290e..f687dc4 100644
  
  	/* Transfer each section which specifies SHF_ALLOC */
  	DEBUGP("final section addresses:\n");
-@@ -2553,16 +2617,45 @@ static int move_module(struct module *mod, struct load_info *info)
+@@ -2575,16 +2639,45 @@ static int move_module(struct module *mo
  		if (!(shdr->sh_flags & SHF_ALLOC))
  			continue;
  
@@ -61102,7 +57863,7 @@ index efa290e..f687dc4 100644
  		DEBUGP("\t0x%lx %s\n",
  		       shdr->sh_addr, info->secstrings + shdr->sh_name);
  	}
-@@ -2613,12 +2706,12 @@ static void flush_module_icache(const struct module *mod)
+@@ -2635,12 +2728,12 @@ static void flush_module_icache(const st
  	 * Do it before processing of module parameters, so the module
  	 * can provide parameter accessor functions of its own.
  	 */
@@ -61121,7 +57882,7 @@ index efa290e..f687dc4 100644
  
  	set_fs(old_fs);
  }
-@@ -2690,8 +2783,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
+@@ -2712,8 +2805,10 @@ static void module_deallocate(struct mod
  {
  	kfree(info->strmap);
  	percpu_modfree(mod);
@@ -61134,7 +57895,7 @@ index efa290e..f687dc4 100644
  }
  
  static int post_relocation(struct module *mod, const struct load_info *info)
-@@ -2748,9 +2843,38 @@ static struct module *load_module(void __user *umod,
+@@ -2770,9 +2865,38 @@ static struct module *load_module(void _
  	if (err)
  		goto free_unload;
  
@@ -61173,7 +57934,7 @@ index efa290e..f687dc4 100644
  	/* Fix up syms, so that st_value is a pointer to location. */
  	err = simplify_symbols(mod, &info);
  	if (err < 0)
-@@ -2766,13 +2890,6 @@ static struct module *load_module(void __user *umod,
+@@ -2788,13 +2912,6 @@ static struct module *load_module(void _
  
  	flush_module_icache(mod);
  
@@ -61187,7 +57948,7 @@ index efa290e..f687dc4 100644
  	/* Mark state as coming so strong_try_module_get() ignores us. */
  	mod->state = MODULE_STATE_COMING;
  
-@@ -2832,11 +2949,10 @@ static struct module *load_module(void __user *umod,
+@@ -2854,11 +2971,10 @@ static struct module *load_module(void _
   unlock:
  	mutex_unlock(&module_mutex);
  	synchronize_sched();
@@ -61200,7 +57961,7 @@ index efa290e..f687dc4 100644
   free_unload:
  	module_unload_free(mod);
   free_module:
-@@ -2877,16 +2993,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+@@ -2899,16 +3015,16 @@ SYSCALL_DEFINE3(init_module, void __user
  			MODULE_STATE_COMING, mod);
  
  	/* Set RO and NX regions for core */
@@ -61225,16 +57986,15 @@ index efa290e..f687dc4 100644
  
  	do_mod_ctors(mod);
  	/* Start the module */
-@@ -2931,11 +3047,13 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
- 	mod->symtab = mod->core_symtab;
+@@ -2954,11 +3070,12 @@ SYSCALL_DEFINE3(init_module, void __user
  	mod->strtab = mod->core_strtab;
  #endif
--	unset_section_ro_nx(mod, mod->module_init);
+ 	unset_module_init_ro_nx(mod);
 -	module_free(mod, mod->module_init);
 -	mod->module_init = NULL;
 -	mod->init_size = 0;
+-	mod->init_ro_size = 0;
 -	mod->init_text_size = 0;
-+	unset_section_ro_nx(mod, mod->module_init_rx);
 +	module_free(mod, mod->module_init_rw);
 +	module_free_exec(mod, mod->module_init_rx);
 +	mod->module_init_rw = NULL;
@@ -61244,7 +58004,7 @@ index efa290e..f687dc4 100644
  	mutex_unlock(&module_mutex);
  
  	return 0;
-@@ -2966,10 +3084,16 @@ static const char *get_ksymbol(struct module *mod,
+@@ -2989,10 +3106,16 @@ static const char *get_ksymbol(struct mo
  	unsigned long nextval;
  
  	/* At worse, next value is at end of module */
@@ -61262,9 +58022,9 @@ index efa290e..f687dc4 100644
 -		nextval = (unsigned long)mod->module_core+mod->core_text_size;
 +		return NULL;
  
- 	/* Scan for closest preceeding symbol, and next symbol. (ELF
+ 	/* Scan for closest preceding symbol, and next symbol. (ELF
  	   starts real symbols at 1). */
-@@ -3215,7 +3339,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3238,7 +3361,7 @@ static int m_show(struct seq_file *m, vo
  	char buf[8];
  
  	seq_printf(m, "%s %u",
@@ -61273,16 +58033,16 @@ index efa290e..f687dc4 100644
  	print_unload_info(m, mod);
  
  	/* Informative for users. */
-@@ -3224,7 +3348,7 @@ static int m_show(struct seq_file *m, void *p)
+@@ -3247,7 +3370,7 @@ static int m_show(struct seq_file *m, vo
  		   mod->state == MODULE_STATE_COMING ? "Loading":
  		   "Live");
  	/* Used by oprofile and other similar tools. */
--	seq_printf(m, " 0x%p", mod->module_core);
-+	seq_printf(m, " 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
+-	seq_printf(m, " 0x%pK", mod->module_core);
++	seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
  
  	/* Taints info */
  	if (mod->taints)
-@@ -3260,7 +3384,17 @@ static const struct file_operations proc_modules_operations = {
+@@ -3283,7 +3406,17 @@ static const struct file_operations proc
  
  static int __init proc_modules_init(void)
  {
@@ -61300,7 +58060,7 @@ index efa290e..f687dc4 100644
  	return 0;
  }
  module_init(proc_modules_init);
-@@ -3319,12 +3453,12 @@ struct module *__module_address(unsigned long addr)
+@@ -3342,12 +3475,12 @@ struct module *__module_address(unsigned
  {
  	struct module *mod;
  
@@ -61316,7 +58076,7 @@ index efa290e..f687dc4 100644
  			return mod;
  	return NULL;
  }
-@@ -3358,11 +3492,20 @@ bool is_module_text_address(unsigned long addr)
+@@ -3381,11 +3514,20 @@ bool is_module_text_address(unsigned lon
   */
  struct module *__module_text_address(unsigned long addr)
  {
@@ -61340,11 +58100,41 @@ index efa290e..f687dc4 100644
  			mod = NULL;
  	}
  	return mod;
-diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
-index ec815a9..fe46e99 100644
---- a/kernel/mutex-debug.c
-+++ b/kernel/mutex-debug.c
-@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
+diff -urNp linux-3.0.3/kernel/mutex.c linux-3.0.3/kernel/mutex.c
+--- linux-3.0.3/kernel/mutex.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/mutex.c	2011-08-23 21:47:56.000000000 -0400
+@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, 
+ 	spin_lock_mutex(&lock->wait_lock, flags);
+ 
+ 	debug_mutex_lock_common(lock, &waiter);
+-	debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
++	debug_mutex_add_waiter(lock, &waiter, task);
+ 
+ 	/* add waiting tasks to the end of the waitqueue (FIFO): */
+ 	list_add_tail(&waiter.list, &lock->wait_list);
+@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, 
+ 		 * TASK_UNINTERRUPTIBLE case.)
+ 		 */
+ 		if (unlikely(signal_pending_state(state, task))) {
+-			mutex_remove_waiter(lock, &waiter,
+-					    task_thread_info(task));
++			mutex_remove_waiter(lock, &waiter, task);
+ 			mutex_release(&lock->dep_map, 1, ip);
+ 			spin_unlock_mutex(&lock->wait_lock, flags);
+ 
+@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, 
+ done:
+ 	lock_acquired(&lock->dep_map, ip);
+ 	/* got the lock - rejoice! */
+-	mutex_remove_waiter(lock, &waiter, current_thread_info());
++	mutex_remove_waiter(lock, &waiter, task);
+ 	mutex_set_owner(lock);
+ 
+ 	/* set it to 0 if there are no waiters left: */
+diff -urNp linux-3.0.3/kernel/mutex-debug.c linux-3.0.3/kernel/mutex-debug.c
+--- linux-3.0.3/kernel/mutex-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/mutex-debug.c	2011-08-23 21:47:56.000000000 -0400
+@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
  void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
@@ -61372,20 +58162,10 @@ index ec815a9..fe46e99 100644
  
  	list_del_init(&waiter->list);
  	waiter->task = NULL;
-@@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lock)
- 		return;
- 
- 	DEBUG_LOCKS_WARN_ON(lock->magic != lock);
--	DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
-+	DEBUG_LOCKS_WARN_ON(lock->owner != current);
- 	DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
- 	mutex_clear_owner(lock);
- }
-diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
-index 57d527a..d06ae3b 100644
---- a/kernel/mutex-debug.h
-+++ b/kernel/mutex-debug.h
-@@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
+diff -urNp linux-3.0.3/kernel/mutex-debug.h linux-3.0.3/kernel/mutex-debug.h
+--- linux-3.0.3/kernel/mutex-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/mutex-debug.h	2011-08-23 21:47:56.000000000 -0400
+@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
  				   struct mutex_waiter *waiter,
@@ -61397,73 +58177,10 @@ index 57d527a..d06ae3b 100644
  extern void debug_mutex_unlock(struct mutex *lock);
  extern void debug_mutex_init(struct mutex *lock, const char *name,
  			     struct lock_class_key *key);
- 
- static inline void mutex_set_owner(struct mutex *lock)
- {
--	lock->owner = current_thread_info();
-+	lock->owner = current;
- }
- 
- static inline void mutex_clear_owner(struct mutex *lock)
-diff --git a/kernel/mutex.c b/kernel/mutex.c
-index a5889fb..d5f2ff2 100644
---- a/kernel/mutex.c
-+++ b/kernel/mutex.c
-@@ -160,7 +160,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
- 	 */
- 
- 	for (;;) {
--		struct thread_info *owner;
-+		struct task_struct *owner;
- 
- 		/*
- 		 * If we own the BKL, then don't spin. The owner of
-@@ -205,7 +205,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
- 	spin_lock_mutex(&lock->wait_lock, flags);
- 
- 	debug_mutex_lock_common(lock, &waiter);
--	debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
-+	debug_mutex_add_waiter(lock, &waiter, task);
- 
- 	/* add waiting tasks to the end of the waitqueue (FIFO): */
- 	list_add_tail(&waiter.list, &lock->wait_list);
-@@ -234,8 +234,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
- 		 * TASK_UNINTERRUPTIBLE case.)
- 		 */
- 		if (unlikely(signal_pending_state(state, task))) {
--			mutex_remove_waiter(lock, &waiter,
--					    task_thread_info(task));
-+			mutex_remove_waiter(lock, &waiter, task);
- 			mutex_release(&lock->dep_map, 1, ip);
- 			spin_unlock_mutex(&lock->wait_lock, flags);
- 
-@@ -256,7 +255,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
- done:
- 	lock_acquired(&lock->dep_map, ip);
- 	/* got the lock - rejoice! */
--	mutex_remove_waiter(lock, &waiter, current_thread_info());
-+	mutex_remove_waiter(lock, &waiter, task);
- 	mutex_set_owner(lock);
- 
- 	/* set it to 0 if there are no waiters left: */
-diff --git a/kernel/mutex.h b/kernel/mutex.h
-index 67578ca..4115fbf 100644
---- a/kernel/mutex.h
-+++ b/kernel/mutex.h
-@@ -19,7 +19,7 @@
- #ifdef CONFIG_SMP
- static inline void mutex_set_owner(struct mutex *lock)
- {
--	lock->owner = current_thread_info();
-+	lock->owner = current;
- }
- 
- static inline void mutex_clear_owner(struct mutex *lock)
-diff --git a/kernel/padata.c b/kernel/padata.c
-index 7510194..8d6863d 100644
---- a/kernel/padata.c
-+++ b/kernel/padata.c
-@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
+diff -urNp linux-3.0.3/kernel/padata.c linux-3.0.3/kernel/padata.c
+--- linux-3.0.3/kernel/padata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/padata.c	2011-08-23 21:47:56.000000000 -0400
+@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
  	padata->pd = pd;
  	padata->cb_cpu = cb_cpu;
  
@@ -61477,7 +58194,7 @@ index 7510194..8d6863d 100644
  
  	target_cpu = padata_cpu_hash(padata);
  	queue = per_cpu_ptr(pd->pqueue, target_cpu);
-@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
+@@ -444,7 +444,7 @@ static struct parallel_data *padata_allo
  	padata_init_pqueues(pd);
  	padata_init_squeues(pd);
  	setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
@@ -61486,11 +58203,10 @@ index 7510194..8d6863d 100644
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff --git a/kernel/panic.c b/kernel/panic.c
-index 991bb87..ae5f9be 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -369,7 +369,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
+diff -urNp linux-3.0.3/kernel/panic.c linux-3.0.3/kernel/panic.c
+--- linux-3.0.3/kernel/panic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/panic.c	2011-08-23 21:48:14.000000000 -0400
+@@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
  	const char *board;
  
  	printk(KERN_WARNING "------------[ cut here ]------------\n");
@@ -61509,94 +58225,9 @@ index 991bb87..ae5f9be 100644
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff --git a/kernel/perf_event.c b/kernel/perf_event.c
-index b2536bd..c7789c9 100644
---- a/kernel/perf_event.c
-+++ b/kernel/perf_event.c
-@@ -70,7 +70,7 @@ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free'
-  */
- int sysctl_perf_event_sample_rate __read_mostly = 100000;
- 
--static atomic64_t perf_event_id;
-+static atomic64_unchecked_t perf_event_id;
- 
- static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
- 			      enum event_type_t event_type);
-@@ -1923,7 +1923,7 @@ static void __perf_event_read(void *info)
- 
- static inline u64 perf_event_count(struct perf_event *event)
- {
--	return local64_read(&event->count) + atomic64_read(&event->child_count);
-+	return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
- }
- 
- static u64 perf_event_read(struct perf_event *event)
-@@ -2442,9 +2442,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
- 	mutex_lock(&event->child_mutex);
- 	total += perf_event_read(event);
- 	*enabled += event->total_time_enabled +
--			atomic64_read(&event->child_total_time_enabled);
-+			atomic64_read_unchecked(&event->child_total_time_enabled);
- 	*running += event->total_time_running +
--			atomic64_read(&event->child_total_time_running);
-+			atomic64_read_unchecked(&event->child_total_time_running);
- 
- 	list_for_each_entry(child, &event->child_list, child_list) {
- 		total += perf_event_read(child);
-@@ -2807,10 +2807,10 @@ void perf_event_update_userpage(struct perf_event *event)
- 		userpg->offset -= local64_read(&event->hw.prev_count);
- 
- 	userpg->time_enabled = event->total_time_enabled +
--			atomic64_read(&event->child_total_time_enabled);
-+			atomic64_read_unchecked(&event->child_total_time_enabled);
- 
- 	userpg->time_running = event->total_time_running +
--			atomic64_read(&event->child_total_time_running);
-+			atomic64_read_unchecked(&event->child_total_time_running);
- 
- 	barrier();
- 	++userpg->lock;
-@@ -3607,11 +3607,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
- 	values[n++] = perf_event_count(event);
- 	if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
- 		values[n++] = enabled +
--			atomic64_read(&event->child_total_time_enabled);
-+			atomic64_read_unchecked(&event->child_total_time_enabled);
- 	}
- 	if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
- 		values[n++] = running +
--			atomic64_read(&event->child_total_time_running);
-+			atomic64_read_unchecked(&event->child_total_time_running);
- 	}
- 	if (read_format & PERF_FORMAT_ID)
- 		values[n++] = primary_event_id(event);
-@@ -5597,7 +5597,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
- 	event->parent		= parent_event;
- 
- 	event->ns		= get_pid_ns(current->nsproxy->pid_ns);
--	event->id		= atomic64_inc_return(&perf_event_id);
-+	event->id		= atomic64_inc_return_unchecked(&perf_event_id);
- 
- 	event->state		= PERF_EVENT_STATE_INACTIVE;
- 
-@@ -6095,10 +6095,10 @@ static void sync_child_event(struct perf_event *child_event,
- 	/*
- 	 * Add back the child's count to the parent's count:
- 	 */
--	atomic64_add(child_val, &parent_event->child_count);
--	atomic64_add(child_event->total_time_enabled,
-+	atomic64_add_unchecked(child_val, &parent_event->child_count);
-+	atomic64_add_unchecked(child_event->total_time_enabled,
- 		     &parent_event->child_total_time_enabled);
--	atomic64_add(child_event->total_time_running,
-+	atomic64_add_unchecked(child_event->total_time_running,
- 		     &parent_event->child_total_time_running);
- 
- 	/*
-diff --git a/kernel/pid.c b/kernel/pid.c
-index 6aeebc2..230c80c 100644
---- a/kernel/pid.c
-+++ b/kernel/pid.c
+diff -urNp linux-3.0.3/kernel/pid.c linux-3.0.3/kernel/pid.c
+--- linux-3.0.3/kernel/pid.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/pid.c	2011-08-23 21:48:14.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -61605,7 +58236,7 @@ index 6aeebc2..230c80c 100644
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
  #include <linux/syscalls.h>
-@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
+@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT
  
  int pid_max = PID_MAX_DEFAULT;
  
@@ -61631,10 +58262,22 @@ index 6aeebc2..230c80c 100644
  }
  
  struct task_struct *find_task_by_vpid(pid_t vnr)
-diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
-index 05bb717..c22d8e8 100644
---- a/kernel/posix-cpu-timers.c
-+++ b/kernel/posix-cpu-timers.c
+@@ -428,6 +436,12 @@ struct task_struct *find_task_by_vpid(pi
+ 	return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
+ }
+ 
++struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
++{
++	rcu_lockdep_assert(rcu_read_lock_held());	
++	return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
++}
++
+ struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
+ {
+ 	struct pid *pid;
+diff -urNp linux-3.0.3/kernel/posix-cpu-timers.c linux-3.0.3/kernel/posix-cpu-timers.c
+--- linux-3.0.3/kernel/posix-cpu-timers.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/posix-cpu-timers.c	2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -61643,28 +58286,116 @@ index 05bb717..c22d8e8 100644
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
-index 93bd2eb..e5f41d5 100644
---- a/kernel/posix-timers.c
-+++ b/kernel/posix-timers.c
-@@ -42,6 +42,7 @@
- #include <linux/compiler.h>
+@@ -1604,14 +1605,14 @@ struct k_clock clock_posix_cpu = {
+ 
+ static __init int init_posix_cpu_timers(void)
+ {
+-	struct k_clock process = {
++	static struct k_clock process = {
+ 		.clock_getres	= process_cpu_clock_getres,
+ 		.clock_get	= process_cpu_clock_get,
+ 		.timer_create	= process_cpu_timer_create,
+ 		.nsleep		= process_cpu_nsleep,
+ 		.nsleep_restart	= process_cpu_nsleep_restart,
+ 	};
+-	struct k_clock thread = {
++	static struct k_clock thread = {
+ 		.clock_getres	= thread_cpu_clock_getres,
+ 		.clock_get	= thread_cpu_clock_get,
+ 		.timer_create	= thread_cpu_timer_create,
+diff -urNp linux-3.0.3/kernel/posix-timers.c linux-3.0.3/kernel/posix-timers.c
+--- linux-3.0.3/kernel/posix-timers.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/posix-timers.c	2011-08-23 21:48:14.000000000 -0400
+@@ -43,6 +43,7 @@
  #include <linux/idr.h>
+ #include <linux/posix-clock.h>
  #include <linux/posix-timers.h>
 +#include <linux/grsecurity.h>
  #include <linux/syscalls.h>
  #include <linux/wait.h>
  #include <linux/workqueue.h>
-@@ -302,6 +303,8 @@ static __init int init_posix_timers(void)
- 		.nsleep = no_nsleep,
+@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
+  *	    which we beg off on and pass to do_sys_settimeofday().
+  */
+ 
+-static struct k_clock posix_clocks[MAX_CLOCKS];
++static struct k_clock *posix_clocks[MAX_CLOCKS];
+ 
+ /*
+  * These ones are defined below.
+@@ -227,7 +228,7 @@ static int posix_get_boottime(const cloc
+  */
+ static __init int init_posix_timers(void)
+ {
+-	struct k_clock clock_realtime = {
++	static struct k_clock clock_realtime = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_clock_realtime_get,
+ 		.clock_set	= posix_clock_realtime_set,
+@@ -239,7 +240,7 @@ static __init int init_posix_timers(void
+ 		.timer_get	= common_timer_get,
+ 		.timer_del	= common_timer_del,
+ 	};
+-	struct k_clock clock_monotonic = {
++	static struct k_clock clock_monotonic = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_ktime_get_ts,
+ 		.nsleep		= common_nsleep,
+@@ -249,19 +250,19 @@ static __init int init_posix_timers(void
+ 		.timer_get	= common_timer_get,
+ 		.timer_del	= common_timer_del,
+ 	};
+-	struct k_clock clock_monotonic_raw = {
++	static struct k_clock clock_monotonic_raw = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_get_monotonic_raw,
+ 	};
+-	struct k_clock clock_realtime_coarse = {
++	static struct k_clock clock_realtime_coarse = {
+ 		.clock_getres	= posix_get_coarse_res,
+ 		.clock_get	= posix_get_realtime_coarse,
+ 	};
+-	struct k_clock clock_monotonic_coarse = {
++	static struct k_clock clock_monotonic_coarse = {
+ 		.clock_getres	= posix_get_coarse_res,
+ 		.clock_get	= posix_get_monotonic_coarse,
+ 	};
+-	struct k_clock clock_boottime = {
++	static struct k_clock clock_boottime = {
+ 		.clock_getres	= hrtimer_get_res,
+ 		.clock_get	= posix_get_boottime,
+ 		.nsleep		= common_nsleep,
+@@ -272,6 +273,8 @@ static __init int init_posix_timers(void
+ 		.timer_del	= common_timer_del,
  	};
  
 +	pax_track_stack();
 +
- 	register_posix_clock(CLOCK_REALTIME, &clock_realtime);
- 	register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
- 	register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
-@@ -955,6 +958,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
+ 	posix_timers_register_clock(CLOCK_REALTIME, &clock_realtime);
+ 	posix_timers_register_clock(CLOCK_MONOTONIC, &clock_monotonic);
+ 	posix_timers_register_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
+@@ -473,7 +476,7 @@ void posix_timers_register_clock(const c
+ 		return;
+ 	}
+ 
+-	posix_clocks[clock_id] = *new_clock;
++	posix_clocks[clock_id] = new_clock;
+ }
+ EXPORT_SYMBOL_GPL(posix_timers_register_clock);
+ 
+@@ -519,9 +522,9 @@ static struct k_clock *clockid_to_kclock
+ 		return (id & CLOCKFD_MASK) == CLOCKFD ?
+ 			&clock_posix_dynamic : &clock_posix_cpu;
+ 
+-	if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
++	if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
+ 		return NULL;
+-	return &posix_clocks[id];
++	return posix_clocks[id];
+ }
+ 
+ static int common_timer_create(struct k_itimer *new_timer)
+@@ -959,6 +962,13 @@ SYSCALL_DEFINE2(clock_settime, const clo
  	if (copy_from_user(&new_tp, tp, sizeof (*tp)))
  		return -EFAULT;
  
@@ -61675,14 +58406,13 @@ index 93bd2eb..e5f41d5 100644
 +	   we hook
 +	*/
 +
- 	return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
+ 	return kc->clock_set(which_clock, &new_tp);
  }
  
-diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
-index d523593..68197a4 100644
---- a/kernel/power/poweroff.c
-+++ b/kernel/power/poweroff.c
-@@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_poweroff_op = {
+diff -urNp linux-3.0.3/kernel/power/poweroff.c linux-3.0.3/kernel/power/poweroff.c
+--- linux-3.0.3/kernel/power/poweroff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/power/poweroff.c	2011-08-23 21:47:56.000000000 -0400
+@@ -37,7 +37,7 @@ static struct sysrq_key_op	sysrq_powerof
  	.enable_mask	= SYSRQ_ENABLE_BOOT,
  };
  
@@ -61691,11 +58421,10 @@ index d523593..68197a4 100644
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff --git a/kernel/power/process.c b/kernel/power/process.c
-index 0cf3a27..5481be4 100644
---- a/kernel/power/process.c
-+++ b/kernel/power/process.c
-@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
+diff -urNp linux-3.0.3/kernel/power/process.c linux-3.0.3/kernel/power/process.c
+--- linux-3.0.3/kernel/power/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/power/process.c	2011-08-23 21:47:56.000000000 -0400
+@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
  	u64 elapsed_csecs64;
  	unsigned int elapsed_csecs;
  	bool wakeup = false;
@@ -61703,7 +58432,7 @@ index 0cf3a27..5481be4 100644
  
  	do_gettimeofday(&start);
  
-@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
+@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_
  
  	while (true) {
  		todo = 0;
@@ -61712,7 +58441,7 @@ index 0cf3a27..5481be4 100644
  		read_lock(&tasklist_lock);
  		do_each_thread(g, p) {
  			if (frozen(p) || !freezable(p))
-@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
+@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_
  			 * try_to_stop() after schedule() in ptrace/signal
  			 * stop sees TIF_FREEZE.
  			 */
@@ -61728,7 +58457,7 @@ index 0cf3a27..5481be4 100644
  		} while_each_thread(g, p);
  		read_unlock(&tasklist_lock);
  
-@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
+@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_
  			todo += wq_busy;
  		}
  
@@ -61737,11 +58466,10 @@ index 0cf3a27..5481be4 100644
  			break;
  
  		if (pm_wakeup_pending()) {
-diff --git a/kernel/printk.c b/kernel/printk.c
-index 3623152..2b2ffcf 100644
---- a/kernel/printk.c
-+++ b/kernel/printk.c
-@@ -279,12 +279,17 @@ static int check_syslog_permissions(int type, bool from_file)
+diff -urNp linux-3.0.3/kernel/printk.c linux-3.0.3/kernel/printk.c
+--- linux-3.0.3/kernel/printk.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/printk.c	2011-08-23 21:48:14.000000000 -0400
+@@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
  
@@ -61760,10 +58488,9 @@ index 3623152..2b2ffcf 100644
  				 "but no CAP_SYSLOG (deprecated).\n");
  			return 0;
  		}
-diff --git a/kernel/profile.c b/kernel/profile.c
-index 66f841b..0983d40 100644
---- a/kernel/profile.c
-+++ b/kernel/profile.c
+diff -urNp linux-3.0.3/kernel/profile.c linux-3.0.3/kernel/profile.c
+--- linux-3.0.3/kernel/profile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/profile.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -61773,7 +58500,7 @@ index 66f841b..0983d40 100644
  static unsigned long prof_len, prof_shift;
  
  int prof_on __read_mostly;
-@@ -283,7 +283,7 @@ static void profile_flip_buffers(void)
+@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
  					hits[i].pc = 0;
  				continue;
  			}
@@ -61782,7 +58509,7 @@ index 66f841b..0983d40 100644
  			hits[i].hits = hits[i].pc = 0;
  		}
  	}
-@@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
+@@ -342,9 +342,9 @@ static void do_profile_hits(int type, vo
  	 * Add the current hit(s) and flush the write-queue out
  	 * to the global buffer:
  	 */
@@ -61794,16 +58521,16 @@ index 66f841b..0983d40 100644
  		hits[i].pc = hits[i].hits = 0;
  	}
  out:
-@@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
- 	if (prof_on != type || !prof_buffer)
- 		return;
+@@ -419,7 +419,7 @@ static void do_profile_hits(int type, vo
+ {
+ 	unsigned long pc;
  	pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
 -	atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
 +	atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
  }
  #endif /* !CONFIG_SMP */
- EXPORT_SYMBOL_GPL(profile_hits);
-@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
+ 
+@@ -517,7 +517,7 @@ read_profile(struct file *file, char __u
  			return -EFAULT;
  		buf++; p++; count--; read++;
  	}
@@ -61812,7 +58539,7 @@ index 66f841b..0983d40 100644
  	if (copy_to_user(buf, (void *)pnt, count))
  		return -EFAULT;
  	read += count;
-@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
+@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file
  	}
  #endif
  	profile_discard_flip_buffers();
@@ -61821,11 +58548,10 @@ index 66f841b..0983d40 100644
  	return count;
  }
  
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 254ad5b..f79e393 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_struct *child, int kill)
+diff -urNp linux-3.0.3/kernel/ptrace.c linux-3.0.3/kernel/ptrace.c
+--- linux-3.0.3/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/ptrace.c	2011-08-23 21:48:14.000000000 -0400
+@@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
  
@@ -61835,29 +58561,28 @@ index 254ad5b..f79e393 100644
  {
  	const struct cred *cred = current_cred(), *tcred;
  
-@@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
- 	     cred->gid != tcred->egid ||
- 	     cred->gid != tcred->sgid ||
- 	     cred->gid != tcred->gid) &&
--	    !capable(CAP_SYS_PTRACE)) {
-+	     ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
-+	      (log && !capable(CAP_SYS_PTRACE)))
-+	) {
- 		rcu_read_unlock();
- 		return -EPERM;
- 	}
-@@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
+@@ -158,7 +159,8 @@ int __ptrace_may_access(struct task_stru
+ 	     cred->gid == tcred->sgid &&
+ 	     cred->gid == tcred->gid))
+ 		goto ok;
+-	if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
++	if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
++	    (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
+ 		goto ok;
+ 	rcu_read_unlock();
+ 	return -EPERM;
+@@ -167,7 +169,9 @@ ok:
  	smp_rmb();
  	if (task->mm)
  		dumpable = get_dumpable(task->mm);
--	if (!dumpable && !capable(CAP_SYS_PTRACE))
+-	if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
 +	if (!dumpable &&
-+	     ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
-+	      (log && !capable(CAP_SYS_PTRACE))))
++		((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
++		 (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
  		return -EPERM;
  
  	return security_ptrace_access_check(task, mode);
-@@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
+@@ -177,7 +181,16 @@ bool ptrace_may_access(struct task_struc
  {
  	int err;
  	task_lock(task);
@@ -61875,7 +58600,7 @@ index 254ad5b..f79e393 100644
  	task_unlock(task);
  	return !err;
  }
-@@ -186,7 +200,7 @@ static int ptrace_attach(struct task_struct *task)
+@@ -205,7 +218,7 @@ static int ptrace_attach(struct task_str
  		goto out;
  
  	task_lock(task);
@@ -61884,16 +58609,16 @@ index 254ad5b..f79e393 100644
  	task_unlock(task);
  	if (retval)
  		goto unlock_creds;
-@@ -199,7 +213,7 @@ static int ptrace_attach(struct task_struct *task)
+@@ -218,7 +231,7 @@ static int ptrace_attach(struct task_str
  		goto unlock_tasklist;
  
  	task->ptrace = PT_PTRACED;
--	if (capable(CAP_SYS_PTRACE))
-+	if (capable_nolog(CAP_SYS_PTRACE))
+-	if (task_ns_capable(task, CAP_SYS_PTRACE))
++	if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
  		task->ptrace |= PT_PTRACE_CAP;
  
  	__ptrace_link(task, current);
-@@ -359,6 +373,8 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+@@ -406,6 +419,8 @@ int ptrace_readdata(struct task_struct *
  {
  	int copied = 0;
  
@@ -61902,7 +58627,7 @@ index 254ad5b..f79e393 100644
  	while (len > 0) {
  		char buf[128];
  		int this_len, retval;
-@@ -370,7 +386,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
+@@ -417,7 +432,7 @@ int ptrace_readdata(struct task_struct *
  				break;
  			return -EIO;
  		}
@@ -61911,7 +58636,7 @@ index 254ad5b..f79e393 100644
  			return -EFAULT;
  		copied += retval;
  		src += retval;
-@@ -384,6 +400,8 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds
+@@ -431,6 +446,8 @@ int ptrace_writedata(struct task_struct 
  {
  	int copied = 0;
  
@@ -61920,7 +58645,7 @@ index 254ad5b..f79e393 100644
  	while (len > 0) {
  		char buf[128];
  		int this_len, retval;
-@@ -566,9 +584,11 @@ int ptrace_request(struct task_struct *child, long request,
+@@ -613,9 +630,11 @@ int ptrace_request(struct task_struct *c
  {
  	int ret = -EIO;
  	siginfo_t siginfo;
@@ -61933,7 +58658,7 @@ index 254ad5b..f79e393 100644
  	switch (request) {
  	case PTRACE_PEEKTEXT:
  	case PTRACE_PEEKDATA:
-@@ -714,14 +734,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
+@@ -761,14 +780,21 @@ SYSCALL_DEFINE4(ptrace, long, request, l
  		goto out;
  	}
  
@@ -61956,7 +58681,7 @@ index 254ad5b..f79e393 100644
  		goto out_put_task_struct;
  	}
  
-@@ -746,7 +773,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
+@@ -793,7 +819,7 @@ int generic_ptrace_peekdata(struct task_
  	copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
  	if (copied != sizeof(tmp))
  		return -EIO;
@@ -61965,7 +58690,7 @@ index 254ad5b..f79e393 100644
  }
  
  int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
-@@ -769,6 +796,8 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
+@@ -816,6 +842,8 @@ int compat_ptrace_request(struct task_st
  	siginfo_t siginfo;
  	int ret;
  
@@ -61974,7 +58699,7 @@ index 254ad5b..f79e393 100644
  	switch (request) {
  	case PTRACE_PEEKTEXT:
  	case PTRACE_PEEKDATA:
-@@ -856,14 +885,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
+@@ -903,14 +931,21 @@ asmlinkage long compat_sys_ptrace(compat
  		goto out;
  	}
  
@@ -61997,11 +58722,10 @@ index 254ad5b..f79e393 100644
  		goto out_put_task_struct;
  	}
  
-diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
-index 89613f9..9a89562 100644
---- a/kernel/rcutorture.c
-+++ b/kernel/rcutorture.c
-@@ -139,12 +139,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
+diff -urNp linux-3.0.3/kernel/rcutorture.c linux-3.0.3/kernel/rcutorture.c
+--- linux-3.0.3/kernel/rcutorture.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/rcutorture.c	2011-08-23 21:47:56.000000000 -0400
+@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
  	{ 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
  	{ 0 };
@@ -62019,8 +58743,8 @@ index 89613f9..9a89562 100644
 +static atomic_unchecked_t n_rcu_torture_error;
  static long n_rcu_torture_boost_ktrerror;
  static long n_rcu_torture_boost_rterror;
- static long n_rcu_torture_boost_allocerror;
-@@ -226,11 +226,11 @@ rcu_torture_alloc(void)
+ static long n_rcu_torture_boost_failure;
+@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
  
  	spin_lock_bh(&rcu_torture_lock);
  	if (list_empty(&rcu_torture_freelist)) {
@@ -62034,7 +58758,7 @@ index 89613f9..9a89562 100644
  	p = rcu_torture_freelist.next;
  	list_del_init(p);
  	spin_unlock_bh(&rcu_torture_lock);
-@@ -243,7 +243,7 @@ rcu_torture_alloc(void)
+@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
  static void
  rcu_torture_free(struct rcu_torture *p)
  {
@@ -62043,7 +58767,7 @@ index 89613f9..9a89562 100644
  	spin_lock_bh(&rcu_torture_lock);
  	list_add_tail(&p->rtort_free, &rcu_torture_freelist);
  	spin_unlock_bh(&rcu_torture_lock);
-@@ -363,7 +363,7 @@ rcu_torture_cb(struct rcu_head *p)
+@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
  	i = rp->rtort_pipe_count;
  	if (i > RCU_TORTURE_PIPE_LEN)
  		i = RCU_TORTURE_PIPE_LEN;
@@ -62052,7 +58776,7 @@ index 89613f9..9a89562 100644
  	if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
  		rp->rtort_mbtest = 0;
  		rcu_torture_free(rp);
-@@ -410,7 +410,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
+@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_fr
  		i = rp->rtort_pipe_count;
  		if (i > RCU_TORTURE_PIPE_LEN)
  			i = RCU_TORTURE_PIPE_LEN;
@@ -62061,7 +58785,7 @@ index 89613f9..9a89562 100644
  		if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
  			rp->rtort_mbtest = 0;
  			list_del(&rp->rtort_free);
-@@ -883,7 +883,7 @@ rcu_torture_writer(void *arg)
+@@ -882,7 +882,7 @@ rcu_torture_writer(void *arg)
  			i = old_rp->rtort_pipe_count;
  			if (i > RCU_TORTURE_PIPE_LEN)
  				i = RCU_TORTURE_PIPE_LEN;
@@ -62070,7 +58794,7 @@ index 89613f9..9a89562 100644
  			old_rp->rtort_pipe_count++;
  			cur_ops->deferred_free(old_rp);
  		}
-@@ -952,7 +952,7 @@ static void rcu_torture_timer(unsigned long unused)
+@@ -951,7 +951,7 @@ static void rcu_torture_timer(unsigned l
  		return;
  	}
  	if (p->rtort_mbtest == 0)
@@ -62079,7 +58803,7 @@ index 89613f9..9a89562 100644
  	spin_lock(&rand_lock);
  	cur_ops->read_delay(&rand);
  	n_rcu_torture_timers++;
-@@ -1014,7 +1014,7 @@ rcu_torture_reader(void *arg)
+@@ -1013,7 +1013,7 @@ rcu_torture_reader(void *arg)
  			continue;
  		}
  		if (p->rtort_mbtest == 0)
@@ -62088,7 +58812,7 @@ index 89613f9..9a89562 100644
  		cur_ops->read_delay(&rand);
  		preempt_disable();
  		pipe_count = p->rtort_pipe_count;
-@@ -1073,10 +1073,10 @@ rcu_torture_printk(char *page)
+@@ -1072,16 +1072,16 @@ rcu_torture_printk(char *page)
  		       rcu_torture_current,
  		       rcu_torture_current_version,
  		       list_empty(&rcu_torture_freelist),
@@ -62102,8 +58826,6 @@ index 89613f9..9a89562 100644
 +		       atomic_read_unchecked(&n_rcu_torture_mberror),
  		       n_rcu_torture_boost_ktrerror,
  		       n_rcu_torture_boost_rterror,
- 		       n_rcu_torture_boost_allocerror,
-@@ -1084,7 +1084,7 @@ rcu_torture_printk(char *page)
  		       n_rcu_torture_boost_failure,
  		       n_rcu_torture_boosts,
  		       n_rcu_torture_timers);
@@ -62111,8 +58833,8 @@ index 89613f9..9a89562 100644
 +	if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
  	    n_rcu_torture_boost_ktrerror != 0 ||
  	    n_rcu_torture_boost_rterror != 0 ||
- 	    n_rcu_torture_boost_allocerror != 0 ||
-@@ -1094,7 +1094,7 @@ rcu_torture_printk(char *page)
+ 	    n_rcu_torture_boost_failure != 0)
+@@ -1089,7 +1089,7 @@ rcu_torture_printk(char *page)
  	cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
  	if (i > 1) {
  		cnt += sprintf(&page[cnt], "!!! ");
@@ -62121,7 +58843,7 @@ index 89613f9..9a89562 100644
  		WARN_ON_ONCE(1);
  	}
  	cnt += sprintf(&page[cnt], "Reader Pipe: ");
-@@ -1108,7 +1108,7 @@ rcu_torture_printk(char *page)
+@@ -1103,7 +1103,7 @@ rcu_torture_printk(char *page)
  	cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
  	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  		cnt += sprintf(&page[cnt], " %d",
@@ -62130,7 +58852,7 @@ index 89613f9..9a89562 100644
  	}
  	cnt += sprintf(&page[cnt], "\n");
  	if (cur_ops->stats)
-@@ -1416,7 +1416,7 @@ rcu_torture_cleanup(void)
+@@ -1412,7 +1412,7 @@ rcu_torture_cleanup(void)
  
  	if (cur_ops->cleanup)
  		cur_ops->cleanup();
@@ -62139,7 +58861,7 @@ index 89613f9..9a89562 100644
  		rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
  	else
  		rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
-@@ -1480,11 +1480,11 @@ rcu_torture_init(void)
+@@ -1476,17 +1476,17 @@ rcu_torture_init(void)
  
  	rcu_torture_current = NULL;
  	rcu_torture_current_version = 0;
@@ -62155,8 +58877,6 @@ index 89613f9..9a89562 100644
 +	atomic_set_unchecked(&n_rcu_torture_error, 0);
  	n_rcu_torture_boost_ktrerror = 0;
  	n_rcu_torture_boost_rterror = 0;
- 	n_rcu_torture_boost_allocerror = 0;
-@@ -1492,7 +1492,7 @@ rcu_torture_init(void)
  	n_rcu_torture_boost_failure = 0;
  	n_rcu_torture_boosts = 0;
  	for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
@@ -62165,24 +58885,22 @@ index 89613f9..9a89562 100644
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff --git a/kernel/rcutree.c b/kernel/rcutree.c
-index dd4aea8..2c20a79 100644
---- a/kernel/rcutree.c
-+++ b/kernel/rcutree.c
-@@ -1389,7 +1389,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
+diff -urNp linux-3.0.3/kernel/rcutree.c linux-3.0.3/kernel/rcutree.c
+--- linux-3.0.3/kernel/rcutree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/rcutree.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1470,7 +1470,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
   */
 -static void rcu_process_callbacks(struct softirq_action *unused)
 +static void rcu_process_callbacks(void)
  {
- 	/*
- 	 * Memory references from any prior RCU read-side critical sections
-diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
-index a363871..6545b35 100644
---- a/kernel/rcutree_plugin.h
-+++ b/kernel/rcutree_plugin.h
-@@ -730,7 +730,7 @@ void synchronize_rcu_expedited(void)
+ 	__rcu_process_callbacks(&rcu_sched_state,
+ 				&__get_cpu_var(rcu_sched_data));
+diff -urNp linux-3.0.3/kernel/rcutree_plugin.h linux-3.0.3/kernel/rcutree_plugin.h
+--- linux-3.0.3/kernel/rcutree_plugin.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/rcutree_plugin.h	2011-08-23 21:47:56.000000000 -0400
+@@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
  
  	/* Clean up and exit. */
  	smp_mb(); /* ensure expedited GP seen before counter increment. */
@@ -62191,7 +58909,7 @@ index a363871..6545b35 100644
  unlock_mb_ret:
  	mutex_unlock(&sync_rcu_preempt_exp_mutex);
  mb_ret:
-@@ -1025,8 +1025,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
+@@ -1774,8 +1774,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expe
  
  #else /* #ifndef CONFIG_SMP */
  
@@ -62202,7 +58920,7 @@ index a363871..6545b35 100644
  
  static int synchronize_sched_expedited_cpu_stop(void *data)
  {
-@@ -1081,7 +1081,7 @@ void synchronize_sched_expedited(void)
+@@ -1830,7 +1830,7 @@ void synchronize_sched_expedited(void)
  	int firstsnap, s, snap, trycount = 0;
  
  	/* Note that atomic_inc_return() implies full memory barrier. */
@@ -62211,7 +58929,7 @@ index a363871..6545b35 100644
  	get_online_cpus();
  
  	/*
-@@ -1102,7 +1102,7 @@ void synchronize_sched_expedited(void)
+@@ -1851,7 +1851,7 @@ void synchronize_sched_expedited(void)
  		}
  
  		/* Check to see if someone else did our work for us. */
@@ -62220,7 +58938,7 @@ index a363871..6545b35 100644
  		if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
  			smp_mb(); /* ensure test happens before caller kfree */
  			return;
-@@ -1117,7 +1117,7 @@ void synchronize_sched_expedited(void)
+@@ -1866,7 +1866,7 @@ void synchronize_sched_expedited(void)
  		 * grace period works for us.
  		 */
  		get_online_cpus();
@@ -62229,7 +58947,7 @@ index a363871..6545b35 100644
  		smp_mb(); /* ensure read is before try_stop_cpus(). */
  	}
  
-@@ -1128,12 +1128,12 @@ void synchronize_sched_expedited(void)
+@@ -1877,12 +1877,12 @@ void synchronize_sched_expedited(void)
  	 * than we did beat us to the punch.
  	 */
  	do {
@@ -62244,11 +58962,10 @@ index a363871..6545b35 100644
  
  	put_online_cpus();
  }
-diff --git a/kernel/relay.c b/kernel/relay.c
-index 859ea5a..096e2fe 100644
---- a/kernel/relay.c
-+++ b/kernel/relay.c
-@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struct file *in,
+diff -urNp linux-3.0.3/kernel/relay.c linux-3.0.3/kernel/relay.c
+--- linux-3.0.3/kernel/relay.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/relay.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
  	};
  	ssize_t ret;
  
@@ -62257,11 +58974,10 @@ index 859ea5a..096e2fe 100644
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
  	if (splice_grow_spd(pipe, &spd))
-diff --git a/kernel/resource.c b/kernel/resource.c
-index 798e2fa..896e9ed 100644
---- a/kernel/resource.c
-+++ b/kernel/resource.c
-@@ -133,8 +133,18 @@ static const struct file_operations proc_iomem_operations = {
+diff -urNp linux-3.0.3/kernel/resource.c linux-3.0.3/kernel/resource.c
+--- linux-3.0.3/kernel/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/resource.c	2011-08-23 21:48:14.000000000 -0400
+@@ -141,8 +141,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
  {
@@ -62280,11 +58996,10 @@ index 798e2fa..896e9ed 100644
  	return 0;
  }
  __initcall(ioresources_init);
-diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
-index 66cb89b..dac7f0d 100644
---- a/kernel/rtmutex-tester.c
-+++ b/kernel/rtmutex-tester.c
-@@ -21,7 +21,7 @@
+diff -urNp linux-3.0.3/kernel/rtmutex-tester.c linux-3.0.3/kernel/rtmutex-tester.c
+--- linux-3.0.3/kernel/rtmutex-tester.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/rtmutex-tester.c	2011-08-23 21:47:56.000000000 -0400
+@@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
  static spinlock_t rttest_lock;
@@ -62293,7 +59008,7 @@ index 66cb89b..dac7f0d 100644
  
  struct test_thread_data {
  	int			opcode;
-@@ -64,7 +64,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_
  
  	case RTTEST_LOCKCONT:
  		td->mutexes[td->opdata] = 1;
@@ -62302,7 +59017,7 @@ index 66cb89b..dac7f0d 100644
  		return 0;
  
  	case RTTEST_RESET:
-@@ -84,7 +84,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_
  		return 0;
  
  	case RTTEST_RESETEVENT:
@@ -62311,7 +59026,7 @@ index 66cb89b..dac7f0d 100644
  		return 0;
  
  	default:
-@@ -101,9 +101,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_
  			return ret;
  
  		td->mutexes[id] = 1;
@@ -62323,7 +59038,7 @@ index 66cb89b..dac7f0d 100644
  		td->mutexes[id] = 4;
  		return 0;
  
-@@ -114,9 +114,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_
  			return ret;
  
  		td->mutexes[id] = 1;
@@ -62335,7 +59050,7 @@ index 66cb89b..dac7f0d 100644
  		td->mutexes[id] = ret ? 0 : 4;
  		return ret ? -EINTR : 0;
  
-@@ -125,9 +125,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
+@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_
  		if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
  			return ret;
  
@@ -62347,7 +59062,7 @@ index 66cb89b..dac7f0d 100644
  		td->mutexes[id] = 0;
  		return 0;
  
-@@ -193,7 +193,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mu
  			break;
  
  		td->mutexes[dat] = 2;
@@ -62355,8 +59070,8 @@ index 66cb89b..dac7f0d 100644
 +		td->event = atomic_add_return_unchecked(1, &rttest_event);
  		break;
  
- 	case RTTEST_LOCKBKL:
-@@ -214,7 +214,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+ 	default:
+@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mu
  			return;
  
  		td->mutexes[dat] = 3;
@@ -62365,7 +59080,7 @@ index 66cb89b..dac7f0d 100644
  		break;
  
  	case RTTEST_LOCKNOWAIT:
-@@ -226,7 +226,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
+@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mu
  			return;
  
  		td->mutexes[dat] = 1;
@@ -62373,25 +59088,32 @@ index 66cb89b..dac7f0d 100644
 +		td->event = atomic_add_return_unchecked(1, &rttest_event);
  		return;
  
- 	case RTTEST_LOCKBKL:
-diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
-index a960481..d373438 100644
---- a/kernel/rtmutex.c
-+++ b/kernel/rtmutex.c
-@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
- 	 */
- 	raw_spin_lock_irqsave(&pendowner->pi_lock, flags);
- 
--	WARN_ON(!pendowner->pi_blocked_on);
-+	BUG_ON(!pendowner->pi_blocked_on);
- 	WARN_ON(pendowner->pi_blocked_on != waiter);
- 	WARN_ON(pendowner->pi_blocked_on->lock != lock);
- 
-diff --git a/kernel/sched.c b/kernel/sched.c
-index c164920..2758d12 100644
---- a/kernel/sched.c
-+++ b/kernel/sched.c
-@@ -3938,6 +3938,8 @@ asmlinkage void __sched schedule(void)
+ 	default:
+diff -urNp linux-3.0.3/kernel/sched_autogroup.c linux-3.0.3/kernel/sched_autogroup.c
+--- linux-3.0.3/kernel/sched_autogroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sched_autogroup.c	2011-08-23 21:47:56.000000000 -0400
+@@ -7,7 +7,7 @@
+ 
+ unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
+ static struct autogroup autogroup_default;
+-static atomic_t autogroup_seq_nr;
++static atomic_unchecked_t autogroup_seq_nr;
+ 
+ static void __init autogroup_init(struct task_struct *init_task)
+ {
+@@ -78,7 +78,7 @@ static inline struct autogroup *autogrou
+ 
+ 	kref_init(&ag->kref);
+ 	init_rwsem(&ag->lock);
+-	ag->id = atomic_inc_return(&autogroup_seq_nr);
++	ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
+ 	ag->tg = tg;
+ #ifdef CONFIG_RT_GROUP_SCHED
+ 	/*
+diff -urNp linux-3.0.3/kernel/sched.c linux-3.0.3/kernel/sched.c
+--- linux-3.0.3/kernel/sched.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sched.c	2011-08-23 21:48:14.000000000 -0400
+@@ -4251,6 +4251,8 @@ asmlinkage void __sched schedule(void)
  	struct rq *rq;
  	int cpu;
  
@@ -62400,38 +59122,7 @@ index c164920..2758d12 100644
  need_resched:
  	preempt_disable();
  	cpu = smp_processor_id();
-@@ -4024,7 +4026,7 @@ EXPORT_SYMBOL(schedule);
-  * Look out! "owner" is an entirely speculative pointer
-  * access and not reliable.
-  */
--int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
-+int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner)
- {
- 	unsigned int cpu;
- 	struct rq *rq;
-@@ -4038,10 +4040,10 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
- 	 * DEBUG_PAGEALLOC could have unmapped it if
- 	 * the mutex owner just released it and exited.
- 	 */
--	if (probe_kernel_address(&owner->cpu, cpu))
-+	if (probe_kernel_address(&task_thread_info(owner)->cpu, cpu))
- 		return 0;
- #else
--	cpu = owner->cpu;
-+	cpu = task_thread_info(owner)->cpu;
- #endif
- 
- 	/*
-@@ -4078,7 +4080,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
- 		/*
- 		 * Is that owner really running on that cpu?
- 		 */
--		if (task_thread_info(rq->curr) != owner || need_resched())
-+		if (rq->curr != owner || need_resched())
- 			return 0;
- 
- 		arch_mutex_cpu_relax();
-@@ -4638,6 +4640,8 @@ int can_nice(const struct task_struct *p, const int nice)
+@@ -4934,6 +4936,8 @@ int can_nice(const struct task_struct *p
  	/* convert nice value [19,-20] to rlimit style value [1,40] */
  	int nice_rlim = 20 - nice;
  
@@ -62440,7 +59131,7 @@ index c164920..2758d12 100644
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -4671,7 +4675,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4967,7 +4971,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	if (nice > 19)
  		nice = 19;
  
@@ -62450,7 +59141,7 @@ index c164920..2758d12 100644
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -4814,6 +4819,7 @@ recheck:
+@@ -5111,6 +5116,7 @@ recheck:
  			unsigned long rlim_rtprio =
  					task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -62458,42 +59149,10 @@ index c164920..2758d12 100644
  			/* can't set/change the rt policy */
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
-@@ -6942,7 +6948,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd)
- 	long power;
- 	int weight;
- 
--	WARN_ON(!sd || !sd->groups);
-+	BUG_ON(!sd || !sd->groups);
- 
- 	if (cpu != group_first_cpu(sd->groups))
- 		return;
-diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
-index 9fb6562..89b0e3f 100644
---- a/kernel/sched_autogroup.c
-+++ b/kernel/sched_autogroup.c
-@@ -7,7 +7,7 @@
- 
- unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
- static struct autogroup autogroup_default;
--static atomic_t autogroup_seq_nr;
-+static atomic_unchecked_t autogroup_seq_nr;
- 
- static void __init autogroup_init(struct task_struct *init_task)
- {
-@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
- 
- 	kref_init(&ag->kref);
- 	init_rwsem(&ag->lock);
--	ag->id = atomic_inc_return(&autogroup_seq_nr);
-+	ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
- 	ag->tg = tg;
- #ifdef CONFIG_RT_GROUP_SCHED
- 	/*
-diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
-index 7406f36..f686a8d 100644
---- a/kernel/sched_fair.c
-+++ b/kernel/sched_fair.c
-@@ -3957,7 +3957,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
+diff -urNp linux-3.0.3/kernel/sched_fair.c linux-3.0.3/kernel/sched_fair.c
+--- linux-3.0.3/kernel/sched_fair.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sched_fair.c	2011-08-23 21:47:56.000000000 -0400
+@@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
   */
@@ -62502,11 +59161,10 @@ index 7406f36..f686a8d 100644
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff --git a/kernel/signal.c b/kernel/signal.c
-index bf11d269..3c34bda 100644
---- a/kernel/signal.c
-+++ b/kernel/signal.c
-@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
+diff -urNp linux-3.0.3/kernel/signal.c linux-3.0.3/kernel/signal.c
+--- linux-3.0.3/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
  
@@ -62521,7 +59179,7 @@ index bf11d269..3c34bda 100644
  {
  	/* Is it explicitly or implicitly ignored? */
  	return handler == SIG_IGN ||
-@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
+@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __us
  static int sig_task_ignored(struct task_struct *t, int sig,
  		int from_ancestor_ns)
  {
@@ -62530,7 +59188,7 @@ index bf11d269..3c34bda 100644
  
  	handler = sig_handler(t, sig);
  
-@@ -243,6 +243,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
+@@ -320,6 +320,9 @@ __sigqueue_alloc(int sig, struct task_st
  	atomic_inc(&user->sigpending);
  	rcu_read_unlock();
  
@@ -62540,7 +59198,7 @@ index bf11d269..3c34bda 100644
  	if (override_rlimit ||
  	    atomic_read(&user->sigpending) <=
  			task_rlimit(t, RLIMIT_SIGPENDING)) {
-@@ -367,7 +370,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
+@@ -444,7 +447,7 @@ flush_signal_handlers(struct task_struct
  
  int unhandled_signal(struct task_struct *tsk, int sig)
  {
@@ -62549,17 +59207,21 @@ index bf11d269..3c34bda 100644
  	if (is_global_init(tsk))
  		return 1;
  	if (handler != SIG_IGN && handler != SIG_DFL)
-@@ -678,6 +681,9 @@ static int check_kill_permission(int sig, struct siginfo *info,
+@@ -770,6 +773,13 @@ static int check_kill_permission(int sig
  		}
  	}
  
-+	if (gr_handle_signal(t, sig))
++	/* allow glibc communication via tgkill to other threads in our
++	   thread group */
++	if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
++	     sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
++	    && gr_handle_signal(t, sig))
 +		return -EPERM;
 +
  	return security_task_kill(t, info, sig, 0);
  }
  
-@@ -1025,7 +1031,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1092,7 +1102,7 @@ __group_send_sig_info(int sig, struct si
  	return send_signal(sig, info, p, 1);
  }
  
@@ -62568,7 +59230,7 @@ index bf11d269..3c34bda 100644
  specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
  {
  	return send_signal(sig, info, t, 0);
-@@ -1062,6 +1068,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1129,6 +1139,7 @@ force_sig_info(int sig, struct siginfo *
  	unsigned long int flags;
  	int ret, blocked, ignored;
  	struct k_sigaction *action;
@@ -62576,7 +59238,7 @@ index bf11d269..3c34bda 100644
  
  	spin_lock_irqsave(&t->sighand->siglock, flags);
  	action = &t->sighand->action[sig-1];
-@@ -1076,9 +1083,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+@@ -1143,9 +1154,18 @@ force_sig_info(int sig, struct siginfo *
  	}
  	if (action->sa.sa_handler == SIG_DFL)
  		t->signal->flags &= ~SIGNAL_UNKILLABLE;
@@ -62595,7 +59257,7 @@ index bf11d269..3c34bda 100644
  	return ret;
  }
  
-@@ -1137,8 +1153,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
+@@ -1212,8 +1232,11 @@ int group_send_sig_info(int sig, struct 
  	ret = check_kill_permission(sig, info, p);
  	rcu_read_unlock();
  
@@ -62608,7 +59270,7 @@ index bf11d269..3c34bda 100644
  
  	return ret;
  }
-@@ -1704,6 +1723,8 @@ void ptrace_notify(int exit_code)
+@@ -1839,6 +1862,8 @@ void ptrace_notify(int exit_code)
  {
  	siginfo_t info;
  
@@ -62617,11 +59279,27 @@ index bf11d269..3c34bda 100644
  	BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
  
  	memset(&info, 0, sizeof info);
-diff --git a/kernel/smp.c b/kernel/smp.c
-index 9545489..11acd39 100644
---- a/kernel/smp.c
-+++ b/kernel/smp.c
-@@ -583,22 +583,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
+@@ -2639,7 +2664,15 @@ do_send_specific(pid_t tgid, pid_t pid, 
+ 	int error = -ESRCH;
+ 
+ 	rcu_read_lock();
+-	p = find_task_by_vpid(pid);
++#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
++	/* allow glibc communication via tgkill to other threads in our
++	   thread group */
++	if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
++	    sig == (SIGRTMIN+1) && tgid == info->si_pid)	    
++		p = find_task_by_vpid_unrestricted(pid);
++	else
++#endif
++		p = find_task_by_vpid(pid);
+ 	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
+ 		error = check_kill_permission(sig, info, p);
+ 		/*
+diff -urNp linux-3.0.3/kernel/smp.c linux-3.0.3/kernel/smp.c
+--- linux-3.0.3/kernel/smp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/smp.c	2011-08-23 21:47:56.000000000 -0400
+@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
  
@@ -62648,28 +59326,18 @@ index 9545489..11acd39 100644
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff --git a/kernel/softirq.c b/kernel/softirq.c
-index 68eb5ef..ffd301d 100644
---- a/kernel/softirq.c
-+++ b/kernel/softirq.c
-@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
+diff -urNp linux-3.0.3/kernel/softirq.c linux-3.0.3/kernel/softirq.c
+--- linux-3.0.3/kernel/softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/softirq.c	2011-08-23 21:47:56.000000000 -0400
+@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
- static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
+ DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
  
 -char *softirq_to_name[NR_SOFTIRQS] = {
 +const char * const softirq_to_name[NR_SOFTIRQS] = {
  	"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
- 	"TASKLET", "SCHED", "HRTIMER",	"RCU"
+ 	"TASKLET", "SCHED", "HRTIMER", "RCU"
  };
-@@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
- 
- asmlinkage void __do_softirq(void)
- {
--	struct softirq_action *h;
-+	const struct softirq_action *h;
- 	__u32 pending;
- 	int max_restart = MAX_SOFTIRQ_RESTART;
- 	int cpu;
 @@ -235,7 +235,7 @@ restart:
  			kstat_incr_softirqs_this_cpu(vec_nr);
  
@@ -62679,16 +59347,21 @@ index 68eb5ef..ffd301d 100644
  			trace_softirq_exit(vec_nr);
  			if (unlikely(prev_count != preempt_count())) {
  				printk(KERN_ERR "huh, entered softirq %u %s %p"
-@@ -365,7 +365,7 @@ void raise_softirq(unsigned int nr)
+@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
  	local_irq_restore(flags);
  }
  
 -void open_softirq(int nr, void (*action)(struct softirq_action *))
 +void open_softirq(int nr, void (*action)(void))
  {
- 	softirq_vec[nr].action = action;
+-	softirq_vec[nr].action = action;
++	pax_open_kernel();
++	*(void **)&softirq_vec[nr].action = action;
++	pax_close_kernel();
  }
-@@ -421,7 +421,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
+ 
+ /*
+@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct 
  
  EXPORT_SYMBOL(__tasklet_hi_schedule_first);
  
@@ -62697,7 +59370,7 @@ index 68eb5ef..ffd301d 100644
  {
  	struct tasklet_struct *list;
  
-@@ -456,7 +456,7 @@ static void tasklet_action(struct softirq_action *a)
+@@ -476,7 +478,7 @@ static void tasklet_action(struct softir
  	}
  }
  
@@ -62706,11 +59379,10 @@ index 68eb5ef..ffd301d 100644
  {
  	struct tasklet_struct *list;
  
-diff --git a/kernel/sys.c b/kernel/sys.c
-index 18da702..eef32e9 100644
---- a/kernel/sys.c
-+++ b/kernel/sys.c
-@@ -136,6 +136,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
+diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
+--- linux-3.0.3/kernel/sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sys.c	2011-08-23 21:48:14.000000000 -0400
+@@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
  	}
@@ -62723,7 +59395,7 @@ index 18da702..eef32e9 100644
  	no_nice = security_task_setnice(p, niceval);
  	if (no_nice) {
  		error = no_nice;
-@@ -517,6 +523,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
+@@ -537,6 +543,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
  			goto error;
  	}
  
@@ -62733,7 +59405,7 @@ index 18da702..eef32e9 100644
  	if (rgid != (gid_t) -1 ||
  	    (egid != (gid_t) -1 && egid != old->gid))
  		new->sgid = new->egid;
-@@ -546,6 +555,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -566,6 +575,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -62741,10 +59413,10 @@ index 18da702..eef32e9 100644
 +	if (gr_check_group_change(gid, gid, gid))
 +		goto error;
 +
- 	if (capable(CAP_SETGID))
+ 	if (nsown_capable(CAP_SETGID))
  		new->gid = new->egid = new->sgid = new->fsgid = gid;
  	else if (gid == old->gid || gid == old->sgid)
-@@ -626,6 +639,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
+@@ -646,6 +659,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
  			goto error;
  	}
  
@@ -62754,7 +59426,7 @@ index 18da702..eef32e9 100644
  	if (new->uid != old->uid) {
  		retval = set_user(new);
  		if (retval < 0)
-@@ -670,6 +686,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -690,6 +706,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
  	old = current_cred();
  
  	retval = -EPERM;
@@ -62764,10 +59436,10 @@ index 18da702..eef32e9 100644
 +	if (gr_check_user_change(uid, uid, uid))
 +		goto error;
 +
- 	if (capable(CAP_SETUID)) {
+ 	if (nsown_capable(CAP_SETUID)) {
  		new->suid = new->uid = uid;
  		if (uid != old->uid) {
-@@ -724,6 +746,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
+@@ -744,6 +766,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
  			goto error;
  	}
  
@@ -62777,7 +59449,7 @@ index 18da702..eef32e9 100644
  	if (ruid != (uid_t) -1) {
  		new->uid = ruid;
  		if (ruid != old->uid) {
-@@ -788,6 +813,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
+@@ -808,6 +833,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
  			goto error;
  	}
  
@@ -62787,7 +59459,7 @@ index 18da702..eef32e9 100644
  	if (rgid != (gid_t) -1)
  		new->gid = rgid;
  	if (egid != (gid_t) -1)
-@@ -834,6 +862,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  	old = current_cred();
  	old_fsuid = old->fsuid;
  
@@ -62796,8 +59468,8 @@ index 18da702..eef32e9 100644
 +
  	if (uid == old->uid  || uid == old->euid  ||
  	    uid == old->suid || uid == old->fsuid ||
- 	    capable(CAP_SETUID)) {
-@@ -844,6 +875,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+ 	    nsown_capable(CAP_SETUID)) {
+@@ -864,6 +895,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
  		}
  	}
  
@@ -62805,10 +59477,10 @@ index 18da702..eef32e9 100644
  	abort_creds(new);
  	return old_fsuid;
  
-@@ -870,12 +902,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -890,12 +922,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
  	if (gid == old->gid  || gid == old->egid  ||
  	    gid == old->sgid || gid == old->fsgid ||
- 	    capable(CAP_SETGID)) {
+ 	    nsown_capable(CAP_SETGID)) {
 +		if (gr_check_group_change(-1, -1, gid))
 +			goto error;
 +
@@ -62822,7 +59494,7 @@ index 18da702..eef32e9 100644
  	abort_creds(new);
  	return old_fsgid;
  
-@@ -1616,7 +1652,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
+@@ -1642,7 +1678,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
  			error = get_dumpable(me->mm);
  			break;
  		case PR_SET_DUMPABLE:
@@ -62831,11 +59503,10 @@ index 18da702..eef32e9 100644
  				error = -EINVAL;
  				break;
  			}
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 443fd20..ee63a78 100644
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -84,6 +84,13 @@
+diff -urNp linux-3.0.3/kernel/sysctl.c linux-3.0.3/kernel/sysctl.c
+--- linux-3.0.3/kernel/sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sysctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -85,6 +85,13 @@
  
  
  #if defined(CONFIG_SYSCTL)
@@ -62849,7 +59520,7 @@ index 443fd20..ee63a78 100644
  
  /* External variables not in a header file. */
  extern int sysctl_overcommit_memory;
-@@ -195,6 +202,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
+@@ -197,6 +204,7 @@ static int sysrq_sysctl_handler(ctl_tabl
  }
  
  #endif
@@ -62857,7 +59528,7 @@ index 443fd20..ee63a78 100644
  
  static struct ctl_table root_table[];
  static struct ctl_table_root sysctl_table_root;
-@@ -224,6 +232,20 @@ extern struct ctl_table epoll_table[];
+@@ -226,6 +234,20 @@ extern struct ctl_table epoll_table[];
  int sysctl_legacy_va_layout;
  #endif
  
@@ -62878,7 +59549,7 @@ index 443fd20..ee63a78 100644
  /* The default sysctl tables: */
  
  static struct ctl_table root_table[] = {
-@@ -270,6 +292,22 @@ static int max_extfrag_threshold = 1000;
+@@ -272,6 +294,22 @@ static int max_extfrag_threshold = 1000;
  #endif
  
  static struct ctl_table kern_table[] = {
@@ -62901,7 +59572,7 @@ index 443fd20..ee63a78 100644
  	{
  		.procname	= "sched_child_runs_first",
  		.data		= &sysctl_sched_child_runs_first,
-@@ -551,7 +589,7 @@ static struct ctl_table kern_table[] = {
+@@ -546,7 +584,7 @@ static struct ctl_table kern_table[] = {
  		.data		= &modprobe_path,
  		.maxlen		= KMOD_PATH_LEN,
  		.mode		= 0644,
@@ -62932,7 +59603,7 @@ index 443fd20..ee63a78 100644
  	{
  		.procname	= "ngroups_max",
  		.data		= &ngroups_max,
-@@ -1187,6 +1229,13 @@ static struct ctl_table vm_table[] = {
+@@ -1205,6 +1247,13 @@ static struct ctl_table vm_table[] = {
  		.proc_handler	= proc_dointvec_minmax,
  		.extra1		= &zero,
  	},
@@ -62946,10 +59617,12 @@ index 443fd20..ee63a78 100644
  #else
  	{
  		.procname	= "nr_trim_pages",
-@@ -1698,6 +1747,16 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
- 	int error;
+@@ -1714,6 +1763,17 @@ static int test_perm(int mode, int op)
+ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
+ {
  	int mode;
- 
++	int error;
++
 +	if (table->parent != NULL && table->parent->procname != NULL &&
 +	   table->procname != NULL &&
 +	    gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
@@ -62959,11 +59632,10 @@ index 443fd20..ee63a78 100644
 +	error = gr_handle_sysctl(table, op);
 +	if (error)
 +		return error;
-+
- 	error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
- 	if (error)
- 		return error;
-@@ -2105,6 +2164,16 @@ int proc_dostring(struct ctl_table *table, int write,
+ 
+ 	if (root->permissions)
+ 		mode = root->permissions(root, current->nsproxy, table);
+@@ -2118,6 +2178,16 @@ int proc_dostring(struct ctl_table *tabl
  			       buffer, lenp, ppos);
  }
  
@@ -62980,7 +59652,7 @@ index 443fd20..ee63a78 100644
  static size_t proc_skip_spaces(char **buf)
  {
  	size_t ret;
-@@ -2210,6 +2279,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
+@@ -2223,6 +2293,8 @@ static int proc_put_long(void __user **b
  	len = strlen(tmp);
  	if (len > *size)
  		len = *size;
@@ -62989,7 +59661,7 @@ index 443fd20..ee63a78 100644
  	if (copy_to_user(*buf, tmp, len))
  		return -EFAULT;
  	*size -= len;
-@@ -2526,8 +2597,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
+@@ -2539,8 +2611,11 @@ static int __do_proc_doulongvec_minmax(v
  			*i = val;
  		} else {
  			val = convdiv * (*i) / convmul;
@@ -63002,7 +59674,7 @@ index 443fd20..ee63a78 100644
  			err = proc_put_long(&buffer, &left, val, false);
  			if (err)
  				break;
-@@ -2922,6 +2996,12 @@ int proc_dostring(struct ctl_table *table, int write,
+@@ -2935,6 +3010,12 @@ int proc_dostring(struct ctl_table *tabl
  	return -ENOSYS;
  }
  
@@ -63015,7 +59687,7 @@ index 443fd20..ee63a78 100644
  int proc_dointvec(struct ctl_table *table, int write,
  		  void __user *buffer, size_t *lenp, loff_t *ppos)
  {
-@@ -2978,6 +3058,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
+@@ -2991,6 +3072,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
  EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
  EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
  EXPORT_SYMBOL(proc_dostring);
@@ -63023,11 +59695,10 @@ index 443fd20..ee63a78 100644
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
-index 10b90d8..30be85a 100644
---- a/kernel/sysctl_check.c
-+++ b/kernel/sysctl_check.c
-@@ -131,6 +131,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
+diff -urNp linux-3.0.3/kernel/sysctl_check.c linux-3.0.3/kernel/sysctl_check.c
+--- linux-3.0.3/kernel/sysctl_check.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/sysctl_check.c	2011-08-23 21:48:14.000000000 -0400
+@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
  				set_fail(&fail, table, "Directory with extra2");
  		} else {
  			if ((table->proc_handler == proc_dostring) ||
@@ -63035,10 +59706,9 @@ index 10b90d8..30be85a 100644
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff --git a/kernel/taskstats.c b/kernel/taskstats.c
-index 3971c6b..24ceb04 100644
---- a/kernel/taskstats.c
-+++ b/kernel/taskstats.c
+diff -urNp linux-3.0.3/kernel/taskstats.c linux-3.0.3/kernel/taskstats.c
+--- linux-3.0.3/kernel/taskstats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/taskstats.c	2011-08-23 21:48:14.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -63052,7 +59722,7 @@ index 3971c6b..24ceb04 100644
  /*
   * Maximum length of a cpumask that can be specified in
   * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
-@@ -549,6 +552,9 @@ err:
+@@ -558,6 +561,9 @@ err:
  
  static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
  {
@@ -63062,27 +59732,22 @@ index 3971c6b..24ceb04 100644
  	if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff --git a/kernel/time.c b/kernel/time.c
-index 3217435..3df434d 100644
---- a/kernel/time.c
-+++ b/kernel/time.c
-@@ -163,6 +163,11 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
- 		return error;
- 
- 	if (tz) {
-+		/* we log in do_settimeofday called below, so don't log twice
-+		*/
-+		if (!tv)
-+			gr_log_timechange();
-+
- 		/* SMP safe, global irq locking makes it work. */
- 		sys_tz = *tz;
- 		update_vsyscall_tz();
-diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
-index 2bb742c..d18e573 100644
---- a/kernel/time/tick-broadcast.c
-+++ b/kernel/time/tick-broadcast.c
-@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
+diff -urNp linux-3.0.3/kernel/time/alarmtimer.c linux-3.0.3/kernel/time/alarmtimer.c
+--- linux-3.0.3/kernel/time/alarmtimer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time/alarmtimer.c	2011-08-23 21:47:56.000000000 -0400
+@@ -685,7 +685,7 @@ static int __init alarmtimer_init(void)
+ {
+ 	int error = 0;
+ 	int i;
+-	struct k_clock alarm_clock = {
++	static struct k_clock alarm_clock = {
+ 		.clock_getres	= alarm_clock_getres,
+ 		.clock_get	= alarm_clock_get,
+ 		.timer_create	= alarm_timer_create,
+diff -urNp linux-3.0.3/kernel/time/tick-broadcast.c linux-3.0.3/kernel/time/tick-broadcast.c
+--- linux-3.0.3/kernel/time/tick-broadcast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time/tick-broadcast.c	2011-08-23 21:47:56.000000000 -0400
+@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
  		 * then clear the broadcast bit.
  		 */
  		if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
@@ -63091,19 +59756,18 @@ index 2bb742c..d18e573 100644
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
-index d27c756..6d69585 100644
---- a/kernel/time/timekeeping.c
-+++ b/kernel/time/timekeeping.c
+diff -urNp linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3/kernel/time/timekeeping.c
+--- linux-3.0.3/kernel/time/timekeeping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time/timekeeping.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
  #include <linux/sched.h>
 +#include <linux/grsecurity.h>
- #include <linux/sysdev.h>
+ #include <linux/syscore_ops.h>
  #include <linux/clocksource.h>
  #include <linux/jiffies.h>
-@@ -361,6 +362,8 @@ int do_settimeofday(struct timespec *tv)
+@@ -361,6 +362,8 @@ int do_settimeofday(const struct timespe
  	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
  		return -EINVAL;
  
@@ -63112,11 +59776,10 @@ index d27c756..6d69585 100644
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
-index 3258455..f35227d 100644
---- a/kernel/time/timer_list.c
-+++ b/kernel/time/timer_list.c
-@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
+diff -urNp linux-3.0.3/kernel/time/timer_list.c linux-3.0.3/kernel/time/timer_list.c
+--- linux-3.0.3/kernel/time/timer_list.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time/timer_list.c	2011-08-23 21:48:14.000000000 -0400
+@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
  {
@@ -63145,7 +59808,7 @@ index 3258455..f35227d 100644
  	SEQ_printf(m, "  .index:      %d\n",
  			base->index);
  	SEQ_printf(m, "  .resolution: %Lu nsecs\n",
-@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
+@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs
  {
  	struct proc_dir_entry *pe;
  
@@ -63157,10 +59820,9 @@ index 3258455..f35227d 100644
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
-index 2f3b585..2425fbe 100644
---- a/kernel/time/timer_stats.c
-+++ b/kernel/time/timer_stats.c
+diff -urNp linux-3.0.3/kernel/time/timer_stats.c linux-3.0.3/kernel/time/timer_stats.c
+--- linux-3.0.3/kernel/time/timer_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time/timer_stats.c	2011-08-23 21:48:14.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -63179,7 +59841,7 @@ index 2f3b585..2425fbe 100644
  }
  
  static struct entry *alloc_entry(void)
-@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
+@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *time
  	if (likely(entry))
  		entry->count++;
  	else
@@ -63188,7 +59850,7 @@ index 2f3b585..2425fbe 100644
  
   out_unlock:
  	raw_spin_unlock_irqrestore(lock, flags);
-@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
+@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *time
  
  static void print_name_offset(struct seq_file *m, unsigned long addr)
  {
@@ -63205,7 +59867,7 @@ index 2f3b585..2425fbe 100644
  }
  
  static int tstats_show(struct seq_file *m, void *v)
-@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
+@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *
  
  	seq_puts(m, "Timer Stats Version: v0.2\n");
  	seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
@@ -63217,7 +59879,7 @@ index 2f3b585..2425fbe 100644
  
  	for (i = 0; i < nr_entries; i++) {
  		entry = entries + i;
-@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
+@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(voi
  {
  	struct proc_dir_entry *pe;
  
@@ -63229,11 +59891,25 @@ index 2f3b585..2425fbe 100644
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff --git a/kernel/timer.c b/kernel/timer.c
-index d645992..2b9748a 100644
---- a/kernel/timer.c
-+++ b/kernel/timer.c
-@@ -1276,7 +1276,7 @@ void update_process_times(int user_tick)
+diff -urNp linux-3.0.3/kernel/time.c linux-3.0.3/kernel/time.c
+--- linux-3.0.3/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/time.c	2011-08-23 21:48:14.000000000 -0400
+@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
+ 		return error;
+ 
+ 	if (tz) {
++		/* we log in do_settimeofday called below, so don't log twice
++		*/
++		if (!tv)
++			gr_log_timechange();
++
+ 		/* SMP safe, global irq locking makes it work. */
+ 		sys_tz = *tz;
+ 		update_vsyscall_tz();
+diff -urNp linux-3.0.3/kernel/timer.c linux-3.0.3/kernel/timer.c
+--- linux-3.0.3/kernel/timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/timer.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
   */
@@ -63242,11 +59918,10 @@ index d645992..2b9748a 100644
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
-index cbafed7..8e41d9d 100644
---- a/kernel/trace/blktrace.c
-+++ b/kernel/trace/blktrace.c
-@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
+diff -urNp linux-3.0.3/kernel/trace/blktrace.c linux-3.0.3/kernel/trace/blktrace.c
+--- linux-3.0.3/kernel/trace/blktrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/blktrace.c	2011-08-23 21:47:56.000000000 -0400
+@@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
  	struct blk_trace *bt = filp->private_data;
  	char buf[16];
  
@@ -63255,7 +59930,7 @@ index cbafed7..8e41d9d 100644
  
  	return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
  }
-@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
+@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(str
  		return 1;
  
  	bt = buf->chan->private_data;
@@ -63264,7 +59939,7 @@ index cbafed7..8e41d9d 100644
  	return 0;
  }
  
-@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
+@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_qu
  
  	bt->dir = dir;
  	bt->dev = dev;
@@ -63273,13 +59948,12 @@ index cbafed7..8e41d9d 100644
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
-index 9803b68..42b944f 100644
---- a/kernel/trace/ftrace.c
-+++ b/kernel/trace/ftrace.c
-@@ -1107,13 +1107,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
- 
- 	ip = rec->ip;
+diff -urNp linux-3.0.3/kernel/trace/ftrace.c linux-3.0.3/kernel/trace/ftrace.c
+--- linux-3.0.3/kernel/trace/ftrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/ftrace.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
+ 	if (unlikely(ftrace_disabled))
+ 		return 0;
  
 +	ret = ftrace_arch_code_modify_prepare();
 +	FTRACE_WARN_ON(ret);
@@ -63290,7 +59964,6 @@ index 9803b68..42b944f 100644
 +	FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
  	if (ret) {
  		ftrace_bug(ret, ip);
- 		rec->flags |= FTRACE_FL_FAILED;
 -		return 0;
  	}
 -	return 1;
@@ -63298,24 +59971,19 @@ index 9803b68..42b944f 100644
  }
  
  /*
-diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
-index bd1c35a..6ee56b4 100644
---- a/kernel/trace/ring_buffer.c
-+++ b/kernel/trace/ring_buffer.c
-@@ -669,7 +669,7 @@ static struct list_head *rb_list_head(struct list_head *list)
-  * the reader page). But if the next page is a header page,
-  * its flags will be non zero.
-  */
--static int inline
-+static inline int
- rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
- 		struct buffer_page *page, struct list_head *list)
- {
-diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
-index dc53ecb..c2ced85 100644
---- a/kernel/trace/trace.c
-+++ b/kernel/trace/trace.c
-@@ -3316,6 +3316,8 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
+@@ -2550,7 +2555,7 @@ static void ftrace_free_entry_rcu(struct
+ 
+ int
+ register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
+-			      void *data)
++				void *data)
+ {
+ 	struct ftrace_func_probe *entry;
+ 	struct ftrace_page *pg;
+diff -urNp linux-3.0.3/kernel/trace/trace.c linux-3.0.3/kernel/trace/trace.c
+--- linux-3.0.3/kernel/trace/trace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace.c	2011-08-23 21:48:14.000000000 -0400
+@@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
  	size_t rem;
  	unsigned int i;
  
@@ -63324,7 +59992,7 @@ index dc53ecb..c2ced85 100644
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -3799,6 +3801,8 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
+@@ -3822,6 +3824,8 @@ tracing_buffers_splice_read(struct file 
  	int entries, size, i;
  	size_t ret;
  
@@ -63333,7 +60001,7 @@ index dc53ecb..c2ced85 100644
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-@@ -3967,10 +3971,9 @@ static const struct file_operations tracing_dyn_info_fops = {
+@@ -3990,10 +3994,9 @@ static const struct file_operations trac
  };
  #endif
  
@@ -63345,7 +60013,7 @@ index dc53ecb..c2ced85 100644
  	static int once;
  
  	if (d_tracer)
-@@ -3990,10 +3993,9 @@ struct dentry *tracing_init_dentry(void)
+@@ -4013,10 +4016,9 @@ struct dentry *tracing_init_dentry(void)
  	return d_tracer;
  }
  
@@ -63357,11 +60025,10 @@ index dc53ecb..c2ced85 100644
  	static int once;
  	struct dentry *d_tracer;
  
-diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
-index 5f499e0..8462a2a 100644
---- a/kernel/trace/trace_events.c
-+++ b/kernel/trace/trace_events.c
-@@ -1240,10 +1240,10 @@ static LIST_HEAD(ftrace_module_file_list);
+diff -urNp linux-3.0.3/kernel/trace/trace_events.c linux-3.0.3/kernel/trace/trace_events.c
+--- linux-3.0.3/kernel/trace/trace_events.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace_events.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
  	struct list_head		list;
  	struct module			*mod;
@@ -63369,17 +60036,47 @@ index 5f499e0..8462a2a 100644
 -	struct file_operations		enable;
 -	struct file_operations		format;
 -	struct file_operations		filter;
-+	struct file_operations		id;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		enable;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		format;	/* cannot be const, see trace_create_file_ops() */
-+	struct file_operations		filter;	/* cannot be const, see trace_create_file_ops() */
  };
  
  static struct ftrace_module_file_ops *
-diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
-index 017fa37..39f50bc 100644
---- a/kernel/trace/trace_mmiotrace.c
-+++ b/kernel/trace/trace_mmiotrace.c
+@@ -1342,17 +1338,12 @@ trace_create_file_ops(struct module *mod
+ 
+ 	file_ops->mod = mod;
+ 
+-	file_ops->id = ftrace_event_id_fops;
+-	file_ops->id.owner = mod;
+-
+-	file_ops->enable = ftrace_enable_fops;
+-	file_ops->enable.owner = mod;
+-
+-	file_ops->filter = ftrace_event_filter_fops;
+-	file_ops->filter.owner = mod;
+-
+-	file_ops->format = ftrace_event_format_fops;
+-	file_ops->format.owner = mod;
++	pax_open_kernel();
++	*(void **)&mod->trace_id.owner = mod;
++	*(void **)&mod->trace_enable.owner = mod;
++	*(void **)&mod->trace_filter.owner = mod;
++	*(void **)&mod->trace_format.owner = mod;
++	pax_close_kernel();
+ 
+ 	list_add(&file_ops->list, &ftrace_module_file_list);
+ 
+@@ -1376,8 +1367,8 @@ static void trace_module_add_events(stru
+ 
+ 	for_each_event(call, start, end) {
+ 		__trace_add_event_call(*call, mod,
+-				       &file_ops->id, &file_ops->enable,
+-				       &file_ops->filter, &file_ops->format);
++				       &mod->trace_id, &mod->trace_enable,
++				       &mod->trace_filter, &mod->trace_format);
+ 	}
+ }
+ 
+diff -urNp linux-3.0.3/kernel/trace/trace_mmiotrace.c linux-3.0.3/kernel/trace/trace_mmiotrace.c
+--- linux-3.0.3/kernel/trace/trace_mmiotrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace_mmiotrace.c	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -63389,7 +60086,7 @@ index 017fa37..39f50bc 100644
  
  static void mmio_reset_data(struct trace_array *tr)
  {
-@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
+@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iter
  
  static unsigned long count_overruns(struct trace_iterator *iter)
  {
@@ -63398,7 +60095,7 @@ index 017fa37..39f50bc 100644
  	unsigned long over = ring_buffer_overruns(iter->tr->buffer);
  
  	if (over > prev_overruns)
-@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
+@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct 
  	event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
  					  sizeof(*entry), 0, pc);
  	if (!event) {
@@ -63407,7 +60104,7 @@ index 017fa37..39f50bc 100644
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
+@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct
  	event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
  					  sizeof(*entry), 0, pc);
  	if (!event) {
@@ -63416,11 +60113,10 @@ index 017fa37..39f50bc 100644
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
-index 02272ba..7915ee4 100644
---- a/kernel/trace/trace_output.c
-+++ b/kernel/trace/trace_output.c
-@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
+diff -urNp linux-3.0.3/kernel/trace/trace_output.c linux-3.0.3/kernel/trace/trace_output.c
+--- linux-3.0.3/kernel/trace/trace_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace_output.c	2011-08-23 21:47:56.000000000 -0400
+@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
  	p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
  	if (!IS_ERR(p)) {
@@ -63429,10 +60125,9 @@ index 02272ba..7915ee4 100644
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
-index 4c5dead..9ea847d 100644
---- a/kernel/trace/trace_stack.c
-+++ b/kernel/trace/trace_stack.c
+diff -urNp linux-3.0.3/kernel/trace/trace_stack.c linux-3.0.3/kernel/trace/trace_stack.c
+--- linux-3.0.3/kernel/trace/trace_stack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace_stack.c	2011-08-23 21:47:56.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -63442,10 +60137,9 @@ index 4c5dead..9ea847d 100644
  		return;
  
  	local_irq_save(flags);
-diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
-index 209b379..7f76423 100644
---- a/kernel/trace/trace_workqueue.c
-+++ b/kernel/trace/trace_workqueue.c
+diff -urNp linux-3.0.3/kernel/trace/trace_workqueue.c linux-3.0.3/kernel/trace/trace_workqueue.c
+--- linux-3.0.3/kernel/trace/trace_workqueue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/kernel/trace/trace_workqueue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
  	int		            cpu;
  	pid_t			    pid;
@@ -63464,7 +60158,7 @@ index 209b379..7f76423 100644
  			goto found;
  		}
  	}
-@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
+@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct se
  		tsk = get_pid_task(pid, PIDTYPE_PID);
  		if (tsk) {
  			seq_printf(s, "%3d %6d     %6u       %s\n", cws->cpu,
@@ -63473,23 +60167,10 @@ index 209b379..7f76423 100644
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index d1b5951..b9e45c4 100644
---- a/lib/Kconfig.debug
-+++ b/lib/Kconfig.debug
-@@ -1066,6 +1066,7 @@ config LATENCYTOP
- 	depends on DEBUG_KERNEL
- 	depends on STACKTRACE_SUPPORT
- 	depends on PROC_FS
-+	depends on !GRKERNSEC_HIDESYM
- 	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
- 	select KALLSYMS
- 	select KALLSYMS_ALL
-diff --git a/lib/bug.c b/lib/bug.c
-index 1955209..cbbb2ad 100644
---- a/lib/bug.c
-+++ b/lib/bug.c
-@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+diff -urNp linux-3.0.3/lib/bug.c linux-3.0.3/lib/bug.c
+--- linux-3.0.3/lib/bug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/bug.c	2011-08-23 21:47:56.000000000 -0400
+@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
  		return BUG_TRAP_TYPE_NONE;
  
  	bug = find_bug(bugaddr);
@@ -63498,11 +60179,10 @@ index 1955209..cbbb2ad 100644
  
  	file = NULL;
  	line = 0;
-diff --git a/lib/debugobjects.c b/lib/debugobjects.c
-index deebcc5..6f0a6ef 100644
---- a/lib/debugobjects.c
-+++ b/lib/debugobjects.c
-@@ -281,7 +281,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
+diff -urNp linux-3.0.3/lib/debugobjects.c linux-3.0.3/lib/debugobjects.c
+--- linux-3.0.3/lib/debugobjects.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/debugobjects.c	2011-08-23 21:47:56.000000000 -0400
+@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
  	if (limit > 4)
  		return;
  
@@ -63511,11 +60191,10 @@ index deebcc5..6f0a6ef 100644
  	if (is_on_stack == onstack)
  		return;
  
-diff --git a/lib/dma-debug.c b/lib/dma-debug.c
-index 4bfb047..c143a82 100644
---- a/lib/dma-debug.c
-+++ b/lib/dma-debug.c
-@@ -862,7 +862,7 @@ out:
+diff -urNp linux-3.0.3/lib/dma-debug.c linux-3.0.3/lib/dma-debug.c
+--- linux-3.0.3/lib/dma-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/dma-debug.c	2011-08-23 21:47:56.000000000 -0400
+@@ -870,7 +870,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
  {
@@ -63524,10 +60203,31 @@ index 4bfb047..c143a82 100644
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff --git a/lib/inflate.c b/lib/inflate.c
-index 013a761..c28f3fc 100644
---- a/lib/inflate.c
-+++ b/lib/inflate.c
+diff -urNp linux-3.0.3/lib/extable.c linux-3.0.3/lib/extable.c
+--- linux-3.0.3/lib/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/extable.c	2011-08-23 21:47:56.000000000 -0400
+@@ -13,6 +13,7 @@
+ #include <linux/init.h>
+ #include <linux/sort.h>
+ #include <asm/uaccess.h>
++#include <asm/pgtable.h>
+ 
+ #ifndef ARCH_HAS_SORT_EXTABLE
+ /*
+@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const v
+ void sort_extable(struct exception_table_entry *start,
+ 		  struct exception_table_entry *finish)
+ {
++	pax_open_kernel();
+ 	sort(start, finish - start, sizeof(struct exception_table_entry),
+ 	     cmp_ex, NULL);
++	pax_close_kernel();
+ }
+ 
+ #ifdef CONFIG_MODULES
+diff -urNp linux-3.0.3/lib/inflate.c linux-3.0.3/lib/inflate.c
+--- linux-3.0.3/lib/inflate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/inflate.c	2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ static void free(void *where)
  		malloc_ptr = free_mem_ptr;
  }
@@ -63537,10 +60237,20 @@ index 013a761..c28f3fc 100644
  #define free(a) kfree(a)
  #endif
  
-diff --git a/lib/kref.c b/lib/kref.c
-index 3efb882..8492f4c 100644
---- a/lib/kref.c
-+++ b/lib/kref.c
+diff -urNp linux-3.0.3/lib/Kconfig.debug linux-3.0.3/lib/Kconfig.debug
+--- linux-3.0.3/lib/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/Kconfig.debug	2011-08-23 21:48:14.000000000 -0400
+@@ -1088,6 +1088,7 @@ config LATENCYTOP
+ 	depends on DEBUG_KERNEL
+ 	depends on STACKTRACE_SUPPORT
+ 	depends on PROC_FS
++	depends on !GRKERNSEC_HIDESYM
+ 	select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
+ 	select KALLSYMS
+ 	select KALLSYMS_ALL
+diff -urNp linux-3.0.3/lib/kref.c linux-3.0.3/lib/kref.c
+--- linux-3.0.3/lib/kref.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/kref.c	2011-08-23 21:47:56.000000000 -0400
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -63550,10 +60260,9 @@ index 3efb882..8492f4c 100644
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff --git a/lib/radix-tree.c b/lib/radix-tree.c
-index 7ea2e03..cabda0f 100644
---- a/lib/radix-tree.c
-+++ b/lib/radix-tree.c
+diff -urNp linux-3.0.3/lib/radix-tree.c linux-3.0.3/lib/radix-tree.c
+--- linux-3.0.3/lib/radix-tree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/radix-tree.c	2011-08-23 21:47:56.000000000 -0400
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
  	int nr;
  	struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -63563,10 +60272,9 @@ index 7ea2e03..cabda0f 100644
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff --git a/lib/vsprintf.c b/lib/vsprintf.c
-index f3fd99a..3e0408c 100644
---- a/lib/vsprintf.c
-+++ b/lib/vsprintf.c
+diff -urNp linux-3.0.3/lib/vsprintf.c linux-3.0.3/lib/vsprintf.c
+--- linux-3.0.3/lib/vsprintf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/lib/vsprintf.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -63577,39 +60285,39 @@ index f3fd99a..3e0408c 100644
  #include <stdarg.h>
  #include <linux/module.h>
  #include <linux/types.h>
-@@ -433,7 +436,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
- 	unsigned long value = (unsigned long) ptr;
- #ifdef CONFIG_KALLSYMS
+@@ -435,7 +438,7 @@ char *symbol_string(char *buf, char *end
  	char sym[KSYM_SYMBOL_LEN];
--	if (ext != 'f' && ext != 's')
-+	if (ext != 'f' && ext != 's' && ext != 'a')
+ 	if (ext == 'B')
+ 		sprint_backtrace(sym, value);
+-	else if (ext != 'f' && ext != 's')
++	else if (ext != 'f' && ext != 's' && ext != 'a')
  		sprint_symbol(sym, value);
  	else
  		kallsyms_lookup(value, NULL, NULL, NULL, sym);
-@@ -795,7 +798,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
+@@ -799,7 +802,11 @@ char *uuid_string(char *buf, char *end, 
  	return string(buf, end, uuid, spec);
  }
  
 +#ifdef CONFIG_GRKERNSEC_HIDESYM
-+int kptr_restrict = 2;
++int kptr_restrict __read_mostly = 2;
 +#else
- int kptr_restrict = 1;
+ int kptr_restrict __read_mostly;
 +#endif
  
  /*
   * Show a '%p' thing.  A kernel extension is that the '%p' is followed
-@@ -808,6 +815,8 @@ int kptr_restrict = 1;
-  * - 'f' For simple symbolic function names without offset
+@@ -813,6 +820,8 @@ int kptr_restrict __read_mostly;
   * - 'S' For symbolic direct pointers with offset
   * - 's' For symbolic direct pointers without offset
+  * - 'B' For backtraced symbolic direct pointers with offset
 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
 + * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
   * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
   * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
   * - 'M' For a 6-byte MAC address, it prints the address in the
-@@ -852,12 +861,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -857,12 +866,12 @@ char *pointer(const char *fmt, char *buf
  {
- 	if (!ptr) {
+ 	if (!ptr && *fmt != 'K') {
  		/*
 -		 * Print (null) with the same width as a pointer so it makes
 +		 * Print (nil) with the same width as a pointer so it makes
@@ -63622,7 +60330,7 @@ index f3fd99a..3e0408c 100644
  	}
  
  	switch (*fmt) {
-@@ -867,6 +876,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
+@@ -872,6 +881,13 @@ char *pointer(const char *fmt, char *buf
  		/* Fallthrough */
  	case 'S':
  	case 's':
@@ -63633,10 +60341,10 @@ index f3fd99a..3e0408c 100644
 +#endif
 +	case 'A':
 +	case 'a':
+ 	case 'B':
  		return symbol_string(buf, end, ptr, spec, *fmt);
  	case 'R':
- 	case 'r':
-@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -1631,11 +1647,11 @@ int bstr_printf(char *buf, size_t size, 
  	typeof(type) value;						\
  	if (sizeof(type) == 8) {					\
  		args = PTR_ALIGN(args, sizeof(u32));			\
@@ -63651,7 +60359,7 @@ index f3fd99a..3e0408c 100644
  	}								\
  	args += sizeof(type);						\
  	value;								\
-@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
+@@ -1698,7 +1714,7 @@ int bstr_printf(char *buf, size_t size, 
  		case FORMAT_TYPE_STR: {
  			const char *str_arg = args;
  			args += strlen(str_arg) + 1;
@@ -63660,68 +60368,134 @@ index f3fd99a..3e0408c 100644
  			break;
  		}
  
-diff --git a/localversion-grsec b/localversion-grsec
-new file mode 100644
-index 0000000..7cd6065
---- /dev/null
-+++ b/localversion-grsec
+diff -urNp linux-3.0.3/localversion-grsec linux-3.0.3/localversion-grsec
+--- linux-3.0.3/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/localversion-grsec	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff --git a/mm/Kconfig b/mm/Kconfig
-index e9c0c61..7c31b91 100644
---- a/mm/Kconfig
-+++ b/mm/Kconfig
-@@ -240,7 +240,7 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
- 	depends on MMU
--        default 4096
-+        default 65536
-         help
- 	  This is the portion of low virtual memory which should be protected
- 	  from userspace allocation.  Keeping a user from writing to low pages
-diff --git a/mm/bootmem.c b/mm/bootmem.c
-index 13b0caa..5ad9e8d 100644
---- a/mm/bootmem.c
-+++ b/mm/bootmem.c
-@@ -201,19 +201,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
- unsigned long __init free_all_memory_core_early(int nodeid)
- {
- 	int i;
--	u64 start, end;
-+	u64 start, end, startrange, endrange;
- 	unsigned long count = 0;
--	struct range *range = NULL;
-+	struct range *range = NULL, rangerange = { 0, 0 };
- 	int nr_range;
+diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
+--- linux-3.0.3/Makefile	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/Makefile	2011-08-24 18:10:12.000000000 -0400
+@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
- 	nr_range = get_free_all_memory_range(&range, nodeid);
-+	startrange = __pa(range) >> PAGE_SHIFT;
-+	endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
++HOSTCFLAGS  += $(call cc-option, -Wno-empty-body)
++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks
  
- 	for (i = 0; i < nr_range; i++) {
- 		start = range[i].start;
- 		end = range[i].end;
-+		if (start <= endrange && startrange < end) {
-+			BUG_ON(rangerange.start | rangerange.end);
-+			rangerange = range[i];
-+			continue;
-+		}
- 		count += end - start;
- 		__free_pages_memory(start, end);
- 	}
-+	start = rangerange.start;
-+	end = rangerange.end;
-+	count += end - start;
-+	__free_pages_memory(start, end);
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -365,10 +366,12 @@ LINUXINCLUDE    := -I$(srctree)/arch/$(h
+ KBUILD_CPPFLAGS := -D__KERNEL__
  
- 	return count;
- }
-diff --git a/mm/filemap.c b/mm/filemap.c
-index 83a45d3..54678c3 100644
---- a/mm/filemap.c
-+++ b/mm/filemap.c
-@@ -1664,7 +1664,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
++		   -W -Wno-unused-parameter -Wno-missing-field-initializers \
+ 		   -fno-strict-aliasing -fno-common \
+ 		   -Werror-implicit-function-declaration \
+ 		   -Wno-format-security \
+ 		   -fno-delete-null-pointer-checks
++KBUILD_CFLAGS   += $(call cc-option, -Wno-empty-body)
+ KBUILD_AFLAGS_KERNEL :=
+ KBUILD_CFLAGS_KERNEL :=
+ KBUILD_AFLAGS   := -D__ASSEMBLY__
+@@ -407,10 +410,11 @@ export RCS_TAR_IGNORE := --exclude SCCS 
+ # Rules shared between *config targets and build targets
+ 
+ # Basic helpers built in scripts/
+-PHONY += scripts_basic
+-scripts_basic:
++PHONY += scripts_basic0 scripts_basic gcc-plugins
++scripts_basic0:
+ 	$(Q)$(MAKE) $(build)=scripts/basic
+ 	$(Q)rm -f .tmp_quiet_recordmcount
++scripts_basic: scripts_basic0 gcc-plugins
+ 
+ # To avoid any implicit rule to kick in, define an empty command.
+ scripts/basic/%: scripts_basic ;
+@@ -564,6 +568,24 @@ else
+ KBUILD_CFLAGS	+= -O2
+ endif
+ 
++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh $(HOSTCC)), y)
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
++endif
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
++gcc-plugins:
++	$(Q)$(MAKE) $(build)=tools/gcc
++else
++gcc-plugins:
++ifeq ($(call cc-ifversion, -ge, 0405, y), y)
++	$(error Your gcc installation does not support plugins.  If the necessary headers for plugin support are missing, they should be installed.  On Debian, apt-get install gcc-<ver>-plugin-dev.))
++else
++	$(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
++endif
++	$(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
++endif
++
+ include $(srctree)/arch/$(SRCARCH)/Makefile
+ 
+ ifneq ($(CONFIG_FRAME_WARN),0)
+@@ -708,7 +730,7 @@ export mod_strip_cmd
+ 
+ 
+ ifeq ($(KBUILD_EXTMOD),)
+-core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ 
+ vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
+ 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+@@ -907,6 +929,7 @@ define rule_vmlinux-modpost
+ endef
+ 
+ # vmlinux image - including updated kernel symbols
++vmlinux: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
+ vmlinux: $(vmlinux-lds) $(vmlinux-init) $(vmlinux-main) vmlinux.o $(kallsyms.o) FORCE
+ ifdef CONFIG_HEADERS_CHECK
+ 	$(Q)$(MAKE) -f $(srctree)/Makefile headers_check
+@@ -973,7 +996,7 @@ ifneq ($(KBUILD_SRC),)
+ endif
+ 
+ # prepare2 creates a makefile if using a separate output directory
+-prepare2: prepare3 outputmakefile asm-generic
++prepare2: prepare3 outputmakefile asm-generic gcc-plugins
+ 
+ prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
+                    include/config/auto.conf
+@@ -1087,6 +1110,7 @@ all: modules
+ #	using awk while concatenating to the final file.
+ 
+ PHONY += modules
++modules: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
+ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
+ 	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+ 	@$(kecho) '  Building modules, stage 2.';
+@@ -1198,7 +1222,7 @@ distclean: mrproper
+ 	@find $(srctree) $(RCS_FIND_IGNORE) \
+ 		\( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+ 		-o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
+-		-o -name '.*.rej' -o -size 0 \
++		-o -name '.*.rej' -o -size 0 -o -name '*.so' \
+ 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ 		-type f -print | xargs rm -f
+ 
+@@ -1404,7 +1428,7 @@ clean: $(clean-dirs)
+ 	$(call cmd,rmdirs)
+ 	$(call cmd,rmfiles)
+ 	@find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
+-		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
++		\( -name '*.[oas]' -o -name '*.[ks]o' -o -name '.*.cmd' \
+ 		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
+ 		-o -name '*.symtypes' -o -name 'modules.order' \
+ 		-o -name modules.builtin -o -name '.tmp_*.o.*' \
+diff -urNp linux-3.0.3/mm/filemap.c linux-3.0.3/mm/filemap.c
+--- linux-3.0.3/mm/filemap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/filemap.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
  	struct address_space *mapping = file->f_mapping;
  
  	if (!mapping->a_ops->readpage)
@@ -63730,7 +60504,7 @@ index 83a45d3..54678c3 100644
  	file_accessed(file);
  	vma->vm_ops = &generic_file_vm_ops;
  	vma->vm_flags |= VM_CAN_NONLINEAR;
-@@ -2060,6 +2060,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
+@@ -2169,6 +2169,7 @@ inline int generic_write_checks(struct f
                          *pos = i_size_read(inode);
  
  		if (limit != RLIM_INFINITY) {
@@ -63738,11 +60512,10 @@ index 83a45d3..54678c3 100644
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff --git a/mm/fremap.c b/mm/fremap.c
-index ec520c7..85844a1 100644
---- a/mm/fremap.c
-+++ b/mm/fremap.c
-@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+diff -urNp linux-3.0.3/mm/fremap.c linux-3.0.3/mm/fremap.c
+--- linux-3.0.3/mm/fremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/fremap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
  	vma = find_vma(mm, start);
  
@@ -63754,19 +60527,9 @@ index ec520c7..85844a1 100644
  	/*
  	 * Make sure the vma is shared, that it supports prefaulting,
  	 * and that the remapped range is valid and fully within
-@@ -224,7 +229,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
- 		/*
- 		 * drop PG_Mlocked flag for over-mapped range
- 		 */
--		unsigned int saved_flags = vma->vm_flags;
-+		unsigned long saved_flags = vma->vm_flags;
- 		munlock_vma_pages_range(vma, start, start + size);
- 		vma->vm_flags = saved_flags;
- 	}
-diff --git a/mm/highmem.c b/mm/highmem.c
-index 693394d..fc807e2 100644
---- a/mm/highmem.c
-+++ b/mm/highmem.c
+diff -urNp linux-3.0.3/mm/highmem.c linux-3.0.3/mm/highmem.c
+--- linux-3.0.3/mm/highmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/highmem.c	2011-08-23 21:47:56.000000000 -0400
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
  		 * So no dangers, even with speculative execution.
  		 */
@@ -63792,11 +60555,10 @@ index 693394d..fc807e2 100644
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff --git a/mm/huge_memory.c b/mm/huge_memory.c
-index 56cac93..f8fb029 100644
---- a/mm/huge_memory.c
-+++ b/mm/huge_memory.c
-@@ -698,7 +698,7 @@ out:
+diff -urNp linux-3.0.3/mm/huge_memory.c linux-3.0.3/mm/huge_memory.c
+--- linux-3.0.3/mm/huge_memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/huge_memory.c	2011-08-23 21:47:56.000000000 -0400
+@@ -702,7 +702,7 @@ out:
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
  	 */
@@ -63805,11 +60567,10 @@ index 56cac93..f8fb029 100644
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-diff --git a/mm/hugetlb.c b/mm/hugetlb.c
-index bb0b7c1..3543536 100644
---- a/mm/hugetlb.c
-+++ b/mm/hugetlb.c
-@@ -2333,6 +2333,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
+diff -urNp linux-3.0.3/mm/hugetlb.c linux-3.0.3/mm/hugetlb.c
+--- linux-3.0.3/mm/hugetlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/hugetlb.c	2011-08-23 21:47:56.000000000 -0400
+@@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
  	return 1;
  }
  
@@ -63837,7 +60598,7 @@ index bb0b7c1..3543536 100644
  /*
   * Hugetlb_cow() should be called with page lock of the original hugepage held.
   */
-@@ -2434,6 +2455,11 @@ retry_avoidcopy:
+@@ -2440,6 +2461,11 @@ retry_avoidcopy:
  				make_huge_pte(vma, new_page, 1));
  		page_remove_rmap(old_page);
  		hugepage_add_new_anon_rmap(new_page, vma, address);
@@ -63849,7 +60610,7 @@ index bb0b7c1..3543536 100644
  		/* Make the old page be freed below */
  		new_page = old_page;
  		mmu_notifier_invalidate_range_end(mm,
-@@ -2585,6 +2611,10 @@ retry:
+@@ -2591,6 +2617,10 @@ retry:
  				&& (vma->vm_flags & VM_SHARED)));
  	set_huge_pte_at(mm, address, ptep, new_pte);
  
@@ -63860,7 +60621,7 @@ index bb0b7c1..3543536 100644
  	if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
  		/* Optimization, do the COW without a second fault */
  		ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
-@@ -2614,6 +2644,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2620,6 +2650,10 @@ int hugetlb_fault(struct mm_struct *mm, 
  	static DEFINE_MUTEX(hugetlb_instantiation_mutex);
  	struct hstate *h = hstate_vma(vma);
  
@@ -63871,7 +60632,7 @@ index bb0b7c1..3543536 100644
  	ptep = huge_pte_offset(mm, address);
  	if (ptep) {
  		entry = huge_ptep_get(ptep);
-@@ -2625,6 +2659,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2631,6 +2665,26 @@ int hugetlb_fault(struct mm_struct *mm, 
  			       VM_FAULT_SET_HINDEX(h - hstates);
  	}
  
@@ -63898,11 +60659,33 @@ index bb0b7c1..3543536 100644
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff --git a/mm/kmemleak.c b/mm/kmemleak.c
-index a351b68..b7d6566 100644
---- a/mm/kmemleak.c
-+++ b/mm/kmemleak.c
-@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
+diff -urNp linux-3.0.3/mm/internal.h linux-3.0.3/mm/internal.h
+--- linux-3.0.3/mm/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/internal.h	2011-08-23 21:47:56.000000000 -0400
+@@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
+  * in mm/page_alloc.c
+  */
+ extern void __free_pages_bootmem(struct page *page, unsigned int order);
++extern void free_compound_page(struct page *page);
+ extern void prep_compound_page(struct page *page, unsigned long order);
+ #ifdef CONFIG_MEMORY_FAILURE
+ extern bool is_free_buddy_page(struct page *page);
+diff -urNp linux-3.0.3/mm/Kconfig linux-3.0.3/mm/Kconfig
+--- linux-3.0.3/mm/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -240,7 +240,7 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+         int "Low address space to protect from user allocation"
+ 	depends on MMU
+-        default 4096
++        default 65536
+         help
+ 	  This is the portion of low virtual memory which should be protected
+ 	  from userspace allocation.  Keeping a user from writing to low pages
+diff -urNp linux-3.0.3/mm/kmemleak.c linux-3.0.3/mm/kmemleak.c
+--- linux-3.0.3/mm/kmemleak.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/kmemleak.c	2011-08-23 21:48:14.000000000 -0400
+@@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
  	for (i = 0; i < object->trace_len; i++) {
  		void *ptr = (void *)object->trace[i];
@@ -63911,41 +60694,10 @@ index a351b68..b7d6566 100644
  	}
  }
  
-diff --git a/mm/maccess.c b/mm/maccess.c
-index e2b6f56..4cee182 100644
---- a/mm/maccess.c
-+++ b/mm/maccess.c
-@@ -15,10 +15,10 @@
-  * happens, handle that and return -EFAULT.
-  */
- 
--long __weak probe_kernel_read(void *dst, void *src, size_t size)
-+long __weak probe_kernel_read(void *dst, const void *src, size_t size)
-     __attribute__((alias("__probe_kernel_read")));
- 
--long __probe_kernel_read(void *dst, void *src, size_t size)
-+long __probe_kernel_read(void *dst, const void *src, size_t size)
- {
- 	long ret;
- 	mm_segment_t old_fs = get_fs();
-@@ -43,10 +43,10 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
-  * Safely write to address @dst from the buffer at @src.  If a kernel fault
-  * happens, handle that and return -EFAULT.
-  */
--long __weak probe_kernel_write(void *dst, void *src, size_t size)
-+long __weak probe_kernel_write(void *dst, const void *src, size_t size)
-     __attribute__((alias("__probe_kernel_write")));
- 
--long __probe_kernel_write(void *dst, void *src, size_t size)
-+long __probe_kernel_write(void *dst, const void *src, size_t size)
- {
- 	long ret;
- 	mm_segment_t old_fs = get_fs();
-diff --git a/mm/madvise.c b/mm/madvise.c
-index 2221491..b8ee2d8 100644
---- a/mm/madvise.c
-+++ b/mm/madvise.c
-@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
+diff -urNp linux-3.0.3/mm/madvise.c linux-3.0.3/mm/madvise.c
+--- linux-3.0.3/mm/madvise.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/madvise.c	2011-08-23 21:47:56.000000000 -0400
+@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
  	pgoff_t pgoff;
  	unsigned long new_flags = vma->vm_flags;
  
@@ -63970,7 +60722,7 @@ index 2221491..b8ee2d8 100644
  	vma->vm_flags = new_flags;
  
  out:
-@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_a
  			     struct vm_area_struct ** prev,
  			     unsigned long start, unsigned long end)
  {
@@ -63982,7 +60734,7 @@ index 2221491..b8ee2d8 100644
  	*prev = vma;
  	if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
  		return -EINVAL;
-@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
+@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_a
  		zap_page_range(vma, start, end - start, &details);
  	} else
  		zap_page_range(vma, start, end - start, NULL);
@@ -64004,7 +60756,7 @@ index 2221491..b8ee2d8 100644
  	return 0;
  }
  
-@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
+@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, 
  	if (end < start)
  		goto out;
  
@@ -64021,87 +60773,10 @@ index 2221491..b8ee2d8 100644
  	error = 0;
  	if (end == start)
  		goto out;
-diff --git a/mm/memory-failure.c b/mm/memory-failure.c
-index 0207c2f..cfd4b68 100644
---- a/mm/memory-failure.c
-+++ b/mm/memory-failure.c
-@@ -58,7 +58,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
- 
- int sysctl_memory_failure_recovery __read_mostly = 1;
- 
--atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
- 
- #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
- 
-@@ -1012,7 +1012,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
- 	}
- 
- 	nr_pages = 1 << compound_trans_order(hpage);
--	atomic_long_add(nr_pages, &mce_bad_pages);
-+	atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
- 
- 	/*
- 	 * We need/can do nothing about count=0 pages.
-@@ -1042,7 +1042,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
- 			if (!PageHWPoison(hpage)
- 			    || (hwpoison_filter(p) && TestClearPageHWPoison(p))
- 			    || (p != hpage && TestSetPageHWPoison(hpage))) {
--				atomic_long_sub(nr_pages, &mce_bad_pages);
-+				atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
- 				return 0;
- 			}
- 			set_page_hwpoison_huge_page(hpage);
-@@ -1100,7 +1100,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
- 	}
- 	if (hwpoison_filter(p)) {
- 		if (TestClearPageHWPoison(p))
--			atomic_long_sub(nr_pages, &mce_bad_pages);
-+			atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
- 		unlock_page(hpage);
- 		put_page(hpage);
- 		return 0;
-@@ -1226,7 +1226,7 @@ int unpoison_memory(unsigned long pfn)
- 			return 0;
- 		}
- 		if (TestClearPageHWPoison(p))
--			atomic_long_sub(nr_pages, &mce_bad_pages);
-+			atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
- 		pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
- 		return 0;
- 	}
-@@ -1240,7 +1240,7 @@ int unpoison_memory(unsigned long pfn)
- 	 */
- 	if (TestClearPageHWPoison(page)) {
- 		pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
--		atomic_long_sub(nr_pages, &mce_bad_pages);
-+		atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
- 		freeit = 1;
- 		if (PageHuge(page))
- 			clear_page_hwpoison_huge_page(page);
-@@ -1353,7 +1353,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
- 	}
- done:
- 	if (!PageHWPoison(hpage))
--		atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
-+		atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
- 	set_page_hwpoison_huge_page(hpage);
- 	dequeue_hwpoisoned_huge_page(hpage);
- 	/* keep elevated page count for bad page */
-@@ -1482,7 +1482,7 @@ int soft_offline_page(struct page *page, int flags)
- 		return ret;
- 
- done:
--	atomic_long_add(1, &mce_bad_pages);
-+	atomic_long_add_unchecked(1, &mce_bad_pages);
- 	SetPageHWPoison(page);
- 	/* keep elevated page count for bad page */
- 	return ret;
-diff --git a/mm/memory.c b/mm/memory.c
-index c8fff70..ba759c5 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -259,8 +259,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
+diff -urNp linux-3.0.3/mm/memory.c linux-3.0.3/mm/memory.c
+--- linux-3.0.3/mm/memory.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/mm/memory.c	2011-08-23 21:47:56.000000000 -0400
+@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
  		return;
  
  	pmd = pmd_offset(pud, start);
@@ -64114,7 +60789,7 @@ index c8fff70..ba759c5 100644
  }
  
  static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
-@@ -291,9 +295,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
+@@ -489,9 +493,12 @@ static inline void free_pud_range(struct
  	if (end - 1 > ceiling - 1)
  		return;
  
@@ -64127,7 +60802,7 @@ index c8fff70..ba759c5 100644
  }
  
  /*
-@@ -1410,12 +1417,6 @@ no_page_table:
+@@ -1577,12 +1584,6 @@ no_page_table:
  	return page;
  }
  
@@ -64137,10 +60812,10 @@ index c8fff70..ba759c5 100644
 -	       stack_guard_page_end(vma, addr+PAGE_SIZE);
 -}
 -
- int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- 		     unsigned long start, int nr_pages, unsigned int gup_flags,
- 		     struct page **pages, struct vm_area_struct **vmas,
-@@ -1439,10 +1440,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ /**
+  * __get_user_pages() - pin user pages in memory
+  * @tsk:	task_struct of target task
+@@ -1655,10 +1656,10 @@ int __get_user_pages(struct task_struct 
  			(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
  	i = 0;
  
@@ -64150,10 +60825,10 @@ index c8fff70..ba759c5 100644
  
 -		vma = find_extend_vma(mm, start);
 +		vma = find_vma(mm, start);
- 		if (!vma && in_gate_area(tsk, start)) {
+ 		if (!vma && in_gate_area(mm, start)) {
  			unsigned long pg = start & PAGE_MASK;
  			pgd_t *pgd;
-@@ -1490,7 +1491,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1706,7 +1707,7 @@ int __get_user_pages(struct task_struct 
  			goto next_page;
  		}
  
@@ -64162,7 +60837,7 @@ index c8fff70..ba759c5 100644
  		    (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
  		    !(vm_flags & vma->vm_flags))
  			return i ? : -EFAULT;
-@@ -1517,11 +1518,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+@@ -1733,11 +1734,6 @@ int __get_user_pages(struct task_struct 
  				int ret;
  				unsigned int fault_flags = 0;
  
@@ -64174,7 +60849,7 @@ index c8fff70..ba759c5 100644
  				if (foll_flags & FOLL_WRITE)
  					fault_flags |= FAULT_FLAG_WRITE;
  				if (nonblocking)
-@@ -1582,7 +1578,7 @@ next_page:
+@@ -1811,7 +1807,7 @@ next_page:
  			start += PAGE_SIZE;
  			nr_pages--;
  		} while (nr_pages && start < vma->vm_end);
@@ -64182,8 +60857,8 @@ index c8fff70..ba759c5 100644
 +	}
  	return i;
  }
- 
-@@ -1731,6 +1727,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
+ EXPORT_SYMBOL(__get_user_pages);
+@@ -2018,6 +2014,10 @@ static int insert_page(struct vm_area_st
  	page_add_file_rmap(page);
  	set_pte_at(mm, addr, pte, mk_pte(page, prot));
  
@@ -64194,7 +60869,7 @@ index c8fff70..ba759c5 100644
  	retval = 0;
  	pte_unmap_unlock(pte, ptl);
  	return retval;
-@@ -1765,10 +1765,22 @@ out:
+@@ -2052,10 +2052,22 @@ out:
  int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
  			struct page *page)
  {
@@ -64217,7 +60892,7 @@ index c8fff70..ba759c5 100644
  	vma->vm_flags |= VM_INSERTPAGE;
  	return insert_page(vma, addr, page, vma->vm_page_prot);
  }
-@@ -1854,6 +1866,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
+@@ -2141,6 +2153,7 @@ int vm_insert_mixed(struct vm_area_struc
  			unsigned long pfn)
  {
  	BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
@@ -64225,7 +60900,7 @@ index c8fff70..ba759c5 100644
  
  	if (addr < vma->vm_start || addr >= vma->vm_end)
  		return -EFAULT;
-@@ -2169,6 +2182,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
+@@ -2456,6 +2469,186 @@ static inline void cow_user_page(struct 
  		copy_user_highpage(dst, src, va, vma);
  }
  
@@ -64412,7 +61087,7 @@ index c8fff70..ba759c5 100644
  /*
   * This routine handles present pages, when users try to write
   * to a shared page. It is done by copying the page to a new address
-@@ -2380,6 +2573,12 @@ gotten:
+@@ -2667,6 +2860,12 @@ gotten:
  	 */
  	page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -64425,7 +61100,7 @@ index c8fff70..ba759c5 100644
  		if (old_page) {
  			if (!PageAnon(old_page)) {
  				dec_mm_counter_fast(mm, MM_FILEPAGES);
-@@ -2431,6 +2630,10 @@ gotten:
+@@ -2718,6 +2917,10 @@ gotten:
  			page_remove_rmap(old_page);
  		}
  
@@ -64436,7 +61111,7 @@ index c8fff70..ba759c5 100644
  		/* Free the old page.. */
  		new_page = old_page;
  		ret |= VM_FAULT_WRITE;
-@@ -2841,6 +3044,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2997,6 +3200,11 @@ static int do_swap_page(struct mm_struct
  	swap_free(entry);
  	if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
  		try_to_free_swap(page);
@@ -64448,7 +61123,7 @@ index c8fff70..ba759c5 100644
  	unlock_page(page);
  	if (swapcache) {
  		/*
-@@ -2864,6 +3072,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3020,6 +3228,11 @@ static int do_swap_page(struct mm_struct
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -64460,7 +61135,7 @@ index c8fff70..ba759c5 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  out:
-@@ -2883,40 +3096,6 @@ out_release:
+@@ -3039,40 +3252,6 @@ out_release:
  }
  
  /*
@@ -64483,7 +61158,7 @@ index c8fff70..ba759c5 100644
 -		if (prev && prev->vm_end == address)
 -			return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
 -
--		expand_stack(vma, address - PAGE_SIZE);
+-		expand_downwards(vma, address - PAGE_SIZE);
 -	}
 -	if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
 -		struct vm_area_struct *next = vma->vm_next;
@@ -64501,7 +61176,7 @@ index c8fff70..ba759c5 100644
   * We enter with non-exclusive mmap_sem (to exclude vma changes,
   * but allow concurrent faults), and pte mapped but not yet locked.
   * We return with mmap_sem still held, but pte unmapped and unlocked.
-@@ -2925,27 +3104,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3081,27 +3260,23 @@ static int do_anonymous_page(struct mm_s
  		unsigned long address, pte_t *page_table, pmd_t *pmd,
  		unsigned int flags)
  {
@@ -64534,7 +61209,7 @@ index c8fff70..ba759c5 100644
  	if (unlikely(anon_vma_prepare(vma)))
  		goto oom;
  	page = alloc_zeroed_user_highpage_movable(vma, address);
-@@ -2964,6 +3139,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3120,6 +3295,11 @@ static int do_anonymous_page(struct mm_s
  	if (!pte_none(*page_table))
  		goto release;
  
@@ -64546,7 +61221,7 @@ index c8fff70..ba759c5 100644
  	inc_mm_counter_fast(mm, MM_ANONPAGES);
  	page_add_new_anon_rmap(page, vma, address);
  setpte:
-@@ -2971,6 +3151,12 @@ setpte:
+@@ -3127,6 +3307,12 @@ setpte:
  
  	/* No need to invalidate - it was non-present before */
  	update_mmu_cache(vma, address, page_table);
@@ -64559,7 +61234,7 @@ index c8fff70..ba759c5 100644
  unlock:
  	pte_unmap_unlock(page_table, ptl);
  	return 0;
-@@ -3108,6 +3294,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3264,6 +3450,12 @@ static int __do_fault(struct mm_struct *
  	 */
  	/* Only go through if we didn't race with anybody else... */
  	if (likely(pte_same(*page_table, orig_pte))) {
@@ -64572,7 +61247,7 @@ index c8fff70..ba759c5 100644
  		flush_icache_page(vma, page);
  		entry = mk_pte(page, vma->vm_page_prot);
  		if (flags & FAULT_FLAG_WRITE)
-@@ -3127,6 +3319,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3283,6 +3475,14 @@ static int __do_fault(struct mm_struct *
  
  		/* no need to invalidate: a not-present page won't be cached */
  		update_mmu_cache(vma, address, page_table);
@@ -64587,7 +61262,7 @@ index c8fff70..ba759c5 100644
  	} else {
  		if (charged)
  			mem_cgroup_uncharge_page(page);
-@@ -3274,6 +3474,12 @@ int handle_pte_fault(struct mm_struct *mm,
+@@ -3430,6 +3630,12 @@ int handle_pte_fault(struct mm_struct *m
  		if (flags & FAULT_FLAG_WRITE)
  			flush_tlb_fix_spurious_fault(vma, address);
  	}
@@ -64600,7 +61275,7 @@ index c8fff70..ba759c5 100644
  unlock:
  	pte_unmap_unlock(pte, ptl);
  	return 0;
-@@ -3290,6 +3496,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3446,6 +3652,10 @@ int handle_mm_fault(struct mm_struct *mm
  	pmd_t *pmd;
  	pte_t *pte;
  
@@ -64611,7 +61286,7 @@ index c8fff70..ba759c5 100644
  	__set_current_state(TASK_RUNNING);
  
  	count_vm_event(PGFAULT);
-@@ -3300,6 +3510,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3457,6 +3667,34 @@ int handle_mm_fault(struct mm_struct *mm
  	if (unlikely(is_vm_hugetlb_page(vma)))
  		return hugetlb_fault(mm, vma, address, flags);
  
@@ -64646,7 +61321,7 @@ index c8fff70..ba759c5 100644
  	pgd = pgd_offset(mm, address);
  	pud = pud_alloc(mm, pgd, address);
  	if (!pud)
-@@ -3329,7 +3567,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -3486,7 +3724,7 @@ int handle_mm_fault(struct mm_struct *mm
  	 * run pte_offset_map on the pmd, if an huge pmd could
  	 * materialize from under us from a different thread.
  	 */
@@ -64655,7 +61330,7 @@ index c8fff70..ba759c5 100644
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-@@ -3433,7 +3671,7 @@ static int __init gate_vma_init(void)
+@@ -3590,7 +3828,7 @@ static int __init gate_vma_init(void)
  	gate_vma.vm_start = FIXADDR_USER_START;
  	gate_vma.vm_end = FIXADDR_USER_END;
  	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
@@ -64664,11 +61339,85 @@ index c8fff70..ba759c5 100644
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff --git a/mm/mempolicy.c b/mm/mempolicy.c
-index b53ec99..3c40f15 100644
---- a/mm/mempolicy.c
-+++ b/mm/mempolicy.c
-@@ -643,6 +643,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+diff -urNp linux-3.0.3/mm/memory-failure.c linux-3.0.3/mm/memory-failure.c
+--- linux-3.0.3/mm/memory-failure.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/memory-failure.c	2011-08-23 21:47:56.000000000 -0400
+@@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
+ 
+ int sysctl_memory_failure_recovery __read_mostly = 1;
+ 
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
+ 
+ #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
+ 
+@@ -1008,7 +1008,7 @@ int __memory_failure(unsigned long pfn, 
+ 	}
+ 
+ 	nr_pages = 1 << compound_trans_order(hpage);
+-	atomic_long_add(nr_pages, &mce_bad_pages);
++	atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
+ 
+ 	/*
+ 	 * We need/can do nothing about count=0 pages.
+@@ -1038,7 +1038,7 @@ int __memory_failure(unsigned long pfn, 
+ 			if (!PageHWPoison(hpage)
+ 			    || (hwpoison_filter(p) && TestClearPageHWPoison(p))
+ 			    || (p != hpage && TestSetPageHWPoison(hpage))) {
+-				atomic_long_sub(nr_pages, &mce_bad_pages);
++				atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+ 				return 0;
+ 			}
+ 			set_page_hwpoison_huge_page(hpage);
+@@ -1096,7 +1096,7 @@ int __memory_failure(unsigned long pfn, 
+ 	}
+ 	if (hwpoison_filter(p)) {
+ 		if (TestClearPageHWPoison(p))
+-			atomic_long_sub(nr_pages, &mce_bad_pages);
++			atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+ 		unlock_page(hpage);
+ 		put_page(hpage);
+ 		return 0;
+@@ -1222,7 +1222,7 @@ int unpoison_memory(unsigned long pfn)
+ 			return 0;
+ 		}
+ 		if (TestClearPageHWPoison(p))
+-			atomic_long_sub(nr_pages, &mce_bad_pages);
++			atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+ 		pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
+ 		return 0;
+ 	}
+@@ -1236,7 +1236,7 @@ int unpoison_memory(unsigned long pfn)
+ 	 */
+ 	if (TestClearPageHWPoison(page)) {
+ 		pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
+-		atomic_long_sub(nr_pages, &mce_bad_pages);
++		atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
+ 		freeit = 1;
+ 		if (PageHuge(page))
+ 			clear_page_hwpoison_huge_page(page);
+@@ -1349,7 +1349,7 @@ static int soft_offline_huge_page(struct
+ 	}
+ done:
+ 	if (!PageHWPoison(hpage))
+-		atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
++		atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
+ 	set_page_hwpoison_huge_page(hpage);
+ 	dequeue_hwpoisoned_huge_page(hpage);
+ 	/* keep elevated page count for bad page */
+@@ -1480,7 +1480,7 @@ int soft_offline_page(struct page *page,
+ 		return ret;
+ 
+ done:
+-	atomic_long_add(1, &mce_bad_pages);
++	atomic_long_add_unchecked(1, &mce_bad_pages);
+ 	SetPageHWPoison(page);
+ 	/* keep elevated page count for bad page */
+ 	return ret;
+diff -urNp linux-3.0.3/mm/mempolicy.c linux-3.0.3/mm/mempolicy.c
+--- linux-3.0.3/mm/mempolicy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/mempolicy.c	2011-08-23 21:48:14.000000000 -0400
+@@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct 
  	unsigned long vmstart;
  	unsigned long vmend;
  
@@ -64679,7 +61428,7 @@ index b53ec99..3c40f15 100644
  	vma = find_vma_prev(mm, start, &prev);
  	if (!vma || vma->vm_start > start)
  		return -EFAULT;
-@@ -673,6 +677,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
+@@ -669,6 +673,16 @@ static int mbind_range(struct mm_struct 
  		err = policy_vma(vma, new_pol);
  		if (err)
  			goto out;
@@ -64696,7 +61445,7 @@ index b53ec99..3c40f15 100644
  	}
  
   out:
-@@ -1106,6 +1120,17 @@ static long do_mbind(unsigned long start, unsigned long len,
+@@ -1102,6 +1116,17 @@ static long do_mbind(unsigned long start
  
  	if (end < start)
  		return -EINVAL;
@@ -64714,7 +61463,7 @@ index b53ec99..3c40f15 100644
  	if (end == start)
  		return 0;
  
-@@ -1324,6 +1349,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1320,6 +1345,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
  	if (!mm)
  		goto out;
  
@@ -64729,7 +61478,7 @@ index b53ec99..3c40f15 100644
  	/*
  	 * Check if this process has the right to modify the specified
  	 * process. The right exists if the process has administrative
-@@ -1333,8 +1366,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
+@@ -1329,8 +1362,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pi
  	rcu_read_lock();
  	tcred = __task_cred(task);
  	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -64739,20 +61488,10 @@ index b53ec99..3c40f15 100644
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-@@ -2635,7 +2667,7 @@ int show_numa_map(struct seq_file *m, void *v)
- 
- 	if (file) {
- 		seq_printf(m, " file=");
--		seq_path(m, &file->f_path, "\n\t= ");
-+		seq_path(m, &file->f_path, "\n\t\\= ");
- 	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
- 		seq_printf(m, " heap");
- 	} else if (vma->vm_start <= mm->start_stack &&
-diff --git a/mm/migrate.c b/mm/migrate.c
-index 352de555..57a4dae 100644
---- a/mm/migrate.c
-+++ b/mm/migrate.c
-@@ -1115,6 +1115,8 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task,
+diff -urNp linux-3.0.3/mm/migrate.c linux-3.0.3/mm/migrate.c
+--- linux-3.0.3/mm/migrate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/migrate.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
  	unsigned long chunk_start;
  	int err;
  
@@ -64761,7 +61500,7 @@ index 352de555..57a4dae 100644
  	task_nodes = cpuset_mems_allowed(task);
  
  	err = -ENOMEM;
-@@ -1299,6 +1301,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1308,6 +1310,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
  	if (!mm)
  		return -EINVAL;
  
@@ -64776,7 +61515,7 @@ index 352de555..57a4dae 100644
  	/*
  	 * Check if this process has the right to modify the specified
  	 * process. The right exists if the process has administrative
-@@ -1308,8 +1318,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
+@@ -1317,8 +1327,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 
  	rcu_read_lock();
  	tcred = __task_cred(task);
  	if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
@@ -64786,10 +61525,9 @@ index 352de555..57a4dae 100644
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff --git a/mm/mlock.c b/mm/mlock.c
-index c8e7790..0f0ba37 100644
---- a/mm/mlock.c
-+++ b/mm/mlock.c
+diff -urNp linux-3.0.3/mm/mlock.c linux-3.0.3/mm/mlock.c
+--- linux-3.0.3/mm/mlock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/mlock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -64798,7 +61536,7 @@ index c8e7790..0f0ba37 100644
  #include <linux/sched.h>
  #include <linux/module.h>
  #include <linux/rmap.h>
-@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -377,6 +378,9 @@ static int do_mlock(unsigned long start,
  		return -EINVAL;
  	if (end == start)
  		return 0;
@@ -64808,9 +61546,9 @@ index c8e7790..0f0ba37 100644
  	vma = find_vma_prev(current->mm, start, &prev);
  	if (!vma || vma->vm_start > start)
  		return -ENOMEM;
-@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
+@@ -387,6 +391,11 @@ static int do_mlock(unsigned long start,
  	for (nstart = start ; ; ) {
- 		unsigned int newflags;
+ 		vm_flags_t newflags;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
@@ -64820,7 +61558,7 @@ index c8e7790..0f0ba37 100644
  		/* Here we know that  vma->vm_start <= nstart < vma->vm_end. */
  
  		newflags = vma->vm_flags | VM_LOCKED;
-@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
+@@ -492,6 +501,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, st
  	lock_limit >>= PAGE_SHIFT;
  
  	/* check against resource limits */
@@ -64828,7 +61566,7 @@ index c8e7790..0f0ba37 100644
  	if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
  		error = do_mlock(start, len, 1);
  	up_write(&current->mm->mmap_sem);
-@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
+@@ -515,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, 
  static int do_mlockall(int flags)
  {
  	struct vm_area_struct * vma, * prev = NULL;
@@ -64844,14 +61582,13 @@ index c8e7790..0f0ba37 100644
  		goto out;
  
  	for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
--		unsigned int newflags;
-+		unsigned long newflags;
-+
+ 		vm_flags_t newflags;
+ 
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
 +			break;
 +#endif
- 
++
 +		BUG_ON(vma->vm_end > TASK_SIZE);
  		newflags = vma->vm_flags | VM_LOCKED;
  		if (!(flags & MCL_CURRENT))
@@ -64864,10 +61601,9 @@ index c8e7790..0f0ba37 100644
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 772140c..fd95347 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
+diff -urNp linux-3.0.3/mm/mmap.c linux-3.0.3/mm/mmap.c
+--- linux-3.0.3/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/mmap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -64885,7 +61621,7 @@ index 772140c..fd95347 100644
  static void unmap_region(struct mm_struct *mm,
  		struct vm_area_struct *vma, struct vm_area_struct *prev,
  		unsigned long start, unsigned long end);
-@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
+@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struc
   *		x: (no) no	x: (no) yes	x: (no) yes	x: (yes) yes
   *
   */
@@ -64895,7 +61631,8 @@ index 772140c..fd95347 100644
  	__S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
  };
  
- pgprot_t vm_get_page_prot(unsigned long vm_flags)
+-pgprot_t vm_get_page_prot(unsigned long vm_flags)
++pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
  {
 -	return __pgprot(pgprot_val(protection_map[vm_flags &
 +	pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
@@ -64913,14 +61650,14 @@ index 772140c..fd95347 100644
  }
  EXPORT_SYMBOL(vm_get_page_prot);
  
- int sysctl_overcommit_memory = OVERCOMMIT_GUESS;  /* heuristic overcommit */
- int sysctl_overcommit_ratio = 50;	/* default is 50% */
+ int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS;  /* heuristic overcommit */
+ int sysctl_overcommit_ratio __read_mostly = 50;	/* default is 50% */
  int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
- struct percpu_counter vm_committed_as;
- 
  /*
-@@ -232,6 +252,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
+  * Make sure vm_committed_as in one cacheline and not cacheline shared with
+  * other variables. It can be updated by several CPUs frequently.
+@@ -236,6 +256,7 @@ static struct vm_area_struct *remove_vma
  	struct vm_area_struct *next = vma->vm_next;
  
  	might_sleep();
@@ -64928,7 +61665,7 @@ index 772140c..fd95347 100644
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file) {
-@@ -276,6 +297,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+@@ -280,6 +301,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
  	 * not page aligned -Ram Gupta
  	 */
  	rlim = rlimit(RLIMIT_DATA);
@@ -64936,7 +61673,7 @@ index 772140c..fd95347 100644
  	if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
  			(mm->end_data - mm->start_data) > rlim)
  		goto out;
-@@ -719,6 +741,12 @@ static int
+@@ -697,6 +719,12 @@ static int
  can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -64947,9 +61684,9 @@ index 772140c..fd95347 100644
 +#endif
 +
  	if (is_mergeable_vma(vma, file, vm_flags) &&
- 	    is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
+ 	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		if (vma->vm_pgoff == vm_pgoff)
-@@ -738,6 +766,12 @@ static int
+@@ -716,6 +744,12 @@ static int
  can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
  	struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
  {
@@ -64960,9 +61697,9 @@ index 772140c..fd95347 100644
 +#endif
 +
  	if (is_mergeable_vma(vma, file, vm_flags) &&
- 	    is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
+ 	    is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
  		pgoff_t vm_pglen;
-@@ -780,13 +814,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
+@@ -758,13 +792,20 @@ can_vma_merge_after(struct vm_area_struc
  struct vm_area_struct *vma_merge(struct mm_struct *mm,
  			struct vm_area_struct *prev, unsigned long addr,
  			unsigned long end, unsigned long vm_flags,
@@ -64984,7 +61721,7 @@ index 772140c..fd95347 100644
  	/*
  	 * We later require that vma->vm_flags == vm_flags,
  	 * so this tests vma->vm_flags & VM_SPECIAL, too.
-@@ -802,6 +843,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -780,6 +821,15 @@ struct vm_area_struct *vma_merge(struct 
  	if (next && next->vm_end == end)		/* cases 6, 7, 8 */
  		next = next->vm_next;
  
@@ -65000,7 +61737,7 @@ index 772140c..fd95347 100644
  	/*
  	 * Can it merge with the predecessor?
  	 */
-@@ -821,9 +871,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -799,9 +849,24 @@ struct vm_area_struct *vma_merge(struct 
  							/* cases 1, 6 */
  			err = vma_adjust(prev, prev->vm_start,
  				next->vm_end, prev->vm_pgoff, NULL);
@@ -65026,7 +61763,7 @@ index 772140c..fd95347 100644
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(prev);
-@@ -837,12 +902,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
+@@ -815,12 +880,27 @@ struct vm_area_struct *vma_merge(struct 
   			mpol_equal(policy, vma_policy(next)) &&
  			can_vma_merge_before(next, vm_flags,
  					anon_vma, file, pgoff+pglen)) {
@@ -65056,7 +61793,7 @@ index 772140c..fd95347 100644
  		if (err)
  			return NULL;
  		khugepaged_enter_vma_merge(area);
-@@ -958,14 +1038,11 @@ none:
+@@ -929,14 +1009,11 @@ none:
  void vm_stat_account(struct mm_struct *mm, unsigned long flags,
  						struct file *file, long pages)
  {
@@ -65072,7 +61809,7 @@ index 772140c..fd95347 100644
  		mm->stack_vm += pages;
  	if (flags & (VM_RESERVED|VM_IO))
  		mm->reserved_vm += pages;
-@@ -992,7 +1069,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -963,7 +1040,7 @@ unsigned long do_mmap_pgoff(struct file 
  	 * (the exception is when the underlying filesystem is noexec
  	 *  mounted, in which case we dont add PROT_EXEC.)
  	 */
@@ -65081,7 +61818,7 @@ index 772140c..fd95347 100644
  		if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
  			prot |= PROT_EXEC;
  
-@@ -1018,7 +1095,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -989,7 +1066,7 @@ unsigned long do_mmap_pgoff(struct file 
  	/* Obtain the address to map to. we verify (or select) it and ensure
  	 * that it represents a valid section of the address space.
  	 */
@@ -65090,7 +61827,7 @@ index 772140c..fd95347 100644
  	if (addr & ~PAGE_MASK)
  		return addr;
  
-@@ -1029,6 +1106,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1000,6 +1077,36 @@ unsigned long do_mmap_pgoff(struct file 
  	vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
  			mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
  
@@ -65127,7 +61864,7 @@ index 772140c..fd95347 100644
  	if (flags & MAP_LOCKED)
  		if (!can_do_mlock())
  			return -EPERM;
-@@ -1040,6 +1147,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1011,6 +1118,7 @@ unsigned long do_mmap_pgoff(struct file 
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
@@ -65135,7 +61872,7 @@ index 772140c..fd95347 100644
  		if (locked > lock_limit && !capable(CAP_IPC_LOCK))
  			return -EAGAIN;
  	}
-@@ -1110,6 +1218,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+@@ -1081,6 +1189,9 @@ unsigned long do_mmap_pgoff(struct file 
  	if (error)
  		return error;
  
@@ -65145,12 +61882,8 @@ index 772140c..fd95347 100644
  	return mmap_region(file, addr, len, flags, vm_flags, pgoff);
  }
  EXPORT_SYMBOL(do_mmap_pgoff);
-@@ -1187,10 +1298,10 @@ SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
-  */
- int vma_wants_writenotify(struct vm_area_struct *vma)
- {
--	unsigned int vm_flags = vma->vm_flags;
-+	unsigned long vm_flags = vma->vm_flags;
+@@ -1161,7 +1272,7 @@ int vma_wants_writenotify(struct vm_area
+ 	vm_flags_t vm_flags = vma->vm_flags;
  
  	/* If it was private or non-writable, the write bit is already clear */
 -	if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
@@ -65158,7 +61891,7 @@ index 772140c..fd95347 100644
  		return 0;
  
  	/* The backer wishes to know when pages are first written to? */
-@@ -1239,14 +1350,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1210,14 +1321,24 @@ unsigned long mmap_region(struct file *f
  	unsigned long charged = 0;
  	struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
  
@@ -65185,7 +61918,7 @@ index 772140c..fd95347 100644
  	}
  
  	/* Check against address space limit. */
-@@ -1295,6 +1416,16 @@ munmap_back:
+@@ -1266,6 +1387,16 @@ munmap_back:
  		goto unacct_error;
  	}
  
@@ -65202,7 +61935,7 @@ index 772140c..fd95347 100644
  	vma->vm_mm = mm;
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
-@@ -1318,6 +1449,19 @@ munmap_back:
+@@ -1289,6 +1420,19 @@ munmap_back:
  		error = file->f_op->mmap(file, vma);
  		if (error)
  			goto unmap_and_free_vma;
@@ -65222,7 +61955,7 @@ index 772140c..fd95347 100644
  		if (vm_flags & VM_EXECUTABLE)
  			added_exe_file_vma(mm);
  
-@@ -1353,6 +1497,11 @@ munmap_back:
+@@ -1324,6 +1468,11 @@ munmap_back:
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  	file = vma->vm_file;
  
@@ -65234,7 +61967,7 @@ index 772140c..fd95347 100644
  	/* Once vma denies write, undo our temporary denial count */
  	if (correct_wcount)
  		atomic_inc(&inode->i_writecount);
-@@ -1361,6 +1510,7 @@ out:
+@@ -1332,6 +1481,7 @@ out:
  
  	mm->total_vm += len >> PAGE_SHIFT;
  	vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
@@ -65242,7 +61975,7 @@ index 772140c..fd95347 100644
  	if (vm_flags & VM_LOCKED) {
  		if (!mlock_vma_pages_range(vma, addr, addr + len))
  			mm->locked_vm += (len >> PAGE_SHIFT);
-@@ -1378,6 +1528,12 @@ unmap_and_free_vma:
+@@ -1349,6 +1499,12 @@ unmap_and_free_vma:
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
  	charged = 0;
  free_vma:
@@ -65255,7 +61988,7 @@ index 772140c..fd95347 100644
  	kmem_cache_free(vm_area_cachep, vma);
  unacct_error:
  	if (charged)
-@@ -1385,6 +1541,44 @@ unacct_error:
+@@ -1356,6 +1512,44 @@ unacct_error:
  	return error;
  }
  
@@ -65300,7 +62033,7 @@ index 772140c..fd95347 100644
  /* Get an address range which is currently unmapped.
   * For shmat() with addr=0.
   *
-@@ -1411,18 +1605,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
+@@ -1382,18 +1576,23 @@ arch_get_unmapped_area(struct file *filp
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -65331,7 +62064,7 @@ index 772140c..fd95347 100644
  	}
  
  full_search:
-@@ -1433,34 +1632,40 @@ full_search:
+@@ -1404,34 +1603,40 @@ full_search:
  			 * Start a new search - just in case we missed
  			 * some holes.
  			 */
@@ -65383,7 +62116,7 @@ index 772140c..fd95347 100644
  		mm->free_area_cache = addr;
  		mm->cached_hole_size = ~0UL;
  	}
-@@ -1478,7 +1683,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1449,7 +1654,7 @@ arch_get_unmapped_area_topdown(struct fi
  {
  	struct vm_area_struct *vma;
  	struct mm_struct *mm = current->mm;
@@ -65392,7 +62125,7 @@ index 772140c..fd95347 100644
  
  	/* requested length too big for entire address space */
  	if (len > TASK_SIZE)
-@@ -1487,13 +1692,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1458,13 +1663,18 @@ arch_get_unmapped_area_topdown(struct fi
  	if (flags & MAP_FIXED)
  		return addr;
  
@@ -65415,7 +62148,7 @@ index 772140c..fd95347 100644
  	}
  
  	/* check if free_area_cache is useful for us */
-@@ -1508,7 +1718,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1479,7 +1689,7 @@ arch_get_unmapped_area_topdown(struct fi
  	/* make sure it can fit in the remaining address space */
  	if (addr > len) {
  		vma = find_vma(mm, addr-len);
@@ -65424,7 +62157,7 @@ index 772140c..fd95347 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr-len);
  	}
-@@ -1525,7 +1735,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1496,7 +1706,7 @@ arch_get_unmapped_area_topdown(struct fi
  		 * return with success:
  		 */
  		vma = find_vma(mm, addr);
@@ -65433,7 +62166,7 @@ index 772140c..fd95347 100644
  			/* remember the address as a hint for next time */
  			return (mm->free_area_cache = addr);
  
-@@ -1534,8 +1744,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+@@ -1505,8 +1715,8 @@ arch_get_unmapped_area_topdown(struct fi
   		        mm->cached_hole_size = vma->vm_start - addr;
  
  		/* try just below the current vma->vm_start */
@@ -65444,7 +62177,7 @@ index 772140c..fd95347 100644
  
  bottomup:
  	/*
-@@ -1544,13 +1754,21 @@ bottomup:
+@@ -1515,13 +1725,21 @@ bottomup:
  	 * can happen with large stack limits and large mmap()
  	 * allocations.
  	 */
@@ -65468,7 +62201,7 @@ index 772140c..fd95347 100644
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-@@ -1559,6 +1777,12 @@ bottomup:
+@@ -1530,6 +1748,12 @@ bottomup:
  
  void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
  {
@@ -65481,7 +62214,7 @@ index 772140c..fd95347 100644
  	/*
  	 * Is this a new hole at the highest possible address?
  	 */
-@@ -1566,8 +1790,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
+@@ -1537,8 +1761,10 @@ void arch_unmap_area_topdown(struct mm_s
  		mm->free_area_cache = addr;
  
  	/* dont allow allocations above current base */
@@ -65493,7 +62226,7 @@ index 772140c..fd95347 100644
  }
  
  unsigned long
-@@ -1675,6 +1901,28 @@ out:
+@@ -1646,6 +1872,28 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -65522,7 +62255,7 @@ index 772140c..fd95347 100644
  /*
   * Verify that the stack growth is acceptable and
   * update accounting. This is shared with both the
-@@ -1691,6 +1939,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1662,6 +1910,7 @@ static int acct_stack_growth(struct vm_a
  		return -ENOMEM;
  
  	/* Stack limit test */
@@ -65530,7 +62263,7 @@ index 772140c..fd95347 100644
  	if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
  		return -ENOMEM;
  
-@@ -1701,6 +1950,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1672,6 +1921,7 @@ static int acct_stack_growth(struct vm_a
  		locked = mm->locked_vm + grow;
  		limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
  		limit >>= PAGE_SHIFT;
@@ -65538,7 +62271,7 @@ index 772140c..fd95347 100644
  		if (locked > limit && !capable(CAP_IPC_LOCK))
  			return -ENOMEM;
  	}
-@@ -1731,37 +1981,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
+@@ -1702,37 +1952,48 @@ static int acct_stack_growth(struct vm_a
   * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
   * vma is the last one with address > vma->vm_end.  Have to extend vma.
   */
@@ -65596,7 +62329,7 @@ index 772140c..fd95347 100644
  		unsigned long size, grow;
  
  		size = address - vma->vm_start;
-@@ -1776,6 +2037,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+@@ -1747,6 +2008,8 @@ int expand_upwards(struct vm_area_struct
  			}
  		}
  	}
@@ -65605,7 +62338,7 @@ index 772140c..fd95347 100644
  	vma_unlock_anon_vma(vma);
  	khugepaged_enter_vma_merge(vma);
  	return error;
-@@ -1789,6 +2052,8 @@ static int expand_downwards(struct vm_area_struct *vma,
+@@ -1760,6 +2023,8 @@ int expand_downwards(struct vm_area_stru
  				   unsigned long address)
  {
  	int error;
@@ -65614,7 +62347,7 @@ index 772140c..fd95347 100644
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -1802,6 +2067,15 @@ static int expand_downwards(struct vm_area_struct *vma,
+@@ -1773,6 +2038,15 @@ int expand_downwards(struct vm_area_stru
  	if (error)
  		return error;
  
@@ -65630,7 +62363,7 @@ index 772140c..fd95347 100644
  	vma_lock_anon_vma(vma);
  
  	/*
-@@ -1811,9 +2085,17 @@ static int expand_downwards(struct vm_area_struct *vma,
+@@ -1782,9 +2056,17 @@ int expand_downwards(struct vm_area_stru
  	 */
  
  	/* Somebody else might have raced and expanded it already */
@@ -65649,7 +62382,7 @@ index 772140c..fd95347 100644
  		size = vma->vm_end - address;
  		grow = (vma->vm_start - address) >> PAGE_SHIFT;
  
-@@ -1823,11 +2105,22 @@ static int expand_downwards(struct vm_area_struct *vma,
+@@ -1794,11 +2076,22 @@ int expand_downwards(struct vm_area_stru
  			if (!error) {
  				vma->vm_start = address;
  				vma->vm_pgoff -= grow;
@@ -65672,7 +62405,7 @@ index 772140c..fd95347 100644
  	khugepaged_enter_vma_merge(vma);
  	return error;
  }
-@@ -1902,6 +2195,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -1868,6 +2161,13 @@ static void remove_vma_list(struct mm_st
  	do {
  		long nrpages = vma_pages(vma);
  
@@ -65686,7 +62419,7 @@ index 772140c..fd95347 100644
  		mm->total_vm -= nrpages;
  		vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
  		vma = remove_vma(vma);
-@@ -1947,6 +2247,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1913,6 +2213,16 @@ detach_vmas_to_be_unmapped(struct mm_str
  	insertion_point = (prev ? &prev->vm_next : &mm->mmap);
  	vma->vm_prev = NULL;
  	do {
@@ -65703,7 +62436,7 @@ index 772140c..fd95347 100644
  		rb_erase(&vma->vm_rb, &mm->mm_rb);
  		mm->map_count--;
  		tail_vma = vma;
-@@ -1975,14 +2285,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1941,14 +2251,33 @@ static int __split_vma(struct mm_struct 
  	struct vm_area_struct *new;
  	int err = -ENOMEM;
  
@@ -65737,7 +62470,7 @@ index 772140c..fd95347 100644
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
  
-@@ -1995,6 +2324,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1961,6 +2290,22 @@ static int __split_vma(struct mm_struct 
  		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
  	}
  
@@ -65760,7 +62493,7 @@ index 772140c..fd95347 100644
  	pol = mpol_dup(vma_policy(vma));
  	if (IS_ERR(pol)) {
  		err = PTR_ERR(pol);
-@@ -2020,6 +2365,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1986,6 +2331,42 @@ static int __split_vma(struct mm_struct 
  	else
  		err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
  
@@ -65803,7 +62536,7 @@ index 772140c..fd95347 100644
  	/* Success. */
  	if (!err)
  		return 0;
-@@ -2032,10 +2413,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -1998,10 +2379,18 @@ static int __split_vma(struct mm_struct 
  			removed_exe_file_vma(mm);
  		fput(new->vm_file);
  	}
@@ -65823,7 +62556,7 @@ index 772140c..fd95347 100644
  	kmem_cache_free(vm_area_cachep, new);
   out_err:
  	return err;
-@@ -2048,6 +2437,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
+@@ -2014,6 +2403,15 @@ static int __split_vma(struct mm_struct 
  int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	      unsigned long addr, int new_below)
  {
@@ -65839,7 +62572,7 @@ index 772140c..fd95347 100644
  	if (mm->map_count >= sysctl_max_map_count)
  		return -ENOMEM;
  
-@@ -2059,11 +2457,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2025,11 +2423,30 @@ int split_vma(struct mm_struct *mm, stru
   * work.  This now handles partial unmappings.
   * Jeremy Fitzhardinge <jeremy@goop.org>
   */
@@ -65870,7 +62603,7 @@ index 772140c..fd95347 100644
  	if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
  		return -EINVAL;
  
-@@ -2137,6 +2554,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
+@@ -2104,6 +2521,8 @@ int do_munmap(struct mm_struct *mm, unsi
  	/* Fix up all other VM information */
  	remove_vma_list(mm, vma);
  
@@ -65879,7 +62612,7 @@ index 772140c..fd95347 100644
  	return 0;
  }
  
-@@ -2149,22 +2568,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
+@@ -2116,22 +2535,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a
  
  	profile_munmap(addr);
  
@@ -65908,7 +62641,7 @@ index 772140c..fd95347 100644
  /*
   *  this is really a simplified "do_mmap".  it only handles
   *  anonymous maps.  eventually we may be able to do some
-@@ -2178,6 +2593,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2145,6 +2560,7 @@ unsigned long do_brk(unsigned long addr,
  	struct rb_node ** rb_link, * rb_parent;
  	pgoff_t pgoff = addr >> PAGE_SHIFT;
  	int error;
@@ -65916,7 +62649,7 @@ index 772140c..fd95347 100644
  
  	len = PAGE_ALIGN(len);
  	if (!len)
-@@ -2189,16 +2605,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2156,16 +2572,30 @@ unsigned long do_brk(unsigned long addr,
  
  	flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
  
@@ -65948,7 +62681,7 @@ index 772140c..fd95347 100644
  		locked += mm->locked_vm;
  		lock_limit = rlimit(RLIMIT_MEMLOCK);
  		lock_limit >>= PAGE_SHIFT;
-@@ -2215,22 +2645,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2182,22 +2612,22 @@ unsigned long do_brk(unsigned long addr,
  	/*
  	 * Clear old maps.  this also does some error checking for us
  	 */
@@ -65975,7 +62708,7 @@ index 772140c..fd95347 100644
  		return -ENOMEM;
  
  	/* Can we just expand an old private anonymous mapping? */
-@@ -2244,7 +2674,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2211,7 +2641,7 @@ unsigned long do_brk(unsigned long addr,
  	 */
  	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
  	if (!vma) {
@@ -65984,7 +62717,7 @@ index 772140c..fd95347 100644
  		return -ENOMEM;
  	}
  
-@@ -2258,11 +2688,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
+@@ -2225,11 +2655,12 @@ unsigned long do_brk(unsigned long addr,
  	vma_link(mm, vma, prev, rb_link, rb_parent);
  out:
  	perf_event_mmap(vma);
@@ -65999,7 +62732,7 @@ index 772140c..fd95347 100644
  	return addr;
  }
  
-@@ -2309,8 +2740,10 @@ void exit_mmap(struct mm_struct *mm)
+@@ -2276,8 +2707,10 @@ void exit_mmap(struct mm_struct *mm)
  	 * Walk the list again, actually closing and freeing it,
  	 * with preemption enabled, without holding any MM locks.
  	 */
@@ -66011,7 +62744,7 @@ index 772140c..fd95347 100644
  
  	BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
  }
-@@ -2324,6 +2757,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
+@@ -2291,6 +2724,13 @@ int insert_vm_struct(struct mm_struct * 
  	struct vm_area_struct * __vma, * prev;
  	struct rb_node ** rb_link, * rb_parent;
  
@@ -66025,7 +62758,7 @@ index 772140c..fd95347 100644
  	/*
  	 * The vm_pgoff of a purely anonymous vma should be irrelevant
  	 * until its first write fault, when page's anon_vma and index
-@@ -2346,7 +2786,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
+@@ -2313,7 +2753,22 @@ int insert_vm_struct(struct mm_struct * 
  	if ((vma->vm_flags & VM_ACCOUNT) &&
  	     security_vm_enough_memory_mm(mm, vma_pages(vma)))
  		return -ENOMEM;
@@ -66048,7 +62781,7 @@ index 772140c..fd95347 100644
  	return 0;
  }
  
-@@ -2364,6 +2819,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -2331,6 +2786,8 @@ struct vm_area_struct *copy_vma(struct v
  	struct rb_node **rb_link, *rb_parent;
  	struct mempolicy *pol;
  
@@ -66057,11 +62790,10 @@ index 772140c..fd95347 100644
  	/*
  	 * If anonymous vma has not yet been faulted, update new pgoff
  	 * to match new location, to increase its chance of merging.
-@@ -2413,6 +2870,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
- 	kmem_cache_free(vm_area_cachep, new_vma);
+@@ -2381,6 +2838,39 @@ struct vm_area_struct *copy_vma(struct v
  	return NULL;
  }
-+ 
+ 
 +#ifdef CONFIG_PAX_SEGMEXEC
 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
 +{
@@ -66094,10 +62826,11 @@ index 772140c..fd95347 100644
 +	return 0;
 +}
 +#endif
- 
++
  /*
   * Return true if the calling process may expand its vm space by the passed
-@@ -2424,7 +2914,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
+  * number of pages
+@@ -2391,7 +2881,7 @@ int may_expand_vm(struct mm_struct *mm, 
  	unsigned long lim;
  
  	lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
@@ -66106,7 +62839,7 @@ index 772140c..fd95347 100644
  	if (cur + npages > lim)
  		return 0;
  	return 1;
-@@ -2495,6 +2985,22 @@ int install_special_mapping(struct mm_struct *mm,
+@@ -2462,6 +2952,22 @@ int install_special_mapping(struct mm_st
  	vma->vm_start = addr;
  	vma->vm_end = addr + len;
  
@@ -66129,10 +62862,9 @@ index 772140c..fd95347 100644
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff --git a/mm/mprotect.c b/mm/mprotect.c
-index 5a688a2..27e031c 100644
---- a/mm/mprotect.c
-+++ b/mm/mprotect.c
+diff -urNp linux-3.0.3/mm/mprotect.c linux-3.0.3/mm/mprotect.c
+--- linux-3.0.3/mm/mprotect.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/mprotect.c	2011-08-23 21:48:14.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -66150,7 +62882,7 @@ index 5a688a2..27e031c 100644
  
  #ifndef pgprot_modify
  static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
-@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
+@@ -141,6 +147,48 @@ static void change_protection(struct vm_
  	flush_tlb_range(vma, start, end);
  }
  
@@ -66199,7 +62931,7 @@ index 5a688a2..27e031c 100644
  int
  mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
  	unsigned long start, unsigned long end, unsigned long newflags)
-@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vm
  	int error;
  	int dirty_accountable = 0;
  
@@ -66229,7 +62961,7 @@ index 5a688a2..27e031c 100644
  	/*
  	 * If we make a private mapping writable we increase our commit;
  	 * but (without finer accounting) cannot reduce our commit if we
-@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
+@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vm
  		}
  	}
  
@@ -66295,7 +63027,7 @@ index 5a688a2..27e031c 100644
  
  	if (vma_wants_writenotify(vma)) {
  		vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
-@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  	end = start + len;
  	if (end <= start)
  		return -ENOMEM;
@@ -66313,7 +63045,7 @@ index 5a688a2..27e031c 100644
  	if (!arch_validate_prot(prot))
  		return -EINVAL;
  
-@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  	/*
  	 * Does the application expect PROT_READ to imply PROT_EXEC:
  	 */
@@ -66322,7 +63054,7 @@ index 5a688a2..27e031c 100644
  		prot |= PROT_EXEC;
  
  	vm_flags = calc_vm_prot_bits(prot);
-@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  	if (start > vma->vm_start)
  		prev = vma;
  
@@ -66334,7 +63066,7 @@ index 5a688a2..27e031c 100644
  	for (nstart = start ; ; ) {
  		unsigned long newflags;
  
-@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  
  		/* newflags >> 4 shift VM_MAY% in place of VM_% */
  		if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
@@ -66349,7 +63081,7 @@ index 5a688a2..27e031c 100644
  			error = -EACCES;
  			goto out;
  		}
-@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
+@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long,
  		error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
  		if (error)
  			goto out;
@@ -66359,11 +63091,10 @@ index 5a688a2..27e031c 100644
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff --git a/mm/mremap.c b/mm/mremap.c
-index a7c1f9f..1ce9e38 100644
---- a/mm/mremap.c
-+++ b/mm/mremap.c
-@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
+diff -urNp linux-3.0.3/mm/mremap.c linux-3.0.3/mm/mremap.c
+--- linux-3.0.3/mm/mremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/mremap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
  			continue;
  		pte = ptep_clear_flush(vma, old_addr, old_pte);
  		pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
@@ -66376,7 +63107,7 @@ index a7c1f9f..1ce9e38 100644
  		set_pte_at(mm, new_addr, new_pte, pte);
  	}
  
-@@ -273,6 +279,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
+@@ -272,6 +278,11 @@ static struct vm_area_struct *vma_to_res
  	if (is_vm_hugetlb_page(vma))
  		goto Einval;
  
@@ -66388,7 +63119,7 @@ index a7c1f9f..1ce9e38 100644
  	/* We can't remap across vm area boundaries */
  	if (old_len > vma->vm_end - addr)
  		goto Efault;
-@@ -329,20 +340,25 @@ static unsigned long mremap_to(unsigned long addr,
+@@ -328,20 +339,25 @@ static unsigned long mremap_to(unsigned 
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
  	unsigned long map_flags;
@@ -66419,7 +63150,7 @@ index a7c1f9f..1ce9e38 100644
  		goto out;
  
  	ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
-@@ -414,6 +430,7 @@ unsigned long do_mremap(unsigned long addr,
+@@ -413,6 +429,7 @@ unsigned long do_mremap(unsigned long ad
  	struct vm_area_struct *vma;
  	unsigned long ret = -EINVAL;
  	unsigned long charged = 0;
@@ -66427,7 +63158,7 @@ index a7c1f9f..1ce9e38 100644
  
  	if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
  		goto out;
-@@ -432,6 +449,17 @@ unsigned long do_mremap(unsigned long addr,
+@@ -431,6 +448,17 @@ unsigned long do_mremap(unsigned long ad
  	if (!new_len)
  		goto out;
  
@@ -66445,7 +63176,7 @@ index a7c1f9f..1ce9e38 100644
  	if (flags & MREMAP_FIXED) {
  		if (flags & MREMAP_MAYMOVE)
  			ret = mremap_to(addr, old_len, new_addr, new_len);
-@@ -481,6 +509,7 @@ unsigned long do_mremap(unsigned long addr,
+@@ -480,6 +508,7 @@ unsigned long do_mremap(unsigned long ad
  						   addr + new_len);
  			}
  			ret = addr;
@@ -66453,7 +63184,7 @@ index a7c1f9f..1ce9e38 100644
  			goto out;
  		}
  	}
-@@ -507,7 +536,13 @@ unsigned long do_mremap(unsigned long addr,
+@@ -506,7 +535,13 @@ unsigned long do_mremap(unsigned long ad
  		ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
  		if (ret)
  			goto out;
@@ -66467,11 +63198,46 @@ index a7c1f9f..1ce9e38 100644
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff --git a/mm/nommu.c b/mm/nommu.c
-index f59e142..98fa4cc 100644
---- a/mm/nommu.c
-+++ b/mm/nommu.c
-@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
+diff -urNp linux-3.0.3/mm/nobootmem.c linux-3.0.3/mm/nobootmem.c
+--- linux-3.0.3/mm/nobootmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/nobootmem.c	2011-08-23 21:47:56.000000000 -0400
+@@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
+ unsigned long __init free_all_memory_core_early(int nodeid)
+ {
+ 	int i;
+-	u64 start, end;
++	u64 start, end, startrange, endrange;
+ 	unsigned long count = 0;
+-	struct range *range = NULL;
++	struct range *range = NULL, rangerange = { 0, 0 };
+ 	int nr_range;
+ 
+ 	nr_range = get_free_all_memory_range(&range, nodeid);
++	startrange = __pa(range) >> PAGE_SHIFT;
++	endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
+ 
+ 	for (i = 0; i < nr_range; i++) {
+ 		start = range[i].start;
+ 		end = range[i].end;
++		if (start <= endrange && startrange < end) {
++			BUG_ON(rangerange.start | rangerange.end);
++			rangerange = range[i];
++			continue;
++		}
+ 		count += end - start;
+ 		__free_pages_memory(start, end);
+ 	}
++	start = rangerange.start;
++	end = rangerange.end;
++	count += end - start;
++	__free_pages_memory(start, end);
+ 
+ 	return count;
+ }
+diff -urNp linux-3.0.3/mm/nommu.c linux-3.0.3/mm/nommu.c
+--- linux-3.0.3/mm/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/nommu.c	2011-08-23 21:47:56.000000000 -0400
+@@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
  int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
@@ -66479,7 +63245,7 @@ index f59e142..98fa4cc 100644
  
  atomic_long_t mmap_pages_allocated;
  
-@@ -833,15 +832,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
+@@ -826,15 +825,6 @@ struct vm_area_struct *find_vma(struct m
  EXPORT_SYMBOL(find_vma);
  
  /*
@@ -66495,7 +63261,7 @@ index f59e142..98fa4cc 100644
   * expand a stack to a given address
   * - not supported under NOMMU conditions
   */
-@@ -1563,6 +1553,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -1554,6 +1544,7 @@ int split_vma(struct mm_struct *mm, stru
  
  	/* most fields are the same, copy all, and then fixup */
  	*new = *vma;
@@ -66503,11 +63269,19 @@ index f59e142..98fa4cc 100644
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 493b522..59cbc22 100644
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -644,6 +644,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+diff -urNp linux-3.0.3/mm/page_alloc.c linux-3.0.3/mm/page_alloc.c
+--- linux-3.0.3/mm/page_alloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/page_alloc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -340,7 +340,7 @@ out:
+  * This usage means that zero-order pages may not be compound.
+  */
+ 
+-static void free_compound_page(struct page *page)
++void free_compound_page(struct page *page)
+ {
+ 	__free_pages_ok(page, compound_order(page));
+ }
+@@ -653,6 +653,10 @@ static bool free_pages_prepare(struct pa
  	int i;
  	int bad = 0;
  
@@ -66518,7 +63292,7 @@ index 493b522..59cbc22 100644
  	trace_mm_page_free_direct(page, order);
  	kmemcheck_free_shadow(page, order);
  
-@@ -659,6 +663,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
+@@ -668,6 +672,12 @@ static bool free_pages_prepare(struct pa
  		debug_check_no_obj_freed(page_address(page),
  					   PAGE_SIZE << order);
  	}
@@ -66531,7 +63305,7 @@ index 493b522..59cbc22 100644
  	arch_free_page(page, order);
  	kernel_map_pages(page, 1 << order, 0);
  
-@@ -773,8 +783,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
+@@ -783,8 +793,10 @@ static int prep_new_page(struct page *pa
  	arch_alloc_page(page, order);
  	kernel_map_pages(page, 1 << order, 1);
  
@@ -66542,20 +63316,19 @@ index 493b522..59cbc22 100644
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-@@ -2423,6 +2435,8 @@ void show_free_areas(void)
+@@ -2525,6 +2537,8 @@ void show_free_areas(unsigned int filter
  	int cpu;
  	struct zone *zone;
  
 +	pax_track_stack();
 +
  	for_each_populated_zone(zone) {
- 		show_node(zone);
- 		printk("%s per-cpu:\n", zone->name);
-diff --git a/mm/percpu.c b/mm/percpu.c
-index 3f93001..d4fb612 100644
---- a/mm/percpu.c
-+++ b/mm/percpu.c
-@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu __read_mostly;
+ 		if (skip_free_areas_node(filter, zone_to_nid(zone)))
+ 			continue;
+diff -urNp linux-3.0.3/mm/percpu.c linux-3.0.3/mm/percpu.c
+--- linux-3.0.3/mm/percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/percpu.c	2011-08-23 21:47:56.000000000 -0400
+@@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
  /* the address of the first chunk which starts with the kernel static area */
@@ -66564,11 +63337,10 @@ index 3f93001..d4fb612 100644
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff --git a/mm/rmap.c b/mm/rmap.c
-index 941bf82..b7e2e07 100644
---- a/mm/rmap.c
-+++ b/mm/rmap.c
-@@ -117,6 +117,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+diff -urNp linux-3.0.3/mm/rmap.c linux-3.0.3/mm/rmap.c
+--- linux-3.0.3/mm/rmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/rmap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
  	struct anon_vma *anon_vma = vma->anon_vma;
  	struct anon_vma_chain *avc;
  
@@ -66579,12 +63351,12 @@ index 941bf82..b7e2e07 100644
  	might_sleep();
  	if (unlikely(!anon_vma)) {
  		struct mm_struct *mm = vma->vm_mm;
-@@ -126,6 +130,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -162,6 +166,12 @@ int anon_vma_prepare(struct vm_area_stru
  		if (!avc)
  			goto out_enomem;
  
 +#ifdef CONFIG_PAX_SEGMEXEC
-+		avc_m = anon_vma_chain_alloc();
++		avc_m = anon_vma_chain_alloc(GFP_KERNEL);
 +		if (!avc_m)
 +			goto out_enomem_free_avc;
 +#endif
@@ -66592,7 +63364,7 @@ index 941bf82..b7e2e07 100644
  		anon_vma = find_mergeable_anon_vma(vma);
  		allocated = NULL;
  		if (!anon_vma) {
-@@ -144,6 +154,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -175,6 +185,21 @@ int anon_vma_prepare(struct vm_area_stru
  		/* page_table_lock to protect against threads */
  		spin_lock(&mm->page_table_lock);
  		if (likely(!vma->anon_vma)) {
@@ -66614,10 +63386,10 @@ index 941bf82..b7e2e07 100644
  			vma->anon_vma = anon_vma;
  			avc->anon_vma = anon_vma;
  			avc->vma = vma;
-@@ -157,12 +182,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
+@@ -188,12 +213,24 @@ int anon_vma_prepare(struct vm_area_stru
  
  		if (unlikely(allocated))
- 			anon_vma_free(allocated);
+ 			put_anon_vma(allocated);
 +
 +#ifdef CONFIG_PAX_SEGMEXEC
 +		if (unlikely(avc_m))
@@ -66639,7 +63411,7 @@ index 941bf82..b7e2e07 100644
  	anon_vma_chain_free(avc);
   out_enomem:
  	return -ENOMEM;
-@@ -189,7 +226,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
+@@ -244,7 +281,7 @@ static void anon_vma_chain_link(struct v
   * Attach the anon_vmas from src to dst.
   * Returns 0 on success, -ENOMEM on failure.
   */
@@ -66647,8 +63419,8 @@ index 941bf82..b7e2e07 100644
 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
  {
  	struct anon_vma_chain *avc, *pavc;
- 
-@@ -211,7 +248,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
+ 	struct anon_vma *root = NULL;
+@@ -277,7 +314,7 @@ int anon_vma_clone(struct vm_area_struct
   * the corresponding VMA in the parent process is attached to.
   * Returns 0 on success, non-zero on failure.
   */
@@ -66657,10 +63429,9 @@ index 941bf82..b7e2e07 100644
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff --git a/mm/shmem.c b/mm/shmem.c
-index 91dd9c3..46d35e3 100644
---- a/mm/shmem.c
-+++ b/mm/shmem.c
+diff -urNp linux-3.0.3/mm/shmem.c linux-3.0.3/mm/shmem.c
+--- linux-3.0.3/mm/shmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/shmem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -66670,7 +63441,7 @@ index 91dd9c3..46d35e3 100644
  
  #ifdef CONFIG_SHMEM
  /*
-@@ -1088,6 +1088,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
+@@ -1101,6 +1101,8 @@ static int shmem_writepage(struct page *
  		goto unlock;
  	}
  	entry = shmem_swp_entry(info, index, NULL);
@@ -66679,7 +63450,7 @@ index 91dd9c3..46d35e3 100644
  	if (entry->val) {
  		/*
  		 * The more uptodate page coming down from a stacked
-@@ -1160,6 +1162,8 @@ static struct page *shmem_swapin(swp_entry_t entry, gfp_t gfp,
+@@ -1172,6 +1174,8 @@ static struct page *shmem_swapin(swp_ent
  	struct vm_area_struct pvma;
  	struct page *page;
  
@@ -66688,16 +63459,7 @@ index 91dd9c3..46d35e3 100644
  	spol = mpol_cond_copy(&mpol,
  				mpol_shared_policy_lookup(&info->policy, idx));
  
-@@ -2015,7 +2019,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
- 
- 	info = SHMEM_I(inode);
- 	inode->i_size = len-1;
--	if (len <= (char *)inode - (char *)info) {
-+	if (len <= (char *)inode - (char *)info && len <= 64) {
- 		/* do it inline */
- 		memcpy(info, symname, len);
- 		inode->i_op = &shmem_symlink_inline_operations;
-@@ -2361,8 +2365,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
+@@ -2568,8 +2572,7 @@ int shmem_fill_super(struct super_block 
  	int err = -ENOMEM;
  
  	/* Round up to L1_CACHE_BYTES to resist false sharing */
@@ -66707,11 +63469,10 @@ index 91dd9c3..46d35e3 100644
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff --git a/mm/slab.c b/mm/slab.c
-index 4c6e2e3..36a17c9 100644
---- a/mm/slab.c
-+++ b/mm/slab.c
-@@ -150,7 +150,7 @@
+diff -urNp linux-3.0.3/mm/slab.c linux-3.0.3/mm/slab.c
+--- linux-3.0.3/mm/slab.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/slab.c	2011-08-23 21:48:14.000000000 -0400
+@@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
  #if DEBUG
@@ -66720,7 +63481,7 @@ index 4c6e2e3..36a17c9 100644
  			 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
  			 SLAB_CACHE_DMA | \
  			 SLAB_STORE_USER | \
-@@ -158,7 +158,7 @@
+@@ -159,7 +159,7 @@
  			 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
  			 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
  #else
@@ -66729,7 +63490,7 @@ index 4c6e2e3..36a17c9 100644
  			 SLAB_CACHE_DMA | \
  			 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
  			 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
-@@ -284,7 +284,7 @@ struct kmem_list3 {
+@@ -288,7 +288,7 @@ struct kmem_list3 {
   * Need this for bootstrapping a per node allocator.
   */
  #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
@@ -66738,7 +63499,7 @@ index 4c6e2e3..36a17c9 100644
  #define	CACHE_CACHE 0
  #define	SIZE_AC MAX_NUMNODES
  #define	SIZE_L3 (2 * MAX_NUMNODES)
-@@ -385,10 +385,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
+@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_
  		if ((x)->max_freeable < i)				\
  			(x)->max_freeable = i;				\
  	} while (0)
@@ -66753,7 +63514,7 @@ index 4c6e2e3..36a17c9 100644
  #else
  #define	STATS_INC_ACTIVE(x)	do { } while (0)
  #define	STATS_DEC_ACTIVE(x)	do { } while (0)
-@@ -534,7 +534,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
+@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct 
   *   reciprocal_divide(offset, cache->reciprocal_buffer_size)
   */
  static inline unsigned int obj_to_index(const struct kmem_cache *cache,
@@ -66762,7 +63523,7 @@ index 4c6e2e3..36a17c9 100644
  {
  	u32 offset = (obj - slab->s_mem);
  	return reciprocal_divide(offset, cache->reciprocal_buffer_size);
-@@ -560,7 +560,7 @@ struct cache_names {
+@@ -564,7 +564,7 @@ struct cache_names {
  static struct cache_names __initdata cache_names[] = {
  #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
  #include <linux/kmalloc_sizes.h>
@@ -66771,7 +63532,7 @@ index 4c6e2e3..36a17c9 100644
  #undef CACHE
  };
  
-@@ -1526,7 +1526,7 @@ void __init kmem_cache_init(void)
+@@ -1530,7 +1530,7 @@ void __init kmem_cache_init(void)
  	sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
  					sizes[INDEX_AC].cs_size,
  					ARCH_KMALLOC_MINALIGN,
@@ -66780,7 +63541,7 @@ index 4c6e2e3..36a17c9 100644
  					NULL);
  
  	if (INDEX_AC != INDEX_L3) {
-@@ -1534,7 +1534,7 @@ void __init kmem_cache_init(void)
+@@ -1538,7 +1538,7 @@ void __init kmem_cache_init(void)
  			kmem_cache_create(names[INDEX_L3].name,
  				sizes[INDEX_L3].cs_size,
  				ARCH_KMALLOC_MINALIGN,
@@ -66789,7 +63550,7 @@ index 4c6e2e3..36a17c9 100644
  				NULL);
  	}
  
-@@ -1552,7 +1552,7 @@ void __init kmem_cache_init(void)
+@@ -1556,7 +1556,7 @@ void __init kmem_cache_init(void)
  			sizes->cs_cachep = kmem_cache_create(names->name,
  					sizes->cs_size,
  					ARCH_KMALLOC_MINALIGN,
@@ -66798,7 +63559,7 @@ index 4c6e2e3..36a17c9 100644
  					NULL);
  		}
  #ifdef CONFIG_ZONE_DMA
-@@ -4275,10 +4275,10 @@ static int s_show(struct seq_file *m, void *p)
+@@ -4272,10 +4272,10 @@ static int s_show(struct seq_file *m, vo
  	}
  	/* cpu stats */
  	{
@@ -66813,7 +63574,7 @@ index 4c6e2e3..36a17c9 100644
  
  		seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
  			   allochit, allocmiss, freehit, freemiss);
-@@ -4535,15 +4535,66 @@ static const struct file_operations proc_slabstats_operations = {
+@@ -4532,15 +4532,66 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -66882,10 +63643,9 @@ index 4c6e2e3..36a17c9 100644
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff --git a/mm/slob.c b/mm/slob.c
-index 3588eaa..a160c7d 100644
---- a/mm/slob.c
-+++ b/mm/slob.c
+diff -urNp linux-3.0.3/mm/slob.c linux-3.0.3/mm/slob.c
+--- linux-3.0.3/mm/slob.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/slob.c	2011-08-23 21:47:56.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -66922,7 +63682,7 @@ index 3588eaa..a160c7d 100644
  }
  
  static inline void set_slob_page(struct slob_page *sp)
-@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
+@@ -150,7 +152,7 @@ static inline void clear_slob_page(struc
  
  static inline struct slob_page *slob_page(const void *addr)
  {
@@ -66931,7 +63691,7 @@ index 3588eaa..a160c7d 100644
  }
  
  /*
-@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
+@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_
  /*
   * Return the size of a slob block.
   */
@@ -66958,7 +63718,7 @@ index 3588eaa..a160c7d 100644
  {
  	return !((unsigned long)slob_next(s) & ~PAGE_MASK);
  }
-@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
+@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, i
  	if (!page)
  		return NULL;
  
@@ -66966,7 +63726,7 @@ index 3588eaa..a160c7d 100644
  	return page_address(page);
  }
  
-@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
+@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp
  		if (!b)
  			return NULL;
  		sp = slob_page(b);
@@ -66992,7 +63752,7 @@ index 3588eaa..a160c7d 100644
  	void *ret;
  
  	lockdep_trace_alloc(gfp);
-@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+@@ -492,7 +494,10 @@ void *__kmalloc_node(size_t size, gfp_t 
  
  		if (!m)
  			return NULL;
@@ -67004,7 +63764,7 @@ index 3588eaa..a160c7d 100644
  		ret = (void *)m + align;
  
  		trace_kmalloc_node(_RET_IP_, ret,
-@@ -504,9 +509,9 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
+@@ -504,16 +509,25 @@ void *__kmalloc_node(size_t size, gfp_t 
  			gfp |= __GFP_COMP;
  		ret = slob_new_pages(gfp, order, node);
  		if (ret) {
@@ -67017,21 +63777,24 @@ index 3588eaa..a160c7d 100644
  		}
  
  		trace_kmalloc_node(_RET_IP_, ret,
-@@ -516,6 +521,13 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
- 	kmemleak_alloc(ret, size, 1, gfp);
- 	return ret;
- }
+ 				   size, PAGE_SIZE << order, gfp, node);
+ 	}
+ 
+-	kmemleak_alloc(ret, size, 1, gfp);
++	return ret;
++}
 +
 +void *__kmalloc_node(size_t size, gfp_t gfp, int node)
 +{
 +	int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
++	void *ret = __kmalloc_node_align(size, gfp, node, align);
 +
-+	return __kmalloc_node_align(size, gfp, node, align);
-+}
++	if (!ZERO_OR_NULL_PTR(ret))
++		kmemleak_alloc(ret, size, 1, gfp);
+ 	return ret;
+ }
  EXPORT_SYMBOL(__kmalloc_node);
- 
- void kfree(const void *block)
-@@ -531,13 +543,81 @@ void kfree(const void *block)
+@@ -531,13 +545,88 @@ void kfree(const void *block)
  	sp = slob_page(block);
  	if (is_slob_page(sp)) {
  		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -67056,6 +63819,7 @@ index 3588eaa..a160c7d 100644
 +	struct slob_page *sp;
 +	const slob_t *free;
 +	const void *base;
++	unsigned long flags;
 +
 +	if (!n)
 +		return;
@@ -67081,6 +63845,7 @@ index 3588eaa..a160c7d 100644
 +	}
 +
 +	/* some tricky double walking to find the chunk */
++	spin_lock_irqsave(&slob_lock, flags);
 +	base = (void *)((unsigned long)ptr & PAGE_MASK);
 +	free = sp->free;
 +
@@ -67095,17 +63860,22 @@ index 3588eaa..a160c7d 100644
 +		int offset;
 +
 +		if (ptr < base + align)
-+			goto report;
++			break;
 +
 +		offset = ptr - base - align;
-+		if (offset < m) {
-+			if (n <= m - offset)
-+				return;
-+			goto report;
++		if (offset >= m) {
++			base += size;
++			continue;
 +		}
-+		base += size;
++
++		if (n > m - offset)
++			break;
++
++		spin_unlock_irqrestore(&slob_lock, flags);
++		return;
 +	}
 +
++	spin_unlock_irqrestore(&slob_lock, flags);
 +report:
 +	pax_report_usercopy(ptr, n, to, NULL);
 +#endif
@@ -67116,7 +63886,7 @@ index 3588eaa..a160c7d 100644
  /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
  size_t ksize(const void *block)
  {
-@@ -550,10 +630,10 @@ size_t ksize(const void *block)
+@@ -550,10 +639,10 @@ size_t ksize(const void *block)
  	sp = slob_page(block);
  	if (is_slob_page(sp)) {
  		int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
@@ -67130,7 +63900,21 @@ index 3588eaa..a160c7d 100644
  }
  EXPORT_SYMBOL(ksize);
  
-@@ -608,17 +688,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
+@@ -569,8 +658,13 @@ struct kmem_cache *kmem_cache_create(con
+ {
+ 	struct kmem_cache *c;
+ 
++#ifdef CONFIG_PAX_USERCOPY
++	c = __kmalloc_node_align(sizeof(struct kmem_cache),
++		GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
++#else
+ 	c = slob_alloc(sizeof(struct kmem_cache),
+ 		GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
++#endif
+ 
+ 	if (c) {
+ 		c->name = name;
+@@ -608,17 +702,25 @@ void *kmem_cache_alloc_node(struct kmem_
  {
  	void *b;
  
@@ -67156,7 +63940,7 @@ index 3588eaa..a160c7d 100644
  
  	if (c->ctor)
  		c->ctor(b);
-@@ -630,10 +718,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
+@@ -630,10 +732,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
  
  static void __kmem_cache_free(void *b, int size)
  {
@@ -67175,7 +63959,7 @@ index 3588eaa..a160c7d 100644
  }
  
  static void kmem_rcu_free(struct rcu_head *head)
-@@ -646,14 +740,23 @@ static void kmem_rcu_free(struct rcu_head *head)
+@@ -646,17 +754,31 @@ static void kmem_rcu_free(struct rcu_hea
  
  void kmem_cache_free(struct kmem_cache *c, void *b)
  {
@@ -67201,12 +63985,19 @@ index 3588eaa..a160c7d 100644
 +		__kmem_cache_free(b, size);
  	}
  
++#ifdef CONFIG_PAX_USERCOPY
++	trace_kfree(_RET_IP_, b);
++#else
  	trace_kmem_cache_free(_RET_IP_, b);
-diff --git a/mm/slub.c b/mm/slub.c
-index e15aa7f..f795625 100644
---- a/mm/slub.c
-+++ b/mm/slub.c
-@@ -390,7 +390,7 @@ static void print_track(const char *s, struct track *t)
++#endif
++
+ }
+ EXPORT_SYMBOL(kmem_cache_free);
+ 
+diff -urNp linux-3.0.3/mm/slub.c linux-3.0.3/mm/slub.c
+--- linux-3.0.3/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/slub.c	2011-08-23 21:48:14.000000000 -0400
+@@ -442,7 +442,7 @@ static void print_track(const char *s, s
  	if (!t->addr)
  		return;
  
@@ -67215,7 +64006,7 @@ index e15aa7f..f795625 100644
  		s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
  }
  
-@@ -1927,6 +1927,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
+@@ -2137,6 +2137,8 @@ void kmem_cache_free(struct kmem_cache *
  
  	page = virt_to_head_page(x);
  
@@ -67224,7 +64015,7 @@ index e15aa7f..f795625 100644
  	slab_free(s, page, x, _RET_IP_);
  
  	trace_kmem_cache_free(_RET_IP_, x);
-@@ -1960,7 +1962,7 @@ static int slub_min_objects;
+@@ -2170,7 +2172,7 @@ static int slub_min_objects;
   * Merge control. If this is set then no merging of slab caches will occur.
   * (Could be removed. This was introduced to pacify the merge skeptics.)
   */
@@ -67233,7 +64024,7 @@ index e15aa7f..f795625 100644
  
  /*
   * Calculate the order of allocation given an slab object size.
-@@ -2370,7 +2372,7 @@ static int kmem_cache_open(struct kmem_cache *s,
+@@ -2594,7 +2596,7 @@ static int kmem_cache_open(struct kmem_c
  	 * list to avoid pounding the page allocator excessively.
  	 */
  	set_min_partial(s, ilog2(s->size));
@@ -67242,7 +64033,7 @@ index e15aa7f..f795625 100644
  #ifdef CONFIG_NUMA
  	s->remote_node_defrag_ratio = 1000;
  #endif
-@@ -2482,8 +2484,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
+@@ -2699,8 +2701,7 @@ static inline int kmem_cache_close(struc
  void kmem_cache_destroy(struct kmem_cache *s)
  {
  	down_write(&slub_lock);
@@ -67252,7 +64043,7 @@ index e15aa7f..f795625 100644
  		list_del(&s->list);
  		if (kmem_cache_close(s)) {
  			printk(KERN_ERR "SLUB %s: %s called for cache that "
-@@ -2693,6 +2694,46 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -2910,6 +2911,46 @@ void *__kmalloc_node(size_t size, gfp_t 
  EXPORT_SYMBOL(__kmalloc_node);
  #endif
  
@@ -67299,7 +64090,7 @@ index e15aa7f..f795625 100644
  size_t ksize(const void *object)
  {
  	struct page *page;
-@@ -2958,7 +2999,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
+@@ -3154,7 +3195,7 @@ static void __init kmem_cache_bootstrap_
  	int node;
  
  	list_add(&s->list, &slab_caches);
@@ -67308,7 +64099,7 @@ index e15aa7f..f795625 100644
  
  	for_each_node_state(node, N_NORMAL_MEMORY) {
  		struct kmem_cache_node *n = get_node(s, node);
-@@ -3075,17 +3116,17 @@ void __init kmem_cache_init(void)
+@@ -3271,17 +3312,17 @@ void __init kmem_cache_init(void)
  
  	/* Caches that are not of the two-to-the-power-of size */
  	if (KMALLOC_MIN_SIZE <= 32) {
@@ -67329,7 +64120,7 @@ index e15aa7f..f795625 100644
  		caches++;
  	}
  
-@@ -3153,7 +3194,7 @@ static int slab_unmergeable(struct kmem_cache *s)
+@@ -3349,7 +3390,7 @@ static int slab_unmergeable(struct kmem_
  	/*
  	 * We may have set a slab to be unmergeable during bootstrap.
  	 */
@@ -67338,7 +64129,7 @@ index e15aa7f..f795625 100644
  		return 1;
  
  	return 0;
-@@ -3212,7 +3253,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+@@ -3408,7 +3449,7 @@ struct kmem_cache *kmem_cache_create(con
  	down_write(&slub_lock);
  	s = find_mergeable(size, align, flags, name, ctor);
  	if (s) {
@@ -67347,7 +64138,7 @@ index e15aa7f..f795625 100644
  		/*
  		 * Adjust the object sizes so that we clear
  		 * the complete object on kzalloc.
-@@ -3221,7 +3262,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
+@@ -3417,7 +3458,7 @@ struct kmem_cache *kmem_cache_create(con
  		s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
  
  		if (sysfs_slab_alias(s, name)) {
@@ -67356,7 +64147,7 @@ index e15aa7f..f795625 100644
  			goto err;
  		}
  		up_write(&slub_lock);
-@@ -3954,7 +3995,7 @@ SLAB_ATTR_RO(ctor);
+@@ -4150,7 +4191,7 @@ SLAB_ATTR_RO(ctor);
  
  static ssize_t aliases_show(struct kmem_cache *s, char *buf)
  {
@@ -67365,7 +64156,7 @@ index e15aa7f..f795625 100644
  }
  SLAB_ATTR_RO(aliases);
  
-@@ -4691,7 +4732,13 @@ static const struct file_operations proc_slabinfo_operations = {
+@@ -4894,7 +4935,13 @@ static const struct file_operations proc
  
  static int __init slab_proc_init(void)
  {
@@ -67380,11 +64171,30 @@ index e15aa7f..f795625 100644
  	return 0;
  }
  module_init(slab_proc_init);
-diff --git a/mm/swapfile.c b/mm/swapfile.c
-index 6d6d28c..512ad97 100644
---- a/mm/swapfile.c
-+++ b/mm/swapfile.c
-@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
+diff -urNp linux-3.0.3/mm/swap.c linux-3.0.3/mm/swap.c
+--- linux-3.0.3/mm/swap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/swap.c	2011-08-23 21:47:56.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <linux/backing-dev.h>
+ #include <linux/memcontrol.h>
+ #include <linux/gfp.h>
++#include <linux/hugetlb.h>
+ 
+ #include "internal.h"
+ 
+@@ -71,6 +72,8 @@ static void __put_compound_page(struct p
+ 
+ 	__page_cache_release(page);
+ 	dtor = get_compound_page_dtor(page);
++	if (!PageHuge(page))
++		BUG_ON(dtor != free_compound_page);
+ 	(*dtor)(page);
+ }
+ 
+diff -urNp linux-3.0.3/mm/swapfile.c linux-3.0.3/mm/swapfile.c
+--- linux-3.0.3/mm/swapfile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/swapfile.c	2011-08-23 21:47:56.000000000 -0400
+@@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
  /* Activity counter to indicate that a swapon or swapoff has occurred */
@@ -67393,7 +64203,7 @@ index 6d6d28c..512ad97 100644
  
  static inline unsigned char swap_count(unsigned char ent)
  {
-@@ -1687,7 +1687,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
+@@ -1671,7 +1671,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
  	}
  	filp_close(swap_file, NULL);
  	err = 0;
@@ -67402,7 +64212,7 @@ index 6d6d28c..512ad97 100644
  	wake_up_interruptible(&proc_poll_wait);
  
  out_dput:
-@@ -1708,8 +1708,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
+@@ -1692,8 +1692,8 @@ static unsigned swaps_poll(struct file *
  
  	poll_wait(file, &proc_poll_wait, wait);
  
@@ -67413,7 +64223,7 @@ index 6d6d28c..512ad97 100644
  		return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
  	}
  
-@@ -1815,7 +1815,7 @@ static int swaps_open(struct inode *inode, struct file *file)
+@@ -1799,7 +1799,7 @@ static int swaps_open(struct inode *inod
  	}
  
  	s->seq.private = s;
@@ -67422,20 +64232,35 @@ index 6d6d28c..512ad97 100644
  	return ret;
  }
  
-@@ -2131,7 +2131,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
- 		swap_info[prev]->next = type;
- 	spin_unlock(&swap_lock);
+@@ -2133,7 +2133,7 @@ SYSCALL_DEFINE2(swapon, const char __use
+ 		(p->flags & SWP_DISCARDABLE) ? "D" : "");
+ 
  	mutex_unlock(&swapon_mutex);
 -	atomic_inc(&proc_poll_event);
 +	atomic_inc_unchecked(&proc_poll_event);
  	wake_up_interruptible(&proc_poll_wait);
  
- 	error = 0;
-diff --git a/mm/util.c b/mm/util.c
-index f126975..cdbe913 100644
---- a/mm/util.c
-+++ b/mm/util.c
-@@ -219,6 +219,12 @@ EXPORT_SYMBOL(strndup_user);
+ 	if (S_ISREG(inode->i_mode))
+diff -urNp linux-3.0.3/mm/util.c linux-3.0.3/mm/util.c
+--- linux-3.0.3/mm/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/util.c	2011-08-23 21:47:56.000000000 -0400
+@@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
+  * allocated buffer. Use this if you don't want to free the buffer immediately
+  * like, for example, with RCU.
+  */
++#undef __krealloc
+ void *__krealloc(const void *p, size_t new_size, gfp_t flags)
+ {
+ 	void *ret;
+@@ -147,6 +148,7 @@ EXPORT_SYMBOL(__krealloc);
+  * behaves exactly like kmalloc().  If @size is 0 and @p is not a
+  * %NULL pointer, the object pointed to is freed.
+  */
++#undef krealloc
+ void *krealloc(const void *p, size_t new_size, gfp_t flags)
+ {
+ 	void *ret;
+@@ -243,6 +245,12 @@ void __vma_link_list(struct mm_struct *m
  void arch_pick_mmap_layout(struct mm_struct *mm)
  {
  	mm->mmap_base = TASK_UNMAPPED_BASE;
@@ -67448,11 +64273,10 @@ index f126975..cdbe913 100644
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index f9b1667..243b8aa 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
+diff -urNp linux-3.0.3/mm/vmalloc.c linux-3.0.3/mm/vmalloc.c
+--- linux-3.0.3/mm/vmalloc.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/mm/vmalloc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
  	do {
@@ -67474,7 +64298,7 @@ index f9b1667..243b8aa 100644
  	} while (pte++, addr += PAGE_SIZE, addr != end);
  }
  
-@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
+@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, un
  		unsigned long end, pgprot_t prot, struct page **pages, int *nr)
  {
  	pte_t *pte;
@@ -67482,7 +64306,7 @@ index f9b1667..243b8aa 100644
  
  	/*
  	 * nr is a running index into the array which helps higher level
-@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
+@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, un
  	pte = pte_alloc_kernel(pmd, addr);
  	if (!pte)
  		return -ENOMEM;
@@ -67518,7 +64342,7 @@ index f9b1667..243b8aa 100644
  }
  
  static int vmap_pmd_range(pud_t *pud, unsigned long addr,
-@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
+@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void
  	 * and fall back on vmalloc() if that fails. Others
  	 * just put it in the vmalloc space.
  	 */
@@ -67540,7 +64364,7 @@ index f9b1667..243b8aa 100644
  	return is_vmalloc_addr(x);
  }
  
-@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
+@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void 
  
  	if (!pgd_none(*pgd)) {
  		pud_t *pud = pud_offset(pgd, addr);
@@ -67555,7 +64379,7 @@ index f9b1667..243b8aa 100644
  			if (!pmd_none(*pmd)) {
  				pte_t *ptep, pte;
  
-@@ -1244,6 +1284,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
+@@ -1297,6 +1337,16 @@ static struct vm_struct *__get_vm_area_n
  	struct vm_struct *area;
  
  	BUG_ON(in_interrupt());
@@ -67572,7 +64396,7 @@ index f9b1667..243b8aa 100644
  	if (flags & VM_IOREMAP) {
  		int bit = fls(size);
  
-@@ -1462,6 +1512,11 @@ void *vmap(struct page **pages, unsigned int count,
+@@ -1515,6 +1565,11 @@ void *vmap(struct page **pages, unsigned
  	if (count > totalram_pages)
  		return NULL;
  
@@ -67584,7 +64408,7 @@ index f9b1667..243b8aa 100644
  	area = get_vm_area_caller((count << PAGE_SHIFT), flags,
  					__builtin_return_address(0));
  	if (!area)
-@@ -1558,6 +1613,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
+@@ -1616,6 +1671,13 @@ void *__vmalloc_node_range(unsigned long
  	if (!size || (size >> PAGE_SHIFT) > totalram_pages)
  		return NULL;
  
@@ -67598,7 +64422,7 @@ index f9b1667..243b8aa 100644
  	area = __get_vm_area_node(size, align, VM_ALLOC, start, end, node,
  				  gfp_mask, caller);
  
-@@ -1597,6 +1659,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
+@@ -1655,6 +1717,7 @@ static void *__vmalloc_node(unsigned lon
  				gfp_mask, prot, node, caller);
  }
  
@@ -67606,7 +64430,7 @@ index f9b1667..243b8aa 100644
  void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
  {
  	return __vmalloc_node(size, 1, gfp_mask, prot, -1,
-@@ -1620,6 +1683,7 @@ static inline void *__vmalloc_node_flags(unsigned long size,
+@@ -1678,6 +1741,7 @@ static inline void *__vmalloc_node_flags
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -67614,7 +64438,7 @@ index f9b1667..243b8aa 100644
  void *vmalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1, GFP_KERNEL | __GFP_HIGHMEM);
-@@ -1636,6 +1700,7 @@ EXPORT_SYMBOL(vmalloc);
+@@ -1694,6 +1758,7 @@ EXPORT_SYMBOL(vmalloc);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -67622,7 +64446,7 @@ index f9b1667..243b8aa 100644
  void *vzalloc(unsigned long size)
  {
  	return __vmalloc_node_flags(size, -1,
-@@ -1650,6 +1715,7 @@ EXPORT_SYMBOL(vzalloc);
+@@ -1708,6 +1773,7 @@ EXPORT_SYMBOL(vzalloc);
   * The resulting memory area is zeroed so it can be mapped to userspace
   * without leaking data.
   */
@@ -67630,7 +64454,7 @@ index f9b1667..243b8aa 100644
  void *vmalloc_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -1677,6 +1743,7 @@ EXPORT_SYMBOL(vmalloc_user);
+@@ -1735,6 +1801,7 @@ EXPORT_SYMBOL(vmalloc_user);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -67638,7 +64462,7 @@ index f9b1667..243b8aa 100644
  void *vmalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
-@@ -1696,6 +1763,7 @@ EXPORT_SYMBOL(vmalloc_node);
+@@ -1754,6 +1821,7 @@ EXPORT_SYMBOL(vmalloc_node);
   * For tight control over page level allocator and protection flags
   * use __vmalloc_node() instead.
   */
@@ -67646,7 +64470,7 @@ index f9b1667..243b8aa 100644
  void *vzalloc_node(unsigned long size, int node)
  {
  	return __vmalloc_node_flags(size, node,
-@@ -1718,10 +1786,10 @@ EXPORT_SYMBOL(vzalloc_node);
+@@ -1776,10 +1844,10 @@ EXPORT_SYMBOL(vzalloc_node);
   *	For tight control over page level allocator and protection flags
   *	use __vmalloc() instead.
   */
@@ -67659,7 +64483,7 @@ index f9b1667..243b8aa 100644
  			      -1, __builtin_return_address(0));
  }
  
-@@ -1740,6 +1808,7 @@ void *vmalloc_exec(unsigned long size)
+@@ -1798,6 +1866,7 @@ void *vmalloc_exec(unsigned long size)
   *	Allocate enough 32bit PA addressable pages to cover @size from the
   *	page level allocator and map them into contiguous kernel virtual space.
   */
@@ -67667,7 +64491,7 @@ index f9b1667..243b8aa 100644
  void *vmalloc_32(unsigned long size)
  {
  	return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
-@@ -1754,6 +1823,7 @@ EXPORT_SYMBOL(vmalloc_32);
+@@ -1812,6 +1881,7 @@ EXPORT_SYMBOL(vmalloc_32);
   * The resulting memory area is 32bit addressable and zeroed so it can be
   * mapped to userspace without leaking data.
   */
@@ -67675,7 +64499,7 @@ index f9b1667..243b8aa 100644
  void *vmalloc_32_user(unsigned long size)
  {
  	struct vm_struct *area;
-@@ -2018,6 +2088,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
+@@ -2074,6 +2144,8 @@ int remap_vmalloc_range(struct vm_area_s
  	unsigned long uaddr = vma->vm_start;
  	unsigned long usize = vma->vm_end - vma->vm_start;
  
@@ -67684,10 +64508,9 @@ index f9b1667..243b8aa 100644
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff --git a/mm/vmstat.c b/mm/vmstat.c
-index 0c3b504..a4fafe6 100644
---- a/mm/vmstat.c
-+++ b/mm/vmstat.c
+diff -urNp linux-3.0.3/mm/vmstat.c linux-3.0.3/mm/vmstat.c
+--- linux-3.0.3/mm/vmstat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/mm/vmstat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -67697,7 +64520,7 @@ index 0c3b504..a4fafe6 100644
  EXPORT_SYMBOL(vm_stat);
  
  #ifdef CONFIG_SMP
-@@ -451,7 +451,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
  				v = p->vm_stat_diff[i];
  				p->vm_stat_diff[i] = 0;
  				local_irq_restore(flags);
@@ -67706,7 +64529,7 @@ index 0c3b504..a4fafe6 100644
  				global_diff[i] += v;
  #ifdef CONFIG_NUMA
  				/* 3 seconds idle till flush */
-@@ -489,7 +489,7 @@ void refresh_cpu_vm_stats(int cpu)
+@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
  
  	for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
  		if (global_diff[i])
@@ -67715,7 +64538,7 @@ index 0c3b504..a4fafe6 100644
  }
  
  #endif
-@@ -1188,10 +1188,20 @@ static int __init setup_vmstat(void)
+@@ -1207,10 +1207,20 @@ static int __init setup_vmstat(void)
  		start_cpu_timer(cpu);
  #endif
  #ifdef CONFIG_PROC_FS
@@ -67740,11 +64563,10 @@ index 0c3b504..a4fafe6 100644
  #endif
  	return 0;
  }
-diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
-index 8a7de0f..3f394d8 100644
---- a/net/8021q/vlan.c
-+++ b/net/8021q/vlan.c
-@@ -592,8 +592,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
+diff -urNp linux-3.0.3/net/8021q/vlan.c linux-3.0.3/net/8021q/vlan.c
+--- linux-3.0.3/net/8021q/vlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/8021q/vlan.c	2011-08-23 21:47:56.000000000 -0400
+@@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
  		err = -EPERM;
  		if (!capable(CAP_NET_ADMIN))
  			break;
@@ -67754,11 +64576,10 @@ index 8a7de0f..3f394d8 100644
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
-index fc63526..7777a58 100644
---- a/net/atm/atm_misc.c
-+++ b/net/atm/atm_misc.c
-@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
+diff -urNp linux-3.0.3/net/atm/atm_misc.c linux-3.0.3/net/atm/atm_misc.c
+--- linux-3.0.3/net/atm/atm_misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/atm_misc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
  	if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
  		return 1;
  	atm_return(vcc, truesize);
@@ -67767,7 +64588,7 @@ index fc63526..7777a58 100644
  	return 0;
  }
  EXPORT_SYMBOL(atm_charge);
-@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
+@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct 
  		}
  	}
  	atm_return(vcc, guess);
@@ -67794,11 +64615,34 @@ index fc63526..7777a58 100644
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
-index d1b2d9a..7cc2219 100644
---- a/net/atm/mpoa_caches.c
-+++ b/net/atm/mpoa_caches.c
-@@ -255,6 +255,8 @@ static void check_resolving_entries(struct mpoa_client *client)
+diff -urNp linux-3.0.3/net/atm/lec.h linux-3.0.3/net/atm/lec.h
+--- linux-3.0.3/net/atm/lec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/lec.h	2011-08-23 21:47:56.000000000 -0400
+@@ -48,7 +48,7 @@ struct lane2_ops {
+ 			      const u8 *tlvs, u32 sizeoftlvs);
+ 	void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
+ 				     const u8 *tlvs, u32 sizeoftlvs);
+-};
++} __no_const;
+ 
+ /*
+  * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
+diff -urNp linux-3.0.3/net/atm/mpc.h linux-3.0.3/net/atm/mpc.h
+--- linux-3.0.3/net/atm/mpc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/mpc.h	2011-08-23 21:47:56.000000000 -0400
+@@ -33,7 +33,7 @@ struct mpoa_client {
+ 	struct mpc_parameters parameters;  /* parameters for this client    */
+ 
+ 	const struct net_device_ops *old_ops;
+-	struct net_device_ops new_ops;
++	net_device_ops_no_const new_ops;
+ };
+ 
+ 
+diff -urNp linux-3.0.3/net/atm/mpoa_caches.c linux-3.0.3/net/atm/mpoa_caches.c
+--- linux-3.0.3/net/atm/mpoa_caches.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/mpoa_caches.c	2011-08-23 21:48:14.000000000 -0400
+@@ -255,6 +255,8 @@ static void check_resolving_entries(stru
  	struct timeval now;
  	struct k_message msg;
  
@@ -67807,11 +64651,10 @@ index d1b2d9a..7cc2219 100644
  	do_gettimeofday(&now);
  
  	read_lock_bh(&client->ingress_lock);
-diff --git a/net/atm/proc.c b/net/atm/proc.c
-index f85da077..f0fa716 100644
---- a/net/atm/proc.c
-+++ b/net/atm/proc.c
-@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
+diff -urNp linux-3.0.3/net/atm/proc.c linux-3.0.3/net/atm/proc.c
+--- linux-3.0.3/net/atm/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/proc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
  	seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
@@ -67824,35 +64667,9 @@ index f85da077..f0fa716 100644
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-@@ -191,7 +191,12 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
- {
- 	struct sock *sk = sk_atm(vcc);
- 
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+	seq_printf(seq, "%p ", NULL);
-+#else
- 	seq_printf(seq, "%p ", vcc);
-+#endif
-+
- 	if (!vcc->dev)
- 		seq_printf(seq, "Unassigned    ");
- 	else
-@@ -218,7 +223,11 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
- {
- 	if (!vcc->dev)
- 		seq_printf(seq, sizeof(void *) == 4 ?
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   "N/A@%p%10s" : "N/A@%p%2s", NULL, "");
-+#else
- 			   "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
-+#endif
- 	else
- 		seq_printf(seq, "%3d %3d %5d         ",
- 			   vcc->dev->number, vcc->vpi, vcc->vci);
-diff --git a/net/atm/resources.c b/net/atm/resources.c
-index 23f45ce..c748f1a 100644
---- a/net/atm/resources.c
-+++ b/net/atm/resources.c
+diff -urNp linux-3.0.3/net/atm/resources.c linux-3.0.3/net/atm/resources.c
+--- linux-3.0.3/net/atm/resources.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/atm/resources.c	2011-08-23 21:47:56.000000000 -0400
 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -67862,7 +64679,7 @@ index 23f45ce..c748f1a 100644
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
+@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_
  static void subtract_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
  {
@@ -67871,26 +64688,24 @@ index 23f45ce..c748f1a 100644
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
-index 4f95777..0006f66 100644
---- a/net/batman-adv/hard-interface.c
-+++ b/net/batman-adv/hard-interface.c
-@@ -325,8 +325,8 @@ int hardif_enable_interface(struct batman_if *batman_if, char *iface_name)
- 	kref_get(&batman_if->refcount);
- 	dev_add_pack(&batman_if->batman_adv_ptype);
- 
--	atomic_set(&batman_if->seqno, 1);
--	atomic_set(&batman_if->frag_seqno, 1);
-+	atomic_set_unchecked(&batman_if->seqno, 1);
-+	atomic_set_unchecked(&batman_if->frag_seqno, 1);
- 	bat_info(batman_if->soft_iface, "Adding interface: %s\n",
- 		 batman_if->net_dev->name);
- 
-diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
-index 8828edd..b5cfd66 100644
---- a/net/batman-adv/routing.c
-+++ b/net/batman-adv/routing.c
-@@ -569,7 +569,7 @@ void receive_bat_packet(struct ethhdr *ethhdr,
+diff -urNp linux-3.0.3/net/batman-adv/hard-interface.c linux-3.0.3/net/batman-adv/hard-interface.c
+--- linux-3.0.3/net/batman-adv/hard-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/hard-interface.c	2011-08-23 21:47:56.000000000 -0400
+@@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
+ 	hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
+ 	dev_add_pack(&hard_iface->batman_adv_ptype);
+ 
+-	atomic_set(&hard_iface->seqno, 1);
+-	atomic_set(&hard_iface->frag_seqno, 1);
++	atomic_set_unchecked(&hard_iface->seqno, 1);
++	atomic_set_unchecked(&hard_iface->frag_seqno, 1);
+ 	bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
+ 		 hard_iface->net_dev->name);
+ 
+diff -urNp linux-3.0.3/net/batman-adv/routing.c linux-3.0.3/net/batman-adv/routing.c
+--- linux-3.0.3/net/batman-adv/routing.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/routing.c	2011-08-23 21:47:56.000000000 -0400
+@@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
  		return;
  
  	/* could be changed by schedule_own_packet() */
@@ -67899,33 +64714,31 @@ index 8828edd..b5cfd66 100644
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c
-index b89b9f7..f37626e 100644
---- a/net/batman-adv/send.c
-+++ b/net/batman-adv/send.c
-@@ -277,7 +277,7 @@ void schedule_own_packet(struct batman_if *batman_if)
+diff -urNp linux-3.0.3/net/batman-adv/send.c linux-3.0.3/net/batman-adv/send.c
+--- linux-3.0.3/net/batman-adv/send.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/send.c	2011-08-23 21:47:56.000000000 -0400
+@@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
  
  	/* change sequence number to network order */
  	batman_packet->seqno =
--		htonl((uint32_t)atomic_read(&batman_if->seqno));
-+		htonl((uint32_t)atomic_read_unchecked(&batman_if->seqno));
+-		htonl((uint32_t)atomic_read(&hard_iface->seqno));
++		htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
  
  	if (vis_server == VIS_TYPE_SERVER_SYNC)
  		batman_packet->flags |= VIS_SERVER;
-@@ -291,7 +291,7 @@ void schedule_own_packet(struct batman_if *batman_if)
+@@ -293,7 +293,7 @@ void schedule_own_packet(struct hard_ifa
  	else
  		batman_packet->gw_flags = 0;
  
--	atomic_inc(&batman_if->seqno);
-+	atomic_inc_unchecked(&batman_if->seqno);
+-	atomic_inc(&hard_iface->seqno);
++	atomic_inc_unchecked(&hard_iface->seqno);
  
- 	slide_own_bcast_window(batman_if);
+ 	slide_own_bcast_window(hard_iface);
  	send_time = own_send_time(bat_priv);
-diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
-index e89ede1..1230f68 100644
---- a/net/batman-adv/soft-interface.c
-+++ b/net/batman-adv/soft-interface.c
-@@ -410,7 +410,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
+diff -urNp linux-3.0.3/net/batman-adv/soft-interface.c linux-3.0.3/net/batman-adv/soft-interface.c
+--- linux-3.0.3/net/batman-adv/soft-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/soft-interface.c	2011-08-23 21:47:56.000000000 -0400
+@@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
  
  		/* set broadcast sequence number */
  		bcast_packet->seqno =
@@ -67934,20 +64747,19 @@ index e89ede1..1230f68 100644
  
  		add_bcast_packet_to_list(bat_priv, skb);
  
-@@ -603,7 +603,7 @@ struct net_device *softif_create(char *name)
+@@ -830,7 +830,7 @@ struct net_device *softif_create(char *n
  	atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
  
  	atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
 -	atomic_set(&bat_priv->bcast_seqno, 1);
 +	atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
- 	atomic_set(&bat_priv->hna_local_changed, 0);
+ 	atomic_set(&bat_priv->tt_local_changed, 0);
  
  	bat_priv->primary_if = NULL;
-diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
-index bf3f6f5..328ca43 100644
---- a/net/batman-adv/types.h
-+++ b/net/batman-adv/types.h
-@@ -38,8 +38,8 @@ struct batman_if {
+diff -urNp linux-3.0.3/net/batman-adv/types.h linux-3.0.3/net/batman-adv/types.h
+--- linux-3.0.3/net/batman-adv/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/types.h	2011-08-23 21:47:56.000000000 -0400
+@@ -38,8 +38,8 @@ struct hard_iface {
  	int16_t if_num;
  	char if_status;
  	struct net_device *net_dev;
@@ -67958,7 +64770,7 @@ index bf3f6f5..328ca43 100644
  	unsigned char *packet_buff;
  	int packet_len;
  	struct kobject *hardif_obj;
-@@ -133,7 +133,7 @@ struct bat_priv {
+@@ -142,7 +142,7 @@ struct bat_priv {
  	atomic_t orig_interval;		/* uint */
  	atomic_t hop_penalty;		/* uint */
  	atomic_t log_level;		/* uint */
@@ -67967,27 +64779,22 @@ index bf3f6f5..328ca43 100644
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
  	char num_ifaces;
-diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
-index d1a6113..f722823 100644
---- a/net/batman-adv/unicast.c
-+++ b/net/batman-adv/unicast.c
-@@ -261,9 +261,9 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
- 	frag1->flags |= UNI_FRAG_HEAD;
- 	frag2->flags &= ~UNI_FRAG_HEAD;
- 
--	frag1->seqno = htons((uint16_t)atomic_inc_return(
-+	frag1->seqno = htons((uint16_t)atomic_inc_return_unchecked(
- 			     &batman_if->frag_seqno));
--	frag2->seqno = htons((uint16_t)atomic_inc_return(
-+	frag2->seqno = htons((uint16_t)atomic_inc_return_unchecked(
- 			     &batman_if->frag_seqno));
- 
- 	send_skb_packet(skb, batman_if, dstaddr);
-diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
-index f61eb2e..51cd08f 100644
---- a/net/bridge/br_multicast.c
-+++ b/net/bridge/br_multicast.c
-@@ -1482,7 +1482,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
+diff -urNp linux-3.0.3/net/batman-adv/unicast.c linux-3.0.3/net/batman-adv/unicast.c
+--- linux-3.0.3/net/batman-adv/unicast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/batman-adv/unicast.c	2011-08-23 21:47:56.000000000 -0400
+@@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
+ 	frag1->flags = UNI_FRAG_HEAD | large_tail;
+ 	frag2->flags = large_tail;
+ 
+-	seqno = atomic_add_return(2, &hard_iface->frag_seqno);
++	seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
+ 	frag1->seqno = htons(seqno - 1);
+ 	frag2->seqno = htons(seqno);
+ 
+diff -urNp linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3/net/bridge/br_multicast.c
+--- linux-3.0.3/net/bridge/br_multicast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/bridge/br_multicast.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
  
@@ -67996,11 +64803,10 @@ index f61eb2e..51cd08f 100644
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
-index 47acf4a..11272ea 100644
---- a/net/bridge/netfilter/ebtables.c
-+++ b/net/bridge/netfilter/ebtables.c
-@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
+diff -urNp linux-3.0.3/net/bridge/netfilter/ebtables.c linux-3.0.3/net/bridge/netfilter/ebtables.c
+--- linux-3.0.3/net/bridge/netfilter/ebtables.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/bridge/netfilter/ebtables.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
  			tmp.valid_hooks = t->table->valid_hooks;
  		}
  		mutex_unlock(&ebt_mutex);
@@ -68009,7 +64815,7 @@ index 47acf4a..11272ea 100644
  			BUGPRINT("c2u Didn't work\n");
  			ret = -EFAULT;
  			break;
-@@ -1779,6 +1779,8 @@ static int compat_copy_everything_to_user(struct ebt_table *t,
+@@ -1780,6 +1780,8 @@ static int compat_copy_everything_to_use
  	int ret;
  	void __user *pos;
  
@@ -68018,14 +64824,14 @@ index 47acf4a..11272ea 100644
  	memset(&tinfo, 0, sizeof(tinfo));
  
  	if (cmd == EBT_SO_GET_ENTRIES) {
-diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
-index 8184c03..a1f9b1e 100644
---- a/net/caif/caif_socket.c
-+++ b/net/caif/caif_socket.c
-@@ -48,18 +48,19 @@ static struct dentry *debugfsdir;
+diff -urNp linux-3.0.3/net/caif/caif_socket.c linux-3.0.3/net/caif/caif_socket.c
+--- linux-3.0.3/net/caif/caif_socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/caif/caif_socket.c	2011-08-23 21:47:56.000000000 -0400
+@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
  	atomic_t caif_nr_socks;
+-	atomic_t caif_sock_create;
 -	atomic_t num_connect_req;
 -	atomic_t num_connect_resp;
 -	atomic_t num_connect_fail_resp;
@@ -68035,6 +64841,7 @@ index 8184c03..a1f9b1e 100644
 -	atomic_t num_tx_flow_on_ind;
 -	atomic_t num_rx_flow_off;
 -	atomic_t num_rx_flow_on;
++	atomic_unchecked_t caif_sock_create;
 +	atomic_unchecked_t num_connect_req;
 +	atomic_unchecked_t num_connect_resp;
 +	atomic_unchecked_t num_connect_fail_resp;
@@ -68046,30 +64853,30 @@ index 8184c03..a1f9b1e 100644
 +	atomic_unchecked_t num_rx_flow_on;
  };
  static struct debug_fs_counter cnt;
- #define	dbfs_atomic_inc(v) atomic_inc(v)
-+#define	dbfs_atomic_inc_unchecked(v) atomic_inc_unchecked(v)
- #define	dbfs_atomic_dec(v) atomic_dec(v)
+ #define	dbfs_atomic_inc(v) atomic_inc_return(v)
++#define	dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
+ #define	dbfs_atomic_dec(v) atomic_dec_return(v)
  #else
- #define	dbfs_atomic_inc(v)
-@@ -159,7 +160,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
- 			atomic_read(&cf_sk->sk.sk_rmem_alloc),
- 			sk_rcvbuf_lowwater(cf_sk));
+ #define	dbfs_atomic_inc(v) 0
+@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct soc
+ 					atomic_read(&cf_sk->sk.sk_rmem_alloc),
+ 					sk_rcvbuf_lowwater(cf_sk));
  		set_rx_flow_off(cf_sk);
 -		dbfs_atomic_inc(&cnt.num_rx_flow_off);
 +		dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
  		caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
  	}
  
-@@ -169,7 +170,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
- 	if (!sk_rmem_schedule(sk, skb->truesize) && rx_flow_is_on(cf_sk)) {
+@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct soc
  		set_rx_flow_off(cf_sk);
- 		pr_debug("sending flow OFF due to rmem_schedule\n");
+ 		if (net_ratelimit())
+ 			pr_debug("sending flow OFF due to rmem_schedule\n");
 -		dbfs_atomic_inc(&cnt.num_rx_flow_off);
 +		dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
  		caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
  	}
  	skb->dev = NULL;
-@@ -218,21 +219,21 @@ static void caif_ctrl_cb(struct cflayer *layr,
+@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer 
  	switch (flow) {
  	case CAIF_CTRLCMD_FLOW_ON_IND:
  		/* OK from modem to start sending again */
@@ -68086,15 +64893,16 @@ index 8184c03..a1f9b1e 100644
  		set_tx_flow_off(cf_sk);
  		cf_sk->sk.sk_state_change(&cf_sk->sk);
  		break;
- 
- 	case CAIF_CTRLCMD_INIT_RSP:
+@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer 
  		/* We're now connected */
+ 		caif_client_register_refcnt(&cf_sk->layer,
+ 						cfsk_hold, cfsk_put);
 -		dbfs_atomic_inc(&cnt.num_connect_resp);
 +		dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
  		cf_sk->sk.sk_state = CAIF_CONNECTED;
  		set_tx_flow_on(cf_sk);
  		cf_sk->sk.sk_state_change(&cf_sk->sk);
-@@ -247,7 +248,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
+@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer 
  
  	case CAIF_CTRLCMD_INIT_FAIL_RSP:
  		/* Connect request failed */
@@ -68103,7 +64911,7 @@ index 8184c03..a1f9b1e 100644
  		cf_sk->sk.sk_err = ECONNREFUSED;
  		cf_sk->sk.sk_state = CAIF_DISCONNECTED;
  		cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
-@@ -261,7 +262,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
+@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer 
  
  	case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
  		/* Modem has closed this connection, or device is down. */
@@ -68112,7 +64920,7 @@ index 8184c03..a1f9b1e 100644
  		cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
  		cf_sk->sk.sk_err = ECONNRESET;
  		set_rx_flow_on(cf_sk);
-@@ -281,7 +282,7 @@ static void caif_check_flow_release(struct sock *sk)
+@@ -297,7 +298,7 @@ static void caif_check_flow_release(stru
  		return;
  
  	if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
@@ -68121,28 +64929,36 @@ index 8184c03..a1f9b1e 100644
  			set_rx_flow_on(cf_sk);
  			caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
  	}
-@@ -864,7 +865,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
+@@ -854,7 +855,7 @@ static int caif_connect(struct socket *s
  	/*ifindex = id of the interface.*/
  	cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
  
 -	dbfs_atomic_inc(&cnt.num_connect_req);
 +	dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
  	cf_sk->layer.receive = caif_sktrecv_cb;
- 	err = caif_connect_client(&cf_sk->conn_req,
- 				&cf_sk->layer, &ifindex, &headroom, &tailroom);
-@@ -952,7 +953,7 @@ static int caif_release(struct socket *sock)
- 	spin_unlock(&sk->sk_receive_queue.lock);
+ 
+ 	err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
+@@ -943,7 +944,7 @@ static int caif_release(struct socket *s
+ 	spin_unlock_bh(&sk->sk_receive_queue.lock);
  	sock->sk = NULL;
  
 -	dbfs_atomic_inc(&cnt.num_disconnect);
 +	dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
  
+ 	WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
  	if (cf_sk->debugfs_socket_dir != NULL)
- 		debugfs_remove_recursive(cf_sk->debugfs_socket_dir);
-diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
-index 3cd8f97..da4fdfe 100644
---- a/net/caif/cfctrl.c
-+++ b/net/caif/cfctrl.c
+@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, 
+ 	cf_sk->conn_req.protocol = protocol;
+ 	/* Increase the number of sockets created. */
+ 	dbfs_atomic_inc(&cnt.caif_nr_socks);
+-	num = dbfs_atomic_inc(&cnt.caif_sock_create);
++	num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
+ #ifdef CONFIG_DEBUG_FS
+ 	if (!IS_ERR(debugfsdir)) {
+ 
+diff -urNp linux-3.0.3/net/caif/cfctrl.c linux-3.0.3/net/caif/cfctrl.c
+--- linux-3.0.3/net/caif/cfctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/caif/cfctrl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -68151,7 +64967,7 @@ index 3cd8f97..da4fdfe 100644
  #include <net/caif/caif_layer.h>
  #include <net/caif/cfpkt.h>
  #include <net/caif/cfctrl.h>
-@@ -46,8 +47,8 @@ struct cflayer *cfctrl_create(void)
+@@ -45,8 +46,8 @@ struct cflayer *cfctrl_create(void)
  	dev_info.id = 0xff;
  	memset(this, 0, sizeof(*this));
  	cfsrvl_init(&this->serv, 0, &dev_info, false);
@@ -68162,18 +64978,18 @@ index 3cd8f97..da4fdfe 100644
  	this->serv.layer.receive = cfctrl_recv;
  	sprintf(this->serv.layer.name, "ctrl");
  	this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
-@@ -116,8 +117,8 @@ void cfctrl_insert_req(struct cfctrl *ctrl,
+@@ -132,8 +133,8 @@ static void cfctrl_insert_req(struct cfc
  			      struct cfctrl_request_info *req)
  {
- 	spin_lock(&ctrl->info_list_lock);
+ 	spin_lock_bh(&ctrl->info_list_lock);
 -	atomic_inc(&ctrl->req_seq_no);
 -	req->sequence_no = atomic_read(&ctrl->req_seq_no);
 +	atomic_inc_unchecked(&ctrl->req_seq_no);
 +	req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
  	list_add_tail(&req->list, &ctrl->list);
- 	spin_unlock(&ctrl->info_list_lock);
+ 	spin_unlock_bh(&ctrl->info_list_lock);
  }
-@@ -136,7 +137,7 @@ struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
+@@ -151,7 +152,7 @@ static struct cfctrl_request_info *cfctr
  			if (p != first)
  				pr_warn("Requests are not received in order\n");
  
@@ -68182,7 +64998,7 @@ index 3cd8f97..da4fdfe 100644
  					 p->sequence_no);
  			list_del(&p->list);
  			goto out;
-@@ -385,6 +386,7 @@ static int cfctrl_recv(struct cflayer *layer, struct cfpkt *pkt)
+@@ -364,6 +365,7 @@ static int cfctrl_recv(struct cflayer *l
  	struct cfctrl *cfctrl = container_obj(layer);
  	struct cfctrl_request_info rsp, *req;
  
@@ -68190,31 +65006,10 @@ index 3cd8f97..da4fdfe 100644
  
  	cfpkt_extr_head(pkt, &cmdrsp, 1);
  	cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff --git a/net/can/bcm.c b/net/can/bcm.c
-index 63779ab..74d6c5d 100644
---- a/net/can/bcm.c
-+++ b/net/can/bcm.c
-@@ -165,9 +165,15 @@ static int bcm_proc_show(struct seq_file *m, void *v)
- 	struct bcm_sock *bo = bcm_sk(sk);
- 	struct bcm_op *op;
- 
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+	seq_printf(m, ">>> socket %p", NULL);
-+	seq_printf(m, " / sk %p", NULL);
-+	seq_printf(m, " / bo %p", NULL);
-+#else
- 	seq_printf(m, ">>> socket %p", sk->sk_socket);
- 	seq_printf(m, " / sk %p", sk);
- 	seq_printf(m, " / bo %p", bo);
-+#endif
- 	seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
- 	seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
- 	seq_printf(m, " <<<\n");
-diff --git a/net/core/datagram.c b/net/core/datagram.c
-index 18ac112..fe95ed9 100644
---- a/net/core/datagram.c
-+++ b/net/core/datagram.c
-@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
+diff -urNp linux-3.0.3/net/core/datagram.c linux-3.0.3/net/core/datagram.c
+--- linux-3.0.3/net/core/datagram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/datagram.c	2011-08-23 21:47:56.000000000 -0400
+@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
  	kfree_skb(skb);
@@ -68223,11 +65018,10 @@ index 18ac112..fe95ed9 100644
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 2bb4aa68..1ae6cf5 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -1124,10 +1124,14 @@ void dev_load(struct net *net, const char *name)
+diff -urNp linux-3.0.3/net/core/dev.c linux-3.0.3/net/core/dev.c
+--- linux-3.0.3/net/core/dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/dev.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
  	if (no_module && capable(CAP_NET_ADMIN))
  		no_module = request_module("netdev-%s", name);
  	if (no_module && capable(CAP_SYS_MODULE)) {
@@ -68242,7 +65036,16 @@ index 2bb4aa68..1ae6cf5 100644
  	}
  }
  EXPORT_SYMBOL(dev_load);
-@@ -2789,7 +2793,7 @@ int netif_rx_ni(struct sk_buff *skb)
+@@ -1959,7 +1963,7 @@ static int illegal_highdma(struct net_de
+ 
+ struct dev_gso_cb {
+ 	void (*destructor)(struct sk_buff *skb);
+-};
++} __no_const;
+ 
+ #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
+ 
+@@ -2912,7 +2916,7 @@ int netif_rx_ni(struct sk_buff *skb)
  }
  EXPORT_SYMBOL(netif_rx_ni);
  
@@ -68251,7 +65054,7 @@ index 2bb4aa68..1ae6cf5 100644
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  
-@@ -3699,7 +3703,7 @@ void netif_napi_del(struct napi_struct *napi)
+@@ -3761,7 +3765,7 @@ void netif_napi_del(struct napi_struct *
  }
  EXPORT_SYMBOL(netif_napi_del);
  
@@ -68260,10 +65063,9 @@ index 2bb4aa68..1ae6cf5 100644
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff --git a/net/core/flow.c b/net/core/flow.c
-index 127c8a7..7815384 100644
---- a/net/core/flow.c
-+++ b/net/core/flow.c
+diff -urNp linux-3.0.3/net/core/flow.c linux-3.0.3/net/core/flow.c
+--- linux-3.0.3/net/core/flow.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/flow.c	2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
@@ -68273,7 +65075,7 @@ index 127c8a7..7815384 100644
  EXPORT_SYMBOL(flow_cache_genid);
  static struct flow_cache flow_cache_global;
  static struct kmem_cache *flow_cachep __read_mostly;
-@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
+@@ -85,7 +85,7 @@ static void flow_cache_new_hashrnd(unsig
  
  static int flow_entry_valid(struct flow_cache_entry *fle)
  {
@@ -68282,7 +65084,7 @@ index 127c8a7..7815384 100644
  		return 0;
  	if (fle->object && !fle->object->ops->check(fle->object))
  		return 0;
-@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
+@@ -253,7 +253,7 @@ flow_cache_lookup(struct net *net, const
  			hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
  			fcp->hash_count++;
  		}
@@ -68300,11 +65102,22 @@ index 127c8a7..7815384 100644
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff --git a/net/core/skbuff.c b/net/core/skbuff.c
-index e9f92489..55d1a69 100644
---- a/net/core/skbuff.c
-+++ b/net/core/skbuff.c
-@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset,
+diff -urNp linux-3.0.3/net/core/rtnetlink.c linux-3.0.3/net/core/rtnetlink.c
+--- linux-3.0.3/net/core/rtnetlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/rtnetlink.c	2011-08-23 21:47:56.000000000 -0400
+@@ -56,7 +56,7 @@
+ struct rtnl_link {
+ 	rtnl_doit_func		doit;
+ 	rtnl_dumpit_func	dumpit;
+-};
++} __no_const;
+ 
+ static DEFINE_MUTEX(rtnl_mutex);
+ 
+diff -urNp linux-3.0.3/net/core/skbuff.c linux-3.0.3/net/core/skbuff.c
+--- linux-3.0.3/net/core/skbuff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/skbuff.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
  	struct sock *sk = skb->sk;
  	int ret = 0;
  
@@ -68313,11 +65126,10 @@ index e9f92489..55d1a69 100644
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-diff --git a/net/core/sock.c b/net/core/sock.c
-index 7dfed79..fa3c089 100644
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+diff -urNp linux-3.0.3/net/core/sock.c linux-3.0.3/net/core/sock.c
+--- linux-3.0.3/net/core/sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/core/sock.c	2011-08-23 21:48:14.000000000 -0400
+@@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	 */
  	if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
  	    (unsigned)sk->sk_rcvbuf) {
@@ -68326,7 +65138,7 @@ index 7dfed79..fa3c089 100644
  		return -ENOMEM;
  	}
  
-@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -300,7 +300,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  		return err;
  
  	if (!sk_rmem_schedule(sk, skb->truesize)) {
@@ -68335,7 +65147,7 @@ index 7dfed79..fa3c089 100644
  		return -ENOBUFS;
  	}
  
-@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -320,7 +320,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
  	skb_dst_force(skb);
  
  	spin_lock_irqsave(&list->lock, flags);
@@ -68344,7 +65156,7 @@ index 7dfed79..fa3c089 100644
  	__skb_queue_tail(list, skb);
  	spin_unlock_irqrestore(&list->lock, flags);
  
-@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -340,7 +340,7 @@ int sk_receive_skb(struct sock *sk, stru
  	skb->dev = NULL;
  
  	if (sk_rcvqueues_full(sk, skb)) {
@@ -68353,7 +65165,7 @@ index 7dfed79..fa3c089 100644
  		goto discard_and_relse;
  	}
  	if (nested)
-@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+@@ -358,7 +358,7 @@ int sk_receive_skb(struct sock *sk, stru
  		mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
  	} else if (sk_add_backlog(sk, skb)) {
  		bh_unlock_sock(sk);
@@ -68362,7 +65174,16 @@ index 7dfed79..fa3c089 100644
  		goto discard_and_relse;
  	}
  
-@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -921,7 +921,7 @@ int sock_getsockopt(struct socket *sock,
+ 		if (len > sizeof(peercred))
+ 			len = sizeof(peercred);
+ 		cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
+-		if (copy_to_user(optval, &peercred, len))
++		if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
+ 			return -EFAULT;
+ 		goto lenout;
+ 	}
+@@ -934,7 +934,7 @@ int sock_getsockopt(struct socket *sock,
  			return -ENOTCONN;
  		if (lv < len)
  			return -EINVAL;
@@ -68371,7 +65192,7 @@ index 7dfed79..fa3c089 100644
  			return -EFAULT;
  		goto lenout;
  	}
-@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
+@@ -967,7 +967,7 @@ int sock_getsockopt(struct socket *sock,
  
  	if (len > lv)
  		len = lv;
@@ -68380,7 +65201,7 @@ index 7dfed79..fa3c089 100644
  		return -EFAULT;
  lenout:
  	if (put_user(len, optlen))
-@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
+@@ -2023,7 +2023,7 @@ void sock_init_data(struct socket *sock,
  	 */
  	smp_wmb();
  	atomic_set(&sk->sk_refcnt, 1);
@@ -68389,11 +65210,10 @@ index 7dfed79..fa3c089 100644
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
-index 28f8b5e..2e2c4f4 100644
---- a/net/decnet/sysctl_net_decnet.c
-+++ b/net/decnet/sysctl_net_decnet.c
-@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
+diff -urNp linux-3.0.3/net/decnet/sysctl_net_decnet.c linux-3.0.3/net/decnet/sysctl_net_decnet.c
+--- linux-3.0.3/net/decnet/sysctl_net_decnet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/decnet/sysctl_net_decnet.c	2011-08-23 21:47:56.000000000 -0400
+@@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
  	if (len > *lenp) len = *lenp;
  
@@ -68402,7 +65222,7 @@ index 28f8b5e..2e2c4f4 100644
  		return -EFAULT;
  
  	*lenp = len;
-@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
+@@ -236,7 +236,7 @@ static int dn_def_dev_handler(ctl_table 
  
  	if (len > *lenp) len = *lenp;
  
@@ -68411,10 +65231,9 @@ index 28f8b5e..2e2c4f4 100644
  		return -EFAULT;
  
  	*lenp = len;
-diff --git a/net/econet/Kconfig b/net/econet/Kconfig
-index 39a2d29..f39c0fe 100644
---- a/net/econet/Kconfig
-+++ b/net/econet/Kconfig
+diff -urNp linux-3.0.3/net/econet/Kconfig linux-3.0.3/net/econet/Kconfig
+--- linux-3.0.3/net/econet/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/econet/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -68424,11 +65243,49 @@ index 39a2d29..f39c0fe 100644
  	---help---
  	  Econet is a fairly old and slow networking protocol mainly used by
  	  Acorn computers to access file and print servers. It uses native
-diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
-index 2ada171..e74e680 100644
---- a/net/ipv4/inet_diag.c
-+++ b/net/ipv4/inet_diag.c
-@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
+diff -urNp linux-3.0.3/net/ipv4/fib_frontend.c linux-3.0.3/net/ipv4/fib_frontend.c
+--- linux-3.0.3/net/ipv4/fib_frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/fib_frontend.c	2011-08-23 21:47:56.000000000 -0400
+@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
+ #ifdef CONFIG_IP_ROUTE_MULTIPATH
+ 		fib_sync_up(dev);
+ #endif
+-		atomic_inc(&net->ipv4.dev_addr_genid);
++		atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ 		rt_cache_flush(dev_net(dev), -1);
+ 		break;
+ 	case NETDEV_DOWN:
+ 		fib_del_ifaddr(ifa, NULL);
+-		atomic_inc(&net->ipv4.dev_addr_genid);
++		atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ 		if (ifa->ifa_dev->ifa_list == NULL) {
+ 			/* Last address was deleted from this interface.
+ 			 * Disable IP.
+@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notif
+ #ifdef CONFIG_IP_ROUTE_MULTIPATH
+ 		fib_sync_up(dev);
+ #endif
+-		atomic_inc(&net->ipv4.dev_addr_genid);
++		atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
+ 		rt_cache_flush(dev_net(dev), -1);
+ 		break;
+ 	case NETDEV_DOWN:
+diff -urNp linux-3.0.3/net/ipv4/fib_semantics.c linux-3.0.3/net/ipv4/fib_semantics.c
+--- linux-3.0.3/net/ipv4/fib_semantics.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/fib_semantics.c	2011-08-23 21:47:56.000000000 -0400
+@@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
+ 	nh->nh_saddr = inet_select_addr(nh->nh_dev,
+ 					nh->nh_gw,
+ 					nh->nh_parent->fib_scope);
+-	nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
++	nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
+ 
+ 	return nh->nh_saddr;
+ }
+diff -urNp linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3/net/ipv4/inet_diag.c
+--- linux-3.0.3/net/ipv4/inet_diag.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/inet_diag.c	2011-08-23 21:48:14.000000000 -0400
+@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
  	r->idiag_retrans = 0;
  
  	r->id.idiag_if = sk->sk_bound_dev_if;
@@ -68443,7 +65300,7 @@ index 2ada171..e74e680 100644
  
  	r->id.idiag_sport = inet->inet_sport;
  	r->id.idiag_dport = inet->inet_dport;
-@@ -201,8 +207,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
+@@ -201,8 +207,15 @@ static int inet_twsk_diag_fill(struct in
  	r->idiag_family	      = tw->tw_family;
  	r->idiag_retrans      = 0;
  	r->id.idiag_if	      = tw->tw_bound_dev_if;
@@ -68459,7 +65316,7 @@ index 2ada171..e74e680 100644
  	r->id.idiag_sport     = tw->tw_sport;
  	r->id.idiag_dport     = tw->tw_dport;
  	r->id.idiag_src[0]    = tw->tw_rcv_saddr;
-@@ -285,12 +298,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
+@@ -285,12 +298,14 @@ static int inet_diag_get_exact(struct sk
  	if (sk == NULL)
  		goto unlock;
  
@@ -68474,7 +65331,7 @@ index 2ada171..e74e680 100644
  
  	err = -ENOMEM;
  	rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
-@@ -582,8 +597,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
+@@ -580,8 +595,14 @@ static int inet_diag_fill_req(struct sk_
  	r->idiag_retrans = req->retrans;
  
  	r->id.idiag_if = sk->sk_bound_dev_if;
@@ -68489,11 +65346,10 @@ index 2ada171..e74e680 100644
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
-index 3c0369a..f0d4292 100644
---- a/net/ipv4/inet_hashtables.c
-+++ b/net/ipv4/inet_hashtables.c
-@@ -18,11 +18,14 @@
+diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hashtables.c
+--- linux-3.0.3/net/ipv4/inet_hashtables.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv4/inet_hashtables.c	2011-08-23 21:55:24.000000000 -0400
+@@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
  #include <linux/wait.h>
@@ -68501,6 +65357,7 @@ index 3c0369a..f0d4292 100644
  
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
+ #include <net/secure_seq.h>
  #include <net/ip.h>
  
 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
@@ -68508,7 +65365,7 @@ index 3c0369a..f0d4292 100644
  /*
   * Allocate and initialize a new local port bind bucket.
   * The bindhash mutex for snum's hash chain must be held here.
-@@ -529,6 +532,8 @@ ok:
+@@ -530,6 +533,8 @@ ok:
  			twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
  		spin_unlock(&head->lock);
  
@@ -68517,35 +65374,33 @@ index 3c0369a..f0d4292 100644
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
-index 14af1b4..bf5f8c3 100644
---- a/net/ipv4/inetpeer.c
-+++ b/net/ipv4/inetpeer.c
-@@ -478,6 +478,8 @@ struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create)
- 	struct inet_peer_base *base = family_to_base(daddr->family);
- 	struct inet_peer *p;
+diff -urNp linux-3.0.3/net/ipv4/inetpeer.c linux-3.0.3/net/ipv4/inetpeer.c
+--- linux-3.0.3/net/ipv4/inetpeer.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv4/inetpeer.c	2011-08-23 21:48:14.000000000 -0400
+@@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
+ 	unsigned int sequence;
+ 	int invalidated, newrefcnt = 0;
  
 +	pax_track_stack();
 +
  	/* Look up for the address quickly, lockless.
  	 * Because of a concurrent writer, we might not find an existing entry.
  	 */
-@@ -509,8 +511,8 @@ struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create)
+@@ -517,8 +519,8 @@ found:		/* The existing node has been fo
  	if (p) {
  		p->daddr = *daddr;
  		atomic_set(&p->refcnt, 1);
 -		atomic_set(&p->rid, 0);
--		atomic_set(&p->ip_id_count, secure_ip_id(daddr->a4));
+-		atomic_set(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
 +		atomic_set_unchecked(&p->rid, 0);
-+		atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->a4));
++		atomic_set_unchecked(&p->ip_id_count, secure_ip_id(daddr->addr.a4));
  		p->tcp_ts_stamp = 0;
- 		INIT_LIST_HEAD(&p->unused);
- 
-diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
-index b1d282f..b58b669 100644
---- a/net/ipv4/ip_fragment.c
-+++ b/net/ipv4/ip_fragment.c
-@@ -297,7 +297,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
+ 		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
+ 		p->rate_tokens = 0;
+diff -urNp linux-3.0.3/net/ipv4/ip_fragment.c linux-3.0.3/net/ipv4/ip_fragment.c
+--- linux-3.0.3/net/ipv4/ip_fragment.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/ip_fragment.c	2011-08-23 21:47:56.000000000 -0400
+@@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
  		return 0;
  
  	start = qp->rid;
@@ -68554,11 +65409,10 @@ index b1d282f..b58b669 100644
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
-index 3948c86..b93dee5 100644
---- a/net/ipv4/ip_sockglue.c
-+++ b/net/ipv4/ip_sockglue.c
-@@ -1064,6 +1064,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
+diff -urNp linux-3.0.3/net/ipv4/ip_sockglue.c linux-3.0.3/net/ipv4/ip_sockglue.c
+--- linux-3.0.3/net/ipv4/ip_sockglue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/ip_sockglue.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
  
@@ -68567,11 +65421,20 @@ index 3948c86..b93dee5 100644
  	if (level != SOL_IP)
  		return -EOPNOTSUPP;
  
-diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
-index ee5f419..89f117d 100644
---- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
-+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
-@@ -398,7 +398,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
+@@ -1110,7 +1112,8 @@ static int do_ip_getsockopt(struct sock 
+ 		len = min_t(unsigned int, len, opt->optlen);
+ 		if (put_user(len, optlen))
+ 			return -EFAULT;
+-		if (copy_to_user(optval, opt->__data, len))
++		if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
++		    copy_to_user(optval, opt->__data, len))
+ 			return -EFAULT;
+ 		return 0;
+ 	}
+diff -urNp linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-08-23 21:47:56.000000000 -0400
+@@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
  	*len = 0;
  
@@ -68580,11 +65443,22 @@ index ee5f419..89f117d 100644
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
-index 6390ba2..b561dc4 100644
---- a/net/ipv4/raw.c
-+++ b/net/ipv4/raw.c
-@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
+diff -urNp linux-3.0.3/net/ipv4/ping.c linux-3.0.3/net/ipv4/ping.c
+--- linux-3.0.3/net/ipv4/ping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/ping.c	2011-08-23 21:47:56.000000000 -0400
+@@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
+ 		sk_rmem_alloc_get(sp),
+ 		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
+ 		atomic_read(&sp->sk_refcnt), sp,
+-		atomic_read(&sp->sk_drops), len);
++		atomic_read_unchecked(&sp->sk_drops), len);
+ }
+ 
+ static int ping_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-3.0.3/net/ipv4/raw.c linux-3.0.3/net/ipv4/raw.c
+--- linux-3.0.3/net/ipv4/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/raw.c	2011-08-23 21:48:14.000000000 -0400
+@@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
  	if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -68593,7 +65467,7 @@ index 6390ba2..b561dc4 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -724,15 +724,19 @@ static int raw_init(struct sock *sk)
+@@ -736,16 +736,20 @@ static int raw_init(struct sock *sk)
  
  static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
  {
@@ -68604,28 +65478,30 @@ index 6390ba2..b561dc4 100644
 -	if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
 +	if (copy_from_user(&filter, optval, optlen))
  		return -EFAULT;
-+	memcpy(&raw_sk(sk)->filter, &filter, sizeof(filter));
++	raw_sk(sk)->filter = filter;
  	return 0;
  }
  
  static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
  {
-+	struct icmp_filter filter;
  	int len, ret = -EFAULT;
++	struct icmp_filter filter;
  
  	if (get_user(len, optlen))
-@@ -743,8 +747,9 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
+ 		goto out;
+@@ -755,8 +759,9 @@ static int raw_geticmpfilter(struct sock
  	if (len > sizeof(struct icmp_filter))
  		len = sizeof(struct icmp_filter);
  	ret = -EFAULT;
-+	memcpy(&filter, &raw_sk(sk)->filter, len);
- 	if (put_user(len, optlen) ||
+-	if (put_user(len, optlen) ||
 -	    copy_to_user(optval, &raw_sk(sk)->filter, len))
++	filter = raw_sk(sk)->filter;
++	if (put_user(len, optlen) || len > sizeof filter ||
 +	    copy_to_user(optval, &filter, len))
  		goto out;
  	ret = 0;
  out:	return ret;
-@@ -972,7 +977,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+@@ -984,7 +989,13 @@ static void raw_sock_seq_show(struct seq
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -68640,11 +65516,10 @@ index 6390ba2..b561dc4 100644
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff --git a/net/ipv4/route.c b/net/ipv4/route.c
-index fabfe81..667c31b 100644
---- a/net/ipv4/route.c
-+++ b/net/ipv4/route.c
-@@ -270,7 +270,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
+diff -urNp linux-3.0.3/net/ipv4/route.c linux-3.0.3/net/ipv4/route.c
+--- linux-3.0.3/net/ipv4/route.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv4/route.c	2011-08-23 21:47:56.000000000 -0400
+@@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
  {
@@ -68653,7 +65528,7 @@ index fabfe81..667c31b 100644
  }
  
  #ifdef CONFIG_PROC_FS
-@@ -895,7 +895,7 @@ static void rt_cache_invalidate(struct net *net)
+@@ -833,7 +833,7 @@ static void rt_cache_invalidate(struct n
  	unsigned char shuffle;
  
  	get_random_bytes(&shuffle, sizeof(shuffle));
@@ -68662,20 +65537,19 @@ index fabfe81..667c31b 100644
  }
  
  /*
-@@ -2857,7 +2857,7 @@ static int rt_fill_info(struct net *net,
- 	expires = rt->dst.expires ? rt->dst.expires - jiffies : 0;
- 	if (rt->peer) {
+@@ -2834,7 +2834,7 @@ static int rt_fill_info(struct net *net,
+ 	error = rt->dst.error;
+ 	if (peer) {
  		inet_peer_refcheck(rt->peer);
--		id = atomic_read(&rt->peer->ip_id_count) & 0xffff;
-+		id = atomic_read_unchecked(&rt->peer->ip_id_count) & 0xffff;
- 		if (rt->peer->tcp_ts_stamp) {
- 			ts = rt->peer->tcp_ts;
- 			tsage = get_seconds() - rt->peer->tcp_ts_stamp;
-diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
-index 6c11eec..6e50fa7 100644
---- a/net/ipv4/tcp.c
-+++ b/net/ipv4/tcp.c
-@@ -2121,6 +2121,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
+-		id = atomic_read(&peer->ip_id_count) & 0xffff;
++		id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
+ 		if (peer->tcp_ts_stamp) {
+ 			ts = peer->tcp_ts;
+ 			tsage = get_seconds() - peer->tcp_ts_stamp;
+diff -urNp linux-3.0.3/net/ipv4/tcp.c linux-3.0.3/net/ipv4/tcp.c
+--- linux-3.0.3/net/ipv4/tcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
  	int val;
  	int err = 0;
  
@@ -68684,7 +65558,7 @@ index 6c11eec..6e50fa7 100644
  	/* These are data/string values, all the others are ints */
  	switch (optname) {
  	case TCP_CONGESTION: {
-@@ -2500,6 +2502,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
+@@ -2501,6 +2503,8 @@ static int do_tcp_getsockopt(struct sock
  	struct tcp_sock *tp = tcp_sk(sk);
  	int val, len;
  
@@ -68693,11 +65567,10 @@ index 6c11eec..6e50fa7 100644
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
-index 02f583b..a47bcb8 100644
---- a/net/ipv4/tcp_ipv4.c
-+++ b/net/ipv4/tcp_ipv4.c
-@@ -86,6 +86,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
+diff -urNp linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3/net/ipv4/tcp_ipv4.c
+--- linux-3.0.3/net/ipv4/tcp_ipv4.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp_ipv4.c	2011-08-23 21:48:14.000000000 -0400
+@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
  
@@ -68707,7 +65580,7 @@ index 02f583b..a47bcb8 100644
  
  #ifdef CONFIG_TCP_MD5SIG
  static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
-@@ -1593,6 +1596,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1607,6 +1610,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc
  	return 0;
  
  reset:
@@ -68717,7 +65590,7 @@ index 02f583b..a47bcb8 100644
  	tcp_v4_send_reset(rsk, skb);
  discard:
  	kfree_skb(skb);
-@@ -1655,12 +1661,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
+@@ -1669,12 +1675,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
  	TCP_SKB_CB(skb)->sacked	 = 0;
  
  	sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -68740,7 +65613,7 @@ index 02f583b..a47bcb8 100644
  
  	if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1710,6 +1723,10 @@ no_tcp_socket:
+@@ -1724,6 +1737,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -68751,7 +65624,7 @@ index 02f583b..a47bcb8 100644
  		tcp_v4_send_reset(NULL, skb);
  	}
  
-@@ -2373,7 +2390,11 @@ static void get_openreq4(struct sock *sk, struct request_sock *req,
+@@ -2388,7 +2405,11 @@ static void get_openreq4(struct sock *sk
  		0,  /* non standard timer */
  		0, /* open_requests have no inode */
  		atomic_read(&sk->sk_refcnt),
@@ -68763,7 +65636,7 @@ index 02f583b..a47bcb8 100644
  		len);
  }
  
-@@ -2423,7 +2444,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
+@@ -2438,7 +2459,12 @@ static void get_tcp4_sock(struct sock *s
  		sock_i_uid(sk),
  		icsk->icsk_probes_out,
  		sock_i_ino(sk),
@@ -68777,8 +65650,8 @@ index 02f583b..a47bcb8 100644
  		jiffies_to_clock_t(icsk->icsk_rto),
  		jiffies_to_clock_t(icsk->icsk_ack.ato),
  		(icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
-@@ -2451,7 +2477,13 @@ static void get_timewait4_sock(struct inet_timewait_sock *tw,
- 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
+@@ -2466,7 +2492,13 @@ static void get_timewait4_sock(struct in
+ 		" %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
  		i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
  		3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
 -		atomic_read(&tw->tw_refcnt), tw, len);
@@ -68792,10 +65665,9 @@ index 02f583b..a47bcb8 100644
  }
  
  #define TMPSZ 150
-diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index 80b1f80..9501f25 100644
---- a/net/ipv4/tcp_minisocks.c
-+++ b/net/ipv4/tcp_minisocks.c
+diff -urNp linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3/net/ipv4/tcp_minisocks.c
+--- linux-3.0.3/net/ipv4/tcp_minisocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp_minisocks.c	2011-08-23 21:48:14.000000000 -0400
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -68818,11 +65690,10 @@ index 80b1f80..9501f25 100644
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index 8b0d016..a35e4b4 100644
---- a/net/ipv4/tcp_output.c
-+++ b/net/ipv4/tcp_output.c
-@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
+diff -urNp linux-3.0.3/net/ipv4/tcp_output.c linux-3.0.3/net/ipv4/tcp_output.c
+--- linux-3.0.3/net/ipv4/tcp_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp_output.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
  	int mss;
  	int s_data_desired = 0;
  
@@ -68831,11 +65702,10 @@ index 8b0d016..a35e4b4 100644
  	if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
  		s_data_desired = cvp->s_data_desired;
  	skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
-index 85ee7eb..53277ab 100644
---- a/net/ipv4/tcp_probe.c
-+++ b/net/ipv4/tcp_probe.c
-@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
+diff -urNp linux-3.0.3/net/ipv4/tcp_probe.c linux-3.0.3/net/ipv4/tcp_probe.c
+--- linux-3.0.3/net/ipv4/tcp_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp_probe.c	2011-08-23 21:47:56.000000000 -0400
+@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
  		if (cnt + width >= len)
  			break;
  
@@ -68844,10 +65714,9 @@ index 85ee7eb..53277ab 100644
  			return -EFAULT;
  		cnt += width;
  	}
-diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index 74a6aa0..c66db06 100644
---- a/net/ipv4/tcp_timer.c
-+++ b/net/ipv4/tcp_timer.c
+diff -urNp linux-3.0.3/net/ipv4/tcp_timer.c linux-3.0.3/net/ipv4/tcp_timer.c
+--- linux-3.0.3/net/ipv4/tcp_timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/tcp_timer.c	2011-08-23 21:48:14.000000000 -0400
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -68859,7 +65728,7 @@ index 74a6aa0..c66db06 100644
  int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
  int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
  int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
-@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
+@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock
  		}
  	}
  
@@ -68873,10 +65742,9 @@ index 74a6aa0..c66db06 100644
  	if (retransmits_timed_out(sk, retry_until,
  				  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
-diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
-index 8157b17..49c8ef3 100644
---- a/net/ipv4/udp.c
-+++ b/net/ipv4/udp.c
+diff -urNp linux-3.0.3/net/ipv4/udp.c linux-3.0.3/net/ipv4/udp.c
+--- linux-3.0.3/net/ipv4/udp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv4/udp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -68906,7 +65774,7 @@ index 8157b17..49c8ef3 100644
  /*
   * This routine is called by the ICMP module when it gets some
   * sort of error condition.  If err < 0 then the socket should
-@@ -832,9 +840,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
+@@ -855,9 +863,18 @@ int udp_sendmsg(struct kiocb *iocb, stru
  		dport = usin->sin_port;
  		if (dport == 0)
  			return -EINVAL;
@@ -68925,7 +65793,7 @@ index 8157b17..49c8ef3 100644
  		daddr = inet->inet_daddr;
  		dport = inet->inet_dport;
  		/* Open fast path for connected socket.
-@@ -1053,7 +1070,7 @@ static unsigned int first_packet_length(struct sock *sk)
+@@ -1098,7 +1115,7 @@ static unsigned int first_packet_length(
  		udp_lib_checksum_complete(skb)) {
  		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
  				 IS_UDPLITE(sk));
@@ -68934,7 +65802,7 @@ index 8157b17..49c8ef3 100644
  		__skb_unlink(skb, rcvq);
  		__skb_queue_tail(&list_kill, skb);
  	}
-@@ -1139,6 +1156,10 @@ try_again:
+@@ -1184,6 +1201,10 @@ try_again:
  	if (!skb)
  		goto out;
  
@@ -68945,7 +65813,7 @@ index 8157b17..49c8ef3 100644
  	ulen = skb->len - sizeof(struct udphdr);
  	if (len > ulen)
  		len = ulen;
-@@ -1435,7 +1456,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
+@@ -1483,7 +1504,7 @@ int udp_queue_rcv_skb(struct sock *sk, s
  
  drop:
  	UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
@@ -68954,7 +65822,7 @@ index 8157b17..49c8ef3 100644
  	kfree_skb(skb);
  	return -1;
  }
-@@ -1454,7 +1475,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -1502,7 +1523,7 @@ static void flush_stack(struct sock **st
  			skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
  
  		if (!skb1) {
@@ -68963,7 +65831,7 @@ index 8157b17..49c8ef3 100644
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
  					 IS_UDPLITE(sk));
  			UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
-@@ -1623,6 +1644,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -1671,6 +1692,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, 
  		goto csum_error;
  
  	UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
@@ -68973,7 +65841,7 @@ index 8157b17..49c8ef3 100644
  	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
  
  	/*
-@@ -2050,8 +2074,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
+@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock
  		sk_wmem_alloc_get(sp),
  		sk_rmem_alloc_get(sp),
  		0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -68989,11 +65857,10 @@ index 8157b17..49c8ef3 100644
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
-index e46305d..3e5a6cb 100644
---- a/net/ipv6/inet6_connection_sock.c
-+++ b/net/ipv6/inet6_connection_sock.c
-@@ -183,7 +183,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
+diff -urNp linux-3.0.3/net/ipv6/inet6_connection_sock.c linux-3.0.3/net/ipv6/inet6_connection_sock.c
+--- linux-3.0.3/net/ipv6/inet6_connection_sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv6/inet6_connection_sock.c	2011-08-23 21:47:56.000000000 -0400
+@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
  	{
  		struct rt6_info *rt = (struct rt6_info  *)dst;
@@ -69002,7 +65869,7 @@ index e46305d..3e5a6cb 100644
  	}
  #endif
  }
-@@ -198,7 +198,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
+@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(
  #ifdef CONFIG_XFRM
  	if (dst) {
  		struct rt6_info *rt = (struct rt6_info *)dst;
@@ -69011,24 +65878,10 @@ index e46305d..3e5a6cb 100644
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
-index 633a6c2..b531972 100644
---- a/net/ipv6/inet6_hashtables.c
-+++ b/net/ipv6/inet6_hashtables.c
-@@ -124,7 +124,7 @@ out:
- }
- EXPORT_SYMBOL(__inet6_lookup_established);
- 
--static int inline compute_score(struct sock *sk, struct net *net,
-+static inline int compute_score(struct sock *sk, struct net *net,
- 				const unsigned short hnum,
- 				const struct in6_addr *daddr,
- 				const int dif)
-diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
-index d1770e0..4d7e68e 100644
---- a/net/ipv6/ipv6_sockglue.c
-+++ b/net/ipv6/ipv6_sockglue.c
-@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
+diff -urNp linux-3.0.3/net/ipv6/ipv6_sockglue.c linux-3.0.3/net/ipv6/ipv6_sockglue.c
+--- linux-3.0.3/net/ipv6/ipv6_sockglue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv6/ipv6_sockglue.c	2011-08-23 21:48:14.000000000 -0400
+@@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
  
@@ -69037,7 +65890,7 @@ index d1770e0..4d7e68e 100644
  	if (optval == NULL)
  		val=0;
  	else {
-@@ -919,6 +921,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
+@@ -919,6 +921,8 @@ static int do_ipv6_getsockopt(struct soc
  	int len;
  	int val;
  
@@ -69046,11 +65899,10 @@ index d1770e0..4d7e68e 100644
  	if (ip6_mroute_opt(optname))
  		return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
-index c5b0915..ad59e5b 100644
---- a/net/ipv6/raw.c
-+++ b/net/ipv6/raw.c
-@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb)
+diff -urNp linux-3.0.3/net/ipv6/raw.c linux-3.0.3/net/ipv6/raw.c
+--- linux-3.0.3/net/ipv6/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/ipv6/raw.c	2011-08-23 21:48:14.000000000 -0400
+@@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
  	if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
  	    skb_checksum_complete(skb)) {
@@ -69059,7 +65911,7 @@ index c5b0915..ad59e5b 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk
  	struct raw6_sock *rp = raw6_sk(sk);
  
  	if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
@@ -69068,7 +65920,7 @@ index c5b0915..ad59e5b 100644
  		kfree_skb(skb);
  		return NET_RX_DROP;
  	}
-@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk
  
  	if (inet->hdrincl) {
  		if (skb_checksum_complete(skb)) {
@@ -69077,16 +65929,16 @@ index c5b0915..ad59e5b 100644
  			kfree_skb(skb);
  			return NET_RX_DROP;
  		}
-@@ -602,7 +602,7 @@ out:
+@@ -601,7 +601,7 @@ out:
  	return err;
  }
  
 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
- 			struct flowi *fl, struct dst_entry **dstp,
+ 			struct flowi6 *fl6, struct dst_entry **dstp,
  			unsigned int flags)
  {
-@@ -743,6 +743,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
+@@ -742,6 +742,8 @@ static int rawv6_sendmsg(struct kiocb *i
  	u16 proto;
  	int err;
  
@@ -69095,7 +65947,7 @@ index c5b0915..ad59e5b 100644
  	/* Rough check on arithmetic overflow,
  	   better check is made in ip6_append_data().
  	 */
-@@ -919,12 +921,15 @@ do_confirm:
+@@ -909,12 +911,15 @@ do_confirm:
  static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
  			       char __user *optval, int optlen)
  {
@@ -69108,29 +65960,29 @@ index c5b0915..ad59e5b 100644
 -		if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
 +		if (copy_from_user(&filter, optval, optlen))
  			return -EFAULT;
-+		memcpy(&raw6_sk(sk)->filter, &filter, optlen);
++		raw6_sk(sk)->filter = filter;
  		return 0;
  	default:
  		return -ENOPROTOOPT;
-@@ -936,6 +941,7 @@ static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
- static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+@@ -927,6 +932,7 @@ static int rawv6_geticmpfilter(struct so
  			       char __user *optval, int __user *optlen)
  {
-+	struct icmp6_filter filter;
  	int len;
++	struct icmp6_filter filter;
  
  	switch (optname) {
-@@ -948,7 +954,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
+ 	case ICMPV6_FILTER:
+@@ -938,7 +944,8 @@ static int rawv6_geticmpfilter(struct so
  			len = sizeof(struct icmp6_filter);
  		if (put_user(len, optlen))
  			return -EFAULT;
 -		if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
-+		memcpy(&filter, &raw6_sk(sk)->filter, len);
-+		if (copy_to_user(optval, &filter, len))
++		filter = raw6_sk(sk)->filter;
++		if (len > sizeof filter || copy_to_user(optval, &filter, len))
  			return -EFAULT;
  		return 0;
  	default:
-@@ -1262,7 +1269,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
+@@ -1252,7 +1259,13 @@ static void raw6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
@@ -69145,11 +65997,10 @@ index c5b0915..ad59e5b 100644
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
-index 20aa95e..00c2670 100644
---- a/net/ipv6/tcp_ipv6.c
-+++ b/net/ipv6/tcp_ipv6.c
-@@ -92,6 +92,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
+diff -urNp linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3/net/ipv6/tcp_ipv6.c
+--- linux-3.0.3/net/ipv6/tcp_ipv6.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv6/tcp_ipv6.c	2011-08-23 21:48:14.000000000 -0400
+@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
  
@@ -69160,7 +66011,7 @@ index 20aa95e..00c2670 100644
  static void tcp_v6_hash(struct sock *sk)
  {
  	if (sk->sk_state != TCP_CLOSE) {
-@@ -1676,6 +1680,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -1662,6 +1666,9 @@ static int tcp_v6_do_rcv(struct sock *sk
  	return 0;
  
  reset:
@@ -69170,7 +66021,7 @@ index 20aa95e..00c2670 100644
  	tcp_v6_send_reset(sk, skb);
  discard:
  	if (opt_skb)
-@@ -1755,12 +1762,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
+@@ -1741,12 +1748,20 @@ static int tcp_v6_rcv(struct sk_buff *sk
  	TCP_SKB_CB(skb)->sacked = 0;
  
  	sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
@@ -69193,7 +66044,7 @@ index 20aa95e..00c2670 100644
  
  	if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
  		NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
-@@ -1808,6 +1823,10 @@ no_tcp_socket:
+@@ -1794,6 +1809,10 @@ no_tcp_socket:
  bad_packet:
  		TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
  	} else {
@@ -69204,7 +66055,7 @@ index 20aa95e..00c2670 100644
  		tcp_v6_send_reset(NULL, skb);
  	}
  
-@@ -2068,7 +2087,13 @@ static void get_openreq6(struct seq_file *seq,
+@@ -2054,7 +2073,13 @@ static void get_openreq6(struct seq_file
  		   uid,
  		   0,  /* non standard timer */
  		   0, /* open_requests have no inode */
@@ -69219,7 +66070,7 @@ index 20aa95e..00c2670 100644
  }
  
  static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
-@@ -2118,7 +2143,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
+@@ -2104,7 +2129,12 @@ static void get_tcp6_sock(struct seq_fil
  		   sock_i_uid(sp),
  		   icsk->icsk_probes_out,
  		   sock_i_ino(sp),
@@ -69233,7 +66084,7 @@ index 20aa95e..00c2670 100644
  		   jiffies_to_clock_t(icsk->icsk_rto),
  		   jiffies_to_clock_t(icsk->icsk_ack.ato),
  		   (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
-@@ -2153,7 +2183,13 @@ static void get_timewait6_sock(struct seq_file *seq,
+@@ -2139,7 +2169,13 @@ static void get_timewait6_sock(struct se
  		   dest->s6_addr32[2], dest->s6_addr32[3], destp,
  		   tw->tw_substate, 0, 0,
  		   3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
@@ -69248,10 +66099,9 @@ index 20aa95e..00c2670 100644
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
-index 6703f8b..0278fbd 100644
---- a/net/ipv6/udp.c
-+++ b/net/ipv6/udp.c
+diff -urNp linux-3.0.3/net/ipv6/udp.c linux-3.0.3/net/ipv6/udp.c
+--- linux-3.0.3/net/ipv6/udp.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/ipv6/udp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -69263,7 +66113,7 @@ index 6703f8b..0278fbd 100644
  int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
  {
  	const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
-@@ -542,7 +546,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
+@@ -548,7 +552,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
  
  	return 0;
  drop:
@@ -69272,7 +66122,7 @@ index 6703f8b..0278fbd 100644
  drop_no_sk_drops_inc:
  	UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
  	kfree_skb(skb);
-@@ -618,7 +622,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
+@@ -624,7 +628,7 @@ static void flush_stack(struct sock **st
  			continue;
  		}
  drop:
@@ -69281,7 +66131,7 @@ index 6703f8b..0278fbd 100644
  		UDP6_INC_STATS_BH(sock_net(sk),
  				UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
  		UDP6_INC_STATS_BH(sock_net(sk),
-@@ -773,6 +777,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -779,6 +783,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
  		UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
  				proto == IPPROTO_UDPLITE);
  
@@ -69291,7 +66141,7 @@ index 6703f8b..0278fbd 100644
  		icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
  
  		kfree_skb(skb);
-@@ -789,7 +796,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
+@@ -795,7 +802,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, 
  	if (!sock_owned_by_user(sk))
  		udpv6_queue_rcv_skb(sk, skb);
  	else if (sk_add_backlog(sk, skb)) {
@@ -69300,7 +66150,7 @@ index 6703f8b..0278fbd 100644
  		bh_unlock_sock(sk);
  		sock_put(sk);
  		goto discard;
-@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
+@@ -1406,8 +1413,13 @@ static void udp6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
@@ -69316,11 +66166,10 @@ index 6703f8b..0278fbd 100644
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
-index a39cca8..7601f54 100644
---- a/net/irda/ircomm/ircomm_tty.c
-+++ b/net/irda/ircomm/ircomm_tty.c
-@@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+diff -urNp linux-3.0.3/net/irda/ircomm/ircomm_tty.c linux-3.0.3/net/irda/ircomm/ircomm_tty.c
+--- linux-3.0.3/net/irda/ircomm/ircomm_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/irda/ircomm/ircomm_tty.c	2011-08-23 21:47:56.000000000 -0400
+@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
  	add_wait_queue(&self->open_wait, &wait);
  
  	IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
@@ -69340,7 +66189,7 @@ index a39cca8..7601f54 100644
  
  	while (1) {
  		if (tty->termios->c_cflag & CBAUD) {
-@@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(st
  		}
  
  		IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
@@ -69349,7 +66198,7 @@ index a39cca8..7601f54 100644
  
  		schedule();
  	}
-@@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
+@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(st
  	if (extra_count) {
  		/* ++ is not atomic, so this should be protected - Jean II */
  		spin_lock_irqsave(&self->spinlock, flags);
@@ -69366,7 +66215,7 @@ index a39cca8..7601f54 100644
  
  	if (!retval)
  		self->flags |= ASYNC_NORMAL_ACTIVE;
-@@ -416,14 +416,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
+@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_st
  	}
  	/* ++ is not atomic, so this should be protected - Jean II */
  	spin_lock_irqsave(&self->spinlock, flags);
@@ -69383,7 +66232,7 @@ index a39cca8..7601f54 100644
  
  	/* Not really used by us, but lets do it anyway */
  	self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
-@@ -509,7 +509,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_
  		return;
  	}
  
@@ -69392,7 +66241,7 @@ index a39cca8..7601f54 100644
  		/*
  		 * Uh, oh.  tty->count is 1, which means that the tty
  		 * structure will be freed.  state->count should always
-@@ -519,16 +519,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_
  		 */
  		IRDA_DEBUG(0, "%s(), bad serial port count; "
  			   "tty->count is 1, state->count is %d\n", __func__ ,
@@ -69415,7 +66264,7 @@ index a39cca8..7601f54 100644
  		spin_unlock_irqrestore(&self->spinlock, flags);
  
  		IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
-@@ -560,7 +560,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
+@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_
  	tty->closing = 0;
  	self->tty = NULL;
  
@@ -69424,7 +66273,7 @@ index a39cca8..7601f54 100644
  		if (self->close_delay)
  			schedule_timeout_interruptible(self->close_delay);
  		wake_up_interruptible(&self->open_wait);
-@@ -1012,7 +1012,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
+@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty
  	spin_lock_irqsave(&self->spinlock, flags);
  	self->flags &= ~ASYNC_NORMAL_ACTIVE;
  	self->tty = NULL;
@@ -69433,7 +66282,7 @@ index a39cca8..7601f54 100644
  	spin_unlock_irqrestore(&self->spinlock, flags);
  
  	wake_up_interruptible(&self->open_wait);
-@@ -1364,7 +1364,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
+@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct 
  	seq_putc(m, '\n');
  
  	seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
@@ -69442,11 +66291,10 @@ index a39cca8..7601f54 100644
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
-index 9637e45..53cdc8e 100644
---- a/net/iucv/af_iucv.c
-+++ b/net/iucv/af_iucv.c
-@@ -653,10 +653,10 @@ static int iucv_sock_autobind(struct sock *sk)
+diff -urNp linux-3.0.3/net/iucv/af_iucv.c linux-3.0.3/net/iucv/af_iucv.c
+--- linux-3.0.3/net/iucv/af_iucv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/iucv/af_iucv.c	2011-08-23 21:47:56.000000000 -0400
+@@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
  
  	write_lock_bh(&iucv_sk_list.lock);
  
@@ -69459,11 +66307,10 @@ index 9637e45..53cdc8e 100644
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff --git a/net/key/af_key.c b/net/key/af_key.c
-index d87c22d..f38e373 100644
---- a/net/key/af_key.c
-+++ b/net/key/af_key.c
-@@ -2470,6 +2470,8 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
+diff -urNp linux-3.0.3/net/key/af_key.c linux-3.0.3/net/key/af_key.c
+--- linux-3.0.3/net/key/af_key.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/key/af_key.c	2011-08-23 21:48:14.000000000 -0400
+@@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
  	struct xfrm_migrate m[XFRM_MAX_DEPTH];
  	struct xfrm_kmaddress k;
  
@@ -69472,7 +66319,7 @@ index d87c22d..f38e373 100644
  	if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
  				     ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
  	    !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
-@@ -3003,10 +3005,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, struct km_e
+@@ -3016,10 +3018,10 @@ static int pfkey_send_policy_notify(stru
  static u32 get_acqseq(void)
  {
  	u32 res;
@@ -69485,48 +66332,76 @@ index d87c22d..f38e373 100644
  	} while (!res);
  	return res;
  }
-@@ -3644,7 +3646,11 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
- 		seq_printf(f ,"sk       RefCnt Rmem   Wmem   User   Inode\n");
- 	else
- 		seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			       NULL,
-+#else
- 			       s,
-+#endif
- 			       atomic_read(&s->sk_refcnt),
- 			       sk_rmem_alloc_get(s),
- 			       sk_wmem_alloc_get(s),
-diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
-index c35dcf7..419613c 100644
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -1943,7 +1943,7 @@ static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant)
- 	return drv_get_antenna(local, tx_ant, rx_ant);
- }
- 
--struct cfg80211_ops mac80211_config_ops = {
-+const struct cfg80211_ops mac80211_config_ops = {
- 	.add_virtual_intf = ieee80211_add_iface,
- 	.del_virtual_intf = ieee80211_del_iface,
- 	.change_virtual_intf = ieee80211_change_iface,
-diff --git a/net/mac80211/cfg.h b/net/mac80211/cfg.h
-index 7d7879f..2d51f62 100644
---- a/net/mac80211/cfg.h
-+++ b/net/mac80211/cfg.h
-@@ -4,6 +4,6 @@
- #ifndef __CFG_H
- #define __CFG_H
- 
--extern struct cfg80211_ops mac80211_config_ops;
-+extern const struct cfg80211_ops mac80211_config_ops;
- 
- #endif /* __CFG_H */
-diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
-index c04a139..87e581f 100644
---- a/net/mac80211/debugfs_sta.c
-+++ b/net/mac80211/debugfs_sta.c
-@@ -115,6 +115,8 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
+diff -urNp linux-3.0.3/net/lapb/lapb_iface.c linux-3.0.3/net/lapb/lapb_iface.c
+--- linux-3.0.3/net/lapb/lapb_iface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/lapb/lapb_iface.c	2011-08-23 21:47:56.000000000 -0400
+@@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
+ 		goto out;
+ 
+ 	lapb->dev       = dev;
+-	lapb->callbacks = *callbacks;
++	lapb->callbacks = callbacks;
+ 
+ 	__lapb_insert_cb(lapb);
+ 
+@@ -380,32 +380,32 @@ int lapb_data_received(struct net_device
+ 
+ void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_confirmation)
+-		lapb->callbacks.connect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->connect_confirmation)
++		lapb->callbacks->connect_confirmation(lapb->dev, reason);
+ }
+ 
+ void lapb_connect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.connect_indication)
+-		lapb->callbacks.connect_indication(lapb->dev, reason);
++	if (lapb->callbacks->connect_indication)
++		lapb->callbacks->connect_indication(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_confirmation)
+-		lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_confirmation)
++		lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
+ }
+ 
+ void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
+ {
+-	if (lapb->callbacks.disconnect_indication)
+-		lapb->callbacks.disconnect_indication(lapb->dev, reason);
++	if (lapb->callbacks->disconnect_indication)
++		lapb->callbacks->disconnect_indication(lapb->dev, reason);
+ }
+ 
+ int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
+ {
+-	if (lapb->callbacks.data_indication)
+-		return lapb->callbacks.data_indication(lapb->dev, skb);
++	if (lapb->callbacks->data_indication)
++		return lapb->callbacks->data_indication(lapb->dev, skb);
+ 
+ 	kfree_skb(skb);
+ 	return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
+@@ -415,8 +415,8 @@ int lapb_data_transmit(struct lapb_cb *l
+ {
+ 	int used = 0;
+ 
+-	if (lapb->callbacks.data_transmit) {
+-		lapb->callbacks.data_transmit(lapb->dev, skb);
++	if (lapb->callbacks->data_transmit) {
++		lapb->callbacks->data_transmit(lapb->dev, skb);
+ 		used = 1;
+ 	}
+ 
+diff -urNp linux-3.0.3/net/mac80211/debugfs_sta.c linux-3.0.3/net/mac80211/debugfs_sta.c
+--- linux-3.0.3/net/mac80211/debugfs_sta.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/debugfs_sta.c	2011-08-23 21:48:14.000000000 -0400
+@@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
  	struct tid_ampdu_rx *tid_rx;
  	struct tid_ampdu_tx *tid_tx;
  
@@ -69535,7 +66410,7 @@ index c04a139..87e581f 100644
  	rcu_read_lock();
  
  	p += scnprintf(p, sizeof(buf) + buf - p, "next dialog_token: %#02x\n",
-@@ -215,6 +217,8 @@ static ssize_t sta_ht_capa_read(struct file *file, char __user *userbuf,
+@@ -240,6 +242,8 @@ static ssize_t sta_ht_capa_read(struct f
  	struct sta_info *sta = file->private_data;
  	struct ieee80211_sta_ht_cap *htc = &sta->sta.ht_cap;
  
@@ -69544,10 +66419,9 @@ index c04a139..87e581f 100644
  	p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
  			htc->ht_supported ? "" : "not ");
  	if (htc->ht_supported) {
-diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
-index 533fd32..fcc918e 100644
---- a/net/mac80211/ieee80211_i.h
-+++ b/net/mac80211/ieee80211_i.h
+diff -urNp linux-3.0.3/net/mac80211/ieee80211_i.h linux-3.0.3/net/mac80211/ieee80211_i.h
+--- linux-3.0.3/net/mac80211/ieee80211_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/ieee80211_i.h	2011-08-23 21:47:56.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -69556,7 +66430,7 @@ index 533fd32..fcc918e 100644
  #include "key.h"
  #include "sta_info.h"
  
-@@ -716,7 +717,7 @@ struct ieee80211_local {
+@@ -721,7 +722,7 @@ struct ieee80211_local {
  	/* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
  	spinlock_t queue_stop_reason_lock;
  
@@ -69565,11 +66439,10 @@ index 533fd32..fcc918e 100644
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
-index 7a10a8d..09d23d2 100644
---- a/net/mac80211/iface.c
-+++ b/net/mac80211/iface.c
-@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+diff -urNp linux-3.0.3/net/mac80211/iface.c linux-3.0.3/net/mac80211/iface.c
+--- linux-3.0.3/net/mac80211/iface.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/mac80211/iface.c	2011-08-23 21:47:56.000000000 -0400
+@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
  
@@ -69578,7 +66451,7 @@ index 7a10a8d..09d23d2 100644
  		res = drv_start(local);
  		if (res)
  			goto err_del_bss;
-@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_
  		memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
  
  		if (!is_valid_ether_addr(dev->dev_addr)) {
@@ -69587,7 +66460,7 @@ index 7a10a8d..09d23d2 100644
  				drv_stop(local);
  			return -EADDRNOTAVAIL;
  		}
-@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_
  	mutex_unlock(&local->mtx);
  
  	if (coming_up)
@@ -69596,7 +66469,7 @@ index 7a10a8d..09d23d2 100644
  
  	if (hw_reconf_flags) {
  		ieee80211_hw_config(local, hw_reconf_flags);
-@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
+@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_
   err_del_interface:
  	drv_remove_interface(local, &sdata->vif);
   err_stop:
@@ -69605,7 +66478,7 @@ index 7a10a8d..09d23d2 100644
  		drv_stop(local);
   err_del_bss:
  	sdata->bss = NULL;
-@@ -473,7 +473,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -475,7 +475,7 @@ static void ieee80211_do_stop(struct iee
  	}
  
  	if (going_down)
@@ -69614,7 +66487,7 @@ index 7a10a8d..09d23d2 100644
  
  	switch (sdata->vif.type) {
  	case NL80211_IFTYPE_AP_VLAN:
-@@ -532,7 +532,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
+@@ -534,7 +534,7 @@ static void ieee80211_do_stop(struct iee
  
  	ieee80211_recalc_ps(local, -1);
  
@@ -69623,11 +66496,10 @@ index 7a10a8d..09d23d2 100644
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff --git a/net/mac80211/main.c b/net/mac80211/main.c
-index a46ff06..b677f83 100644
---- a/net/mac80211/main.c
-+++ b/net/mac80211/main.c
-@@ -161,7 +161,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
+diff -urNp linux-3.0.3/net/mac80211/main.c linux-3.0.3/net/mac80211/main.c
+--- linux-3.0.3/net/mac80211/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/main.c	2011-08-23 21:47:56.000000000 -0400
+@@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
  		local->hw.conf.power_level = power;
  	}
  
@@ -69636,11 +66508,10 @@ index a46ff06..b677f83 100644
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
-index c9ceb4d..f0cb515 100644
---- a/net/mac80211/mlme.c
-+++ b/net/mac80211/mlme.c
-@@ -1356,6 +1356,8 @@ static bool ieee80211_assoc_success(struct ieee80211_work *wk,
+diff -urNp linux-3.0.3/net/mac80211/mlme.c linux-3.0.3/net/mac80211/mlme.c
+--- linux-3.0.3/net/mac80211/mlme.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/mac80211/mlme.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru
  	bool have_higher_than_11mbit = false;
  	u16 ap_ht_cap_flags;
  
@@ -69649,11 +66520,19 @@ index c9ceb4d..f0cb515 100644
  	/* AssocResp and ReassocResp have identical structure */
  
  	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
-index e373551..54f546c 100644
---- a/net/mac80211/pm.c
-+++ b/net/mac80211/pm.c
-@@ -95,7 +95,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
+diff -urNp linux-3.0.3/net/mac80211/pm.c linux-3.0.3/net/mac80211/pm.c
+--- linux-3.0.3/net/mac80211/pm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/pm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
+ 	cancel_work_sync(&local->dynamic_ps_enable_work);
+ 	del_timer_sync(&local->dynamic_ps_timer);
+ 
+-	local->wowlan = wowlan && local->open_count;
++	local->wowlan = wowlan && local_read(&local->open_count);
+ 	if (local->wowlan) {
+ 		int err = drv_suspend(local, wowlan);
+ 		if (err) {
+@@ -111,7 +111,7 @@ int __ieee80211_suspend(struct ieee80211
  	}
  
  	/* stop hardware - this must stop RX */
@@ -69661,12 +66540,11 @@ index e373551..54f546c 100644
 +	if (local_read(&local->open_count))
  		ieee80211_stop_device(local);
  
- 	local->suspended = true;
-diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
-index 3d5a2cb..b17ad48 100644
---- a/net/mac80211/rate.c
-+++ b/net/mac80211/rate.c
-@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
+  suspend:
+diff -urNp linux-3.0.3/net/mac80211/rate.c linux-3.0.3/net/mac80211/rate.c
+--- linux-3.0.3/net/mac80211/rate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/rate.c	2011-08-23 21:47:56.000000000 -0400
+@@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
  	ASSERT_RTNL();
  
@@ -69675,11 +66553,10 @@ index 3d5a2cb..b17ad48 100644
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
-index 4851e9e..d860e05 100644
---- a/net/mac80211/rc80211_pid_debugfs.c
-+++ b/net/mac80211/rc80211_pid_debugfs.c
-@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
+diff -urNp linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
  	spin_unlock_irqrestore(&events->lock, status);
  
@@ -69688,25 +66565,11 @@ index 4851e9e..d860e05 100644
  		return -EFAULT;
  
  	return p;
-diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
-index b0beaa5..306533b 100644
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
- 	return cpu_to_le16(dur);
- }
- 
--static int inline is_ieee80211_device(struct ieee80211_local *local,
-+static inline int is_ieee80211_device(struct ieee80211_local *local,
- 				      struct net_device *dev)
- {
- 	return local == wdev_priv(dev->ieee80211_ptr);
-diff --git a/net/mac80211/util.c b/net/mac80211/util.c
-index d036597..f296574 100644
---- a/net/mac80211/util.c
-+++ b/net/mac80211/util.c
-@@ -1135,7 +1135,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
- 		local->resuming = true;
+diff -urNp linux-3.0.3/net/mac80211/util.c linux-3.0.3/net/mac80211/util.c
+--- linux-3.0.3/net/mac80211/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/mac80211/util.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
+ #endif
  
  	/* restart hardware */
 -	if (local->open_count) {
@@ -69714,57 +66577,10 @@ index d036597..f296574 100644
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
-index 1534f2b..6ca818c 100644
---- a/net/netfilter/Kconfig
-+++ b/net/netfilter/Kconfig
-@@ -709,6 +709,16 @@ config NETFILTER_XT_MATCH_ESP
- 
- 	  To compile it as a module, choose M here.  If unsure, say N.
- 
-+config NETFILTER_XT_MATCH_GRADM
-+	tristate '"gradm" match support'
-+	depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
-+	depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
-+	---help---
-+	  The gradm match allows to match on grsecurity RBAC being enabled.
-+	  It is useful when iptables rules are applied early on bootup to
-+	  prevent connections to the machine (except from a trusted host)
-+	  while the RBAC system is disabled.
-+
- config NETFILTER_XT_MATCH_HASHLIMIT
- 	tristate '"hashlimit" match support'
- 	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
-index 441050f..41e04ce 100644
---- a/net/netfilter/Makefile
-+++ b/net/netfilter/Makefile
-@@ -74,6 +74,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CPU) += xt_cpu.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
-+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
- obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
-index a475ede..7262415 100644
---- a/net/netfilter/ipvs/ip_vs_app.c
-+++ b/net/netfilter/ipvs/ip_vs_app.c
-@@ -565,7 +565,7 @@ static const struct file_operations ip_vs_app_fops = {
- 	.open	 = ip_vs_app_open,
- 	.read	 = seq_read,
- 	.llseek  = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- #endif
- 
-diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
-index e9adecd..bce37c0 100644
---- a/net/netfilter/ipvs/ip_vs_conn.c
-+++ b/net/netfilter/ipvs/ip_vs_conn.c
-@@ -553,7 +553,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
+diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c	2011-08-23 21:47:56.000000000 -0400
+@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
  	/* Increase the refcnt counter of the dest */
  	atomic_inc(&dest->refcnt);
  
@@ -69773,34 +66589,16 @@ index e9adecd..bce37c0 100644
  	if (cp->protocol != IPPROTO_UDP)
  		conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
  	/* Bind with the destination and its corresponding transmitter */
-@@ -840,7 +840,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
+@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_p
  	atomic_set(&cp->refcnt, 1);
  
  	atomic_set(&cp->n_control, 0);
 -	atomic_set(&cp->in_pkts, 0);
 +	atomic_set_unchecked(&cp->in_pkts, 0);
  
- 	atomic_inc(&ip_vs_conn_count);
+ 	atomic_inc(&ipvs->conn_count);
  	if (flags & IP_VS_CONN_F_NO_CPORT)
-@@ -1012,7 +1012,7 @@ static const struct file_operations ip_vs_conn_fops = {
- 	.open    = ip_vs_conn_open,
- 	.read    = seq_read,
- 	.llseek  = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- 
- static const char *ip_vs_origin_name(unsigned flags)
-@@ -1075,7 +1075,7 @@ static const struct file_operations ip_vs_conn_sync_fops = {
- 	.open    = ip_vs_conn_sync_open,
- 	.read    = seq_read,
- 	.llseek  = seq_lseek,
--	.release = seq_release,
-+	.release = seq_release_net,
- };
- 
- #endif
-@@ -1102,7 +1102,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
+@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip
  
  	/* Don't drop the entry if its number of incoming packets is not
  	   located in [0, 8] */
@@ -69809,12 +66607,11 @@ index e9adecd..bce37c0 100644
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
-index b4e51e9..8970f65 100644
---- a/net/netfilter/ipvs/ip_vs_core.c
-+++ b/net/netfilter/ipvs/ip_vs_core.c
-@@ -504,7 +504,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
- 		ret = cp->packet_xmit(skb, cp, pp);
+diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c	2011-08-23 21:47:56.000000000 -0400
+@@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
+ 		ret = cp->packet_xmit(skb, cp, pd->pp);
  		/* do not touch skb anymore */
  
 -		atomic_inc(&cp->in_pkts);
@@ -69822,29 +66619,28 @@ index b4e51e9..8970f65 100644
  		ip_vs_conn_put(cp);
  		return ret;
  	}
-@@ -1536,7 +1536,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
- 	 * Sync connection if it is about to close to
- 	 * encorage the standby servers to update the connections timeout
- 	 */
--	pkts = atomic_add_return(1, &cp->in_pkts);
-+	pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
- 	if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
+@@ -1613,7 +1613,7 @@ ip_vs_in(unsigned int hooknum, struct sk
+ 	if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
+ 		pkts = sysctl_sync_threshold(ipvs);
+ 	else
+-		pkts = atomic_add_return(1, &cp->in_pkts);
++		pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+ 
+ 	if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
- 		if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
-diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
-index ba98e13..5ddc91b 100644
---- a/net/netfilter/ipvs/ip_vs_ctl.c
-+++ b/net/netfilter/ipvs/ip_vs_ctl.c
-@@ -787,7 +787,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
- 		ip_vs_rs_hash(dest);
- 		write_unlock_bh(&__ip_vs_rs_lock);
+diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:48:14.000000000 -0400
+@@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
+ 		ip_vs_rs_hash(ipvs, dest);
+ 		write_unlock_bh(&ipvs->rs_lock);
  	}
 -	atomic_set(&dest->conn_flags, conn_flags);
 +	atomic_set_unchecked(&dest->conn_flags, conn_flags);
  
  	/* bind the service */
  	if (!dest->svc) {
-@@ -1905,7 +1905,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2027,7 +2027,7 @@ static int ip_vs_info_seq_show(struct se
  					   "      %-7s %-6d %-10d %-10d\n",
  					   &dest->addr.in6,
  					   ntohs(dest->port),
@@ -69853,7 +66649,7 @@ index ba98e13..5ddc91b 100644
  					   atomic_read(&dest->weight),
  					   atomic_read(&dest->activeconns),
  					   atomic_read(&dest->inactconns));
-@@ -1916,7 +1916,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
+@@ -2038,7 +2038,7 @@ static int ip_vs_info_seq_show(struct se
  					   "%-7s %-6d %-10d %-10d\n",
  					   ntohl(dest->addr.ip),
  					   ntohs(dest->port),
@@ -69862,25 +66658,16 @@ index ba98e13..5ddc91b 100644
  					   atomic_read(&dest->weight),
  					   atomic_read(&dest->activeconns),
  					   atomic_read(&dest->inactconns));
-@@ -1944,7 +1944,7 @@ static const struct file_operations ip_vs_info_fops = {
- 	.open    = ip_vs_info_open,
- 	.read    = seq_read,
- 	.llseek  = seq_lseek,
--	.release = seq_release_private,
-+	.release = seq_release_net,
- };
+@@ -2284,6 +2284,8 @@ do_ip_vs_set_ctl(struct sock *sk, int cm
+ 	struct ip_vs_dest_user *udest_compat;
+ 	struct ip_vs_dest_user_kern udest;
  
- #endif
-@@ -1993,7 +1993,7 @@ static const struct file_operations ip_vs_stats_fops = {
- 	.open = ip_vs_stats_seq_open,
- 	.read = seq_read,
- 	.llseek = seq_lseek,
--	.release = single_release,
-+	.release = single_release_net,
- };
++	pax_track_stack();
++
+ 	if (!capable(CAP_NET_ADMIN))
+ 		return -EPERM;
  
- #endif
-@@ -2315,7 +2315,7 @@ __ip_vs_get_dest_entries(const struct ip_vs_get_dests *get,
+@@ -2498,7 +2500,7 @@ __ip_vs_get_dest_entries(struct net *net
  
  			entry.addr = dest->addr.ip;
  			entry.port = dest->port;
@@ -69889,16 +66676,7 @@ index ba98e13..5ddc91b 100644
  			entry.weight = atomic_read(&dest->weight);
  			entry.u_threshold = dest->u_threshold;
  			entry.l_threshold = dest->l_threshold;
-@@ -2376,6 +2376,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
- 	int ret = 0;
- 	unsigned int copylen;
- 
-+	pax_track_stack();
-+
- 	if (!capable(CAP_NET_ADMIN))
- 		return -EPERM;
- 
-@@ -2831,7 +2833,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
+@@ -3026,7 +3028,7 @@ static int ip_vs_genl_fill_dest(struct s
  	NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
  
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
@@ -69907,24 +66685,31 @@ index ba98e13..5ddc91b 100644
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
  	NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
-index ab85aed..6959e16 100644
---- a/net/netfilter/ipvs/ip_vs_sync.c
-+++ b/net/netfilter/ipvs/ip_vs_sync.c
-@@ -460,7 +460,7 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen)
- 
- 		if (opt)
- 			memcpy(&cp->in_seq, opt, sizeof(*opt));
--		atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
-+		atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
- 		cp->state = state;
- 		cp->old_state = cp->state;
- 		/*
-diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
-index 5325a3f..09efa24 100644
---- a/net/netfilter/ipvs/ip_vs_xmit.c
-+++ b/net/netfilter/ipvs/ip_vs_xmit.c
-@@ -1116,7 +1116,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
+diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c	2011-08-23 21:47:56.000000000 -0400
+@@ -648,7 +648,7 @@ control:
+ 	 * i.e only increment in_pkts for Templates.
+ 	 */
+ 	if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
+-		int pkts = atomic_add_return(1, &cp->in_pkts);
++		int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
+ 
+ 		if (pkts % sysctl_sync_period(ipvs) != 1)
+ 			return;
+@@ -794,7 +794,7 @@ static void ip_vs_proc_conn(struct net *
+ 
+ 	if (opt)
+ 		memcpy(&cp->in_seq, opt, sizeof(*opt));
+-	atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
++	atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
+ 	cp->state = state;
+ 	cp->old_state = cp->state;
+ 	/*
+diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
  		else
  			rc = NF_ACCEPT;
  		/* do not touch skb anymore */
@@ -69933,7 +66718,7 @@ index 5325a3f..09efa24 100644
  		goto out;
  	}
  
-@@ -1230,7 +1230,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
+@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, 
  		else
  			rc = NF_ACCEPT;
  		/* do not touch skb anymore */
@@ -69942,23 +66727,40 @@ index 5325a3f..09efa24 100644
  		goto out;
  	}
  
-diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
-index eead9db..7ee80e3 100644
---- a/net/netfilter/nf_conntrack_netlink.c
-+++ b/net/netfilter/nf_conntrack_netlink.c
-@@ -761,7 +761,7 @@ static const struct nla_policy tuple_nla_policy[CTA_TUPLE_MAX+1] = {
- static int
- ctnetlink_parse_tuple(const struct nlattr * const cda[],
- 		      struct nf_conntrack_tuple *tuple,
--		      enum ctattr_tuple type, u_int8_t l3num)
-+		      enum ctattr_type type, u_int8_t l3num)
- {
- 	struct nlattr *tb[CTA_TUPLE_MAX+1];
- 	int err;
-diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
-index 6a1572b..559396e 100644
---- a/net/netfilter/nfnetlink_log.c
-+++ b/net/netfilter/nfnetlink_log.c
+diff -urNp linux-3.0.3/net/netfilter/Kconfig linux-3.0.3/net/netfilter/Kconfig
+--- linux-3.0.3/net/netfilter/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config NETFILTER_XT_MATCH_GRADM
++	tristate '"gradm" match support'
++	depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
++	depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
++	---help---
++	  The gradm match allows to match on grsecurity RBAC being enabled.
++	  It is useful when iptables rules are applied early on bootup to
++	  prevent connections to the machine (except from a trusted host)
++	  while the RBAC system is disabled.
++
+ config NETFILTER_XT_MATCH_HASHLIMIT
+ 	tristate '"hashlimit" match support'
+ 	depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
+diff -urNp linux-3.0.3/net/netfilter/Makefile linux-3.0.3/net/netfilter/Makefile
+--- linux-3.0.3/net/netfilter/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/Makefile	2011-08-23 21:48:14.000000000 -0400
+@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
+ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
++obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
+ obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
+diff -urNp linux-3.0.3/net/netfilter/nfnetlink_log.c linux-3.0.3/net/netfilter/nfnetlink_log.c
+--- linux-3.0.3/net/netfilter/nfnetlink_log.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/nfnetlink_log.c	2011-08-23 21:47:56.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -69968,7 +66770,7 @@ index 6a1572b..559396e 100644
  
  #define INSTANCE_BUCKETS	16
  static struct hlist_head instance_table[INSTANCE_BUCKETS];
-@@ -507,7 +507,7 @@ __build_packet_message(struct nfulnl_instance *inst,
+@@ -505,7 +505,7 @@ __build_packet_message(struct nfulnl_ins
  	/* global sequence number */
  	if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
  		NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
@@ -69977,10 +66779,9 @@ index 6a1572b..559396e 100644
  
  	if (data_len) {
  		struct nlattr *nla;
-diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
-index 68e67d1..c9531d6 100644
---- a/net/netfilter/nfnetlink_queue.c
-+++ b/net/netfilter/nfnetlink_queue.c
+diff -urNp linux-3.0.3/net/netfilter/nfnetlink_queue.c linux-3.0.3/net/netfilter/nfnetlink_queue.c
+--- linux-3.0.3/net/netfilter/nfnetlink_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/nfnetlink_queue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
  	spinlock_t	lock;
@@ -69990,7 +66791,7 @@ index 68e67d1..c9531d6 100644
  	struct list_head queue_list;		/* packets in queue */
  };
  
-@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
+@@ -272,7 +272,7 @@ nfqnl_build_packet_message(struct nfqnl_
  	nfmsg->version = NFNETLINK_V0;
  	nfmsg->res_id = htons(queue->queue_num);
  
@@ -69999,7 +66800,7 @@ index 68e67d1..c9531d6 100644
  	pmsg.packet_id 		= htonl(entry->id);
  	pmsg.hw_protocol	= entskb->protocol;
  	pmsg.hook		= entry->hook;
-@@ -863,7 +863,7 @@ static int seq_show(struct seq_file *s, void *v)
+@@ -870,7 +870,7 @@ static int seq_show(struct seq_file *s, 
  			  inst->peer_pid, inst->queue_total,
  			  inst->copy_mode, inst->copy_range,
  			  inst->queue_dropped, inst->queue_user_dropped,
@@ -70008,11 +66809,9 @@ index 68e67d1..c9531d6 100644
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
-new file mode 100644
-index 0000000..6905327
---- /dev/null
-+++ b/net/netfilter/xt_gradm.c
+diff -urNp linux-3.0.3/net/netfilter/xt_gradm.c linux-3.0.3/net/netfilter/xt_gradm.c
+--- linux-3.0.3/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/net/netfilter/xt_gradm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -70065,10 +66864,9 @@ index 0000000..6905327
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
-index 42ecb71..8d687c0 100644
---- a/net/netfilter/xt_statistic.c
-+++ b/net/netfilter/xt_statistic.c
+diff -urNp linux-3.0.3/net/netfilter/xt_statistic.c linux-3.0.3/net/netfilter/xt_statistic.c
+--- linux-3.0.3/net/netfilter/xt_statistic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netfilter/xt_statistic.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -70078,7 +66876,7 @@ index 42ecb71..8d687c0 100644
  } ____cacheline_aligned_in_smp;
  
  MODULE_LICENSE("GPL");
-@@ -41,9 +41,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
+@@ -41,9 +41,9 @@ statistic_mt(const struct sk_buff *skb, 
  		break;
  	case XT_STATISTIC_MODE_NTH:
  		do {
@@ -70090,7 +66888,7 @@ index 42ecb71..8d687c0 100644
  		if (nval == 0)
  			ret = !ret;
  		break;
-@@ -63,7 +63,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
+@@ -63,7 +63,7 @@ static int statistic_mt_check(const stru
  	info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
  	if (info->master == NULL)
  		return -ENOMEM;
@@ -70099,11 +66897,10 @@ index 42ecb71..8d687c0 100644
  
  	return 0;
  }
-diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
-index 1f92459..30166e5 100644
---- a/net/netlink/af_netlink.c
-+++ b/net/netlink/af_netlink.c
-@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock *sk)
+diff -urNp linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3/net/netlink/af_netlink.c
+--- linux-3.0.3/net/netlink/af_netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netlink/af_netlink.c	2011-08-23 21:47:56.000000000 -0400
+@@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
  			sk->sk_error_report(sk);
  		}
  	}
@@ -70112,36 +66909,19 @@ index 1f92459..30166e5 100644
  }
  
  static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
-@@ -2001,15 +2001,23 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
- 		struct netlink_sock *nlk = nlk_sk(s);
- 
- 		seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d %-8lu\n",
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   NULL,
-+#else
- 			   s,
-+#endif
- 			   s->sk_protocol,
- 			   nlk->pid,
- 			   nlk->groups ? (u32)nlk->groups[0] : 0,
- 			   sk_rmem_alloc_get(s),
+@@ -1994,7 +1994,7 @@ static int netlink_seq_show(struct seq_f
  			   sk_wmem_alloc_get(s),
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   NULL,
-+#else
  			   nlk->cb,
-+#endif
  			   atomic_read(&s->sk_refcnt),
 -			   atomic_read(&s->sk_drops),
 +			   atomic_read_unchecked(&s->sk_drops),
  			   sock_i_ino(s)
  			);
  
-diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
-index 06cb027..6faef38 100644
---- a/net/netrom/af_netrom.c
-+++ b/net/netrom/af_netrom.c
-@@ -840,6 +840,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+diff -urNp linux-3.0.3/net/netrom/af_netrom.c linux-3.0.3/net/netrom/af_netrom.c
+--- linux-3.0.3/net/netrom/af_netrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/netrom/af_netrom.c	2011-08-23 21:48:14.000000000 -0400
+@@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
  	struct sock *sk = sock->sk;
  	struct nr_sock *nr = nr_sk(sk);
  
@@ -70149,7 +66929,7 @@ index 06cb027..6faef38 100644
  	lock_sock(sk);
  	if (peer != 0) {
  		if (sk->sk_state != TCP_ESTABLISHED) {
-@@ -854,7 +855,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
+@@ -853,7 +854,6 @@ static int nr_getname(struct socket *soc
  		*uaddr_len = sizeof(struct full_sockaddr_ax25);
  	} else {
  		sax->fsa_ax25.sax25_family = AF_NETROM;
@@ -70157,11 +66937,10 @@ index 06cb027..6faef38 100644
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 91cb1d7..3cf89a4 100644
---- a/net/packet/af_packet.c
-+++ b/net/packet/af_packet.c
-@@ -635,14 +635,14 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
+diff -urNp linux-3.0.3/net/packet/af_packet.c linux-3.0.3/net/packet/af_packet.c
+--- linux-3.0.3/net/packet/af_packet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/packet/af_packet.c	2011-08-23 21:47:56.000000000 -0400
+@@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
  
  	spin_lock(&sk->sk_receive_queue.lock);
  	po->stats.tp_packets++;
@@ -70178,7 +66957,7 @@ index 91cb1d7..3cf89a4 100644
  
  drop_n_restore:
  	if (skb_head != skb->data && skb_shared(skb)) {
-@@ -2134,7 +2134,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -2168,7 +2168,7 @@ static int packet_getsockopt(struct sock
  	case PACKET_HDRLEN:
  		if (len > sizeof(int))
  			len = sizeof(int);
@@ -70187,7 +66966,7 @@ index 91cb1d7..3cf89a4 100644
  			return -EFAULT;
  		switch (val) {
  		case TPACKET_V1:
-@@ -2172,7 +2172,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
+@@ -2206,7 +2206,7 @@ static int packet_getsockopt(struct sock
  
  	if (put_user(len, optlen))
  		return -EFAULT;
@@ -70196,23 +66975,10 @@ index 91cb1d7..3cf89a4 100644
  		return -EFAULT;
  	return 0;
  }
-@@ -2684,7 +2684,11 @@ static int packet_seq_show(struct seq_file *seq, void *v)
- 
- 		seq_printf(seq,
- 			   "%p %-6d %-4d %04x   %-5d %1d %-6u %-6u %-6lu\n",
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   NULL,
-+#else
- 			   s,
-+#endif
- 			   atomic_read(&s->sk_refcnt),
- 			   s->sk_type,
- 			   ntohs(po->num),
-diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
-index 1072b2c..97301fb 100644
---- a/net/phonet/af_phonet.c
-+++ b/net/phonet/af_phonet.c
-@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
+diff -urNp linux-3.0.3/net/phonet/af_phonet.c linux-3.0.3/net/phonet/af_phonet.c
+--- linux-3.0.3/net/phonet/af_phonet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/phonet/af_phonet.c	2011-08-23 21:48:14.000000000 -0400
+@@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
  	struct phonet_protocol *pp;
  
@@ -70221,7 +66987,7 @@ index 1072b2c..97301fb 100644
  		return NULL;
  
  	rcu_read_lock();
-@@ -463,7 +463,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol,
+@@ -469,7 +469,7 @@ int __init_or_module phonet_proto_regist
  {
  	int err = 0;
  
@@ -70230,11 +66996,10 @@ index 1072b2c..97301fb 100644
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff --git a/net/phonet/pep.c b/net/phonet/pep.c
-index 3e60f2e..feb0690 100644
---- a/net/phonet/pep.c
-+++ b/net/phonet/pep.c
-@@ -592,7 +592,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
+diff -urNp linux-3.0.3/net/phonet/pep.c linux-3.0.3/net/phonet/pep.c
+--- linux-3.0.3/net/phonet/pep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/phonet/pep.c	2011-08-23 21:47:56.000000000 -0400
+@@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
  	case PNS_PEP_CTRL_REQ:
  		if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
@@ -70243,7 +67008,7 @@ index 3e60f2e..feb0690 100644
  			break;
  		}
  		__skb_pull(skb, 4);
-@@ -612,7 +612,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
+@@ -408,7 +408,7 @@ static int pipe_do_rcv(struct sock *sk, 
  		}
  
  		if (pn->rx_credits == 0) {
@@ -70252,12 +67017,20 @@ index 3e60f2e..feb0690 100644
  			err = -ENOBUFS;
  			break;
  		}
-diff --git a/net/phonet/socket.c b/net/phonet/socket.c
-index 25f746d..fdeef84 100644
---- a/net/phonet/socket.c
-+++ b/net/phonet/socket.c
-@@ -637,8 +637,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
- 			sk->sk_state,
+@@ -556,7 +556,7 @@ static int pipe_handler_do_rcv(struct so
+ 		}
+ 
+ 		if (pn->rx_credits == 0) {
+-			atomic_inc(&sk->sk_drops);
++			atomic_inc_unchecked(&sk->sk_drops);
+ 			err = NET_RX_DROP;
+ 			break;
+ 		}
+diff -urNp linux-3.0.3/net/phonet/socket.c linux-3.0.3/net/phonet/socket.c
+--- linux-3.0.3/net/phonet/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/phonet/socket.c	2011-08-23 21:48:14.000000000 -0400
+@@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
+ 			pn->resource, sk->sk_state,
  			sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
  			sock_i_uid(sk), sock_i_ino(sk),
 -			atomic_read(&sk->sk_refcnt), sk,
@@ -70272,11 +67045,10 @@ index 25f746d..fdeef84 100644
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff --git a/net/rds/cong.c b/net/rds/cong.c
-index 75ea686..1ed2c26 100644
---- a/net/rds/cong.c
-+++ b/net/rds/cong.c
-@@ -78,7 +78,7 @@
+diff -urNp linux-3.0.3/net/rds/cong.c linux-3.0.3/net/rds/cong.c
+--- linux-3.0.3/net/rds/cong.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/cong.c	2011-08-23 21:47:56.000000000 -0400
+@@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
   */
@@ -70285,7 +67057,7 @@ index 75ea686..1ed2c26 100644
  
  /*
   * Congestion monitoring
-@@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
+@@ -232,7 +232,7 @@ void rds_cong_map_updated(struct rds_con
  	rdsdebug("waking map %p for %pI4\n",
  	  map, &map->m_addr);
  	rds_stats_inc(s_cong_update_received);
@@ -70294,7 +67066,7 @@ index 75ea686..1ed2c26 100644
  	if (waitqueue_active(&map->m_waitq))
  		wake_up(&map->m_waitq);
  	if (waitqueue_active(&rds_poll_waitq))
-@@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
+@@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
  
  int rds_cong_updated_since(unsigned long *recent)
  {
@@ -70303,10 +67075,21 @@ index 75ea686..1ed2c26 100644
  
  	if (likely(*recent == gen))
  		return 0;
-diff --git a/net/rds/ib.h b/net/rds/ib.h
-index e34ad03..97b8eb3 100644
---- a/net/rds/ib.h
-+++ b/net/rds/ib.h
+diff -urNp linux-3.0.3/net/rds/ib_cm.c linux-3.0.3/net/rds/ib_cm.c
+--- linux-3.0.3/net/rds/ib_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/ib_cm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
+ 	/* Clear the ACK state */
+ 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_set(&ic->i_ack_next, 0);
++	atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ 	ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-3.0.3/net/rds/ib.h linux-3.0.3/net/rds/ib.h
+--- linux-3.0.3/net/rds/ib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/ib.h	2011-08-23 21:47:56.000000000 -0400
 @@ -127,7 +127,7 @@ struct rds_ib_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -70316,24 +67099,10 @@ index e34ad03..97b8eb3 100644
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
-index ee369d2..2106660 100644
---- a/net/rds/ib_cm.c
-+++ b/net/rds/ib_cm.c
-@@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
- 	/* Clear the ACK state */
- 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
- #ifdef KERNEL_HAS_ATOMIC64
--	atomic64_set(&ic->i_ack_next, 0);
-+	atomic64_set_unchecked(&ic->i_ack_next, 0);
- #else
- 	ic->i_ack_next = 0;
- #endif
-diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
-index e29e0ca..fa3a6a3 100644
---- a/net/rds/ib_recv.c
-+++ b/net/rds/ib_recv.c
-@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
+diff -urNp linux-3.0.3/net/rds/ib_recv.c linux-3.0.3/net/rds/ib_recv.c
+--- linux-3.0.3/net/rds/ib_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/ib_recv.c	2011-08-23 21:47:56.000000000 -0400
+@@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
  static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
  				int ack_required)
  {
@@ -70342,7 +67111,7 @@ index e29e0ca..fa3a6a3 100644
  	if (ack_required) {
  		smp_mb__before_clear_bit();
  		set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
-@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
+@@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
  	clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
  	smp_mb__after_clear_bit();
  
@@ -70351,10 +67120,21 @@ index e29e0ca..fa3a6a3 100644
  }
  #endif
  
-diff --git a/net/rds/iw.h b/net/rds/iw.h
-index 9015192..39f60c0 100644
---- a/net/rds/iw.h
-+++ b/net/rds/iw.h
+diff -urNp linux-3.0.3/net/rds/iw_cm.c linux-3.0.3/net/rds/iw_cm.c
+--- linux-3.0.3/net/rds/iw_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/iw_cm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
+ 	/* Clear the ACK state */
+ 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
+ #ifdef KERNEL_HAS_ATOMIC64
+-	atomic64_set(&ic->i_ack_next, 0);
++	atomic64_set_unchecked(&ic->i_ack_next, 0);
+ #else
+ 	ic->i_ack_next = 0;
+ #endif
+diff -urNp linux-3.0.3/net/rds/iw.h linux-3.0.3/net/rds/iw.h
+--- linux-3.0.3/net/rds/iw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/iw.h	2011-08-23 21:47:56.000000000 -0400
 @@ -133,7 +133,7 @@ struct rds_iw_connection {
  	/* sending acks */
  	unsigned long		i_ack_flags;
@@ -70364,24 +67144,10 @@ index 9015192..39f60c0 100644
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
-index 712cf2d..d863875 100644
---- a/net/rds/iw_cm.c
-+++ b/net/rds/iw_cm.c
-@@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
- 	/* Clear the ACK state */
- 	clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
- #ifdef KERNEL_HAS_ATOMIC64
--	atomic64_set(&ic->i_ack_next, 0);
-+	atomic64_set_unchecked(&ic->i_ack_next, 0);
- #else
- 	ic->i_ack_next = 0;
- #endif
-diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
-index 59509e9..4314c64 100644
---- a/net/rds/iw_rdma.c
-+++ b/net/rds/iw_rdma.c
-@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_i
+diff -urNp linux-3.0.3/net/rds/iw_rdma.c linux-3.0.3/net/rds/iw_rdma.c
+--- linux-3.0.3/net/rds/iw_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/iw_rdma.c	2011-08-23 21:48:14.000000000 -0400
+@@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
  	struct rdma_cm_id *pcm_id;
  	int rc;
  
@@ -70390,11 +67156,10 @@ index 59509e9..4314c64 100644
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
-index 5e57347..3916042 100644
---- a/net/rds/iw_recv.c
-+++ b/net/rds/iw_recv.c
-@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
+diff -urNp linux-3.0.3/net/rds/iw_recv.c linux-3.0.3/net/rds/iw_recv.c
+--- linux-3.0.3/net/rds/iw_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rds/iw_recv.c	2011-08-23 21:47:56.000000000 -0400
+@@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
  static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
  				int ack_required)
  {
@@ -70403,7 +67168,7 @@ index 5e57347..3916042 100644
  	if (ack_required) {
  		smp_mb__before_clear_bit();
  		set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
-@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
+@@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
  	clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
  	smp_mb__after_clear_bit();
  
@@ -70412,11 +67177,10 @@ index 5e57347..3916042 100644
  }
  #endif
  
-diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
-index 74c064c..fdec26f 100644
---- a/net/rxrpc/af_rxrpc.c
-+++ b/net/rxrpc/af_rxrpc.c
-@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ops;
+diff -urNp linux-3.0.3/net/rxrpc/af_rxrpc.c linux-3.0.3/net/rxrpc/af_rxrpc.c
+--- linux-3.0.3/net/rxrpc/af_rxrpc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/af_rxrpc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
  /* current debugging ID */
@@ -70425,11 +67189,10 @@ index 74c064c..fdec26f 100644
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
-index b6ffe4e..d3f7619 100644
---- a/net/rxrpc/ar-ack.c
-+++ b/net/rxrpc/ar-ack.c
-@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+diff -urNp linux-3.0.3/net/rxrpc/ar-ack.c linux-3.0.3/net/rxrpc/ar-ack.c
+--- linux-3.0.3/net/rxrpc/ar-ack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-ack.c	2011-08-23 21:48:14.000000000 -0400
+@@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  	_enter("{%d,%d,%d,%d},",
  	       call->acks_hard, call->acks_unacked,
@@ -70438,7 +67201,7 @@ index b6ffe4e..d3f7619 100644
  	       CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
  
  	stop = 0;
-@@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
+@@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
  			/* each Tx packet has a new serial number */
  			sp->hdr.serial =
@@ -70447,7 +67210,7 @@ index b6ffe4e..d3f7619 100644
  
  			hdr = (struct rxrpc_header *) txb->head;
  			hdr->serial = sp->hdr.serial;
-@@ -405,7 +405,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
+@@ -403,7 +403,7 @@ static void rxrpc_rotate_tx_window(struc
   */
  static void rxrpc_clear_tx_window(struct rxrpc_call *call)
  {
@@ -70456,7 +67219,7 @@ index b6ffe4e..d3f7619 100644
  }
  
  /*
-@@ -631,7 +631,7 @@ process_further:
+@@ -629,7 +629,7 @@ process_further:
  
  		latest = ntohl(sp->hdr.serial);
  		hard = ntohl(ack.firstPacket);
@@ -70465,7 +67228,7 @@ index b6ffe4e..d3f7619 100644
  
  		_proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
  		       latest,
-@@ -844,6 +844,8 @@ void rxrpc_process_call(struct work_struct *work)
+@@ -842,6 +842,8 @@ void rxrpc_process_call(struct work_stru
  	u32 abort_code = RX_PROTOCOL_ERROR;
  	u8 *acks = NULL;
  
@@ -70474,7 +67237,7 @@ index b6ffe4e..d3f7619 100644
  	//printk("\n--------------------\n");
  	_enter("{%d,%s,%lx} [%lu]",
  	       call->debug_id, rxrpc_call_states[call->state], call->events,
-@@ -1163,7 +1165,7 @@ void rxrpc_process_call(struct work_struct *work)
+@@ -1161,7 +1163,7 @@ void rxrpc_process_call(struct work_stru
  	goto maybe_reschedule;
  
  send_ACK_with_skew:
@@ -70483,7 +67246,7 @@ index b6ffe4e..d3f7619 100644
  			    ntohl(ack.serial));
  send_ACK:
  	mtu = call->conn->trans->peer->if_mtu;
-@@ -1175,7 +1177,7 @@ send_ACK:
+@@ -1173,7 +1175,7 @@ send_ACK:
  	ackinfo.rxMTU	= htonl(5692);
  	ackinfo.jumbo_max = htonl(4);
  
@@ -70492,7 +67255,7 @@ index b6ffe4e..d3f7619 100644
  	_proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
  	       ntohl(hdr.serial),
  	       ntohs(ack.maxSkew),
-@@ -1193,7 +1195,7 @@ send_ACK:
+@@ -1191,7 +1193,7 @@ send_ACK:
  send_message:
  	_debug("send message");
  
@@ -70501,11 +67264,10 @@ index b6ffe4e..d3f7619 100644
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
-index bf656c2..48f9d27 100644
---- a/net/rxrpc/ar-call.c
-+++ b/net/rxrpc/ar-call.c
-@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
+diff -urNp linux-3.0.3/net/rxrpc/ar-call.c linux-3.0.3/net/rxrpc/ar-call.c
+--- linux-3.0.3/net/rxrpc/ar-call.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-call.c	2011-08-23 21:47:56.000000000 -0400
+@@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
  	spin_lock_init(&call->lock);
  	rwlock_init(&call->state_lock);
  	atomic_set(&call->usage, 1);
@@ -70514,11 +67276,10 @@ index bf656c2..48f9d27 100644
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
-index 4106ca9..a338d7a 100644
---- a/net/rxrpc/ar-connection.c
-+++ b/net/rxrpc/ar-connection.c
-@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
+diff -urNp linux-3.0.3/net/rxrpc/ar-connection.c linux-3.0.3/net/rxrpc/ar-connection.c
+--- linux-3.0.3/net/rxrpc/ar-connection.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-connection.c	2011-08-23 21:47:56.000000000 -0400
+@@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
  		rwlock_init(&conn->lock);
  		spin_lock_init(&conn->state_lock);
  		atomic_set(&conn->usage, 1);
@@ -70527,11 +67288,10 @@ index 4106ca9..a338d7a 100644
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
-index 0505cdc..f0748ce 100644
---- a/net/rxrpc/ar-connevent.c
-+++ b/net/rxrpc/ar-connevent.c
-@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
+diff -urNp linux-3.0.3/net/rxrpc/ar-connevent.c linux-3.0.3/net/rxrpc/ar-connevent.c
+--- linux-3.0.3/net/rxrpc/ar-connevent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-connevent.c	2011-08-23 21:47:56.000000000 -0400
+@@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
  	len = iov[0].iov_len + iov[1].iov_len;
  
@@ -70540,11 +67300,10 @@ index 0505cdc..f0748ce 100644
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
-index 1a2b0633..e8d1382 100644
---- a/net/rxrpc/ar-input.c
-+++ b/net/rxrpc/ar-input.c
-@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
+diff -urNp linux-3.0.3/net/rxrpc/ar-input.c linux-3.0.3/net/rxrpc/ar-input.c
+--- linux-3.0.3/net/rxrpc/ar-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-input.c	2011-08-23 21:47:56.000000000 -0400
+@@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
  	/* track the latest serial number on this connection for ACK packet
  	 * information */
  	serial = ntohl(sp->hdr.serial);
@@ -70556,10 +67315,9 @@ index 1a2b0633..e8d1382 100644
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
-index 8e22bd3..f66d1c0 100644
---- a/net/rxrpc/ar-internal.h
-+++ b/net/rxrpc/ar-internal.h
+diff -urNp linux-3.0.3/net/rxrpc/ar-internal.h linux-3.0.3/net/rxrpc/ar-internal.h
+--- linux-3.0.3/net/rxrpc/ar-internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-internal.h	2011-08-23 21:47:56.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
  	int			error;		/* error code for local abort */
  	int			debug_id;	/* debug ID for printks */
@@ -70580,7 +67338,7 @@ index 8e22bd3..f66d1c0 100644
  	u32			abort_code;	/* local/remote abort code */
  	enum {					/* current state of call */
  		RXRPC_CALL_CLIENT_SEND_REQUEST,	/* - client sending request phase */
-@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
+@@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(stru
   */
  extern atomic_t rxrpc_n_skbs;
  extern __be32 rxrpc_epoch;
@@ -70589,11 +67347,10 @@ index 8e22bd3..f66d1c0 100644
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
-index 87f7135..74d3703 100644
---- a/net/rxrpc/ar-local.c
-+++ b/net/rxrpc/ar-local.c
-@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
+diff -urNp linux-3.0.3/net/rxrpc/ar-local.c linux-3.0.3/net/rxrpc/ar-local.c
+--- linux-3.0.3/net/rxrpc/ar-local.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-local.c	2011-08-23 21:47:56.000000000 -0400
+@@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
  		spin_lock_init(&local->lock);
  		rwlock_init(&local->services_lock);
  		atomic_set(&local->usage, 1);
@@ -70602,11 +67359,10 @@ index 87f7135..74d3703 100644
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
-index 5f22e26..e5bd20f 100644
---- a/net/rxrpc/ar-output.c
-+++ b/net/rxrpc/ar-output.c
-@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
+diff -urNp linux-3.0.3/net/rxrpc/ar-output.c linux-3.0.3/net/rxrpc/ar-output.c
+--- linux-3.0.3/net/rxrpc/ar-output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-output.c	2011-08-23 21:47:56.000000000 -0400
+@@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
  			sp->hdr.cid = call->cid;
  			sp->hdr.callNumber = call->call_id;
  			sp->hdr.seq =
@@ -70618,11 +67374,10 @@ index 5f22e26..e5bd20f 100644
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
-index a53fb25..88e6088 100644
---- a/net/rxrpc/ar-peer.c
-+++ b/net/rxrpc/ar-peer.c
-@@ -87,7 +87,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
+diff -urNp linux-3.0.3/net/rxrpc/ar-peer.c linux-3.0.3/net/rxrpc/ar-peer.c
+--- linux-3.0.3/net/rxrpc/ar-peer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-peer.c	2011-08-23 21:47:56.000000000 -0400
+@@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
  		INIT_LIST_HEAD(&peer->error_targets);
  		spin_lock_init(&peer->lock);
  		atomic_set(&peer->usage, 1);
@@ -70631,11 +67386,10 @@ index a53fb25..88e6088 100644
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
-index 38047f7..9f48511 100644
---- a/net/rxrpc/ar-proc.c
-+++ b/net/rxrpc/ar-proc.c
-@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-3.0.3/net/rxrpc/ar-proc.c linux-3.0.3/net/rxrpc/ar-proc.c
+--- linux-3.0.3/net/rxrpc/ar-proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-proc.c	2011-08-23 21:47:56.000000000 -0400
+@@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
  		   atomic_read(&conn->usage),
  		   rxrpc_conn_states[conn->state],
  		   key_serial(conn->key),
@@ -70646,11 +67400,10 @@ index 38047f7..9f48511 100644
  
  	return 0;
  }
-diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
-index 5e0226f..1ff5b8d 100644
---- a/net/rxrpc/ar-transport.c
-+++ b/net/rxrpc/ar-transport.c
-@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
+diff -urNp linux-3.0.3/net/rxrpc/ar-transport.c linux-3.0.3/net/rxrpc/ar-transport.c
+--- linux-3.0.3/net/rxrpc/ar-transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/ar-transport.c	2011-08-23 21:47:56.000000000 -0400
+@@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
  		spin_lock_init(&trans->client_lock);
  		rwlock_init(&trans->conn_lock);
  		atomic_set(&trans->usage, 1);
@@ -70659,11 +67412,10 @@ index 5e0226f..1ff5b8d 100644
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
-index 7635107..5000b71 100644
---- a/net/rxrpc/rxkad.c
-+++ b/net/rxrpc/rxkad.c
-@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
+diff -urNp linux-3.0.3/net/rxrpc/rxkad.c linux-3.0.3/net/rxrpc/rxkad.c
+--- linux-3.0.3/net/rxrpc/rxkad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/rxrpc/rxkad.c	2011-08-23 21:48:14.000000000 -0400
+@@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
  	u16 check;
  	int nsg;
  
@@ -70672,7 +67424,7 @@ index 7635107..5000b71 100644
  	sp = rxrpc_skb(skb);
  
  	_enter("");
-@@ -338,6 +340,8 @@ static int rxkad_verify_packet_auth(const struct rxrpc_call *call,
+@@ -338,6 +340,8 @@ static int rxkad_verify_packet_auth(cons
  	u16 check;
  	int nsg;
  
@@ -70681,7 +67433,7 @@ index 7635107..5000b71 100644
  	_enter("");
  
  	sp = rxrpc_skb(skb);
-@@ -610,7 +614,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
+@@ -610,7 +614,7 @@ static int rxkad_issue_challenge(struct 
  
  	len = iov[0].iov_len + iov[1].iov_len;
  
@@ -70690,7 +67442,7 @@ index 7635107..5000b71 100644
  	_proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-@@ -660,7 +664,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
+@@ -660,7 +664,7 @@ static int rxkad_send_response(struct rx
  
  	len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
  
@@ -70699,43 +67451,23 @@ index 7635107..5000b71 100644
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff --git a/net/sctp/proc.c b/net/sctp/proc.c
-index 61aacfb..9a2e19c 100644
---- a/net/sctp/proc.c
-+++ b/net/sctp/proc.c
-@@ -212,7 +212,12 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
- 	sctp_for_each_hentry(epb, node, &head->chain) {
- 		ep = sctp_ep(epb);
- 		sk = epb->sk;
--		seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,
-+		seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ",
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   NULL, NULL,
-+#else
-+			   ep, sk,
-+#endif
- 			   sctp_sk(sk)->type, sk->sk_state, hash,
- 			   epb->bind_addr.port,
- 			   sock_i_uid(sk), sock_i_ino(sk));
-@@ -318,7 +323,12 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
+diff -urNp linux-3.0.3/net/sctp/proc.c linux-3.0.3/net/sctp/proc.c
+--- linux-3.0.3/net/sctp/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sctp/proc.c	2011-08-23 21:48:14.000000000 -0400
+@@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
  		seq_printf(seq,
- 			   "%8p %8p %-3d %-3d %-2d %-4d "
+ 			   "%8pK %8pK %-3d %-3d %-2d %-4d "
  			   "%4d %8d %8d %7d %5lu %-5d %5d ",
 -			   assoc, sk, sctp_sk(sk)->type, sk->sk_state,
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			   NULL, NULL,
-+#else
 +			   assoc, sk,
-+#endif
 +			   sctp_sk(sk)->type, sk->sk_state,
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff --git a/net/sctp/socket.c b/net/sctp/socket.c
-index 8e02550..b172396 100644
---- a/net/sctp/socket.c
-+++ b/net/sctp/socket.c
-@@ -4435,7 +4435,7 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+diff -urNp linux-3.0.3/net/sctp/socket.c linux-3.0.3/net/sctp/socket.c
+--- linux-3.0.3/net/sctp/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sctp/socket.c	2011-08-23 21:47:56.000000000 -0400
+@@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
  		addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
  		if (space_left < addrlen)
  			return -ENOMEM;
@@ -70744,10 +67476,9 @@ index 8e02550..b172396 100644
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff --git a/net/socket.c b/net/socket.c
-index 1204afd..50656a0 100644
---- a/net/socket.c
-+++ b/net/socket.c
+diff -urNp linux-3.0.3/net/socket.c linux-3.0.3/net/socket.c
+--- linux-3.0.3/net/socket.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/net/socket.c	2011-08-23 21:48:14.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -70765,7 +67496,7 @@ index 1204afd..50656a0 100644
  static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
  static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
  			 unsigned long nr_segs, loff_t pos);
-@@ -326,7 +329,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
+@@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struc
  		&sockfs_dentry_operations, SOCKFS_MAGIC);
  }
  
@@ -70774,7 +67505,7 @@ index 1204afd..50656a0 100644
  
  static struct file_system_type sock_fs_type = {
  	.name =		"sockfs",
-@@ -1174,6 +1177,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
+@@ -1187,6 +1190,8 @@ int __sock_create(struct net *net, int f
  		return -EAFNOSUPPORT;
  	if (type < 0 || type >= SOCK_MAX)
  		return -EINVAL;
@@ -70783,7 +67514,7 @@ index 1204afd..50656a0 100644
  
  	/* Compatibility.
  
-@@ -1306,6 +1311,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
+@@ -1319,6 +1324,16 @@ SYSCALL_DEFINE3(socket, int, family, int
  	if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
  		flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
  
@@ -70800,7 +67531,7 @@ index 1204afd..50656a0 100644
  	retval = sock_create(family, type, protocol, &sock);
  	if (retval < 0)
  		goto out;
-@@ -1418,6 +1433,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1431,6 +1446,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
  	if (sock) {
  		err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
  		if (err >= 0) {
@@ -70815,7 +67546,7 @@ index 1204afd..50656a0 100644
  			err = security_socket_bind(sock,
  						   (struct sockaddr *)&address,
  						   addrlen);
-@@ -1426,6 +1449,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
+@@ -1439,6 +1462,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so
  						      (struct sockaddr *)
  						      &address, addrlen);
  		}
@@ -70823,7 +67554,7 @@ index 1204afd..50656a0 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1449,10 +1473,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
+@@ -1462,10 +1486,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba
  		if ((unsigned)backlog > somaxconn)
  			backlog = somaxconn;
  
@@ -70844,7 +67575,7 @@ index 1204afd..50656a0 100644
  		fput_light(sock->file, fput_needed);
  	}
  	return err;
-@@ -1496,6 +1530,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1509,6 +1543,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
  	newsock->type = sock->type;
  	newsock->ops = sock->ops;
  
@@ -70863,7 +67594,7 @@ index 1204afd..50656a0 100644
  	/*
  	 * We don't need try_module_get here, as the listening socket (sock)
  	 * has the protocol module (sock->ops->owner) held.
-@@ -1534,6 +1580,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
+@@ -1547,6 +1593,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct
  	fd_install(newfd, newfile);
  	err = newfd;
  
@@ -70872,7 +67603,7 @@ index 1204afd..50656a0 100644
  out_put:
  	fput_light(sock->file, fput_needed);
  out:
-@@ -1566,6 +1614,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1579,6 +1627,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct
  		int, addrlen)
  {
  	struct socket *sock;
@@ -70880,7 +67611,7 @@ index 1204afd..50656a0 100644
  	struct sockaddr_storage address;
  	int err, fput_needed;
  
-@@ -1576,6 +1625,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
+@@ -1589,6 +1638,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct
  	if (err < 0)
  		goto out_put;
  
@@ -70898,20 +67629,19 @@ index 1204afd..50656a0 100644
  	err =
  	    security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
  	if (err)
-@@ -1877,6 +1937,8 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned, flags)
+@@ -1890,6 +1950,8 @@ static int __sys_sendmsg(struct socket *
+ 	unsigned char *ctl_buf = ctl;
  	int err, ctl_len, iov_size, total_len;
- 	int fput_needed;
  
 +	pax_track_stack();
 +
  	err = -EFAULT;
  	if (MSG_CMSG_COMPAT & flags) {
- 		if (get_compat_msghdr(&msg_sys, msg_compat))
-diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
-index 17c3e3a..9402eb2 100644
---- a/net/sunrpc/sched.c
-+++ b/net/sunrpc/sched.c
-@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *word)
+ 		if (get_compat_msghdr(msg_sys, msg_compat))
+diff -urNp linux-3.0.3/net/sunrpc/sched.c linux-3.0.3/net/sunrpc/sched.c
+--- linux-3.0.3/net/sunrpc/sched.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sunrpc/sched.c	2011-08-23 21:47:56.000000000 -0400
+@@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
  {
@@ -70923,11 +67653,10 @@ index 17c3e3a..9402eb2 100644
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
-index 09af4fa..77110a9 100644
---- a/net/sunrpc/xprtrdma/svc_rdma.c
-+++ b/net/sunrpc/xprtrdma/svc_rdma.c
-@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
+diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c	2011-08-23 21:47:56.000000000 -0400
+@@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
  
@@ -70952,7 +67681,7 @@ index 09af4fa..77110a9 100644
  
  /* Temporary NFS request map and context caches */
  struct kmem_cache *svc_rdma_map_cachep;
-@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *table, int write,
+@@ -109,7 +109,7 @@ static int read_reset_stat(ctl_table *ta
  		len -= *ppos;
  		if (len > *lenp)
  			len = *lenp;
@@ -70961,7 +67690,7 @@ index 09af4fa..77110a9 100644
  			return -EFAULT;
  		*lenp = len;
  		*ppos += len;
-@@ -150,63 +150,63 @@ static ctl_table svcrdma_parm_table[] = {
+@@ -150,63 +150,63 @@ static ctl_table svcrdma_parm_table[] = 
  	{
  		.procname	= "rdma_stat_read",
  		.data		= &rdma_stat_read,
@@ -71034,10 +67763,9 @@ index 09af4fa..77110a9 100644
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-index df67211..c354b13 100644
---- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-08-23 21:47:56.000000000 -0400
 @@ -499,7 +499,7 @@ next_sge:
  			svc_rdma_put_context(ctxt, 0);
  			goto out;
@@ -71047,7 +67775,7 @@ index df67211..c354b13 100644
  
  		if (read_wr.num_sge < chl_map->ch[ch_no].count) {
  			chl_map->ch[ch_no].count -= read_wr.num_sge;
-@@ -609,7 +609,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -609,7 +609,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r
  				  dto_q);
  		list_del_init(&ctxt->dto_q);
  	} else {
@@ -71056,7 +67784,7 @@ index df67211..c354b13 100644
  		clear_bit(XPT_DATA, &xprt->xpt_flags);
  		ctxt = NULL;
  	}
-@@ -629,7 +629,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
+@@ -629,7 +629,7 @@ int svc_rdma_recvfrom(struct svc_rqst *r
  	dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
  		ctxt, rdma_xprt, rqstp, ctxt->wc_status);
  	BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
@@ -71065,11 +67793,10 @@ index df67211..c354b13 100644
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-index 249a835..fb2794b 100644
---- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
+diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-08-23 21:47:56.000000000 -0400
+@@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
  	write_wr.wr.rdma.remote_addr = to;
  
  	/* Post It */
@@ -71078,11 +67805,10 @@ index 249a835..fb2794b 100644
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index 1a10dcd..61e6853 100644
---- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
-+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-08-23 21:47:56.000000000 -0400
+@@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
  		return;
  
  	ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
@@ -71091,7 +67817,7 @@ index 1a10dcd..61e6853 100644
  
  	while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
  		ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
-@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -320,7 +320,7 @@ static void rq_cq_reap(struct svcxprt_rd
  	}
  
  	if (ctxt)
@@ -71100,7 +67826,7 @@ index 1a10dcd..61e6853 100644
  
  	set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
  	/*
-@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -392,7 +392,7 @@ static void sq_cq_reap(struct svcxprt_rd
  		return;
  
  	ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
@@ -71109,7 +67835,7 @@ index 1a10dcd..61e6853 100644
  	while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
  		if (wc.status != IB_WC_SUCCESS)
  			/* Close the transport */
-@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
+@@ -410,7 +410,7 @@ static void sq_cq_reap(struct svcxprt_rd
  	}
  
  	if (ctxt)
@@ -71118,7 +67844,7 @@ index 1a10dcd..61e6853 100644
  }
  
  static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
-@@ -1271,7 +1271,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
+@@ -1272,7 +1272,7 @@ int svc_rdma_send(struct svcxprt_rdma *x
  		spin_lock_bh(&xprt->sc_lock);
  		if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
  			spin_unlock_bh(&xprt->sc_lock);
@@ -71127,11 +67853,10 @@ index 1a10dcd..61e6853 100644
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff --git a/net/sysctl_net.c b/net/sysctl_net.c
-index ca84212..3aa338f 100644
---- a/net/sysctl_net.c
-+++ b/net/sysctl_net.c
-@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
+diff -urNp linux-3.0.3/net/sysctl_net.c linux-3.0.3/net/sysctl_net.c
+--- linux-3.0.3/net/sysctl_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/sysctl_net.c	2011-08-23 21:48:14.000000000 -0400
+@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
  			       struct ctl_table *table)
  {
  	/* Allow network administrator to have same access as root. */
@@ -71140,11 +67865,10 @@ index ca84212..3aa338f 100644
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
-index 7a79ad0..5715351 100644
---- a/net/unix/af_unix.c
-+++ b/net/unix/af_unix.c
-@@ -767,6 +767,12 @@ static struct sock *unix_find_other(struct net *net,
+diff -urNp linux-3.0.3/net/unix/af_unix.c linux-3.0.3/net/unix/af_unix.c
+--- linux-3.0.3/net/unix/af_unix.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/unix/af_unix.c	2011-08-23 21:48:14.000000000 -0400
+@@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
  		err = -ECONNREFUSED;
  		if (!S_ISSOCK(inode->i_mode))
  			goto put_fail;
@@ -71157,12 +67881,12 @@ index 7a79ad0..5715351 100644
  		u = unix_find_socket_byinode(inode);
  		if (!u)
  			goto put_fail;
-@@ -787,6 +793,13 @@ static struct sock *unix_find_other(struct net *net,
+@@ -787,6 +793,13 @@ static struct sock *unix_find_other(stru
  		if (u) {
  			struct dentry *dentry;
  			dentry = unix_sk(u)->dentry;
 +
-+			if (!gr_handle_chroot_unix(u->sk_peer_pid)) {
++			if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
 +				err = -EPERM;
 +				sock_put(u);
 +				goto fail;
@@ -71171,7 +67895,7 @@ index 7a79ad0..5715351 100644
  			if (dentry)
  				touch_atime(unix_sk(u)->mnt, dentry);
  		} else
-@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
+@@ -872,11 +885,18 @@ static int unix_bind(struct socket *sock
  		err = security_path_mknod(&nd.path, dentry, mode, 0);
  		if (err)
  			goto out_mknod_drop_write;
@@ -71190,35 +67914,22 @@ index 7a79ad0..5715351 100644
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-@@ -894,6 +914,11 @@ out_mknod_drop_write:
- 			goto out_unlock;
- 		}
- 
-+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
-+		put_pid(sk->sk_peer_pid);
-+		sk->sk_peer_pid = get_pid(task_tgid(current));
-+#endif
-+
- 		list = &unix_socket_table[addr->hash];
- 	} else {
- 		list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
-@@ -2249,7 +2274,11 @@ static int unix_seq_show(struct seq_file *seq, void *v)
- 		unix_state_lock(s);
- 
- 		seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
-+#ifdef CONFIG_GRKERNSEC_HIDESYM
-+			NULL,
-+#else
- 			s,
-+#endif
- 			atomic_read(&s->sk_refcnt),
- 			0,
- 			s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
-diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
-index fdbc23c..212d53e 100644
---- a/net/wireless/wext-core.c
-+++ b/net/wireless/wext-core.c
-@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
+diff -urNp linux-3.0.3/net/wireless/core.h linux-3.0.3/net/wireless/core.h
+--- linux-3.0.3/net/wireless/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/wireless/core.h	2011-08-23 21:47:56.000000000 -0400
+@@ -27,7 +27,7 @@ struct cfg80211_registered_device {
+ 	struct mutex mtx;
+ 
+ 	/* rfkill support */
+-	struct rfkill_ops rfkill_ops;
++	rfkill_ops_no_const rfkill_ops;
+ 	struct rfkill *rfkill;
+ 	struct work_struct rfkill_sync;
+ 
+diff -urNp linux-3.0.3/net/wireless/wext-core.c linux-3.0.3/net/wireless/wext-core.c
+--- linux-3.0.3/net/wireless/wext-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/wireless/wext-core.c	2011-08-23 21:47:56.000000000 -0400
+@@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
  		/* Support for very large requests */
@@ -71228,7 +67939,7 @@ index fdbc23c..212d53e 100644
  			/* Allow userspace to GET more than max so
  			 * we can support any size GET requests.
  			 * There is still a limit : -ENOMEM.
-@@ -784,22 +783,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
+@@ -784,22 +783,6 @@ static int ioctl_standard_iw_point(struc
  		}
  	}
  
@@ -71251,11 +67962,10 @@ index fdbc23c..212d53e 100644
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
-index 8da2741..5cb452e 100644
---- a/net/xfrm/xfrm_policy.c
-+++ b/net/xfrm/xfrm_policy.c
-@@ -296,7 +296,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
+diff -urNp linux-3.0.3/net/xfrm/xfrm_policy.c linux-3.0.3/net/xfrm/xfrm_policy.c
+--- linux-3.0.3/net/xfrm/xfrm_policy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/xfrm/xfrm_policy.c	2011-08-23 21:47:56.000000000 -0400
+@@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
  	policy->walk.dead = 1;
  
@@ -71264,7 +67974,7 @@ index 8da2741..5cb452e 100644
  
  	if (del_timer(&policy->timer))
  		xfrm_pol_put(policy);
-@@ -575,7 +575,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
+@@ -583,7 +583,7 @@ int xfrm_policy_insert(int dir, struct x
  		hlist_add_head(&policy->bydst, chain);
  	xfrm_pol_hold(policy);
  	net->xfrm.policy_count[dir]++;
@@ -71273,34 +67983,34 @@ index 8da2741..5cb452e 100644
  	if (delpol)
  		__xfrm_policy_unlink(delpol, dir);
  	policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
-@@ -1507,7 +1507,7 @@ free_dst:
+@@ -1528,7 +1528,7 @@ free_dst:
  	goto out;
  }
  
 -static int inline
 +static inline int
- xfrm_dst_alloc_copy(void **target, void *src, int size)
+ xfrm_dst_alloc_copy(void **target, const void *src, int size)
  {
  	if (!*target) {
-@@ -1519,7 +1519,7 @@ xfrm_dst_alloc_copy(void **target, void *src, int size)
+@@ -1540,7 +1540,7 @@ xfrm_dst_alloc_copy(void **target, const
  	return 0;
  }
  
 -static int inline
 +static inline int
- xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
+ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1531,7 +1531,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
+@@ -1552,7 +1552,7 @@ xfrm_dst_update_parent(struct dst_entry 
  #endif
  }
  
 -static int inline
 +static inline int
- xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
+ xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
  {
  #ifdef CONFIG_XFRM_SUB_POLICY
-@@ -1625,7 +1625,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
+@@ -1646,7 +1646,7 @@ xfrm_resolve_and_create_bundle(struct xf
  
  	xdst->num_pols = num_pols;
  	memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
@@ -71309,7 +68019,7 @@ index 8da2741..5cb452e 100644
  
  	return xdst;
  }
-@@ -2319,7 +2319,7 @@ static int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *first,
+@@ -2333,7 +2333,7 @@ static int xfrm_bundle_ok(struct xfrm_ds
  		if (xdst->xfrm_genid != dst->xfrm->genid)
  			return 0;
  		if (xdst->num_pols > 0 &&
@@ -71317,8 +68027,8 @@ index 8da2741..5cb452e 100644
 +		    xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
  			return 0;
  
- 		if (strict && fl &&
-@@ -2852,7 +2852,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
+ 		mtu = dst_mtu(dst->child);
+@@ -2861,7 +2861,7 @@ static int xfrm_policy_migrate(struct xf
  			       sizeof(pol->xfrm_vec[i].saddr));
  			pol->xfrm_vec[i].encap_family = mp->new_family;
  			/* flush bundles */
@@ -71327,11 +68037,10 @@ index 8da2741..5cb452e 100644
  		}
  	}
  
-diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
-index 6129196..586deee 100644
---- a/net/xfrm/xfrm_user.c
-+++ b/net/xfrm/xfrm_user.c
-@@ -1309,6 +1309,8 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
+diff -urNp linux-3.0.3/net/xfrm/xfrm_user.c linux-3.0.3/net/xfrm/xfrm_user.c
+--- linux-3.0.3/net/xfrm/xfrm_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/net/xfrm/xfrm_user.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
  	struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
  	int i;
  
@@ -71340,7 +68049,7 @@ index 6129196..586deee 100644
  	if (xp->xfrm_nr == 0)
  		return 0;
  
-@@ -1957,6 +1959,8 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
+@@ -2062,6 +2064,8 @@ static int xfrm_do_migrate(struct sk_buf
  	int err;
  	int n = 0;
  
@@ -71349,11 +68058,10 @@ index 6129196..586deee 100644
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
-index 291228e..8557cf6 100644
---- a/scripts/basic/fixdep.c
-+++ b/scripts/basic/fixdep.c
-@@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
+diff -urNp linux-3.0.3/scripts/basic/fixdep.c linux-3.0.3/scripts/basic/fixdep.c
+--- linux-3.0.3/scripts/basic/fixdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/basic/fixdep.c	2011-08-23 21:47:56.000000000 -0400
+@@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
  {
@@ -71374,11 +68082,60 @@ index 291228e..8557cf6 100644
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
-index 88f3f07..9089a1b 100644
---- a/scripts/mod/file2alias.c
-+++ b/scripts/mod/file2alias.c
-@@ -72,7 +72,7 @@ static void device_id_check(const char *modname, const char *device_id,
+diff -urNp linux-3.0.3/scripts/gcc-plugin.sh linux-3.0.3/scripts/gcc-plugin.sh
+--- linux-3.0.3/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/scripts/gcc-plugin.sh	2011-08-23 21:47:56.000000000 -0400
+@@ -0,0 +1,2 @@
++#!/bin/sh
++echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
+diff -urNp linux-3.0.3/scripts/Makefile.build linux-3.0.3/scripts/Makefile.build
+--- linux-3.0.3/scripts/Makefile.build	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/Makefile.build	2011-08-23 21:47:56.000000000 -0400
+@@ -109,7 +109,7 @@ endif
+ endif
+ 
+ # Do not include host rules unless needed
+-ifneq ($(hostprogs-y)$(hostprogs-m),)
++ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),)
+ include scripts/Makefile.host
+ endif
+ 
+diff -urNp linux-3.0.3/scripts/Makefile.clean linux-3.0.3/scripts/Makefile.clean
+--- linux-3.0.3/scripts/Makefile.clean	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/Makefile.clean	2011-08-23 21:47:56.000000000 -0400
+@@ -43,7 +43,8 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subd
+ __clean-files	:= $(extra-y) $(always)                  \
+ 		   $(targets) $(clean-files)             \
+ 		   $(host-progs)                         \
+-		   $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
++		   $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
++		   $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
+ 
+ __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
+ 
+diff -urNp linux-3.0.3/scripts/Makefile.host linux-3.0.3/scripts/Makefile.host
+--- linux-3.0.3/scripts/Makefile.host	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/Makefile.host	2011-08-23 21:47:56.000000000 -0400
+@@ -31,6 +31,7 @@
+ # Note: Shared libraries consisting of C++ files are not supported
+ 
+ __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
++__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
+ 
+ # C code
+ # Executables compiled from a single .c file
+@@ -54,6 +55,7 @@ host-cxxobjs	:= $(sort $(foreach m,$(hos
+ # Shared libaries (only .c supported)
+ # Shared libraries (.so) - all .so files referenced in "xxx-objs"
+ host-cshlib	:= $(sort $(filter %.so, $(host-cobjs)))
++host-cshlib	+= $(sort $(filter %.so, $(__hostlibs)))
+ # Remove .so files from "xxx-objs"
+ host-cobjs	:= $(filter-out %.so,$(host-cobjs))
+ 
+diff -urNp linux-3.0.3/scripts/mod/file2alias.c linux-3.0.3/scripts/mod/file2alias.c
+--- linux-3.0.3/scripts/mod/file2alias.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/mod/file2alias.c	2011-08-23 21:47:56.000000000 -0400
+@@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
  {
@@ -71387,7 +68144,7 @@ index 88f3f07..9089a1b 100644
  
  	if (size % id_size || size < id_size) {
  		if (cross_build != 0)
-@@ -102,7 +102,7 @@ static void device_id_check(const char *modname, const char *device_id,
+@@ -102,7 +102,7 @@ static void device_id_check(const char *
  /* USB is special because the bcdDevice can be matched against a numeric range */
  /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
  static void do_usb_entry(struct usb_device_id *id,
@@ -71396,7 +68153,7 @@ index 88f3f07..9089a1b 100644
  			 unsigned char range_lo, unsigned char range_hi,
  			 unsigned char max, struct module *mod)
  {
-@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
+@@ -437,7 +437,7 @@ static void do_pnp_device_entry(void *sy
  	for (i = 0; i < count; i++) {
  		const char *id = (char *)devs[i].id;
  		char acpi_id[sizeof(devs[0].id)];
@@ -71405,7 +68162,7 @@ index 88f3f07..9089a1b 100644
  
  		buf_printf(&mod->dev_table_buf,
  			   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -467,7 +467,7 @@ static void do_pnp_card_entries(void *sy
  
  		for (j = 0; j < PNP_MAX_DEVICES; j++) {
  			const char *id = (char *)card->devs[j].id;
@@ -71414,7 +68171,7 @@ index 88f3f07..9089a1b 100644
  			int dup = 0;
  
  			if (!id[0])
-@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
+@@ -493,7 +493,7 @@ static void do_pnp_card_entries(void *sy
  			/* add an individual alias for every device entry */
  			if (!dup) {
  				char acpi_id[sizeof(card->devs[0].id)];
@@ -71423,7 +68180,7 @@ index 88f3f07..9089a1b 100644
  
  				buf_printf(&mod->dev_table_buf,
  					   "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
-@@ -768,7 +768,7 @@ static void dmi_ascii_filter(char *d, const char *s)
+@@ -786,7 +786,7 @@ static void dmi_ascii_filter(char *d, co
  static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
  			char *alias)
  {
@@ -71432,11 +68189,10 @@ index 88f3f07..9089a1b 100644
  
  	sprintf(alias, "dmi*");
  
-diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index e8fba95..0accc17 100644
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -896,6 +896,7 @@ enum mismatch {
+diff -urNp linux-3.0.3/scripts/mod/modpost.c linux-3.0.3/scripts/mod/modpost.c
+--- linux-3.0.3/scripts/mod/modpost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/mod/modpost.c	2011-08-23 21:47:56.000000000 -0400
+@@ -892,6 +892,7 @@ enum mismatch {
  	ANY_INIT_TO_ANY_EXIT,
  	ANY_EXIT_TO_ANY_INIT,
  	EXPORT_TO_INIT_EXIT,
@@ -71444,7 +68200,7 @@ index e8fba95..0accc17 100644
  };
  
  struct sectioncheck {
-@@ -1004,6 +1005,12 @@ const struct sectioncheck sectioncheck[] = {
+@@ -1000,6 +1001,12 @@ const struct sectioncheck sectioncheck[]
  	.tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
  	.mismatch = EXPORT_TO_INIT_EXIT,
  	.symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
@@ -71457,7 +68213,7 @@ index e8fba95..0accc17 100644
  }
  };
  
-@@ -1126,10 +1133,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+@@ -1122,10 +1129,10 @@ static Elf_Sym *find_elf_symbol(struct e
  			continue;
  		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
  			continue;
@@ -71470,7 +68226,7 @@ index e8fba95..0accc17 100644
  		if (d < 0)
  			d = addr - sym->st_value;
  		if (d < distance) {
-@@ -1401,6 +1408,14 @@ static void report_sec_mismatch(const char *modname,
+@@ -1404,6 +1411,14 @@ static void report_sec_mismatch(const ch
  		tosym, prl_to, prl_to, tosym);
  		free(prl_to);
  		break;
@@ -71485,7 +68241,16 @@ index e8fba95..0accc17 100644
  	}
  	fprintf(stderr, "\n");
  }
-@@ -1724,7 +1739,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
+@@ -1629,7 +1644,7 @@ static void section_rel(const char *modn
+ static void check_sec_ref(struct module *mod, const char *modname,
+                           struct elf_info *elf)
+ {
+-	int i;
++	unsigned int i;
+ 	Elf_Shdr *sechdrs = elf->sechdrs;
+ 
+ 	/* Walk through all sections */
+@@ -1727,7 +1742,7 @@ void __attribute__((format(printf, 2, 3)
  	va_end(ap);
  }
  
@@ -71494,7 +68259,7 @@ index e8fba95..0accc17 100644
  {
  	if (buf->size - buf->pos < len) {
  		buf->size += len + SZ;
-@@ -1936,7 +1951,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
+@@ -1939,7 +1954,7 @@ static void write_if_changed(struct buff
  	if (fstat(fileno(file), &st) < 0)
  		goto close_write;
  
@@ -71503,11 +68268,10 @@ index e8fba95..0accc17 100644
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
-index 0388cfc..68ca013 100644
---- a/scripts/mod/modpost.h
-+++ b/scripts/mod/modpost.h
-@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
+diff -urNp linux-3.0.3/scripts/mod/modpost.h linux-3.0.3/scripts/mod/modpost.h
+--- linux-3.0.3/scripts/mod/modpost.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/mod/modpost.h	2011-08-23 21:47:56.000000000 -0400
+@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
  	char *p;
@@ -71526,11 +68290,10 @@ index 0388cfc..68ca013 100644
  
  struct module {
  	struct module *next;
-diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
-index 9dfcd6d..099068e 100644
---- a/scripts/mod/sumversion.c
-+++ b/scripts/mod/sumversion.c
-@@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
+diff -urNp linux-3.0.3/scripts/mod/sumversion.c linux-3.0.3/scripts/mod/sumversion.c
+--- linux-3.0.3/scripts/mod/sumversion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/mod/sumversion.c	2011-08-23 21:47:56.000000000 -0400
+@@ -470,7 +470,7 @@ static void write_version(const char *fi
  		goto out;
  	}
  
@@ -71539,10 +68302,9 @@ index 9dfcd6d..099068e 100644
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
-index 5c11312..72742b5 100644
---- a/scripts/pnmtologo.c
-+++ b/scripts/pnmtologo.c
+diff -urNp linux-3.0.3/scripts/pnmtologo.c linux-3.0.3/scripts/pnmtologo.c
+--- linux-3.0.3/scripts/pnmtologo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/scripts/pnmtologo.c	2011-08-23 21:47:56.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -71569,11 +68331,108 @@ index 5c11312..72742b5 100644
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff --git a/security/Kconfig b/security/Kconfig
-index 95accd4..c9d4b56 100644
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -4,6 +4,548 @@
+diff -urNp linux-3.0.3/security/apparmor/lsm.c linux-3.0.3/security/apparmor/lsm.c
+--- linux-3.0.3/security/apparmor/lsm.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/security/apparmor/lsm.c	2011-08-23 21:48:14.000000000 -0400
+@@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
+ 	return error;
+ }
+ 
+-static struct security_operations apparmor_ops = {
++static struct security_operations apparmor_ops __read_only = {
+ 	.name =				"apparmor",
+ 
+ 	.ptrace_access_check =		apparmor_ptrace_access_check,
+diff -urNp linux-3.0.3/security/commoncap.c linux-3.0.3/security/commoncap.c
+--- linux-3.0.3/security/commoncap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/commoncap.c	2011-08-23 21:48:14.000000000 -0400
+@@ -28,6 +28,7 @@
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
+ #include <linux/user_namespace.h>
++#include <net/sock.h>
+ 
+ /*
+  * If a non-root user executes a setuid-root binary in
+@@ -58,7 +59,7 @@ int cap_netlink_send(struct sock *sk, st
+ 
+ int cap_netlink_recv(struct sk_buff *skb, int cap)
+ {
+-	if (!cap_raised(current_cap(), cap))
++	if (!cap_raised(current_cap(), cap) || !gr_is_capable(cap))
+ 		return -EPERM;
+ 	return 0;
+ }
+@@ -575,6 +576,9 @@ int cap_bprm_secureexec(struct linux_bin
+ {
+ 	const struct cred *cred = current_cred();
+ 
++	if (gr_acl_enable_at_secure())
++		return 1;
++
+ 	if (cred->uid != 0) {
+ 		if (bprm->cap_effective)
+ 			return 1;
+diff -urNp linux-3.0.3/security/integrity/ima/ima_api.c linux-3.0.3/security/integrity/ima/ima_api.c
+--- linux-3.0.3/security/integrity/ima/ima_api.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/integrity/ima/ima_api.c	2011-08-23 21:47:56.000000000 -0400
+@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
+ 	int result;
+ 
+ 	/* can overflow, only indicator */
+-	atomic_long_inc(&ima_htable.violations);
++	atomic_long_inc_unchecked(&ima_htable.violations);
+ 
+ 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry) {
+diff -urNp linux-3.0.3/security/integrity/ima/ima_fs.c linux-3.0.3/security/integrity/ima/ima_fs.c
+--- linux-3.0.3/security/integrity/ima/ima_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/integrity/ima/ima_fs.c	2011-08-23 21:47:56.000000000 -0400
+@@ -28,12 +28,12 @@
+ static int valid_policy = 1;
+ #define TMPBUFLEN 12
+ static ssize_t ima_show_htable_value(char __user *buf, size_t count,
+-				     loff_t *ppos, atomic_long_t *val)
++				     loff_t *ppos, atomic_long_unchecked_t *val)
+ {
+ 	char tmpbuf[TMPBUFLEN];
+ 	ssize_t len;
+ 
+-	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
++	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
+ 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+ }
+ 
+diff -urNp linux-3.0.3/security/integrity/ima/ima.h linux-3.0.3/security/integrity/ima/ima.h
+--- linux-3.0.3/security/integrity/ima/ima.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/integrity/ima/ima.h	2011-08-23 21:47:56.000000000 -0400
+@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
+ extern spinlock_t ima_queue_lock;
+ 
+ struct ima_h_table {
+-	atomic_long_t len;	/* number of stored measurements in the list */
+-	atomic_long_t violations;
++	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
++	atomic_long_unchecked_t violations;
+ 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
+ };
+ extern struct ima_h_table ima_htable;
+diff -urNp linux-3.0.3/security/integrity/ima/ima_queue.c linux-3.0.3/security/integrity/ima/ima_queue.c
+--- linux-3.0.3/security/integrity/ima/ima_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/integrity/ima/ima_queue.c	2011-08-23 21:47:56.000000000 -0400
+@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
+ 	INIT_LIST_HEAD(&qe->later);
+ 	list_add_tail_rcu(&qe->later, &ima_measurements);
+ 
+-	atomic_long_inc(&ima_htable.len);
++	atomic_long_inc_unchecked(&ima_htable.len);
+ 	key = ima_hash_key(entry->digest);
+ 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
+ 	return 0;
+diff -urNp linux-3.0.3/security/Kconfig linux-3.0.3/security/Kconfig
+--- linux-3.0.3/security/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -4,6 +4,554 @@
  
  menu "Security options"
  
@@ -72048,6 +68907,12 @@ index 95accd4..c9d4b56 100644
 +	  and you are advised to test this feature on your expected workload
 +	  before deploying it.
 +
++	  Note: full support for this feature requires gcc with plugin support
++	  so make sure your compiler is at least gcc 4.5.0 (cross compilation
++	  is not supported).  Using older gcc versions means that functions
++	  with large enough stack frames may leave uninitialized memory behind
++	  that may be exposed to a later syscall leaking the stack.
++
 +config PAX_MEMORY_UDEREF
 +	bool "Prevent invalid userland pointer dereference"
 +	depends on X86 && !UML_X86 && !XEN
@@ -72088,8 +68953,8 @@ index 95accd4..c9d4b56 100644
 +
 +config PAX_USERCOPY
 +	bool "Harden heap object copies between kernel and userland"
-+	depends on X86 || PPC || SPARC
-+	depends on GRKERNSEC && (SLAB || SLUB)
++	depends on X86 || PPC || SPARC || ARM
++	depends on GRKERNSEC && (SLAB || SLUB || SLOB)
 +	help
 +	  By saying Y here the kernel will enforce the size of heap objects
 +	  when they are copied in either direction between the kernel and
@@ -72122,128 +68987,19 @@ index 95accd4..c9d4b56 100644
  config KEYS
  	bool "Enable access key retention support"
  	help
-@@ -167,7 +709,7 @@ config INTEL_TXT
+@@ -167,7 +715,7 @@ config INTEL_TXT
  config LSM_MMAP_MIN_ADDR
  	int "Low address space for LSM to protect from user allocation"
  	depends on SECURITY && SECURITY_SELINUX
--	default 65536
-+	default 32768
+-	default 32768 if ARM
++	default 32768 if ALPHA || ARM || PARISC || SPARC32
+ 	default 65536
  	help
  	  This is the portion of low virtual memory which should be protected
- 	  from userspace allocation.  Keeping a user from writing to low pages
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index e2e902f..03f2b69 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -620,7 +620,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
- 	return error;
- }
- 
--static struct security_operations apparmor_ops = {
-+static struct security_operations apparmor_ops __read_only = {
- 	.name =				"apparmor",
- 
- 	.ptrace_access_check =		apparmor_ptrace_access_check,
-diff --git a/security/commoncap.c b/security/commoncap.c
-index 64c2ed9..bfd68b4 100644
---- a/security/commoncap.c
-+++ b/security/commoncap.c
-@@ -27,6 +27,7 @@
- #include <linux/sched.h>
- #include <linux/prctl.h>
- #include <linux/securebits.h>
-+#include <net/sock.h>
- 
- /*
-  * If a non-root user executes a setuid-root binary in
-@@ -50,9 +51,11 @@ static void warn_setuid_and_fcaps_mixed(const char *fname)
- 	}
- }
- 
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
--	NETLINK_CB(skb).eff_cap = current_cap();
-+	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
- 	return 0;
- }
- 
-@@ -534,6 +537,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
- {
- 	const struct cred *cred = current_cred();
- 
-+	if (gr_acl_enable_at_secure())
-+		return 1;
-+
- 	if (cred->uid != 0) {
- 		if (bprm->cap_effective)
- 			return 1;
-diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
-index ac79032..fb00506 100644
---- a/security/integrity/ima/ima.h
-+++ b/security/integrity/ima/ima.h
-@@ -85,8 +85,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
- extern spinlock_t ima_queue_lock;
- 
- struct ima_h_table {
--	atomic_long_t len;	/* number of stored measurements in the list */
--	atomic_long_t violations;
-+	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
-+	atomic_long_unchecked_t violations;
- 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
- };
- extern struct ima_h_table ima_htable;
-diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
-index d3963de..5eafb77 100644
---- a/security/integrity/ima/ima_api.c
-+++ b/security/integrity/ima/ima_api.c
-@@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
- 	int result;
- 
- 	/* can overflow, only indicator */
--	atomic_long_inc(&ima_htable.violations);
-+	atomic_long_inc_unchecked(&ima_htable.violations);
- 
- 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
- 	if (!entry) {
-diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
-index ef21b96..d53e674 100644
---- a/security/integrity/ima/ima_fs.c
-+++ b/security/integrity/ima/ima_fs.c
-@@ -28,12 +28,12 @@
- static int valid_policy = 1;
- #define TMPBUFLEN 12
- static ssize_t ima_show_htable_value(char __user *buf, size_t count,
--				     loff_t *ppos, atomic_long_t *val)
-+				     loff_t *ppos, atomic_long_unchecked_t *val)
- {
- 	char tmpbuf[TMPBUFLEN];
- 	ssize_t len;
- 
--	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
-+	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
- 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
- }
- 
-diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
-index 8e28f04..d5951b1 100644
---- a/security/integrity/ima/ima_queue.c
-+++ b/security/integrity/ima/ima_queue.c
-@@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
- 	INIT_LIST_HEAD(&qe->later);
- 	list_add_tail_rcu(&qe->later, &ima_measurements);
- 
--	atomic_long_inc(&ima_htable.len);
-+	atomic_long_inc_unchecked(&ima_htable.len);
- 	key = ima_hash_key(entry->digest);
- 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
- 	return 0;
-diff --git a/security/keys/keyring.c b/security/keys/keyring.c
-index 5620f08..329e634 100644
---- a/security/keys/keyring.c
-+++ b/security/keys/keyring.c
-@@ -213,15 +213,15 @@ static long keyring_read(const struct key *keyring,
+diff -urNp linux-3.0.3/security/keys/keyring.c linux-3.0.3/security/keys/keyring.c
+--- linux-3.0.3/security/keys/keyring.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/keys/keyring.c	2011-08-23 21:47:56.000000000 -0400
+@@ -215,15 +215,15 @@ static long keyring_read(const struct ke
  			ret = -EFAULT;
  
  			for (loop = 0; loop < klist->nkeys; loop++) {
@@ -72262,11 +69018,10 @@ index 5620f08..329e634 100644
  					goto error;
  
  				buflen -= tmp;
-diff --git a/security/min_addr.c b/security/min_addr.c
-index f728728..6457a0c 100644
---- a/security/min_addr.c
-+++ b/security/min_addr.c
-@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
+diff -urNp linux-3.0.3/security/min_addr.c linux-3.0.3/security/min_addr.c
+--- linux-3.0.3/security/min_addr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/min_addr.c	2011-08-23 21:48:14.000000000 -0400
+@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
  {
@@ -72282,11 +69037,10 @@ index f728728..6457a0c 100644
  }
  
  /*
-diff --git a/security/security.c b/security/security.c
-index 7b7308a..541c5a8 100644
---- a/security/security.c
-+++ b/security/security.c
-@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
+diff -urNp linux-3.0.3/security/security.c linux-3.0.3/security/security.c
+--- linux-3.0.3/security/security.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/security.c	2011-08-23 21:48:14.000000000 -0400
+@@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
  /* things that live in capability.c */
  extern void __init security_fixup_ops(struct security_operations *ops);
  
@@ -72307,11 +69061,10 @@ index 7b7308a..541c5a8 100644
  }
  
  /* Save user chosen LSM */
-diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index c8d6992..9737f71 100644
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -90,7 +90,6 @@
+diff -urNp linux-3.0.3/security/selinux/hooks.c linux-3.0.3/security/selinux/hooks.c
+--- linux-3.0.3/security/selinux/hooks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/selinux/hooks.c	2011-08-23 21:48:14.000000000 -0400
+@@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
  extern int selinux_nlmsg_lookup(u16 sclass, u16 nlmsg_type, u32 *perm);
@@ -72319,7 +69072,7 @@ index c8d6992..9737f71 100644
  
  /* SECMARK reference count */
  atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
-@@ -5395,7 +5394,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
+@@ -5454,7 +5453,7 @@ static int selinux_key_getsecurity(struc
  
  #endif
  
@@ -72328,11 +69081,10 @@ index c8d6992..9737f71 100644
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
-index 13128f9..c23c736 100644
---- a/security/selinux/include/xfrm.h
-+++ b/security/selinux/include/xfrm.h
-@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
+diff -urNp linux-3.0.3/security/selinux/include/xfrm.h linux-3.0.3/security/selinux/include/xfrm.h
+--- linux-3.0.3/security/selinux/include/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/selinux/include/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+@@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
  {
@@ -72341,11 +69093,10 @@ index 13128f9..c23c736 100644
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
-index a03cfaf..9105fd6 100644
---- a/security/selinux/ss/services.c
-+++ b/security/selinux/ss/services.c
-@@ -1769,6 +1769,8 @@ int security_load_policy(void *data, size_t len)
+diff -urNp linux-3.0.3/security/selinux/ss/services.c linux-3.0.3/security/selinux/ss/services.c
+--- linux-3.0.3/security/selinux/ss/services.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/selinux/ss/services.c	2011-08-23 21:48:14.000000000 -0400
+@@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
  	int rc = 0;
  	struct policy_file file = { data, len }, *fp = &file;
  
@@ -72354,11 +69105,10 @@ index a03cfaf..9105fd6 100644
  	if (!ss_initialized) {
  		avtab_cache_init();
  		rc = policydb_read(&policydb, fp);
-diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
-index 533bf32..bc19c16 100644
---- a/security/smack/smack_lsm.c
-+++ b/security/smack/smack_lsm.c
-@@ -3179,7 +3179,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
+diff -urNp linux-3.0.3/security/smack/smack_lsm.c linux-3.0.3/security/smack/smack_lsm.c
+--- linux-3.0.3/security/smack/smack_lsm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/smack/smack_lsm.c	2011-08-23 21:47:56.000000000 -0400
+@@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct 
  	return 0;
  }
  
@@ -72367,11 +69117,10 @@ index 533bf32..bc19c16 100644
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
-index 95d3f95..1786602 100644
---- a/security/tomoyo/tomoyo.c
-+++ b/security/tomoyo/tomoyo.c
-@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct path *old_path, struct path *new_path)
+diff -urNp linux-3.0.3/security/tomoyo/tomoyo.c linux-3.0.3/security/tomoyo/tomoyo.c
+--- linux-3.0.3/security/tomoyo/tomoyo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/security/tomoyo/tomoyo.c	2011-08-23 21:47:56.000000000 -0400
+@@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
   */
@@ -72380,10 +69129,9 @@ index 95d3f95..1786602 100644
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
-index 3687a6c..652565e 100644
---- a/sound/aoa/codecs/onyx.c
-+++ b/sound/aoa/codecs/onyx.c
+diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.c linux-3.0.3/sound/aoa/codecs/onyx.c
+--- linux-3.0.3/sound/aoa/codecs/onyx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/aoa/codecs/onyx.c	2011-08-23 21:47:56.000000000 -0400
 @@ -54,7 +54,7 @@ struct onyx {
  				spdif_locked:1,
  				analog_locked:1,
@@ -72393,7 +69141,7 @@ index 3687a6c..652565e 100644
  	struct codec_info	*codec_info;
  
  	/* mutex serializes concurrent access to the device
-@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
+@@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_i
  	struct onyx *onyx = cii->codec_data;
  
  	mutex_lock(&onyx->mutex);
@@ -72402,7 +69150,7 @@ index 3687a6c..652565e 100644
  	mutex_unlock(&onyx->mutex);
  
  	return 0;
-@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
+@@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_
  	struct onyx *onyx = cii->codec_data;
  
  	mutex_lock(&onyx->mutex);
@@ -72412,10 +69160,9 @@ index 3687a6c..652565e 100644
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
-index ffd2025..df062c9 100644
---- a/sound/aoa/codecs/onyx.h
-+++ b/sound/aoa/codecs/onyx.h
+diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.h linux-3.0.3/sound/aoa/codecs/onyx.h
+--- linux-3.0.3/sound/aoa/codecs/onyx.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/aoa/codecs/onyx.h	2011-08-23 21:47:56.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -72424,10 +69171,48 @@ index ffd2025..df062c9 100644
  
  /* PCM3052 register definitions */
  
-diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
-index 8539ab0..be8a121 100644
---- a/sound/drivers/mts64.c
-+++ b/sound/drivers/mts64.c
+diff -urNp linux-3.0.3/sound/core/seq/seq_device.c linux-3.0.3/sound/core/seq/seq_device.c
+--- linux-3.0.3/sound/core/seq/seq_device.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/core/seq/seq_device.c	2011-08-23 21:47:56.000000000 -0400
+@@ -63,7 +63,7 @@ struct ops_list {
+ 	int argsize;		/* argument size */
+ 
+ 	/* operators */
+-	struct snd_seq_dev_ops ops;
++	struct snd_seq_dev_ops *ops;
+ 
+ 	/* registred devices */
+ 	struct list_head dev_list;	/* list of devices */
+@@ -332,7 +332,7 @@ int snd_seq_device_register_driver(char 
+ 
+ 	mutex_lock(&ops->reg_mutex);
+ 	/* copy driver operators */
+-	ops->ops = *entry;
++	ops->ops = entry;
+ 	ops->driver |= DRIVER_LOADED;
+ 	ops->argsize = argsize;
+ 
+@@ -462,7 +462,7 @@ static int init_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
+ 	}
+-	if (ops->ops.init_device(dev) >= 0) {
++	if (ops->ops->init_device(dev) >= 0) {
+ 		dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
+ 		ops->num_init_devices++;
+ 	} else {
+@@ -489,7 +489,7 @@ static int free_device(struct snd_seq_de
+ 			   dev->name, ops->id, ops->argsize, dev->argsize);
+ 		return -EINVAL;
+ 	}
+-	if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
++	if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
+ 		dev->status = SNDRV_SEQ_DEVICE_FREE;
+ 		dev->driver_data = NULL;
+ 		ops->num_init_devices--;
+diff -urNp linux-3.0.3/sound/drivers/mts64.c linux-3.0.3/sound/drivers/mts64.c
+--- linux-3.0.3/sound/drivers/mts64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/drivers/mts64.c	2011-08-23 21:47:56.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -72445,7 +69230,7 @@ index 8539ab0..be8a121 100644
  	int current_midi_output_port;
  	int current_midi_input_port;
  	u8 mode[MTS64_NUM_INPUT_PORTS];
-@@ -696,7 +697,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
+@@ -696,7 +697,7 @@ static int snd_mts64_rawmidi_open(struct
  {
  	struct mts64 *mts = substream->rmidi->private_data;
  
@@ -72454,7 +69239,7 @@ index 8539ab0..be8a121 100644
  		/* We don't need a spinlock here, because this is just called 
  		   if the device has not been opened before. 
  		   So there aren't any IRQs from the device */
-@@ -704,7 +705,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
+@@ -704,7 +705,7 @@ static int snd_mts64_rawmidi_open(struct
  
  		msleep(50);
  	}
@@ -72463,7 +69248,7 @@ index 8539ab0..be8a121 100644
  
  	return 0;
  }
-@@ -714,8 +715,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
+@@ -714,8 +715,7 @@ static int snd_mts64_rawmidi_close(struc
  	struct mts64 *mts = substream->rmidi->private_data;
  	unsigned long flags;
  
@@ -72473,7 +69258,7 @@ index 8539ab0..be8a121 100644
  		/* We need the spinlock_irqsave here because we can still
  		   have IRQs at this point */
  		spin_lock_irqsave(&mts->lock, flags);
-@@ -724,8 +724,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
+@@ -724,8 +724,8 @@ static int snd_mts64_rawmidi_close(struc
  
  		msleep(500);
  
@@ -72484,10 +69269,21 @@ index 8539ab0..be8a121 100644
  
  	return 0;
  }
-diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
-index f2b0ba2..429efc5 100644
---- a/sound/drivers/portman2x4.c
-+++ b/sound/drivers/portman2x4.c
+diff -urNp linux-3.0.3/sound/drivers/opl4/opl4_lib.c linux-3.0.3/sound/drivers/opl4/opl4_lib.c
+--- linux-3.0.3/sound/drivers/opl4/opl4_lib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/drivers/opl4/opl4_lib.c	2011-08-23 21:47:56.000000000 -0400
+@@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
+ MODULE_DESCRIPTION("OPL4 driver");
+ MODULE_LICENSE("GPL");
+ 
+-static void inline snd_opl4_wait(struct snd_opl4 *opl4)
++static inline void snd_opl4_wait(struct snd_opl4 *opl4)
+ {
+ 	int timeout = 10;
+ 	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
+diff -urNp linux-3.0.3/sound/drivers/portman2x4.c linux-3.0.3/sound/drivers/portman2x4.c
+--- linux-3.0.3/sound/drivers/portman2x4.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/drivers/portman2x4.c	2011-08-23 21:47:56.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -72505,10 +69301,97 @@ index f2b0ba2..429efc5 100644
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
-index 733b014..56ce96f 100644
---- a/sound/oss/sb_audio.c
-+++ b/sound/oss/sb_audio.c
+diff -urNp linux-3.0.3/sound/firewire/amdtp.c linux-3.0.3/sound/firewire/amdtp.c
+--- linux-3.0.3/sound/firewire/amdtp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/firewire/amdtp.c	2011-08-23 21:47:56.000000000 -0400
+@@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
+ 		ptr = s->pcm_buffer_pointer + data_blocks;
+ 		if (ptr >= pcm->runtime->buffer_size)
+ 			ptr -= pcm->runtime->buffer_size;
+-		ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
++		ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
+ 
+ 		s->pcm_period_pointer += data_blocks;
+ 		if (s->pcm_period_pointer >= pcm->runtime->period_size) {
+@@ -511,7 +511,7 @@ EXPORT_SYMBOL(amdtp_out_stream_start);
+  */
+ void amdtp_out_stream_update(struct amdtp_out_stream *s)
+ {
+-	ACCESS_ONCE(s->source_node_id_field) =
++	ACCESS_ONCE_RW(s->source_node_id_field) =
+ 		(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
+ }
+ EXPORT_SYMBOL(amdtp_out_stream_update);
+diff -urNp linux-3.0.3/sound/firewire/amdtp.h linux-3.0.3/sound/firewire/amdtp.h
+--- linux-3.0.3/sound/firewire/amdtp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/firewire/amdtp.h	2011-08-23 21:47:56.000000000 -0400
+@@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
+ static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
+ 						struct snd_pcm_substream *pcm)
+ {
+-	ACCESS_ONCE(s->pcm) = pcm;
++	ACCESS_ONCE_RW(s->pcm) = pcm;
+ }
+ 
+ /**
+diff -urNp linux-3.0.3/sound/firewire/isight.c linux-3.0.3/sound/firewire/isight.c
+--- linux-3.0.3/sound/firewire/isight.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/firewire/isight.c	2011-08-23 21:47:56.000000000 -0400
+@@ -97,7 +97,7 @@ static void isight_update_pointers(struc
+ 	ptr += count;
+ 	if (ptr >= runtime->buffer_size)
+ 		ptr -= runtime->buffer_size;
+-	ACCESS_ONCE(isight->buffer_pointer) = ptr;
++	ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
+ 
+ 	isight->period_counter += count;
+ 	if (isight->period_counter >= runtime->period_size) {
+@@ -308,7 +308,7 @@ static int isight_hw_params(struct snd_p
+ 	if (err < 0)
+ 		return err;
+ 
+-	ACCESS_ONCE(isight->pcm_active) = true;
++	ACCESS_ONCE_RW(isight->pcm_active) = true;
+ 
+ 	return 0;
+ }
+@@ -341,7 +341,7 @@ static int isight_hw_free(struct snd_pcm
+ {
+ 	struct isight *isight = substream->private_data;
+ 
+-	ACCESS_ONCE(isight->pcm_active) = false;
++	ACCESS_ONCE_RW(isight->pcm_active) = false;
+ 
+ 	mutex_lock(&isight->mutex);
+ 	isight_stop_streaming(isight);
+@@ -434,10 +434,10 @@ static int isight_trigger(struct snd_pcm
+ 
+ 	switch (cmd) {
+ 	case SNDRV_PCM_TRIGGER_START:
+-		ACCESS_ONCE(isight->pcm_running) = true;
++		ACCESS_ONCE_RW(isight->pcm_running) = true;
+ 		break;
+ 	case SNDRV_PCM_TRIGGER_STOP:
+-		ACCESS_ONCE(isight->pcm_running) = false;
++		ACCESS_ONCE_RW(isight->pcm_running) = false;
+ 		break;
+ 	default:
+ 		return -EINVAL;
+diff -urNp linux-3.0.3/sound/isa/cmi8330.c linux-3.0.3/sound/isa/cmi8330.c
+--- linux-3.0.3/sound/isa/cmi8330.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/isa/cmi8330.c	2011-08-23 21:47:56.000000000 -0400
+@@ -172,7 +172,7 @@ struct snd_cmi8330 {
+ 
+ 	struct snd_pcm *pcm;
+ 	struct snd_cmi8330_stream {
+-		struct snd_pcm_ops ops;
++		snd_pcm_ops_no_const ops;
+ 		snd_pcm_open_callback_t open;
+ 		void *private_data; /* sb or wss */
+ 	} streams[2];
+diff -urNp linux-3.0.3/sound/oss/sb_audio.c linux-3.0.3/sound/oss/sb_audio.c
+--- linux-3.0.3/sound/oss/sb_audio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/oss/sb_audio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
  		buf16 = (signed short *)(localbuf + localoffs);
  		while (c)
@@ -72518,10 +69401,9 @@ index 733b014..56ce96f 100644
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
-index 44357d8..370f0c5 100644
---- a/sound/oss/swarm_cs4297a.c
-+++ b/sound/oss/swarm_cs4297a.c
+diff -urNp linux-3.0.3/sound/oss/swarm_cs4297a.c linux-3.0.3/sound/oss/swarm_cs4297a.c
+--- linux-3.0.3/sound/oss/swarm_cs4297a.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/oss/swarm_cs4297a.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
  	struct cs4297a_state *s;
@@ -72556,24 +69438,69 @@ index 44357d8..370f0c5 100644
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
-index 13cec1e..2bfae48 100644
---- a/sound/pci/intel8x0m.c
-+++ b/sound/pci/intel8x0m.c
-@@ -1264,7 +1264,7 @@ static struct shortname_table {
- 	{ 0x5455, "ALi M5455" },
- 	{ 0x746d, "AMD AMD8111" },
+diff -urNp linux-3.0.3/sound/pci/hda/hda_codec.h linux-3.0.3/sound/pci/hda/hda_codec.h
+--- linux-3.0.3/sound/pci/hda/hda_codec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/pci/hda/hda_codec.h	2011-08-23 21:47:56.000000000 -0400
+@@ -615,7 +615,7 @@ struct hda_bus_ops {
+ 	/* notify power-up/down from codec to controller */
+ 	void (*pm_notify)(struct hda_bus *bus);
+ #endif
+-};
++} __no_const;
+ 
+ /* template to pass to the bus constructor */
+ struct hda_bus_template {
+@@ -713,6 +713,7 @@ struct hda_codec_ops {
  #endif
--	{ 0 },
-+	{ 0, },
+ 	void (*reboot_notify)(struct hda_codec *codec);
+ };
++typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
+ 
+ /* record for amp information cache */
+ struct hda_cache_head {
+@@ -743,7 +744,7 @@ struct hda_pcm_ops {
+ 		       struct snd_pcm_substream *substream);
+ 	int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
+ 		       struct snd_pcm_substream *substream);
+-};
++} __no_const;
+ 
+ /* PCM information for each substream */
+ struct hda_pcm_stream {
+@@ -801,7 +802,7 @@ struct hda_codec {
+ 	const char *modelname;	/* model name for preset */
+ 
+ 	/* set by patch */
+-	struct hda_codec_ops patch_ops;
++	hda_codec_ops_no_const patch_ops;
+ 
+ 	/* PCM to create, set by patch_ops.build_pcms callback */
+ 	unsigned int num_pcms;
+diff -urNp linux-3.0.3/sound/pci/ice1712/ice1712.h linux-3.0.3/sound/pci/ice1712/ice1712.h
+--- linux-3.0.3/sound/pci/ice1712/ice1712.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/pci/ice1712/ice1712.h	2011-08-23 21:47:56.000000000 -0400
+@@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
+ 	unsigned int mask_flags;	/* total mask bits */
+ 	struct snd_akm4xxx_ops {
+ 		void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
+-	} ops;
++	} __no_const ops;
  };
  
- static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
-diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
-index c94c051..be0abd1 100644
---- a/sound/pci/ymfpci/ymfpci_main.c
-+++ b/sound/pci/ymfpci/ymfpci_main.c
-@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
+ struct snd_ice1712_spdif {
+@@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
+ 		int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+ 		int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
+-	} ops;
++	} __no_const ops;
+ };
+ 
+ 
+diff -urNp linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c	2011-08-23 21:47:56.000000000 -0400
+@@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
  		if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
  			break;
  	}
@@ -72584,7 +69511,7 @@ index c94c051..be0abd1 100644
  		wake_up(&chip->interrupt_sleep);
  	}
        __end:
-@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
+@@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct s
  		 	continue;
  		init_waitqueue_entry(&wait, current);
  		add_wait_queue(&chip->interrupt_sleep, &wait);
@@ -72593,7 +69520,7 @@ index c94c051..be0abd1 100644
  		schedule_timeout_uninterruptible(msecs_to_jiffies(50));
  		remove_wait_queue(&chip->interrupt_sleep, &wait);
  	}
-@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
+@@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(
  		snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
  		spin_unlock(&chip->reg_lock);
  
@@ -72604,7 +69531,7 @@ index c94c051..be0abd1 100644
  			wake_up(&chip->interrupt_sleep);
  		}
  	}
-@@ -2363,7 +2363,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
+@@ -2363,7 +2363,7 @@ int __devinit snd_ymfpci_create(struct s
  	spin_lock_init(&chip->reg_lock);
  	spin_lock_init(&chip->voice_lock);
  	init_waitqueue_head(&chip->interrupt_sleep);
@@ -72613,11 +69540,576 @@ index c94c051..be0abd1 100644
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
-index 7f06884..0b6f3ed 100644
---- a/usr/gen_init_cpio.c
-+++ b/usr/gen_init_cpio.c
-@@ -305,7 +305,7 @@ static int cpio_mkfile(const char *name, const char *location,
+diff -urNp linux-3.0.3/sound/soc/soc-core.c linux-3.0.3/sound/soc/soc-core.c
+--- linux-3.0.3/sound/soc/soc-core.c	2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.3/sound/soc/soc-core.c	2011-08-23 21:47:56.000000000 -0400
+@@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
+ }
+ 
+ /* ASoC PCM operations */
+-static struct snd_pcm_ops soc_pcm_ops = {
++static snd_pcm_ops_no_const soc_pcm_ops = {
+ 	.open		= soc_pcm_open,
+ 	.close		= soc_codec_close,
+ 	.hw_params	= soc_pcm_hw_params,
+@@ -2128,6 +2128,7 @@ static int soc_new_pcm(struct snd_soc_pc
+ 	rtd->pcm = pcm;
+ 	pcm->private_data = rtd;
+ 	if (platform->driver->ops) {
++		/* this whole logic is broken... */
+ 		soc_pcm_ops.mmap = platform->driver->ops->mmap;
+ 		soc_pcm_ops.pointer = platform->driver->ops->pointer;
+ 		soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
+diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
+--- linux-3.0.3/sound/usb/card.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/sound/usb/card.h	2011-08-23 21:47:56.000000000 -0400
+@@ -44,6 +44,7 @@ struct snd_urb_ops {
+ 	int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ 	int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
+ };
++typedef struct snd_urb_ops __no_const snd_urb_ops_no_const;
+ 
+ struct snd_usb_substream {
+ 	struct snd_usb_stream *stream;
+@@ -93,7 +94,7 @@ struct snd_usb_substream {
+ 	struct snd_pcm_hw_constraint_list rate_list;	/* limited rates */
+ 	spinlock_t lock;
+ 
+-	struct snd_urb_ops ops;		/* callbacks (must be filled at init) */
++	snd_urb_ops_no_const ops;		/* callbacks (must be filled at init) */
+ };
+ 
+ struct snd_usb_stream {
+diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constify_plugin.c
+--- linux-3.0.3/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/tools/gcc/constify_plugin.c	2011-08-24 18:13:06.000000000 -0400
+@@ -0,0 +1,259 @@
++/*
++ * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
++ * Licensed under the GPL v2, or (at your option) v3
++ *
++ * This gcc plugin constifies all structures which contain only function pointers and const fields.
++ *
++ * Usage:
++ * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
++ * $ gcc -fplugin=constify_plugin.so test.c  -O2
++ */
++
++#include "gcc-plugin.h"
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tree.h"
++#include "tree-pass.h"
++#include "intl.h"
++#include "plugin-version.h"
++#include "tm.h"
++#include "toplev.h"
++#include "function.h"
++#include "tree-flow.h"
++#include "plugin.h"
++//#include "c-tree.h"
++
++#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1 (TYPE)
++
++int plugin_is_GPL_compatible;
++
++static struct plugin_info const_plugin_info = {
++	.version	= "20110824",
++	.help		= "no-constify\tturn off constification\n",
++};
++
++static bool walk_struct(tree node);
++
++static void deconstify_node(tree type)
++{
++	tree field;
++
++	C_TYPE_FIELDS_READONLY(type) = 0;
++	for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
++		enum tree_code code = TREE_CODE(TREE_TYPE(field));
++		if (code == RECORD_TYPE || code == UNION_TYPE)
++			deconstify_node(TREE_TYPE(field));
++		TREE_READONLY(field) = 0;
++		TYPE_READONLY(TREE_TYPE(field)) = 0;
++	}
++}
++
++static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
++{
++	tree type;
++
++	*no_add_attrs = true;
++	if (TREE_CODE(*node) == FUNCTION_DECL) {
++		error("%qE attribute does not apply to functions", name);
++		return NULL_TREE;
++	}
++
++	if (TREE_CODE(*node) == VAR_DECL) {
++		error("%qE attribute does not apply to variables", name);
++		return NULL_TREE;
++	}
++
++	if (!DECL_P(*node)) {
++		if (TREE_CODE(*node) == RECORD_TYPE || TREE_CODE(*node) == UNION_TYPE)
++			*no_add_attrs = false;
++		else
++			error("%qE attribute applies to struct and union types only", name);
++		return NULL_TREE;
++	}
++
++	type = TREE_TYPE(*node);
++
++	if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
++		error("%qE attribute applies to struct and union types only", name);
++		return NULL_TREE;
++	}
++
++	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
++		error("%qE attribute is already applied to the type", name);
++		return NULL_TREE;
++	}
++
++	if (TREE_CODE(*node) == TYPE_DECL && !TYPE_READONLY(type)) {
++		error("%qE attribute used on type that is not constified", name);
++		return NULL_TREE;
++	}
++
++	if (TREE_CODE(*node) == TYPE_DECL) {
++		TREE_TYPE(*node) = build_qualified_type(type, TYPE_QUALS(type) & ~TYPE_QUAL_CONST);
++		TYPE_FIELDS(TREE_TYPE(*node)) = copy_list(TYPE_FIELDS(TREE_TYPE(*node)));
++		deconstify_node(TREE_TYPE(*node));
++		return NULL_TREE;
++	}
++
++	return NULL_TREE;
++}
++
++static struct attribute_spec no_const_attr = {
++	.name			= "no_const",
++	.min_length		= 0,
++	.max_length		= 0,
++	.decl_required		= false,
++	.type_required		= false,
++	.function_type_required	= false,
++	.handler		= handle_no_const_attribute
++};
++
++static void register_attributes(void *event_data, void *data)
++{
++	register_attribute(&no_const_attr);
++}
++
++static void constify_node(tree node)
++{
++	TREE_READONLY(node) = 1;
++}
++
++static bool is_fptr(tree field)
++{
++	tree ptr = TREE_TYPE(field);
++
++	if (TREE_CODE(ptr) != POINTER_TYPE)
++		return false;
++
++	return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
++}
++
++static bool walk_struct(tree node)
++{
++	tree field;
++
++	if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node)))
++		return false;
++
++	if (TYPE_FIELDS(node) == NULL_TREE)
++		return false;
++
++	for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
++		tree type = TREE_TYPE(field);
++		enum tree_code code = TREE_CODE(type);
++		if (code == RECORD_TYPE || code == UNION_TYPE) {
++			if (!(walk_struct(type)))
++				return false;
++		} else if (is_fptr(field) == false && !TREE_READONLY(field))
++			return false;
++	}
++	return true;
++}
++
++static void finish_type(void *event_data, void *data)
++{
++	tree node = (tree)event_data;
++
++	if (node == NULL_TREE)
++		return;
++
++	if (TREE_READONLY(node))
++		return;
++
++	if (walk_struct(node))
++		constify_node(node);
++}
++
++static unsigned int check_local_variables(void);
++
++struct gimple_opt_pass pass_local_variable = {
++	{
++		.type			= GIMPLE_PASS,
++		.name			= "check_local_variables",
++		.gate			= NULL,
++		.execute		= check_local_variables,
++		.sub			= NULL,
++		.next			= NULL,
++		.static_pass_number	= 0,
++		.tv_id			= TV_NONE,
++		.properties_required	= 0,
++		.properties_provided	= 0,
++		.properties_destroyed	= 0,
++		.todo_flags_start	= 0,
++		.todo_flags_finish	= 0
++	}
++};
++
++static unsigned int check_local_variables(void)
++{
++	tree var;
++	referenced_var_iterator rvi;
++
++#if __GNUC__ == 4 && __GNUC_MINOR__ == 5
++	FOR_EACH_REFERENCED_VAR(var, rvi) {
++#else
++	FOR_EACH_REFERENCED_VAR(cfun, var, rvi) {
++#endif
++		tree type = TREE_TYPE(var);
++
++		if (!DECL_P(var) || TREE_STATIC(var) || DECL_EXTERNAL(var))
++			continue;
++
++		if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
++			continue;
++
++		if (!TYPE_READONLY(type))
++			continue;
++
++//		if (lookup_attribute("no_const", DECL_ATTRIBUTES(var)))
++//			continue;
++
++//		if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
++//			continue;
++
++		if (walk_struct(type)) {
++			error("constified variable %qE cannot be local", var);
++			return 1;
++		}
++	}
++	return 0;
++}
++
++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
++{
++	const char * const plugin_name = plugin_info->base_name;
++	const int argc = plugin_info->argc;
++	const struct plugin_argument * const argv = plugin_info->argv;
++	int i;
++	bool constify = true;
++
++	struct register_pass_info local_variable_pass_info = {
++		.pass				= &pass_local_variable.pass,
++		.reference_pass_name		= "*referenced_vars",
++		.ref_pass_instance_number	= 0,
++		.pos_op				= PASS_POS_INSERT_AFTER
++	};
++
++	if (!plugin_default_version_check(version, &gcc_version)) {
++		error(G_("incompatible gcc/plugin versions"));
++		return 1;
++	}
++
++	for (i = 0; i < argc; ++i) {
++		if (!(strcmp(argv[i].key, "no-constify"))) {
++			constify = false;
++			continue;
++		}
++		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++	}
++
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
++	if (constify) {
++		register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
++		register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &local_variable_pass_info);
++	}
++	register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
++
++	return 0;
++}
+diff -urNp linux-3.0.3/tools/gcc/Makefile linux-3.0.3/tools/gcc/Makefile
+--- linux-3.0.3/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/tools/gcc/Makefile	2011-08-23 21:47:56.000000000 -0400
+@@ -0,0 +1,12 @@
++#CC := gcc
++#PLUGIN_SOURCE_FILES := pax_plugin.c
++#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
++GCCPLUGINS_DIR := $(shell $(HOSTCC) -print-file-name=plugin)
++#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W
++
++HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
++
++hostlibs-y := stackleak_plugin.so constify_plugin.so
++always := $(hostlibs-y)
++stackleak_plugin-objs := stackleak_plugin.o
++constify_plugin-objs := constify_plugin.o
+diff -urNp linux-3.0.3/tools/gcc/stackleak_plugin.c linux-3.0.3/tools/gcc/stackleak_plugin.c
+--- linux-3.0.3/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.3/tools/gcc/stackleak_plugin.c	2011-08-23 21:47:56.000000000 -0400
+@@ -0,0 +1,243 @@
++/*
++ * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
++ * Licensed under the GPL v2
++ *
++ * Note: the choice of the license means that the compilation process is
++ *       NOT 'eligible' as defined by gcc's library exception to the GPL v3,
++ *       but for the kernel it doesn't matter since it doesn't link against
++ *       any of the gcc libraries
++ *
++ * gcc plugin to help implement various PaX features
++ *
++ * - track lowest stack pointer
++ *
++ * TODO:
++ * - initialize all local variables
++ *
++ * BUGS:
++ * - cloned functions are instrumented twice
++ */
++#include "gcc-plugin.h"
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tree.h"
++#include "tree-pass.h"
++#include "intl.h"
++#include "plugin-version.h"
++#include "tm.h"
++#include "toplev.h"
++#include "basic-block.h"
++#include "gimple.h"
++//#include "expr.h" where are you...
++#include "diagnostic.h"
++#include "rtl.h"
++#include "emit-rtl.h"
++#include "function.h"
++
++int plugin_is_GPL_compatible;
++
++static int track_frame_size = -1;
++static const char track_function[] = "pax_track_stack";
++static bool init_locals;
++
++static struct plugin_info stackleak_plugin_info = {
++	.version	= "201106030000",
++	.help		= "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
++//			  "initialize-locals\t\tforcibly initialize all stack frames\n"
++};
++
++static bool gate_stackleak_track_stack(void);
++static unsigned int execute_stackleak_tree_instrument(void);
++static unsigned int execute_stackleak_final(void);
++
++static struct gimple_opt_pass stackleak_tree_instrument_pass = {
++	.pass = {
++		.type			= GIMPLE_PASS,
++		.name			= "stackleak_tree_instrument",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_tree_instrument,
++		.sub			= NULL,
++		.next			= NULL,
++		.static_pass_number	= 0,
++		.tv_id			= TV_NONE,
++		.properties_required	= PROP_gimple_leh | PROP_cfg,
++		.properties_provided	= 0,
++		.properties_destroyed	= 0,
++		.todo_flags_start	= 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
++		.todo_flags_finish	= TODO_verify_stmts // | TODO_dump_func
++	}
++};
++
++static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
++	.pass = {
++		.type			= RTL_PASS,
++		.name			= "stackleak_final",
++		.gate			= gate_stackleak_track_stack,
++		.execute		= execute_stackleak_final,
++		.sub			= NULL,
++		.next			= NULL,
++		.static_pass_number	= 0,
++		.tv_id			= TV_NONE,
++		.properties_required	= 0,
++		.properties_provided	= 0,
++		.properties_destroyed	= 0,
++		.todo_flags_start	= 0,
++		.todo_flags_finish	= 0
++	}
++};
++
++static bool gate_stackleak_track_stack(void)
++{
++	return track_frame_size >= 0;
++}
++
++static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi, bool before)
++{
++	gimple call;
++	tree decl, type;
++
++	// insert call to void pax_track_stack(void)
++	type = build_function_type_list(void_type_node, NULL_TREE);
++	decl = build_fn_decl(track_function, type);
++	DECL_ASSEMBLER_NAME(decl); // for LTO
++	call = gimple_build_call(decl, 0);
++	if (before)
++		gsi_insert_before(gsi, call, GSI_CONTINUE_LINKING);
++	else
++		gsi_insert_after(gsi, call, GSI_CONTINUE_LINKING);
++}
++
++static unsigned int execute_stackleak_tree_instrument(void)
++{
++	basic_block bb;
++	gimple_stmt_iterator gsi;
++
++	// 1. loop through BBs and GIMPLE statements
++	FOR_EACH_BB(bb) {
++		for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
++			// gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
++			tree decl;
++			gimple stmt = gsi_stmt(gsi);
++
++			if (!is_gimple_call(stmt))
++				continue;
++			decl = gimple_call_fndecl(stmt);
++			if (!decl)
++				continue;
++			if (TREE_CODE(decl) != FUNCTION_DECL)
++				continue;
++			if (!DECL_BUILT_IN(decl))
++				continue;
++			if (DECL_BUILT_IN_CLASS(decl) != BUILT_IN_NORMAL)
++				continue;
++			if (DECL_FUNCTION_CODE(decl) != BUILT_IN_ALLOCA)
++				continue;
++
++			// 2. insert track call after each __builtin_alloca call
++			stackleak_add_instrumentation(&gsi, false);
++//			print_node(stderr, "pax", decl, 4);
++		}
++	}
++
++	// 3. insert track call at the beginning
++	bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
++	gsi = gsi_start_bb(bb);
++	stackleak_add_instrumentation(&gsi, true);
++
++	return 0;
++}
++
++static unsigned int execute_stackleak_final(void)
++{
++	rtx insn;
++
++	if (cfun->calls_alloca)
++		return 0;
++
++	// 1. find pax_track_stack calls
++	for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
++		// rtl match: (call_insn 8 7 9 3 (call (mem (symbol_ref ("pax_track_stack") [flags 0x41] <function_decl 0xb7470e80 pax_track_stack>) [0 S1 A8]) (4)) -1 (nil) (nil))
++		rtx body;
++
++		if (!CALL_P(insn))
++			continue;
++		body = PATTERN(insn);
++		if (GET_CODE(body) != CALL)
++			continue;
++		body = XEXP(body, 0);
++		if (GET_CODE(body) != MEM)
++			continue;
++		body = XEXP(body, 0);
++		if (GET_CODE(body) != SYMBOL_REF)
++			continue;
++		if (strcmp(XSTR(body, 0), track_function))
++			continue;
++//		warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
++		// 2. delete call if function frame is not big enough
++		if (get_frame_size() >= track_frame_size)
++			continue;
++		delete_insn_and_edges(insn);
++	}
++
++//	print_simple_rtl(stderr, get_insns());
++//	print_rtl(stderr, get_insns());
++//	warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
++
++	return 0;
++}
++
++int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
++{
++	const char * const plugin_name = plugin_info->base_name;
++	const int argc = plugin_info->argc;
++	const struct plugin_argument * const argv = plugin_info->argv;
++	int i;
++	struct register_pass_info stackleak_tree_instrument_pass_info = {
++		.pass				= &stackleak_tree_instrument_pass.pass,
++//		.reference_pass_name		= "tree_profile",
++		.reference_pass_name		= "optimized",
++		.ref_pass_instance_number	= 0,
++		.pos_op 			= PASS_POS_INSERT_AFTER
++	};
++	struct register_pass_info stackleak_final_pass_info = {
++		.pass				= &stackleak_final_rtl_opt_pass.pass,
++		.reference_pass_name		= "final",
++		.ref_pass_instance_number	= 0,
++		.pos_op 			= PASS_POS_INSERT_BEFORE
++	};
++
++	if (!plugin_default_version_check(version, &gcc_version)) {
++		error(G_("incompatible gcc/plugin versions"));
++		return 1;
++	}
++
++	register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
++
++	for (i = 0; i < argc; ++i) {
++		if (!strcmp(argv[i].key, "track-lowest-sp")) {
++			if (!argv[i].value) {
++				error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++				continue;
++			}
++			track_frame_size = atoi(argv[i].value);
++			if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
++				error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
++			continue;
++		}
++		if (!strcmp(argv[i].key, "initialize-locals")) {
++			if (argv[i].value) {
++				error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
++				continue;
++			}
++			init_locals = true;
++			continue;
++		}
++		error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
++	}
++
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
++	register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
++
++	return 0;
++}
+diff -urNp linux-3.0.3/usr/gen_init_cpio.c linux-3.0.3/usr/gen_init_cpio.c
+--- linux-3.0.3/usr/gen_init_cpio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/usr/gen_init_cpio.c	2011-08-23 21:47:56.000000000 -0400
+@@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
  	int retval;
  	int rc = -1;
  	int namesize;
@@ -72626,7 +70118,7 @@ index 7f06884..0b6f3ed 100644
  
  	mode |= S_IFREG;
  
-@@ -394,9 +394,10 @@ static char *cpio_replace_env(char *new_location)
+@@ -392,9 +392,10 @@ static char *cpio_replace_env(char *new_
                         *env_var = *expanded = '\0';
                         strncat(env_var, start + 2, end - start - 2);
                         strncat(expanded, new_location, start - new_location);
@@ -72639,11 +70131,10 @@ index 7f06884..0b6f3ed 100644
                 } else
                         break;
         }
-diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index f29abeb..7c69874 100644
---- a/virt/kvm/kvm_main.c
-+++ b/virt/kvm/kvm_main.c
-@@ -74,7 +74,7 @@ LIST_HEAD(vm_list);
+diff -urNp linux-3.0.3/virt/kvm/kvm_main.c linux-3.0.3/virt/kvm/kvm_main.c
+--- linux-3.0.3/virt/kvm/kvm_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.3/virt/kvm/kvm_main.c	2011-08-23 21:47:56.000000000 -0400
+@@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;
  static int kvm_usage_count = 0;
@@ -72652,34 +70143,7 @@ index f29abeb..7c69874 100644
  
  struct kmem_cache *kvm_vcpu_cache;
  EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
-@@ -1521,7 +1521,7 @@ static int kvm_vcpu_release(struct inode *inode, struct file *filp)
- 	return 0;
- }
- 
--static struct file_operations kvm_vcpu_fops = {
-+static struct file_operations kvm_vcpu_fops = {	/* cannot be const */
- 	.release        = kvm_vcpu_release,
- 	.unlocked_ioctl = kvm_vcpu_ioctl,
- 	.compat_ioctl   = kvm_vcpu_ioctl,
-@@ -1990,7 +1990,7 @@ static int kvm_vm_mmap(struct file *file, struct vm_area_struct *vma)
- 	return 0;
- }
- 
--static struct file_operations kvm_vm_fops = {
-+static struct file_operations kvm_vm_fops = {	/* cannot be const */
- 	.release        = kvm_vm_release,
- 	.unlocked_ioctl = kvm_vm_ioctl,
- #ifdef CONFIG_COMPAT
-@@ -2088,7 +2088,7 @@ out:
- 	return r;
- }
- 
--static struct file_operations kvm_chardev_ops = {
-+static struct file_operations kvm_chardev_ops = {	/* cannot be const */
- 	.unlocked_ioctl = kvm_dev_ioctl,
- 	.compat_ioctl   = kvm_dev_ioctl,
- 	.llseek		= noop_llseek,
-@@ -2114,7 +2114,7 @@ static void hardware_enable_nolock(void *junk)
+@@ -2176,7 +2176,7 @@ static void hardware_enable_nolock(void 
  
  	if (r) {
  		cpumask_clear_cpu(cpu, cpus_hardware_enabled);
@@ -72688,7 +70152,7 @@ index f29abeb..7c69874 100644
  		printk(KERN_INFO "kvm: enabling virtualization on "
  				 "CPU%d failed\n", cpu);
  	}
-@@ -2168,10 +2168,10 @@ static int hardware_enable_all(void)
+@@ -2230,10 +2230,10 @@ static int hardware_enable_all(void)
  
  	kvm_usage_count++;
  	if (kvm_usage_count == 1) {
@@ -72701,7 +70165,7 @@ index f29abeb..7c69874 100644
  			hardware_disable_all_nolock();
  			r = -EBUSY;
  		}
-@@ -2443,7 +2443,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
+@@ -2498,7 +2498,7 @@ static void kvm_sched_out(struct preempt
  	kvm_arch_vcpu_put(vcpu);
  }
  
@@ -72710,7 +70174,7 @@ index f29abeb..7c69874 100644
  		  struct module *module)
  {
  	int r;
-@@ -2514,7 +2514,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
+@@ -2561,7 +2561,7 @@ int kvm_init(void *opaque, unsigned vcpu
  	if (!vcpu_align)
  		vcpu_align = __alignof__(struct kvm_vcpu);
  	kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
@@ -72718,4 +70182,19 @@ index f29abeb..7c69874 100644
 +					   SLAB_USERCOPY, NULL);
  	if (!kvm_vcpu_cache) {
  		r = -ENOMEM;
- 		goto out_free_5;
+ 		goto out_free_3;
+@@ -2571,9 +2571,11 @@ int kvm_init(void *opaque, unsigned vcpu
+ 	if (r)
+ 		goto out_free;
+ 
+-	kvm_chardev_ops.owner = module;
+-	kvm_vm_fops.owner = module;
+-	kvm_vcpu_fops.owner = module;
++	pax_open_kernel();
++	*(void **)&kvm_chardev_ops.owner = module;
++	*(void **)&kvm_vm_fops.owner = module;
++	*(void **)&kvm_vcpu_fops.owner = module;
++	pax_close_kernel();
+ 
+ 	r = misc_register(&kvm_dev);
+ 	if (r) {
diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index a648b9945e..27588733db 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/i386 2.6.38.8 Kernel Configuration
-# Wed Aug  3 08:43:09 2011
+# Linux/i386 3.0.3 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -48,12 +47,10 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_32_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
 CONFIG_KTIME_SCALAR=y
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 
@@ -61,7 +58,6 @@ CONFIG_IRQ_WORK=y
 # General setup
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
@@ -76,12 +72,14 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@@ -90,13 +88,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set
 
 #
@@ -115,12 +111,12 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 # CONFIG_CPUSETS is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -146,11 +142,9 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_EXPERT=y
-CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -164,6 +158,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 
 #
@@ -277,7 +272,6 @@ CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 # CONFIG_X86_BIGSMP is not set
 CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_ELAN is not set
 # CONFIG_X86_MRST is not set
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_32_NON_STANDARD is not set
@@ -310,6 +304,7 @@ CONFIG_M586=y
 # CONFIG_MEFFICEON is not set
 # CONFIG_MWINCHIPC6 is not set
 # CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
 # CONFIG_MGEODEGX1 is not set
 # CONFIG_MGEODE_LX is not set
 # CONFIG_MCYRIXIII is not set
@@ -318,7 +313,6 @@ CONFIG_M586=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_X86_GENERIC=y
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@@ -403,6 +397,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_CLEANCACHE is not set
 # CONFIG_HIGHPTE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
@@ -433,20 +428,18 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 # CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_POWER_METER is not set
 CONFIG_ACPI_EC_DEBUGFS=y
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
@@ -468,6 +461,7 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=m
 CONFIG_ACPI_APEI_EINJ=m
@@ -480,7 +474,6 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -495,7 +488,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
-# CPUFreq processor drivers
+# x86 CPU frequency scaling drivers
 #
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
@@ -547,13 +540,13 @@ CONFIG_PCI_STUB=m
 CONFIG_HT_IRQ=y
 # CONFIG_PCI_IOV is not set
 CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 # CONFIG_ISA is not set
 # CONFIG_MCA is not set
 CONFIG_SCx200=m
 CONFIG_SCx200HR_TIMER=m
 # CONFIG_OLPC is not set
-# CONFIG_OLPC_OPENFIRMWARE is not set
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
 CONFIG_PCMCIA=m
@@ -582,6 +575,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
 
 #
 # Executable file formats / Emulations
@@ -610,12 +604,11 @@ CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -701,6 +694,7 @@ CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -709,7 +703,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -723,6 +719,7 @@ CONFIG_NETFILTER_XTABLES=m
 #
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
@@ -751,6 +748,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 # Xtables matches
 #
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -759,6 +757,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_GRADM=m
@@ -789,6 +788,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
 # CONFIG_IP_VS_DEBUG is not set
@@ -833,7 +844,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -974,7 +984,6 @@ CONFIG_X25=m
 CONFIG_LAPB=m
 CONFIG_WAN_ROUTER=m
 CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
 CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
@@ -988,6 +997,7 @@ CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
@@ -995,6 +1005,9 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -1004,7 +1017,6 @@ CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
@@ -1037,6 +1049,7 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
 
 #
@@ -1064,6 +1077,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_C_CAN is not set
 
 #
 # CAN USB interfaces
@@ -1131,8 +1145,8 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1161,6 +1175,7 @@ CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_MRVL is not set
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
@@ -1202,6 +1217,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 # CONFIG_RFKILL_INPUT is not set
+CONFIG_RFKILL_REGULATOR=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_RDMA=m
@@ -1231,8 +1247,6 @@ CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -1255,6 +1269,7 @@ CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 CONFIG_SM_FTL=m
 CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -1305,6 +1320,7 @@ CONFIG_MTD_PCMCIA=m
 # CONFIG_MTD_GPIO_ADDR is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
 
 #
 # Self-contained MTD device drivers
@@ -1341,6 +1357,7 @@ CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_DENALI=m
@@ -1372,10 +1389,6 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
 # CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
@@ -1421,12 +1434,14 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
+# CONFIG_INTEL_MID_PTI is not set
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1470,7 +1485,8 @@ CONFIG_IWMC3200TOP=m
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1513,7 +1529,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
@@ -1522,6 +1537,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 # CONFIG_BE2ISCSI is not set
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
@@ -1574,6 +1590,7 @@ CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -1661,6 +1678,7 @@ CONFIG_SATA_VITESSE=m
 #
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_ATP867X=m
@@ -1740,10 +1758,14 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 # CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
+CONFIG_TCM_FC=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1805,7 +1827,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -1897,7 +1918,6 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1920,11 +1940,8 @@ CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
 CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
 CONFIG_CHELSIO_T4VF=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
@@ -1979,12 +1996,12 @@ CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@@ -2027,15 +2044,21 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+# CONFIG_IWLWIFI_DEVICE_SVTOOL is not set
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
@@ -2068,23 +2091,27 @@ CONFIG_RT61PCI=m
 CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 # CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
@@ -2097,6 +2124,8 @@ CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2136,11 +2165,13 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -2256,8 +2287,6 @@ CONFIG_ISDN_CAPI=m
 # CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
 
 #
 # CAPI hardware drivers
@@ -2327,7 +2356,9 @@ CONFIG_INPUT_EVBUG=m
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
@@ -2337,6 +2368,7 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 # CONFIG_KEYBOARD_MAX7359 is not set
 CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_MPR121 is not set
 CONFIG_KEYBOARD_NEWTON=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 CONFIG_KEYBOARD_STOWAWAY=m
@@ -2366,6 +2398,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2375,12 +2408,12 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2407,6 +2440,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
@@ -2457,26 +2491,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
 CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
 CONFIG_N_HDLC=m
 # CONFIG_N_GSM is not set
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
+# CONFIG_TRACE_SINK is not set
 CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2513,9 +2545,7 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_IFX6X60=m
 CONFIG_SERIAL_PCH_UART=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -2616,6 +2646,7 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2C_EG20T=m
@@ -2623,6 +2654,7 @@ CONFIG_I2C_EG20T=m
 #
 # External I2C/SMBus adapter drivers
 #
+CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
@@ -2642,10 +2674,12 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
+# CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SPI_TOPCLIFF_PCH=m
@@ -2667,14 +2701,23 @@ CONFIG_SPI_TLE62X0=m
 #
 # PPS generators support
 #
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_MAX730X=m
 
 #
-# Memory mapped GPIO expanders:
+# Memory mapped GPIO drivers:
 #
+CONFIG_GPIO_BASIC_MMIO_CORE=m
 CONFIG_GPIO_BASIC_MMIO=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
@@ -2725,6 +2768,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 
 #
@@ -2732,24 +2776,30 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
 CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
+# CONFIG_BATTERY_DS2780 is not set
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
+# CONFIG_BATTERY_BQ27X00_I2C is not set
+# CONFIG_BATTERY_BQ27X00_PLATFORM is not set
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
@@ -2776,6 +2826,7 @@ CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
@@ -2790,11 +2841,11 @@ CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_LM73=m
@@ -2808,16 +2859,28 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
@@ -2825,9 +2888,12 @@ CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
@@ -2849,15 +2915,14 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
 #
+CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2932,22 +2997,29 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_CORE=m
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+# CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
 # CONFIG_AB8500_CORE is not set
@@ -2986,8 +3058,10 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -3009,7 +3083,10 @@ CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IR_ENE is not set
 CONFIG_IR_IMON=m
 # CONFIG_IR_MCEUSB is not set
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
 # CONFIG_IR_NUVOTON is not set
+CONFIG_IR_REDRAT3=m
 # CONFIG_IR_STREAMZAP is not set
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_RC_LOOPBACK=m
@@ -3035,6 +3112,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -3045,6 +3123,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -3052,11 +3133,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders/decoders and other helper chips
+# Encoders, decoders, sensors and other helper chips
 #
 
 #
-# Audio decoders
+# Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
@@ -3066,7 +3147,6 @@ CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -3085,12 +3165,8 @@ CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_SAA7191=m
 CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
@@ -3100,6 +3176,7 @@ CONFIG_VIDEO_VPX3220=m
 #
 # Video and audio decoders
 #
+CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
@@ -3114,15 +3191,28 @@ CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_ADV7343=m
 CONFIG_VIDEO_AK881X=m
 
 #
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_TCM825X=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -3153,6 +3243,7 @@ CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
+# CONFIG_MEDIA_ALTERA_CI is not set
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3162,6 +3253,8 @@ CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_VIA_CAMERA is not set
+CONFIG_VIDEO_NOON010PC30=m
+# CONFIG_VIDEO_M5MOLS is not set
 CONFIG_SOC_CAMERA=m
 # CONFIG_SOC_CAMERA_IMX074 is not set
 CONFIG_SOC_CAMERA_MT9M001=m
@@ -3176,6 +3269,7 @@ CONFIG_SOC_CAMERA_OV2640=m
 # CONFIG_SOC_CAMERA_OV6650 is not set
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3189,9 +3283,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KINECT=m
 # CONFIG_USB_GSPCA_KONICA is not set
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_OV534_9=m
@@ -3218,6 +3314,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -3244,7 +3341,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 # CONFIG_I2C_SI4713 is not set
 # CONFIG_RADIO_SI4713 is not set
 CONFIG_USB_DSBR=m
@@ -3255,6 +3351,11 @@ CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
 CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3306,6 +3407,7 @@ CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3338,9 +3440,11 @@ CONFIG_DVB_PLUTO2=m
 # Supported SDMC DM1105 Adapters
 #
 CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_FIREWIRE=y
-# CONFIG_DVB_FIREDTV_IEEE1394 is not set
 CONFIG_DVB_FIREDTV_INPUT=y
 
 #
@@ -3407,6 +3511,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
@@ -3419,6 +3524,8 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
 
 #
 # DVB-C (cable) frontends
@@ -3495,7 +3602,6 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
@@ -3534,6 +3640,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
 CONFIG_FB_ARC=m
 CONFIG_FB_VGA16=m
 CONFIG_FB_UVESA=m
@@ -3572,6 +3679,7 @@ CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
@@ -3580,6 +3688,7 @@ CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
@@ -3604,7 +3713,8 @@ CONFIG_FB_SM501=m
 # CONFIG_FB_VIRTUAL is not set
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
-# CONFIG_FB_MB862XX_PCI_GDC is not set
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3616,13 +3726,15 @@ CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
+# CONFIG_LCD_LD9040 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+# CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
+# CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
@@ -3741,8 +3853,10 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_RECONFIG is not set
@@ -3769,6 +3883,7 @@ CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MAESTRO3_INPUT=y
@@ -3795,6 +3910,11 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
 CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
@@ -3809,25 +3929,33 @@ CONFIG_SND_SOC_AD73311=m
 CONFIG_SND_SOC_ADS117X=m
 CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4641=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
 CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DFBMCS320=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX9850=m
 CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
+CONFIG_SND_SOC_TVL320AIC32X4=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
 CONFIG_SND_SOC_WL1273=m
+CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
@@ -3846,6 +3974,7 @@ CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8900=m
 CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8915=m
 CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8955=m
 CONFIG_SND_SOC_WM8960=m
@@ -3857,9 +3986,11 @@ CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_WM8988=m
 CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8991=m
 CONFIG_SND_SOC_WM8993=m
 CONFIG_SND_SOC_WM8995=m
 CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9877=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_WM2000=m
@@ -3886,31 +4017,29 @@ CONFIG_USB_MOUSE=m
 #
 # Special HID drivers
 #
-CONFIG_HID_3M_PCT=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
-CONFIG_HID_CANDO=m
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
 CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-CONFIG_HID_EGALAX=m
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_LCPOWER=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
-CONFIG_HID_MOSART=m
 # CONFIG_HID_MONTEREY is not set
 CONFIG_HID_MULTITOUCH=m
 # CONFIG_HID_NTRIG is not set
@@ -3924,12 +4053,14 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
@@ -3980,6 +4111,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
@@ -4006,6 +4138,7 @@ CONFIG_USB_TMC=m
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -4017,6 +4150,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_UAS=m
 CONFIG_USB_LIBUSUAL=y
 
@@ -4070,7 +4204,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SAMBA is not set
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
@@ -4153,6 +4286,7 @@ CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
@@ -4168,15 +4302,18 @@ CONFIG_MSPRO_BLOCK=m
 #
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
+CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
@@ -4229,8 +4366,11 @@ CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_ISER=m
 # CONFIG_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -4262,10 +4402,13 @@ CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
 
 #
 # SPI RTC drivers
 #
+CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
 CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1390=m
@@ -4331,24 +4474,25 @@ CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_DIGIEPCA=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_COMPUTONE=m
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_TM6000 is not set
-CONFIG_USB_DABUSB=m
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IP_COMMON is not set
+# CONFIG_DVB_CXD2099 is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMUTIL is not set
+# CONFIG_BRCMSMAC is not set
 # CONFIG_BRCMFMAC is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
@@ -4356,9 +4500,9 @@ CONFIG_BRCM80211_PCI=y
 # CONFIG_RTL8192U is not set
 # CONFIG_RTL8192E is not set
 # CONFIG_R8712U is not set
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
-CONFIG_AUTOFS_FS=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 CONFIG_DRM_VMWGFX=m
@@ -4380,26 +4524,21 @@ CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
 # CONFIG_CS5535_GPIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_WLAGS49_H2 is not set
 # CONFIG_WLAGS49_H25 is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_VIDEO_DT3155 is not set
 # CONFIG_CRYSTALHD is not set
 # CONFIG_CXT1E1 is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_LIRC_STAGING is not set
-# CONFIG_SMB_FS is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
@@ -4416,14 +4555,24 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_DRM_PSB is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 # CONFIG_TC1100_WMI is not set
+CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
@@ -4441,6 +4590,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
@@ -4451,6 +4602,11 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 # CONFIG_IBM_RTL is not set
+CONFIG_XO15_EBOOK=m
+# CONFIG_SAMSUNG_LAPTOP is not set
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_CLKSRC_I8253=y
 
 #
 # Firmware Drivers
@@ -4461,7 +4617,10 @@ CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
 # File systems
@@ -4574,6 +4733,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
@@ -4627,6 +4787,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -4666,7 +4827,6 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_ACL is not set
-CONFIG_CIFS_EXPERIMENTAL=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -4693,7 +4853,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
@@ -4741,6 +4901,7 @@ CONFIG_DLM=m
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
@@ -4749,16 +4910,16 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-CONFIG_BKL=y
 # CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_LKDTM is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -5015,7 +5176,6 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_FPU=m
 
 #
 # Hash modes
@@ -5112,8 +5272,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5151,5 +5309,6 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y
diff --git a/main/linux-grsec/kernelconfig.x86_64 b/main/linux-grsec/kernelconfig.x86_64
index c035fc93bf..c033138c85 100644
--- a/main/linux-grsec/kernelconfig.x86_64
+++ b/main/linux-grsec/kernelconfig.x86_64
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Linux/x86_64 2.6.38.3 Kernel Configuration
-# Mon Apr 18 10:45:51 2011
+# Linux/x86_64 3.0.3 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -49,12 +48,10 @@ CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_64_SMP=y
 CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
 CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
 # CONFIG_KTIME_SCALAR is not set
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
 CONFIG_HAVE_IRQ_WORK=y
 CONFIG_IRQ_WORK=y
 
@@ -62,7 +59,6 @@ CONFIG_IRQ_WORK=y
 # General setup
 #
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION=""
@@ -77,12 +73,14 @@ CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_XZ is not set
 # CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_POSIX_MQUEUE is not set
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
 CONFIG_HAVE_GENERIC_HARDIRQS=y
@@ -91,13 +89,11 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
 # IRQ subsystem
 #
 CONFIG_GENERIC_HARDIRQS=y
-# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
 CONFIG_HAVE_SPARSE_IRQ=y
 CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
 CONFIG_GENERIC_PENDING_IRQ=y
-# CONFIG_AUTO_IRQ_AFFINITY is not set
-# CONFIG_IRQ_PER_CPU is not set
-# CONFIG_HARDIRQS_SW_RESEND is not set
+CONFIG_IRQ_FORCED_THREADING=y
 # CONFIG_SPARSE_IRQ is not set
 
 #
@@ -116,7 +112,6 @@ CONFIG_LOG_BUF_SHIFT=14
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
@@ -124,6 +119,7 @@ CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 # CONFIG_CGROUP_MEM_RES_CTLR is not set
+# CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
@@ -149,11 +145,9 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_EXPERT=y
-CONFIG_EMBEDDED=y
 CONFIG_UID16=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
@@ -167,6 +161,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_EMBEDDED=y
 CONFIG_HAVE_PERF_EVENTS=y
 
 #
@@ -289,6 +284,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
+# CONFIG_XEN_DEBUG is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
 CONFIG_PARAVIRT=y
@@ -301,7 +297,6 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_GENERIC_CPU=y
-CONFIG_X86_CPU=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 CONFIG_X86_CMPXCHG=y
 CONFIG_CMPXCHG_LOCAL=y
@@ -348,8 +343,8 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_NUMA is not set
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_SELECT_MEMORY_MODEL=y
@@ -376,6 +371,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+# CONFIG_CLEANCACHE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
 CONFIG_X86_RESERVE_LOW=64
 CONFIG_MTRR=y
@@ -405,20 +401,19 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 # Power management and ACPI options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
 # CONFIG_HIBERNATION is not set
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_RUNTIME is not set
-CONFIG_PM_OPS=y
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_PROCFS=y
 CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_POWER_METER is not set
 CONFIG_ACPI_EC_DEBUGFS=y
 CONFIG_ACPI_PROC_EVENT=y
 CONFIG_ACPI_AC=m
@@ -440,6 +435,7 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_ACPI_CONTAINER=m
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
+# CONFIG_ACPI_CUSTOM_METHOD is not set
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=m
 CONFIG_ACPI_APEI_EINJ=m
@@ -451,7 +447,6 @@ CONFIG_ACPI_APEI_ERST_DEBUG=y
 #
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
@@ -466,7 +461,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 
 #
-# CPUFreq processor drivers
+# x86 CPU frequency scaling drivers
 #
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
@@ -511,6 +506,7 @@ CONFIG_XEN_PCIDEV_FRONTEND=y
 CONFIG_HT_IRQ=y
 # CONFIG_PCI_IOV is not set
 CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
 CONFIG_PCCARD=m
@@ -538,6 +534,7 @@ CONFIG_HOTPLUG_PCI_CPCI=y
 CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
 CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_RAPIDIO is not set
 
 #
 # Executable file formats / Emulations
@@ -552,6 +549,7 @@ CONFIG_IA32_EMULATION=y
 CONFIG_COMPAT=y
 CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
 CONFIG_HAVE_TEXT_POKE_SMP=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
@@ -572,12 +570,11 @@ CONFIG_NET_KEY_MIGRATE=y
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
@@ -663,6 +660,7 @@ CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_GRE=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -671,7 +669,9 @@ CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
@@ -685,6 +685,7 @@ CONFIG_NETFILTER_XTABLES=m
 #
 CONFIG_NETFILTER_XT_MARK=m
 CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
 
 #
 # Xtables targets
@@ -713,6 +714,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
 #
 # Xtables matches
 #
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
 CONFIG_NETFILTER_XT_MATCH_COMMENT=m
 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
@@ -721,6 +723,7 @@ CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_CPU=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
 CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_GRADM=m
@@ -751,6 +754,18 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
 CONFIG_NETFILTER_XT_MATCH_TIME=m
 CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_LIST_SET=m
 CONFIG_IP_VS=m
 CONFIG_IP_VS_IPV6=y
 # CONFIG_IP_VS_DEBUG is not set
@@ -795,7 +810,6 @@ CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
@@ -936,7 +950,6 @@ CONFIG_X25=m
 CONFIG_LAPB=m
 CONFIG_WAN_ROUTER=m
 CONFIG_PHONET=m
-# CONFIG_PHONET_PIPECTRLR is not set
 CONFIG_IEEE802154=m
 CONFIG_NET_SCHED=y
 
@@ -950,6 +963,7 @@ CONFIG_NET_SCH_ATM=m
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TEQL=m
 CONFIG_NET_SCH_TBF=m
@@ -957,6 +971,9 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_DSMARK=m
 CONFIG_NET_SCH_NETEM=m
 CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_INGRESS=m
 
 #
@@ -966,7 +983,6 @@ CONFIG_NET_CLS=y
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
 CONFIG_NET_CLS_FW=m
 CONFIG_NET_CLS_U32=m
 CONFIG_CLS_U32_PERF=y
@@ -999,7 +1015,10 @@ CONFIG_NET_SCH_FIFO=y
 CONFIG_DNS_RESOLVER=y
 # CONFIG_BATMAN_ADV is not set
 CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_BPF_JIT=y
 
 #
 # Network testing
@@ -1026,6 +1045,7 @@ CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
+# CONFIG_CAN_C_CAN is not set
 
 #
 # CAN USB interfaces
@@ -1092,8 +1112,8 @@ CONFIG_VLSI_FIR=m
 CONFIG_VIA_FIR=m
 CONFIG_MCS_FIR=m
 CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
+CONFIG_BT_L2CAP=y
+CONFIG_BT_SCO=y
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_BNEP=m
@@ -1122,6 +1142,7 @@ CONFIG_BT_HCIBTUART=m
 CONFIG_BT_HCIVHCI=m
 # CONFIG_BT_MRVL is not set
 CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
 CONFIG_AF_RXRPC=m
 # CONFIG_AF_RXRPC_DEBUG is not set
 CONFIG_RXKAD=m
@@ -1163,6 +1184,7 @@ CONFIG_WIMAX_DEBUG_LEVEL=8
 CONFIG_RFKILL=m
 CONFIG_RFKILL_LEDS=y
 # CONFIG_RFKILL_INPUT is not set
+CONFIG_RFKILL_REGULATOR=m
 CONFIG_NET_9P=m
 CONFIG_NET_9P_VIRTIO=m
 CONFIG_NET_9P_RDMA=m
@@ -1192,8 +1214,6 @@ CONFIG_CONNECTOR=m
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
 CONFIG_MTD_TESTS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=m
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -1216,6 +1236,7 @@ CONFIG_RFD_FTL=m
 CONFIG_SSFDC=m
 CONFIG_SM_FTL=m
 CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
 
 #
 # RAM/ROM/Flash chip drivers
@@ -1265,6 +1286,7 @@ CONFIG_MTD_PCMCIA=m
 # CONFIG_MTD_GPIO_ADDR is not set
 CONFIG_MTD_INTEL_VR_NOR=m
 CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
 
 #
 # Self-contained MTD device drivers
@@ -1301,6 +1323,7 @@ CONFIG_MTD_NAND_ECC=m
 CONFIG_MTD_NAND_ECC_SMC=y
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_BCH is not set
 CONFIG_MTD_SM_COMMON=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_DENALI=m
@@ -1331,10 +1354,6 @@ CONFIG_MTD_UBI=m
 CONFIG_MTD_UBI_WL_THRESHOLD=4096
 CONFIG_MTD_UBI_BEB_RESERVE=1
 # CONFIG_MTD_UBI_GLUEBI is not set
-
-#
-# UBI debugging options
-#
 # CONFIG_MTD_UBI_DEBUG is not set
 CONFIG_PARPORT=m
 CONFIG_PARPORT_PC=m
@@ -1378,15 +1397,18 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RBD is not set
+CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_MISC_DEVICES=y
 CONFIG_AD525X_DPOT=m
 CONFIG_AD525X_DPOT_I2C=m
 CONFIG_AD525X_DPOT_SPI=m
 CONFIG_IBM_ASM=m
 CONFIG_PHANTOM=m
+# CONFIG_INTEL_MID_PTI is not set
 CONFIG_SGI_IOC4=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIFM_7XX1=m
@@ -1430,7 +1452,8 @@ CONFIG_IWMC3200TOP=m
 #
 # Texas Instruments shared transport line discipline
 #
-# CONFIG_TI_ST is not set
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set
 
@@ -1473,7 +1496,6 @@ CONFIG_SCSI_SAS_ATTRS=m
 CONFIG_SCSI_SAS_LIBSAS=m
 CONFIG_SCSI_SAS_ATA=y
 CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SCSI_SRP_ATTRS=m
 CONFIG_SCSI_SRP_TGT_ATTRS=y
 CONFIG_SCSI_LOWLEVEL=y
@@ -1482,6 +1504,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
 CONFIG_SCSI_CXGB3_ISCSI=m
 CONFIG_SCSI_CXGB4_ISCSI=m
 CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 # CONFIG_BE2ISCSI is not set
 CONFIG_BLK_DEV_3W_XXXX_RAID=m
 CONFIG_SCSI_HPSA=m
@@ -1533,6 +1556,7 @@ CONFIG_SCSI_EATA=m
 CONFIG_SCSI_EATA_MAX_TAGS=16
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
 CONFIG_SCSI_IPS=m
 CONFIG_SCSI_INITIO=m
 CONFIG_SCSI_INIA100=m
@@ -1618,6 +1642,7 @@ CONFIG_SATA_VITESSE=m
 #
 CONFIG_PATA_ALI=m
 CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
 CONFIG_PATA_ARTOP=m
 CONFIG_PATA_ATIIXP=m
 CONFIG_PATA_ATP867X=m
@@ -1696,10 +1721,14 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 # CONFIG_DM_UEVENT is not set
+CONFIG_DM_FLAKEY=m
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
+CONFIG_TCM_FC=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SPI=m
 CONFIG_FUSION_FC=m
@@ -1762,7 +1791,6 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
-CONFIG_BCM63XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -1854,7 +1882,6 @@ CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
-CONFIG_R8169_VLAN=y
 CONFIG_SIS190=m
 CONFIG_SKGE=m
 # CONFIG_SKGE_DEBUG is not set
@@ -1877,11 +1904,8 @@ CONFIG_NETDEV_10000=y
 CONFIG_MDIO=m
 CONFIG_CHELSIO_T1=m
 CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
 CONFIG_CHELSIO_T3=m
-CONFIG_CHELSIO_T4_DEPENDS=y
 CONFIG_CHELSIO_T4=m
-CONFIG_CHELSIO_T4VF_DEPENDS=y
 CONFIG_CHELSIO_T4VF=m
 CONFIG_ENIC=m
 CONFIG_IXGBE=m
@@ -1936,12 +1960,12 @@ CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DEBUGFS is not set
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
 CONFIG_CARL9170=m
 CONFIG_CARL9170_LEDS=y
 CONFIG_CARL9170_WPC=y
@@ -1984,15 +2008,21 @@ CONFIG_IPW2200_QOS=y
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
+CONFIG_IWLAGN=m
 
 #
 # Debugging Options
 #
 # CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
+# CONFIG_IWLWIFI_DEVICE_SVTOOL is not set
+# CONFIG_IWL_P2P is not set
+CONFIG_IWLWIFI_LEGACY=m
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+CONFIG_IWL4965=m
 CONFIG_IWL3945=m
 CONFIG_IWM=m
 # CONFIG_IWM_DEBUG is not set
@@ -2025,23 +2055,27 @@ CONFIG_RT61PCI=m
 CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 # CONFIG_RT2800PCI_RT35XX is not set
+CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
 CONFIG_RT2800USB_RT33XX=y
 # CONFIG_RT2800USB_RT35XX is not set
+CONFIG_RT2800USB_RT53XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2X00_LIB_PCI=m
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
+CONFIG_RTL8192C_COMMON=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SPI=m
 CONFIG_WL1251_SDIO=m
@@ -2054,6 +2088,8 @@ CONFIG_WL12XX_SDIO_TEST=m
 CONFIG_WL12XX_PLATFORM_DATA=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
 
 #
 # WiMAX Wireless Broadband devices
@@ -2093,11 +2129,13 @@ CONFIG_USB_EPSON2888=y
 CONFIG_USB_KC2190=y
 CONFIG_USB_NET_ZAURUS=m
 CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
 CONFIG_USB_HSO=m
 CONFIG_USB_NET_INT51X1=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
 CONFIG_NET_PCMCIA=y
 CONFIG_PCMCIA_3C589=m
 CONFIG_PCMCIA_3C574=m
@@ -2174,6 +2212,7 @@ CONFIG_CAIF_TTY=m
 CONFIG_CAIF_SPI_SLAVE=m
 # CONFIG_CAIF_SPI_SYNC is not set
 CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_FDDI=y
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set
@@ -2214,8 +2253,6 @@ CONFIG_ISDN_CAPI=m
 # CONFIG_CAPI_TRACE is not set
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
 
 #
 # CAPI hardware drivers
@@ -2279,14 +2316,15 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 CONFIG_INPUT_JOYDEV=m
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_EVBUG=m
-CONFIG_XEN_KBDDEV_FRONTEND=m
 
 #
 # Input Device Drivers
 #
 CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
 CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_QT2160 is not set
 CONFIG_KEYBOARD_LKKBD=m
 CONFIG_KEYBOARD_GPIO=m
@@ -2296,6 +2334,7 @@ CONFIG_KEYBOARD_MATRIX=m
 CONFIG_KEYBOARD_LM8323=m
 # CONFIG_KEYBOARD_MAX7359 is not set
 CONFIG_KEYBOARD_MCS=m
+# CONFIG_KEYBOARD_MPR121 is not set
 CONFIG_KEYBOARD_NEWTON=m
 # CONFIG_KEYBOARD_OPENCORES is not set
 CONFIG_KEYBOARD_STOWAWAY=m
@@ -2325,6 +2364,7 @@ CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_AD7879=m
 CONFIG_TOUCHSCREEN_AD7879_I2C=m
 CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_BU21013=m
 CONFIG_TOUCHSCREEN_CY8CTMG110=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
@@ -2334,12 +2374,12 @@ CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_WACOM_W8001=m
+# CONFIG_TOUCHSCREEN_MAX11801 is not set
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_QT602240=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2366,6 +2406,7 @@ CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
 CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
 CONFIG_TOUCHSCREEN_USB_NEXIO=y
 CONFIG_TOUCHSCREEN_TOUCHIT213=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
 CONFIG_TOUCHSCREEN_TSC2007=m
 CONFIG_TOUCHSCREEN_ST1232=m
 CONFIG_TOUCHSCREEN_TPS6507X=m
@@ -2391,6 +2432,7 @@ CONFIG_INPUT_ADXL34X_I2C=m
 CONFIG_INPUT_ADXL34X_SPI=m
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
 
 #
 # Hardware I/O ports
@@ -2415,26 +2457,24 @@ CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_VT_CONSOLE=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
 CONFIG_ROCKETPORT=m
 CONFIG_CYCLADES=m
 # CONFIG_CYZ_INTR is not set
-CONFIG_DIGIEPCA=m
 CONFIG_MOXA_INTELLIO=m
 CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
 CONFIG_SYNCLINK=m
 CONFIG_SYNCLINKMP=m
 CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
 CONFIG_N_HDLC=m
 # CONFIG_N_GSM is not set
-CONFIG_RISCOM8=m
-CONFIG_SPECIALIX=m
+# CONFIG_TRACE_SINK is not set
 CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_NOZOMI=m
 
 #
 # Serial drivers
@@ -2471,9 +2511,7 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 CONFIG_SERIAL_IFX6X60=m
 CONFIG_SERIAL_PCH_UART=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
+# CONFIG_SERIAL_XILINX_PS_UART is not set
 # CONFIG_TTY_PRINTK is not set
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
@@ -2571,6 +2609,7 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
 CONFIG_I2C_EG20T=m
@@ -2578,6 +2617,7 @@ CONFIG_I2C_EG20T=m
 #
 # External I2C/SMBus adapter drivers
 #
+CONFIG_I2C_DIOLAN_U2C=m
 CONFIG_I2C_PARPORT=m
 CONFIG_I2C_PARPORT_LIGHT=m
 CONFIG_I2C_TAOS_EVM=m
@@ -2596,10 +2636,12 @@ CONFIG_SPI_MASTER=y
 #
 # SPI Master Controller Drivers
 #
+# CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
+# CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_TOPCLIFF_PCH=m
 # CONFIG_SPI_XILINX is not set
@@ -2620,14 +2662,23 @@ CONFIG_SPI_TLE62X0=m
 #
 # PPS generators support
 #
+
+#
+# PTP clock support
+#
+
+#
+# Enable Device Drivers -> PPS to see the PTP clock options.
+#
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_MAX730X=m
 
 #
-# Memory mapped GPIO expanders:
+# Memory mapped GPIO drivers:
 #
+CONFIG_GPIO_BASIC_MMIO_CORE=m
 CONFIG_GPIO_BASIC_MMIO=m
 CONFIG_GPIO_IT8761E=m
 CONFIG_GPIO_SCH=m
@@ -2678,6 +2729,7 @@ CONFIG_W1_CON=y
 CONFIG_W1_MASTER_MATROX=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
 CONFIG_W1_MASTER_GPIO=m
 
 #
@@ -2685,24 +2737,30 @@ CONFIG_W1_MASTER_GPIO=m
 #
 CONFIG_W1_SLAVE_THERM=m
 CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2408=m
 CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
 CONFIG_W1_SLAVE_DS2760=m
+CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_BQ27000=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 CONFIG_PDA_POWER=m
 CONFIG_TEST_POWER=m
 CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
 CONFIG_BATTERY_DS2782=m
 CONFIG_BATTERY_BQ20Z75=m
 CONFIG_BATTERY_BQ27x00=m
+# CONFIG_BATTERY_BQ27X00_I2C is not set
+# CONFIG_BATTERY_BQ27X00_PLATFORM is not set
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 CONFIG_CHARGER_PCF50633=m
 CONFIG_CHARGER_ISP1704=m
+# CONFIG_CHARGER_MAX8903 is not set
 CONFIG_CHARGER_GPIO=m
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
@@ -2729,6 +2787,7 @@ CONFIG_SENSORS_ADT7475=m
 CONFIG_SENSORS_ASC7621=m
 CONFIG_SENSORS_K8TEMP=m
 CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_ATXP1=m
 CONFIG_SENSORS_DS620=m
@@ -2743,11 +2802,11 @@ CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_LM73=m
@@ -2761,16 +2820,28 @@ CONFIG_SENSORS_LM87=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_LM92=m
 CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
 CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
 CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SIS5595=m
@@ -2778,9 +2849,12 @@ CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_DME1737=m
 CONFIG_SENSORS_EMC1403=m
 CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
 CONFIG_SENSORS_SMSC47M1=m
 CONFIG_SENSORS_SMSC47M192=m
 CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_ADS1015=m
 CONFIG_SENSORS_ADS7828=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_AMC6821=m
@@ -2802,15 +2876,14 @@ CONFIG_SENSORS_W83L785TS=m
 CONFIG_SENSORS_W83L786NG=m
 CONFIG_SENSORS_W83627HF=m
 CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_SENSORS_APPLESMC=m
 # CONFIG_SENSORS_MC13783_ADC is not set
 
 #
 # ACPI drivers
 #
+CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -2853,6 +2926,7 @@ CONFIG_W83877F_WDT=m
 CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_XEN_WDT=m
 
 #
 # PCI-based Watchdog Cards
@@ -2883,22 +2957,29 @@ CONFIG_SSB_SDIOHOST=y
 # CONFIG_SSB_DEBUG is not set
 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+# CONFIG_BCMA is not set
 CONFIG_MFD_SUPPORT=y
 CONFIG_MFD_CORE=m
 CONFIG_MFD_SM501=m
 # CONFIG_MFD_SM501_GPIO is not set
 CONFIG_HTC_PASIC3=m
 CONFIG_UCB1400_CORE=m
+# CONFIG_TPS6105X is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 # CONFIG_MFD_TMIO is not set
 CONFIG_MFD_WM8400=m
 # CONFIG_MFD_WM831X_SPI is not set
 CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_MFD_MC13XXX=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
 CONFIG_ABX500_CORE=y
 # CONFIG_EZX_PCAP is not set
 # CONFIG_AB8500_CORE is not set
@@ -2937,8 +3018,10 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_VIDEO_MEDIA=m
 
@@ -2960,7 +3043,10 @@ CONFIG_IR_LIRC_CODEC=m
 # CONFIG_IR_ENE is not set
 CONFIG_IR_IMON=m
 # CONFIG_IR_MCEUSB is not set
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
 # CONFIG_IR_NUVOTON is not set
+CONFIG_IR_REDRAT3=m
 # CONFIG_IR_STREAMZAP is not set
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_RC_LOOPBACK=m
@@ -2986,6 +3072,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m
 CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
@@ -2996,6 +3083,9 @@ CONFIG_VIDEO_BTCX=m
 CONFIG_VIDEO_TVEEPROM=m
 CONFIG_VIDEO_TUNER=m
 CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_VIDEO_CAPTURE_DRIVERS=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
@@ -3003,11 +3093,11 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y
 CONFIG_VIDEO_IR_I2C=m
 
 #
-# Encoders/decoders and other helper chips
+# Encoders, decoders, sensors and other helper chips
 #
 
 #
-# Audio decoders
+# Audio decoders, processors and mixers
 #
 CONFIG_VIDEO_TVAUDIO=m
 CONFIG_VIDEO_TDA7432=m
@@ -3017,7 +3107,6 @@ CONFIG_VIDEO_TEA6420=m
 CONFIG_VIDEO_MSP3400=m
 CONFIG_VIDEO_CS5345=m
 CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_TLV320AIC23B=m
 CONFIG_VIDEO_WM8775=m
 CONFIG_VIDEO_WM8739=m
@@ -3036,12 +3125,8 @@ CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=m
 CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_SAA7191=m
 CONFIG_VIDEO_TVP514X=m
 CONFIG_VIDEO_TVP5150=m
@@ -3051,6 +3136,7 @@ CONFIG_VIDEO_VPX3220=m
 #
 # Video and audio decoders
 #
+CONFIG_VIDEO_SAA717X=m
 CONFIG_VIDEO_CX25840=m
 
 #
@@ -3065,15 +3151,28 @@ CONFIG_VIDEO_SAA7127=m
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_ADV7343=m
 CONFIG_VIDEO_AK881X=m
 
 #
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_TCM825X=m
+
+#
 # Video improvement chips
 #
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
 # CONFIG_VIDEO_VIVI is not set
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -3104,6 +3203,7 @@ CONFIG_VIDEO_CX88_DVB=m
 CONFIG_VIDEO_CX88_MPEG=m
 CONFIG_VIDEO_CX88_VP3054=m
 CONFIG_VIDEO_CX23885=m
+# CONFIG_MEDIA_ALTERA_CI is not set
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_FB_IVTV=m
@@ -3113,6 +3213,8 @@ CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_CAFE_CCIC=m
 # CONFIG_VIDEO_SR030PC30 is not set
 # CONFIG_VIDEO_VIA_CAMERA is not set
+CONFIG_VIDEO_NOON010PC30=m
+# CONFIG_VIDEO_M5MOLS is not set
 CONFIG_SOC_CAMERA=m
 # CONFIG_SOC_CAMERA_IMX074 is not set
 CONFIG_SOC_CAMERA_MT9M001=m
@@ -3127,6 +3229,7 @@ CONFIG_SOC_CAMERA_OV2640=m
 # CONFIG_SOC_CAMERA_OV6650 is not set
 CONFIG_SOC_CAMERA_OV772X=m
 CONFIG_SOC_CAMERA_OV9640=m
+CONFIG_SOC_CAMERA_OV9740=m
 CONFIG_V4L_USB_DRIVERS=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -3140,9 +3243,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
 CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_KINECT=m
 # CONFIG_USB_GSPCA_KONICA is not set
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
 CONFIG_USB_GSPCA_OV519=m
 CONFIG_USB_GSPCA_OV534=m
 CONFIG_USB_GSPCA_OV534_9=m
@@ -3169,6 +3274,7 @@ CONFIG_USB_GSPCA_SUNPLUS=m
 CONFIG_USB_GSPCA_T613=m
 CONFIG_USB_GSPCA_TV8532=m
 CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
 # CONFIG_USB_GSPCA_XIRLINK_CIT is not set
 CONFIG_USB_GSPCA_ZC3XX=m
 CONFIG_VIDEO_PVRUSB2=m
@@ -3195,7 +3301,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_MEM2MEM_TESTDEV=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 # CONFIG_I2C_SI4713 is not set
 # CONFIG_RADIO_SI4713 is not set
 CONFIG_USB_DSBR=m
@@ -3206,6 +3311,11 @@ CONFIG_RADIO_SAA7706H=m
 CONFIG_RADIO_TEF6862=m
 CONFIG_RADIO_TIMBERDALE=m
 CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -3257,6 +3367,7 @@ CONFIG_DVB_USB_CE6230=m
 CONFIG_DVB_USB_EC168=m
 CONFIG_DVB_USB_AZ6027=m
 # CONFIG_DVB_USB_LME2510 is not set
+CONFIG_DVB_USB_TECHNISAT_USB2=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_SIANO_MDTV=m
@@ -3289,9 +3400,11 @@ CONFIG_DVB_PLUTO2=m
 # Supported SDMC DM1105 Adapters
 #
 CONFIG_DVB_DM1105=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
 CONFIG_DVB_FIREDTV=m
-CONFIG_DVB_FIREDTV_FIREWIRE=y
-# CONFIG_DVB_FIREDTV_IEEE1394 is not set
 CONFIG_DVB_FIREDTV_INPUT=y
 
 #
@@ -3358,6 +3471,7 @@ CONFIG_DVB_SP8870=m
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
@@ -3370,6 +3484,8 @@ CONFIG_DVB_DIB7000P=m
 CONFIG_DVB_TDA10048=m
 CONFIG_DVB_AF9013=m
 CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
 
 #
 # DVB-C (cable) frontends
@@ -3440,7 +3556,6 @@ CONFIG_DRM_R128=m
 CONFIG_DRM_RADEON=m
 # CONFIG_DRM_RADEON_KMS is not set
 CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
 CONFIG_DRM_I915=m
 # CONFIG_DRM_I915_KMS is not set
 CONFIG_DRM_MGA=m
@@ -3479,6 +3594,7 @@ CONFIG_FB_CIRRUS=m
 CONFIG_FB_PM2=m
 CONFIG_FB_PM2_FIFO_DISCONNECT=y
 CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
 CONFIG_FB_ARC=m
 CONFIG_FB_VGA16=m
 CONFIG_FB_UVESA=m
@@ -3516,6 +3632,7 @@ CONFIG_FB_ATY_GENERIC_LCD=y
 CONFIG_FB_ATY_GX=y
 CONFIG_FB_ATY_BACKLIGHT=y
 CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
 CONFIG_FB_SAVAGE=m
 CONFIG_FB_SAVAGE_I2C=y
 CONFIG_FB_SAVAGE_ACCEL=y
@@ -3524,6 +3641,7 @@ CONFIG_FB_SIS_300=y
 CONFIG_FB_SIS_315=y
 CONFIG_FB_VIA=m
 # CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
 CONFIG_FB_NEOMAGIC=m
 CONFIG_FB_KYRO=m
 CONFIG_FB_3DFX=m
@@ -3549,7 +3667,8 @@ CONFIG_FB_SM501=m
 CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
-# CONFIG_FB_MB862XX_PCI_GDC is not set
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
 CONFIG_FB_BROADSHEET=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
@@ -3561,13 +3680,15 @@ CONFIG_LCD_TDO24M=m
 CONFIG_LCD_VGG2432A4=m
 CONFIG_LCD_PLATFORM=m
 CONFIG_LCD_S6E63M0=m
+# CONFIG_LCD_LD9040 is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=m
 CONFIG_BACKLIGHT_GENERIC=m
 CONFIG_BACKLIGHT_PROGEAR=m
 CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
+# CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_SAHARA=m
 CONFIG_BACKLIGHT_ADP8860=m
+# CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
 
 #
@@ -3686,8 +3807,10 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
 # CONFIG_SND_FM801_TEA575X_BOOL is not set
+CONFIG_SND_TEA575X=m
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_RECONFIG is not set
@@ -3714,6 +3837,7 @@ CONFIG_SND_ICE1724=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
 CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
 CONFIG_SND_LX6464ES=m
 CONFIG_SND_MAESTRO3=m
 CONFIG_SND_MAESTRO3_INPUT=y
@@ -3739,6 +3863,11 @@ CONFIG_SND_USB_USX2Y=m
 CONFIG_SND_USB_CAIAQ=m
 # CONFIG_SND_USB_CAIAQ_INPUT is not set
 CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
 CONFIG_SND_PCMCIA=y
 CONFIG_SND_VXPOCKET=m
 CONFIG_SND_PDAUDIOCF=m
@@ -3753,25 +3882,33 @@ CONFIG_SND_SOC_AD73311=m
 CONFIG_SND_SOC_ADS117X=m
 CONFIG_SND_SOC_AK4104=m
 CONFIG_SND_SOC_AK4535=m
+CONFIG_SND_SOC_AK4641=m
 CONFIG_SND_SOC_AK4642=m
 CONFIG_SND_SOC_AK4671=m
 CONFIG_SND_SOC_ALC5623=m
 CONFIG_SND_SOC_CS42L51=m
 CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
 CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_DA7210=m
+CONFIG_SND_SOC_DFBMCS320=m
 CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SOC_MAX9850=m
 CONFIG_SND_SOC_PCM3008=m
+CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SPDIF=m
 CONFIG_SND_SOC_SSM2602=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC26=m
+CONFIG_SND_SOC_TVL320AIC32X4=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
 CONFIG_SND_SOC_WL1273=m
+CONFIG_SND_SOC_WM1250_EV1=m
 CONFIG_SND_SOC_WM8400=m
 CONFIG_SND_SOC_WM8510=m
 CONFIG_SND_SOC_WM8523=m
@@ -3790,6 +3927,7 @@ CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8900=m
 CONFIG_SND_SOC_WM8903=m
 CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8915=m
 CONFIG_SND_SOC_WM8940=m
 CONFIG_SND_SOC_WM8955=m
 CONFIG_SND_SOC_WM8960=m
@@ -3801,9 +3939,11 @@ CONFIG_SND_SOC_WM8978=m
 CONFIG_SND_SOC_WM8985=m
 CONFIG_SND_SOC_WM8988=m
 CONFIG_SND_SOC_WM8990=m
+CONFIG_SND_SOC_WM8991=m
 CONFIG_SND_SOC_WM8993=m
 CONFIG_SND_SOC_WM8995=m
 CONFIG_SND_SOC_WM9081=m
+CONFIG_SND_SOC_LM4857=m
 CONFIG_SND_SOC_MAX9877=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_WM2000=m
@@ -3830,31 +3970,29 @@ CONFIG_USB_MOUSE=m
 #
 # Special HID drivers
 #
-CONFIG_HID_3M_PCT=m
 # CONFIG_HID_A4TECH is not set
 # CONFIG_HID_ACRUX is not set
 # CONFIG_HID_APPLE is not set
 # CONFIG_HID_BELKIN is not set
-CONFIG_HID_CANDO=m
 # CONFIG_HID_CHERRY is not set
 # CONFIG_HID_CHICONY is not set
 CONFIG_HID_PRODIKEYS=m
 # CONFIG_HID_CYPRESS is not set
 # CONFIG_HID_DRAGONRISE is not set
 # CONFIG_HID_EMS_FF is not set
-CONFIG_HID_EGALAX=m
 # CONFIG_HID_ELECOM is not set
 # CONFIG_HID_EZKEY is not set
+CONFIG_HID_KEYTOUCH=m
 # CONFIG_HID_KYE is not set
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_TWINHAN is not set
 # CONFIG_HID_KENSINGTON is not set
+CONFIG_HID_LCPOWER=m
 # CONFIG_HID_LOGITECH is not set
 CONFIG_HID_MAGICMOUSE=m
 # CONFIG_HID_MICROSOFT is not set
-CONFIG_HID_MOSART=m
 # CONFIG_HID_MONTEREY is not set
 CONFIG_HID_MULTITOUCH=m
 # CONFIG_HID_NTRIG is not set
@@ -3868,12 +4006,14 @@ CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
 CONFIG_HID_QUANTA=m
 CONFIG_HID_ROCCAT=m
+CONFIG_HID_ROCCAT_COMMON=m
+CONFIG_HID_ROCCAT_ARVO=m
 CONFIG_HID_ROCCAT_KONE=m
 CONFIG_HID_ROCCAT_KONEPLUS=m
+CONFIG_HID_ROCCAT_KOVAPLUS=m
 # CONFIG_HID_ROCCAT_PYRA is not set
 # CONFIG_HID_SAMSUNG is not set
 CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_GREENASIA is not set
 # CONFIG_HID_SMARTJOYPLUS is not set
@@ -3924,6 +4064,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_R8A66597_HCD=m
 CONFIG_USB_WHCI_HCD=m
@@ -3950,6 +4091,7 @@ CONFIG_USB_TMC=m
 #
 CONFIG_USB_STORAGE=m
 # CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
 CONFIG_USB_STORAGE_DATAFAB=m
 CONFIG_USB_STORAGE_FREECOM=m
 CONFIG_USB_STORAGE_ISD200=m
@@ -3961,6 +4103,7 @@ CONFIG_USB_STORAGE_ALAUDA=m
 CONFIG_USB_STORAGE_ONETOUCH=m
 CONFIG_USB_STORAGE_KARMA=m
 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
 # CONFIG_USB_UAS is not set
 CONFIG_USB_LIBUSUAL=y
 
@@ -4014,7 +4157,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
-# CONFIG_USB_SERIAL_SAMBA is not set
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
@@ -4098,6 +4240,7 @@ CONFIG_MMC_TIFM_SD=m
 CONFIG_MMC_SDRICOH_CS=m
 CONFIG_MMC_CB710=m
 CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
 # CONFIG_MMC_USHC is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
@@ -4113,15 +4256,18 @@ CONFIG_MSPRO_BLOCK=m
 #
 CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 
 #
 # LED drivers
 #
+CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_NET5501=m
 CONFIG_LEDS_ALIX2=m
 CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP3944=m
@@ -4176,8 +4322,11 @@ CONFIG_INFINIBAND_IPOIB=m
 CONFIG_INFINIBAND_SRP=m
 CONFIG_INFINIBAND_ISER=m
 # CONFIG_EDAC is not set
-CONFIG_RTC_LIB=m
-CONFIG_RTC_CLASS=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
 
 #
 # RTC interfaces
@@ -4209,10 +4358,13 @@ CONFIG_RTC_DRV_S35390A=m
 CONFIG_RTC_DRV_FM3130=m
 CONFIG_RTC_DRV_RX8581=m
 CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
 
 #
 # SPI RTC drivers
 #
+CONFIG_RTC_DRV_M41T93=m
 CONFIG_RTC_DRV_M41T94=m
 CONFIG_RTC_DRV_DS1305=m
 CONFIG_RTC_DRV_DS1390=m
@@ -4290,27 +4442,29 @@ CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_XENBUS_FRONTEND=y
 CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_PLATFORM_PCI=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_DIGIEPCA=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+CONFIG_COMPUTONE=m
 # CONFIG_ET131X is not set
 # CONFIG_SLICOSS is not set
 # CONFIG_VIDEO_GO7007 is not set
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_VIDEO_TM6000 is not set
-CONFIG_USB_DABUSB=m
-CONFIG_USB_SE401=m
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_IP_COMMON is not set
+# CONFIG_DVB_CXD2099 is not set
+# CONFIG_USBIP_CORE is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
 # CONFIG_ECHO is not set
-CONFIG_BRCM80211=m
-CONFIG_BRCM80211_PCI=y
+# CONFIG_BRCMUTIL is not set
+# CONFIG_BRCMSMAC is not set
 # CONFIG_BRCMFMAC is not set
-# CONFIG_RT2860 is not set
-# CONFIG_RT2870 is not set
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
@@ -4318,9 +4472,9 @@ CONFIG_BRCM80211_PCI=y
 # CONFIG_RTL8192U is not set
 # CONFIG_RTL8192E is not set
 # CONFIG_R8712U is not set
+# CONFIG_RTS_PSTOR is not set
 # CONFIG_TRANZPORT is not set
 # CONFIG_POHMELFS is not set
-CONFIG_AUTOFS_FS=m
 # CONFIG_IDE_PHISON is not set
 # CONFIG_LINE6_USB is not set
 CONFIG_DRM_VMWGFX=m
@@ -4342,25 +4496,20 @@ CONFIG_HYPERV_STORAGE=m
 CONFIG_HYPERV_BLOCK=m
 CONFIG_HYPERV_NET=m
 CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_MOUSE=m
 # CONFIG_VME_BUS is not set
 # CONFIG_DX_SEP is not set
 # CONFIG_IIO is not set
+# CONFIG_XVMALLOC is not set
 # CONFIG_ZRAM is not set
 # CONFIG_WLAGS49_H2 is not set
 # CONFIG_WLAGS49_H25 is not set
-# CONFIG_SAMSUNG_LAPTOP is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_VIDEO_DT3155 is not set
 # CONFIG_CRYSTALHD is not set
 # CONFIG_CXT1E1 is not set
-
-#
-# Texas Instruments shared transport line discipline
-#
-# CONFIG_ST_BT is not set
 # CONFIG_FB_XGI is not set
 # CONFIG_LIRC_STAGING is not set
-# CONFIG_SMB_FS is not set
 # CONFIG_EASYCAP is not set
 # CONFIG_SOLO6X10 is not set
 # CONFIG_ACPI_QUICKSTART is not set
@@ -4377,13 +4526,23 @@ CONFIG_MACH_NO_WESTBRIDGE=y
 # CONFIG_SPEAKUP is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_DRM_PSB is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
+# CONFIG_INTEL_MEI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_PANASONIC_LAPTOP=m
@@ -4401,6 +4560,8 @@ CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_SENSORS_HDAPS=m
 CONFIG_INTEL_MENLOW=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
@@ -4411,6 +4572,10 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 # CONFIG_INTEL_IPS is not set
 # CONFIG_IBM_RTL is not set
+CONFIG_XO15_EBOOK=m
+# CONFIG_SAMSUNG_LAPTOP is not set
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
 
 #
 # Firmware Drivers
@@ -4421,7 +4586,10 @@ CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_DELL_RBU=m
 CONFIG_DCDBAS=m
 CONFIG_DMIID=y
+# CONFIG_DMI_SYSFS is not set
 # CONFIG_ISCSI_IBFT_FIND is not set
+# CONFIG_SIGMA is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
 # File systems
@@ -4535,6 +4703,7 @@ CONFIG_PROC_SYSCTL=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 # CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_TMPFS_XATTR is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=m
@@ -4588,6 +4757,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 # CONFIG_ROMFS_BACKED_BY_MTD is not set
 # CONFIG_ROMFS_BACKED_BY_BOTH is not set
 CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -4627,7 +4797,6 @@ CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_DFS_UPCALL=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_CIFS_ACL is not set
-CONFIG_CIFS_EXPERIMENTAL=y
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -4654,7 +4823,7 @@ CONFIG_MSDOS_PARTITION=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=m
+CONFIG_NLS=y
 CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_NLS_CODEPAGE_437=m
 CONFIG_NLS_CODEPAGE_737=m
@@ -4702,24 +4871,25 @@ CONFIG_DLM=m
 #
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y 
+CONFIG_MAGIC_SYSRQ=y
 # CONFIG_STRIP_ASM_SYMS is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_SLUB_STATS is not set
-CONFIG_BKL=y
 # CONFIG_SPARSE_RCU_POINTER is not set
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_MEMORY_INIT is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_FRAME_POINTER=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_LKDTM is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -4972,7 +5142,6 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_FPU=m
 
 #
 # Hash modes
@@ -5068,8 +5237,6 @@ CONFIG_VIRTIO_BALLOON=m
 CONFIG_RAID6_PQ=m
 CONFIG_BITREVERSE=y
 CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=m
@@ -5107,5 +5274,6 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
 CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
 CONFIG_NLATTR=y
 CONFIG_AVERAGE=y