Grsec/PaX: 2.2.2-2.6.32.46-201110191214 + 2.2.2-3.0.7-20111019121420111019

15 files changed, 15726 insertions, 12827 deletions

diff --git a/2.6.32/0000_README b/2.6.32/0000_README
index 2d691bc..fda316c 100644
--- a/2.6.32/0000_README
+++ b/2.6.32/0000_README
@@ -3,7 +3,7 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-2.6.32.46-201110080819.patch
+Patch:	4420_grsecurity-2.2.2-2.6.32.46-201110191214.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110080819.patch b/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110191214.patch
index e1d04bf..4c56198 100644
--- a/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110080819.patch
+++ b/2.6.32/4420_grsecurity-2.2.2-2.6.32.46-201110191214.patch
@@ -1,3 +1,377 @@
+diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/dontdiff
+--- linux-2.6.32.46/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/Documentation/dontdiff	2011-08-21 18:59:02.000000000 -0400
+@@ -1,13 +1,16 @@
+ *.a
+ *.aux
+ *.bin
++*.cis
+ *.cpio
+ *.csp
++*.dbg
+ *.dsp
+ *.dvi
+ *.elf
+ *.eps
+ *.fw
++*.gcno
+ *.gen.S
+ *.gif
+ *.grep
+@@ -38,8 +41,10 @@
+ *.tab.h
+ *.tex
+ *.ver
++*.vim
+ *.xml
+ *_MODULES
++*_reg_safe.h
+ *_vga16.c
+ *~
+ *.9
+@@ -49,11 +54,16 @@
+ 53c700_d.h
+ CVS
+ ChangeSet
++GPATH
++GRTAGS
++GSYMS
++GTAGS
+ Image
+ Kerntypes
+ Module.markers
+ Module.symvers
+ PENDING
++PERF*
+ SCCS
+ System.map*
+ TAGS
+@@ -76,7 +86,11 @@ btfixupprep
+ build
+ bvmlinux
+ bzImage*
++capability_names.h
++capflags.c
+ classlist.h*
++clut_vga16.c
++common-cmds.h
+ comp*.log
+ compile.h*
+ conf
+@@ -97,19 +111,21 @@ elfconfig.h*
+ fixdep
+ fore200e_mkfirm
+ fore200e_pca_fw.c*
++gate.lds
+ gconf
+ gen-devlist
+ gen_crc32table
+ gen_init_cpio
+ genksyms
+ *_gray256.c
++hash
+ ihex2fw
+ ikconfig.h*
+ initramfs_data.cpio
++initramfs_data.cpio.bz2
+ initramfs_data.cpio.gz
+ initramfs_list
+ kallsyms
+-kconfig
+ keywords.c
+ ksym.c*
+ ksym.h*
+@@ -133,7 +149,9 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
++mkregtable
+ mktables
+ mktree
+ modpost
+@@ -149,6 +167,7 @@ patches*
+ pca200e.bin
+ pca200e_ecd.bin2
+ piggy.gz
++piggy.S
+ piggyback
+ pnmtologo
+ ppc_defs.h*
+@@ -157,12 +176,15 @@ qconf
+ raid6altivec*.c
+ raid6int*.c
+ raid6tables.c
++regdb.c
+ relocs
++rlim_names.h
+ series
+ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -186,14 +208,20 @@ version.h*
+ vmlinux
+ vmlinux-*
+ vmlinux.aout
++vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
++voffset.h
+ vsyscall.lds
+ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+ zImage*
+ zconf.hash.c
++zoffset.h
+diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/Documentation/kernel-parameters.txt
+--- linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
+@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. 
+ 			the specified number of seconds.  This is to be used if
+ 			your oopses keep scrolling off the screen.
+ 
++	pax_nouderef	[X86] 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-2.6.32.46/Makefile linux-2.6.32.46/Makefile
+--- linux-2.6.32.46/Makefile	2011-08-29 22:24:44.000000000 -0400
++++ linux-2.6.32.46/Makefile	2011-10-08 08:14:40.000000000 -0400
+@@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+ 
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -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
+ 
+ # Decide whether to build built-in, modular, or both.
+ # Normally, just do built-in.
+@@ -342,10 +343,12 @@ LINUXINCLUDE    := -Iinclude \
+ KBUILD_CPPFLAGS := -D__KERNEL__
+ 
+ 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   := -D__ASSEMBLY__
+ 
+ # Read KERNELRELEASE from include/config/kernel.release (if it exists)
+@@ -376,8 +379,8 @@ 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_basic gcc-plugins
++scripts_basic: gcc-plugins
+ 	$(Q)$(MAKE) $(build)=scripts/basic
+ 
+ # To avoid any implicit rule to kick in, define an empty command.
+@@ -403,7 +406,7 @@ endif
+ # of make so .config is not included in this case either (for *config).
+ 
+ no-dot-config-targets := clean mrproper distclean \
+-			 cscope TAGS tags help %docs check% \
++			 cscope gtags TAGS tags help %docs check% \
+ 			 include/linux/version.h headers_% \
+ 			 kernelrelease kernelversion
+ 
+@@ -526,6 +529,36 @@ else
+ KBUILD_CFLAGS	+= -O2
+ endif
+ 
++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
++endif
++ifdef CONFIG_KALLOCSTAT_PLUGIN
++KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
++endif
++ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
++endif
++ifdef CONFIG_CHECKER_PLUGIN
++ifeq ($(call cc-ifversion, -ge, 0406, y), y)
++CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
++endif
++endif
++GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_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)
+@@ -644,7 +677,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) \
+@@ -865,6 +898,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+ 
+ # The actual objects are generated when descending, 
+ # make sure no implicit rule kicks in
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
+ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
+ 
+ # Handle descending into subdirectories listed in $(vmlinux-dirs)
+@@ -874,7 +908,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Error messages still appears in the original language
+ 
+ PHONY += $(vmlinux-dirs)
+-$(vmlinux-dirs): prepare scripts
++$(vmlinux-dirs): gcc-plugins prepare scripts
+ 	$(Q)$(MAKE) $(build)=$@
+ 
+ # Build the kernel release string
+@@ -983,6 +1017,7 @@ prepare0: archprepare FORCE
+ 	$(Q)$(MAKE) $(build)=. missing-syscalls
+ 
+ # All the preparing..
++prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
+ prepare: prepare0
+ 
+ # The asm symlink changes when $(ARCH) changes.
+@@ -1124,6 +1159,7 @@ all: modules
+ #	using awk while concatenating to the final file.
+ 
+ PHONY += modules
++modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
+ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
+ 	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
+ 	@$(kecho) '  Building modules, stage 2.';
+@@ -1133,7 +1169,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B
+ 
+ # Target to prepare building external modules
+ PHONY += modules_prepare
+-modules_prepare: prepare scripts
++modules_prepare: gcc-plugins prepare scripts
+ 
+ # Target to install modules
+ PHONY += modules_install
+@@ -1198,7 +1234,7 @@ MRPROPER_FILES += .config .config.old in
+                   include/linux/autoconf.h include/linux/version.h      \
+                   include/linux/utsrelease.h                            \
+                   include/linux/bounds.h include/asm*/asm-offsets.h     \
+-		  Module.symvers Module.markers tags TAGS cscope*
++		  Module.symvers Module.markers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+ 
+ # clean - Delete most, but leave enough to build external modules
+ #
+@@ -1242,7 +1278,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 -name '*.so' -o -size 0 \
+ 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ 		-type f -print | xargs rm -f
+ 
+@@ -1289,6 +1325,7 @@ help:
+ 	@echo  '  modules_prepare - Set up for building external modules'
+ 	@echo  '  tags/TAGS	  - Generate tags file for editors'
+ 	@echo  '  cscope	  - Generate cscope index'
++	@echo  '  gtags           - Generate GNU GLOBAL index'
+ 	@echo  '  kernelrelease	  - Output the release version string'
+ 	@echo  '  kernelversion	  - Output the version stored in Makefile'
+ 	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
+@@ -1390,6 +1427,7 @@ PHONY += $(module-dirs) modules
+ $(module-dirs): crmodverdir $(objtree)/Module.symvers
+ 	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
+ 
++modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
+ modules: $(module-dirs)
+ 	@$(kecho) '  Building modules, stage 2.';
+ 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+@@ -1445,7 +1483,7 @@ endif # KBUILD_EXTMOD
+ quiet_cmd_tags = GEN     $@
+       cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
+ 
+-tags TAGS cscope: FORCE
++tags TAGS cscope gtags: FORCE
+ 	$(call cmd,tags)
+ 
+ # Scripts to check various things for consistency
+@@ -1510,17 +1548,19 @@ else
+         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
+ endif
+ 
+-%.s: %.c prepare scripts FORCE
++%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.s: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.i: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.c prepare scripts FORCE
++%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.o: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.lst: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.s: %.S prepare scripts FORCE
++%.s: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.S prepare scripts FORCE
++%.o: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.symtypes: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+@@ -1530,11 +1570,13 @@ endif
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
+-%/: prepare scripts FORCE
++%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%/: gcc-plugins prepare scripts FORCE
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
+-%.ko: prepare scripts FORCE
++%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.ko: gcc-plugins prepare scripts FORCE
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
+ 	$(build)=$(build-dir) $(@:.ko=.o)
 diff -urNp linux-2.6.32.46/arch/alpha/include/asm/elf.h linux-2.6.32.46/arch/alpha/include/asm/elf.h
 --- linux-2.6.32.46/arch/alpha/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/alpha/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
@@ -1445,6 +1819,18 @@ diff -urNp linux-2.6.32.46/arch/m32r/lib/usercopy.c linux-2.6.32.46/arch/m32r/li
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
+diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile
+--- linux-2.6.32.46/arch/mips/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/mips/Makefile	2011-08-21 19:26:52.000000000 -0400
+@@ -51,6 +51,8 @@ endif
+ cflags-y := -ffunction-sections
+ cflags-y += $(call cc-option, -mno-check-zero-division)
+ 
++cflags-y += -Wno-sign-compare -Wno-extra
++
+ ifdef CONFIG_32BIT
+ ld-emul			= $(32bit-emul)
+ vmlinux-32		= vmlinux
 diff -urNp linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c
 --- linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/mips/alchemy/devboards/pm.c	2011-04-17 15:56:45.000000000 -0400
@@ -1643,18 +2029,6 @@ diff -urNp linux-2.6.32.46/arch/mips/kernel/syscall.c linux-2.6.32.46/arch/mips/
  			return addr;
  		addr = vmm->vm_end;
  		if (do_color_align)
-diff -urNp linux-2.6.32.46/arch/mips/Makefile linux-2.6.32.46/arch/mips/Makefile
---- linux-2.6.32.46/arch/mips/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/mips/Makefile	2011-08-21 19:26:52.000000000 -0400
-@@ -51,6 +51,8 @@ endif
- cflags-y := -ffunction-sections
- cflags-y += $(call cc-option, -mno-check-zero-division)
- 
-+cflags-y += -Wno-sign-compare -Wno-extra
-+
- ifdef CONFIG_32BIT
- ld-emul			= $(32bit-emul)
- vmlinux-32		= vmlinux
 diff -urNp linux-2.6.32.46/arch/mips/mm/fault.c linux-2.6.32.46/arch/mips/mm/fault.c
 --- linux-2.6.32.46/arch/mips/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/mips/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
@@ -2039,6 +2413,18 @@ diff -urNp linux-2.6.32.46/arch/parisc/mm/fault.c linux-2.6.32.46/arch/parisc/mm
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
+diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Makefile
+--- linux-2.6.32.46/arch/powerpc/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/Makefile	2011-08-21 19:27:08.000000000 -0400
+@@ -74,6 +74,8 @@ KBUILD_AFLAGS	+= -Iarch/$(ARCH)
+ KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
+ CPP		= $(CC) -E $(KBUILD_CFLAGS)
+ 
++cflags-y += -Wno-sign-compare -Wno-extra
++
+ CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
+ 
+ ifeq ($(CONFIG_PPC64),y)
 diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/device.h linux-2.6.32.46/arch/powerpc/include/asm/device.h
 --- linux-2.6.32.46/arch/powerpc/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/include/asm/device.h	2011-04-17 15:56:45.000000000 -0400
@@ -2179,30 +2565,6 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/kmap_types.h linux-2.6.32.46
  	KM_TYPE_NR
  };
  
-diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/arch/powerpc/include/asm/page_64.h
---- linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
-@@ -180,15 +180,18 @@ do {						\
-  * stack by default, so in the absense of a PT_GNU_STACK program header
-  * we turn execute permission off.
-  */
--#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
--					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+#define VM_STACK_DEFAULT_FLAGS32 \
-+	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
-+	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
- #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
- 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
- 
-+#ifndef CONFIG_PAX_PAGEEXEC
- #define VM_STACK_DEFAULT_FLAGS \
- 	(test_thread_flag(TIF_32BIT) ? \
- 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
-+#endif
- 
- #include <asm-generic/getorder.h>
- 
 diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/powerpc/include/asm/page.h
 --- linux-2.6.32.46/arch/powerpc/include/asm/page.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/include/asm/page.h	2011-08-21 16:07:39.000000000 -0400
@@ -2228,6 +2590,30 @@ diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page.h linux-2.6.32.46/arch/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
+diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/page_64.h linux-2.6.32.46/arch/powerpc/include/asm/page_64.h
+--- linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/include/asm/page_64.h	2011-04-17 15:56:45.000000000 -0400
+@@ -180,15 +180,18 @@ do {						\
+  * stack by default, so in the absense of a PT_GNU_STACK program header
+  * we turn execute permission off.
+  */
+-#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
+-					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
++#define VM_STACK_DEFAULT_FLAGS32 \
++	(((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
++	 VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
+ #define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
+ 					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+ 
++#ifndef CONFIG_PAX_PAGEEXEC
+ #define VM_STACK_DEFAULT_FLAGS \
+ 	(test_thread_flag(TIF_32BIT) ? \
+ 	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
++#endif
+ 
+ #include <asm-generic/getorder.h>
+ 
 diff -urNp linux-2.6.32.46/arch/powerpc/include/asm/pci.h linux-2.6.32.46/arch/powerpc/include/asm/pci.h
 --- linux-2.6.32.46/arch/powerpc/include/asm/pci.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/include/asm/pci.h	2011-04-17 15:56:45.000000000 -0400
@@ -2503,18 +2889,6 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.46/arch/
  	.show = cache_index_show,
  };
  
-diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerpc/kernel/dma.c
---- linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
-@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
- }
- #endif
- 
--struct dma_map_ops dma_direct_ops = {
-+const struct dma_map_ops dma_direct_ops = {
- 	.alloc_coherent	= dma_direct_alloc_coherent,
- 	.free_coherent	= dma_direct_free_coherent,
- 	.map_sg		= dma_direct_map_sg,
 diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c
 --- linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/kernel/dma-iommu.c	2011-04-17 15:56:45.000000000 -0400
@@ -2539,6 +2913,18 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.46/arc
  	.alloc_coherent = dma_direct_alloc_coherent,
  	.free_coherent = dma_direct_free_coherent,
  	.map_sg = swiotlb_map_sg_attrs,
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/dma.c linux-2.6.32.46/arch/powerpc/kernel/dma.c
+--- linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/dma.c	2011-04-17 15:56:45.000000000 -0400
+@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
+ }
+ #endif
+ 
+-struct dma_map_ops dma_direct_ops = {
++const struct dma_map_ops dma_direct_ops = {
+ 	.alloc_coherent	= dma_direct_alloc_coherent,
+ 	.free_coherent	= dma_direct_free_coherent,
+ 	.map_sg		= dma_direct_map_sg,
 diff -urNp linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S
 --- linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/kernel/exceptions-64e.S	2011-04-17 15:56:45.000000000 -0400
@@ -2608,38 +2994,6 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/kgdb.c linux-2.6.32.46/arch/power
  	.gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
  };
  
-diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/powerpc/kernel/module_32.c
---- linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
-@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
- 			me->arch.core_plt_section = i;
- 	}
- 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
--		printk("Module doesn't contain .plt or .init.plt sections.\n");
-+		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
- 		return -ENOEXEC;
- 	}
- 
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
- 
- 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- 	/* Init, or core PLT? */
--	if (location >= mod->module_core
--	    && location < mod->module_core + mod->core_size)
-+	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
--	else
-+	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+	else {
-+		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+		return ~0UL;
-+	}
- 
- 	/* Find this entry, or if that fails, the next avail. entry */
- 	while (entry->jump[0]) {
 diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/powerpc/kernel/module.c
 --- linux-2.6.32.46/arch/powerpc/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
@@ -2682,6 +3036,38 @@ diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module.c linux-2.6.32.46/arch/pow
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
+diff -urNp linux-2.6.32.46/arch/powerpc/kernel/module_32.c linux-2.6.32.46/arch/powerpc/kernel/module_32.c
+--- linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/powerpc/kernel/module_32.c	2011-04-17 15:56:45.000000000 -0400
+@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
+ 			me->arch.core_plt_section = i;
+ 	}
+ 	if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
+-		printk("Module doesn't contain .plt or .init.plt sections.\n");
++		printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
+ 		return -ENOEXEC;
+ 	}
+ 
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+ 
+ 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ 	/* Init, or core PLT? */
+-	if (location >= mod->module_core
+-	    && location < mod->module_core + mod->core_size)
++	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+-	else
++	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++	else {
++		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++		return ~0UL;
++	}
+ 
+ 	/* Find this entry, or if that fails, the next avail. entry */
+ 	while (entry->jump[0]) {
 diff -urNp linux-2.6.32.46/arch/powerpc/kernel/pci-common.c linux-2.6.32.46/arch/powerpc/kernel/pci-common.c
 --- linux-2.6.32.46/arch/powerpc/kernel/pci-common.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/kernel/pci-common.c	2011-04-17 15:56:45.000000000 -0400
@@ -2968,18 +3354,6 @@ diff -urNp linux-2.6.32.46/arch/powerpc/lib/usercopy_64.c linux-2.6.32.46/arch/p
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-2.6.32.46/arch/powerpc/Makefile linux-2.6.32.46/arch/powerpc/Makefile
---- linux-2.6.32.46/arch/powerpc/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/powerpc/Makefile	2011-08-21 19:27:08.000000000 -0400
-@@ -74,6 +74,8 @@ KBUILD_AFLAGS	+= -Iarch/$(ARCH)
- KBUILD_CFLAGS	+= -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
- CPP		= $(CC) -E $(KBUILD_CFLAGS)
- 
-+cflags-y += -Wno-sign-compare -Wno-extra
-+
- CHECKFLAGS	+= -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
- 
- ifeq ($(CONFIG_PPC64),y)
 diff -urNp linux-2.6.32.46/arch/powerpc/mm/fault.c linux-2.6.32.46/arch/powerpc/mm/fault.c
 --- linux-2.6.32.46/arch/powerpc/mm/fault.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/powerpc/mm/fault.c	2011-04-17 15:56:45.000000000 -0400
@@ -3275,6 +3649,46 @@ diff -urNp linux-2.6.32.46/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.4
  	select PPC_I8259
  	select PPC_RTAS
  	select RTAS_ERROR_LOGGING
+diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig
+--- linux-2.6.32.46/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
+@@ -194,28 +194,26 @@ config AUDIT_ARCH
+ 
+ config S390_SWITCH_AMODE
+ 	bool "Switch kernel/user addressing modes"
++	default y
+ 	help
+ 	  This option allows to switch the addressing modes of kernel and user
+-	  space. The kernel parameter switch_amode=on will enable this feature,
+-	  default is disabled. Enabling this (via kernel parameter) on machines
+-	  earlier than IBM System z9-109 EC/BC will reduce system performance.
++	  space.  Enabling this on machines earlier than IBM System z9-109 EC/BC
++	  will reduce system performance.
+ 
+ 	  Note that this option will also be selected by selecting the execute
+-	  protection option below. Enabling the execute protection via the
+-	  noexec kernel parameter will also switch the addressing modes,
+-	  independent of the switch_amode kernel parameter.
++	  protection option below. Enabling the execute protection will also
++	  switch the addressing modes, independent of this option.
+ 
+ 
+ config S390_EXEC_PROTECT
+ 	bool "Data execute protection"
++	default y
+ 	select S390_SWITCH_AMODE
+ 	help
+ 	  This option allows to enable a buffer overflow protection for user
+ 	  space programs and it also selects the addressing mode option above.
+-	  The kernel parameter noexec=on will enable this feature and also
+-	  switch the addressing modes, default is disabled. Enabling this (via
+-	  kernel parameter) on machines earlier than IBM System z9-109 EC/BC
+-	  will reduce system performance.
++	  Enabling this on machines earlier than IBM System z9-109 EC/BC will
++	  reduce system performance.
+ 
+ comment "Code generation options"
+ 
 diff -urNp linux-2.6.32.46/arch/s390/include/asm/elf.h linux-2.6.32.46/arch/s390/include/asm/elf.h
 --- linux-2.6.32.46/arch/s390/include/asm/elf.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/s390/include/asm/elf.h	2011-04-17 15:56:45.000000000 -0400
@@ -3346,46 +3760,6 @@ diff -urNp linux-2.6.32.46/arch/s390/include/asm/uaccess.h linux-2.6.32.46/arch/
  	if (access_ok(VERIFY_READ, from, n))
  		n = __copy_from_user(to, from, n);
  	else
-diff -urNp linux-2.6.32.46/arch/s390/Kconfig linux-2.6.32.46/arch/s390/Kconfig
---- linux-2.6.32.46/arch/s390/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/s390/Kconfig	2011-04-17 15:56:45.000000000 -0400
-@@ -194,28 +194,26 @@ config AUDIT_ARCH
- 
- config S390_SWITCH_AMODE
- 	bool "Switch kernel/user addressing modes"
-+	default y
- 	help
- 	  This option allows to switch the addressing modes of kernel and user
--	  space. The kernel parameter switch_amode=on will enable this feature,
--	  default is disabled. Enabling this (via kernel parameter) on machines
--	  earlier than IBM System z9-109 EC/BC will reduce system performance.
-+	  space.  Enabling this on machines earlier than IBM System z9-109 EC/BC
-+	  will reduce system performance.
- 
- 	  Note that this option will also be selected by selecting the execute
--	  protection option below. Enabling the execute protection via the
--	  noexec kernel parameter will also switch the addressing modes,
--	  independent of the switch_amode kernel parameter.
-+	  protection option below. Enabling the execute protection will also
-+	  switch the addressing modes, independent of this option.
- 
- 
- config S390_EXEC_PROTECT
- 	bool "Data execute protection"
-+	default y
- 	select S390_SWITCH_AMODE
- 	help
- 	  This option allows to enable a buffer overflow protection for user
- 	  space programs and it also selects the addressing mode option above.
--	  The kernel parameter noexec=on will enable this feature and also
--	  switch the addressing modes, default is disabled. Enabling this (via
--	  kernel parameter) on machines earlier than IBM System z9-109 EC/BC
--	  will reduce system performance.
-+	  Enabling this on machines earlier than IBM System z9-109 EC/BC will
-+	  reduce system performance.
- 
- comment "Code generation options"
- 
 diff -urNp linux-2.6.32.46/arch/s390/kernel/module.c linux-2.6.32.46/arch/s390/kernel/module.c
 --- linux-2.6.32.46/arch/s390/kernel/module.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/s390/kernel/module.c	2011-04-17 15:56:45.000000000 -0400
@@ -3714,6 +4088,18 @@ diff -urNp linux-2.6.32.46/arch/sh/mm/mmap.c linux-2.6.32.46/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
+diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefile
+--- linux-2.6.32.46/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
+@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
+ # Export what is needed by arch/sparc/boot/Makefile
+ export VMLINUX_INIT VMLINUX_MAIN
+ VMLINUX_INIT := $(head-y) $(init-y)
+-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
++VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
+ VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
+ VMLINUX_MAIN += $(drivers-y) $(net-y)
+ 
 diff -urNp linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h
 --- linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/include/asm/atomic_64.h	2011-08-18 23:11:34.000000000 -0400
@@ -4163,6 +4549,23 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/thread_info_64.h linux-2.6.32.
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
+diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch/sparc/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
+@@ -1,5 +1,13 @@
+ #ifndef ___ASM_SPARC_UACCESS_H
+ #define ___ASM_SPARC_UACCESS_H
++
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
++#include <linux/types.h>
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++#endif
++#endif
++
+ #if defined(__sparc__) && defined(__arch64__)
+ #include <asm/uaccess_64.h>
+ #else
 diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h
 --- linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/include/asm/uaccess_32.h	2011-04-17 15:56:46.000000000 -0400
@@ -4262,23 +4665,18 @@ diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess_64.h linux-2.6.32.46/a
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-2.6.32.46/arch/sparc/include/asm/uaccess.h linux-2.6.32.46/arch/sparc/include/asm/uaccess.h
---- linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/sparc/include/asm/uaccess.h	2011-04-17 15:56:46.000000000 -0400
-@@ -1,5 +1,13 @@
- #ifndef ___ASM_SPARC_UACCESS_H
- #define ___ASM_SPARC_UACCESS_H
-+
-+#ifdef __KERNEL__
-+#ifndef __ASSEMBLY__
-+#include <linux/types.h>
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+#endif
-+#endif
-+
- #if defined(__sparc__) && defined(__arch64__)
- #include <asm/uaccess_64.h>
- #else
+diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc/kernel/Makefile
+--- linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
+@@ -3,7 +3,7 @@
+ #
+ 
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
+ 
+ extra-y     := head_$(BITS).o
+ extra-y     += init_task.o
 diff -urNp linux-2.6.32.46/arch/sparc/kernel/iommu.c linux-2.6.32.46/arch/sparc/kernel/iommu.c
 --- linux-2.6.32.46/arch/sparc/kernel/iommu.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/kernel/iommu.c	2011-04-17 15:56:46.000000000 -0400
@@ -4354,18 +4752,6 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/kgdb_64.c linux-2.6.32.46/arch/spar
  	/* Breakpoint instruction: ta 0x72 */
  	.gdb_bpt_instr		= { 0x91, 0xd0, 0x20, 0x72 },
  };
-diff -urNp linux-2.6.32.46/arch/sparc/kernel/Makefile linux-2.6.32.46/arch/sparc/kernel/Makefile
---- linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/sparc/kernel/Makefile	2011-04-17 15:56:46.000000000 -0400
-@@ -3,7 +3,7 @@
- #
- 
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
- 
- extra-y     := head_$(BITS).o
- extra-y     += init_task.o
 diff -urNp linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c
 --- linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/kernel/pci_sun4v.c	2011-04-17 15:56:46.000000000 -0400
@@ -4815,6 +5201,18 @@ diff -urNp linux-2.6.32.46/arch/sparc/kernel/unaligned_64.c linux-2.6.32.46/arch
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
+diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/lib/Makefile
+--- linux-2.6.32.46/arch/sparc/lib/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/lib/Makefile	2011-05-17 19:26:34.000000000 -0400
+@@ -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 -urNp linux-2.6.32.46/arch/sparc/lib/atomic_64.S linux-2.6.32.46/arch/sparc/lib/atomic_64.S
 --- linux-2.6.32.46/arch/sparc/lib/atomic_64.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/lib/atomic_64.S	2011-04-17 15:56:46.000000000 -0400
@@ -5074,18 +5472,6 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/ksyms.c linux-2.6.32.46/arch/sparc/lib
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-2.6.32.46/arch/sparc/lib/Makefile linux-2.6.32.46/arch/sparc/lib/Makefile
---- linux-2.6.32.46/arch/sparc/lib/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/sparc/lib/Makefile	2011-05-17 19:26:34.000000000 -0400
-@@ -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 -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/lib/rwsem_64.S
 --- linux-2.6.32.46/arch/sparc/lib/rwsem_64.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/lib/rwsem_64.S	2011-04-17 15:56:46.000000000 -0400
@@ -5187,18 +5573,18 @@ diff -urNp linux-2.6.32.46/arch/sparc/lib/rwsem_64.S linux-2.6.32.46/arch/sparc/
  	cas		[%o0], %g3, %g7
  	cmp		%g3, %g7
  	bne,pn		%icc, 1b
-diff -urNp linux-2.6.32.46/arch/sparc/Makefile linux-2.6.32.46/arch/sparc/Makefile
---- linux-2.6.32.46/arch/sparc/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/sparc/Makefile	2011-04-17 15:56:46.000000000 -0400
-@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)	+= arch/sparc
- # Export what is needed by arch/sparc/boot/Makefile
- export VMLINUX_INIT VMLINUX_MAIN
- VMLINUX_INIT := $(head-y) $(init-y)
--VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
-+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
- VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
- VMLINUX_MAIN += $(drivers-y) $(net-y)
+diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/Makefile
+--- linux-2.6.32.46/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
+@@ -2,7 +2,7 @@
+ #
+ 
+ asflags-y := -ansi
+-ccflags-y := -Werror
++#ccflags-y := -Werror
  
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-y                   += fault_$(BITS).o
 diff -urNp linux-2.6.32.46/arch/sparc/mm/fault_32.c linux-2.6.32.46/arch/sparc/mm/fault_32.c
 --- linux-2.6.32.46/arch/sparc/mm/fault_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/mm/fault_32.c	2011-04-17 15:56:46.000000000 -0400
@@ -6113,18 +6499,6 @@ diff -urNp linux-2.6.32.46/arch/sparc/mm/init_32.c linux-2.6.32.46/arch/sparc/mm
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-2.6.32.46/arch/sparc/mm/Makefile linux-2.6.32.46/arch/sparc/mm/Makefile
---- linux-2.6.32.46/arch/sparc/mm/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/sparc/mm/Makefile	2011-04-17 15:56:46.000000000 -0400
-@@ -2,7 +2,7 @@
- #
- 
- asflags-y := -ansi
--ccflags-y := -Werror
-+#ccflags-y := -Werror
- 
- obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
- obj-y                   += fault_$(BITS).o
 diff -urNp linux-2.6.32.46/arch/sparc/mm/srmmu.c linux-2.6.32.46/arch/sparc/mm/srmmu.c
 --- linux-2.6.32.46/arch/sparc/mm/srmmu.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/sparc/mm/srmmu.c	2011-04-17 15:56:46.000000000 -0400
@@ -6217,6 +6591,160 @@ diff -urNp linux-2.6.32.46/arch/um/sys-i386/syscalls.c linux-2.6.32.46/arch/um/s
  /*
   * Perform the select(nd, in, out, ex, tv) and mmap() system
   * calls. Linux/i386 didn't use to be able to handle more than
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig
+--- linux-2.6.32.46/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig	2011-10-07 08:11:49.000000000 -0400
+@@ -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 KTIME_SCALAR
+ 	def_bool X86_32
+@@ -1008,7 +1008,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
+@@ -1045,7 +1045,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.
+@@ -1099,7 +1099,7 @@ config PAGE_OFFSET
+ 	hex
+ 	default 0xB0000000 if VMSPLIT_3G_OPT
+ 	default 0x80000000 if VMSPLIT_2G
+-	default 0x78000000 if VMSPLIT_2G_OPT
++	default 0x70000000 if VMSPLIT_2G_OPT
+ 	default 0x40000000 if VMSPLIT_1G
+ 	default 0xC0000000
+ 	depends on X86_32
+@@ -1460,6 +1460,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
+@@ -1517,6 +1518,7 @@ config KEXEC_JUMP
+ config PHYSICAL_START
+ 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
+ 	default "0x1000000"
++	range 0x400000 0x40000000
+ 	---help---
+ 	  This gives the physical address where the kernel is loaded.
+ 
+@@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
+ 	hex
+ 	prompt "Alignment value to which kernel should be aligned" if X86_32
+ 	default "0x1000000"
++	range 0x400000 0x1000000 if PAX_KERNEXEC
+ 	range 0x2000 0x1000000
+ 	---help---
+ 	  This value puts the alignment restrictions on physical address
+@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
+ 	  Say N if you want to disable CPU hotplug.
+ 
+ config COMPAT_VDSO
+-	def_bool y
++	def_bool n
+ 	prompt "Compat VDSO support"
+ 	depends on X86_32 || IA32_EMULATION
++	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
+ 	---help---
+ 	  Map the 32-bit VDSO to the predictable old-style address too.
+ 	---help---
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig.cpu
+--- linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
+@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
+ 
+ config X86_F00F_BUG
+ 	def_bool y
+-	depends on M586MMX || M586TSC || M586 || M486 || M386
++	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
+ 
+ config X86_WP_WORKS_OK
+ 	def_bool y
+@@ -360,7 +360,7 @@ config X86_POPAD_OK
+ 
+ config X86_ALIGNMENT_16
+ 	def_bool y
+-	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
++	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
+ 
+ config X86_INTEL_USERCOPY
+ 	def_bool y
+@@ -406,7 +406,7 @@ config X86_CMPXCHG64
+ # generates cmov.
+ config X86_CMOV
+ 	def_bool y
+-	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
++	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
+ 
+ config X86_MINIMUM_CPU_FAMILY
+ 	int
+diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconfig.debug
+--- linux-2.6.32.46/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+@@ -99,7 +99,7 @@ config X86_PTDUMP
+ config DEBUG_RODATA
+ 	bool "Write protect kernel read-only data structures"
+ 	default y
+-	depends on DEBUG_KERNEL
++	depends on DEBUG_KERNEL && BROKEN
+ 	---help---
+ 	  Mark the kernel read-only data as write-protected in the pagetables,
+ 	  in order to catch accidental (and incorrect) writes to such const
+diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile
+--- linux-2.6.32.46/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/Makefile	2011-07-19 18:16:02.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
+@@ -189,3 +190,12 @@ define archhelp
+   echo  '                  FDARGS="..."  arguments for the booted kernel'
+   echo  '                  FDINITRD=file initrd for the booted kernel'
+ endef
++
++define OLD_LD
++
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
++
++archprepare:
++	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/Makefile
+--- linux-2.6.32.46/arch/x86/boot/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/Makefile	2011-08-07 14:38:13.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-2.6.32.46/arch/x86/boot/bitops.h linux-2.6.32.46/arch/x86/boot/bitops.h
 --- linux-2.6.32.46/arch/x86/boot/bitops.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/boot/bitops.h	2011-04-17 15:56:46.000000000 -0400
@@ -6259,6 +6787,19 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/boot.h linux-2.6.32.46/arch/x86/boot/bo
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
+diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arch/x86/boot/compressed/Makefile
+--- linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-08-07 14:38:34.000000000 -0400
+@@ -13,6 +13,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-2.6.32.46/arch/x86/boot/compressed/head_32.S linux-2.6.32.46/arch/x86/boot/compressed/head_32.S
 --- linux-2.6.32.46/arch/x86/boot/compressed/head_32.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/boot/compressed/head_32.S	2011-04-17 15:56:46.000000000 -0400
@@ -6320,19 +6861,6 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/head_64.S linux-2.6.32.46/ar
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-2.6.32.46/arch/x86/boot/compressed/Makefile linux-2.6.32.46/arch/x86/boot/compressed/Makefile
---- linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/boot/compressed/Makefile	2011-08-07 14:38:34.000000000 -0400
-@@ -13,6 +13,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-2.6.32.46/arch/x86/boot/compressed/misc.c linux-2.6.32.46/arch/x86/boot/compressed/misc.c
 --- linux-2.6.32.46/arch/x86/boot/compressed/misc.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/boot/compressed/misc.c	2011-04-17 15:56:46.000000000 -0400
@@ -6679,19 +7207,6 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/header.S linux-2.6.32.46/arch/x86/boot/
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-2.6.32.46/arch/x86/boot/Makefile linux-2.6.32.46/arch/x86/boot/Makefile
---- linux-2.6.32.46/arch/x86/boot/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/boot/Makefile	2011-08-07 14:38:13.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-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/memory.c
 --- linux-2.6.32.46/arch/x86/boot/memory.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/boot/memory.c	2011-04-17 15:56:46.000000000 -0400
@@ -6704,6 +7219,17 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/memory.c linux-2.6.32.46/arch/x86/boot/
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
+diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/boot/video-vesa.c
+--- linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
+@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
+ 
+ 	boot_params.screen_info.vesapm_seg = oreg.es;
+ 	boot_params.screen_info.vesapm_off = oreg.di;
++	boot_params.screen_info.vesapm_size = oreg.cx;
+ }
+ 
+ /*
 diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/video.c
 --- linux-2.6.32.46/arch/x86/boot/video.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/boot/video.c	2011-04-17 15:56:46.000000000 -0400
@@ -6716,17 +7242,6 @@ diff -urNp linux-2.6.32.46/arch/x86/boot/video.c linux-2.6.32.46/arch/x86/boot/v
  	int key;
  	unsigned int v;
  
-diff -urNp linux-2.6.32.46/arch/x86/boot/video-vesa.c linux-2.6.32.46/arch/x86/boot/video-vesa.c
---- linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/boot/video-vesa.c	2011-04-17 15:56:46.000000000 -0400
-@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
- 
- 	boot_params.screen_info.vesapm_seg = oreg.es;
- 	boot_params.screen_info.vesapm_off = oreg.di;
-+	boot_params.screen_info.vesapm_size = oreg.cx;
- }
- 
- /*
 diff -urNp linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S
 --- linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/crypto/aes-x86_64-asm_64.S	2011-10-06 09:37:14.000000000 -0400
@@ -6829,6 +7344,85 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_aout.c linux-2.6.32.46/arch/x86/ia
  end_coredump:
  	set_fs(fs);
  	return has_dumped;
+diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ia32/ia32_signal.c
+--- linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-10-06 09:37:08.000000000 -0400
+@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const 
+ 	}
+ 	seg = get_fs();
+ 	set_fs(KERNEL_DS);
+-	ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
++	ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
+ 	set_fs(seg);
+ 	if (ret >= 0 && uoss_ptr)  {
+ 		if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
+@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct 
+  */
+ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+ 				 size_t frame_size,
+-				 void **fpstate)
++				 void __user **fpstate)
+ {
+ 	unsigned long sp;
+ 
+@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct 
+ 
+ 	if (used_math()) {
+ 		sp = sp - sig_xstate_ia32_size;
+-		*fpstate = (struct _fpstate_ia32 *) sp;
++		*fpstate = (struct _fpstate_ia32 __user *) sp;
+ 		if (save_i387_xstate_ia32(*fpstate) < 0)
+ 			return (void __user *) -1L;
+ 	}
+@@ -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 __user *)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 __user *)frame->retcode);
+ 	} put_user_catch(err);
+ 
+ 	if (err)
 diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia32/ia32entry.S
 --- linux-2.6.32.46/arch/x86/ia32/ia32entry.S	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/ia32/ia32entry.S	2011-08-25 17:42:18.000000000 -0400
@@ -7008,85 +7602,6 @@ diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32entry.S linux-2.6.32.46/arch/x86/ia
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-2.6.32.46/arch/x86/ia32/ia32_signal.c linux-2.6.32.46/arch/x86/ia32/ia32_signal.c
---- linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/ia32/ia32_signal.c	2011-10-06 09:37:08.000000000 -0400
-@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const 
- 	}
- 	seg = get_fs();
- 	set_fs(KERNEL_DS);
--	ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
-+	ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
- 	set_fs(seg);
- 	if (ret >= 0 && uoss_ptr)  {
- 		if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
-@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct 
-  */
- static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
- 				 size_t frame_size,
--				 void **fpstate)
-+				 void __user **fpstate)
- {
- 	unsigned long sp;
- 
-@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct 
- 
- 	if (used_math()) {
- 		sp = sp - sig_xstate_ia32_size;
--		*fpstate = (struct _fpstate_ia32 *) sp;
-+		*fpstate = (struct _fpstate_ia32 __user *) sp;
- 		if (save_i387_xstate_ia32(*fpstate) < 0)
- 			return (void __user *) -1L;
- 	}
-@@ -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 __user *)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 __user *)frame->retcode);
- 	} put_user_catch(err);
- 
- 	if (err)
 diff -urNp linux-2.6.32.46/arch/x86/ia32/sys_ia32.c linux-2.6.32.46/arch/x86/ia32/sys_ia32.c
 --- linux-2.6.32.46/arch/x86/ia32/sys_ia32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/ia32/sys_ia32.c	2011-10-06 09:37:14.000000000 -0400
@@ -8430,6 +8945,21 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/boot.h linux-2.6.32.46/arch/x86/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86/include/asm/cache.h
+--- linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
+@@ -5,9 +5,10 @@
+ 
+ /* L1 cache line size */
+ #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
+-#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
++#define L1_CACHE_BYTES	(_AC(1,UL) << L1_CACHE_SHIFT)
+ 
+ #define __read_mostly __attribute__((__section__(".data.read_mostly")))
++#define __read_only __attribute__((__section__(".data.read_only")))
+ 
+ #ifdef CONFIG_X86_VSMP
+ /* vSMP Internode cacheline shift */
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arch/x86/include/asm/cacheflush.h
 --- linux-2.6.32.46/arch/x86/include/asm/cacheflush.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/cacheflush.h	2011-04-17 15:56:46.000000000 -0400
@@ -8451,21 +8981,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/cacheflush.h linux-2.6.32.46/arc
  		ClearPageUncached(pg);
  		ClearPageWC(pg);
  		break;
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/cache.h linux-2.6.32.46/arch/x86/include/asm/cache.h
---- linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/cache.h	2011-07-06 19:53:33.000000000 -0400
-@@ -5,9 +5,10 @@
- 
- /* L1 cache line size */
- #define L1_CACHE_SHIFT	(CONFIG_X86_L1_CACHE_SHIFT)
--#define L1_CACHE_BYTES	(1 << L1_CACHE_SHIFT)
-+#define L1_CACHE_BYTES	(_AC(1,UL) << L1_CACHE_SHIFT)
- 
- #define __read_mostly __attribute__((__section__(".data.read_mostly")))
-+#define __read_only __attribute__((__section__(".data.read_only")))
- 
- #ifdef CONFIG_X86_VSMP
- /* vSMP Internode cacheline shift */
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/calling.h linux-2.6.32.46/arch/x86/include/asm/calling.h
 --- linux-2.6.32.46/arch/x86/include/asm/calling.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/calling.h	2011-10-06 10:08:42.000000000 -0400
@@ -8559,22 +9074,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/checksum_32.h linux-2.6.32.46/ar
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch/x86/include/asm/desc_defs.h
---- linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
-@@ -31,6 +31,12 @@ struct desc_struct {
- 			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
- 			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
- 		};
-+		struct {
-+			u16 offset_low;
-+			u16 seg;
-+			unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
-+			unsigned offset_high: 16;
-+		} gate;
- 	};
- } __attribute__((packed));
- 
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/include/asm/desc.h
 --- linux-2.6.32.46/arch/x86/include/asm/desc.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/desc.h	2011-04-23 12:56:10.000000000 -0400
@@ -8758,6 +9257,22 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc.h linux-2.6.32.46/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/desc_defs.h linux-2.6.32.46/arch/x86/include/asm/desc_defs.h
+--- linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/desc_defs.h	2011-04-17 15:56:46.000000000 -0400
+@@ -31,6 +31,12 @@ struct desc_struct {
+ 			unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
+ 			unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
+ 		};
++		struct {
++			u16 offset_low;
++			u16 seg;
++			unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
++			unsigned offset_high: 16;
++		} gate;
+ 	};
+ } __attribute__((packed));
+ 
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/device.h linux-2.6.32.46/arch/x86/include/asm/device.h
 --- linux-2.6.32.46/arch/x86/include/asm/device.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/device.h	2011-04-17 15:56:46.000000000 -0400
@@ -9363,6 +9878,35 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/mman.h linux-2.6.32.46/arch/x86/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/include/asm/mmu.h
+--- linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
+@@ -9,10 +9,23 @@
+  * we put the segment information here.
+  */
+ typedef struct {
+-	void *ldt;
++	struct desc_struct *ldt;
+ 	int size;
+ 	struct mutex lock;
+-	void *vdso;
++	unsigned long vdso;
++
++#ifdef CONFIG_X86_32
++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
++	unsigned long user_cs_base;
++	unsigned long user_cs_limit;
++
++#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
++	cpumask_t cpu_user_cs_mask;
++#endif
++
++#endif
++#endif
++
+ } mm_context_t;
+ 
+ #ifdef CONFIG_SMP
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/arch/x86/include/asm/mmu_context.h
 --- linux-2.6.32.46/arch/x86/include/asm/mmu_context.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/mmu_context.h	2011-08-23 20:24:19.000000000 -0400
@@ -9486,35 +10030,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu_context.h linux-2.6.32.46/ar
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/mmu.h linux-2.6.32.46/arch/x86/include/asm/mmu.h
---- linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/mmu.h	2011-04-17 15:56:46.000000000 -0400
-@@ -9,10 +9,23 @@
-  * we put the segment information here.
-  */
- typedef struct {
--	void *ldt;
-+	struct desc_struct *ldt;
- 	int size;
- 	struct mutex lock;
--	void *vdso;
-+	unsigned long vdso;
-+
-+#ifdef CONFIG_X86_32
-+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
-+	unsigned long user_cs_base;
-+	unsigned long user_cs_limit;
-+
-+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
-+	cpumask_t cpu_user_cs_mask;
-+#endif
-+
-+#endif
-+#endif
-+
- } mm_context_t;
- 
- #ifdef CONFIG_SMP
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/module.h linux-2.6.32.46/arch/x86/include/asm/module.h
 --- linux-2.6.32.46/arch/x86/include/asm/module.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/module.h	2011-10-08 08:16:59.000000000 -0400
@@ -9785,84 +10300,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-2level.h linux-2.6.32.46
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h
---- linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
-@@ -26,9 +26,6 @@
- struct mm_struct;
- struct vm_area_struct;
- 
--extern pgd_t swapper_pg_dir[1024];
--extern pgd_t trampoline_pg_dir[1024];
--
- static inline void pgtable_cache_init(void) { }
- static inline void check_pgt_cache(void) { }
- void paging_init(void);
-@@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, u
- # include <asm/pgtable-2level.h>
- #endif
- 
-+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
-+extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
-+#ifdef CONFIG_X86_PAE
-+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
-+#endif
-+
- #if defined(CONFIG_HIGHPTE)
- #define __KM_PTE			\
- 	(in_nmi() ? KM_NMI_PTE : 	\
-@@ -73,7 +76,9 @@ extern void set_pmd_pfn(unsigned long, u
- /* Clear a kernel PTE and flush it from the TLB */
- #define kpte_clear_flush(ptep, vaddr)		\
- do {						\
-+	pax_open_kernel();			\
- 	pte_clear(&init_mm, (vaddr), (ptep));	\
-+	pax_close_kernel();			\
- 	__flush_tlb_one((vaddr));		\
- } while (0)
- 
-@@ -85,6 +90,9 @@ do {						\
- 
- #endif /* !__ASSEMBLY__ */
- 
-+#define HAVE_ARCH_UNMAPPED_AREA
-+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
-+
- /*
-  * kern_addr_valid() is (1) for FLATMEM and (0) for
-  * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h
---- linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
-@@ -8,7 +8,7 @@
-  */
- #ifdef CONFIG_X86_PAE
- # include <asm/pgtable-3level_types.h>
--# define PMD_SIZE	(1UL << PMD_SHIFT)
-+# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
- # define PMD_MASK	(~(PMD_SIZE - 1))
- #else
- # include <asm/pgtable-2level_types.h>
-@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set 
- # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
- #endif
- 
-+#ifdef CONFIG_PAX_KERNEXEC
-+#ifndef __ASSEMBLY__
-+extern unsigned char MODULES_EXEC_VADDR[];
-+extern unsigned char MODULES_EXEC_END[];
-+#endif
-+#include <asm/boot.h>
-+#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
-+#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
-+#else
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
-+#endif
-+
- #define MODULES_VADDR	VMALLOC_START
- #define MODULES_END	VMALLOC_END
- #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h
 --- linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h	2011-04-17 15:56:46.000000000 -0400
@@ -9883,63 +10320,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable-3level.h linux-2.6.32.46
  }
  
  /*
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h
---- linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-08-23 20:24:19.000000000 -0400
-@@ -16,10 +16,13 @@
- 
- extern pud_t level3_kernel_pgt[512];
- extern pud_t level3_ident_pgt[512];
-+extern pud_t level3_vmalloc_pgt[512];
-+extern pud_t level3_vmemmap_pgt[512];
-+extern pud_t level2_vmemmap_pgt[512];
- extern pmd_t level2_kernel_pgt[512];
- extern pmd_t level2_fixmap_pgt[512];
--extern pmd_t level2_ident_pgt[512];
--extern pgd_t init_level4_pgt[];
-+extern pmd_t level2_ident_pgt[512*2];
-+extern pgd_t init_level4_pgt[512];
- 
- #define swapper_pg_dir init_level4_pgt
- 
-@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
- 
- static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
- {
-+	pax_open_kernel();
- 	*pmdp = pmd;
-+	pax_close_kernel();
- }
- 
- static inline void native_pmd_clear(pmd_t *pmd)
-@@ -94,6 +99,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-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h
---- linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
-@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
- #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
- #define MODULES_END      _AC(0xffffffffff000000, UL)
- #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
-+#define MODULES_EXEC_VADDR MODULES_VADDR
-+#define MODULES_EXEC_END MODULES_END
-+
-+#define ktla_ktva(addr)		(addr)
-+#define ktva_ktla(addr)		(addr)
- 
- #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x86/include/asm/pgtable.h
 --- linux-2.6.32.46/arch/x86/include/asm/pgtable.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/pgtable.h	2011-08-23 20:24:19.000000000 -0400
@@ -10120,6 +10500,141 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable.h linux-2.6.32.46/arch/x
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32.h	2011-04-17 15:56:46.000000000 -0400
+@@ -26,9 +26,6 @@
+ struct mm_struct;
+ struct vm_area_struct;
+ 
+-extern pgd_t swapper_pg_dir[1024];
+-extern pgd_t trampoline_pg_dir[1024];
+-
+ static inline void pgtable_cache_init(void) { }
+ static inline void check_pgt_cache(void) { }
+ void paging_init(void);
+@@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, u
+ # include <asm/pgtable-2level.h>
+ #endif
+ 
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
++#ifdef CONFIG_X86_PAE
++extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
++#endif
++
+ #if defined(CONFIG_HIGHPTE)
+ #define __KM_PTE			\
+ 	(in_nmi() ? KM_NMI_PTE : 	\
+@@ -73,7 +76,9 @@ extern void set_pmd_pfn(unsigned long, u
+ /* Clear a kernel PTE and flush it from the TLB */
+ #define kpte_clear_flush(ptep, vaddr)		\
+ do {						\
++	pax_open_kernel();			\
+ 	pte_clear(&init_mm, (vaddr), (ptep));	\
++	pax_close_kernel();			\
+ 	__flush_tlb_one((vaddr));		\
+ } while (0)
+ 
+@@ -85,6 +90,9 @@ do {						\
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
++#define HAVE_ARCH_UNMAPPED_AREA
++#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
++
+ /*
+  * kern_addr_valid() is (1) for FLATMEM and (0) for
+  * SPARSEMEM and DISCONTIGMEM
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_32_types.h	2011-04-17 15:56:46.000000000 -0400
+@@ -8,7 +8,7 @@
+  */
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level_types.h>
+-# define PMD_SIZE	(1UL << PMD_SHIFT)
++# define PMD_SIZE	(_AC(1, UL) << PMD_SHIFT)
+ # define PMD_MASK	(~(PMD_SIZE - 1))
+ #else
+ # include <asm/pgtable-2level_types.h>
+@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set 
+ # define VMALLOC_END	(FIXADDR_START - 2 * PAGE_SIZE)
+ #endif
+ 
++#ifdef CONFIG_PAX_KERNEXEC
++#ifndef __ASSEMBLY__
++extern unsigned char MODULES_EXEC_VADDR[];
++extern unsigned char MODULES_EXEC_END[];
++#endif
++#include <asm/boot.h>
++#define ktla_ktva(addr)		(addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
++#define ktva_ktla(addr)		(addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
++#else
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
++#endif
++
+ #define MODULES_VADDR	VMALLOC_START
+ #define MODULES_END	VMALLOC_END
+ #define MODULES_LEN	(MODULES_VADDR - MODULES_END)
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64.h	2011-08-23 20:24:19.000000000 -0400
+@@ -16,10 +16,13 @@
+ 
+ extern pud_t level3_kernel_pgt[512];
+ extern pud_t level3_ident_pgt[512];
++extern pud_t level3_vmalloc_pgt[512];
++extern pud_t level3_vmemmap_pgt[512];
++extern pud_t level2_vmemmap_pgt[512];
+ extern pmd_t level2_kernel_pgt[512];
+ extern pmd_t level2_fixmap_pgt[512];
+-extern pmd_t level2_ident_pgt[512];
+-extern pgd_t init_level4_pgt[];
++extern pmd_t level2_ident_pgt[512*2];
++extern pgd_t init_level4_pgt[512];
+ 
+ #define swapper_pg_dir init_level4_pgt
+ 
+@@ -74,7 +77,9 @@ static inline pte_t native_ptep_get_and_
+ 
+ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
+ {
++	pax_open_kernel();
+ 	*pmdp = pmd;
++	pax_close_kernel();
+ }
+ 
+ static inline void native_pmd_clear(pmd_t *pmd)
+@@ -94,6 +99,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-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h
+--- linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/pgtable_64_types.h	2011-04-17 15:56:46.000000000 -0400
+@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
+ #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
+ #define MODULES_END      _AC(0xffffffffff000000, UL)
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
++#define MODULES_EXEC_VADDR MODULES_VADDR
++#define MODULES_EXEC_END MODULES_END
++
++#define ktla_ktva(addr)		(addr)
++#define ktva_ktla(addr)		(addr)
+ 
+ #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
 diff -urNp linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h
 --- linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/pgtable_types.h	2011-04-17 15:56:46.000000000 -0400
@@ -10952,6 +11467,236 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/thread_info.h linux-2.6.32.46/ar
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
+diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x86/include/asm/uaccess.h
+--- linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-06-25 12:55:34.000000000 -0400
++++ linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-10-06 09:37:08.000000000 -0400
+@@ -8,12 +8,15 @@
+ #include <linux/thread_info.h>
+ #include <linux/prefetch.h>
+ #include <linux/string.h>
++#include <linux/sched.h>
+ #include <asm/asm.h>
+ #include <asm/page.h>
+ 
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
++extern void check_object_size(const void *ptr, unsigned long n, bool to);
++
+ /*
+  * The fs value determines whether argument validity checking should be
+  * performed or not.  If get_fs() == USER_DS, checking is performed, with
+@@ -29,7 +32,12 @@
+ 
+ #define get_ds()	(KERNEL_DS)
+ #define get_fs()	(current_thread_info()->addr_limit)
++#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)				\
+@@ -253,7 +295,7 @@ extern void __put_user_8(void);
+ 	__typeof__(*(ptr)) __pu_val;				\
+ 	__chk_user_ptr(ptr);					\
+ 	might_fault();						\
+-	__pu_val = x;						\
++	__pu_val = (x);						\
+ 	switch (sizeof(*(ptr))) {				\
+ 	case 1:							\
+ 		__put_user_x(1, __pu_val, ptr, __ret_pu);	\
+@@ -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 bu
+  * aliasing issues.
+  */
+ #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
+-	asm volatile("1:	mov"itype" %"rtype"1,%2\n"		\
++	asm volatile("1:	"__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
+ 		     "2:\n"						\
+ 		     ".section .fixup,\"ax\"\n"				\
+ 		     "3:	mov %3,%0\n"				\
+@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu
+ 		     ".previous\n"					\
+ 		     _ASM_EXTABLE(1b, 3b)				\
+ 		     : "=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 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.
+@@ -511,8 +568,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
+@@ -530,7 +591,7 @@ struct __large_struct { unsigned long bu
+ #define get_user_ex(x, ptr)	do {					\
+ 	unsigned long __gue_val;					\
+ 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
+-	(x) = (__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 -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h
 --- linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/uaccess_32.h	2011-05-16 21:46:57.000000000 -0400
@@ -11481,236 +12226,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess_64.h linux-2.6.32.46/arc
 +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-2.6.32.46/arch/x86/include/asm/uaccess.h linux-2.6.32.46/arch/x86/include/asm/uaccess.h
---- linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-06-25 12:55:34.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/include/asm/uaccess.h	2011-10-06 09:37:08.000000000 -0400
-@@ -8,12 +8,15 @@
- #include <linux/thread_info.h>
- #include <linux/prefetch.h>
- #include <linux/string.h>
-+#include <linux/sched.h>
- #include <asm/asm.h>
- #include <asm/page.h>
- 
- #define VERIFY_READ 0
- #define VERIFY_WRITE 1
- 
-+extern void check_object_size(const void *ptr, unsigned long n, bool to);
-+
- /*
-  * The fs value determines whether argument validity checking should be
-  * performed or not.  If get_fs() == USER_DS, checking is performed, with
-@@ -29,7 +32,12 @@
- 
- #define get_ds()	(KERNEL_DS)
- #define get_fs()	(current_thread_info()->addr_limit)
-+#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)				\
-@@ -253,7 +295,7 @@ extern void __put_user_8(void);
- 	__typeof__(*(ptr)) __pu_val;				\
- 	__chk_user_ptr(ptr);					\
- 	might_fault();						\
--	__pu_val = x;						\
-+	__pu_val = (x);						\
- 	switch (sizeof(*(ptr))) {				\
- 	case 1:							\
- 		__put_user_x(1, __pu_val, ptr, __ret_pu);	\
-@@ -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 bu
-  * aliasing issues.
-  */
- #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret)	\
--	asm volatile("1:	mov"itype" %"rtype"1,%2\n"		\
-+	asm volatile("1:	"__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
- 		     "2:\n"						\
- 		     ".section .fixup,\"ax\"\n"				\
- 		     "3:	mov %3,%0\n"				\
-@@ -446,10 +499,10 @@ struct __large_struct { unsigned long bu
- 		     ".previous\n"					\
- 		     _ASM_EXTABLE(1b, 3b)				\
- 		     : "=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 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.
-@@ -511,8 +568,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
-@@ -530,7 +591,7 @@ struct __large_struct { unsigned long bu
- #define get_user_ex(x, ptr)	do {					\
- 	unsigned long __gue_val;					\
- 	__get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr))));	\
--	(x) = (__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 -urNp linux-2.6.32.46/arch/x86/include/asm/vdso.h linux-2.6.32.46/arch/x86/include/asm/vdso.h
 --- linux-2.6.32.46/arch/x86/include/asm/vdso.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/include/asm/vdso.h	2011-10-06 09:37:14.000000000 -0400
@@ -11907,123 +12422,6 @@ diff -urNp linux-2.6.32.46/arch/x86/include/asm/xsave.h linux-2.6.32.46/arch/x86
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-2.6.32.46/arch/x86/Kconfig linux-2.6.32.46/arch/x86/Kconfig
---- linux-2.6.32.46/arch/x86/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/Kconfig	2011-10-07 08:11:49.000000000 -0400
-@@ -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 KTIME_SCALAR
- 	def_bool X86_32
-@@ -1008,7 +1008,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
-@@ -1045,7 +1045,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.
-@@ -1099,7 +1099,7 @@ config PAGE_OFFSET
- 	hex
- 	default 0xB0000000 if VMSPLIT_3G_OPT
- 	default 0x80000000 if VMSPLIT_2G
--	default 0x78000000 if VMSPLIT_2G_OPT
-+	default 0x70000000 if VMSPLIT_2G_OPT
- 	default 0x40000000 if VMSPLIT_1G
- 	default 0xC0000000
- 	depends on X86_32
-@@ -1460,6 +1460,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
-@@ -1517,6 +1518,7 @@ config KEXEC_JUMP
- config PHYSICAL_START
- 	hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
- 	default "0x1000000"
-+	range 0x400000 0x40000000
- 	---help---
- 	  This gives the physical address where the kernel is loaded.
- 
-@@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
- 	hex
- 	prompt "Alignment value to which kernel should be aligned" if X86_32
- 	default "0x1000000"
-+	range 0x400000 0x1000000 if PAX_KERNEXEC
- 	range 0x2000 0x1000000
- 	---help---
- 	  This value puts the alignment restrictions on physical address
-@@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
- 	  Say N if you want to disable CPU hotplug.
- 
- config COMPAT_VDSO
--	def_bool y
-+	def_bool n
- 	prompt "Compat VDSO support"
- 	depends on X86_32 || IA32_EMULATION
-+	depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
- 	---help---
- 	  Map the 32-bit VDSO to the predictable old-style address too.
- 	---help---
-diff -urNp linux-2.6.32.46/arch/x86/Kconfig.cpu linux-2.6.32.46/arch/x86/Kconfig.cpu
---- linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/Kconfig.cpu	2011-04-17 15:56:46.000000000 -0400
-@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
- 
- config X86_F00F_BUG
- 	def_bool y
--	depends on M586MMX || M586TSC || M586 || M486 || M386
-+	depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
- 
- config X86_WP_WORKS_OK
- 	def_bool y
-@@ -360,7 +360,7 @@ config X86_POPAD_OK
- 
- config X86_ALIGNMENT_16
- 	def_bool y
--	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
-+	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
- 
- config X86_INTEL_USERCOPY
- 	def_bool y
-@@ -406,7 +406,7 @@ config X86_CMPXCHG64
- # generates cmov.
- config X86_CMOV
- 	def_bool y
--	depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
-+	depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
- 
- config X86_MINIMUM_CPU_FAMILY
- 	int
-diff -urNp linux-2.6.32.46/arch/x86/Kconfig.debug linux-2.6.32.46/arch/x86/Kconfig.debug
---- linux-2.6.32.46/arch/x86/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
-@@ -99,7 +99,7 @@ config X86_PTDUMP
- config DEBUG_RODATA
- 	bool "Write protect kernel read-only data structures"
- 	default y
--	depends on DEBUG_KERNEL
-+	depends on DEBUG_KERNEL && BROKEN
- 	---help---
- 	  Mark the kernel read-only data as write-protected in the pagetables,
- 	  in order to catch accidental (and incorrect) writes to such const
 diff -urNp linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile
 --- linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/acpi/realmode/Makefile	2011-08-07 14:38:58.000000000 -0400
@@ -12489,6 +12887,20 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/asm-offsets_64.c linux-2.6.32.46/arch
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86/kernel/cpu/Makefile
+--- linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
+@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
+ CFLAGS_REMOVE_common.o = -pg
+ endif
+ 
+-# Make sure load_percpu_segment has no stackprotector
+-nostackp := $(call cc-option, -fno-stack-protector)
+-CFLAGS_common.o		:= $(nostackp)
+-
+ obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
+ obj-y			+= proc.o capflags.o powerflags.o common.o
+ obj-y			+= vmware.o hypervisor.o sched.o
 diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/amd.c
 --- linux-2.6.32.46/arch/x86/kernel/cpu/amd.c	2011-06-25 12:55:34.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/cpu/amd.c	2011-06-25 12:56:37.000000000 -0400
@@ -12672,32 +13084,20 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.46
  	.show   = show,
  	.store  = store,
  };
-diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/Makefile linux-2.6.32.46/arch/x86/kernel/cpu/Makefile
---- linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/cpu/Makefile	2011-04-17 15:56:46.000000000 -0400
-@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_common.o = -pg
- endif
- 
--# Make sure load_percpu_segment has no stackprotector
--nostackp := $(call cc-option, -fno-stack-protector)
--CFLAGS_common.o		:= $(nostackp)
--
- obj-y			:= intel_cacheinfo.o addon_cpuid_features.o
- obj-y			+= proc.o capflags.o powerflags.o common.o
- obj-y			+= vmware.o hypervisor.o sched.o
-diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c
---- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:56:59.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:57:13.000000000 -0400
-@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
- 	return ret;
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:33:55.000000000 -0400
+@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
+ static int inject_init(void)
+ {
+ 	printk(KERN_INFO "Machine check injector initialized\n");
+-	mce_chrdev_ops.write = mce_write;
++	pax_open_kernel();
++	*(void **)&mce_chrdev_ops.write = mce_write;
++	pax_close_kernel();
+ 	register_die_notifier(&mce_raise_nb);
+ 	return 0;
  }
- 
--static struct sysfs_ops threshold_ops = {
-+static const struct sysfs_ops threshold_ops = {
- 	.show			= show,
- 	.store			= store,
- };
 diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c
 --- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c	2011-05-04 17:56:20.000000000 -0400
@@ -12802,20 +13202,18 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce.c linux-2.6.32.46/arch
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-08-05 20:33:55.000000000 -0400
-@@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *fi
- static int inject_init(void)
- {
- 	printk(KERN_INFO "Machine check injector initialized\n");
--	mce_chrdev_ops.write = 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-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:56:59.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/mcheck/mce_amd.c	2011-05-23 16:57:13.000000000 -0400
+@@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kob
+ 	return ret;
  }
+ 
+-static struct sysfs_ops threshold_ops = {
++static const struct sysfs_ops threshold_ops = {
+ 	.show			= show,
+ 	.store			= store,
+ };
 diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c
 --- linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/amd.c	2011-04-17 15:56:46.000000000 -0400
@@ -12918,42 +13316,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.46/arch/
  
  #define is_cpu(vnd)	(mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
  #define use_intel()	(mtrr_if && mtrr_if->use_intel_if == 1)
-diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c
---- linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
-@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
- 
- /* Interface defining a CPU specific perfctr watchdog */
- struct wd_ops {
--	int (*reserve)(void);
--	void (*unreserve)(void);
--	int (*setup)(unsigned nmi_hz);
--	void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
--	void (*stop)(void);
-+	int (* const reserve)(void);
-+	void (* const unreserve)(void);
-+	int (* const setup)(unsigned nmi_hz);
-+	void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
-+	void (* const stop)(void);
- 	unsigned perfctr;
- 	unsigned evntsel;
- 	u64 checkbit;
-@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
- #define ARCH_PERFMON_NMI_EVENT_SEL	ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
- #define ARCH_PERFMON_NMI_EVENT_UMASK	ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
- 
-+/* cannot be const */
- static struct wd_ops intel_arch_wd_ops;
- 
- static int setup_intel_arch_watchdog(unsigned nmi_hz)
-@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns
- 	return 1;
- }
- 
-+/* cannot be const */
- static struct wd_ops intel_arch_wd_ops __read_mostly = {
- 	.reserve	= single_msr_reserve,
- 	.unreserve	= single_msr_unreserve,
 diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c
 --- linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c	2011-05-04 17:56:20.000000000 -0400
@@ -12997,6 +13359,42 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perf_event.c linux-2.6.32.46/arch
  	}
  }
  
+diff -urNp linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c
+--- linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/cpu/perfctr-watchdog.c	2011-04-17 15:56:46.000000000 -0400
+@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
+ 
+ /* Interface defining a CPU specific perfctr watchdog */
+ struct wd_ops {
+-	int (*reserve)(void);
+-	void (*unreserve)(void);
+-	int (*setup)(unsigned nmi_hz);
+-	void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
+-	void (*stop)(void);
++	int (* const reserve)(void);
++	void (* const unreserve)(void);
++	int (* const setup)(unsigned nmi_hz);
++	void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
++	void (* const stop)(void);
+ 	unsigned perfctr;
+ 	unsigned evntsel;
+ 	u64 checkbit;
+@@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
+ #define ARCH_PERFMON_NMI_EVENT_SEL	ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
+ #define ARCH_PERFMON_NMI_EVENT_UMASK	ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
+ 
++/* cannot be const */
+ static struct wd_ops intel_arch_wd_ops;
+ 
+ static int setup_intel_arch_watchdog(unsigned nmi_hz)
+@@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(uns
+ 	return 1;
+ }
+ 
++/* cannot be const */
+ static struct wd_ops intel_arch_wd_ops __read_mostly = {
+ 	.reserve	= single_msr_reserve,
+ 	.unreserve	= single_msr_unreserve,
 diff -urNp linux-2.6.32.46/arch/x86/kernel/crash.c linux-2.6.32.46/arch/x86/kernel/crash.c
 --- linux-2.6.32.46/arch/x86/kernel/crash.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/crash.c	2011-04-17 15:56:46.000000000 -0400
@@ -13043,127 +13441,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/doublefault_32.c linux-2.6.32.46/arch
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c
---- linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
-@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
- #endif
- 
- 	for (;;) {
--		struct thread_info *context;
-+		void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
-+		bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
- 
--		context = (struct thread_info *)
--			((unsigned long)stack & (~(THREAD_SIZE - 1)));
--		bp = print_context_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();
-@@ -112,11 +108,12 @@ void show_registers(struct pt_regs *regs
- 	 * When in-kernel, we also print out the stack and code at the
- 	 * time of the fault..
- 	 */
--	if (!user_mode_vm(regs)) {
-+	if (!user_mode(regs)) {
- 		unsigned int code_prologue = 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,
-@@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs
- 
- 		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++) {
-@@ -136,7 +133,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);
-@@ -149,6 +146,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-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c
---- linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
-@@ -116,8 +116,8 @@ 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;
-+	void *stack_start;
- 
- 	if (!task)
- 		task = current;
-@@ -146,10 +146,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);
- 
-@@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task
- 			if (ops->stack(data, id) < 0)
- 				break;
- 
--			bp = print_context_stack(tinfo, stack, bp, ops,
-+			bp = print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
- 						 data, estack_end, &graph);
- 			ops->stack(data, "<EOE>");
- 			/*
-@@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task
- 			if (stack >= irq_stack && stack < irq_stack_end) {
- 				if (ops->stack(data, "IRQ") < 0)
- 					break;
--				bp = print_context_stack(tinfo, stack, bp,
-+				bp = print_context_stack(task, irq_stack, stack, bp,
- 					ops, data, irq_stack_end, &graph);
- 				/*
- 				 * We link to the next stack (which would be
-@@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task
- 	/*
- 	 * This handles the process stack:
- 	 */
--	bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph);
-+	stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
-+	bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
- 	put_cpu();
- }
- EXPORT_SYMBOL(dump_trace);
 diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.c linux-2.6.32.46/arch/x86/kernel/dumpstack.c
 --- linux-2.6.32.46/arch/x86/kernel/dumpstack.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/dumpstack.c	2011-04-17 15:56:46.000000000 -0400
@@ -13295,6 +13572,127 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack.h linux-2.6.32.46/arch/x86/
  		unsigned long *stack, unsigned long bp,
  		const struct stacktrace_ops *ops, void *data,
  		unsigned long *end, int *graph);
+diff -urNp linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack_32.c	2011-04-17 15:56:46.000000000 -0400
+@@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task
+ #endif
+ 
+ 	for (;;) {
+-		struct thread_info *context;
++		void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
++		bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+ 
+-		context = (struct thread_info *)
+-			((unsigned long)stack & (~(THREAD_SIZE - 1)));
+-		bp = print_context_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();
+@@ -112,11 +108,12 @@ void show_registers(struct pt_regs *regs
+ 	 * When in-kernel, we also print out the stack and code at the
+ 	 * time of the fault..
+ 	 */
+-	if (!user_mode_vm(regs)) {
++	if (!user_mode(regs)) {
+ 		unsigned int code_prologue = 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,
+@@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs
+ 
+ 		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++) {
+@@ -136,7 +133,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);
+@@ -149,6 +146,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-2.6.32.46/arch/x86/kernel/dumpstack_64.c linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c
+--- linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/dumpstack_64.c	2011-04-17 15:56:46.000000000 -0400
+@@ -116,8 +116,8 @@ 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;
++	void *stack_start;
+ 
+ 	if (!task)
+ 		task = current;
+@@ -146,10 +146,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);
+ 
+@@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task
+ 			if (ops->stack(data, id) < 0)
+ 				break;
+ 
+-			bp = print_context_stack(tinfo, stack, bp, ops,
++			bp = print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
+ 						 data, estack_end, &graph);
+ 			ops->stack(data, "<EOE>");
+ 			/*
+@@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task
+ 			if (stack >= irq_stack && stack < irq_stack_end) {
+ 				if (ops->stack(data, "IRQ") < 0)
+ 					break;
+-				bp = print_context_stack(tinfo, stack, bp,
++				bp = print_context_stack(task, irq_stack, stack, bp,
+ 					ops, data, irq_stack_end, &graph);
+ 				/*
+ 				 * We link to the next stack (which would be
+@@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task
+ 	/*
+ 	 * This handles the process stack:
+ 	 */
+-	bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph);
++	stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
++	bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
+ 	put_cpu();
+ }
+ EXPORT_SYMBOL(dump_trace);
 diff -urNp linux-2.6.32.46/arch/x86/kernel/e820.c linux-2.6.32.46/arch/x86/kernel/e820.c
 --- linux-2.6.32.46/arch/x86/kernel/e820.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/e820.c	2011-04-17 15:56:46.000000000 -0400
@@ -15819,6 +16217,43 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/ioport.c linux-2.6.32.46/arch/x86/ker
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
+diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel/irq.c
+--- linux-2.6.32.46/arch/x86/kernel/irq.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/irq.c	2011-05-04 17:56:28.000000000 -0400
+@@ -15,7 +15,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 (*generic_interrupt_extension)(void) = NULL;
+@@ -114,9 +114,9 @@ static int show_other_interrupts(struct 
+ 		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;
+ }
+@@ -209,10 +209,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-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/kernel/irq_32.c
 --- linux-2.6.32.46/arch/x86/kernel/irq_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/irq_32.c	2011-07-06 19:53:33.000000000 -0400
@@ -15962,43 +16397,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/irq_32.c linux-2.6.32.46/arch/x86/ker
  		/*
  		 * Shouldnt happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-2.6.32.46/arch/x86/kernel/irq.c linux-2.6.32.46/arch/x86/kernel/irq.c
---- linux-2.6.32.46/arch/x86/kernel/irq.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/irq.c	2011-05-04 17:56:28.000000000 -0400
-@@ -15,7 +15,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 (*generic_interrupt_extension)(void) = NULL;
-@@ -114,9 +114,9 @@ static int show_other_interrupts(struct 
- 		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;
- }
-@@ -209,10 +209,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-2.6.32.46/arch/x86/kernel/kgdb.c linux-2.6.32.46/arch/x86/kernel/kgdb.c
 --- linux-2.6.32.46/arch/x86/kernel/kgdb.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/kgdb.c	2011-05-04 17:56:20.000000000 -0400
@@ -16461,6 +16859,18 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/module.c linux-2.6.32.46/arch/x86/ker
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
+diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
+@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
+ 	__raw_spin_lock(lock);
+ }
+ 
+-struct pv_lock_ops pv_lock_ops = {
++struct pv_lock_ops pv_lock_ops __read_only = {
+ #ifdef CONFIG_SMP
+ 	.spin_is_locked = __ticket_spin_is_locked,
+ 	.spin_is_contended = __ticket_spin_is_contended,
 diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/kernel/paravirt.c
 --- linux-2.6.32.46/arch/x86/kernel/paravirt.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/paravirt.c	2011-08-23 20:24:19.000000000 -0400
@@ -16611,18 +17021,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt.c linux-2.6.32.46/arch/x86/k
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c
---- linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/paravirt-spinlocks.c	2011-04-17 15:56:46.000000000 -0400
-@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
- 	__raw_spin_lock(lock);
- }
- 
--struct pv_lock_ops pv_lock_ops = {
-+struct pv_lock_ops pv_lock_ops __read_only = {
- #ifdef CONFIG_SMP
- 	.spin_is_locked = __ticket_spin_is_locked,
- 	.spin_is_contended = __ticket_spin_is_contended,
 diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c
 --- linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/pci-calgary_64.c	2011-04-17 15:56:46.000000000 -0400
@@ -16692,6 +17090,123 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.46/arch/x8
  	.mapping_error = swiotlb_dma_mapping_error,
  	.alloc_coherent = x86_swiotlb_alloc_coherent,
  	.free_coherent = swiotlb_free_coherent,
+diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/kernel/process.c
+--- linux-2.6.32.46/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/process.c	2011-08-30 18:19:52.000000000 -0400
+@@ -51,16 +51,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(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);
+ }
+ 
+ /*
+@@ -73,7 +90,7 @@ void exit_thread(void)
+ 	unsigned long *bp = t->io_bitmap_ptr;
+ 
+ 	if (bp) {
+-		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
++		struct tss_struct *tss = init_tss + get_cpu();
+ 
+ 		t->io_bitmap_ptr = NULL;
+ 		clear_thread_flag(TIF_IO_BITMAP);
+@@ -93,6 +110,9 @@ void flush_thread(void)
+ 
+ 	clear_tsk_thread_flag(tsk, TIF_DEBUG);
+ 
++#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
++	loadsegment(gs, 0);
++#endif
+ 	tsk->thread.debugreg0 = 0;
+ 	tsk->thread.debugreg1 = 0;
+ 	tsk->thread.debugreg2 = 0;
+@@ -307,7 +327,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();
+ 	/*
+@@ -568,16 +588,38 @@ static int __init idle_setup(char *str)
+ }
+ early_param("idle", idle_setup);
+ 
+-unsigned long arch_align_stack(unsigned long sp)
++#ifdef CONFIG_PAX_RANDKSTACK
++void pax_randomize_kstack(struct pt_regs *regs)
+ {
+-	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;
++
++	if (v8086_mode(regs))
++		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-2.6.32.46/arch/x86/kernel/process_32.c linux-2.6.32.46/arch/x86/kernel/process_32.c
 --- linux-2.6.32.46/arch/x86/kernel/process_32.c	2011-06-25 12:55:34.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/process_32.c	2011-06-25 12:56:37.000000000 -0400
@@ -16871,123 +17386,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/process_64.c linux-2.6.32.46/arch/x86
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-2.6.32.46/arch/x86/kernel/process.c linux-2.6.32.46/arch/x86/kernel/process.c
---- linux-2.6.32.46/arch/x86/kernel/process.c	2011-04-22 19:16:29.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/process.c	2011-08-30 18:19:52.000000000 -0400
-@@ -51,16 +51,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(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);
- }
- 
- /*
-@@ -73,7 +90,7 @@ void exit_thread(void)
- 	unsigned long *bp = t->io_bitmap_ptr;
- 
- 	if (bp) {
--		struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
-+		struct tss_struct *tss = init_tss + get_cpu();
- 
- 		t->io_bitmap_ptr = NULL;
- 		clear_thread_flag(TIF_IO_BITMAP);
-@@ -93,6 +110,9 @@ void flush_thread(void)
- 
- 	clear_tsk_thread_flag(tsk, TIF_DEBUG);
- 
-+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
-+	loadsegment(gs, 0);
-+#endif
- 	tsk->thread.debugreg0 = 0;
- 	tsk->thread.debugreg1 = 0;
- 	tsk->thread.debugreg2 = 0;
-@@ -307,7 +327,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();
- 	/*
-@@ -568,16 +588,38 @@ static int __init idle_setup(char *str)
- }
- early_param("idle", idle_setup);
- 
--unsigned long arch_align_stack(unsigned long sp)
-+#ifdef CONFIG_PAX_RANDKSTACK
-+void pax_randomize_kstack(struct pt_regs *regs)
- {
--	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;
-+
-+	if (v8086_mode(regs))
-+		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-2.6.32.46/arch/x86/kernel/ptrace.c linux-2.6.32.46/arch/x86/kernel/ptrace.c
 --- linux-2.6.32.46/arch/x86/kernel/ptrace.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/ptrace.c	2011-04-17 15:56:46.000000000 -0400
@@ -17498,14 +17896,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/step.c linux-2.6.32.46/arch/x86/kerne
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S
---- linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
-@@ -1,3 +1,4 @@
-+.section .rodata,"a",@progbits
- ENTRY(sys_call_table)
- 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
- 	.long sys_exit
 diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c
 --- linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/sys_i386_32.c	2011-04-17 15:56:46.000000000 -0400
@@ -17920,6 +18310,14 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/sys_x86_64.c linux-2.6.32.46/arch/x86
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
+diff -urNp linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S
+--- linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/syscall_table_32.S	2011-04-17 15:56:46.000000000 -0400
+@@ -1,3 +1,4 @@
++.section .rodata,"a",@progbits
+ ENTRY(sys_call_table)
+ 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
+ 	.long sys_exit
 diff -urNp linux-2.6.32.46/arch/x86/kernel/tboot.c linux-2.6.32.46/arch/x86/kernel/tboot.c
 --- linux-2.6.32.46/arch/x86/kernel/tboot.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/tboot.c	2011-05-22 23:02:03.000000000 -0400
@@ -18271,115 +18669,6 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/traps.c linux-2.6.32.46/arch/x86/kern
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S
---- linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	1969-12-31 19:00:00.000000000 -0500
-@@ -1,105 +0,0 @@
--/*
-- *
-- *	verify_cpu.S - Code for cpu long mode and SSE verification. This
-- *	code has been borrowed from boot/setup.S and was introduced by
-- * 	Andi Kleen.
-- *
-- *	Copyright (c) 2007  Andi Kleen (ak@suse.de)
-- *	Copyright (c) 2007  Eric Biederman (ebiederm@xmission.com)
-- *	Copyright (c) 2007  Vivek Goyal (vgoyal@in.ibm.com)
-- *
-- * 	This source code is licensed under the GNU General Public License,
-- * 	Version 2.  See the file COPYING for more details.
-- *
-- *	This is a common code for verification whether CPU supports
-- * 	long mode and SSE or not. It is not called directly instead this
-- *	file is included at various places and compiled in that context.
-- * 	Following are the current usage.
-- *
-- * 	This file is included by both 16bit and 32bit code.
-- *
-- *	arch/x86_64/boot/setup.S : Boot cpu verification (16bit)
-- *	arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit)
-- *	arch/x86_64/kernel/trampoline.S: secondary processor verfication (16bit)
-- *	arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit)
-- *
-- *	verify_cpu, returns the status of cpu check in register %eax.
-- *		0: Success    1: Failure
-- *
-- * 	The caller needs to check for the error code and take the action
-- * 	appropriately. Either display a message or halt.
-- */
--
--#include <asm/cpufeature.h>
--
--verify_cpu:
--	pushfl				# Save caller passed flags
--	pushl	$0			# Kill any dangerous flags
--	popfl
--
--	pushfl				# standard way to check for cpuid
--	popl	%eax
--	movl	%eax,%ebx
--	xorl	$0x200000,%eax
--	pushl	%eax
--	popfl
--	pushfl
--	popl	%eax
--	cmpl	%eax,%ebx
--	jz	verify_cpu_no_longmode	# cpu has no cpuid
--
--	movl	$0x0,%eax		# See if cpuid 1 is implemented
--	cpuid
--	cmpl	$0x1,%eax
--	jb	verify_cpu_no_longmode	# no cpuid 1
--
--	xor	%di,%di
--	cmpl	$0x68747541,%ebx	# AuthenticAMD
--	jnz	verify_cpu_noamd
--	cmpl	$0x69746e65,%edx
--	jnz	verify_cpu_noamd
--	cmpl	$0x444d4163,%ecx
--	jnz	verify_cpu_noamd
--	mov	$1,%di			# cpu is from AMD
--
--verify_cpu_noamd:
--	movl    $0x1,%eax		# Does the cpu have what it takes
--	cpuid
--	andl	$REQUIRED_MASK0,%edx
--	xorl	$REQUIRED_MASK0,%edx
--	jnz	verify_cpu_no_longmode
--
--	movl    $0x80000000,%eax	# See if extended cpuid is implemented
--	cpuid
--	cmpl    $0x80000001,%eax
--	jb      verify_cpu_no_longmode	# no extended cpuid
--
--	movl    $0x80000001,%eax	# Does the cpu have what it takes
--	cpuid
--	andl    $REQUIRED_MASK1,%edx
--	xorl    $REQUIRED_MASK1,%edx
--	jnz     verify_cpu_no_longmode
--
--verify_cpu_sse_test:
--	movl	$1,%eax
--	cpuid
--	andl	$SSE_MASK,%edx
--	cmpl	$SSE_MASK,%edx
--	je	verify_cpu_sse_ok
--	test	%di,%di
--	jz	verify_cpu_no_longmode	# only try to force SSE on AMD
--	movl	$0xc0010015,%ecx	# HWCR
--	rdmsr
--	btr	$15,%eax		# enable SSE
--	wrmsr
--	xor	%di,%di			# don't loop
--	jmp	verify_cpu_sse_test	# try again
--
--verify_cpu_no_longmode:
--	popfl				# Restore caller passed flags
--	movl $1,%eax
--	ret
--verify_cpu_sse_ok:
--	popfl				# Restore caller passed flags
--	xorl %eax, %eax
--	ret
 diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86/kernel/verify_cpu.S
 --- linux-2.6.32.46/arch/x86/kernel/verify_cpu.S	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.32.46/arch/x86/kernel/verify_cpu.S	2011-07-01 18:28:42.000000000 -0400
@@ -18524,6 +18813,115 @@ diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu.S linux-2.6.32.46/arch/x86
 +	popfl				# Restore caller passed flags
 +	xorl %eax, %eax
 +	ret
+diff -urNp linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S
+--- linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/kernel/verify_cpu_64.S	1969-12-31 19:00:00.000000000 -0500
+@@ -1,105 +0,0 @@
+-/*
+- *
+- *	verify_cpu.S - Code for cpu long mode and SSE verification. This
+- *	code has been borrowed from boot/setup.S and was introduced by
+- * 	Andi Kleen.
+- *
+- *	Copyright (c) 2007  Andi Kleen (ak@suse.de)
+- *	Copyright (c) 2007  Eric Biederman (ebiederm@xmission.com)
+- *	Copyright (c) 2007  Vivek Goyal (vgoyal@in.ibm.com)
+- *
+- * 	This source code is licensed under the GNU General Public License,
+- * 	Version 2.  See the file COPYING for more details.
+- *
+- *	This is a common code for verification whether CPU supports
+- * 	long mode and SSE or not. It is not called directly instead this
+- *	file is included at various places and compiled in that context.
+- * 	Following are the current usage.
+- *
+- * 	This file is included by both 16bit and 32bit code.
+- *
+- *	arch/x86_64/boot/setup.S : Boot cpu verification (16bit)
+- *	arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit)
+- *	arch/x86_64/kernel/trampoline.S: secondary processor verfication (16bit)
+- *	arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit)
+- *
+- *	verify_cpu, returns the status of cpu check in register %eax.
+- *		0: Success    1: Failure
+- *
+- * 	The caller needs to check for the error code and take the action
+- * 	appropriately. Either display a message or halt.
+- */
+-
+-#include <asm/cpufeature.h>
+-
+-verify_cpu:
+-	pushfl				# Save caller passed flags
+-	pushl	$0			# Kill any dangerous flags
+-	popfl
+-
+-	pushfl				# standard way to check for cpuid
+-	popl	%eax
+-	movl	%eax,%ebx
+-	xorl	$0x200000,%eax
+-	pushl	%eax
+-	popfl
+-	pushfl
+-	popl	%eax
+-	cmpl	%eax,%ebx
+-	jz	verify_cpu_no_longmode	# cpu has no cpuid
+-
+-	movl	$0x0,%eax		# See if cpuid 1 is implemented
+-	cpuid
+-	cmpl	$0x1,%eax
+-	jb	verify_cpu_no_longmode	# no cpuid 1
+-
+-	xor	%di,%di
+-	cmpl	$0x68747541,%ebx	# AuthenticAMD
+-	jnz	verify_cpu_noamd
+-	cmpl	$0x69746e65,%edx
+-	jnz	verify_cpu_noamd
+-	cmpl	$0x444d4163,%ecx
+-	jnz	verify_cpu_noamd
+-	mov	$1,%di			# cpu is from AMD
+-
+-verify_cpu_noamd:
+-	movl    $0x1,%eax		# Does the cpu have what it takes
+-	cpuid
+-	andl	$REQUIRED_MASK0,%edx
+-	xorl	$REQUIRED_MASK0,%edx
+-	jnz	verify_cpu_no_longmode
+-
+-	movl    $0x80000000,%eax	# See if extended cpuid is implemented
+-	cpuid
+-	cmpl    $0x80000001,%eax
+-	jb      verify_cpu_no_longmode	# no extended cpuid
+-
+-	movl    $0x80000001,%eax	# Does the cpu have what it takes
+-	cpuid
+-	andl    $REQUIRED_MASK1,%edx
+-	xorl    $REQUIRED_MASK1,%edx
+-	jnz     verify_cpu_no_longmode
+-
+-verify_cpu_sse_test:
+-	movl	$1,%eax
+-	cpuid
+-	andl	$SSE_MASK,%edx
+-	cmpl	$SSE_MASK,%edx
+-	je	verify_cpu_sse_ok
+-	test	%di,%di
+-	jz	verify_cpu_no_longmode	# only try to force SSE on AMD
+-	movl	$0xc0010015,%ecx	# HWCR
+-	rdmsr
+-	btr	$15,%eax		# enable SSE
+-	wrmsr
+-	xor	%di,%di			# don't loop
+-	jmp	verify_cpu_sse_test	# try again
+-
+-verify_cpu_no_longmode:
+-	popfl				# Restore caller passed flags
+-	movl $1,%eax
+-	ret
+-verify_cpu_sse_ok:
+-	popfl				# Restore caller passed flags
+-	xorl %eax, %eax
+-	ret
 diff -urNp linux-2.6.32.46/arch/x86/kernel/vm86_32.c linux-2.6.32.46/arch/x86/kernel/vm86_32.c
 --- linux-2.6.32.46/arch/x86/kernel/vm86_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/kernel/vm86_32.c	2011-04-17 15:56:46.000000000 -0400
@@ -21585,30 +21983,6 @@ diff -urNp linux-2.6.32.46/arch/x86/lib/usercopy_64.c linux-2.6.32.46/arch/x86/l
  {
  	char c;
  	unsigned zero_len;
-diff -urNp linux-2.6.32.46/arch/x86/Makefile linux-2.6.32.46/arch/x86/Makefile
---- linux-2.6.32.46/arch/x86/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/Makefile	2011-07-19 18:16:02.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
-@@ -189,3 +190,12 @@ define archhelp
-   echo  '                  FDARGS="..."  arguments for the booted kernel'
-   echo  '                  FDINITRD=file initrd for the booted kernel'
- endef
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
 diff -urNp linux-2.6.32.46/arch/x86/mm/extable.c linux-2.6.32.46/arch/x86/mm/extable.c
 --- linux-2.6.32.46/arch/x86/mm/extable.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/extable.c	2011-04-17 15:56:46.000000000 -0400
@@ -22610,6 +22984,146 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/hugetlbpage.c linux-2.6.32.46/arch/x86/mm
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
+diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c
+--- linux-2.6.32.46/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/init.c	2011-06-07 19:06:09.000000000 -0400
+@@ -69,11 +69,7 @@ static void __init find_early_table_spac
+ 	 * cause a hotspot and fill up ZONE_DMA. The page tables
+ 	 * need roughly 0.5KB per GB.
+ 	 */
+-#ifdef CONFIG_X86_32
+-	start = 0x7000;
+-#else
+-	start = 0x8000;
+-#endif
++	start = 0x100000;
+ 	e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
+ 					tables, PAGE_SIZE);
+ 	if (e820_table_start == -1UL)
+@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_m
+ #endif
+ 
+ 	set_nx();
+-	if (nx_enabled)
++	if (nx_enabled && cpu_has_nx)
+ 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
+ 
+ 	/* Enable PSE if available */
+@@ -329,10 +325,27 @@ unsigned long __init_refok init_memory_m
+  * Access has to be given to non-kernel-ram areas as well, these contain the PCI
+  * mmio resources as well as potential bios/acpi data regions.
+  */
++
+ int devmem_is_allowed(unsigned long pagenr)
+ {
++#ifdef CONFIG_GRKERNSEC_KMEM
++	/* allow BDA */
++	if (!pagenr)
++		return 1;
++	/* allow EBDA */
++	if ((0x9f000 >> PAGE_SHIFT) == pagenr)
++		return 1;
++	/* allow ISA/video mem */
++	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
++		return 1;
++	/* throw out everything else below 1MB */
++	if (pagenr <= 256)
++		return 0;
++#else
+ 	if (pagenr <= 256)
+ 		return 1;
++#endif
++
+ 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
+ 		return 0;
+ 	if (!page_is_ram(pagenr))
+@@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigne
+ 
+ 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-2.6.32.46/arch/x86/mm/init_32.c linux-2.6.32.46/arch/x86/mm/init_32.c
 --- linux-2.6.32.46/arch/x86/mm/init_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/init_32.c	2011-04-17 15:56:46.000000000 -0400
@@ -22979,146 +23493,6 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/init_64.c linux-2.6.32.46/arch/x86/mm/ini
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-2.6.32.46/arch/x86/mm/init.c linux-2.6.32.46/arch/x86/mm/init.c
---- linux-2.6.32.46/arch/x86/mm/init.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/mm/init.c	2011-06-07 19:06:09.000000000 -0400
-@@ -69,11 +69,7 @@ static void __init find_early_table_spac
- 	 * cause a hotspot and fill up ZONE_DMA. The page tables
- 	 * need roughly 0.5KB per GB.
- 	 */
--#ifdef CONFIG_X86_32
--	start = 0x7000;
--#else
--	start = 0x8000;
--#endif
-+	start = 0x100000;
- 	e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
- 					tables, PAGE_SIZE);
- 	if (e820_table_start == -1UL)
-@@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_m
- #endif
- 
- 	set_nx();
--	if (nx_enabled)
-+	if (nx_enabled && cpu_has_nx)
- 		printk(KERN_INFO "NX (Execute Disable) protection: active\n");
- 
- 	/* Enable PSE if available */
-@@ -329,10 +325,27 @@ unsigned long __init_refok init_memory_m
-  * Access has to be given to non-kernel-ram areas as well, these contain the PCI
-  * mmio resources as well as potential bios/acpi data regions.
-  */
-+
- int devmem_is_allowed(unsigned long pagenr)
- {
-+#ifdef CONFIG_GRKERNSEC_KMEM
-+	/* allow BDA */
-+	if (!pagenr)
-+		return 1;
-+	/* allow EBDA */
-+	if ((0x9f000 >> PAGE_SHIFT) == pagenr)
-+		return 1;
-+	/* allow ISA/video mem */
-+	if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
-+		return 1;
-+	/* throw out everything else below 1MB */
-+	if (pagenr <= 256)
-+		return 0;
-+#else
- 	if (pagenr <= 256)
- 		return 1;
-+#endif
-+
- 	if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
- 		return 0;
- 	if (!page_is_ram(pagenr))
-@@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigne
- 
- 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-2.6.32.46/arch/x86/mm/iomap_32.c linux-2.6.32.46/arch/x86/mm/iomap_32.c
 --- linux-2.6.32.46/arch/x86/mm/iomap_32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/iomap_32.c	2011-04-17 15:56:46.000000000 -0400
@@ -23323,6 +23697,18 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/numa_32.c linux-2.6.32.46/arch/x86/mm/num
  extern unsigned long highend_pfn, highstart_pfn;
  
  #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
+diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/mm/pageattr-test.c
+--- linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
+@@ -36,7 +36,7 @@ enum {
+ 
+ static int pte_testbit(pte_t pte)
+ {
+-	return pte_flags(pte) & _PAGE_UNUSED1;
++	return pte_flags(pte) & _PAGE_CPA_TEST;
+ }
+ 
+ struct split_state {
 diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pageattr.c
 --- linux-2.6.32.46/arch/x86/mm/pageattr.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/pageattr.c	2011-04-17 15:56:46.000000000 -0400
@@ -23402,18 +23788,6 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr.c linux-2.6.32.46/arch/x86/mm/pa
  }
  
  static int
-diff -urNp linux-2.6.32.46/arch/x86/mm/pageattr-test.c linux-2.6.32.46/arch/x86/mm/pageattr-test.c
---- linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/mm/pageattr-test.c	2011-04-17 15:56:46.000000000 -0400
-@@ -36,7 +36,7 @@ enum {
- 
- static int pte_testbit(pte_t pte)
- {
--	return pte_flags(pte) & _PAGE_UNUSED1;
-+	return pte_flags(pte) & _PAGE_CPA_TEST;
- }
- 
- struct split_state {
 diff -urNp linux-2.6.32.46/arch/x86/mm/pat.c linux-2.6.32.46/arch/x86/mm/pat.c
 --- linux-2.6.32.46/arch/x86/mm/pat.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/pat.c	2011-04-17 15:56:46.000000000 -0400
@@ -23512,23 +23886,6 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pf_in.c linux-2.6.32.46/arch/x86/mm/pf_in
  	p += skip_prefix(p, &prf);
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/pgtable_32.c
---- linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
-@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
- 		return;
- 	}
- 	pte = pte_offset_kernel(pmd, vaddr);
-+
-+	pax_open_kernel();
- 	if (pte_val(pteval))
- 		set_pte_at(&init_mm, vaddr, pte, pteval);
- 	else
- 		pte_clear(&init_mm, vaddr, pte);
-+	pax_close_kernel();
- 
- 	/*
- 	 * It's enough to flush this one mapping.
 diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgtable.c
 --- linux-2.6.32.46/arch/x86/mm/pgtable.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/pgtable.c	2011-05-11 18:25:15.000000000 -0400
@@ -23778,6 +24135,23 @@ diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable.c linux-2.6.32.46/arch/x86/mm/pgt
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
+diff -urNp linux-2.6.32.46/arch/x86/mm/pgtable_32.c linux-2.6.32.46/arch/x86/mm/pgtable_32.c
+--- linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/mm/pgtable_32.c	2011-04-17 15:56:46.000000000 -0400
+@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 
+ 		return;
+ 	}
+ 	pte = pte_offset_kernel(pmd, vaddr);
++
++	pax_open_kernel();
+ 	if (pte_val(pteval))
+ 		set_pte_at(&init_mm, vaddr, pte, pteval);
+ 	else
+ 		pte_clear(&init_mm, vaddr, pte);
++	pax_close_kernel();
+ 
+ 	/*
+ 	 * It's enough to flush this one mapping.
 diff -urNp linux-2.6.32.46/arch/x86/mm/setup_nx.c linux-2.6.32.46/arch/x86/mm/setup_nx.c
 --- linux-2.6.32.46/arch/x86/mm/setup_nx.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/mm/setup_nx.c	2011-04-17 15:56:46.000000000 -0400
@@ -24446,6 +24820,19 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vclock_gettime.c linux-2.6.32.46/arch/x
  }
  int gettimeofday(struct timeval *, struct timezone *)
  	__attribute__((weak, alias("__vdso_gettimeofday")));
+diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vdso/vdso.lds.S
+--- linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-06-06 17:35:35.000000000 -0400
+@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
+ #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
+ #include "vextern.h"
+ #undef	VEXTERN
++
++#define VEXTERN(x)	VDSO64_ ## x = __vdso_ ## x;
++VEXTERN(fallback_gettimeofday)
++VEXTERN(fallback_time)
++VEXTERN(getcpu)
++#undef	VEXTERN
 diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c
 --- linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c	2011-04-23 12:56:10.000000000 -0400
@@ -24531,19 +24918,6 @@ diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso32-setup.c linux-2.6.32.46/arch/x86
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-2.6.32.46/arch/x86/vdso/vdso.lds.S linux-2.6.32.46/arch/x86/vdso/vdso.lds.S
---- linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/arch/x86/vdso/vdso.lds.S	2011-06-06 17:35:35.000000000 -0400
-@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
- #define VEXTERN(x)	VDSO64_ ## x = vdso_ ## x;
- #include "vextern.h"
- #undef	VEXTERN
-+
-+#define VEXTERN(x)	VDSO64_ ## x = __vdso_ ## x;
-+VEXTERN(fallback_gettimeofday)
-+VEXTERN(fallback_time)
-+VEXTERN(getcpu)
-+#undef	VEXTERN
 diff -urNp linux-2.6.32.46/arch/x86/vdso/vextern.h linux-2.6.32.46/arch/x86/vdso/vextern.h
 --- linux-2.6.32.46/arch/x86/vdso/vextern.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/arch/x86/vdso/vextern.h	2011-04-17 15:56:46.000000000 -0400
@@ -25152,161 +25526,6 @@ diff -urNp linux-2.6.32.46/crypto/serpent.c linux-2.6.32.46/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-2.6.32.46/Documentation/dontdiff linux-2.6.32.46/Documentation/dontdiff
---- linux-2.6.32.46/Documentation/dontdiff	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/Documentation/dontdiff	2011-08-21 18:59:02.000000000 -0400
-@@ -1,13 +1,16 @@
- *.a
- *.aux
- *.bin
-+*.cis
- *.cpio
- *.csp
-+*.dbg
- *.dsp
- *.dvi
- *.elf
- *.eps
- *.fw
-+*.gcno
- *.gen.S
- *.gif
- *.grep
-@@ -38,8 +41,10 @@
- *.tab.h
- *.tex
- *.ver
-+*.vim
- *.xml
- *_MODULES
-+*_reg_safe.h
- *_vga16.c
- *~
- *.9
-@@ -49,11 +54,16 @@
- 53c700_d.h
- CVS
- ChangeSet
-+GPATH
-+GRTAGS
-+GSYMS
-+GTAGS
- Image
- Kerntypes
- Module.markers
- Module.symvers
- PENDING
-+PERF*
- SCCS
- System.map*
- TAGS
-@@ -76,7 +86,11 @@ btfixupprep
- build
- bvmlinux
- bzImage*
-+capability_names.h
-+capflags.c
- classlist.h*
-+clut_vga16.c
-+common-cmds.h
- comp*.log
- compile.h*
- conf
-@@ -97,19 +111,21 @@ elfconfig.h*
- fixdep
- fore200e_mkfirm
- fore200e_pca_fw.c*
-+gate.lds
- gconf
- gen-devlist
- gen_crc32table
- gen_init_cpio
- genksyms
- *_gray256.c
-+hash
- ihex2fw
- ikconfig.h*
- initramfs_data.cpio
-+initramfs_data.cpio.bz2
- initramfs_data.cpio.gz
- initramfs_list
- kallsyms
--kconfig
- keywords.c
- ksym.c*
- ksym.h*
-@@ -133,7 +149,9 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
-+mkregtable
- mktables
- mktree
- modpost
-@@ -149,6 +167,7 @@ patches*
- pca200e.bin
- pca200e_ecd.bin2
- piggy.gz
-+piggy.S
- piggyback
- pnmtologo
- ppc_defs.h*
-@@ -157,12 +176,15 @@ qconf
- raid6altivec*.c
- raid6int*.c
- raid6tables.c
-+regdb.c
- relocs
-+rlim_names.h
- series
- setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -186,14 +208,20 @@ version.h*
- vmlinux
- vmlinux-*
- vmlinux.aout
-+vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
-+voffset.h
- vsyscall.lds
- vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
- zImage*
- zconf.hash.c
-+zoffset.h
-diff -urNp linux-2.6.32.46/Documentation/kernel-parameters.txt linux-2.6.32.46/Documentation/kernel-parameters.txt
---- linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/Documentation/kernel-parameters.txt	2011-04-17 15:56:45.000000000 -0400
-@@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. 
- 			the specified number of seconds.  This is to be used if
- 			your oopses keep scrolling off the screen.
- 
-+	pax_nouderef	[X86] 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-2.6.32.46/drivers/acpi/acpi_pad.c linux-2.6.32.46/drivers/acpi/acpi_pad.c
 --- linux-2.6.32.46/drivers/acpi/acpi_pad.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/acpi/acpi_pad.c	2011-04-17 15:56:46.000000000 -0400
@@ -26935,18 +27154,6 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_qstor.c linux-2.6.32.46/drivers/ata/
  	.inherits		= &ata_sff_port_ops,
  
  	.check_atapi_dma	= qs_check_atapi_dma,
-diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/sata_sil24.c
---- linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
-@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
- 	.dma_boundary		= ATA_DMA_BOUNDARY,
- };
- 
--static struct ata_port_operations sil24_ops = {
-+static const struct ata_port_operations sil24_ops = {
- 	.inherits		= &sata_pmp_port_ops,
- 
- 	.qc_defer		= sil24_qc_defer,
 diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sata_sil.c
 --- linux-2.6.32.46/drivers/ata/sata_sil.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/ata/sata_sil.c	2011-04-17 15:56:46.000000000 -0400
@@ -26959,6 +27166,18 @@ diff -urNp linux-2.6.32.46/drivers/ata/sata_sil.c linux-2.6.32.46/drivers/ata/sa
  	.inherits		= &ata_bmdma32_port_ops,
  	.dev_config		= sil_dev_config,
  	.set_mode		= sil_set_mode,
+diff -urNp linux-2.6.32.46/drivers/ata/sata_sil24.c linux-2.6.32.46/drivers/ata/sata_sil24.c
+--- linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/ata/sata_sil24.c	2011-04-17 15:56:46.000000000 -0400
+@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
+ 	.dma_boundary		= ATA_DMA_BOUNDARY,
+ };
+ 
+-static struct ata_port_operations sil24_ops = {
++static const struct ata_port_operations sil24_ops = {
+ 	.inherits		= &sata_pmp_port_ops,
+ 
+ 	.qc_defer		= sil24_qc_defer,
 diff -urNp linux-2.6.32.46/drivers/ata/sata_sis.c linux-2.6.32.46/drivers/ata/sata_sis.c
 --- linux-2.6.32.46/drivers/ata/sata_sis.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/ata/sata_sis.c	2011-04-17 15:56:46.000000000 -0400
@@ -28146,6 +28365,18 @@ diff -urNp linux-2.6.32.46/drivers/base/sys.c linux-2.6.32.46/drivers/base/sys.c
  	.show	= sysdev_class_show,
  	.store	= sysdev_class_store,
  };
+diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/DAC960.c
+--- linux-2.6.32.46/drivers/block/DAC960.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/block/DAC960.c	2011-05-16 21:46:57.000000000 -0400
+@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur
+   unsigned long flags;
+   int Channel, TargetID;
+ 
++  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-2.6.32.46/drivers/block/cciss.c linux-2.6.32.46/drivers/block/cciss.c
 --- linux-2.6.32.46/drivers/block/cciss.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/block/cciss.c	2011-08-05 20:33:55.000000000 -0400
@@ -28410,18 +28641,6 @@ diff -urNp linux-2.6.32.46/drivers/block/cpqarray.h linux-2.6.32.46/drivers/bloc
  
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
-diff -urNp linux-2.6.32.46/drivers/block/DAC960.c linux-2.6.32.46/drivers/block/DAC960.c
---- linux-2.6.32.46/drivers/block/DAC960.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/block/DAC960.c	2011-05-16 21:46:57.000000000 -0400
-@@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfigur
-   unsigned long flags;
-   int Channel, TargetID;
- 
-+  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-2.6.32.46/drivers/block/loop.c linux-2.6.32.46/drivers/block/loop.c
 --- linux-2.6.32.46/drivers/block/loop.c	2011-06-25 12:55:34.000000000 -0400
 +++ linux-2.6.32.46/drivers/block/loop.c	2011-10-06 09:37:14.000000000 -0400
@@ -28467,6 +28686,27 @@ diff -urNp linux-2.6.32.46/drivers/block/pktcdvd.c linux-2.6.32.46/drivers/block
  	.show = kobj_pkt_show,
  	.store = kobj_pkt_store
  };
+diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kconfig
+--- linux-2.6.32.46/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
+@@ -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
+@@ -1114,6 +1115,7 @@ config DEVPORT
+ 	bool
+ 	depends on !M68K
+ 	depends on ISA || PCI
++	depends on !GRKERNSEC_KMEM
+ 	default y
+ 
+ source "drivers/s390/char/Kconfig"
 diff -urNp linux-2.6.32.46/drivers/char/agp/frontend.c linux-2.6.32.46/drivers/char/agp/frontend.c
 --- linux-2.6.32.46/drivers/char/agp/frontend.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/agp/frontend.c	2011-04-17 15:56:46.000000000 -0400
@@ -28673,6 +28913,42 @@ diff -urNp linux-2.6.32.46/drivers/char/hvc_rtas.c linux-2.6.32.46/drivers/char/
  	.get_chars = hvc_rtas_read_console,
  	.put_chars = hvc_rtas_write_console,
  };
+diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/hvc_udbg.c
+--- linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
+@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
+ 	return i;
+ }
+ 
+-static struct hv_ops hvc_udbg_ops = {
++static const struct hv_ops hvc_udbg_ops = {
+ 	.get_chars = hvc_udbg_get,
+ 	.put_chars = hvc_udbg_put,
+ };
+diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/hvc_vio.c
+--- linux-2.6.32.46/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
+@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
+ 	return got;
+ }
+ 
+-static struct hv_ops hvc_get_put_ops = {
++static const struct hv_ops hvc_get_put_ops = {
+ 	.get_chars = filtered_get_chars,
+ 	.put_chars = hvc_put_chars,
+ 	.notifier_add = notifier_add_irq,
+diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/hvc_xen.c
+--- linux-2.6.32.46/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
+@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
+ 	return recv;
+ }
+ 
+-static struct hv_ops hvc_ops = {
++static const struct hv_ops hvc_ops = {
+ 	.get_chars = read_console,
+ 	.put_chars = write_console,
+ 	.notifier_add = notifier_add_irq,
 diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs.c
 --- linux-2.6.32.46/drivers/char/hvcs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/hvcs.c	2011-04-17 15:56:46.000000000 -0400
@@ -28778,42 +29054,6 @@ diff -urNp linux-2.6.32.46/drivers/char/hvcs.c linux-2.6.32.46/drivers/char/hvcs
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-2.6.32.46/drivers/char/hvc_udbg.c linux-2.6.32.46/drivers/char/hvc_udbg.c
---- linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/char/hvc_udbg.c	2011-04-17 15:56:46.000000000 -0400
-@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
- 	return i;
- }
- 
--static struct hv_ops hvc_udbg_ops = {
-+static const struct hv_ops hvc_udbg_ops = {
- 	.get_chars = hvc_udbg_get,
- 	.put_chars = hvc_udbg_put,
- };
-diff -urNp linux-2.6.32.46/drivers/char/hvc_vio.c linux-2.6.32.46/drivers/char/hvc_vio.c
---- linux-2.6.32.46/drivers/char/hvc_vio.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/char/hvc_vio.c	2011-04-17 15:56:46.000000000 -0400
-@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
- 	return got;
- }
- 
--static struct hv_ops hvc_get_put_ops = {
-+static const struct hv_ops hvc_get_put_ops = {
- 	.get_chars = filtered_get_chars,
- 	.put_chars = hvc_put_chars,
- 	.notifier_add = notifier_add_irq,
-diff -urNp linux-2.6.32.46/drivers/char/hvc_xen.c linux-2.6.32.46/drivers/char/hvc_xen.c
---- linux-2.6.32.46/drivers/char/hvc_xen.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/char/hvc_xen.c	2011-04-17 15:56:46.000000000 -0400
-@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
- 	return recv;
- }
- 
--static struct hv_ops hvc_ops = {
-+static const struct hv_ops hvc_ops = {
- 	.get_chars = read_console,
- 	.put_chars = write_console,
- 	.notifier_add = notifier_add_irq,
 diff -urNp linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c
 --- linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/ipmi/ipmi_msghandler.c	2011-05-16 21:46:57.000000000 -0400
@@ -28926,27 +29166,6 @@ diff -urNp linux-2.6.32.46/drivers/char/istallion.c linux-2.6.32.46/drivers/char
  	if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
  		return -EFAULT;
  	if (stli_dummybrd.brdnr >= STL_MAXBRDS)
-diff -urNp linux-2.6.32.46/drivers/char/Kconfig linux-2.6.32.46/drivers/char/Kconfig
---- linux-2.6.32.46/drivers/char/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/char/Kconfig	2011-04-18 19:20:15.000000000 -0400
-@@ -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
-@@ -1114,6 +1115,7 @@ config DEVPORT
- 	bool
- 	depends on !M68K
- 	depends on ISA || PCI
-+	depends on !GRKERNSEC_KMEM
- 	default y
- 
- source "drivers/s390/char/Kconfig"
 diff -urNp linux-2.6.32.46/drivers/char/keyboard.c linux-2.6.32.46/drivers/char/keyboard.c
 --- linux-2.6.32.46/drivers/char/keyboard.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/keyboard.c	2011-04-17 15:56:46.000000000 -0400
@@ -29369,6 +29588,58 @@ diff -urNp linux-2.6.32.46/drivers/char/stallion.c linux-2.6.32.46/drivers/char/
  	if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
  		return -EFAULT;
  	portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
+diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/tpm/tpm.c
+--- linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-10-17 02:49:00.000000000 -0400
+@@ -374,6 +374,9 @@ static ssize_t tpm_transmit(struct tpm_c
+ 	u32 count, ordinal;
+ 	unsigned long stop;
+ 
++	if (bufsiz > TPM_BUFSIZE)
++		bufsiz = TPM_BUFSIZE;
++
+ 	count = be32_to_cpu(*((__be32 *) (buf + 2)));
+ 	ordinal = be32_to_cpu(*((__be32 *) (buf + 6)));
+ 	if (count == 0)
+@@ -402,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_c
+ 		    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;
+@@ -821,6 +824,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");
+@@ -1041,6 +1046,7 @@ ssize_t tpm_read(struct file *file, char
+ {
+ 	struct tpm_chip *chip = file->private_data;
+ 	ssize_t ret_size;
++	int rc;
+ 
+ 	del_singleshot_timer_sync(&chip->user_read_timer);
+ 	flush_scheduled_work();
+@@ -1051,8 +1057,11 @@ ssize_t tpm_read(struct file *file, char
+ 			ret_size = size;
+ 
+ 		mutex_lock(&chip->buffer_mutex);
+-		if (copy_to_user(buf, chip->data_buffer, ret_size))
++		rc = copy_to_user(buf, chip->data_buffer, ret_size);
++		memset(chip->data_buffer, 0, ret_size);
++		if (rc)
+ 			ret_size = -EFAULT;
++
+ 		mutex_unlock(&chip->buffer_mutex);
+ 	}
+ 
 diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/char/tpm/tpm_bios.c
 --- linux-2.6.32.46/drivers/char/tpm/tpm_bios.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/tpm/tpm_bios.c	2011-10-06 09:37:08.000000000 -0400
@@ -29415,27 +29686,6 @@ diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm_bios.c linux-2.6.32.46/drivers/c
  
  	acpi_os_unmap_memory(virt, len);
  	return 0;
-diff -urNp linux-2.6.32.46/drivers/char/tpm/tpm.c linux-2.6.32.46/drivers/char/tpm/tpm.c
---- linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.46/drivers/char/tpm/tpm.c	2011-05-16 21:46:57.000000000 -0400
-@@ -402,7 +402,7 @@ static ssize_t tpm_transmit(struct tpm_c
- 		    chip->vendor.req_complete_val)
- 			goto out_recv;
- 
--		if ((status == chip->vendor.req_canceled)) {
-+		if (status == chip->vendor.req_canceled) {
- 			dev_err(chip->dev, "Operation Canceled\n");
- 			rc = -ECANCELED;
- 			goto out;
-@@ -821,6 +821,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-2.6.32.46/drivers/char/tty_io.c linux-2.6.32.46/drivers/char/tty_io.c
 --- linux-2.6.32.46/drivers/char/tty_io.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/char/tty_io.c	2011-08-05 20:33:55.000000000 -0400
@@ -29878,17 +30128,6 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core-cdev.c linux-2.6.32.46/drivers/
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firewire/core.h
---- linux-2.6.32.46/drivers/firewire/core.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/firewire/core.h	2011-08-23 20:24:26.000000000 -0400
-@@ -86,6 +86,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-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/drivers/firewire/core-transaction.c
 --- linux-2.6.32.46/drivers/firewire/core-transaction.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/firewire/core-transaction.c	2011-05-16 21:46:57.000000000 -0400
@@ -29909,6 +30148,17 @@ diff -urNp linux-2.6.32.46/drivers/firewire/core-transaction.c linux-2.6.32.46/d
  	init_completion(&d.done);
  	d.payload = payload;
  	fw_send_request(card, &t, tcode, destination_id, generation, speed,
+diff -urNp linux-2.6.32.46/drivers/firewire/core.h linux-2.6.32.46/drivers/firewire/core.h
+--- linux-2.6.32.46/drivers/firewire/core.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/firewire/core.h	2011-08-23 20:24:26.000000000 -0400
+@@ -86,6 +86,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-2.6.32.46/drivers/firmware/dmi_scan.c linux-2.6.32.46/drivers/firmware/dmi_scan.c
 --- linux-2.6.32.46/drivers/firmware/dmi_scan.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/firmware/dmi_scan.c	2011-10-06 09:37:08.000000000 -0400
@@ -30440,30 +30690,6 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i830/i830_irq.c linux-2.6.32.46/drive
  	init_waitqueue_head(&dev_priv->irq_queue);
  }
  
-diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c
---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
-@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7017_ops = {
-+const struct intel_dvo_dev_ops ch7017_ops = {
- 	.init = ch7017_init,
- 	.detect = ch7017_detect,
- 	.mode_valid = ch7017_mode_valid,
-diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c
---- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
-@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
- 	}
- }
- 
--struct intel_dvo_dev_ops ch7xxx_ops = {
-+const struct intel_dvo_dev_ops ch7xxx_ops = {
- 	.init = ch7xxx_init,
- 	.detect = ch7xxx_detect,
- 	.mode_valid = ch7xxx_mode_valid,
 diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h
 --- linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h	2011-04-17 15:56:46.000000000 -0400
@@ -30499,6 +30725,30 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo.h linux-2.6.32.46/drivers/gp
 +extern const struct intel_dvo_dev_ops ch7017_ops;
  
  #endif /* _INTEL_DVO_H */
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7017.c	2011-04-17 15:56:46.000000000 -0400
+@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
+ 	}
+ }
+ 
+-struct intel_dvo_dev_ops ch7017_ops = {
++const struct intel_dvo_dev_ops ch7017_ops = {
+ 	.init = ch7017_init,
+ 	.detect = ch7017_detect,
+ 	.mode_valid = ch7017_mode_valid,
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c
+--- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ch7xxx.c	2011-04-17 15:56:46.000000000 -0400
+@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
+ 	}
+ }
+ 
+-struct intel_dvo_dev_ops ch7xxx_ops = {
++const struct intel_dvo_dev_ops ch7xxx_ops = {
+ 	.init = ch7xxx_init,
+ 	.detect = ch7xxx_detect,
+ 	.mode_valid = ch7xxx_mode_valid,
 diff -urNp linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c
 --- linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/gpu/drm/i915/dvo_ivch.c	2011-04-17 15:56:46.000000000 -0400
@@ -30855,6 +31105,27 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.46/d
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
+diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h
+--- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:33:55.000000000 -0400
+@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device 
+  */
+ struct radeon_fence_driver {
+ 	uint32_t			scratch_reg;
+-	atomic_t			seq;
++	atomic_unchecked_t		seq;
+ 	uint32_t			last_seq;
+ 	unsigned long			count_timeout;
+ 	wait_queue_head_t		queue;
+@@ -640,7 +640,7 @@ struct radeon_asic {
+ 			       uint32_t offset, uint32_t obj_size);
+ 	int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
+ 	void (*bandwidth_update)(struct radeon_device *rdev);
+-};
++} __no_const;
+ 
+ /*
+  * Asic structures
 diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c
 --- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_atombios.c	2011-05-16 21:46:57.000000000 -0400
@@ -30936,27 +31207,6 @@ diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_fence.c linux-2.6.32.46
  	INIT_LIST_HEAD(&rdev->fence_drv.created);
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h
---- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon.h	2011-08-05 20:33:55.000000000 -0400
-@@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device 
-  */
- struct radeon_fence_driver {
- 	uint32_t			scratch_reg;
--	atomic_t			seq;
-+	atomic_unchecked_t		seq;
- 	uint32_t			last_seq;
- 	unsigned long			count_timeout;
- 	wait_queue_head_t		queue;
-@@ -640,7 +640,7 @@ struct radeon_asic {
- 			       uint32_t offset, uint32_t obj_size);
- 	int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
- 	void (*bandwidth_update)(struct radeon_device *rdev);
--};
-+} __no_const;
- 
- /*
-  * Asic structures
 diff -urNp linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c
 --- linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-04-23 13:57:24.000000000 -0400
@@ -31840,6 +32090,55 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.c linux-2.6.32.46/drive
  
  	/* Free the control structures */
  
+diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h
+--- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-05-04 17:56:28.000000000 -0400
+@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
+ extern unsigned int wqm_quanta;
+ extern struct list_head nes_adapter_list;
+ 
+-extern atomic_t cm_connects;
+-extern atomic_t cm_accepts;
+-extern atomic_t cm_disconnects;
+-extern atomic_t cm_closes;
+-extern atomic_t cm_connecteds;
+-extern atomic_t cm_connect_reqs;
+-extern atomic_t cm_rejects;
+-extern atomic_t mod_qp_timouts;
+-extern atomic_t qps_created;
+-extern atomic_t qps_destroyed;
+-extern atomic_t sw_qps_destroyed;
++extern atomic_unchecked_t cm_connects;
++extern atomic_unchecked_t cm_accepts;
++extern atomic_unchecked_t cm_disconnects;
++extern atomic_unchecked_t cm_closes;
++extern atomic_unchecked_t cm_connecteds;
++extern atomic_unchecked_t cm_connect_reqs;
++extern atomic_unchecked_t cm_rejects;
++extern atomic_unchecked_t mod_qp_timouts;
++extern atomic_unchecked_t qps_created;
++extern atomic_unchecked_t qps_destroyed;
++extern atomic_unchecked_t sw_qps_destroyed;
+ extern u32 mh_detected;
+ extern u32 mh_pauses_sent;
+ extern u32 cm_packets_sent;
+@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
+ extern u32 cm_listens_created;
+ extern u32 cm_listens_destroyed;
+ extern u32 cm_backlog_drops;
+-extern atomic_t cm_loopbacks;
+-extern atomic_t cm_nodes_created;
+-extern atomic_t cm_nodes_destroyed;
+-extern atomic_t cm_accel_dropped_pkts;
+-extern atomic_t cm_resets_recvd;
++extern atomic_unchecked_t cm_loopbacks;
++extern atomic_unchecked_t cm_nodes_created;
++extern atomic_unchecked_t cm_nodes_destroyed;
++extern atomic_unchecked_t cm_accel_dropped_pkts;
++extern atomic_unchecked_t cm_resets_recvd;
+ 
+ extern u32 int_mod_timer_init;
+ extern u32 int_mod_cq_depth_256;
 diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c
 --- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c	2011-05-04 17:56:28.000000000 -0400
@@ -32016,55 +32315,6 @@ diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_cm.c linux-2.6.32.46/dr
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h
---- linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes.h	2011-05-04 17:56:28.000000000 -0400
-@@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
- extern unsigned int wqm_quanta;
- extern struct list_head nes_adapter_list;
- 
--extern atomic_t cm_connects;
--extern atomic_t cm_accepts;
--extern atomic_t cm_disconnects;
--extern atomic_t cm_closes;
--extern atomic_t cm_connecteds;
--extern atomic_t cm_connect_reqs;
--extern atomic_t cm_rejects;
--extern atomic_t mod_qp_timouts;
--extern atomic_t qps_created;
--extern atomic_t qps_destroyed;
--extern atomic_t sw_qps_destroyed;
-+extern atomic_unchecked_t cm_connects;
-+extern atomic_unchecked_t cm_accepts;
-+extern atomic_unchecked_t cm_disconnects;
-+extern atomic_unchecked_t cm_closes;
-+extern atomic_unchecked_t cm_connecteds;
-+extern atomic_unchecked_t cm_connect_reqs;
-+extern atomic_unchecked_t cm_rejects;
-+extern atomic_unchecked_t mod_qp_timouts;
-+extern atomic_unchecked_t qps_created;
-+extern atomic_unchecked_t qps_destroyed;
-+extern atomic_unchecked_t sw_qps_destroyed;
- extern u32 mh_detected;
- extern u32 mh_pauses_sent;
- extern u32 cm_packets_sent;
-@@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
- extern u32 cm_listens_created;
- extern u32 cm_listens_destroyed;
- extern u32 cm_backlog_drops;
--extern atomic_t cm_loopbacks;
--extern atomic_t cm_nodes_created;
--extern atomic_t cm_nodes_destroyed;
--extern atomic_t cm_accel_dropped_pkts;
--extern atomic_t cm_resets_recvd;
-+extern atomic_unchecked_t cm_loopbacks;
-+extern atomic_unchecked_t cm_nodes_created;
-+extern atomic_unchecked_t cm_nodes_destroyed;
-+extern atomic_unchecked_t cm_accel_dropped_pkts;
-+extern atomic_unchecked_t cm_resets_recvd;
- 
- extern u32 int_mod_timer_init;
- extern u32 int_mod_cq_depth_256;
 diff -urNp linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c
 --- linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/infiniband/hw/nes/nes_nic.c	2011-05-04 17:56:28.000000000 -0400
@@ -32775,63 +33025,6 @@ diff -urNp linux-2.6.32.46/drivers/macintosh/via-pmu.c linux-2.6.32.46/drivers/m
  	.enter = powerbook_sleep,
  	.valid = pmu_sleep_valid,
  };
-diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c
---- linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:35:29.000000000 -0400
-+++ linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:33:59.000000000 -0400
-@@ -165,9 +165,9 @@ struct mapped_device {
- 	/*
- 	 * Event handling.
- 	 */
--	atomic_t event_nr;
-+	atomic_unchecked_t event_nr;
- 	wait_queue_head_t eventq;
--	atomic_t uevent_seq;
-+	atomic_unchecked_t uevent_seq;
- 	struct list_head uevent_list;
- 	spinlock_t uevent_lock; /* Protect access to uevent_list */
- 
-@@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(i
- 	rwlock_init(&md->map_lock);
- 	atomic_set(&md->holders, 1);
- 	atomic_set(&md->open_count, 0);
--	atomic_set(&md->event_nr, 0);
--	atomic_set(&md->uevent_seq, 0);
-+	atomic_set_unchecked(&md->event_nr, 0);
-+	atomic_set_unchecked(&md->uevent_seq, 0);
- 	INIT_LIST_HEAD(&md->uevent_list);
- 	spin_lock_init(&md->uevent_lock);
- 
-@@ -1927,7 +1927,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);
- }
- 
-@@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_dev
- 
- 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-2.6.32.46/drivers/md/dm-ioctl.c linux-2.6.32.46/drivers/md/dm-ioctl.c
 --- linux-2.6.32.46/drivers/md/dm-ioctl.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/md/dm-ioctl.c	2011-04-17 15:56:46.000000000 -0400
@@ -32984,6 +33177,63 @@ diff -urNp linux-2.6.32.46/drivers/md/dm-table.c linux-2.6.32.46/drivers/md/dm-t
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
+diff -urNp linux-2.6.32.46/drivers/md/dm.c linux-2.6.32.46/drivers/md/dm.c
+--- linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:35:29.000000000 -0400
++++ linux-2.6.32.46/drivers/md/dm.c	2011-08-09 18:33:59.000000000 -0400
+@@ -165,9 +165,9 @@ struct mapped_device {
+ 	/*
+ 	 * Event handling.
+ 	 */
+-	atomic_t event_nr;
++	atomic_unchecked_t event_nr;
+ 	wait_queue_head_t eventq;
+-	atomic_t uevent_seq;
++	atomic_unchecked_t uevent_seq;
+ 	struct list_head uevent_list;
+ 	spinlock_t uevent_lock; /* Protect access to uevent_list */
+ 
+@@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(i
+ 	rwlock_init(&md->map_lock);
+ 	atomic_set(&md->holders, 1);
+ 	atomic_set(&md->open_count, 0);
+-	atomic_set(&md->event_nr, 0);
+-	atomic_set(&md->uevent_seq, 0);
++	atomic_set_unchecked(&md->event_nr, 0);
++	atomic_set_unchecked(&md->uevent_seq, 0);
+ 	INIT_LIST_HEAD(&md->uevent_list);
+ 	spin_lock_init(&md->uevent_lock);
+ 
+@@ -1927,7 +1927,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);
+ }
+ 
+@@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_dev
+ 
+ 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-2.6.32.46/drivers/md/md.c linux-2.6.32.46/drivers/md/md.c
 --- linux-2.6.32.46/drivers/md/md.c	2011-07-13 17:23:04.000000000 -0400
 +++ linux-2.6.32.46/drivers/md/md.c	2011-07-13 17:23:18.000000000 -0400
@@ -33154,27 +33404,6 @@ diff -urNp linux-2.6.32.46/drivers/md/md.h linux-2.6.32.46/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10.c
---- linux-2.6.32.46/drivers/md/raid10.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/md/raid10.c	2011-05-04 17:56:28.000000000 -0400
-@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
- 	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
- 		set_bit(R10BIO_Uptodate, &r10_bio->state);
- 	else {
--		atomic_add(r10_bio->sectors,
-+		atomic_add_unchecked(r10_bio->sectors,
- 			   &conf->mirrors[d].rdev->corrected_errors);
- 		if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
- 			md_error(r10_bio->mddev,
-@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
- 			    test_bit(In_sync, &rdev->flags)) {
- 				atomic_inc(&rdev->nr_pending);
- 				rcu_read_unlock();
--				atomic_add(s, &rdev->corrected_errors);
-+				atomic_add_unchecked(s, &rdev->corrected_errors);
- 				if (sync_page_io(rdev->bdev,
- 						 r10_bio->devs[sl].addr +
- 						 sect + rdev->data_offset,
 diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c
 --- linux-2.6.32.46/drivers/md/raid1.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/md/raid1.c	2011-05-04 17:56:28.000000000 -0400
@@ -33196,6 +33425,27 @@ diff -urNp linux-2.6.32.46/drivers/md/raid1.c linux-2.6.32.46/drivers/md/raid1.c
  					printk(KERN_INFO
  					       "raid1:%s: read error corrected "
  					       "(%d sectors at %llu on %s)\n",
+diff -urNp linux-2.6.32.46/drivers/md/raid10.c linux-2.6.32.46/drivers/md/raid10.c
+--- linux-2.6.32.46/drivers/md/raid10.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/md/raid10.c	2011-05-04 17:56:28.000000000 -0400
+@@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bi
+ 	if (test_bit(BIO_UPTODATE, &bio->bi_flags))
+ 		set_bit(R10BIO_Uptodate, &r10_bio->state);
+ 	else {
+-		atomic_add(r10_bio->sectors,
++		atomic_add_unchecked(r10_bio->sectors,
+ 			   &conf->mirrors[d].rdev->corrected_errors);
+ 		if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
+ 			md_error(r10_bio->mddev,
+@@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf,
+ 			    test_bit(In_sync, &rdev->flags)) {
+ 				atomic_inc(&rdev->nr_pending);
+ 				rcu_read_unlock();
+-				atomic_add(s, &rdev->corrected_errors);
++				atomic_add_unchecked(s, &rdev->corrected_errors);
+ 				if (sync_page_io(rdev->bdev,
+ 						 r10_bio->devs[sl].addr +
+ 						 sect + rdev->data_offset,
 diff -urNp linux-2.6.32.46/drivers/md/raid5.c linux-2.6.32.46/drivers/md/raid5.c
 --- linux-2.6.32.46/drivers/md/raid5.c	2011-06-25 12:55:34.000000000 -0400
 +++ linux-2.6.32.46/drivers/md/raid5.c	2011-06-25 12:58:39.000000000 -0400
@@ -34159,6 +34409,18 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-gru/grutables.h linux-2.6.32.46/driv
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
+diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc/sgi-xp/xp.h
+--- linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-08-05 20:33: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-2.6.32.46/drivers/misc/sgi-xp/xpc.h linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h
 --- linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/misc/sgi-xp/xpc.h	2011-08-05 20:33:55.000000000 -0400
@@ -34229,18 +34491,6 @@ diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xpc_uv.c linux-2.6.32.46/drivers/
  
  	if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
  		dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
-diff -urNp linux-2.6.32.46/drivers/misc/sgi-xp/xp.h linux-2.6.32.46/drivers/misc/sgi-xp/xp.h
---- linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/misc/sgi-xp/xp.h	2011-08-05 20:33: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-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c
 --- linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/mtd/chips/cfi_cmdset_0001.c	2011-05-16 21:46:57.000000000 -0400
@@ -36097,20 +36347,6 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl1000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c
---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-08-05 20:33:55.000000000 -0400
-@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
- 	 */
- 	if (iwl3945_mod_params.disable_hw_scan) {
- 		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
--		iwl3945_hw_ops.hw_scan = NULL;
-+		pax_open_kernel();
-+		*(void **)&iwl3945_hw_ops.hw_scan = NULL;
-+		pax_close_kernel();
- 	}
- 
- 
 diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c
 --- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-3945.c	2011-04-17 15:56:46.000000000 -0400
@@ -36167,20 +36403,6 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
  	.ucode = &iwl5000_ucode,
  	.lib = &iwl6000_lib,
  	.hcmd = &iwl5000_hcmd,
-diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c
---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:33:55.000000000 -0400
-@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev 
- 		if (iwl_debug_level & IWL_DL_INFO)
- 			dev_printk(KERN_DEBUG, &(pdev->dev),
- 				   "Disabling hw_scan\n");
--		iwl_hw_ops.hw_scan = NULL;
-+		pax_open_kernel();
-+		*(void **)&iwl_hw_ops.hw_scan = NULL;
-+		pax_close_kernel();
- 	}
- 
- 	hw = iwl_alloc_all(cfg, &iwl_hw_ops);
 diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
 --- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-05-16 21:46:57.000000000 -0400
@@ -36202,6 +36424,34 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-2.6.3
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-agn.c	2011-08-05 20:33:55.000000000 -0400
+@@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev 
+ 		if (iwl_debug_level & IWL_DL_INFO)
+ 			dev_printk(KERN_DEBUG, &(pdev->dev),
+ 				   "Disabling hw_scan\n");
+-		iwl_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwl_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 	hw = iwl_alloc_all(cfg, &iwl_hw_ops);
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
+@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
+ #endif
+ 
+ #else
+-#define IWL_DEBUG(__priv, level, fmt, args...)
+-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
++#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
++#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
+ static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
+ 				      void *p, u32 len)
+ {}
 diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c
 --- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-05-16 21:46:57.000000000 -0400
@@ -36223,20 +36473,6 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-2.6.
  	for (i = 0; i < AC_NUM; i++) {
  		pos += scnprintf(buf + pos, bufsz - pos,
  			"\tcw_min\tcw_max\taifsn\ttxop\n");
-diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-04-17 15:56:46.000000000 -0400
-@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
- #endif
- 
- #else
--#define IWL_DEBUG(__priv, level, fmt, args...)
--#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
-+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
-+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
- static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
- 				      void *p, u32 len)
- {}
 diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h
 --- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h	2011-04-17 15:56:46.000000000 -0400
@@ -36249,6 +36485,20 @@ diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl-dev.h linux-2.6.32.4
  extern struct iwl_ucode_ops iwl5000_ucode;
  extern struct iwl_lib_ops iwl5000_lib;
  extern struct iwl_hcmd_ops iwl5000_hcmd;
+diff -urNp linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c
+--- linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/net/wireless/iwlwifi/iwl3945-base.c	2011-08-05 20:33:55.000000000 -0400
+@@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_
+ 	 */
+ 	if (iwl3945_mod_params.disable_hw_scan) {
+ 		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
+-		iwl3945_hw_ops.hw_scan = NULL;
++		pax_open_kernel();
++		*(void **)&iwl3945_hw_ops.hw_scan = NULL;
++		pax_close_kernel();
+ 	}
+ 
+ 
 diff -urNp linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c
 --- linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-05-16 21:46:57.000000000 -0400
@@ -36347,18 +36597,6 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprof.c linux-2.6.32.46/drivers/opro
  	start_switch_worker();
  }
  
-diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers/oprofile/oprofilefs.c
---- linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
-@@ -187,7 +187,7 @@ static const struct file_operations atom
- 
- 
- int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
--	char const *name, atomic_t *val)
-+	char const *name, atomic_unchecked_t *val)
- {
- 	struct dentry *d = __oprofilefs_create_file(sb, root, name,
- 						     &atomic_ro_fops, 0444);
 diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.c linux-2.6.32.46/drivers/oprofile/oprofile_stats.c
 --- linux-2.6.32.46/drivers/oprofile/oprofile_stats.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/oprofile/oprofile_stats.c	2011-04-17 15:56:46.000000000 -0400
@@ -36399,6 +36637,18 @@ diff -urNp linux-2.6.32.46/drivers/oprofile/oprofile_stats.h linux-2.6.32.46/dri
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
+diff -urNp linux-2.6.32.46/drivers/oprofile/oprofilefs.c linux-2.6.32.46/drivers/oprofile/oprofilefs.c
+--- linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/oprofile/oprofilefs.c	2011-04-17 15:56:46.000000000 -0400
+@@ -187,7 +187,7 @@ static const struct file_operations atom
+ 
+ 
+ int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
+-	char const *name, atomic_t *val)
++	char const *name, atomic_unchecked_t *val)
+ {
+ 	struct dentry *d = __oprofilefs_create_file(sb, root, name,
+ 						     &atomic_ro_fops, 0444);
 diff -urNp linux-2.6.32.46/drivers/parisc/pdc_stable.c linux-2.6.32.46/drivers/parisc/pdc_stable.c
 --- linux-2.6.32.46/drivers/parisc/pdc_stable.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/parisc/pdc_stable.c	2011-04-17 15:56:46.000000000 -0400
@@ -36649,18 +36899,6 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/acer-wmi.c linux-2.6.32.46/drive
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
-diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/drivers/platform/x86/asus_acpi.c
---- linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
-@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
- 	return 0;
- }
- 
--static struct backlight_ops asus_backlight_data = {
-+static const struct backlight_ops asus_backlight_data = {
- 	.get_brightness = read_brightness,
- 	.update_status  = set_brightness_status,
- };
 diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/drivers/platform/x86/asus-laptop.c
 --- linux-2.6.32.46/drivers/platform/x86/asus-laptop.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/platform/x86/asus-laptop.c	2011-04-17 15:56:46.000000000 -0400
@@ -36673,6 +36911,18 @@ diff -urNp linux-2.6.32.46/drivers/platform/x86/asus-laptop.c linux-2.6.32.46/dr
  	.get_brightness = read_brightness,
  	.update_status = update_bl_status,
  };
+diff -urNp linux-2.6.32.46/drivers/platform/x86/asus_acpi.c linux-2.6.32.46/drivers/platform/x86/asus_acpi.c
+--- linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/platform/x86/asus_acpi.c	2011-04-17 15:56:46.000000000 -0400
+@@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_
+ 	return 0;
+ }
+ 
+-static struct backlight_ops asus_backlight_data = {
++static const struct backlight_ops asus_backlight_data = {
+ 	.get_brightness = read_brightness,
+ 	.update_status  = set_brightness_status,
+ };
 diff -urNp linux-2.6.32.46/drivers/platform/x86/compal-laptop.c linux-2.6.32.46/drivers/platform/x86/compal-laptop.c
 --- linux-2.6.32.46/drivers/platform/x86/compal-laptop.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/platform/x86/compal-laptop.c	2011-04-17 15:56:46.000000000 -0400
@@ -37055,6 +37305,18 @@ diff -urNp linux-2.6.32.46/drivers/s390/cio/qdio_perf.h linux-2.6.32.46/drivers/
  }
  
  int qdio_setup_perf_stats(void);
+diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/BusLogic.c
+--- linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-05-16 21:46:57.000000000 -0400
+@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla
+ 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 -urNp linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h
 --- linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/scsi/aacraid/aacraid.h	2011-08-05 20:33:55.000000000 -0400
@@ -37090,18 +37352,6 @@ diff -urNp linux-2.6.32.46/drivers/scsi/aic94xx/aic94xx_init.c linux-2.6.32.46/d
  	asd_show_update_bios, asd_store_update_bios);
  
  static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
-diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h
---- linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-08-05 20:33:55.000000000 -0400
-@@ -61,7 +61,7 @@ struct bfa_hwif_s {
- 	void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
- 	void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
- 			u32 *nvecs, u32 *maxvec);
--};
-+} __no_const;
- typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
- 
- struct bfa_iocfc_s {
 diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h
 --- linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h	2011-08-05 20:33:55.000000000 -0400
@@ -37114,18 +37364,18 @@ diff -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_ioc.h linux-2.6.32.46/drivers/sc
  
  /**
   * Heartbeat failure notification queue element.
-diff -urNp linux-2.6.32.46/drivers/scsi/BusLogic.c linux-2.6.32.46/drivers/scsi/BusLogic.c
---- linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/scsi/BusLogic.c	2011-05-16 21:46:57.000000000 -0400
-@@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFla
- 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 -urNp linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h
+--- linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/bfa/bfa_iocfc.h	2011-08-05 20:33:55.000000000 -0400
+@@ -61,7 +61,7 @@ struct bfa_hwif_s {
+ 	void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
+ 	void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
+ 			u32 *nvecs, u32 *maxvec);
+-};
++} __no_const;
+ typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
+ 
+ struct bfa_iocfc_s {
 diff -urNp linux-2.6.32.46/drivers/scsi/dpt_i2o.c linux-2.6.32.46/drivers/scsi/dpt_i2o.c
 --- linux-2.6.32.46/drivers/scsi/dpt_i2o.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/scsi/dpt_i2o.c	2011-05-16 21:46:57.000000000 -0400
@@ -37426,6 +37676,38 @@ diff -urNp linux-2.6.32.46/drivers/scsi/libsas/sas_ata.c linux-2.6.32.46/drivers
  	.phy_reset		= sas_ata_phy_reset,
  	.post_internal_cmd	= sas_ata_post_internal,
  	.qc_defer               = ata_std_qc_defer,
+diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h
+--- linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-05-04 17:56:28.000000000 -0400
+@@ -400,7 +400,7 @@ struct lpfc_vport {
+ 	struct dentry *debug_nodelist;
+ 	struct dentry *vport_debugfs_root;
+ 	struct lpfc_debugfs_trc *disc_trc;
+-	atomic_t disc_trc_cnt;
++	atomic_unchecked_t disc_trc_cnt;
+ #endif
+ 	uint8_t stat_data_enabled;
+ 	uint8_t stat_data_blocked;
+@@ -725,8 +725,8 @@ struct lpfc_hba {
+ 	struct timer_list fabric_block_timer;
+ 	unsigned long bit_flags;
+ #define	FABRIC_COMANDS_BLOCKED	0
+-	atomic_t num_rsrc_err;
+-	atomic_t num_cmd_success;
++	atomic_unchecked_t num_rsrc_err;
++	atomic_unchecked_t num_cmd_success;
+ 	unsigned long last_rsrc_error_time;
+ 	unsigned long last_ramp_down_time;
+ 	unsigned long last_ramp_up_time;
+@@ -740,7 +740,7 @@ struct lpfc_hba {
+ 	struct dentry *debug_dumpDif;    /* BlockGuard BPL*/
+ 	struct dentry *debug_slow_ring_trc;
+ 	struct lpfc_debugfs_trc *slow_ring_trc;
+-	atomic_t slow_ring_trc_cnt;
++	atomic_unchecked_t slow_ring_trc_cnt;
+ #endif
+ 
+ 	/* Used for deferred freeing of ELS data buffers */
 diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c
 --- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c	2011-05-16 21:46:57.000000000 -0400
@@ -37517,38 +37799,6 @@ diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.32.46/driv
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h
---- linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc.h	2011-05-04 17:56:28.000000000 -0400
-@@ -400,7 +400,7 @@ struct lpfc_vport {
- 	struct dentry *debug_nodelist;
- 	struct dentry *vport_debugfs_root;
- 	struct lpfc_debugfs_trc *disc_trc;
--	atomic_t disc_trc_cnt;
-+	atomic_unchecked_t disc_trc_cnt;
- #endif
- 	uint8_t stat_data_enabled;
- 	uint8_t stat_data_blocked;
-@@ -725,8 +725,8 @@ struct lpfc_hba {
- 	struct timer_list fabric_block_timer;
- 	unsigned long bit_flags;
- #define	FABRIC_COMANDS_BLOCKED	0
--	atomic_t num_rsrc_err;
--	atomic_t num_cmd_success;
-+	atomic_unchecked_t num_rsrc_err;
-+	atomic_unchecked_t num_cmd_success;
- 	unsigned long last_rsrc_error_time;
- 	unsigned long last_ramp_down_time;
- 	unsigned long last_ramp_up_time;
-@@ -740,7 +740,7 @@ struct lpfc_hba {
- 	struct dentry *debug_dumpDif;    /* BlockGuard BPL*/
- 	struct dentry *debug_slow_ring_trc;
- 	struct lpfc_debugfs_trc *slow_ring_trc;
--	atomic_t slow_ring_trc_cnt;
-+	atomic_unchecked_t slow_ring_trc_cnt;
- #endif
- 
- 	/* Used for deferred freeing of ELS data buffers */
 diff -urNp linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c
 --- linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/scsi/lpfc/lpfc_init.c	2011-08-05 20:33:55.000000000 -0400
@@ -38314,18 +38564,6 @@ diff -urNp linux-2.6.32.46/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.46/
  	.open	= go7007_vm_open,
  	.close	= go7007_vm_close,
  	.fault	= go7007_vm_fault,
-diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c
---- linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
-@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
- /* The one and only one */
- static struct blkvsc_driver_context g_blkvsc_drv;
- 
--static struct block_device_operations block_ops = {
-+static const struct block_device_operations block_ops = {
- 	.owner = THIS_MODULE,
- 	.open = blkvsc_open,
- 	.release = blkvsc_release,
 diff -urNp linux-2.6.32.46/drivers/staging/hv/Channel.c linux-2.6.32.46/drivers/staging/hv/Channel.c
 --- linux-2.6.32.46/drivers/staging/hv/Channel.c	2011-04-17 17:00:52.000000000 -0400
 +++ linux-2.6.32.46/drivers/staging/hv/Channel.c	2011-05-04 17:56:28.000000000 -0400
@@ -38364,6 +38602,30 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusApi.h linux-2.6.32.46/drivers
  
  /* Base driver object */
  struct hv_driver {
+diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h
+--- linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-04-17 17:00:52.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-05-04 17:56:28.000000000 -0400
+@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
+ struct VMBUS_CONNECTION {
+ 	enum VMBUS_CONNECT_STATE ConnectState;
+ 
+-	atomic_t NextGpadlHandle;
++	atomic_unchecked_t NextGpadlHandle;
+ 
+ 	/*
+ 	 * Represents channel interrupts. Each bit position represents a
+diff -urNp linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c
+--- linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/hv/blkvsc_drv.c	2011-04-17 15:56:46.000000000 -0400
+@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
+ /* The one and only one */
+ static struct blkvsc_driver_context g_blkvsc_drv;
+ 
+-static struct block_device_operations block_ops = {
++static const struct block_device_operations block_ops = {
+ 	.owner = THIS_MODULE,
+ 	.open = blkvsc_open,
+ 	.release = blkvsc_release,
 diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c
 --- linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c	2011-05-04 17:56:28.000000000 -0400
@@ -38385,18 +38647,6 @@ diff -urNp linux-2.6.32.46/drivers/staging/hv/vmbus_drv.c linux-2.6.32.46/driver
  
  	/* The new device belongs to this bus */
  	child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
-diff -urNp linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h
---- linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-04-17 17:00:52.000000000 -0400
-+++ linux-2.6.32.46/drivers/staging/hv/VmbusPrivate.h	2011-05-04 17:56:28.000000000 -0400
-@@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
- struct VMBUS_CONNECTION {
- 	enum VMBUS_CONNECT_STATE ConnectState;
- 
--	atomic_t NextGpadlHandle;
-+	atomic_unchecked_t NextGpadlHandle;
- 
- 	/*
- 	 * Represents channel interrupts. Each bit position represents a
 diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/drivers/staging/iio/ring_generic.h
 --- linux-2.6.32.46/drivers/staging/iio/ring_generic.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/staging/iio/ring_generic.h	2011-08-23 20:24:26.000000000 -0400
@@ -38409,25 +38659,6 @@ diff -urNp linux-2.6.32.46/drivers/staging/iio/ring_generic.h linux-2.6.32.46/dr
  
  /**
   * struct iio_ring_buffer - general ring buffer structure
-diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/drivers/staging/octeon/ethernet.c
---- linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-05-04 17:56:28.000000000 -0400
-@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
- 		 * since the RX tasklet also increments it.
- 		 */
- #ifdef CONFIG_64BIT
--		atomic64_add(rx_status.dropped_packets,
--			     (atomic64_t *)&priv->stats.rx_dropped);
-+		atomic64_add_unchecked(rx_status.dropped_packets,
-+			     (atomic64_unchecked_t *)&priv->stats.rx_dropped);
- #else
--		atomic_add(rx_status.dropped_packets,
--			     (atomic_t *)&priv->stats.rx_dropped);
-+		atomic_add_unchecked(rx_status.dropped_packets,
-+			     (atomic_unchecked_t *)&priv->stats.rx_dropped);
- #endif
- 	}
- 
 diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c
 --- linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c	2011-05-04 17:56:28.000000000 -0400
@@ -38459,6 +38690,25 @@ diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet-rx.c linux-2.6.32.46/
  #endif
  				dev_kfree_skb_irq(skb);
  			}
+diff -urNp linux-2.6.32.46/drivers/staging/octeon/ethernet.c linux-2.6.32.46/drivers/staging/octeon/ethernet.c
+--- linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/drivers/staging/octeon/ethernet.c	2011-05-04 17:56:28.000000000 -0400
+@@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_
+ 		 * since the RX tasklet also increments it.
+ 		 */
+ #ifdef CONFIG_64BIT
+-		atomic64_add(rx_status.dropped_packets,
+-			     (atomic64_t *)&priv->stats.rx_dropped);
++		atomic64_add_unchecked(rx_status.dropped_packets,
++			     (atomic64_unchecked_t *)&priv->stats.rx_dropped);
+ #else
+-		atomic_add(rx_status.dropped_packets,
+-			     (atomic_t *)&priv->stats.rx_dropped);
++		atomic_add_unchecked(rx_status.dropped_packets,
++			     (atomic_unchecked_t *)&priv->stats.rx_dropped);
+ #endif
+ 	}
+ 
 diff -urNp linux-2.6.32.46/drivers/staging/panel/panel.c linux-2.6.32.46/drivers/staging/panel/panel.c
 --- linux-2.6.32.46/drivers/staging/panel/panel.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/drivers/staging/panel/panel.c	2011-04-17 15:56:46.000000000 -0400
@@ -42379,6 +42629,18 @@ diff -urNp linux-2.6.32.46/fs/9p/vfs_inode.c linux-2.6.32.46/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
+diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt
+--- linux-2.6.32.46/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/Kconfig.binfmt	2011-04-17 15:56:46.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-2.6.32.46/fs/aio.c linux-2.6.32.46/fs/aio.c
 --- linux-2.6.32.46/fs/aio.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/aio.c	2011-06-04 20:40:21.000000000 -0400
@@ -43362,6 +43624,20 @@ diff -urNp linux-2.6.32.46/fs/btrfs/disk-io.c linux-2.6.32.46/fs/btrfs/disk-io.c
  	.write_cache_pages_lock_hook = btree_lock_page_hook,
  	.readpage_end_io_hook = btree_readpage_end_io_hook,
  	.submit_bio_hook = btree_submit_bio_hook,
+diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/extent-tree.c
+--- linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-06-12 06:39:08.000000000 -0400
+@@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(
+ 				u64 group_start = group->key.objectid;
+ 				new_extents = kmalloc(sizeof(*new_extents),
+ 						      GFP_NOFS);
++				if (!new_extents) {
++					ret = -ENOMEM;
++					goto out;
++				}
+ 				nr_extents = 1;
+ 				ret = get_new_locations(reloc_inode,
+ 							extent_key,
 diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_io.h
 --- linux-2.6.32.46/fs/btrfs/extent_io.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/btrfs/extent_io.h	2011-04-17 15:56:46.000000000 -0400
@@ -43425,20 +43701,6 @@ diff -urNp linux-2.6.32.46/fs/btrfs/extent_io.h linux-2.6.32.46/fs/btrfs/extent_
  };
  
  struct extent_state {
-diff -urNp linux-2.6.32.46/fs/btrfs/extent-tree.c linux-2.6.32.46/fs/btrfs/extent-tree.c
---- linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/btrfs/extent-tree.c	2011-06-12 06:39:08.000000000 -0400
-@@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(
- 				u64 group_start = group->key.objectid;
- 				new_extents = kmalloc(sizeof(*new_extents),
- 						      GFP_NOFS);
-+				if (!new_extents) {
-+					ret = -ENOMEM;
-+					goto out;
-+				}
- 				nr_extents = 1;
- 				ret = get_new_locations(reloc_inode,
- 							extent_key,
 diff -urNp linux-2.6.32.46/fs/btrfs/free-space-cache.c linux-2.6.32.46/fs/btrfs/free-space-cache.c
 --- linux-2.6.32.46/fs/btrfs/free-space-cache.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/btrfs/free-space-cache.c	2011-04-17 15:56:46.000000000 -0400
@@ -43918,6 +44180,19 @@ diff -urNp linux-2.6.32.46/fs/cifs/cifsglob.h linux-2.6.32.46/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
+diff -urNp linux-2.6.32.46/fs/cifs/cifssmb.c linux-2.6.32.46/fs/cifs/cifssmb.c
+--- linux-2.6.32.46/fs/cifs/cifssmb.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/cifs/cifssmb.c	2011-10-17 02:36:33.000000000 -0400
+@@ -3596,7 +3596,8 @@ int CIFSFindNext(const int xid, struct c
+ 	T2_FNEXT_RSP_PARMS *parms;
+ 	char *response_data;
+ 	int rc = 0;
+-	int bytes_returned, name_len;
++	int bytes_returned;
++	unsigned int name_len;
+ 	__u16 params, byte_count;
+ 
+ 	cFYI(1, ("In FindNext"));
 diff -urNp linux-2.6.32.46/fs/cifs/link.c linux-2.6.32.46/fs/cifs/link.c
 --- linux-2.6.32.46/fs/cifs/link.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/cifs/link.c	2011-04-17 15:56:46.000000000 -0400
@@ -43996,22 +44271,6 @@ diff -urNp linux-2.6.32.46/fs/coda/cache.c linux-2.6.32.46/fs/coda/cache.c
  
          return hit;
  }
-diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binfmt_elf.c
---- linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
-@@ -29,10 +29,12 @@
- #undef	elfhdr
- #undef	elf_phdr
- #undef	elf_note
-+#undef	elf_dyn
- #undef	elf_addr_t
- #define elfhdr		elf32_hdr
- #define elf_phdr	elf32_phdr
- #define elf_note	elf32_note
-+#define elf_dyn		Elf32_Dyn
- #define elf_addr_t	Elf32_Addr
- 
- /*
 diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c
 --- linux-2.6.32.46/fs/compat.c	2011-04-17 17:00:52.000000000 -0400
 +++ linux-2.6.32.46/fs/compat.c	2011-10-06 09:37:14.000000000 -0400
@@ -44260,6 +44519,22 @@ diff -urNp linux-2.6.32.46/fs/compat.c linux-2.6.32.46/fs/compat.c
  	set_fs(oldfs);
  
  	if (err)
+diff -urNp linux-2.6.32.46/fs/compat_binfmt_elf.c linux-2.6.32.46/fs/compat_binfmt_elf.c
+--- linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/compat_binfmt_elf.c	2011-04-17 15:56:46.000000000 -0400
+@@ -29,10 +29,12 @@
+ #undef	elfhdr
+ #undef	elf_phdr
+ #undef	elf_note
++#undef	elf_dyn
+ #undef	elf_addr_t
+ #define elfhdr		elf32_hdr
+ #define elf_phdr	elf32_phdr
+ #define elf_note	elf32_note
++#define elf_dyn		Elf32_Dyn
+ #define elf_addr_t	Elf32_Addr
+ 
+ /*
 diff -urNp linux-2.6.32.46/fs/compat_ioctl.c linux-2.6.32.46/fs/compat_ioctl.c
 --- linux-2.6.32.46/fs/compat_ioctl.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/compat_ioctl.c	2011-10-06 09:37:14.000000000 -0400
@@ -45036,6 +45311,20 @@ diff -urNp linux-2.6.32.46/fs/ext4/ext4.h linux-2.6.32.46/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
+diff -urNp linux-2.6.32.46/fs/ext4/file.c linux-2.6.32.46/fs/ext4/file.c
+--- linux-2.6.32.46/fs/ext4/file.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/ext4/file.c	2011-10-17 02:30:06.000000000 -0400
+@@ -122,8 +122,8 @@ static int ext4_file_open(struct inode *
+ 		cp = d_path(&path, buf, sizeof(buf));
+ 		path_put(&path);
+ 		if (!IS_ERR(cp)) {
+-			memcpy(sbi->s_es->s_last_mounted, cp,
+-			       sizeof(sbi->s_es->s_last_mounted));
++			strlcpy(sbi->s_es->s_last_mounted, cp,
++			        sizeof(sbi->s_es->s_last_mounted));
+ 			sb->s_dirt = 1;
+ 		}
+ 	}
 diff -urNp linux-2.6.32.46/fs/ext4/mballoc.c linux-2.6.32.46/fs/ext4/mballoc.c
 --- linux-2.6.32.46/fs/ext4/mballoc.c	2011-06-25 12:55:34.000000000 -0400
 +++ linux-2.6.32.46/fs/ext4/mballoc.c	2011-06-25 12:56:37.000000000 -0400
@@ -45323,6 +45612,88 @@ diff -urNp linux-2.6.32.46/fs/filesystems.c linux-2.6.32.46/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
+diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c
+--- linux-2.6.32.46/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
+@@ -4,6 +4,7 @@
+ #include <linux/path.h>
+ #include <linux/slab.h>
+ #include <linux/fs_struct.h>
++#include <linux/grsecurity.h>
+ 
+ /*
+  * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
+@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s
+ 	old_root = fs->root;
+ 	fs->root = *path;
+ 	path_get(path);
++	gr_set_chroot_entries(current, path);
+ 	write_unlock(&fs->lock);
+ 	if (old_root.dentry)
+ 		path_put(&old_root);
+@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo
+ 			    && fs->root.mnt == old_root->mnt) {
+ 				path_get(new_root);
+ 				fs->root = *new_root;
++				gr_set_chroot_entries(p, new_root);
+ 				count++;
+ 			}
+ 			if (fs->pwd.dentry == old_root->dentry
+@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
+ 		task_lock(tsk);
+ 		write_lock(&fs->lock);
+ 		tsk->fs = NULL;
+-		kill = !--fs->users;
++		gr_clear_chroot_entries(tsk);
++		kill = !atomic_dec_return(&fs->users);
+ 		write_unlock(&fs->lock);
+ 		task_unlock(tsk);
+ 		if (kill)
+@@ -102,7 +106,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;
+ 		rwlock_init(&fs->lock);
+ 		fs->umask = old->umask;
+@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
+ 
+ 	task_lock(current);
+ 	write_lock(&fs->lock);
+-	kill = !--fs->users;
++	kill = !atomic_dec_return(&fs->users);
+ 	current->fs = new_fs;
++	gr_set_chroot_entries(current, &new_fs->root);
+ 	write_unlock(&fs->lock);
+ 	task_unlock(current);
+ 
+@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
+ 
+ /* to be mentioned only in INIT_TASK */
+ struct fs_struct init_fs = {
+-	.users		= 1,
++	.users		= ATOMIC_INIT(1),
+ 	.lock		= __RW_LOCK_UNLOCKED(init_fs.lock),
+ 	.umask		= 0022,
+ };
+@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
+ 		task_lock(current);
+ 
+ 		write_lock(&init_fs.lock);
+-		init_fs.users++;
++		atomic_inc(&init_fs.users);
+ 		write_unlock(&init_fs.lock);
+ 
+ 		write_lock(&fs->lock);
+ 		current->fs = &init_fs;
+-		kill = !--fs->users;
++		gr_set_chroot_entries(current, &current->fs->root);
++		kill = !atomic_dec_return(&fs->users);
+ 		write_unlock(&fs->lock);
+ 
+ 		task_unlock(current);
 diff -urNp linux-2.6.32.46/fs/fscache/cookie.c linux-2.6.32.46/fs/fscache/cookie.c
 --- linux-2.6.32.46/fs/fscache/cookie.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/fscache/cookie.c	2011-05-04 17:56:28.000000000 -0400
@@ -46646,88 +47017,6 @@ diff -urNp linux-2.6.32.46/fs/fscache/stats.c linux-2.6.32.46/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-2.6.32.46/fs/fs_struct.c linux-2.6.32.46/fs/fs_struct.c
---- linux-2.6.32.46/fs/fs_struct.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/fs_struct.c	2011-04-17 15:56:46.000000000 -0400
-@@ -4,6 +4,7 @@
- #include <linux/path.h>
- #include <linux/slab.h>
- #include <linux/fs_struct.h>
-+#include <linux/grsecurity.h>
- 
- /*
-  * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
-@@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, s
- 	old_root = fs->root;
- 	fs->root = *path;
- 	path_get(path);
-+	gr_set_chroot_entries(current, path);
- 	write_unlock(&fs->lock);
- 	if (old_root.dentry)
- 		path_put(&old_root);
-@@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_roo
- 			    && fs->root.mnt == old_root->mnt) {
- 				path_get(new_root);
- 				fs->root = *new_root;
-+				gr_set_chroot_entries(p, new_root);
- 				count++;
- 			}
- 			if (fs->pwd.dentry == old_root->dentry
-@@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
- 		task_lock(tsk);
- 		write_lock(&fs->lock);
- 		tsk->fs = NULL;
--		kill = !--fs->users;
-+		gr_clear_chroot_entries(tsk);
-+		kill = !atomic_dec_return(&fs->users);
- 		write_unlock(&fs->lock);
- 		task_unlock(tsk);
- 		if (kill)
-@@ -102,7 +106,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;
- 		rwlock_init(&fs->lock);
- 		fs->umask = old->umask;
-@@ -127,8 +131,9 @@ int unshare_fs_struct(void)
- 
- 	task_lock(current);
- 	write_lock(&fs->lock);
--	kill = !--fs->users;
-+	kill = !atomic_dec_return(&fs->users);
- 	current->fs = new_fs;
-+	gr_set_chroot_entries(current, &new_fs->root);
- 	write_unlock(&fs->lock);
- 	task_unlock(current);
- 
-@@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
- 
- /* to be mentioned only in INIT_TASK */
- struct fs_struct init_fs = {
--	.users		= 1,
-+	.users		= ATOMIC_INIT(1),
- 	.lock		= __RW_LOCK_UNLOCKED(init_fs.lock),
- 	.umask		= 0022,
- };
-@@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
- 		task_lock(current);
- 
- 		write_lock(&init_fs.lock);
--		init_fs.users++;
-+		atomic_inc(&init_fs.users);
- 		write_unlock(&init_fs.lock);
- 
- 		write_lock(&fs->lock);
- 		current->fs = &init_fs;
--		kill = !--fs->users;
-+		gr_set_chroot_entries(current, &current->fs->root);
-+		kill = !atomic_dec_return(&fs->users);
- 		write_unlock(&fs->lock);
- 
- 		task_unlock(current);
 diff -urNp linux-2.6.32.46/fs/fuse/cuse.c linux-2.6.32.46/fs/fuse/cuse.c
 --- linux-2.6.32.46/fs/fuse/cuse.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/fuse/cuse.c	2011-08-05 20:33:55.000000000 -0400
@@ -47072,18 +47361,6 @@ diff -urNp linux-2.6.32.46/fs/jfs/super.c linux-2.6.32.46/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-2.6.32.46/fs/Kconfig.binfmt linux-2.6.32.46/fs/Kconfig.binfmt
---- linux-2.6.32.46/fs/Kconfig.binfmt	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/Kconfig.binfmt	2011-04-17 15:56:46.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-2.6.32.46/fs/libfs.c linux-2.6.32.46/fs/libfs.c
 --- linux-2.6.32.46/fs/libfs.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/libfs.c	2011-05-11 18:25:15.000000000 -0400
@@ -47237,7 +47514,7 @@ diff -urNp linux-2.6.32.46/fs/mbcache.c linux-2.6.32.46/fs/mbcache.c
  #ifdef MB_CACHE_INDEXES_COUNT
 diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
 --- linux-2.6.32.46/fs/namei.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/namei.c	2011-10-06 03:36:41.000000000 -0400
++++ linux-2.6.32.46/fs/namei.c	2011-10-19 12:12:56.000000000 -0400
 @@ -224,14 +224,6 @@ int generic_permission(struct inode *ino
  		return ret;
  
@@ -47287,7 +47564,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -669,6 +670,18 @@ static inline int do_follow_link(struct 
+@@ -669,6 +670,13 @@ static inline int do_follow_link(struct 
  	err = security_inode_follow_link(path->dentry, nd);
  	if (err)
  		goto loop;
@@ -47298,19 +47575,15 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
 +		goto loop;
 +	}
 +
-+	if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
-+		err = -ENOENT;
-+		goto loop;
-+	}
-+
  	current->link_count++;
  	current->total_link_count++;
  	nd->depth++;
-@@ -1016,11 +1029,18 @@ return_reval:
+@@ -1016,11 +1024,19 @@ return_reval:
  				break;
  		}
  return_base:
-+		if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++		if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT)) &&
++		    !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
 +			path_put(&nd->path);
 +			return -ENOENT;
 +		}
@@ -47325,7 +47598,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	path_put(&nd->path);
  return_err:
  	return err;
-@@ -1091,13 +1111,20 @@ static int do_path_lookup(int dfd, const
+@@ -1091,13 +1107,20 @@ static int do_path_lookup(int dfd, const
  	int retval = path_init(dfd, name, flags, nd);
  	if (!retval)
  		retval = path_walk(name, nd);
@@ -47349,7 +47622,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	return retval;
  }
  
-@@ -1576,6 +1603,20 @@ int may_open(struct path *path, int acc_
+@@ -1576,6 +1599,20 @@ int may_open(struct path *path, int acc_
  	if (error)
  		goto err_out;
  
@@ -47370,11 +47643,11 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	if (flag & O_TRUNC) {
  		error = get_write_access(inode);
  		if (error)
-@@ -1621,12 +1662,19 @@ static int __open_namei_create(struct na
+@@ -1621,12 +1658,19 @@ static int __open_namei_create(struct na
  	int error;
  	struct dentry *dir = nd->path.dentry;
  
-+	if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, nd->path.mnt, flag, mode)) {
++	if (!gr_acl_handle_creat(path->dentry, dir, nd->path.mnt, flag, mode)) {
 +		error = -EACCES;
 +		goto out_unlock;
 +	}
@@ -47390,7 +47663,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  out_unlock:
  	mutex_unlock(&dir->d_inode->i_mutex);
  	dput(nd->path.dentry);
-@@ -1709,6 +1757,22 @@ struct file *do_filp_open(int dfd, const
+@@ -1709,6 +1753,22 @@ struct file *do_filp_open(int dfd, const
  					 &nd, flag);
  		if (error)
  			return ERR_PTR(error);
@@ -47413,11 +47686,16 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  		goto ok;
  	}
  
-@@ -1795,6 +1859,14 @@ do_last:
+@@ -1795,6 +1855,19 @@ do_last:
  	/*
  	 * It already exists.
  	 */
 +
++	if (!gr_acl_handle_hidden_file(path.dentry, path.mnt)) {
++		error = -ENOENT;
++		goto exit_mutex_unlock;
++	}
++
 +	/* only check if O_CREAT is specified, all other checks need
 +	   to go into may_open */
 +	if (gr_handle_fifo(path.dentry, path.mnt, dir, flag, acc_mode)) {
@@ -47428,7 +47706,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	mutex_unlock(&dir->d_inode->i_mutex);
  	audit_inode(pathname, path.dentry);
  
-@@ -1887,6 +1959,13 @@ do_link:
+@@ -1887,6 +1960,13 @@ do_link:
  	error = security_inode_follow_link(path.dentry, &nd);
  	if (error)
  		goto exit_dput;
@@ -47442,7 +47720,18 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = __do_follow_link(&path, &nd);
  	if (error) {
  		/* Does someone understand code flow here? Or it is only
-@@ -2061,6 +2140,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -1984,6 +2064,10 @@ struct dentry *lookup_create(struct name
+ 	}
+ 	return dentry;
+ eexist:
++	if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
++		dput(dentry);
++		return ERR_PTR(-ENOENT);
++	}
+ 	dput(dentry);
+ 	dentry = ERR_PTR(-EEXIST);
+ fail:
+@@ -2061,6 +2145,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	error = may_mknod(mode);
  	if (error)
  		goto out_dput;
@@ -47460,7 +47749,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2081,6 +2171,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2081,6 +2176,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	}
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -47470,7 +47759,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2134,6 +2227,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2134,6 +2232,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -47482,7 +47771,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	if (!IS_POSIXACL(nd.path.dentry->d_inode))
  		mode &= ~current_umask();
  	error = mnt_want_write(nd.path.mnt);
-@@ -2145,6 +2243,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2145,6 +2248,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);
@@ -47493,7 +47782,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2226,6 +2328,8 @@ static long do_rmdir(int dfd, const char
+@@ -2226,6 +2333,8 @@ static long do_rmdir(int dfd, const char
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -47502,7 +47791,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2250,6 +2354,19 @@ static long do_rmdir(int dfd, const char
+@@ -2250,6 +2359,19 @@ static long do_rmdir(int dfd, const char
  	error = PTR_ERR(dentry);
  	if (IS_ERR(dentry))
  		goto exit2;
@@ -47522,7 +47811,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2257,6 +2374,8 @@ static long do_rmdir(int dfd, const char
+@@ -2257,6 +2379,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -47531,7 +47820,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2318,6 +2437,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2318,6 +2442,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -47540,7 +47829,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2337,8 +2458,19 @@ static long do_unlinkat(int dfd, const c
+@@ -2337,8 +2463,19 @@ static long do_unlinkat(int dfd, const c
  		if (nd.last.name[nd.last.len])
  			goto slashes;
  		inode = dentry->d_inode;
@@ -47561,7 +47850,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2346,6 +2478,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2346,6 +2483,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -47570,7 +47859,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2424,6 +2558,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2424,6 +2563,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -47582,7 +47871,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2431,6 +2570,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2431,6 +2575,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -47591,7 +47880,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2524,6 +2665,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2524,6 +2670,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -47612,7 +47901,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2531,6 +2686,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2531,6 +2691,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);
@@ -47621,7 +47910,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2708,6 +2865,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2708,6 +2870,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -47630,7 +47919,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -2764,6 +2923,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2764,6 +2928,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -47643,7 +47932,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -2773,6 +2938,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -2773,6 +2943,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -47653,7 +47942,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -2798,6 +2966,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -2798,6 +2971,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -47662,7 +47951,7 @@ diff -urNp linux-2.6.32.46/fs/namei.c linux-2.6.32.46/fs/namei.c
  	int len;
  
  	len = PTR_ERR(link);
-@@ -2807,7 +2977,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -2807,7 +2982,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -48467,6 +48756,36 @@ diff -urNp linux-2.6.32.46/fs/pipe.c linux-2.6.32.46/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
+diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig
+--- linux-2.6.32.46/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
+@@ -30,12 +30,12 @@ config PROC_FS
+ 
+ config PROC_KCORE
+ 	bool "/proc/kcore support" if !ARM
+-	depends on PROC_FS && MMU
++	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
+ 
+ config PROC_VMCORE
+         bool "/proc/vmcore support (EXPERIMENTAL)"
+-        depends on PROC_FS && CRASH_DUMP
+-	default y
++        depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
++	default n
+         help
+         Exports the dump image of crashed kernel in ELF format.
+ 
+@@ -59,8 +59,8 @@ config PROC_SYSCTL
+ 	  limited in memory.
+ 
+ config PROC_PAGE_MONITOR
+- 	default y
+-	depends on PROC_FS && MMU
++ 	default n
++	depends on PROC_FS && MMU && !GRKERNSEC
+ 	bool "Enable /proc page monitoring" if EMBEDDED
+  	help
+ 	  Various /proc files exist to monitor process memory utilization:
 diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c
 --- linux-2.6.32.46/fs/proc/array.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/proc/array.c	2011-05-16 21:46:57.000000000 -0400
@@ -48595,7 +48914,7 @@ diff -urNp linux-2.6.32.46/fs/proc/array.c linux-2.6.32.46/fs/proc/array.c
 +#endif
 diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
 --- linux-2.6.32.46/fs/proc/base.c	2011-08-09 18:35:30.000000000 -0400
-+++ linux-2.6.32.46/fs/proc/base.c	2011-09-13 14:51:06.000000000 -0400
++++ linux-2.6.32.46/fs/proc/base.c	2011-10-19 04:05:03.000000000 -0400
 @@ -102,6 +102,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -48953,10 +49272,13 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -2746,7 +2871,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -2746,7 +2871,14 @@ struct dentry *proc_pid_lookup(struct in
  	if (!task)
  		goto out;
  
++	if (!has_group_leader_pid(task))
++		goto out_put_task;
++
 +	if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
 +		goto out_put_task;
 +
@@ -48965,7 +49287,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
  	put_task_struct(task);
  out:
  	return result;
-@@ -2811,6 +2940,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -2811,6 +2943,11 @@ int proc_pid_readdir(struct file * filp,
  {
  	unsigned int nr;
  	struct task_struct *reaper;
@@ -48977,7 +49299,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -2834,8 +2968,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -2834,8 +2971,27 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -49006,7 +49328,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -2861,7 +3014,7 @@ static const struct pid_entry tid_base_s
+@@ -2861,7 +3017,7 @@ static const struct pid_entry tid_base_s
  #ifdef CONFIG_SCHED_DEBUG
  	REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
  #endif
@@ -49015,7 +49337,7 @@ diff -urNp linux-2.6.32.46/fs/proc/base.c linux-2.6.32.46/fs/proc/base.c
  	INF("syscall",   S_IRUSR, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -2885,10 +3038,10 @@ static const struct pid_entry tid_base_s
+@@ -2885,10 +3041,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
@@ -49060,8 +49382,42 @@ diff -urNp linux-2.6.32.46/fs/proc/devices.c linux-2.6.32.46/fs/proc/devices.c
  module_init(proc_devices_init);
 diff -urNp linux-2.6.32.46/fs/proc/inode.c linux-2.6.32.46/fs/proc/inode.c
 --- linux-2.6.32.46/fs/proc/inode.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/proc/inode.c	2011-04-17 15:56:46.000000000 -0400
-@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
++++ linux-2.6.32.46/fs/proc/inode.c	2011-10-19 04:08:02.000000000 -0400
+@@ -18,12 +18,19 @@
+ #include <linux/module.h>
+ #include <linux/smp_lock.h>
+ #include <linux/sysctl.h>
++#include <linux/grsecurity.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+ 
++#ifdef CONFIG_PROC_SYSCTL
++extern const struct inode_operations proc_sys_inode_operations;
++extern const struct inode_operations proc_sys_dir_operations;
++#endif
++
++
+ struct proc_dir_entry *de_get(struct proc_dir_entry *de)
+ {
+ 	atomic_inc(&de->count);
+@@ -62,6 +69,13 @@ static void proc_delete_inode(struct ino
+ 		de_put(de);
+ 	if (PROC_I(inode)->sysctl)
+ 		sysctl_head_put(PROC_I(inode)->sysctl);
++
++#ifdef CONFIG_PROC_SYSCTL
++	if (inode->i_op == &proc_sys_inode_operations ||
++	    inode->i_op == &proc_sys_dir_operations)
++		gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
++#endif
++
+ 	clear_inode(inode);
+ }
+ 
+@@ -457,7 +471,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
  			inode->i_uid = de->uid;
@@ -49086,36 +49442,6 @@ diff -urNp linux-2.6.32.46/fs/proc/internal.h linux-2.6.32.46/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-2.6.32.46/fs/proc/Kconfig linux-2.6.32.46/fs/proc/Kconfig
---- linux-2.6.32.46/fs/proc/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/proc/Kconfig	2011-04-17 15:56:46.000000000 -0400
-@@ -30,12 +30,12 @@ config PROC_FS
- 
- config PROC_KCORE
- 	bool "/proc/kcore support" if !ARM
--	depends on PROC_FS && MMU
-+	depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
- 
- config PROC_VMCORE
-         bool "/proc/vmcore support (EXPERIMENTAL)"
--        depends on PROC_FS && CRASH_DUMP
--	default y
-+        depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
-+	default n
-         help
-         Exports the dump image of crashed kernel in ELF format.
- 
-@@ -59,8 +59,8 @@ config PROC_SYSCTL
- 	  limited in memory.
- 
- config PROC_PAGE_MONITOR
-- 	default y
--	depends on PROC_FS && MMU
-+ 	default n
-+	depends on PROC_FS && MMU && !GRKERNSEC
- 	bool "Enable /proc page monitoring" if EMBEDDED
-  	help
- 	  Various /proc files exist to monitor process memory utilization:
 diff -urNp linux-2.6.32.46/fs/proc/kcore.c linux-2.6.32.46/fs/proc/kcore.c
 --- linux-2.6.32.46/fs/proc/kcore.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/proc/kcore.c	2011-05-16 21:46:57.000000000 -0400
@@ -49242,8 +49568,8 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_net.c linux-2.6.32.46/fs/proc/proc_net.c
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
 diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sysctl.c
 --- linux-2.6.32.46/fs/proc/proc_sysctl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/proc/proc_sysctl.c	2011-04-17 15:56:46.000000000 -0400
-@@ -7,6 +7,8 @@
++++ linux-2.6.32.46/fs/proc/proc_sysctl.c	2011-10-19 04:08:51.000000000 -0400
+@@ -7,11 +7,13 @@
  #include <linux/security.h>
  #include "internal.h"
  
@@ -49251,7 +49577,14 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sy
 +
  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;
+-static const struct inode_operations proc_sys_inode_operations;
++const struct inode_operations proc_sys_inode_operations;
+ static const struct file_operations proc_sys_dir_file_operations;
+-static const struct inode_operations proc_sys_dir_operations;
++const struct inode_operations proc_sys_dir_operations;
+ 
+ static struct inode *proc_sys_make_inode(struct super_block *sb,
+ 		struct ctl_table_header *head, struct ctl_table *table)
 @@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(st
  	if (!p)
  		goto out;
@@ -49262,7 +49595,27 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sy
  	err = ERR_PTR(-ENOMEM);
  	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
  	if (h)
-@@ -228,6 +233,9 @@ static int scan(struct ctl_table_header 
+@@ -119,6 +124,9 @@ static struct dentry *proc_sys_lookup(st
+ 
+ 	err = NULL;
+ 	dentry->d_op = &proc_sys_dentry_operations;
++
++	gr_handle_proc_create(dentry, inode);
++
+ 	d_add(dentry, inode);
+ 
+ out:
+@@ -200,6 +208,9 @@ static int proc_sys_fill_cache(struct fi
+ 				return -ENOMEM;
+ 			} else {
+ 				child->d_op = &proc_sys_dentry_operations;
++
++				gr_handle_proc_create(child, inode);
++
+ 				d_add(child, inode);
+ 			}
+ 		} else {
+@@ -228,6 +239,9 @@ static int scan(struct ctl_table_header 
  		if (*pos < file->f_pos)
  			continue;
  
@@ -49272,7 +49625,7 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sy
  		res = proc_sys_fill_cache(file, dirent, filldir, head, table);
  		if (res)
  			return res;
-@@ -344,6 +352,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -344,6 +358,9 @@ static int proc_sys_getattr(struct vfsmo
  	if (IS_ERR(head))
  		return PTR_ERR(head);
  
@@ -49282,6 +49635,22 @@ diff -urNp linux-2.6.32.46/fs/proc/proc_sysctl.c linux-2.6.32.46/fs/proc/proc_sy
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
+@@ -362,13 +379,13 @@ static const struct file_operations proc
+ 	.llseek		= generic_file_llseek,
+ };
+ 
+-static const struct inode_operations proc_sys_inode_operations = {
++const struct inode_operations proc_sys_inode_operations = {
+ 	.permission	= proc_sys_permission,
+ 	.setattr	= proc_sys_setattr,
+ 	.getattr	= proc_sys_getattr,
+ };
+ 
+-static const struct inode_operations proc_sys_dir_operations = {
++const struct inode_operations proc_sys_dir_operations = {
+ 	.lookup		= proc_sys_lookup,
+ 	.permission	= proc_sys_permission,
+ 	.setattr	= proc_sys_setattr,
 diff -urNp linux-2.6.32.46/fs/proc/root.c linux-2.6.32.46/fs/proc/root.c
 --- linux-2.6.32.46/fs/proc/root.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/proc/root.c	2011-04-17 15:56:46.000000000 -0400
@@ -50248,20 +50617,6 @@ diff -urNp linux-2.6.32.46/fs/utimes.c linux-2.6.32.46/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c
---- linux-2.6.32.46/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/xattr_acl.c	2011-04-17 15:56:46.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-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c
 --- linux-2.6.32.46/fs/xattr.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/xattr.c	2011-04-17 15:56:46.000000000 -0400
@@ -50327,17 +50682,20 @@ diff -urNp linux-2.6.32.46/fs/xattr.c linux-2.6.32.46/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
-@@ -75,6 +75,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-2.6.32.46/fs/xattr_acl.c linux-2.6.32.46/fs/xattr_acl.c
+--- linux-2.6.32.46/fs/xattr_acl.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xattr_acl.c	2011-04-17 15:56:46.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-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c
 --- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 17:00:52.000000000 -0400
 +++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c	2011-04-17 20:07:09.000000000 -0400
@@ -50368,6 +50726,17 @@ diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl.c linux-2.6.32.46/fs/xfs/l
  	int			error;
  
  	error = xfs_fs_geometry(mp, &fsgeo, 3);
+diff -urNp linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-04-17 15:56:46.000000000 -0400
+@@ -75,6 +75,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-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c
 --- linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/fs/xfs/linux-2.6/xfs_iops.c	2011-04-17 15:56:46.000000000 -0400
@@ -50412,119 +50781,1091 @@ diff -urNp linux-2.6.32.46/fs/xfs/xfs_dir2_sf.c linux-2.6.32.46/fs/xfs/xfs_dir2_
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/gracl_alloc.c
---- linux-2.6.32.46/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
-@@ -0,0 +1,105 @@
-+#include <linux/kernel.h>
-+#include <linux/mm.h>
-+#include <linux/slab.h>
-+#include <linux/vmalloc.h>
-+#include <linux/gracl.h>
-+#include <linux/grsecurity.h>
+diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig
+--- linux-2.6.32.46/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/Kconfig	2011-09-15 00:00:38.000000000 -0400
+@@ -0,0 +1,1037 @@
++#
++# grecurity configuration
++#
 +
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
++menu "Grsecurity"
 +
-+static __inline__ int
-+alloc_pop(void)
-+{
-+	if (alloc_stack_next == 1)
-+		return 0;
++config GRKERNSEC
++	bool "Grsecurity"
++	select CRYPTO
++	select CRYPTO_SHA256
++	help
++	  If you say Y here, you will be able to configure many features
++	  that will enhance the security of your system.  It is highly
++	  recommended that you say Y here and read through the help
++	  for each option so that you fully understand the features and
++	  can evaluate their usefulness for your machine.
 +
-+	kfree(alloc_stack[alloc_stack_next - 2]);
++choice
++	prompt "Security Level"
++	depends on GRKERNSEC
++	default GRKERNSEC_CUSTOM
 +
-+	alloc_stack_next--;
++config GRKERNSEC_LOW
++	bool "Low"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_CHDIR
 +
-+	return 1;
-+}
++	help
++	  If you choose this option, several of the grsecurity options will
++	  be enabled that will give you greater protection against a number
++	  of attacks, while assuring that none of your software will have any
++	  conflicts with the additional security measures.  If you run a lot
++	  of unusual software, or you are having problems with the higher
++	  security levels, you should say Y here.  With this option, the
++	  following features are enabled:
 +
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+	if (alloc_stack_next >= alloc_stack_size)
-+		return 1;
++	  - Linking restrictions
++	  - FIFO restrictions
++	  - Restricted dmesg
++	  - Enforced chdir("/") on chroot
++	  - Runtime module disabling
 +
-+	alloc_stack[alloc_stack_next - 1] = buf;
++config GRKERNSEC_MEDIUM
++	bool "Medium"
++	select PAX
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_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))
 +
-+	alloc_stack_next++;
++	help
++	  If you say Y here, several features in addition to those included
++	  in the low additional security level will be enabled.  These
++	  features provide even more security to your system, though in rare
++	  cases they may be incompatible with very old or poorly written
++	  software.  If you enable this option, make sure that your auth
++	  service (identd) is running as gid 1001.  With this option, 
++	  the following features (in addition to those provided in the 
++	  low additional security level) will be enabled:
 +
-+	return 0;
-+}
++	  - Failed fork logging
++	  - Time change logging
++	  - Signal logging
++	  - Deny mounts in chroot
++	  - Deny double chrooting
++	  - Deny sysctl writes in chroot
++	  - Deny mknod in chroot
++	  - Deny access to abstract AF_UNIX sockets out of chroot
++	  - Deny pivot_root in chroot
++	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++	  - /proc restrictions with special GID set to 10 (usually wheel)
++	  - Address Space Layout Randomization (ASLR)
++	  - Prevent exploitation of most refcount overflows
++	  - Bounds checking of copying between the kernel and userland
 +
-+void *
-+acl_alloc(unsigned long len)
-+{
-+	void *ret = NULL;
++config GRKERNSEC_HIGH
++	bool "High"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_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 || SPARC || PPC || 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:
 +
-+	if (!len || len > PAGE_SIZE)
-+		goto out;
++	  - Additional /proc restrictions
++	  - Chmod restrictions in chroot
++	  - No signals, ptrace, or viewing of processes outside of chroot
++	  - Capability restrictions in chroot
++	  - Deny fchdir out of chroot
++	  - Priority restrictions in chroot
++	  - Segmentation-based implementation of PaX
++	  - Mprotect restrictions
++	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++	  - Kernel stack randomization
++	  - Mount/unmount/remount logging
++	  - Kernel symbol hiding
++	  - Prevention of memory exhaustion-based exploits
++	  - Hardening of module auto-loading
++	  - Ptrace restrictions
++	  - Restricted vm86 mode
++	  - Restricted sysfs/debugfs
++	  - Active kernel exploit response
 +
-+	ret = kmalloc(len, GFP_KERNEL);
++config GRKERNSEC_CUSTOM
++	bool "Custom"
++	help
++	  If you say Y here, you will be able to configure every grsecurity
++	  option, which allows you to enable many more features that aren't
++	  covered in the basic security levels.  These additional features
++	  include TPE, socket restrictions, and the sysctl system for
++	  grsecurity.  It is advised that you read through the help for
++	  each option to determine its usefulness in your situation.
 +
-+	if (ret) {
-+		if (alloc_push(ret)) {
-+			kfree(ret);
-+			ret = NULL;
-+		}
-+	}
++endchoice
 +
-+out:
-+	return ret;
-+}
++menu "Address Space Protection"
++depends on GRKERNSEC
 +
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+	if (!len || (num > (PAGE_SIZE / len)))
-+		return NULL;
++config GRKERNSEC_KMEM
++	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++	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.
 +
-+	return acl_alloc(num * len);
-+}
++config GRKERNSEC_VM86
++	bool "Restrict VM86 mode"
++	depends on X86_32
 +
-+void
-+acl_free_all(void)
-+{
-+	if (gr_acl_is_enabled() || !alloc_stack)
-+		return;
++	help
++	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++	  make use of a special execution mode on 32bit x86 processors called
++	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
++	  video cards and will still work with this option enabled.  The purpose
++	  of the option is to prevent exploitation of emulation errors in
++	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
++	  Nearly all users should be able to enable this option.
 +
-+	while (alloc_pop()) ;
++config GRKERNSEC_IO
++	bool "Disable privileged I/O"
++	depends on X86
++	select RTC_CLASS
++	select RTC_INTF_DEV
++	select RTC_DRV_CMOS
 +
-+	if (alloc_stack) {
-+		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+			kfree(alloc_stack);
-+		else
-+			vfree(alloc_stack);
-+	}
++	help
++	  If you say Y here, all ioperm and iopl calls will return an error.
++	  Ioperm and iopl can be used to modify the running kernel.
++	  Unfortunately, some programs need this access to operate properly,
++	  the most notable of which are XFree86 and hwclock.  hwclock can be
++	  remedied by having RTC support in the kernel, so real-time 
++	  clock support is enabled if this option is enabled, to ensure 
++	  that hwclock operates correctly.  XFree86 still will not 
++	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
++	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
++	  protect your kernel against modification, use the RBAC system.
 +
-+	alloc_stack = NULL;
-+	alloc_stack_size = 1;
-+	alloc_stack_next = 1;
++config GRKERNSEC_PROC_MEMMAP
++	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++	default y if (PAX_NOEXEC || PAX_ASLR)
++	depends on PAX_NOEXEC || PAX_ASLR
++	help
++	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++	  give no information about the addresses of its mappings if
++	  PaX features that rely on random addresses are enabled on the task.
++	  If you use PaX it is greatly recommended that you say Y here as it
++	  closes up a hole that makes the full ASLR useless for suid
++	  binaries.
 +
-+	return;
-+}
++config GRKERNSEC_BRUTE
++	bool "Deter exploit bruteforcing"
++	help
++	  If you say Y here, attempts to bruteforce exploits against forking
++	  daemons such as apache or sshd, 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.
 +
-+int
-+acl_alloc_stack_init(unsigned long size)
-+{
-+	if ((size * sizeof (void *)) <= PAGE_SIZE)
-+		alloc_stack =
-+		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
-+	else
-+		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++config GRKERNSEC_MODHARDEN
++	bool "Harden module auto-loading"
++	depends on MODULES
++	help
++	  If you say Y here, module auto-loading in response to use of some
++	  feature implemented by an unloaded module will be restricted to
++	  root users.  Enabling this option helps defend against attacks 
++	  by unprivileged users who abuse the auto-loading behavior to 
++	  cause a vulnerable module to load that is then exploited.
 +
-+	alloc_stack_size = size;
++	  If this option prevents a legitimate use of auto-loading for a 
++	  non-root user, the administrator can execute modprobe manually 
++	  with the exact name of the module mentioned in the alert log.
++	  Alternatively, the administrator can add the module to the list
++	  of modules loaded at boot by modifying init scripts.
 +
-+	if (!alloc_stack)
-+		return 0;
-+	else
-+		return 1;
-+}
++	  Modification of init scripts will most likely be needed on 
++	  Ubuntu servers with encrypted home directory support enabled,
++	  as the first non-root user logging in will cause the ecb(aes),
++	  ecb(aes)-all, cbc(aes), and cbc(aes)-all  modules to be loaded.
++
++config GRKERNSEC_HIDESYM
++	bool "Hide kernel symbols"
++	help
++	  If you say Y here, getting information on loaded modules, and
++	  displaying all kernel symbols through a syscall will be restricted
++	  to users with CAP_SYS_MODULE.  For software compatibility reasons,
++	  /proc/kallsyms will be restricted to the root user.  The RBAC
++	  system can hide that entry even from root.
++
++	  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 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_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 6
++	help
++	  This option allows you to choose the maximum number of messages allowed
++	  within the flood time interval you chose in a separate option.  The
++	  default should be suitable for most people, however if you find that
++	  many of your logs are being interpreted as flooding, you may want to
++	  raise this value.
++
++endmenu
++
++endmenu
+diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefile
+--- linux-2.6.32.46/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/Makefile	2011-10-17 06:48:36.000000000 -0400
+@@ -0,0 +1,36 @@
++# 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 500 /lib64/modules
++	@-chmod -f 500 /lib32/modules
++	@-chmod -f 700 .
++	@echo '  grsec: protected kernel image paths'
++endif
 diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 --- linux-2.6.32.46/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/grsecurity/gracl.c	2011-07-14 20:02:48.000000000 -0400
-@@ -0,0 +1,4082 @@
++++ linux-2.6.32.46/grsecurity/gracl.c	2011-10-17 07:04:31.000000000 -0400
+@@ -0,0 +1,4140 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -50698,6 +52039,16 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +	return !memcmp(a, b, lena);
 +}
 +
++static int prepend(char **buffer, int *buflen, const char *str, int namelen)
++{
++	*buflen -= namelen;
++	if (*buflen < 0)
++		return -ENAMETOOLONG;
++	*buffer -= namelen;
++	memcpy(*buffer, str, namelen);
++	return 0;
++}
++
 +/* this must be called with vfsmount_lock and dcache_lock held */
 +
 +static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
@@ -50826,6 +52177,27 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +	return ret;
 +}
 +
++static char *
++gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++	char *ret;
++	char *buf;
++	int buflen;
++
++	spin_lock(&dcache_lock);
++	spin_lock(&vfsmount_lock);
++	buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
++	ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
++	buflen = (int)(ret - buf);
++	if (buflen >= 5)
++		prepend(&ret, &buflen, "/proc", 5);
++	else
++		ret = strcpy(buf, "<path too long>");
++	spin_unlock(&vfsmount_lock);
++	spin_unlock(&dcache_lock);
++	return ret;
++}
++
 +char *
 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -52527,63 +53899,6 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +}
 +
 +__u32
-+gr_check_link(const struct dentry * new_dentry,
-+	      const struct dentry * parent_dentry,
-+	      const struct vfsmount * parent_mnt,
-+	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
-+{
-+	struct acl_object_label *obj;
-+	__u32 oldmode, newmode;
-+	__u32 needmode;
-+
-+	if (unlikely(!(gr_status & GR_READY)))
-+		return (GR_CREATE | GR_LINK);
-+
-+	obj = chk_obj_label(old_dentry, old_mnt, current->acl);
-+	oldmode = obj->mode;
-+
-+	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
-+		oldmode |= (GR_CREATE | GR_LINK);
-+
-+	needmode = GR_CREATE | GR_AUDIT_CREATE | GR_SUPPRESS;
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+		needmode |= GR_SETID | GR_AUDIT_SETID;
-+
-+	newmode =
-+	    gr_check_create(new_dentry, parent_dentry, parent_mnt,
-+			    oldmode | needmode);
-+
-+	needmode = newmode & (GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC |
-+			      GR_SETID | GR_READ | GR_FIND | GR_DELETE |
-+			      GR_INHERIT | GR_AUDIT_INHERIT);
-+
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID) && !(newmode & GR_SETID))
-+		goto bad;
-+
-+	if ((oldmode & needmode) != needmode)
-+		goto bad;
-+
-+	needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
-+	if ((newmode & needmode) != needmode)
-+		goto bad;
-+
-+	if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
-+		return newmode;
-+bad:
-+	needmode = oldmode;
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+		needmode |= GR_SETID;
-+	
-+	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+		gr_log_learn(old_dentry, old_mnt, needmode);
-+		return (GR_CREATE | GR_LINK);
-+	} else if (newmode & GR_SUPPRESS)
-+		return GR_SUPPRESS;
-+	else
-+		return 0;
-+}
-+
-+__u32
 +gr_search_file(const struct dentry * dentry, const __u32 mode,
 +	       const struct vfsmount * mnt)
 +{
@@ -52638,70 +53953,124 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +	return retval;
 +}
 +
-+__u32
-+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
-+		const struct vfsmount * mnt, const __u32 mode)
++struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
++					      const struct dentry *parent,
++					      const struct vfsmount *mnt)
 +{
 +	struct name_entry *match;
 +	struct acl_object_label *matchpo;
 +	struct acl_subject_label *curracl;
 +	char *path;
-+	__u32 retval;
 +
 +	if (unlikely(!(gr_status & GR_READY)))
-+		return (mode & ~GR_AUDITS);
++		return NULL;
 +
 +	preempt_disable();
 +	path = gr_to_filename_rbac(new_dentry, mnt);
 +	match = lookup_name_entry_create(path);
 +
-+	if (!match)
-+		goto check_parent;
-+
 +	curracl = current->acl;
 +
-+	read_lock(&gr_inode_lock);
-+	matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
-+	read_unlock(&gr_inode_lock);
-+
-+	if (matchpo) {
-+		if ((matchpo->mode & mode) !=
-+		    (mode & ~(GR_AUDITS | GR_SUPPRESS))
-+		    && curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+			__u32 new_mode = mode;
-+
-+			new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
-+
-+			gr_log_learn(new_dentry, mnt, new_mode);
++	if (match) {
++		read_lock(&gr_inode_lock);
++		matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
++		read_unlock(&gr_inode_lock);
 +
++		if (matchpo) {
 +			preempt_enable();
-+			return new_mode;
++			return matchpo;
 +		}
-+		preempt_enable();
-+		return (matchpo->mode & mode);
 +	}
 +
-+      check_parent:
-+	curracl = current->acl;
++	// lookup parent
 +
 +	matchpo = chk_obj_create_label(parent, mnt, curracl, path);
++
++	preempt_enable();
++	return matchpo;
++}
++
++__u32
++gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
++		const struct vfsmount * mnt, const __u32 mode)
++{
++	struct acl_object_label *matchpo;
++	__u32 retval;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return (mode & ~GR_AUDITS);
++
++	matchpo = gr_get_create_object(new_dentry, parent, mnt);
++
 +	retval = matchpo->mode & mode;
 +
 +	if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
-+	    && (curracl->mode & (GR_LEARN | GR_INHERITLEARN))) {
++	    && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
 +		__u32 new_mode = mode;
 +
 +		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 +
 +		gr_log_learn(new_dentry, mnt, new_mode);
-+		preempt_enable();
 +		return new_mode;
 +	}
 +
-+	preempt_enable();
 +	return retval;
 +}
 +
++__u32
++gr_check_link(const struct dentry * new_dentry,
++	      const struct dentry * parent_dentry,
++	      const struct vfsmount * parent_mnt,
++	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
++{
++	struct acl_object_label *obj;
++	__u32 oldmode, newmode;
++	__u32 needmode;
++	__u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
++			   GR_DELETE | GR_INHERIT;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return (GR_CREATE | GR_LINK);
++
++	obj = chk_obj_label(old_dentry, old_mnt, current->acl);
++	oldmode = obj->mode;
++
++	obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
++	newmode = obj->mode;
++
++	needmode = newmode & checkmodes;
++
++	// old name for hardlink must have at least the permissions of the new name
++	if ((oldmode & needmode) != needmode)
++		goto bad;
++
++	// if old name had restrictions/auditing, make sure the new name does as well
++	needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
++
++	// don't allow hardlinking of suid/sgid files without permission
++	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++		needmode |= GR_SETID;
++
++	if ((newmode & needmode) != needmode)
++		goto bad;
++
++	// enforce minimum permissions
++	if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
++		return newmode;
++bad:
++	needmode = oldmode;
++	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++		needmode |= GR_SETID;
++	
++	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
++		gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
++		return (GR_CREATE | GR_LINK);
++	} else if (newmode & GR_SUPPRESS)
++		return GR_SUPPRESS;
++	else
++		return 0;
++}
++
 +int
 +gr_check_hidden_task(const struct task_struct *task)
 +{
@@ -53229,14 +54598,11 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +}
 +
 +static void
-+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
-+		 const struct vfsmount *mnt)
++__do_handle_create(const struct name_entry *matchn, ino_t inode, dev_t dev)
 +{
 +	struct acl_subject_label *subj;
 +	struct acl_role_label *role;
 +	unsigned int x;
-+	ino_t inode = dentry->d_inode->i_ino;
-+	dev_t dev = __get_dev(dentry);
 +	
 +	FOR_EACH_ROLE_START(role)
 +		update_acl_subj_label(matchn->inode, matchn->device,
@@ -53259,6 +54625,18 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +	return;
 +}
 +
++static void
++do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
++		 const struct vfsmount *mnt)
++{
++	ino_t ino = dentry->d_inode->i_ino;
++	dev_t dev = __get_dev(dentry);
++
++	__do_handle_create(matchn, ino, dev);	
++
++	return;
++}
++
 +void
 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -53281,6 +54659,27 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +}
 +
 +void
++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
++{
++	struct name_entry *matchn;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return;
++
++	preempt_disable();
++	matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
++
++	if (unlikely((unsigned long)matchn)) {
++		write_lock(&gr_inode_lock);
++		__do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
++		write_unlock(&gr_inode_lock);
++	}
++	preempt_enable();
++
++	return;
++}
++
++void
 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
 +		 struct dentry *old_dentry,
 +		 struct dentry *new_dentry,
@@ -54607,6 +56006,115 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl.c linux-2.6.32.46/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
+diff -urNp linux-2.6.32.46/grsecurity/gracl_alloc.c linux-2.6.32.46/grsecurity/gracl_alloc.c
+--- linux-2.6.32.46/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/grsecurity/gracl_alloc.c	2011-04-17 15:56:46.000000000 -0400
+@@ -0,0 +1,105 @@
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/gracl.h>
++#include <linux/grsecurity.h>
++
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
++
++static __inline__ int
++alloc_pop(void)
++{
++	if (alloc_stack_next == 1)
++		return 0;
++
++	kfree(alloc_stack[alloc_stack_next - 2]);
++
++	alloc_stack_next--;
++
++	return 1;
++}
++
++static __inline__ int
++alloc_push(void *buf)
++{
++	if (alloc_stack_next >= alloc_stack_size)
++		return 1;
++
++	alloc_stack[alloc_stack_next - 1] = buf;
++
++	alloc_stack_next++;
++
++	return 0;
++}
++
++void *
++acl_alloc(unsigned long len)
++{
++	void *ret = NULL;
++
++	if (!len || len > PAGE_SIZE)
++		goto out;
++
++	ret = kmalloc(len, GFP_KERNEL);
++
++	if (ret) {
++		if (alloc_push(ret)) {
++			kfree(ret);
++			ret = NULL;
++		}
++	}
++
++out:
++	return ret;
++}
++
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++	if (!len || (num > (PAGE_SIZE / len)))
++		return NULL;
++
++	return acl_alloc(num * len);
++}
++
++void
++acl_free_all(void)
++{
++	if (gr_acl_is_enabled() || !alloc_stack)
++		return;
++
++	while (alloc_pop()) ;
++
++	if (alloc_stack) {
++		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++			kfree(alloc_stack);
++		else
++			vfree(alloc_stack);
++	}
++
++	alloc_stack = NULL;
++	alloc_stack_size = 1;
++	alloc_stack_next = 1;
++
++	return;
++}
++
++int
++acl_alloc_stack_init(unsigned long size)
++{
++	if ((size * sizeof (void *)) <= PAGE_SIZE)
++		alloc_stack =
++		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++	else
++		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++
++	alloc_stack_size = size;
++
++	if (!alloc_stack)
++		return 0;
++	else
++		return 1;
++}
 diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gracl_cap.c
 --- linux-2.6.32.46/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.32.46/grsecurity/gracl_cap.c	2011-09-14 08:53:50.000000000 -0400
@@ -54714,7 +56222,7 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_cap.c linux-2.6.32.46/grsecurity/gra
 +
 diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/gracl_fs.c
 --- linux-2.6.32.46/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/grsecurity/gracl_fs.c	2011-04-17 15:56:46.000000000 -0400
++++ linux-2.6.32.46/grsecurity/gracl_fs.c	2011-10-17 02:16:34.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54963,7 +56471,7 @@ diff -urNp linux-2.6.32.46/grsecurity/gracl_fs.c linux-2.6.32.46/grsecurity/grac
 +			   GR_UNIXCONNECT_ACL_MSG);
 +}
 +
-+/* hardlinks require at minimum create permission,
++/* hardlinks require at minimum create and link permission,
 +   any additional privilege required is based on the
 +   privilege of the file being linked to
 +*/
@@ -59161,1086 +60669,6 @@ diff -urNp linux-2.6.32.46/grsecurity/grsum.c linux-2.6.32.46/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-2.6.32.46/grsecurity/Kconfig linux-2.6.32.46/grsecurity/Kconfig
---- linux-2.6.32.46/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/grsecurity/Kconfig	2011-09-15 00:00:38.000000000 -0400
-@@ -0,0 +1,1037 @@
-+#
-+# 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_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
-+	  - 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_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_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 || SPARC || PPC || 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 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_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 6
-+	help
-+	  This option allows you to choose the maximum number of messages allowed
-+	  within the flood time interval you chose in a separate option.  The
-+	  default should be suitable for most people, however if you find that
-+	  many of your logs are being interpreted as flooding, you may want to
-+	  raise this value.
-+
-+endmenu
-+
-+endmenu
-diff -urNp linux-2.6.32.46/grsecurity/Makefile linux-2.6.32.46/grsecurity/Makefile
---- linux-2.6.32.46/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/grsecurity/Makefile	2011-09-14 23:29:39.000000000 -0400
-@@ -0,0 +1,35 @@
-+# 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 500 /lib64/modules
-+	@-chmod -f 700 .
-+	@echo '  grsec: protected kernel image paths'
-+endif
 diff -urNp linux-2.6.32.46/include/acpi/acpi_bus.h linux-2.6.32.46/include/acpi/acpi_bus.h
 --- linux-2.6.32.46/include/acpi/acpi_bus.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/acpi/acpi_bus.h	2011-08-05 20:33:55.000000000 -0400
@@ -60765,24 +61193,6 @@ diff -urNp linux-2.6.32.46/include/asm-generic/kmap_types.h linux-2.6.32.46/incl
  };
  
  #undef KMAP_D
-diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include/asm-generic/pgtable.h
---- linux-2.6.32.46/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
-@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
- 				unsigned long size);
- #endif
- 
-+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
-+static inline unsigned long pax_open_kernel(void) { return 0; }
-+#endif
-+
-+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
-+static inline unsigned long pax_close_kernel(void) { return 0; }
-+#endif
-+
- #endif /* !__ASSEMBLY__ */
- 
- #endif /* _ASM_GENERIC_PGTABLE_H */
 diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h
 --- linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/asm-generic/pgtable-nopmd.h	2011-04-17 15:56:46.000000000 -0400
@@ -60855,6 +61265,24 @@ diff -urNp linux-2.6.32.46/include/asm-generic/pgtable-nopud.h linux-2.6.32.46/i
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
+diff -urNp linux-2.6.32.46/include/asm-generic/pgtable.h linux-2.6.32.46/include/asm-generic/pgtable.h
+--- linux-2.6.32.46/include/asm-generic/pgtable.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/asm-generic/pgtable.h	2011-04-17 15:56:46.000000000 -0400
+@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
+ 				unsigned long size);
+ #endif
+ 
++#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
++static inline unsigned long pax_open_kernel(void) { return 0; }
++#endif
++
++#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
++static inline unsigned long pax_close_kernel(void) { return 0; }
++#endif
++
+ #endif /* !__ASSEMBLY__ */
+ 
+ #endif /* _ASM_GENERIC_PGTABLE_H */
 diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/include/asm-generic/vmlinux.lds.h
 --- linux-2.6.32.46/include/asm-generic/vmlinux.lds.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/asm-generic/vmlinux.lds.h	2011-04-17 15:56:46.000000000 -0400
@@ -60896,27 +61324,6 @@ diff -urNp linux-2.6.32.46/include/asm-generic/vmlinux.lds.h linux-2.6.32.46/inc
  
  /**
   * PERCPU - define output section for percpu area, simple version
-diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include/drm/drm_crtc_helper.h
---- linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-08-05 20:33:55.000000000 -0400
-@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
- 
- 	/* reload the current crtc LUT */
- 	void (*load_lut)(struct drm_crtc *crtc);
--};
-+} __no_const;
- 
- struct drm_encoder_helper_funcs {
- 	void (*dpms)(struct drm_encoder *encoder, int mode);
-@@ -85,7 +85,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-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h
 --- linux-2.6.32.46/include/drm/drmP.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/drm/drmP.h	2011-04-17 15:56:46.000000000 -0400
@@ -60979,6 +61386,27 @@ diff -urNp linux-2.6.32.46/include/drm/drmP.h linux-2.6.32.46/include/drm/drmP.h
  	uint32_t gtt_total;
  	uint32_t invalidate_domains;    /* domains pending invalidation */
  	uint32_t flush_domains;         /* domains pending flush */
+diff -urNp linux-2.6.32.46/include/drm/drm_crtc_helper.h linux-2.6.32.46/include/drm/drm_crtc_helper.h
+--- linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/drm/drm_crtc_helper.h	2011-08-05 20:33:55.000000000 -0400
+@@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
+ 
+ 	/* reload the current crtc LUT */
+ 	void (*load_lut)(struct drm_crtc *crtc);
+-};
++} __no_const;
+ 
+ struct drm_encoder_helper_funcs {
+ 	void (*dpms)(struct drm_encoder *encoder, int mode);
+@@ -85,7 +85,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-2.6.32.46/include/drm/ttm/ttm_memory.h linux-2.6.32.46/include/drm/ttm/ttm_memory.h
 --- linux-2.6.32.46/include/drm/ttm/ttm_memory.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/drm/ttm/ttm_memory.h	2011-08-05 20:33:55.000000000 -0400
@@ -61521,27 +61949,6 @@ diff -urNp linux-2.6.32.46/include/linux/elf.h linux-2.6.32.46/include/linux/elf
  
  #endif
  
-diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include/linux/fscache-cache.h
---- linux-2.6.32.46/include/linux/fscache-cache.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/include/linux/fscache-cache.h	2011-05-04 17:56:28.000000000 -0400
-@@ -116,7 +116,7 @@ struct fscache_operation {
- #endif
- };
- 
--extern atomic_t fscache_op_debug_id;
-+extern atomic_unchecked_t fscache_op_debug_id;
- extern const struct slow_work_ops fscache_op_slow_work_ops;
- 
- extern void fscache_enqueue_operation(struct fscache_operation *);
-@@ -134,7 +134,7 @@ static inline void fscache_operation_ini
- 					  fscache_operation_release_t release)
- {
- 	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->release = release;
- 	INIT_LIST_HEAD(&op->pend_link);
- 	fscache_set_op_state(op, "Init");
 diff -urNp linux-2.6.32.46/include/linux/fs.h linux-2.6.32.46/include/linux/fs.h
 --- linux-2.6.32.46/include/linux/fs.h	2011-07-13 17:23:04.000000000 -0400
 +++ linux-2.6.32.46/include/linux/fs.h	2011-08-26 20:19:09.000000000 -0400
@@ -61728,6 +62135,27 @@ diff -urNp linux-2.6.32.46/include/linux/fs_struct.h linux-2.6.32.46/include/lin
  	rwlock_t lock;
  	int umask;
  	int in_exec;
+diff -urNp linux-2.6.32.46/include/linux/fscache-cache.h linux-2.6.32.46/include/linux/fscache-cache.h
+--- linux-2.6.32.46/include/linux/fscache-cache.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/fscache-cache.h	2011-05-04 17:56:28.000000000 -0400
+@@ -116,7 +116,7 @@ struct fscache_operation {
+ #endif
+ };
+ 
+-extern atomic_t fscache_op_debug_id;
++extern atomic_unchecked_t fscache_op_debug_id;
+ extern const struct slow_work_ops fscache_op_slow_work_ops;
+ 
+ extern void fscache_enqueue_operation(struct fscache_operation *);
+@@ -134,7 +134,7 @@ static inline void fscache_operation_ini
+ 					  fscache_operation_release_t release)
+ {
+ 	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->release = release;
+ 	INIT_LIST_HEAD(&op->pend_link);
+ 	fscache_set_op_state(op, "Init");
 diff -urNp linux-2.6.32.46/include/linux/ftrace_event.h linux-2.6.32.46/include/linux/ftrace_event.h
 --- linux-2.6.32.46/include/linux/ftrace_event.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/linux/ftrace_event.h	2011-05-04 17:56:28.000000000 -0400
@@ -62565,8 +62993,8 @@ diff -urNp linux-2.6.32.46/include/linux/grmsg.h linux-2.6.32.46/include/linux/g
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
 diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/linux/grsecurity.h
 --- linux-2.6.32.46/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/include/linux/grsecurity.h	2011-09-13 16:03:42.000000000 -0400
-@@ -0,0 +1,216 @@
++++ linux-2.6.32.46/include/linux/grsecurity.h	2011-10-17 06:48:36.000000000 -0400
+@@ -0,0 +1,218 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -62721,6 +63149,8 @@ diff -urNp linux-2.6.32.46/include/linux/grsecurity.h linux-2.6.32.46/include/li
 +				 const int imode);
 +void gr_handle_create(const struct dentry *dentry,
 +			     const struct vfsmount *mnt);
++void gr_handle_proc_create(const struct dentry *dentry,
++			   const struct inode *inode);
 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
 +				 const struct dentry *parent_dentry,
 +				 const struct vfsmount *parent_mnt,
@@ -64230,24 +64660,6 @@ diff -urNp linux-2.6.32.46/include/linux/skbuff.h linux-2.6.32.46/include/linux/
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linux/slab_def.h
---- linux-2.6.32.46/include/linux/slab_def.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/include/linux/slab_def.h	2011-05-04 17:56:28.000000000 -0400
-@@ -69,10 +69,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-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/slab.h
 --- linux-2.6.32.46/include/linux/slab.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/linux/slab.h	2011-04-17 15:56:46.000000000 -0400
@@ -64335,6 +64747,24 @@ diff -urNp linux-2.6.32.46/include/linux/slab.h linux-2.6.32.46/include/linux/sl
 +})
 +
  #endif	/* _LINUX_SLAB_H */
+diff -urNp linux-2.6.32.46/include/linux/slab_def.h linux-2.6.32.46/include/linux/slab_def.h
+--- linux-2.6.32.46/include/linux/slab_def.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/include/linux/slab_def.h	2011-05-04 17:56:28.000000000 -0400
+@@ -69,10 +69,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-2.6.32.46/include/linux/slub_def.h linux-2.6.32.46/include/linux/slub_def.h
 --- linux-2.6.32.46/include/linux/slub_def.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/include/linux/slub_def.h	2011-08-05 20:33:55.000000000 -0400
@@ -65421,6 +65851,18 @@ diff -urNp linux-2.6.32.46/include/video/uvesafb.h linux-2.6.32.46/include/video
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
+diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig
+--- linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:01.000000000 -0400
++++ linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:34.000000000 -0400
+@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
+ 
+ config COMPAT_BRK
+ 	bool "Disable heap randomization"
+-	default y
++	default n
+ 	help
+ 	  Randomizing heap placement makes heap exploits harder, but it
+ 	  also breaks ancient binaries (including anything libc5 based).
 diff -urNp linux-2.6.32.46/init/do_mounts.c linux-2.6.32.46/init/do_mounts.c
 --- linux-2.6.32.46/init/do_mounts.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/init/do_mounts.c	2011-04-17 15:56:46.000000000 -0400
@@ -65727,18 +66169,6 @@ diff -urNp linux-2.6.32.46/init/initramfs.c linux-2.6.32.46/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-2.6.32.46/init/Kconfig linux-2.6.32.46/init/Kconfig
---- linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:01.000000000 -0400
-+++ linux-2.6.32.46/init/Kconfig	2011-05-10 22:12:34.000000000 -0400
-@@ -1004,7 +1004,7 @@ config SLUB_DEBUG
- 
- config COMPAT_BRK
- 	bool "Disable heap randomization"
--	default y
-+	default n
- 	help
- 	  Randomizing heap placement makes heap exploits harder, but it
- 	  also breaks ancient binaries (including anything libc5 based).
 diff -urNp linux-2.6.32.46/init/main.c linux-2.6.32.46/init/main.c
 --- linux-2.6.32.46/init/main.c	2011-05-10 22:12:01.000000000 -0400
 +++ linux-2.6.32.46/init/main.c	2011-10-06 09:37:14.000000000 -0400
@@ -68122,46 +68552,6 @@ diff -urNp linux-2.6.32.46/kernel/module.c linux-2.6.32.46/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c
---- linux-2.6.32.46/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
-@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, 
- 	 */
- 
- 	for (;;) {
--		struct thread_info *owner;
-+		struct task_struct *owner;
- 
- 		/*
- 		 * If we own the BKL, then don't spin. The owner of
-@@ -214,7 +214,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);
-@@ -243,8 +243,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);
- 
-@@ -265,7 +264,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-2.6.32.46/kernel/mutex-debug.c linux-2.6.32.46/kernel/mutex-debug.c
 --- linux-2.6.32.46/kernel/mutex-debug.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/kernel/mutex-debug.c	2011-04-17 15:56:46.000000000 -0400
@@ -68225,6 +68615,46 @@ diff -urNp linux-2.6.32.46/kernel/mutex-debug.h linux-2.6.32.46/kernel/mutex-deb
  }
  
  static inline void mutex_clear_owner(struct mutex *lock)
+diff -urNp linux-2.6.32.46/kernel/mutex.c linux-2.6.32.46/kernel/mutex.c
+--- linux-2.6.32.46/kernel/mutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/mutex.c	2011-04-17 15:56:46.000000000 -0400
+@@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, 
+ 	 */
+ 
+ 	for (;;) {
+-		struct thread_info *owner;
++		struct task_struct *owner;
+ 
+ 		/*
+ 		 * If we own the BKL, then don't spin. The owner of
+@@ -214,7 +214,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);
+@@ -243,8 +243,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);
+ 
+@@ -265,7 +264,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-2.6.32.46/kernel/mutex.h linux-2.6.32.46/kernel/mutex.h
 --- linux-2.6.32.46/kernel/mutex.h	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/kernel/mutex.h	2011-04-17 15:56:46.000000000 -0400
@@ -69282,18 +69712,6 @@ diff -urNp linux-2.6.32.46/kernel/resource.c linux-2.6.32.46/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c
---- linux-2.6.32.46/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
-@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
- 	 */
- 	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 -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmutex-tester.c
 --- linux-2.6.32.46/kernel/rtmutex-tester.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/kernel/rtmutex-tester.c	2011-05-04 17:56:28.000000000 -0400
@@ -69387,6 +69805,18 @@ diff -urNp linux-2.6.32.46/kernel/rtmutex-tester.c linux-2.6.32.46/kernel/rtmute
  		return;
  
  	case RTTEST_LOCKBKL:
+diff -urNp linux-2.6.32.46/kernel/rtmutex.c linux-2.6.32.46/kernel/rtmutex.c
+--- linux-2.6.32.46/kernel/rtmutex.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/kernel/rtmutex.c	2011-04-17 15:56:46.000000000 -0400
+@@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt
+ 	 */
+ 	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 -urNp linux-2.6.32.46/kernel/sched.c linux-2.6.32.46/kernel/sched.c
 --- linux-2.6.32.46/kernel/sched.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/kernel/sched.c	2011-08-21 19:29:25.000000000 -0400
@@ -70613,6 +71043,18 @@ diff -urNp linux-2.6.32.46/kernel/user.c linux-2.6.32.46/kernel/user.c
  			key_put(new->uid_keyring);
  			key_put(new->session_keyring);
  			kmem_cache_free(uid_cachep, new);
+diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug
+--- linux-2.6.32.46/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
+@@ -905,7 +905,7 @@ config LATENCYTOP
+ 	select STACKTRACE
+ 	select SCHEDSTATS
+ 	select SCHED_DEBUG
+-	depends on HAVE_LATENCYTOP_SUPPORT
++	depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
+ 	help
+ 	  Enable this option if you want to use the LatencyTOP tool
+ 	  to find out which userspace is blocking on what kernel operations.
 diff -urNp linux-2.6.32.46/lib/bitmap.c linux-2.6.32.46/lib/bitmap.c
 --- linux-2.6.32.46/lib/bitmap.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/lib/bitmap.c	2011-10-06 09:37:14.000000000 -0400
@@ -70715,18 +71157,6 @@ diff -urNp linux-2.6.32.46/lib/inflate.c linux-2.6.32.46/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-2.6.32.46/lib/Kconfig.debug linux-2.6.32.46/lib/Kconfig.debug
---- linux-2.6.32.46/lib/Kconfig.debug	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/lib/Kconfig.debug	2011-04-17 15:56:46.000000000 -0400
-@@ -905,7 +905,7 @@ config LATENCYTOP
- 	select STACKTRACE
- 	select SCHEDSTATS
- 	select SCHED_DEBUG
--	depends on HAVE_LATENCYTOP_SUPPORT
-+	depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
- 	help
- 	  Enable this option if you want to use the LatencyTOP tool
- 	  to find out which userspace is blocking on what kernel operations.
 diff -urNp linux-2.6.32.46/lib/kobject.c linux-2.6.32.46/lib/kobject.c
 --- linux-2.6.32.46/lib/kobject.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/lib/kobject.c	2011-04-17 15:56:46.000000000 -0400
@@ -70925,225 +71355,18 @@ diff -urNp linux-2.6.32.46/localversion-grsec linux-2.6.32.46/localversion-grsec
 +++ linux-2.6.32.46/localversion-grsec	2011-04-17 15:56:46.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-2.6.32.46/Makefile linux-2.6.32.46/Makefile
---- linux-2.6.32.46/Makefile	2011-08-29 22:24:44.000000000 -0400
-+++ linux-2.6.32.46/Makefile	2011-10-08 08:14:40.000000000 -0400
-@@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
--HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -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
- 
- # Decide whether to build built-in, modular, or both.
- # Normally, just do built-in.
-@@ -342,10 +343,12 @@ LINUXINCLUDE    := -Iinclude \
- KBUILD_CPPFLAGS := -D__KERNEL__
- 
- 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   := -D__ASSEMBLY__
- 
- # Read KERNELRELEASE from include/config/kernel.release (if it exists)
-@@ -376,8 +379,8 @@ 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_basic gcc-plugins
-+scripts_basic: gcc-plugins
- 	$(Q)$(MAKE) $(build)=scripts/basic
- 
- # To avoid any implicit rule to kick in, define an empty command.
-@@ -403,7 +406,7 @@ endif
- # of make so .config is not included in this case either (for *config).
- 
- no-dot-config-targets := clean mrproper distclean \
--			 cscope TAGS tags help %docs check% \
-+			 cscope gtags TAGS tags help %docs check% \
- 			 include/linux/version.h headers_% \
- 			 kernelrelease kernelversion
- 
-@@ -526,6 +529,36 @@ else
- KBUILD_CFLAGS	+= -O2
- endif
- 
-+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
-+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
-+ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
-+endif
-+ifdef CONFIG_KALLOCSTAT_PLUGIN
-+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
-+endif
-+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
-+endif
-+ifdef CONFIG_CHECKER_PLUGIN
-+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
-+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
-+endif
-+endif
-+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
-+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_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)
-@@ -644,7 +677,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) \
-@@ -865,6 +898,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
- 
- # The actual objects are generated when descending, 
- # make sure no implicit rule kicks in
-+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
- $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
- 
- # Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -874,7 +908,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
- # Error messages still appears in the original language
- 
- PHONY += $(vmlinux-dirs)
--$(vmlinux-dirs): prepare scripts
-+$(vmlinux-dirs): gcc-plugins prepare scripts
- 	$(Q)$(MAKE) $(build)=$@
- 
- # Build the kernel release string
-@@ -983,6 +1017,7 @@ prepare0: archprepare FORCE
- 	$(Q)$(MAKE) $(build)=. missing-syscalls
- 
- # All the preparing..
-+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
- prepare: prepare0
- 
- # The asm symlink changes when $(ARCH) changes.
-@@ -1124,6 +1159,7 @@ all: modules
- #	using awk while concatenating to the final file.
- 
- PHONY += modules
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
- 	$(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
- 	@$(kecho) '  Building modules, stage 2.';
-@@ -1133,7 +1169,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_B
- 
- # Target to prepare building external modules
- PHONY += modules_prepare
--modules_prepare: prepare scripts
-+modules_prepare: gcc-plugins prepare scripts
- 
- # Target to install modules
- PHONY += modules_install
-@@ -1198,7 +1234,7 @@ MRPROPER_FILES += .config .config.old in
-                   include/linux/autoconf.h include/linux/version.h      \
-                   include/linux/utsrelease.h                            \
-                   include/linux/bounds.h include/asm*/asm-offsets.h     \
--		  Module.symvers Module.markers tags TAGS cscope*
-+		  Module.symvers Module.markers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
- 
- # clean - Delete most, but leave enough to build external modules
- #
-@@ -1242,7 +1278,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 -name '*.so' -o -size 0 \
- 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
- 		-type f -print | xargs rm -f
- 
-@@ -1289,6 +1325,7 @@ help:
- 	@echo  '  modules_prepare - Set up for building external modules'
- 	@echo  '  tags/TAGS	  - Generate tags file for editors'
- 	@echo  '  cscope	  - Generate cscope index'
-+	@echo  '  gtags           - Generate GNU GLOBAL index'
- 	@echo  '  kernelrelease	  - Output the release version string'
- 	@echo  '  kernelversion	  - Output the version stored in Makefile'
- 	@echo  '  headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
-@@ -1390,6 +1427,7 @@ PHONY += $(module-dirs) modules
- $(module-dirs): crmodverdir $(objtree)/Module.symvers
- 	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
- 
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- modules: $(module-dirs)
- 	@$(kecho) '  Building modules, stage 2.';
- 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1445,7 +1483,7 @@ endif # KBUILD_EXTMOD
- quiet_cmd_tags = GEN     $@
-       cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
- 
--tags TAGS cscope: FORCE
-+tags TAGS cscope gtags: FORCE
- 	$(call cmd,tags)
- 
- # Scripts to check various things for consistency
-@@ -1510,17 +1548,19 @@ else
-         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
- endif
- 
--%.s: %.c prepare scripts FORCE
-+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.s: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.i: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.c prepare scripts FORCE
-+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.o: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.lst: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.s: %.S prepare scripts FORCE
-+%.s: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.S prepare scripts FORCE
-+%.o: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.symtypes: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1530,11 +1570,13 @@ endif
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%/: prepare scripts FORCE
-+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%/: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%.ko: prepare scripts FORCE
-+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.ko: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
- 	$(build)=$(build-dir) $(@:.ko=.o)
+diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig
+--- linux-2.6.32.46/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
+@@ -228,7 +228,7 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+         int "Low address space to protect from user allocation"
+ 	depends on MMU
+-        default 4096
++        default 65536
+         help
+ 	  This is the portion of low virtual memory which should be protected
+ 	  from userspace allocation.  Keeping a user from writing to low pages
 diff -urNp linux-2.6.32.46/mm/backing-dev.c linux-2.6.32.46/mm/backing-dev.c
 --- linux-2.6.32.46/mm/backing-dev.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/mm/backing-dev.c	2011-08-11 19:48:17.000000000 -0400
@@ -71330,18 +71553,6 @@ diff -urNp linux-2.6.32.46/mm/internal.h linux-2.6.32.46/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  
  
-diff -urNp linux-2.6.32.46/mm/Kconfig linux-2.6.32.46/mm/Kconfig
---- linux-2.6.32.46/mm/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/mm/Kconfig	2011-04-17 15:56:46.000000000 -0400
-@@ -228,7 +228,7 @@ config KSM
- config DEFAULT_MMAP_MIN_ADDR
-         int "Low address space to protect from user allocation"
- 	depends on MMU
--        default 4096
-+        default 65536
-         help
- 	  This is the portion of low virtual memory which should be protected
- 	  from userspace allocation.  Keeping a user from writing to low pages
 diff -urNp linux-2.6.32.46/mm/kmemleak.c linux-2.6.32.46/mm/kmemleak.c
 --- linux-2.6.32.46/mm/kmemleak.c	2011-06-25 12:55:35.000000000 -0400
 +++ linux-2.6.32.46/mm/kmemleak.c	2011-06-25 12:56:37.000000000 -0400
@@ -71471,6 +71682,36 @@ diff -urNp linux-2.6.32.46/mm/madvise.c linux-2.6.32.46/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
+diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure.c
+--- linux-2.6.32.46/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/mm/memory-failure.c	2011-10-06 09:37:14.000000000 -0400
+@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
+ 
+ int sysctl_memory_failure_recovery __read_mostly = 1;
+ 
+-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
++atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
+ 
+ /*
+  * Send all the processes who have the page mapped an ``action optional''
+@@ -64,7 +64,7 @@ static int kill_proc_ao(struct task_stru
+ 	si.si_signo = SIGBUS;
+ 	si.si_errno = 0;
+ 	si.si_code = BUS_MCEERR_AO;
+-	si.si_addr = (void *)addr;
++	si.si_addr = (void __user *)addr;
+ #ifdef __ARCH_SI_TRAPNO
+ 	si.si_trapno = trapno;
+ #endif
+@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn, 
+ 		return 0;
+ 	}
+ 
+-	atomic_long_add(1, &mce_bad_pages);
++	atomic_long_add_unchecked(1, &mce_bad_pages);
+ 
+ 	/*
+ 	 * We need/can do nothing about count=0 pages.
 diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c
 --- linux-2.6.32.46/mm/memory.c	2011-07-13 17:23:04.000000000 -0400
 +++ linux-2.6.32.46/mm/memory.c	2011-07-13 17:23:23.000000000 -0400
@@ -72003,36 +72244,6 @@ diff -urNp linux-2.6.32.46/mm/memory.c linux-2.6.32.46/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-2.6.32.46/mm/memory-failure.c linux-2.6.32.46/mm/memory-failure.c
---- linux-2.6.32.46/mm/memory-failure.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/mm/memory-failure.c	2011-10-06 09:37:14.000000000 -0400
-@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
- 
- int sysctl_memory_failure_recovery __read_mostly = 1;
- 
--atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
-+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
- 
- /*
-  * Send all the processes who have the page mapped an ``action optional''
-@@ -64,7 +64,7 @@ static int kill_proc_ao(struct task_stru
- 	si.si_signo = SIGBUS;
- 	si.si_errno = 0;
- 	si.si_code = BUS_MCEERR_AO;
--	si.si_addr = (void *)addr;
-+	si.si_addr = (void __user *)addr;
- #ifdef __ARCH_SI_TRAPNO
- 	si.si_trapno = trapno;
- #endif
-@@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn, 
- 		return 0;
- 	}
- 
--	atomic_long_add(1, &mce_bad_pages);
-+	atomic_long_add_unchecked(1, &mce_bad_pages);
- 
- 	/*
- 	 * We need/can do nothing about count=0 pages.
 diff -urNp linux-2.6.32.46/mm/mempolicy.c linux-2.6.32.46/mm/mempolicy.c
 --- linux-2.6.32.46/mm/mempolicy.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/mm/mempolicy.c	2011-04-17 15:56:46.000000000 -0400
@@ -75856,36 +76067,6 @@ diff -urNp linux-2.6.32.46/net/ipv4/inetpeer.c linux-2.6.32.46/net/ipv4/inetpeer
  	n->ip_id_count = secure_ip_id(daddr);
  	n->tcp_ts_stamp = 0;
  
-diff -urNp linux-2.6.32.46/net/ipv4/ipconfig.c linux-2.6.32.46/net/ipv4/ipconfig.c
---- linux-2.6.32.46/net/ipv4/ipconfig.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/net/ipv4/ipconfig.c	2011-10-06 09:37:14.000000000 -0400
-@@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsig
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
-+	res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
-@@ -306,7 +306,7 @@ static int __init ic_dev_ioctl(unsigned 
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
-+	res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
-@@ -317,7 +317,7 @@ static int __init ic_route_ioctl(unsigne
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
-+	res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
 diff -urNp linux-2.6.32.46/net/ipv4/ip_fragment.c linux-2.6.32.46/net/ipv4/ip_fragment.c
 --- linux-2.6.32.46/net/ipv4/ip_fragment.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/net/ipv4/ip_fragment.c	2011-04-17 15:56:46.000000000 -0400
@@ -75919,6 +76100,36 @@ diff -urNp linux-2.6.32.46/net/ipv4/ip_sockglue.c linux-2.6.32.46/net/ipv4/ip_so
  		msg.msg_controllen = len;
  		msg.msg_flags = 0;
  
+diff -urNp linux-2.6.32.46/net/ipv4/ipconfig.c linux-2.6.32.46/net/ipv4/ipconfig.c
+--- linux-2.6.32.46/net/ipv4/ipconfig.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/ipv4/ipconfig.c	2011-10-06 09:37:14.000000000 -0400
+@@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsig
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++	res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
+@@ -306,7 +306,7 @@ static int __init ic_dev_ioctl(unsigned 
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++	res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
+@@ -317,7 +317,7 @@ static int __init ic_route_ioctl(unsigne
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
++	res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
 diff -urNp linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c
 --- linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:00:52.000000000 -0400
 +++ linux-2.6.32.46/net/ipv4/netfilter/arp_tables.c	2011-04-17 17:04:18.000000000 -0400
@@ -77203,6 +77414,37 @@ diff -urNp linux-2.6.32.46/net/mac80211/util.c linux-2.6.32.46/net/mac80211/util
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
+diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/Kconfig
+--- linux-2.6.32.46/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
+@@ -635,6 +635,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-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/Makefile
+--- linux-2.6.32.46/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
+@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
+ 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 -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c
 --- linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/net/netfilter/ipvs/ip_vs_app.c	2011-05-17 19:26:34.000000000 -0400
@@ -77396,37 +77638,6 @@ diff -urNp linux-2.6.32.46/net/netfilter/ipvs/ip_vs_xmit.c linux-2.6.32.46/net/n
  		goto out;
  	}
  
-diff -urNp linux-2.6.32.46/net/netfilter/Kconfig linux-2.6.32.46/net/netfilter/Kconfig
---- linux-2.6.32.46/net/netfilter/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/net/netfilter/Kconfig	2011-04-17 15:56:46.000000000 -0400
-@@ -635,6 +635,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-2.6.32.46/net/netfilter/Makefile linux-2.6.32.46/net/netfilter/Makefile
---- linux-2.6.32.46/net/netfilter/Makefile	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/net/netfilter/Makefile	2011-04-17 15:56:46.000000000 -0400
-@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRAC
- 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 -urNp linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c
 --- linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/net/netfilter/nf_conntrack_netlink.c	2011-04-17 15:56:46.000000000 -0400
@@ -77665,6 +77876,18 @@ diff -urNp linux-2.6.32.46/net/phonet/socket.c linux-2.6.32.46/net/phonet/socket
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
+diff -urNp linux-2.6.32.46/net/rds/Kconfig linux-2.6.32.46/net/rds/Kconfig
+--- linux-2.6.32.46/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
+@@ -1,7 +1,7 @@
+ 
+ config RDS
+ 	tristate "The RDS Protocol (EXPERIMENTAL)"
+-	depends on INET && EXPERIMENTAL
++	depends on INET && EXPERIMENTAL && BROKEN
+ 	---help---
+ 	  The RDS (Reliable Datagram Sockets) protocol provides reliable,
+ 	  sequenced delivery of datagrams over Infiniband, iWARP,
 diff -urNp linux-2.6.32.46/net/rds/cong.c linux-2.6.32.46/net/rds/cong.c
 --- linux-2.6.32.46/net/rds/cong.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/net/rds/cong.c	2011-05-04 17:56:28.000000000 -0400
@@ -77707,18 +77930,6 @@ diff -urNp linux-2.6.32.46/net/rds/iw_rdma.c linux-2.6.32.46/net/rds/iw_rdma.c
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-2.6.32.46/net/rds/Kconfig linux-2.6.32.46/net/rds/Kconfig
---- linux-2.6.32.46/net/rds/Kconfig	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/net/rds/Kconfig	2011-04-17 15:56:46.000000000 -0400
-@@ -1,7 +1,7 @@
- 
- config RDS
- 	tristate "The RDS Protocol (EXPERIMENTAL)"
--	depends on INET && EXPERIMENTAL
-+	depends on INET && EXPERIMENTAL && BROKEN
- 	---help---
- 	  The RDS (Reliable Datagram Sockets) protocol provides reliable,
- 	  sequenced delivery of datagrams over Infiniband, iWARP,
 diff -urNp linux-2.6.32.46/net/rds/tcp.c linux-2.6.32.46/net/rds/tcp.c
 --- linux-2.6.32.46/net/rds/tcp.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/net/rds/tcp.c	2011-10-06 09:37:16.000000000 -0400
@@ -78769,6 +78980,50 @@ diff -urNp linux-2.6.32.46/samples/kobject/kset-example.c linux-2.6.32.46/sample
  	.show = foo_attr_show,
  	.store = foo_attr_store,
  };
+diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/scripts/Makefile.build
+--- linux-2.6.32.46/scripts/Makefile.build	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.build	2011-08-23 20:45:11.000000000 -0400
+@@ -59,7 +59,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-2.6.32.46/scripts/Makefile.clean linux-2.6.32.46/scripts/Makefile.clean
+--- linux-2.6.32.46/scripts/Makefile.clean	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.clean	2011-06-04 20:47:19.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-)
+ 
+ # as clean-files is given relative to the current directory, this adds
+ # a $(obj) prefix, except for absolute paths
+diff -urNp linux-2.6.32.46/scripts/Makefile.host linux-2.6.32.46/scripts/Makefile.host
+--- linux-2.6.32.46/scripts/Makefile.host	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/scripts/Makefile.host	2011-06-04 20:48:22.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-2.6.32.46/scripts/basic/fixdep.c linux-2.6.32.46/scripts/basic/fixdep.c
 --- linux-2.6.32.46/scripts/basic/fixdep.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/scripts/basic/fixdep.c	2011-10-06 09:37:14.000000000 -0400
@@ -78817,50 +79072,6 @@ diff -urNp linux-2.6.32.46/scripts/gcc-plugin.sh linux-2.6.32.46/scripts/gcc-plu
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-2.6.32.46/scripts/Makefile.build linux-2.6.32.46/scripts/Makefile.build
---- linux-2.6.32.46/scripts/Makefile.build	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/scripts/Makefile.build	2011-08-23 20:45:11.000000000 -0400
-@@ -59,7 +59,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-2.6.32.46/scripts/Makefile.clean linux-2.6.32.46/scripts/Makefile.clean
---- linux-2.6.32.46/scripts/Makefile.clean	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/scripts/Makefile.clean	2011-06-04 20:47:19.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-)
- 
- # as clean-files is given relative to the current directory, this adds
- # a $(obj) prefix, except for absolute paths
-diff -urNp linux-2.6.32.46/scripts/Makefile.host linux-2.6.32.46/scripts/Makefile.host
---- linux-2.6.32.46/scripts/Makefile.host	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/scripts/Makefile.host	2011-06-04 20:48:22.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-2.6.32.46/scripts/mod/file2alias.c linux-2.6.32.46/scripts/mod/file2alias.c
 --- linux-2.6.32.46/scripts/mod/file2alias.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/scripts/mod/file2alias.c	2011-10-06 09:37:14.000000000 -0400
@@ -79107,115 +79318,6 @@ diff -urNp linux-2.6.32.46/scripts/tags.sh linux-2.6.32.46/scripts/tags.sh
  	"tags")
  		rm -f tags
  		xtags ctags
-diff -urNp linux-2.6.32.46/security/capability.c linux-2.6.32.46/security/capability.c
---- linux-2.6.32.46/security/capability.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/capability.c	2011-04-17 15:56:46.000000000 -0400
-@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
- }
- #endif /* CONFIG_AUDIT */
- 
--struct security_operations default_security_ops = {
-+struct security_operations default_security_ops __read_only = {
- 	.name	= "default",
- };
- 
-diff -urNp linux-2.6.32.46/security/commoncap.c linux-2.6.32.46/security/commoncap.c
---- linux-2.6.32.46/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/commoncap.c	2011-08-17 19:22:13.000000000 -0400
-@@ -27,7 +27,7 @@
- #include <linux/sched.h>
- #include <linux/prctl.h>
- #include <linux/securebits.h>
--
-+#include <net/sock.h>
- /*
-  * If a non-root user executes a setuid-root binary in
-  * !secure(SECURE_NOROOT) mode, then we raise capabilities.
-@@ -50,9 +50,18 @@ static void warn_setuid_and_fcaps_mixed(
- 	}
- }
- 
-+#ifdef CONFIG_NET
-+extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
-+#endif
-+
- int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
- {
-+#ifdef CONFIG_NET
-+	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
-+#else
- 	NETLINK_CB(skb).eff_cap = current_cap();
-+#endif
-+	
- 	return 0;
- }
- 
-@@ -582,6 +591,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-2.6.32.46/security/integrity/ima/ima_api.c linux-2.6.32.46/security/integrity/ima/ima_api.c
---- linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
-@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
- 	int result;
- 
- 	/* can overflow, only indicator */
--	atomic_long_inc(&ima_htable.violations);
-+	atomic_long_inc_unchecked(&ima_htable.violations);
- 
- 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
- 	if (!entry) {
-diff -urNp linux-2.6.32.46/security/integrity/ima/ima_fs.c linux-2.6.32.46/security/integrity/ima/ima_fs.c
---- linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
-@@ -27,12 +27,12 @@
- static int valid_policy = 1;
- #define TMPBUFLEN 12
- static ssize_t ima_show_htable_value(char __user *buf, size_t count,
--				     loff_t *ppos, atomic_long_t *val)
-+				     loff_t *ppos, atomic_long_unchecked_t *val)
- {
- 	char tmpbuf[TMPBUFLEN];
- 	ssize_t len;
- 
--	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
-+	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
- 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
- }
- 
-diff -urNp linux-2.6.32.46/security/integrity/ima/ima.h linux-2.6.32.46/security/integrity/ima/ima.h
---- linux-2.6.32.46/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
-@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
- extern spinlock_t ima_queue_lock;
- 
- struct ima_h_table {
--	atomic_long_t len;	/* number of stored measurements in the list */
--	atomic_long_t violations;
-+	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
-+	atomic_long_unchecked_t violations;
- 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
- };
- extern struct ima_h_table ima_htable;
-diff -urNp linux-2.6.32.46/security/integrity/ima/ima_queue.c linux-2.6.32.46/security/integrity/ima/ima_queue.c
---- linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
-+++ linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
-@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
- 	INIT_LIST_HEAD(&qe->later);
- 	list_add_tail_rcu(&qe->later, &ima_measurements);
- 
--	atomic_long_inc(&ima_htable.len);
-+	atomic_long_inc_unchecked(&ima_htable.len);
- 	key = ima_hash_key(entry->digest);
- 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
- 	return 0;
 diff -urNp linux-2.6.32.46/security/Kconfig linux-2.6.32.46/security/Kconfig
 --- linux-2.6.32.46/security/Kconfig	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/security/Kconfig	2011-10-06 09:38:20.000000000 -0400
@@ -79788,6 +79890,115 @@ diff -urNp linux-2.6.32.46/security/Kconfig linux-2.6.32.46/security/Kconfig
  	help
  	  This is the portion of low virtual memory which should be protected
  	  from userspace allocation.  Keeping a user from writing to low pages
+diff -urNp linux-2.6.32.46/security/capability.c linux-2.6.32.46/security/capability.c
+--- linux-2.6.32.46/security/capability.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/capability.c	2011-04-17 15:56:46.000000000 -0400
+@@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *ls
+ }
+ #endif /* CONFIG_AUDIT */
+ 
+-struct security_operations default_security_ops = {
++struct security_operations default_security_ops __read_only = {
+ 	.name	= "default",
+ };
+ 
+diff -urNp linux-2.6.32.46/security/commoncap.c linux-2.6.32.46/security/commoncap.c
+--- linux-2.6.32.46/security/commoncap.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/commoncap.c	2011-08-17 19:22:13.000000000 -0400
+@@ -27,7 +27,7 @@
+ #include <linux/sched.h>
+ #include <linux/prctl.h>
+ #include <linux/securebits.h>
+-
++#include <net/sock.h>
+ /*
+  * If a non-root user executes a setuid-root binary in
+  * !secure(SECURE_NOROOT) mode, then we raise capabilities.
+@@ -50,9 +50,18 @@ static void warn_setuid_and_fcaps_mixed(
+ 	}
+ }
+ 
++#ifdef CONFIG_NET
++extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
++#endif
++
+ int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
+ {
++#ifdef CONFIG_NET
++	NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
++#else
+ 	NETLINK_CB(skb).eff_cap = current_cap();
++#endif
++	
+ 	return 0;
+ }
+ 
+@@ -582,6 +591,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-2.6.32.46/security/integrity/ima/ima.h linux-2.6.32.46/security/integrity/ima/ima.h
+--- linux-2.6.32.46/security/integrity/ima/ima.h	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima.h	2011-04-17 15:56:46.000000000 -0400
+@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
+ extern spinlock_t ima_queue_lock;
+ 
+ struct ima_h_table {
+-	atomic_long_t len;	/* number of stored measurements in the list */
+-	atomic_long_t violations;
++	atomic_long_unchecked_t len;	/* number of stored measurements in the list */
++	atomic_long_unchecked_t violations;
+ 	struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
+ };
+ extern struct ima_h_table ima_htable;
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_api.c linux-2.6.32.46/security/integrity/ima/ima_api.c
+--- linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_api.c	2011-04-17 15:56:46.000000000 -0400
+@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
+ 	int result;
+ 
+ 	/* can overflow, only indicator */
+-	atomic_long_inc(&ima_htable.violations);
++	atomic_long_inc_unchecked(&ima_htable.violations);
+ 
+ 	entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+ 	if (!entry) {
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_fs.c linux-2.6.32.46/security/integrity/ima/ima_fs.c
+--- linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_fs.c	2011-04-17 15:56:46.000000000 -0400
+@@ -27,12 +27,12 @@
+ static int valid_policy = 1;
+ #define TMPBUFLEN 12
+ static ssize_t ima_show_htable_value(char __user *buf, size_t count,
+-				     loff_t *ppos, atomic_long_t *val)
++				     loff_t *ppos, atomic_long_unchecked_t *val)
+ {
+ 	char tmpbuf[TMPBUFLEN];
+ 	ssize_t len;
+ 
+-	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
++	len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
+ 	return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
+ }
+ 
+diff -urNp linux-2.6.32.46/security/integrity/ima/ima_queue.c linux-2.6.32.46/security/integrity/ima/ima_queue.c
+--- linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-03-27 14:31:47.000000000 -0400
++++ linux-2.6.32.46/security/integrity/ima/ima_queue.c	2011-04-17 15:56:46.000000000 -0400
+@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
+ 	INIT_LIST_HEAD(&qe->later);
+ 	list_add_tail_rcu(&qe->later, &ima_measurements);
+ 
+-	atomic_long_inc(&ima_htable.len);
++	atomic_long_inc_unchecked(&ima_htable.len);
+ 	key = ima_hash_key(entry->digest);
+ 	hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
+ 	return 0;
 diff -urNp linux-2.6.32.46/security/keys/keyring.c linux-2.6.32.46/security/keys/keyring.c
 --- linux-2.6.32.46/security/keys/keyring.c	2011-03-27 14:31:47.000000000 -0400
 +++ linux-2.6.32.46/security/keys/keyring.c	2011-04-18 22:03:00.000000000 -0400
@@ -80798,6 +81009,31 @@ diff -urNp linux-2.6.32.46/sound/usb/usbaudio.c linux-2.6.32.46/sound/usb/usbaud
  			break;
  		}
  	}
+diff -urNp linux-2.6.32.46/tools/gcc/Makefile linux-2.6.32.46/tools/gcc/Makefile
+--- linux-2.6.32.46/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-2.6.32.46/tools/gcc/Makefile	2011-10-06 09:37:14.000000000 -0400
+@@ -0,0 +1,21 @@
++#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 := constify_plugin.so
++hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
++hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
++hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
++hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
++
++always := $(hostlibs-y)
++
++stackleak_plugin-objs := stackleak_plugin.o
++constify_plugin-objs := constify_plugin.o
++kallocstat_plugin-objs := kallocstat_plugin.o
++kernexec_plugin-objs := kernexec_plugin.o
++checker_plugin-objs := checker_plugin.o
 diff -urNp linux-2.6.32.46/tools/gcc/checker_plugin.c linux-2.6.32.46/tools/gcc/checker_plugin.c
 --- linux-2.6.32.46/tools/gcc/checker_plugin.c	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.32.46/tools/gcc/checker_plugin.c	2011-10-06 09:37:16.000000000 -0400
@@ -81714,31 +81950,6 @@ diff -urNp linux-2.6.32.46/tools/gcc/kernexec_plugin.c linux-2.6.32.46/tools/gcc
 +
 +	return 0;
 +}
-diff -urNp linux-2.6.32.46/tools/gcc/Makefile linux-2.6.32.46/tools/gcc/Makefile
---- linux-2.6.32.46/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-2.6.32.46/tools/gcc/Makefile	2011-10-06 09:37:14.000000000 -0400
-@@ -0,0 +1,21 @@
-+#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 := constify_plugin.so
-+hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
-+hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
-+hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
-+hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
-+
-+always := $(hostlibs-y)
-+
-+stackleak_plugin-objs := stackleak_plugin.o
-+constify_plugin-objs := constify_plugin.o
-+kallocstat_plugin-objs := kallocstat_plugin.o
-+kernexec_plugin-objs := kernexec_plugin.o
-+checker_plugin-objs := checker_plugin.o
 diff -urNp linux-2.6.32.46/tools/gcc/stackleak_plugin.c linux-2.6.32.46/tools/gcc/stackleak_plugin.c
 --- linux-2.6.32.46/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
 +++ linux-2.6.32.46/tools/gcc/stackleak_plugin.c	2011-10-06 09:37:14.000000000 -0400
diff --git a/2.6.32/4423_grsec-remove-protected-paths.patch b/2.6.32/4423_grsec-remove-protected-paths.patch
index abd9b99..5cec66c 100644
--- a/2.6.32/4423_grsec-remove-protected-paths.patch
+++ b/2.6.32/4423_grsec-remove-protected-paths.patch
@@ -4,15 +4,16 @@ We don't want GRSEC's Makefile to change permissions on paths in
 the filesystem.
 
 diff -Naur a/grsecurity/Makefile b/grsecurity/Makefile
---- a/grsecurity/Makefile	2011-09-15 13:36:25.000000000 -0400
-+++ b/grsecurity/Makefile	2011-09-15 13:44:58.000000000 -0400
-@@ -27,9 +27,4 @@
+--- a/grsecurity/Makefile	2011-10-19 19:48:21.000000000 -0400
++++ b/grsecurity/Makefile	2011-10-19 19:50:44.000000000 -0400
+@@ -27,10 +27,4 @@
  ifdef CONFIG_GRKERNSEC_HIDESYM
  extra-y := grsec_hidesym.o
  $(obj)/grsec_hidesym.o:
 -	@-chmod -f 500 /boot
 -	@-chmod -f 500 /lib/modules
 -	@-chmod -f 500 /lib64/modules
+-	@-chmod -f 500 /lib32/modules
 -	@-chmod -f 700 .
 -	@echo '  grsec: protected kernel image paths'
  endif
diff --git a/3.0.4/0000_README b/3.0.7/0000_README
index eee11e1..f57a73c 100644
--- a/3.0.4/0000_README
+++ b/3.0.7/0000_README
@@ -3,7 +3,11 @@ README
 
 Individual Patch Descriptions:
 -----------------------------------------------------------------------------
-Patch:	4420_grsecurity-2.2.2-3.0.4-201110080819.patch
+Patch:	1006_linux-3.0.7.patch
+From:	http://www.kernel.org
+Desc:	Linux 3.0.7
+
+Patch:	4420_grsecurity-2.2.2-3.0.7-201110191214.patch
 From:	http://www.grsecurity.net
 Desc:	hardened-sources base patch from upstream grsecurity
 
diff --git a/3.0.7/1006_linux-3.0.7.patch b/3.0.7/1006_linux-3.0.7.patch
new file mode 100644
index 0000000..71aa052
--- /dev/null
+++ b/3.0.7/1006_linux-3.0.7.patch
@@ -0,0 +1,1413 @@
+diff --git a/Makefile b/Makefile
+index 7767a64..11c4249 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 3
+ PATCHLEVEL = 0
+-SUBLEVEL = 6
++SUBLEVEL = 7
+ EXTRAVERSION =
+ NAME = Sneaky Weasel
+ 
+diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
+index f8b9392..9a9706c 100644
+--- a/arch/arm/mach-ux500/Kconfig
++++ b/arch/arm/mach-ux500/Kconfig
+@@ -6,6 +6,7 @@ config UX500_SOC_COMMON
+ 	select ARM_GIC
+ 	select HAS_MTU
+ 	select ARM_ERRATA_753970
++	select ARM_ERRATA_754322
+ 
+ menu "Ux500 SoC"
+ 
+diff --git a/arch/mips/jz4740/gpio.c b/arch/mips/jz4740/gpio.c
+index 73031f7..4397972 100644
+--- a/arch/mips/jz4740/gpio.c
++++ b/arch/mips/jz4740/gpio.c
+@@ -18,7 +18,7 @@
+ #include <linux/init.h>
+ 
+ #include <linux/spinlock.h>
+-#include <linux/sysdev.h>
++#include <linux/syscore_ops.h>
+ #include <linux/io.h>
+ #include <linux/gpio.h>
+ #include <linux/delay.h>
+@@ -86,7 +86,6 @@ struct jz_gpio_chip {
+ 	spinlock_t lock;
+ 
+ 	struct gpio_chip gpio_chip;
+-	struct sys_device sysdev;
+ };
+ 
+ static struct jz_gpio_chip jz4740_gpio_chips[];
+@@ -459,49 +458,47 @@ static struct jz_gpio_chip jz4740_gpio_chips[] = {
+ 	JZ4740_GPIO_CHIP(D),
+ };
+ 
+-static inline struct jz_gpio_chip *sysdev_to_chip(struct sys_device *dev)
++static void jz4740_gpio_suspend_chip(struct jz_gpio_chip *chip)
+ {
+-	return container_of(dev, struct jz_gpio_chip, sysdev);
++	chip->suspend_mask = readl(chip->base + JZ_REG_GPIO_MASK);
++	writel(~(chip->wakeup), chip->base + JZ_REG_GPIO_MASK_SET);
++	writel(chip->wakeup, chip->base + JZ_REG_GPIO_MASK_CLEAR);
+ }
+ 
+-static int jz4740_gpio_suspend(struct sys_device *dev, pm_message_t state)
++static int jz4740_gpio_suspend(void)
+ {
+-	struct jz_gpio_chip *chip = sysdev_to_chip(dev);
++	int i;
+ 
+-	chip->suspend_mask = readl(chip->base + JZ_REG_GPIO_MASK);
+-	writel(~(chip->wakeup), chip->base + JZ_REG_GPIO_MASK_SET);
+-	writel(chip->wakeup, chip->base + JZ_REG_GPIO_MASK_CLEAR);
++	for (i = 0; i < ARRAY_SIZE(jz4740_gpio_chips); i++)
++		jz4740_gpio_suspend_chip(&jz4740_gpio_chips[i]);
+ 
+ 	return 0;
+ }
+ 
+-static int jz4740_gpio_resume(struct sys_device *dev)
++static void jz4740_gpio_resume_chip(struct jz_gpio_chip *chip)
+ {
+-	struct jz_gpio_chip *chip = sysdev_to_chip(dev);
+ 	uint32_t mask = chip->suspend_mask;
+ 
+ 	writel(~mask, chip->base + JZ_REG_GPIO_MASK_CLEAR);
+ 	writel(mask, chip->base + JZ_REG_GPIO_MASK_SET);
++}
+ 
+-	return 0;
++static void jz4740_gpio_resume(void)
++{
++	int i;
++
++	for (i = ARRAY_SIZE(jz4740_gpio_chips) - 1; i >= 0 ; i--)
++		jz4740_gpio_resume_chip(&jz4740_gpio_chips[i]);
+ }
+ 
+-static struct sysdev_class jz4740_gpio_sysdev_class = {
+-	.name = "gpio",
++static struct syscore_ops jz4740_gpio_syscore_ops = {
+ 	.suspend = jz4740_gpio_suspend,
+ 	.resume = jz4740_gpio_resume,
+ };
+ 
+-static int jz4740_gpio_chip_init(struct jz_gpio_chip *chip, unsigned int id)
++static void jz4740_gpio_chip_init(struct jz_gpio_chip *chip, unsigned int id)
+ {
+-	int ret, irq;
+-
+-	chip->sysdev.id = id;
+-	chip->sysdev.cls = &jz4740_gpio_sysdev_class;
+-	ret = sysdev_register(&chip->sysdev);
+-
+-	if (ret)
+-		return ret;
++	int irq;
+ 
+ 	spin_lock_init(&chip->lock);
+ 
+@@ -519,22 +516,17 @@ static int jz4740_gpio_chip_init(struct jz_gpio_chip *chip, unsigned int id)
+ 		irq_set_chip_and_handler(irq, &jz_gpio_irq_chip,
+ 					 handle_level_irq);
+ 	}
+-
+-	return 0;
+ }
+ 
+ static int __init jz4740_gpio_init(void)
+ {
+ 	unsigned int i;
+-	int ret;
+-
+-	ret = sysdev_class_register(&jz4740_gpio_sysdev_class);
+-	if (ret)
+-		return ret;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(jz4740_gpio_chips); ++i)
+ 		jz4740_gpio_chip_init(&jz4740_gpio_chips[i], i);
+ 
++	register_syscore_ops(&jz4740_gpio_syscore_ops);
++
+ 	printk(KERN_INFO "JZ4740 GPIO initialized\n");
+ 
+ 	return 0;
+diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
+index 581531d..8e073d8 100644
+--- a/arch/sparc/mm/init_64.c
++++ b/arch/sparc/mm/init_64.c
+@@ -511,6 +511,11 @@ static void __init read_obp_translations(void)
+ 		for (i = 0; i < prom_trans_ents; i++)
+ 			prom_trans[i].data &= ~0x0003fe0000000000UL;
+ 	}
++
++	/* Force execute bit on.  */
++	for (i = 0; i < prom_trans_ents; i++)
++		prom_trans[i].data |= (tlb_type == hypervisor ?
++				       _PAGE_EXEC_4V : _PAGE_EXEC_4U);
+ }
+ 
+ static void __init hypervisor_tlb_lock(unsigned long vaddr,
+diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
+index 68c3c13..50b3f14 100644
+--- a/arch/x86/pci/acpi.c
++++ b/arch/x86/pci/acpi.c
+@@ -43,6 +43,17 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
+ 			DMI_MATCH(DMI_PRODUCT_NAME, "ALiveSATA2-GLAN"),
+                 },
+         },
++	/* https://bugzilla.kernel.org/show_bug.cgi?id=30552 */
++	/* 2006 AMD HT/VIA system with two host bridges */
++	{
++		.callback = set_use_crs,
++		.ident = "ASUS M2V-MX SE",
++		.matches = {
++			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
++			DMI_MATCH(DMI_BOARD_NAME, "M2V-MX SE"),
++			DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
++		},
++	},
+ 	{}
+ };
+ 
+diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
+index cab6960..1e9ab9b 100644
+--- a/drivers/ata/ahci.c
++++ b/drivers/ata/ahci.c
+@@ -812,6 +812,18 @@ static bool ahci_sb600_enable_64bit(struct pci_dev *pdev)
+ 				DMI_MATCH(DMI_BOARD_NAME, "MS-7376"),
+ 			},
+ 		},
++		/*
++		 * All BIOS versions for the Asus M3A support 64bit DMA.
++		 * (all release versions from 0301 to 1206 were tested)
++		 */
++		{
++			.ident = "ASUS M3A",
++			.matches = {
++				DMI_MATCH(DMI_BOARD_VENDOR,
++					  "ASUSTeK Computer INC."),
++				DMI_MATCH(DMI_BOARD_NAME, "M3A"),
++			},
++		},
+ 		{ }
+ 	};
+ 	const struct dmi_system_id *match;
+diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c
+index 7ad43c6..79e8ebc 100644
+--- a/drivers/gpu/drm/radeon/atombios_dp.c
++++ b/drivers/gpu/drm/radeon/atombios_dp.c
+@@ -115,6 +115,7 @@ static int radeon_dp_aux_native_write(struct radeon_connector *radeon_connector,
+ 	u8 msg[20];
+ 	int msg_bytes = send_bytes + 4;
+ 	u8 ack;
++	unsigned retry;
+ 
+ 	if (send_bytes > 16)
+ 		return -1;
+@@ -125,20 +126,22 @@ static int radeon_dp_aux_native_write(struct radeon_connector *radeon_connector,
+ 	msg[3] = (msg_bytes << 4) | (send_bytes - 1);
+ 	memcpy(&msg[4], send, send_bytes);
+ 
+-	while (1) {
++	for (retry = 0; retry < 4; retry++) {
+ 		ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
+ 					    msg, msg_bytes, NULL, 0, delay, &ack);
+-		if (ret < 0)
++		if (ret == -EBUSY)
++			continue;
++		else if (ret < 0)
+ 			return ret;
+ 		if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
+-			break;
++			return send_bytes;
+ 		else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER)
+ 			udelay(400);
+ 		else
+ 			return -EIO;
+ 	}
+ 
+-	return send_bytes;
++	return -EIO;
+ }
+ 
+ static int radeon_dp_aux_native_read(struct radeon_connector *radeon_connector,
+@@ -149,26 +152,31 @@ static int radeon_dp_aux_native_read(struct radeon_connector *radeon_connector,
+ 	int msg_bytes = 4;
+ 	u8 ack;
+ 	int ret;
++	unsigned retry;
+ 
+ 	msg[0] = address;
+ 	msg[1] = address >> 8;
+ 	msg[2] = AUX_NATIVE_READ << 4;
+ 	msg[3] = (msg_bytes << 4) | (recv_bytes - 1);
+ 
+-	while (1) {
++	for (retry = 0; retry < 4; retry++) {
+ 		ret = radeon_process_aux_ch(dig_connector->dp_i2c_bus,
+ 					    msg, msg_bytes, recv, recv_bytes, delay, &ack);
+-		if (ret == 0)
+-			return -EPROTO;
+-		if (ret < 0)
++		if (ret == -EBUSY)
++			continue;
++		else if (ret < 0)
+ 			return ret;
+ 		if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_ACK)
+ 			return ret;
+ 		else if ((ack & AUX_NATIVE_REPLY_MASK) == AUX_NATIVE_REPLY_DEFER)
+ 			udelay(400);
++		else if (ret == 0)
++			return -EPROTO;
+ 		else
+ 			return -EIO;
+ 	}
++
++	return -EIO;
+ }
+ 
+ static void radeon_write_dpcd_reg(struct radeon_connector *radeon_connector,
+@@ -232,7 +240,9 @@ int radeon_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode,
+ 	for (retry = 0; retry < 4; retry++) {
+ 		ret = radeon_process_aux_ch(auxch,
+ 					    msg, msg_bytes, reply, reply_bytes, 0, &ack);
+-		if (ret < 0) {
++		if (ret == -EBUSY)
++			continue;
++		else if (ret < 0) {
+ 			DRM_DEBUG_KMS("aux_ch failed %d\n", ret);
+ 			return ret;
+ 		}
+diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
+index c975581..ea7a24e 100644
+--- a/drivers/gpu/drm/radeon/evergreen.c
++++ b/drivers/gpu/drm/radeon/evergreen.c
+@@ -1593,48 +1593,6 @@ static u32 evergreen_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
+ 	return backend_map;
+ }
+ 
+-static void evergreen_program_channel_remap(struct radeon_device *rdev)
+-{
+-	u32 tcp_chan_steer_lo, tcp_chan_steer_hi, mc_shared_chremap, tmp;
+-
+-	tmp = RREG32(MC_SHARED_CHMAP);
+-	switch ((tmp & NOOFCHAN_MASK) >> NOOFCHAN_SHIFT) {
+-	case 0:
+-	case 1:
+-	case 2:
+-	case 3:
+-	default:
+-		/* default mapping */
+-		mc_shared_chremap = 0x00fac688;
+-		break;
+-	}
+-
+-	switch (rdev->family) {
+-	case CHIP_HEMLOCK:
+-	case CHIP_CYPRESS:
+-	case CHIP_BARTS:
+-		tcp_chan_steer_lo = 0x54763210;
+-		tcp_chan_steer_hi = 0x0000ba98;
+-		break;
+-	case CHIP_JUNIPER:
+-	case CHIP_REDWOOD:
+-	case CHIP_CEDAR:
+-	case CHIP_PALM:
+-	case CHIP_SUMO:
+-	case CHIP_SUMO2:
+-	case CHIP_TURKS:
+-	case CHIP_CAICOS:
+-	default:
+-		tcp_chan_steer_lo = 0x76543210;
+-		tcp_chan_steer_hi = 0x0000ba98;
+-		break;
+-	}
+-
+-	WREG32(TCP_CHAN_STEER_LO, tcp_chan_steer_lo);
+-	WREG32(TCP_CHAN_STEER_HI, tcp_chan_steer_hi);
+-	WREG32(MC_SHARED_CHREMAP, mc_shared_chremap);
+-}
+-
+ static void evergreen_gpu_init(struct radeon_device *rdev)
+ {
+ 	u32 cc_rb_backend_disable = 0;
+@@ -2080,8 +2038,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
+ 	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
+ 	WREG32(HDP_ADDR_CONFIG, gb_addr_config);
+ 
+-	evergreen_program_channel_remap(rdev);
+-
+ 	num_shader_engines = ((RREG32(GB_ADDR_CONFIG) & NUM_SHADER_ENGINES(3)) >> 12) + 1;
+ 	grbm_gfx_index = INSTANCE_BROADCAST_WRITES;
+ 
+diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
+index 0b132a3..0c460c4 100644
+--- a/drivers/gpu/drm/radeon/ni.c
++++ b/drivers/gpu/drm/radeon/ni.c
+@@ -569,36 +569,6 @@ static u32 cayman_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
+ 	return backend_map;
+ }
+ 
+-static void cayman_program_channel_remap(struct radeon_device *rdev)
+-{
+-	u32 tcp_chan_steer_lo, tcp_chan_steer_hi, mc_shared_chremap, tmp;
+-
+-	tmp = RREG32(MC_SHARED_CHMAP);
+-	switch ((tmp & NOOFCHAN_MASK) >> NOOFCHAN_SHIFT) {
+-	case 0:
+-	case 1:
+-	case 2:
+-	case 3:
+-	default:
+-		/* default mapping */
+-		mc_shared_chremap = 0x00fac688;
+-		break;
+-	}
+-
+-	switch (rdev->family) {
+-	case CHIP_CAYMAN:
+-	default:
+-		//tcp_chan_steer_lo = 0x54763210
+-		tcp_chan_steer_lo = 0x76543210;
+-		tcp_chan_steer_hi = 0x0000ba98;
+-		break;
+-	}
+-
+-	WREG32(TCP_CHAN_STEER_LO, tcp_chan_steer_lo);
+-	WREG32(TCP_CHAN_STEER_HI, tcp_chan_steer_hi);
+-	WREG32(MC_SHARED_CHREMAP, mc_shared_chremap);
+-}
+-
+ static u32 cayman_get_disable_mask_per_asic(struct radeon_device *rdev,
+ 					    u32 disable_mask_per_se,
+ 					    u32 max_disable_mask_per_se,
+@@ -841,8 +811,6 @@ static void cayman_gpu_init(struct radeon_device *rdev)
+ 	WREG32(DMIF_ADDR_CONFIG, gb_addr_config);
+ 	WREG32(HDP_ADDR_CONFIG, gb_addr_config);
+ 
+-	cayman_program_channel_remap(rdev);
+-
+ 	/* primary versions */
+ 	WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable);
+ 	WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable);
+diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
+index d1b36f8..05b8b2c 100644
+--- a/drivers/gpu/drm/radeon/radeon_connectors.c
++++ b/drivers/gpu/drm/radeon/radeon_connectors.c
+@@ -68,11 +68,11 @@ void radeon_connector_hotplug(struct drm_connector *connector)
+ 	if (connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort) {
+ 		int saved_dpms = connector->dpms;
+ 
+-		if (radeon_hpd_sense(rdev, radeon_connector->hpd.hpd) &&
+-		    radeon_dp_needs_link_train(radeon_connector))
+-			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+-		else
++		/* Only turn off the display it it's physically disconnected */
++		if (!radeon_hpd_sense(rdev, radeon_connector->hpd.hpd))
+ 			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_OFF);
++		else if (radeon_dp_needs_link_train(radeon_connector))
++			drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
+ 		connector->dpms = saved_dpms;
+ 	}
+ }
+diff --git a/drivers/gpu/drm/radeon/radeon_cursor.c b/drivers/gpu/drm/radeon/radeon_cursor.c
+index 3189a7e..f59a682 100644
+--- a/drivers/gpu/drm/radeon/radeon_cursor.c
++++ b/drivers/gpu/drm/radeon/radeon_cursor.c
+@@ -208,6 +208,13 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
+ 	int xorigin = 0, yorigin = 0;
+ 	int w = radeon_crtc->cursor_width;
+ 
++	if (ASIC_IS_AVIVO(rdev)) {
++		/* avivo cursor are offset into the total surface */
++		x += crtc->x;
++		y += crtc->y;
++	}
++	DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y);
++
+ 	if (x < 0)
+ 		xorigin = -x + 1;
+ 	if (y < 0)
+@@ -221,11 +228,6 @@ int radeon_crtc_cursor_move(struct drm_crtc *crtc,
+ 		int i = 0;
+ 		struct drm_crtc *crtc_p;
+ 
+-		/* avivo cursor are offset into the total surface */
+-		x += crtc->x;
+-		y += crtc->y;
+-		DRM_DEBUG("x %d y %d c->x %d c->y %d\n", x, y, crtc->x, crtc->y);
+-
+ 		/* avivo cursor image can't end on 128 pixel boundary or
+ 		 * go past the end of the frame if both crtcs are enabled
+ 		 */
+diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
+index 13690f3..8a171b2 100644
+--- a/drivers/gpu/drm/radeon/radeon_encoders.c
++++ b/drivers/gpu/drm/radeon/radeon_encoders.c
+@@ -1755,9 +1755,12 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)
+ 	/* DCE4/5 */
+ 	if (ASIC_IS_DCE4(rdev)) {
+ 		dig = radeon_encoder->enc_priv;
+-		if (ASIC_IS_DCE41(rdev))
+-			return radeon_crtc->crtc_id;
+-		else {
++		if (ASIC_IS_DCE41(rdev)) {
++			if (dig->linkb)
++				return 1;
++			else
++				return 0;
++		} else {
+ 			switch (radeon_encoder->encoder_id) {
+ 			case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+ 				if (dig->linkb)
+diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
+index 4de5189..f2516e6 100644
+--- a/drivers/gpu/drm/radeon/rv770.c
++++ b/drivers/gpu/drm/radeon/rv770.c
+@@ -536,55 +536,6 @@ static u32 r700_get_tile_pipe_to_backend_map(struct radeon_device *rdev,
+ 	return backend_map;
+ }
+ 
+-static void rv770_program_channel_remap(struct radeon_device *rdev)
+-{
+-	u32 tcp_chan_steer, mc_shared_chremap, tmp;
+-	bool force_no_swizzle;
+-
+-	switch (rdev->family) {
+-	case CHIP_RV770:
+-	case CHIP_RV730:
+-		force_no_swizzle = false;
+-		break;
+-	case CHIP_RV710:
+-	case CHIP_RV740:
+-	default:
+-		force_no_swizzle = true;
+-		break;
+-	}
+-
+-	tmp = RREG32(MC_SHARED_CHMAP);
+-	switch ((tmp & NOOFCHAN_MASK) >> NOOFCHAN_SHIFT) {
+-	case 0:
+-	case 1:
+-	default:
+-		/* default mapping */
+-		mc_shared_chremap = 0x00fac688;
+-		break;
+-	case 2:
+-	case 3:
+-		if (force_no_swizzle)
+-			mc_shared_chremap = 0x00fac688;
+-		else
+-			mc_shared_chremap = 0x00bbc298;
+-		break;
+-	}
+-
+-	if (rdev->family == CHIP_RV740)
+-		tcp_chan_steer = 0x00ef2a60;
+-	else
+-		tcp_chan_steer = 0x00fac688;
+-
+-	/* RV770 CE has special chremap setup */
+-	if (rdev->pdev->device == 0x944e) {
+-		tcp_chan_steer = 0x00b08b08;
+-		mc_shared_chremap = 0x00b08b08;
+-	}
+-
+-	WREG32(TCP_CHAN_STEER, tcp_chan_steer);
+-	WREG32(MC_SHARED_CHREMAP, mc_shared_chremap);
+-}
+-
+ static void rv770_gpu_init(struct radeon_device *rdev)
+ {
+ 	int i, j, num_qd_pipes;
+@@ -784,8 +735,6 @@ static void rv770_gpu_init(struct radeon_device *rdev)
+ 	WREG32(DCP_TILING_CONFIG, (gb_tiling_config & 0xffff));
+ 	WREG32(HDP_TILING_CONFIG, (gb_tiling_config & 0xffff));
+ 
+-	rv770_program_channel_remap(rdev);
+-
+ 	WREG32(CC_RB_BACKEND_DISABLE,      cc_rb_backend_disable);
+ 	WREG32(CC_GC_SHADER_PIPE_CONFIG,   cc_gc_shader_pipe_config);
+ 	WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config);
+diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
+index 2747980..16f69be 100644
+--- a/drivers/ide/ide-disk.c
++++ b/drivers/ide/ide-disk.c
+@@ -435,7 +435,12 @@ static int idedisk_prep_fn(struct request_queue *q, struct request *rq)
+ 	if (!(rq->cmd_flags & REQ_FLUSH))
+ 		return BLKPREP_OK;
+ 
+-	cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
++	if (rq->special) {
++		cmd = rq->special;
++		memset(cmd, 0, sizeof(*cmd));
++	} else {
++		cmd = kzalloc(sizeof(*cmd), GFP_ATOMIC);
++	}
+ 
+ 	/* FIXME: map struct ide_taskfile on rq->cmd[] */
+ 	BUG_ON(cmd == NULL);
+diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
+index 451c3bb..ebdae6e 100644
+--- a/drivers/md/dm-table.c
++++ b/drivers/md/dm-table.c
+@@ -1184,14 +1184,15 @@ static void dm_table_set_integrity(struct dm_table *t)
+ 		return;
+ 
+ 	template_disk = dm_table_get_integrity_disk(t, true);
+-	if (!template_disk &&
+-	    blk_integrity_is_initialized(dm_disk(t->md))) {
++	if (template_disk)
++		blk_integrity_register(dm_disk(t->md),
++				       blk_get_integrity(template_disk));
++	else if (blk_integrity_is_initialized(dm_disk(t->md)))
+ 		DMWARN("%s: device no longer has a valid integrity profile",
+ 		       dm_device_name(t->md));
+-		return;
+-	}
+-	blk_integrity_register(dm_disk(t->md),
+-			       blk_get_integrity(template_disk));
++	else
++		DMWARN("%s: unable to establish an integrity profile",
++		       dm_device_name(t->md));
+ }
+ 
+ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
+diff --git a/drivers/md/md.c b/drivers/md/md.c
+index 8554082..bc83428 100644
+--- a/drivers/md/md.c
++++ b/drivers/md/md.c
+@@ -61,6 +61,11 @@
+ static void autostart_arrays(int part);
+ #endif
+ 
++/* pers_list is a list of registered personalities protected
++ * by pers_lock.
++ * pers_lock does extra service to protect accesses to
++ * mddev->thread when the mutex cannot be held.
++ */
+ static LIST_HEAD(pers_list);
+ static DEFINE_SPINLOCK(pers_lock);
+ 
+@@ -690,7 +695,12 @@ static void mddev_unlock(mddev_t * mddev)
+ 	} else
+ 		mutex_unlock(&mddev->reconfig_mutex);
+ 
++	/* was we've dropped the mutex we need a spinlock to
++	 * make sur the thread doesn't disappear
++	 */
++	spin_lock(&pers_lock);
+ 	md_wakeup_thread(mddev->thread);
++	spin_unlock(&pers_lock);
+ }
+ 
+ static mdk_rdev_t * find_rdev_nr(mddev_t *mddev, int nr)
+@@ -6186,11 +6196,18 @@ mdk_thread_t *md_register_thread(void (*run) (mddev_t *), mddev_t *mddev,
+ 	return thread;
+ }
+ 
+-void md_unregister_thread(mdk_thread_t *thread)
++void md_unregister_thread(mdk_thread_t **threadp)
+ {
++	mdk_thread_t *thread = *threadp;
+ 	if (!thread)
+ 		return;
+ 	dprintk("interrupting MD-thread pid %d\n", task_pid_nr(thread->tsk));
++	/* Locking ensures that mddev_unlock does not wake_up a
++	 * non-existent thread
++	 */
++	spin_lock(&pers_lock);
++	*threadp = NULL;
++	spin_unlock(&pers_lock);
+ 
+ 	kthread_stop(thread->tsk);
+ 	kfree(thread);
+@@ -7125,8 +7142,7 @@ static void reap_sync_thread(mddev_t *mddev)
+ 	mdk_rdev_t *rdev;
+ 
+ 	/* resync has finished, collect result */
+-	md_unregister_thread(mddev->sync_thread);
+-	mddev->sync_thread = NULL;
++	md_unregister_thread(&mddev->sync_thread);
+ 	if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) &&
+ 	    !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {
+ 		/* success...*/
+diff --git a/drivers/md/md.h b/drivers/md/md.h
+index 1c26c7a..ce4e328 100644
+--- a/drivers/md/md.h
++++ b/drivers/md/md.h
+@@ -475,7 +475,7 @@ extern int register_md_personality(struct mdk_personality *p);
+ extern int unregister_md_personality(struct mdk_personality *p);
+ extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev),
+ 				mddev_t *mddev, const char *name);
+-extern void md_unregister_thread(mdk_thread_t *thread);
++extern void md_unregister_thread(mdk_thread_t **threadp);
+ extern void md_wakeup_thread(mdk_thread_t *thread);
+ extern void md_check_recovery(mddev_t *mddev);
+ extern void md_write_start(mddev_t *mddev, struct bio *bi);
+diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
+index 3535c23..d5b5fb3 100644
+--- a/drivers/md/multipath.c
++++ b/drivers/md/multipath.c
+@@ -514,8 +514,7 @@ static int multipath_stop (mddev_t *mddev)
+ {
+ 	multipath_conf_t *conf = mddev->private;
+ 
+-	md_unregister_thread(mddev->thread);
+-	mddev->thread = NULL;
++	md_unregister_thread(&mddev->thread);
+ 	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
+ 	mempool_destroy(conf->pool);
+ 	kfree(conf->multipaths);
+diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
+index f7431b6..3a9e59f 100644
+--- a/drivers/md/raid1.c
++++ b/drivers/md/raid1.c
+@@ -2045,8 +2045,7 @@ static int stop(mddev_t *mddev)
+ 	raise_barrier(conf);
+ 	lower_barrier(conf);
+ 
+-	md_unregister_thread(mddev->thread);
+-	mddev->thread = NULL;
++	md_unregister_thread(&mddev->thread);
+ 	if (conf->r1bio_pool)
+ 		mempool_destroy(conf->r1bio_pool);
+ 	kfree(conf->mirrors);
+diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
+index 6e84668..17cb6ab 100644
+--- a/drivers/md/raid10.c
++++ b/drivers/md/raid10.c
+@@ -2331,7 +2331,7 @@ static int run(mddev_t *mddev)
+ 	return 0;
+ 
+ out_free_conf:
+-	md_unregister_thread(mddev->thread);
++	md_unregister_thread(&mddev->thread);
+ 	if (conf->r10bio_pool)
+ 		mempool_destroy(conf->r10bio_pool);
+ 	safe_put_page(conf->tmppage);
+@@ -2349,8 +2349,7 @@ static int stop(mddev_t *mddev)
+ 	raise_barrier(conf, 0);
+ 	lower_barrier(conf);
+ 
+-	md_unregister_thread(mddev->thread);
+-	mddev->thread = NULL;
++	md_unregister_thread(&mddev->thread);
+ 	blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/
+ 	if (conf->r10bio_pool)
+ 		mempool_destroy(conf->r10bio_pool);
+diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
+index b72edf3..2581ba1 100644
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -5162,8 +5162,7 @@ static int run(mddev_t *mddev)
+ 
+ 	return 0;
+ abort:
+-	md_unregister_thread(mddev->thread);
+-	mddev->thread = NULL;
++	md_unregister_thread(&mddev->thread);
+ 	if (conf) {
+ 		print_raid5_conf(conf);
+ 		free_conf(conf);
+@@ -5177,8 +5176,7 @@ static int stop(mddev_t *mddev)
+ {
+ 	raid5_conf_t *conf = mddev->private;
+ 
+-	md_unregister_thread(mddev->thread);
+-	mddev->thread = NULL;
++	md_unregister_thread(&mddev->thread);
+ 	if (mddev->queue)
+ 		mddev->queue->backing_dev_info.congested_fn = NULL;
+ 	free_conf(conf);
+diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
+index b928bc1..8b51cd6 100644
+--- a/drivers/misc/lis3lv02d/lis3lv02d.c
++++ b/drivers/misc/lis3lv02d/lis3lv02d.c
+@@ -375,12 +375,14 @@ void lis3lv02d_poweron(struct lis3lv02d *lis3)
+ 	 *      both have been read. So the value read will always be correct.
+ 	 * Set BOOT bit to refresh factory tuning values.
+ 	 */
+-	lis3->read(lis3, CTRL_REG2, &reg);
+-	if (lis3->whoami ==  WAI_12B)
+-		reg |= CTRL2_BDU | CTRL2_BOOT;
+-	else
+-		reg |= CTRL2_BOOT_8B;
+-	lis3->write(lis3, CTRL_REG2, reg);
++	if (lis3->pdata) {
++		lis3->read(lis3, CTRL_REG2, &reg);
++		if (lis3->whoami ==  WAI_12B)
++			reg |= CTRL2_BDU | CTRL2_BOOT;
++		else
++			reg |= CTRL2_BOOT_8B;
++		lis3->write(lis3, CTRL_REG2, reg);
++	}
+ 
+ 	/* LIS3 power on delay is quite long */
+ 	msleep(lis3->pwron_delay / lis3lv02d_get_odr());
+diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
+index 99d39a6..d513d47 100644
+--- a/drivers/mmc/host/mxs-mmc.c
++++ b/drivers/mmc/host/mxs-mmc.c
+@@ -564,40 +564,38 @@ static void mxs_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
+ 
+ static void mxs_mmc_set_clk_rate(struct mxs_mmc_host *host, unsigned int rate)
+ {
+-	unsigned int ssp_rate, bit_rate;
+-	u32 div1, div2;
++	unsigned int ssp_clk, ssp_sck;
++	u32 clock_divide, clock_rate;
+ 	u32 val;
+ 
+-	ssp_rate = clk_get_rate(host->clk);
++	ssp_clk = clk_get_rate(host->clk);
+ 
+-	for (div1 = 2; div1 < 254; div1 += 2) {
+-		div2 = ssp_rate / rate / div1;
+-		if (div2 < 0x100)
++	for (clock_divide = 2; clock_divide <= 254; clock_divide += 2) {
++		clock_rate = DIV_ROUND_UP(ssp_clk, rate * clock_divide);
++		clock_rate = (clock_rate > 0) ? clock_rate - 1 : 0;
++		if (clock_rate <= 255)
+ 			break;
+ 	}
+ 
+-	if (div1 >= 254) {
++	if (clock_divide > 254) {
+ 		dev_err(mmc_dev(host->mmc),
+ 			"%s: cannot set clock to %d\n", __func__, rate);
+ 		return;
+ 	}
+ 
+-	if (div2 == 0)
+-		bit_rate = ssp_rate / div1;
+-	else
+-		bit_rate = ssp_rate / div1 / div2;
++	ssp_sck = ssp_clk / clock_divide / (1 + clock_rate);
+ 
+ 	val = readl(host->base + HW_SSP_TIMING);
+ 	val &= ~(BM_SSP_TIMING_CLOCK_DIVIDE | BM_SSP_TIMING_CLOCK_RATE);
+-	val |= BF_SSP(div1, TIMING_CLOCK_DIVIDE);
+-	val |= BF_SSP(div2 - 1, TIMING_CLOCK_RATE);
++	val |= BF_SSP(clock_divide, TIMING_CLOCK_DIVIDE);
++	val |= BF_SSP(clock_rate, TIMING_CLOCK_RATE);
+ 	writel(val, host->base + HW_SSP_TIMING);
+ 
+-	host->clk_rate = bit_rate;
++	host->clk_rate = ssp_sck;
+ 
+ 	dev_dbg(mmc_dev(host->mmc),
+-		"%s: div1 %d, div2 %d, ssp %d, bit %d, rate %d\n",
+-		__func__, div1, div2, ssp_rate, bit_rate, rate);
++		"%s: clock_divide %d, clock_rate %d, ssp_clk %d, rate_actual %d, rate_requested %d\n",
++		__func__, clock_divide, clock_rate, ssp_clk, ssp_sck, rate);
+ }
+ 
+ static void mxs_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
+diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
+index 3369d1f..ee77b94 100644
+--- a/drivers/net/e1000e/ich8lan.c
++++ b/drivers/net/e1000e/ich8lan.c
+@@ -137,8 +137,9 @@
+ #define HV_PM_CTRL		PHY_REG(770, 17)
+ 
+ /* PHY Low Power Idle Control */
+-#define I82579_LPI_CTRL			PHY_REG(772, 20)
+-#define I82579_LPI_CTRL_ENABLE_MASK	0x6000
++#define I82579_LPI_CTRL				PHY_REG(772, 20)
++#define I82579_LPI_CTRL_ENABLE_MASK		0x6000
++#define I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT	0x80
+ 
+ /* EMI Registers */
+ #define I82579_EMI_ADDR         0x10
+@@ -1611,6 +1612,7 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
+ 	s32 ret_val = 0;
+ 	u16 status_reg = 0;
+ 	u32 mac_reg;
++	u16 phy_reg;
+ 
+ 	if (hw->mac.type != e1000_pch2lan)
+ 		goto out;
+@@ -1625,12 +1627,19 @@ static s32 e1000_k1_workaround_lv(struct e1000_hw *hw)
+ 		mac_reg = er32(FEXTNVM4);
+ 		mac_reg &= ~E1000_FEXTNVM4_BEACON_DURATION_MASK;
+ 
+-		if (status_reg & HV_M_STATUS_SPEED_1000)
++		ret_val = e1e_rphy(hw, I82579_LPI_CTRL, &phy_reg);
++		if (ret_val)
++			goto out;
++
++		if (status_reg & HV_M_STATUS_SPEED_1000) {
+ 			mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_8USEC;
+-		else
++			phy_reg &= ~I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
++		} else {
+ 			mac_reg |= E1000_FEXTNVM4_BEACON_DURATION_16USEC;
+-
++			phy_reg |= I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT;
++		}
+ 		ew32(FEXTNVM4, mac_reg);
++		ret_val = e1e_wphy(hw, I82579_LPI_CTRL, phy_reg);
+ 	}
+ 
+ out:
+diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
+index ab8c16f..2886d25 100644
+--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
++++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
+@@ -556,15 +556,21 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+ 			       bool local)
+ {
+ 	struct ieee80211_tx_info *tx_info;
+-	struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);
++	struct queue_entry *entry;
+ 	struct txentry_desc txdesc;
+ 	struct skb_frame_desc *skbdesc;
+ 	u8 rate_idx, rate_flags;
++	int ret = 0;
++
++	spin_lock(&queue->tx_lock);
++
++	entry = rt2x00queue_get_entry(queue, Q_INDEX);
+ 
+ 	if (unlikely(rt2x00queue_full(queue))) {
+ 		ERROR(queue->rt2x00dev,
+ 		      "Dropping frame due to full tx queue %d.\n", queue->qid);
+-		return -ENOBUFS;
++		ret = -ENOBUFS;
++		goto out;
+ 	}
+ 
+ 	if (unlikely(test_and_set_bit(ENTRY_OWNER_DEVICE_DATA,
+@@ -573,7 +579,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+ 		      "Arrived at non-free entry in the non-full queue %d.\n"
+ 		      "Please file bug report to %s.\n",
+ 		      queue->qid, DRV_PROJECT);
+-		return -EINVAL;
++		ret = -EINVAL;
++		goto out;
+ 	}
+ 
+ 	/*
+@@ -635,7 +642,8 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+ 	if (unlikely(rt2x00queue_write_tx_data(entry, &txdesc))) {
+ 		clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);
+ 		entry->skb = NULL;
+-		return -EIO;
++		ret = -EIO;
++		goto out;
+ 	}
+ 
+ 	set_bit(ENTRY_DATA_PENDING, &entry->flags);
+@@ -644,7 +652,9 @@ int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb,
+ 	rt2x00queue_write_tx_descriptor(entry, &txdesc);
+ 	rt2x00queue_kick_tx_queue(queue, &txdesc);
+ 
+-	return 0;
++out:
++	spin_unlock(&queue->tx_lock);
++	return ret;
+ }
+ 
+ int rt2x00queue_clear_beacon(struct rt2x00_dev *rt2x00dev,
+@@ -1185,6 +1195,7 @@ static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
+ 			     struct data_queue *queue, enum data_queue_qid qid)
+ {
+ 	mutex_init(&queue->status_lock);
++	spin_lock_init(&queue->tx_lock);
+ 	spin_lock_init(&queue->index_lock);
+ 
+ 	queue->rt2x00dev = rt2x00dev;
+diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h
+index 167d458..ad3d527 100644
+--- a/drivers/net/wireless/rt2x00/rt2x00queue.h
++++ b/drivers/net/wireless/rt2x00/rt2x00queue.h
+@@ -432,6 +432,7 @@ enum data_queue_flags {
+  * @flags: Entry flags, see &enum queue_entry_flags.
+  * @status_lock: The mutex for protecting the start/stop/flush
+  *	handling on this queue.
++ * @tx_lock: Spinlock to serialize tx operations on this queue.
+  * @index_lock: Spinlock to protect index handling. Whenever @index, @index_done or
+  *	@index_crypt needs to be changed this lock should be grabbed to prevent
+  *	index corruption due to concurrency.
+@@ -458,6 +459,7 @@ struct data_queue {
+ 	unsigned long flags;
+ 
+ 	struct mutex status_lock;
++	spinlock_t tx_lock;
+ 	spinlock_t index_lock;
+ 
+ 	unsigned int count;
+diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
+index c9e3dc0..16ad97d 100644
+--- a/drivers/scsi/libsas/sas_expander.c
++++ b/drivers/scsi/libsas/sas_expander.c
+@@ -1769,10 +1769,12 @@ static void sas_unregister_devs_sas_addr(struct domain_device *parent,
+ 		sas_disable_routing(parent, phy->attached_sas_addr);
+ 	}
+ 	memset(phy->attached_sas_addr, 0, SAS_ADDR_SIZE);
+-	sas_port_delete_phy(phy->port, phy->phy);
+-	if (phy->port->num_phys == 0)
+-		sas_port_delete(phy->port);
+-	phy->port = NULL;
++	if (phy->port) {
++		sas_port_delete_phy(phy->port, phy->phy);
++		if (phy->port->num_phys == 0)
++			sas_port_delete(phy->port);
++		phy->port = NULL;
++	}
+ }
+ 
+ static int sas_discover_bfs_by_root_level(struct domain_device *root,
+diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
+index f461925..a2a1a83 100644
+--- a/drivers/scsi/qla2xxx/qla_os.c
++++ b/drivers/scsi/qla2xxx/qla_os.c
+@@ -1240,10 +1240,9 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
+ 					qla2x00_sp_compl(ha, sp);
+ 				} else {
+ 					ctx = sp->ctx;
+-					if (ctx->type == SRB_LOGIN_CMD ||
+-					    ctx->type == SRB_LOGOUT_CMD) {
+-						ctx->u.iocb_cmd->free(sp);
+-					} else {
++					if (ctx->type == SRB_ELS_CMD_RPT ||
++					    ctx->type == SRB_ELS_CMD_HST ||
++					    ctx->type == SRB_CT_CMD) {
+ 						struct fc_bsg_job *bsg_job =
+ 						    ctx->u.bsg_job;
+ 						if (bsg_job->request->msgcode
+@@ -1255,6 +1254,8 @@ qla2x00_abort_all_cmds(scsi_qla_host_t *vha, int res)
+ 						kfree(sp->ctx);
+ 						mempool_free(sp,
+ 							ha->srb_mempool);
++					} else {
++						ctx->u.iocb_cmd->free(sp);
+ 					}
+ 				}
+ 			}
+diff --git a/fs/exec.c b/fs/exec.c
+index 6075a1e..044c13f 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -1411,6 +1411,8 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
+ 			    printable(bprm->buf[2]) &&
+ 			    printable(bprm->buf[3]))
+ 				break; /* -ENOEXEC */
++			if (try)
++				break; /* -ENOEXEC */
+ 			request_module("binfmt-%04x", *(unsigned short *)(&bprm->buf[2]));
+ #endif
+ 		}
+diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
+index 9d88e1c..f0c0e8a 100644
+--- a/include/linux/ftrace.h
++++ b/include/linux/ftrace.h
+@@ -19,6 +19,8 @@
+ 
+ #include <asm/ftrace.h>
+ 
++struct ftrace_hash;
++
+ #ifdef CONFIG_FUNCTION_TRACER
+ 
+ extern int ftrace_enabled;
+@@ -29,8 +31,6 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
+ 
+ typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip);
+ 
+-struct ftrace_hash;
+-
+ enum {
+ 	FTRACE_OPS_FL_ENABLED		= 1 << 0,
+ 	FTRACE_OPS_FL_GLOBAL		= 1 << 1,
+@@ -123,7 +123,8 @@ stack_trace_sysctl(struct ctl_table *table, int write,
+ struct ftrace_func_command {
+ 	struct list_head	list;
+ 	char			*name;
+-	int			(*func)(char *func, char *cmd,
++	int			(*func)(struct ftrace_hash *hash,
++					char *func, char *cmd,
+ 					char *params, int enable);
+ };
+ 
+diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
+index e07e274..1dc420b 100644
+--- a/include/linux/ptp_classify.h
++++ b/include/linux/ptp_classify.h
+@@ -51,6 +51,7 @@
+ #define PTP_CLASS_V2_VLAN (PTP_CLASS_V2 | PTP_CLASS_VLAN)
+ 
+ #define PTP_EV_PORT 319
++#define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */
+ 
+ #define OFF_ETYPE	12
+ #define OFF_IHL		14
+@@ -116,14 +117,20 @@ static inline int ptp_filter_init(struct sock_filter *f, int len)
+ 	{OP_OR,		0,   0, PTP_CLASS_IPV6		}, /*              */ \
+ 	{OP_RETA,	0,   0, 0			}, /*              */ \
+ /*L3x*/	{OP_RETK,	0,   0, PTP_CLASS_NONE		}, /*              */ \
+-/*L40*/	{OP_JEQ,	0,   6, ETH_P_8021Q		}, /* f goto L50   */ \
++/*L40*/	{OP_JEQ,	0,   9, ETH_P_8021Q		}, /* f goto L50   */ \
+ 	{OP_LDH,	0,   0, OFF_ETYPE + 4		}, /*              */ \
+-	{OP_JEQ,	0,   9, ETH_P_1588		}, /* f goto L60   */ \
++	{OP_JEQ,	0,  15, ETH_P_1588		}, /* f goto L60   */ \
++	{OP_LDB,	0,   0, ETH_HLEN + VLAN_HLEN	}, /*              */ \
++	{OP_AND,	0,   0, PTP_GEN_BIT		}, /*              */ \
++	{OP_JEQ,	0,  12, 0			}, /* f goto L6x   */ \
+ 	{OP_LDH,	0,   0, ETH_HLEN + VLAN_HLEN	}, /*              */ \
+ 	{OP_AND,	0,   0, PTP_CLASS_VMASK		}, /*              */ \
+ 	{OP_OR,		0,   0, PTP_CLASS_VLAN		}, /*              */ \
+ 	{OP_RETA,	0,   0, 0			}, /*              */ \
+-/*L50*/	{OP_JEQ,	0,   4, ETH_P_1588		}, /* f goto L61   */ \
++/*L50*/	{OP_JEQ,	0,   7, ETH_P_1588		}, /* f goto L61   */ \
++	{OP_LDB,	0,   0, ETH_HLEN		}, /*              */ \
++	{OP_AND,	0,   0, PTP_GEN_BIT		}, /*              */ \
++	{OP_JEQ,	0,   4, 0			}, /* f goto L6x   */ \
+ 	{OP_LDH,	0,   0, ETH_HLEN		}, /*              */ \
+ 	{OP_AND,	0,   0, PTP_CLASS_VMASK		}, /*              */ \
+ 	{OP_OR,		0,   0, PTP_CLASS_L2		}, /*              */ \
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 14a6c7b..4ef452b 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1937,7 +1937,6 @@ static inline void disable_sched_clock_irqtime(void) {}
+ 
+ extern unsigned long long
+ task_sched_runtime(struct task_struct *task);
+-extern unsigned long long thread_group_sched_runtime(struct task_struct *task);
+ 
+ /* sched_exec is called by processes performing an exec */
+ #ifdef CONFIG_SMP
+diff --git a/include/net/ipv6.h b/include/net/ipv6.h
+index 3b5ac1f..c39121f 100644
+--- a/include/net/ipv6.h
++++ b/include/net/ipv6.h
+@@ -463,7 +463,7 @@ static inline int ipv6_addr_diff(const struct in6_addr *a1, const struct in6_add
+ 	return __ipv6_addr_diff(a1, a2, sizeof(struct in6_addr));
+ }
+ 
+-extern void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt);
++extern void ipv6_select_ident(struct frag_hdr *fhdr, struct in6_addr *addr);
+ 
+ /*
+  *	Prototypes exported by ipv6
+diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
+index 58f405b..c8008dd 100644
+--- a/kernel/posix-cpu-timers.c
++++ b/kernel/posix-cpu-timers.c
+@@ -250,7 +250,7 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times)
+ 	do {
+ 		times->utime = cputime_add(times->utime, t->utime);
+ 		times->stime = cputime_add(times->stime, t->stime);
+-		times->sum_exec_runtime += t->se.sum_exec_runtime;
++		times->sum_exec_runtime += task_sched_runtime(t);
+ 	} while_each_thread(tsk, t);
+ out:
+ 	rcu_read_unlock();
+@@ -312,7 +312,8 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
+ 		cpu->cpu = cputime.utime;
+ 		break;
+ 	case CPUCLOCK_SCHED:
+-		cpu->sched = thread_group_sched_runtime(p);
++		thread_group_cputime(p, &cputime);
++		cpu->sched = cputime.sum_exec_runtime;
+ 		break;
+ 	}
+ 	return 0;
+diff --git a/kernel/sched.c b/kernel/sched.c
+index 8b37360..063d7a4 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -3713,30 +3713,6 @@ unsigned long long task_sched_runtime(struct task_struct *p)
+ }
+ 
+ /*
+- * Return sum_exec_runtime for the thread group.
+- * In case the task is currently running, return the sum plus current's
+- * pending runtime that have not been accounted yet.
+- *
+- * Note that the thread group might have other running tasks as well,
+- * so the return value not includes other pending runtime that other
+- * running tasks might have.
+- */
+-unsigned long long thread_group_sched_runtime(struct task_struct *p)
+-{
+-	struct task_cputime totals;
+-	unsigned long flags;
+-	struct rq *rq;
+-	u64 ns;
+-
+-	rq = task_rq_lock(p, &flags);
+-	thread_group_cputime(p, &totals);
+-	ns = totals.sum_exec_runtime + do_task_delta_exec(p, rq);
+-	task_rq_unlock(rq, p, &flags);
+-
+-	return ns;
+-}
+-
+-/*
+  * Account user cpu time to a process.
+  * @p: the process that the cpu time gets accounted to
+  * @cputime: the cpu time spent in user space since the last update
+@@ -4335,7 +4311,7 @@ static inline void sched_submit_work(struct task_struct *tsk)
+ 		blk_schedule_flush_plug(tsk);
+ }
+ 
+-asmlinkage void schedule(void)
++asmlinkage void __sched schedule(void)
+ {
+ 	struct task_struct *tsk = current;
+ 
+diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c
+index 10d0182..17f2319 100644
+--- a/kernel/sched_rt.c
++++ b/kernel/sched_rt.c
+@@ -1038,7 +1038,7 @@ select_task_rq_rt(struct task_struct *p, int sd_flag, int flags)
+ 	 */
+ 	if (curr && unlikely(rt_task(curr)) &&
+ 	    (curr->rt.nr_cpus_allowed < 2 ||
+-	     curr->prio < p->prio) &&
++	     curr->prio <= p->prio) &&
+ 	    (p->rt.nr_cpus_allowed > 1)) {
+ 		int target = find_lowest_rq(p);
+ 
+@@ -1569,7 +1569,7 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p)
+ 	    p->rt.nr_cpus_allowed > 1 &&
+ 	    rt_task(rq->curr) &&
+ 	    (rq->curr->rt.nr_cpus_allowed < 2 ||
+-	     rq->curr->prio < p->prio))
++	     rq->curr->prio <= p->prio))
+ 		push_rt_tasks(rq);
+ }
+ 
+diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
+index 908038f..ef9271b 100644
+--- a/kernel/trace/ftrace.c
++++ b/kernel/trace/ftrace.c
+@@ -1744,10 +1744,36 @@ static cycle_t		ftrace_update_time;
+ static unsigned long	ftrace_update_cnt;
+ unsigned long		ftrace_update_tot_cnt;
+ 
++static int ops_traces_mod(struct ftrace_ops *ops)
++{
++	struct ftrace_hash *hash;
++
++	hash = ops->filter_hash;
++	return !!(!hash || !hash->count);
++}
++
+ static int ftrace_update_code(struct module *mod)
+ {
+ 	struct dyn_ftrace *p;
+ 	cycle_t start, stop;
++	unsigned long ref = 0;
++
++	/*
++	 * When adding a module, we need to check if tracers are
++	 * currently enabled and if they are set to trace all functions.
++	 * If they are, we need to enable the module functions as well
++	 * as update the reference counts for those function records.
++	 */
++	if (mod) {
++		struct ftrace_ops *ops;
++
++		for (ops = ftrace_ops_list;
++		     ops != &ftrace_list_end; ops = ops->next) {
++			if (ops->flags & FTRACE_OPS_FL_ENABLED &&
++			    ops_traces_mod(ops))
++				ref++;
++		}
++	}
+ 
+ 	start = ftrace_now(raw_smp_processor_id());
+ 	ftrace_update_cnt = 0;
+@@ -1760,7 +1786,7 @@ static int ftrace_update_code(struct module *mod)
+ 
+ 		p = ftrace_new_addrs;
+ 		ftrace_new_addrs = p->newlist;
+-		p->flags = 0L;
++		p->flags = ref;
+ 
+ 		/*
+ 		 * Do the initial record conversion from mcount jump
+@@ -1783,7 +1809,7 @@ static int ftrace_update_code(struct module *mod)
+ 		 * conversion puts the module to the correct state, thus
+ 		 * passing the ftrace_make_call check.
+ 		 */
+-		if (ftrace_start_up) {
++		if (ftrace_start_up && ref) {
+ 			int failed = __ftrace_replace_code(p, 1);
+ 			if (failed) {
+ 				ftrace_bug(failed, p->ip);
+@@ -2407,10 +2433,9 @@ ftrace_match_module_records(struct ftrace_hash *hash, char *buff, char *mod)
+  */
+ 
+ static int
+-ftrace_mod_callback(char *func, char *cmd, char *param, int enable)
++ftrace_mod_callback(struct ftrace_hash *hash,
++		    char *func, char *cmd, char *param, int enable)
+ {
+-	struct ftrace_ops *ops = &global_ops;
+-	struct ftrace_hash *hash;
+ 	char *mod;
+ 	int ret = -EINVAL;
+ 
+@@ -2430,11 +2455,6 @@ ftrace_mod_callback(char *func, char *cmd, char *param, int enable)
+ 	if (!strlen(mod))
+ 		return ret;
+ 
+-	if (enable)
+-		hash = ops->filter_hash;
+-	else
+-		hash = ops->notrace_hash;
+-
+ 	ret = ftrace_match_module_records(hash, func, mod);
+ 	if (!ret)
+ 		ret = -EINVAL;
+@@ -2760,7 +2780,7 @@ static int ftrace_process_regex(struct ftrace_hash *hash,
+ 	mutex_lock(&ftrace_cmd_mutex);
+ 	list_for_each_entry(p, &ftrace_commands, list) {
+ 		if (strcmp(p->name, command) == 0) {
+-			ret = p->func(func, command, next, enable);
++			ret = p->func(hash, func, command, next, enable);
+ 			goto out_unlock;
+ 		}
+ 	}
+diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
+index 8d0e1cc..c7b0c6a 100644
+--- a/kernel/trace/trace_functions.c
++++ b/kernel/trace/trace_functions.c
+@@ -324,7 +324,8 @@ ftrace_trace_onoff_unreg(char *glob, char *cmd, char *param)
+ }
+ 
+ static int
+-ftrace_trace_onoff_callback(char *glob, char *cmd, char *param, int enable)
++ftrace_trace_onoff_callback(struct ftrace_hash *hash,
++			    char *glob, char *cmd, char *param, int enable)
+ {
+ 	struct ftrace_probe_ops *ops;
+ 	void *count = (void *)-1;
+diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
+index 1661296..e17596b 100644
+--- a/net/ipv6/ip6_output.c
++++ b/net/ipv6/ip6_output.c
+@@ -620,9 +620,9 @@ static u32 __ipv6_select_ident(const struct in6_addr *addr)
+ 	return hash + newid;
+ }
+ 
+-void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
++void ipv6_select_ident(struct frag_hdr *fhdr, struct in6_addr *addr)
+ {
+-	fhdr->identification = htonl(__ipv6_select_ident(&rt->rt6i_dst.addr));
++	fhdr->identification = htonl(__ipv6_select_ident(addr));
+ }
+ 
+ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
+@@ -709,7 +709,7 @@ int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
+ 		skb_reset_network_header(skb);
+ 		memcpy(skb_network_header(skb), tmp_hdr, hlen);
+ 
+-		ipv6_select_ident(fh, rt);
++		ipv6_select_ident(fh, &rt->rt6i_dst.addr);
+ 		fh->nexthdr = nexthdr;
+ 		fh->reserved = 0;
+ 		fh->frag_off = htons(IP6_MF);
+@@ -855,7 +855,7 @@ slow_path:
+ 		fh->nexthdr = nexthdr;
+ 		fh->reserved = 0;
+ 		if (!frag_id) {
+-			ipv6_select_ident(fh, rt);
++			ipv6_select_ident(fh, &rt->rt6i_dst.addr);
+ 			frag_id = fh->identification;
+ 		} else
+ 			fh->identification = frag_id;
+@@ -1146,7 +1146,7 @@ static inline int ip6_ufo_append_data(struct sock *sk,
+ 		skb_shinfo(skb)->gso_size = (mtu - fragheaderlen -
+ 					     sizeof(struct frag_hdr)) & ~7;
+ 		skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
+-		ipv6_select_ident(&fhdr, rt);
++		ipv6_select_ident(&fhdr, &rt->rt6i_dst.addr);
+ 		skb_shinfo(skb)->ip6_frag_id = fhdr.identification;
+ 		__skb_queue_tail(&sk->sk_write_queue, skb);
+ 
+diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
+index 29213b5..0d920c5 100644
+--- a/net/ipv6/udp.c
++++ b/net/ipv6/udp.c
+@@ -1309,6 +1309,7 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, u32 features)
+ 	u8 frag_hdr_sz = sizeof(struct frag_hdr);
+ 	int offset;
+ 	__wsum csum;
++	struct rt6_info *rt = (struct rt6_info *)skb_dst(skb);
+ 
+ 	mss = skb_shinfo(skb)->gso_size;
+ 	if (unlikely(skb->len <= mss))
+@@ -1359,7 +1360,8 @@ static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, u32 features)
+ 	fptr = (struct frag_hdr *)(skb_network_header(skb) + unfrag_ip6hlen);
+ 	fptr->nexthdr = nexthdr;
+ 	fptr->reserved = 0;
+-	ipv6_select_ident(fptr, (struct rt6_info *)skb_dst(skb));
++	ipv6_select_ident(fptr,
++			  rt ? &rt->rt6i_dst.addr : &ipv6_hdr(skb)->daddr);
+ 
+ 	/* Fragment the skb. ipv6 header and the remaining fields of the
+ 	 * fragment header are updated in ipv6_gso_segment()
+diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
+index ffa2ffe..aa091a0 100644
+--- a/sound/soc/codecs/wm8753.c
++++ b/sound/soc/codecs/wm8753.c
+@@ -1454,8 +1454,8 @@ static int wm8753_probe(struct snd_soc_codec *codec)
+ 	/* set the update bits */
+ 	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);
+ 	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);
+-	snd_soc_update_bits(codec, WM8753_LDAC, 0x0100, 0x0100);
+-	snd_soc_update_bits(codec, WM8753_RDAC, 0x0100, 0x0100);
++	snd_soc_update_bits(codec, WM8753_LADC, 0x0100, 0x0100);
++	snd_soc_update_bits(codec, WM8753_RADC, 0x0100, 0x0100);
+ 	snd_soc_update_bits(codec, WM8753_LOUT1V, 0x0100, 0x0100);
+ 	snd_soc_update_bits(codec, WM8753_ROUT1V, 0x0100, 0x0100);
+ 	snd_soc_update_bits(codec, WM8753_LOUT2V, 0x0100, 0x0100);
+diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
+index b644575..2b8350b 100644
+--- a/sound/soc/pxa/zylonite.c
++++ b/sound/soc/pxa/zylonite.c
+@@ -196,20 +196,20 @@ static int zylonite_probe(struct snd_soc_card *card)
+ 	if (clk_pout) {
+ 		pout = clk_get(NULL, "CLK_POUT");
+ 		if (IS_ERR(pout)) {
+-			dev_err(&pdev->dev, "Unable to obtain CLK_POUT: %ld\n",
++			dev_err(card->dev, "Unable to obtain CLK_POUT: %ld\n",
+ 				PTR_ERR(pout));
+ 			return PTR_ERR(pout);
+ 		}
+ 
+ 		ret = clk_enable(pout);
+ 		if (ret != 0) {
+-			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
++			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
+ 				ret);
+ 			clk_put(pout);
+ 			return ret;
+ 		}
+ 
+-		dev_dbg(&pdev->dev, "MCLK enabled at %luHz\n",
++		dev_dbg(card->dev, "MCLK enabled at %luHz\n",
+ 			clk_get_rate(pout));
+ 	}
+ 
+@@ -241,7 +241,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card)
+ 	if (clk_pout) {
+ 		ret = clk_enable(pout);
+ 		if (ret != 0)
+-			dev_err(&pdev->dev, "Unable to enable CLK_POUT: %d\n",
++			dev_err(card->dev, "Unable to enable CLK_POUT: %d\n",
+ 				ret);
+ 	}
+ 
diff --git a/3.0.4/4420_grsecurity-2.2.2-3.0.4-201110080819.patch b/3.0.7/4420_grsecurity-2.2.2-3.0.7-201110191214.patch
index 1cf43ab..acce39b 100644
--- a/3.0.4/4420_grsecurity-2.2.2-3.0.4-201110080819.patch
+++ b/3.0.7/4420_grsecurity-2.2.2-3.0.7-201110191214.patch
@@ -1,6 +1,328 @@
-diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/include/asm/elf.h
---- linux-3.0.4/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/Documentation/dontdiff linux-3.0.7/Documentation/dontdiff
+--- linux-3.0.7/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/Documentation/dontdiff	2011-10-07 19:07:23.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
+@@ -166,7 +172,6 @@ machtypes.h
+ map
+ map_hugetlb
+ maui_boot.h
+-media
+ mconf
+ miboot*
+ mk_elfconfig
+@@ -174,6 +179,7 @@ mkboot
+ mkbugboot
+ mkcpustr
+ mkdep
++mkpiggy
+ mkprep
+ mkregtable
+ mktables
+@@ -209,6 +215,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 +226,7 @@ setup
+ setup.bin
+ setup.elf
+ sImage
++slabinfo
+ sm_tbl*
+ split-include
+ syscalltab.h
+@@ -246,7 +254,9 @@ vmlinux
+ vmlinux-*
+ vmlinux.aout
+ vmlinux.bin.all
++vmlinux.bin.bz2
+ vmlinux.lds
++vmlinux.relocs
+ vmlinuz
+ voffset.h
+ vsyscall.lds
+@@ -254,6 +264,7 @@ vsyscall_32.lds
+ wanxlfw.inc
+ uImage
+ unifdef
++utsrelease.h
+ wakeup.bin
+ wakeup.elf
+ wakeup.lds
+diff -urNp linux-3.0.7/Documentation/kernel-parameters.txt linux-3.0.7/Documentation/kernel-parameters.txt
+--- linux-3.0.7/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/Makefile linux-3.0.7/Makefile
+--- linux-3.0.7/Makefile	2011-10-17 23:17:08.000000000 -0400
++++ linux-3.0.7/Makefile	2011-10-17 23:17:19.000000000 -0400
+@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
+ 
+ HOSTCC       = gcc
+ HOSTCXX      = g++
+-HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
+-HOSTCXXFLAGS = -O2
++HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -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
+ 
+ # 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__
+ 
+ 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,8 +410,8 @@ 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_basic gcc-plugins
++scripts_basic: gcc-plugins
+ 	$(Q)$(MAKE) $(build)=scripts/basic
+ 	$(Q)rm -f .tmp_quiet_recordmcount
+ 
+@@ -564,6 +567,36 @@ else
+ KBUILD_CFLAGS	+= -O2
+ endif
+ 
++ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
++ifdef CONFIG_PAX_MEMORY_STACKLEAK
++STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
++endif
++ifdef CONFIG_KALLOCSTAT_PLUGIN
++KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
++endif
++ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
++endif
++ifdef CONFIG_CHECKER_PLUGIN
++ifeq ($(call cc-ifversion, -ge, 0406, y), y)
++CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
++endif
++endif
++GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
++export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_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 +741,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) \
+@@ -932,6 +965,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
+ 
+ # The actual objects are generated when descending, 
+ # make sure no implicit rule kicks in
++$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
+ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
+ 
+ # Handle descending into subdirectories listed in $(vmlinux-dirs)
+@@ -941,7 +975,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
+ # Error messages still appears in the original language
+ 
+ PHONY += $(vmlinux-dirs)
+-$(vmlinux-dirs): prepare scripts
++$(vmlinux-dirs): gcc-plugins prepare scripts
+ 	$(Q)$(MAKE) $(build)=$@
+ 
+ # Store (new) KERNELRELASE string in include/config/kernel.release
+@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE
+ 	$(Q)$(MAKE) $(build)=. missing-syscalls
+ 
+ # All the preparing..
++prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
+ prepare: prepare0
+ 
+ # Generate some files
+@@ -1087,6 +1122,7 @@ all: modules
+ #	using awk while concatenating to the final file.
+ 
+ PHONY += modules
++modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
+ 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.';
+@@ -1102,7 +1138,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
+ 
+ # Target to prepare building external modules
+ PHONY += modules_prepare
+-modules_prepare: prepare scripts
++modules_prepare: gcc-plugins prepare scripts
+ 
+ # Target to install modules
+ PHONY += modules_install
+@@ -1198,7 +1234,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 -name '*.so' -o -size 0 \
+ 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
+ 		-type f -print | xargs rm -f
+ 
+@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules
+ $(module-dirs): crmodverdir $(objtree)/Module.symvers
+ 	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
+ 
++modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
+ modules: $(module-dirs)
+ 	@$(kecho) '  Building modules, stage 2.';
+ 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+@@ -1485,17 +1522,19 @@ else
+         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
+ endif
+ 
+-%.s: %.c prepare scripts FORCE
++%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.s: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.i: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.c prepare scripts FORCE
++%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.o: %.c gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.lst: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.s: %.S prepare scripts FORCE
++%.s: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+-%.o: %.S prepare scripts FORCE
++%.o: %.S gcc-plugins prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ %.symtypes: %.c prepare scripts FORCE
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+@@ -1505,11 +1544,13 @@ endif
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
+-%/: prepare scripts FORCE
++%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%/: gcc-plugins prepare scripts FORCE
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
+-%.ko: prepare scripts FORCE
++%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
++%.ko: gcc-plugins prepare scripts FORCE
+ 	$(cmd_crmodverdir)
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
+ 	$(build)=$(build-dir) $(@:.ko=.o)
+diff -urNp linux-3.0.7/arch/alpha/include/asm/elf.h linux-3.0.7/arch/alpha/include/asm/elf.h
+--- linux-3.0.7/arch/alpha/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -15,9 +337,9 @@ diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/inclu
  /* $0 is set by ld.so to a pointer to a function which might be 
     registered using atexit.  This provides a mean for the dynamic
     linker to call DT_FINI functions for shared libraries that have
-diff -urNp linux-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/include/asm/pgtable.h
---- linux-3.0.4/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/alpha/include/asm/pgtable.h linux-3.0.7/arch/alpha/include/asm/pgtable.h
+--- linux-3.0.7/arch/alpha/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -36,9 +358,9 @@ diff -urNp linux-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/i
  #define PAGE_KERNEL	__pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
  
  #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
-diff -urNp linux-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/module.c
---- linux-3.0.4/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/alpha/kernel/module.c linux-3.0.7/arch/alpha/kernel/module.c
+--- linux-3.0.7/arch/alpha/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -48,9 +370,9 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/
  	got = sechdrs[me->arch.gotsecindex].sh_addr;
  
  	for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel/osf_sys.c
---- linux-3.0.4/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/kernel/osf_sys.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/alpha/kernel/osf_sys.c linux-3.0.7/arch/alpha/kernel/osf_sys.c
+--- linux-3.0.7/arch/alpha/kernel/osf_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -82,9 +404,9 @@ diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel
  	if (addr != (unsigned long) -ENOMEM)
  		return addr;
  
-diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
---- linux-3.0.4/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/alpha/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/alpha/mm/fault.c linux-3.0.7/arch/alpha/mm/fault.c
+--- linux-3.0.7/arch/alpha/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -241,9 +563,9 @@ diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
  	} else if (!cause) {
  		/* Allow reads even for write-only mappings */
  		if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/asm/elf.h
---- linux-3.0.4/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/include/asm/elf.h linux-3.0.7/arch/arm/include/asm/elf.h
+--- linux-3.0.7/arch/arm/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.  */
@@ -271,9 +593,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/a
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/include/asm/kmap_types.h
---- linux-3.0.4/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/include/asm/kmap_types.h linux-3.0.7/arch/arm/include/asm/kmap_types.h
+--- linux-3.0.7/arch/arm/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -282,9 +604,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/include/asm/uaccess.h
---- linux-3.0.4/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/include/asm/uaccess.h linux-3.0.7/arch/arm/include/asm/uaccess.h
+--- linux-3.0.7/arch/arm/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -340,9 +662,9 @@ diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/inclu
  	if (access_ok(VERIFY_WRITE, to, n))
  		n = __copy_to_user(to, from, n);
  	return n;
-diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/armksyms.c
---- linux-3.0.4/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/armksyms.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/kernel/armksyms.c linux-3.0.7/arch/arm/kernel/armksyms.c
+--- linux-3.0.7/arch/arm/kernel/armksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -354,9 +676,9 @@ diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/ar
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/process.c
---- linux-3.0.4/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/kernel/process.c linux-3.0.7/arch/arm/kernel/process.c
+--- linux-3.0.7/arch/arm/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -378,9 +700,9 @@ diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/pro
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps.c
---- linux-3.0.4/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/kernel/traps.c linux-3.0.7/arch/arm/kernel/traps.c
+--- linux-3.0.7/arch/arm/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -400,9 +722,9 @@ diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps
  	if (ret != NOTIFY_STOP)
  		do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/copy_from_user.S
---- linux-3.0.4/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/lib/copy_from_user.S linux-3.0.7/arch/arm/lib/copy_from_user.S
+--- linux-3.0.7/arch/arm/lib/copy_from_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/arm/lib/copy_from_user.S	2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +748,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/co
  
  	.pushsection .fixup,"ax"
  	.align 0
-diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy_to_user.S
---- linux-3.0.4/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/lib/copy_to_user.S linux-3.0.7/arch/arm/lib/copy_to_user.S
+--- linux-3.0.7/arch/arm/lib/copy_to_user.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/arm/lib/copy_to_user.S	2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +774,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy
  ENDPROC(__copy_to_user_std)
  
  	.pushsection .fixup,"ax"
-diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
---- linux-3.0.4/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/lib/uaccess.S linux-3.0.7/arch/arm/lib/uaccess.S
+--- linux-3.0.7/arch/arm/lib/uaccess.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/arm/lib/uaccess.S	2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +830,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
  
  		.pushsection .fixup,"ax"
  		.align	0
-diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/arm/lib/uaccess_with_memcpy.c	2011-08-23 21:47:55.000000000 -0400
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +842,9 @@ diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/l
  {
  	/*
  	 * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.0.7/arch/arm/mach-ux500/mbox-db5500.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -532,9 +854,9 @@ diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/ma
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
---- linux-3.0.4/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/mm/fault.c linux-3.0.7/arch/arm/mm/fault.c
+--- linux-3.0.7/arch/arm/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -583,9 +905,9 @@ diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
---- linux-3.0.4/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/arm/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/arm/mm/mmap.c linux-3.0.7/arch/arm/mm/mmap.c
+--- linux-3.0.7/arch/arm/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -635,9 +957,9 @@ diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
  			/*
  			 * Remember the place where we stopped the search:
  			 */
-diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/include/asm/elf.h
---- linux-3.0.4/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/avr32/include/asm/elf.h linux-3.0.7/arch/avr32/include/asm/elf.h
+--- linux-3.0.7/arch/avr32/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.  */
@@ -654,9 +976,9 @@ diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/inclu
  
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
-diff -urNp linux-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.4/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/avr32/include/asm/kmap_types.h linux-3.0.7/arch/avr32/include/asm/kmap_types.h
+--- linux-3.0.7/arch/avr32/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -667,9 +989,9 @@ diff -urNp linux-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr3
  };
  
  #undef D
-diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/arch/avr32/mm/fault.c
---- linux-3.0.4/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/avr32/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/avr32/mm/fault.c linux-3.0.7/arch/avr32/mm/fault.c
+--- linux-3.0.7/arch/avr32/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -711,9 +1033,9 @@ diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/arch/avr32/mm/fault.c
  		if (exception_trace && printk_ratelimit())
  			printk("%s%s[%d]: segfault at %08lx pc %08lx "
  			       "sp %08lx ecr %lu\n",
-diff -urNp linux-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/include/asm/kmap_types.h
---- linux-3.0.4/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/frv/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/frv/include/asm/kmap_types.h linux-3.0.7/arch/frv/include/asm/kmap_types.h
+--- linux-3.0.7/arch/frv/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -722,9 +1044,9 @@ diff -urNp linux-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/in
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic.c
---- linux-3.0.4/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/frv/mm/elf-fdpic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/frv/mm/elf-fdpic.c linux-3.0.7/arch/frv/mm/elf-fdpic.c
+--- linux-3.0.7/arch/frv/mm/elf-fdpic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -753,9 +1075,9 @@ diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic
  				goto success;
  			addr = vma->vm_end;
  		}
-diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include/asm/elf.h
---- linux-3.0.4/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/include/asm/elf.h linux-3.0.7/arch/ia64/include/asm/elf.h
+--- linux-3.0.7/arch/ia64/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -770,9 +1092,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include
  #define PT_IA_64_UNWIND		0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/include/asm/pgtable.h
---- linux-3.0.4/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/include/asm/pgtable.h linux-3.0.7/arch/ia64/include/asm/pgtable.h
+--- linux-3.0.7/arch/ia64/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
   */
@@ -800,9 +1122,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/inc
  #define PAGE_GATE	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
  #define PAGE_KERNEL	__pgprot(__DIRTY_BITS  | _PAGE_PL_0 | _PAGE_AR_RWX)
  #define PAGE_KERNELRX	__pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
-diff -urNp linux-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/include/asm/spinlock.h
---- linux-3.0.4/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/include/asm/spinlock.h linux-3.0.7/arch/ia64/include/asm/spinlock.h
+--- linux-3.0.7/arch/ia64/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -812,9 +1134,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/in
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/include/asm/uaccess.h
---- linux-3.0.4/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/include/asm/uaccess.h linux-3.0.7/arch/ia64/include/asm/uaccess.h
+--- linux-3.0.7/arch/ia64/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);								\
@@ -833,9 +1155,9 @@ diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/inc
  		__cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);	\
  	__cu_len;									\
  })
-diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/module.c
---- linux-3.0.4/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/kernel/module.c linux-3.0.7/arch/ia64/kernel/module.c
+--- linux-3.0.7/arch/ia64/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -924,9 +1246,9 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/mo
  		mod->arch.gp = gp;
  		DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
  	}
-diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.4/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/sys_ia64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/kernel/sys_ia64.c linux-3.0.7/arch/ia64/kernel/sys_ia64.c
+--- linux-3.0.7/arch/ia64/kernel/sys_ia64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -959,9 +1281,9 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/
  			/* Remember the address where we stopped this search:  */
  			mm->free_area_cache = addr + len;
  			return addr;
-diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.0.7/arch/ia64/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -971,9 +1293,9 @@ diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kern
  	/*
  	 * ensure percpu data fits
  	 * into percpu page size
-diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/arch/ia64/mm/fault.c
---- linux-3.0.4/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/mm/fault.c linux-3.0.7/arch/ia64/mm/fault.c
+--- linux-3.0.7/arch/ia64/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -1023,9 +1345,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/arch/ia64/mm/fault.c
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
  	 * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.4/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/mm/hugetlbpage.c linux-3.0.7/arch/ia64/mm/hugetlbpage.c
+--- linux-3.0.7/arch/ia64/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1035,9 +1357,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/huget
  			return addr;
  		addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
  	}
-diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/arch/ia64/mm/init.c
---- linux-3.0.4/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/ia64/mm/init.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/ia64/mm/init.c linux-3.0.7/arch/ia64/mm/init.c
+--- linux-3.0.7/arch/ia64/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -1058,9 +1380,9 @@ diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/arch/ia64/mm/init.c
  		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  		down_write(&current->mm->mmap_sem);
  		if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/usercopy.c
---- linux-3.0.4/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/m32r/lib/usercopy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/m32r/lib/usercopy.c linux-3.0.7/arch/m32r/lib/usercopy.c
+--- linux-3.0.7/arch/m32r/lib/usercopy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1081,9 +1403,9 @@ diff -urNp linux-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/userco
  	prefetchw(to);
  	if (access_ok(VERIFY_READ, from, n))
  		__copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include/asm/elf.h
---- linux-3.0.4/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/include/asm/elf.h linux-3.0.7/arch/mips/include/asm/elf.h
+--- linux-3.0.7/arch/mips/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1105,9 +1427,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/include/asm/page.h
---- linux-3.0.4/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/include/asm/page.h linux-3.0.7/arch/mips/include/asm/page.h
+--- linux-3.0.7/arch/mips/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -1117,9 +1439,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/includ
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)	((x).pte)
-diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/include/asm/system.h
---- linux-3.0.4/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/include/asm/system.h linux-3.0.7/arch/mips/include/asm/system.h
+--- linux-3.0.7/arch/mips/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1128,9 +1450,9 @@ diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/incl
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.0.7/arch/mips/kernel/binfmt_elfn32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1145,9 +1467,9 @@ diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/ke
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.0.7/arch/mips/kernel/binfmt_elfo32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1162,9 +1484,9 @@ diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/ke
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/process.c
---- linux-3.0.4/arch/mips/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/kernel/process.c linux-3.0.7/arch/mips/kernel/process.c
+--- linux-3.0.7/arch/mips/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -1181,9 +1503,9 @@ diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/p
 -
 -	return sp & ALMASK;
 -}
-diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/arch/mips/mm/fault.c
---- linux-3.0.4/arch/mips/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/mm/fault.c linux-3.0.7/arch/mips/mm/fault.c
+--- linux-3.0.7/arch/mips/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -1208,9 +1530,9 @@ diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/arch/mips/mm/fault.c
  /*
   * 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.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
---- linux-3.0.4/arch/mips/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/mips/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/mips/mm/mmap.c linux-3.0.7/arch/mips/mm/mmap.c
+--- linux-3.0.7/arch/mips/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -1272,9 +1594,9 @@ diff -urNp linux-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/include/asm/elf.h
---- linux-3.0.4/arch/parisc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/include/asm/elf.h linux-3.0.7/arch/parisc/include/asm/elf.h
+--- linux-3.0.7/arch/parisc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1289,9 +1611,9 @@ diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/inc
  /* This yields a mask that user programs can use to figure out what
     instruction set this CPU supports.  This could be done in user space,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc/include/asm/pgtable.h
---- linux-3.0.4/arch/parisc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/include/asm/pgtable.h linux-3.0.7/arch/parisc/include/asm/pgtable.h
+--- linux-3.0.7/arch/parisc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1310,9 +1632,9 @@ diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc
  #define PAGE_KERNEL	__pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_EXEC	__pgprot(_PAGE_KERNEL_EXEC)
  #define PAGE_KERNEL_RWX	__pgprot(_PAGE_KERNEL_RWX)
-diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kernel/module.c
---- linux-3.0.4/arch/parisc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/kernel/module.c linux-3.0.7/arch/parisc/kernel/module.c
+--- linux-3.0.7/arch/parisc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1413,9 +1735,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kerne
  
  	DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
  	       me->arch.unwind_section, table, end, gp);
-diff -urNp linux-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/kernel/sys_parisc.c
---- linux-3.0.4/arch/parisc/kernel/sys_parisc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/sys_parisc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/kernel/sys_parisc.c linux-3.0.7/arch/parisc/kernel/sys_parisc.c
+--- linux-3.0.7/arch/parisc/kernel/sys_parisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1443,9 +1765,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/k
  
  	if (filp) {
  		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel/traps.c
---- linux-3.0.4/arch/parisc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/kernel/traps.c linux-3.0.7/arch/parisc/kernel/traps.c
+--- linux-3.0.7/arch/parisc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -1457,9 +1779,9 @@ diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel
  				fault_address = regs->iaoq[0];
  				fault_space = regs->iasq[0];
  
-diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
---- linux-3.0.4/arch/parisc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/parisc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/parisc/mm/fault.c linux-3.0.7/arch/parisc/mm/fault.c
+--- linux-3.0.7/arch/parisc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -1629,9 +1951,9 @@ diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
  
  	/*
  	 * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/include/asm/elf.h
---- linux-3.0.4/arch/powerpc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/elf.h linux-3.0.7/arch/powerpc/include/asm/elf.h
+--- linux-3.0.7/arch/powerpc/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.  */
@@ -1664,9 +1986,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/i
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/powerpc/include/asm/kmap_types.h
---- linux-3.0.4/arch/powerpc/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/kmap_types.h linux-3.0.7/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.0.7/arch/powerpc/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -1675,9 +1997,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/po
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/include/asm/mman.h
---- linux-3.0.4/arch/powerpc/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/mman.h linux-3.0.7/arch/powerpc/include/asm/mman.h
+--- linux-3.0.7/arch/powerpc/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1687,33 +2009,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/
  {
  	return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
  }
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/page_64.h linux-3.0.4/arch/powerpc/include/asm/page_64.h
---- linux-3.0.4/arch/powerpc/include/asm/page_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/include/asm/page.h
---- linux-3.0.4/arch/powerpc/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/page.h linux-3.0.7/arch/powerpc/include/asm/page.h
+--- linux-3.0.7/arch/powerpc/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -1736,9 +2034,33 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/powerpc/include/asm/pgtable.h
---- linux-3.0.4/arch/powerpc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/page_64.h linux-3.0.7/arch/powerpc/include/asm/page_64.h
+--- linux-3.0.7/arch/powerpc/include/asm/page_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/powerpc/include/asm/pgtable.h linux-3.0.7/arch/powerpc/include/asm/pgtable.h
+--- linux-3.0.7/arch/powerpc/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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__
@@ -1747,9 +2069,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/power
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>		/* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.0.7/arch/powerpc/include/asm/pte-hash32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -1758,9 +2080,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/po
  #define _PAGE_COHERENT	0x010	/* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE	0x020	/* I: cache inhibit */
  #define _PAGE_WRITETHRU	0x040	/* W: cache write-through */
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/include/asm/reg.h
---- linux-3.0.4/arch/powerpc/include/asm/reg.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/reg.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/reg.h linux-3.0.7/arch/powerpc/include/asm/reg.h
+--- linux-3.0.7/arch/powerpc/include/asm/reg.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -1769,9 +2091,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/i
  #define   DSISR_PROTFAULT	0x08000000	/* protection fault */
  #define   DSISR_ISSTORE		0x02000000	/* access was a store */
  #define   DSISR_DABRMATCH	0x00400000	/* hit data breakpoint */
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerpc/include/asm/system.h
---- linux-3.0.4/arch/powerpc/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/system.h linux-3.0.7/arch/powerpc/include/asm/system.h
+--- linux-3.0.7/arch/powerpc/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1781,9 +2103,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerp
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/powerpc/include/asm/uaccess.h
---- linux-3.0.4/arch/powerpc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/include/asm/uaccess.h linux-3.0.7/arch/powerpc/include/asm/uaccess.h
+--- linux-3.0.7/arch/powerpc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -1961,9 +2283,9 @@ diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/power
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.0.7/arch/powerpc/kernel/exceptions-64e.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1982,9 +2304,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/pow
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	ld	r4,_DAR(r1)
  	bl	.bad_page_fault
-diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.0.7/arch/powerpc/kernel/exceptions-64s.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -1997,41 +2319,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/pow
  	mr	r5,r3
  	addi	r3,r1,STACK_FRAME_OVERHEAD
  	lwz	r4,_DAR(r1)
-diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/kernel/module_32.c
---- linux-3.0.4/arch/powerpc/kernel/module_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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;
- 	}
- 
-@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
- 
- 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
- 	/* Init, or core PLT? */
--	if (location >= mod->module_core
--	    && location < mod->module_core + mod->core_size)
-+	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
-+	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
- 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
--	else
-+	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
-+		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
- 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
-+	else {
-+		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
-+		return ~0UL;
-+	}
- 
- 	/* Find this entry, or if that fails, the next avail. entry */
- 	while (entry->jump[0]) {
-diff -urNp linux-3.0.4/arch/powerpc/kernel/module.c linux-3.0.4/arch/powerpc/kernel/module.c
---- linux-3.0.4/arch/powerpc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/module.c linux-3.0.7/arch/powerpc/kernel/module.c
+--- linux-3.0.7/arch/powerpc/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/powerpc/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2071,9 +2361,41 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/module.c linux-3.0.4/arch/powerpc/ker
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
  				    const Elf_Shdr *sechdrs,
  				    const char *name)
-diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/kernel/process.c
---- linux-3.0.4/arch/powerpc/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/process.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/module_32.c linux-3.0.7/arch/powerpc/kernel/module_32.c
+--- linux-3.0.7/arch/powerpc/kernel/module_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
+ 	}
+ 
+@@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *locati
+ 
+ 	DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
+ 	/* Init, or core PLT? */
+-	if (location >= mod->module_core
+-	    && location < mod->module_core + mod->core_size)
++	if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
++	    (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
+-	else
++	else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
++		 (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
+ 		entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
++	else {
++		printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
++		return ~0UL;
++	}
+ 
+ 	/* Find this entry, or if that fails, the next avail. entry */
+ 	while (entry->jump[0]) {
+diff -urNp linux-3.0.7/arch/powerpc/kernel/process.c linux-3.0.7/arch/powerpc/kernel/process.c
+--- linux-3.0.7/arch/powerpc/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -2166,9 +2488,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/ke
 -
 -	return ret;
 -}
-diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/kernel/signal_32.c
---- linux-3.0.4/arch/powerpc/kernel/signal_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/signal_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_32.c linux-3.0.7/arch/powerpc/kernel/signal_32.c
+--- linux-3.0.7/arch/powerpc/kernel/signal_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -2178,9 +2500,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/
  		if (save_user_regs(regs, frame, 0, 1))
  			goto badframe;
  		regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/kernel/signal_64.c
---- linux-3.0.4/arch/powerpc/kernel/signal_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/signal_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/signal_64.c linux-3.0.7/arch/powerpc/kernel/signal_64.c
+--- linux-3.0.7/arch/powerpc/kernel/signal_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -2190,9 +2512,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/
  		regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
  	} else {
  		err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kernel/traps.c
---- linux-3.0.4/arch/powerpc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/traps.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/traps.c linux-3.0.7/arch/powerpc/kernel/traps.c
+--- linux-3.0.7/arch/powerpc/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -2211,9 +2533,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kern
  	oops_exit();
  	do_exit(err);
  
-diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kernel/vdso.c
---- linux-3.0.4/arch/powerpc/kernel/vdso.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/kernel/vdso.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/kernel/vdso.c linux-3.0.7/arch/powerpc/kernel/vdso.c
+--- linux-3.0.7/arch/powerpc/kernel/vdso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -2240,9 +2562,9 @@ diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kerne
  	if (IS_ERR_VALUE(vdso_base)) {
  		rc = vdso_base;
  		goto fail_mmapsem;
-diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/lib/usercopy_64.c
---- linux-3.0.4/arch/powerpc/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/lib/usercopy_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/lib/usercopy_64.c linux-3.0.7/arch/powerpc/lib/usercopy_64.c
+--- linux-3.0.7/arch/powerpc/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -2274,9 +2596,9 @@ diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/l
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault.c
---- linux-3.0.4/arch/powerpc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/fault.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/mm/fault.c linux-3.0.7/arch/powerpc/mm/fault.c
+--- linux-3.0.7/arch/powerpc/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -2381,9 +2703,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault
  		_exception(SIGSEGV, regs, code, address);
  		return 0;
  	}
-diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mmap_64.c
---- linux-3.0.4/arch/powerpc/mm/mmap_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/mmap_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/mm/mmap_64.c linux-3.0.7/arch/powerpc/mm/mmap_64.c
+--- linux-3.0.7/arch/powerpc/mm/mmap_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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()) {
@@ -2407,9 +2729,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mma
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice.c
---- linux-3.0.4/arch/powerpc/mm/slice.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/powerpc/mm/slice.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/powerpc/mm/slice.c linux-3.0.7/arch/powerpc/mm/slice.c
+--- linux-3.0.7/arch/powerpc/mm/slice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -2476,9 +2798,9 @@ diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice
  	/* If hint, make sure it matches our alignment restrictions */
  	if (!fixed && addr) {
  		addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include/asm/elf.h
---- linux-3.0.4/arch/s390/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/include/asm/elf.h linux-3.0.7/arch/s390/include/asm/elf.h
+--- linux-3.0.7/arch/s390/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.  */
@@ -2504,9 +2826,9 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/include/asm/system.h
---- linux-3.0.4/arch/s390/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/include/asm/system.h linux-3.0.7/arch/s390/include/asm/system.h
+--- linux-3.0.7/arch/s390/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -2516,9 +2838,9 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/incl
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/include/asm/uaccess.h
---- linux-3.0.4/arch/s390/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/include/asm/uaccess.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/include/asm/uaccess.h linux-3.0.7/arch/s390/include/asm/uaccess.h
+--- linux-3.0.7/arch/s390/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -2551,9 +2873,9 @@ diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/inc
  	if (unlikely(sz != -1 && sz < n)) {
  		copy_from_user_overflow();
  		return n;
-diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/module.c
---- linux-3.0.4/arch/s390/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/kernel/module.c linux-3.0.7/arch/s390/kernel/module.c
+--- linux-3.0.7/arch/s390/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -2625,9 +2947,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/mo
  			rela->r_addend - loc;
  		if (r_type == R_390_GOTPC)
  			*(unsigned int *) loc = val;
-diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/process.c
---- linux-3.0.4/arch/s390/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/kernel/process.c linux-3.0.7/arch/s390/kernel/process.c
+--- linux-3.0.7/arch/s390/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -2668,9 +2990,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/p
 -		return base;
 -	return ret;
 -}
-diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/setup.c
---- linux-3.0.4/arch/s390/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/kernel/setup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/kernel/setup.c linux-3.0.7/arch/s390/kernel/setup.c
+--- linux-3.0.7/arch/s390/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -2680,9 +3002,9 @@ diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/set
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
---- linux-3.0.4/arch/s390/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/s390/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/s390/mm/mmap.c linux-3.0.7/arch/s390/mm/mmap.c
+--- linux-3.0.7/arch/s390/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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()) {
@@ -2729,9 +3051,9 @@ diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
  		mm->get_unmapped_area = s390_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/include/asm/system.h
---- linux-3.0.4/arch/score/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/score/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/score/include/asm/system.h linux-3.0.7/arch/score/include/asm/system.h
+--- linux-3.0.7/arch/score/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  
@@ -2741,9 +3063,9 @@ diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/in
  
  #define mb()		barrier()
  #define rmb()		barrier()
-diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel/process.c
---- linux-3.0.4/arch/score/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/score/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/score/kernel/process.c linux-3.0.7/arch/score/kernel/process.c
+--- linux-3.0.7/arch/score/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -2753,9 +3075,9 @@ diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel
 -{
 -	return sp;
 -}
-diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
---- linux-3.0.4/arch/sh/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sh/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sh/mm/mmap.c linux-3.0.7/arch/sh/mm/mmap.c
+--- linux-3.0.7/arch/sh/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -2830,9 +3152,21 @@ diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
  
  bottomup:
  	/*
-diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc/include/asm/atomic_64.h
---- linux-3.0.4/arch/sparc/include/asm/atomic_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/atomic_64.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/Makefile linux-3.0.7/arch/sparc/Makefile
+--- linux-3.0.7/arch/sparc/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/sparc/include/asm/atomic_64.h linux-3.0.7/arch/sparc/include/asm/atomic_64.h
+--- linux-3.0.7/arch/sparc/include/asm/atomic_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/sparc/include/asm/atomic_64.h	2011-08-23 21:48:14.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)	{ (i) }
  
@@ -3025,9 +3359,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/include/asm/cache.h
---- linux-3.0.4/arch/sparc/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/cache.h linux-3.0.7/arch/sparc/include/asm/cache.h
+--- linux-3.0.7/arch/sparc/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  
@@ -3037,9 +3371,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/inc
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/include/asm/elf_32.h
---- linux-3.0.4/arch/sparc/include/asm/elf_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/elf_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/elf_32.h linux-3.0.7/arch/sparc/include/asm/elf_32.h
+--- linux-3.0.7/arch/sparc/include/asm/elf_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -3054,9 +3388,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/in
  /* This yields a mask that user programs can use to figure out what
     instruction set this cpu supports.  This can NOT be done in userspace
     on Sparc.  */
-diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/include/asm/elf_64.h
---- linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/elf_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/elf_64.h linux-3.0.7/arch/sparc/include/asm/elf_64.h
+--- linux-3.0.7/arch/sparc/include/asm/elf_64.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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
@@ -3071,9 +3405,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/in
  extern unsigned long sparc64_elf_hwcap;
  #define ELF_HWCAP	sparc64_elf_hwcap
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/sparc/include/asm/pgtable_32.h
---- linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/pgtable_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtable_32.h linux-3.0.7/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.0.7/arch/sparc/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -3105,9 +3439,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/spar
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.0.7/arch/sparc/include/asm/pgtsrmmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 | \
@@ -3122,9 +3456,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
  				    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/sparc/include/asm/spinlock_64.h
---- linux-3.0.4/arch/sparc/include/asm/spinlock_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/spinlock_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/spinlock_64.h linux-3.0.7/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.0.7/arch/sparc/include/asm/spinlock_64.h	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/arch/sparc/include/asm/spinlock_64.h	2011-10-16 21:55:27.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... */
@@ -3222,9 +3556,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/spa
  {
  	unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/sparc/include/asm/thread_info_32.h
---- linux-3.0.4/arch/sparc/include/asm/thread_info_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/thread_info_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_32.h linux-3.0.7/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.0.7/arch/sparc/include/asm/thread_info_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -3234,9 +3568,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/
  };
  
  /*
-diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/sparc/include/asm/thread_info_64.h
---- linux-3.0.4/arch/sparc/include/asm/thread_info_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/thread_info_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/thread_info_64.h linux-3.0.7/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.0.7/arch/sparc/include/asm/thread_info_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -3246,9 +3580,26 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/
  	unsigned long		fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/sparc/include/asm/uaccess_32.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/uaccess_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess.h linux-3.0.7/arch/sparc/include/asm/uaccess.h
+--- linux-3.0.7/arch/sparc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/sparc/include/asm/uaccess_32.h linux-3.0.7/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.0.7/arch/sparc/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -3300,9 +3651,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/spar
  	return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/sparc/include/asm/uaccess_64.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/include/asm/uaccess_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/include/asm/uaccess_64.h linux-3.0.7/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.0.7/arch/sparc/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -3345,26 +3696,9 @@ diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/spar
  	if (unlikely(ret))
  		ret = copy_to_user_fixup(to, from, size);
  	return ret;
-diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess.h linux-3.0.4/arch/sparc/include/asm/uaccess.h
---- linux-3.0.4/arch/sparc/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/Makefile
---- linux-3.0.4/arch/sparc/kernel/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/Makefile linux-3.0.7/arch/sparc/kernel/Makefile
+--- linux-3.0.7/arch/sparc/kernel/Makefile	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/arch/sparc/kernel/Makefile	2011-10-16 21:55:27.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -3374,9 +3708,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/kernel/process_32.c
---- linux-3.0.4/arch/sparc/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/process_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/process_32.c linux-3.0.7/arch/sparc/kernel/process_32.c
+--- linux-3.0.7/arch/sparc/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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],
@@ -3412,9 +3746,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/ker
  		fp = rw->ins[6];
  	} while (++count < 16);
  	printk("\n");
-diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/kernel/process_64.c
---- linux-3.0.4/arch/sparc/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/process_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/process_64.c linux-3.0.7/arch/sparc/kernel/process_64.c
+--- linux-3.0.7/arch/sparc/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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]);
@@ -3450,9 +3784,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/ker
  			       (void *) gp->tpc,
  			       (void *) gp->o7,
  			       (void *) gp->i7,
-diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.0.7/arch/sparc/kernel/sys_sparc_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -3471,9 +3805,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/k
  			return addr;
  		addr = vmm->vm_end;
  		if (flags & MAP_SHARED)
-diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.0.7/arch/sparc/kernel/sys_sparc_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -3621,9 +3955,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/k
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kernel/traps_32.c
---- linux-3.0.4/arch/sparc/kernel/traps_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/traps_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/traps_32.c linux-3.0.7/arch/sparc/kernel/traps_32.c
+--- linux-3.0.7/arch/sparc/kernel/traps_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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")
@@ -3653,9 +3987,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  
-diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kernel/traps_64.c
---- linux-3.0.4/arch/sparc/kernel/traps_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/traps_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/traps_64.c linux-3.0.7/arch/sparc/kernel/traps_64.c
+--- linux-3.0.7/arch/sparc/kernel/traps_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -3793,9 +4127,9 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kerne
  	do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/kernel/unaligned_64.c
---- linux-3.0.4/arch/sparc/kernel/unaligned_64.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/kernel/unaligned_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/kernel/unaligned_64.c linux-3.0.7/arch/sparc/kernel/unaligned_64.c
+--- linux-3.0.7/arch/sparc/kernel/unaligned_64.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -3805,9 +4139,21 @@ diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/k
  		       regs->tpc, (void *) regs->tpc);
  	}
  }
-diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/atomic_64.S
---- linux-3.0.4/arch/sparc/lib/atomic_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/atomic_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/lib/Makefile linux-3.0.7/arch/sparc/lib/Makefile
+--- linux-3.0.7/arch/sparc/lib/Makefile	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/arch/sparc/lib/Makefile	2011-08-23 21:47:55.000000000 -0400
+@@ -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 -urNp linux-3.0.7/arch/sparc/lib/atomic_64.S linux-3.0.7/arch/sparc/lib/atomic_64.S
+--- linux-3.0.7/arch/sparc/lib/atomic_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -4042,9 +4388,9 @@ diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/ato
  	casx	[%o1], %g1, %g7
  	cmp	%g1, %g7
  	bne,pn	%xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
---- linux-3.0.4/arch/sparc/lib/ksyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/ksyms.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/lib/ksyms.c linux-3.0.7/arch/sparc/lib/ksyms.c
+--- linux-3.0.7/arch/sparc/lib/ksyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/sparc/lib/ksyms.c	2011-08-23 21:48:14.000000000 -0400
 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4064,33 +4410,21 @@ diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-3.0.4/arch/sparc/lib/Makefile linux-3.0.4/arch/sparc/lib/Makefile
---- linux-3.0.4/arch/sparc/lib/Makefile	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/sparc/lib/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/mm/Makefile linux-3.0.7/arch/sparc/mm/Makefile
+--- linux-3.0.7/arch/sparc/mm/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/sparc/mm/Makefile	2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
- asflags-y := -ansi -DST_DIV0=0x02
+ asflags-y := -ansi
 -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 -urNp linux-3.0.4/arch/sparc/Makefile linux-3.0.4/arch/sparc/Makefile
---- linux-3.0.4/arch/sparc/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_32.c
---- linux-3.0.4/arch/sparc/mm/fault_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/fault_32.c	2011-08-23 21:47:55.000000000 -0400
+ obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
+ obj-y                   += fault_$(BITS).o
+diff -urNp linux-3.0.7/arch/sparc/mm/fault_32.c linux-3.0.7/arch/sparc/mm/fault_32.c
+--- linux-3.0.7/arch/sparc/mm/fault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -4395,9 +4729,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_
  		/* Allow reads even for write-only mappings */
  		if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
  			goto bad_area;
-diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_64.c
---- linux-3.0.4/arch/sparc/mm/fault_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/fault_64.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/mm/fault_64.c linux-3.0.7/arch/sparc/mm/fault_64.c
+--- linux-3.0.7/arch/sparc/mm/fault_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -4905,9 +5239,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_
  	/* Pure DTLB misses do not tell us whether the fault causing
  	 * load/store/atomic was a write or not, it only says that there
  	 * was no match.  So in such a case we (carefully) read the
-diff -urNp linux-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hugetlbpage.c
---- linux-3.0.4/arch/sparc/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/mm/hugetlbpage.c linux-3.0.7/arch/sparc/mm/hugetlbpage.c
+--- linux-3.0.7/arch/sparc/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/sparc/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
  			}
  			return -ENOMEM;
@@ -4967,9 +5301,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hug
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32.c
---- linux-3.0.4/arch/sparc/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/mm/init_32.c linux-3.0.7/arch/sparc/mm/init_32.c
+--- linux-3.0.7/arch/sparc/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -5004,21 +5338,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32
  	protection_map[12] = PAGE_READONLY;
  	protection_map[13] = PAGE_READONLY;
  	protection_map[14] = PAGE_SHARED;
-diff -urNp linux-3.0.4/arch/sparc/mm/Makefile linux-3.0.4/arch/sparc/mm/Makefile
---- linux-3.0.4/arch/sparc/mm/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
---- linux-3.0.4/arch/sparc/mm/srmmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/sparc/mm/srmmu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/sparc/mm/srmmu.c linux-3.0.7/arch/sparc/mm/srmmu.c
+--- linux-3.0.7/arch/sparc/mm/srmmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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));
@@ -5033,9 +5355,9 @@ diff -urNp linux-3.0.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
  	BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
  	page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/include/asm/kmap_types.h
---- linux-3.0.4/arch/um/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/include/asm/kmap_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/um/include/asm/kmap_types.h linux-3.0.7/arch/um/include/asm/kmap_types.h
+--- linux-3.0.7/arch/um/include/asm/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -5044,9 +5366,9 @@ diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/incl
  	KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/asm/page.h
---- linux-3.0.4/arch/um/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/include/asm/page.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/um/include/asm/page.h linux-3.0.7/arch/um/include/asm/page.h
+--- linux-3.0.7/arch/um/include/asm/page.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -5057,9 +5379,9 @@ diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/as
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/process.c
---- linux-3.0.4/arch/um/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/um/kernel/process.c linux-3.0.7/arch/um/kernel/process.c
+--- linux-3.0.7/arch/um/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/um/kernel/process.c	2011-08-23 21:47:55.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
  	return 2;
  }
@@ -5083,9 +5405,9 @@ diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/proce
  unsigned long get_wchan(struct task_struct *p)
  {
  	unsigned long stack_page, sp, ip;
-diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/syscalls.c
---- linux-3.0.4/arch/um/sys-i386/syscalls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/um/sys-i386/syscalls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/um/sys-i386/syscalls.c linux-3.0.7/arch/um/sys-i386/syscalls.c
+--- linux-3.0.7/arch/um/sys-i386/syscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"
@@ -5108,9 +5430,172 @@ diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
---- linux-3.0.4/arch/x86/boot/bitops.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/bitops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/Kconfig linux-3.0.7/arch/x86/Kconfig
+--- linux-3.0.7/arch/x86/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/Kconfig	2011-09-17 00:58:36.000000000 -0400
+@@ -229,7 +229,7 @@ config X86_HT
+ 
+ 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
+ 
+ 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
+@@ -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.7/arch/x86/Kconfig.cpu linux-3.0.7/arch/x86/Kconfig.cpu
+--- linux-3.0.7/arch/x86/Kconfig.cpu	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/Kconfig.debug linux-3.0.7/arch/x86/Kconfig.debug
+--- linux-3.0.7/arch/x86/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/Makefile linux-3.0.7/arch/x86/Makefile
+--- linux-3.0.7/arch/x86/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
++
++define OLD_LD
++
++*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
++*** Please upgrade your binutils to 2.18 or newer
++endef
++
++archprepare:
++	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
+diff -urNp linux-3.0.7/arch/x86/boot/Makefile linux-3.0.7/arch/x86/boot/Makefile
+--- linux-3.0.7/arch/x86/boot/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/boot/bitops.h linux-3.0.7/arch/x86/boot/bitops.h
+--- linux-3.0.7/arch/x86/boot/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -5129,9 +5614,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
---- linux-3.0.4/arch/x86/boot/boot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/boot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/boot.h linux-3.0.7/arch/x86/boot/boot.h
+--- linux-3.0.7/arch/x86/boot/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -5150,9 +5635,22 @@ diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
  	    : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
  	return diff;
  }
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/boot/compressed/head_32.S
---- linux-3.0.4/arch/x86/boot/compressed/head_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/head_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/compressed/Makefile linux-3.0.7/arch/x86/boot/compressed/Makefile
+--- linux-3.0.7/arch/x86/boot/compressed/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/boot/compressed/head_32.S linux-3.0.7/arch/x86/boot/compressed/head_32.S
+--- linux-3.0.7/arch/x86/boot/compressed/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -5181,9 +5679,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/b
  	addl	%ebx, -__PAGE_OFFSET(%ebx, %ecx)
  	jmp	1b
  2:
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/boot/compressed/head_64.S
---- linux-3.0.4/arch/x86/boot/compressed/head_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/head_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/compressed/head_64.S linux-3.0.7/arch/x86/boot/compressed/head_64.S
+--- linux-3.0.7/arch/x86/boot/compressed/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -5202,22 +5700,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/b
  #endif
  
  	/* Target address to relocate to for decompression */
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/Makefile linux-3.0.4/arch/x86/boot/compressed/Makefile
---- linux-3.0.4/arch/x86/boot/compressed/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot/compressed/misc.c
---- linux-3.0.4/arch/x86/boot/compressed/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/misc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/compressed/misc.c linux-3.0.7/arch/x86/boot/compressed/misc.c
+--- linux-3.0.7/arch/x86/boot/compressed/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -5236,9 +5721,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot
  		error("Wrong destination address");
  #endif
  
-diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/boot/compressed/relocs.c
---- linux-3.0.4/arch/x86/boot/compressed/relocs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/compressed/relocs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/compressed/relocs.c linux-3.0.7/arch/x86/boot/compressed/relocs.c
+--- linux-3.0.7/arch/x86/boot/compressed/relocs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/boot/compressed/relocs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5431,9 +5916,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/bo
  	read_shdrs(fp);
  	read_strtabs(fp);
  	read_symtabs(fp);
-diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpucheck.c
---- linux-3.0.4/arch/x86/boot/cpucheck.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/cpucheck.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/cpucheck.c linux-3.0.7/arch/x86/boot/cpucheck.c
+--- linux-3.0.7/arch/x86/boot/cpucheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -5529,9 +6014,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpuche
  
  		err = check_flags();
  	}
-diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
---- linux-3.0.4/arch/x86/boot/header.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/header.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/header.S linux-3.0.7/arch/x86/boot/header.S
+--- linux-3.0.7/arch/x86/boot/header.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -5541,22 +6026,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
  
  #define ZO_INIT_SIZE	(ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE	(VO__end - VO__text)
-diff -urNp linux-3.0.4/arch/x86/boot/Makefile linux-3.0.4/arch/x86/boot/Makefile
---- linux-3.0.4/arch/x86/boot/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
---- linux-3.0.4/arch/x86/boot/memory.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/memory.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/memory.c linux-3.0.7/arch/x86/boot/memory.c
+--- linux-3.0.7/arch/x86/boot/memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/boot/memory.c	2011-08-23 21:47:55.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5566,9 +6038,20 @@ diff -urNp linux-3.0.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
  	struct biosregs ireg, oreg;
  	struct e820entry *desc = boot_params.e820_map;
  	static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
---- linux-3.0.4/arch/x86/boot/video.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/boot/video.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/boot/video-vesa.c linux-3.0.7/arch/x86/boot/video-vesa.c
+--- linux-3.0.7/arch/x86/boot/video-vesa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/boot/video.c linux-3.0.7/arch/x86/boot/video.c
+--- linux-3.0.7/arch/x86/boot/video.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -5578,20 +6061,9 @@ diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
  	int key;
  	unsigned int v;
  
-diff -urNp linux-3.0.4/arch/x86/boot/video-vesa.c linux-3.0.4/arch/x86/boot/video-vesa.c
---- linux-3.0.4/arch/x86/boot/video-vesa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S
+--- linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/crypto/aes-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -8,6 +8,8 @@
   * including this sentence is retained in full.
   */
@@ -5610,9 +6082,9 @@ diff -urNp linux-3.0.4/arch/x86/crypto/aes-x86_64-asm_64.S linux-3.0.4/arch/x86/
  #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
  	movq	r1,r2;			\
  	movq	r3,r4;			\
-diff -urNp linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S
+--- linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/crypto/salsa20-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -1,3 +1,5 @@
 +#include <asm/alternative-asm.h>
 +
@@ -5641,9 +6113,9 @@ diff -urNp linux-3.0.4/arch/x86/crypto/salsa20-x86_64-asm_64.S linux-3.0.4/arch/
  	mov	%rsi,%rdx
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S
---- linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S
+--- linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/crypto/twofish-x86_64-asm_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -21,6 +21,7 @@
  .text
  
@@ -5666,9 +6138,9 @@ diff -urNp linux-3.0.4/arch/x86/crypto/twofish-x86_64-asm_64.S linux-3.0.4/arch/
  	movq	$1,%rax
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_aout.c
---- linux-3.0.4/arch/x86/ia32/ia32_aout.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32_aout.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/ia32/ia32_aout.c linux-3.0.7/arch/x86/ia32/ia32_aout.c
+--- linux-3.0.7/arch/x86/ia32/ia32_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -5678,18 +6150,99 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_
  	fs = get_fs();
  	set_fs(KERNEL_DS);
  	has_dumped = 1;
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32entry.S
---- linux-3.0.4/arch/x86/ia32/ia32entry.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32entry.S	2011-08-25 17:36:37.000000000 -0400
-@@ -13,6 +13,7 @@
+diff -urNp linux-3.0.7/arch/x86/ia32/ia32_signal.c linux-3.0.7/arch/x86/ia32/ia32_signal.c
+--- linux-3.0.7/arch/x86/ia32/ia32_signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/ia32/ia32_signal.c	2011-10-06 04:17:55.000000000 -0400
+@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const 
+ 	}
+ 	seg = get_fs();
+ 	set_fs(KERNEL_DS);
+-	ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
++	ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
+ 	set_fs(seg);
+ 	if (ret >= 0 && uoss_ptr)  {
+ 		if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
+@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct 
+  */
+ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
+ 				 size_t frame_size,
+-				 void **fpstate)
++				 void __user **fpstate)
+ {
+ 	unsigned long sp;
+ 
+@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct 
+ 
+ 	if (used_math()) {
+ 		sp = sp - sig_xstate_ia32_size;
+-		*fpstate = (struct _fpstate_ia32 *) sp;
++		*fpstate = (struct _fpstate_ia32 __user *) sp;
+ 		if (save_i387_xstate_ia32(*fpstate) < 0)
+ 			return (void __user *) -1L;
+ 	}
+@@ -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 __user *)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 __user *)frame->retcode);
+ 	} put_user_catch(err);
+ 
+ 	if (err)
+diff -urNp linux-3.0.7/arch/x86/ia32/ia32entry.S linux-3.0.7/arch/x86/ia32/ia32entry.S
+--- linux-3.0.7/arch/x86/ia32/ia32entry.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/ia32/ia32entry.S	2011-10-11 10:44:33.000000000 -0400
+@@ -13,7 +13,9 @@
  #include <asm/thread_info.h>	
  #include <asm/segment.h>
  #include <asm/irqflags.h>
 +#include <asm/pgtable.h>
  #include <linux/linkage.h>
++#include <asm/alternative-asm.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -95,6 +96,29 @@ ENTRY(native_irq_enable_sysexit)
+ #include <linux/elf-em.h>
+@@ -95,6 +97,29 @@ ENTRY(native_irq_enable_sysexit)
  ENDPROC(native_irq_enable_sysexit)
  #endif
  
@@ -5719,7 +6272,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  /*
   * 32bit SYSENTER instruction entry.
   *
-@@ -121,7 +145,7 @@ ENTRY(ia32_sysenter_target)
+@@ -121,7 +146,7 @@ ENTRY(ia32_sysenter_target)
  	CFI_REGISTER	rsp,rbp
  	SWAPGS_UNSAFE_STACK
  	movq	PER_CPU_VAR(kernel_stack), %rsp
@@ -5728,7 +6281,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs, here we enable it straight after entry:
-@@ -134,7 +158,8 @@ ENTRY(ia32_sysenter_target)
+@@ -134,7 +159,8 @@ ENTRY(ia32_sysenter_target)
  	CFI_REL_OFFSET rsp,0
  	pushfq_cfi
  	/*CFI_REL_OFFSET rflags,0*/
@@ -5738,7 +6291,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	CFI_REGISTER rip,r10
  	pushq_cfi $__USER32_CS
  	/*CFI_REL_OFFSET cs,0*/
-@@ -146,6 +171,12 @@ ENTRY(ia32_sysenter_target)
+@@ -146,6 +172,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 */ 
@@ -5751,7 +6304,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  1:	movl	(%rbp),%ebp
   	.section __ex_table,"a"
   	.quad 1b,ia32_badarg
-@@ -168,6 +199,8 @@ sysenter_dispatch:
+@@ -168,6 +200,8 @@ sysenter_dispatch:
  	testl	$_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz	sysexit_audit
  sysexit_from_sys_call:
@@ -5760,7 +6313,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	andl    $~TS_COMPAT,TI_status(%r10)
  	/* clear IF, that popfq doesn't enable interrupts early */
  	andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -194,6 +227,9 @@ sysexit_from_sys_call:
+@@ -194,6 +228,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
@@ -5770,7 +6323,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	movl RAX-ARGOFFSET(%rsp),%eax	/* reload syscall number */
  	cmpq $(IA32_NR_syscalls-1),%rax
  	ja ia32_badsys
-@@ -246,6 +282,9 @@ sysenter_tracesys:
+@@ -246,6 +283,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
@@ -5780,7 +6333,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq	$(IA32_NR_syscalls-1),%rax
-@@ -277,19 +316,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -277,19 +317,24 @@ ENDPROC(ia32_sysenter_target)
  ENTRY(ia32_cstar_target)
  	CFI_STARTPROC32	simple
  	CFI_SIGNAL_FRAME
@@ -5807,7 +6360,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	movl 	%eax,%eax	/* zero extension */
  	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
  	movq	%rcx,RIP-ARGOFFSET(%rsp)
-@@ -305,6 +349,12 @@ ENTRY(ia32_cstar_target)
+@@ -305,6 +350,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 */	
@@ -5820,7 +6373,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  1:	movl	(%r8),%r9d
  	.section __ex_table,"a"
  	.quad 1b,ia32_badarg
-@@ -327,6 +377,8 @@ cstar_dispatch:
+@@ -327,6 +378,8 @@ cstar_dispatch:
  	testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
  	jnz sysretl_audit
  sysretl_from_sys_call:
@@ -5829,7 +6382,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	andl $~TS_COMPAT,TI_status(%r10)
  	RESTORE_ARGS 1,-ARG_SKIP,1,1,1
  	movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -364,6 +416,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
@@ -5839,7 +6392,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	xchgl %ebp,%r9d
-@@ -409,6 +464,7 @@ ENTRY(ia32_syscall)
+@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
  	CFI_REL_OFFSET	rip,RIP-RIP
  	PARAVIRT_ADJUST_EXCEPTION_FRAME
  	SWAPGS
@@ -5847,7 +6400,7 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	/*
  	 * No need to follow this irqs on/off section: the syscall
  	 * disabled irqs and here we enable it straight after entry:
-@@ -441,6 +497,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
@@ -5857,88 +6410,17 @@ diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32e
  	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
  	RESTORE_REST
  	cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia32_signal.c
---- linux-3.0.4/arch/x86/ia32/ia32_signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/ia32_signal.c	2011-10-06 04:17:55.000000000 -0400
-@@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const 
- 	}
- 	seg = get_fs();
- 	set_fs(KERNEL_DS);
--	ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
-+	ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
- 	set_fs(seg);
- 	if (ret >= 0 && uoss_ptr)  {
- 		if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
-@@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct 
-  */
- static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
- 				 size_t frame_size,
--				 void **fpstate)
-+				 void __user **fpstate)
- {
- 	unsigned long sp;
- 
-@@ -395,7 +395,7 @@ static void __user *get_sigframe(struct 
+@@ -455,6 +515,7 @@ ia32_badsys:
  
- 	if (used_math()) {
- 		sp = sp - sig_xstate_ia32_size;
--		*fpstate = (struct _fpstate_ia32 *) sp;
-+		*fpstate = (struct _fpstate_ia32 __user *) sp;
- 		if (save_i387_xstate_ia32(*fpstate) < 0)
- 			return (void __user *) -1L;
- 	}
-@@ -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 __user *)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 __user *)frame->retcode);
- 	} put_user_catch(err);
- 
- 	if (err)
-diff -urNp linux-3.0.4/arch/x86/ia32/sys_ia32.c linux-3.0.4/arch/x86/ia32/sys_ia32.c
---- linux-3.0.4/arch/x86/ia32/sys_ia32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/ia32/sys_ia32.c	2011-10-06 04:17:55.000000000 -0400
+ quiet_ni_syscall:
+ 	movq $-ENOSYS,%rax
++	pax_force_retaddr
+ 	ret
+ 	CFI_ENDPROC
+ 	
+diff -urNp linux-3.0.7/arch/x86/ia32/sys_ia32.c linux-3.0.7/arch/x86/ia32/sys_ia32.c
+--- linux-3.0.7/arch/x86/ia32/sys_ia32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/ia32/sys_ia32.c	2011-10-06 04:17:55.000000000 -0400
 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsign
   */
  static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
@@ -6006,9 +6488,9 @@ diff -urNp linux-3.0.4/arch/x86/ia32/sys_ia32.c linux-3.0.4/arch/x86/ia32/sys_ia
  			   count);
  	set_fs(old_fs);
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/alternative-asm.h linux-3.0.4/arch/x86/include/asm/alternative-asm.h
---- linux-3.0.4/arch/x86/include/asm/alternative-asm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/alternative-asm.h	2011-10-07 19:07:23.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/alternative-asm.h linux-3.0.7/arch/x86/include/asm/alternative-asm.h
+--- linux-3.0.7/arch/x86/include/asm/alternative-asm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/alternative-asm.h	2011-10-07 19:07:23.000000000 -0400
 @@ -15,6 +15,20 @@
  	.endm
  #endif
@@ -6030,9 +6512,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/alternative-asm.h linux-3.0.4/arch/x
  .macro altinstruction_entry orig alt feature orig_len alt_len
  	.align 8
  	.quad \orig
-diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/include/asm/alternative.h
---- linux-3.0.4/arch/x86/include/asm/alternative.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/alternative.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/alternative.h linux-3.0.7/arch/x86/include/asm/alternative.h
+--- linux-3.0.7/arch/x86/include/asm/alternative.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */	\
@@ -6042,9 +6524,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/i
        "663:\n\t" newinstr "\n664:\n"		/* replacement     */	\
        ".previous"
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/asm/apic.h
---- linux-3.0.4/arch/x86/include/asm/apic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/apic.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/apic.h linux-3.0.7/arch/x86/include/asm/apic.h
+--- linux-3.0.7/arch/x86/include/asm/apic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -6054,9 +6536,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/asm/apm.h
---- linux-3.0.4/arch/x86/include/asm/apm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/apm.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/apm.h linux-3.0.7/arch/x86/include/asm/apm.h
+--- linux-3.0.7/arch/x86/include/asm/apm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"
@@ -6075,9 +6557,424 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/a
  		"setc %%bl\n\t"
  		"popl %%ebp\n\t"
  		"popl %%edi\n\t"
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/include/asm/atomic64_32.h
---- linux-3.0.4/arch/x86/include/asm/atomic64_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/atomic64_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/atomic.h linux-3.0.7/arch/x86/include/asm/atomic.h
+--- linux-3.0.7/arch/x86/include/asm/atomic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/atomic64_32.h linux-3.0.7/arch/x86/include/asm/atomic64_32.h
+--- linux-3.0.7/arch/x86/include/asm/atomic64_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -6227,9 +7124,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/i
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/include/asm/atomic64_64.h
---- linux-3.0.4/arch/x86/include/asm/atomic64_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/atomic64_64.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/atomic64_64.h linux-3.0.7/arch/x86/include/asm/atomic64_64.h
+--- linux-3.0.7/arch/x86/include/asm/atomic64_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -6551,424 +7448,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/i
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/include/asm/atomic.h
---- linux-3.0.4/arch/x86/include/asm/atomic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/include/asm/bitops.h
---- linux-3.0.4/arch/x86/include/asm/bitops.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/bitops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/bitops.h linux-3.0.7/arch/x86/include/asm/bitops.h
+--- linux-3.0.7/arch/x86/include/asm/bitops.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/bitops.h	2011-08-23 21:47:55.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -6978,9 +7460,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/includ
  #define CONST_MASK(nr)			(1 << ((nr) & 7))
  
  /**
-diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/asm/boot.h
---- linux-3.0.4/arch/x86/include/asm/boot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/boot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/boot.h linux-3.0.7/arch/x86/include/asm/boot.h
+--- linux-3.0.7/arch/x86/include/asm/boot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/boot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6998,21 +7480,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT
-diff -urNp linux-3.0.4/arch/x86/include/asm/cacheflush.h linux-3.0.4/arch/x86/include/asm/cacheflush.h
---- linux-3.0.4/arch/x86/include/asm/cacheflush.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include/asm/cache.h
---- linux-3.0.4/arch/x86/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/cache.h linux-3.0.7/arch/x86/include/asm/cache.h
+--- linux-3.0.7/arch/x86/include/asm/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/cache.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -7029,9 +7499,21 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/include/asm/checksum_32.h
---- linux-3.0.4/arch/x86/include/asm/checksum_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/checksum_32.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/cacheflush.h linux-3.0.7/arch/x86/include/asm/cacheflush.h
+--- linux-3.0.7/arch/x86/include/asm/cacheflush.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/checksum_32.h linux-3.0.7/arch/x86/include/asm/checksum_32.h
+--- linux-3.0.7/arch/x86/include/asm/checksum_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -7065,9 +7547,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/i
  						 len, sum, NULL, err_ptr);
  
  	if (len)
-diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/include/asm/cpufeature.h
---- linux-3.0.4/arch/x86/include/asm/cpufeature.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/cpufeature.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/cpufeature.h linux-3.0.7/arch/x86/include/asm/cpufeature.h
+--- linux-3.0.7/arch/x86/include/asm/cpufeature.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -7077,25 +7559,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/in
  			     "3: movb $1,%0\n"
  			     "4:\n"
  			     ".previous\n"
-diff -urNp linux-3.0.4/arch/x86/include/asm/desc_defs.h linux-3.0.4/arch/x86/include/asm/desc_defs.h
---- linux-3.0.4/arch/x86/include/asm/desc_defs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/asm/desc.h
---- linux-3.0.4/arch/x86/include/asm/desc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/desc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/desc.h linux-3.0.7/arch/x86/include/asm/desc.h
+--- linux-3.0.7/arch/x86/include/asm/desc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -7274,9 +7740,25 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/asm/e820.h
---- linux-3.0.4/arch/x86/include/asm/e820.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/e820.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/desc_defs.h linux-3.0.7/arch/x86/include/asm/desc_defs.h
+--- linux-3.0.7/arch/x86/include/asm/desc_defs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/e820.h linux-3.0.7/arch/x86/include/asm/e820.h
+--- linux-3.0.7/arch/x86/include/asm/e820.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -7286,9 +7768,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/
  #define BIOS_END		0x00100000
  
  #define BIOS_ROM_BASE		0xffe00000
-diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/asm/elf.h
---- linux-3.0.4/arch/x86/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/elf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/elf.h linux-3.0.7/arch/x86/include/asm/elf.h
+--- linux-3.0.7/arch/x86/include/asm/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.  */
@@ -7343,9 +7825,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/a
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch/x86/include/asm/emergency-restart.h
---- linux-3.0.4/arch/x86/include/asm/emergency-restart.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/emergency-restart.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/emergency-restart.h linux-3.0.7/arch/x86/include/asm/emergency-restart.h
+--- linux-3.0.7/arch/x86/include/asm/emergency-restart.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -7354,9 +7836,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include/asm/futex.h
---- linux-3.0.4/arch/x86/include/asm/futex.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/futex.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/futex.h linux-3.0.7/arch/x86/include/asm/futex.h
+--- linux-3.0.7/arch/x86/include/asm/futex.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/futex.h	2011-10-06 04:17:55.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7415,9 +7897,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include
  		     : "i" (-EFAULT), "r" (newval), "1" (oldval)
  		     : "memory"
  	);
-diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/include/asm/hw_irq.h
---- linux-3.0.4/arch/x86/include/asm/hw_irq.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/hw_irq.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/hw_irq.h linux-3.0.7/arch/x86/include/asm/hw_irq.h
+--- linux-3.0.7/arch/x86/include/asm/hw_irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -7429,9 +7911,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/includ
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/asm/i387.h
---- linux-3.0.4/arch/x86/include/asm/i387.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/i387.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/i387.h linux-3.0.7/arch/x86/include/asm/i387.h
+--- linux-3.0.7/arch/x86/include/asm/i387.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/i387.h	2011-10-06 04:17:55.000000000 -0400
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
  	int err;
@@ -7481,9 +7963,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/
  	else
  		clts();
  }
-diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/asm/io.h
---- linux-3.0.4/arch/x86/include/asm/io.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/io.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/io.h linux-3.0.7/arch/x86/include/asm/io.h
+--- linux-3.0.7/arch/x86/include/asm/io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -7502,9 +7984,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/as
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/include/asm/irqflags.h
---- linux-3.0.4/arch/x86/include/asm/irqflags.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/irqflags.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/irqflags.h linux-3.0.7/arch/x86/include/asm/irqflags.h
+--- linux-3.0.7/arch/x86/include/asm/irqflags.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -7517,9 +7999,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/incl
  #else
  #define INTERRUPT_RETURN		iret
  #define ENABLE_INTERRUPTS_SYSEXIT	sti; sysexit
-diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/include/asm/kprobes.h
---- linux-3.0.4/arch/x86/include/asm/kprobes.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/kprobes.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/kprobes.h linux-3.0.7/arch/x86/include/asm/kprobes.h
+--- linux-3.0.7/arch/x86/include/asm/kprobes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -7536,9 +8018,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/inclu
  
  #define flush_insn_slot(p)	do { } while (0)
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/include/asm/kvm_host.h
---- linux-3.0.4/arch/x86/include/asm/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/kvm_host.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/kvm_host.h linux-3.0.7/arch/x86/include/asm/kvm_host.h
+--- linux-3.0.7/arch/x86/include/asm/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/kvm_host.h	2011-08-26 19:49:56.000000000 -0400
 @@ -441,7 +441,7 @@ struct kvm_arch {
  	unsigned int n_used_mmu_pages;
  	unsigned int n_requested_mmu_pages;
@@ -7557,9 +8039,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/incl
  
  struct kvm_arch_async_pf {
  	u32 token;
-diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include/asm/local.h
---- linux-3.0.4/arch/x86/include/asm/local.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/local.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/local.h linux-3.0.7/arch/x86/include/asm/local.h
+--- linux-3.0.7/arch/x86/include/asm/local.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -7712,9 +8194,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include
  		     : "+r" (i), "+m" (l->a.counter)
  		     : : "memory");
  	return i + __i;
-diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/asm/mman.h
---- linux-3.0.4/arch/x86/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/mman.h linux-3.0.7/arch/x86/include/asm/mman.h
+--- linux-3.0.7/arch/x86/include/asm/mman.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/mman.h	2011-08-23 21:47:55.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7730,9 +8212,42 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/include/asm/mmu_context.h
---- linux-3.0.4/arch/x86/include/asm/mmu_context.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/mmu_context.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/mmu.h linux-3.0.7/arch/x86/include/asm/mmu.h
+--- linux-3.0.7/arch/x86/include/asm/mmu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/mmu_context.h linux-3.0.7/arch/x86/include/asm/mmu_context.h
+--- linux-3.0.7/arch/x86/include/asm/mmu_context.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -7853,42 +8368,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/i
  }
  
  #define activate_mm(prev, next)			\
-diff -urNp linux-3.0.4/arch/x86/include/asm/mmu.h linux-3.0.4/arch/x86/include/asm/mmu.h
---- linux-3.0.4/arch/x86/include/asm/mmu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/include/asm/module.h
---- linux-3.0.4/arch/x86/include/asm/module.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/module.h	2011-10-07 19:24:31.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/module.h linux-3.0.7/arch/x86/include/asm/module.h
+--- linux-3.0.7/arch/x86/include/asm/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/module.h	2011-10-07 19:24:31.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -7918,9 +8400,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/includ
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86/include/asm/page_64_types.h
---- linux-3.0.4/arch/x86/include/asm/page_64_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/page_64_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/page_64_types.h linux-3.0.7/arch/x86/include/asm/page_64_types.h
+--- linux-3.0.7/arch/x86/include/asm/page_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -7930,9 +8412,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)	(x)
-diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/include/asm/paravirt.h
---- linux-3.0.4/arch/x86/include/asm/paravirt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/paravirt.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt.h linux-3.0.7/arch/x86/include/asm/paravirt.h
+--- linux-3.0.7/arch/x86/include/asm/paravirt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -8005,9 +8487,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/incl
  #endif	/* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x86/include/asm/paravirt_types.h
---- linux-3.0.4/arch/x86/include/asm/paravirt_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/paravirt_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/paravirt_types.h linux-3.0.7/arch/x86/include/asm/paravirt_types.h
+--- linux-3.0.7/arch/x86/include/asm/paravirt_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -8079,9 +8561,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x8
  
  /* 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.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/include/asm/pgalloc.h
---- linux-3.0.4/arch/x86/include/asm/pgalloc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgalloc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/pgalloc.h linux-3.0.7/arch/x86/include/asm/pgalloc.h
+--- linux-3.0.7/arch/x86/include/asm/pgalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -8096,9 +8578,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/inclu
  	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x86/include/asm/pgtable-2level.h
---- linux-3.0.4/arch/x86/include/asm/pgtable-2level.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable-2level.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-2level.h linux-3.0.7/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable-2level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -8109,87 +8591,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x8
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32.h linux-3.0.4/arch/x86/include/asm/pgtable_32.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/pgtable_32_types.h linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x86/include/asm/pgtable-3level.h
---- linux-3.0.4/arch/x86/include/asm/pgtable-3level.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable-3level.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable-3level.h linux-3.0.7/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable-3level.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -8207,66 +8611,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x8
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64.h linux-3.0.4/arch/x86/include/asm/pgtable_64.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/pgtable_64_types.h linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/include/asm/pgtable.h
---- linux-3.0.4/arch/x86/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable.h linux-3.0.7/arch/x86/include/asm/pgtable.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -8444,9 +8791,144 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/inclu
  
  #include <asm-generic/pgtable.h>
  #endif	/* __ASSEMBLY__ */
-diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86/include/asm/pgtable_types.h
---- linux-3.0.4/arch/x86/include/asm/pgtable_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/pgtable_types.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/pgtable_32.h linux-3.0.7/arch/x86/include/asm/pgtable_32.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/pgtable_32_types.h linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable_32_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/pgtable_64.h linux-3.0.7/arch/x86/include/asm/pgtable_64.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/pgtable_64_types.h linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable_64_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/include/asm/pgtable_types.h linux-3.0.7/arch/x86/include/asm/pgtable_types.h
+--- linux-3.0.7/arch/x86/include/asm/pgtable_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -8560,9 +9042,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86
  
  #define pgprot_writecombine	pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/include/asm/processor.h
---- linux-3.0.4/arch/x86/include/asm/processor.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/processor.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/processor.h linux-3.0.7/arch/x86/include/asm/processor.h
+--- linux-3.0.7/arch/x86/include/asm/processor.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/processor.h	2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -8665,9 +9147,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/inc
  #define KSTK_EIP(task)		(task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/include/asm/ptrace.h
---- linux-3.0.4/arch/x86/include/asm/ptrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/ptrace.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/ptrace.h linux-3.0.7/arch/x86/include/asm/ptrace.h
+--- linux-3.0.7/arch/x86/include/asm/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/ptrace.h	2011-08-23 21:47:55.000000000 -0400
 @@ -153,28 +153,29 @@ static inline unsigned long regs_return_
  }
  
@@ -8704,9 +9186,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/includ
  #endif
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/include/asm/reboot.h
---- linux-3.0.4/arch/x86/include/asm/reboot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/reboot.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/reboot.h linux-3.0.7/arch/x86/include/asm/reboot.h
+--- linux-3.0.7/arch/x86/include/asm/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/reboot.h	2011-08-23 21:47:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -8733,9 +9215,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/includ
  /* These must match dispatch_table in reboot_32.S */
  #define MRR_BIOS	0
  #define MRR_APM		1
-diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include/asm/rwsem.h
---- linux-3.0.4/arch/x86/include/asm/rwsem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/rwsem.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/rwsem.h linux-3.0.7/arch/x86/include/asm/rwsem.h
+--- linux-3.0.7/arch/x86/include/asm/rwsem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"
@@ -8860,9 +9342,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include
  		     : "+r" (tmp), "+m" (sem->count)
  		     : : "memory");
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/include/asm/segment.h
---- linux-3.0.4/arch/x86/include/asm/segment.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/segment.h	2011-09-17 00:53:42.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/segment.h linux-3.0.7/arch/x86/include/asm/segment.h
+--- linux-3.0.7/arch/x86/include/asm/segment.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/segment.h	2011-09-17 00:53:42.000000000 -0400
 @@ -64,10 +64,15 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu			[ offset to per-cpu data area ]
@@ -8929,9 +9411,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/inclu
  #define __KERNEL_DS	(GDT_ENTRY_KERNEL_DS*8)
  #define __USER_DS	(GDT_ENTRY_DEFAULT_USER_DS*8+3)
  #define __USER_CS	(GDT_ENTRY_DEFAULT_USER_CS*8+3)
-diff -urNp linux-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/asm/smp.h
---- linux-3.0.4/arch/x86/include/asm/smp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/smp.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/smp.h linux-3.0.7/arch/x86/include/asm/smp.h
+--- linux-3.0.7/arch/x86/include/asm/smp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -8967,9 +9449,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/a
  #define safe_smp_processor_id()		smp_processor_id()
  
  #endif
-diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/include/asm/spinlock.h
---- linux-3.0.4/arch/x86/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/spinlock.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/spinlock.h linux-3.0.7/arch/x86/include/asm/spinlock.h
+--- linux-3.0.7/arch/x86/include/asm/spinlock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -9032,9 +9514,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/incl
  		     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x86/include/asm/stackprotector.h
---- linux-3.0.4/arch/x86/include/asm/stackprotector.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/stackprotector.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/stackprotector.h linux-3.0.7/arch/x86/include/asm/stackprotector.h
+--- linux-3.0.7/arch/x86/include/asm/stackprotector.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -9053,9 +9535,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x8
  	asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/include/asm/stacktrace.h
---- linux-3.0.4/arch/x86/include/asm/stacktrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/stacktrace.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/stacktrace.h linux-3.0.7/arch/x86/include/asm/stacktrace.h
+--- linux-3.0.7/arch/x86/include/asm/stacktrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/stacktrace.h	2011-08-23 21:47:55.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -9106,9 +9588,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/in
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.0.4/arch/x86/include/asm/sys_ia32.h linux-3.0.4/arch/x86/include/asm/sys_ia32.h
---- linux-3.0.4/arch/x86/include/asm/sys_ia32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/sys_ia32.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/sys_ia32.h linux-3.0.7/arch/x86/include/asm/sys_ia32.h
+--- linux-3.0.7/arch/x86/include/asm/sys_ia32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/sys_ia32.h	2011-10-06 04:17:55.000000000 -0400
 @@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int
  				     compat_sigset_t __user *, unsigned int);
  asmlinkage long sys32_alarm(unsigned int);
@@ -9118,9 +9600,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/sys_ia32.h linux-3.0.4/arch/x86/incl
  asmlinkage long sys32_sysfs(int, u32, u32);
  
  asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
-diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/include/asm/system.h
---- linux-3.0.4/arch/x86/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/system.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/system.h linux-3.0.7/arch/x86/include/asm/system.h
+--- linux-3.0.7/arch/x86/include/asm/system.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"		  \
@@ -9163,9 +9645,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/includ
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/include/asm/thread_info.h
---- linux-3.0.4/arch/x86/include/asm/thread_info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/thread_info.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/thread_info.h linux-3.0.7/arch/x86/include/asm/thread_info.h
+--- linux-3.0.7/arch/x86/include/asm/thread_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -9313,9 +9795,231 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/i
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/include/asm/uaccess_32.h
---- linux-3.0.4/arch/x86/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess_32.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess.h linux-3.0.7/arch/x86/include/asm/uaccess.h
+--- linux-3.0.7/arch/x86/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/uaccess.h	2011-10-06 04:17: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)				\
+@@ -252,7 +294,7 @@ extern void __put_user_8(void);
+ 	__typeof__(*(ptr)) __pu_val;				\
+ 	__chk_user_ptr(ptr);					\
+ 	might_fault();						\
+-	__pu_val = x;						\
++	__pu_val = (x);						\
+ 	switch (sizeof(*(ptr))) {				\
+ 	case 1:							\
+ 		__put_user_x(1, __pu_val, ptr, __ret_pu);	\
+@@ -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.7/arch/x86/include/asm/uaccess_32.h linux-3.0.7/arch/x86/include/asm/uaccess_32.h
+--- linux-3.0.7/arch/x86/include/asm/uaccess_32.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -9483,9 +10187,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/in
  	return n;
  }
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/include/asm/uaccess_64.h
---- linux-3.0.4/arch/x86/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess_64.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/uaccess_64.h linux-3.0.7/arch/x86/include/asm/uaccess_64.h
+--- linux-3.0.7/arch/x86/include/asm/uaccess_64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/uaccess_64.h	2011-10-06 04:17:55.000000000 -0400
 @@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9897,231 +10601,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/in
 +copy_user_handle_tail(char __user *to, char __user *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/include/asm/uaccess.h
---- linux-3.0.4/arch/x86/include/asm/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/uaccess.h	2011-10-06 04:17: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)				\
-@@ -252,7 +294,7 @@ extern void __put_user_8(void);
- 	__typeof__(*(ptr)) __pu_val;				\
- 	__chk_user_ptr(ptr);					\
- 	might_fault();						\
--	__pu_val = x;						\
-+	__pu_val = (x);						\
- 	switch (sizeof(*(ptr))) {				\
- 	case 1:							\
- 		__put_user_x(1, __pu_val, ptr, __ret_pu);	\
-@@ -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.4/arch/x86/include/asm/vdso.h linux-3.0.4/arch/x86/include/asm/vdso.h
---- linux-3.0.4/arch/x86/include/asm/vdso.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/vdso.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/vdso.h linux-3.0.7/arch/x86/include/asm/vdso.h
+--- linux-3.0.7/arch/x86/include/asm/vdso.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/vdso.h	2011-10-06 04:17:55.000000000 -0400
 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
  #define VDSO32_SYMBOL(base, name)					\
  ({									\
@@ -10131,9 +10613,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/vdso.h linux-3.0.4/arch/x86/include/
  })
  #endif
  
-diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/include/asm/x86_init.h
---- linux-3.0.4/arch/x86/include/asm/x86_init.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/x86_init.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/x86_init.h linux-3.0.7/arch/x86/include/asm/x86_init.h
+--- linux-3.0.7/arch/x86/include/asm/x86_init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -10251,9 +10733,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/incl
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include/asm/xsave.h
---- linux-3.0.4/arch/x86/include/asm/xsave.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/include/asm/xsave.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/include/asm/xsave.h linux-3.0.7/arch/x86/include/asm/xsave.h
+--- linux-3.0.7/arch/x86/include/asm/xsave.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/include/asm/xsave.h	2011-10-06 04:17:55.000000000 -0400
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
  	int err;
@@ -10283,135 +10765,9 @@ diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include
  	__asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
  			     "2:\n"
  			     ".section .fixup,\"ax\"\n"
-diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
---- linux-3.0.4/arch/x86/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/Kconfig	2011-09-17 00:58:36.000000000 -0400
-@@ -229,7 +229,7 @@ config X86_HT
- 
- 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
- 
- 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
-@@ -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.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
---- linux-3.0.4/arch/x86/Kconfig.cpu	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/Kconfig.debug linux-3.0.4/arch/x86/Kconfig.debug
---- linux-3.0.4/arch/x86/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.0.7/arch/x86/kernel/acpi/realmode/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -10422,9 +10778,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x
  KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.0.7/arch/x86/kernel/acpi/realmode/wakeup.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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... */
  
@@ -10443,9 +10799,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x
  #else
  	pushw	$0
  	pushw	trampoline_segment
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/acpi/sleep.c
---- linux-3.0.4/arch/x86/kernel/acpi/sleep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/sleep.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/acpi/sleep.c linux-3.0.7/arch/x86/kernel/acpi/sleep.c
+--- linux-3.0.7/arch/x86/kernel/acpi/sleep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -10459,9 +10815,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/
  	initial_gs = per_cpu_offset(smp_processor_id());
  #endif
  	initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.0.7/arch/x86/kernel/acpi/wakeup_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -10478,9 +10834,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/ker
  
  bogus_magic:
  	jmp	bogus_magic
-diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel/alternative.c
---- linux-3.0.4/arch/x86/kernel/alternative.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/alternative.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/alternative.c linux-3.0.7/arch/x86/kernel/alternative.c
+--- linux-3.0.7/arch/x86/kernel/alternative.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -10582,9 +10938,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel
  	return addr;
  }
  
-diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/apic/apic.c
---- linux-3.0.4/arch/x86/kernel/apic/apic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apic/apic.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/apic/apic.c linux-3.0.7/arch/x86/kernel/apic/apic.c
+--- linux-3.0.7/arch/x86/kernel/apic/apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -10612,9 +10968,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/a
  	bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
  	bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kernel/apic/io_apic.c
---- linux-3.0.4/arch/x86/kernel/apic/io_apic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apic/io_apic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/apic/io_apic.c linux-3.0.7/arch/x86/kernel/apic/io_apic.c
+--- linux-3.0.7/arch/x86/kernel/apic/io_apic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -10651,9 +11007,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kerne
  
  		eoi_ioapic_irq(irq, cfg);
  	}
-diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_32.c
---- linux-3.0.4/arch/x86/kernel/apm_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/apm_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/apm_32.c linux-3.0.7/arch/x86/kernel/apm_32.c
+--- linux-3.0.7/arch/x86/kernel/apm_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -10725,20 +11081,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_
  
  	proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets_64.c linux-3.0.4/arch/x86/kernel/asm-offsets_64.c
---- linux-3.0.4/arch/x86/kernel/asm-offsets_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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();
- 
-diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel/asm-offsets.c
---- linux-3.0.4/arch/x86/kernel/asm-offsets.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/asm-offsets.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/asm-offsets.c linux-3.0.7/arch/x86/kernel/asm-offsets.c
+--- linux-3.0.7/arch/x86/kernel/asm-offsets.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  	OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10775,9 +11120,34 @@ diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel
  #ifdef CONFIG_XEN
  	BLANK();
  	OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu/amd.c
---- linux-3.0.4/arch/x86/kernel/cpu/amd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/amd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/asm-offsets_64.c linux-3.0.7/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.0.7/arch/x86/kernel/asm-offsets_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
+ 
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/Makefile linux-3.0.7/arch/x86/kernel/cpu/Makefile
+--- linux-3.0.7/arch/x86/kernel/cpu/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/cpu/amd.c linux-3.0.7/arch/x86/kernel/cpu/amd.c
+--- linux-3.0.7/arch/x86/kernel/cpu/amd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -10787,9 +11157,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu
  		/* Duron Rev A0 */
  		if (c->x86_model == 3 && c->x86_mask == 0)
  			size = 64;
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/cpu/common.c
---- linux-3.0.4/arch/x86/kernel/cpu/common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/common.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/common.c linux-3.0.7/arch/x86/kernel/cpu/common.c
+--- linux-3.0.7/arch/x86/kernel/cpu/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -10934,9 +11304,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/
  	struct thread_struct *thread = &curr->thread;
  
  	if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/cpu/intel.c
---- linux-3.0.4/arch/x86/kernel/cpu/intel.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/intel.c	2011-08-29 23:30:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/intel.c linux-3.0.7/arch/x86/kernel/cpu/intel.c
+--- linux-3.0.7/arch/x86/kernel/cpu/intel.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/cpu/intel.c	2011-08-29 23:30:14.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.
@@ -10946,23 +11316,23 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/c
  	load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/Makefile linux-3.0.4/arch/x86/kernel/cpu/Makefile
---- linux-3.0.4/arch/x86/kernel/cpu/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.0.7/arch/x86/kernel/cpu/mcheck/mce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -11064,23 +11434,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/ker
  	atomic_set(&mce_executing, 0);
  	atomic_set(&mce_callin, 0);
  	atomic_set(&global_nwo, 0);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c	2011-08-29 23:26:21.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/cpu/mtrr/main.c	2011-08-29 23:26:21.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -11090,9 +11446,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kern
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/cpu/mtrr/mtrr.h	2011-08-26 19:49:56.000000000 -0400
 @@ -25,7 +25,7 @@ struct mtrr_ops {
  	int	(*validate_add_page)(unsigned long base, unsigned long size,
  				     unsigned int type);
@@ -11102,9 +11458,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kern
  
  extern int generic_get_free_region(unsigned long base, unsigned long size,
  				   int replace_reg);
-diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/kernel/cpu/perf_event.c
---- linux-3.0.4/arch/x86/kernel/cpu/perf_event.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/cpu/perf_event.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/cpu/perf_event.c linux-3.0.7/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.0.7/arch/x86/kernel/cpu/perf_event.c	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/cpu/perf_event.c	2011-10-16 21:55:27.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;
@@ -11114,7 +11470,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/ker
  	bitmap_zero(used_mask, X86_PMC_IDX_MAX);
  
  	for (i = 0; i < n; i++) {
-@@ -1872,7 +1874,7 @@ perf_callchain_user(struct perf_callchai
+@@ -1875,7 +1877,7 @@ perf_callchain_user(struct perf_callchai
  			break;
  
  		perf_callchain_store(entry, frame.return_address);
@@ -11123,9 +11479,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/ker
  	}
  }
  
-diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash.c
---- linux-3.0.4/arch/x86/kernel/crash.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/crash.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/crash.c linux-3.0.7/arch/x86/kernel/crash.c
+--- linux-3.0.7/arch/x86/kernel/crash.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -11135,9 +11491,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash
  		crash_fixup_ss_esp(&fixed_regs, regs);
  		regs = &fixed_regs;
  	}
-diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/kernel/doublefault_32.c
---- linux-3.0.4/arch/x86/kernel/doublefault_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/doublefault_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/doublefault_32.c linux-3.0.7/arch/x86/kernel/doublefault_32.c
+--- linux-3.0.7/arch/x86/kernel/doublefault_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/doublefault_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -11169,129 +11525,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/ker
  		.fs		= __KERNEL_PERCPU,
  
  		.__cr3		= __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_32.c linux-3.0.4/arch/x86/kernel/dumpstack_32.c
---- linux-3.0.4/arch/x86/kernel/dumpstack_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kernel/dumpstack_64.c
---- linux-3.0.4/arch/x86/kernel/dumpstack_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/dumpstack.c
---- linux-3.0.4/arch/x86/kernel/dumpstack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/dumpstack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack.c linux-3.0.7/arch/x86/kernel/dumpstack.c
+--- linux-3.0.7/arch/x86/kernel/dumpstack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -11435,9 +11671,129 @@ diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/d
  		report_bug(regs->ip, regs);
  
  	if (__die(str, regs, err))
-diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kernel/early_printk.c
---- linux-3.0.4/arch/x86/kernel/early_printk.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/early_printk.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/dumpstack_32.c linux-3.0.7/arch/x86/kernel/dumpstack_32.c
+--- linux-3.0.7/arch/x86/kernel/dumpstack_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/dumpstack_64.c linux-3.0.7/arch/x86/kernel/dumpstack_64.c
+--- linux-3.0.7/arch/x86/kernel/dumpstack_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/early_printk.c linux-3.0.7/arch/x86/kernel/early_printk.c
+--- linux-3.0.7/arch/x86/kernel/early_printk.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -11455,9 +11811,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kerne
  	va_start(ap, fmt);
  	n = vscnprintf(buf, sizeof(buf), fmt, ap);
  	early_console->write(early_console, buf, n);
-diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/entry_32.S
---- linux-3.0.4/arch/x86/kernel/entry_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/entry_32.S	2011-08-30 18:23:52.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/entry_32.S linux-3.0.7/arch/x86/kernel/entry_32.S
+--- linux-3.0.7/arch/x86/kernel/entry_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/entry_32.S	2011-08-30 18:23:52.000000000 -0400
 @@ -185,13 +185,146 @@
  	/*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -11955,9 +12311,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/en
  	RESTORE_REGS
  	lss 12+4(%esp), %esp		# back to espfix stack
  	CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/entry_64.S
---- linux-3.0.4/arch/x86/kernel/entry_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/entry_64.S	2011-10-07 19:07:23.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/entry_64.S linux-3.0.7/arch/x86/kernel/entry_64.S
+--- linux-3.0.7/arch/x86/kernel/entry_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/entry_64.S	2011-10-11 10:44:33.000000000 -0400
 @@ -53,6 +53,8 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -12560,15 +12916,31 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  	call *%rsi
  	# exit
  	mov %eax, %edi
-@@ -1213,6 +1569,7 @@ ENTRY(call_softirq)
+@@ -1193,9 +1549,10 @@ ENTRY(kernel_execve)
+ 	je int_ret_from_sys_call
+ 	RESTORE_ARGS
+ 	UNFAKE_STACK_FRAME
++	pax_force_retaddr
+ 	ret
+ 	CFI_ENDPROC
+-END(kernel_execve)
++ENDPROC(kernel_execve)
+ 
+ /* Call softirq on interrupt stack. Interrupts are off. */
+ ENTRY(call_softirq)
+@@ -1213,9 +1570,10 @@ ENTRY(call_softirq)
  	CFI_DEF_CFA_REGISTER	rsp
  	CFI_ADJUST_CFA_OFFSET   -8
  	decl PER_CPU_VAR(irq_count)
 +	pax_force_retaddr
  	ret
  	CFI_ENDPROC
- END(call_softirq)
-@@ -1361,16 +1718,31 @@ ENTRY(paranoid_exit)
+-END(call_softirq)
++ENDPROC(call_softirq)
+ 
+ #ifdef CONFIG_XEN
+ zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
+@@ -1361,16 +1719,31 @@ ENTRY(paranoid_exit)
  	TRACE_IRQS_OFF
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz paranoid_restore
@@ -12601,7 +12973,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  	jmp irq_return
  paranoid_userspace:
  	GET_THREAD_INFO(%rcx)
-@@ -1426,12 +1798,13 @@ ENTRY(error_entry)
+@@ -1426,12 +1799,13 @@ ENTRY(error_entry)
  	movq_cfi r14, R14+8
  	movq_cfi r15, R15+8
  	xorl %ebx,%ebx
@@ -12616,7 +12988,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  	ret
  
  /*
-@@ -1490,6 +1863,16 @@ ENTRY(nmi)
+@@ -1490,6 +1864,16 @@ ENTRY(nmi)
  	CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
  	call save_paranoid
  	DEFAULT_FRAME 0
@@ -12633,7 +13005,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  	/* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
  	movq %rsp,%rdi
  	movq $-1,%rsi
-@@ -1500,12 +1883,28 @@ ENTRY(nmi)
+@@ -1500,12 +1884,28 @@ ENTRY(nmi)
  	DISABLE_INTERRUPTS(CLBR_NONE)
  	testl %ebx,%ebx				/* swapgs needed? */
  	jnz nmi_restore
@@ -12663,9 +13035,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/en
  	jmp irq_return
  nmi_userspace:
  	GET_THREAD_INFO(%rcx)
-diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftrace.c
---- linux-3.0.4/arch/x86/kernel/ftrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ftrace.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/ftrace.c linux-3.0.7/arch/x86/kernel/ftrace.c
+--- linux-3.0.7/arch/x86/kernel/ftrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  
@@ -12723,9 +13095,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftra
  	if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
  		return -EFAULT;
  
-diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head32.c
---- linux-3.0.4/arch/x86/kernel/head32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/head32.c linux-3.0.7/arch/x86/kernel/head32.c
+--- linux-3.0.7/arch/x86/kernel/head32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -12743,9 +13115,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head
  
  #ifdef CONFIG_BLK_DEV_INITRD
  	/* Reserve INITRD */
-diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/head_32.S
---- linux-3.0.4/arch/x86/kernel/head_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/head_32.S linux-3.0.7/arch/x86/kernel/head_32.S
+--- linux-3.0.7/arch/x86/kernel/head_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -13180,9 +13552,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/hea
 +	/* Be sure this is zeroed to avoid false validations in Xen */
 +	.fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +	.endr
-diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/head_64.S
---- linux-3.0.4/arch/x86/kernel/head_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/head_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/head_64.S linux-3.0.7/arch/x86/kernel/head_64.S
+--- linux-3.0.7/arch/x86/kernel/head_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -13452,9 +13824,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/hea
  
  	__PAGE_ALIGNED_BSS
  	.align PAGE_SIZE
-diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.0.7/arch/x86/kernel/i386_ksyms_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -13476,9 +13848,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kern
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259.c
---- linux-3.0.4/arch/x86/kernel/i8259.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/i8259.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/i8259.c linux-3.0.7/arch/x86/kernel/i8259.c
+--- linux-3.0.7/arch/x86/kernel/i8259.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -13488,9 +13860,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259
  		/*
  		 * Theoretically we do not have to handle this IRQ,
  		 * but in Linux this does not cause problems and is
-diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/init_task.c
---- linux-3.0.4/arch/x86/kernel/init_task.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/init_task.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/init_task.c linux-3.0.7/arch/x86/kernel/init_task.c
+--- linux-3.0.7/arch/x86/kernel/init_task.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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..
@@ -13509,9 +13881,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/i
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/ioport.c
---- linux-3.0.4/arch/x86/kernel/ioport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ioport.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/ioport.c linux-3.0.7/arch/x86/kernel/ioport.c
+--- linux-3.0.7/arch/x86/kernel/ioport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -13555,9 +13927,46 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/iopo
  		if (!capable(CAP_SYS_RAWIO))
  			return -EPERM;
  	}
-diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_32.c
---- linux-3.0.4/arch/x86/kernel/irq_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/irq_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/irq.c linux-3.0.7/arch/x86/kernel/irq.c
+--- linux-3.0.7/arch/x86/kernel/irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/irq_32.c linux-3.0.7/arch/x86/kernel/irq_32.c
+--- linux-3.0.7/arch/x86/kernel/irq_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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));
@@ -13697,46 +14106,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_
  		/*
  		 * Shouldn't happen, we returned above if in_interrupt():
  		 */
-diff -urNp linux-3.0.4/arch/x86/kernel/irq.c linux-3.0.4/arch/x86/kernel/irq.c
---- linux-3.0.4/arch/x86/kernel/irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
---- linux-3.0.4/arch/x86/kernel/kgdb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kgdb.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/kgdb.c linux-3.0.7/arch/x86/kernel/kgdb.c
+--- linux-3.0.7/arch/x86/kernel/kgdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -13775,9 +14147,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
  			if (user_mode(regs))
  				return single_step_cont(regs, args);
  			break;
-diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kprobes.c
---- linux-3.0.4/arch/x86/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kprobes.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/kprobes.c linux-3.0.7/arch/x86/kernel/kprobes.c
+--- linux-3.0.7/arch/x86/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/kprobes.c	2011-10-11 10:44:33.000000000 -0400
 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
  	} __attribute__((packed)) *insn;
  
@@ -13861,7 +14233,17 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  		/*
  		 * The breakpoint instruction was removed right
  		 * after we hit it.  Another cpu has removed
-@@ -817,7 +824,7 @@ static void __kprobes resume_execution(s
+@@ -680,6 +687,9 @@ static void __used __kprobes kretprobe_t
+ 			"	movq %rax, 152(%rsp)\n"
+ 			RESTORE_REGS_STRING
+ 			"	popfq\n"
++#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
++			"	btsq $63,(%rsp)\n"
++#endif
+ #else
+ 			"	pushf\n"
+ 			SAVE_REGS_STRING
+@@ -817,7 +827,7 @@ static void __kprobes resume_execution(s
  		struct pt_regs *regs, struct kprobe_ctlblk *kcb)
  {
  	unsigned long *tos = stack_addr(regs);
@@ -13870,7 +14252,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  	unsigned long orig_ip = (unsigned long)p->addr;
  	kprobe_opcode_t *insn = p->ainsn.insn;
  
-@@ -999,7 +1006,7 @@ int __kprobes kprobe_exceptions_notify(s
+@@ -999,7 +1009,7 @@ int __kprobes kprobe_exceptions_notify(s
  	struct die_args *args = data;
  	int ret = NOTIFY_DONE;
  
@@ -13879,7 +14261,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  		return ret;
  
  	switch (val) {
-@@ -1381,7 +1388,7 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1381,7 +1391,7 @@ int __kprobes arch_prepare_optimized_kpr
  	 * Verify if the address gap is in 2GB range, because this uses
  	 * a relative jump.
  	 */
@@ -13888,7 +14270,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  	if (abs(rel) > 0x7fffffff)
  		return -ERANGE;
  
-@@ -1402,11 +1409,11 @@ int __kprobes arch_prepare_optimized_kpr
+@@ -1402,11 +1412,11 @@ int __kprobes arch_prepare_optimized_kpr
  	synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
  
  	/* Set probe function call */
@@ -13902,7 +14284,7 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  
  	flush_icache_range((unsigned long) buf,
  			   (unsigned long) buf + TMPL_END_IDX +
-@@ -1428,7 +1435,7 @@ static void __kprobes setup_optimize_kpr
+@@ -1428,7 +1438,7 @@ static void __kprobes setup_optimize_kpr
  			((long)op->kp.addr + RELATIVEJUMP_SIZE));
  
  	/* Backup instructions which will be replaced by jump address */
@@ -13911,9 +14293,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kpr
  	       RELATIVE_ADDR_SIZE);
  
  	insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
---- linux-3.0.4/arch/x86/kernel/kvm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/kvm.c	2011-08-24 18:10:12.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/kvm.c linux-3.0.7/arch/x86/kernel/kvm.c
+--- linux-3.0.7/arch/x86/kernel/kvm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -13922,9 +14304,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
  #endif
  #endif
  		pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
---- linux-3.0.4/arch/x86/kernel/ldt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ldt.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/ldt.c linux-3.0.7/arch/x86/kernel/ldt.c
+--- linux-3.0.7/arch/x86/kernel/ldt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -13989,9 +14371,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
  	fill_ldt(&ldt, &ldt_info);
  	if (oldmode)
  		ldt.avl = 0;
-diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/kernel/machine_kexec_32.c
---- linux-3.0.4/arch/x86/kernel/machine_kexec_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/machine_kexec_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/machine_kexec_32.c linux-3.0.7/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.0.7/arch/x86/kernel/machine_kexec_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -14019,9 +14401,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/k
  
  	relocate_kernel_ptr = control_page;
  	page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.0.4/arch/x86/kernel/microcode_intel.c linux-3.0.4/arch/x86/kernel/microcode_intel.c
---- linux-3.0.4/arch/x86/kernel/microcode_intel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/microcode_intel.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/microcode_intel.c linux-3.0.7/arch/x86/kernel/microcode_intel.c
+--- linux-3.0.7/arch/x86/kernel/microcode_intel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/microcode_intel.c	2011-10-06 04:17: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)
@@ -14038,9 +14420,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/microcode_intel.c linux-3.0.4/arch/x86/ke
  }
  
  static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/module.c
---- linux-3.0.4/arch/x86/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/module.c linux-3.0.7/arch/x86/kernel/module.c
+--- linux-3.0.7/arch/x86/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/module.c	2011-08-23 21:47:55.000000000 -0400
 @@ -36,21 +36,66 @@
  #define DEBUGP(fmt...)
  #endif
@@ -14179,9 +14561,21 @@ diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/modu
  #if 0
  			if ((s64)val != *(s32 *)loc)
  				goto overflow;
-diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/paravirt.c
---- linux-3.0.4/arch/x86/kernel/paravirt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/paravirt.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.0.7/arch/x86/kernel/paravirt-spinlocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
+ }
+ 
+-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.7/arch/x86/kernel/paravirt.c linux-3.0.7/arch/x86/kernel/paravirt.c
+--- linux-3.0.7/arch/x86/kernel/paravirt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -14330,21 +14724,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/pa
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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);
- }
- 
--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.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/kernel/pci-iommu_table.c
---- linux-3.0.4/arch/x86/kernel/pci-iommu_table.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/pci-iommu_table.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/pci-iommu_table.c linux-3.0.7/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.0.7/arch/x86/kernel/pci-iommu_table.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -14363,9 +14745,149 @@ diff -urNp linux-3.0.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/ke
  	/* Simple cyclic dependency checker. */
  	for (p = start; p < finish; p++) {
  		q = find_dependents_of(start, finish, p);
-diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/process_32.c
---- linux-3.0.4/arch/x86/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/process.c linux-3.0.7/arch/x86/kernel/process.c
+--- linux-3.0.7/arch/x86/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/process.c	2011-08-30 18:23:52.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,37 @@ static int __init idle_setup(char *str)
+ }
+ early_param("idle", idle_setup);
+ 
+-unsigned long arch_align_stack(unsigned long sp)
++#ifdef CONFIG_PAX_RANDKSTACK
++void pax_randomize_kstack(struct pt_regs *regs)
+ {
+-	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;
++
++	if (v8086_mode(regs))
++		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.7/arch/x86/kernel/process_32.c linux-3.0.7/arch/x86/kernel/process_32.c
+--- linux-3.0.7/arch/x86/kernel/process_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -14452,9 +14974,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/
  	return 0;
  }
 -
-diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/process_64.c
---- linux-3.0.4/arch/x86/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/process_64.c linux-3.0.7/arch/x86/kernel/process_64.c
+--- linux-3.0.7/arch/x86/kernel/process_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -14519,149 +15041,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/
  			return 0;
  		ip = *(u64 *)(fp+8);
  		if (!in_sched_functions(ip))
-diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/process.c
---- linux-3.0.4/arch/x86/kernel/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/process.c	2011-08-30 18:23:52.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,37 @@ static int __init idle_setup(char *str)
- }
- early_param("idle", idle_setup);
- 
--unsigned long arch_align_stack(unsigned long sp)
-+#ifdef CONFIG_PAX_RANDKSTACK
-+void pax_randomize_kstack(struct pt_regs *regs)
- {
--	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;
-+
-+	if (v8086_mode(regs))
-+		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.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptrace.c
---- linux-3.0.4/arch/x86/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/ptrace.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/ptrace.c linux-3.0.7/arch/x86/kernel/ptrace.c
+--- linux-3.0.7/arch/x86/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -14697,9 +15079,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptra
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvclock.c
---- linux-3.0.4/arch/x86/kernel/pvclock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/pvclock.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/pvclock.c linux-3.0.7/arch/x86/kernel/pvclock.c
+--- linux-3.0.7/arch/x86/kernel/pvclock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -14728,9 +15110,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvc
  	} while (unlikely(last != ret));
  
  	return ret;
-diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/reboot.c
---- linux-3.0.4/arch/x86/kernel/reboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/reboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/reboot.c linux-3.0.7/arch/x86/kernel/reboot.c
+--- linux-3.0.7/arch/x86/kernel/reboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -14862,9 +15244,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/rebo
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup.c
---- linux-3.0.4/arch/x86/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/setup.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/setup.c linux-3.0.7/arch/x86/kernel/setup.c
+--- linux-3.0.7/arch/x86/kernel/setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/setup.c	2011-10-06 04:17:55.000000000 -0400
 @@ -447,7 +447,7 @@ static void __init parse_setup_data(void
  
  		switch (data->type) {
@@ -14903,9 +15285,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup
  	data_resource.end = virt_to_phys(_edata)-1;
  	bss_resource.start = virt_to_phys(&__bss_start);
  	bss_resource.end = virt_to_phys(&__bss_stop)-1;
-diff -urNp linux-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kernel/setup_percpu.c
---- linux-3.0.4/arch/x86/kernel/setup_percpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/setup_percpu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/setup_percpu.c linux-3.0.7/arch/x86/kernel/setup_percpu.c
+--- linux-3.0.7/arch/x86/kernel/setup_percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -14969,9 +15351,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kerne
  		/*
  		 * Up to this point, the boot CPU has been using .init.data
  		 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/signal.c
---- linux-3.0.4/arch/x86/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/signal.c linux-3.0.7/arch/x86/kernel/signal.c
+--- linux-3.0.7/arch/x86/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -15055,9 +15437,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/sign
  		return;
  
  	if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smpboot.c
---- linux-3.0.4/arch/x86/kernel/smpboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/smpboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/smpboot.c linux-3.0.7/arch/x86/kernel/smpboot.c
+--- linux-3.0.7/arch/x86/kernel/smpboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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:
@@ -15095,9 +15477,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smp
  	err = do_boot_cpu(apicid, cpu);
  	if (err) {
  		pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
---- linux-3.0.4/arch/x86/kernel/step.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/step.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/step.c linux-3.0.7/arch/x86/kernel/step.c
+--- linux-3.0.7/arch/x86/kernel/step.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -15140,17 +15522,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
  				/* 32-bit mode: register increment */
  				return 0;
  			/* 64-bit mode: REX prefix */
-diff -urNp linux-3.0.4/arch/x86/kernel/syscall_table_32.S linux-3.0.4/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.4/arch/x86/kernel/syscall_table_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel/sys_i386_32.c
---- linux-3.0.4/arch/x86/kernel/sys_i386_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/sys_i386_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/sys_i386_32.c linux-3.0.7/arch/x86/kernel/sys_i386_32.c
+--- linux-3.0.7/arch/x86/kernel/sys_i386_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/sys_i386_32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15388,9 +15762,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel
 +
 +	return addr;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/sys_x86_64.c
---- linux-3.0.4/arch/x86/kernel/sys_x86_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/sys_x86_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/sys_x86_64.c linux-3.0.7/arch/x86/kernel/sys_x86_64.c
+--- linux-3.0.7/arch/x86/kernel/sys_x86_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/sys_x86_64.c	2011-08-23 21:47:55.000000000 -0400
 @@ -32,8 +32,8 @@ out:
  	return error;
  }
@@ -15528,9 +15902,17 @@ diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/
  	mm->cached_hole_size = ~0UL;
  
  	return addr;
-diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot.c
---- linux-3.0.4/arch/x86/kernel/tboot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/tboot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/syscall_table_32.S linux-3.0.7/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.7/arch/x86/kernel/syscall_table_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/kernel/tboot.c linux-3.0.7/arch/x86/kernel/tboot.c
+--- linux-3.0.7/arch/x86/kernel/tboot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -15579,9 +15961,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot
  	register_hotcpu_notifier(&tboot_cpu_notifier);
  	return 0;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
---- linux-3.0.4/arch/x86/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/time.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/time.c linux-3.0.7/arch/x86/kernel/time.c
+--- linux-3.0.7/arch/x86/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -15612,9 +15994,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
  	}
  	return pc;
  }
-diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
---- linux-3.0.4/arch/x86/kernel/tls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/tls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/tls.c linux-3.0.7/arch/x86/kernel/tls.c
+--- linux-3.0.7/arch/x86/kernel/tls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -15627,9 +16009,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
  	set_tls_desc(p, idx, &info, 1);
  
  	return 0;
-diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kernel/trampoline_32.S
---- linux-3.0.4/arch/x86/kernel/trampoline_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/trampoline_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/trampoline_32.S linux-3.0.7/arch/x86/kernel/trampoline_32.S
+--- linux-3.0.7/arch/x86/kernel/trampoline_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -15652,9 +16034,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kern
  
  	# These need to be in the same 64K segment as the above;
  	# hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kernel/trampoline_64.S
---- linux-3.0.4/arch/x86/kernel/trampoline_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/trampoline_64.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/trampoline_64.S linux-3.0.7/arch/x86/kernel/trampoline_64.S
+--- linux-3.0.7/arch/x86/kernel/trampoline_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -15673,9 +16055,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kern
  	.long	tgdt - r_base
  	.short 0
  	.quad	0x00cf9b000000ffff	# __KERNEL32_CS
-diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps.c
---- linux-3.0.4/arch/x86/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/traps.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/traps.c linux-3.0.7/arch/x86/kernel/traps.c
+--- linux-3.0.7/arch/x86/kernel/traps.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 ? */
@@ -15855,9 +16237,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps
  
  	if (!tsk_used_math(tsk)) {
  		local_irq_enable();
-diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/verify_cpu.S
---- linux-3.0.4/arch/x86/kernel/verify_cpu.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/verify_cpu.S	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/verify_cpu.S linux-3.0.7/arch/x86/kernel/verify_cpu.S
+--- linux-3.0.7/arch/x86/kernel/verify_cpu.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -15866,9 +16248,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/
   *
   *	verify_cpu, returns the status of longmode and SSE in register %eax.
   *		0: Success    1: Failure
-diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm86_32.c
---- linux-3.0.4/arch/x86/kernel/vm86_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vm86_32.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/vm86_32.c linux-3.0.7/arch/x86/kernel/vm86_32.c
+--- linux-3.0.7/arch/x86/kernel/vm86_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -15933,9 +16315,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm8
  	if (get_user(segoffs, intr_ptr))
  		goto cannot_handle;
  	if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel/vmlinux.lds.S
---- linux-3.0.4/arch/x86/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vmlinux.lds.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/vmlinux.lds.S linux-3.0.7/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.0.7/arch/x86/kernel/vmlinux.lds.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -16198,9 +16580,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel
  	   "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.4/arch/x86/kernel/vsyscall_64.c linux-3.0.4/arch/x86/kernel/vsyscall_64.c
---- linux-3.0.4/arch/x86/kernel/vsyscall_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/vsyscall_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/vsyscall_64.c linux-3.0.7/arch/x86/kernel/vsyscall_64.c
+--- linux-3.0.7/arch/x86/kernel/vsyscall_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) =
  {
@@ -16219,9 +16601,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/vsyscall_64.c linux-3.0.4/arch/x86/kernel
  	  .proc_handler = proc_dointvec },
  	{}
  };
-diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.0.7/arch/x86/kernel/x8664_ksyms_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -16231,9 +16613,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/ker
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave.c
---- linux-3.0.4/arch/x86/kernel/xsave.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kernel/xsave.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kernel/xsave.c linux-3.0.7/arch/x86/kernel/xsave.c
+--- linux-3.0.7/arch/x86/kernel/xsave.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kernel/xsave.c	2011-10-06 04:17: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;
@@ -16261,9 +16643,9 @@ diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave
  				       buf);
  	if (unlikely(err)) {
  		/*
-diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
---- linux-3.0.4/arch/x86/kvm/emulate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/emulate.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/emulate.c linux-3.0.7/arch/x86/kvm/emulate.c
+--- linux-3.0.7/arch/x86/kvm/emulate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -16298,9 +16680,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
  		switch ((_dst).bytes) {				             \
  		case 1:							     \
  			____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
---- linux-3.0.4/arch/x86/kvm/lapic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/lapic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/lapic.c linux-3.0.7/arch/x86/kvm/lapic.c
+--- linux-3.0.7/arch/x86/kvm/lapic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kvm/lapic.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -16310,9 +16692,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
  
  #define APIC_LVT_NUM			6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
---- linux-3.0.4/arch/x86/kvm/mmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/mmu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/mmu.c linux-3.0.7/arch/x86/kvm/mmu.c
+--- linux-3.0.7/arch/x86/kvm/mmu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -16331,9 +16713,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
  		gentry = 0;
  	kvm_mmu_free_some_pages(vcpu);
  	++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/paging_tmpl.h
---- linux-3.0.4/arch/x86/kvm/paging_tmpl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/paging_tmpl.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/paging_tmpl.h linux-3.0.7/arch/x86/kvm/paging_tmpl.h
+--- linux-3.0.7/arch/x86/kvm/paging_tmpl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kvm/paging_tmpl.h	2011-10-06 04:17:55.000000000 -0400
 @@ -182,7 +182,7 @@ walk:
  			break;
  		}
@@ -16361,9 +16743,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/pagin
  
  	spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
---- linux-3.0.4/arch/x86/kvm/svm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/svm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/svm.c linux-3.0.7/arch/x86/kvm/svm.c
+--- linux-3.0.7/arch/x86/kvm/svm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
  
@@ -16387,9 +16769,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
  	reload_tss(vcpu);
  
  	local_irq_disable();
-diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
---- linux-3.0.4/arch/x86/kvm/vmx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/vmx.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/vmx.c linux-3.0.7/arch/x86/kvm/vmx.c
+--- linux-3.0.7/arch/x86/kvm/vmx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -16468,9 +16850,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
  	vmx->launched = 1;
  
  	vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
---- linux-3.0.4/arch/x86/kvm/x86.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/kvm/x86.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/kvm/x86.c linux-3.0.7/arch/x86/kvm/x86.c
+--- linux-3.0.7/arch/x86/kvm/x86.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/kvm/x86.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1313,8 +1313,8 @@ static int xen_hvm_config(struct kvm_vcp
  {
  	struct kvm *kvm = vcpu->kvm;
@@ -16556,9 +16938,9 @@ diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
  {
  	int r;
  	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
---- linux-3.0.4/arch/x86/lguest/boot.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lguest/boot.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lguest/boot.c linux-3.0.7/arch/x86/lguest/boot.c
+--- linux-3.0.7/arch/x86/lguest/boot.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -16571,9 +16953,9 @@ diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
  }
  
  /*G:050
-diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomic64_32.c
---- linux-3.0.4/arch/x86/lib/atomic64_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/atomic64_32.c linux-3.0.7/arch/x86/lib/atomic64_32.c
+--- linux-3.0.7/arch/x86/lib/atomic64_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -16652,9 +17034,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomi
  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 -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/atomic64_386_32.S
---- linux-3.0.4/arch/x86/lib/atomic64_386_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_386_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/atomic64_386_32.S linux-3.0.7/arch/x86/lib/atomic64_386_32.S
+--- linux-3.0.7/arch/x86/lib/atomic64_386_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -16910,9 +17292,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/a
  	js 1f
  	movl %eax,  (v)
  	movl %edx, 4(v)
-diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/atomic64_cx8_32.S	2011-10-06 04:17:55.000000000 -0400
 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
  	CFI_STARTPROC
  
@@ -17134,9 +17516,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/a
  	ret
  4:
  	testl %edx, %edx
-diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/checksum_32.S
---- linux-3.0.4/arch/x86/lib/checksum_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/checksum_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/checksum_32.S linux-3.0.7/arch/x86/lib/checksum_32.S
+--- linux-3.0.7/arch/x86/lib/checksum_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -17381,9 +17763,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/check
  				
  #undef ROUND
  #undef ROUND1		
-diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/clear_page_64.S
---- linux-3.0.4/arch/x86/lib/clear_page_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/clear_page_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/clear_page_64.S linux-3.0.7/arch/x86/lib/clear_page_64.S
+--- linux-3.0.7/arch/x86/lib/clear_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/clear_page_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
  	movl $4096/8,%ecx
  	xorl %eax,%eax
@@ -17417,9 +17799,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/cle
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (clear_page_c - clear_page) - (2f - 1b)	/* offset */
  2:	.byte 0xeb					/* jmp <disp8> */
-diff -urNp linux-3.0.4/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.4/arch/x86/lib/cmpxchg16b_emu.S
---- linux-3.0.4/arch/x86/lib/cmpxchg16b_emu.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/cmpxchg16b_emu.S	2011-10-07 19:07:28.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S
+--- linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/cmpxchg16b_emu.S	2011-10-07 19:07:28.000000000 -0400
 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
  
  	popf
@@ -17434,9 +17816,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/cmpxchg16b_emu.S linux-3.0.4/arch/x86/lib/cm
  	ret
  
  CFI_ENDPROC
-diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy_page_64.S
---- linux-3.0.4/arch/x86/lib/copy_page_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_page_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/copy_page_64.S linux-3.0.7/arch/x86/lib/copy_page_64.S
+--- linux-3.0.7/arch/x86/lib/copy_page_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/copy_page_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -2,12 +2,14 @@
  
  #include <linux/linkage.h>
@@ -17469,9 +17851,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy
  1:	.byte 0xeb					/* jmp <disp8> */
  	.byte (copy_page_c - copy_page) - (2f - 1b)	/* offset */
  2:
-diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy_user_64.S
---- linux-3.0.4/arch/x86/lib/copy_user_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_user_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/copy_user_64.S linux-3.0.7/arch/x86/lib/copy_user_64.S
+--- linux-3.0.7/arch/x86/lib/copy_user_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/copy_user_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
@@ -17564,9 +17946,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy
  	ret
  
  	.section .fixup,"ax"
-diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/copy_user_nocache_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -8,12 +8,14 @@
  
  #include <linux/linkage.h>
@@ -17606,9 +17988,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/
  	ret
  
  	.section .fixup,"ax"
-diff -urNp linux-3.0.4/arch/x86/lib/csum-copy_64.S linux-3.0.4/arch/x86/lib/csum-copy_64.S
---- linux-3.0.4/arch/x86/lib/csum-copy_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/csum-copy_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/csum-copy_64.S linux-3.0.7/arch/x86/lib/csum-copy_64.S
+--- linux-3.0.7/arch/x86/lib/csum-copy_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/csum-copy_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -8,6 +8,7 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -17625,9 +18007,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/csum-copy_64.S linux-3.0.4/arch/x86/lib/csum
  	ret
  	CFI_RESTORE_STATE
  
-diff -urNp linux-3.0.4/arch/x86/lib/csum-wrappers_64.c linux-3.0.4/arch/x86/lib/csum-wrappers_64.c
---- linux-3.0.4/arch/x86/lib/csum-wrappers_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/csum-wrappers_64.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/csum-wrappers_64.c linux-3.0.7/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.0.7/arch/x86/lib/csum-wrappers_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/csum-wrappers_64.c	2011-10-06 04:17:55.000000000 -0400
 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void _
  			len -= 2;
  		}
@@ -17658,9 +18040,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/csum-wrappers_64.c linux-3.0.4/arch/x86/lib/
  					 len, isum, NULL, errp);
  }
  EXPORT_SYMBOL(csum_partial_copy_to_user);
-diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
---- linux-3.0.4/arch/x86/lib/getuser.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/getuser.S	2011-10-07 19:07:23.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/getuser.S linux-3.0.7/arch/x86/lib/getuser.S
+--- linux-3.0.7/arch/x86/lib/getuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/getuser.S	2011-10-07 19:07:23.000000000 -0400
 @@ -33,15 +33,38 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17784,9 +18166,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
  	ret
  	CFI_ENDPROC
  END(bad_get_user)
-diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
---- linux-3.0.4/arch/x86/lib/insn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/insn.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/insn.c linux-3.0.7/arch/x86/lib/insn.c
+--- linux-3.0.7/arch/x86/lib/insn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -17810,9 +18192,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
  	insn->x86_64 = x86_64 ? 1 : 0;
  	insn->opnd_bytes = 4;
  	if (x86_64)
-diff -urNp linux-3.0.4/arch/x86/lib/iomap_copy_64.S linux-3.0.4/arch/x86/lib/iomap_copy_64.S
---- linux-3.0.4/arch/x86/lib/iomap_copy_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/iomap_copy_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/iomap_copy_64.S linux-3.0.7/arch/x86/lib/iomap_copy_64.S
+--- linux-3.0.7/arch/x86/lib/iomap_copy_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/iomap_copy_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -17,6 +17,7 @@
  
  #include <linux/linkage.h>
@@ -17829,9 +18211,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/iomap_copy_64.S linux-3.0.4/arch/x86/lib/iom
  	ret
  	CFI_ENDPROC
  ENDPROC(__iowrite32_copy)
-diff -urNp linux-3.0.4/arch/x86/lib/memcpy_64.S linux-3.0.4/arch/x86/lib/memcpy_64.S
---- linux-3.0.4/arch/x86/lib/memcpy_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memcpy_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/memcpy_64.S linux-3.0.7/arch/x86/lib/memcpy_64.S
+--- linux-3.0.7/arch/x86/lib/memcpy_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/memcpy_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -34,6 +34,7 @@
  	rep movsq
  	movl %edx, %ecx
@@ -17880,9 +18262,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/memcpy_64.S linux-3.0.4/arch/x86/lib/memcpy_
  	retq
  	CFI_ENDPROC
  ENDPROC(memcpy)
-diff -urNp linux-3.0.4/arch/x86/lib/memmove_64.S linux-3.0.4/arch/x86/lib/memmove_64.S
---- linux-3.0.4/arch/x86/lib/memmove_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memmove_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/memmove_64.S linux-3.0.7/arch/x86/lib/memmove_64.S
+--- linux-3.0.7/arch/x86/lib/memmove_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/memmove_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -17907,9 +18289,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/memmove_64.S linux-3.0.4/arch/x86/lib/memmov
  	retq
  .Lmemmove_end_forward_efs:
  	.previous
-diff -urNp linux-3.0.4/arch/x86/lib/memset_64.S linux-3.0.4/arch/x86/lib/memset_64.S
---- linux-3.0.4/arch/x86/lib/memset_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/memset_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/memset_64.S linux-3.0.7/arch/x86/lib/memset_64.S
+--- linux-3.0.7/arch/x86/lib/memset_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/memset_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -31,6 +31,7 @@
  	movl %r8d,%ecx
  	rep stosb
@@ -17934,9 +18316,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/memset_64.S linux-3.0.4/arch/x86/lib/memset_
  	ret
  
  	CFI_RESTORE_STATE
-diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
---- linux-3.0.4/arch/x86/lib/mmx_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/mmx_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/mmx_32.c linux-3.0.7/arch/x86/lib/mmx_32.c
+--- linux-3.0.7/arch/x86/lib/mmx_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -18252,9 +18634,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
  
  		from += 64;
  		to += 64;
-diff -urNp linux-3.0.4/arch/x86/lib/msr-reg.S linux-3.0.4/arch/x86/lib/msr-reg.S
---- linux-3.0.4/arch/x86/lib/msr-reg.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/msr-reg.S	2011-10-07 19:07:28.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/msr-reg.S linux-3.0.7/arch/x86/lib/msr-reg.S
+--- linux-3.0.7/arch/x86/lib/msr-reg.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/msr-reg.S	2011-10-07 19:07:28.000000000 -0400
 @@ -3,6 +3,7 @@
  #include <asm/dwarf2.h>
  #include <asm/asm.h>
@@ -18271,9 +18653,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/msr-reg.S linux-3.0.4/arch/x86/lib/msr-reg.S
  	ret
  3:
  	CFI_RESTORE_STATE
-diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
---- linux-3.0.4/arch/x86/lib/putuser.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/putuser.S	2011-10-07 19:07:23.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/putuser.S linux-3.0.7/arch/x86/lib/putuser.S
+--- linux-3.0.7/arch/x86/lib/putuser.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/putuser.S	2011-10-07 19:07:23.000000000 -0400
 @@ -15,7 +15,9 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -18413,9 +18795,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
  #endif
  	xor %eax,%eax
  	EXIT
-diff -urNp linux-3.0.4/arch/x86/lib/rwlock_64.S linux-3.0.4/arch/x86/lib/rwlock_64.S
---- linux-3.0.4/arch/x86/lib/rwlock_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/rwlock_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/rwlock_64.S linux-3.0.7/arch/x86/lib/rwlock_64.S
+--- linux-3.0.7/arch/x86/lib/rwlock_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/rwlock_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -17,6 +17,7 @@ ENTRY(__write_lock_failed)
  	LOCK_PREFIX
  	subl $RW_LOCK_BIAS,(%rdi)
@@ -18432,9 +18814,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/rwlock_64.S linux-3.0.4/arch/x86/lib/rwlock_
  	ret
  	CFI_ENDPROC
  END(__read_lock_failed)
-diff -urNp linux-3.0.4/arch/x86/lib/rwsem_64.S linux-3.0.4/arch/x86/lib/rwsem_64.S
---- linux-3.0.4/arch/x86/lib/rwsem_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/rwsem_64.S	2011-10-07 10:46:47.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/rwsem_64.S linux-3.0.7/arch/x86/lib/rwsem_64.S
+--- linux-3.0.7/arch/x86/lib/rwsem_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/rwsem_64.S	2011-10-07 10:46:47.000000000 -0400
 @@ -51,6 +51,7 @@ ENTRY(call_rwsem_down_read_failed)
  	popq_cfi %rdx
  	CFI_RESTORE rdx
@@ -18469,9 +18851,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/rwsem_64.S linux-3.0.4/arch/x86/lib/rwsem_64
  	ret
  	CFI_ENDPROC
  ENDPROC(call_rwsem_downgrade_wake)
-diff -urNp linux-3.0.4/arch/x86/lib/thunk_64.S linux-3.0.4/arch/x86/lib/thunk_64.S
---- linux-3.0.4/arch/x86/lib/thunk_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/thunk_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/thunk_64.S linux-3.0.7/arch/x86/lib/thunk_64.S
+--- linux-3.0.7/arch/x86/lib/thunk_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/thunk_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -10,7 +10,8 @@
  	#include <asm/dwarf2.h>
  	#include <asm/calling.h>			
@@ -18490,9 +18872,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/thunk_64.S linux-3.0.4/arch/x86/lib/thunk_64
 +	pax_force_retaddr
 +	ret
  	CFI_ENDPROC
-diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/usercopy_32.c
---- linux-3.0.4/arch/x86/lib/usercopy_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/usercopy_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/usercopy_32.c linux-3.0.7/arch/x86/lib/usercopy_32.c
+--- linux-3.0.7/arch/x86/lib/usercopy_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"					   \
@@ -19113,9 +19495,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/userc
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/usercopy_64.c
---- linux-3.0.4/arch/x86/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/lib/usercopy_64.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/lib/usercopy_64.c linux-3.0.7/arch/x86/lib/usercopy_64.c
+--- linux-3.0.7/arch/x86/lib/usercopy_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/lib/usercopy_64.c	2011-10-06 04:17:55.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -19174,33 +19556,9 @@ diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/userc
  {
  	char c;
  	unsigned zero_len;
-diff -urNp linux-3.0.4/arch/x86/Makefile linux-3.0.4/arch/x86/Makefile
---- linux-3.0.4/arch/x86/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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
-+
-+define OLD_LD
-+
-+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
-+*** Please upgrade your binutils to 2.18 or newer
-+endef
-+
-+archprepare:
-+	$(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/arch/x86/mm/extable.c
---- linux-3.0.4/arch/x86/mm/extable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/extable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/extable.c linux-3.0.7/arch/x86/mm/extable.c
+--- linux-3.0.7/arch/x86/mm/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -19210,9 +19568,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/arch/x86/mm/extable.c
  		extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
  		extern u32 pnp_bios_is_utter_crap;
  		pnp_bios_is_utter_crap = 1;
-diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
---- linux-3.0.4/arch/x86/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/fault.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/fault.c linux-3.0.7/arch/x86/mm/fault.c
+--- linux-3.0.7/arch/x86/mm/fault.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/mm/fault.c	2011-10-06 04:17:55.000000000 -0400
 @@ -13,10 +13,18 @@
  #include <linux/perf_event.h>		/* perf_sw_event		*/
  #include <linux/hugetlb.h>		/* hstate_index_to_shift	*/
@@ -19879,9 +20237,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
 +
 +	return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
---- linux-3.0.4/arch/x86/mm/gup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/gup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/gup.c linux-3.0.7/arch/x86/mm/gup.c
+--- linux-3.0.7/arch/x86/mm/gup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -19891,9 +20249,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
  					(void __user *)start, len)))
  		return 0;
  
-diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_32.c
---- linux-3.0.4/arch/x86/mm/highmem_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/highmem_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/highmem_32.c linux-3.0.7/arch/x86/mm/highmem_32.c
+--- linux-3.0.7/arch/x86/mm/highmem_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -19905,9 +20263,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_
  
  	return (void *)vaddr;
  }
-diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlbpage.c
---- linux-3.0.4/arch/x86/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/hugetlbpage.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/hugetlbpage.c linux-3.0.7/arch/x86/mm/hugetlbpage.c
+--- linux-3.0.7/arch/x86/mm/hugetlbpage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -20115,9 +20473,144 @@ diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlb
  			return addr;
  	}
  	if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/arch/x86/mm/init_32.c
---- linux-3.0.4/arch/x86/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/init_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/init.c linux-3.0.7/arch/x86/mm/init.c
+--- linux-3.0.7/arch/x86/mm/init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/mm/init_32.c linux-3.0.7/arch/x86/mm/init_32.c
+--- linux-3.0.7/arch/x86/mm/init_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  }
  
@@ -20392,9 +20885,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/arch/x86/mm/init_32.c
  	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
  	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
  		size >> 10);
-diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
---- linux-3.0.4/arch/x86/mm/init_64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/init_64.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/init_64.c linux-3.0.7/arch/x86/mm/init_64.c
+--- linux-3.0.7/arch/x86/mm/init_64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/mm/init_64.c	2011-10-06 04:17:55.000000000 -0400
 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -20524,144 +21017,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
  		return "[vdso]";
  	if (vma == &gate_vma)
  		return "[vsyscall]";
-diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
---- linux-3.0.4/arch/x86/mm/init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
---- linux-3.0.4/arch/x86/mm/iomap_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/iomap_32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/iomap_32.c linux-3.0.7/arch/x86/mm/iomap_32.c
+--- linux-3.0.7/arch/x86/mm/iomap_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
@@ -20674,9 +21032,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
  	arch_flush_lazy_mmu_mode();
  
  	return (void *)vaddr;
-diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
---- linux-3.0.4/arch/x86/mm/ioremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/ioremap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/ioremap.c linux-3.0.7/arch/x86/mm/ioremap.c
+--- linux-3.0.7/arch/x86/mm/ioremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -20705,9 +21063,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
  
  	/*
  	 * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.0.7/arch/x86/mm/kmemcheck/kmemcheck.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -20720,9 +21078,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm
  		return false;
  
  	pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
---- linux-3.0.4/arch/x86/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/mmap.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/mmap.c linux-3.0.7/arch/x86/mm/mmap.c
+--- linux-3.0.7/arch/x86/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -20804,9 +21162,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
  		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
  		mm->unmap_area = arch_unmap_area_topdown;
  	}
-diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
---- linux-3.0.4/arch/x86/mm/mmio-mod.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/mmio-mod.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/mmio-mod.c linux-3.0.7/arch/x86/mm/mmio-mod.c
+--- linux-3.0.7/arch/x86/mm/mmio-mod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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:
@@ -20834,9 +21192,21 @@ diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
  	};
  	map.map_id = trace->id;
  
-diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
---- linux-3.0.4/arch/x86/mm/pageattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pageattr.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/pageattr-test.c linux-3.0.7/arch/x86/mm/pageattr-test.c
+--- linux-3.0.7/arch/x86/mm/pageattr-test.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/mm/pageattr.c linux-3.0.7/arch/x86/mm/pageattr.c
+--- linux-3.0.7/arch/x86/mm/pageattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -20921,21 +21291,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
  }
  
  static int
-diff -urNp linux-3.0.4/arch/x86/mm/pageattr-test.c linux-3.0.4/arch/x86/mm/pageattr-test.c
---- linux-3.0.4/arch/x86/mm/pageattr-test.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
---- linux-3.0.4/arch/x86/mm/pat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pat.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/pat.c linux-3.0.7/arch/x86/mm/pat.c
+--- linux-3.0.7/arch/x86/mm/pat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -20983,9 +21341,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
  				cattr_name(want_flags),
  				(unsigned long long)paddr,
  				(unsigned long long)(paddr + size),
-diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
---- linux-3.0.4/arch/x86/mm/pf_in.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pf_in.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/pf_in.c linux-3.0.7/arch/x86/mm/pf_in.c
+--- linux-3.0.7/arch/x86/mm/pf_in.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -21031,26 +21389,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
  	p += skip_prefix(p, &prf);
  	p += get_opcode(p, &opcode);
  	for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-3.0.4/arch/x86/mm/pgtable_32.c linux-3.0.4/arch/x86/mm/pgtable_32.c
---- linux-3.0.4/arch/x86/mm/pgtable_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
---- linux-3.0.4/arch/x86/mm/pgtable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/pgtable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/pgtable.c linux-3.0.7/arch/x86/mm/pgtable.c
+--- linux-3.0.7/arch/x86/mm/pgtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -21296,9 +21637,26 @@ diff -urNp linux-3.0.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
  	pgd_dtor(pgd);
  	paravirt_pgd_free(mm, pgd);
  	free_page((unsigned long)pgd);
-diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
---- linux-3.0.4/arch/x86/mm/setup_nx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/setup_nx.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/pgtable_32.c linux-3.0.7/arch/x86/mm/pgtable_32.c
+--- linux-3.0.7/arch/x86/mm/pgtable_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/mm/setup_nx.c linux-3.0.7/arch/x86/mm/setup_nx.c
+--- linux-3.0.7/arch/x86/mm/setup_nx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -21328,9 +21686,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
  		__supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
---- linux-3.0.4/arch/x86/mm/tlb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/mm/tlb.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/mm/tlb.c linux-3.0.7/arch/x86/mm/tlb.c
+--- linux-3.0.7/arch/x86/mm/tlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -21343,31 +21701,9 @@ diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-3.0.4/arch/x86/net/bpf_jit_comp.c linux-3.0.4/arch/x86/net/bpf_jit_comp.c
---- linux-3.0.4/arch/x86/net/bpf_jit_comp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/arch/x86/net/bpf_jit.S linux-3.0.4/arch/x86/net/bpf_jit.S
---- linux-3.0.4/arch/x86/net/bpf_jit.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/net/bpf_jit.S	2011-10-07 19:07:28.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/net/bpf_jit.S linux-3.0.7/arch/x86/net/bpf_jit.S
+--- linux-3.0.7/arch/x86/net/bpf_jit.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/net/bpf_jit.S	2011-10-07 19:07:28.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  #include <linux/linkage.h>
@@ -21445,9 +21781,31 @@ diff -urNp linux-3.0.4/arch/x86/net/bpf_jit.S linux-3.0.4/arch/x86/net/bpf_jit.S
  	xchg	%eax,%ebx
 +	pax_force_retaddr
  	ret
-diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofile/backtrace.c
---- linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/x86/oprofile/backtrace.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/net/bpf_jit_comp.c linux-3.0.7/arch/x86/net/bpf_jit_comp.c
+--- linux-3.0.7/arch/x86/net/bpf_jit_comp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/arch/x86/oprofile/backtrace.c linux-3.0.7/arch/x86/oprofile/backtrace.c
+--- linux-3.0.7/arch/x86/oprofile/backtrace.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/arch/x86/oprofile/backtrace.c	2011-10-06 04:17:55.000000000 -0400
 @@ -83,11 +83,11 @@ dump_user_backtrace_32(struct stack_fram
  	struct stack_frame_ia32 *fp;
  	unsigned long bytes;
@@ -21480,9 +21838,9 @@ diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofi
  		unsigned long stack = kernel_stack_pointer(regs);
  		if (depth)
  			dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
---- linux-3.0.4/arch/x86/pci/mrst.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/pci/mrst.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/pci/mrst.c linux-3.0.7/arch/x86/pci/mrst.c
+--- linux-3.0.7/arch/x86/pci/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
@@ -21494,9 +21852,9 @@ diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
  	/* Continue with standard init */
  	return 1;
  }
-diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
---- linux-3.0.4/arch/x86/pci/pcbios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/pci/pcbios.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/pci/pcbios.c linux-3.0.7/arch/x86/pci/pcbios.c
+--- linux-3.0.7/arch/x86/pci/pcbios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/pci/pcbios.c	2011-08-23 21:47:55.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
  	unsigned long address;
@@ -21801,9 +22159,9 @@ diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
  	return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platform/efi/efi_32.c
---- linux-3.0.4/arch/x86/platform/efi/efi_32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_32.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_32.c linux-3.0.7/arch/x86/platform/efi/efi_32.c
+--- linux-3.0.7/arch/x86/platform/efi/efi_32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/platform/efi/efi_32.c	2011-10-06 04:17:55.000000000 -0400
 @@ -38,70 +38,56 @@
   */
  
@@ -21901,9 +22259,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platf
  
  	/*
  	 * After the lock is released, the original page table is restored.
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S	2011-09-19 09:16:58.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/platform/efi/efi_stub_32.S	2011-09-19 09:16:58.000000000 -0400
 @@ -6,7 +6,9 @@
   */
  
@@ -22012,9 +22370,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/
  saved_return_addr:
  	.long 0
  efi_rt_function_ptr:
-diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S
---- linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S
+--- linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/platform/efi/efi_stub_64.S	2011-10-06 04:17:55.000000000 -0400
 @@ -7,6 +7,7 @@
   */
  
@@ -22078,9 +22436,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_64.S linux-3.0.4/arch/x86/
 +	pax_force_retaddr
  	ret
  ENDPROC(efi_call6)
-diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platform/mrst/mrst.c
---- linux-3.0.4/arch/x86/platform/mrst/mrst.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/mrst/mrst.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/platform/mrst/mrst.c linux-3.0.7/arch/x86/platform/mrst/mrst.c
+--- linux-3.0.7/arch/x86/platform/mrst/mrst.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/arch/x86/platform/mrst/mrst.c	2011-08-23 21:47:55.000000000 -0400
 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
  }
  
@@ -22100,9 +22458,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platform/uv/tlb_uv.c
---- linux-3.0.4/arch/x86/platform/uv/tlb_uv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/platform/uv/tlb_uv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/platform/uv/tlb_uv.c linux-3.0.7/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.0.7/arch/x86/platform/uv/tlb_uv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -22112,9 +22470,9 @@ diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platfo
  	reset_args.sender = sender;
  	cpus_clear(mask);
  	/* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
---- linux-3.0.4/arch/x86/power/cpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/power/cpu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/power/cpu.c linux-3.0.7/arch/x86/power/cpu.c
+--- linux-3.0.7/arch/x86/power/cpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -22134,9 +22492,9 @@ diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
  
  	syscall_init();				/* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
---- linux-3.0.4/arch/x86/vdso/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/Makefile	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/vdso/Makefile linux-3.0.7/arch/x86/vdso/Makefile
+--- linux-3.0.7/arch/x86/vdso/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)' '$@'
@@ -22146,9 +22504,9 @@ diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vdso32-setup.c
---- linux-3.0.4/arch/x86/vdso/vdso32-setup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/vdso32-setup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/vdso/vdso32-setup.c linux-3.0.7/arch/x86/vdso/vdso32-setup.c
+--- linux-3.0.7/arch/x86/vdso/vdso32-setup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -22231,9 +22589,9 @@ diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vd
  		return &gate_vma;
  	return NULL;
  }
-diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
---- linux-3.0.4/arch/x86/vdso/vma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/vdso/vma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/vdso/vma.c linux-3.0.7/arch/x86/vdso/vma.c
+--- linux-3.0.7/arch/x86/vdso/vma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -22336,9 +22694,9 @@ diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
 -	return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlighten.c
---- linux-3.0.4/arch/x86/xen/enlighten.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/enlighten.c	2011-08-29 23:26:21.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/xen/enlighten.c linux-3.0.7/arch/x86/xen/enlighten.c
+--- linux-3.0.7/arch/x86/xen/enlighten.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/arch/x86/xen/enlighten.c	2011-08-29 23:26:21.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -22411,9 +22769,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlight
  	xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
---- linux-3.0.4/arch/x86/xen/mmu.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/mmu.c	2011-08-29 23:26:21.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/xen/mmu.c linux-3.0.7/arch/x86/xen/mmu.c
+--- linux-3.0.7/arch/x86/xen/mmu.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/arch/x86/xen/mmu.c	2011-08-29 23:26:21.000000000 -0400
 @@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
  	convert_pfn_mfn(init_level4_pgt);
  	convert_pfn_mfn(level3_ident_pgt);
@@ -22450,10 +22808,10 @@ diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
  
  	.alloc_pud = xen_alloc_pmd_init,
  	.release_pud = xen_release_pmd_init,
-diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
---- linux-3.0.4/arch/x86/xen/smp.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/smp.c	2011-08-29 23:26:21.000000000 -0400
-@@ -193,11 +193,6 @@ static void __init xen_smp_prepare_boot_
+diff -urNp linux-3.0.7/arch/x86/xen/smp.c linux-3.0.7/arch/x86/xen/smp.c
+--- linux-3.0.7/arch/x86/xen/smp.c	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/arch/x86/xen/smp.c	2011-10-16 21:55:27.000000000 -0400
+@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_
  {
  	BUG_ON(smp_processor_id() != 0);
  	native_smp_prepare_boot_cpu();
@@ -22465,7 +22823,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
  	xen_filter_cpu_maps();
  	xen_setup_vcpu_info_placement();
  }
-@@ -265,12 +260,12 @@ cpu_initialize_context(unsigned int cpu,
+@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu,
  	gdt = get_cpu_gdt_table(cpu);
  
  	ctxt->flags = VGCF_IN_KERNEL;
@@ -22481,7 +22839,7 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
  #else
  	ctxt->gs_base_kernel = per_cpu_offset(cpu);
  #endif
-@@ -321,13 +316,12 @@ static int __cpuinit xen_cpu_up(unsigned
+@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned
  	int rc;
  
  	per_cpu(current_task, cpu) = idle;
@@ -22497,9 +22855,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
  #endif
  	xen_setup_runstate_info(cpu);
  	xen_setup_timer(cpu);
-diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-asm_32.S
---- linux-3.0.4/arch/x86/xen/xen-asm_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-asm_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/xen/xen-asm_32.S linux-3.0.7/arch/x86/xen/xen-asm_32.S
+--- linux-3.0.7/arch/x86/xen/xen-asm_32.S	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/arch/x86/xen/xen-asm_32.S	2011-10-16 21:55:27.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
  	ESP_OFFSET=4	# bytes pushed onto stack
  
@@ -22521,9 +22879,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-as
  #else
  	movl xen_vcpu, %eax
  #endif
-diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head.S
---- linux-3.0.4/arch/x86/xen/xen-head.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-head.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/xen/xen-head.S linux-3.0.7/arch/x86/xen/xen-head.S
+--- linux-3.0.7/arch/x86/xen/xen-head.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -22542,9 +22900,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head
  #else
  	mov %rsi,xen_start_info
  	mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
---- linux-3.0.4/arch/x86/xen/xen-ops.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/arch/x86/xen/xen-ops.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/arch/x86/xen/xen-ops.h linux-3.0.7/arch/x86/xen/xen-ops.h
+--- linux-3.0.7/arch/x86/xen/xen-ops.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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[];
@@ -22554,9 +22912,9 @@ diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
---- linux-3.0.4/block/blk-iopoll.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-iopoll.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/block/blk-iopoll.c linux-3.0.7/block/blk-iopoll.c
+--- linux-3.0.7/block/blk-iopoll.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -22566,9 +22924,9 @@ diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
  {
  	struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
  	int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
---- linux-3.0.4/block/blk-map.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-map.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/block/blk-map.c linux-3.0.7/block/blk-map.c
+--- linux-3.0.7/block/blk-map.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -22578,9 +22936,9 @@ diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
  	if (do_copy)
  		bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
  	else
-diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
---- linux-3.0.4/block/blk-softirq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/blk-softirq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/block/blk-softirq.c linux-3.0.7/block/blk-softirq.c
+--- linux-3.0.7/block/blk-softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -22590,9 +22948,9 @@ diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
  {
  	struct list_head *cpu_list, local_list;
  
-diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
---- linux-3.0.4/block/bsg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/bsg.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/block/bsg.c linux-3.0.7/block/bsg.c
+--- linux-3.0.7/block/bsg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/block/bsg.c	2011-10-06 04:17: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)
@@ -22660,9 +23018,9 @@ diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
  				   rq->sense, len);
  		if (!ret)
  			hdr->response_len = len;
-diff -urNp linux-3.0.4/block/compat_ioctl.c linux-3.0.4/block/compat_ioctl.c
---- linux-3.0.4/block/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/compat_ioctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/block/compat_ioctl.c linux-3.0.7/block/compat_ioctl.c
+--- linux-3.0.7/block/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/block/compat_ioctl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_
  		err |= __get_user(f->spec1, &uf->spec1);
  		err |= __get_user(f->fmt_gap, &uf->fmt_gap);
@@ -22672,9 +23030,9 @@ diff -urNp linux-3.0.4/block/compat_ioctl.c linux-3.0.4/block/compat_ioctl.c
  		if (err) {
  			err = -EFAULT;
  			goto out;
-diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
---- linux-3.0.4/block/scsi_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/block/scsi_ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/block/scsi_ioctl.c linux-3.0.7/block/scsi_ioctl.c
+--- linux-3.0.7/block/scsi_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -22726,9 +23084,9 @@ diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
  	if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
  		goto error;
  
-diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
---- linux-3.0.4/crypto/cryptd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/cryptd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/crypto/cryptd.c linux-3.0.7/crypto/cryptd.c
+--- linux-3.0.7/crypto/cryptd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/crypto/cryptd.c	2011-08-23 21:47:55.000000000 -0400
 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -22747,9 +23105,9 @@ diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
  
  static void cryptd_queue_worker(struct work_struct *work);
  
-diff -urNp linux-3.0.4/crypto/gf128mul.c linux-3.0.4/crypto/gf128mul.c
---- linux-3.0.4/crypto/gf128mul.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/gf128mul.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/crypto/gf128mul.c linux-3.0.7/crypto/gf128mul.c
+--- linux-3.0.7/crypto/gf128mul.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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]);
@@ -22768,9 +23126,9 @@ diff -urNp linux-3.0.4/crypto/gf128mul.c linux-3.0.4/crypto/gf128mul.c
  	for (i = 0;;) {
  		u8 ch = ((u8 *)b)[i];
  
-diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
---- linux-3.0.4/crypto/serpent.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/crypto/serpent.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/crypto/serpent.c linux-3.0.7/crypto/serpent.c
+--- linux-3.0.7/crypto/serpent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -22780,147 +23138,9 @@ diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
  	/* Copy key, add padding */
  
  	for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
---- linux-3.0.4/Documentation/dontdiff	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/Documentation/dontdiff	2011-10-07 19:07:23.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
-@@ -166,7 +172,6 @@ machtypes.h
- map
- map_hugetlb
- maui_boot.h
--media
- mconf
- miboot*
- mk_elfconfig
-@@ -174,6 +179,7 @@ mkboot
- mkbugboot
- mkcpustr
- mkdep
-+mkpiggy
- mkprep
- mkregtable
- mktables
-@@ -209,6 +215,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 +226,7 @@ setup
- setup.bin
- setup.elf
- sImage
-+slabinfo
- sm_tbl*
- split-include
- syscalltab.h
-@@ -246,7 +254,9 @@ vmlinux
- vmlinux-*
- vmlinux.aout
- vmlinux.bin.all
-+vmlinux.bin.bz2
- vmlinux.lds
-+vmlinux.relocs
- vmlinuz
- voffset.h
- vsyscall.lds
-@@ -254,6 +264,7 @@ vsyscall_32.lds
- wanxlfw.inc
- uImage
- unifdef
-+utsrelease.h
- wakeup.bin
- wakeup.elf
- wakeup.lds
-diff -urNp linux-3.0.4/Documentation/kernel-parameters.txt linux-3.0.4/Documentation/kernel-parameters.txt
---- linux-3.0.4/Documentation/kernel-parameters.txt	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cper.c
---- linux-3.0.4/drivers/acpi/apei/cper.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/apei/cper.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/acpi/apei/cper.c linux-3.0.7/drivers/acpi/apei/cper.c
+--- linux-3.0.7/drivers/acpi/apei/cper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/acpi/apei/cper.c	2011-08-23 21:47:55.000000000 -0400
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -22938,9 +23158,9 @@ diff -urNp linux-3.0.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cp
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
---- linux-3.0.4/drivers/acpi/ec_sys.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/ec_sys.c	2011-08-24 19:06:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/acpi/ec_sys.c linux-3.0.7/drivers/acpi/ec_sys.c
+--- linux-3.0.7/drivers/acpi/ec_sys.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -22990,9 +23210,9 @@ diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
  		err = ec_write(*off, byte_write);
  		if (err)
  			return err;
-diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
---- linux-3.0.4/drivers/acpi/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/proc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/acpi/proc.c linux-3.0.7/drivers/acpi/proc.c
+--- linux-3.0.7/drivers/acpi/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -23027,9 +23247,9 @@ diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
  			if (device_can_wakeup(&dev->dev)) {
  				bool enable = !device_may_wakeup(&dev->dev);
  				device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/processor_driver.c
---- linux-3.0.4/drivers/acpi/processor_driver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/acpi/processor_driver.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/acpi/processor_driver.c linux-3.0.7/drivers/acpi/processor_driver.c
+--- linux-3.0.7/drivers/acpi/processor_driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -23039,9 +23259,9 @@ diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/
  
  	/*
  	 * Buggy BIOS check
-diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-core.c
---- linux-3.0.4/drivers/ata/libata-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/libata-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ata/libata-core.c linux-3.0.7/drivers/ata/libata-core.c
+--- linux-3.0.7/drivers/ata/libata-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -23079,9 +23299,9 @@ diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-
  	spin_unlock(&lock);
  }
  
-diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh.c
---- linux-3.0.4/drivers/ata/libata-eh.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/libata-eh.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ata/libata-eh.c linux-3.0.7/drivers/ata/libata-eh.c
+--- linux-3.0.7/drivers/ata/libata-eh.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -23091,9 +23311,9 @@ diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh
  	ata_for_each_link(link, ap, HOST_FIRST)
  		ata_eh_link_report(link);
  }
-diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata_arasan_cf.c
---- linux-3.0.4/drivers/ata/pata_arasan_cf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ata/pata_arasan_cf.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ata/pata_arasan_cf.c linux-3.0.7/drivers/ata/pata_arasan_cf.c
+--- linux-3.0.7/drivers/ata/pata_arasan_cf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -23105,9 +23325,9 @@ diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata
  			ap->pio_mask = 0;
  		}
  		if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
---- linux-3.0.4/drivers/atm/adummy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/adummy.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/adummy.c linux-3.0.7/drivers/atm/adummy.c
+--- linux-3.0.7/drivers/atm/adummy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -23117,9 +23337,9 @@ diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
  
  	return 0;
  }
-diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassador.c
---- linux-3.0.4/drivers/atm/ambassador.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/ambassador.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/ambassador.c linux-3.0.7/drivers/atm/ambassador.c
+--- linux-3.0.7/drivers/atm/ambassador.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
    
@@ -23156,9 +23376,9 @@ diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassad
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
---- linux-3.0.4/drivers/atm/atmtcp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/atmtcp.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/atmtcp.c linux-3.0.7/drivers/atm/atmtcp.c
+--- linux-3.0.7/drivers/atm/atmtcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -23208,9 +23428,9 @@ diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
  done:
  	if (vcc->pop) vcc->pop(vcc,skb);
  	else dev_kfree_skb(skb);
-diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
---- linux-3.0.4/drivers/atm/eni.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/eni.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/eni.c linux-3.0.7/drivers/atm/eni.c
+--- linux-3.0.7/drivers/atm/eni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/atm/eni.c	2011-10-11 10:44:33.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);
@@ -23256,9 +23476,18 @@ diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
  		wake_up(&eni_dev->tx_wait);
  dma_complete++;
  	}
-diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestream.c
---- linux-3.0.4/drivers/atm/firestream.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/firestream.c	2011-08-23 21:47:55.000000000 -0400
+@@ -1568,7 +1568,7 @@ tx_complete++;
+ /*--------------------------------- entries ---------------------------------*/
+ 
+ 
+-static const char *media_name[] __devinitdata = {
++static const char *media_name[] __devinitconst = {
+     "MMF", "SMF", "MMF", "03?", /*  0- 3 */
+     "UTP", "05?", "06?", "07?", /*  4- 7 */
+     "TAXI","09?", "10?", "11?", /*  8-11 */
+diff -urNp linux-3.0.7/drivers/atm/firestream.c linux-3.0.7/drivers/atm/firestream.c
+--- linux-3.0.7/drivers/atm/firestream.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/atm/firestream.c	2011-08-23 21:47:55.000000000 -0400
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
  				}
  			}
@@ -23292,9 +23521,9 @@ diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestre
  			break;
  		default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
  			printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 
-diff -urNp linux-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
---- linux-3.0.4/drivers/atm/fore200e.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/fore200e.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/fore200e.c linux-3.0.7/drivers/atm/fore200e.c
+--- linux-3.0.7/drivers/atm/fore200e.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -23351,9 +23580,9 @@ diff -urNp linux-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
  
  	    fore200e->tx_sat++;
  	    DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
---- linux-3.0.4/drivers/atm/he.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/he.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/he.c linux-3.0.7/drivers/atm/he.c
+--- linux-3.0.7/drivers/atm/he.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)) {
@@ -23435,9 +23664,9 @@ diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
  
  	return 0;
  }
-diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
---- linux-3.0.4/drivers/atm/horizon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/horizon.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/horizon.c linux-3.0.7/drivers/atm/horizon.c
+--- linux-3.0.7/drivers/atm/horizon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -23456,9 +23685,9 @@ diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
  	
  	// free the skb
  	hrz_kfree_skb (skb);
-diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
---- linux-3.0.4/drivers/atm/idt77252.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/idt77252.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/idt77252.c linux-3.0.7/drivers/atm/idt77252.c
+--- linux-3.0.7/drivers/atm/idt77252.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -23613,9 +23842,9 @@ diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
  		return -ENOMEM;
  	}
  	atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
---- linux-3.0.4/drivers/atm/iphase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/iphase.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/iphase.c linux-3.0.7/drivers/atm/iphase.c
+--- linux-3.0.7/drivers/atm/iphase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))  
@@ -23712,9 +23941,9 @@ diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-3.0.4/drivers/atm/lanai.c linux-3.0.4/drivers/atm/lanai.c
---- linux-3.0.4/drivers/atm/lanai.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/lanai.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/lanai.c linux-3.0.7/drivers/atm/lanai.c
+--- linux-3.0.7/drivers/atm/lanai.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -23769,9 +23998,9 @@ diff -urNp linux-3.0.4/drivers/atm/lanai.c linux-3.0.4/drivers/atm/lanai.c
  	lvcc->stats.x.aal5.service_rxcrc++;
  	lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
  	cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
-diff -urNp linux-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
---- linux-3.0.4/drivers/atm/nicstar.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/nicstar.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/nicstar.c linux-3.0.7/drivers/atm/nicstar.c
+--- linux-3.0.7/drivers/atm/nicstar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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",
@@ -23973,9 +24202,9 @@ diff -urNp linux-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
  			}
  		}
  
-diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci.c
---- linux-3.0.4/drivers/atm/solos-pci.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/solos-pci.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/solos-pci.c linux-3.0.7/drivers/atm/solos-pci.c
+--- linux-3.0.7/drivers/atm/solos-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -24003,9 +24232,9 @@ diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci
  				solos_pop(vcc, oldskb);
  			} else
  				dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
---- linux-3.0.4/drivers/atm/suni.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/suni.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/suni.c linux-3.0.7/drivers/atm/suni.c
+--- linux-3.0.7/drivers/atm/suni.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/atm/suni.c	2011-08-23 21:47:55.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -24017,9 +24246,9 @@ diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
---- linux-3.0.4/drivers/atm/uPD98402.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/uPD98402.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/uPD98402.c linux-3.0.7/drivers/atm/uPD98402.c
+--- linux-3.0.7/drivers/atm/uPD98402.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24064,9 +24293,9 @@ diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
  	return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
---- linux-3.0.4/drivers/atm/zatm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/atm/zatm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/atm/zatm.c linux-3.0.7/drivers/atm/zatm.c
+--- linux-3.0.7/drivers/atm/zatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -24094,9 +24323,9 @@ diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
  	wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-3.0.4/drivers/base/devtmpfs.c linux-3.0.4/drivers/base/devtmpfs.c
---- linux-3.0.4/drivers/base/devtmpfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/base/devtmpfs.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/base/devtmpfs.c linux-3.0.7/drivers/base/devtmpfs.c
+--- linux-3.0.7/drivers/base/devtmpfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/base/devtmpfs.c	2011-10-06 04:17:55.000000000 -0400
 @@ -357,7 +357,7 @@ int devtmpfs_mount(const char *mntdir)
  	if (!dev_mnt)
  		return 0;
@@ -24106,9 +24335,9 @@ diff -urNp linux-3.0.4/drivers/base/devtmpfs.c linux-3.0.4/drivers/base/devtmpfs
  	if (err)
  		printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
  	else
-diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/power/wakeup.c
---- linux-3.0.4/drivers/base/power/wakeup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/base/power/wakeup.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/base/power/wakeup.c linux-3.0.7/drivers/base/power/wakeup.c
+--- linux-3.0.7/drivers/base/power/wakeup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -24144,9 +24373,21 @@ diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/powe
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
---- linux-3.0.4/drivers/block/cciss.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cciss.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/DAC960.c linux-3.0.7/drivers/block/DAC960.c
+--- linux-3.0.7/drivers/block/DAC960.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
+ 
++  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.7/drivers/block/cciss.c linux-3.0.7/drivers/block/cciss.c
+--- linux-3.0.7/drivers/block/cciss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24270,9 +24511,9 @@ diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
  	free_irq(h->intr[PERF_MODE_INT], h);
  }
  
-diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
---- linux-3.0.4/drivers/block/cciss.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/block/cciss.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/cciss.h linux-3.0.7/drivers/block/cciss.h
+--- linux-3.0.7/drivers/block/cciss.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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];
@@ -24282,9 +24523,9 @@ diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
  
  	/* queue and queue Info */ 
  	struct list_head reqQ;
-diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarray.c
---- linux-3.0.4/drivers/block/cpqarray.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cpqarray.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/cpqarray.c linux-3.0.7/drivers/block/cpqarray.c
+--- linux-3.0.7/drivers/block/cpqarray.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24410,9 +24651,9 @@ diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarr
  		if (done == 0) {
  			udelay(10);	/* a short fixed delay */
  		} else
-diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarray.h
---- linux-3.0.4/drivers/block/cpqarray.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/cpqarray.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/cpqarray.h linux-3.0.7/drivers/block/cpqarray.h
+--- linux-3.0.7/drivers/block/cpqarray.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24422,21 +24663,9 @@ diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarr
  
  	cmdlist_t *reqQ;
  	cmdlist_t *cmpQ;
-diff -urNp linux-3.0.4/drivers/block/DAC960.c linux-3.0.4/drivers/block/DAC960.c
---- linux-3.0.4/drivers/block/DAC960.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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;
- 
-+  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.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/drbd/drbd_int.h
---- linux-3.0.4/drivers/block/drbd/drbd_int.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_int.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/drbd/drbd_int.h linux-3.0.7/drivers/block/drbd/drbd_int.h
+--- linux-3.0.7/drivers/block/drbd/drbd_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/block/drbd/drbd_int.h	2011-10-06 04:17:55.000000000 -0400
 @@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
  	struct list_head list;
@@ -24494,9 +24723,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/d
  }
  
  void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/drbd/drbd_main.c
---- linux-3.0.4/drivers/block/drbd/drbd_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_main.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/drbd/drbd_main.c linux-3.0.7/drivers/block/drbd/drbd_main.c
+--- linux-3.0.7/drivers/block/drbd/drbd_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24535,9 +24764,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/
  	mdev->al_writ_cnt  =
  	mdev->bm_writ_cnt  =
  	mdev->read_cnt     =
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/drbd/drbd_nl.c
---- linux-3.0.4/drivers/block/drbd/drbd_nl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_nl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/drbd/drbd_nl.c linux-3.0.7/drivers/block/drbd/drbd_nl.c
+--- linux-3.0.7/drivers/block/drbd/drbd_nl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -24583,9 +24812,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/dr
  	cn_reply->ack = 0; /* not used here. */
  	cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
  		(int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/block/drbd/drbd_receiver.c
---- linux-3.0.4/drivers/block/drbd/drbd_receiver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/drbd/drbd_receiver.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/drbd/drbd_receiver.c linux-3.0.7/drivers/block/drbd/drbd_receiver.c
+--- linux-3.0.7/drivers/block/drbd/drbd_receiver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24671,9 +24900,9 @@ diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/bl
  	D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-3.0.4/drivers/block/loop.c linux-3.0.4/drivers/block/loop.c
---- linux-3.0.4/drivers/block/loop.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/drivers/block/loop.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/loop.c linux-3.0.7/drivers/block/loop.c
+--- linux-3.0.7/drivers/block/loop.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/drivers/block/loop.c	2011-10-06 04:17:55.000000000 -0400
 @@ -283,7 +283,7 @@ static int __do_lo_send_write(struct fil
  	mm_segment_t old_fs = get_fs();
  
@@ -24683,9 +24912,9 @@ diff -urNp linux-3.0.4/drivers/block/loop.c linux-3.0.4/drivers/block/loop.c
  	set_fs(old_fs);
  	if (likely(bw == len))
  		return 0;
-diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
---- linux-3.0.4/drivers/block/nbd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/block/nbd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/block/nbd.c linux-3.0.7/drivers/block/nbd.c
+--- linux-3.0.7/drivers/block/nbd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24704,9 +24933,30 @@ diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
  	switch (cmd) {
  	case NBD_DISCONNECT: {
  		struct request sreq;
-diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/frontend.c
---- linux-3.0.4/drivers/char/agp/frontend.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/agp/frontend.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/Kconfig linux-3.0.7/drivers/char/Kconfig
+--- linux-3.0.7/drivers/char/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/Kconfig	2011-08-23 21:48:14.000000000 -0400
+@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
+ 
+ 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
+ 
+ source "drivers/s390/char/Kconfig"
+diff -urNp linux-3.0.7/drivers/char/agp/frontend.c linux-3.0.7/drivers/char/agp/frontend.c
+--- linux-3.0.7/drivers/char/agp/frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -24716,9 +24966,9 @@ diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/
  		return -EFAULT;
  
  	client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_panel.c
---- linux-3.0.4/drivers/char/briq_panel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/briq_panel.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/briq_panel.c linux-3.0.7/drivers/char/briq_panel.c
+--- linux-3.0.7/drivers/char/briq_panel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -24760,9 +25010,9 @@ diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_p
  
  	return len;
  }
-diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
---- linux-3.0.4/drivers/char/genrtc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/genrtc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/genrtc.c linux-3.0.7/drivers/char/genrtc.c
+--- linux-3.0.7/drivers/char/genrtc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
  
@@ -24771,9 +25021,9 @@ diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
  	    if (get_rtc_pll(&pll))
  	 	    return -EINVAL;
  	    else
-diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
---- linux-3.0.4/drivers/char/hpet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/hpet.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/hpet.c linux-3.0.7/drivers/char/hpet.c
+--- linux-3.0.7/drivers/char/hpet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/hpet.c	2011-08-23 21:47:55.000000000 -0400
 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -24783,9 +25033,9 @@ diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
  		  struct hpet_info *info)
  {
  	struct hpet_timer __iomem *timer;
-diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.0.7/drivers/char/ipmi/ipmi_msghandler.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -24825,9 +25075,9 @@ diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/c
  	si = (struct ipmi_system_interface_addr *) &addr;
  	si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
  	si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.0.7/drivers/char/ipmi/ipmi_si_intf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -24858,30 +25108,21 @@ diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char
  
  	new_smi->interrupt_disabled = 1;
  	atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.0.4/drivers/char/Kconfig linux-3.0.4/drivers/char/Kconfig
---- linux-3.0.4/drivers/char/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/Kconfig	2011-08-23 21:48:14.000000000 -0400
-@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
- 
- 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
+diff -urNp linux-3.0.7/drivers/char/mbcs.c linux-3.0.7/drivers/char/mbcs.c
+--- linux-3.0.7/drivers/char/mbcs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/mbcs.c	2011-10-11 10:44:33.000000000 -0400
+@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *de
+ 	return 0;
+ }
  
- source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
---- linux-3.0.4/drivers/char/mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/mem.c	2011-08-23 21:48:14.000000000 -0400
+-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
++static const struct cx_device_id __devinitconst mbcs_id_table[] = {
+ 	{
+ 	 .part_num = MBCS_PART_NUM,
+ 	 .mfg_num = MBCS_MFG_NUM,
+diff -urNp linux-3.0.7/drivers/char/mem.c linux-3.0.7/drivers/char/mem.c
+--- linux-3.0.7/drivers/char/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -25014,9 +25255,9 @@ diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
---- linux-3.0.4/drivers/char/nvram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/nvram.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/nvram.c linux-3.0.7/drivers/char/nvram.c
+--- linux-3.0.7/drivers/char/nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -25026,9 +25267,9 @@ diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
  		return -EFAULT;
  
  	*ppos = i;
-diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
---- linux-3.0.4/drivers/char/random.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/char/random.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/random.c linux-3.0.7/drivers/char/random.c
+--- linux-3.0.7/drivers/char/random.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/drivers/char/random.c	2011-08-23 21:48:14.000000000 -0400
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -25079,9 +25320,9 @@ diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
---- linux-3.0.4/drivers/char/sonypi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/sonypi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/sonypi.c linux-3.0.7/drivers/char/sonypi.c
+--- linux-3.0.7/drivers/char/sonypi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/sonypi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -25120,9 +25361,30 @@ diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
  	mutex_unlock(&sonypi_device.lock);
  
  	return 0;
-diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/tpm_bios.c
---- linux-3.0.4/drivers/char/tpm/tpm_bios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/tpm/tpm_bios.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/tpm/tpm.c linux-3.0.7/drivers/char/tpm/tpm.c
+--- linux-3.0.7/drivers/char/tpm/tpm.c	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/drivers/char/tpm/tpm.c	2011-10-16 21:55:27.000000000 -0400
+@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_c
+ 		    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;
+@@ -847,6 +847,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.7/drivers/char/tpm/tpm_bios.c linux-3.0.7/drivers/char/tpm/tpm_bios.c
+--- linux-3.0.7/drivers/char/tpm/tpm_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/tpm/tpm_bios.c	2011-10-06 04:17:55.000000000 -0400
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
  	event = addr;
  
@@ -25166,30 +25428,9 @@ diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/
  
  	acpi_os_unmap_memory(virt, len);
  	return 0;
-diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
---- linux-3.0.4/drivers/char/tpm/tpm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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;
- 
--		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.4/drivers/char/virtio_console.c linux-3.0.4/drivers/char/virtio_console.c
---- linux-3.0.4/drivers/char/virtio_console.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/char/virtio_console.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/char/virtio_console.c linux-3.0.7/drivers/char/virtio_console.c
+--- linux-3.0.7/drivers/char/virtio_console.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/char/virtio_console.c	2011-10-06 04:17:55.000000000 -0400
 @@ -555,7 +555,7 @@ static ssize_t fill_readbuf(struct port 
  	if (to_user) {
  		ssize_t ret;
@@ -25208,9 +25449,9 @@ diff -urNp linux-3.0.4/drivers/char/virtio_console.c linux-3.0.4/drivers/char/vi
  }
  
  static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
-diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hifn_795x.c
---- linux-3.0.4/drivers/crypto/hifn_795x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/crypto/hifn_795x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/crypto/hifn_795x.c linux-3.0.7/drivers/crypto/hifn_795x.c
+--- linux-3.0.7/drivers/crypto/hifn_795x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25220,9 +25461,9 @@ diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hif
  	memset(src, 0, sizeof(src));
  	memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/padlock-aes.c
---- linux-3.0.4/drivers/crypto/padlock-aes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/crypto/padlock-aes.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/crypto/padlock-aes.c linux-3.0.7/drivers/crypto/padlock-aes.c
+--- linux-3.0.7/drivers/crypto/padlock-aes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25232,9 +25473,75 @@ diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/p
  	if (key_len % 8) {
  		*flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
  		return -EINVAL;
-diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/edac_pci_sysfs.c
---- linux-3.0.4/drivers/edac/edac_pci_sysfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/edac/edac_pci_sysfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/dma/ioat/dma_v3.c linux-3.0.7/drivers/dma/ioat/dma_v3.c
+--- linux-3.0.7/drivers/dma/ioat/dma_v3.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/dma/ioat/dma_v3.c	2011-10-11 10:44:33.000000000 -0400
+@@ -73,10 +73,10 @@
+ /* provide a lookup table for setting the source address in the base or
+  * extended descriptor of an xor or pq descriptor
+  */
+-static const u8 xor_idx_to_desc __read_mostly = 0xd0;
+-static const u8 xor_idx_to_field[] __read_mostly = { 1, 4, 5, 6, 7, 0, 1, 2 };
+-static const u8 pq_idx_to_desc __read_mostly = 0xf8;
+-static const u8 pq_idx_to_field[] __read_mostly = { 1, 4, 5, 0, 1, 2, 4, 5 };
++static const u8 xor_idx_to_desc = 0xd0;
++static const u8 xor_idx_to_field[] = { 1, 4, 5, 6, 7, 0, 1, 2 };
++static const u8 pq_idx_to_desc = 0xf8;
++static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 };
+ 
+ static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)
+ {
+diff -urNp linux-3.0.7/drivers/edac/amd64_edac.c linux-3.0.7/drivers/edac/amd64_edac.c
+--- linux-3.0.7/drivers/edac/amd64_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/amd64_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -2670,7 +2670,7 @@ static void __devexit amd64_remove_one_i
+  * PCI core identifies what devices are on a system during boot, and then
+  * inquiry this table to see if this driver is for a given device found.
+  */
+-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
++static const struct pci_device_id amd64_pci_table[] __devinitconst = {
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_AMD,
+ 		.device		= PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
+diff -urNp linux-3.0.7/drivers/edac/amd76x_edac.c linux-3.0.7/drivers/edac/amd76x_edac.c
+--- linux-3.0.7/drivers/edac/amd76x_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/amd76x_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 AMD762},
+diff -urNp linux-3.0.7/drivers/edac/e752x_edac.c linux-3.0.7/drivers/edac/e752x_edac.c
+--- linux-3.0.7/drivers/edac/e752x_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/e752x_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(s
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 E7520},
+diff -urNp linux-3.0.7/drivers/edac/e7xxx_edac.c linux-3.0.7/drivers/edac/e7xxx_edac.c
+--- linux-3.0.7/drivers/edac/e7xxx_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/e7xxx_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(s
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 E7205},
+diff -urNp linux-3.0.7/drivers/edac/edac_pci_sysfs.c linux-3.0.7/drivers/edac/edac_pci_sysfs.c
+--- linux-3.0.7/drivers/edac/edac_pci_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -25318,9 +25625,141 @@ diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/ed
  			panic("EDAC: PCI Parity Error");
  	}
  }
-diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
---- linux-3.0.4/drivers/edac/mce_amd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/edac/mce_amd.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/edac/i3000_edac.c linux-3.0.7/drivers/edac/i3000_edac.c
+--- linux-3.0.7/drivers/edac/i3000_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i3000_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(s
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 I3000},
+diff -urNp linux-3.0.7/drivers/edac/i3200_edac.c linux-3.0.7/drivers/edac/i3200_edac.c
+--- linux-3.0.7/drivers/edac/i3200_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i3200_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(s
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
+ 	{
+ 		PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 		I3200},
+diff -urNp linux-3.0.7/drivers/edac/i5000_edac.c linux-3.0.7/drivers/edac/i5000_edac.c
+--- linux-3.0.7/drivers/edac/i5000_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i5000_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(s
+  *
+  *	The "E500P" device is the first device supported.
+  */
+-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
+ 	 .driver_data = I5000P},
+ 
+diff -urNp linux-3.0.7/drivers/edac/i5100_edac.c linux-3.0.7/drivers/edac/i5100_edac.c
+--- linux-3.0.7/drivers/edac/i5100_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i5100_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(s
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
+ 	/* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
+ 	{ 0, }
+diff -urNp linux-3.0.7/drivers/edac/i5400_edac.c linux-3.0.7/drivers/edac/i5400_edac.c
+--- linux-3.0.7/drivers/edac/i5400_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i5400_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(s
+  *
+  *	The "E500P" device is the first device supported.
+  */
+-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
+ 	{0,}			/* 0 terminated list. */
+ };
+diff -urNp linux-3.0.7/drivers/edac/i7300_edac.c linux-3.0.7/drivers/edac/i7300_edac.c
+--- linux-3.0.7/drivers/edac/i7300_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i7300_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1191,7 +1191,7 @@ static void __devexit i7300_remove_one(s
+  *
+  * Has only 8086:360c PCI ID
+  */
+-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
+ 	{0,}			/* 0 terminated list. */
+ };
+diff -urNp linux-3.0.7/drivers/edac/i7core_edac.c linux-3.0.7/drivers/edac/i7core_edac.c
+--- linux-3.0.7/drivers/edac/i7core_edac.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/drivers/edac/i7core_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -359,7 +359,7 @@ static const struct pci_id_table pci_dev
+ /*
+  *	pci_device_id	table for which devices we are looking for
+  */
+-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
+ 	{0,}			/* 0 terminated list. */
+diff -urNp linux-3.0.7/drivers/edac/i82443bxgx_edac.c linux-3.0.7/drivers/edac/i82443bxgx_edac.c
+--- linux-3.0.7/drivers/edac/i82443bxgx_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i82443bxgx_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_
+ 
+ EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
+ 
+-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
+diff -urNp linux-3.0.7/drivers/edac/i82860_edac.c linux-3.0.7/drivers/edac/i82860_edac.c
+--- linux-3.0.7/drivers/edac/i82860_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i82860_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 I82860},
+diff -urNp linux-3.0.7/drivers/edac/i82875p_edac.c linux-3.0.7/drivers/edac/i82875p_edac.c
+--- linux-3.0.7/drivers/edac/i82875p_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i82875p_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 I82875P},
+diff -urNp linux-3.0.7/drivers/edac/i82975x_edac.c linux-3.0.7/drivers/edac/i82975x_edac.c
+--- linux-3.0.7/drivers/edac/i82975x_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/i82975x_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
++static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
+ 	{
+ 		PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 		I82975X
+diff -urNp linux-3.0.7/drivers/edac/mce_amd.h linux-3.0.7/drivers/edac/mce_amd.h
+--- linux-3.0.7/drivers/edac/mce_amd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -25330,9 +25769,33 @@ diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
  
  void amd_report_gart_errors(bool);
  void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
-diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire/core-card.c
---- linux-3.0.4/drivers/firewire/core-card.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-card.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/edac/r82600_edac.c linux-3.0.7/drivers/edac/r82600_edac.c
+--- linux-3.0.7/drivers/edac/r82600_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/r82600_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
++static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
+ 	 },
+diff -urNp linux-3.0.7/drivers/edac/x38_edac.c linux-3.0.7/drivers/edac/x38_edac.c
+--- linux-3.0.7/drivers/edac/x38_edac.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/edac/x38_edac.c	2011-10-11 10:44:33.000000000 -0400
+@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(str
+ 	edac_mc_free(mci);
+ }
+ 
+-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
++static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
+ 	{
+ 	 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+ 	 X38},
+diff -urNp linux-3.0.7/drivers/firewire/core-card.c linux-3.0.7/drivers/firewire/core-card.c
+--- linux-3.0.7/drivers/firewire/core-card.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -25342,9 +25805,9 @@ diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire
  
  	card->driver->update_phy_reg(card, 4,
  				     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire/core-cdev.c
---- linux-3.0.4/drivers/firewire/core-cdev.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-cdev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/firewire/core-cdev.c linux-3.0.7/drivers/firewire/core-cdev.c
+--- linux-3.0.7/drivers/firewire/core-cdev.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -25355,20 +25818,9 @@ diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire
  		return -EINVAL;
  
  	r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.0.4/drivers/firewire/core.h linux-3.0.4/drivers/firewire/core.h
---- linux-3.0.4/drivers/firewire/core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/firewire/core-transaction.c
---- linux-3.0.4/drivers/firewire/core-transaction.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firewire/core-transaction.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/firewire/core-transaction.c linux-3.0.7/drivers/firewire/core-transaction.c
+--- linux-3.0.7/drivers/firewire/core-transaction.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -25386,9 +25838,20 @@ diff -urNp linux-3.0.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/f
  	init_timer_on_stack(&t.split_timeout_timer);
  	init_completion(&d.done);
  	d.payload = payload;
-diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/dmi_scan.c
---- linux-3.0.4/drivers/firmware/dmi_scan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/firmware/dmi_scan.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/firewire/core.h linux-3.0.7/drivers/firewire/core.h
+--- linux-3.0.7/drivers/firewire/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/drivers/firmware/dmi_scan.c linux-3.0.7/drivers/firmware/dmi_scan.c
+--- linux-3.0.7/drivers/firmware/dmi_scan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/firmware/dmi_scan.c	2011-10-06 04:17:55.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
  		}
  	}
@@ -25410,9 +25873,9 @@ diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/
  
  	iounmap(buf);
  	return 0;
-diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx_giu.c
---- linux-3.0.4/drivers/gpio/vr41xx_giu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpio/vr41xx_giu.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpio/vr41xx_giu.c linux-3.0.7/drivers/gpio/vr41xx_giu.c
+--- linux-3.0.7/drivers/gpio/vr41xx_giu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -25422,9 +25885,9 @@ diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx
  
  	return -EINVAL;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc.c linux-3.0.4/drivers/gpu/drm/drm_crtc.c
---- linux-3.0.4/drivers/gpu/drm/drm_crtc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_crtc.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc.c linux-3.0.7/drivers/gpu/drm/drm_crtc.c
+--- linux-3.0.7/drivers/gpu/drm/drm_crtc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/drm_crtc.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1372,7 +1372,7 @@ int drm_mode_getconnector(struct drm_dev
  	 */
  	if ((out_resp->count_modes >= mode_count) && mode_count) {
@@ -25517,9 +25980,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc.c linux-3.0.4/drivers/gpu/drm/dr
  		if (copy_to_user(blob_ptr, blob->data, blob->length)){
  			ret = -EFAULT;
  			goto done;
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.0.7/drivers/gpu/drm/drm_crtc_helper.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25538,9 +26001,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu
  	crtc->enabled = drm_helper_crtc_in_use(crtc);
  	if (!crtc->enabled)
  		return true;
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm_drv.c
---- linux-3.0.4/drivers/gpu/drm/drm_drv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_drv.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_drv.c linux-3.0.7/drivers/gpu/drm/drm_drv.c
+--- linux-3.0.7/drivers/gpu/drm/drm_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/drm_drv.c	2011-10-06 04:17:55.000000000 -0400
 @@ -307,7 +307,7 @@ module_exit(drm_core_exit);
  /**
   * Copy and IOCTL return string to user space
@@ -25559,9 +26022,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm
  	++file_priv->ioctl_count;
  
  	DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/drm_fops.c
---- linux-3.0.4/drivers/gpu/drm/drm_fops.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_fops.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_fops.c linux-3.0.7/drivers/gpu/drm/drm_fops.c
+--- linux-3.0.7/drivers/gpu/drm/drm_fops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *
  	}
  
@@ -25611,9 +26074,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/dr
  		if (atomic_read(&dev->ioctl_count)) {
  			DRM_ERROR("Device busy: %d\n",
  				  atomic_read(&dev->ioctl_count));
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/drm_global.c
---- linux-3.0.4/drivers/gpu/drm/drm_global.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_global.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_global.c linux-3.0.7/drivers/gpu/drm/drm_global.c
+--- linux-3.0.7/drivers/gpu/drm/drm_global.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25671,9 +26134,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/
  		ref->release(ref);
  		item->object = NULL;
  	}
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/drm_info.c
---- linux-3.0.4/drivers/gpu/drm/drm_info.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_info.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_info.c linux-3.0.7/drivers/gpu/drm/drm_info.c
+--- linux-3.0.7/drivers/gpu/drm/drm_info.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25714,9 +26177,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/dr
  
  #if defined(__i386__)
  		pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioc32.c linux-3.0.4/drivers/gpu/drm/drm_ioc32.c
---- linux-3.0.4/drivers/gpu/drm/drm_ioc32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_ioc32.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioc32.c linux-3.0.7/drivers/gpu/drm/drm_ioc32.c
+--- linux-3.0.7/drivers/gpu/drm/drm_ioc32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/drm_ioc32.c	2011-10-06 04:17:55.000000000 -0400
 @@ -455,7 +455,7 @@ static int compat_drm_infobufs(struct fi
  	request = compat_alloc_user_space(nbytes);
  	if (!access_ok(VERIFY_WRITE, request, nbytes))
@@ -25735,9 +26198,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioc32.c linux-3.0.4/drivers/gpu/drm/d
  
  	if (__put_user(count, &request->count)
  	    || __put_user(list, &request->list))
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/drm_ioctl.c
---- linux-3.0.4/drivers/gpu/drm/drm_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_ioctl.c linux-3.0.7/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.0.7/drivers/gpu/drm/drm_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -25747,9 +26210,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/d
  		stats->data[i].type = dev->types[i];
  	}
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/drm_lock.c
---- linux-3.0.4/drivers/gpu/drm/drm_lock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/drm_lock.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/drm_lock.c linux-3.0.7/drivers/gpu/drm/drm_lock.c
+--- linux-3.0.7/drivers/gpu/drm/drm_lock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -25768,9 +26231,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/dr
  
  	if (drm_lock_free(&master->lock, lock->context)) {
  		/* FIXME: Should really bail out here. */
-diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.0.7/drivers/gpu/drm/i810/i810_dma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -25793,9 +26256,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/d
  	sarea_priv->last_enqueue = dev_priv->counter - 1;
  	sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.0.7/drivers/gpu/drm/i810/i810_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -25807,9 +26270,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/d
  
  	int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/i915/i915_debugfs.c	2011-10-06 04:17:55.000000000 -0400
 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
  			   I915_READ(GTIMR));
  	}
@@ -25828,9 +26291,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/g
  
  	mutex_unlock(&dev->struct_mutex);
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.0.7/drivers/gpu/drm/i915/i915_dma.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -25840,9 +26303,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/d
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.0.7/drivers/gpu/drm/i915/i915_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -25879,9 +26342,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/d
  {
  	return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.0.7/drivers/gpu/drm/i915/i915_gem_execbuffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -25891,9 +26354,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/dr
  
  	/* 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.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.0.7/drivers/gpu/drm/i915/i915_irq.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -25939,9 +26402,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/d
  
  	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.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/gpu/drm/i915/intel_display.c
---- linux-3.0.4/drivers/gpu/drm/i915/intel_display.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/i915/intel_display.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/i915/intel_display.c linux-3.0.7/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.0.7/drivers/gpu/drm/i915/intel_display.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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,
@@ -25987,9 +26450,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/
  cleanup_objs:
  	drm_gem_object_unreference(&work->old_fb_obj->base);
  	drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.0.7/drivers/gpu/drm/mga/mga_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26002,9 +26465,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm
  	u32 next_fence_to_post;
  
  	unsigned int fb_cpp;
-diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.0.7/drivers/gpu/drm/mga/mga_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26041,9 +26504,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm
  		      - *sequence) <= (1 << 23)));
  
  	*sequence = cur_fence;
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_bios.c	2011-08-26 19:49:56.000000000 -0400
 @@ -200,7 +200,7 @@ struct methods {
  	const char desc[8];
  	void (*loadbios)(struct drm_device *, uint8_t *);
@@ -26062,9 +26525,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/driver
  
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26117,9 +26580,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers
  	} ttm;
  
  	struct {
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -26138,9 +26601,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drive
  	return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_gem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26150,9 +26613,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers
  retry:
  	if (++trycnt > 100000) {
  		NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nouveau_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26162,9 +26625,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drive
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.0.7/drivers/gpu/drm/nouveau/nv04_graph.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -26174,9 +26637,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/
  	return 0;
  }
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.0.7/drivers/gpu/drm/r128/r128_cce.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -26186,9 +26649,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/d
  
  	/* We don't support anything other than bus-mastering ring mode,
  	 * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.0.7/drivers/gpu/drm/r128/r128_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26206,9 +26669,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/d
  
  	u32 color_fmt;
  	unsigned int front_offset;
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.0.7/drivers/gpu/drm/r128/r128_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26227,9 +26690,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/d
  		drm_handle_vblank(dev, 0);
  		return IRQ_HANDLED;
  	}
-diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu/drm/r128/r128_state.c
---- linux-3.0.4/drivers/gpu/drm/r128/r128_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/r128/r128_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/r128/r128_state.c linux-3.0.7/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.0.7/drivers/gpu/drm/r128/r128_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -26243,9 +26706,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu
  }
  
  #endif
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/atom.c linux-3.0.4/drivers/gpu/drm/radeon/atom.c
---- linux-3.0.4/drivers/gpu/drm/radeon/atom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/atom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/atom.c linux-3.0.7/drivers/gpu/drm/radeon/atom.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/atom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26255,9 +26718,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/atom.c linux-3.0.4/drivers/gpu/drm
  	ctx->card = card;
  	ctx->bios = bios;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/mkregtable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -26275,9 +26738,30 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/g
  
  	if (regcomp
  	    (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon.h linux-3.0.7/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon.h	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/radeon/radeon.h	2011-10-16 21:55:27.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;
+@@ -961,7 +961,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.7/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_atombios.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26287,9 +26771,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/driv
  	if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
  		return false;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_device.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26299,9 +26783,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/driver
  	spin_unlock(&dev->count_lock);
  	return can_switch;
  }
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_display.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -26311,9 +26795,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drive
  	DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
  	freq = freq * 1000;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -26323,9 +26807,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/g
  	int vblank_crtc;
  	uint32_t irq_enable_reg;
  	uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26344,30 +26828,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers
  	INIT_LIST_HEAD(&rdev->fence_drv.created);
  	INIT_LIST_HEAD(&rdev->fence_drv.emited);
  	INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/drm/radeon/radeon.h
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_ioc32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -26377,9 +26840,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers
  			  &request->value))
  		return -EFAULT;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26400,9 +26863,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/g
  	DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
  	dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_state.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26421,10 +26884,10 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers
  
  	DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c	2011-10-16 21:54:53.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/radeon/radeon_ttm.c	2011-10-16 21:55:27.000000000 -0400
+@@ -649,8 +649,10 @@ int radeon_mmap(struct file *filp, struc
  	}
  	if (unlikely(ttm_vm_ops == NULL)) {
  		ttm_vm_ops = vma->vm_ops;
@@ -26437,9 +26900,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/g
  	}
  	vma->vm_ops = &radeon_ttm_vm_ops;
  	return 0;
-diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/drm/radeon/rs690.c
---- linux-3.0.4/drivers/gpu/drm/radeon/rs690.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/radeon/rs690.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/radeon/rs690.c linux-3.0.7/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.0.7/drivers/gpu/drm/radeon/rs690.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -26453,9 +26916,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/dr
  	} else {
  		if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
  			rdev->pm.k8_bandwidth.full)
-diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.0.7/drivers/gpu/drm/ttm/ttm_page_alloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -26468,9 +26931,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/
  	struct ttm_page_pool *pool;
  	int shrink_pages = sc->nr_to_scan;
  
-diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm/via/via_drv.h
---- linux-3.0.4/drivers/gpu/drm/via/via_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/via/via_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_drv.h linux-3.0.7/drivers/gpu/drm/via/via_drv.h
+--- linux-3.0.7/drivers/gpu/drm/via/via_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
  
@@ -26489,9 +26952,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm
  	drm_via_state_t hc_state;
  	char pci_buf[VIA_PCI_BUF_SIZE];
  	const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm/via/via_irq.c
---- linux-3.0.4/drivers/gpu/drm/via/via_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/via/via_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/via/via_irq.c linux-3.0.7/drivers/gpu/drm/via/via_irq.c
+--- linux-3.0.7/drivers/gpu/drm/via/via_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26562,9 +27025,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm
  		irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
  	case VIA_IRQ_ABSOLUTE:
  		break;
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  	 */
@@ -26574,9 +27037,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/g
  	wait_queue_head_t fence_queue;
  	wait_queue_head_t fifo_queue;
  	atomic_t fence_queue_waiters;
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+--- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	2011-10-06 04:17:55.000000000 -0400
 @@ -610,7 +610,7 @@ int vmw_execbuf_ioctl(struct drm_device 
  	struct drm_vmw_fence_rep fence_rep;
  	struct drm_vmw_fence_rep __user *user_fence_rep;
@@ -26586,9 +27049,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c linux-3.0.4/drive
  	void *cmd;
  	uint32_t sequence;
  	struct vmw_sw_context *sw_context = &dev_priv->ctx;
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -26598,9 +27061,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers
  		else {
  			fence = list_first_entry(&queue->head,
  						 struct vmw_fence, head);
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c	2011-10-06 04:17:55.000000000 -0400
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
  		 (unsigned int) min,
  		 (unsigned int) fifo->capabilities);
@@ -26637,9 +27100,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/
  	} while (*sequence == 0);
  
  	if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.0.7/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  	 */
@@ -26658,9 +27121,9 @@ diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/g
  	ret = 0;
  
  	for (;;) {
-diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
---- linux-3.0.4/drivers/hid/hid-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hid/hid-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/hid/hid-core.c linux-3.0.7/drivers/hid/hid-core.c
+--- linux-3.0.7/drivers/hid/hid-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -26679,9 +27142,9 @@ diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
  
  	hid_debug_register(hdev, dev_name(&hdev->dev));
  	ret = device_add(&hdev->dev);
-diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhid/hiddev.c
---- linux-3.0.4/drivers/hid/usbhid/hiddev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hid/usbhid/hiddev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/hid/usbhid/hiddev.c linux-3.0.7/drivers/hid/usbhid/hiddev.c
+--- linux-3.0.7/drivers/hid/usbhid/hiddev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26691,9 +27154,9 @@ diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhi
  			break;
  
  		for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmon/acpi_power_meter.c
---- linux-3.0.4/drivers/hwmon/acpi_power_meter.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/acpi_power_meter.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/hwmon/acpi_power_meter.c linux-3.0.7/drivers/hwmon/acpi_power_meter.c
+--- linux-3.0.7/drivers/hwmon/acpi_power_meter.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26703,9 +27166,9 @@ diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmo
  
  	mutex_lock(&resource->lock);
  	resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
---- linux-3.0.4/drivers/hwmon/sht15.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/sht15.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/hwmon/sht15.c linux-3.0.7/drivers/hwmon/sht15.c
+--- linux-3.0.7/drivers/hwmon/sht15.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/hwmon/sht15.c	2011-08-23 21:47:55.000000000 -0400
 @@ -166,7 +166,7 @@ struct sht15_data {
  	int				supply_uV;
  	bool				supply_uV_valid;
@@ -26754,9 +27217,9 @@ diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
  			return;
  	}
  
-diff -urNp linux-3.0.4/drivers/hwmon/w83791d.c linux-3.0.4/drivers/hwmon/w83791d.c
---- linux-3.0.4/drivers/hwmon/w83791d.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/hwmon/w83791d.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/hwmon/w83791d.c linux-3.0.7/drivers/hwmon/w83791d.c
+--- linux-3.0.7/drivers/hwmon/w83791d.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -26768,9 +27231,9 @@ diff -urNp linux-3.0.4/drivers/hwmon/w83791d.c linux-3.0.4/drivers/hwmon/w83791d
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.0.7/drivers/i2c/busses/i2c-amd756-s4882.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26780,9 +27243,9 @@ diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.0.7/drivers/i2c/busses/i2c-nforce2-s4985.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -26792,9 +27255,9 @@ diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/driver
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
---- linux-3.0.4/drivers/i2c/i2c-mux.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/i2c/i2c-mux.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/i2c/i2c-mux.c linux-3.0.7/drivers/i2c/i2c-mux.c
+--- linux-3.0.7/drivers/i2c/i2c-mux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -26804,9 +27267,228 @@ diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
  
  	struct i2c_adapter *parent;
  	void *mux_dev;	/* the mux chip/device */
-diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
---- linux-3.0.4/drivers/ide/ide-cd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/ide-cd.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ide/aec62xx.c linux-3.0.7/drivers/ide/aec62xx.c
+--- linux-3.0.7/drivers/ide/aec62xx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/aec62xx.c	2011-10-11 10:44:33.000000000 -0400
+@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_
+ 	.cable_detect		= atp86x_cable_detect,
+ };
+ 
+-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
++static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
+ 	{	/* 0: AEC6210 */
+ 		.name		= DRV_NAME,
+ 		.init_chipset	= init_chipset_aec62xx,
+diff -urNp linux-3.0.7/drivers/ide/alim15x3.c linux-3.0.7/drivers/ide/alim15x3.c
+--- linux-3.0.7/drivers/ide/alim15x3.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/alim15x3.c	2011-10-11 10:44:33.000000000 -0400
+@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info ali15x3_chipset __devinitdata = {
++static const struct ide_port_info ali15x3_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_ali15x3,
+ 	.init_hwif	= init_hwif_ali15x3,
+diff -urNp linux-3.0.7/drivers/ide/amd74xx.c linux-3.0.7/drivers/ide/amd74xx.c
+--- linux-3.0.7/drivers/ide/amd74xx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/amd74xx.c	2011-10-11 10:44:33.000000000 -0400
+@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_por
+ 		.udma_mask	= udma,					\
+ 	}
+ 
+-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
++static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
+ 	/* 0: AMD7401 */	DECLARE_AMD_DEV(0x00, ATA_UDMA2),
+ 	/* 1: AMD7409 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
+ 	/* 2: AMD7411/7441 */	DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
+diff -urNp linux-3.0.7/drivers/ide/atiixp.c linux-3.0.7/drivers/ide/atiixp.c
+--- linux-3.0.7/drivers/ide/atiixp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/atiixp.c	2011-10-11 10:44:33.000000000 -0400
+@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_
+ 	.cable_detect		= atiixp_cable_detect,
+ };
+ 
+-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
++static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
+ 	{	/* 0: IXP200/300/400/700 */
+ 		.name		= DRV_NAME,
+ 		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
+diff -urNp linux-3.0.7/drivers/ide/cmd64x.c linux-3.0.7/drivers/ide/cmd64x.c
+--- linux-3.0.7/drivers/ide/cmd64x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/cmd64x.c	2011-10-11 10:44:33.000000000 -0400
+@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_r
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
++static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
+ 	{	/* 0: CMD643 */
+ 		.name		= DRV_NAME,
+ 		.init_chipset	= init_chipset_cmd64x,
+diff -urNp linux-3.0.7/drivers/ide/cs5520.c linux-3.0.7/drivers/ide/cs5520.c
+--- linux-3.0.7/drivers/ide/cs5520.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/cs5520.c	2011-10-11 10:44:33.000000000 -0400
+@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_
+ 	.set_dma_mode		= cs5520_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info cyrix_chipset __devinitdata = {
++static const struct ide_port_info cyrix_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
+ 	.port_ops	= &cs5520_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/cs5530.c linux-3.0.7/drivers/ide/cs5530.c
+--- linux-3.0.7/drivers/ide/cs5530.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/cs5530.c	2011-10-11 10:44:33.000000000 -0400
+@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_
+ 	.udma_filter		= cs5530_udma_filter,
+ };
+ 
+-static const struct ide_port_info cs5530_chipset __devinitdata = {
++static const struct ide_port_info cs5530_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_cs5530,
+ 	.init_hwif	= init_hwif_cs5530,
+diff -urNp linux-3.0.7/drivers/ide/cs5535.c linux-3.0.7/drivers/ide/cs5535.c
+--- linux-3.0.7/drivers/ide/cs5535.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/cs5535.c	2011-10-11 10:44:33.000000000 -0400
+@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_
+ 	.cable_detect		= cs5535_cable_detect,
+ };
+ 
+-static const struct ide_port_info cs5535_chipset __devinitdata = {
++static const struct ide_port_info cs5535_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.port_ops	= &cs5535_port_ops,
+ 	.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
+diff -urNp linux-3.0.7/drivers/ide/cy82c693.c linux-3.0.7/drivers/ide/cy82c693.c
+--- linux-3.0.7/drivers/ide/cy82c693.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/cy82c693.c	2011-10-11 10:44:33.000000000 -0400
+@@ -161,7 +161,7 @@ static const struct ide_port_ops cy82c69
+ 	.set_dma_mode		= cy82c693_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info cy82c693_chipset __devinitdata = {
++static const struct ide_port_info cy82c693_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_iops	= init_iops_cy82c693,
+ 	.port_ops	= &cy82c693_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/hpt366.c linux-3.0.7/drivers/ide/hpt366.c
+--- linux-3.0.7/drivers/ide/hpt366.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/hpt366.c	2011-10-11 10:44:33.000000000 -0400
+@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings
+ 	}
+ };
+ 
+-static const struct hpt_info hpt36x __devinitdata = {
++static const struct hpt_info hpt36x __devinitconst = {
+ 	.chip_name	= "HPT36x",
+ 	.chip_type	= HPT36x,
+ 	.udma_mask	= HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
+@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __de
+ 	.timings	= &hpt36x_timings
+ };
+ 
+-static const struct hpt_info hpt370 __devinitdata = {
++static const struct hpt_info hpt370 __devinitconst = {
+ 	.chip_name	= "HPT370",
+ 	.chip_type	= HPT370,
+ 	.udma_mask	= HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
+@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __de
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt370a __devinitdata = {
++static const struct hpt_info hpt370a __devinitconst = {
+ 	.chip_name	= "HPT370A",
+ 	.chip_type	= HPT370A,
+ 	.udma_mask	= HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
+@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __d
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt374 __devinitdata = {
++static const struct hpt_info hpt374 __devinitconst = {
+ 	.chip_name	= "HPT374",
+ 	.chip_type	= HPT374,
+ 	.udma_mask	= ATA_UDMA5,
+@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __de
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372 __devinitdata = {
++static const struct hpt_info hpt372 __devinitconst = {
+ 	.chip_name	= "HPT372",
+ 	.chip_type	= HPT372,
+ 	.udma_mask	= HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __de
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372a __devinitdata = {
++static const struct hpt_info hpt372a __devinitconst = {
+ 	.chip_name	= "HPT372A",
+ 	.chip_type	= HPT372A,
+ 	.udma_mask	= HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __d
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt302 __devinitdata = {
++static const struct hpt_info hpt302 __devinitconst = {
+ 	.chip_name	= "HPT302",
+ 	.chip_type	= HPT302,
+ 	.udma_mask	= HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __de
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt371 __devinitdata = {
++static const struct hpt_info hpt371 __devinitconst = {
+ 	.chip_name	= "HPT371",
+ 	.chip_type	= HPT371,
+ 	.udma_mask	= HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __de
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt372n __devinitdata = {
++static const struct hpt_info hpt372n __devinitconst = {
+ 	.chip_name	= "HPT372N",
+ 	.chip_type	= HPT372N,
+ 	.udma_mask	= HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __d
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt302n __devinitdata = {
++static const struct hpt_info hpt302n __devinitconst = {
+ 	.chip_name	= "HPT302N",
+ 	.chip_type	= HPT302N,
+ 	.udma_mask	= HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __d
+ 	.timings	= &hpt37x_timings
+ };
+ 
+-static const struct hpt_info hpt371n __devinitdata = {
++static const struct hpt_info hpt371n __devinitconst = {
+ 	.chip_name	= "HPT371N",
+ 	.chip_type	= HPT371N,
+ 	.udma_mask	= HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
+@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_d
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
++static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
+ 	{	/* 0: HPT36x */
+ 		.name		= DRV_NAME,
+ 		.init_chipset	= init_chipset_hpt366,
+diff -urNp linux-3.0.7/drivers/ide/ide-cd.c linux-3.0.7/drivers/ide/ide-cd.c
+--- linux-3.0.7/drivers/ide/ide-cd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -26816,9 +27498,9 @@ diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
  			drive->dma = 0;
  	}
  }
-diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-floppy.c
---- linux-3.0.4/drivers/ide/ide-floppy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/ide-floppy.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ide/ide-floppy.c linux-3.0.7/drivers/ide/ide-floppy.c
+--- linux-3.0.7/drivers/ide/ide-floppy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -26828,9 +27510,177 @@ diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-flop
  	ide_debug_log(IDE_DBG_FUNC, "enter");
  
  	drive->bios_cyl = 0;
-diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci.c
---- linux-3.0.4/drivers/ide/setup-pci.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/ide/setup-pci.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ide/ide-pci-generic.c linux-3.0.7/drivers/ide/ide-pci-generic.c
+--- linux-3.0.7/drivers/ide/ide-pci-generic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/ide-pci-generic.c	2011-10-11 10:44:33.000000000 -0400
+@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell
+ 		.udma_mask	= ATA_UDMA6, \
+ 	}
+ 
+-static const struct ide_port_info generic_chipsets[] __devinitdata = {
++static const struct ide_port_info generic_chipsets[] __devinitconst = {
+ 	/*  0: Unknown */
+ 	DECLARE_GENERIC_PCI_DEV(0),
+ 
+diff -urNp linux-3.0.7/drivers/ide/it8172.c linux-3.0.7/drivers/ide/it8172.c
+--- linux-3.0.7/drivers/ide/it8172.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/it8172.c	2011-10-11 10:44:33.000000000 -0400
+@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_
+ 	.set_dma_mode	= it8172_set_dma_mode,
+ };
+ 
+-static const struct ide_port_info it8172_port_info __devinitdata = {
++static const struct ide_port_info it8172_port_info __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.port_ops	= &it8172_port_ops,
+ 	.enablebits	= { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
+diff -urNp linux-3.0.7/drivers/ide/it8213.c linux-3.0.7/drivers/ide/it8213.c
+--- linux-3.0.7/drivers/ide/it8213.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/it8213.c	2011-10-11 10:44:33.000000000 -0400
+@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_
+ 	.cable_detect		= it8213_cable_detect,
+ };
+ 
+-static const struct ide_port_info it8213_chipset __devinitdata = {
++static const struct ide_port_info it8213_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= { {0x41, 0x80, 0x80} },
+ 	.port_ops	= &it8213_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/it821x.c linux-3.0.7/drivers/ide/it821x.c
+--- linux-3.0.7/drivers/ide/it821x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/it821x.c	2011-10-11 10:44:33.000000000 -0400
+@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_
+ 	.cable_detect		= it821x_cable_detect,
+ };
+ 
+-static const struct ide_port_info it821x_chipset __devinitdata = {
++static const struct ide_port_info it821x_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_it821x,
+ 	.init_hwif	= init_hwif_it821x,
+diff -urNp linux-3.0.7/drivers/ide/jmicron.c linux-3.0.7/drivers/ide/jmicron.c
+--- linux-3.0.7/drivers/ide/jmicron.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/jmicron.c	2011-10-11 10:44:33.000000000 -0400
+@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron
+ 	.cable_detect		= jmicron_cable_detect,
+ };
+ 
+-static const struct ide_port_info jmicron_chipset __devinitdata = {
++static const struct ide_port_info jmicron_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
+ 	.port_ops	= &jmicron_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/ns87415.c linux-3.0.7/drivers/ide/ns87415.c
+--- linux-3.0.7/drivers/ide/ns87415.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/ns87415.c	2011-10-11 10:44:33.000000000 -0400
+@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_
+ 	.dma_sff_read_status	= superio_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info ns87415_chipset __devinitdata = {
++static const struct ide_port_info ns87415_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_hwif	= init_hwif_ns87415,
+ 	.tp_ops 	= &ns87415_tp_ops,
+diff -urNp linux-3.0.7/drivers/ide/opti621.c linux-3.0.7/drivers/ide/opti621.c
+--- linux-3.0.7/drivers/ide/opti621.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/opti621.c	2011-10-11 10:44:33.000000000 -0400
+@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621
+ 	.set_pio_mode		= opti621_set_pio_mode,
+ };
+ 
+-static const struct ide_port_info opti621_chipset __devinitdata = {
++static const struct ide_port_info opti621_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
+ 	.port_ops	= &opti621_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/pdc202xx_new.c linux-3.0.7/drivers/ide/pdc202xx_new.c
+--- linux-3.0.7/drivers/ide/pdc202xx_new.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/pdc202xx_new.c	2011-10-11 10:44:33.000000000 -0400
+@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_
+ 		.udma_mask	= udma, \
+ 	}
+ 
+-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
++static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
+ 	/* 0: PDC202{68,70} */		DECLARE_PDCNEW_DEV(ATA_UDMA5),
+ 	/* 1: PDC202{69,71,75,76,77} */	DECLARE_PDCNEW_DEV(ATA_UDMA6),
+ };
+diff -urNp linux-3.0.7/drivers/ide/pdc202xx_old.c linux-3.0.7/drivers/ide/pdc202xx_old.c
+--- linux-3.0.7/drivers/ide/pdc202xx_old.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/pdc202xx_old.c	2011-10-11 10:44:33.000000000 -0400
+@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x
+ 		.max_sectors	= sectors, \
+ 	}
+ 
+-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
++static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
+ 	{	/* 0: PDC20246 */
+ 		.name		= DRV_NAME,
+ 		.init_chipset	= init_chipset_pdc202xx,
+diff -urNp linux-3.0.7/drivers/ide/piix.c linux-3.0.7/drivers/ide/piix.c
+--- linux-3.0.7/drivers/ide/piix.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/piix.c	2011-10-11 10:44:33.000000000 -0400
+@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_por
+ 		.udma_mask	= udma, \
+ 	}
+ 
+-static const struct ide_port_info piix_pci_info[] __devinitdata = {
++static const struct ide_port_info piix_pci_info[] __devinitconst = {
+ 	/* 0: MPIIX */
+ 	{	/*
+ 		 * MPIIX actually has only a single IDE channel mapped to
+diff -urNp linux-3.0.7/drivers/ide/rz1000.c linux-3.0.7/drivers/ide/rz1000.c
+--- linux-3.0.7/drivers/ide/rz1000.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/rz1000.c	2011-10-11 10:44:33.000000000 -0400
+@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_read
+ 	}
+ }
+ 
+-static const struct ide_port_info rz1000_chipset __devinitdata = {
++static const struct ide_port_info rz1000_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.host_flags	= IDE_HFLAG_NO_DMA,
+ };
+diff -urNp linux-3.0.7/drivers/ide/sc1200.c linux-3.0.7/drivers/ide/sc1200.c
+--- linux-3.0.7/drivers/ide/sc1200.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/sc1200.c	2011-10-11 10:44:33.000000000 -0400
+@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_d
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info sc1200_chipset __devinitdata = {
++static const struct ide_port_info sc1200_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.port_ops	= &sc1200_port_ops,
+ 	.dma_ops	= &sc1200_dma_ops,
+diff -urNp linux-3.0.7/drivers/ide/scc_pata.c linux-3.0.7/drivers/ide/scc_pata.c
+--- linux-3.0.7/drivers/ide/scc_pata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/scc_pata.c	2011-10-11 10:44:33.000000000 -0400
+@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_
+ 	.dma_sff_read_status	= scc_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info scc_chipset __devinitdata = {
++static const struct ide_port_info scc_chipset __devinitconst = {
+ 	.name		= "sccIDE",
+ 	.init_iops	= init_iops_scc,
+ 	.init_dma	= scc_init_dma,
+diff -urNp linux-3.0.7/drivers/ide/serverworks.c linux-3.0.7/drivers/ide/serverworks.c
+--- linux-3.0.7/drivers/ide/serverworks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/serverworks.c	2011-10-11 10:44:33.000000000 -0400
+@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_p
+ 	.cable_detect		= svwks_cable_detect,
+ };
+ 
+-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
++static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
+ 	{	/* 0: OSB4 */
+ 		.name		= DRV_NAME,
+ 		.init_chipset	= init_chipset_svwks,
+diff -urNp linux-3.0.7/drivers/ide/setup-pci.c linux-3.0.7/drivers/ide/setup-pci.c
+--- linux-3.0.7/drivers/ide/setup-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 };
@@ -26840,9 +27690,105 @@ diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci
  	for (i = 0; i < n_ports / 2; i++) {
  		ret = ide_setup_pci_controller(pdev[i], d, !i);
  		if (ret < 0)
-diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniband/core/cm.c
---- linux-3.0.4/drivers/infiniband/core/cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/core/cm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/ide/siimage.c linux-3.0.7/drivers/ide/siimage.c
+--- linux-3.0.7/drivers/ide/siimage.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/siimage.c	2011-10-11 10:44:33.000000000 -0400
+@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_
+ 		.udma_mask	= ATA_UDMA6,		\
+ 	}
+ 
+-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
++static const struct ide_port_info siimage_chipsets[] __devinitconst = {
+ 	/* 0: SiI680 */  DECLARE_SII_DEV(&sil_pata_port_ops),
+ 	/* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
+ };
+diff -urNp linux-3.0.7/drivers/ide/sis5513.c linux-3.0.7/drivers/ide/sis5513.c
+--- linux-3.0.7/drivers/ide/sis5513.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/sis5513.c	2011-10-11 10:44:33.000000000 -0400
+@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata
+ 	.cable_detect		= sis_cable_detect,
+ };
+ 
+-static const struct ide_port_info sis5513_chipset __devinitdata = {
++static const struct ide_port_info sis5513_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_sis5513,
+ 	.enablebits	= { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
+diff -urNp linux-3.0.7/drivers/ide/sl82c105.c linux-3.0.7/drivers/ide/sl82c105.c
+--- linux-3.0.7/drivers/ide/sl82c105.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/sl82c105.c	2011-10-11 10:44:33.000000000 -0400
+@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info sl82c105_chipset __devinitdata = {
++static const struct ide_port_info sl82c105_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_sl82c105,
+ 	.enablebits	= {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
+diff -urNp linux-3.0.7/drivers/ide/slc90e66.c linux-3.0.7/drivers/ide/slc90e66.c
+--- linux-3.0.7/drivers/ide/slc90e66.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/slc90e66.c	2011-10-11 10:44:33.000000000 -0400
+@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e6
+ 	.cable_detect		= slc90e66_cable_detect,
+ };
+ 
+-static const struct ide_port_info slc90e66_chipset __devinitdata = {
++static const struct ide_port_info slc90e66_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
+ 	.port_ops	= &slc90e66_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/tc86c001.c linux-3.0.7/drivers/ide/tc86c001.c
+--- linux-3.0.7/drivers/ide/tc86c001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/tc86c001.c	2011-10-11 10:44:33.000000000 -0400
+@@ -191,7 +191,7 @@ static const struct ide_dma_ops tc86c001
+ 	.dma_sff_read_status	= ide_dma_sff_read_status,
+ };
+ 
+-static const struct ide_port_info tc86c001_chipset __devinitdata = {
++static const struct ide_port_info tc86c001_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_hwif	= init_hwif_tc86c001,
+ 	.port_ops	= &tc86c001_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/triflex.c linux-3.0.7/drivers/ide/triflex.c
+--- linux-3.0.7/drivers/ide/triflex.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/triflex.c	2011-10-11 10:44:33.000000000 -0400
+@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex
+ 	.set_dma_mode		= triflex_set_mode,
+ };
+ 
+-static const struct ide_port_info triflex_device __devinitdata = {
++static const struct ide_port_info triflex_device __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.enablebits	= {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
+ 	.port_ops	= &triflex_port_ops,
+diff -urNp linux-3.0.7/drivers/ide/trm290.c linux-3.0.7/drivers/ide/trm290.c
+--- linux-3.0.7/drivers/ide/trm290.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/trm290.c	2011-10-11 10:44:33.000000000 -0400
+@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops
+ 	.dma_check		= trm290_dma_check,
+ };
+ 
+-static const struct ide_port_info trm290_chipset __devinitdata = {
++static const struct ide_port_info trm290_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_hwif	= init_hwif_trm290,
+ 	.tp_ops 	= &trm290_tp_ops,
+diff -urNp linux-3.0.7/drivers/ide/via82cxxx.c linux-3.0.7/drivers/ide/via82cxxx.c
+--- linux-3.0.7/drivers/ide/via82cxxx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/ide/via82cxxx.c	2011-10-11 10:44:33.000000000 -0400
+@@ -403,7 +403,7 @@ static const struct ide_port_ops via_por
+ 	.cable_detect		= via82cxxx_cable_detect,
+ };
+ 
+-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
++static const struct ide_port_info via82cxxx_chipset __devinitconst = {
+ 	.name		= DRV_NAME,
+ 	.init_chipset	= init_chipset_via82cxxx,
+ 	.enablebits	= { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
+diff -urNp linux-3.0.7/drivers/infiniband/core/cm.c linux-3.0.7/drivers/infiniband/core/cm.c
+--- linux-3.0.7/drivers/infiniband/core/cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -26982,9 +27928,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniba
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/infiniband/core/fmr_pool.c
---- linux-3.0.4/drivers/infiniband/core/fmr_pool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/core/fmr_pool.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/core/fmr_pool.c linux-3.0.7/drivers/infiniband/core/fmr_pool.c
+--- linux-3.0.7/drivers/infiniband/core/fmr_pool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27052,9 +27998,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/in
  				wake_up_process(pool->thread);
  			}
  		}
-diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.0.7/drivers/infiniband/hw/cxgb4/mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27073,9 +28019,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/inf
  	}
  	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 -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27085,9 +28031,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/driver
  	dd = file->f_path.dentry->d_inode->i_private;
  	dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_rc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27111,9 +28057,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/driver
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      be64_to_cpu(ateth->compare_data),
  				      sdata);
-diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.0.7/drivers/infiniband/hw/ipath/ipath_ruc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27137,9 +28083,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drive
  			(u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
  				      sdata, wqe->wr.wr.atomic.swap);
  		goto send_comp;
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infiniband/hw/nes/nes.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes.c linux-3.0.7/drivers/infiniband/hw/nes/nes.c
+--- linux-3.0.7/drivers/infiniband/hw/nes/nes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -27158,9 +28104,63 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infin
  
  	/* Free the control structures */
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes.h linux-3.0.7/drivers/infiniband/hw/nes/nes.h
+--- linux-3.0.7/drivers/infiniband/hw/nes/nes.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.0.7/drivers/infiniband/hw/nes/nes_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27357,63 +28357,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/in
  	nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
  			cm_node, cm_id, jiffies);
  
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.h linux-3.0.4/drivers/infiniband/hw/nes/nes.h
---- linux-3.0.4/drivers/infiniband/hw/nes/nes.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.0.7/drivers/infiniband/hw/nes/nes_nic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27464,9 +28410,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/i
  	target_stat_values[++index] = nesadapter->free_4kpbl;
  	target_stat_values[++index] = nesadapter->free_256pbl;
  	target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/infiniband/hw/nes/nes_verbs.c	2011-08-23 21:47:55.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -27498,9 +28444,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers
  	nesqp->destroyed = 1;
  
  	/* Blow away the connection if it exists. */
-diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infiniband/hw/qib/qib.h
---- linux-3.0.4/drivers/infiniband/hw/qib/qib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/infiniband/hw/qib/qib.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/infiniband/hw/qib/qib.h linux-3.0.7/drivers/infiniband/hw/qib/qib.h
+--- linux-3.0.7/drivers/infiniband/hw/qib/qib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -27509,9 +28455,9 @@ diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infin
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/input/gameport/gameport.c
---- linux-3.0.4/drivers/input/gameport/gameport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/gameport/gameport.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/gameport/gameport.c linux-3.0.7/drivers/input/gameport/gameport.c
+--- linux-3.0.7/drivers/input/gameport/gameport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -27529,9 +28475,9 @@ diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/inp
  	gameport->dev.bus = &gameport_bus;
  	gameport->dev.release = gameport_release_port;
  	if (gameport->parent)
-diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
---- linux-3.0.4/drivers/input/input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/input.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/input.c linux-3.0.7/drivers/input/input.c
+--- linux-3.0.7/drivers/input/input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -27550,9 +28496,9 @@ diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
  
  	error = device_add(&dev->dev);
  	if (error)
-diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/input/joystick/sidewinder.c
---- linux-3.0.4/drivers/input/joystick/sidewinder.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/joystick/sidewinder.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/joystick/sidewinder.c linux-3.0.7/drivers/input/joystick/sidewinder.c
+--- linux-3.0.7/drivers/input/joystick/sidewinder.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -27570,9 +28516,9 @@ diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/i
  	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 -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/joystick/xpad.c
---- linux-3.0.4/drivers/input/joystick/xpad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/joystick/xpad.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/joystick/xpad.c linux-3.0.7/drivers/input/joystick/xpad.c
+--- linux-3.0.7/drivers/input/joystick/xpad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -27591,9 +28537,9 @@ diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/j
  
  	snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
  	led->xpad = xpad;
-diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/mousedev.c
---- linux-3.0.4/drivers/input/mousedev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/mousedev.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/mousedev.c linux-3.0.7/drivers/input/mousedev.c
+--- linux-3.0.7/drivers/input/mousedev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -27603,9 +28549,9 @@ diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/moused
  		return -EFAULT;
  
  	return count;
-diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/serio/serio.c
---- linux-3.0.4/drivers/input/serio/serio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/input/serio/serio.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/input/serio/serio.c linux-3.0.7/drivers/input/serio/serio.c
+--- linux-3.0.7/drivers/input/serio/serio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -27624,9 +28570,9 @@ diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/ser
  	serio->dev.bus = &serio_bus;
  	serio->dev.release = serio_release_port;
  	serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/capi.c
---- linux-3.0.4/drivers/isdn/capi/capi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/capi/capi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/capi/capi.c linux-3.0.7/drivers/isdn/capi/capi.c
+--- linux-3.0.7/drivers/isdn/capi/capi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/isdn/capi/capi.c	2011-08-23 21:47:55.000000000 -0400
 @@ -83,8 +83,8 @@ struct capiminor {
  
  	struct capi20_appl	*ap;
@@ -27664,9 +28610,9 @@ diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/ca
  		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 -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gigaset/common.c
---- linux-3.0.4/drivers/isdn/gigaset/common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/common.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/gigaset/common.c linux-3.0.7/drivers/isdn/gigaset/common.c
+--- linux-3.0.7/drivers/isdn/gigaset/common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27676,9 +28622,9 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gi
  	cs->dev = NULL;
  	cs->tty = NULL;
  	cs->tty_dev = NULL;
-diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/gigaset/gigaset.h
---- linux-3.0.4/drivers/isdn/gigaset/gigaset.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/gigaset.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/gigaset/gigaset.h linux-3.0.7/drivers/isdn/gigaset/gigaset.h
+--- linux-3.0.7/drivers/isdn/gigaset/gigaset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -27696,9 +28642,9 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/g
  	struct tty_struct *tty;
  	struct tasklet_struct if_wake_tasklet;
  	unsigned control_state;
-diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn/gigaset/interface.c
---- linux-3.0.4/drivers/isdn/gigaset/interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/gigaset/interface.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/gigaset/interface.c linux-3.0.7/drivers/isdn/gigaset/interface.c
+--- linux-3.0.7/drivers/isdn/gigaset/interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27786,9 +28732,9 @@ diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn
  		dev_warn(cs->dev, "%s: device not opened\n", __func__);
  		goto out;
  	}
-diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/hardware/avm/b1.c
---- linux-3.0.4/drivers/isdn/hardware/avm/b1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/avm/b1.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/avm/b1.c linux-3.0.7/drivers/isdn/hardware/avm/b1.c
+--- linux-3.0.7/drivers/isdn/hardware/avm/b1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -27807,9 +28753,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/h
  				return -EFAULT;
  		} else {
  			memcpy(buf, dp, left);
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/capidtmf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27818,9 +28764,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/driver
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/capifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27830,9 +28776,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/diddfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27842,9 +28788,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/driver
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/divasfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27854,9 +28800,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drive
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.0.7/drivers/isdn/hardware/eicon/divasync.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -27866,9 +28812,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/driver
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/idifunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27878,9 +28824,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers/isdn/hardware/eicon/message.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/message.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/message.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/message.c linux-3.0.7/drivers/isdn/hardware/eicon/message.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27917,9 +28863,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.0.7/drivers/isdn/hardware/eicon/mntfunc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -27929,9 +28875,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers
  	DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
  	for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.0.7/drivers/isdn/hardware/eicon/xdi_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27941,9 +28887,9 @@ diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/dri
  
  typedef struct _diva_os_xdi_adapter {
  	struct list_head link;
-diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i4l/isdn_common.c
---- linux-3.0.4/drivers/isdn/i4l/isdn_common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/i4l/isdn_common.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/i4l/isdn_common.c linux-3.0.7/drivers/isdn/i4l/isdn_common.c
+--- linux-3.0.7/drivers/isdn/i4l/isdn_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27953,9 +28899,9 @@ diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
---- linux-3.0.4/drivers/isdn/icn/icn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/isdn/icn/icn.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/isdn/icn/icn.c linux-3.0.7/drivers/isdn/icn/icn.c
+--- linux-3.0.7/drivers/isdn/icn/icn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -27965,9 +28911,9 @@ diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
  				return -EFAULT;
  		} else
  			memcpy(msg, buf, count);
-diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
---- linux-3.0.4/drivers/lguest/core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/lguest/core.c linux-3.0.7/drivers/lguest/core.c
+--- linux-3.0.7/drivers/lguest/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -27995,9 +28941,9 @@ diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
  	       end_switcher_text - start_switcher_text);
  
  	printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/core.c
---- linux-3.0.4/drivers/lguest/x86/core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/x86/core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/lguest/x86/core.c linux-3.0.7/drivers/lguest/x86/core.c
+--- linux-3.0.7/drivers/lguest/x86/core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -28039,9 +28985,9 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/
  	lguest_entry.segment = LGUEST_CS;
  
  	/*
-diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lguest/x86/switcher_32.S
---- linux-3.0.4/drivers/lguest/x86/switcher_32.S	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/lguest/x86/switcher_32.S	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/lguest/x86/switcher_32.S linux-3.0.7/drivers/lguest/x86/switcher_32.S
+--- linux-3.0.7/drivers/lguest/x86/switcher_32.S	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -28100,66 +29046,21 @@ diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lgue
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
---- linux-3.0.4/drivers/md/dm.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
---- linux-3.0.4/drivers/md/dm-ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-ioctl.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/macintosh/macio_asic.c linux-3.0.7/drivers/macintosh/macio_asic.c
+--- linux-3.0.7/drivers/macintosh/macio_asic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/macintosh/macio_asic.c	2011-10-11 10:44:33.000000000 -0400
+@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(s
+  * MacIO is matched against any Apple ID, it's probe() function
+  * will then decide wether it applies or not
+  */
+-static const struct pci_device_id __devinitdata pci_ids [] = { {
++static const struct pci_device_id __devinitconst pci_ids [] = { {
+ 	.vendor		= PCI_VENDOR_ID_APPLE,
+ 	.device		= PCI_ANY_ID,
+ 	.subvendor	= PCI_ANY_ID,
+diff -urNp linux-3.0.7/drivers/md/dm-ioctl.c linux-3.0.7/drivers/md/dm-ioctl.c
+--- linux-3.0.7/drivers/md/dm-ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28169,9 +29070,9 @@ diff -urNp linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
  		if (!*param->name) {
  			DMWARN("name not supplied when creating device");
  			return -EINVAL;
-diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
---- linux-3.0.4/drivers/md/dm-raid1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-raid1.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/dm-raid1.c linux-3.0.7/drivers/md/dm-raid1.c
+--- linux-3.0.7/drivers/md/dm-raid1.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/md/dm-raid1.c	2011-08-23 21:47:55.000000000 -0400
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -28244,9 +29145,9 @@ diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
  		return 'A';
  
  	return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
---- linux-3.0.4/drivers/md/dm-stripe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-stripe.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/dm-stripe.c linux-3.0.7/drivers/md/dm-stripe.c
+--- linux-3.0.7/drivers/md/dm-stripe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28285,9 +29186,9 @@ diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
  			    DM_IO_ERROR_THRESHOLD)
  				schedule_work(&sc->trigger_event);
  		}
-diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/drivers/md/dm-table.c
---- linux-3.0.4/drivers/md/dm-table.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/dm-table.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/dm-table.c linux-3.0.7/drivers/md/dm-table.c
+--- linux-3.0.7/drivers/md/dm-table.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/dm-table.c	2011-10-17 23:17:19.000000000 -0400
 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
  	if (!dev_size)
  		return 0;
@@ -28297,10 +29198,67 @@ diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/drivers/md/dm-table.c
  		DMWARN("%s: %s too small for target: "
  		       "start=%llu, len=%llu, dev_size=%llu",
  		       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
---- linux-3.0.4/drivers/md/md.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/md.c	2011-08-23 21:47:55.000000000 -0400
-@@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
+diff -urNp linux-3.0.7/drivers/md/dm.c linux-3.0.7/drivers/md/dm.c
+--- linux-3.0.7/drivers/md/dm.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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.7/drivers/md/md.c linux-3.0.7/drivers/md/md.c
+--- linux-3.0.7/drivers/md/md.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/md.c	2011-10-17 23:17:19.000000000 -0400
+@@ -231,10 +231,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
  static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
@@ -28313,7 +29271,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  	wake_up(&md_event_waiters);
  }
  EXPORT_SYMBOL_GPL(md_new_event);
-@@ -239,7 +239,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
+@@ -244,7 +244,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
   */
  static void md_new_event_inintr(mddev_t *mddev)
  {
@@ -28322,7 +29280,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  	wake_up(&md_event_waiters);
  }
  
-@@ -1457,7 +1457,7 @@ static int super_1_load(mdk_rdev_t *rdev
+@@ -1475,7 +1475,7 @@ static int super_1_load(mdk_rdev_t *rdev
  
  	rdev->preferred_minor = 0xffff;
  	rdev->data_offset = le64_to_cpu(sb->data_offset);
@@ -28331,7 +29289,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
  	rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
  	bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-@@ -1635,7 +1635,7 @@ static void super_1_sync(mddev_t *mddev,
+@@ -1653,7 +1653,7 @@ static void super_1_sync(mddev_t *mddev,
  	else
  		sb->resync_offset = cpu_to_le64(0);
  
@@ -28340,7 +29298,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
  	sb->raid_disks = cpu_to_le32(mddev->raid_disks);
  	sb->size = cpu_to_le64(mddev->dev_sectors);
-@@ -2428,7 +2428,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
+@@ -2446,7 +2446,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_sho
  static ssize_t
  errors_show(mdk_rdev_t *rdev, char *page)
  {
@@ -28349,7 +29307,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  }
  
  static ssize_t
-@@ -2437,7 +2437,7 @@ errors_store(mdk_rdev_t *rdev, const cha
+@@ -2455,7 +2455,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')) {
@@ -28358,7 +29316,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  		return len;
  	}
  	return -EINVAL;
-@@ -2793,8 +2793,8 @@ void md_rdev_init(mdk_rdev_t *rdev)
+@@ -2811,8 +2811,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);
@@ -28369,7 +29327,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  
  	INIT_LIST_HEAD(&rdev->same_set);
  	init_waitqueue_head(&rdev->blocked_wait);
-@@ -6415,7 +6415,7 @@ static int md_seq_show(struct seq_file *
+@@ -6440,7 +6440,7 @@ static int md_seq_show(struct seq_file *
  
  		spin_unlock(&pers_lock);
  		seq_printf(seq, "\n");
@@ -28378,7 +29336,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  		return 0;
  	}
  	if (v == (void*)2) {
-@@ -6504,7 +6504,7 @@ static int md_seq_show(struct seq_file *
+@@ -6529,7 +6529,7 @@ static int md_seq_show(struct seq_file *
  				chunk_kb ? "KB" : "B");
  			if (bitmap->file) {
  				seq_printf(seq, ", file: ");
@@ -28387,7 +29345,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  			}
  
  			seq_printf(seq, "\n");
-@@ -6538,7 +6538,7 @@ static int md_seq_open(struct inode *ino
+@@ -6563,7 +6563,7 @@ static int md_seq_open(struct inode *ino
  	else {
  		struct seq_file *p = file->private_data;
  		p->private = mi;
@@ -28396,7 +29354,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  	}
  	return error;
  }
-@@ -6554,7 +6554,7 @@ static unsigned int mdstat_poll(struct f
+@@ -6579,7 +6579,7 @@ static unsigned int mdstat_poll(struct f
  	/* always allow read */
  	mask = POLLIN | POLLRDNORM;
  
@@ -28405,7 +29363,7 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  		mask |= POLLERR | POLLPRI;
  	return mask;
  }
-@@ -6598,7 +6598,7 @@ static int is_mddev_idle(mddev_t *mddev,
+@@ -6623,7 +6623,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]) -
@@ -28414,9 +29372,9 @@ diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
  		/* sync IO will cause sync_io to increase before the disk_stats
  		 * as sync_io is counted when a request starts, and
  		 * disk_stats is counted when it completes.
-diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
---- linux-3.0.4/drivers/md/md.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/md.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/md.h linux-3.0.7/drivers/md/md.h
+--- linux-3.0.7/drivers/md/md.h	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/md.h	2011-10-17 23:17:19.000000000 -0400
 @@ -97,13 +97,13 @@ struct mdk_rdev_s
  					 * only maintained for arrays that
  					 * support hot removal
@@ -28442,9 +29400,30 @@ diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
---- linux-3.0.4/drivers/md/raid10.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/raid10.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/raid1.c linux-3.0.7/drivers/md/raid1.c
+--- linux-3.0.7/drivers/md/raid1.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/raid1.c	2011-10-17 23:17:19.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.7/drivers/md/raid10.c linux-3.0.7/drivers/md/raid10.c
+--- linux-3.0.7/drivers/md/raid10.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/raid10.c	2011-10-17 23:17:19.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);
@@ -28504,30 +29483,9 @@ diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
  				if (sync_page_io(rdev,
  						 r10_bio->devs[sl].addr +
  						 sect,
-diff -urNp linux-3.0.4/drivers/md/raid1.c linux-3.0.4/drivers/md/raid1.c
---- linux-3.0.4/drivers/md/raid1.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
---- linux-3.0.4/drivers/md/raid5.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/md/raid5.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/md/raid5.c linux-3.0.7/drivers/md/raid5.c
+--- linux-3.0.7/drivers/md/raid5.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/md/raid5.c	2011-10-17 23:17:19.000000000 -0400
 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
  			bi->bi_next = NULL;
  			if ((rw & WRITE) &&
@@ -28573,9 +29531,9 @@ diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
  
  	chunk_offset = sector_div(new_sector, sectors_per_chunk);
  	stripe = new_sector;
-diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/media/common/saa7146_hlp.c
---- linux-3.0.4/drivers/media/common/saa7146_hlp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/common/saa7146_hlp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/common/saa7146_hlp.c linux-3.0.7/drivers/media/common/saa7146_hlp.c
+--- linux-3.0.7/drivers/media/common/saa7146_hlp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -28585,9 +29543,9 @@ diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/me
  	/* clear out memory */
  	memset(&line_list[0],  0x00, sizeof(u32)*32);
  	memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.0.7/drivers/media/dvb/dvb-core/dvb_ca_en50221.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28606,9 +29564,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/d
  	dprintk("%s\n", __func__);
  
  	/* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h	2011-08-24 18:24:40.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.0.7/drivers/media/dvb/dvb-core/dvb_demux.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28624,9 +29582,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/driver
  
  	struct dvb_demux *demux;
  	void *priv;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c	2011-08-24 18:24:19.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.0.7/drivers/media/dvb/dvb-core/dvbdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -28636,9 +29594,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/m
  	struct device *clsdev;
  	int minor;
  	int id;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c	2011-08-24 18:26:33.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.0.7/drivers/media/dvb/dvb-usb/cxusb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *,
@@ -28648,9 +29606,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/med
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
  				      struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.0.7/drivers/media/dvb/dvb-usb/dib0700_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28660,9 +29618,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/driv
  	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 -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h	2011-08-24 18:27:27.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h
+--- linux-3.0.7/drivers/media/dvb/dvb-usb/dibusb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
  
@@ -28672,9 +29630,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.4/drivers/me
  	int mt2060_present;
  	u8 tuner_addr;
  };
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c	2011-08-24 18:27:45.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.0.7/drivers/media/dvb/dvb-usb/dw2102.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -28684,9 +29642,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/me
  
  /* debug */
  static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.0.7/drivers/media/dvb/dvb-usb/lmedm04.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -28704,9 +29662,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/m
  	data[0] = 0x0a;
  	len_in = 1;
  	info("FRM Firmware Cold Reset");
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000.h linux-3.0.4/drivers/media/dvb/frontends/dib3000.h
---- linux-3.0.4/drivers/media/dvb/frontends/dib3000.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/dib3000.h	2011-10-07 19:07:39.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000.h linux-3.0.7/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.0.7/drivers/media/dvb/frontends/dib3000.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/media/dvb/frontends/dib3000.h	2011-10-07 19:07:39.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);
@@ -28720,9 +29678,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000.h linux-3.0.4/drivers
  #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.4/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c
---- linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c	2011-08-24 18:28:42.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c
+--- linux-3.0.7/drivers/media/dvb/frontends/dib3000mb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -28732,9 +29690,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.4/drive
  {
  	struct dib3000_state* state = NULL;
  
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.0.7/drivers/media/dvb/frontends/mb86a16.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28744,9 +29702,9 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers
  	dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
  	fcp = 3000;
-diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers/media/dvb/frontends/or51211.c
---- linux-3.0.4/drivers/media/dvb/frontends/or51211.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/dvb/frontends/or51211.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/frontends/or51211.c linux-3.0.7/drivers/media/dvb/frontends/or51211.c
+--- linux-3.0.7/drivers/media/dvb/frontends/or51211.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28756,9 +29714,21 @@ diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers
  	dprintk("Firmware is %zd bytes\n",fw->size);
  
  	/* Get eprom data */
-diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/drivers/media/video/cx18/cx18-driver.c
---- linux-3.0.4/drivers/media/video/cx18/cx18-driver.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/cx18/cx18-driver.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c
+--- linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/media/dvb/ngene/ngene-cards.c	2011-10-11 10:44:33.000000000 -0400
+@@ -379,7 +379,7 @@ static struct ngene_info ngene_info_m780
+ 
+ /****************************************************************************/
+ 
+-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
++static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
+ 	NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
+ 	NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
+ 	NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
+diff -urNp linux-3.0.7/drivers/media/video/cx18/cx18-driver.c linux-3.0.7/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.0.7/drivers/media/video/cx18/cx18-driver.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -28768,9 +29738,9 @@ diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/driver
  	memset(&c, 0, sizeof(c));
  	strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
  	c.adapter = &cx->i2c_adap[0];
-diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.0.7/drivers/media/video/cx23885/cx23885-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -28780,9 +29750,21 @@ diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/d
  	do {
  		num = 0;
  		v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c
+--- linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/media/video/cx88/cx88-alsa.c	2011-10-11 10:44:33.000000000 -0400
+@@ -764,7 +764,7 @@ static struct snd_kcontrol_new snd_cx88_
+  * Only boards with eeprom and byte 1 at eeprom=1 have it
+  */
+ 
+-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
++static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
+ 	{0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+ 	{0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
+ 	{0, }
+diff -urNp linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.0.7/drivers/media/video/pvrusb2/pvrusb2-eeprom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28792,9 +29774,9 @@ diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/
  	memset(&tvdata,0,sizeof(tvdata));
  
  	eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.0.7/drivers/media/video/saa7134/saa6752hs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -28804,9 +29786,9 @@ diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drive
  	/* Set video format - must be done first as it resets other settings */
  	set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.0.7/drivers/media/video/saa7164/saa7164-cmd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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__);
@@ -28825,9 +29807,9 @@ diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/dri
  	while (loop) {
  
  		struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media/video/timblogiw.c
---- linux-3.0.4/drivers/media/video/timblogiw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/timblogiw.c	2011-08-24 18:29:20.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/timblogiw.c linux-3.0.7/drivers/media/video/timblogiw.c
+--- linux-3.0.7/drivers/media/video/timblogiw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -28837,9 +29819,9 @@ diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media
  	.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.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.0.7/drivers/media/video/usbvision/usbvision-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28849,9 +29831,9 @@ diff -urNp linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.
  	frame = usbvision->cur_frame;
  	image_size = frame->frmwidth * frame->frmheight;
  	if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers/media/video/videobuf-dma-sg.c
---- linux-3.0.4/drivers/media/video/videobuf-dma-sg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/media/video/videobuf-dma-sg.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/media/video/videobuf-dma-sg.c linux-3.0.7/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.0.7/drivers/media/video/videobuf-dma-sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28861,9 +29843,9 @@ diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers
  	/* Required to make generic handler to call __videobuf_alloc */
  	q.int_ops = &sg_ops;
  
-diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/message/fusion/mptbase.c
---- linux-3.0.4/drivers/message/fusion/mptbase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptbase.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/fusion/mptbase.c linux-3.0.7/drivers/message/fusion/mptbase.c
+--- linux-3.0.7/drivers/message/fusion/mptbase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -28878,9 +29860,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/mess
  	/*
  	 *  Rounding UP to nearest 4-kB boundary here...
  	 */
-diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/message/fusion/mptsas.c
---- linux-3.0.4/drivers/message/fusion/mptsas.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptsas.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/fusion/mptsas.c linux-3.0.7/drivers/message/fusion/mptsas.c
+--- linux-3.0.7/drivers/message/fusion/mptsas.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -28929,9 +29911,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/messa
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/message/fusion/mptscsih.c
---- linux-3.0.4/drivers/message/fusion/mptscsih.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/fusion/mptscsih.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/fusion/mptscsih.c linux-3.0.7/drivers/message/fusion/mptscsih.c
+--- linux-3.0.7/drivers/message/fusion/mptscsih.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -28957,9 +29939,9 @@ diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/mes
  
  	return h->info_kbuf;
  }
-diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/message/i2o/i2o_config.c
---- linux-3.0.4/drivers/message/i2o/i2o_config.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/i2o_config.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/i2o/i2o_config.c linux-3.0.7/drivers/message/i2o/i2o_config.c
+--- linux-3.0.7/drivers/message/i2o/i2o_config.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -28969,9 +29951,9 @@ diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/mess
  	if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
  		return -EFAULT;
  
-diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/message/i2o/i2o_proc.c
---- linux-3.0.4/drivers/message/i2o/i2o_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/i2o_proc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/i2o/i2o_proc.c linux-3.0.7/drivers/message/i2o/i2o_proc.c
+--- linux-3.0.7/drivers/message/i2o/i2o_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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"
  };
@@ -29058,9 +30040,9 @@ diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/messag
  
  	return 0;
  }
-diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o/iop.c
---- linux-3.0.4/drivers/message/i2o/iop.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/message/i2o/iop.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/message/i2o/iop.c linux-3.0.7/drivers/message/i2o/iop.c
+--- linux-3.0.7/drivers/message/i2o/iop.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -29084,9 +30066,21 @@ diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o
  	INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-core.c
---- linux-3.0.4/drivers/mfd/abx500-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/abx500-core.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mfd/ab3100-core.c linux-3.0.7/drivers/mfd/ab3100-core.c
+--- linux-3.0.7/drivers/mfd/ab3100-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/mfd/ab3100-core.c	2011-10-11 10:44:33.000000000 -0400
+@@ -809,7 +809,7 @@ struct ab_family_id {
+ 	char	*name;
+ };
+ 
+-static const struct ab_family_id ids[] __devinitdata = {
++static const struct ab_family_id ids[] __devinitconst = {
+ 	/* AB3100 */
+ 	{
+ 		.id = 0xc0,
+diff -urNp linux-3.0.7/drivers/mfd/abx500-core.c linux-3.0.7/drivers/mfd/abx500-core.c
+--- linux-3.0.7/drivers/mfd/abx500-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -29096,9 +30090,9 @@ diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-
  	struct device *dev;
  };
  
-diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cmodio.c
---- linux-3.0.4/drivers/mfd/janz-cmodio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/janz-cmodio.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mfd/janz-cmodio.c linux-3.0.7/drivers/mfd/janz-cmodio.c
+--- linux-3.0.7/drivers/mfd/janz-cmodio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/mfd/janz-cmodio.c	2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -29107,9 +30101,9 @@ diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cm
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i2c.c
---- linux-3.0.4/drivers/mfd/wm8350-i2c.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mfd/wm8350-i2c.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mfd/wm8350-i2c.c linux-3.0.7/drivers/mfd/wm8350-i2c.c
+--- linux-3.0.7/drivers/mfd/wm8350-i2c.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29119,10 +30113,10 @@ diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i
  	if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
  		return -EINVAL;
  
-diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c	2011-08-23 21:47:55.000000000 -0400
-@@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in
+diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.c	2011-10-17 23:17:19.000000000 -0400
+@@ -437,7 +437,7 @@ static irqreturn_t lis302dl_interrupt(in
  	 * the lid is closed. This leads to interrupts as soon as a little move
  	 * is done.
  	 */
@@ -29131,7 +30125,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
  
  	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
+@@ -520,7 +520,7 @@ static int lis3lv02d_misc_open(struct in
  	if (lis3_dev.pm_dev)
  		pm_runtime_get_sync(lis3_dev.pm_dev);
  
@@ -29140,7 +30134,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
  	return 0;
  }
  
-@@ -545,7 +545,7 @@ static ssize_t lis3lv02d_misc_read(struc
+@@ -547,7 +547,7 @@ static ssize_t lis3lv02d_misc_read(struc
  	add_wait_queue(&lis3_dev.misc_wait, &wait);
  	while (true) {
  		set_current_state(TASK_INTERRUPTIBLE);
@@ -29149,7 +30143,7 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
  		if (data)
  			break;
  
-@@ -583,7 +583,7 @@ out:
+@@ -585,7 +585,7 @@ out:
  static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
  {
  	poll_wait(file, &lis3_dev.misc_wait, wait);
@@ -29158,9 +30152,9 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/mi
  		return POLLIN | POLLRDNORM;
  	return 0;
  }
-diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.0.7/drivers/misc/lis3lv02d/lis3lv02d.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -29170,9 +30164,9 @@ diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/mi
  	union axis_conversion	ac;        /* hw -> logical axis */
  	int			mapped_btns[3];
  
-diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.0.7/drivers/misc/sgi-gru/gruhandles.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -29184,9 +30178,9 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/mis
  	if (mcs_op_statistics[op].max < nsec)
  		mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.0.7/drivers/misc/sgi-gru/gruprocfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -29210,9 +30204,9 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc
  		max = mcs_op_statistics[op].max;
  		seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
  			   count ? total / count : 0, max);
-diff -urNp linux-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc/sgi-gru/grutables.h
---- linux-3.0.4/drivers/misc/sgi-gru/grutables.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-gru/grutables.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/sgi-gru/grutables.h linux-3.0.7/drivers/misc/sgi-gru/grutables.h
+--- linux-3.0.7/drivers/misc/sgi-gru/grutables.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -29392,9 +30386,9 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc
  			} while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/xp.h
---- linux-3.0.4/drivers/misc/sgi-xp/xp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/misc/sgi-xp/xp.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xp.h linux-3.0.7/drivers/misc/sgi-xp/xp.h
+--- linux-3.0.7/drivers/misc/sgi-xp/xp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -29404,9 +30398,53 @@ diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc.h linux-3.0.7/drivers/misc/sgi-xp/xpc.h
+--- linux-3.0.7/drivers/misc/sgi-xp/xpc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/misc/sgi-xp/xpc.h	2011-10-11 10:44:33.000000000 -0400
+@@ -835,6 +835,7 @@ struct xpc_arch_operations {
+ 	void (*received_payload) (struct xpc_channel *, void *);
+ 	void (*notify_senders_of_disconnect) (struct xpc_channel *);
+ };
++typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
+ 
+ /* struct xpc_partition act_state values (for XPC HB) */
+ 
+@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_regis
+ /* found in xpc_main.c */
+ extern struct device *xpc_part;
+ extern struct device *xpc_chan;
+-extern struct xpc_arch_operations xpc_arch_ops;
++extern xpc_arch_operations_no_const xpc_arch_ops;
+ extern int xpc_disengage_timelimit;
+ extern int xpc_disengage_timedout;
+ extern int xpc_activate_IRQ_rcvd;
+diff -urNp linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c
+--- linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/misc/sgi-xp/xpc_main.c	2011-10-11 10:44:33.000000000 -0400
+@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_not
+ 	.notifier_call = xpc_system_die,
+ };
+ 
+-struct xpc_arch_operations xpc_arch_ops;
++xpc_arch_operations_no_const xpc_arch_ops;
+ 
+ /*
+  * Timer function to enforce the timelimit on the partition disengage.
+diff -urNp linux-3.0.7/drivers/mmc/host/sdhci-pci.c linux-3.0.7/drivers/mmc/host/sdhci-pci.c
+--- linux-3.0.7/drivers/mmc/host/sdhci-pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/mmc/host/sdhci-pci.c	2011-10-11 10:44:33.000000000 -0400
+@@ -524,7 +524,7 @@ static const struct sdhci_pci_fixes sdhc
+ 	.probe		= via_probe,
+ };
+ 
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_RICOH,
+ 		.device		= PCI_DEVICE_ID_RICOH_R5C822,
+diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29434,9 +30472,9 @@ diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/m
  	adr += chip->start;
  
   retry:
-diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.0.7/drivers/mtd/chips/cfi_cmdset_0020.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29482,9 +30520,9 @@ diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/m
  	adr += chip->start;
  
  	/* Let's determine this according to the interleave only once */
-diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/devices/doc2000.c
---- linux-3.0.4/drivers/mtd/devices/doc2000.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/devices/doc2000.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/devices/doc2000.c linux-3.0.7/drivers/mtd/devices/doc2000.c
+--- linux-3.0.7/drivers/mtd/devices/doc2000.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -29494,9 +30532,9 @@ diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/dev
  			printk(KERN_WARNING
  			       "ECC needs a full sector write (adr: %lx size %lx)\n",
  			       (long) to, (long) len);
-diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/devices/doc2001.c
---- linux-3.0.4/drivers/mtd/devices/doc2001.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/devices/doc2001.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/devices/doc2001.c linux-3.0.7/drivers/mtd/devices/doc2001.c
+--- linux-3.0.7/drivers/mtd/devices/doc2001.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)];
  
@@ -29506,9 +30544,9 @@ diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/dev
  		return -EINVAL;
  
  	/* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
---- linux-3.0.4/drivers/mtd/ftl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/ftl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/ftl.c linux-3.0.7/drivers/mtd/ftl.c
+--- linux-3.0.7/drivers/mtd/ftl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -29518,9 +30556,9 @@ diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore.c
---- linux-3.0.4/drivers/mtd/inftlcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/inftlcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/inftlcore.c linux-3.0.7/drivers/mtd/inftlcore.c
+--- linux-3.0.7/drivers/mtd/inftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29530,9 +30568,9 @@ diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
  		"pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmount.c
---- linux-3.0.4/drivers/mtd/inftlmount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/inftlmount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/inftlmount.c linux-3.0.7/drivers/mtd/inftlmount.c
+--- linux-3.0.7/drivers/mtd/inftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29542,9 +30580,9 @@ diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmou
  	DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.0.7/drivers/mtd/lpddr/qinfo_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -29554,9 +30592,9 @@ diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/l
  	/* 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 -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
---- linux-3.0.4/drivers/mtd/mtdchar.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/mtdchar.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/mtdchar.c linux-3.0.7/drivers/mtd/mtdchar.c
+--- linux-3.0.7/drivers/mtd/mtdchar.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29566,9 +30604,9 @@ diff -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
  	DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
  	size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/denali.c
---- linux-3.0.4/drivers/mtd/nand/denali.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nand/denali.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/nand/denali.c linux-3.0.7/drivers/mtd/nand/denali.c
+--- linux-3.0.7/drivers/mtd/nand/denali.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -29577,9 +30615,9 @@ diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/de
  
  #include "denali.h"
  
-diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
---- linux-3.0.4/drivers/mtd/nftlcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nftlcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/nftlcore.c linux-3.0.7/drivers/mtd/nftlcore.c
+--- linux-3.0.7/drivers/mtd/nftlcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29589,9 +30627,9 @@ diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
  	memset(BlockMap, 0xff, sizeof(BlockMap));
  	memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount.c
---- linux-3.0.4/drivers/mtd/nftlmount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/nftlmount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/nftlmount.c linux-3.0.7/drivers/mtd/nftlmount.c
+--- linux-3.0.7/drivers/mtd/nftlmount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/mtd/nftlmount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -29609,9 +30647,9 @@ diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount
          /* 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 -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build.c
---- linux-3.0.4/drivers/mtd/ubi/build.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/mtd/ubi/build.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/mtd/ubi/build.c linux-3.0.7/drivers/mtd/ubi/build.c
+--- linux-3.0.7/drivers/mtd/ubi/build.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -29651,9 +30689,21 @@ diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/atlx/atl2.c linux-3.0.7/drivers/net/atlx/atl2.c
+--- linux-3.0.7/drivers/net/atlx/atl2.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/atlx/atl2.c	2011-10-11 10:44:33.000000000 -0400
+@@ -2840,7 +2840,7 @@ static void atl2_force_ps(struct atl2_hw
+  */
+ 
+ #define ATL2_PARAM(X, desc) \
+-    static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
++    static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
+     MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
+     MODULE_PARM_DESC(X, desc);
+ #else
+diff -urNp linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.0.7/drivers/net/bna/bfa_ioc_ct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -29698,9 +30748,9 @@ diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/
  	ioc->ioc_hwif = &nw_hwif_ct;
  }
  
-diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
---- linux-3.0.4/drivers/net/bna/bnad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bna/bnad.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/bna/bnad.c linux-3.0.7/drivers/net/bna/bnad.c
+--- linux-3.0.7/drivers/net/bna/bnad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29762,10 +30812,10 @@ diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
  	/* 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.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
---- linux-3.0.4/drivers/net/bnx2.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bnx2.c	2011-08-23 21:48:14.000000000 -0400
-@@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
+diff -urNp linux-3.0.7/drivers/net/bnx2.c linux-3.0.7/drivers/net/bnx2.c
+--- linux-3.0.7/drivers/net/bnx2.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/net/bnx2.c	2011-10-16 21:55:27.000000000 -0400
+@@ -5831,6 +5831,8 @@ bnx2_test_nvram(struct bnx2 *bp)
  	int rc = 0;
  	u32 magic, csum;
  
@@ -29774,9 +30824,9 @@ diff -urNp linux-3.0.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
  	if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
  		goto test_nvram_done;
  
-diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.0.7/drivers/net/bnx2x/bnx2x_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29786,10 +30836,44 @@ diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net
  	if (BP_NOMCP(bp))
  		return 0;
  
-diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t.h
---- linux-3.0.4/drivers/net/cxgb3/l2t.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb3/l2t.h	2011-08-23 21:47:55.000000000 -0400
-@@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
+diff -urNp linux-3.0.7/drivers/net/can/mscan/mscan.c linux-3.0.7/drivers/net/can/mscan/mscan.c
+--- linux-3.0.7/drivers/net/can/mscan/mscan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/can/mscan/mscan.c	2011-10-17 02:51:46.000000000 -0400
+@@ -261,11 +261,13 @@ static netdev_tx_t mscan_start_xmit(stru
+ 		void __iomem *data = &regs->tx.dsr1_0;
+ 		u16 *payload = (u16 *)frame->data;
+ 
+-		/* It is safe to write into dsr[dlc+1] */
+-		for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
++		for (i = 0; i < frame->can_dlc / 2; i++) {
+ 			out_be16(data, *payload++);
+ 			data += 2 + _MSCAN_RESERVED_DSR_SIZE;
+ 		}
++		/* write remaining byte if necessary */
++		if (frame->can_dlc & 1)
++			out_8(data, frame->data[frame->can_dlc - 1]);
+ 	}
+ 
+ 	out_8(&regs->tx.dlr, frame->can_dlc);
+@@ -330,10 +332,13 @@ static void mscan_get_rx_frame(struct ne
+ 		void __iomem *data = &regs->rx.dsr1_0;
+ 		u16 *payload = (u16 *)frame->data;
+ 
+-		for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
++		for (i = 0; i < frame->can_dlc / 2; i++) {
+ 			*payload++ = in_be16(data);
+ 			data += 2 + _MSCAN_RESERVED_DSR_SIZE;
+ 		}
++		/* read remaining byte if necessary */
++		if (frame->can_dlc & 1)
++			frame->data[frame->can_dlc - 1] = in_8(data);
+ 	}
+ 
+ 	out_8(&regs->canrflg, MSCAN_RXF);
+diff -urNp linux-3.0.7/drivers/net/cxgb3/l2t.h linux-3.0.7/drivers/net/cxgb3/l2t.h
+--- linux-3.0.7/drivers/net/cxgb3/l2t.h	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/net/cxgb3/l2t.h	2011-10-16 21:55:27.000000000 -0400
+@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
  	arp_failure_handler_func arp_failure_handler;
@@ -29798,9 +30882,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.0.7/drivers/net/cxgb4/cxgb4_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -29810,9 +30894,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cx
  	for (i = 0; i < ARRAY_SIZE(entries); ++i)
  		entries[i].entry = i;
  
-diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t4_hw.c
---- linux-3.0.4/drivers/net/cxgb4/t4_hw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/cxgb4/t4_hw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/cxgb4/t4_hw.c linux-3.0.7/drivers/net/cxgb4/t4_hw.c
+--- linux-3.0.7/drivers/net/cxgb4/t4_hw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29822,9 +30906,9 @@ diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t
  	ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e/82571.c
---- linux-3.0.4/drivers/net/e1000e/82571.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/82571.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/e1000e/82571.c linux-3.0.7/drivers/net/e1000e/82571.c
+--- linux-3.0.7/drivers/net/e1000e/82571.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29834,9 +30918,9 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e
  	u32 swsm = 0;
  	u32 swsm2 = 0;
  	bool force_clear_smbi = false;
-diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000e/es2lan.c
---- linux-3.0.4/drivers/net/e1000e/es2lan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/es2lan.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/e1000e/es2lan.c linux-3.0.7/drivers/net/e1000e/es2lan.c
+--- linux-3.0.7/drivers/net/e1000e/es2lan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29846,9 +30930,9 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000
  
  	/* Set media type */
  	switch (adapter->pdev->device) {
-diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw.h
---- linux-3.0.4/drivers/net/e1000e/hw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/e1000e/hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/e1000e/hw.h linux-3.0.7/drivers/net/e1000e/hw.h
+--- linux-3.0.7/drivers/net/e1000e/hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -29895,9 +30979,21 @@ diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw
  
  	enum e1000_nvm_type type;
  	enum e1000_nvm_override override;
-diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamradio/6pack.c
---- linux-3.0.4/drivers/net/hamradio/6pack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/hamradio/6pack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/fealnx.c linux-3.0.7/drivers/net/fealnx.c
+--- linux-3.0.7/drivers/net/fealnx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/fealnx.c	2011-10-11 10:44:33.000000000 -0400
+@@ -150,7 +150,7 @@ struct chip_info {
+ 	int flags;
+ };
+ 
+-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
++static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
+  	{ "100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },
+ 	{ "100/10M Ethernet PCI Adapter",	HAS_CHIP_XCVR },
+ 	{ "1000/100/10M Ethernet PCI Adapter",	HAS_MII_XCVR },
+diff -urNp linux-3.0.7/drivers/net/hamradio/6pack.c linux-3.0.7/drivers/net/hamradio/6pack.c
+--- linux-3.0.7/drivers/net/hamradio/6pack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -29907,9 +31003,9 @@ diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamr
  	if (!count)
  		return;
  
-diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1000_hw.h
---- linux-3.0.4/drivers/net/igb/e1000_hw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/igb/e1000_hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/igb/e1000_hw.h linux-3.0.7/drivers/net/igb/e1000_hw.h
+--- linux-3.0.7/drivers/net/igb/e1000_hw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -29978,9 +31074,9 @@ diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
---- linux-3.0.4/drivers/net/igbvf/vf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/igbvf/vf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/igbvf/vf.h linux-3.0.7/drivers/net/igbvf/vf.h
+--- linux-3.0.7/drivers/net/igbvf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -30010,9 +31106,9 @@ diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
  	struct e1000_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb/ixgb_main.c
---- linux-3.0.4/drivers/net/ixgb/ixgb_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgb/ixgb_main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_main.c linux-3.0.7/drivers/net/ixgb/ixgb_main.c
+--- linux-3.0.7/drivers/net/ixgb/ixgb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -30022,9 +31118,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb
  	/* Check for Promiscuous and All Multicast modes */
  
  	rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixgb/ixgb_param.c
---- linux-3.0.4/drivers/net/ixgb/ixgb_param.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgb/ixgb_param.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ixgb/ixgb_param.c linux-3.0.7/drivers/net/ixgb/ixgb_param.c
+--- linux-3.0.7/drivers/net/ixgb/ixgb_param.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -30035,9 +31131,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixg
  	if (bd >= IXGB_MAX_NIC) {
  		pr_notice("Warning: no configuration for board #%i\n", bd);
  		pr_notice("Using defaults for all values\n");
-diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.0.7/drivers/net/ixgbe/ixgbe_type.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -30101,9 +31197,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ix
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 usec_delay;
-diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/vf.h
---- linux-3.0.4/drivers/net/ixgbevf/vf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ixgbevf/vf.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ixgbevf/vf.h linux-3.0.7/drivers/net/ixgbevf/vf.h
+--- linux-3.0.7/drivers/net/ixgbevf/vf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -30138,9 +31234,9 @@ diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/
  	struct ixgbe_mbx_stats stats;
  	u32 timeout;
  	u32 udelay;
-diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
---- linux-3.0.4/drivers/net/ksz884x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ksz884x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ksz884x.c linux-3.0.7/drivers/net/ksz884x.c
+--- linux-3.0.7/drivers/net/ksz884x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -30150,9 +31246,9 @@ diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
  	mutex_lock(&hw_priv->lock);
  	n = SWITCH_PORT_NUM;
  	for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main.c
---- linux-3.0.4/drivers/net/mlx4/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/mlx4/main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/mlx4/main.c linux-3.0.7/drivers/net/mlx4/main.c
+--- linux-3.0.7/drivers/net/mlx4/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -30170,9 +31266,9 @@ diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main
  	err = mlx4_QUERY_FW(dev);
  	if (err) {
  		if (err == -EACCES)
-diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
---- linux-3.0.4/drivers/net/niu.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/niu.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/niu.c linux-3.0.7/drivers/net/niu.c
+--- linux-3.0.7/drivers/net/niu.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -30182,9 +31278,9 @@ diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
  	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 -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
---- linux-3.0.4/drivers/net/pcnet32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/pcnet32.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/pcnet32.c linux-3.0.7/drivers/net/pcnet32.c
+--- linux-3.0.7/drivers/net/pcnet32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/pcnet32.c	2011-08-23 21:47:55.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -30807,9 +31903,9 @@ diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
  			}
  		} else {
  			netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_generic.c
---- linux-3.0.4/drivers/net/ppp_generic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/ppp_generic.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/ppp_generic.c linux-3.0.7/drivers/net/ppp_generic.c
+--- linux-3.0.7/drivers/net/ppp_generic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -30828,9 +31924,9 @@ diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_gen
  			break;
  		err = 0;
  		break;
-diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
---- linux-3.0.4/drivers/net/r8169.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/r8169.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/r8169.c linux-3.0.7/drivers/net/r8169.c
+--- linux-3.0.7/drivers/net/r8169.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -30846,9 +31942,33 @@ diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
  
  	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.4/drivers/net/tg3.h linux-3.0.4/drivers/net/tg3.h
---- linux-3.0.4/drivers/net/tg3.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tg3.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/sis190.c linux-3.0.7/drivers/net/sis190.c
+--- linux-3.0.7/drivers/net/sis190.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/drivers/net/sis190.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1623,7 +1623,7 @@ static int __devinit sis190_get_mac_addr
+ static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
+ 						  struct net_device *dev)
+ {
+-	static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
++	static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
+ 	struct sis190_private *tp = netdev_priv(dev);
+ 	struct pci_dev *isa_bridge;
+ 	u8 reg, tmp8;
+diff -urNp linux-3.0.7/drivers/net/sundance.c linux-3.0.7/drivers/net/sundance.c
+--- linux-3.0.7/drivers/net/sundance.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/sundance.c	2011-10-11 10:44:33.000000000 -0400
+@@ -218,7 +218,7 @@ enum {
+ struct pci_id_info {
+         const char *name;
+ };
+-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
++static const struct pci_id_info pci_id_tbl[] __devinitconst = {
+ 	{"D-Link DFE-550TX FAST Ethernet Adapter"},
+ 	{"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
+ 	{"D-Link DFE-580TX 4 port Server Adapter"},
+diff -urNp linux-3.0.7/drivers/net/tg3.h linux-3.0.7/drivers/net/tg3.h
+--- linux-3.0.7/drivers/net/tg3.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -30857,9 +31977,9 @@ diff -urNp linux-3.0.4/drivers/net/tg3.h linux-3.0.4/drivers/net/tg3.h
  #define  CHIPREV_ID_5750_C2		 0x4202
  #define  CHIPREV_ID_5752_A0_HW		 0x5000
  #define  CHIPREV_ID_5752_A0		 0x6000
-diff -urNp linux-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tokenring/abyss.c
---- linux-3.0.4/drivers/net/tokenring/abyss.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/abyss.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tokenring/abyss.c linux-3.0.7/drivers/net/tokenring/abyss.c
+--- linux-3.0.7/drivers/net/tokenring/abyss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -30876,9 +31996,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tok
  
  	return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/tokenring/madgemc.c
---- linux-3.0.4/drivers/net/tokenring/madgemc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/madgemc.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tokenring/madgemc.c linux-3.0.7/drivers/net/tokenring/madgemc.c
+--- linux-3.0.7/drivers/net/tokenring/madgemc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -30894,9 +32014,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/t
  
  	return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/tokenring/proteon.c
---- linux-3.0.4/drivers/net/tokenring/proteon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/proteon.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tokenring/proteon.c linux-3.0.7/drivers/net/tokenring/proteon.c
+--- linux-3.0.7/drivers/net/tokenring/proteon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -30912,9 +32032,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/t
  
  	err = platform_driver_register(&proteon_driver);
  	if (err)
-diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tokenring/skisa.c
---- linux-3.0.4/drivers/net/tokenring/skisa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tokenring/skisa.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tokenring/skisa.c linux-3.0.7/drivers/net/tokenring/skisa.c
+--- linux-3.0.7/drivers/net/tokenring/skisa.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -30930,9 +32050,9 @@ diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tok
  
  	err = platform_driver_register(&sk_isa_driver);
  	if (err)
-diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip/de2104x.c
---- linux-3.0.4/drivers/net/tulip/de2104x.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tulip/de2104x.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tulip/de2104x.c linux-3.0.7/drivers/net/tulip/de2104x.c
+--- linux-3.0.7/drivers/net/tulip/de2104x.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -30942,9 +32062,9 @@ diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip
  	/* download entire eeprom */
  	for (i = 0; i < DE_EEPROM_WORDS; i++)
  		((__le16 *)ee_data)[i] =
-diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/de4x5.c
---- linux-3.0.4/drivers/net/tulip/de4x5.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/tulip/de4x5.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tulip/de4x5.c linux-3.0.7/drivers/net/tulip/de4x5.c
+--- linux-3.0.7/drivers/net/tulip/de4x5.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -30963,9 +32083,33 @@ diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/d
  		return -EFAULT;
  	break;
      }
-diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/drivers/net/usb/hso.c
---- linux-3.0.4/drivers/net/usb/hso.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/usb/hso.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/tulip/eeprom.c linux-3.0.7/drivers/net/tulip/eeprom.c
+--- linux-3.0.7/drivers/net/tulip/eeprom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/tulip/eeprom.c	2011-10-11 10:44:33.000000000 -0400
+@@ -81,7 +81,7 @@ static struct eeprom_fixup eeprom_fixups
+   {NULL}};
+ 
+ 
+-static const char *block_name[] __devinitdata = {
++static const char *block_name[] __devinitconst = {
+ 	"21140 non-MII",
+ 	"21140 MII PHY",
+ 	"21142 Serial PHY",
+diff -urNp linux-3.0.7/drivers/net/tulip/winbond-840.c linux-3.0.7/drivers/net/tulip/winbond-840.c
+--- linux-3.0.7/drivers/net/tulip/winbond-840.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/net/tulip/winbond-840.c	2011-10-11 10:44:33.000000000 -0400
+@@ -236,7 +236,7 @@ struct pci_id_info {
+         int drv_flags;		/* Driver use, intended as capability flags. */
+ };
+ 
+-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
++static const struct pci_id_info pci_id_tbl[] __devinitconst = {
+ 	{ 				/* Sometime a Level-One switch card. */
+ 	  "Winbond W89c840",	CanHaveMII | HasBrokenTx | FDXOnNoMII},
+ 	{ "Winbond W89c840",	CanHaveMII | HasBrokenTx},
+diff -urNp linux-3.0.7/drivers/net/usb/hso.c linux-3.0.7/drivers/net/usb/hso.c
+--- linux-3.0.7/drivers/net/usb/hso.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -31062,9 +32206,9 @@ diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/drivers/net/usb/hso.c
  				result =
  				    hso_start_serial_device(serial_table[i], GFP_NOIO);
  				hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.0.7/drivers/net/vmxnet3/vmxnet3_ethtool.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -31075,9 +32219,9 @@ diff -urNp linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers
  			return -EINVAL;
  	}
  
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vxge/vxge-config.h
---- linux-3.0.4/drivers/net/vxge/vxge-config.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-config.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/vxge/vxge-config.h linux-3.0.7/drivers/net/vxge/vxge-config.h
+--- linux-3.0.7/drivers/net/vxge/vxge-config.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -31087,9 +32231,9 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vx
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge/vxge-main.c
---- linux-3.0.4/drivers/net/vxge/vxge-main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-main.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/vxge/vxge-main.c linux-3.0.7/drivers/net/vxge/vxge-main.c
+--- linux-3.0.7/drivers/net/vxge/vxge-main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31108,9 +32252,9 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge
  	/*
  	 * Filling
  	 * 	- itable with bucket numbers
-diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/vxge/vxge-traffic.h
---- linux-3.0.4/drivers/net/vxge/vxge-traffic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/vxge/vxge-traffic.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/vxge/vxge-traffic.h linux-3.0.7/drivers/net/vxge/vxge-traffic.h
+--- linux-3.0.7/drivers/net/vxge/vxge-traffic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -31120,9 +32264,9 @@ diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/v
  
  #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)				\
  		((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.0.4/drivers/net/wan/cycx_x25.c linux-3.0.4/drivers/net/wan/cycx_x25.c
---- linux-3.0.4/drivers/net/wan/cycx_x25.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wan/cycx_x25.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wan/cycx_x25.c linux-3.0.7/drivers/net/wan/cycx_x25.c
+--- linux-3.0.7/drivers/net/wan/cycx_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31132,9 +32276,9 @@ diff -urNp linux-3.0.4/drivers/net/wan/cycx_x25.c linux-3.0.4/drivers/net/wan/cy
  	if (len >= (sizeof(hex) / 2))
  		len = (sizeof(hex) / 2) - 1;
  
-diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hdlc_x25.c
---- linux-3.0.4/drivers/net/wan/hdlc_x25.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wan/hdlc_x25.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wan/hdlc_x25.c linux-3.0.7/drivers/net/wan/hdlc_x25.c
+--- linux-3.0.7/drivers/net/wan/hdlc_x25.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -31160,9 +32304,9 @@ diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hd
  	result = lapb_register(dev, &cb);
  	if (result != LAPB_OK)
  		return result;
-diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.0.7/drivers/net/wimax/i2400m/usb-fw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31172,9 +32316,9 @@ diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net
  	d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
  		  i2400m, ack, ack_size);
  	BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wireless/airo.c
---- linux-3.0.4/drivers/net/wireless/airo.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/airo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/airo.c linux-3.0.7/drivers/net/wireless/airo.c
+--- linux-3.0.7/drivers/net/wireless/airo.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -31229,9 +32373,20 @@ diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wirel
  	/* Get stats out of the card */
  	clear_bit(JOB_WSTATS, &local->jobs);
  	if (local->power.event) {
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath.h linux-3.0.7/drivers/net/wireless/ath/ath.h
+--- linux-3.0.7/drivers/net/wireless/ath/ath.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
+ };
++typedef struct ath_ops __no_const ath_ops_no_const;
+ 
+ struct ath_common;
+ struct ath_bus_ops;
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.0.7/drivers/net/wireless/ath/ath5k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31295,9 +32450,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.4/driver
  	len += snprintf(buf+len, sizeof(buf)-len,
  			"available txbuffers: %d\n", sc->txbuf_len);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_calib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31307,9 +32462,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4
  	for (i = 0; i < AR9300_MAX_CHAINS; i++) {
  		if (ah->txchainmask & (1 << i))
  			num_chains++;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.0.7/drivers/net/wireless/ath/ath9k/ar9003_paprd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31319,9 +32474,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4
  	/* disregard any bin that contains <= 16 samples */
  	thresh_accum_cnt = 16;
  	scale_factor = 5;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.0.7/drivers/net/wireless/ath/ath9k/debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31340,9 +32495,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/driver
  	len += snprintf(buf + len, sizeof(buf) - len,
  			"%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
  			wiphy_name(sc->hw->wiphy),
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.0.7/drivers/net/wireless/ath/ath9k/htc_drv_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31397,9 +32552,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.
  	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.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.0.7/drivers/net/wireless/ath/ath9k/hw.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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 */
@@ -31427,20 +32582,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/n
  
  	struct ieee80211_hw *hw;
  	struct ath_common common;
-diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath.h linux-3.0.4/drivers/net/wireless/ath/ath.h
---- linux-3.0.4/drivers/net/wireless/ath/ath.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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);
- };
-+typedef struct ath_ops __no_const ath_ops_no_const;
- 
- struct ath_common;
- struct ath_bus_ops;
-diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.0.7/drivers/net/wireless/ipw2x00/ipw2100.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31459,9 +32603,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/driver
  	IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
  		     idx, keylen, len);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.0.7/drivers/net/wireless/ipw2x00/libipw_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31471,9 +32615,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/driv
  	LIBIPW_DEBUG_SCAN("'%s' (%pM"
  		     "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
  		     print_ssid(ssid, info_element->data, info_element->len),
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/net/wireless/iwlegacy/iwl3945-base.c	2011-10-16 21:55:27.000000000 -0400
 @@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
  	 */
  	if (iwl3945_mod_params.disable_hw_scan) {
@@ -31485,9 +32629,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/
  	}
  
  	IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-agn-rs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31506,9 +32650,23 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/dri
  	/* Override starting rate (index 0) if needed for debug purposes */
  	rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.0.7/drivers/net/wireless/iwlwifi/iwl-debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31527,23 +32685,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/dr
  	for_each_context(priv, ctx) {
  		pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
  				 ctx->ctxid);
-diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.0.7/drivers/net/wireless/iwmc3200wifi/debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31553,9 +32697,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/d
  	if (*ppos != 0)
  		return 0;
  	if (count < sizeof(buf))
-diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.0.7/drivers/net/wireless/mac80211_hwsim.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -31571,9 +32715,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers
  	}
  
  	spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net/wireless/rndis_wlan.c
---- linux-3.0.4/drivers/net/wireless/rndis_wlan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/rndis_wlan.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/rndis_wlan.c linux-3.0.7/drivers/net/wireless/rndis_wlan.c
+--- linux-3.0.7/drivers/net/wireless/rndis_wlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31583,9 +32727,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net
  		rts_threshold = 2347;
  
  	tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.0.7/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31595,9 +32739,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
  	precommoncmdcnt = 0;
  	_rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
  					 MAX_PRECMD_CNT,
-diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.0.7/drivers/net/wireless/wl1251/wl1251.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31607,9 +32751,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/
  
  struct wl1251 {
  	struct ieee80211_hw *hw;
-diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net/wireless/wl12xx/spi.c
---- linux-3.0.4/drivers/net/wireless/wl12xx/spi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/net/wireless/wl12xx/spi.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/net/wireless/wl12xx/spi.c linux-3.0.7/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.0.7/drivers/net/wireless/wl12xx/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31619,9 +32763,9 @@ diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net
  	WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
  	spi_message_init(&m);
-diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofile/buffer_sync.c
---- linux-3.0.4/drivers/oprofile/buffer_sync.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/buffer_sync.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/buffer_sync.c linux-3.0.7/drivers/oprofile/buffer_sync.c
+--- linux-3.0.7/drivers/oprofile/buffer_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31657,9 +32801,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofi
  		}
  	}
  	release_mm(mm);
-diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprofile/event_buffer.c
---- linux-3.0.4/drivers/oprofile/event_buffer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/event_buffer.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/event_buffer.c linux-3.0.7/drivers/oprofile/event_buffer.c
+--- linux-3.0.7/drivers/oprofile/event_buffer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/oprofile/event_buffer.c	2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
  	}
  
@@ -31669,9 +32813,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprof
  		return;
  	}
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/oprof.c
---- linux-3.0.4/drivers/oprofile/oprof.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprof.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/oprof.c linux-3.0.7/drivers/oprofile/oprof.c
+--- linux-3.0.7/drivers/oprofile/oprof.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31681,21 +32825,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/opr
  	start_switch_worker();
  }
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprofilefs.c linux-3.0.4/drivers/oprofile/oprofilefs.c
---- linux-3.0.4/drivers/oprofile/oprofilefs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/oprofile/oprofile_stats.c
---- linux-3.0.4/drivers/oprofile/oprofile_stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprofile_stats.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.c linux-3.0.7/drivers/oprofile/oprofile_stats.c
+--- linux-3.0.7/drivers/oprofile/oprofile_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -31713,9 +32845,9 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/opr
  }
  
  
-diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/oprofile/oprofile_stats.h
---- linux-3.0.4/drivers/oprofile/oprofile_stats.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/oprofile/oprofile_stats.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/oprofile_stats.h linux-3.0.7/drivers/oprofile/oprofile_stats.h
+--- linux-3.0.7/drivers/oprofile/oprofile_stats.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/oprofile/oprofile_stats.h	2011-08-23 21:47:55.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -31733,9 +32865,21 @@ diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/opr
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/procfs.c
---- linux-3.0.4/drivers/parport/procfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/parport/procfs.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/oprofile/oprofilefs.c linux-3.0.7/drivers/oprofile/oprofilefs.c
+--- linux-3.0.7/drivers/oprofile/oprofilefs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/drivers/parport/procfs.c linux-3.0.7/drivers/parport/procfs.c
+--- linux-3.0.7/drivers/parport/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31754,9 +32898,9 @@ diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/proc
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.0.7/drivers/pci/hotplug/cpci_hotplug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31766,9 +32910,9 @@ diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pc
  
  struct cpci_hp_controller {
  	unsigned int irq;
-diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.0.7/drivers/pci/hotplug/cpqphp_nvram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -31783,9 +32927,9 @@ diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pc
  	dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
  	/* initialize our int15 lock */
-diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm.c
---- linux-3.0.4/drivers/pci/pcie/aspm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/pcie/aspm.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/pcie/aspm.c linux-3.0.7/drivers/pci/pcie/aspm.c
+--- linux-3.0.7/drivers/pci/pcie/aspm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/pci/pcie/aspm.c	2011-08-23 21:47:55.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -31799,9 +32943,9 @@ diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm
  #define ASPM_STATE_L0S		(ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL		(ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
---- linux-3.0.4/drivers/pci/probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/probe.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/probe.c linux-3.0.7/drivers/pci/probe.c
+--- linux-3.0.7/drivers/pci/probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -31811,9 +32955,9 @@ diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
  
  	if (!dev->mmio_always_on) {
  		pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
---- linux-3.0.4/drivers/pci/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/proc.c linux-3.0.7/drivers/pci/proc.c
+--- linux-3.0.7/drivers/pci/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -31831,9 +32975,9 @@ diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
  	proc_create("devices", 0, proc_bus_pci_dir,
  		    &proc_bus_pci_dev_operations);
  	proc_initialized = 1;
-diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pcifront.c
---- linux-3.0.4/drivers/pci/xen-pcifront.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pci/xen-pcifront.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pci/xen-pcifront.c linux-3.0.7/drivers/pci/xen-pcifront.c
+--- linux-3.0.7/drivers/pci/xen-pcifront.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -31879,9 +33023,9 @@ diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pc
  	err = do_pci_op(pdev, &op);
  	if (likely(!err)) {
  		vector[0] = op.value;
-diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.0.7/drivers/platform/x86/thinkpad_acpi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -31891,9 +33035,9 @@ diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/
  {
  	/* log only what the user can fix... */
  	const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.0.7/drivers/pnp/pnpbios/bioscalls.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -31950,9 +33094,9 @@ diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/p
 +
 +	pax_close_kernel();
  }
-diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
---- linux-3.0.4/drivers/pnp/resource.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/pnp/resource.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/pnp/resource.c linux-3.0.7/drivers/pnp/resource.c
+--- linux-3.0.7/drivers/pnp/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -31971,9 +33115,9 @@ diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
  		return 0;
  
  	/* check if the resource is reserved */
-diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power/bq27x00_battery.c
---- linux-3.0.4/drivers/power/bq27x00_battery.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/power/bq27x00_battery.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/power/bq27x00_battery.c linux-3.0.7/drivers/power/bq27x00_battery.c
+--- linux-3.0.7/drivers/power/bq27x00_battery.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -31983,9 +33127,9 @@ diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power
  
  enum bq27x00_chip { BQ27000, BQ27500 };
  
-diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator/max8660.c
---- linux-3.0.4/drivers/regulator/max8660.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/regulator/max8660.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/regulator/max8660.c linux-3.0.7/drivers/regulator/max8660.c
+--- linux-3.0.7/drivers/regulator/max8660.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -31999,9 +33143,9 @@ diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator
  	}
  
  	/*
-diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers/regulator/mc13892-regulator.c
---- linux-3.0.4/drivers/regulator/mc13892-regulator.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/regulator/mc13892-regulator.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/regulator/mc13892-regulator.c linux-3.0.7/drivers/regulator/mc13892-regulator.c
+--- linux-3.0.7/drivers/regulator/mc13892-regulator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -32017,9 +33161,9 @@ diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers
  	for (i = 0; i < pdata->num_regulators; i++) {
  		init_data = &pdata->regulators[i];
  		priv->regulators[i] = regulator_register(
-diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
---- linux-3.0.4/drivers/rtc/rtc-dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/rtc/rtc-dev.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/rtc/rtc-dev.c linux-3.0.7/drivers/rtc/rtc-dev.c
+--- linux-3.0.7/drivers/rtc/rtc-dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -32037,9 +33181,21 @@ diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
  		return rtc_set_time(rtc, &tm);
  
  	case RTC_PIE_ON:
-diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/aacraid/aacraid.h
---- linux-3.0.4/drivers/scsi/aacraid/aacraid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/aacraid/aacraid.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/BusLogic.c linux-3.0.7/drivers/scsi/BusLogic.c
+--- linux-3.0.7/drivers/scsi/BusLogic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
++
+ 	/*
+ 	   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.7/drivers/scsi/aacraid/aacraid.h linux-3.0.7/drivers/scsi/aacraid/aacraid.h
+--- linux-3.0.7/drivers/scsi/aacraid/aacraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -32049,9 +33205,9 @@ diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/a
  
  /*
   *	Define which interrupt handler needs to be installed
-diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/aacraid/commctrl.c
---- linux-3.0.4/drivers/scsi/aacraid/commctrl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/aacraid/commctrl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/aacraid/commctrl.c linux-3.0.7/drivers/scsi/aacraid/commctrl.c
+--- linux-3.0.7/drivers/scsi/aacraid/commctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32060,21 +33216,45 @@ diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/
  
  	if (dev->in_reset) {
  		dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfad.c linux-3.0.4/drivers/scsi/bfa/bfad.c
---- linux-3.0.4/drivers/scsi/bfa/bfad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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;
+diff -urNp linux-3.0.7/drivers/scsi/aacraid/linit.c linux-3.0.7/drivers/scsi/aacraid/linit.c
+--- linux-3.0.7/drivers/scsi/aacraid/linit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/aacraid/linit.c	2011-10-11 10:44:33.000000000 -0400
+@@ -92,7 +92,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_
+ #elif defined(__devinitconst)
+ static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
+ #else
+-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
++static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
+ #endif
+ 	{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
+ 	{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
+diff -urNp linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c
+--- linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/aic94xx/aic94xx_init.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1012,7 +1012,7 @@ static struct sas_domain_function_templa
+ 	.lldd_control_phy	= asd_control_phy,
+ };
  
-+	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.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c	2011-08-23 21:48:14.000000000 -0400
+-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
++static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
+ 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
+ 	{PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
+diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa.h linux-3.0.7/drivers/scsi/bfa/bfa.h
+--- linux-3.0.7/drivers/scsi/bfa/bfa.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.0.7/drivers/scsi/bfa/bfa_fcs_lport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32093,9 +33273,9 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi
  	/*
  	 * get port attributes
  	 */
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.0.7/drivers/scsi/bfa/bfa_fcs_rport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32105,21 +33285,9 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi
  	bfa_trc(port->fcs, rx_fchs->s_id);
  	bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa.h linux-3.0.4/drivers/scsi/bfa/bfa.h
---- linux-3.0.4/drivers/scsi/bfa/bfa.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.0.7/drivers/scsi/bfa/bfa_ioc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32138,21 +33306,21 @@ diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/b
  
  #define bfa_ioc_pcifn(__ioc)		((__ioc)->pcidev.pci_func)
  #define bfa_ioc_devid(__ioc)		((__ioc)->pcidev.device_id)
-diff -urNp linux-3.0.4/drivers/scsi/BusLogic.c linux-3.0.4/drivers/scsi/BusLogic.c
---- linux-3.0.4/drivers/scsi/BusLogic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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)
- {
+diff -urNp linux-3.0.7/drivers/scsi/bfa/bfad.c linux-3.0.7/drivers/scsi/bfa/bfad.c
+--- linux-3.0.7/drivers/scsi/bfa/bfad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
 +
- 	/*
- 	   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.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
---- linux-3.0.4/drivers/scsi/dpt_i2o.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/dpt_i2o.c	2011-08-23 21:48:14.000000000 -0400
+ 	/* 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.7/drivers/scsi/dpt_i2o.c linux-3.0.7/drivers/scsi/dpt_i2o.c
+--- linux-3.0.7/drivers/scsi/dpt_i2o.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32171,9 +33339,9 @@ diff -urNp linux-3.0.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
  	memset(msg, 0 , sizeof(msg));
  	len = scsi_bufflen(cmd);
  	direction = 0x00000000;	
-diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
---- linux-3.0.4/drivers/scsi/eata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/eata.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/eata.c linux-3.0.7/drivers/scsi/eata.c
+--- linux-3.0.7/drivers/scsi/eata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -32183,9 +33351,9 @@ diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
  	sprintf(name, "%s%d", driver_name, j);
  
  	if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.0.7/drivers/scsi/fcoe/fcoe_ctlr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32195,9 +33363,9 @@ diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fc
  	fiph = (struct fip_header *)skb->data;
  	sub = fiph->fip_subcode;
  
-diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
---- linux-3.0.4/drivers/scsi/gdth.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/gdth.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/gdth.c linux-3.0.7/drivers/scsi/gdth.c
+--- linux-3.0.7/drivers/scsi/gdth.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32235,9 +33403,9 @@ diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_proc.c
---- linux-3.0.4/drivers/scsi/gdth_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/gdth_proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/gdth_proc.c linux-3.0.7/drivers/scsi/gdth_proc.c
+--- linux-3.0.7/drivers/scsi/gdth_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -32257,9 +33425,9 @@ diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_pr
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
---- linux-3.0.4/drivers/scsi/hosts.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hosts.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/hosts.c linux-3.0.7/drivers/scsi/hosts.c
+--- linux-3.0.7/drivers/scsi/hosts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/hosts.c	2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -32278,9 +33446,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
  	shost->dma_channel = 0xff;
  
  	/* These three are default values which can be overridden */
-diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
---- linux-3.0.4/drivers/scsi/hpsa.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hpsa.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/hpsa.c linux-3.0.7/drivers/scsi/hpsa.c
+--- linux-3.0.7/drivers/scsi/hpsa.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/scsi/hpsa.c	2011-10-16 21:55:27.000000000 -0400
 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
  	u32 a;
  
@@ -32290,7 +33458,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  	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
+@@ -2955,7 +2955,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 */
@@ -32299,7 +33467,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  			dev_warn(&h->pdev->dev, "fifo full\n");
  			break;
  		}
-@@ -2948,7 +2948,7 @@ static void start_io(struct ctlr_info *h
+@@ -2965,7 +2965,7 @@ static void start_io(struct ctlr_info *h
  		h->Qdepth--;
  
  		/* Tell the controller execute command */
@@ -32308,7 +33476,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  		/* Put job onto the completed Q */
  		addQ(&h->cmpQ, c);
-@@ -2957,17 +2957,17 @@ static void start_io(struct ctlr_info *h
+@@ -2974,17 +2974,17 @@ static void start_io(struct ctlr_info *h
  
  static inline unsigned long get_next_completion(struct ctlr_info *h)
  {
@@ -32329,7 +33497,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  		(h->interrupts_enabled == 0);
  }
  
-@@ -3857,7 +3857,7 @@ static int __devinit hpsa_pci_init(struc
+@@ -3874,7 +3874,7 @@ static int __devinit hpsa_pci_init(struc
  	if (prod_index < 0)
  		return -ENODEV;
  	h->product_name = products[prod_index].product_name;
@@ -32338,7 +33506,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  	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:
+@@ -4151,7 +4151,7 @@ reinit_after_soft_reset:
  	}
  
  	/* make sure the board interrupts are off */
@@ -32347,7 +33515,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  	if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
  		goto clean2;
-@@ -4168,7 +4168,7 @@ reinit_after_soft_reset:
+@@ -4185,7 +4185,7 @@ reinit_after_soft_reset:
  		 * fake ones to scoop up any residual completions.
  		 */
  		spin_lock_irqsave(&h->lock, flags);
@@ -32356,7 +33524,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  		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:
+@@ -4204,9 +4204,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");
@@ -32368,7 +33536,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  		rc = controller_reset_failed(h->cfgtable);
  		if (rc)
-@@ -4210,7 +4210,7 @@ reinit_after_soft_reset:
+@@ -4227,7 +4227,7 @@ reinit_after_soft_reset:
  	}
  
  	/* Turn the interrupts on so we can service requests */
@@ -32377,7 +33545,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  
  	hpsa_hba_inquiry(h);
  	hpsa_register_scsi(h);	/* hook ourselves into SCSI subsystem */
-@@ -4263,7 +4263,7 @@ static void hpsa_shutdown(struct pci_dev
+@@ -4280,7 +4280,7 @@ static void hpsa_shutdown(struct pci_dev
  	 * To write all data in the battery backed cache to disks
  	 */
  	hpsa_flush_cache(h);
@@ -32386,7 +33554,7 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  	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
+@@ -4443,7 +4443,7 @@ static __devinit void hpsa_enter_perform
  		return;
  	}
  	/* Change the access methods to the performant access methods */
@@ -32395,9 +33563,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
  	h->transMethod = CFGTBL_Trans_Performant;
  }
  
-diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
---- linux-3.0.4/drivers/scsi/hpsa.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/hpsa.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/hpsa.h linux-3.0.7/drivers/scsi/hpsa.h
+--- linux-3.0.7/drivers/scsi/hpsa.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -32407,9 +33575,9 @@ diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
  
  	/* queue and queue Info */
  	struct list_head reqQ;
-diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
---- linux-3.0.4/drivers/scsi/ips.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/ips.h	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/ips.h linux-3.0.7/drivers/scsi/ips.h
+--- linux-3.0.7/drivers/scsi/ips.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -32419,9 +33587,9 @@ diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/libfc/fc_exch.c
---- linux-3.0.4/drivers/scsi/libfc/fc_exch.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/libfc/fc_exch.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/libfc/fc_exch.c linux-3.0.7/drivers/scsi/libfc/fc_exch.c
+--- linux-3.0.7/drivers/scsi/libfc/fc_exch.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
  	 */
@@ -32543,9 +33711,9 @@ diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/lib
  
  	fc_frame_free(fp);
  }
-diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/libsas/sas_ata.c
---- linux-3.0.4/drivers/scsi/libsas/sas_ata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/libsas/sas_ata.c	2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/libsas/sas_ata.c linux-3.0.7/drivers/scsi/libsas/sas_ata.c
+--- linux-3.0.7/drivers/scsi/libsas/sas_ata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -32555,9 +33723,41 @@ diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/li
  	.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.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc.h linux-3.0.7/drivers/scsi/lpfc/lpfc.h
+--- linux-3.0.7/drivers/scsi/lpfc/lpfc.h	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/scsi/lpfc/lpfc.h	2011-10-16 21:55:27.000000000 -0400
+@@ -425,7 +425,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;
+@@ -832,8 +832,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;
+@@ -847,7 +847,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.7/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.0.7/drivers/scsi/lpfc/lpfc_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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_
  
  #include <linux/debugfs.h>
@@ -32646,42 +33846,10 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi
  
  	snprintf(name, sizeof(name), "discovery_trace");
  	vport->debug_disc_trc =
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lpfc.h
---- linux-3.0.4/drivers/scsi/lpfc/lpfc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c	2011-08-23 21:47:56.000000000 -0400
-@@ -9923,8 +9923,10 @@ lpfc_init(void)
+diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/scsi/lpfc/lpfc_init.c	2011-10-16 21:55:27.000000000 -0400
+@@ -9971,8 +9971,10 @@ lpfc_init(void)
  	printk(LPFC_COPYRIGHT "\n");
  
  	if (lpfc_enable_npiv) {
@@ -32694,9 +33862,9 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lp
  	}
  	lpfc_transport_template =
  				fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/scsi/lpfc/lpfc_scsi.c	2011-10-16 21:55:27.000000000 -0400
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
  	uint32_t evt_posted;
  
@@ -32748,9 +33916,9 @@ diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lp
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.0.7/drivers/scsi/megaraid/megaraid_mbox.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32760,9 +33928,9 @@ diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers
  	// 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 -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi/osd/osd_initiator.c
---- linux-3.0.4/drivers/scsi/osd/osd_initiator.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/osd/osd_initiator.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/osd/osd_initiator.c linux-3.0.7/drivers/scsi/osd/osd_initiator.c
+--- linux-3.0.7/drivers/scsi/osd/osd_initiator.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32772,9 +33940,9 @@ diff -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi
  	or = osd_start_request(od, GFP_KERNEL);
  	if (!or)
  		return -ENOMEM;
-diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
---- linux-3.0.4/drivers/scsi/pmcraid.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/pmcraid.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/pmcraid.c linux-3.0.7/drivers/scsi/pmcraid.c
+--- linux-3.0.7/drivers/scsi/pmcraid.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -32845,9 +34013,9 @@ diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
  	schedule_work(&pinstance->worker_q);
  	return rc;
  
-diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
---- linux-3.0.4/drivers/scsi/pmcraid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/pmcraid.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/pmcraid.h linux-3.0.7/drivers/scsi/pmcraid.h
+--- linux-3.0.7/drivers/scsi/pmcraid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
  
@@ -32877,9 +34045,9 @@ diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
  
  	/* To indicate add/delete/modify during CCN */
  	u8 change_detected;
-diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.0.7/drivers/scsi/qla2xxx/qla_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -32889,9 +34057,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/q
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.0.7/drivers/scsi/qla4xxx/ql4_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) */
@@ -32901,9 +34069,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/q
  				       * retried */
  
  	uint16_t port;
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.0.7/drivers/scsi/qla4xxx/ql4_init.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -32922,9 +34090,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/
  		atomic_set(&ddb_entry->relogin_timer, 0);
  		clear_bit(DF_RELOGIN, &ddb_entry->flags);
  		iscsi_unblock_session(ddb_entry->sess);
-diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.0.7/drivers/scsi/qla4xxx/ql4_os.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -32941,9 +34109,9 @@ diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/ql
  							  relogin_retry_count))
  					);
  				start_dpc++;
-diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
---- linux-3.0.4/drivers/scsi/scsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi.c linux-3.0.7/drivers/scsi/scsi.c
+--- linux-3.0.7/drivers/scsi/scsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32953,9 +34121,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
  
  	/* check if the device is still usable */
  	if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_debug.c
---- linux-3.0.4/drivers/scsi/scsi_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_debug.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_debug.c linux-3.0.7/drivers/scsi/scsi_debug.c
+--- linux-3.0.7/drivers/scsi/scsi_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -32974,9 +34142,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_d
  	if ((errsts = check_readiness(scp, 1, devip)))
  		return errsts;
  	memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib.c
---- linux-3.0.4/drivers/scsi/scsi_lib.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_lib.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_lib.c linux-3.0.7/drivers/scsi/scsi_lib.c
+--- linux-3.0.7/drivers/scsi/scsi_lib.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -32998,9 +34166,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib
  
  	disposition = scsi_decide_disposition(cmd);
  	if (disposition != SUCCESS &&
-diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_sysfs.c
---- linux-3.0.4/drivers/scsi/scsi_sysfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_sysfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_sysfs.c linux-3.0.7/drivers/scsi/scsi_sysfs.c
+--- linux-3.0.7/drivers/scsi/scsi_sysfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)						\
  {									\
@@ -33010,9 +34178,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_s
  	return snprintf(buf, 20, "0x%llx\n", count);			\
  }									\
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-3.0.4/drivers/scsi/scsi_tgt_lib.c linux-3.0.4/drivers/scsi/scsi_tgt_lib.c
---- linux-3.0.4/drivers/scsi/scsi_tgt_lib.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_tgt_lib.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_tgt_lib.c linux-3.0.7/drivers/scsi/scsi_tgt_lib.c
+--- linux-3.0.7/drivers/scsi/scsi_tgt_lib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/scsi_tgt_lib.c	2011-10-06 04:17:55.000000000 -0400
 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct sc
  	int err;
  
@@ -33022,9 +34190,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_tgt_lib.c linux-3.0.4/drivers/scsi/scsi
  	if (err) {
  		/*
  		 * TODO: need to fixup sg_tablesize, max_segment_size,
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi/scsi_transport_fc.c
---- linux-3.0.4/drivers/scsi/scsi_transport_fc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_fc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_fc.c linux-3.0.7/drivers/scsi/scsi_transport_fc.c
+--- linux-3.0.7/drivers/scsi/scsi_transport_fc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
   */
@@ -33061,9 +34229,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi
  		return -EINVAL;
  	/*
  	 * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.0.7/drivers/scsi/scsi_transport_iscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
  };
@@ -33091,9 +34259,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/s
  
  	err = class_register(&iscsi_transport_class);
  	if (err)
-diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scsi/scsi_transport_srp.c
---- linux-3.0.4/drivers/scsi/scsi_transport_srp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/scsi_transport_srp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/scsi_transport_srp.c linux-3.0.7/drivers/scsi/scsi_transport_srp.c
+--- linux-3.0.7/drivers/scsi/scsi_transport_srp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/scsi_transport_srp.c	2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -33121,9 +34289,9 @@ diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scs
  	dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
  	transport_setup_device(&rport->dev);
-diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
---- linux-3.0.4/drivers/scsi/sg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/sg.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/sg.c linux-3.0.7/drivers/scsi/sg.c
+--- linux-3.0.7/drivers/scsi/sg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/scsi/sg.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1075,7 +1075,7 @@ sg_ioctl(struct file *filp, unsigned int
  				       sdp->disk->disk_name,
  				       MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
@@ -33151,9 +34319,9 @@ diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
  
  	sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
  	if (!sg_proc_sgp)
-diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.0.7/drivers/scsi/sym53c8xx_2/sym_glue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33163,9 +34331,9 @@ diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/s
  	memset(&sym_dev, 0, sizeof(sym_dev));
  	memset(&nvram, 0, sizeof(nvram));
  	sym_dev.pdev = pdev;
-diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pvscsi.c
---- linux-3.0.4/drivers/scsi/vmw_pvscsi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/scsi/vmw_pvscsi.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/scsi/vmw_pvscsi.c linux-3.0.7/drivers/scsi/vmw_pvscsi.c
+--- linux-3.0.7/drivers/scsi/vmw_pvscsi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33175,9 +34343,21 @@ diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pv
  	cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
  	cmd.reqRingNumPages = adapter->req_pages;
  	cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
---- linux-3.0.4/drivers/spi/spi.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/spi/spi.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/spi/dw_spi_pci.c linux-3.0.7/drivers/spi/dw_spi_pci.c
+--- linux-3.0.7/drivers/spi/dw_spi_pci.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/spi/dw_spi_pci.c	2011-10-11 10:44:33.000000000 -0400
+@@ -148,7 +148,7 @@ static int spi_resume(struct pci_dev *pd
+ #define spi_resume	NULL
+ #endif
+ 
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+ 	/* Intel MID platform SPI controller 0 */
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
+ 	{},
+diff -urNp linux-3.0.7/drivers/spi/spi.c linux-3.0.7/drivers/spi/spi.c
+--- linux-3.0.7/drivers/spi/spi.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -33187,9 +34367,9 @@ diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
  
  static u8	*buf;
  
-diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.0.7/drivers/staging/ath6kl/os/linux/ar6000_drv.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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))
  
@@ -33199,9 +34379,9 @@ diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/
      .ndo_init               = NULL,
      .ndo_open               = ar6000_open,
      .ndo_stop               = ar6000_close,
-diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.0.7/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
  {
@@ -33211,9 +34391,9 @@ diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
  
  void register_pal_cb(ar6k_pal_config_t *palConfig_p);
  #endif /* _AR6K_PAL_H_ */
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.0.7/drivers/staging/brcm80211/brcmfmac/dhd_linux.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  		}
@@ -33258,9 +34438,9 @@ diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
  	g_bus = bus;
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
---- linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
+--- linux-3.0.7/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33270,9 +34450,9 @@ diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu
  typedef struct phy_func_ptr phy_func_ptr_t;
  
  struct phy_info {
-diff -urNp linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h
---- linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h
+--- linux-3.0.7/drivers/staging/brcm80211/include/bcmsdh.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -33282,9 +34462,9 @@ diff -urNp linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.4/dr
  
  /* platform specific/high level functions */
  extern int bcmsdh_register(bcmsdh_driver_t *driver);
-diff -urNp linux-3.0.4/drivers/staging/et131x/et1310_tx.c linux-3.0.4/drivers/staging/et131x/et1310_tx.c
---- linux-3.0.4/drivers/staging/et131x/et1310_tx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/et131x/et1310_tx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/et131x/et1310_tx.c linux-3.0.7/drivers/staging/et131x/et1310_tx.c
+--- linux-3.0.7/drivers/staging/et131x/et1310_tx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -33300,9 +34480,9 @@ diff -urNp linux-3.0.4/drivers/staging/et131x/et1310_tx.c linux-3.0.4/drivers/st
  
  	if (tcb->skb) {
  		stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drivers/staging/et131x/et131x_adapter.h
---- linux-3.0.4/drivers/staging/et131x/et131x_adapter.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/et131x/et131x_adapter.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/et131x/et131x_adapter.h linux-3.0.7/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.0.7/drivers/staging/et131x/et131x_adapter.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/staging/et131x/et131x_adapter.h	2011-08-23 21:47:56.000000000 -0400
 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
  	 * operations
  	 */
@@ -33318,9 +34498,9 @@ diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drive
  	u32 norcvbuf;	/* # Rx packets discarded */
  	u32 noxmtbuf;	/* # Tx packets discarded */
  
-diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/hv/channel.c
---- linux-3.0.4/drivers/staging/hv/channel.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/channel.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/channel.c linux-3.0.7/drivers/staging/hv/channel.c
+--- linux-3.0.7/drivers/staging/hv/channel.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -33332,9 +34512,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/
  
  	ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
  	if (ret)
-diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv.c
---- linux-3.0.4/drivers/staging/hv/hv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/hv.c linux-3.0.7/drivers/staging/hv/hv.c
+--- linux-3.0.7/drivers/staging/hv/hv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33344,9 +34524,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv
  
  	__asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
  			      "=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging/hv/hv_mouse.c
---- linux-3.0.4/drivers/staging/hv/hv_mouse.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hv_mouse.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/hv_mouse.c linux-3.0.7/drivers/staging/hv/hv_mouse.c
+--- linux-3.0.7/drivers/staging/hv/hv_mouse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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");
@@ -33360,9 +34540,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging
  
  		hid_dev->bus = BUS_VIRTUAL;
  		hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.0.7/drivers/staging/hv/hyperv_vmbus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33372,9 +34552,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/sta
  
  	/*
  	 * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/staging/hv/rndis_filter.c
---- linux-3.0.4/drivers/staging/hv/rndis_filter.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/rndis_filter.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/rndis_filter.c linux-3.0.7/drivers/staging/hv/rndis_filter.c
+--- linux-3.0.7/drivers/staging/hv/rndis_filter.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -33402,9 +34582,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/sta
  
  	/* Ignore return since this msg is optional. */
  	rndis_filter_send_request(dev, request);
-diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/staging/hv/vmbus_drv.c
---- linux-3.0.4/drivers/staging/hv/vmbus_drv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/hv/vmbus_drv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/hv/vmbus_drv.c linux-3.0.7/drivers/staging/hv/vmbus_drv.c
+--- linux-3.0.7/drivers/staging/hv/vmbus_drv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33419,9 +34599,9 @@ diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/stagin
  
  	/* The new device belongs to this bus */
  	child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/staging/iio/ring_generic.h
---- linux-3.0.4/drivers/staging/iio/ring_generic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/iio/ring_generic.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/iio/ring_generic.h linux-3.0.7/drivers/staging/iio/ring_generic.h
+--- linux-3.0.7/drivers/staging/iio/ring_generic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -33431,28 +34611,9 @@ diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/st
  
  struct iio_ring_setup_ops {
  	int				(*preenable)(struct iio_dev *);
-diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet.c linux-3.0.4/drivers/staging/octeon/ethernet.c
---- linux-3.0.4/drivers/staging/octeon/ethernet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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
- 	}
- 
-diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/staging/octeon/ethernet-rx.c
---- linux-3.0.4/drivers/staging/octeon/ethernet-rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/octeon/ethernet-rx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/octeon/ethernet-rx.c linux-3.0.7/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.0.7/drivers/staging/octeon/ethernet-rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -33481,9 +34642,28 @@ diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/
  #endif
  				dev_kfree_skb_irq(skb);
  			}
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/staging/pohmelfs/inode.c
---- linux-3.0.4/drivers/staging/pohmelfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/octeon/ethernet.c linux-3.0.7/drivers/staging/octeon/ethernet.c
+--- linux-3.0.7/drivers/staging/octeon/ethernet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
+ 	}
+ 
+diff -urNp linux-3.0.7/drivers/staging/pohmelfs/inode.c linux-3.0.7/drivers/staging/pohmelfs/inode.c
+--- linux-3.0.7/drivers/staging/pohmelfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33502,9 +34682,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/stag
  	atomic_long_set(&psb->total_inodes, 0);
  
  	mutex_init(&psb->state_lock);
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/staging/pohmelfs/mcache.c
---- linux-3.0.4/drivers/staging/pohmelfs/mcache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/mcache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/pohmelfs/mcache.c linux-3.0.7/drivers/staging/pohmelfs/mcache.c
+--- linux-3.0.7/drivers/staging/pohmelfs/mcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33514,9 +34694,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/sta
  
  	mutex_lock(&psb->mcache_lock);
  	err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/staging/pohmelfs/netfs.h
---- linux-3.0.4/drivers/staging/pohmelfs/netfs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/netfs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/pohmelfs/netfs.h linux-3.0.7/drivers/staging/pohmelfs/netfs.h
+--- linux-3.0.7/drivers/staging/pohmelfs/netfs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33534,9 +34714,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/stag
  
  	unsigned int		crypto_attached_size;
  	unsigned int		crypto_align_size;
-diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/staging/pohmelfs/trans.c
---- linux-3.0.4/drivers/staging/pohmelfs/trans.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/pohmelfs/trans.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/pohmelfs/trans.c linux-3.0.7/drivers/staging/pohmelfs/trans.c
+--- linux-3.0.7/drivers/staging/pohmelfs/trans.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33546,9 +34726,9 @@ diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/stag
  
  	cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
  		t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.0.7/drivers/staging/rtl8712/rtl871x_io.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -33558,9 +34738,9 @@ diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/
  
  struct io_req {
  	struct list_head list;
-diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c	2011-08-24 18:21:41.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.0.7/drivers/staging/sbe-2t3e3/netdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -33570,9 +34750,9 @@ diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/st
  			return -EFAULT;
  
  	return 0;
-diff -urNp linux-3.0.4/drivers/staging/tty/stallion.c linux-3.0.4/drivers/staging/tty/stallion.c
---- linux-3.0.4/drivers/staging/tty/stallion.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/tty/stallion.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/tty/stallion.c linux-3.0.7/drivers/staging/tty/stallion.c
+--- linux-3.0.7/drivers/staging/tty/stallion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33582,9 +34762,9 @@ diff -urNp linux-3.0.4/drivers/staging/tty/stallion.c linux-3.0.4/drivers/stagin
  	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.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/staging/usbip/usbip_common.h
---- linux-3.0.4/drivers/staging/usbip/usbip_common.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/usbip_common.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/usbip/usbip_common.h linux-3.0.7/drivers/staging/usbip/usbip_common.h
+--- linux-3.0.7/drivers/staging/usbip/usbip_common.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -33594,9 +34774,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/
  };
  
  void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/usbip/vhci.h
---- linux-3.0.4/drivers/staging/usbip/vhci.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/usbip/vhci.h linux-3.0.7/drivers/staging/usbip/vhci.h
+--- linux-3.0.7/drivers/staging/usbip/vhci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33606,9 +34786,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/
  
  	/*
  	 * NOTE:
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/staging/usbip/vhci_hcd.c
---- linux-3.0.4/drivers/staging/usbip/vhci_hcd.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci_hcd.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_hcd.c linux-3.0.7/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.0.7/drivers/staging/usbip/vhci_hcd.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -33636,9 +34816,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/stag
  	spin_lock_init(&vhci->lock);
  
  	hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/staging/usbip/vhci_rx.c
---- linux-3.0.4/drivers/staging/usbip/vhci_rx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/usbip/vhci_rx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/usbip/vhci_rx.c linux-3.0.7/drivers/staging/usbip/vhci_rx.c
+--- linux-3.0.7/drivers/staging/usbip/vhci_rx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -33648,9 +34828,9 @@ diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/stagi
  		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
  		return;
  	}
-diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/staging/vt6655/hostap.c
---- linux-3.0.4/drivers/staging/vt6655/hostap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/vt6655/hostap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/vt6655/hostap.c linux-3.0.7/drivers/staging/vt6655/hostap.c
+--- linux-3.0.7/drivers/staging/vt6655/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/staging/vt6655/hostap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -79,14 +79,13 @@ static int          msglevel            
   *
   */
@@ -33677,9 +34857,9 @@ diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/staging/vt6656/hostap.c
---- linux-3.0.4/drivers/staging/vt6656/hostap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/vt6656/hostap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/vt6656/hostap.c linux-3.0.7/drivers/staging/vt6656/hostap.c
+--- linux-3.0.7/drivers/staging/vt6656/hostap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/staging/vt6656/hostap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -80,14 +80,13 @@ static int          msglevel            
   *
   */
@@ -33706,9 +34886,9 @@ diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/stagi
  	pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
  	pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.0.7/drivers/staging/wlan-ng/hfa384x_usb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -33718,9 +34898,9 @@ diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers
  
  static int
  hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging/zcache/tmem.c
---- linux-3.0.4/drivers/staging/zcache/tmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/zcache/tmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.c linux-3.0.7/drivers/staging/zcache/tmem.c
+--- linux-3.0.7/drivers/staging/zcache/tmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -33739,9 +34919,9 @@ diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging
  
  void tmem_register_pamops(struct tmem_pamops *m)
  {
-diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging/zcache/tmem.h
---- linux-3.0.4/drivers/staging/zcache/tmem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/staging/zcache/tmem.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/staging/zcache/tmem.h linux-3.0.7/drivers/staging/zcache/tmem.h
+--- linux-3.0.7/drivers/staging/zcache/tmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -33758,9 +34938,9 @@ diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging
  extern void tmem_register_hostops(struct tmem_hostops *m);
  
  /* core tmem accessor functions */
-diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/target/target_core_alua.c
---- linux-3.0.4/drivers/target/target_core_alua.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_alua.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_alua.c linux-3.0.7/drivers/target/target_core_alua.c
+--- linux-3.0.7/drivers/target/target_core_alua.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33779,9 +34959,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/tar
  	memset(path, 0, ALUA_METADATA_PATH_LEN);
  	memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/target/target_core_cdb.c
---- linux-3.0.4/drivers/target/target_core_cdb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_cdb.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_cdb.c linux-3.0.7/drivers/target/target_core_cdb.c
+--- linux-3.0.7/drivers/target/target_core_cdb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -33791,9 +34971,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/targ
  	memset(buf, 0, SE_MODE_PAGE_BUF);
  
  	switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.0.4/drivers/target/target_core_configfs.c linux-3.0.4/drivers/target/target_core_configfs.c
---- linux-3.0.4/drivers/target/target_core_configfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_configfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_configfs.c linux-3.0.7/drivers/target/target_core_configfs.c
+--- linux-3.0.7/drivers/target/target_core_configfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33803,9 +34983,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_configfs.c linux-3.0.4/drivers
  	if (!(su_dev->se_dev_ptr))
  		return -ENODEV;
  
-diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/target/target_core_pr.c
---- linux-3.0.4/drivers/target/target_core_pr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_pr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_pr.c linux-3.0.7/drivers/target/target_core_pr.c
+--- linux-3.0.7/drivers/target/target_core_pr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33833,9 +35013,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/targe
  	memset(iov, 0, sizeof(struct iovec));
  	memset(path, 0, 512);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_tmr.c linux-3.0.4/drivers/target/target_core_tmr.c
---- linux-3.0.4/drivers/target/target_core_tmr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_tmr.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_tmr.c linux-3.0.7/drivers/target/target_core_tmr.c
+--- linux-3.0.7/drivers/target/target_core_tmr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -33863,9 +35043,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_tmr.c linux-3.0.4/drivers/targ
  		spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
  		core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/drivers/target/target_core_transport.c
---- linux-3.0.4/drivers/target/target_core_transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/target/target_core_transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/target/target_core_transport.c linux-3.0.7/drivers/target/target_core_transport.c
+--- linux-3.0.7/drivers/target/target_core_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33941,9 +35121,9 @@ diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/driver
  			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 -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj.c
---- linux-3.0.4/drivers/telephony/ixj.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/telephony/ixj.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/telephony/ixj.c linux-3.0.7/drivers/telephony/ixj.c
+--- linux-3.0.7/drivers/telephony/ixj.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -33953,9 +35133,9 @@ diff -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj
  	if (!SCI_Prepare(j))
  		return 0;
  
-diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
---- linux-3.0.4/drivers/tty/hvc/hvcs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/hvc/hvcs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/hvc/hvcs.c linux-3.0.7/drivers/tty/hvc/hvcs.c
+--- linux-3.0.7/drivers/tty/hvc/hvcs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -34058,9 +35238,9 @@ diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
  		return 0;
  
  	return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwireless/tty.c
---- linux-3.0.4/drivers/tty/ipwireless/tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/ipwireless/tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/ipwireless/tty.c linux-3.0.7/drivers/tty/ipwireless/tty.c
+--- linux-3.0.7/drivers/tty/ipwireless/tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -34183,9 +35363,9 @@ diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwi
  				do_ipw_close(ttyj);
  			ipwireless_disassociate_network_ttys(network,
  							     ttyj->channel_idx);
-diff -urNp linux-3.0.4/drivers/tty/n_gsm.c linux-3.0.4/drivers/tty/n_gsm.c
---- linux-3.0.4/drivers/tty/n_gsm.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/drivers/tty/n_gsm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/n_gsm.c linux-3.0.7/drivers/tty/n_gsm.c
+--- linux-3.0.7/drivers/tty/n_gsm.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -34195,9 +35375,9 @@ diff -urNp linux-3.0.4/drivers/tty/n_gsm.c linux-3.0.4/drivers/tty/n_gsm.c
  		kfree(dlci);
  		return NULL;
  	}
-diff -urNp linux-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
---- linux-3.0.4/drivers/tty/n_tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/n_tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/n_tty.c linux-3.0.7/drivers/tty/n_tty.c
+--- linux-3.0.7/drivers/tty/n_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34207,10 +35387,10 @@ diff -urNp linux-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
 +	ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
---- linux-3.0.4/drivers/tty/pty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/pty.c	2011-08-23 21:47:56.000000000 -0400
-@@ -754,8 +754,10 @@ static void __init unix98_pty_init(void)
+diff -urNp linux-3.0.7/drivers/tty/pty.c linux-3.0.7/drivers/tty/pty.c
+--- linux-3.0.7/drivers/tty/pty.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/tty/pty.c	2011-10-16 21:55:28.000000000 -0400
+@@ -767,8 +767,10 @@ static void __init unix98_pty_init(void)
  	register_sysctl_table(pty_root_table);
  
  	/* Now create the /dev/ptmx special device */
@@ -34222,9 +35402,9 @@ diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
  
  	cdev_init(&ptmx_cdev, &ptmx_fops);
  	if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
---- linux-3.0.4/drivers/tty/rocket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/rocket.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/rocket.c linux-3.0.7/drivers/tty/rocket.c
+--- linux-3.0.7/drivers/tty/rocket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34234,9 +35414,9 @@ diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
  	if (!retports)
  		return -EFAULT;
  	memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/serial/kgdboc.c
---- linux-3.0.4/drivers/tty/serial/kgdboc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/serial/kgdboc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/serial/kgdboc.c linux-3.0.7/drivers/tty/serial/kgdboc.c
+--- linux-3.0.7/drivers/tty/serial/kgdboc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/tty/serial/kgdboc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN		40
  
@@ -34335,9 +35515,21 @@ diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/seria
  #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.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty/serial/mrst_max3110.c
---- linux-3.0.4/drivers/tty/serial/mrst_max3110.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/serial/mrst_max3110.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/serial/mfd.c linux-3.0.7/drivers/tty/serial/mfd.c
+--- linux-3.0.7/drivers/tty/serial/mfd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/tty/serial/mfd.c	2011-10-11 10:44:33.000000000 -0400
+@@ -1423,7 +1423,7 @@ static void serial_hsu_remove(struct pci
+ }
+ 
+ /* First 3 are UART ports, and the 4th is the DMA */
+-static const struct pci_device_id pci_ids[] __devinitdata = {
++static const struct pci_device_id pci_ids[] __devinitconst = {
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081B) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081C) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x081D) },
+diff -urNp linux-3.0.7/drivers/tty/serial/mrst_max3110.c linux-3.0.7/drivers/tty/serial/mrst_max3110.c
+--- linux-3.0.7/drivers/tty/serial/mrst_max3110.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/tty/serial/mrst_max3110.c	2011-10-16 21:55:28.000000000 -0400
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
  	int loop = 1, num, total = 0;
  	u8 recv_buf[512], *pbuf;
@@ -34347,10 +35539,10 @@ diff -urNp linux-3.0.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty
  	pbuf = recv_buf;
  	do {
  		num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
---- linux-3.0.4/drivers/tty/tty_io.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/tty_io.c	2011-08-23 21:47:56.000000000 -0400
-@@ -3215,7 +3215,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+diff -urNp linux-3.0.7/drivers/tty/tty_io.c linux-3.0.7/drivers/tty/tty_io.c
+--- linux-3.0.7/drivers/tty/tty_io.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/drivers/tty/tty_io.c	2011-10-16 21:55:28.000000000 -0400
+@@ -3214,7 +3214,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
  {
@@ -34359,9 +35551,9 @@ diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
  }
  
  /*
-diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc.c
---- linux-3.0.4/drivers/tty/tty_ldisc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/tty_ldisc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/tty_ldisc.c linux-3.0.7/drivers/tty/tty_ldisc.c
+--- linux-3.0.7/drivers/tty/tty_ldisc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34407,9 +35599,9 @@ diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc
  	module_put(ldops->owner);
  	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyboard.c
---- linux-3.0.4/drivers/tty/vt/keyboard.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/keyboard.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/vt/keyboard.c linux-3.0.7/drivers/tty/vt/keyboard.c
+--- linux-3.0.7/drivers/tty/vt/keyboard.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -34427,9 +35619,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyb
  	fn_handler[value](vc);
  }
  
-diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
---- linux-3.0.4/drivers/tty/vt/vt.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/vt.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/vt/vt.c linux-3.0.7/drivers/tty/vt/vt.c
+--- linux-3.0.7/drivers/tty/vt/vt.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -34439,9 +35631,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
  	atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_ioctl.c
---- linux-3.0.4/drivers/tty/vt/vt_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/tty/vt/vt_ioctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/tty/vt/vt_ioctl.c linux-3.0.7/drivers/tty/vt/vt_ioctl.c
+--- linux-3.0.7/drivers/tty/vt/vt_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34482,9 +35674,9 @@ diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_i
  		if (!perm) {
  			ret = -EPERM;
  			goto reterr;
-diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
---- linux-3.0.4/drivers/uio/uio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/uio/uio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/uio/uio.c linux-3.0.7/drivers/uio/uio.c
+--- linux-3.0.7/drivers/uio/uio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/uio/uio.c	2011-08-23 21:47:56.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -34576,9 +35768,9 @@ diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
  
  	ret = uio_get_minor(idev);
  	if (ret)
-diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxacru.c
---- linux-3.0.4/drivers/usb/atm/cxacru.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/atm/cxacru.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/atm/cxacru.c linux-3.0.7/drivers/usb/atm/cxacru.c
+--- linux-3.0.7/drivers/usb/atm/cxacru.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -34588,9 +35780,9 @@ diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxac
  			return -EINVAL;
  		pos += tmp;
  
-diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usbatm.c
---- linux-3.0.4/drivers/usb/atm/usbatm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/atm/usbatm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/atm/usbatm.c linux-3.0.7/drivers/usb/atm/usbatm.c
+--- linux-3.0.7/drivers/usb/atm/usbatm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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",
@@ -34670,9 +35862,9 @@ diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usba
  
  	if (!left--) {
  		if (instance->disconnected)
-diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/devices.c
---- linux-3.0.4/drivers/usb/core/devices.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/core/devices.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/core/devices.c linux-3.0.7/drivers/usb/core/devices.c
+--- linux-3.0.7/drivers/usb/core/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -34700,9 +35892,9 @@ diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/d
  	if (file->f_version != event_count) {
  		file->f_version = event_count;
  		return POLLIN | POLLRDNORM;
-diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/message.c
---- linux-3.0.4/drivers/usb/core/message.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/core/message.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/core/message.c linux-3.0.7/drivers/usb/core/message.c
+--- linux-3.0.7/drivers/usb/core/message.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -34714,9 +35906,9 @@ diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/m
  			if (!smallbuf)
  				return buf;
  			memcpy(smallbuf, buf, len);
-diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/early/ehci-dbgp.c
---- linux-3.0.4/drivers/usb/early/ehci-dbgp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/early/ehci-dbgp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/early/ehci-dbgp.c linux-3.0.7/drivers/usb/early/ehci-dbgp.c
+--- linux-3.0.7/drivers/usb/early/ehci-dbgp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -34754,9 +35946,9 @@ diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/ear
  
  	return 0;
  }
-diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/xhci-mem.c
---- linux-3.0.4/drivers/usb/host/xhci-mem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/host/xhci-mem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/host/xhci-mem.c linux-3.0.7/drivers/usb/host/xhci-mem.c
+--- linux-3.0.7/drivers/usb/host/xhci-mem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34766,9 +35958,9 @@ diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/
  	num_tests = ARRAY_SIZE(simple_test_vector);
  	for (i = 0; i < num_tests; i++) {
  		ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusbcore/wa-hc.h
---- linux-3.0.4/drivers/usb/wusbcore/wa-hc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/wusbcore/wa-hc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-hc.h linux-3.0.7/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.0.7/drivers/usb/wusbcore/wa-hc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34787,9 +35979,9 @@ diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusb
  }
  
  /**
-diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.0.7/drivers/usb/wusbcore/wa-xfer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -34799,9 +35991,9 @@ diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wu
  }
  
  /*
-diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
---- linux-3.0.4/drivers/vhost/vhost.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/vhost/vhost.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/vhost/vhost.c linux-3.0.7/drivers/vhost/vhost.c
+--- linux-3.0.7/drivers/vhost/vhost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -34811,9 +36003,21 @@ diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
  {
  	struct file *eventfp, *filep = NULL,
  		    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
---- linux-3.0.4/drivers/video/fbcmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/fbcmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/aty/aty128fb.c linux-3.0.7/drivers/video/aty/aty128fb.c
+--- linux-3.0.7/drivers/video/aty/aty128fb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/aty/aty128fb.c	2011-10-11 10:44:33.000000000 -0400
+@@ -148,7 +148,7 @@ enum {
+ };
+ 
+ /* Must match above enum */
+-static const char *r128_family[] __devinitdata = {
++static const char *r128_family[] __devinitconst = {
+ 	"AGP",
+ 	"PCI",
+ 	"PRO AGP",
+diff -urNp linux-3.0.7/drivers/video/fbcmap.c linux-3.0.7/drivers/video/fbcmap.c
+--- linux-3.0.7/drivers/video/fbcmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -34824,9 +36028,9 @@ diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
  		rc = -EINVAL;
  		goto out1;
  	}
-diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
---- linux-3.0.4/drivers/video/fbmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/fbmem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/fbmem.c linux-3.0.7/drivers/video/fbmem.c
+--- linux-3.0.7/drivers/video/fbmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  		}
@@ -34872,9 +36076,42 @@ diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
  			return -EINVAL;
  		if (!registered_fb[con2fb.framebuffer])
  			request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video/i810/i810_accel.c
---- linux-3.0.4/drivers/video/i810/i810_accel.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/i810/i810_accel.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/geode/gx1fb_core.c linux-3.0.7/drivers/video/geode/gx1fb_core.c
+--- linux-3.0.7/drivers/video/geode/gx1fb_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/geode/gx1fb_core.c	2011-10-11 10:44:33.000000000 -0400
+@@ -29,7 +29,7 @@ static int  crt_option = 1;
+ static char panel_option[32] = "";
+ 
+ /* Modes relevant to the GX1 (taken from modedb.c) */
+-static const struct fb_videomode __devinitdata gx1_modedb[] = {
++static const struct fb_videomode __devinitconst gx1_modedb[] = {
+ 	/* 640x480-60 VESA */
+ 	{ NULL, 60, 640, 480, 39682,  48, 16, 33, 10, 96, 2,
+ 	  0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
+diff -urNp linux-3.0.7/drivers/video/gxt4500.c linux-3.0.7/drivers/video/gxt4500.c
+--- linux-3.0.7/drivers/video/gxt4500.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/gxt4500.c	2011-10-11 10:44:33.000000000 -0400
+@@ -156,7 +156,7 @@ struct gxt4500_par {
+ static char *mode_option;
+ 
+ /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
+-static const struct fb_videomode defaultmode __devinitdata = {
++static const struct fb_videomode defaultmode __devinitconst = {
+ 	.refresh = 60,
+ 	.xres = 1280,
+ 	.yres = 1024,
+@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, stru
+ 	return 0;
+ }
+ 
+-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
++static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
+ 	.id = "IBM GXT4500P",
+ 	.type = FB_TYPE_PACKED_PIXELS,
+ 	.visual = FB_VISUAL_PSEUDOCOLOR,
+diff -urNp linux-3.0.7/drivers/video/i810/i810_accel.c linux-3.0.7/drivers/video/i810/i810_accel.c
+--- linux-3.0.7/drivers/video/i810/i810_accel.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 
  		}
  	}
@@ -34883,9 +36120,33 @@ diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video
  	i810_report_error(mmio); 
  	par->dev_flags |= LOCKUP;
  	info->pixmap.scan_align = 1;
-diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm
---- linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm	2011-08-29 23:49:40.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/i810/i810_main.c linux-3.0.7/drivers/video/i810/i810_main.c
+--- linux-3.0.7/drivers/video/i810/i810_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/i810/i810_main.c	2011-10-11 10:44:33.000000000 -0400
+@@ -97,7 +97,7 @@ static int i810fb_blank      (int blank_
+ static void i810fb_release_resource       (struct fb_info *info, struct i810fb_par *par);
+ 
+ /* PCI */
+-static const char *i810_pci_list[] __devinitdata = {
++static const char *i810_pci_list[] __devinitconst = {
+ 	"Intel(R) 810 Framebuffer Device"                                 ,
+ 	"Intel(R) 810-DC100 Framebuffer Device"                           ,
+ 	"Intel(R) 810E Framebuffer Device"                                ,
+diff -urNp linux-3.0.7/drivers/video/jz4740_fb.c linux-3.0.7/drivers/video/jz4740_fb.c
+--- linux-3.0.7/drivers/video/jz4740_fb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/jz4740_fb.c	2011-10-11 10:44:33.000000000 -0400
+@@ -136,7 +136,7 @@ struct jzfb {
+ 	uint32_t pseudo_palette[16];
+ };
+ 
+-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
++static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
+ 	.id		= "JZ4740 FB",
+ 	.type		= FB_TYPE_PACKED_PIXELS,
+ 	.visual		= FB_VISUAL_TRUECOLOR,
+diff -urNp linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/logo/logo_linux_clut224.ppm	2011-08-29 23:49:40.000000000 -0400
 @@ -1,1604 +1,1123 @@
  P3
 -# Standard 224-color Linux logo
@@ -37611,9 +38872,9 @@ diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/dri
 +4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
 +4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
 +4 4 4  4 4 4
-diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
---- linux-3.0.4/drivers/video/udlfb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/udlfb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/udlfb.c linux-3.0.7/drivers/video/udlfb.c
+--- linux-3.0.7/drivers/video/udlfb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -37697,9 +38958,9 @@ diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
  
  	return count;
  }
-diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb.c
---- linux-3.0.4/drivers/video/uvesafb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/uvesafb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/uvesafb.c linux-3.0.7/drivers/video/uvesafb.c
+--- linux-3.0.7/drivers/video/uvesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/uvesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -37775,9 +39036,9 @@ diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb
  		}
  
  		framebuffer_release(info);
-diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
---- linux-3.0.4/drivers/video/vesafb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/vesafb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/vesafb.c linux-3.0.7/drivers/video/vesafb.c
+--- linux-3.0.7/drivers/video/vesafb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/drivers/video/vesafb.c	2011-08-23 21:47:56.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -37880,9 +39141,9 @@ diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
  	if (info->screen_base)
  		iounmap(info->screen_base);
  	framebuffer_release(info);
-diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/via/via_clock.h
---- linux-3.0.4/drivers/video/via/via_clock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/video/via/via_clock.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/drivers/video/via/via_clock.h linux-3.0.7/drivers/video/via/via_clock.h
+--- linux-3.0.7/drivers/video/via/via_clock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -37892,9 +39153,9 @@ diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/v
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virtio/virtio_balloon.c
---- linux-3.0.4/drivers/virtio/virtio_balloon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/drivers/virtio/virtio_balloon.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/drivers/virtio/virtio_balloon.c linux-3.0.7/drivers/virtio/virtio_balloon.c
+--- linux-3.0.7/drivers/virtio/virtio_balloon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -37904,10 +39165,10 @@ diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virti
  	all_vm_events(events);
  	si_meminfo(&i);
  
-diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/fs/9p/vfs_inode.c
---- linux-3.0.4/fs/9p/vfs_inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/9p/vfs_inode.c	2011-08-23 21:47:56.000000000 -0400
-@@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
+diff -urNp linux-3.0.7/fs/9p/vfs_inode.c linux-3.0.7/fs/9p/vfs_inode.c
+--- linux-3.0.7/fs/9p/vfs_inode.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/fs/9p/vfs_inode.c	2011-10-16 21:55:28.000000000 -0400
+@@ -1264,7 +1264,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
  {
@@ -37916,9 +39177,21 @@ diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/fs/9p/vfs_inode.c
  
  	P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
  		IS_ERR(s) ? "<error>" : s);
-diff -urNp linux-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
---- linux-3.0.4/fs/aio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/aio.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/Kconfig.binfmt linux-3.0.7/fs/Kconfig.binfmt
+--- linux-3.0.7/fs/Kconfig.binfmt	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/fs/aio.c linux-3.0.7/fs/aio.c
+--- linux-3.0.7/fs/aio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -37967,9 +39240,9 @@ diff -urNp linux-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
  	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.4/fs/attr.c linux-3.0.4/fs/attr.c
---- linux-3.0.4/fs/attr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/attr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/attr.c linux-3.0.7/fs/attr.c
+--- linux-3.0.7/fs/attr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -37978,9 +39251,9 @@ diff -urNp linux-3.0.4/fs/attr.c linux-3.0.4/fs/attr.c
  		if (limit != RLIM_INFINITY && offset > limit)
  			goto out_sig;
  		if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.0.4/fs/autofs4/waitq.c linux-3.0.4/fs/autofs4/waitq.c
---- linux-3.0.4/fs/autofs4/waitq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/autofs4/waitq.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/autofs4/waitq.c linux-3.0.7/fs/autofs4/waitq.c
+--- linux-3.0.7/fs/autofs4/waitq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/autofs4/waitq.c	2011-10-06 04:17:55.000000000 -0400
 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *fi
  {
  	unsigned long sigpipe, flags;
@@ -37990,9 +39263,9 @@ diff -urNp linux-3.0.4/fs/autofs4/waitq.c linux-3.0.4/fs/autofs4/waitq.c
  	ssize_t wr = 0;
  
  	/** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
-diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
---- linux-3.0.4/fs/befs/linuxvfs.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/fs/befs/linuxvfs.c	2011-08-29 23:26:27.000000000 -0400
+diff -urNp linux-3.0.7/fs/befs/linuxvfs.c linux-3.0.7/fs/befs/linuxvfs.c
+--- linux-3.0.7/fs/befs/linuxvfs.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/fs/befs/linuxvfs.c	2011-08-29 23:26:27.000000000 -0400
 @@ -503,7 +503,7 @@ static void befs_put_link(struct dentry 
  {
  	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
@@ -38002,9 +39275,9 @@ diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
  		if (!IS_ERR(link))
  			kfree(link);
  	}
-diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/fs/binfmt_aout.c
---- linux-3.0.4/fs/binfmt_aout.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_aout.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/binfmt_aout.c linux-3.0.7/fs/binfmt_aout.c
+--- linux-3.0.7/fs/binfmt_aout.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/binfmt_aout.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -38081,9 +39354,9 @@ diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/fs/binfmt_aout.c
  				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
  				fd_offset + ex.a_text);
  		up_write(&current->mm->mmap_sem);
-diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
---- linux-3.0.4/fs/binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_elf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/binfmt_elf.c linux-3.0.7/fs/binfmt_elf.c
+--- linux-3.0.7/fs/binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -38787,9 +40060,9 @@ diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
  	return register_binfmt(&elf_format);
-diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
---- linux-3.0.4/fs/binfmt_flat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/binfmt_flat.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/binfmt_flat.c linux-3.0.7/fs/binfmt_flat.c
+--- linux-3.0.7/fs/binfmt_flat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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",
@@ -38822,9 +40095,9 @@ diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
  			ret = result;
  			goto err;
  		}
-diff -urNp linux-3.0.4/fs/bio.c linux-3.0.4/fs/bio.c
---- linux-3.0.4/fs/bio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/bio.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/bio.c linux-3.0.7/fs/bio.c
+--- linux-3.0.7/fs/bio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/bio.c	2011-10-06 04:17:55.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;
@@ -38834,9 +40107,9 @@ diff -urNp linux-3.0.4/fs/bio.c linux-3.0.4/fs/bio.c
  
  	__bio_for_each_segment(bvec, bio, i, 0) {
  		char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/fs/block_dev.c
---- linux-3.0.4/fs/block_dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/block_dev.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/block_dev.c linux-3.0.7/fs/block_dev.c
+--- linux-3.0.7/fs/block_dev.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/fs/block_dev.c	2011-10-16 21:55:28.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 */
@@ -38846,9 +40119,9 @@ diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/fs/block_dev.c
  		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 -urNp linux-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
---- linux-3.0.4/fs/btrfs/ctree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/ctree.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/btrfs/ctree.c linux-3.0.7/fs/btrfs/ctree.c
+--- linux-3.0.7/fs/btrfs/ctree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -38865,10 +40138,10 @@ diff -urNp linux-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
  			parent_start = 0;
  
  		WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
---- linux-3.0.4/fs/btrfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/inode.c	2011-08-23 21:48:14.000000000 -0400
-@@ -6895,7 +6895,7 @@ fail:
+diff -urNp linux-3.0.7/fs/btrfs/inode.c linux-3.0.7/fs/btrfs/inode.c
+--- linux-3.0.7/fs/btrfs/inode.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/fs/btrfs/inode.c	2011-10-16 21:55:28.000000000 -0400
+@@ -6896,7 +6896,7 @@ fail:
  	return -ENOMEM;
  }
  
@@ -38877,7 +40150,7 @@ diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
  			 struct dentry *dentry, struct kstat *stat)
  {
  	struct inode *inode = dentry->d_inode;
-@@ -6907,6 +6907,14 @@ static int btrfs_getattr(struct vfsmount
+@@ -6908,6 +6908,14 @@ static int btrfs_getattr(struct vfsmount
  	return 0;
  }
  
@@ -38892,9 +40165,9 @@ diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
  /*
   * If a file is moved, it will inherit the cow and compression flags of the new
   * directory.
-diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
---- linux-3.0.4/fs/btrfs/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/ioctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/btrfs/ioctl.c linux-3.0.7/fs/btrfs/ioctl.c
+--- linux-3.0.7/fs/btrfs/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/btrfs/ioctl.c	2011-10-06 04:17:55.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;
@@ -38925,9 +40198,9 @@ diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
  		(arg + sizeof(struct btrfs_ioctl_space_args));
  
  	if (copy_to_user(user_dest, dest_orig, alloc_size))
-diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
---- linux-3.0.4/fs/btrfs/relocation.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/btrfs/relocation.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/btrfs/relocation.c linux-3.0.7/fs/btrfs/relocation.c
+--- linux-3.0.7/fs/btrfs/relocation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -38937,9 +40210,9 @@ diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
  
  	if (!del) {
  		spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
---- linux-3.0.4/fs/cachefiles/bind.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/bind.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/bind.c linux-3.0.7/fs/cachefiles/bind.c
+--- linux-3.0.7/fs/cachefiles/bind.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cachefiles/bind.c	2011-08-23 21:47:56.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
  	       args);
  
@@ -38956,9 +40229,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
  	       cache->bcull_percent < cache->brun_percent &&
  	       cache->brun_percent  < 100);
  
-diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
---- linux-3.0.4/fs/cachefiles/daemon.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/daemon.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/daemon.c linux-3.0.7/fs/cachefiles/daemon.c
+--- linux-3.0.7/fs/cachefiles/daemon.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -38995,9 +40268,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
  		return cachefiles_daemon_range_error(cache, args);
  
  	cache->bstop_percent = bstop;
-diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/internal.h
---- linux-3.0.4/fs/cachefiles/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/internal.h linux-3.0.7/fs/cachefiles/internal.h
+--- linux-3.0.7/fs/cachefiles/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) */
@@ -39032,9 +40305,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/intern
  }
  
  #else
-diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
---- linux-3.0.4/fs/cachefiles/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/namei.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/namei.c linux-3.0.7/fs/cachefiles/namei.c
+--- linux-3.0.7/fs/cachefiles/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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",
@@ -39044,9 +40317,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
  
  	/* do the multiway lock magic */
  	trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
---- linux-3.0.4/fs/cachefiles/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/proc.c linux-3.0.7/fs/cachefiles/proc.c
+--- linux-3.0.7/fs/cachefiles/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cachefiles/proc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -39073,9 +40346,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
  		if (x == 0 && y == 0 && z == 0)
  			return 0;
  
-diff -urNp linux-3.0.4/fs/cachefiles/rdwr.c linux-3.0.4/fs/cachefiles/rdwr.c
---- linux-3.0.4/fs/cachefiles/rdwr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cachefiles/rdwr.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/cachefiles/rdwr.c linux-3.0.7/fs/cachefiles/rdwr.c
+--- linux-3.0.7/fs/cachefiles/rdwr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cachefiles/rdwr.c	2011-10-06 04:17:55.000000000 -0400
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
  			old_fs = get_fs();
  			set_fs(KERNEL_DS);
@@ -39085,9 +40358,9 @@ diff -urNp linux-3.0.4/fs/cachefiles/rdwr.c linux-3.0.4/fs/cachefiles/rdwr.c
  			set_fs(old_fs);
  			kunmap(page);
  			if (ret != len)
-diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
---- linux-3.0.4/fs/ceph/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ceph/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ceph/dir.c linux-3.0.7/fs/ceph/dir.c
+--- linux-3.0.7/fs/ceph/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -39097,9 +40370,9 @@ diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
  	int err;
  	u32 ftype;
  	struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
---- linux-3.0.4/fs/cifs/cifs_debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifs_debug.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.7/fs/cifs/cifs_debug.c linux-3.0.7/fs/cifs/cifs_debug.c
+--- linux-3.0.7/fs/cifs/cifs_debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cifs/cifs_debug.c	2011-08-25 17:18:05.000000000 -0400
 @@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
  
  	if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
@@ -39229,9 +40502,9 @@ diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
  			}
  		}
  	}
-diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
---- linux-3.0.4/fs/cifs/cifsfs.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifsfs.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.7/fs/cifs/cifsfs.c linux-3.0.7/fs/cifs/cifsfs.c
+--- linux-3.0.7/fs/cifs/cifsfs.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/fs/cifs/cifsfs.c	2011-08-25 17:18:05.000000000 -0400
 @@ -994,7 +994,7 @@ cifs_init_request_bufs(void)
  	cifs_req_cachep = kmem_cache_create("cifs_request",
  					    CIFSMaxBufSize +
@@ -39261,9 +40534,9 @@ diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	atomic_set(&midCount, 0);
-diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
---- linux-3.0.4/fs/cifs/cifsglob.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/cifsglob.h	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.7/fs/cifs/cifsglob.h linux-3.0.7/fs/cifs/cifsglob.h
+--- linux-3.0.7/fs/cifs/cifsglob.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cifs/cifsglob.h	2011-08-25 17:18:05.000000000 -0400
 @@ -381,28 +381,28 @@ struct cifs_tcon {
  	__u16 Flags;		/* optional support bits */
  	enum statusEnum tidStatus;
@@ -39335,9 +40608,9 @@ diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
  #endif
  GLOBAL_EXTERN atomic_t smBufAllocCount;
  GLOBAL_EXTERN atomic_t midCount;
-diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
---- linux-3.0.4/fs/cifs/link.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/link.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/cifs/link.c linux-3.0.7/fs/cifs/link.c
+--- linux-3.0.7/fs/cifs/link.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -39347,9 +40620,9 @@ diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
  	if (!IS_ERR(p))
  		kfree(p);
  }
-diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
---- linux-3.0.4/fs/cifs/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/cifs/misc.c	2011-08-25 17:18:05.000000000 -0400
+diff -urNp linux-3.0.7/fs/cifs/misc.c linux-3.0.7/fs/cifs/misc.c
+--- linux-3.0.7/fs/cifs/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/cifs/misc.c	2011-08-25 17:18:05.000000000 -0400
 @@ -156,7 +156,7 @@ cifs_buf_get(void)
  		memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
  		atomic_inc(&bufAllocCount);
@@ -39368,9 +40641,9 @@ diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
  #endif /* CONFIG_CIFS_STATS2 */
  
  	}
-diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
---- linux-3.0.4/fs/coda/cache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/coda/cache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/coda/cache.c linux-3.0.7/fs/coda/cache.c
+--- linux-3.0.7/fs/coda/cache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/coda/cache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -39415,26 +40688,9 @@ diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
  	spin_unlock(&cii->c_lock);
  
  	return hit;
-diff -urNp linux-3.0.4/fs/compat_binfmt_elf.c linux-3.0.4/fs/compat_binfmt_elf.c
---- linux-3.0.4/fs/compat_binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/fs/compat.c linux-3.0.4/fs/compat.c
---- linux-3.0.4/fs/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/compat.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/compat.c linux-3.0.7/fs/compat.c
+--- linux-3.0.7/fs/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/compat.c	2011-10-06 04:17:55.000000000 -0400
 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(const 
  static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
  {
@@ -39571,9 +40827,26 @@ diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
  	set_fs(oldfs);
  
  	if (err)
-diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
---- linux-3.0.4/fs/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/compat_ioctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/compat_binfmt_elf.c linux-3.0.7/fs/compat_binfmt_elf.c
+--- linux-3.0.7/fs/compat_binfmt_elf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/fs/compat_ioctl.c linux-3.0.7/fs/compat_ioctl.c
+--- linux-3.0.7/fs/compat_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/compat_ioctl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
  	err  = get_user(palp, &up->palette);
@@ -39612,9 +40885,9 @@ diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
  	if (a > b)
  		return 1;
  	if (a < b)
-diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
---- linux-3.0.4/fs/configfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/configfs/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/configfs/dir.c linux-3.0.7/fs/configfs/dir.c
+--- linux-3.0.7/fs/configfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -39639,9 +40912,9 @@ diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
  
  				/*
  				 * We'll have a dentry and an inode for
-diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
---- linux-3.0.4/fs/dcache.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/dcache.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/dcache.c linux-3.0.7/fs/dcache.c
+--- linux-3.0.7/fs/dcache.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/dcache.c	2011-08-23 21:47:56.000000000 -0400
 @@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
  	mempages -= reserve;
  
@@ -39651,9 +40924,9 @@ diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
  
  	dcache_init();
  	inode_init();
-diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
---- linux-3.0.4/fs/ecryptfs/inode.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ecryptfs/inode.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/ecryptfs/inode.c linux-3.0.7/fs/ecryptfs/inode.c
+--- linux-3.0.7/fs/ecryptfs/inode.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/fs/ecryptfs/inode.c	2011-10-06 04:17:55.000000000 -0400
 @@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
  	old_fs = get_fs();
  	set_fs(get_ds());
@@ -39681,9 +40954,9 @@ diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
  	if (!IS_ERR(buf)) {
  		/* Free the char* */
  		kfree(buf);
-diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/fs/ecryptfs/miscdev.c
---- linux-3.0.4/fs/ecryptfs/miscdev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ecryptfs/miscdev.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ecryptfs/miscdev.c linux-3.0.7/fs/ecryptfs/miscdev.c
+--- linux-3.0.7/fs/ecryptfs/miscdev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -39693,9 +40966,9 @@ diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/fs/ecryptfs/miscdev.c
  			goto out_unlock_msg_ctx;
  		i += packet_length_size;
  		if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-3.0.4/fs/ecryptfs/read_write.c linux-3.0.4/fs/ecryptfs/read_write.c
---- linux-3.0.4/fs/ecryptfs/read_write.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ecryptfs/read_write.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/ecryptfs/read_write.c linux-3.0.7/fs/ecryptfs/read_write.c
+--- linux-3.0.7/fs/ecryptfs/read_write.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/fs/ecryptfs/read_write.c	2011-10-06 04:17:55.000000000 -0400
 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *e
  		return -EIO;
  	fs_save = get_fs();
@@ -39714,9 +40987,9 @@ diff -urNp linux-3.0.4/fs/ecryptfs/read_write.c linux-3.0.4/fs/ecryptfs/read_wri
  	set_fs(fs_save);
  	return rc;
  }
-diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
---- linux-3.0.4/fs/exec.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/exec.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/exec.c linux-3.0.7/fs/exec.c
+--- linux-3.0.7/fs/exec.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/fs/exec.c	2011-10-17 23:17:19.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
@@ -39974,7 +41247,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  		bprm->unsafe |= LSM_UNSAFE_SHARE;
  	} else {
  		res = -EAGAIN;
-@@ -1428,11 +1445,35 @@ static int do_execve_common(const char *
+@@ -1430,11 +1447,35 @@ static int do_execve_common(const char *
  				struct user_arg_ptr envp,
  				struct pt_regs *regs)
  {
@@ -40010,7 +41283,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  
  	retval = unshare_files(&displaced);
  	if (retval)
-@@ -1464,6 +1505,16 @@ static int do_execve_common(const char *
+@@ -1466,6 +1507,16 @@ static int do_execve_common(const char *
  	bprm->filename = filename;
  	bprm->interp = filename;
  
@@ -40027,7 +41300,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	retval = bprm_mm_init(bprm);
  	if (retval)
  		goto out_file;
-@@ -1493,9 +1544,40 @@ static int do_execve_common(const char *
+@@ -1495,9 +1546,40 @@ static int do_execve_common(const char *
  	if (retval < 0)
  		goto out;
  
@@ -40069,7 +41342,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  
  	/* execve succeeded */
  	current->fs->in_exec = 0;
-@@ -1506,6 +1588,14 @@ static int do_execve_common(const char *
+@@ -1508,6 +1590,14 @@ static int do_execve_common(const char *
  		put_files_struct(displaced);
  	return retval;
  
@@ -40084,7 +41357,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  out:
  	if (bprm->mm) {
  		acct_arg_size(bprm, 0);
-@@ -1579,7 +1669,7 @@ static int expand_corename(struct core_n
+@@ -1581,7 +1671,7 @@ static int expand_corename(struct core_n
  {
  	char *old_corename = cn->corename;
  
@@ -40093,7 +41366,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
  
  	if (!cn->corename) {
-@@ -1667,7 +1757,7 @@ static int format_corename(struct core_n
+@@ -1669,7 +1759,7 @@ static int format_corename(struct core_n
  	int pid_in_pattern = 0;
  	int err = 0;
  
@@ -40102,7 +41375,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	cn->corename = kmalloc(cn->size, GFP_KERNEL);
  	cn->used = 0;
  
-@@ -1758,6 +1848,219 @@ out:
+@@ -1760,6 +1850,219 @@ out:
  	return ispipe;
  }
  
@@ -40322,7 +41595,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  static int zap_process(struct task_struct *start, int exit_code)
  {
  	struct task_struct *t;
-@@ -1969,17 +2272,17 @@ static void wait_for_dump_helpers(struct
+@@ -1971,17 +2274,17 @@ static void wait_for_dump_helpers(struct
  	pipe = file->f_path.dentry->d_inode->i_pipe;
  
  	pipe_lock(pipe);
@@ -40345,7 +41618,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	pipe_unlock(pipe);
  
  }
-@@ -2040,7 +2343,7 @@ void do_coredump(long signr, int exit_co
+@@ -2042,7 +2345,7 @@ void do_coredump(long signr, int exit_co
  	int retval = 0;
  	int flag = 0;
  	int ispipe;
@@ -40354,7 +41627,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	struct coredump_params cprm = {
  		.signr = signr,
  		.regs = regs,
-@@ -2055,6 +2358,9 @@ void do_coredump(long signr, int exit_co
+@@ -2057,6 +2360,9 @@ void do_coredump(long signr, int exit_co
  
  	audit_core_dumps(signr);
  
@@ -40364,7 +41637,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  	binfmt = mm->binfmt;
  	if (!binfmt || !binfmt->core_dump)
  		goto fail;
-@@ -2095,6 +2401,8 @@ void do_coredump(long signr, int exit_co
+@@ -2097,6 +2403,8 @@ void do_coredump(long signr, int exit_co
  		goto fail_corename;
  	}
  
@@ -40373,7 +41646,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
   	if (ispipe) {
  		int dump_count;
  		char **helper_argv;
-@@ -2122,7 +2430,7 @@ void do_coredump(long signr, int exit_co
+@@ -2124,7 +2432,7 @@ void do_coredump(long signr, int exit_co
  		}
  		cprm.limit = RLIM_INFINITY;
  
@@ -40382,7 +41655,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  		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);
-@@ -2192,7 +2500,7 @@ close_fail:
+@@ -2194,7 +2502,7 @@ close_fail:
  		filp_close(cprm.file, NULL);
  fail_dropcount:
  	if (ispipe)
@@ -40391,7 +41664,7 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  fail_unlock:
  	kfree(cn.corename);
  fail_corename:
-@@ -2211,7 +2519,7 @@ fail:
+@@ -2213,7 +2521,7 @@ fail:
   */
  int dump_write(struct file *file, const void *addr, int nr)
  {
@@ -40400,9 +41673,9 @@ diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
  }
  EXPORT_SYMBOL(dump_write);
  
-diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
---- linux-3.0.4/fs/ext2/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext2/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext2/balloc.c linux-3.0.7/fs/ext2/balloc.c
+--- linux-3.0.7/fs/ext2/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -40412,9 +41685,9 @@ diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
---- linux-3.0.4/fs/ext3/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext3/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext3/balloc.c linux-3.0.7/fs/ext3/balloc.c
+--- linux-3.0.7/fs/ext3/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -40424,9 +41697,9 @@ diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
  		sbi->s_resuid != current_fsuid() &&
  		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
  		return 0;
-diff -urNp linux-3.0.4/fs/ext3/ioctl.c linux-3.0.4/fs/ext3/ioctl.c
---- linux-3.0.4/fs/ext3/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext3/ioctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext3/ioctl.c linux-3.0.7/fs/ext3/ioctl.c
+--- linux-3.0.7/fs/ext3/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/ext3/ioctl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -285,7 +285,7 @@ group_add_out:
  		if (!capable(CAP_SYS_ADMIN))
  			return -EPERM;
@@ -40445,9 +41718,9 @@ diff -urNp linux-3.0.4/fs/ext3/ioctl.c linux-3.0.4/fs/ext3/ioctl.c
  				 sizeof(range)))
  			return -EFAULT;
  
-diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
---- linux-3.0.4/fs/ext4/balloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext4/balloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext4/balloc.c linux-3.0.7/fs/ext4/balloc.c
+--- linux-3.0.7/fs/ext4/balloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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() ||
@@ -40459,9 +41732,9 @@ diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
  
  		if (free_blocks >= (nblocks + dirty_blocks))
  			return 1;
-diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
---- linux-3.0.4/fs/ext4/ext4.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ext4/ext4.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext4/ext4.h linux-3.0.7/fs/ext4/ext4.h
+--- linux-3.0.7/fs/ext4/ext4.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -40492,9 +41765,23 @@ diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
  	atomic_t s_lock_busy;
  
  	/* locality groups */
-diff -urNp linux-3.0.4/fs/ext4/ioctl.c linux-3.0.4/fs/ext4/ioctl.c
---- linux-3.0.4/fs/ext4/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ext4/ioctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext4/file.c linux-3.0.7/fs/ext4/file.c
+--- linux-3.0.7/fs/ext4/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/ext4/file.c	2011-10-17 02:30:30.000000000 -0400
+@@ -181,8 +181,8 @@ static int ext4_file_open(struct inode *
+ 		path.dentry = mnt->mnt_root;
+ 		cp = d_path(&path, buf, sizeof(buf));
+ 		if (!IS_ERR(cp)) {
+-			memcpy(sbi->s_es->s_last_mounted, cp,
+-			       sizeof(sbi->s_es->s_last_mounted));
++			strlcpy(sbi->s_es->s_last_mounted, cp,
++			        sizeof(sbi->s_es->s_last_mounted));
+ 			ext4_mark_super_dirty(sb);
+ 		}
+ 	}
+diff -urNp linux-3.0.7/fs/ext4/ioctl.c linux-3.0.7/fs/ext4/ioctl.c
+--- linux-3.0.7/fs/ext4/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/ext4/ioctl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -344,7 +344,7 @@ mext_out:
  		if (!blk_queue_discard(q))
  			return -EOPNOTSUPP;
@@ -40513,9 +41800,9 @@ diff -urNp linux-3.0.4/fs/ext4/ioctl.c linux-3.0.4/fs/ext4/ioctl.c
  		    sizeof(range)))
  			return -EFAULT;
  
-diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
---- linux-3.0.4/fs/ext4/mballoc.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/ext4/mballoc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ext4/mballoc.c linux-3.0.7/fs/ext4/mballoc.c
+--- linux-3.0.7/fs/ext4/mballoc.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -40638,9 +41925,9 @@ diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
  	trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
  	return 0;
-diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
---- linux-3.0.4/fs/fcntl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fcntl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/fcntl.c linux-3.0.7/fs/fcntl.c
+--- linux-3.0.7/fs/fcntl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/fcntl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
  	if (err)
  		return err;
@@ -40696,9 +41983,9 @@ diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
  		));
  
  	fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
---- linux-3.0.4/fs/fifo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fifo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fifo.c linux-3.0.7/fs/fifo.c
+--- linux-3.0.7/fs/fifo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -40769,9 +42056,9 @@ diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
  		free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
---- linux-3.0.4/fs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/file.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/file.c linux-3.0.7/fs/file.c
+--- linux-3.0.7/fs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/file.c	2011-08-23 21:48:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -40788,9 +42075,9 @@ diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
  	if (nr >= rlimit(RLIMIT_NOFILE))
  		return -EMFILE;
  
-diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
---- linux-3.0.4/fs/filesystems.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/filesystems.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/filesystems.c linux-3.0.7/fs/filesystems.c
+--- linux-3.0.7/fs/filesystems.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -40804,9 +42091,101 @@ diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
  		fs = __get_fs_type(name, len);
  
  	if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
---- linux-3.0.4/fs/fscache/cookie.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/cookie.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fs_struct.c linux-3.0.7/fs/fs_struct.c
+--- linux-3.0.7/fs/fs_struct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 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)
+ 
+ 	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.7/fs/fscache/cookie.c linux-3.0.7/fs/fscache/cookie.c
+--- linux-3.0.7/fs/fscache/cookie.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -40925,9 +42304,9 @@ diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
  		wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
  			    fscache_wait_bit, TASK_UNINTERRUPTIBLE);
  	}
-diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
---- linux-3.0.4/fs/fscache/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fscache/internal.h linux-3.0.7/fs/fscache/internal.h
+--- linux-3.0.7/fs/fscache/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -41131,9 +42510,9 @@ diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
---- linux-3.0.4/fs/fscache/object.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/object.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fscache/object.c linux-3.0.7/fs/fscache/object.c
+--- linux-3.0.7/fs/fscache/object.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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:
@@ -41245,9 +42624,9 @@ diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
  		break;
  
  	default:
-diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
---- linux-3.0.4/fs/fscache/operation.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/operation.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fscache/operation.c linux-3.0.7/fs/fscache/operation.c
+--- linux-3.0.7/fs/fscache/operation.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/fscache/operation.c	2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -41363,9 +42742,9 @@ diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
  
  		ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
---- linux-3.0.4/fs/fscache/page.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/page.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fscache/page.c linux-3.0.7/fs/fscache/page.c
+--- linux-3.0.7/fs/fscache/page.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -41749,9 +43128,9 @@ diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
  #endif
  
  	for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
---- linux-3.0.4/fs/fscache/stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fscache/stats.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fscache/stats.c linux-3.0.7/fs/fscache/stats.c
+--- linux-3.0.7/fs/fscache/stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/fscache/stats.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -42127,101 +43506,9 @@ diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
  
  	seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
  		   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-3.0.4/fs/fs_struct.c linux-3.0.4/fs/fs_struct.c
---- linux-3.0.4/fs/fs_struct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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 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)
- 
- 	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.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
---- linux-3.0.4/fs/fuse/cuse.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fuse/cuse.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fuse/cuse.c linux-3.0.7/fs/fuse/cuse.c
+--- linux-3.0.7/fs/fuse/cuse.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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]);
  
@@ -42239,9 +43526,9 @@ diff -urNp linux-3.0.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
  
  	cuse_class = class_create(THIS_MODULE, "cuse");
  	if (IS_ERR(cuse_class))
-diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
---- linux-3.0.4/fs/fuse/dev.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/fs/fuse/dev.c	2011-08-29 23:26:27.000000000 -0400
+diff -urNp linux-3.0.7/fs/fuse/dev.c linux-3.0.7/fs/fuse/dev.c
+--- linux-3.0.7/fs/fuse/dev.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/fs/fuse/dev.c	2011-08-29 23:26:27.000000000 -0400
 @@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
  	ret = 0;
  	pipe_lock(pipe);
@@ -42251,9 +43538,9 @@ diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
  		send_sig(SIGPIPE, current, 0);
  		if (!ret)
  			ret = -EPIPE;
-diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
---- linux-3.0.4/fs/fuse/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/fuse/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/fuse/dir.c linux-3.0.7/fs/fuse/dir.c
+--- linux-3.0.7/fs/fuse/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -42263,9 +43550,9 @@ diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
  {
  	if (!IS_ERR(link))
  		free_page((unsigned long) link);
-diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
---- linux-3.0.4/fs/gfs2/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/gfs2/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/gfs2/inode.c linux-3.0.7/fs/gfs2/inode.c
+--- linux-3.0.7/fs/gfs2/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -42275,9 +43562,9 @@ diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
  	if (!IS_ERR(s))
  		kfree(s);
  }
-diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
---- linux-3.0.4/fs/hfsplus/catalog.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/catalog.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hfsplus/catalog.c linux-3.0.7/fs/hfsplus/catalog.c
+--- linux-3.0.7/fs/hfsplus/catalog.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42305,9 +43592,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
  	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 -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
---- linux-3.0.4/fs/hfsplus/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hfsplus/dir.c linux-3.0.7/fs/hfsplus/dir.c
+--- linux-3.0.7/fs/hfsplus/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42317,9 +43604,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
  	if (filp->f_pos >= inode->i_size)
  		return 0;
  
-diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
---- linux-3.0.4/fs/hfsplus/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hfsplus/inode.c linux-3.0.7/fs/hfsplus/inode.c
+--- linux-3.0.7/fs/hfsplus/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42338,9 +43625,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
  	if (HFSPLUS_IS_RSRC(inode))
  		main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
---- linux-3.0.4/fs/hfsplus/ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/ioctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hfsplus/ioctl.c linux-3.0.7/fs/hfsplus/ioctl.c
+--- linux-3.0.7/fs/hfsplus/ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42359,9 +43646,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
  	if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
  		return -EOPNOTSUPP;
  
-diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
---- linux-3.0.4/fs/hfsplus/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hfsplus/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hfsplus/super.c linux-3.0.7/fs/hfsplus/super.c
+--- linux-3.0.7/fs/hfsplus/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42371,9 +43658,9 @@ diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
  	err = -EINVAL;
  	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
  	if (!sbi)
-diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
---- linux-3.0.4/fs/hugetlbfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/hugetlbfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/hugetlbfs/inode.c linux-3.0.7/fs/hugetlbfs/inode.c
+--- linux-3.0.7/fs/hugetlbfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
  };
@@ -42383,9 +43670,9 @@ diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
---- linux-3.0.4/fs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/inode.c linux-3.0.7/fs/inode.c
+--- linux-3.0.7/fs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/inode.c	2011-08-23 21:47:56.000000000 -0400
 @@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
@@ -42397,9 +43684,9 @@ diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
  
  		res = next - LAST_INO_BATCH;
  	}
-diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
---- linux-3.0.4/fs/jbd/checkpoint.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jbd/checkpoint.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/jbd/checkpoint.c linux-3.0.7/fs/jbd/checkpoint.c
+--- linux-3.0.7/fs/jbd/checkpoint.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42409,9 +43696,9 @@ diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
  	jbd_debug(1, "Start checkpoint\n");
  
  	/*
-diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
---- linux-3.0.4/fs/jffs2/compr_rtime.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/compr_rtime.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/jffs2/compr_rtime.c linux-3.0.7/fs/jffs2/compr_rtime.c
+--- linux-3.0.7/fs/jffs2/compr_rtime.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42430,9 +43717,9 @@ diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
  	memset(positions,0,sizeof(positions));
  
  	while (outpos<destlen) {
-diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
---- linux-3.0.4/fs/jffs2/compr_rubin.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/compr_rubin.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/jffs2/compr_rubin.c linux-3.0.7/fs/jffs2/compr_rubin.c
+--- linux-3.0.7/fs/jffs2/compr_rubin.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42442,9 +43729,9 @@ diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
  	mysrclen = *sourcelen;
  	mydstlen = *dstlen - 8;
  
-diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
---- linux-3.0.4/fs/jffs2/erase.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/erase.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/jffs2/erase.c linux-3.0.7/fs/jffs2/erase.c
+--- linux-3.0.7/fs/jffs2/erase.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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),
@@ -42455,9 +43742,9 @@ diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
  		};
  
  		jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
---- linux-3.0.4/fs/jffs2/wbuf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/wbuf.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/jffs2/wbuf.c linux-3.0.7/fs/jffs2/wbuf.c
+--- linux-3.0.7/fs/jffs2/wbuf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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),
@@ -42468,9 +43755,9 @@ diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
---- linux-3.0.4/fs/jffs2/xattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jffs2/xattr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/jffs2/xattr.c linux-3.0.7/fs/jffs2/xattr.c
+--- linux-3.0.7/fs/jffs2/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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));
@@ -42480,9 +43767,9 @@ diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
  	/* Phase.1 : Merge same xref */
  	for (i=0; i < XREF_TMPHASH_SIZE; i++)
  		xref_tmphash[i] = NULL;
-diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
---- linux-3.0.4/fs/jfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/jfs/super.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/jfs/super.c linux-3.0.7/fs/jfs/super.c
+--- linux-3.0.7/fs/jfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 =
@@ -42492,21 +43779,9 @@ diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
  			    init_once);
  	if (jfs_inode_cachep == NULL)
  		return -ENOMEM;
-diff -urNp linux-3.0.4/fs/Kconfig.binfmt linux-3.0.4/fs/Kconfig.binfmt
---- linux-3.0.4/fs/Kconfig.binfmt	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/fs/libfs.c linux-3.0.4/fs/libfs.c
---- linux-3.0.4/fs/libfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/libfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/libfs.c linux-3.0.7/fs/libfs.c
+--- linux-3.0.7/fs/libfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -42531,9 +43806,9 @@ diff -urNp linux-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
  					    next->d_name.len, filp->f_pos, 
  					    next->d_inode->i_ino, 
  					    dt_type(next->d_inode)) < 0)
-diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
---- linux-3.0.4/fs/lockd/clntproc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/lockd/clntproc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/lockd/clntproc.c linux-3.0.7/fs/lockd/clntproc.c
+--- linux-3.0.7/fs/lockd/clntproc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -42557,9 +43832,9 @@ diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
  	req = &reqst;
  	memset(req, 0, sizeof(*req));
  	locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
---- linux-3.0.4/fs/locks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/locks.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/locks.c linux-3.0.7/fs/locks.c
+--- linux-3.0.7/fs/locks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/locks.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
  		return;
  
@@ -42581,9 +43856,9 @@ diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
  	}
  
  	lock_flocks();
-diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
---- linux-3.0.4/fs/logfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/logfs/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/logfs/super.c linux-3.0.7/fs/logfs/super.c
+--- linux-3.0.7/fs/logfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -42593,10 +43868,10 @@ diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
  	/* read first superblock */
  	err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
  	if (err)
-diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
---- linux-3.0.4/fs/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/namei.c	2011-10-06 03:40:11.000000000 -0400
-@@ -237,21 +237,31 @@ int generic_permission(struct inode *ino
+diff -urNp linux-3.0.7/fs/namei.c linux-3.0.7/fs/namei.c
+--- linux-3.0.7/fs/namei.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/fs/namei.c	2011-10-19 10:09:26.000000000 -0400
+@@ -237,21 +237,23 @@ int generic_permission(struct inode *ino
  		return ret;
  
  	/*
@@ -42609,10 +43884,6 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
 -		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 (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
  			return 0;
 +	}
@@ -42627,27 +43898,13 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
 -	if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
 -		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 (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
  			return 0;
 +	}
  
  	return -EACCES;
  }
-@@ -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
+@@ -593,9 +595,12 @@ static inline int exec_permission(struct
  	if (ret == -ECHILD)
  		return ret;
  
@@ -42656,17 +43913,13 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
 +	if (ns_capable_nolog(ns, CAP_DAC_OVERRIDE))
  		goto ok;
 +	else {
-+#ifdef CONFIG_GRKERNSEC
-+		if (flags & IPERM_FLAG_RCU)
-+			return -ECHILD;
-+#endif
 +		if (ns_capable(ns, CAP_DAC_READ_SEARCH) || ns_capable(ns, CAP_DAC_OVERRIDE))
 +			goto ok;
 +	}
  
  	return ret;
  ok:
-@@ -703,11 +723,26 @@ follow_link(struct path *link, struct na
+@@ -703,11 +708,19 @@ follow_link(struct path *link, struct na
  		return error;
  	}
  
@@ -42678,13 +43931,6 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
 +		return error;
 +	}
 +
-+	if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
-+		error = -ENOENT;
-+		*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);
@@ -42694,7 +43940,20 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		error = 0;
  		if (s)
  			error = __vfs_follow_link(nd, s);
-@@ -1625,6 +1660,9 @@ static int do_path_lookup(int dfd, const
+@@ -1598,6 +1611,12 @@ static int path_lookupat(int dfd, const 
+ 	if (!err)
+ 		err = complete_walk(nd);
+ 
++	if (!(nd->flags & LOOKUP_PARENT) && !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++		if (!err)
++			path_put(&nd->path);
++		err = -ENOENT;
++	}
++
+ 	if (!err && nd->flags & LOOKUP_DIRECTORY) {
+ 		if (!nd->inode->i_op->lookup) {
+ 			path_put(&nd->path);
+@@ -1625,6 +1644,9 @@ static int do_path_lookup(int dfd, const
  		retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
  
  	if (likely(!retval)) {
@@ -42704,7 +43963,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		if (unlikely(!audit_dummy_context())) {
  			if (nd->path.dentry && nd->inode)
  				audit_inode(name, nd->path.dentry);
-@@ -1935,6 +1973,30 @@ int vfs_create(struct inode *dir, struct
+@@ -1935,6 +1957,30 @@ int vfs_create(struct inode *dir, struct
  	return error;
  }
  
@@ -42735,7 +43994,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  static int may_open(struct path *path, int acc_mode, int flag)
  {
  	struct dentry *dentry = path->dentry;
-@@ -1987,7 +2049,27 @@ static int may_open(struct path *path, i
+@@ -1987,7 +2033,27 @@ static int may_open(struct path *path, i
  	/*
  	 * Ensure there are no outstanding leases on the file.
  	 */
@@ -42764,7 +44023,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  }
  
  static int handle_truncate(struct file *filp)
-@@ -2013,30 +2095,6 @@ static int handle_truncate(struct file *
+@@ -2013,30 +2079,6 @@ static int handle_truncate(struct file *
  }
  
  /*
@@ -42795,7 +44054,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
   * Handle the last step of open()
   */
  static struct file *do_last(struct nameidata *nd, struct path *path,
-@@ -2045,6 +2103,7 @@ static struct file *do_last(struct namei
+@@ -2045,6 +2087,7 @@ static struct file *do_last(struct namei
  	struct dentry *dir = nd->path.dentry;
  	struct dentry *dentry;
  	int open_flag = op->open_flag;
@@ -42803,7 +44062,41 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	int will_truncate = open_flag & O_TRUNC;
  	int want_write = 0;
  	int acc_mode = op->acc_mode;
-@@ -2132,6 +2191,12 @@ static struct file *do_last(struct namei
+@@ -2065,6 +2108,10 @@ static struct file *do_last(struct namei
+ 		error = complete_walk(nd);
+ 		if (error)
+ 			return ERR_PTR(error);
++		if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++			error = -ENOENT;
++			goto exit;
++		}
+ 		audit_inode(pathname, nd->path.dentry);
+ 		if (open_flag & O_CREAT) {
+ 			error = -EISDIR;
+@@ -2075,6 +2122,10 @@ static struct file *do_last(struct namei
+ 		error = complete_walk(nd);
+ 		if (error)
+ 			return ERR_PTR(error);
++		if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
++			error = -ENOENT;
++			goto exit;
++		}
+ 		audit_inode(pathname, dir);
+ 		goto ok;
+ 	}
+@@ -2097,6 +2148,11 @@ static struct file *do_last(struct namei
+ 		if (error)
+ 			return ERR_PTR(-ECHILD);
+ 
++		if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
++			error = -ENOENT;
++			goto exit;
++		}
++
+ 		error = -ENOTDIR;
+ 		if (nd->flags & LOOKUP_DIRECTORY) {
+ 			if (!nd->inode->i_op->lookup)
+@@ -2132,6 +2188,12 @@ static struct file *do_last(struct namei
  	/* Negative dentry, just create the file */
  	if (!dentry->d_inode) {
  		int mode = op->mode;
@@ -42816,7 +44109,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current_umask();
  		/*
-@@ -2155,6 +2220,8 @@ static struct file *do_last(struct namei
+@@ -2155,6 +2217,8 @@ static struct file *do_last(struct namei
  		error = vfs_create(dir->d_inode, dentry, mode, nd);
  		if (error)
  			goto exit_mutex_unlock;
@@ -42825,11 +44118,16 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		mutex_unlock(&dir->d_inode->i_mutex);
  		dput(nd->path.dentry);
  		nd->path.dentry = dentry;
-@@ -2164,6 +2231,14 @@ static struct file *do_last(struct namei
+@@ -2164,6 +2228,19 @@ static struct file *do_last(struct namei
  	/*
  	 * It already exists.
  	 */
 +
++	if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
++		error = -ENOENT;
++		goto exit_mutex_unlock;
++	}
++
 +	/* only check if O_CREAT is specified, all other checks need to go
 +	   into may_open */
 +	if (gr_handle_fifo(path->dentry, path->mnt, dir, flag, acc_mode)) {
@@ -42840,7 +44138,18 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	mutex_unlock(&dir->d_inode->i_mutex);
  	audit_inode(pathname, path->dentry);
  
-@@ -2450,6 +2525,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2373,6 +2450,10 @@ struct dentry *lookup_create(struct name
+ 	}
+ 	return dentry;
+ eexist:
++	if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
++		dput(dentry);
++		return ERR_PTR(-ENOENT);
++	}
+ 	dput(dentry);
+ 	dentry = ERR_PTR(-EEXIST);
+ fail:
+@@ -2450,6 +2531,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	error = may_mknod(mode);
  	if (error)
  		goto out_dput;
@@ -42858,7 +44167,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2470,6 +2556,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
+@@ -2470,6 +2562,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const
  	}
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
@@ -42868,7 +44177,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2522,6 +2611,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2522,6 +2617,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -42880,7 +44189,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	if (!IS_POSIXACL(nd.path.dentry->d_inode))
  		mode &= ~current_umask();
  	error = mnt_want_write(nd.path.mnt);
-@@ -2533,6 +2627,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const
+@@ -2533,6 +2633,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);
@@ -42891,7 +44200,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  out_dput:
  	dput(dentry);
  out_unlock:
-@@ -2613,6 +2711,8 @@ static long do_rmdir(int dfd, const char
+@@ -2615,6 +2719,8 @@ static long do_rmdir(int dfd, const char
  	char * name;
  	struct dentry *dentry;
  	struct nameidata nd;
@@ -42900,7 +44209,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2641,6 +2741,17 @@ static long do_rmdir(int dfd, const char
+@@ -2643,6 +2749,17 @@ static long do_rmdir(int dfd, const char
  		error = -ENOENT;
  		goto exit3;
  	}
@@ -42918,7 +44227,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto exit3;
-@@ -2648,6 +2759,8 @@ static long do_rmdir(int dfd, const char
+@@ -2650,6 +2767,8 @@ static long do_rmdir(int dfd, const char
  	if (error)
  		goto exit4;
  	error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
@@ -42927,7 +44236,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit4:
  	mnt_drop_write(nd.path.mnt);
  exit3:
-@@ -2710,6 +2823,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2712,6 +2831,8 @@ static long do_unlinkat(int dfd, const c
  	struct dentry *dentry;
  	struct nameidata nd;
  	struct inode *inode = NULL;
@@ -42936,7 +44245,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  
  	error = user_path_parent(dfd, pathname, &nd, &name);
  	if (error)
-@@ -2732,6 +2847,16 @@ static long do_unlinkat(int dfd, const c
+@@ -2734,6 +2855,16 @@ static long do_unlinkat(int dfd, const c
  		if (!inode)
  			goto slashes;
  		ihold(inode);
@@ -42953,7 +44262,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		error = mnt_want_write(nd.path.mnt);
  		if (error)
  			goto exit2;
-@@ -2739,6 +2864,8 @@ static long do_unlinkat(int dfd, const c
+@@ -2741,6 +2872,8 @@ static long do_unlinkat(int dfd, const c
  		if (error)
  			goto exit3;
  		error = vfs_unlink(nd.path.dentry->d_inode, dentry);
@@ -42962,7 +44271,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit3:
  		mnt_drop_write(nd.path.mnt);
  	exit2:
-@@ -2816,6 +2943,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2818,6 +2951,11 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (IS_ERR(dentry))
  		goto out_unlock;
  
@@ -42974,7 +44283,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2823,6 +2955,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
+@@ -2825,6 +2963,8 @@ SYSCALL_DEFINE3(symlinkat, const char __
  	if (error)
  		goto out_drop_write;
  	error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
@@ -42983,7 +44292,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -2931,6 +3065,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2933,6 +3073,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
  	error = PTR_ERR(new_dentry);
  	if (IS_ERR(new_dentry))
  		goto out_unlock;
@@ -43004,7 +44313,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = mnt_want_write(nd.path.mnt);
  	if (error)
  		goto out_dput;
-@@ -2938,6 +3086,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con
+@@ -2940,6 +3094,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);
@@ -43013,7 +44322,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  out_drop_write:
  	mnt_drop_write(nd.path.mnt);
  out_dput:
-@@ -3113,6 +3263,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3117,6 +3273,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	char *to;
  	int error;
  
@@ -43022,7 +44331,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = user_path_parent(olddfd, oldname, &oldnd, &from);
  	if (error)
  		goto exit;
-@@ -3169,6 +3321,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3173,6 +3331,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  	if (new_dentry == trap)
  		goto exit5;
  
@@ -43035,7 +44344,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	error = mnt_want_write(oldnd.path.mnt);
  	if (error)
  		goto exit5;
-@@ -3178,6 +3336,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
+@@ -3182,6 +3346,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c
  		goto exit6;
  	error = vfs_rename(old_dir->d_inode, old_dentry,
  				   new_dir->d_inode, new_dentry);
@@ -43045,7 +44354,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  exit6:
  	mnt_drop_write(oldnd.path.mnt);
  exit5:
-@@ -3203,6 +3364,8 @@ SYSCALL_DEFINE2(rename, const char __use
+@@ -3207,6 +3374,8 @@ SYSCALL_DEFINE2(rename, const char __use
  
  int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
  {
@@ -43054,7 +44363,7 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  	int len;
  
  	len = PTR_ERR(link);
-@@ -3212,7 +3375,14 @@ int vfs_readlink(struct dentry *dentry, 
+@@ -3216,7 +3385,14 @@ int vfs_readlink(struct dentry *dentry, 
  	len = strlen(link);
  	if (len > (unsigned) buflen)
  		len = buflen;
@@ -43070,9 +44379,9 @@ diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
  		len = -EFAULT;
  out:
  	return len;
-diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
---- linux-3.0.4/fs/namespace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/namespace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/namespace.c linux-3.0.7/fs/namespace.c
+--- linux-3.0.7/fs/namespace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -43132,9 +44441,9 @@ diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
  	get_fs_root(current->fs, &root);
  	error = lock_mount(&old);
  	if (error)
-diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
---- linux-3.0.4/fs/ncpfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ncpfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ncpfs/dir.c linux-3.0.7/fs/ncpfs/dir.c
+--- linux-3.0.7/fs/ncpfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -43180,9 +44489,9 @@ diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
  	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 -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
---- linux-3.0.4/fs/ncpfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ncpfs/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ncpfs/inode.c linux-3.0.7/fs/ncpfs/inode.c
+--- linux-3.0.7/fs/ncpfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -43192,9 +44501,9 @@ diff -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
  	memset(&data, 0, sizeof(data));
  	server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
  	if (!server)
-diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
---- linux-3.0.4/fs/nfs/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfs/inode.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/nfs/inode.c linux-3.0.7/fs/nfs/inode.c
+--- linux-3.0.7/fs/nfs/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -43224,9 +44533,9 @@ diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
---- linux-3.0.4/fs/nfsd/nfs4state.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/nfs4state.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/nfsd/nfs4state.c linux-3.0.7/fs/nfsd/nfs4state.c
+--- linux-3.0.7/fs/nfsd/nfs4state.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -43236,9 +44545,9 @@ diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
  	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
  		(long long) lock->lk_offset,
  		(long long) lock->lk_length);
-diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
---- linux-3.0.4/fs/nfsd/nfs4xdr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/nfs4xdr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/nfsd/nfs4xdr.c linux-3.0.7/fs/nfsd/nfs4xdr.c
+--- linux-3.0.7/fs/nfsd/nfs4xdr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
  	};
@@ -43248,9 +44557,9 @@ diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
  	BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
  	BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
  	BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
---- linux-3.0.4/fs/nfsd/vfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/nfsd/vfs.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/nfsd/vfs.c linux-3.0.7/fs/nfsd/vfs.c
+--- linux-3.0.7/fs/nfsd/vfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/nfsd/vfs.c	2011-10-06 04:17:55.000000000 -0400
 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
  	} else {
  		oldfs = get_fs();
@@ -43278,9 +44587,9 @@ diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
  	set_fs(oldfs);
  
  	if (host_err < 0)
-diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/fanotify/fanotify_user.c
---- linux-3.0.4/fs/notify/fanotify/fanotify_user.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/notify/fanotify/fanotify_user.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/notify/fanotify/fanotify_user.c linux-3.0.7/fs/notify/fanotify/fanotify_user.c
+--- linux-3.0.7/fs/notify/fanotify/fanotify_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -43291,9 +44600,9 @@ diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/
  			 fanotify_event_metadata.event_len))
  		goto out_kill_access_response;
  
-diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notification.c
---- linux-3.0.4/fs/notify/notification.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/notify/notification.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/notify/notification.c linux-3.0.7/fs/notify/notification.c
+--- linux-3.0.7/fs/notify/notification.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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'
   */
@@ -43312,9 +44621,9 @@ diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notificati
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/fs/ntfs/dir.c
---- linux-3.0.4/fs/ntfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ntfs/dir.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ntfs/dir.c linux-3.0.7/fs/ntfs/dir.c
+--- linux-3.0.7/fs/ntfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)));
@@ -43324,9 +44633,9 @@ diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/fs/ntfs/dir.c
  		ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
  				"inode 0x%lx or driver bug.", vdir->i_ino);
  		goto err_out;
-diff -urNp linux-3.0.4/fs/ntfs/file.c linux-3.0.4/fs/ntfs/file.c
---- linux-3.0.4/fs/ntfs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ntfs/file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ntfs/file.c linux-3.0.7/fs/ntfs/file.c
+--- linux-3.0.7/fs/ntfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  };
@@ -43336,9 +44645,9 @@ diff -urNp linux-3.0.4/fs/ntfs/file.c linux-3.0.4/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
---- linux-3.0.4/fs/ocfs2/localalloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/localalloc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/localalloc.c linux-3.0.7/fs/ocfs2/localalloc.c
+--- linux-3.0.7/fs/ocfs2/localalloc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -43348,9 +44657,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
  
  bail:
  	if (handle)
-diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
---- linux-3.0.4/fs/ocfs2/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/namei.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/namei.c linux-3.0.7/fs/ocfs2/namei.c
+--- linux-3.0.7/fs/ocfs2/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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, };
@@ -43360,9 +44669,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
  	/* At some point it might be nice to break this function up a
  	 * bit. */
  
-diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
---- linux-3.0.4/fs/ocfs2/ocfs2.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/ocfs2.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/ocfs2.h linux-3.0.7/fs/ocfs2/ocfs2.h
+--- linux-3.0.7/fs/ocfs2/ocfs2.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/ocfs2/ocfs2.h	2011-08-23 21:47:56.000000000 -0400
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -43380,9 +44689,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
---- linux-3.0.4/fs/ocfs2/suballoc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/suballoc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/suballoc.c linux-3.0.7/fs/ocfs2/suballoc.c
+--- linux-3.0.7/fs/ocfs2/suballoc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -43437,9 +44746,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
  			*num_clusters = res.sr_bits;
  		}
  	}
-diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
---- linux-3.0.4/fs/ocfs2/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/super.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/super.c linux-3.0.7/fs/ocfs2/super.c
+--- linux-3.0.7/fs/ocfs2/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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",
@@ -43474,9 +44783,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
  
  	/* Copy the blockcheck stats from the superblock probe */
  	osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
---- linux-3.0.4/fs/ocfs2/symlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/ocfs2/symlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/ocfs2/symlink.c linux-3.0.7/fs/ocfs2/symlink.c
+--- linux-3.0.7/fs/ocfs2/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -43486,9 +44795,9 @@ diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
  	if (!IS_ERR(link))
  		kfree(link);
  }
-diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
---- linux-3.0.4/fs/open.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/open.c	2011-09-14 09:16:46.000000000 -0400
+diff -urNp linux-3.0.7/fs/open.c linux-3.0.7/fs/open.c
+--- linux-3.0.7/fs/open.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/open.c	2011-09-14 09:16:46.000000000 -0400
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error)
@@ -43621,9 +44930,9 @@ diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
  			if (IS_ERR(f)) {
  				put_unused_fd(fd);
  				fd = PTR_ERR(f);
-diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
---- linux-3.0.4/fs/partitions/ldm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/partitions/ldm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/partitions/ldm.c linux-3.0.7/fs/partitions/ldm.c
+--- linux-3.0.7/fs/partitions/ldm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -43641,9 +44950,9 @@ diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
  	if (!f) {
  		ldm_crit ("Out of memory.");
  		return false;
-diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
---- linux-3.0.4/fs/pipe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/pipe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/pipe.c linux-3.0.7/fs/pipe.c
+--- linux-3.0.7/fs/pipe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/pipe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
  		}
  		if (bufs)	/* More to do? */
@@ -43767,9 +45076,39 @@ diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
  	inode->i_fop = &rdwr_pipefifo_fops;
  
  	/*
-diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
---- linux-3.0.4/fs/proc/array.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/array.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/Kconfig linux-3.0.7/fs/proc/Kconfig
+--- linux-3.0.7/fs/proc/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/fs/proc/array.c linux-3.0.7/fs/proc/array.c
+--- linux-3.0.7/fs/proc/array.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/proc/array.c	2011-08-23 21:48:14.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -43893,9 +45232,9 @@ diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
 +	return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
---- linux-3.0.4/fs/proc/base.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/fs/proc/base.c	2011-09-13 14:50:28.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/base.c linux-3.0.7/fs/proc/base.c
+--- linux-3.0.7/fs/proc/base.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/fs/proc/base.c	2011-10-19 03:59:32.000000000 -0400
 @@ -107,6 +107,22 @@ struct pid_entry {
  	union proc_op op;
  };
@@ -44111,12 +45450,12 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
 +#else
  			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();
@@ -44205,7 +45544,15 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	if (!IS_ERR(s))
  		__putname(s);
  }
-@@ -2795,7 +2910,7 @@ static const struct pid_entry tgid_base_
+@@ -2656,6 +2771,7 @@ static struct dentry *proc_base_instanti
+ 	if (p->fop)
+ 		inode->i_fop = p->fop;
+ 	ei->op = p->op;
++
+ 	d_add(dentry, inode);
+ 	error = NULL;
+ out:
+@@ -2795,7 +2911,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),
@@ -44214,7 +45561,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	INF("syscall",    S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",    S_IRUGO, proc_pid_cmdline),
-@@ -2820,10 +2935,10 @@ static const struct pid_entry tgid_base_
+@@ -2820,10 +2936,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
@@ -44227,7 +45574,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-@@ -2857,6 +2972,9 @@ static const struct pid_entry tgid_base_
+@@ -2857,6 +2973,9 @@ static const struct pid_entry tgid_base_
  #ifdef CONFIG_HARDWALL
  	INF("hardwall",   S_IRUGO, proc_pid_hardwall),
  #endif
@@ -44237,7 +45584,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  };
  
  static int proc_tgid_base_readdir(struct file * filp,
-@@ -2982,7 +3100,14 @@ static struct dentry *proc_pid_instantia
+@@ -2982,7 +3101,14 @@ static struct dentry *proc_pid_instantia
  	if (!inode)
  		goto out;
  
@@ -44252,10 +45599,13 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	inode->i_op = &proc_tgid_base_inode_operations;
  	inode->i_fop = &proc_tgid_base_operations;
  	inode->i_flags|=S_IMMUTABLE;
-@@ -3024,7 +3149,11 @@ struct dentry *proc_pid_lookup(struct in
+@@ -3024,7 +3150,14 @@ struct dentry *proc_pid_lookup(struct in
  	if (!task)
  		goto out;
  
++	if (!has_group_leader_pid(task))
++		goto out_put_task;
++
 +	if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
 +		goto out_put_task;
 +
@@ -44264,7 +45614,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	put_task_struct(task);
  out:
  	return result;
-@@ -3089,6 +3218,11 @@ int proc_pid_readdir(struct file * filp,
+@@ -3089,6 +3222,11 @@ int proc_pid_readdir(struct file * filp,
  {
  	unsigned int nr;
  	struct task_struct *reaper;
@@ -44276,7 +45626,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	struct tgid_iter iter;
  	struct pid_namespace *ns;
  
-@@ -3112,8 +3246,27 @@ int proc_pid_readdir(struct file * filp,
+@@ -3112,8 +3250,27 @@ int proc_pid_readdir(struct file * filp,
  	for (iter = next_tgid(ns, iter);
  	     iter.task;
  	     iter.tgid += 1, iter = next_tgid(ns, iter)) {
@@ -44305,7 +45655,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  			put_task_struct(iter.task);
  			goto out;
  		}
-@@ -3141,7 +3294,7 @@ static const struct pid_entry tid_base_s
+@@ -3141,7 +3298,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),
@@ -44314,7 +45664,7 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	INF("syscall",   S_IRUGO, proc_pid_syscall),
  #endif
  	INF("cmdline",   S_IRUGO, proc_pid_cmdline),
-@@ -3165,10 +3318,10 @@ static const struct pid_entry tid_base_s
+@@ -3165,10 +3322,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
@@ -44327,9 +45677,9 @@ diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
  	ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
---- linux-3.0.4/fs/proc/cmdline.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/cmdline.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/cmdline.c linux-3.0.7/fs/proc/cmdline.c
+--- linux-3.0.7/fs/proc/cmdline.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -44342,9 +45692,9 @@ diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
  	return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
---- linux-3.0.4/fs/proc/devices.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/devices.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/devices.c linux-3.0.7/fs/proc/devices.c
+--- linux-3.0.7/fs/proc/devices.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -44357,10 +45707,43 @@ diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
  	return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
---- linux-3.0.4/fs/proc/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/inode.c	2011-08-23 21:48:14.000000000 -0400
-@@ -440,7 +440,11 @@ struct inode *proc_get_inode(struct supe
+diff -urNp linux-3.0.7/fs/proc/inode.c linux-3.0.7/fs/proc/inode.c
+--- linux-3.0.7/fs/proc/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/proc/inode.c	2011-10-19 03:59:32.000000000 -0400
+@@ -18,12 +18,18 @@
+ #include <linux/module.h>
+ #include <linux/sysctl.h>
+ #include <linux/slab.h>
++#include <linux/grsecurity.h>
+ 
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+ #include "internal.h"
+ 
++#ifdef CONFIG_PROC_SYSCTL
++extern const struct inode_operations proc_sys_inode_operations;
++extern const struct inode_operations proc_sys_dir_operations;
++#endif
++
+ static void proc_evict_inode(struct inode *inode)
+ {
+ 	struct proc_dir_entry *de;
+@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inod
+ 	ns_ops = PROC_I(inode)->ns_ops;
+ 	if (ns_ops && ns_ops->put)
+ 		ns_ops->put(PROC_I(inode)->ns);
++
++#ifdef CONFIG_PROC_SYSCTL
++	if (inode->i_op == &proc_sys_inode_operations ||
++	    inode->i_op == &proc_sys_dir_operations)
++		gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
++#endif
++
+ }
+ 
+ static struct kmem_cache * proc_inode_cachep;
+@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct supe
  		if (de->mode) {
  			inode->i_mode = de->mode;
  			inode->i_uid = de->uid;
@@ -44372,9 +45755,9 @@ diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
  		}
  		if (de->size)
  			inode->i_size = de->size;
-diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/fs/proc/internal.h
---- linux-3.0.4/fs/proc/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/internal.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/internal.h linux-3.0.7/fs/proc/internal.h
+--- linux-3.0.7/fs/proc/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -44385,39 +45768,9 @@ diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/fs/proc/internal.h
  extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
  
  extern const struct file_operations proc_maps_operations;
-diff -urNp linux-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
---- linux-3.0.4/fs/proc/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
---- linux-3.0.4/fs/proc/kcore.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/kcore.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/kcore.c linux-3.0.7/fs/proc/kcore.c
+--- linux-3.0.7/fs/proc/kcore.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44485,9 +45838,9 @@ diff -urNp linux-3.0.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
  	if (!capable(CAP_SYS_RAWIO))
  		return -EPERM;
  	if (kcore_need_update)
-diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
---- linux-3.0.4/fs/proc/meminfo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/meminfo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/meminfo.c linux-3.0.7/fs/proc/meminfo.c
+--- linux-3.0.7/fs/proc/meminfo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44506,9 +45859,9 @@ diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
  		,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
---- linux-3.0.4/fs/proc/nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/nommu.c linux-3.0.7/fs/proc/nommu.c
+--- linux-3.0.7/fs/proc/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44518,9 +45871,9 @@ diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
  	}
  
  	seq_putc(m, '\n');
-diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
---- linux-3.0.4/fs/proc/proc_net.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/proc_net.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/proc_net.c linux-3.0.7/fs/proc/proc_net.c
+--- linux-3.0.7/fs/proc/proc_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44539,10 +45892,10 @@ diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
  
  	rcu_read_lock();
  	task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
---- linux-3.0.4/fs/proc/proc_sysctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/proc_sysctl.c	2011-08-23 21:48:14.000000000 -0400
-@@ -8,6 +8,8 @@
+diff -urNp linux-3.0.7/fs/proc/proc_sysctl.c linux-3.0.7/fs/proc/proc_sysctl.c
+--- linux-3.0.7/fs/proc/proc_sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/proc/proc_sysctl.c	2011-10-19 03:59:32.000000000 -0400
+@@ -8,11 +8,13 @@
  #include <linux/namei.h>
  #include "internal.h"
  
@@ -44550,18 +45903,40 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
 +
  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;
-@@ -111,6 +113,9 @@ static struct dentry *proc_sys_lookup(st
- 	if (!p)
- 		goto out;
+-static const struct inode_operations proc_sys_inode_operations;
++const struct inode_operations proc_sys_inode_operations;
+ static const struct file_operations proc_sys_dir_file_operations;
+-static const struct inode_operations proc_sys_dir_operations;
++const struct inode_operations proc_sys_dir_operations;
+ 
+ static struct inode *proc_sys_make_inode(struct super_block *sb,
+ 		struct ctl_table_header *head, struct ctl_table *table)
+@@ -121,8 +123,14 @@ static struct dentry *proc_sys_lookup(st
+ 
+ 	err = NULL;
+ 	d_set_d_op(dentry, &proc_sys_dentry_operations);
++
++	gr_handle_proc_create(dentry, inode);
++
+ 	d_add(dentry, inode);
  
 +	if (gr_handle_sysctl(p, MAY_EXEC))
-+		goto out;
++		err = ERR_PTR(-ENOENT);
++
+ out:
+ 	sysctl_head_finish(head);
+ 	return err;
+@@ -202,6 +210,9 @@ static int proc_sys_fill_cache(struct fi
+ 				return -ENOMEM;
+ 			} else {
+ 				d_set_d_op(child, &proc_sys_dentry_operations);
++
++				gr_handle_proc_create(child, inode);
 +
- 	err = ERR_PTR(-ENOMEM);
- 	inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
- 	if (h)
-@@ -230,6 +235,9 @@ static int scan(struct ctl_table_header 
+ 				d_add(child, inode);
+ 			}
+ 		} else {
+@@ -230,6 +241,9 @@ static int scan(struct ctl_table_header 
  		if (*pos < file->f_pos)
  			continue;
  
@@ -44571,7 +45946,7 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
  		res = proc_sys_fill_cache(file, dirent, filldir, head, table);
  		if (res)
  			return res;
-@@ -355,6 +363,9 @@ static int proc_sys_getattr(struct vfsmo
+@@ -355,6 +369,9 @@ static int proc_sys_getattr(struct vfsmo
  	if (IS_ERR(head))
  		return PTR_ERR(head);
  
@@ -44581,9 +45956,25 @@ diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
  	generic_fillattr(inode, stat);
  	if (table)
  		stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
---- linux-3.0.4/fs/proc/root.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/root.c	2011-08-23 21:48:14.000000000 -0400
+@@ -374,13 +391,13 @@ static const struct file_operations proc
+ 	.llseek		= generic_file_llseek,
+ };
+ 
+-static const struct inode_operations proc_sys_inode_operations = {
++const struct inode_operations proc_sys_inode_operations = {
+ 	.permission	= proc_sys_permission,
+ 	.setattr	= proc_sys_setattr,
+ 	.getattr	= proc_sys_getattr,
+ };
+ 
+-static const struct inode_operations proc_sys_dir_operations = {
++const struct inode_operations proc_sys_dir_operations = {
+ 	.lookup		= proc_sys_lookup,
+ 	.permission	= proc_sys_permission,
+ 	.setattr	= proc_sys_setattr,
+diff -urNp linux-3.0.7/fs/proc/root.c linux-3.0.7/fs/proc/root.c
+--- linux-3.0.7/fs/proc/root.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
@@ -44600,9 +45991,9 @@ diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
  	proc_sys_init();
  }
  
-diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
---- linux-3.0.4/fs/proc/task_mmu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/task_mmu.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/task_mmu.c linux-3.0.7/fs/proc/task_mmu.c
+--- linux-3.0.7/fs/proc/task_mmu.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/fs/proc/task_mmu.c	2011-10-16 21:55:28.000000000 -0400
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
  		"VmExe:\t%8lu kB\n"
  		"VmLib:\t%8lu kB\n"
@@ -44733,7 +46124,7 @@ diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
  		   mss.resident >> 10,
  		   (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
  		   mss.shared_clean  >> 10,
-@@ -1001,7 +1032,7 @@ static int show_numa_map(struct seq_file
+@@ -1031,7 +1062,7 @@ static int show_numa_map(struct seq_file
  
  	if (file) {
  		seq_printf(m, " file=");
@@ -44742,9 +46133,9 @@ diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
  	} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
  		seq_printf(m, " heap");
  	} else if (vma->vm_start <= mm->start_stack &&
-diff -urNp linux-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
---- linux-3.0.4/fs/proc/task_nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/proc/task_nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/proc/task_nommu.c linux-3.0.7/fs/proc/task_nommu.c
+--- linux-3.0.7/fs/proc/task_nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -44763,9 +46154,9 @@ diff -urNp linux-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
  	} else if (mm) {
  		if (vma->vm_start <= mm->start_stack &&
  			vma->vm_end >= mm->start_stack) {
-diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
---- linux-3.0.4/fs/quota/netlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/quota/netlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/quota/netlink.c linux-3.0.7/fs/quota/netlink.c
+--- linux-3.0.7/fs/quota/netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -44784,9 +46175,9 @@ diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
  			&quota_genl_family, 0, QUOTA_NL_C_WARNING);
  	if (!msg_head) {
  		printk(KERN_ERR
-diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
---- linux-3.0.4/fs/readdir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/readdir.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/readdir.c linux-3.0.7/fs/readdir.c
+--- linux-3.0.7/fs/readdir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/readdir.c	2011-10-06 04:17:55.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -44885,9 +46276,9 @@ diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
  		if (__put_user(d_off, &lastdirent->d_off))
  			error = -EFAULT;
  		else
-diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
---- linux-3.0.4/fs/reiserfs/dir.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/dir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/dir.c linux-3.0.7/fs/reiserfs/dir.c
+--- linux-3.0.7/fs/reiserfs/dir.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44897,9 +46288,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
  	reiserfs_write_lock(inode->i_sb);
  
  	reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
---- linux-3.0.4/fs/reiserfs/do_balan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/do_balan.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/do_balan.c linux-3.0.7/fs/reiserfs/do_balan.c
+--- linux-3.0.7/fs/reiserfs/do_balan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -44909,9 +46300,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
  	do_balance_starts(tb);
  
  	/* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
---- linux-3.0.4/fs/reiserfs/journal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/journal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/journal.c linux-3.0.7/fs/reiserfs/journal.c
+--- linux-3.0.7/fs/reiserfs/journal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44921,9 +46312,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
  	bh = __getblk(dev, block, bufsize);
  	if (buffer_uptodate(bh))
  		return (bh);
-diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
---- linux-3.0.4/fs/reiserfs/namei.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/namei.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/namei.c linux-3.0.7/fs/reiserfs/namei.c
+--- linux-3.0.7/fs/reiserfs/namei.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -44933,9 +46324,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
  	/* three balancings: (1) old name removal, (2) new name insertion
  	   and (3) maybe "save" link insertion
  	   stat data updates: (1) old directory,
-diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
---- linux-3.0.4/fs/reiserfs/procfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/procfs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/procfs.c linux-3.0.7/fs/reiserfs/procfs.c
+--- linux-3.0.7/fs/reiserfs/procfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 " : "",
@@ -44954,9 +46345,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
  	seq_printf(m,		/* on-disk fields */
  		   "jp_journal_1st_block: \t%i\n"
  		   "jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
---- linux-3.0.4/fs/reiserfs/stree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/stree.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/stree.c linux-3.0.7/fs/reiserfs/stree.c
+--- linux-3.0.7/fs/reiserfs/stree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -45002,9 +46393,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
  	BUG_ON(!th->t_trans_id);
  
  	if (inode) {		/* Do we count quotas for item? */
-diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
---- linux-3.0.4/fs/reiserfs/super.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/reiserfs/super.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/reiserfs/super.c linux-3.0.7/fs/reiserfs/super.c
+--- linux-3.0.7/fs/reiserfs/super.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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}
  	};
@@ -45014,9 +46405,9 @@ diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
  	*blocks = 0;
  	if (!options || !*options)
  		/* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
---- linux-3.0.4/fs/select.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/select.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/select.c linux-3.0.7/fs/select.c
+--- linux-3.0.7/fs/select.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/select.c	2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -45053,9 +46444,9 @@ diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
  	if (nfds > rlimit(RLIMIT_NOFILE))
  		return -EINVAL;
  
-diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
---- linux-3.0.4/fs/seq_file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/seq_file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/seq_file.c linux-3.0.7/fs/seq_file.c
+--- linux-3.0.7/fs/seq_file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -45105,9 +46496,9 @@ diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
  	int res = -ENOMEM;
  
  	if (op) {
-diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
---- linux-3.0.4/fs/splice.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/splice.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/fs/splice.c linux-3.0.7/fs/splice.c
+--- linux-3.0.7/fs/splice.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/splice.c	2011-10-06 04:17:55.000000000 -0400
 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
  	pipe_lock(pipe);
  
@@ -45273,9 +46664,9 @@ diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
  		ret = -EAGAIN;
  
  	pipe_unlock(ipipe);
-diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
---- linux-3.0.4/fs/sysfs/file.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/file.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/sysfs/file.c linux-3.0.7/fs/sysfs/file.c
+--- linux-3.0.7/fs/sysfs/file.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -45321,9 +46712,9 @@ diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
  		wake_up_interruptible(&od->poll);
  	}
  
-diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
---- linux-3.0.4/fs/sysfs/mount.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/mount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/sysfs/mount.c linux-3.0.7/fs/sysfs/mount.c
+--- linux-3.0.7/fs/sysfs/mount.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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),
@@ -45336,9 +46727,9 @@ diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
  	.s_ino		= 1,
  };
  
-diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
---- linux-3.0.4/fs/sysfs/symlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/sysfs/symlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/sysfs/symlink.c linux-3.0.7/fs/sysfs/symlink.c
+--- linux-3.0.7/fs/sysfs/symlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -45348,9 +46739,9 @@ diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
  	if (!IS_ERR(page))
  		free_page((unsigned long)page);
  }
-diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
---- linux-3.0.4/fs/udf/inode.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/udf/inode.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/udf/inode.c linux-3.0.7/fs/udf/inode.c
+--- linux-3.0.7/fs/udf/inode.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -45360,9 +46751,9 @@ diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
  	prev_epos.offset = udf_file_entry_alloc_offset(inode);
  	prev_epos.block = iinfo->i_location;
  	prev_epos.bh = NULL;
-diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
---- linux-3.0.4/fs/udf/misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/udf/misc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/udf/misc.c linux-3.0.7/fs/udf/misc.c
+--- linux-3.0.7/fs/udf/misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -45372,9 +46763,9 @@ diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
  	u8 checksum = 0;
  	int i;
  	for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
---- linux-3.0.4/fs/utimes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/utimes.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/utimes.c linux-3.0.7/fs/utimes.c
+--- linux-3.0.7/fs/utimes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/utimes.c	2011-08-23 21:48:14.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -45396,23 +46787,9 @@ diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
  	mutex_lock(&inode->i_mutex);
  	error = notify_change(path->dentry, &newattrs);
  	mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.0.4/fs/xattr_acl.c linux-3.0.4/fs/xattr_acl.c
---- linux-3.0.4/fs/xattr_acl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/fs/xattr.c linux-3.0.4/fs/xattr.c
---- linux-3.0.4/fs/xattr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xattr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/fs/xattr.c linux-3.0.7/fs/xattr.c
+--- linux-3.0.7/fs/xattr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/xattr.c	2011-08-23 21:48:14.000000000 -0400
 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -45475,20 +46852,23 @@ diff -urNp linux-3.0.4/fs/xattr.c linux-3.0.4/fs/xattr.c
  		mnt_drop_write(f->f_path.mnt);
  	}
  	fput(f);
-diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/xattr_acl.c linux-3.0.7/fs/xattr_acl.c
+--- linux-3.0.7/fs/xattr_acl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl.c	2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
  	}
  
@@ -45498,9 +46878,20 @@ diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4/fs/xfs/linux-2.6
  	    copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
  		goto out_put;
  
-diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-3.0.7/fs/xfs/linux-2.6/xfs_ioctl32.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.7/fs/xfs/linux-2.6/xfs_iops.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -45510,9 +46901,9 @@ diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4/fs/xfs/linux-2.6/
  
  	if (!IS_ERR(s))
  		kfree(s);
-diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
---- linux-3.0.4/fs/xfs/xfs_bmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/xfs_bmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/xfs/xfs_bmap.c linux-3.0.7/fs/xfs/xfs_bmap.c
+--- linux-3.0.7/fs/xfs/xfs_bmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -45522,9 +46913,9 @@ diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
---- linux-3.0.4/fs/xfs/xfs_dir2_sf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/fs/xfs/xfs_dir2_sf.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/fs/xfs/xfs_dir2_sf.c linux-3.0.7/fs/xfs/xfs_dir2_sf.c
+--- linux-3.0.7/fs/xfs/xfs_dir2_sf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/fs/xfs/xfs_dir2_sf.c	2011-08-23 21:47:56.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
  		}
  
@@ -45542,119 +46933,1092 @@ diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
  			    off & 0x7fffffff, ino, DT_UNKNOWN)) {
  			*offset = off & 0x7fffffff;
  			return 0;
-diff -urNp linux-3.0.4/grsecurity/gracl_alloc.c linux-3.0.4/grsecurity/gracl_alloc.c
---- linux-3.0.4/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/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>
+diff -urNp linux-3.0.7/grsecurity/Kconfig linux-3.0.7/grsecurity/Kconfig
+--- linux-3.0.7/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/Kconfig	2011-09-15 00:00:57.000000000 -0400
+@@ -0,0 +1,1038 @@
++#
++# grecurity configuration
++#
 +
-+static unsigned long alloc_stack_next = 1;
-+static unsigned long alloc_stack_size = 1;
-+static void **alloc_stack;
++menu "Grsecurity"
 +
-+static __inline__ int
-+alloc_pop(void)
-+{
-+	if (alloc_stack_next == 1)
-+		return 0;
++config GRKERNSEC
++	bool "Grsecurity"
++	select CRYPTO
++	select CRYPTO_SHA256
++	help
++	  If you say Y here, you will be able to configure many features
++	  that will enhance the security of your system.  It is highly
++	  recommended that you say Y here and read through the help
++	  for each option so that you fully understand the features and
++	  can evaluate their usefulness for your machine.
 +
-+	kfree(alloc_stack[alloc_stack_next - 2]);
++choice
++	prompt "Security Level"
++	depends on GRKERNSEC
++	default GRKERNSEC_CUSTOM
 +
-+	alloc_stack_next--;
++config GRKERNSEC_LOW
++	bool "Low"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_RANDNET
++	select GRKERNSEC_DMESG
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_CHDIR
 +
-+	return 1;
-+}
++	help
++	  If you choose this option, several of the grsecurity options will
++	  be enabled that will give you greater protection against a number
++	  of attacks, while assuring that none of your software will have any
++	  conflicts with the additional security measures.  If you run a lot
++	  of unusual software, or you are having problems with the higher
++	  security levels, you should say Y here.  With this option, the
++	  following features are enabled:
 +
-+static __inline__ int
-+alloc_push(void *buf)
-+{
-+	if (alloc_stack_next >= alloc_stack_size)
-+		return 1;
++	  - Linking restrictions
++	  - FIFO restrictions
++	  - Restricted dmesg
++	  - Enforced chdir("/") on chroot
++	  - Runtime module disabling
 +
-+	alloc_stack[alloc_stack_next - 1] = buf;
++config GRKERNSEC_MEDIUM
++	bool "Medium"
++	select PAX
++	select PAX_EI_PAX
++	select PAX_PT_PAX_FLAGS
++	select PAX_HAVE_ACL_FLAGS
++	select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
++	select GRKERNSEC_CHROOT
++	select GRKERNSEC_CHROOT_SYSCTL
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_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))
 +
-+	alloc_stack_next++;
++	help
++	  If you say Y here, several features in addition to those included
++	  in the low additional security level will be enabled.  These
++	  features provide even more security to your system, though in rare
++	  cases they may be incompatible with very old or poorly written
++	  software.  If you enable this option, make sure that your auth
++	  service (identd) is running as gid 1001.  With this option, 
++	  the following features (in addition to those provided in the 
++	  low additional security level) will be enabled:
 +
-+	return 0;
-+}
++	  - Failed fork logging
++	  - Time change logging
++	  - Signal logging
++	  - Deny mounts in chroot
++	  - Deny double chrooting
++	  - Deny sysctl writes in chroot
++	  - Deny mknod in chroot
++	  - Deny access to abstract AF_UNIX sockets out of chroot
++	  - Deny pivot_root in chroot
++	  - Denied writes of /dev/kmem, /dev/mem, and /dev/port
++	  - /proc restrictions with special GID set to 10 (usually wheel)
++	  - Address Space Layout Randomization (ASLR)
++	  - Prevent exploitation of most refcount overflows
++	  - Bounds checking of copying between the kernel and userland
 +
-+void *
-+acl_alloc(unsigned long len)
-+{
-+	void *ret = NULL;
++config GRKERNSEC_HIGH
++	bool "High"
++	select GRKERNSEC_LINK
++	select GRKERNSEC_FIFO
++	select GRKERNSEC_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:
 +
-+	if (!len || len > PAGE_SIZE)
-+		goto out;
++	  - Additional /proc restrictions
++	  - Chmod restrictions in chroot
++	  - No signals, ptrace, or viewing of processes outside of chroot
++	  - Capability restrictions in chroot
++	  - Deny fchdir out of chroot
++	  - Priority restrictions in chroot
++	  - Segmentation-based implementation of PaX
++	  - Mprotect restrictions
++	  - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
++	  - Kernel stack randomization
++	  - Mount/unmount/remount logging
++	  - Kernel symbol hiding
++	  - Prevention of memory exhaustion-based exploits
++	  - Hardening of module auto-loading
++	  - Ptrace restrictions
++	  - Restricted vm86 mode
++	  - Restricted sysfs/debugfs
++	  - Active kernel exploit response
 +
-+	ret = kmalloc(len, GFP_KERNEL);
++config GRKERNSEC_CUSTOM
++	bool "Custom"
++	help
++	  If you say Y here, you will be able to configure every grsecurity
++	  option, which allows you to enable many more features that aren't
++	  covered in the basic security levels.  These additional features
++	  include TPE, socket restrictions, and the sysctl system for
++	  grsecurity.  It is advised that you read through the help for
++	  each option to determine its usefulness in your situation.
 +
-+	if (ret) {
-+		if (alloc_push(ret)) {
-+			kfree(ret);
-+			ret = NULL;
-+		}
-+	}
++endchoice
 +
-+out:
-+	return ret;
-+}
++menu "Address Space Protection"
++depends on GRKERNSEC
 +
-+void *
-+acl_alloc_num(unsigned long num, unsigned long len)
-+{
-+	if (!len || (num > (PAGE_SIZE / len)))
-+		return NULL;
++config GRKERNSEC_KMEM
++	bool "Deny writing to /dev/kmem, /dev/mem, and /dev/port"
++	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.
 +
-+	return acl_alloc(num * len);
-+}
++config GRKERNSEC_VM86
++	bool "Restrict VM86 mode"
++	depends on X86_32
 +
-+void
-+acl_free_all(void)
-+{
-+	if (gr_acl_is_enabled() || !alloc_stack)
-+		return;
++	help
++	  If you say Y here, only processes with CAP_SYS_RAWIO will be able to
++	  make use of a special execution mode on 32bit x86 processors called
++	  Virtual 8086 (VM86) mode.  XFree86 may need vm86 mode for certain
++	  video cards and will still work with this option enabled.  The purpose
++	  of the option is to prevent exploitation of emulation errors in
++	  virtualization of vm86 mode like the one discovered in VMWare in 2009.
++	  Nearly all users should be able to enable this option.
 +
-+	while (alloc_pop()) ;
++config GRKERNSEC_IO
++	bool "Disable privileged I/O"
++	depends on X86
++	select RTC_CLASS
++	select RTC_INTF_DEV
++	select RTC_DRV_CMOS
 +
-+	if (alloc_stack) {
-+		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
-+			kfree(alloc_stack);
-+		else
-+			vfree(alloc_stack);
-+	}
++	help
++	  If you say Y here, all ioperm and iopl calls will return an error.
++	  Ioperm and iopl can be used to modify the running kernel.
++	  Unfortunately, some programs need this access to operate properly,
++	  the most notable of which are XFree86 and hwclock.  hwclock can be
++	  remedied by having RTC support in the kernel, so real-time 
++	  clock support is enabled if this option is enabled, to ensure 
++	  that hwclock operates correctly.  XFree86 still will not 
++	  operate correctly with this option enabled, so DO NOT CHOOSE Y 
++	  IF YOU USE XFree86.  If you use XFree86 and you still want to 
++	  protect your kernel against modification, use the RBAC system.
 +
-+	alloc_stack = NULL;
-+	alloc_stack_size = 1;
-+	alloc_stack_next = 1;
++config GRKERNSEC_PROC_MEMMAP
++	bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
++	default y if (PAX_NOEXEC || PAX_ASLR)
++	depends on PAX_NOEXEC || PAX_ASLR
++	help
++	  If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
++	  give no information about the addresses of its mappings if
++	  PaX features that rely on random addresses are enabled on the task.
++	  If you use PaX it is greatly recommended that you say Y here as it
++	  closes up a hole that makes the full ASLR useless for suid
++	  binaries.
 +
-+	return;
-+}
++config GRKERNSEC_BRUTE
++	bool "Deter exploit bruteforcing"
++	help
++	  If you say Y here, attempts to bruteforce exploits against forking
++	  daemons such as apache or sshd, 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.
 +
-+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;
++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 (!alloc_stack)
-+		return 0;
-+	else
-+		return 1;
-+}
-diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
---- linux-3.0.4/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl.c	2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,4106 @@
++	  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 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_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 6
++	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.7/grsecurity/Makefile linux-3.0.7/grsecurity/Makefile
+--- linux-3.0.7/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/Makefile	2011-10-17 06:45:43.000000000 -0400
+@@ -0,0 +1,36 @@
++# 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 500 /lib64/modules
++	@-chmod -f 500 /lib32/modules
++	@-chmod -f 700 .
++	@echo '  grsec: protected kernel image paths'
++endif
+diff -urNp linux-3.0.7/grsecurity/gracl.c linux-3.0.7/grsecurity/gracl.c
+--- linux-3.0.7/grsecurity/gracl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl.c	2011-10-17 06:42:59.000000000 -0400
+@@ -0,0 +1,4154 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +#include <linux/sched.h>
@@ -45971,6 +48335,27 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +	return ret;
 +}
 +
++static char *
++gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
++{
++	char *ret;
++	char *buf;
++	int buflen;
++
++	write_seqlock(&rename_lock);
++	br_read_lock(vfsmount_lock);
++	buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
++	ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
++	buflen = (int)(ret - buf);
++	if (buflen >= 5)
++		prepend(&ret, &buflen, "/proc", 5);
++	else
++		ret = strcpy(buf, "<path too long>");
++	br_read_unlock(vfsmount_lock);
++	write_sequnlock(&rename_lock);
++	return ret;
++}
++
 +char *
 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -47682,63 +50067,6 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +__u32
-+gr_check_link(const struct dentry * new_dentry,
-+	      const struct dentry * parent_dentry,
-+	      const struct vfsmount * parent_mnt,
-+	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
-+{
-+	struct acl_object_label *obj;
-+	__u32 oldmode, newmode;
-+	__u32 needmode;
-+
-+	if (unlikely(!(gr_status & GR_READY)))
-+		return (GR_CREATE | GR_LINK);
-+
-+	obj = chk_obj_label(old_dentry, old_mnt, current->acl);
-+	oldmode = obj->mode;
-+
-+	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
-+		oldmode |= (GR_CREATE | GR_LINK);
-+
-+	needmode = GR_CREATE | GR_AUDIT_CREATE | GR_SUPPRESS;
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+		needmode |= GR_SETID | GR_AUDIT_SETID;
-+
-+	newmode =
-+	    gr_check_create(new_dentry, parent_dentry, parent_mnt,
-+			    oldmode | needmode);
-+
-+	needmode = newmode & (GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC |
-+			      GR_SETID | GR_READ | GR_FIND | GR_DELETE |
-+			      GR_INHERIT | GR_AUDIT_INHERIT);
-+
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID) && !(newmode & GR_SETID))
-+		goto bad;
-+
-+	if ((oldmode & needmode) != needmode)
-+		goto bad;
-+
-+	needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
-+	if ((newmode & needmode) != needmode)
-+		goto bad;
-+
-+	if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
-+		return newmode;
-+bad:
-+	needmode = oldmode;
-+	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
-+		needmode |= GR_SETID;
-+	
-+	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+		gr_log_learn(old_dentry, old_mnt, needmode);
-+		return (GR_CREATE | GR_LINK);
-+	} else if (newmode & GR_SUPPRESS)
-+		return GR_SUPPRESS;
-+	else
-+		return 0;
-+}
-+
-+__u32
 +gr_search_file(const struct dentry * dentry, const __u32 mode,
 +	       const struct vfsmount * mnt)
 +{
@@ -47793,70 +50121,124 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +	return retval;
 +}
 +
-+__u32
-+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
-+		const struct vfsmount * mnt, const __u32 mode)
++struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
++					      const struct dentry *parent,
++					      const struct vfsmount *mnt)
 +{
 +	struct name_entry *match;
 +	struct acl_object_label *matchpo;
 +	struct acl_subject_label *curracl;
 +	char *path;
-+	__u32 retval;
 +
 +	if (unlikely(!(gr_status & GR_READY)))
-+		return (mode & ~GR_AUDITS);
++		return NULL;
 +
 +	preempt_disable();
 +	path = gr_to_filename_rbac(new_dentry, mnt);
 +	match = lookup_name_entry_create(path);
 +
-+	if (!match)
-+		goto check_parent;
-+
 +	curracl = current->acl;
 +
-+	read_lock(&gr_inode_lock);
-+	matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
-+	read_unlock(&gr_inode_lock);
-+
-+	if (matchpo) {
-+		if ((matchpo->mode & mode) !=
-+		    (mode & ~(GR_AUDITS | GR_SUPPRESS))
-+		    && curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
-+			__u32 new_mode = mode;
-+
-+			new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
-+
-+			gr_log_learn(new_dentry, mnt, new_mode);
++	if (match) {
++		read_lock(&gr_inode_lock);
++		matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
++		read_unlock(&gr_inode_lock);
 +
++		if (matchpo) {
 +			preempt_enable();
-+			return new_mode;
++			return matchpo;
 +		}
-+		preempt_enable();
-+		return (matchpo->mode & mode);
 +	}
 +
-+      check_parent:
-+	curracl = current->acl;
++	// lookup parent
 +
 +	matchpo = chk_obj_create_label(parent, mnt, curracl, path);
++
++	preempt_enable();
++	return matchpo;
++}
++
++__u32
++gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
++		const struct vfsmount * mnt, const __u32 mode)
++{
++	struct acl_object_label *matchpo;
++	__u32 retval;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return (mode & ~GR_AUDITS);
++
++	matchpo = gr_get_create_object(new_dentry, parent, mnt);
++
 +	retval = matchpo->mode & mode;
 +
 +	if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
-+	    && (curracl->mode & (GR_LEARN | GR_INHERITLEARN))) {
++	    && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
 +		__u32 new_mode = mode;
 +
 +		new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
 +
 +		gr_log_learn(new_dentry, mnt, new_mode);
-+		preempt_enable();
 +		return new_mode;
 +	}
 +
-+	preempt_enable();
 +	return retval;
 +}
 +
++__u32
++gr_check_link(const struct dentry * new_dentry,
++	      const struct dentry * parent_dentry,
++	      const struct vfsmount * parent_mnt,
++	      const struct dentry * old_dentry, const struct vfsmount * old_mnt)
++{
++	struct acl_object_label *obj;
++	__u32 oldmode, newmode;
++	__u32 needmode;
++	__u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
++			   GR_DELETE | GR_INHERIT;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return (GR_CREATE | GR_LINK);
++
++	obj = chk_obj_label(old_dentry, old_mnt, current->acl);
++	oldmode = obj->mode;
++
++	obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
++	newmode = obj->mode;
++
++	needmode = newmode & checkmodes;
++
++	// old name for hardlink must have at least the permissions of the new name
++	if ((oldmode & needmode) != needmode)
++		goto bad;
++
++	// if old name had restrictions/auditing, make sure the new name does as well
++	needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
++
++	// don't allow hardlinking of suid/sgid files without permission
++	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++		needmode |= GR_SETID;
++
++	if ((newmode & needmode) != needmode)
++		goto bad;
++
++	// enforce minimum permissions
++	if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
++		return newmode;
++bad:
++	needmode = oldmode;
++	if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
++		needmode |= GR_SETID;
++	
++	if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
++		gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
++		return (GR_CREATE | GR_LINK);
++	} else if (newmode & GR_SUPPRESS)
++		return GR_SUPPRESS;
++	else
++		return 0;
++}
++
 +int
 +gr_check_hidden_task(const struct task_struct *task)
 +{
@@ -48384,15 +50766,12 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +static void
-+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
-+		 const struct vfsmount *mnt)
++__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
 +{
 +	struct acl_subject_label *subj;
 +	struct acl_role_label *role;
 +	unsigned int x;
-+	ino_t ino = dentry->d_inode->i_ino;
-+	dev_t dev = __get_dev(dentry);
-+	
++
 +	FOR_EACH_ROLE_START(role)
 +		update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
 +
@@ -48413,6 +50792,18 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +	return;
 +}
 +
++static void
++do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
++		 const struct vfsmount *mnt)
++{
++	ino_t ino = dentry->d_inode->i_ino;
++	dev_t dev = __get_dev(dentry);
++
++	__do_handle_create(matchn, ino, dev);	
++
++	return;
++}
++
 +void
 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
 +{
@@ -48435,6 +50826,27 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +}
 +
 +void
++gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
++{
++	struct name_entry *matchn;
++
++	if (unlikely(!(gr_status & GR_READY)))
++		return;
++
++	preempt_disable();
++	matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
++
++	if (unlikely((unsigned long)matchn)) {
++		write_lock(&gr_inode_lock);
++		__do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
++		write_unlock(&gr_inode_lock);
++	}
++	preempt_enable();
++
++	return;
++}
++
++void
 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
 +		 struct dentry *old_dentry,
 +		 struct dentry *new_dentry,
@@ -49761,9 +52173,118 @@ diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
---- linux-3.0.4/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_cap.c	2011-09-14 09:21:24.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_alloc.c linux-3.0.7/grsecurity/gracl_alloc.c
+--- linux-3.0.7/grsecurity/gracl_alloc.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/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>
++
++static unsigned long alloc_stack_next = 1;
++static unsigned long alloc_stack_size = 1;
++static void **alloc_stack;
++
++static __inline__ int
++alloc_pop(void)
++{
++	if (alloc_stack_next == 1)
++		return 0;
++
++	kfree(alloc_stack[alloc_stack_next - 2]);
++
++	alloc_stack_next--;
++
++	return 1;
++}
++
++static __inline__ int
++alloc_push(void *buf)
++{
++	if (alloc_stack_next >= alloc_stack_size)
++		return 1;
++
++	alloc_stack[alloc_stack_next - 1] = buf;
++
++	alloc_stack_next++;
++
++	return 0;
++}
++
++void *
++acl_alloc(unsigned long len)
++{
++	void *ret = NULL;
++
++	if (!len || len > PAGE_SIZE)
++		goto out;
++
++	ret = kmalloc(len, GFP_KERNEL);
++
++	if (ret) {
++		if (alloc_push(ret)) {
++			kfree(ret);
++			ret = NULL;
++		}
++	}
++
++out:
++	return ret;
++}
++
++void *
++acl_alloc_num(unsigned long num, unsigned long len)
++{
++	if (!len || (num > (PAGE_SIZE / len)))
++		return NULL;
++
++	return acl_alloc(num * len);
++}
++
++void
++acl_free_all(void)
++{
++	if (gr_acl_is_enabled() || !alloc_stack)
++		return;
++
++	while (alloc_pop()) ;
++
++	if (alloc_stack) {
++		if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
++			kfree(alloc_stack);
++		else
++			vfree(alloc_stack);
++	}
++
++	alloc_stack = NULL;
++	alloc_stack_size = 1;
++	alloc_stack_next = 1;
++
++	return;
++}
++
++int
++acl_alloc_stack_init(unsigned long size)
++{
++	if ((size * sizeof (void *)) <= PAGE_SIZE)
++		alloc_stack =
++		    (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
++	else
++		alloc_stack = (void **) vmalloc(size * sizeof (void *));
++
++	alloc_stack_size = size;
++
++	if (!alloc_stack)
++		return 0;
++	else
++		return 1;
++}
+diff -urNp linux-3.0.7/grsecurity/gracl_cap.c linux-3.0.7/grsecurity/gracl_cap.c
+--- linux-3.0.7/grsecurity/gracl_cap.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_cap.c	2011-09-14 09:21:24.000000000 -0400
 @@ -0,0 +1,101 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -49866,9 +52387,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
 +	return 0;
 +}
 +
-diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
---- linux-3.0.4/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_fs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_fs.c linux-3.0.7/grsecurity/gracl_fs.c
+--- linux-3.0.7/grsecurity/gracl_fs.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_fs.c	2011-10-17 01:22:26.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -50117,7 +52638,7 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +			   GR_UNIXCONNECT_ACL_MSG);
 +}
 +
-+/* hardlinks require at minimum create permission,
++/* hardlinks require at minimum create and link permission,
 +   any additional privilege required is based on the
 +   privilege of the file being linked to
 +*/
@@ -50301,9 +52822,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
---- linux-3.0.4/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_ip.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_ip.c linux-3.0.7/grsecurity/gracl_ip.c
+--- linux-3.0.7/grsecurity/gracl_ip.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_ip.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -50686,9 +53207,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
 +
 +	return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_learn.c
---- linux-3.0.4/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_learn.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_learn.c linux-3.0.7/grsecurity/gracl_learn.c
+--- linux-3.0.7/grsecurity/gracl_learn.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_learn.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -50897,9 +53418,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_lea
 +	.release	= close_learn,
 +	.poll		= poll_learn,
 +};
-diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
---- linux-3.0.4/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_res.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_res.c linux-3.0.7/grsecurity/gracl_res.c
+--- linux-3.0.7/grsecurity/gracl_res.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_res.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -50969,9 +53490,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
 +	rcu_read_unlock();
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv.c
---- linux-3.0.4/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_segv.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_segv.c linux-3.0.7/grsecurity/gracl_segv.c
+--- linux-3.0.7/grsecurity/gracl_segv.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_segv.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -51272,9 +53793,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv
 +
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
---- linux-3.0.4/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/gracl_shm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/gracl_shm.c linux-3.0.7/grsecurity/gracl_shm.c
+--- linux-3.0.7/grsecurity/gracl_shm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/gracl_shm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -51316,9 +53837,9 @@ diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
 +
 +	return 1;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chdir.c
---- linux-3.0.4/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_chdir.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_chdir.c linux-3.0.7/grsecurity/grsec_chdir.c
+--- linux-3.0.7/grsecurity/grsec_chdir.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_chdir.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -51339,9 +53860,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chd
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_chroot.c
---- linux-3.0.4/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_chroot.c	2011-09-15 06:47:48.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_chroot.c linux-3.0.7/grsecurity/grsec_chroot.c
+--- linux-3.0.7/grsecurity/grsec_chroot.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_chroot.c	2011-09-15 06:47:48.000000000 -0400
 @@ -0,0 +1,351 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -51694,9 +54215,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_ch
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_disabled.c
---- linux-3.0.4/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_disabled.c	2011-09-24 08:13:01.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_disabled.c linux-3.0.7/grsecurity/grsec_disabled.c
+--- linux-3.0.7/grsecurity/grsec_disabled.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_disabled.c	2011-09-24 08:13:01.000000000 -0400
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -52131,9 +54652,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec.c
---- linux-3.0.4/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_exec.c	2011-09-14 09:20:28.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_exec.c linux-3.0.7/grsecurity/grsec_exec.c
+--- linux-3.0.7/grsecurity/grsec_exec.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_exec.c	2011-09-14 09:20:28.000000000 -0400
 @@ -0,0 +1,145 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52280,9 +54801,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec
 +
 +EXPORT_SYMBOL(gr_is_capable);
 +EXPORT_SYMBOL(gr_is_capable_nolog);
-diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo.c
---- linux-3.0.4/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_fifo.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_fifo.c linux-3.0.7/grsecurity/grsec_fifo.c
+--- linux-3.0.7/grsecurity/grsec_fifo.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_fifo.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52308,9 +54829,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork.c
---- linux-3.0.4/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_fork.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_fork.c linux-3.0.7/grsecurity/grsec_fork.c
+--- linux-3.0.7/grsecurity/grsec_fork.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_fork.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52335,9 +54856,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init.c
---- linux-3.0.4/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_init.c	2011-08-25 17:25:12.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_init.c linux-3.0.7/grsecurity/grsec_init.c
+--- linux-3.0.7/grsecurity/grsec_init.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_init.c	2011-08-25 17:25:12.000000000 -0400
 @@ -0,0 +1,269 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52608,9 +55129,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init
 +
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link.c
---- linux-3.0.4/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_link.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_link.c linux-3.0.7/grsecurity/grsec_link.c
+--- linux-3.0.7/grsecurity/grsec_link.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_link.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52655,9 +55176,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
---- linux-3.0.4/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_log.c	2011-09-26 10:46:21.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_log.c linux-3.0.7/grsecurity/grsec_log.c
+--- linux-3.0.7/grsecurity/grsec_log.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_log.c	2011-09-26 10:46:21.000000000 -0400
 @@ -0,0 +1,315 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -52974,9 +55495,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
 +	gr_log_end(audit);
 +	END_LOCKS(audit);
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
---- linux-3.0.4/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_mem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_mem.c linux-3.0.7/grsecurity/grsec_mem.c
+--- linux-3.0.7/grsecurity/grsec_mem.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_mem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53011,9 +55532,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
 +	gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mount.c
---- linux-3.0.4/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_mount.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_mount.c linux-3.0.7/grsecurity/grsec_mount.c
+--- linux-3.0.7/grsecurity/grsec_mount.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_mount.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53077,9 +55598,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mou
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
---- linux-3.0.4/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_pax.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_pax.c linux-3.0.7/grsecurity/grsec_pax.c
+--- linux-3.0.7/grsecurity/grsec_pax.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_pax.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53117,9 +55638,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_ptrace.c
---- linux-3.0.4/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_ptrace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_ptrace.c linux-3.0.7/grsecurity/grsec_ptrace.c
+--- linux-3.0.7/grsecurity/grsec_ptrace.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_ptrace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53135,9 +55656,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_pt
 +#endif
 +	return;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
---- linux-3.0.4/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sig.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_sig.c linux-3.0.7/grsecurity/grsec_sig.c
+--- linux-3.0.7/grsecurity/grsec_sig.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_sig.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -53345,9 +55866,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock.c
---- linux-3.0.4/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_sock.c linux-3.0.7/grsecurity/grsec_sock.c
+--- linux-3.0.7/grsecurity/grsec_sock.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_sock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -53593,9 +56114,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock
 +#endif
 +	return 0;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sysctl.c
---- linux-3.0.4/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_sysctl.c	2011-08-25 17:26:15.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_sysctl.c linux-3.0.7/grsecurity/grsec_sysctl.c
+--- linux-3.0.7/grsecurity/grsec_sysctl.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_sysctl.c	2011-08-25 17:26:15.000000000 -0400
 @@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54030,9 +56551,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sy
 +	{ }
 +};
 +#endif
-diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time.c
---- linux-3.0.4/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_time.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_time.c linux-3.0.7/grsecurity/grsec_time.c
+--- linux-3.0.7/grsecurity/grsec_time.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_time.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54050,9 +56571,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
---- linux-3.0.4/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsec_tpe.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsec_tpe.c linux-3.0.7/grsecurity/grsec_tpe.c
+--- linux-3.0.7/grsecurity/grsec_tpe.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsec_tpe.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -54093,9 +56614,9 @@ diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
 +#endif
 +	return 1;
 +}
-diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
---- linux-3.0.4/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/grsum.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/grsecurity/grsum.c linux-3.0.7/grsecurity/grsum.c
+--- linux-3.0.7/grsecurity/grsum.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/grsecurity/grsum.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -54158,1090 +56679,9 @@ diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
 +
 +	return retval;
 +}
-diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
---- linux-3.0.4/grsecurity/Kconfig	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/Kconfig	2011-09-15 00:00:57.000000000 -0400
-@@ -0,0 +1,1038 @@
-+#
-+# 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_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
-+	  - 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_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_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 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_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 6
-+	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.4/grsecurity/Makefile linux-3.0.4/grsecurity/Makefile
---- linux-3.0.4/grsecurity/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/grsecurity/Makefile	2011-09-14 23:29:56.000000000 -0400
-@@ -0,0 +1,35 @@
-+# 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 500 /lib64/modules
-+	@-chmod -f 700 .
-+	@echo '  grsec: protected kernel image paths'
-+endif
-diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus.h
---- linux-3.0.4/include/acpi/acpi_bus.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/acpi/acpi_bus.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/acpi/acpi_bus.h linux-3.0.7/include/acpi/acpi_bus.h
+--- linux-3.0.7/include/acpi/acpi_bus.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -55251,9 +56691,9 @@ diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
  
-diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm-generic/atomic-long.h
---- linux-3.0.4/include/asm-generic/atomic-long.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/atomic-long.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/atomic-long.h linux-3.0.7/include/asm-generic/atomic-long.h
+--- linux-3.0.7/include/asm-generic/atomic-long.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/asm-generic/atomic-long.h	2011-08-23 21:47:56.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -55554,9 +56994,9 @@ diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-generic/cache.h
---- linux-3.0.4/include/asm-generic/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/cache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/cache.h linux-3.0.7/include/asm-generic/cache.h
+--- linux-3.0.7/include/asm-generic/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -55567,9 +57007,9 @@ diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-gener
 +#define L1_CACHE_BYTES		(1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-generic/int-l64.h
---- linux-3.0.4/include/asm-generic/int-l64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/int-l64.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/int-l64.h linux-3.0.7/include/asm-generic/int-l64.h
+--- linux-3.0.7/include/asm-generic/int-l64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -55579,9 +57019,9 @@ diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-gen
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-generic/int-ll64.h
---- linux-3.0.4/include/asm-generic/int-ll64.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/int-ll64.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/int-ll64.h linux-3.0.7/include/asm-generic/int-ll64.h
+--- linux-3.0.7/include/asm-generic/int-ll64.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -55591,9 +57031,9 @@ diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-ge
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-generic/kmap_types.h
---- linux-3.0.4/include/asm-generic/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/kmap_types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/kmap_types.h linux-3.0.7/include/asm-generic/kmap_types.h
+--- linux-3.0.7/include/asm-generic/kmap_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -55607,27 +57047,9 @@ diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-
  };
  
  #undef KMAP_D
-diff -urNp linux-3.0.4/include/asm-generic/pgtable.h linux-3.0.4/include/asm-generic/pgtable.h
---- linux-3.0.4/include/asm-generic/pgtable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/asm-generic/pgtable-nopmd.h
---- linux-3.0.4/include/asm-generic/pgtable-nopmd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/pgtable-nopmd.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/pgtable-nopmd.h linux-3.0.7/include/asm-generic/pgtable-nopmd.h
+--- linux-3.0.7/include/asm-generic/pgtable-nopmd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -55664,9 +57086,9 @@ diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/a
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/asm-generic/pgtable-nopud.h
---- linux-3.0.4/include/asm-generic/pgtable-nopud.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/pgtable-nopud.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/pgtable-nopud.h linux-3.0.7/include/asm-generic/pgtable-nopud.h
+--- linux-3.0.7/include/asm-generic/pgtable-nopud.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -55697,9 +57119,27 @@ diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/a
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm-generic/vmlinux.lds.h
---- linux-3.0.4/include/asm-generic/vmlinux.lds.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/asm-generic/vmlinux.lds.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/asm-generic/pgtable.h linux-3.0.7/include/asm-generic/pgtable.h
+--- linux-3.0.7/include/asm-generic/pgtable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/include/asm-generic/vmlinux.lds.h linux-3.0.7/include/asm-generic/vmlinux.lds.h
+--- linux-3.0.7/include/asm-generic/vmlinux.lds.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) = .;			\
@@ -55731,30 +57171,9 @@ diff -urNp linux-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm
  
  /**
   * PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.0.4/include/drm/drm_crtc_helper.h linux-3.0.4/include/drm/drm_crtc_helper.h
---- linux-3.0.4/include/drm/drm_crtc_helper.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
---- linux-3.0.4/include/drm/drmP.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/drm/drmP.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/drm/drmP.h linux-3.0.7/include/drm/drmP.h
+--- linux-3.0.7/include/drm/drmP.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/drm/drmP.h	2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -55781,9 +57200,30 @@ diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
  	/*@} */
  
  	struct list_head filelist;
-diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/ttm_memory.h
---- linux-3.0.4/include/drm/ttm/ttm_memory.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/drm/ttm/ttm_memory.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/drm/drm_crtc_helper.h linux-3.0.7/include/drm/drm_crtc_helper.h
+--- linux-3.0.7/include/drm/drm_crtc_helper.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/include/drm/ttm/ttm_memory.h linux-3.0.7/include/drm/ttm/ttm_memory.h
+--- linux-3.0.7/include/drm/ttm/ttm_memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/drm/ttm/ttm_memory.h	2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -55793,9 +57233,9 @@ diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
---- linux-3.0.4/include/linux/a.out.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/a.out.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/a.out.h linux-3.0.7/include/linux/a.out.h
+--- linux-3.0.7/include/linux/a.out.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  };
@@ -55811,9 +57251,9 @@ diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
---- linux-3.0.4/include/linux/atmdev.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/atmdev.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/atmdev.h linux-3.0.7/include/linux/atmdev.h
+--- linux-3.0.7/include/linux/atmdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/atmdev.h	2011-08-23 21:47:56.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -55823,9 +57263,9 @@ diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts.h
---- linux-3.0.4/include/linux/binfmts.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/binfmts.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/binfmts.h linux-3.0.7/include/linux/binfmts.h
+--- linux-3.0.7/include/linux/binfmts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -55834,9 +57274,9 @@ diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts
  	unsigned long min_coredump;	/* minimal dump size */
  };
  
-diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
---- linux-3.0.4/include/linux/blkdev.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/blkdev.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/blkdev.h linux-3.0.7/include/linux/blkdev.h
+--- linux-3.0.7/include/linux/blkdev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/blkdev.h	2011-08-26 19:49:56.000000000 -0400
 @@ -1308,7 +1308,7 @@ struct block_device_operations {
  	/* this callback is with swap_lock and sometimes page table lock held */
  	void (*swap_slot_free_notify) (struct block_device *, unsigned long);
@@ -55846,9 +57286,9 @@ diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
  				 unsigned long);
-diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/blktrace_api.h
---- linux-3.0.4/include/linux/blktrace_api.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/blktrace_api.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/blktrace_api.h linux-3.0.7/include/linux/blktrace_api.h
+--- linux-3.0.7/include/linux/blktrace_api.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -55858,9 +57298,9 @@ diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/bl
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/include/linux/byteorder/little_endian.h
---- linux-3.0.4/include/linux/byteorder/little_endian.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/byteorder/little_endian.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/byteorder/little_endian.h linux-3.0.7/include/linux/byteorder/little_endian.h
+--- linux-3.0.7/include/linux/byteorder/little_endian.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -55925,9 +57365,9 @@ diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/inclu
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
---- linux-3.0.4/include/linux/cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/cache.h linux-3.0.7/include/linux/cache.h
+--- linux-3.0.7/include/linux/cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/cache.h	2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -55939,9 +57379,9 @@ diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capability.h
---- linux-3.0.4/include/linux/capability.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/capability.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/capability.h linux-3.0.7/include/linux/capability.h
+--- linux-3.0.7/include/linux/capability.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -55952,9 +57392,9 @@ diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capa
  
  /* audit system wants to get cap info from files as well */
  extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/cleancache.h
---- linux-3.0.4/include/linux/cleancache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cleancache.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/cleancache.h linux-3.0.7/include/linux/cleancache.h
+--- linux-3.0.7/include/linux/cleancache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -55964,9 +57404,9 @@ diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/clea
  
  extern struct cleancache_ops
  	cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/compiler-gcc4.h
---- linux-3.0.4/include/linux/compiler-gcc4.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/compiler-gcc4.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/compiler-gcc4.h linux-3.0.7/include/linux/compiler-gcc4.h
+--- linux-3.0.7/include/linux/compiler-gcc4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/compiler-gcc4.h	2011-08-26 19:49:56.000000000 -0400
 @@ -31,6 +31,12 @@
  
  
@@ -55992,9 +57432,9 @@ diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/c
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compiler.h
---- linux-3.0.4/include/linux/compiler.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/compiler.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/compiler.h linux-3.0.7/include/linux/compiler.h
+--- linux-3.0.7/include/linux/compiler.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/compiler.h	2011-10-06 04:17:55.000000000 -0400
 @@ -5,31 +5,62 @@
  
  #ifdef __CHECKER__
@@ -56115,9 +57555,9 @@ diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
---- linux-3.0.4/include/linux/cpuset.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/cpuset.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/cpuset.h linux-3.0.7/include/linux/cpuset.h
+--- linux-3.0.7/include/linux/cpuset.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/cpuset.h	2011-08-23 21:47:56.000000000 -0400
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
  	 * nodemask.
  	 */
@@ -56127,9 +57567,9 @@ diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
---- linux-3.0.4/include/linux/crypto.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/crypto.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/crypto.h linux-3.0.7/include/linux/crypto.h
+--- linux-3.0.7/include/linux/crypto.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -56155,9 +57595,9 @@ diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
  
  #define crt_ablkcipher	crt_u.ablkcipher
  #define crt_aead	crt_u.aead
-diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/decompress/mm.h
---- linux-3.0.4/include/linux/decompress/mm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/decompress/mm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/decompress/mm.h linux-3.0.7/include/linux/decompress/mm.h
+--- linux-3.0.7/include/linux/decompress/mm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -56167,9 +57607,9 @@ diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/d
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma-mapping.h
---- linux-3.0.4/include/linux/dma-mapping.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/dma-mapping.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/dma-mapping.h linux-3.0.7/include/linux/dma-mapping.h
+--- linux-3.0.7/include/linux/dma-mapping.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/dma-mapping.h	2011-08-26 19:49:56.000000000 -0400
 @@ -50,7 +50,7 @@ struct dma_map_ops {
  	int (*dma_supported)(struct device *dev, u64 mask);
  	int (*set_dma_mask)(struct device *dev, u64 mask);
@@ -56179,9 +57619,9 @@ diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma
  
  #define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
  
-diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
---- linux-3.0.4/include/linux/efi.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/efi.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/efi.h linux-3.0.7/include/linux/efi.h
+--- linux-3.0.7/include/linux/efi.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -56191,9 +57631,9 @@ diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
  
  struct efivars {
  	/*
-diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
---- linux-3.0.4/include/linux/elf.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/elf.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/elf.h linux-3.0.7/include/linux/elf.h
+--- linux-3.0.7/include/linux/elf.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
  
@@ -56266,9 +57706,9 @@ diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewire.h
---- linux-3.0.4/include/linux/firewire.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/firewire.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/firewire.h linux-3.0.7/include/linux/firewire.h
+--- linux-3.0.7/include/linux/firewire.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -56278,30 +57718,9 @@ diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewi
  	void *callback_data;
  };
  
-diff -urNp linux-3.0.4/include/linux/fscache-cache.h linux-3.0.4/include/linux/fscache-cache.h
---- linux-3.0.4/include/linux/fscache-cache.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
---- linux-3.0.4/include/linux/fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fs.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/fs.h linux-3.0.7/include/linux/fs.h
+--- linux-3.0.7/include/linux/fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/fs.h	2011-08-26 19:49:56.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)
@@ -56324,21 +57743,9 @@ diff -urNp linux-3.0.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
  
  #define IPERM_FLAG_RCU	0x0001
  
-diff -urNp linux-3.0.4/include/linux/fsnotify.h linux-3.0.4/include/linux/fsnotify.h
---- linux-3.0.4/include/linux/fsnotify.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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 -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_struct.h
---- linux-3.0.4/include/linux/fs_struct.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/fs_struct.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/fs_struct.h linux-3.0.7/include/linux/fs_struct.h
+--- linux-3.0.7/include/linux/fs_struct.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/fs_struct.h	2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -56348,9 +57755,42 @@ diff -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_st
  	spinlock_t lock;
  	seqcount_t seq;
  	int umask;
-diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ftrace_event.h
---- linux-3.0.4/include/linux/ftrace_event.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/ftrace_event.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/fscache-cache.h linux-3.0.7/include/linux/fscache-cache.h
+--- linux-3.0.7/include/linux/fscache-cache.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/include/linux/fsnotify.h linux-3.0.7/include/linux/fsnotify.h
+--- linux-3.0.7/include/linux/fsnotify.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 -urNp linux-3.0.7/include/linux/ftrace_event.h linux-3.0.7/include/linux/ftrace_event.h
+--- linux-3.0.7/include/linux/ftrace_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -56369,9 +57809,9 @@ diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ft
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
---- linux-3.0.4/include/linux/genhd.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/genhd.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/genhd.h linux-3.0.7/include/linux/genhd.h
+--- linux-3.0.7/include/linux/genhd.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/genhd.h	2011-08-23 21:47:56.000000000 -0400
 @@ -184,7 +184,7 @@ struct gendisk {
  	struct kobject *slave_dir;
  
@@ -56381,9 +57821,9 @@ diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
  	struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
  	struct blk_integrity *integrity;
-diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
---- linux-3.0.4/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/gracl.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/gracl.h linux-3.0.7/include/linux/gracl.h
+--- linux-3.0.7/include/linux/gracl.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/gracl.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -56702,9 +58142,9 @@ diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc.h
---- linux-3.0.4/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/gralloc.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/gralloc.h linux-3.0.7/include/linux/gralloc.h
+--- linux-3.0.7/include/linux/gralloc.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/gralloc.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -56715,9 +58155,9 @@ diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
---- linux-3.0.4/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grdefs.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/grdefs.h linux-3.0.7/include/linux/grdefs.h
+--- linux-3.0.7/include/linux/grdefs.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/grdefs.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -56859,9 +58299,9 @@ diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
 +};
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grinternal.h
---- linux-3.0.4/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grinternal.h	2011-09-24 08:43:45.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/grinternal.h linux-3.0.7/include/linux/grinternal.h
+--- linux-3.0.7/include/linux/grinternal.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/grinternal.h	2011-10-17 00:25:19.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -57082,9 +58522,9 @@ diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grin
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
---- linux-3.0.4/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grmsg.h	2011-09-14 09:16:54.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/grmsg.h linux-3.0.7/include/linux/grmsg.h
+--- linux-3.0.7/include/linux/grmsg.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/grmsg.h	2011-09-14 09:16:54.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"
@@ -57194,10 +58634,10 @@ diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
 +#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 -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grsecurity.h
---- linux-3.0.4/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grsecurity.h	2011-09-14 09:16:54.000000000 -0400
-@@ -0,0 +1,226 @@
+diff -urNp linux-3.0.7/include/linux/grsecurity.h linux-3.0.7/include/linux/grsecurity.h
+--- linux-3.0.7/include/linux/grsecurity.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/grsecurity.h	2011-10-17 06:35:30.000000000 -0400
+@@ -0,0 +1,228 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -57362,6 +58802,8 @@ diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grse
 +				 const int imode);
 +void gr_handle_create(const struct dentry *dentry,
 +			     const struct vfsmount *mnt);
++void gr_handle_proc_create(const struct dentry *dentry,
++			   const struct inode *inode);
 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
 +				 const struct dentry *parent_dentry,
 +				 const struct vfsmount *parent_mnt,
@@ -57424,9 +58866,9 @@ diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grse
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
---- linux-3.0.4/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/grsock.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/grsock.h linux-3.0.7/include/linux/grsock.h
+--- linux-3.0.7/include/linux/grsock.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/include/linux/grsock.h	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -57447,9 +58889,9 @@ diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
 +			    const int protocol);
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
---- linux-3.0.4/include/linux/hid.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/hid.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/hid.h linux-3.0.7/include/linux/hid.h
+--- linux-3.0.7/include/linux/hid.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -57459,9 +58901,9 @@ diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
  
  #define	PM_HINT_FULLON	1<<5
  #define PM_HINT_NORMAL	1<<1
-diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem.h
---- linux-3.0.4/include/linux/highmem.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/highmem.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/highmem.h linux-3.0.7/include/linux/highmem.h
+--- linux-3.0.7/include/linux/highmem.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -57481,9 +58923,9 @@ diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem
  static inline void zero_user_segments(struct page *page,
  	unsigned start1, unsigned end1,
  	unsigned start2, unsigned end2)
-diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
---- linux-3.0.4/include/linux/i2c.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/i2c.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/i2c.h linux-3.0.7/include/linux/i2c.h
+--- linux-3.0.7/include/linux/i2c.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -57492,9 +58934,9 @@ diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
---- linux-3.0.4/include/linux/i2o.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/i2o.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/i2o.h linux-3.0.7/include/linux/i2o.h
+--- linux-3.0.7/include/linux/i2o.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -57504,9 +58946,9 @@ diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
  	struct list_head context_list;	/* list of context id's
  					   and pointers */
  #endif
-diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
---- linux-3.0.4/include/linux/init.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/init.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/init.h linux-3.0.7/include/linux/init.h
+--- linux-3.0.7/include/linux/init.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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(). */
@@ -57523,9 +58965,9 @@ diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
  	{ return exitfn; }					\
  	void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_task.h
---- linux-3.0.4/include/linux/init_task.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/init_task.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/init_task.h linux-3.0.7/include/linux/init_task.h
+--- linux-3.0.7/include/linux/init_task.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -57547,9 +58989,9 @@ diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_
  	.fs		= &init_fs,					\
  	.files		= &init_files,					\
  	.signal		= &init_signals,				\
-diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/intel-iommu.h
---- linux-3.0.4/include/linux/intel-iommu.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/intel-iommu.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/intel-iommu.h linux-3.0.7/include/linux/intel-iommu.h
+--- linux-3.0.7/include/linux/intel-iommu.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -57559,9 +59001,9 @@ diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/int
  
  enum {
  	SR_DMAR_FECTL_REG,
-diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/interrupt.h
---- linux-3.0.4/include/linux/interrupt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/interrupt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/interrupt.h linux-3.0.7/include/linux/interrupt.h
+--- linux-3.0.7/include/linux/interrupt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -57586,9 +59028,9 @@ diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/inter
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsyms.h
---- linux-3.0.4/include/linux/kallsyms.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kallsyms.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/kallsyms.h linux-3.0.7/include/linux/kallsyms.h
+--- linux-3.0.7/include/linux/kallsyms.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/kallsyms.h	2011-08-23 21:48:14.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -57616,9 +59058,9 @@ diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsy
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
---- linux-3.0.4/include/linux/kgdb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kgdb.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/kgdb.h linux-3.0.7/include/linux/kgdb.h
+--- linux-3.0.7/include/linux/kgdb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/kgdb.h	2011-08-26 19:49:56.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -57646,9 +59088,9 @@ diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
  
  extern struct kgdb_arch		arch_kgdb_ops;
  
-diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
---- linux-3.0.4/include/linux/kmod.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kmod.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/kmod.h linux-3.0.7/include/linux/kmod.h
+--- linux-3.0.7/include/linux/kmod.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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, ...) \
@@ -57658,9 +59100,9 @@ diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
  #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 -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_host.h
---- linux-3.0.4/include/linux/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/kvm_host.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/kvm_host.h linux-3.0.7/include/linux/kvm_host.h
+--- linux-3.0.7/include/linux/kvm_host.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -57679,9 +59121,9 @@ diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_ho
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
---- linux-3.0.4/include/linux/libata.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/libata.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/libata.h linux-3.0.7/include/linux/libata.h
+--- linux-3.0.7/include/linux/libata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/libata.h	2011-08-26 19:49:56.000000000 -0400
 @@ -899,7 +899,7 @@ struct ata_port_operations {
  	 * fields must be pointers.
  	 */
@@ -57691,9 +59133,20 @@ diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
  
  struct ata_port_info {
  	unsigned long		flags;
-diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
---- linux-3.0.4/include/linux/mca.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mca.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/linkage.h linux-3.0.7/include/linux/linkage.h
+--- linux-3.0.7/include/linux/linkage.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/linkage.h	2011-10-11 10:44:33.000000000 -0400
+@@ -82,6 +82,7 @@
+  */
+ #ifndef ENDPROC
+ #define ENDPROC(name) \
++  .size name, .-name; \
+   .type name, @function; \
+   END(name)
+ #endif
+diff -urNp linux-3.0.7/include/linux/mca.h linux-3.0.7/include/linux/mca.h
+--- linux-3.0.7/include/linux/mca.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *,
@@ -57703,9 +59156,9 @@ diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
  
  struct mca_bus {
  	u64			default_dma_mask;
-diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
---- linux-3.0.4/include/linux/memory.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/memory.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/memory.h linux-3.0.7/include/linux/memory.h
+--- linux-3.0.7/include/linux/memory.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -57715,9 +59168,9 @@ diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/abx500.h
---- linux-3.0.4/include/linux/mfd/abx500.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mfd/abx500.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mfd/abx500.h linux-3.0.7/include/linux/mfd/abx500.h
+--- linux-3.0.7/include/linux/mfd/abx500.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -57726,9 +59179,9 @@ diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/
  
  int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
  void abx500_remove_ops(struct device *dev);
-diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
---- linux-3.0.4/include/linux/mm.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/mm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mm.h linux-3.0.7/include/linux/mm.h
+--- linux-3.0.7/include/linux/mm.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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 */
@@ -57851,9 +59304,9 @@ diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_types.h
---- linux-3.0.4/include/linux/mm_types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mm_types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mm_types.h linux-3.0.7/include/linux/mm_types.h
+--- linux-3.0.7/include/linux/mm_types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -57888,9 +59341,9 @@ diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_typ
  };
  
  static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mmu_notifier.h
---- linux-3.0.4/include/linux/mmu_notifier.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mmu_notifier.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mmu_notifier.h linux-3.0.7/include/linux/mmu_notifier.h
+--- linux-3.0.7/include/linux/mmu_notifier.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)		\
@@ -57907,9 +59360,9 @@ diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mm
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)		\
-diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
---- linux-3.0.4/include/linux/mmzone.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mmzone.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mmzone.h linux-3.0.7/include/linux/mmzone.h
+--- linux-3.0.7/include/linux/mmzone.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  
@@ -57919,9 +59372,9 @@ diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
  
  	/*
  	 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux/mod_devicetable.h
---- linux-3.0.4/include/linux/mod_devicetable.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/mod_devicetable.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/mod_devicetable.h linux-3.0.7/include/linux/mod_devicetable.h
+--- linux-3.0.7/include/linux/mod_devicetable.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/mod_devicetable.h	2011-08-23 21:47:56.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -57940,9 +59393,9 @@ diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux
  
  struct hid_device_id {
  	__u16 bus;
-diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
---- linux-3.0.4/include/linux/module.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/module.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/module.h linux-3.0.7/include/linux/module.h
+--- linux-3.0.7/include/linux/module.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/module.h	2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -58037,9 +59490,9 @@ diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/moduleloader.h
---- linux-3.0.4/include/linux/moduleloader.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/moduleloader.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/moduleloader.h linux-3.0.7/include/linux/moduleloader.h
+--- linux-3.0.7/include/linux/moduleloader.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -58062,9 +59515,9 @@ diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/mo
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/moduleparam.h
---- linux-3.0.4/include/linux/moduleparam.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/moduleparam.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/moduleparam.h linux-3.0.7/include/linux/moduleparam.h
+--- linux-3.0.7/include/linux/moduleparam.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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).
   */
@@ -58083,9 +59536,9 @@ diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/mod
  	= { .max = ARRAY_SIZE(array), .num = nump,                      \
  	    .ops = &param_ops_##type,					\
  	    .elemsize = sizeof(array[0]), .elem = array };		\
-diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
---- linux-3.0.4/include/linux/namei.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/namei.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/namei.h linux-3.0.7/include/linux/namei.h
+--- linux-3.0.7/include/linux/namei.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/namei.h	2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct nameidata {
  	unsigned	seq;
  	int		last_type;
@@ -58110,9 +59563,9 @@ diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
  {
  	return nd->saved_names[nd->depth];
  }
-diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netdevice.h
---- linux-3.0.4/include/linux/netdevice.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/netdevice.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/netdevice.h linux-3.0.7/include/linux/netdevice.h
+--- linux-3.0.7/include/linux/netdevice.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -58121,9 +59574,9 @@ diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netde
  
  /*
   *	The DEVICE structure.
-diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/linux/netfilter/xt_gradm.h
---- linux-3.0.4/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/include/linux/netfilter/xt_gradm.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/netfilter/xt_gradm.h linux-3.0.7/include/linux/netfilter/xt_gradm.h
+--- linux-3.0.7/include/linux/netfilter/xt_gradm.h	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/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
@@ -58134,9 +59587,9 @@ diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/li
 +};
 +
 +#endif
-diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
---- linux-3.0.4/include/linux/of_pdt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/of_pdt.h	2011-08-30 06:20:11.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/of_pdt.h linux-3.0.7/include/linux/of_pdt.h
+--- linux-3.0.7/include/linux/of_pdt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/of_pdt.h	2011-08-30 06:20:11.000000000 -0400
 @@ -32,7 +32,7 @@ struct of_pdt_ops {
  
  	/* return 0 on success; fill in 'len' with number of bytes in path */
@@ -58146,9 +59599,9 @@ diff -urNp linux-3.0.4/include/linux/of_pdt.h linux-3.0.4/include/linux/of_pdt.h
  
  extern void *prom_early_alloc(unsigned long size);
  
-diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofile.h
---- linux-3.0.4/include/linux/oprofile.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/oprofile.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/oprofile.h linux-3.0.7/include/linux/oprofile.h
+--- linux-3.0.7/include/linux/oprofile.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -58161,9 +59614,9 @@ diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofi
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
---- linux-3.0.4/include/linux/padata.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/padata.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/padata.h linux-3.0.7/include/linux/padata.h
+--- linux-3.0.7/include/linux/padata.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58173,9 +59626,9 @@ diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
  	atomic_t			reorder_objects;
  	atomic_t			refcnt;
  	unsigned int			max_seq_nr;
-diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf_event.h
---- linux-3.0.4/include/linux/perf_event.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/perf_event.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/perf_event.h linux-3.0.7/include/linux/perf_event.h
+--- linux-3.0.7/include/linux/perf_event.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58198,9 +59651,9 @@ diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf
  
  	/*
  	 * Protect attach/detach and child_list:
-diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_fs_i.h
---- linux-3.0.4/include/linux/pipe_fs_i.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/pipe_fs_i.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/pipe_fs_i.h linux-3.0.7/include/linux/pipe_fs_i.h
+--- linux-3.0.7/include/linux/pipe_fs_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58214,9 +59667,9 @@ diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_
  	unsigned int r_counter;
  	unsigned int w_counter;
  	struct page *tmp_page;
-diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_runtime.h
---- linux-3.0.4/include/linux/pm_runtime.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/pm_runtime.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/pm_runtime.h linux-3.0.7/include/linux/pm_runtime.h
+--- linux-3.0.7/include/linux/pm_runtime.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -58226,9 +59679,9 @@ diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_r
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
---- linux-3.0.4/include/linux/poison.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/poison.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/poison.h linux-3.0.7/include/linux/poison.h
+--- linux-3.0.7/include/linux/poison.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -58240,9 +59693,9 @@ diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt.h
---- linux-3.0.4/include/linux/preempt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/preempt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/preempt.h linux-3.0.7/include/linux/preempt.h
+--- linux-3.0.7/include/linux/preempt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -58252,9 +59705,9 @@ diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs.h
---- linux-3.0.4/include/linux/proc_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/proc_fs.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/proc_fs.h linux-3.0.7/include/linux/proc_fs.h
+--- linux-3.0.7/include/linux/proc_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -58284,9 +59737,9 @@ diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
---- linux-3.0.4/include/linux/ptrace.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/ptrace.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/ptrace.h linux-3.0.7/include/linux/ptrace.h
+--- linux-3.0.7/include/linux/ptrace.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -58300,9 +59753,9 @@ diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
---- linux-3.0.4/include/linux/random.h	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/include/linux/random.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/random.h linux-3.0.7/include/linux/random.h
+--- linux-3.0.7/include/linux/random.h	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -58322,9 +59775,9 @@ diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
  }
  
  /**
-diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
---- linux-3.0.4/include/linux/reboot.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reboot.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/reboot.h linux-3.0.7/include/linux/reboot.h
+--- linux-3.0.7/include/linux/reboot.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
   */
@@ -58360,9 +59813,9 @@ diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/reiserfs_fs.h
---- linux-3.0.4/include/linux/reiserfs_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reiserfs_fs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/reiserfs_fs.h linux-3.0.7/include/linux/reiserfs_fs.h
+--- linux-3.0.7/include/linux/reiserfs_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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            */
  
@@ -58372,9 +59825,9 @@ diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/rei
  #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)		\
-diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/reiserfs_fs_sb.h
---- linux-3.0.4/include/linux/reiserfs_fs_sb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/reiserfs_fs_sb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/reiserfs_fs_sb.h linux-3.0.7/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.7/include/linux/reiserfs_fs_sb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58384,9 +59837,9 @@ diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/
  	// tree gets re-balanced
  	unsigned long s_properties;	/* File system properties. Currently holds
  					   on-disk FS format */
-diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
---- linux-3.0.4/include/linux/relay.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/relay.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/relay.h linux-3.0.7/include/linux/relay.h
+--- linux-3.0.7/include/linux/relay.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  	 */
@@ -58396,9 +59849,9 @@ diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
---- linux-3.0.4/include/linux/rfkill.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/rfkill.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/rfkill.h linux-3.0.7/include/linux/rfkill.h
+--- linux-3.0.7/include/linux/rfkill.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -58407,9 +59860,9 @@ diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
---- linux-3.0.4/include/linux/rmap.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/rmap.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/rmap.h linux-3.0.7/include/linux/rmap.h
+--- linux-3.0.7/include/linux/rmap.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -58421,9 +59874,9 @@ diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
  void __anon_vma_link(struct vm_area_struct *);
  
  static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
---- linux-3.0.4/include/linux/sched.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sched.h	2011-08-25 17:22:27.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/sched.h linux-3.0.7/include/linux/sched.h
+--- linux-3.0.7/include/linux/sched.h	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/include/linux/sched.h	2011-10-17 23:17:19.000000000 -0400
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -58618,7 +60071,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  #define PF_USED_MATH	0x00002000	/* if unset the fpu must be initialized before use */
  #define PF_FREEZING	0x00004000	/* freeze in progress. do not account to load */
  #define PF_NOFREEZE	0x00008000	/* this thread should not be frozen */
-@@ -2056,7 +2149,9 @@ void yield(void);
+@@ -2055,7 +2148,9 @@ void yield(void);
  extern struct exec_domain	default_exec_domain;
  
  union thread_union {
@@ -58628,7 +60081,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  	unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2089,6 +2184,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2088,6 +2183,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -58636,7 +60089,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
  		struct pid_namespace *ns);
  
-@@ -2225,7 +2321,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2224,7 +2320,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -58645,7 +60098,7 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2393,13 +2489,17 @@ static inline unsigned long *end_of_stac
+@@ -2392,13 +2488,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -58665,9 +60118,9 @@ diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/screen_info.h
---- linux-3.0.4/include/linux/screen_info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/screen_info.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/screen_info.h linux-3.0.7/include/linux/screen_info.h
+--- linux-3.0.7/include/linux/screen_info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -58678,9 +60131,9 @@ diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/scr
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/security.h
---- linux-3.0.4/include/linux/security.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/security.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/security.h linux-3.0.7/include/linux/security.h
+--- linux-3.0.7/include/linux/security.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/security.h	2011-08-23 21:48:14.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -58689,9 +60142,9 @@ diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/securi
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_file.h
---- linux-3.0.4/include/linux/seq_file.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/seq_file.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/seq_file.h linux-3.0.7/include/linux/seq_file.h
+--- linux-3.0.7/include/linux/seq_file.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -58700,21 +60153,9 @@ diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_fi
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-3.0.4/include/linux/shmem_fs.h linux-3.0.4/include/linux/shmem_fs.h
---- linux-3.0.4/include/linux/shmem_fs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
---- linux-3.0.4/include/linux/shm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/shm.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/shm.h linux-3.0.7/include/linux/shm.h
+--- linux-3.0.7/include/linux/shm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58726,9 +60167,21 @@ diff -urNp linux-3.0.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
---- linux-3.0.4/include/linux/skbuff.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/skbuff.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/shmem_fs.h linux-3.0.7/include/linux/shmem_fs.h
+--- linux-3.0.7/include/linux/shmem_fs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/include/linux/skbuff.h linux-3.0.7/include/linux/skbuff.h
+--- linux-3.0.7/include/linux/skbuff.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -58765,27 +60218,9 @@ diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.0.4/include/linux/slab_def.h linux-3.0.4/include/linux/slab_def.h
---- linux-3.0.4/include/linux/slab_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
---- linux-3.0.4/include/linux/slab.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/slab.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/slab.h linux-3.0.7/include/linux/slab.h
+--- linux-3.0.7/include/linux/slab.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/slab.h	2011-08-23 21:47:56.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -58892,9 +60327,27 @@ diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
 +})
 +
  #endif	/* _LINUX_SLAB_H */
-diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_def.h
---- linux-3.0.4/include/linux/slub_def.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/slub_def.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/slab_def.h linux-3.0.7/include/linux/slab_def.h
+--- linux-3.0.7/include/linux/slab_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/include/linux/slub_def.h linux-3.0.7/include/linux/slub_def.h
+--- linux-3.0.7/include/linux/slub_def.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58913,9 +60366,9 @@ diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_d
  
  static __always_inline void *
  kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
---- linux-3.0.4/include/linux/sonet.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sonet.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/sonet.h linux-3.0.7/include/linux/sonet.h
+--- linux-3.0.7/include/linux/sonet.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/sonet.h	2011-08-23 21:47:56.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -58925,9 +60378,9 @@ diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sunrpc/clnt.h
---- linux-3.0.4/include/linux/sunrpc/clnt.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sunrpc/clnt.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/sunrpc/clnt.h linux-3.0.7/include/linux/sunrpc/clnt.h
+--- linux-3.0.7/include/linux/sunrpc/clnt.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
@@ -58958,9 +60411,9 @@ diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sun
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux/sunrpc/svc_rdma.h
---- linux-3.0.4/include/linux/sunrpc/svc_rdma.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sunrpc/svc_rdma.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/sunrpc/svc_rdma.h linux-3.0.7/include/linux/sunrpc/svc_rdma.h
+--- linux-3.0.7/include/linux/sunrpc/svc_rdma.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -58986,9 +60439,9 @@ diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
---- linux-3.0.4/include/linux/sysctl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/sysctl.h	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/sysctl.h linux-3.0.7/include/linux/sysctl.h
+--- linux-3.0.7/include/linux/sysctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  };
@@ -59011,9 +60464,9 @@ diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
  extern int proc_dointvec(struct ctl_table *, int,
  			 void __user *, size_t *, loff_t *);
  extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_ldisc.h
---- linux-3.0.4/include/linux/tty_ldisc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/tty_ldisc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/tty_ldisc.h linux-3.0.7/include/linux/tty_ldisc.h
+--- linux-3.0.7/include/linux/tty_ldisc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/tty_ldisc.h	2011-08-23 21:47:56.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
  	struct  module *owner;
@@ -59023,9 +60476,9 @@ diff -urNp linux-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_l
  };
  
  struct tty_ldisc {
-diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
---- linux-3.0.4/include/linux/types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/types.h linux-3.0.7/include/linux/types.h
+--- linux-3.0.7/include/linux/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/types.h	2011-08-23 21:47:56.000000000 -0400
 @@ -213,10 +213,26 @@ typedef struct {
  	int counter;
  } atomic_t;
@@ -59053,9 +60506,9 @@ diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-3.0.4/include/linux/uaccess.h linux-3.0.4/include/linux/uaccess.h
---- linux-3.0.4/include/linux/uaccess.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/uaccess.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/uaccess.h linux-3.0.7/include/linux/uaccess.h
+--- linux-3.0.7/include/linux/uaccess.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/uaccess.h	2011-10-06 04:17:55.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
  		long ret;				\
  		mm_segment_t old_fs = get_fs();		\
@@ -59071,9 +60524,9 @@ diff -urNp linux-3.0.4/include/linux/uaccess.h linux-3.0.4/include/linux/uaccess
  		ret;					\
  	})
  
-diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/linux/unaligned/access_ok.h
---- linux-3.0.4/include/linux/unaligned/access_ok.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/unaligned/access_ok.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/unaligned/access_ok.h linux-3.0.7/include/linux/unaligned/access_ok.h
+--- linux-3.0.7/include/linux/unaligned/access_ok.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -59113,9 +60566,9 @@ diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/l
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.0.4/include/linux/vermagic.h linux-3.0.4/include/linux/vermagic.h
---- linux-3.0.4/include/linux/vermagic.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/vermagic.h	2011-10-07 19:25:35.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/vermagic.h linux-3.0.7/include/linux/vermagic.h
+--- linux-3.0.7/include/linux/vermagic.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/linux/vermagic.h	2011-10-07 19:25:35.000000000 -0400
 @@ -26,9 +26,28 @@
  #define MODULE_ARCH_VERMAGIC ""
  #endif
@@ -59146,9 +60599,9 @@ diff -urNp linux-3.0.4/include/linux/vermagic.h linux-3.0.4/include/linux/vermag
 +	MODULE_ARCH_VERMAGIC						\
 +	MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_GRSEC
  
-diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc.h
---- linux-3.0.4/include/linux/vmalloc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/vmalloc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/vmalloc.h linux-3.0.7/include/linux/vmalloc.h
+--- linux-3.0.7/include/linux/vmalloc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -59265,9 +60718,9 @@ diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
---- linux-3.0.4/include/linux/vmstat.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/linux/vmstat.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/linux/vmstat.h linux-3.0.7/include/linux/vmstat.h
+--- linux-3.0.7/include/linux/vmstat.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -59331,9 +60784,9 @@ diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7146_vv.h
---- linux-3.0.4/include/media/saa7146_vv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/media/saa7146_vv.h	2011-10-07 19:07:40.000000000 -0400
+diff -urNp linux-3.0.7/include/media/saa7146_vv.h linux-3.0.7/include/media/saa7146_vv.h
+--- linux-3.0.7/include/media/saa7146_vv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/media/saa7146_vv.h	2011-10-07 19:07:40.000000000 -0400
 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
  	int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -59343,9 +60796,9 @@ diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7
  	/* pointer to the saa7146 core ops */
  	const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-3.0.4/include/media/v4l2-dev.h linux-3.0.4/include/media/v4l2-dev.h
---- linux-3.0.4/include/media/v4l2-dev.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/media/v4l2-dev.h	2011-10-07 19:07:40.000000000 -0400
+diff -urNp linux-3.0.7/include/media/v4l2-dev.h linux-3.0.7/include/media/v4l2-dev.h
+--- linux-3.0.7/include/media/v4l2-dev.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/media/v4l2-dev.h	2011-10-07 19:07:40.000000000 -0400
 @@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_sta
  
  
@@ -59363,9 +60816,9 @@ diff -urNp linux-3.0.4/include/media/v4l2-dev.h linux-3.0.4/include/media/v4l2-d
  
  /*
   * Newer version of video_device, handled by videodev2.c
-diff -urNp linux-3.0.4/include/media/v4l2-ioctl.h linux-3.0.4/include/media/v4l2-ioctl.h
---- linux-3.0.4/include/media/v4l2-ioctl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/media/v4l2-ioctl.h	2011-08-24 18:25:45.000000000 -0400
+diff -urNp linux-3.0.7/include/media/v4l2-ioctl.h linux-3.0.7/include/media/v4l2-ioctl.h
+--- linux-3.0.7/include/media/v4l2-ioctl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -59374,9 +60827,9 @@ diff -urNp linux-3.0.4/include/media/v4l2-ioctl.h linux-3.0.4/include/media/v4l2
  
  
  /* v4l debugging and diagnostics */
-diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cfctrl.h
---- linux-3.0.4/include/net/caif/cfctrl.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/caif/cfctrl.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/caif/cfctrl.h linux-3.0.7/include/net/caif/cfctrl.h
+--- linux-3.0.7/include/net/caif/cfctrl.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -59397,9 +60850,9 @@ diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cf
  	struct list_head list;
  	/* Protects from simultaneous access to first_req list */
  	spinlock_t info_list_lock;
-diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
---- linux-3.0.4/include/net/flow.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/flow.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/flow.h linux-3.0.7/include/net/flow.h
+--- linux-3.0.7/include/net/flow.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -59408,9 +60861,9 @@ diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
---- linux-3.0.4/include/net/inetpeer.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/inetpeer.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/inetpeer.h linux-3.0.7/include/net/inetpeer.h
+--- linux-3.0.7/include/net/inetpeer.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/net/inetpeer.h	2011-08-23 21:47:56.000000000 -0400
 @@ -43,8 +43,8 @@ struct inet_peer {
  	 */
  	union {
@@ -59431,9 +60884,9 @@ diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
---- linux-3.0.4/include/net/ip_fib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/ip_fib.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/ip_fib.h linux-3.0.7/include/net/ip_fib.h
+--- linux-3.0.7/include/net/ip_fib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)				\
@@ -59443,9 +60896,9 @@ diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
  	 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.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
---- linux-3.0.4/include/net/ip_vs.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/ip_vs.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/ip_vs.h linux-3.0.7/include/net/ip_vs.h
+--- linux-3.0.7/include/net/ip_vs.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -59464,9 +60917,9 @@ diff -urNp linux-3.0.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
  	atomic_t		weight;		/* server weight */
  
  	atomic_t		refcnt;		/* reference counter */
-diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/irda/ircomm_core.h
---- linux-3.0.4/include/net/irda/ircomm_core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/irda/ircomm_core.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/irda/ircomm_core.h linux-3.0.7/include/net/irda/ircomm_core.h
+--- linux-3.0.7/include/net/irda/ircomm_core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *, 
@@ -59476,9 +60929,9 @@ diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/ir
  
  struct ircomm_cb {
  	irda_queue_t queue;
-diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/irda/ircomm_tty.h
---- linux-3.0.4/include/net/irda/ircomm_tty.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/irda/ircomm_tty.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/irda/ircomm_tty.h linux-3.0.7/include/net/irda/ircomm_tty.h
+--- linux-3.0.7/include/net/irda/ircomm_tty.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -59498,9 +60951,9 @@ diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/ird
  
  	/* Protect concurent access to :
  	 *	o self->open_count
-diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/af_iucv.h
---- linux-3.0.4/include/net/iucv/af_iucv.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/iucv/af_iucv.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/iucv/af_iucv.h linux-3.0.7/include/net/iucv/af_iucv.h
+--- linux-3.0.7/include/net/iucv/af_iucv.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -59510,9 +60963,9 @@ diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/a
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
---- linux-3.0.4/include/net/lapb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/lapb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/lapb.h linux-3.0.7/include/net/lapb.h
+--- linux-3.0.7/include/net/lapb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -59522,9 +60975,9 @@ diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
  
  	/* FRMR control information */
  	struct lapb_frame	frmr_data;
-diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour.h
---- linux-3.0.4/include/net/neighbour.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/neighbour.h	2011-08-31 18:39:25.000000000 -0400
+diff -urNp linux-3.0.7/include/net/neighbour.h linux-3.0.7/include/net/neighbour.h
+--- linux-3.0.7/include/net/neighbour.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/net/neighbour.h	2011-08-31 18:39:25.000000000 -0400
 @@ -124,7 +124,7 @@ struct neigh_ops {
  	int			(*connected_output)(struct sk_buff*);
  	int			(*hh_output)(struct sk_buff*);
@@ -59534,9 +60987,9 @@ diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour
  
  struct pneigh_entry {
  	struct pneigh_entry	*next;
-diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
---- linux-3.0.4/include/net/netlink.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/netlink.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/netlink.h linux-3.0.7/include/net/netlink.h
+--- linux-3.0.7/include/net/netlink.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -59546,9 +60999,9 @@ diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
  }
  
  /**
-diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ipv4.h
---- linux-3.0.4/include/net/netns/ipv4.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/netns/ipv4.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/netns/ipv4.h linux-3.0.7/include/net/netns/ipv4.h
+--- linux-3.0.7/include/net/netns/ipv4.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -59560,9 +61013,9 @@ diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ip
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp.h
---- linux-3.0.4/include/net/sctp/sctp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/sctp/sctp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/sctp/sctp.h linux-3.0.7/include/net/sctp/sctp.h
+--- linux-3.0.7/include/net/sctp/sctp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/net/sctp/sctp.h	2011-08-23 21:47:56.000000000 -0400
 @@ -315,9 +315,9 @@ do {									\
  
  #else	/* SCTP_DEBUG */
@@ -59576,9 +61029,9 @@ diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
---- linux-3.0.4/include/net/sock.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/sock.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/sock.h linux-3.0.7/include/net/sock.h
+--- linux-3.0.7/include/net/sock.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/net/sock.h	2011-08-23 21:47:56.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
  	__u32			sk_rxhash;
@@ -59597,9 +61050,9 @@ diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
  					   int copy, int offset)
  {
  	if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
---- linux-3.0.4/include/net/tcp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/tcp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/tcp.h linux-3.0.7/include/net/tcp.h
+--- linux-3.0.7/include/net/tcp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -59611,9 +61064,9 @@ diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
---- linux-3.0.4/include/net/udp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/udp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/udp.h linux-3.0.7/include/net/udp.h
+--- linux-3.0.7/include/net/udp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -59625,9 +61078,9 @@ diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
---- linux-3.0.4/include/net/xfrm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/net/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/net/xfrm.h linux-3.0.7/include/net/xfrm.h
+--- linux-3.0.7/include/net/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/net/xfrm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -505,7 +505,7 @@ struct xfrm_policy {
  	struct timer_list	timer;
  
@@ -59637,9 +61090,9 @@ diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
  	u32			priority;
  	u32			index;
  	struct xfrm_mark	mark;
-diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
---- linux-3.0.4/include/rdma/iw_cm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/rdma/iw_cm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/rdma/iw_cm.h linux-3.0.7/include/rdma/iw_cm.h
+--- linux-3.0.7/include/rdma/iw_cm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/rdma/iw_cm.h	2011-08-23 21:47:56.000000000 -0400
 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
  					 int backlog);
  
@@ -59649,9 +61102,9 @@ diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
---- linux-3.0.4/include/scsi/libfc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/libfc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/scsi/libfc.h linux-3.0.7/include/scsi/libfc.h
+--- linux-3.0.7/include/scsi/libfc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -59669,9 +61122,9 @@ diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
  	u8			       link_up;
  	u8			       qfull;
  	enum fc_lport_state	       state;
-diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_device.h
---- linux-3.0.4/include/scsi/scsi_device.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/scsi_device.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/scsi/scsi_device.h linux-3.0.7/include/scsi/scsi_device.h
+--- linux-3.0.7/include/scsi/scsi_device.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -59685,9 +61138,9 @@ diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_
  
  	struct device		sdev_gendev,
  				sdev_dev;
-diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi/scsi_transport_fc.h
---- linux-3.0.4/include/scsi/scsi_transport_fc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/scsi/scsi_transport_fc.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/scsi/scsi_transport_fc.h linux-3.0.7/include/scsi/scsi_transport_fc.h
+--- linux-3.0.7/include/scsi/scsi_transport_fc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/scsi/scsi_transport_fc.h	2011-08-26 19:49:56.000000000 -0400
 @@ -711,7 +711,7 @@ struct fc_function_template {
  	unsigned long	show_host_system_hostname:1;
  
@@ -59697,9 +61150,9 @@ diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi
  
  
  /**
-diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4xxx-adda.h
---- linux-3.0.4/include/sound/ak4xxx-adda.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/ak4xxx-adda.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/ak4xxx-adda.h linux-3.0.7/include/sound/ak4xxx-adda.h
+--- linux-3.0.7/include/sound/ak4xxx-adda.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -59709,9 +61162,9 @@ diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4
  
  #define AK4XXX_IMAGE_SIZE	(AK4XXX_MAX_CHIPS * 16)	/* 64 bytes */
  
-diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
---- linux-3.0.4/include/sound/hwdep.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/hwdep.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/hwdep.h linux-3.0.7/include/sound/hwdep.h
+--- linux-3.0.7/include/sound/hwdep.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -59721,9 +61174,9 @@ diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
  
  struct snd_hwdep {
  	struct snd_card *card;
-diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
---- linux-3.0.4/include/sound/info.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/info.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/info.h linux-3.0.7/include/sound/info.h
+--- linux-3.0.7/include/sound/info.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -59733,9 +61186,9 @@ diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
  
  struct snd_info_entry_ops {
  	int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
---- linux-3.0.4/include/sound/pcm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/pcm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/pcm.h linux-3.0.7/include/sound/pcm.h
+--- linux-3.0.7/include/sound/pcm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -59744,9 +61197,9 @@ diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
  
  /*
   *
-diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_csp.h
---- linux-3.0.4/include/sound/sb16_csp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/sb16_csp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/sb16_csp.h linux-3.0.7/include/sound/sb16_csp.h
+--- linux-3.0.7/include/sound/sb16_csp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -59756,9 +61209,9 @@ diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_c
  
  /*
   * CSP private data
-diff -urNp linux-3.0.4/include/sound/soc.h linux-3.0.4/include/sound/soc.h
---- linux-3.0.4/include/sound/soc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/soc.h	2011-08-26 19:49:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/soc.h linux-3.0.7/include/sound/soc.h
+--- linux-3.0.7/include/sound/soc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/include/sound/soc.h	2011-08-26 19:49:56.000000000 -0400
 @@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
  
  	/* platform stream ops */
@@ -59768,9 +61221,9 @@ diff -urNp linux-3.0.4/include/sound/soc.h linux-3.0.4/include/sound/soc.h
  
  struct snd_soc_platform {
  	const char *name;
-diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
---- linux-3.0.4/include/sound/ymfpci.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/sound/ymfpci.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/sound/ymfpci.h linux-3.0.7/include/sound/ymfpci.h
+--- linux-3.0.7/include/sound/ymfpci.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -59780,9 +61233,9 @@ diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
  	struct snd_info_entry *proc_entry;
  	const struct firmware *dsp_microcode;
  	const struct firmware *controller_microcode;
-diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/target/target_core_base.h
---- linux-3.0.4/include/target/target_core_base.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/target/target_core_base.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/target/target_core_base.h linux-3.0.7/include/target/target_core_base.h
+--- linux-3.0.7/include/target/target_core_base.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 *);
@@ -59812,9 +61265,9 @@ diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/tar
  	atomic_t		dev_tur_active;
  	atomic_t		execute_tasks;
  	atomic_t		dev_status_thr_count;
-diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/events/irq.h
---- linux-3.0.4/include/trace/events/irq.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/trace/events/irq.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/trace/events/irq.h linux-3.0.7/include/trace/events/irq.h
+--- linux-3.0.7/include/trace/events/irq.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -59833,9 +61286,9 @@ diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/even
  
  	TP_ARGS(irq, action, ret),
  
-diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
---- linux-3.0.4/include/video/udlfb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/video/udlfb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/video/udlfb.h linux-3.0.7/include/video/udlfb.h
+--- linux-3.0.7/include/video/udlfb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -59851,9 +61304,9 @@ diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb.h
---- linux-3.0.4/include/video/uvesafb.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/include/video/uvesafb.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/include/video/uvesafb.h linux-3.0.7/include/video/uvesafb.h
+--- linux-3.0.7/include/video/uvesafb.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -59862,9 +61315,21 @@ diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb
  	void *pmi_start;
  	void *pmi_pal;
  	u8 *vbe_state_orig;		/*
-diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
---- linux-3.0.4/init/do_mounts.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/Kconfig linux-3.0.7/init/Kconfig
+--- linux-3.0.7/init/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/init/do_mounts.c linux-3.0.7/init/do_mounts.c
+--- linux-3.0.7/init/do_mounts.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/do_mounts.c	2011-10-06 04:17:55.000000000 -0400
 @@ -287,11 +287,11 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -59910,9 +61375,9 @@ diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
 +	sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
 +	sys_chroot((const char __force_user *)".");
  }
-diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
---- linux-3.0.4/init/do_mounts.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts.h	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/do_mounts.h linux-3.0.7/init/do_mounts.h
+--- linux-3.0.7/init/do_mounts.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/do_mounts.h	2011-10-06 04:17:55.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -59941,9 +61406,9 @@ diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
  		return 0;
  	if (!S_ISBLK(stat.st_mode))
  		return 0;
-diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd.c
---- linux-3.0.4/init/do_mounts_initrd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts_initrd.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/do_mounts_initrd.c linux-3.0.7/init/do_mounts_initrd.c
+--- linux-3.0.7/init/do_mounts_initrd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/do_mounts_initrd.c	2011-10-06 04:17:55.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
  	create_dev("/dev/root.old", Root_RAM0);
  	/* mount initrd on rootfs' /root */
@@ -60018,9 +61483,9 @@ diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd
 +	sys_unlink((const char __force_user *)"/initrd.image");
  	return 0;
  }
-diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
---- linux-3.0.4/init/do_mounts_md.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/do_mounts_md.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/do_mounts_md.c linux-3.0.7/init/do_mounts_md.c
+--- linux-3.0.7/init/do_mounts_md.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/do_mounts_md.c	2011-10-06 04:17:55.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
  			partitioned ? "_d" : "", minor,
  			md_setup_args[ent].device_names);
@@ -60048,9 +61513,9 @@ diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
  	if (fd >= 0) {
  		sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
  		sys_close(fd);
-diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
---- linux-3.0.4/init/initramfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/initramfs.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/initramfs.c linux-3.0.7/init/initramfs.c
+--- linux-3.0.7/init/initramfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/initramfs.c	2011-10-06 04:17:55.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
  	}
  }
@@ -60159,21 +61624,9 @@ diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
  	state = SkipIt;
  	next_state = Reset;
  	return 0;
-diff -urNp linux-3.0.4/init/Kconfig linux-3.0.4/init/Kconfig
---- linux-3.0.4/init/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/init/main.c linux-3.0.4/init/main.c
---- linux-3.0.4/init/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/init/main.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/init/main.c linux-3.0.7/init/main.c
+--- linux-3.0.7/init/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/init/main.c	2011-10-06 04:17:55.000000000 -0400
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -60285,20 +61738,20 @@ diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
  	/*
  	 * Ok, we have completed the initial bootup, and
  	 * we're essentially up and running. Get rid of the
-diff -urNp linux-3.0.4/ipc/mqueue.c linux-3.0.4/ipc/mqueue.c
---- linux-3.0.4/ipc/mqueue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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));
- 
-+			gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
- 			spin_lock(&mq_lock);
- 			if (u->mq_bytes + mq_bytes < u->mq_bytes ||
- 		 	    u->mq_bytes + mq_bytes >
-diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
---- linux-3.0.4/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/ipc/msg.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/ipc/mqueue.c linux-3.0.7/ipc/mqueue.c
+--- linux-3.0.7/ipc/mqueue.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/ipc/mqueue.c	2011-10-16 21:59:31.000000000 -0400
+@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(st
+ 		mq_bytes = (mq_msg_tblsz +
+ 			(info->attr.mq_maxmsg * info->attr.mq_msgsize));
+ 
++		gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
+ 		spin_lock(&mq_lock);
+ 		if (u->mq_bytes + mq_bytes < u->mq_bytes ||
+ 		    u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
+diff -urNp linux-3.0.7/ipc/msg.c linux-3.0.7/ipc/msg.c
+--- linux-3.0.7/ipc/msg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -60324,9 +61777,9 @@ diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
  	msg_params.key = key;
  	msg_params.flg = msgflg;
  
-diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
---- linux-3.0.4/ipc/sem.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/ipc/sem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/ipc/sem.c linux-3.0.7/ipc/sem.c
+--- linux-3.0.7/ipc/sem.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/ipc/sem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
  	return 0;
  }
@@ -60373,9 +61826,9 @@ diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
  	ns = current->nsproxy->ipc_ns;
  
  	if (nsops < 1 || semid < 0)
-diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
---- linux-3.0.4/ipc/shm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/ipc/shm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/ipc/shm.c linux-3.0.7/ipc/shm.c
+--- linux-3.0.7/ipc/shm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -60462,9 +61915,9 @@ diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
  	size = i_size_read(path.dentry->d_inode);
  	shm_unlock(shp);
  
-diff -urNp linux-3.0.4/kernel/acct.c linux-3.0.4/kernel/acct.c
---- linux-3.0.4/kernel/acct.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/acct.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/acct.c linux-3.0.7/kernel/acct.c
+--- linux-3.0.7/kernel/acct.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/acct.c	2011-10-06 04:17:55.000000000 -0400
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
  	 */
  	flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -60474,9 +61927,9 @@ diff -urNp linux-3.0.4/kernel/acct.c linux-3.0.4/kernel/acct.c
  			       sizeof(acct_t), &file->f_pos);
  	current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
  	set_fs(fs);
-diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
---- linux-3.0.4/kernel/audit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/audit.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/audit.c linux-3.0.7/kernel/audit.c
+--- linux-3.0.7/kernel/audit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -60513,9 +61966,9 @@ diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
  		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 -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
---- linux-3.0.4/kernel/auditsc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/auditsc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/auditsc.c linux-3.0.7/kernel/auditsc.c
+--- linux-3.0.7/kernel/auditsc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/auditsc.c	2011-08-23 21:47:56.000000000 -0400
 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -60534,9 +61987,9 @@ diff -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
  	struct audit_context *context = task->audit_context;
  
  	if (context && context->in_syscall) {
-diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
---- linux-3.0.4/kernel/capability.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/capability.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/capability.c linux-3.0.7/kernel/capability.c
+--- linux-3.0.7/kernel/capability.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -60597,9 +62050,9 @@ diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
  /**
   * nsown_capable - Check superior capability to one's own user_ns
   * @cap: The capability in question
-diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
---- linux-3.0.4/kernel/cgroup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/cgroup.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/cgroup.c linux-3.0.7/kernel/cgroup.c
+--- linux-3.0.7/kernel/cgroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -60609,9 +62062,9 @@ diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
  	/* First see if we already have a cgroup group that matches
  	 * the desired set */
  	read_lock(&css_set_lock);
-diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
---- linux-3.0.4/kernel/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/compat.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/compat.c linux-3.0.7/kernel/compat.c
+--- linux-3.0.7/kernel/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/compat.c	2011-10-06 04:17:55.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -60777,9 +62230,9 @@ diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
  	set_fs(oldfs);
  
  	if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
-diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
---- linux-3.0.4/kernel/configs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/configs.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/configs.c linux-3.0.7/kernel/configs.c
+--- linux-3.0.7/kernel/configs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -60800,9 +62253,9 @@ diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
  	if (!entry)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
---- linux-3.0.4/kernel/cred.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/cred.c	2011-08-25 17:23:03.000000000 -0400
+diff -urNp linux-3.0.7/kernel/cred.c linux-3.0.7/kernel/cred.c
+--- linux-3.0.7/kernel/cred.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/cred.c	2011-08-25 17:23:03.000000000 -0400
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -60951,9 +62404,9 @@ diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
  	ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
  	if (ret < 0)
  		return ret;
-diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_core.c
---- linux-3.0.4/kernel/debug/debug_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/debug/debug_core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/debug/debug_core.c linux-3.0.7/kernel/debug/debug_core.c
+--- linux-3.0.7/kernel/debug/debug_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -61014,9 +62467,9 @@ diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_
  	tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/kdb_main.c
---- linux-3.0.4/kernel/debug/kdb/kdb_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/debug/kdb/kdb_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/debug/kdb/kdb_main.c linux-3.0.7/kernel/debug/kdb/kdb_main.c
+--- linux-3.0.7/kernel/debug/kdb/kdb_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) {
  
@@ -61035,9 +62488,9 @@ diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/
  
  #ifdef CONFIG_MODULE_UNLOAD
  		{
-diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
---- linux-3.0.4/kernel/events/core.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/events/core.c	2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.0.7/kernel/events/core.c linux-3.0.7/kernel/events/core.c
+--- linux-3.0.7/kernel/events/core.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/kernel/events/core.c	2011-09-14 09:08:05.000000000 -0400
 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
  	return 0;
  }
@@ -61133,9 +62586,9 @@ diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
  		     &parent_event->child_total_time_running);
  
  	/*
-diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
---- linux-3.0.4/kernel/exit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/exit.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/exit.c linux-3.0.7/kernel/exit.c
+--- linux-3.0.7/kernel/exit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/exit.c	2011-08-23 21:48:14.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -61249,9 +62702,9 @@ diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
  	exit_mm(tsk);
  
  	if (group_dead)
-diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
---- linux-3.0.4/kernel/fork.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/fork.c	2011-08-25 17:23:36.000000000 -0400
+diff -urNp linux-3.0.7/kernel/fork.c linux-3.0.7/kernel/fork.c
+--- linux-3.0.7/kernel/fork.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/fork.c	2011-08-25 17:23:36.000000000 -0400
 @@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
  	*stackend = STACK_END_MAGIC;	/* for overflow detection */
  
@@ -61549,9 +63002,9 @@ diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
  				new_fs = NULL;
  			else
  				new_fs = fs;
-diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.c
---- linux-3.0.4/kernel/futex.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/futex.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/futex.c linux-3.0.7/kernel/futex.c
+--- linux-3.0.7/kernel/futex.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/kernel/futex.c	2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -61639,9 +63092,9 @@ diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.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.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
---- linux-3.0.4/kernel/futex_compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/futex_compat.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/futex_compat.c linux-3.0.7/kernel/futex_compat.c
+--- linux-3.0.7/kernel/futex_compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/futex_compat.c	2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -61681,9 +63134,9 @@ diff -urNp linux-3.0.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
  		head = p->compat_robust_list;
  		rcu_read_unlock();
  	}
-diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
---- linux-3.0.4/kernel/gcov/base.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/gcov/base.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/gcov/base.c linux-3.0.7/kernel/gcov/base.c
+--- linux-3.0.7/kernel/gcov/base.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/gcov/base.c	2011-08-23 21:47:56.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -61705,9 +63158,9 @@ diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
  			if (prev)
  				prev->next = info->next;
  			else
-diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
---- linux-3.0.4/kernel/hrtimer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/hrtimer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/hrtimer.c linux-3.0.7/kernel/hrtimer.c
+--- linux-3.0.7/kernel/hrtimer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  }
@@ -61717,9 +63170,9 @@ diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
  {
  	hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
---- linux-3.0.4/kernel/jump_label.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/jump_label.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/jump_label.c linux-3.0.7/kernel/jump_label.c
+--- linux-3.0.7/kernel/jump_label.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -61743,9 +63196,9 @@ diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
  }
  
  static int
-diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
---- linux-3.0.4/kernel/kallsyms.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kallsyms.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/kallsyms.c linux-3.0.7/kernel/kallsyms.c
+--- linux-3.0.7/kernel/kallsyms.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -61848,9 +63301,9 @@ diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
  	if (!iter)
  		return -ENOMEM;
  	reset_iter(iter, 0);
-diff -urNp linux-3.0.4/kernel/kexec.c linux-3.0.4/kernel/kexec.c
---- linux-3.0.4/kernel/kexec.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kexec.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/kexec.c linux-3.0.7/kernel/kexec.c
+--- linux-3.0.7/kernel/kexec.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/kexec.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1033,7 +1033,8 @@ asmlinkage long compat_sys_kexec_load(un
  				unsigned long flags)
  {
@@ -61861,9 +63314,9 @@ diff -urNp linux-3.0.4/kernel/kexec.c linux-3.0.4/kernel/kexec.c
  	unsigned long i, result;
  
  	/* Don't allow clients that don't understand the native
-diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
---- linux-3.0.4/kernel/kmod.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kmod.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/kmod.c linux-3.0.7/kernel/kmod.c
+--- linux-3.0.7/kernel/kmod.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/kmod.c	2011-10-06 04:17:55.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.
@@ -61969,9 +63422,9 @@ diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
  
  		/*
  		 * If ret is 0, either ____call_usermodehelper failed and the
-diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
---- linux-3.0.4/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/kprobes.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/kprobes.c linux-3.0.7/kernel/kprobes.c
+--- linux-3.0.7/kernel/kprobes.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -62008,9 +63461,9 @@ diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
  
  	head = &kprobe_table[i];
  	preempt_disable();
-diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
---- linux-3.0.4/kernel/lockdep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/lockdep.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/lockdep.c linux-3.0.7/kernel/lockdep.c
+--- linux-3.0.7/kernel/lockdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -62039,9 +63492,9 @@ diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
  	if (very_verbose(class)) {
  		printk("\nacquire class [%p] %s", class->key, class->name);
  		if (class->name_version > 1)
-diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
---- linux-3.0.4/kernel/lockdep_proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/lockdep_proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/lockdep_proc.c linux-3.0.7/kernel/lockdep_proc.c
+--- linux-3.0.7/kernel/lockdep_proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -62051,9 +63504,9 @@ diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
  	const char *name = class->name;
  
  	if (!name) {
-diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
---- linux-3.0.4/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/module.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/module.c linux-3.0.7/kernel/module.c
+--- linux-3.0.7/kernel/module.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/module.c	2011-08-23 21:48:14.000000000 -0400
 @@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
@@ -62782,40 +64235,9 @@ diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
  			mod = NULL;
  	}
  	return mod;
-diff -urNp linux-3.0.4/kernel/mutex.c linux-3.0.4/kernel/mutex.c
---- linux-3.0.4/kernel/mutex.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
---- linux-3.0.4/kernel/mutex-debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/mutex-debug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/mutex-debug.c linux-3.0.7/kernel/mutex-debug.c
+--- linux-3.0.7/kernel/mutex-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/mutex-debug.c	2011-08-23 21:47:56.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -62844,9 +64266,9 @@ diff -urNp linux-3.0.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
  
  	list_del_init(&waiter->list);
  	waiter->task = NULL;
-diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
---- linux-3.0.4/kernel/mutex-debug.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/mutex-debug.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/mutex-debug.h linux-3.0.7/kernel/mutex-debug.h
+--- linux-3.0.7/kernel/mutex-debug.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -62859,9 +64281,40 @@ diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
  extern void debug_mutex_unlock(struct mutex *lock);
  extern void debug_mutex_init(struct mutex *lock, const char *name,
  			     struct lock_class_key *key);
-diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
---- linux-3.0.4/kernel/padata.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/padata.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/mutex.c linux-3.0.7/kernel/mutex.c
+--- linux-3.0.7/kernel/mutex.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/kernel/padata.c linux-3.0.7/kernel/padata.c
+--- linux-3.0.7/kernel/padata.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -62885,9 +64338,9 @@ diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
  	atomic_set(&pd->reorder_objects, 0);
  	atomic_set(&pd->refcnt, 0);
  	pd->pinst = pinst;
-diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
---- linux-3.0.4/kernel/panic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/panic.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/panic.c linux-3.0.7/kernel/panic.c
+--- linux-3.0.7/kernel/panic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -62907,9 +64360,9 @@ diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
  		__builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
---- linux-3.0.4/kernel/pid.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/pid.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/pid.c linux-3.0.7/kernel/pid.c
+--- linux-3.0.7/kernel/pid.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/pid.c	2011-08-23 21:48:14.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -62957,9 +64410,9 @@ diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
  	struct pid *pid;
-diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-timers.c
---- linux-3.0.4/kernel/posix-cpu-timers.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/posix-cpu-timers.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/posix-cpu-timers.c linux-3.0.7/kernel/posix-cpu-timers.c
+--- linux-3.0.7/kernel/posix-cpu-timers.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/kernel/posix-cpu-timers.c	2011-10-17 23:17:19.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -62968,7 +64421,7 @@ diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-ti
  #include <asm/uaccess.h>
  #include <linux/kernel_stat.h>
  #include <trace/events/timer.h>
-@@ -1604,14 +1605,14 @@ struct k_clock clock_posix_cpu = {
+@@ -1605,14 +1606,14 @@ struct k_clock clock_posix_cpu = {
  
  static __init int init_posix_cpu_timers(void)
  {
@@ -62985,9 +64438,9 @@ diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-ti
  		.clock_getres	= thread_cpu_clock_getres,
  		.clock_get	= thread_cpu_clock_get,
  		.timer_create	= thread_cpu_timer_create,
-diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
---- linux-3.0.4/kernel/posix-timers.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/posix-timers.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/posix-timers.c linux-3.0.7/kernel/posix-timers.c
+--- linux-3.0.7/kernel/posix-timers.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -63091,9 +64544,9 @@ diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
  	return kc->clock_set(which_clock, &new_tp);
  }
  
-diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff.c
---- linux-3.0.4/kernel/power/poweroff.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/power/poweroff.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/power/poweroff.c linux-3.0.7/kernel/power/poweroff.c
+--- linux-3.0.7/kernel/power/poweroff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
  };
@@ -63103,9 +64556,9 @@ diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff
  {
  	register_sysrq_key('o', &sysrq_poweroff_op);
  	return 0;
-diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
---- linux-3.0.4/kernel/power/process.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/power/process.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/power/process.c linux-3.0.7/kernel/power/process.c
+--- linux-3.0.7/kernel/power/process.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -63148,9 +64601,9 @@ diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
  			break;
  
  		if (pm_wakeup_pending()) {
-diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
---- linux-3.0.4/kernel/printk.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/printk.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/printk.c linux-3.0.7/kernel/printk.c
+--- linux-3.0.7/kernel/printk.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/kernel/printk.c	2011-10-16 21:55:28.000000000 -0400
 @@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
  	if (from_file && type != SYSLOG_ACTION_OPEN)
  		return 0;
@@ -63170,9 +64623,9 @@ diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
  				 "but no CAP_SYSLOG (deprecated).\n");
  			return 0;
  		}
-diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
---- linux-3.0.4/kernel/profile.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/profile.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/profile.c linux-3.0.7/kernel/profile.c
+--- linux-3.0.7/kernel/profile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -63230,9 +64683,9 @@ diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
  	return count;
  }
  
-diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
---- linux-3.0.4/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/ptrace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/ptrace.c linux-3.0.7/kernel/ptrace.c
+--- linux-3.0.7/kernel/ptrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/ptrace.c	2011-08-23 21:48:14.000000000 -0400
 @@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
  	return ret;
  }
@@ -63404,9 +64857,9 @@ diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
  		goto out_put_task_struct;
  	}
  
-diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
---- linux-3.0.4/kernel/rcutorture.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutorture.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/rcutorture.c linux-3.0.7/kernel/rcutorture.c
+--- linux-3.0.7/kernel/rcutorture.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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) =
@@ -63567,9 +65020,9 @@ diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
  	for_each_possible_cpu(cpu) {
  		for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
  			per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
---- linux-3.0.4/kernel/rcutree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree.c	2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.0.7/kernel/rcutree.c linux-3.0.7/kernel/rcutree.c
+--- linux-3.0.7/kernel/rcutree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/rcutree.c	2011-09-14 09:08:05.000000000 -0400
 @@ -356,9 +356,9 @@ void rcu_enter_nohz(void)
  	}
  	/* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
@@ -63652,9 +65105,9 @@ diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
  {
  	__rcu_process_callbacks(&rcu_sched_state,
  				&__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.0.4/kernel/rcutree.h linux-3.0.4/kernel/rcutree.h
---- linux-3.0.4/kernel/rcutree.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree.h	2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.0.7/kernel/rcutree.h linux-3.0.7/kernel/rcutree.h
+--- linux-3.0.7/kernel/rcutree.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/rcutree.h	2011-09-14 09:08:05.000000000 -0400
 @@ -86,7 +86,7 @@
  struct rcu_dynticks {
  	int dynticks_nesting;	/* Track irq/process nesting level. */
@@ -63664,9 +65117,9 @@ diff -urNp linux-3.0.4/kernel/rcutree.h linux-3.0.4/kernel/rcutree.h
  };
  
  /* RCU's kthread states for tracing. */
-diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin.h
---- linux-3.0.4/kernel/rcutree_plugin.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rcutree_plugin.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/rcutree_plugin.h linux-3.0.7/kernel/rcutree_plugin.h
+--- linux-3.0.7/kernel/rcutree_plugin.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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. */
@@ -63729,9 +65182,9 @@ diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin
  
  	put_online_cpus();
  }
-diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
---- linux-3.0.4/kernel/relay.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/relay.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/relay.c linux-3.0.7/kernel/relay.c
+--- linux-3.0.7/kernel/relay.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -63741,9 +65194,9 @@ diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
  	if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
  		return 0;
  	if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
---- linux-3.0.4/kernel/resource.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/resource.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/resource.c linux-3.0.7/kernel/resource.c
+--- linux-3.0.7/kernel/resource.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -63763,9 +65216,9 @@ diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
  	return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester.c
---- linux-3.0.4/kernel/rtmutex-tester.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/rtmutex-tester.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/rtmutex-tester.c linux-3.0.7/kernel/rtmutex-tester.c
+--- linux-3.0.7/kernel/rtmutex-tester.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/rtmutex-tester.c	2011-08-23 21:47:56.000000000 -0400
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES	8
  
@@ -63856,31 +65309,10 @@ diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester
  		return;
  
  	default:
-diff -urNp linux-3.0.4/kernel/sched_autogroup.c linux-3.0.4/kernel/sched_autogroup.c
---- linux-3.0.4/kernel/sched_autogroup.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/kernel/sched.c linux-3.0.4/kernel/sched.c
---- linux-3.0.4/kernel/sched.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sched.c	2011-08-23 21:48:14.000000000 -0400
-@@ -4251,6 +4251,8 @@ asmlinkage void __sched schedule(void)
+diff -urNp linux-3.0.7/kernel/sched.c linux-3.0.7/kernel/sched.c
+--- linux-3.0.7/kernel/sched.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/kernel/sched.c	2011-10-17 23:17:19.000000000 -0400
+@@ -4227,6 +4227,8 @@ static void __sched __schedule(void)
  	struct rq *rq;
  	int cpu;
  
@@ -63889,7 +65321,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
  need_resched:
  	preempt_disable();
  	cpu = smp_processor_id();
-@@ -4934,6 +4936,8 @@ int can_nice(const struct task_struct *p
+@@ -4920,6 +4922,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;
  
@@ -63898,7 +65330,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
  	return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
  		capable(CAP_SYS_NICE));
  }
-@@ -4967,7 +4971,8 @@ SYSCALL_DEFINE1(nice, int, increment)
+@@ -4953,7 +4957,8 @@ SYSCALL_DEFINE1(nice, int, increment)
  	if (nice > 19)
  		nice = 19;
  
@@ -63908,7 +65340,7 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
  		return -EPERM;
  
  	retval = security_task_setnice(current, nice);
-@@ -5111,6 +5116,7 @@ recheck:
+@@ -5097,6 +5102,7 @@ recheck:
  			unsigned long rlim_rtprio =
  					task_rlimit(p, RLIMIT_RTPRIO);
  
@@ -63916,9 +65348,30 @@ diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
  			/* can't set/change the rt policy */
  			if (policy != p->policy && !rlim_rtprio)
  				return -EPERM;
-diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
---- linux-3.0.4/kernel/sched_fair.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sched_fair.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/sched_autogroup.c linux-3.0.7/kernel/sched_autogroup.c
+--- linux-3.0.7/kernel/sched_autogroup.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/kernel/sched_fair.c linux-3.0.7/kernel/sched_fair.c
+--- linux-3.0.7/kernel/sched_fair.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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).
@@ -63928,9 +65381,9 @@ diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
  {
  	int this_cpu = smp_processor_id();
  	struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
---- linux-3.0.4/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/signal.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/signal.c linux-3.0.7/kernel/signal.c
+--- linux-3.0.7/kernel/signal.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -64063,9 +65516,9 @@ diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
  	if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
  		error = check_kill_permission(sig, info, p);
  		/*
-diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
---- linux-3.0.4/kernel/smp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/smp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/smp.c linux-3.0.7/kernel/smp.c
+--- linux-3.0.7/kernel/smp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -64093,9 +65546,9 @@ diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
  {
  	raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
---- linux-3.0.4/kernel/softirq.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/softirq.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/softirq.c linux-3.0.7/kernel/softirq.c
+--- linux-3.0.7/kernel/softirq.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/softirq.c	2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -64146,9 +65599,9 @@ diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
  {
  	struct tasklet_struct *list;
  
-diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
---- linux-3.0.4/kernel/sys.c	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/kernel/sys.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/sys.c linux-3.0.7/kernel/sys.c
+--- linux-3.0.7/kernel/sys.c	2011-09-02 18:11:26.000000000 -0400
++++ linux-3.0.7/kernel/sys.c	2011-10-06 04:17:55.000000000 -0400
 @@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
  		error = -EACCES;
  		goto out;
@@ -64318,75 +65771,9 @@ diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
  				error = -EINVAL;
  				break;
  			}
-diff -urNp linux-3.0.4/kernel/sysctl_binary.c linux-3.0.4/kernel/sysctl_binary.c
---- linux-3.0.4/kernel/sysctl_binary.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sysctl_binary.c	2011-10-06 04:17:55.000000000 -0400
-@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
- 		int i;
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_read(file, buffer, BUFSZ - 1, &pos);
-+		result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out_kfree;
-@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *f
- 		}
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_write(file, buffer, str - buffer, &pos);
-+		result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out_kfree;
-@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file 
- 		int i;
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_read(file, buffer, BUFSZ - 1, &pos);
-+		result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out_kfree;
-@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file 
- 		}
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_write(file, buffer, str - buffer, &pos);
-+		result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out_kfree;
-@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *fil
- 		int i;
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
-+		result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out;
-@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struc
- 		__le16 dnaddr;
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
-+		result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out;
-@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struc
- 				le16_to_cpu(dnaddr) & 0x3ff);
- 
- 		set_fs(KERNEL_DS);
--		result = vfs_write(file, buf, len, &pos);
-+		result = vfs_write(file, (const char __force_user *)buf, len, &pos);
- 		set_fs(old_fs);
- 		if (result < 0)
- 			goto out;
-diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
---- linux-3.0.4/kernel/sysctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sysctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/sysctl.c linux-3.0.7/kernel/sysctl.c
+--- linux-3.0.7/kernel/sysctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/sysctl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -85,6 +85,13 @@
  
  
@@ -64576,9 +65963,75 @@ diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
---- linux-3.0.4/kernel/sysctl_check.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/sysctl_check.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/sysctl_binary.c linux-3.0.7/kernel/sysctl_binary.c
+--- linux-3.0.7/kernel/sysctl_binary.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/sysctl_binary.c	2011-10-06 04:17:55.000000000 -0400
+@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *f
+ 		int i;
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++		result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out_kfree;
+@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *f
+ 		}
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_write(file, buffer, str - buffer, &pos);
++		result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out_kfree;
+@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file 
+ 		int i;
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_read(file, buffer, BUFSZ - 1, &pos);
++		result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out_kfree;
+@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file 
+ 		}
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_write(file, buffer, str - buffer, &pos);
++		result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out_kfree;
+@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *fil
+ 		int i;
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++		result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out;
+@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struc
+ 		__le16 dnaddr;
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
++		result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out;
+@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struc
+ 				le16_to_cpu(dnaddr) & 0x3ff);
+ 
+ 		set_fs(KERNEL_DS);
+-		result = vfs_write(file, buf, len, &pos);
++		result = vfs_write(file, (const char __force_user *)buf, len, &pos);
+ 		set_fs(old_fs);
+ 		if (result < 0)
+ 			goto out;
+diff -urNp linux-3.0.7/kernel/sysctl_check.c linux-3.0.7/kernel/sysctl_check.c
+--- linux-3.0.7/kernel/sysctl_check.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -64587,9 +66040,9 @@ diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
  			    (table->proc_handler == proc_dointvec) ||
  			    (table->proc_handler == proc_dointvec_minmax) ||
  			    (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
---- linux-3.0.4/kernel/taskstats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/taskstats.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/taskstats.c linux-3.0.7/kernel/taskstats.c
+--- linux-3.0.7/kernel/taskstats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/taskstats.c	2011-08-23 21:48:14.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -64613,10 +66066,10 @@ diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
  	if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
  		return cmd_attr_register_cpumask(info);
  	else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtimer.c
---- linux-3.0.4/kernel/time/alarmtimer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/alarmtimer.c	2011-08-23 21:47:56.000000000 -0400
-@@ -685,7 +685,7 @@ static int __init alarmtimer_init(void)
+diff -urNp linux-3.0.7/kernel/time/alarmtimer.c linux-3.0.7/kernel/time/alarmtimer.c
+--- linux-3.0.7/kernel/time/alarmtimer.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/kernel/time/alarmtimer.c	2011-10-16 21:55:28.000000000 -0400
+@@ -693,7 +693,7 @@ static int __init alarmtimer_init(void)
  {
  	int error = 0;
  	int i;
@@ -64625,9 +66078,9 @@ diff -urNp linux-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtim
  		.clock_getres	= alarm_clock_getres,
  		.clock_get	= alarm_clock_get,
  		.timer_create	= alarm_timer_create,
-diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick-broadcast.c
---- linux-3.0.4/kernel/time/tick-broadcast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/tick-broadcast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/time/tick-broadcast.c linux-3.0.7/kernel/time/tick-broadcast.c
+--- linux-3.0.7/kernel/time/tick-broadcast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  		 */
@@ -64637,9 +66090,9 @@ diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick
  
  			cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
  			tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekeeping.c
---- linux-3.0.4/kernel/time/timekeeping.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timekeeping.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/time/timekeeping.c linux-3.0.7/kernel/time/timekeeping.c
+--- linux-3.0.7/kernel/time/timekeeping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/time/timekeeping.c	2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -64657,9 +66110,9 @@ diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekee
  	write_seqlock_irqsave(&xtime_lock, flags);
  
  	timekeeping_forward_now();
-diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_list.c
---- linux-3.0.4/kernel/time/timer_list.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timer_list.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/time/timer_list.c linux-3.0.7/kernel/time/timer_list.c
+--- linux-3.0.7/kernel/time/timer_list.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -64701,9 +66154,9 @@ diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_li
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_stats.c
---- linux-3.0.4/kernel/time/timer_stats.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time/timer_stats.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/time/timer_stats.c linux-3.0.7/kernel/time/timer_stats.c
+--- linux-3.0.7/kernel/time/timer_stats.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -64772,9 +66225,9 @@ diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_s
  	if (!pe)
  		return -ENOMEM;
  	return 0;
-diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
---- linux-3.0.4/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/time.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/time.c linux-3.0.7/kernel/time.c
+--- linux-3.0.7/kernel/time.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/time.c	2011-08-23 21:48:14.000000000 -0400
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
  		return error;
  
@@ -64787,9 +66240,9 @@ diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
  		/* SMP safe, global irq locking makes it work. */
  		sys_tz = *tz;
  		update_vsyscall_tz();
-diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
---- linux-3.0.4/kernel/timer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/timer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/timer.c linux-3.0.7/kernel/timer.c
+--- linux-3.0.7/kernel/timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -64799,9 +66252,9 @@ diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
  {
  	struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace.c
---- linux-3.0.4/kernel/trace/blktrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/blktrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/blktrace.c linux-3.0.7/kernel/trace/blktrace.c
+--- linux-3.0.7/kernel/trace/blktrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -64829,9 +66282,9 @@ diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace
  
  	ret = -EIO;
  	bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
---- linux-3.0.4/kernel/trace/ftrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/ftrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/ftrace.c linux-3.0.7/kernel/trace/ftrace.c
+--- linux-3.0.7/kernel/trace/ftrace.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/kernel/trace/ftrace.c	2011-10-17 23:17:19.000000000 -0400
 @@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
  	if (unlikely(ftrace_disabled))
  		return 0;
@@ -64852,7 +66305,7 @@ diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
  }
  
  /*
-@@ -2550,7 +2555,7 @@ static void ftrace_free_entry_rcu(struct
+@@ -2570,7 +2575,7 @@ static void ftrace_free_entry_rcu(struct
  
  int
  register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
@@ -64861,9 +66314,9 @@ diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
  {
  	struct ftrace_func_probe *entry;
  	struct ftrace_page *pg;
-diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
---- linux-3.0.4/kernel/trace/trace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace.c linux-3.0.7/kernel/trace/trace.c
+--- linux-3.0.7/kernel/trace/trace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -64906,9 +66359,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
  	static int once;
  	struct dentry *d_tracer;
  
-diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trace_events.c
---- linux-3.0.4/kernel/trace/trace_events.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_events.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_events.c linux-3.0.7/kernel/trace/trace_events.c
+--- linux-3.0.7/kernel/trace/trace_events.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -64955,9 +66408,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trac
  	}
  }
  
-diff -urNp linux-3.0.4/kernel/trace/trace_kprobe.c linux-3.0.4/kernel/trace/trace_kprobe.c
---- linux-3.0.4/kernel/trace/trace_kprobe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_kprobe.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_kprobe.c linux-3.0.7/kernel/trace/trace_kprobe.c
+--- linux-3.0.7/kernel/trace/trace_kprobe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/trace/trace_kprobe.c	2011-10-06 04:17:55.000000000 -0400
 @@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(me
  	long ret;
  	int maxlen = get_rloc_len(*(u32 *)dest);
@@ -64994,9 +66447,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_kprobe.c linux-3.0.4/kernel/trace/trac
  		len++;
  	} while (c && ret == 0 && len < MAX_STRING_SIZE);
  	pagefault_enable();
-diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/trace_mmiotrace.c
---- linux-3.0.4/kernel/trace/trace_mmiotrace.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_mmiotrace.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_mmiotrace.c linux-3.0.7/kernel/trace/trace_mmiotrace.c
+--- linux-3.0.7/kernel/trace/trace_mmiotrace.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -65033,9 +66486,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/t
  		return;
  	}
  	entry	= ring_buffer_event_data(event);
-diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trace_output.c
---- linux-3.0.4/kernel/trace/trace_output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_output.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_output.c linux-3.0.7/kernel/trace/trace_output.c
+--- linux-3.0.7/kernel/trace/trace_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -65045,9 +66498,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trac
  		if (p) {
  			s->len = p - s->buffer;
  			return 1;
-diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace_stack.c
---- linux-3.0.4/kernel/trace/trace_stack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_stack.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_stack.c linux-3.0.7/kernel/trace/trace_stack.c
+--- linux-3.0.7/kernel/trace/trace_stack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/kernel/trace/trace_stack.c	2011-08-23 21:47:56.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
  		return;
  
@@ -65057,9 +66510,9 @@ diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace
  		return;
  
  	local_irq_save(flags);
-diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/trace_workqueue.c
---- linux-3.0.4/kernel/trace/trace_workqueue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/kernel/trace/trace_workqueue.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/kernel/trace/trace_workqueue.c linux-3.0.7/kernel/trace/trace_workqueue.c
+--- linux-3.0.7/kernel/trace/trace_workqueue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -65087,9 +66540,20 @@ diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/t
  				   tsk->comm);
  			put_task_struct(tsk);
  		}
-diff -urNp linux-3.0.4/lib/bitmap.c linux-3.0.4/lib/bitmap.c
---- linux-3.0.4/lib/bitmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/bitmap.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/lib/Kconfig.debug linux-3.0.7/lib/Kconfig.debug
+--- linux-3.0.7/lib/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/lib/bitmap.c linux-3.0.7/lib/bitmap.c
+--- linux-3.0.7/lib/bitmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/lib/bitmap.c	2011-10-06 04:17:55.000000000 -0400
 @@ -421,7 +421,7 @@ int __bitmap_parse(const char *buf, unsi
  {
  	int c, old_c, totaldigits, ndigits, nchunks, nbits;
@@ -65126,9 +66590,9 @@ diff -urNp linux-3.0.4/lib/bitmap.c linux-3.0.4/lib/bitmap.c
  					ulen, 1, maskp, nmaskbits);
  }
  EXPORT_SYMBOL(bitmap_parselist_user);
-diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
---- linux-3.0.4/lib/bug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/bug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/bug.c linux-3.0.7/lib/bug.c
+--- linux-3.0.7/lib/bug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -65138,9 +66602,9 @@ diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
  
  	file = NULL;
  	line = 0;
-diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
---- linux-3.0.4/lib/debugobjects.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/debugobjects.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/debugobjects.c linux-3.0.7/lib/debugobjects.c
+--- linux-3.0.7/lib/debugobjects.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -65150,9 +66614,9 @@ diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
  	if (is_on_stack == onstack)
  		return;
  
-diff -urNp linux-3.0.4/lib/devres.c linux-3.0.4/lib/devres.c
---- linux-3.0.4/lib/devres.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/devres.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/lib/devres.c linux-3.0.7/lib/devres.c
+--- linux-3.0.7/lib/devres.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/lib/devres.c	2011-10-06 04:17:55.000000000 -0400
 @@ -81,7 +81,7 @@ void devm_iounmap(struct device *dev, vo
  {
  	iounmap(addr);
@@ -65171,9 +66635,9 @@ diff -urNp linux-3.0.4/lib/devres.c linux-3.0.4/lib/devres.c
  }
  EXPORT_SYMBOL(devm_ioport_unmap);
  
-diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
---- linux-3.0.4/lib/dma-debug.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/dma-debug.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/dma-debug.c linux-3.0.7/lib/dma-debug.c
+--- linux-3.0.7/lib/dma-debug.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -65183,9 +66647,9 @@ diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
  		err_printk(dev, NULL, "DMA-API: device driver maps memory from"
  				"stack [addr=%p]\n", addr);
  }
-diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
---- linux-3.0.4/lib/extable.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/extable.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/extable.c linux-3.0.7/lib/extable.c
+--- linux-3.0.7/lib/extable.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/lib/extable.c	2011-08-23 21:47:56.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/init.h>
  #include <linux/sort.h>
@@ -65205,9 +66669,9 @@ diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
  }
  
  #ifdef CONFIG_MODULES
-diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
---- linux-3.0.4/lib/inflate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/inflate.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/inflate.c linux-3.0.7/lib/inflate.c
+--- linux-3.0.7/lib/inflate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -65217,20 +66681,9 @@ diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-3.0.4/lib/Kconfig.debug linux-3.0.4/lib/Kconfig.debug
---- linux-3.0.4/lib/Kconfig.debug	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/lib/kref.c linux-3.0.4/lib/kref.c
---- linux-3.0.4/lib/kref.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/kref.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/kref.c linux-3.0.7/lib/kref.c
+--- linux-3.0.7/lib/kref.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -65240,9 +66693,9 @@ diff -urNp linux-3.0.4/lib/kref.c linux-3.0.4/lib/kref.c
  	WARN_ON(release == (void (*)(struct kref *))kfree);
  
  	if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
---- linux-3.0.4/lib/radix-tree.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/radix-tree.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/lib/radix-tree.c linux-3.0.7/lib/radix-tree.c
+--- linux-3.0.7/lib/radix-tree.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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];
@@ -65252,9 +66705,9 @@ diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
---- linux-3.0.4/lib/vsprintf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/lib/vsprintf.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/lib/vsprintf.c linux-3.0.7/lib/vsprintf.c
+--- linux-3.0.7/lib/vsprintf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/lib/vsprintf.c	2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -65348,198 +66801,26 @@ diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
  			break;
  		}
  
-diff -urNp linux-3.0.4/localversion-grsec linux-3.0.4/localversion-grsec
---- linux-3.0.4/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/localversion-grsec	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/localversion-grsec linux-3.0.7/localversion-grsec
+--- linux-3.0.7/localversion-grsec	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/localversion-grsec	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
---- linux-3.0.4/Makefile	2011-09-02 18:11:26.000000000 -0400
-+++ linux-3.0.4/Makefile	2011-10-07 19:29:57.000000000 -0400
-@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
- 
- HOSTCC       = gcc
- HOSTCXX      = g++
--HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
--HOSTCXXFLAGS = -O2
-+HOSTCFLAGS   = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -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
- 
- # 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__
- 
- 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,8 +410,8 @@ 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_basic gcc-plugins
-+scripts_basic: gcc-plugins
- 	$(Q)$(MAKE) $(build)=scripts/basic
- 	$(Q)rm -f .tmp_quiet_recordmcount
- 
-@@ -564,6 +567,36 @@ else
- KBUILD_CFLAGS	+= -O2
- endif
- 
-+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
-+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
-+ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
-+endif
-+ifdef CONFIG_KALLOCSTAT_PLUGIN
-+KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
-+endif
-+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
-+KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
-+endif
-+ifdef CONFIG_CHECKER_PLUGIN
-+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
-+CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
-+endif
-+endif
-+GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
-+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_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 +741,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) \
-@@ -932,6 +965,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-mai
- 
- # The actual objects are generated when descending, 
- # make sure no implicit rule kicks in
-+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
- $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
- 
- # Handle descending into subdirectories listed in $(vmlinux-dirs)
-@@ -941,7 +975,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) 
- # Error messages still appears in the original language
- 
- PHONY += $(vmlinux-dirs)
--$(vmlinux-dirs): prepare scripts
-+$(vmlinux-dirs): gcc-plugins prepare scripts
- 	$(Q)$(MAKE) $(build)=$@
- 
- # Store (new) KERNELRELASE string in include/config/kernel.release
-@@ -986,6 +1020,7 @@ prepare0: archprepare FORCE
- 	$(Q)$(MAKE) $(build)=. missing-syscalls
- 
- # All the preparing..
-+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
- prepare: prepare0
- 
- # Generate some files
-@@ -1087,6 +1122,7 @@ all: modules
- #	using awk while concatenating to the final file.
- 
- PHONY += modules
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- 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.';
-@@ -1102,7 +1138,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modu
- 
- # Target to prepare building external modules
- PHONY += modules_prepare
--modules_prepare: prepare scripts
-+modules_prepare: gcc-plugins prepare scripts
- 
- # Target to install modules
- PHONY += modules_install
-@@ -1198,7 +1234,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 -name '*.so' -o -size 0 \
- 		-o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
- 		-type f -print | xargs rm -f
- 
-@@ -1359,6 +1395,7 @@ PHONY += $(module-dirs) modules
- $(module-dirs): crmodverdir $(objtree)/Module.symvers
- 	$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
- 
-+modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
- modules: $(module-dirs)
- 	@$(kecho) '  Building modules, stage 2.';
- 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
-@@ -1485,17 +1522,19 @@ else
-         target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
- endif
- 
--%.s: %.c prepare scripts FORCE
-+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.s: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.i: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.c prepare scripts FORCE
-+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.o: %.c gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.lst: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.s: %.S prepare scripts FORCE
-+%.s: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
--%.o: %.S prepare scripts FORCE
-+%.o: %.S gcc-plugins prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
- %.symtypes: %.c prepare scripts FORCE
- 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
-@@ -1505,11 +1544,13 @@ endif
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%/: prepare scripts FORCE
-+%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%/: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
- 	$(build)=$(build-dir)
--%.ko: prepare scripts FORCE
-+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
-+%.ko: gcc-plugins prepare scripts FORCE
- 	$(cmd_crmodverdir)
- 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
- 	$(build)=$(build-dir) $(@:.ko=.o)
-diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
---- linux-3.0.4/mm/filemap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/filemap.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/Kconfig linux-3.0.7/mm/Kconfig
+--- linux-3.0.7/mm/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/mm/filemap.c linux-3.0.7/mm/filemap.c
+--- linux-3.0.7/mm/filemap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -65557,9 +66838,9 @@ diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
  			if (*pos >= limit) {
  				send_sig(SIGXFSZ, current, 0);
  				return -EFBIG;
-diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
---- linux-3.0.4/mm/fremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/fremap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/fremap.c linux-3.0.7/mm/fremap.c
+--- linux-3.0.7/mm/fremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -65572,9 +66853,9 @@ diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
  	/*
  	 * Make sure the vma is shared, that it supports prefaulting,
  	 * and that the remapped range is valid and fully within
-diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
---- linux-3.0.4/mm/highmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/highmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/highmem.c linux-3.0.7/mm/highmem.c
+--- linux-3.0.7/mm/highmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  		 */
@@ -65600,9 +66881,9 @@ diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
  	pkmap_count[last_pkmap_nr] = 1;
  	set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
---- linux-3.0.4/mm/huge_memory.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/huge_memory.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/huge_memory.c linux-3.0.7/mm/huge_memory.c
+--- linux-3.0.7/mm/huge_memory.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -65612,9 +66893,9 @@ diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
  		return VM_FAULT_OOM;
  	/* if an huge pmd materialized from under us just retry later */
  	if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
---- linux-3.0.4/mm/hugetlb.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/hugetlb.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/hugetlb.c linux-3.0.7/mm/hugetlb.c
+--- linux-3.0.7/mm/hugetlb.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -65704,9 +66985,9 @@ diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
  	ptep = huge_pte_alloc(mm, address, huge_page_size(h));
  	if (!ptep)
  		return VM_FAULT_OOM;
-diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
---- linux-3.0.4/mm/internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/internal.h linux-3.0.7/mm/internal.h
+--- linux-3.0.7/mm/internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
   */
@@ -65715,21 +66996,9 @@ diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
  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.4/mm/Kconfig linux-3.0.4/mm/Kconfig
---- linux-3.0.4/mm/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
---- linux-3.0.4/mm/kmemleak.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/kmemleak.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/kmemleak.c linux-3.0.7/mm/kmemleak.c
+--- linux-3.0.7/mm/kmemleak.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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++) {
@@ -65739,9 +67008,9 @@ diff -urNp linux-3.0.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
  	}
  }
  
-diff -urNp linux-3.0.4/mm/maccess.c linux-3.0.4/mm/maccess.c
---- linux-3.0.4/mm/maccess.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/maccess.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/mm/maccess.c linux-3.0.7/mm/maccess.c
+--- linux-3.0.7/mm/maccess.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/maccess.c	2011-10-06 04:17:55.000000000 -0400
 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, cons
  	set_fs(KERNEL_DS);
  	pagefault_disable();
@@ -65760,9 +67029,9 @@ diff -urNp linux-3.0.4/mm/maccess.c linux-3.0.4/mm/maccess.c
  	pagefault_enable();
  	set_fs(old_fs);
  
-diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
---- linux-3.0.4/mm/madvise.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/madvise.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/madvise.c linux-3.0.7/mm/madvise.c
+--- linux-3.0.7/mm/madvise.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -65839,9 +67108,93 @@ diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
  	error = 0;
  	if (end == start)
  		goto out;
-diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
---- linux-3.0.4/mm/memory.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/mm/memory.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/memory-failure.c linux-3.0.7/mm/memory-failure.c
+--- linux-3.0.7/mm/memory-failure.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/memory-failure.c	2011-10-06 04:17:55.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)
+ 
+@@ -200,7 +200,7 @@ static int kill_proc_ao(struct task_stru
+ 	si.si_signo = SIGBUS;
+ 	si.si_errno = 0;
+ 	si.si_code = BUS_MCEERR_AO;
+-	si.si_addr = (void *)addr;
++	si.si_addr = (void __user *)addr;
+ #ifdef __ARCH_SI_TRAPNO
+ 	si.si_trapno = trapno;
+ #endif
+@@ -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.7/mm/memory.c linux-3.0.7/mm/memory.c
+--- linux-3.0.7/mm/memory.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/mm/memory.c	2011-08-23 21:47:56.000000000 -0400
 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
  		return;
  
@@ -66405,93 +67758,9 @@ diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
  	/*
  	 * Make sure the vDSO gets into every core dump.
  	 * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
---- linux-3.0.4/mm/memory-failure.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/memory-failure.c	2011-10-06 04:17:55.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)
- 
-@@ -200,7 +200,7 @@ static int kill_proc_ao(struct task_stru
- 	si.si_signo = SIGBUS;
- 	si.si_errno = 0;
- 	si.si_code = BUS_MCEERR_AO;
--	si.si_addr = (void *)addr;
-+	si.si_addr = (void __user *)addr;
- #ifdef __ARCH_SI_TRAPNO
- 	si.si_trapno = trapno;
- #endif
-@@ -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.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
---- linux-3.0.4/mm/mempolicy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mempolicy.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/mempolicy.c linux-3.0.7/mm/mempolicy.c
+--- linux-3.0.7/mm/mempolicy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -66563,9 +67832,9 @@ diff -urNp linux-3.0.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
---- linux-3.0.4/mm/migrate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/migrate.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/migrate.c linux-3.0.7/mm/migrate.c
+--- linux-3.0.7/mm/migrate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -66600,9 +67869,9 @@ diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
  		rcu_read_unlock();
  		err = -EPERM;
  		goto out;
-diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
---- linux-3.0.4/mm/mlock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mlock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/mlock.c linux-3.0.7/mm/mlock.c
+--- linux-3.0.7/mm/mlock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/mlock.c	2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -66676,9 +67945,9 @@ diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
  	if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
  	    capable(CAP_IPC_LOCK))
  		ret = do_mlockall(flags);
-diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
---- linux-3.0.4/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mmap.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/mmap.c linux-3.0.7/mm/mmap.c
+--- linux-3.0.7/mm/mmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/mmap.c	2011-08-23 21:48:14.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)		(addr)
  #endif
@@ -67937,9 +69206,9 @@ diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
  	vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
  	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
  
-diff -urNp linux-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
---- linux-3.0.4/mm/mprotect.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mprotect.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/mprotect.c linux-3.0.7/mm/mprotect.c
+--- linux-3.0.7/mm/mprotect.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/mprotect.c	2011-08-23 21:48:14.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -68166,9 +69435,9 @@ diff -urNp linux-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
  		nstart = tmp;
  
  		if (nstart < prev->vm_end)
-diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
---- linux-3.0.4/mm/mremap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/mremap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/mremap.c linux-3.0.7/mm/mremap.c
+--- linux-3.0.7/mm/mremap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -68273,9 +69542,9 @@ diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
  	}
  out:
  	if (ret & ~PAGE_MASK)
-diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
---- linux-3.0.4/mm/nobootmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/nobootmem.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/nobootmem.c linux-3.0.7/mm/nobootmem.c
+--- linux-3.0.7/mm/nobootmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -68309,9 +69578,9 @@ diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
  
  	return count;
  }
-diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
---- linux-3.0.4/mm/nommu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/nommu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/nommu.c linux-3.0.7/mm/nommu.c
+--- linux-3.0.7/mm/nommu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -68344,9 +69613,9 @@ diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
  	*region = *vma->vm_region;
  	new->vm_region = region;
  
-diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
---- linux-3.0.4/mm/page_alloc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/page_alloc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/page_alloc.c linux-3.0.7/mm/page_alloc.c
+--- linux-3.0.7/mm/page_alloc.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/mm/page_alloc.c	2011-10-16 21:55:28.000000000 -0400
 @@ -340,7 +340,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -68391,7 +69660,7 @@ diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
  
  	if (order && (gfp_flags & __GFP_COMP))
  		prep_compound_page(page, order);
-@@ -2525,6 +2537,8 @@ void show_free_areas(unsigned int filter
+@@ -2557,6 +2569,8 @@ void show_free_areas(unsigned int filter
  	int cpu;
  	struct zone *zone;
  
@@ -68400,9 +69669,9 @@ diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
  	for_each_populated_zone(zone) {
  		if (skip_free_areas_node(filter, zone_to_nid(zone)))
  			continue;
-diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
---- linux-3.0.4/mm/percpu.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/percpu.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/percpu.c linux-3.0.7/mm/percpu.c
+--- linux-3.0.7/mm/percpu.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -68412,9 +69681,9 @@ diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;		/* cpu -> unit */
-diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
---- linux-3.0.4/mm/rmap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/rmap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/rmap.c linux-3.0.7/mm/rmap.c
+--- linux-3.0.7/mm/rmap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -68504,9 +69773,9 @@ diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
  {
  	struct anon_vma_chain *avc;
  	struct anon_vma *anon_vma;
-diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
---- linux-3.0.4/mm/shmem.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/shmem.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/shmem.c linux-3.0.7/mm/shmem.c
+--- linux-3.0.7/mm/shmem.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/shmem.c	2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -68544,9 +69813,9 @@ diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
  	if (!sbinfo)
  		return -ENOMEM;
  
-diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
---- linux-3.0.4/mm/slab.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slab.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/slab.c linux-3.0.7/mm/slab.c
+--- linux-3.0.7/mm/slab.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/slab.c	2011-08-23 21:48:14.000000000 -0400
 @@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -68718,9 +69987,9 @@ diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
---- linux-3.0.4/mm/slob.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slob.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/slob.c linux-3.0.7/mm/slob.c
+--- linux-3.0.7/mm/slob.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -69069,9 +70338,9 @@ diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
---- linux-3.0.4/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/slub.c	2011-09-25 22:15:40.000000000 -0400
+diff -urNp linux-3.0.7/mm/slub.c linux-3.0.7/mm/slub.c
+--- linux-3.0.7/mm/slub.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/slub.c	2011-09-25 22:15:40.000000000 -0400
 @@ -200,7 +200,7 @@ struct track {
  
  enum track_item { TRACK_ALLOC, TRACK_FREE };
@@ -69311,9 +70580,9 @@ diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
  	return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
---- linux-3.0.4/mm/swap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/swap.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/swap.c linux-3.0.7/mm/swap.c
+--- linux-3.0.7/mm/swap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/mm/swap.c	2011-08-23 21:47:56.000000000 -0400
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -69331,9 +70600,9 @@ diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
  	(*dtor)(page);
  }
  
-diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
---- linux-3.0.4/mm/swapfile.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/swapfile.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/swapfile.c linux-3.0.7/mm/swapfile.c
+--- linux-3.0.7/mm/swapfile.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -69381,9 +70650,9 @@ diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
  	wake_up_interruptible(&proc_poll_wait);
  
  	if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
---- linux-3.0.4/mm/util.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/util.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/util.c linux-3.0.7/mm/util.c
+--- linux-3.0.7/mm/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -69413,9 +70682,9 @@ diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
  	mm->get_unmapped_area = arch_get_unmapped_area;
  	mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
---- linux-3.0.4/mm/vmalloc.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/mm/vmalloc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/mm/vmalloc.c linux-3.0.7/mm/vmalloc.c
+--- linux-3.0.7/mm/vmalloc.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/mm/vmalloc.c	2011-10-16 21:55:28.000000000 -0400
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
  	pte = pte_offset_kernel(pmd, addr);
@@ -69648,9 +70917,9 @@ diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
  	if ((PAGE_SIZE-1) & (unsigned long)addr)
  		return -EINVAL;
  
-diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
---- linux-3.0.4/mm/vmstat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/mm/vmstat.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/mm/vmstat.c linux-3.0.7/mm/vmstat.c
+--- linux-3.0.7/mm/vmstat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
@@ -69703,9 +70972,9 @@ diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
  #endif
  	return 0;
  }
-diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
---- linux-3.0.4/net/8021q/vlan.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/8021q/vlan.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/8021q/vlan.c linux-3.0.7/net/8021q/vlan.c
+--- linux-3.0.7/net/8021q/vlan.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -69716,9 +70985,9 @@ diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
  			struct vlan_net *vn;
  
  			vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.0.4/net/9p/trans_fd.c linux-3.0.4/net/9p/trans_fd.c
---- linux-3.0.4/net/9p/trans_fd.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/9p/trans_fd.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/9p/trans_fd.c linux-3.0.7/net/9p/trans_fd.c
+--- linux-3.0.7/net/9p/trans_fd.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/9p/trans_fd.c	2011-10-06 04:17:55.000000000 -0400
 @@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client 
  	oldfs = get_fs();
  	set_fs(get_ds());
@@ -69728,10 +70997,10 @@ diff -urNp linux-3.0.4/net/9p/trans_fd.c linux-3.0.4/net/9p/trans_fd.c
  	set_fs(oldfs);
  
  	if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
-diff -urNp linux-3.0.4/net/9p/trans_virtio.c linux-3.0.4/net/9p/trans_virtio.c
---- linux-3.0.4/net/9p/trans_virtio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/9p/trans_virtio.c	2011-10-06 04:17:55.000000000 -0400
-@@ -328,7 +328,7 @@ req_retry_pinned:
+diff -urNp linux-3.0.7/net/9p/trans_virtio.c linux-3.0.7/net/9p/trans_virtio.c
+--- linux-3.0.7/net/9p/trans_virtio.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/9p/trans_virtio.c	2011-10-16 21:55:28.000000000 -0400
+@@ -327,7 +327,7 @@ req_retry_pinned:
  		} else {
  			char *pbuf;
  			if (req->tc->pubuf)
@@ -69749,9 +71018,9 @@ diff -urNp linux-3.0.4/net/9p/trans_virtio.c linux-3.0.4/net/9p/trans_virtio.c
  			else
  				pbuf = req->tc->pkbuf;
  
-diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
---- linux-3.0.4/net/atm/atm_misc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/atm_misc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/atm_misc.c linux-3.0.7/net/atm/atm_misc.c
+--- linux-3.0.7/net/atm/atm_misc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -69788,9 +71057,9 @@ diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
  	__SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
---- linux-3.0.4/net/atm/lec.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/lec.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/lec.h linux-3.0.7/net/atm/lec.h
+--- linux-3.0.7/net/atm/lec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -69800,9 +71069,9 @@ diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
---- linux-3.0.4/net/atm/mpc.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/mpc.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/mpc.h linux-3.0.7/net/atm/mpc.h
+--- linux-3.0.7/net/atm/mpc.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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    */
  
@@ -69812,9 +71081,9 @@ diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
  };
  
  
-diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
---- linux-3.0.4/net/atm/mpoa_caches.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/mpoa_caches.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/mpoa_caches.c linux-3.0.7/net/atm/mpoa_caches.c
+--- linux-3.0.7/net/atm/mpoa_caches.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -69824,9 +71093,9 @@ diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
  	do_gettimeofday(&now);
  
  	read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
---- linux-3.0.4/net/atm/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/proc.c linux-3.0.7/net/atm/proc.c
+--- linux-3.0.7/net/atm/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -69840,9 +71109,9 @@ diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
---- linux-3.0.4/net/atm/resources.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/atm/resources.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/atm/resources.c linux-3.0.7/net/atm/resources.c
+--- linux-3.0.7/net/atm/resources.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -69861,9 +71130,9 @@ diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
  	__AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-adv/hard-interface.c
---- linux-3.0.4/net/batman-adv/hard-interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/hard-interface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/hard-interface.c linux-3.0.7/net/batman-adv/hard-interface.c
+--- linux-3.0.7/net/batman-adv/hard-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -69875,9 +71144,9 @@ diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-ad
  	bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
  		 hard_iface->net_dev->name);
  
-diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routing.c
---- linux-3.0.4/net/batman-adv/routing.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/routing.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/routing.c linux-3.0.7/net/batman-adv/routing.c
+--- linux-3.0.7/net/batman-adv/routing.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -69887,9 +71156,9 @@ diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routi
  
  	has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-3.0.4/net/batman-adv/send.c linux-3.0.4/net/batman-adv/send.c
---- linux-3.0.4/net/batman-adv/send.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/send.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/send.c linux-3.0.7/net/batman-adv/send.c
+--- linux-3.0.7/net/batman-adv/send.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -69908,9 +71177,9 @@ diff -urNp linux-3.0.4/net/batman-adv/send.c linux-3.0.4/net/batman-adv/send.c
  
  	slide_own_bcast_window(hard_iface);
  	send_time = own_send_time(bat_priv);
-diff -urNp linux-3.0.4/net/batman-adv/soft-interface.c linux-3.0.4/net/batman-adv/soft-interface.c
---- linux-3.0.4/net/batman-adv/soft-interface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/soft-interface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/soft-interface.c linux-3.0.7/net/batman-adv/soft-interface.c
+--- linux-3.0.7/net/batman-adv/soft-interface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -69929,9 +71198,9 @@ diff -urNp linux-3.0.4/net/batman-adv/soft-interface.c linux-3.0.4/net/batman-ad
  	atomic_set(&bat_priv->tt_local_changed, 0);
  
  	bat_priv->primary_if = NULL;
-diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
---- linux-3.0.4/net/batman-adv/types.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/types.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/types.h linux-3.0.7/net/batman-adv/types.h
+--- linux-3.0.7/net/batman-adv/types.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -69952,9 +71221,9 @@ diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
  	atomic_t bcast_queue_left;
  	atomic_t batman_queue_left;
  	char num_ifaces;
-diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unicast.c
---- linux-3.0.4/net/batman-adv/unicast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/batman-adv/unicast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/batman-adv/unicast.c linux-3.0.7/net/batman-adv/unicast.c
+--- linux-3.0.7/net/batman-adv/unicast.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -69964,9 +71233,9 @@ diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unica
  	frag1->seqno = htons(seqno - 1);
  	frag2->seqno = htons(seqno);
  
-diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multicast.c
---- linux-3.0.4/net/bridge/br_multicast.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/bridge/br_multicast.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/bridge/br_multicast.c linux-3.0.7/net/bridge/br_multicast.c
+--- linux-3.0.7/net/bridge/br_multicast.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/bridge/br_multicast.c	2011-10-16 21:55:28.000000000 -0400
 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
  	nexthdr = ip6h->nexthdr;
  	offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -69976,9 +71245,9 @@ diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multi
  		return 0;
  
  	/* Okay, we found ICMPv6 header */
-diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/netfilter/ebtables.c
---- linux-3.0.4/net/bridge/netfilter/ebtables.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/bridge/netfilter/ebtables.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/bridge/netfilter/ebtables.c linux-3.0.7/net/bridge/netfilter/ebtables.c
+--- linux-3.0.7/net/bridge/netfilter/ebtables.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  		}
@@ -69997,9 +71266,9 @@ diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/ne
  	memset(&tinfo, 0, sizeof(tinfo));
  
  	if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
---- linux-3.0.4/net/caif/caif_socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/caif/caif_socket.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/caif/caif_socket.c linux-3.0.7/net/caif/caif_socket.c
+--- linux-3.0.7/net/caif/caif_socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -70129,9 +71398,9 @@ diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
  #ifdef CONFIG_DEBUG_FS
  	if (!IS_ERR(debugfsdir)) {
  
-diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
---- linux-3.0.4/net/caif/cfctrl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/caif/cfctrl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/caif/cfctrl.c linux-3.0.7/net/caif/cfctrl.c
+--- linux-3.0.7/net/caif/cfctrl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/caif/cfctrl.c	2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -70179,9 +71448,9 @@ diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
  
  	cfpkt_extr_head(pkt, &cmdrsp, 1);
  	cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.0.4/net/compat.c linux-3.0.4/net/compat.c
---- linux-3.0.4/net/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/compat.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/compat.c linux-3.0.7/net/compat.c
+--- linux-3.0.7/net/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/compat.c	2011-10-06 04:17:55.000000000 -0400
 @@ -70,9 +70,9 @@ int get_compat_msghdr(struct msghdr *kms
  	    __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
  	    __get_user(kmsg->msg_flags, &umsg->msg_flags))
@@ -70309,9 +71578,9 @@ diff -urNp linux-3.0.4/net/compat.c linux-3.0.4/net/compat.c
  	struct group_filter __user *kgf;
  	int __user	*koptlen;
  	u32 interface, fmode, numsrc;
-diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
---- linux-3.0.4/net/core/datagram.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/datagram.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/core/datagram.c linux-3.0.7/net/core/datagram.c
+--- linux-3.0.7/net/core/datagram.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/core/datagram.c	2011-08-23 21:47:56.000000000 -0400
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
  	}
  
@@ -70321,9 +71590,9 @@ diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
  	sk_mem_reclaim_partial(sk);
  
  	return err;
-diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
---- linux-3.0.4/net/core/dev.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/dev.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/core/dev.c linux-3.0.7/net/core/dev.c
+--- linux-3.0.7/net/core/dev.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -70366,9 +71635,9 @@ diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
  {
  	struct softnet_data *sd = &__get_cpu_var(softnet_data);
  	unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
---- linux-3.0.4/net/core/flow.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/flow.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/core/flow.c linux-3.0.7/net/core/flow.c
+--- linux-3.0.7/net/core/flow.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/core/flow.c	2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
  	struct timer_list		rnd_timer;
  };
@@ -70405,9 +71674,9 @@ diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
  		if (!IS_ERR(flo))
  			fle->object = flo;
  		else
-diff -urNp linux-3.0.4/net/core/iovec.c linux-3.0.4/net/core/iovec.c
---- linux-3.0.4/net/core/iovec.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/iovec.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/core/iovec.c linux-3.0.7/net/core/iovec.c
+--- linux-3.0.7/net/core/iovec.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/core/iovec.c	2011-10-06 04:17:55.000000000 -0400
 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struc
  	if (m->msg_namelen) {
  		if (mode == VERIFY_READ) {
@@ -70426,9 +71695,9 @@ diff -urNp linux-3.0.4/net/core/iovec.c linux-3.0.4/net/core/iovec.c
  		return -EFAULT;
  
  	m->msg_iov = iov;
-diff -urNp linux-3.0.4/net/core/rtnetlink.c linux-3.0.4/net/core/rtnetlink.c
---- linux-3.0.4/net/core/rtnetlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/rtnetlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/core/rtnetlink.c linux-3.0.7/net/core/rtnetlink.c
+--- linux-3.0.7/net/core/rtnetlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/core/rtnetlink.c	2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@
  struct rtnl_link {
  	rtnl_doit_func		doit;
@@ -70438,9 +71707,9 @@ diff -urNp linux-3.0.4/net/core/rtnetlink.c linux-3.0.4/net/core/rtnetlink.c
  
  static DEFINE_MUTEX(rtnl_mutex);
  
-diff -urNp linux-3.0.4/net/core/scm.c linux-3.0.4/net/core/scm.c
---- linux-3.0.4/net/core/scm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/scm.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/core/scm.c linux-3.0.7/net/core/scm.c
+--- linux-3.0.7/net/core/scm.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/core/scm.c	2011-10-16 21:55:28.000000000 -0400
 @@ -218,7 +218,7 @@ EXPORT_SYMBOL(__scm_send);
  int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
  {
@@ -70477,9 +71746,9 @@ diff -urNp linux-3.0.4/net/core/scm.c linux-3.0.4/net/core/scm.c
  	     i++, cmfptr++)
  	{
  		int new_fd;
-diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
---- linux-3.0.4/net/core/skbuff.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/skbuff.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/core/skbuff.c linux-3.0.7/net/core/skbuff.c
+--- linux-3.0.7/net/core/skbuff.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -70489,9 +71758,9 @@ diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
  	if (splice_grow_spd(pipe, &spd))
  		return -ENOMEM;
  
-diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
---- linux-3.0.4/net/core/sock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/core/sock.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/core/sock.c linux-3.0.7/net/core/sock.c
+--- linux-3.0.7/net/core/sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 >=
@@ -70573,9 +71842,9 @@ diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sysctl_net_decnet.c
---- linux-3.0.4/net/decnet/sysctl_net_decnet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/decnet/sysctl_net_decnet.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/decnet/sysctl_net_decnet.c linux-3.0.7/net/decnet/sysctl_net_decnet.c
+--- linux-3.0.7/net/decnet/sysctl_net_decnet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -70594,9 +71863,9 @@ diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sys
  		return -EFAULT;
  
  	*lenp = len;
-diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
---- linux-3.0.4/net/econet/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/econet/Kconfig	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/econet/Kconfig linux-3.0.7/net/econet/Kconfig
+--- linux-3.0.7/net/econet/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/econet/Kconfig	2011-08-23 21:48:14.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -70606,9 +71875,9 @@ diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
  	---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 -urNp linux-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend.c
---- linux-3.0.4/net/ipv4/fib_frontend.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/fib_frontend.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/fib_frontend.c linux-3.0.7/net/ipv4/fib_frontend.c
+--- linux-3.0.7/net/ipv4/fib_frontend.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -70633,9 +71902,9 @@ diff -urNp linux-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend
  		rt_cache_flush(dev_net(dev), -1);
  		break;
  	case NETDEV_DOWN:
-diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semantics.c
---- linux-3.0.4/net/ipv4/fib_semantics.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/fib_semantics.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/fib_semantics.c linux-3.0.7/net/ipv4/fib_semantics.c
+--- linux-3.0.7/net/ipv4/fib_semantics.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -70645,9 +71914,9 @@ diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semanti
  
  	return nh->nh_saddr;
  }
-diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
---- linux-3.0.4/net/ipv4/inet_diag.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inet_diag.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/inet_diag.c linux-3.0.7/net/ipv4/inet_diag.c
+--- linux-3.0.7/net/ipv4/inet_diag.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -70709,9 +71978,9 @@ diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
  
  	tmo = req->expires - jiffies;
  	if (tmo < 0)
-diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hashtables.c
---- linux-3.0.4/net/ipv4/inet_hashtables.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inet_hashtables.c	2011-08-23 21:55:24.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/inet_hashtables.c linux-3.0.7/net/ipv4/inet_hashtables.c
+--- linux-3.0.7/net/ipv4/inet_hashtables.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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>
@@ -70737,9 +72006,9 @@ diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hash
  		if (tw) {
  			inet_twsk_deschedule(tw, death_row);
  			while (twrefcnt) {
-diff -urNp linux-3.0.4/net/ipv4/inetpeer.c linux-3.0.4/net/ipv4/inetpeer.c
---- linux-3.0.4/net/ipv4/inetpeer.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/inetpeer.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/inetpeer.c linux-3.0.7/net/ipv4/inetpeer.c
+--- linux-3.0.7/net/ipv4/inetpeer.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -70760,39 +72029,9 @@ diff -urNp linux-3.0.4/net/ipv4/inetpeer.c linux-3.0.4/net/ipv4/inetpeer.c
  		p->tcp_ts_stamp = 0;
  		p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
  		p->rate_tokens = 0;
-diff -urNp linux-3.0.4/net/ipv4/ipconfig.c linux-3.0.4/net/ipv4/ipconfig.c
---- linux-3.0.4/net/ipv4/ipconfig.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ipconfig.c	2011-10-06 04:17:55.000000000 -0400
-@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
-+	res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
-@@ -324,7 +324,7 @@ static int __init ic_dev_ioctl(unsigned 
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
-+	res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
-@@ -335,7 +335,7 @@ static int __init ic_route_ioctl(unsigne
- 
- 	mm_segment_t oldfs = get_fs();
- 	set_fs(get_ds());
--	res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
-+	res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
- 	set_fs(oldfs);
- 	return res;
- }
-diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
---- linux-3.0.4/net/ipv4/ip_fragment.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ip_fragment.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/ip_fragment.c linux-3.0.7/net/ipv4/ip_fragment.c
+--- linux-3.0.7/net/ipv4/ip_fragment.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -70802,9 +72041,9 @@ diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
  	qp->rid = end;
  
  	rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
---- linux-3.0.4/net/ipv4/ip_sockglue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ip_sockglue.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/ip_sockglue.c linux-3.0.7/net/ipv4/ip_sockglue.c
+--- linux-3.0.7/net/ipv4/ip_sockglue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/ipv4/ip_sockglue.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
  	int val;
  	int len;
@@ -70833,9 +72072,39 @@ diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
  		msg.msg_controllen = len;
  		msg.msg_flags = 0;
  
-diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/ipconfig.c linux-3.0.7/net/ipv4/ipconfig.c
+--- linux-3.0.7/net/ipv4/ipconfig.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/ipv4/ipconfig.c	2011-10-06 04:17:55.000000000 -0400
+@@ -313,7 +313,7 @@ static int __init ic_devinet_ioctl(unsig
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++	res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
+@@ -324,7 +324,7 @@ static int __init ic_dev_ioctl(unsigned 
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
++	res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
+@@ -335,7 +335,7 @@ static int __init ic_route_ioctl(unsigne
+ 
+ 	mm_segment_t oldfs = get_fs();
+ 	set_fs(get_ds());
+-	res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
++	res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
+ 	set_fs(oldfs);
+ 	return res;
+ }
+diff -urNp linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.0.7/net/ipv4/netfilter/nf_nat_snmp_basic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -70845,9 +72114,9 @@ diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ip
  	if (*octets == NULL) {
  		if (net_ratelimit())
  			pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
---- linux-3.0.4/net/ipv4/ping.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/ping.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/ping.c linux-3.0.7/net/ipv4/ping.c
+--- linux-3.0.7/net/ipv4/ping.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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),
@@ -70857,9 +72126,9 @@ diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
  }
  
  static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
---- linux-3.0.4/net/ipv4/raw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/raw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/raw.c linux-3.0.7/net/ipv4/raw.c
+--- linux-3.0.7/net/ipv4/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -70918,9 +72187,9 @@ diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
---- linux-3.0.4/net/ipv4/route.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/route.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/route.c linux-3.0.7/net/ipv4/route.c
+--- linux-3.0.7/net/ipv4/route.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/ipv4/route.c	2011-10-16 21:55:28.000000000 -0400
 @@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -70930,7 +72199,7 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
  }
  
  #ifdef CONFIG_PROC_FS
-@@ -833,7 +833,7 @@ static void rt_cache_invalidate(struct n
+@@ -832,7 +832,7 @@ static void rt_cache_invalidate(struct n
  	unsigned char shuffle;
  
  	get_random_bytes(&shuffle, sizeof(shuffle));
@@ -70939,7 +72208,7 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
  }
  
  /*
-@@ -2834,7 +2834,7 @@ static int rt_fill_info(struct net *net,
+@@ -2832,7 +2832,7 @@ static int rt_fill_info(struct net *net,
  	error = rt->dst.error;
  	if (peer) {
  		inet_peer_refcheck(rt->peer);
@@ -70948,9 +72217,9 @@ diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
  		if (peer->tcp_ts_stamp) {
  			ts = peer->tcp_ts;
  			tsage = get_seconds() - peer->tcp_ts_stamp;
-diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
---- linux-3.0.4/net/ipv4/tcp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp.c linux-3.0.7/net/ipv4/tcp.c
+--- linux-3.0.7/net/ipv4/tcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -70969,9 +72238,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
  	if (get_user(len, optlen))
  		return -EFAULT;
  
-diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
---- linux-3.0.4/net/ipv4/tcp_ipv4.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_ipv4.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp_ipv4.c linux-3.0.7/net/ipv4/tcp_ipv4.c
+--- linux-3.0.7/net/ipv4/tcp_ipv4.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -71067,9 +72336,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisocks.c
---- linux-3.0.4/net/ipv4/tcp_minisocks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_minisocks.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp_minisocks.c linux-3.0.7/net/ipv4/tcp_minisocks.c
+--- linux-3.0.7/net/ipv4/tcp_minisocks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -71092,9 +72361,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisoc
  	if (!(flg & TCP_FLAG_RST))
  		req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
---- linux-3.0.4/net/ipv4/tcp_output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_output.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp_output.c linux-3.0.7/net/ipv4/tcp_output.c
+--- linux-3.0.7/net/ipv4/tcp_output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -71104,9 +72373,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
  	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 -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
---- linux-3.0.4/net/ipv4/tcp_probe.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_probe.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp_probe.c linux-3.0.7/net/ipv4/tcp_probe.c
+--- linux-3.0.7/net/ipv4/tcp_probe.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -71116,9 +72385,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
  			return -EFAULT;
  		cnt += width;
  	}
-diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
---- linux-3.0.4/net/ipv4/tcp_timer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/tcp_timer.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/tcp_timer.c linux-3.0.7/net/ipv4/tcp_timer.c
+--- linux-3.0.7/net/ipv4/tcp_timer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -71144,9 +72413,9 @@ diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
  	if (retransmits_timed_out(sk, retry_until,
  				  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
  		/* Has it gone just too far? */
-diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
---- linux-3.0.4/net/ipv4/udp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv4/udp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv4/udp.c linux-3.0.7/net/ipv4/udp.c
+--- linux-3.0.7/net/ipv4/udp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/ipv4/udp.c	2011-08-23 21:48:14.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -71259,9 +72528,9 @@ diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/addrconf.c linux-3.0.4/net/ipv6/addrconf.c
---- linux-3.0.4/net/ipv6/addrconf.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/addrconf.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/addrconf.c linux-3.0.7/net/ipv6/addrconf.c
+--- linux-3.0.7/net/ipv6/addrconf.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/ipv6/addrconf.c	2011-10-06 04:17:55.000000000 -0400
 @@ -2072,7 +2072,7 @@ int addrconf_set_dstaddr(struct net *net
  		p.iph.ihl = 5;
  		p.iph.protocol = IPPROTO_IPV6;
@@ -71271,9 +72540,9 @@ diff -urNp linux-3.0.4/net/ipv6/addrconf.c linux-3.0.4/net/ipv6/addrconf.c
  
  		if (ops->ndo_do_ioctl) {
  			mm_segment_t oldfs = get_fs();
-diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/inet6_connection_sock.c
---- linux-3.0.4/net/ipv6/inet6_connection_sock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/inet6_connection_sock.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/inet6_connection_sock.c linux-3.0.7/net/ipv6/inet6_connection_sock.c
+--- linux-3.0.7/net/ipv6/inet6_connection_sock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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
  	{
@@ -71292,9 +72561,9 @@ diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/ine
  			__sk_dst_reset(sk);
  			dst = NULL;
  		}
-diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockglue.c
---- linux-3.0.4/net/ipv6/ipv6_sockglue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/ipv6_sockglue.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/ipv6_sockglue.c linux-3.0.7/net/ipv6/ipv6_sockglue.c
+--- linux-3.0.7/net/ipv6/ipv6_sockglue.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/ipv6/ipv6_sockglue.c	2011-10-16 21:55:28.000000000 -0400
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
  	int val, valbool;
  	int retv = -ENOPROTOOPT;
@@ -71320,11 +72589,11 @@ diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockgl
 -		msg.msg_control = optval;
 +		msg.msg_control = (void __force_kernel *)optval;
  		msg.msg_controllen = len;
- 		msg.msg_flags = 0;
+ 		msg.msg_flags = flags;
  
-diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
---- linux-3.0.4/net/ipv6/raw.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/ipv6/raw.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/raw.c linux-3.0.7/net/ipv6/raw.c
+--- linux-3.0.7/net/ipv6/raw.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)) &&
@@ -71420,9 +72689,9 @@ diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
---- linux-3.0.4/net/ipv6/tcp_ipv6.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv6/tcp_ipv6.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/tcp_ipv6.c linux-3.0.7/net/ipv6/tcp_ipv6.c
+--- linux-3.0.7/net/ipv6/tcp_ipv6.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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
@@ -71522,9 +72791,9 @@ diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
---- linux-3.0.4/net/ipv6/udp.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/ipv6/udp.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/ipv6/udp.c linux-3.0.7/net/ipv6/udp.c
+--- linux-3.0.7/net/ipv6/udp.c	2011-10-17 23:17:09.000000000 -0400
++++ linux-3.0.7/net/ipv6/udp.c	2011-10-17 23:17:19.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -71573,7 +72842,7 @@ diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
  		bh_unlock_sock(sk);
  		sock_put(sk);
  		goto discard;
-@@ -1406,8 +1413,13 @@ static void udp6_sock_seq_show(struct se
+@@ -1408,8 +1415,13 @@ static void udp6_sock_seq_show(struct se
  		   0, 0L, 0,
  		   sock_i_uid(sp), 0,
  		   sock_i_ino(sp),
@@ -71589,9 +72858,9 @@ diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/ircomm_tty.c
---- linux-3.0.4/net/irda/ircomm/ircomm_tty.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/irda/ircomm/ircomm_tty.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/irda/ircomm/ircomm_tty.c linux-3.0.7/net/irda/ircomm/ircomm_tty.c
+--- linux-3.0.7/net/irda/ircomm/ircomm_tty.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  
@@ -71714,9 +72983,9 @@ diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/
  	seq_printf(m, "Max data size: %d\n", self->max_data_size);
  	seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
---- linux-3.0.4/net/iucv/af_iucv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/iucv/af_iucv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/iucv/af_iucv.c linux-3.0.7/net/iucv/af_iucv.c
+--- linux-3.0.7/net/iucv/af_iucv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -71730,9 +72999,9 @@ diff -urNp linux-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
  	}
  
  	write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
---- linux-3.0.4/net/key/af_key.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/key/af_key.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/key/af_key.c linux-3.0.7/net/key/af_key.c
+--- linux-3.0.7/net/key/af_key.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -71755,9 +73024,9 @@ diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
  	} while (!res);
  	return res;
  }
-diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
---- linux-3.0.4/net/lapb/lapb_iface.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/lapb/lapb_iface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/lapb/lapb_iface.c linux-3.0.7/net/lapb/lapb_iface.c
+--- linux-3.0.7/net/lapb/lapb_iface.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -71821,9 +73090,9 @@ diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
  		used = 1;
  	}
  
-diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debugfs_sta.c
---- linux-3.0.4/net/mac80211/debugfs_sta.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/debugfs_sta.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/debugfs_sta.c linux-3.0.7/net/mac80211/debugfs_sta.c
+--- linux-3.0.7/net/mac80211/debugfs_sta.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -71842,9 +73111,9 @@ diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debug
  	p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
  			htc->ht_supported ? "" : "not ");
  	if (htc->ht_supported) {
-diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee80211_i.h
---- linux-3.0.4/net/mac80211/ieee80211_i.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/ieee80211_i.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/ieee80211_i.h linux-3.0.7/net/mac80211/ieee80211_i.h
+--- linux-3.0.7/net/mac80211/ieee80211_i.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -71862,9 +73131,9 @@ diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee8
  	int monitors, cooked_mntrs;
  	/* number of interfaces with corresponding FIF_ flags */
  	int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
---- linux-3.0.4/net/mac80211/iface.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/mac80211/iface.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/iface.c linux-3.0.7/net/mac80211/iface.c
+--- linux-3.0.7/net/mac80211/iface.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/net/mac80211/iface.c	2011-08-23 21:47:56.000000000 -0400
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
  		break;
  	}
@@ -71919,9 +73188,9 @@ diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
  		if (local->ops->napi_poll)
  			napi_disable(&local->napi);
  		ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
---- linux-3.0.4/net/mac80211/main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/main.c linux-3.0.7/net/mac80211/main.c
+--- linux-3.0.7/net/mac80211/main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -71931,9 +73200,9 @@ diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
  		ret = drv_config(local, changed);
  		/*
  		 * Goal:
-diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
---- linux-3.0.4/net/mac80211/mlme.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/mac80211/mlme.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/mlme.c linux-3.0.7/net/mac80211/mlme.c
+--- linux-3.0.7/net/mac80211/mlme.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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;
@@ -71943,9 +73212,9 @@ diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
  	/* AssocResp and ReassocResp have identical structure */
  
  	aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
---- linux-3.0.4/net/mac80211/pm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/pm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/pm.c linux-3.0.7/net/mac80211/pm.c
+--- linux-3.0.7/net/mac80211/pm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -71964,9 +73233,9 @@ diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
  		ieee80211_stop_device(local);
  
   suspend:
-diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
---- linux-3.0.4/net/mac80211/rate.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/rate.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/rate.c linux-3.0.7/net/mac80211/rate.c
+--- linux-3.0.7/net/mac80211/rate.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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();
@@ -71976,9 +73245,9 @@ diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
  		return -EBUSY;
  
  	if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.0.7/net/mac80211/rc80211_pid_debugfs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -71988,9 +73257,9 @@ diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac802
  		return -EFAULT;
  
  	return p;
-diff -urNp linux-3.0.4/net/mac80211/util.c linux-3.0.4/net/mac80211/util.c
---- linux-3.0.4/net/mac80211/util.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/mac80211/util.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/mac80211/util.c linux-3.0.7/net/mac80211/util.c
+--- linux-3.0.7/net/mac80211/util.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/mac80211/util.c	2011-08-23 21:47:56.000000000 -0400
 @@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
  #endif
  
@@ -72000,9 +73269,40 @@ diff -urNp linux-3.0.4/net/mac80211/util.c linux-3.0.4/net/mac80211/util.c
  		/*
  		 * Upon resume hardware can sometimes be goofy due to
  		 * various platform / driver / bus issues, so restarting
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/Kconfig linux-3.0.7/net/netfilter/Kconfig
+--- linux-3.0.7/net/netfilter/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/net/netfilter/Makefile linux-3.0.7/net/netfilter/Makefile
+--- linux-3.0.7/net/netfilter/Makefile	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.0.7/net/netfilter/ipvs/ip_vs_conn.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72030,9 +73330,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter
  	if (i > 8 || i < 0) return 0;
  
  	if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.0.7/net/netfilter/ipvs/ip_vs_core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -72051,9 +73351,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter
  
  	if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
  	    cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.0.7/net/netfilter/ipvs/ip_vs_ctl.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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);
@@ -72108,9 +73408,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/
  	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 -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.0.7/net/netfilter/ipvs/ip_vs_sync.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
  	 */
@@ -72129,9 +73429,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter
  	cp->state = state;
  	cp->old_state = cp->state;
  	/*
-diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.7/net/netfilter/ipvs/ip_vs_xmit.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72150,40 +73450,9 @@ diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter
  		goto out;
  	}
  
-diff -urNp linux-3.0.4/net/netfilter/Kconfig linux-3.0.4/net/netfilter/Kconfig
---- linux-3.0.4/net/netfilter/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/net/netfilter/Makefile linux-3.0.4/net/netfilter/Makefile
---- linux-3.0.4/net/netfilter/Makefile	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/nfnetlink_log.c
---- linux-3.0.4/net/netfilter/nfnetlink_log.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/nfnetlink_log.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/nfnetlink_log.c linux-3.0.7/net/netfilter/nfnetlink_log.c
+--- linux-3.0.7/net/netfilter/nfnetlink_log.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/netfilter/nfnetlink_log.c	2011-08-23 21:47:56.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -72202,9 +73471,9 @@ diff -urNp linux-3.0.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/n
  
  	if (data_len) {
  		struct nlattr *nla;
-diff -urNp linux-3.0.4/net/netfilter/nfnetlink_queue.c linux-3.0.4/net/netfilter/nfnetlink_queue.c
---- linux-3.0.4/net/netfilter/nfnetlink_queue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/nfnetlink_queue.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/nfnetlink_queue.c linux-3.0.7/net/netfilter/nfnetlink_queue.c
+--- linux-3.0.7/net/netfilter/nfnetlink_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/netfilter/nfnetlink_queue.c	2011-08-23 21:47:56.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
  	spinlock_t	lock;
@@ -72232,9 +73501,9 @@ diff -urNp linux-3.0.4/net/netfilter/nfnetlink_queue.c linux-3.0.4/net/netfilter
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gradm.c
---- linux-3.0.4/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/net/netfilter/xt_gradm.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/xt_gradm.c linux-3.0.7/net/netfilter/xt_gradm.c
+--- linux-3.0.7/net/netfilter/xt_gradm.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/net/netfilter/xt_gradm.c	2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *	gradm match for netfilter
@@ -72287,9 +73556,9 @@ diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gra
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt_statistic.c
---- linux-3.0.4/net/netfilter/xt_statistic.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netfilter/xt_statistic.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netfilter/xt_statistic.c linux-3.0.7/net/netfilter/xt_statistic.c
+--- linux-3.0.7/net/netfilter/xt_statistic.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/netfilter/xt_statistic.c	2011-08-23 21:47:56.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -72320,9 +73589,9 @@ diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt
  
  	return 0;
  }
-diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netlink.c
---- linux-3.0.4/net/netlink/af_netlink.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netlink/af_netlink.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/netlink/af_netlink.c linux-3.0.7/net/netlink/af_netlink.c
+--- linux-3.0.7/net/netlink/af_netlink.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
  		}
@@ -72341,9 +73610,9 @@ diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netli
  			   sock_i_ino(s)
  			);
  
-diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
---- linux-3.0.4/net/netrom/af_netrom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/netrom/af_netrom.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/netrom/af_netrom.c linux-3.0.7/net/netrom/af_netrom.c
+--- linux-3.0.7/net/netrom/af_netrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72360,9 +73629,9 @@ diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
  		sax->fsa_ax25.sax25_call   = nr->source_addr;
  		*uaddr_len = sizeof(struct sockaddr_ax25);
  	}
-diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
---- linux-3.0.4/net/packet/af_packet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/packet/af_packet.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/packet/af_packet.c linux-3.0.7/net/packet/af_packet.c
+--- linux-3.0.7/net/packet/af_packet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72398,9 +73667,9 @@ diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
  		return -EFAULT;
  	return 0;
  }
-diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
---- linux-3.0.4/net/phonet/af_phonet.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/af_phonet.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/phonet/af_phonet.c linux-3.0.7/net/phonet/af_phonet.c
+--- linux-3.0.7/net/phonet/af_phonet.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72419,9 +73688,9 @@ diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
  		return -EINVAL;
  
  	err = proto_register(pp->prot, 1);
-diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
---- linux-3.0.4/net/phonet/pep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/pep.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/phonet/pep.c linux-3.0.7/net/phonet/pep.c
+--- linux-3.0.7/net/phonet/pep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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:
@@ -72449,9 +73718,9 @@ diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
  			err = NET_RX_DROP;
  			break;
  		}
-diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
---- linux-3.0.4/net/phonet/socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/phonet/socket.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/phonet/socket.c linux-3.0.7/net/phonet/socket.c
+--- linux-3.0.7/net/phonet/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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),
@@ -72468,9 +73737,9 @@ diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
  	}
  	seq_printf(seq, "%*s\n", 127 - len, "");
  	return 0;
-diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
---- linux-3.0.4/net/rds/cong.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/cong.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/cong.c linux-3.0.7/net/rds/cong.c
+--- linux-3.0.7/net/rds/cong.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -72498,21 +73767,9 @@ diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
  
  	if (likely(*recent == gen))
  		return 0;
-diff -urNp linux-3.0.4/net/rds/ib_cm.c linux-3.0.4/net/rds/ib_cm.c
---- linux-3.0.4/net/rds/ib_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
---- linux-3.0.4/net/rds/ib.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/ib.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/ib.h linux-3.0.7/net/rds/ib.h
+--- linux-3.0.7/net/rds/ib.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72522,9 +73779,21 @@ diff -urNp linux-3.0.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
---- linux-3.0.4/net/rds/ib_recv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/ib_recv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/ib_cm.c linux-3.0.7/net/rds/ib_cm.c
+--- linux-3.0.7/net/rds/ib_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/net/rds/ib_recv.c linux-3.0.7/net/rds/ib_recv.c
+--- linux-3.0.7/net/rds/ib_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -72543,21 +73812,9 @@ diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.4/net/rds/iw_cm.c linux-3.0.4/net/rds/iw_cm.c
---- linux-3.0.4/net/rds/iw_cm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
---- linux-3.0.4/net/rds/iw.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/iw.h linux-3.0.7/net/rds/iw.h
+--- linux-3.0.7/net/rds/iw.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72567,9 +73824,21 @@ diff -urNp linux-3.0.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
  #else
  	spinlock_t		i_ack_lock;	/* protect i_ack_next */
  	u64			i_ack_next;	/* next ACK to send */
-diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
---- linux-3.0.4/net/rds/iw_rdma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw_rdma.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/iw_cm.c linux-3.0.7/net/rds/iw_cm.c
+--- linux-3.0.7/net/rds/iw_cm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/net/rds/iw_rdma.c linux-3.0.7/net/rds/iw_rdma.c
+--- linux-3.0.7/net/rds/iw_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72579,9 +73848,9 @@ diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
  	src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
  	dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
---- linux-3.0.4/net/rds/iw_recv.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/iw_recv.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/iw_recv.c linux-3.0.7/net/rds/iw_recv.c
+--- linux-3.0.7/net/rds/iw_recv.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -72600,9 +73869,9 @@ diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.4/net/rds/tcp.c linux-3.0.4/net/rds/tcp.c
---- linux-3.0.4/net/rds/tcp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/tcp.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/tcp.c linux-3.0.7/net/rds/tcp.c
+--- linux-3.0.7/net/rds/tcp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/rds/tcp.c	2011-10-06 04:17:55.000000000 -0400
 @@ -58,7 +58,7 @@ void rds_tcp_nonagle(struct socket *sock
  	int val = 1;
  
@@ -72612,9 +73881,9 @@ diff -urNp linux-3.0.4/net/rds/tcp.c linux-3.0.4/net/rds/tcp.c
  			      sizeof(val));
  	set_fs(oldfs);
  }
-diff -urNp linux-3.0.4/net/rds/tcp_send.c linux-3.0.4/net/rds/tcp_send.c
---- linux-3.0.4/net/rds/tcp_send.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rds/tcp_send.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/rds/tcp_send.c linux-3.0.7/net/rds/tcp_send.c
+--- linux-3.0.7/net/rds/tcp_send.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/rds/tcp_send.c	2011-10-06 04:17:55.000000000 -0400
 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *
  
  	oldfs = get_fs();
@@ -72624,9 +73893,9 @@ diff -urNp linux-3.0.4/net/rds/tcp_send.c linux-3.0.4/net/rds/tcp_send.c
  			      sizeof(val));
  	set_fs(oldfs);
  }
-diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
---- linux-3.0.4/net/rxrpc/af_rxrpc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/af_rxrpc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/af_rxrpc.c linux-3.0.7/net/rxrpc/af_rxrpc.c
+--- linux-3.0.7/net/rxrpc/af_rxrpc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -72636,9 +73905,9 @@ diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
---- linux-3.0.4/net/rxrpc/ar-ack.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-ack.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-ack.c linux-3.0.7/net/rxrpc/ar-ack.c
+--- linux-3.0.7/net/rxrpc/ar-ack.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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},",
@@ -72711,9 +73980,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
  	_proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
---- linux-3.0.4/net/rxrpc/ar-call.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-call.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-call.c linux-3.0.7/net/rxrpc/ar-call.c
+--- linux-3.0.7/net/rxrpc/ar-call.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72723,9 +73992,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
  	call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
  	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connection.c
---- linux-3.0.4/net/rxrpc/ar-connection.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-connection.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-connection.c linux-3.0.7/net/rxrpc/ar-connection.c
+--- linux-3.0.7/net/rxrpc/ar-connection.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72735,9 +74004,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connec
  		conn->avail_calls = RXRPC_MAXCALLS;
  		conn->size_align = 4;
  		conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-connevent.c
---- linux-3.0.4/net/rxrpc/ar-connevent.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-connevent.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-connevent.c linux-3.0.7/net/rxrpc/ar-connevent.c
+--- linux-3.0.7/net/rxrpc/ar-connevent.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72747,9 +74016,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-conneve
  	_proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
---- linux-3.0.4/net/rxrpc/ar-input.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-input.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-input.c linux-3.0.7/net/rxrpc/ar-input.c
+--- linux-3.0.7/net/rxrpc/ar-input.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -72762,9 +74031,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
  					   serial);
  
  	/* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal.h
---- linux-3.0.4/net/rxrpc/ar-internal.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-internal.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-internal.h linux-3.0.7/net/rxrpc/ar-internal.h
+--- linux-3.0.7/net/rxrpc/ar-internal.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
@@ -72794,9 +74063,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
---- linux-3.0.4/net/rxrpc/ar-local.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-local.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-local.c linux-3.0.7/net/rxrpc/ar-local.c
+--- linux-3.0.7/net/rxrpc/ar-local.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72806,9 +74075,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
  		memcpy(&local->srx, srx, sizeof(*srx));
  	}
  
-diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
---- linux-3.0.4/net/rxrpc/ar-output.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-output.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-output.c linux-3.0.7/net/rxrpc/ar-output.c
+--- linux-3.0.7/net/rxrpc/ar-output.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72821,9 +74090,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
  			sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
  			sp->hdr.userStatus = 0;
  			sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
---- linux-3.0.4/net/rxrpc/ar-peer.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-peer.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-peer.c linux-3.0.7/net/rxrpc/ar-peer.c
+--- linux-3.0.7/net/rxrpc/ar-peer.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72833,9 +74102,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
  		memcpy(&peer->srx, srx, sizeof(*srx));
  
  		rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
---- linux-3.0.4/net/rxrpc/ar-proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-proc.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-proc.c linux-3.0.7/net/rxrpc/ar-proc.c
+--- linux-3.0.7/net/rxrpc/ar-proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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],
@@ -72847,9 +74116,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
  
  	return 0;
  }
-diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transport.c
---- linux-3.0.4/net/rxrpc/ar-transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/ar-transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/ar-transport.c linux-3.0.7/net/rxrpc/ar-transport.c
+--- linux-3.0.7/net/rxrpc/ar-transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -72859,9 +74128,9 @@ diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transpo
  
  		if (peer->srx.transport.family == AF_INET) {
  			switch (peer->srx.transport_type) {
-diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
---- linux-3.0.4/net/rxrpc/rxkad.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/rxrpc/rxkad.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/rxrpc/rxkad.c linux-3.0.7/net/rxrpc/rxkad.c
+--- linux-3.0.7/net/rxrpc/rxkad.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -72898,9 +74167,9 @@ diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
  	_proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
  	ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
---- linux-3.0.4/net/sctp/proc.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sctp/proc.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/sctp/proc.c linux-3.0.7/net/sctp/proc.c
+--- linux-3.0.7/net/sctp/proc.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
  			   "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -72911,9 +74180,9 @@ diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
  			   assoc->state, hash,
  			   assoc->assoc_id,
  			   assoc->sndbuf_used,
-diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
---- linux-3.0.4/net/sctp/socket.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sctp/socket.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sctp/socket.c linux-3.0.7/net/sctp/socket.c
+--- linux-3.0.7/net/sctp/socket.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -72923,9 +74192,9 @@ diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
  			return -EFAULT;
  		to += addrlen;
  		cnt++;
-diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
---- linux-3.0.4/net/socket.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/net/socket.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/socket.c linux-3.0.7/net/socket.c
+--- linux-3.0.7/net/socket.c	2011-10-16 21:54:54.000000000 -0400
++++ linux-3.0.7/net/socket.c	2011-10-16 21:55:28.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -73094,7 +74363,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  				   ctl_len))
  			goto out_freectl;
  		msg_sys->msg_control = ctl_buf;
-@@ -2118,7 +2180,7 @@ static int __sys_recvmsg(struct socket *
+@@ -2120,7 +2182,7 @@ static int __sys_recvmsg(struct socket *
  	 *      kernel msghdr to use the kernel address space)
  	 */
  
@@ -73103,7 +74372,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  	uaddr_len = COMPAT_NAMELEN(msg);
  	if (MSG_CMSG_COMPAT & flags) {
  		err = verify_compat_iovec(msg_sys, iov,
-@@ -2746,7 +2808,7 @@ static int ethtool_ioctl(struct net *net
+@@ -2748,7 +2810,7 @@ static int ethtool_ioctl(struct net *net
  	}
  
  	ifr = compat_alloc_user_space(buf_size);
@@ -73112,7 +74381,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  
  	if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
  		return -EFAULT;
-@@ -2770,12 +2832,12 @@ static int ethtool_ioctl(struct net *net
+@@ -2772,12 +2834,12 @@ static int ethtool_ioctl(struct net *net
  			offsetof(struct ethtool_rxnfc, fs.ring_cookie));
  
  		if (copy_in_user(rxnfc, compat_rxnfc,
@@ -73129,7 +74398,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  		    copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
  				 sizeof(rxnfc->rule_cnt)))
  			return -EFAULT;
-@@ -2787,12 +2849,12 @@ static int ethtool_ioctl(struct net *net
+@@ -2789,12 +2851,12 @@ static int ethtool_ioctl(struct net *net
  
  	if (convert_out) {
  		if (copy_in_user(compat_rxnfc, rxnfc,
@@ -73146,7 +74415,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  		    copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
  				 sizeof(rxnfc->rule_cnt)))
  			return -EFAULT;
-@@ -2862,7 +2924,7 @@ static int bond_ioctl(struct net *net, u
+@@ -2864,7 +2926,7 @@ static int bond_ioctl(struct net *net, u
  		old_fs = get_fs();
  		set_fs(KERNEL_DS);
  		err = dev_ioctl(net, cmd,
@@ -73155,7 +74424,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  		set_fs(old_fs);
  
  		return err;
-@@ -2971,7 +3033,7 @@ static int compat_sioc_ifmap(struct net 
+@@ -2973,7 +3035,7 @@ static int compat_sioc_ifmap(struct net 
  
  	old_fs = get_fs();
  	set_fs(KERNEL_DS);
@@ -73164,7 +74433,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  	set_fs(old_fs);
  
  	if (cmd == SIOCGIFMAP && !err) {
-@@ -3076,7 +3138,7 @@ static int routing_ioctl(struct net *net
+@@ -3078,7 +3140,7 @@ static int routing_ioctl(struct net *net
  		ret |= __get_user(rtdev, &(ur4->rt_dev));
  		if (rtdev) {
  			ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
@@ -73173,7 +74442,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  			devname[15] = 0;
  		} else
  			r4.rt_dev = NULL;
-@@ -3316,8 +3378,8 @@ int kernel_getsockopt(struct socket *soc
+@@ -3318,8 +3380,8 @@ int kernel_getsockopt(struct socket *soc
  	int __user *uoptlen;
  	int err;
  
@@ -73184,7 +74453,7 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-@@ -3337,7 +3399,7 @@ int kernel_setsockopt(struct socket *soc
+@@ -3339,7 +3401,7 @@ int kernel_setsockopt(struct socket *soc
  	char __user *uoptval;
  	int err;
  
@@ -73193,9 +74462,9 @@ diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
  
  	set_fs(KERNEL_DS);
  	if (level == SOL_SOCKET)
-diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
---- linux-3.0.4/net/sunrpc/sched.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/sched.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/sched.c linux-3.0.7/net/sunrpc/sched.c
+--- linux-3.0.7/net/sunrpc/sched.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -73208,9 +74477,9 @@ diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.0.4/net/sunrpc/svcsock.c linux-3.0.4/net/sunrpc/svcsock.c
---- linux-3.0.4/net/sunrpc/svcsock.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/svcsock.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/svcsock.c linux-3.0.7/net/sunrpc/svcsock.c
+--- linux-3.0.7/net/sunrpc/svcsock.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/sunrpc/svcsock.c	2011-10-06 04:17:55.000000000 -0400
 @@ -392,7 +392,7 @@ static int svc_partial_recvfrom(struct s
  				int buflen, unsigned int base)
  {
@@ -73220,9 +74489,9 @@ diff -urNp linux-3.0.4/net/sunrpc/svcsock.c linux-3.0.4/net/sunrpc/svcsock.c
  	unsigned int i;
  	int ret;
  
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -73330,9 +74599,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xpr
  		.mode		= 0644,
  		.proc_handler	= read_reset_stat,
  	},
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -73360,9 +74629,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/s
  
  	/* Build up the XDR from the receive buffers. */
  	rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_sendto.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -73372,9 +74641,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sun
  	if (svc_rdma_send(xprt, &write_wr))
  		goto err;
  	return 0;
-diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.0.7/net/sunrpc/xprtrdma/svc_rdma_transport.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -73420,9 +74689,9 @@ diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/
  
  			/* See if we can opportunistically reap SQ WR to make room */
  			sq_cq_reap(xprt);
-diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
---- linux-3.0.4/net/sysctl_net.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/sysctl_net.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/sysctl_net.c linux-3.0.7/net/sysctl_net.c
+--- linux-3.0.7/net/sysctl_net.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
  {
@@ -73432,9 +74701,9 @@ diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
  		int mode = (table->mode >> 6) & 7;
  		return (mode << 6) | (mode << 3) | mode;
  	}
-diff -urNp linux-3.0.4/net/tipc/link.c linux-3.0.4/net/tipc/link.c
---- linux-3.0.4/net/tipc/link.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/tipc/link.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/tipc/link.c linux-3.0.7/net/tipc/link.c
+--- linux-3.0.7/net/tipc/link.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/tipc/link.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1170,7 +1170,7 @@ static int link_send_sections_long(struc
  	struct tipc_msg fragm_hdr;
  	struct sk_buff *buf, *buf_chain, *prev;
@@ -73462,9 +74731,9 @@ diff -urNp linux-3.0.4/net/tipc/link.c linux-3.0.4/net/tipc/link.c
  		sect_crs += sz;
  		sect_rest -= sz;
  		fragm_crs += sz;
-diff -urNp linux-3.0.4/net/tipc/msg.c linux-3.0.4/net/tipc/msg.c
---- linux-3.0.4/net/tipc/msg.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/tipc/msg.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/tipc/msg.c linux-3.0.7/net/tipc/msg.c
+--- linux-3.0.7/net/tipc/msg.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/tipc/msg.c	2011-10-06 04:17:55.000000000 -0400
 @@ -101,7 +101,7 @@ int tipc_msg_build(struct tipc_msg *hdr,
  					      msg_sect[cnt].iov_len);
  		else
@@ -73474,9 +74743,9 @@ diff -urNp linux-3.0.4/net/tipc/msg.c linux-3.0.4/net/tipc/msg.c
  						       msg_sect[cnt].iov_len);
  		pos += msg_sect[cnt].iov_len;
  	}
-diff -urNp linux-3.0.4/net/tipc/subscr.c linux-3.0.4/net/tipc/subscr.c
---- linux-3.0.4/net/tipc/subscr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/tipc/subscr.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/net/tipc/subscr.c linux-3.0.7/net/tipc/subscr.c
+--- linux-3.0.7/net/tipc/subscr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/tipc/subscr.c	2011-10-06 04:17:55.000000000 -0400
 @@ -101,7 +101,7 @@ static void subscr_send_event(struct sub
  {
  	struct iovec msg_sect;
@@ -73486,9 +74755,9 @@ diff -urNp linux-3.0.4/net/tipc/subscr.c linux-3.0.4/net/tipc/subscr.c
  	msg_sect.iov_len = sizeof(struct tipc_event);
  
  	sub->evt.event = htohl(event, sub->swap);
-diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
---- linux-3.0.4/net/unix/af_unix.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/unix/af_unix.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/unix/af_unix.c linux-3.0.7/net/unix/af_unix.c
+--- linux-3.0.7/net/unix/af_unix.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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))
@@ -73535,9 +74804,9 @@ diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
  		mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
  		dput(nd.path.dentry);
  		nd.path.dentry = dentry;
-diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
---- linux-3.0.4/net/wireless/core.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/wireless/core.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/wireless/core.h linux-3.0.7/net/wireless/core.h
+--- linux-3.0.7/net/wireless/core.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/wireless/core.h	2011-08-23 21:47:56.000000000 -0400
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
  	struct mutex mtx;
  
@@ -73547,9 +74816,9 @@ diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
  	struct rfkill *rfkill;
  	struct work_struct rfkill_sync;
  
-diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-core.c
---- linux-3.0.4/net/wireless/wext-core.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/wireless/wext-core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/wireless/wext-core.c linux-3.0.7/net/wireless/wext-core.c
+--- linux-3.0.7/net/wireless/wext-core.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/net/wireless/wext-core.c	2011-08-23 21:47:56.000000000 -0400
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
  		 */
  
@@ -73583,9 +74852,9 @@ diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-co
  	err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
  	iwp->length += essid_compat;
-diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
---- linux-3.0.4/net/xfrm/xfrm_policy.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/xfrm/xfrm_policy.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/net/xfrm/xfrm_policy.c linux-3.0.7/net/xfrm/xfrm_policy.c
+--- linux-3.0.7/net/xfrm/xfrm_policy.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -73658,9 +74927,9 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
  		}
  	}
  
-diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
---- linux-3.0.4/net/xfrm/xfrm_user.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/net/xfrm/xfrm_user.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/net/xfrm/xfrm_user.c linux-3.0.7/net/xfrm/xfrm_user.c
+--- linux-3.0.7/net/xfrm/xfrm_user.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -73679,9 +74948,53 @@ diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
  	if (attrs[XFRMA_MIGRATE] == NULL)
  		return -EINVAL;
  
-diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
---- linux-3.0.4/scripts/basic/fixdep.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/basic/fixdep.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/scripts/Makefile.build linux-3.0.7/scripts/Makefile.build
+--- linux-3.0.7/scripts/Makefile.build	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/scripts/Makefile.clean linux-3.0.7/scripts/Makefile.clean
+--- linux-3.0.7/scripts/Makefile.clean	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/scripts/Makefile.host linux-3.0.7/scripts/Makefile.host
+--- linux-3.0.7/scripts/Makefile.host	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/scripts/basic/fixdep.c linux-3.0.7/scripts/basic/fixdep.c
+--- linux-3.0.7/scripts/basic/fixdep.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/scripts/basic/fixdep.c	2011-10-06 04:17:55.000000000 -0400
 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *
  /*
   * Lookup a value in the configuration string.
@@ -73725,59 +75038,15 @@ diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
  
  	if (*p != INT_CONF) {
  		fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plugin.sh
---- linux-3.0.4/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/scripts/gcc-plugin.sh	2011-09-14 09:08:05.000000000 -0400
+diff -urNp linux-3.0.7/scripts/gcc-plugin.sh linux-3.0.7/scripts/gcc-plugin.sh
+--- linux-3.0.7/scripts/gcc-plugin.sh	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/scripts/gcc-plugin.sh	2011-09-14 09:08:05.000000000 -0400
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
---- linux-3.0.4/scripts/Makefile.build	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/scripts/Makefile.clean linux-3.0.4/scripts/Makefile.clean
---- linux-3.0.4/scripts/Makefile.clean	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/scripts/Makefile.host linux-3.0.4/scripts/Makefile.host
---- linux-3.0.4/scripts/Makefile.host	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2alias.c
---- linux-3.0.4/scripts/mod/file2alias.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/file2alias.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/scripts/mod/file2alias.c linux-3.0.7/scripts/mod/file2alias.c
+--- linux-3.0.7/scripts/mod/file2alias.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/scripts/mod/file2alias.c	2011-10-06 04:17:55.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
  			    unsigned long size, unsigned long id_size,
  			    void *symval)
@@ -73841,9 +75110,9 @@ diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2ali
  
  	sprintf(alias, "dmi*");
  
-diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
---- linux-3.0.4/scripts/mod/modpost.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/modpost.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/scripts/mod/modpost.c linux-3.0.7/scripts/mod/modpost.c
+--- linux-3.0.7/scripts/mod/modpost.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -73920,9 +75189,9 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
  		goto close_write;
  
  	tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
---- linux-3.0.4/scripts/mod/modpost.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/modpost.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/scripts/mod/modpost.h linux-3.0.7/scripts/mod/modpost.h
+--- linux-3.0.7/scripts/mod/modpost.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -73942,9 +75211,9 @@ diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
  
  struct module {
  	struct module *next;
-diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversion.c
---- linux-3.0.4/scripts/mod/sumversion.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/mod/sumversion.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/scripts/mod/sumversion.c linux-3.0.7/scripts/mod/sumversion.c
+--- linux-3.0.7/scripts/mod/sumversion.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  	}
@@ -73954,9 +75223,9 @@ diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversi
  		warn("writing sum in %s failed: %s\n",
  			filename, strerror(errno));
  		goto out;
-diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
---- linux-3.0.4/scripts/pnmtologo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/scripts/pnmtologo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/scripts/pnmtologo.c linux-3.0.7/scripts/pnmtologo.c
+--- linux-3.0.7/scripts/pnmtologo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -73983,107 +75252,9 @@ diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
  	    logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.0.4/security/apparmor/lsm.c linux-3.0.4/security/apparmor/lsm.c
---- linux-3.0.4/security/apparmor/lsm.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/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.4/security/commoncap.c linux-3.0.4/security/commoncap.c
---- linux-3.0.4/security/commoncap.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/security/integrity/ima/ima_api.c linux-3.0.4/security/integrity/ima/ima_api.c
---- linux-3.0.4/security/integrity/ima/ima_api.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/security/integrity/ima/ima_fs.c linux-3.0.4/security/integrity/ima/ima_fs.c
---- linux-3.0.4/security/integrity/ima/ima_fs.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/security/integrity/ima/ima.h linux-3.0.4/security/integrity/ima/ima.h
---- linux-3.0.4/security/integrity/ima/ima.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/security/integrity/ima/ima_queue.c linux-3.0.4/security/integrity/ima/ima_queue.c
---- linux-3.0.4/security/integrity/ima/ima_queue.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/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.4/security/Kconfig linux-3.0.4/security/Kconfig
---- linux-3.0.4/security/Kconfig	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/Kconfig	2011-10-06 04:19:25.000000000 -0400
+diff -urNp linux-3.0.7/security/Kconfig linux-3.0.7/security/Kconfig
+--- linux-3.0.7/security/Kconfig	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/security/Kconfig	2011-10-06 04:19:25.000000000 -0400
 @@ -4,6 +4,558 @@
  
  menu "Security options"
@@ -74652,9 +75823,107 @@ diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
  	default 65536
  	help
  	  This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.0.4/security/keys/compat.c linux-3.0.4/security/keys/compat.c
---- linux-3.0.4/security/keys/compat.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/keys/compat.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/security/apparmor/lsm.c linux-3.0.7/security/apparmor/lsm.c
+--- linux-3.0.7/security/apparmor/lsm.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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.7/security/commoncap.c linux-3.0.7/security/commoncap.c
+--- linux-3.0.7/security/commoncap.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/security/integrity/ima/ima.h linux-3.0.7/security/integrity/ima/ima.h
+--- linux-3.0.7/security/integrity/ima/ima.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/security/integrity/ima/ima_api.c linux-3.0.7/security/integrity/ima/ima_api.c
+--- linux-3.0.7/security/integrity/ima/ima_api.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/security/integrity/ima/ima_fs.c linux-3.0.7/security/integrity/ima/ima_fs.c
+--- linux-3.0.7/security/integrity/ima/ima_fs.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/security/integrity/ima/ima_queue.c linux-3.0.7/security/integrity/ima/ima_queue.c
+--- linux-3.0.7/security/integrity/ima/ima_queue.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.7/security/keys/compat.c linux-3.0.7/security/keys/compat.c
+--- linux-3.0.7/security/keys/compat.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/security/keys/compat.c	2011-10-06 04:17:55.000000000 -0400
 @@ -44,7 +44,7 @@ long compat_keyctl_instantiate_key_iov(
  	if (ret == 0)
  		goto no_payload_free;
@@ -74664,9 +75933,9 @@ diff -urNp linux-3.0.4/security/keys/compat.c linux-3.0.4/security/keys/compat.c
  
  	if (iov != iovstack)
  		kfree(iov);
-diff -urNp linux-3.0.4/security/keys/keyctl.c linux-3.0.4/security/keys/keyctl.c
---- linux-3.0.4/security/keys/keyctl.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/keys/keyctl.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/security/keys/keyctl.c linux-3.0.7/security/keys/keyctl.c
+--- linux-3.0.7/security/keys/keyctl.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/security/keys/keyctl.c	2011-10-06 04:17:55.000000000 -0400
 @@ -921,7 +921,7 @@ static int keyctl_change_reqkey_auth(str
  /*
   * Copy the iovec data from userspace
@@ -74703,9 +75972,9 @@ diff -urNp linux-3.0.4/security/keys/keyctl.c linux-3.0.4/security/keys/keyctl.c
  
  	if (iov != iovstack)
  		kfree(iov);
-diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring.c
---- linux-3.0.4/security/keys/keyring.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/keys/keyring.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/security/keys/keyring.c linux-3.0.7/security/keys/keyring.c
+--- linux-3.0.7/security/keys/keyring.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  
@@ -74725,9 +75994,9 @@ diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring
  					goto error;
  
  				buflen -= tmp;
-diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
---- linux-3.0.4/security/min_addr.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/min_addr.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/security/min_addr.c linux-3.0.7/security/min_addr.c
+--- linux-3.0.7/security/min_addr.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -74744,9 +76013,9 @@ diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
  }
  
  /*
-diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
---- linux-3.0.4/security/security.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/security.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/security/security.c linux-3.0.7/security/security.c
+--- linux-3.0.7/security/security.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -74768,9 +76037,9 @@ diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hooks.c
---- linux-3.0.4/security/selinux/hooks.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/hooks.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/security/selinux/hooks.c linux-3.0.7/security/selinux/hooks.c
+--- linux-3.0.7/security/selinux/hooks.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/security/selinux/hooks.c	2011-08-23 21:48:14.000000000 -0400
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -74788,9 +76057,9 @@ diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hoo
  	.name =				"selinux",
  
  	.ptrace_access_check =		selinux_ptrace_access_check,
-diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/selinux/include/xfrm.h
---- linux-3.0.4/security/selinux/include/xfrm.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/include/xfrm.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/security/selinux/include/xfrm.h linux-3.0.7/security/selinux/include/xfrm.h
+--- linux-3.0.7/security/selinux/include/xfrm.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -74800,9 +76069,9 @@ diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/seli
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selinux/ss/services.c
---- linux-3.0.4/security/selinux/ss/services.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/selinux/ss/services.c	2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.7/security/selinux/ss/services.c linux-3.0.7/security/selinux/ss/services.c
+--- linux-3.0.7/security/selinux/ss/services.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -74812,9 +76081,9 @@ diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selin
  	if (!ss_initialized) {
  		avtab_cache_init();
  		rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/smack_lsm.c
---- linux-3.0.4/security/smack/smack_lsm.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/smack/smack_lsm.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/security/smack/smack_lsm.c linux-3.0.7/security/smack/smack_lsm.c
+--- linux-3.0.7/security/smack/smack_lsm.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
  }
@@ -74824,9 +76093,9 @@ diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/sma
  	.name =				"smack",
  
  	.ptrace_access_check =		smack_ptrace_access_check,
-diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomoyo.c
---- linux-3.0.4/security/tomoyo/tomoyo.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/security/tomoyo/tomoyo.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/security/tomoyo/tomoyo.c linux-3.0.7/security/tomoyo/tomoyo.c
+--- linux-3.0.7/security/tomoyo/tomoyo.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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.
@@ -74836,9 +76105,9 @@ diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomo
  	.name                = "tomoyo",
  	.cred_alloc_blank    = tomoyo_cred_alloc_blank,
  	.cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx.c
---- linux-3.0.4/sound/aoa/codecs/onyx.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/aoa/codecs/onyx.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.c linux-3.0.7/sound/aoa/codecs/onyx.c
+--- linux-3.0.7/sound/aoa/codecs/onyx.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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,
@@ -74867,9 +76136,9 @@ diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx
  		onyx->spdif_locked = onyx->analog_locked = 0;
  	mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx.h
---- linux-3.0.4/sound/aoa/codecs/onyx.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/aoa/codecs/onyx.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/aoa/codecs/onyx.h linux-3.0.7/sound/aoa/codecs/onyx.h
+--- linux-3.0.7/sound/aoa/codecs/onyx.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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>
@@ -74878,9 +76147,9 @@ diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-3.0.4/sound/core/oss/pcm_oss.c linux-3.0.4/sound/core/oss/pcm_oss.c
---- linux-3.0.4/sound/core/oss/pcm_oss.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/core/oss/pcm_oss.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/sound/core/oss/pcm_oss.c linux-3.0.7/sound/core/oss/pcm_oss.c
+--- linux-3.0.7/sound/core/oss/pcm_oss.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/sound/core/oss/pcm_oss.c	2011-10-06 04:17:55.000000000 -0400
 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(str
  		if (in_kernel) {
  			mm_segment_t fs;
@@ -74952,9 +76221,9 @@ diff -urNp linux-3.0.4/sound/core/oss/pcm_oss.c linux-3.0.4/sound/core/oss/pcm_o
  					snd_leave_user(fs);
  				}
  			} else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
-diff -urNp linux-3.0.4/sound/core/pcm_compat.c linux-3.0.4/sound/core/pcm_compat.c
---- linux-3.0.4/sound/core/pcm_compat.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/sound/core/pcm_compat.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/sound/core/pcm_compat.c linux-3.0.7/sound/core/pcm_compat.c
+--- linux-3.0.7/sound/core/pcm_compat.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/sound/core/pcm_compat.c	2011-10-06 04:17:55.000000000 -0400
 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(st
  	int err;
  
@@ -74964,9 +76233,9 @@ diff -urNp linux-3.0.4/sound/core/pcm_compat.c linux-3.0.4/sound/core/pcm_compat
  	snd_leave_user(fs);
  	if (err < 0)
  		return err;
-diff -urNp linux-3.0.4/sound/core/pcm_native.c linux-3.0.4/sound/core/pcm_native.c
---- linux-3.0.4/sound/core/pcm_native.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/core/pcm_native.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/sound/core/pcm_native.c linux-3.0.7/sound/core/pcm_native.c
+--- linux-3.0.7/sound/core/pcm_native.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/sound/core/pcm_native.c	2011-10-06 04:17:55.000000000 -0400
 @@ -2770,11 +2770,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_
  	switch (substream->stream) {
  	case SNDRV_PCM_STREAM_PLAYBACK:
@@ -74981,9 +76250,9 @@ diff -urNp linux-3.0.4/sound/core/pcm_native.c linux-3.0.4/sound/core/pcm_native
  		break;
  	default:
  		result = -EINVAL;
-diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/seq_device.c
---- linux-3.0.4/sound/core/seq/seq_device.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/core/seq/seq_device.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/core/seq/seq_device.c linux-3.0.7/sound/core/seq/seq_device.c
+--- linux-3.0.7/sound/core/seq/seq_device.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 */
  
@@ -75020,9 +76289,9 @@ diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/se
  		dev->status = SNDRV_SEQ_DEVICE_FREE;
  		dev->driver_data = NULL;
  		ops->num_init_devices--;
-diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
---- linux-3.0.4/sound/drivers/mts64.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/mts64.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/drivers/mts64.c linux-3.0.7/sound/drivers/mts64.c
+--- linux-3.0.7/sound/drivers/mts64.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/sound/drivers/mts64.c	2011-08-23 21:47:56.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -75079,9 +76348,9 @@ diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
  
  	return 0;
  }
-diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/opl4/opl4_lib.c
---- linux-3.0.4/sound/drivers/opl4/opl4_lib.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/opl4/opl4_lib.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/drivers/opl4/opl4_lib.c linux-3.0.7/sound/drivers/opl4/opl4_lib.c
+--- linux-3.0.7/sound/drivers/opl4/opl4_lib.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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");
@@ -75091,9 +76360,9 @@ diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/o
  {
  	int timeout = 10;
  	while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/portman2x4.c
---- linux-3.0.4/sound/drivers/portman2x4.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/drivers/portman2x4.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/drivers/portman2x4.c linux-3.0.7/sound/drivers/portman2x4.c
+--- linux-3.0.7/sound/drivers/portman2x4.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/sound/drivers/portman2x4.c	2011-08-23 21:47:56.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -75111,9 +76380,9 @@ diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/port
  	int mode[PORTMAN_NUM_INPUT_PORTS];
  	struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
---- linux-3.0.4/sound/firewire/amdtp.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/amdtp.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/firewire/amdtp.c linux-3.0.7/sound/firewire/amdtp.c
+--- linux-3.0.7/sound/firewire/amdtp.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -75132,9 +76401,9 @@ diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
  		(fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
---- linux-3.0.4/sound/firewire/amdtp.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/amdtp.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/firewire/amdtp.h linux-3.0.7/sound/firewire/amdtp.h
+--- linux-3.0.7/sound/firewire/amdtp.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -75144,9 +76413,9 @@ diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
  }
  
  /**
-diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight.c
---- linux-3.0.4/sound/firewire/isight.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/firewire/isight.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/firewire/isight.c linux-3.0.7/sound/firewire/isight.c
+--- linux-3.0.7/sound/firewire/isight.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -75187,9 +76456,9 @@ diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight
  		break;
  	default:
  		return -EINVAL;
-diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
---- linux-3.0.4/sound/isa/cmi8330.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/isa/cmi8330.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/isa/cmi8330.c linux-3.0.7/sound/isa/cmi8330.c
+--- linux-3.0.7/sound/isa/cmi8330.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/sound/isa/cmi8330.c	2011-08-23 21:47:56.000000000 -0400
 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
  	struct snd_pcm *pcm;
@@ -75199,9 +76468,9 @@ diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
  		snd_pcm_open_callback_t open;
  		void *private_data; /* sb or wss */
  	} streams[2];
-diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
---- linux-3.0.4/sound/oss/sb_audio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/oss/sb_audio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/oss/sb_audio.c linux-3.0.7/sound/oss/sb_audio.c
+--- linux-3.0.7/sound/oss/sb_audio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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)
@@ -75211,9 +76480,9 @@ diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
  			if (copy_from_user(lbuf8,
  					   userbuf+useroffs + p,
  					   locallen))
-diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4297a.c
---- linux-3.0.4/sound/oss/swarm_cs4297a.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/oss/swarm_cs4297a.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/oss/swarm_cs4297a.c linux-3.0.7/sound/oss/swarm_cs4297a.c
+--- linux-3.0.7/sound/oss/swarm_cs4297a.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -75248,9 +76517,9 @@ diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_codec.h
---- linux-3.0.4/sound/pci/hda/hda_codec.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/hda/hda_codec.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/pci/hda/hda_codec.h linux-3.0.7/sound/pci/hda/hda_codec.h
+--- linux-3.0.7/sound/pci/hda/hda_codec.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -75286,9 +76555,9 @@ diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_c
  
  	/* PCM to create, set by patch_ops.build_pcms callback */
  	unsigned int num_pcms;
-diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712/ice1712.h
---- linux-3.0.4/sound/pci/ice1712/ice1712.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/ice1712/ice1712.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/pci/ice1712/ice1712.h linux-3.0.7/sound/pci/ice1712/ice1712.h
+--- linux-3.0.7/sound/pci/ice1712/ice1712.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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 {
@@ -75307,9 +76576,9 @@ diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712
  };
  
  
-diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.0.7/sound/pci/ymfpci/ymfpci_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -75350,9 +76619,9 @@ diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfp
  	chip->card = card;
  	chip->pci = pci;
  	chip->irq = -1;
-diff -urNp linux-3.0.4/sound/soc/soc-core.c linux-3.0.4/sound/soc/soc-core.c
---- linux-3.0.4/sound/soc/soc-core.c	2011-09-02 18:11:21.000000000 -0400
-+++ linux-3.0.4/sound/soc/soc-core.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/soc/soc-core.c linux-3.0.7/sound/soc/soc-core.c
+--- linux-3.0.7/sound/soc/soc-core.c	2011-09-02 18:11:21.000000000 -0400
++++ linux-3.0.7/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
  }
  
@@ -75370,9 +76639,9 @@ diff -urNp linux-3.0.4/sound/soc/soc-core.c linux-3.0.4/sound/soc/soc-core.c
  		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.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
---- linux-3.0.4/sound/usb/card.h	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/sound/usb/card.h	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/sound/usb/card.h linux-3.0.7/sound/usb/card.h
+--- linux-3.0.7/sound/usb/card.h	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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);
@@ -75390,9 +76659,34 @@ diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
  };
  
  struct snd_usb_stream {
-diff -urNp linux-3.0.4/tools/gcc/checker_plugin.c linux-3.0.4/tools/gcc/checker_plugin.c
---- linux-3.0.4/tools/gcc/checker_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/checker_plugin.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/tools/gcc/Makefile linux-3.0.7/tools/gcc/Makefile
+--- linux-3.0.7/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/Makefile	2011-10-06 04:17:55.000000000 -0400
+@@ -0,0 +1,21 @@
++#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 := constify_plugin.so
++hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
++hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
++hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
++hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
++
++always := $(hostlibs-y)
++
++stackleak_plugin-objs := stackleak_plugin.o
++constify_plugin-objs := constify_plugin.o
++kallocstat_plugin-objs := kallocstat_plugin.o
++kernexec_plugin-objs := kernexec_plugin.o
++checker_plugin-objs := checker_plugin.o
+diff -urNp linux-3.0.7/tools/gcc/checker_plugin.c linux-3.0.7/tools/gcc/checker_plugin.c
+--- linux-3.0.7/tools/gcc/checker_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/checker_plugin.c	2011-10-06 04:17:55.000000000 -0400
 @@ -0,0 +1,169 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -75563,9 +76857,9 @@ diff -urNp linux-3.0.4/tools/gcc/checker_plugin.c linux-3.0.4/tools/gcc/checker_
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constify_plugin.c
---- linux-3.0.4/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/constify_plugin.c	2011-08-30 18:23:52.000000000 -0400
+diff -urNp linux-3.0.7/tools/gcc/constify_plugin.c linux-3.0.7/tools/gcc/constify_plugin.c
+--- linux-3.0.7/tools/gcc/constify_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/constify_plugin.c	2011-08-30 18:23:52.000000000 -0400
 @@ -0,0 +1,293 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
@@ -75860,9 +77154,9 @@ diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constif
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallocstat_plugin.c
---- linux-3.0.4/tools/gcc/kallocstat_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/kallocstat_plugin.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/tools/gcc/kallocstat_plugin.c linux-3.0.7/tools/gcc/kallocstat_plugin.c
+--- linux-3.0.7/tools/gcc/kallocstat_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/kallocstat_plugin.c	2011-10-06 04:17:55.000000000 -0400
 @@ -0,0 +1,165 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -76029,9 +77323,9 @@ diff -urNp linux-3.0.4/tools/gcc/kallocstat_plugin.c linux-3.0.4/tools/gcc/kallo
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexec_plugin.c
---- linux-3.0.4/tools/gcc/kernexec_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/kernexec_plugin.c	2011-10-06 04:17:55.000000000 -0400
+diff -urNp linux-3.0.7/tools/gcc/kernexec_plugin.c linux-3.0.7/tools/gcc/kernexec_plugin.c
+--- linux-3.0.7/tools/gcc/kernexec_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/kernexec_plugin.c	2011-10-06 04:17:55.000000000 -0400
 @@ -0,0 +1,273 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -76306,34 +77600,9 @@ diff -urNp linux-3.0.4/tools/gcc/kernexec_plugin.c linux-3.0.4/tools/gcc/kernexe
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/tools/gcc/Makefile linux-3.0.4/tools/gcc/Makefile
---- linux-3.0.4/tools/gcc/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/Makefile	2011-10-06 04:17:55.000000000 -0400
-@@ -0,0 +1,21 @@
-+#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 := constify_plugin.so
-+hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
-+hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
-+hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
-+hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
-+
-+always := $(hostlibs-y)
-+
-+stackleak_plugin-objs := stackleak_plugin.o
-+constify_plugin-objs := constify_plugin.o
-+kallocstat_plugin-objs := kallocstat_plugin.o
-+kernexec_plugin-objs := kernexec_plugin.o
-+checker_plugin-objs := checker_plugin.o
-diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackleak_plugin.c
---- linux-3.0.4/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.4/tools/gcc/stackleak_plugin.c	2011-09-17 00:53:44.000000000 -0400
+diff -urNp linux-3.0.7/tools/gcc/stackleak_plugin.c linux-3.0.7/tools/gcc/stackleak_plugin.c
+--- linux-3.0.7/tools/gcc/stackleak_plugin.c	1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.7/tools/gcc/stackleak_plugin.c	2011-09-17 00:53:44.000000000 -0400
 @@ -0,0 +1,251 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -76586,9 +77855,9 @@ diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackl
 +
 +	return 0;
 +}
-diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
---- linux-3.0.4/usr/gen_init_cpio.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/usr/gen_init_cpio.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/usr/gen_init_cpio.c linux-3.0.7/usr/gen_init_cpio.c
+--- linux-3.0.7/usr/gen_init_cpio.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
@@ -76611,9 +77880,9 @@ diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
---- linux-3.0.4/virt/kvm/kvm_main.c	2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.4/virt/kvm/kvm_main.c	2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.7/virt/kvm/kvm_main.c linux-3.0.7/virt/kvm/kvm_main.c
+--- linux-3.0.7/virt/kvm/kvm_main.c	2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.7/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;
diff --git a/3.0.4/4421_grsec-remove-localversion-grsec.patch b/3.0.7/4421_grsec-remove-localversion-grsec.patch
index 31cf878..31cf878 100644
--- a/3.0.4/4421_grsec-remove-localversion-grsec.patch
+++ b/3.0.7/4421_grsec-remove-localversion-grsec.patch
diff --git a/3.0.4/4422_grsec-mute-warnings.patch b/3.0.7/4422_grsec-mute-warnings.patch
index fbca0bb..fbca0bb 100644
--- a/3.0.4/4422_grsec-mute-warnings.patch
+++ b/3.0.7/4422_grsec-mute-warnings.patch
diff --git a/3.0.4/4423_grsec-remove-protected-paths.patch b/3.0.7/4423_grsec-remove-protected-paths.patch
index abd9b99..4afb3e2 100644
--- a/3.0.4/4423_grsec-remove-protected-paths.patch
+++ b/3.0.7/4423_grsec-remove-protected-paths.patch
@@ -4,15 +4,16 @@ We don't want GRSEC's Makefile to change permissions on paths in
 the filesystem.
 
 diff -Naur a/grsecurity/Makefile b/grsecurity/Makefile
---- a/grsecurity/Makefile	2011-09-15 13:36:25.000000000 -0400
-+++ b/grsecurity/Makefile	2011-09-15 13:44:58.000000000 -0400
-@@ -27,9 +27,4 @@
+--- a/grsecurity/Makefile	2011-10-19 20:42:50.000000000 -0400
++++ b/grsecurity/Makefile	2011-10-19 20:45:08.000000000 -0400
+@@ -27,10 +27,4 @@
  ifdef CONFIG_GRKERNSEC_HIDESYM
  extra-y := grsec_hidesym.o
  $(obj)/grsec_hidesym.o:
 -	@-chmod -f 500 /boot
 -	@-chmod -f 500 /lib/modules
 -	@-chmod -f 500 /lib64/modules
+-	@-chmod -f 500 /lib32/modules
 -	@-chmod -f 700 .
 -	@echo '  grsec: protected kernel image paths'
  endif
diff --git a/3.0.4/4425_grsec-pax-without-grsec.patch b/3.0.7/4425_grsec-pax-without-grsec.patch
index 41be0d0..41be0d0 100644
--- a/3.0.4/4425_grsec-pax-without-grsec.patch
+++ b/3.0.7/4425_grsec-pax-without-grsec.patch
diff --git a/3.0.4/4430_grsec-kconfig-default-gids.patch b/3.0.7/4430_grsec-kconfig-default-gids.patch
index 6a448bf..6a448bf 100644
--- a/3.0.4/4430_grsec-kconfig-default-gids.patch
+++ b/3.0.7/4430_grsec-kconfig-default-gids.patch
diff --git a/3.0.4/4435_grsec-kconfig-gentoo.patch b/3.0.7/4435_grsec-kconfig-gentoo.patch
index 1bc9742..1bc9742 100644
--- a/3.0.4/4435_grsec-kconfig-gentoo.patch
+++ b/3.0.7/4435_grsec-kconfig-gentoo.patch
diff --git a/3.0.4/4437-grsec-kconfig-proc-user.patch b/3.0.7/4437-grsec-kconfig-proc-user.patch
index c588683..c588683 100644
--- a/3.0.4/4437-grsec-kconfig-proc-user.patch
+++ b/3.0.7/4437-grsec-kconfig-proc-user.patch
diff --git a/3.0.4/4440_selinux-avc_audit-log-curr_ip.patch b/3.0.7/4440_selinux-avc_audit-log-curr_ip.patch
index 0fd5d2d..0fd5d2d 100644
--- a/3.0.4/4440_selinux-avc_audit-log-curr_ip.patch
+++ b/3.0.7/4440_selinux-avc_audit-log-curr_ip.patch
diff --git a/3.0.4/4445_disable-compat_vdso.patch b/3.0.7/4445_disable-compat_vdso.patch
index 3b76b6c..3b76b6c 100644
--- a/3.0.4/4445_disable-compat_vdso.patch
+++ b/3.0.7/4445_disable-compat_vdso.patch